improvements to colors etc