applied Markus' decouple color-scheme patch