Improvements in theming and styling