Theme updates

Cleanup & styling