tidying up some colour styles
more changes, tempary font