small refactoring, new colorscheme