Redesign of theme

Changed UI in many parts