Add Environments & Themes
More fast again