changed the EnvironmentThemeResolver
updated the config.yml
small cleanups