Added some themes, starting to come together