More theming
Cleaning up styles
Updated theme
More theme changes