Update graphics

Generate correct color sets, refactoring plot lines, fix control