Making the colors a little more bearable
A few fixes and color changes