added new class colorway_and_screen
added new colorway form (not yet implemented)
Merge origin/master