Theming, icon and restructuring