removed themeMap to address hang on load issue