Changed colors

Changed the colors and some of the borders