Added some colors, changed orange to grey