various changes including theme change