diff --git a/effects.c b/effects.c
index ee63216..3eb2321 100644
--- a/effects.c
+++ b/effects.c
@@ -579,34 +579,34 @@ static EffectSettings noisegate_swell_settings[] = {
 };
 
 static EffectSettings chorusfx_ce_settings[] = {
-    {"Speed", CE_CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
-    {"Depth", CE_CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
+    {"Speed", CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
+    {"Depth", CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
 };
 
 static EffectSettings chorusfx_tc_settings[] = {
-    {"Speed", CE_CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
+    {"Speed", CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
     {"Width", CHORUS_WIDTH, CHORUSFX_POSITION, &values_0_to_99},
     {"Intensity", CHORUS_INTENSITY, CHORUSFX_POSITION, &values_0_to_99},
 };
 
 static EffectSettings chorusfx_dual_settings[] = {
-    {"Speed", DUAL_CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
-    {"Depth", DUAL_CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
-    {"Level", DUAL_CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
-    {"Wave", DUAL_CHORUS_WAVE, CHORUSFX_POSITION, &values_waveform},
+    {"Speed", CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
+    {"Depth", CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
+    {"Level", CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
+    {"Wave", CHORUS_WAVE, CHORUSFX_POSITION, &values_waveform},
 };
 
 static EffectSettings chorusfx_glisten_settings[] = {
-    {"Speed", CE_CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
-    {"Depth", DUAL_CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
-    {"Level", DUAL_CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
+    {"Speed", CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
+    {"Depth", CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
+    {"Level", CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
 };
 
 static EffectSettings chorusfx_multi_settings[] = {
-    {"Speed", MULTI_CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
-    {"Depth", MULTI_CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
-    {"Level", MULTI_CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
-    {"Wave", MULTI_CHORUS_WAVE, CHORUSFX_POSITION, &values_waveform},
+    {"Speed", CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
+    {"Depth", CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
+    {"Level", CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
+    {"Wave", CHORUS_WAVE, CHORUSFX_POSITION, &values_waveform},
 };
 
 static EffectSettings chorusfx_flanger_settings[] = {
@@ -625,9 +625,9 @@ static EffectSettings chorusfx_trig_flanger_settings[] = {
 };
 
 static EffectSettings chorusfx_mxr_flanger_settings[] = {
-    {"Speed", MXR_FLANGER_SPEED, CHORUSFX_POSITION, &values_0_to_99},
+    {"Speed", FLANGER_SPEED, CHORUSFX_POSITION, &values_0_to_99},
     {"Width", MXR_FLANGER_WIDTH, CHORUSFX_POSITION, &values_0_to_99},
-    {"Regen", MXR_FLANGER_REGEN, CHORUSFX_POSITION, &values_0_to_99},
+    {"Regen", FLANGER_REGEN, CHORUSFX_POSITION, &values_0_to_99},
     {"Manual", MXR_FLANGER_MANUAL, CHORUSFX_POSITION, &values_0_to_99},
 };
 
@@ -638,7 +638,7 @@ static EffectSettings chorusfx_eh_flanger_settings[] = {
 };
 
 static EffectSettings chorusfx_ad_flanger_settings[] = {
-    {"Speed", MXR_FLANGER_SPEED, CHORUSFX_POSITION, &values_0_to_99},
+    {"Speed", FLANGER_SPEED, CHORUSFX_POSITION, &values_0_to_99},
     {"Enhance", AD_FLANGER_ENHANCE, CHORUSFX_POSITION, &values_0_to_99},
     {"Range", EH_FLANGER_RANGE, CHORUSFX_POSITION, &values_0_to_99},
     {"Harmonics", AD_FLANGER_HARMONICS, CHORUSFX_POSITION, &values_odd_even},
@@ -1480,10 +1480,10 @@ static Modifier modifiers[] = {
     {"Phaser Regen", PHASER_REGEN, CHORUSFX_POSITION, &values_0_to_99},
     {"Phaser Waveform", PHASER_WAVE, CHORUSFX_POSITION, &values_waveform},
     {"Phaser Level", PHASER_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
-    {"Chorus Speed", CE_CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
-    {"Chorus Depth", CE_CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
-    {"Chorus Level", DUAL_CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
-    {"Chorus Waveform", DUAL_CHORUS_WAVE, CHORUSFX_POSITION, &values_waveform},
+    {"Chorus Speed", CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99},
+    {"Chorus Depth", CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
+    {"Chorus Level", CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99},
+    {"Chorus Waveform", CHORUS_WAVE, CHORUSFX_POSITION, &values_waveform},
     {"Flanger Speed", FLANGER_SPEED, CHORUSFX_POSITION, &values_0_to_99},
     {"Flanger Depth", FLANGER_DEPTH, CHORUSFX_POSITION, &values_0_to_99},
     {"Flanger Regen", FLANGER_REGEN, CHORUSFX_POSITION, &values_0_to_99},
diff --git a/gdigi.h b/gdigi.h
index ce3c0cd..57d3baf 100644
--- a/gdigi.h
+++ b/gdigi.h
@@ -244,33 +244,34 @@ enum {
 #define AMP_CAB_TYPE 2560
 #define AMP_CAB_POSITION 9
 
-/* valid AMP_CAB_TYPE values */
-#define AMP_CAB_DIRECT 570
-#define AMP_CAB_CHAMP 571
-#define AMP_CAB_DELUXE 572
-#define AMP_CAB_DELUXE_REVERB 573
-#define AMP_CAB_BRITISH1_12 623
-#define AMP_CAB_GA1_12 624
-#define AMP_CAB_BLONDE2_12 577
-#define AMP_CAB_TWIN 576
-#define AMP_CAB_BRITISH2_12 613
-#define AMP_CAB_JAZZ2_12 626
-#define AMP_CAB_BASSMAN 579
-#define AMP_CAB_BRITISH4_12 614
-#define AMP_CAB_BRITISH_GREEN 616
-#define AMP_CAB_FANE4_12 584
-#define AMP_CAB_BOUTIQUE4_12 583
-#define AMP_CAB_VINTAGE 622
-#define AMP_CAB_RECTO4_12 625
-#define AMP_CAB_DIGI_SOLO 609
-#define AMP_CAB_DIGI_BRIGHT 611
-#define AMP_CAB_DIGI_METAL 618
-#define AMP_CAB_DIGI_ROCK 619
-#define AMP_CAB_DIGI_ALT 620
-#define AMP_CAB_DIGI_VNTG 621
-#define AMP_CAB_DIGI_CHUNK 612
-#define AMP_CAB_DIGI_SPANK2_12 608
-#define AMP_CAB_DIGI_SPKR_COMP 585
+enum {
+  AMP_CAB_DIRECT = 570,
+  AMP_CAB_CHAMP = 571,
+  AMP_CAB_DELUXE = 572,
+  AMP_CAB_DELUXE_REVERB = 573,
+  AMP_CAB_BRITISH1_12 = 623,
+  AMP_CAB_GA1_12 = 624,
+  AMP_CAB_BLONDE2_12 = 577,
+  AMP_CAB_TWIN = 576,
+  AMP_CAB_BRITISH2_12 = 613,
+  AMP_CAB_JAZZ2_12 = 626,
+  AMP_CAB_BASSMAN = 579,
+  AMP_CAB_BRITISH4_12 = 614,
+  AMP_CAB_BRITISH_GREEN = 616,
+  AMP_CAB_FANE4_12 = 584,
+  AMP_CAB_BOUTIQUE4_12 = 583,
+  AMP_CAB_VINTAGE = 622,
+  AMP_CAB_RECTO4_12 = 625,
+  AMP_CAB_DIGI_SOLO = 609,
+  AMP_CAB_DIGI_BRIGHT = 611,
+  AMP_CAB_DIGI_METAL = 618,
+  AMP_CAB_DIGI_ROCK = 619,
+  AMP_CAB_DIGI_ALT = 620,
+  AMP_CAB_DIGI_VNTG = 621,
+  AMP_CAB_DIGI_CHUNK = 612,
+  AMP_CAB_DIGI_SPANK2_12 = 608,
+  AMP_CAB_DIGI_SPKR_COMP = 585
+};
 
 #define EQ_TYPE 3202
 #define EQ_ON_OFF 3212
@@ -351,21 +352,14 @@ enum {
 #define CHORUSFX_ON_OFF 769
 #define CHORUSFX_POSITION 14
 
-#define CE_CHORUS_SPEED 837
-#define CE_CHORUS_DEPTH 838
+#define CHORUS_SPEED 837
+#define CHORUS_DEPTH 838
 
 #define CHORUS_WIDTH 848
 #define CHORUS_INTENSITY 849
 
-#define DUAL_CHORUS_SPEED 837
-#define DUAL_CHORUS_DEPTH 838
-#define DUAL_CHORUS_LEVEL 836
-#define DUAL_CHORUS_WAVE 840
-
-#define MULTI_CHORUS_SPEED 837
-#define MULTI_CHORUS_DEPTH 838
-#define MULTI_CHORUS_WAVE  840
-#define MULTI_CHORUS_LEVEL 836
+#define CHORUS_LEVEL 836
+#define CHORUS_WAVE 840
 
 #define FLANGER_SPEED 902
 #define FLANGER_DEPTH 903
@@ -378,9 +372,7 @@ enum {
 #define TRIG_FLANGER_LFO_START 1028
 #define TRIG_FLANGER_LEVEL 1032
 
-#define MXR_FLANGER_SPEED 902
 #define MXR_FLANGER_WIDTH 914
-#define MXR_FLANGER_REGEN 904
 #define MXR_FLANGER_MANUAL 917
 
 #define EH_FLANGER_RATE 918