implementing new theme selector for ES.