Altered some colours and consolidated some css