Started the creation of themes
Minor changes to add some small functionality.