Improved themecontroller not to check all the time for themes