cleaned up code

cleaned up code and fixed one of the theme selections