Cosmetic changes to defaults in theme