Theming improvements
Merge