Fix Multiverse conflict, continue color scheme work