Fixed some color bugs...still doesn't quite seem right