Merge: Make toggling dynamic colors less invasive