Theme updates: cleaning it up