Minor Color change and other stuff
Fixed Evil Merge Conflicts