added theme switcher, fixed several issues