refactored theme to use a svc instead of a controller.