Ant's theme updates

Theme updates from Ant.