Change a lot of colors, add some icons
merge