Added yellow color to auto-merged stuff, like deleted components. Improved color scheme.