Fixed issues with thememing