Modified color schemes

Also fixed some bugs