upgraded colors and cleaned up code a bit