Added theme switching and tidied up some existing code. Now need to add theme consistancy across all pages