fixed up colors etc