Major overhaul of colors... not so awful now :)