Theme cleanup: quasiquote, organize, remove wrong/obsolete/removed
faces and add missing