Rearranged themes
Fixed theming issues