colors, title fixes
merge fix