Improved the theme