Improved many themes.