Changed terminal shading
fixed merge conflict