fixed merge conflict
removed some color schemes