Fixed some color schemes, and cleaned up indentation in some file!