fixes with the CookieThemeResolver