Added some themes and such