Proper color scheme, minor tweaks