Moved to the right place.
Color and Line classes
More window improvements