Editor and colors changes
Fix up local differences