Improvements to theme
Improvements to theme