change some colours, deleted unneeded code,