Better update, colors
Fix merge conflict