Committing latest theming changes
Merge branch 'frontend'