Theme updates

Hmmm... I swear I already did the Subs PR for the changes Ant gave me. Let me know if I'm not doing this right...