Simplified and lightened the theme