[[ Better Themes ]] Various clean-ups
Merge branch 'feature-better-themes' into feature-better-fonts