new colortheme, some refactoring