Refactor Frontend to Controller for other themes