Improved colors a bit