Added seperate color control and ability to save