Tdh merged 2

Hmm, I was standardizing font sizes at the same time you were doing this, apparently, so now there are two sets of sizes. Can you reconcile the font_size_blah dimensions and the text_blah dimensions?