more refactoring and color change now saves