Fixed small color bugs