fix colors and if statements