Added the theme controller again but with a better concept