global colors
merge fix