Colour scheme cleanup, variable cleanup in screen.scss, adding comments