Improvements to theme