Theme Stuff

Fixing the themes