OZP-421 Forgot to wire ThemeService and add some comments