Add color constants && tidy some functions