reorganizing color variables a bit

still needs some fine tuning - but more progress being made!