theme changes and configuration cleanup