remove unnecessary button fill color definitions AND fix up "variable" names in COLOR_ALIAS macros (makes no difference to function

1 files changed, 165 insertions, 182 deletions

diff --git a/gtk2_ardour/color_aliases.h b/gtk2_ardour/color_aliases.h
index 7dab33f39a..405ff0611d 100644
--- a/gtk2_ardour/color_aliases.h
+++ b/gtk2_ardour/color_aliases.h
@@ -38,19 +38,19 @@ COLOR_ALIAS(EditPoint,"edit point","color 18")
 COLOR_ALIAS(EnteredAutomationLine,"entered automation line","color 19")
 COLOR_ALIAS(EnteredGainLine,"entered gain line","color 19")
 COLOR_ALIAS(EnteredMarker,"entered marker","color 19")
-COLOR_ALIAS(FeedbackAlertFillActive,"feedback alert: fill","color 20")
-COLOR_ALIAS(FeedbackAlertFill,"feedback alert: fill active","color 9")
-COLOR_ALIAS(FeedbackAlertLEDActive,"feedback alert: led","color 4")
-COLOR_ALIAS(FeedbackAlertLED,"feedback alert: led active","color 4")
+COLOR_ALIAS(FeedbackAlertFill,"feedback alert: fill","color 20")
+COLOR_ALIAS(FeedbackAlertFillActive,"feedback alert: fill active","color 9")
+COLOR_ALIAS(FeedbackAlertLED,"feedback alert: led","color 4")
+COLOR_ALIAS(FeedbackAlertLEDActive,"feedback alert: led active","color 4")
 COLOR_ALIAS(FeedbackAlertTextActive,"feedback alert: text","color 21")
 COLOR_ALIAS(FeedbackAlertText,"feedback alert: text active","color 22")
 COLOR_ALIAS(FrameHandle,"frame handle","color 23")
 COLOR_ALIAS(GainLine,"gain line","color 6")
 COLOR_ALIAS(GainLineInactive,"gain line inactive","color 24")
-COLOR_ALIAS(GenericButtonFillActive,"generic button: fill","color 25")
-COLOR_ALIAS(GenericButtonFill,"generic button: fill active","color 9")
-COLOR_ALIAS(GenericButtonLEDActive,"generic button: led","color 15")
-COLOR_ALIAS(GenericButtonLED,"generic button: led active","color 18")
+COLOR_ALIAS(GenericButtonFill,"generic button: fill","color 25")
+COLOR_ALIAS(GenericButtonFillActive,"generic button: fill active","color 9")
+COLOR_ALIAS(GenericButtonLED,"generic button: led","color 15")
+COLOR_ALIAS(GenericButtonLEDActive,"generic button: led active","color 18")
 COLOR_ALIAS(GhostTrackBase,"ghost track base","color 28")
 COLOR_ALIAS(GhostTrackMidiOutline,"ghost track midi outline","color 4")
 COLOR_ALIAS(GhostTrackWaveClip,"ghost track wave","color 29")
@@ -101,8 +101,7 @@ COLOR_ALIAS(ImageTrack,"image track","color 31")
 COLOR_ALIAS(InactiveCrossfade,"inactive crossfade","color 32")
 COLOR_ALIAS(InactiveFadeHandle,"inactive fade handle","color 33")
 COLOR_ALIAS(InactiveGroupTab,"inactive group tab","color 34")
-COLOR_ALIAS(InvertButtonFillActive,"invert button: fill","color 25")
-COLOR_ALIAS(InvertButtonFill,"invert button: fill active","color 35")
+COLOR_ALIAS(InvertButtonFillActive,"invert button: fill active","color 35")
 COLOR_ALIAS(InvertButtonLEDActive,"invert button: led","color 36")
 COLOR_ALIAS(InvertButtonLED,"invert button: led active","color 37")
 COLOR_ALIAS(LocationCDMarker,"location cd marker","color 38")
@@ -110,8 +109,7 @@ COLOR_ALIAS(LocationLoop,"location loop","color 39")
 COLOR_ALIAS(LocationMarker,"location marker","color 32")
 COLOR_ALIAS(LocationPunch,"location punch","color 40")
 COLOR_ALIAS(LocationRange,"location range","color 41")
-COLOR_ALIAS(LockButtonFillActive,"lock button: fill","color 25")
-COLOR_ALIAS(LockButtonFill,"lock button: fill active","color 42")
+COLOR_ALIAS(LockButtonFillActive,"lock button: fill active","color 42")
 COLOR_ALIAS(LockButtonLEDActive,"lock button: led","color 4")
 COLOR_ALIAS(LockButtonLED,"lock button: led active","color 4")
 COLOR_ALIAS(MarkerBar,"marker bar","color 11")
@@ -144,15 +142,13 @@ COLOR_ALIAS(MeterStripDPMBackground, "meterstrip dpm bg", "color 9")
 COLOR_ALIAS(MeterStripPPMBackground, "meterstrip ppm bg", "color 27")
 COLOR_ALIAS(MeterStripVUBackground, "meterstrip vu bg", "color 32")
 COLOR_ALIAS(MidiBusBase,"midi bus base","color 4")
-COLOR_ALIAS(MidiDeviceButtonFillActive,"midi device: fill","color 25")
-COLOR_ALIAS(MidiDeviceButtonFill,"midi device: fill active","color 42")
+COLOR_ALIAS(MidiDeviceButtonFillActive,"midi device: fill active","color 42")
 COLOR_ALIAS(MidiDeviceButtonLEDActive,"midi device: led","color 49")
 COLOR_ALIAS(MidiDeviceButtonLED,"midi device: led active","color 17")
 COLOR_ALIAS(MidiDeviceButtonTextActive,"midi device: text","color 26")
 COLOR_ALIAS(MidiDeviceButtonText,"midi device: text active","color 50")
 COLOR_ALIAS(MidiFrameBase,"midi frame base","color 51")
-COLOR_ALIAS(MidiInputButtonFillActive,"midi input button: fill","color 25")
-COLOR_ALIAS(MidiInputButtonFill,"midi input button: fill active","color 48")
+COLOR_ALIAS(MidiInputButtonFillActive,"midi input button: fill active","color 48")
 COLOR_ALIAS(MidiInputButtonLEDActive,"midi input button: led","color 4")
 COLOR_ALIAS(MidiInputButtonLED,"midi input button: led active","color 4")
 COLOR_ALIAS(MidiMeterColor0,"midi meter fill: 0","color 52")
@@ -180,89 +176,84 @@ COLOR_ALIAS(MidiSelectRectOutline,"midi select rect outline","color 63")
 COLOR_ALIAS(MidiSysExFill,"midi sysex fill","color 32")
 COLOR_ALIAS(MidiSysExOutline,"midi sysex outline","color 64")
 COLOR_ALIAS(MidiTrackBase,"midi track base","color 65")
-COLOR_ALIAS(MixerStripButtonFillActive,"mixer strip button: fill","color 25")
-COLOR_ALIAS(MixerStripButtonFill,"mixer strip button: fill active","color 8")
-COLOR_ALIAS(MixerStripButtonLEDActive,"mixer strip button: led","color 66")
-COLOR_ALIAS(MixerStripButtonLED,"mixer strip button: led active","color 8")
-COLOR_ALIAS(MixerStripNameButtonFillActive,"mixer strip name button: fill","color 25")
+COLOR_ALIAS(MixerStripButtonFillActive,"mixer strip button: fill active","color 8")
+COLOR_ALIAS(MixerStripButtonLED,"mixer strip button: led","color 66")
+COLOR_ALIAS(MixerStripButtonLEDActive,"mixer strip button: led active","color 8")
 COLOR_ALIAS(MixerStripNameButtonFill,"mixer strip name button: fill active","color 67")
-COLOR_ALIAS(MixerStripNameButtonLEDActive,"mixer strip name button: led","color 66")
-COLOR_ALIAS(MixerStripNameButtonLED,"mixer strip name button: led active","color 8")
-COLOR_ALIAS(MonitorButtonFillActive,"monitor button: fill","color 25")
-COLOR_ALIAS(MonitorButtonFill,"monitor button: fill active","color 68")
+COLOR_ALIAS(MixerStripNameButtonLED,"mixer strip name button: led","color 66")
+COLOR_ALIAS(MixerStripNameButtonLEDActive,"mixer strip name button: led active","color 8")
+COLOR_ALIAS(MonitorButtonFillActive,"monitor button: fill active","color 68")
 COLOR_ALIAS(MonitorButtonLEDActive,"monitor button: led","color 69")
 COLOR_ALIAS(MonitorButtonLED,"monitor button: led active","color 9")
 COLOR_ALIAS(MonitorKnobArcEnd,"monitor knob","color 60")
 COLOR_ALIAS(MonitorKnobArcStart,"monitor knob: arc end","color 70")
 COLOR_ALIAS(MonitorSectionKnob,"monitor knob: arc start","color 16")
-COLOR_ALIAS(MonitorSectionCutButtonFillActive,"monitor section cut: fill","color 71")
-COLOR_ALIAS(MonitorSectionCutButtonFill,"monitor section cut: fill active","color 8")
-COLOR_ALIAS(MonitorSectionCutButtonLEDActive,"monitor section cut: led","color 36")
-COLOR_ALIAS(MonitorSectionCutButtonLED,"monitor section cut: led active","color 37")
-COLOR_ALIAS(MonitorSectionCutButtonTextActive,"monitor section cut: text","color 26")
-COLOR_ALIAS(MonitorSectionCutButtonText,"monitor section cut: text active","color 4")
-COLOR_ALIAS(MonitorSectionDimButtonFillActive,"monitor section dim: fill","color 71")
-COLOR_ALIAS(MonitorSectionDimButtonFill,"monitor section dim: fill active","color 72")
-COLOR_ALIAS(MonitorSectionDimButtonLEDActive,"monitor section dim: led","color 4")
-COLOR_ALIAS(MonitorSectionDimButtonLED,"monitor section dim: led active","color 37")
-COLOR_ALIAS(MonitorSectionDimButtonTextActive,"monitor section dim: text","color 26")
-COLOR_ALIAS(MonitorSectionDimButtonText,"monitor section dim: text active","color 26")
-COLOR_ALIAS(MonitorSectionInvertButtonFillActive,"monitor section invert: fill","color 71")
-COLOR_ALIAS(MonitorSectionInvertButtonFill,"monitor section invert: fill active","color 35")
-COLOR_ALIAS(MonitorSectionInvertButtonLEDActive,"monitor section invert: led","color 36")
-COLOR_ALIAS(MonitorSectionInvertButtonLED,"monitor section invert: led active","color 37")
-COLOR_ALIAS(MonitorSectionInvertButtonTextActive,"monitor section invert: text","color 4")
-COLOR_ALIAS(MonitorSectionInvertButtonText,"monitor section invert: text active","color 4")
-COLOR_ALIAS(MonitorSectionMonoButtonFillActive,"monitor section mono: fill","color 71")
-COLOR_ALIAS(MonitorSectionMonoButtonFill,"monitor section mono: fill active","color 73")
-COLOR_ALIAS(MonitorSectionMonoButtonLEDActive,"monitor section mono: led","color 36")
-COLOR_ALIAS(MonitorSectionMonoButtonLED,"monitor section mono: led active","color 37")
-COLOR_ALIAS(MonitorSectionMonoButtonTextActive,"monitor section mono: text","color 26")
-COLOR_ALIAS(MonitorSectionMonoButtonText,"monitor section mono: text active","color 26")
-COLOR_ALIAS(MonitorSectionSoloButtonFillActive,"monitor section solo model: fill","color 71")
-COLOR_ALIAS(MonitorSectionSoloButtonFill,"monitor section solo model: fill active","color 42")
-COLOR_ALIAS(MonitorSectionSoloButtonLEDActive,"monitor section solo model: led","color 66")
-COLOR_ALIAS(MonitorSectionSoloButtonLED,"monitor section solo model: led active","color 8")
-COLOR_ALIAS(MonitorSectionSoloModelButtonFillActive,"monitor section solo model: text","color 26")
-COLOR_ALIAS(MonitorSectionSoloModelButtonFill,"monitor section solo model: text active","color 26")
-COLOR_ALIAS(MonitorSectionSoloModelButtonLEDActive,"monitor section solo: fill","color 71")
-COLOR_ALIAS(MonitorSectionSoloModelButtonLED,"monitor section solo: fill active","color 12")
-COLOR_ALIAS(MonitorSectionSoloModelButtonTextActive,"monitor section solo: led","color 36")
-COLOR_ALIAS(MonitorSectionSoloModelButtonText,"monitor section solo: led active","color 8")
-COLOR_ALIAS(MonitorSectionSoloButtonTextActive,"monitor section solo: text","color 4")
-COLOR_ALIAS(MonitorSectionSoloButtonText,"monitor section solo: text active","color 4")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonFillActive,"monitor solo exclusive: fill","color 71")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonFill,"monitor solo exclusive: fill active","color 20")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonLEDActive,"monitor solo exclusive: led","color 66")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonLED,"monitor solo exclusive: led active","color 8")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonTextActive,"monitor solo exclusive: text","color 26")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonText,"monitor solo exclusive: text active","color 26")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonFillActive,"monitor solo override: fill","color 71")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonFill,"monitor solo override: fill active","color 42")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonLEDActive,"monitor solo override: led","color 66")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonLED,"monitor solo override: led active","color 8")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonTextActive,"monitor solo override: text","color 26")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonText,"monitor solo override: text active","color 26")
+COLOR_ALIAS(MonitorSectionCutButtonFill,"monitor section cut: fill","color 71")
+COLOR_ALIAS(MonitorSectionCutButtonFillActive,"monitor section cut: fill active","color 8")
+COLOR_ALIAS(MonitorSectionCutButtonLED,"monitor section cut: led","color 36")
+COLOR_ALIAS(MonitorSectionCutButtonLEDActive,"monitor section cut: led active","color 37")
+COLOR_ALIAS(MonitorSectionCutButtonText,"monitor section cut: text","color 26")
+COLOR_ALIAS(MonitorSectionCutButtonTextActive,"monitor section cut: text active","color 4")
+COLOR_ALIAS(MonitorSectionDimButtonFill,"monitor section dim: fill","color 71")
+COLOR_ALIAS(MonitorSectionDimButtonFillActive,"monitor section dim: fill active","color 72")
+COLOR_ALIAS(MonitorSectionDimButtonLED,"monitor section dim: led","color 4")
+COLOR_ALIAS(MonitorSectionDimButtonLEDActive,"monitor section dim: led active","color 37")
+COLOR_ALIAS(MonitorSectionDimButtonText,"monitor section dim: text","color 26")
+COLOR_ALIAS(MonitorSectionDimButtonTextActive,"monitor section dim: text active","color 26")
+COLOR_ALIAS(MonitorSectionInvertButtonFill,"monitor section invert: fill","color 71")
+COLOR_ALIAS(MonitorSectionInvertButtonFillActive,"monitor section invert: fill active","color 35")
+COLOR_ALIAS(MonitorSectionInvertButtonLED,"monitor section invert: led","color 36")
+COLOR_ALIAS(MonitorSectionInvertButtonLEDActive,"monitor section invert: led active","color 37")
+COLOR_ALIAS(MonitorSectionInvertButtonText,"monitor section invert: text","color 4")
+COLOR_ALIAS(MonitorSectionInvertButtonTextActive,"monitor section invert: text active","color 4")
+COLOR_ALIAS(MonitorSectionMonoButtonFill,"monitor section mono: fill","color 71")
+COLOR_ALIAS(MonitorSectionMonoButtonFillActive,"monitor section mono: fill active","color 73")
+COLOR_ALIAS(MonitorSectionMonoButtonLED,"monitor section mono: led","color 36")
+COLOR_ALIAS(MonitorSectionMonoButtonLEDActive,"monitor section mono: led active","color 37")
+COLOR_ALIAS(MonitorSectionMonoButtonText,"monitor section mono: text","color 26")
+COLOR_ALIAS(MonitorSectionMonoButtonTextActive,"monitor section mono: text active","color 26")
+COLOR_ALIAS(MonitorSectionSoloButtonFill,"monitor section solo model: fill","color 71")
+COLOR_ALIAS(MonitorSectionSoloButtonFillActive,"monitor section solo model: fill active","color 42")
+COLOR_ALIAS(MonitorSectionSoloButtonLED,"monitor section solo model: led","color 66")
+COLOR_ALIAS(MonitorSectionSoloButtonLEDActive,"monitor section solo model: led active","color 8")
+COLOR_ALIAS(MonitorSectionSoloModelButtonText,"monitor section solo model: text","color 26")
+COLOR_ALIAS(MonitorSectionSoloModelButtonTextActive,"monitor section solo model: text active","color 26")
+COLOR_ALIAS(MonitorSectionSoloModelButtonFill,"monitor section solo: fill","color 71")
+COLOR_ALIAS(MonitorSectionSoloModelButtonFillActive,"monitor section solo: fill active","color 12")
+COLOR_ALIAS(MonitorSectionSoloModelButtonLED,"monitor section solo: led","color 36")
+COLOR_ALIAS(MonitorSectionSoloModelButtonLEDActive,"monitor section solo: led active","color 8")
+COLOR_ALIAS(MonitorSectionSoloButtonText,"monitor section solo: text","color 4")
+COLOR_ALIAS(MonitorSectionSoloButtonTextActive,"monitor section solo: text active","color 4")
+COLOR_ALIAS(MonitorSectionSoloExclusiveButtonFill,"monitor solo exclusive: fill","color 71")
+COLOR_ALIAS(MonitorSectionSoloExclusiveButtonFillActive,"monitor solo exclusive: fill active","color 20")
+COLOR_ALIAS(MonitorSectionSoloExclusiveButtonLED,"monitor solo exclusive: led","color 66")
+COLOR_ALIAS(MonitorSectionSoloExclusiveButtonLEDActive,"monitor solo exclusive: led active","color 8")
+COLOR_ALIAS(MonitorSectionSoloExclusiveButtonText,"monitor solo exclusive: text","color 26")
+COLOR_ALIAS(MonitorSectionSoloExclusiveButtonTextActive,"monitor solo exclusive: text active","color 26")
+COLOR_ALIAS(MonitorSectionSoloOverrideButtonFill,"monitor solo override: fill","color 71")
+COLOR_ALIAS(MonitorSectionSoloOverrideButtonFillActive,"monitor solo override: fill active","color 42")
+COLOR_ALIAS(MonitorSectionSoloOverrideButtonLED,"monitor solo override: led","color 66")
+COLOR_ALIAS(MonitorSectionSoloOverrideButtonLEDActive,"monitor solo override: led active","color 8")
+COLOR_ALIAS(MonitorSectionSoloOverrideButtonText,"monitor solo override: text","color 26")
+COLOR_ALIAS(MonitorSectionSoloOverrideButtonTextActive,"monitor solo override: text active","color 26")
 COLOR_ALIAS(MonoPannerBackground,"mono panner bg","color 61")
 COLOR_ALIAS(MonoPannerFill,"mono panner fill","color 74")
 COLOR_ALIAS(MonoPannerOutline,"mono panner outline","color 70")
 COLOR_ALIAS(MonoPannerPositionFill,"mono panner position fill","color 11")
 COLOR_ALIAS(MonoPannerPositionOutline,"mono panner position outline","color 70")
 COLOR_ALIAS(MonoPannerText,"mono panner text","color 4")
-COLOR_ALIAS(MouseModeButtonFillActive,"mouse mode button: fill","color 25")
-COLOR_ALIAS(MouseModeButtonFill,"mouse mode button: fill active","color 12")
-COLOR_ALIAS(MouseModeButtonLEDActive,"mouse mode button: led","color 66")
-COLOR_ALIAS(MouseModeButtonLED,"mouse mode button: led active","color 8")
-COLOR_ALIAS(MuteButtonFillActive,"mute button: fill","color 25")
-COLOR_ALIAS(MuteButtonFill,"mute button: fill active","color 75")
-COLOR_ALIAS(MuteButtonLEDActive,"mute button: led","color 4")
-COLOR_ALIAS(MuteButtonLED,"mute button: led active","color 4")
+COLOR_ALIAS(MouseModeButtonFillActive,"mouse mode button: fill active","color 12")
+COLOR_ALIAS(MouseModeButtonLED,"mouse mode button: led","color 66")
+COLOR_ALIAS(MouseModeButtonLEDActive,"mouse mode button: led active","color 8")
+COLOR_ALIAS(MuteButtonFillActive,"mute button: fill active","color 75")
+COLOR_ALIAS(MuteButtonLED,"mute button: led","color 4")
+COLOR_ALIAS(MuteButtonLEDActive,"mute button: led active","color 4")
 COLOR_ALIAS(NameHighlightFill,"name highlight fill","color 18")
 COLOR_ALIAS(NameHighlightOutline,"name highlight outline","color 23")
-COLOR_ALIAS(NudgeButtonFillActive,"nudge button: fill","color 20")
-COLOR_ALIAS(NudgeButtonFill,"nudge button: fill active","color 42")
-COLOR_ALIAS(NudgeButtonLEDActive,"nudge button: led","color 66")
-COLOR_ALIAS(NudgeButtonLED,"nudge button: led active","color 8")
+COLOR_ALIAS(NudgeButtonFill,"nudge button: fill","color 20")
+COLOR_ALIAS(NudgeButtonFillActive,"nudge button: fill active","color 42")
+COLOR_ALIAS(NudgeButtonLED,"nudge button: led","color 66")
+COLOR_ALIAS(NudgeButtonLEDActive,"nudge button: led active","color 8")
 COLOR_ALIAS(NudgeClockBackground,"nudge clock: background","color 7")
 COLOR_ALIAS(NudgeClockCursor,"nudge clock: cursor","color 8")
 COLOR_ALIAS(NudgeClockEditedText,"nudge clock: edited text","color 8")
@@ -271,37 +262,37 @@ COLOR_ALIAS(PianoRollBlack,"piano roll black","color 76")
 COLOR_ALIAS(PianoRollBlackOutline,"piano roll black outline","color 10")
 COLOR_ALIAS(PianoRollWhite,"piano roll white","color 45")
 COLOR_ALIAS(PlayHead,"play head","color 9")
-COLOR_ALIAS(PluginBypassButtonFillActive,"plugin bypass button: fill","color 71")
-COLOR_ALIAS(PluginBypassButtonFill,"plugin bypass button: fill active","color 42")
-COLOR_ALIAS(PluginBypassButtonLEDActive,"plugin bypass button: led","color 69")
-COLOR_ALIAS(PluginBypassButtonLED,"plugin bypass button: led active","color 9")
+COLOR_ALIAS(PluginBypassButtonFill,"plugin bypass button: fill","color 71")
+COLOR_ALIAS(PluginBypassButtonFillActive,"plugin bypass button: fill active","color 42")
+COLOR_ALIAS(PluginBypassButtonLED,"plugin bypass button: led","color 69")
+COLOR_ALIAS(PluginBypassButtonLEDActive,"plugin bypass button: led active","color 9")
 COLOR_ALIAS(ProcessorAutomationLine,"processor automation line","color 77")
-COLOR_ALIAS(ProcessorControlButtonFillActive,"processor control button: fill","color 29")
-COLOR_ALIAS(ProcessorControlButtonFill,"processor control button: fill active","color 46")
-COLOR_ALIAS(ProcessorControlButtonLEDActive,"processor control button: led","color 67")
-COLOR_ALIAS(ProcessorControlButtonLED,"processor control button: led active","color 16")
-COLOR_ALIAS(ProcessorFaderFillActive,"processor fader: fill","color 16")
-COLOR_ALIAS(ProcessorFaderFill,"processor fader: fill active","color 78")
-COLOR_ALIAS(ProcessorFaderLEDActive,"processor fader: led","color 44")
-COLOR_ALIAS(ProcessorFaderLED,"processor fader: led active","color 37")
-COLOR_ALIAS(ProcessorFaderTextActive,"processor fader: text","color 45")
-COLOR_ALIAS(ProcessorFaderText,"processor fader: text active","color 50")
-COLOR_ALIAS(ProcessorPostFaderFillActive,"processor postfader: fill","color 58")
-COLOR_ALIAS(ProcessorPostFaderFill,"processor postfader: fill active","color 79")
-COLOR_ALIAS(ProcessorPostFaderLEDActive,"processor postfader: led","color 44")
-COLOR_ALIAS(ProcessorPostFaderLED,"processor postfader: led active","color 37")
-COLOR_ALIAS(ProcessorPostFaderTextActive,"processor postfader: text","color 45")
-COLOR_ALIAS(ProcessorPostFaderText,"processor postfader: text active","color 50")
-COLOR_ALIAS(ProcessorPreFaderFillActive,"processor prefader: fill","color 40")
-COLOR_ALIAS(ProcessorPreFaderFill,"processor prefader: fill active","color 80")
-COLOR_ALIAS(ProcessorPreFaderLEDActive,"processor prefader: led","color 44")
-COLOR_ALIAS(ProcessorPreFaderLED,"processor prefader: led active","color 37")
-COLOR_ALIAS(ProcessorPreFaderTextActive,"processor prefader: text","color 45")
-COLOR_ALIAS(ProcessorPreFaderText,"processor prefader: text active","color 50")
-COLOR_ALIAS(PunchButtonFillActive,"punch button: fill","color 20")
-COLOR_ALIAS(PunchButtonFill,"punch button: fill active","color 9")
-COLOR_ALIAS(PunchButtonLEDActive,"punch button: led","color 4")
-COLOR_ALIAS(PunchButtonLED,"punch button: led active","color 4")
+COLOR_ALIAS(ProcessorControlButtonFill,"processor control button: fill","color 29")
+COLOR_ALIAS(ProcessorControlButtonFillActive,"processor control button: fill active","color 46")
+COLOR_ALIAS(ProcessorControlButtonLED,"processor control button: led","color 67")
+COLOR_ALIAS(ProcessorControlButtonLEDActive,"processor control button: led active","color 16")
+COLOR_ALIAS(ProcessorFaderFill,"processor fader: fill","color 16")
+COLOR_ALIAS(ProcessorFaderFillActive,"processor fader: fill active","color 78")
+COLOR_ALIAS(ProcessorFaderLED,"processor fader: led","color 44")
+COLOR_ALIAS(ProcessorFaderLEDActive,"processor fader: led active","color 37")
+COLOR_ALIAS(ProcessorFaderText,"processor fader: text","color 45")
+COLOR_ALIAS(ProcessorFaderTextActive,"processor fader: text active","color 50")
+COLOR_ALIAS(ProcessorPostFaderFill,"processor postfader: fill","color 58")
+COLOR_ALIAS(ProcessorPostFaderFillActive,"processor postfader: fill active","color 79")
+COLOR_ALIAS(ProcessorPostFaderLED,"processor postfader: led","color 44")
+COLOR_ALIAS(ProcessorPostFaderLEDActive,"processor postfader: led active","color 37")
+COLOR_ALIAS(ProcessorPostFaderText,"processor postfader: text","color 45")
+COLOR_ALIAS(ProcessorPostFaderTextActive,"processor postfader: text active","color 50")
+COLOR_ALIAS(ProcessorPreFaderFill,"processor prefader: fill","color 40")
+COLOR_ALIAS(ProcessorPreFaderFillActive,"processor prefader: fill active","color 80")
+COLOR_ALIAS(ProcessorPreFaderLED,"processor prefader: led","color 44")
+COLOR_ALIAS(ProcessorPreFaderLEDActive,"processor prefader: led active","color 37")
+COLOR_ALIAS(ProcessorPreFaderText,"processor prefader: text","color 45")
+COLOR_ALIAS(ProcessorPreFaderTextActive,"processor prefader: text active","color 50")
+COLOR_ALIAS(PunchButtonFill,"punch button: fill","color 20")
+COLOR_ALIAS(PunchButtonFillActive,"punch button: fill active","color 9")
+COLOR_ALIAS(PunchButtonLED,"punch button: led","color 4")
+COLOR_ALIAS(PunchButtonLEDActive,"punch button: led active","color 4")
 COLOR_ALIAS(PunchClockBackground,"punch clock: background","color 4")
 COLOR_ALIAS(PunchClockCursor,"punch clock: cursor","color 9")
 COLOR_ALIAS(PunchClockEditedText,"punch clock: edited text","color 9")
@@ -311,40 +302,39 @@ COLOR_ALIAS(RangeDragBarRect,"range drag bar rect","color 21")
 COLOR_ALIAS(RangeDragRect,"range drag rect","color 56")
 COLOR_ALIAS(RangeMarkerBar,"range marker bar","color 3")
 COLOR_ALIAS(RecWaveFormFill,"record enable button: fill","color 25")
-COLOR_ALIAS(RecWaveForm,"record enable button: fill active","color 83")
-COLOR_ALIAS(RecEnableButtonFillActive,"record enable button: led","color 84")
-COLOR_ALIAS(RecEnableButtonFill,"record enable button: led active","color 85")
-COLOR_ALIAS(RecEnableButtonTextActive,"recorded waveform fill","color 13")
-COLOR_ALIAS(RecEnableButtonText,"recorded waveform outline","color 43")
+COLOR_ALIAS(RecWaveForm,"record waveform","color 83")
+COLOR_ALIAS(RecEnableButtonLED,"record enable button: led","color 84")
+COLOR_ALIAS(RecEnableButtonLEDActive,"record enable button: led active","color 85")
+COLOR_ALIAS(RecEnableButtonFill,"recorded waveform fill","color 13")
+COLOR_ALIAS(RecEnableButtonOutline,"recorded waveform outline","color 43")
 COLOR_ALIAS(RecordingRect,"recording rect","color 86")
 COLOR_ALIAS(RegionListAutomatic, "region list automatic", "color 53")
 COLOR_ALIAS(RegionListMissingSource, "region list missing source", "color 9")
 COLOR_ALIAS(RegionListWholeFile, "region list whole file", "color 1")
 COLOR_ALIAS(CoveredRegion,"region area covered by another region","color 87")
 COLOR_ALIAS(FrameBase,"region base","color 11")
-COLOR_ALIAS(RouteButtonFillActive,"route button: fill","color 25")
-COLOR_ALIAS(RouteButtonFill,"route button: fill active","color 67")
-COLOR_ALIAS(RouteButtonLEDActive,"route button: led","color 66")
-COLOR_ALIAS(RouteButtonLED,"route button: led active","color 8")
+COLOR_ALIAS(RouteButtonFillActive,"route button: fill active","color 67")
+COLOR_ALIAS(RouteButtonLED,"route button: led","color 66")
+COLOR_ALIAS(RouteButtonLEDActive,"route button: led active","color 8")
 COLOR_ALIAS(RubberBandRect,"rubber band rect","color 88")
-COLOR_ALIAS(RudeAuditionFillActive,"rude audition: fill","color 20")
-COLOR_ALIAS(RudeAuditionFill,"rude audition: fill active","color 86")
-COLOR_ALIAS(RudeAuditionLEDActive,"rude audition: led","color 4")
-COLOR_ALIAS(RudeAuditionLED,"rude audition: led active","color 4")
-COLOR_ALIAS(RudeAuditionTextActive,"rude audition: text","color 21")
-COLOR_ALIAS(RudeAuditionText,"rude audition: text active","color 13")
-COLOR_ALIAS(RudeIsolateFillActive,"rude isolate: fill","color 42")
-COLOR_ALIAS(RudeIsolateFill,"rude isolate: fill active","color 89")
-COLOR_ALIAS(RudeIsolateLEDActive,"rude isolate: led","color 4")
-COLOR_ALIAS(RudeIsolateLED,"rude isolate: led active","color 4")
-COLOR_ALIAS(RudeIsolateTextActive,"rude isolate: text","color 21")
-COLOR_ALIAS(RudeIsolateText,"rude isolate: text active","color 4")
-COLOR_ALIAS(RudeSoloFillActive,"rude solo: fill","color 20")
-COLOR_ALIAS(RudeSoloFill,"rude solo: fill active","color 86")
-COLOR_ALIAS(RudeSoloLEDActive,"rude solo: led","color 4")
-COLOR_ALIAS(RudeSoloLED,"rude solo: led active","color 4")
-COLOR_ALIAS(RudeSoloTextActive,"rude solo: text","color 21")
-COLOR_ALIAS(RudeSoloText,"rude solo: text active","color 22")
+COLOR_ALIAS(RudeAuditionFill,"rude audition: fill","color 20")
+COLOR_ALIAS(RudeAuditionFillActive,"rude audition: fill active","color 86")
+COLOR_ALIAS(RudeAuditionLED,"rude audition: led","color 4")
+COLOR_ALIAS(RudeAuditionLEDActive,"rude audition: led active","color 4")
+COLOR_ALIAS(RudeAuditionText,"rude audition: text","color 21")
+COLOR_ALIAS(RudeAuditionTextActive,"rude audition: text active","color 13")
+COLOR_ALIAS(RudeIsolateFill,"rude isolate: fill","color 42")
+COLOR_ALIAS(RudeIsolateFillActive,"rude isolate: fill active","color 89")
+COLOR_ALIAS(RudeIsolateLED,"rude isolate: led","color 4")
+COLOR_ALIAS(RudeIsolateLEDActive,"rude isolate: led active","color 4")
+COLOR_ALIAS(RudeIsolateText,"rude isolate: text","color 21")
+COLOR_ALIAS(RudeIsolateTextActive,"rude isolate: text active","color 4")
+COLOR_ALIAS(RudeSoloFill,"rude solo: fill","color 20")
+COLOR_ALIAS(RudeSoloFillActive,"rude solo: fill active","color 86")
+COLOR_ALIAS(RudeSoloLED,"rude solo: led","color 4")
+COLOR_ALIAS(RudeSoloLEDActive,"rude solo: led active","color 4")
+COLOR_ALIAS(RudeSoloText,"rude solo: text","color 21")
+COLOR_ALIAS(RudeSoloTextActive,"rude solo: text active","color 22")
 COLOR_ALIAS(RulerBase,"ruler base","color 90")
 COLOR_ALIAS(RulerText,"ruler text","color 22")
 COLOR_ALIAS(SecondaryClockBackground,"secondary clock: background","color 7")
@@ -372,25 +362,22 @@ COLOR_ALIAS(SelectionClockText,"selection clock: edited text","color 9")
 COLOR_ALIAS(Selection,"selection clock: text","color 12")
 COLOR_ALIAS(SelectionRect,"selection rect","color 95")
 COLOR_ALIAS(SendBg,"send bg","color 71")
-COLOR_ALIAS(SendButtonFillActive,"send alert button: fill","color 71")
-COLOR_ALIAS(SendButtonFill,"send alert button: fill active","color 96")
-COLOR_ALIAS(SendButtonLEDActive,"send alert button: led","color 4")
-COLOR_ALIAS(SendButtonLED,"send alert button: led active","color 4")
+COLOR_ALIAS(SendButtonFill,"send alert button: fill","color 71")
+COLOR_ALIAS(SendButtonFillActive,"send alert button: fill active","color 96")
+COLOR_ALIAS(SendButtonLED,"send alert button: led","color 4")
+COLOR_ALIAS(SendButtonLEDActive,"send alert button: led active","color 4")
 COLOR_ALIAS(Shuttle,"shuttle","color 12")
 COLOR_ALIAS(Silence,"silence","color 98")
 COLOR_ALIAS(SilenceText,"silence text","color 99")
-COLOR_ALIAS(SoloButtonFillActive,"solo button: fill","color 25")
 COLOR_ALIAS(SoloButtonFill,"solo button: fill active","color 12")
-COLOR_ALIAS(SoloButtonLEDActive,"solo button: led","color 4")
-COLOR_ALIAS(SoloButtonLED,"solo button: led active","color 4")
-COLOR_ALIAS(SoloIsolateButtonFillActive,"solo isolate: fill","color 25")
-COLOR_ALIAS(SoloIsolateButtonFill,"solo isolate: fill active","color 42")
-COLOR_ALIAS(SoloIsolateButtonLEDActive,"solo isolate: led","color 69")
-COLOR_ALIAS(SoloIsolateButtonLED,"solo isolate: led active","color 9")
-COLOR_ALIAS(SoloSafeButtonFillActive,"solo safe: fill","color 25")
+COLOR_ALIAS(SoloButtonLED,"solo button: led","color 4")
+COLOR_ALIAS(SoloButtonLEDActive,"solo button: led active","color 4")
+COLOR_ALIAS(SoloIsolateButtonFillActive,"solo isolate: fill active","color 42")
+COLOR_ALIAS(SoloIsolateButtonLED,"solo isolate: led","color 69")
+COLOR_ALIAS(SoloIsolateButtonLEDActive,"solo isolate: led active","color 9")
 COLOR_ALIAS(SoloSafeButtonFill,"solo safe: fill active","color 42")
-COLOR_ALIAS(SoloSafeButtonLEDActive,"solo safe: led","color 69")
-COLOR_ALIAS(SoloSafeButtonLED,"solo safe: led active","color 9")
+COLOR_ALIAS(SoloSafeButtonLED,"solo safe: led","color 69")
+COLOR_ALIAS(SoloSafeButtonLEDActive,"solo safe: led active","color 9")
 COLOR_ALIAS(StereoPannerBackground,"stereo panner bg","color 61")
 COLOR_ALIAS(StereoPannerFill,"stereo panner fill","color 74")
 COLOR_ALIAS(StereoPannerInvertedBackground,"stereo panner inverted bg","color 61")
@@ -409,20 +396,18 @@ COLOR_ALIAS(TempoMarker,"tempo marker","color 19")
 COLOR_ALIAS(TimeAxisFrame,"time axis frame","color 4")
 COLOR_ALIAS(TimeStretchFill,"time stretch fill","color 26")
 COLOR_ALIAS(TimeStretchOutline,"time stretch outline","color 94")
-COLOR_ALIAS(TrackNumberLabelFillActive,"tracknumber label: fill","color 34")
-COLOR_ALIAS(TrackNumberLabelFill,"tracknumber label: fill active","color 46")
-COLOR_ALIAS(TrackNumberLabelLEDActive,"tracknumber label: led","color 9")
-COLOR_ALIAS(TrackNumberLabelLED,"tracknumber label: led active","color 9")
-COLOR_ALIAS(TrackNumberLabelTextActive,"tracknumber label: text","color 26")
-COLOR_ALIAS(TrackNumberLabelText,"tracknumber label: text active","color 9")
-COLOR_ALIAS(TransportActiveOptionButtonFillActive,"transport active option button: fill","color 25")
-COLOR_ALIAS(TransportActiveOptionButtonFill,"transport active option button: fill active","color 48")
-COLOR_ALIAS(TransportActiveOptionButtonLEDActive,"transport active option button: led","color 66")
-COLOR_ALIAS(TransportActiveOptionButtonLED,"transport active option button: led active","color 8")
-COLOR_ALIAS(TransportButtonFillActive,"transport button: fill","color 25")
-COLOR_ALIAS(TransportButtonFill,"transport button: fill active","color 48")
-COLOR_ALIAS(TransportButtonLEDActive,"transport button: led","color 4")
-COLOR_ALIAS(TransportButtonLED,"transport button: led active","color 4")
+COLOR_ALIAS(TrackNumberLabelFill,"tracknumber label: fill","color 34")
+COLOR_ALIAS(TrackNumberLabelFillActive,"tracknumber label: fill active","color 46")
+COLOR_ALIAS(TrackNumberLabelLED,"tracknumber label: led","color 9")
+COLOR_ALIAS(TrackNumberLabelLEDActive,"tracknumber label: led active","color 9")
+COLOR_ALIAS(TrackNumberLabelText,"tracknumber label: text","color 26")
+COLOR_ALIAS(TrackNumberLabelTextActive,"tracknumber label: text active","color 9")
+COLOR_ALIAS(TransportActiveOptionButtonFillActive,"transport active option button: fill active","color 48")
+COLOR_ALIAS(TransportActiveOptionButtonLED,"transport active option button: led","color 66")
+COLOR_ALIAS(TransportActiveOptionButtonLEDActive,"transport active option button: led active","color 8")
+COLOR_ALIAS(TransportButtonFillActive,"transport button: fill active","color 48")
+COLOR_ALIAS(TransportButtonLED,"transport button: led","color 4")
+COLOR_ALIAS(TransportButtonLEDActive,"transport button: led active","color 4")
 COLOR_ALIAS(TransportClockBackground,"transport clock: background","color 7")
 COLOR_ALIAS(TransportClockCursor,"transport clock: cursor","color 8")
 COLOR_ALIAS(TransportClockEditedText,"transport clock: edited text","color 8")
@@ -434,15 +419,14 @@ COLOR_ALIAS(TransportDeltaClockText,"transport delta clock: text","color 92")
 COLOR_ALIAS(TransportDragRect,"transport drag rect","color 21")
 COLOR_ALIAS(TransportLoopRect,"transport loop rect","color 103")
 COLOR_ALIAS(TransportMarkerBar,"transport marker bar","color 11")
-COLOR_ALIAS(TransportOptionButtonFillActive,"transport option button: fill","color 25")
-COLOR_ALIAS(TransportOptionButtonFill,"transport option button: fill active","color 42")
-COLOR_ALIAS(TransportOptionButtonLEDActive,"transport option button: led","color 66")
-COLOR_ALIAS(TransportOptionButtonLED,"transport option button: led active","color 8")
+COLOR_ALIAS(TransportOptionButtonFillActive,"transport option button: fill active","color 42")
+COLOR_ALIAS(TransportOptionButtonLED,"transport option button: led","color 66")
+COLOR_ALIAS(TransportOptionButtonLEDActive,"transport option button: led active","color 8")
 COLOR_ALIAS(TransportPunchRect,"transport punch rect","color 80")
-COLOR_ALIAS(TransportRecenableButtonFillActive,"transport recenable button: fill","color 20")
-COLOR_ALIAS(TransportRecenableButtonFill,"transport recenable button: fill active","color 83")
-COLOR_ALIAS(TransportRecenableButtonLEDActive,"transport recenable button: led","color 4")
-COLOR_ALIAS(TransportRecenableButtonLED,"transport recenable button: led active","color 4")
+COLOR_ALIAS(TransportRecenableButtonFill,"transport recenable button: fill","color 20")
+COLOR_ALIAS(TransportRecenableButtonFillActive,"transport recenable button: fill active","color 83")
+COLOR_ALIAS(TransportRecenableButtonLED,"transport recenable button: led","color 4")
+COLOR_ALIAS(TransportRecenableButtonLEDActive,"transport recenable button: led active","color 4")
 COLOR_ALIAS(TrimHandle,"trim handle","color 18")
 COLOR_ALIAS(TrimHandleLocked,"trim handle locked","color 86")
 COLOR_ALIAS(VerboseCanvasCursor,"verbose canvas cursor","color 32")
@@ -451,7 +435,6 @@ COLOR_ALIAS(VideoBar,"video timeline bar","color 46")
 COLOR_ALIAS(WaveFormFill,"waveform fill","color 13")
 COLOR_ALIAS(WaveForm,"waveform outline","color 4")
 COLOR_ALIAS(ZeroLine,"zero line","color 104")
-COLOR_ALIAS(ZoomButtonFillActive,"zoom button: fill","color 25")
-COLOR_ALIAS(ZoomButtonFill,"zoom button: fill active","color 48")
-COLOR_ALIAS(ZoomButtonLEDActive,"zoom button: led","color 66")
-COLOR_ALIAS(ZoomButtonLED,"zoom button: led active","color 8")
+COLOR_ALIAS(ZoomButtonFillActive,"zoom button: fill active","color 48")
+COLOR_ALIAS(ZoomButtonLED,"zoom button: led","color 66")
+COLOR_ALIAS(ZoomButtonLEDActive,"zoom button: led active","color 8")