fixed colors and editing