Changed colors, small other tweaks