We present a summary of the full calculation of the axial, scalar and tensor flavor diagonal charges of the nucleon carried out using Wilson-clover fermions on eight ensembles generated using 2+1+1-flavors of highly improved staggered quarks (HISQ) by the MILC collaboration. We also give results for the $3\times 3$ matrix of renormalization factors between the RI-sMOM and $\overline{\rm MS}$ scheme for the 2+1 flavor theory that include flavor mixing. Preliminary results for $g_{A,S,T}^{u,d,s}$ are presented in the $\overline{\rm MS}$ scheme at scale 2 GeV.