Tried to speed up theme switching support