theme change related fixes