diff --git a/resources/data/configuration.xml b/resources/data/configuration.xml
index 2f29f9a76f4..1e3c4fa46e8 100644
--- a/resources/data/configuration.xml
+++ b/resources/data/configuration.xml
@@ -10,7 +10,7 @@
     <type i="1" name="Sine" />
     <type i="6" name="FM2" />
     <type i="5" name="FM3" />
-    <type i="3" name="SH Noise" />
+    <type i="3" name="S&amp;H Noise" />
     <type i="4" name="Audio Input">
         <snapshot name="Left" p0="-1.0" p1="0.0" p2="0.0" p3="0.0" p4="0.0" />
         <snapshot name="Right" p0="1.0" p1="0.0" p2="0.0" p3="0.0" p4="0.0" />
@@ -19,12 +19,79 @@
 </osc>
 <fx>
     <type i="0" name="Off" />
-
     <separator/>
-    <!-- Do I crash us? -->
-
+    <type i="6" name="EQ">
+        <snapshot p0="0.000000" p1="-27.251785" p2="2.000000" p3="0.000000" p4="6.000000" p5="2.000000" p6="0.000000" p7="54.964317" p8="2.223215" name="Init" />
+        <snapshot p0="10.285721" p1="-27.251785" p2="2.000000" p3="0.000000" p4="6.000000" p5="2.000000" p6="11.057152" p7="54.964317" p8="2.223215" name="Smiley Curve" />
+        <snapshot p0="0.000000" p1="-27.251785" p2="2.000000" p3="-10.285713" p4="14.855362" p5="0.924107" p6="0.000000" p7="54.964317" p8="2.223215" name="Mid Cut" />
+        <snapshot p0="0.000000" p1="-27.251785" p2="2.000000" p3="0.000000" p4="6.000000" p5="2.000000" p6="7.971434" p7="61.039318" p8="2.785716" name="Air" />
+    </type>
+    <type i="5" name="Distortion">
+        <snapshot p0="0.000000" p1="3.817860" p2="1.944644" p3="38.421448" p4="0.000000" p5="0.000000" p6="0.000000" p7="3.000000" p8="2.031250" p9="30.535736" name="Init" />
+        <snapshot p0="-6.171432" p1="-6.564289" p2="1.234822" p3="59.491096" p4="-4.500006" p5="0.000000" p6="7.971436" p7="20.100006" p8="2.031250" p9="50.994675" name="Subtle" />
+        <snapshot p0="0.000000" p1="3.817860" p2="1.944644" p3="66.000000" p4="0.000000" p5="0.000000" p6="0.000000" p7="3.000000" p8="2.031250" p9="66.000000" name="Full Range" />
+        <snapshot p0="14.657152" p1="16.305359" p2="1.944644" p3="38.421448" p4="4.457139" p5="0.767859" p6="13.628580" p7="36.750023" p8="2.263393" p9="32.223236" p10="-8.314284" name="Round" />
+        <snapshot p0="-7.457146" p1="-17.444653" p2="1.944644" p3="43.483955" p4="3.728577" p5="0.903571" p6="3.085716" p7="36.412521" p8="2.031250" p9="43.023239" p10="0.000000" name="Low End" />
+        <snapshot p0="-5.142868" p1="20.435730" p2="2.654465" p3="61.178596" p4="18.900009" p5="-0.614286" p6="7.714291" p7="35.625015" p8="3.691965" p9="55.382172" p10="-11.314293" name="Kind" />
+        <type i="5" name="Arty">
+            <snapshot p0="-14.400009" p1="43.723221" p2="1.944644" p3="70.000000" p4="0.000000" p5="0.000000" p6="0.000000" p7="3.000000" p8="2.031250" p9="33.333015" p10="0.000000" name="Warm 1" />
+            <snapshot p0="-14.400009" p1="43.723221" p2="1.944644" p3="70.000000" p4="0.000000" p5="0.000000" p6="-20.057150" p7="37.125023" p8="2.031250" p9="33.333015" p10="0.000000" name="Warm 2" />
+            <snapshot p0="0.000000" p1="3.873554" p2="1.944644" p3="33.234497" p4="0.000000" p5="0.000000" p6="0.000000" p7="2.240891" p8="2.031250" p9="61.103157" p10="0.000000" name="Warm 3" />
+            <snapshot p0="5.039993" p1="21.238914" p2="1.944644" p3="26.235390" p4="0.000000" p5="0.000000" p6="3.985725" p7="2.237354" p8="2.031250" p9="42.229935" p10="0.000000" name="Warm 4" />
+            <snapshot p0="5.039993" p1="21.238914" p2="1.944644" p3="14.228958" p4="0.000000" p5="0.000000" p6="3.985725" p7="2.237354" p8="2.031250" p9="26.222519" p10="0.000000" name="Warm 5" />
+            <snapshot p0="6.004265" p1="47.901802" p2="2.999101" p3="70.000000" p4="0.000000" p5="0.000000" p6="6.004417" p7="54.079567" p8="2.998620" p9="70.000000" p10="0.000000" name="Bright 1" />
+            <snapshot p0="9.995064" p1="52.254967" p2="2.003750" p3="70.000000" p4="0.000000" p5="0.000000" p6="10.000389" p7="61.096107" p8="1.999999" p9="70.000000" p10="9.995163" name="Bright 2" />
+            <snapshot p0="19.997894" p1="-13.645096" p2="5.000000" p3="45.234993" p4="-0.428587" p5="0.000000" p6="14.001465" p7="2.237419" p8="5.000000" p9="30.083092" p10="-8.004837" name="Deep 1" />
+            <snapshot p0="19.997894" p1="-13.645088" p2="5.000000" p3="45.234993" p4="-24.000000" p5="0.000000" p6="14.001465" p7="-9.079617" p8="5.000000" p9="30.083092" p10="-8.004837" name="Deep 2" />
+        </type>
+    </type>
+    <type i="8" name="Conditioner">
+        <snapshot p0="0.000000" p1="0.000000" p2="1.000000" p3="0.000000" p4="-17.014269" p5="0.000000" p6="0.000000" p7="0.000000" name="Init" />
+        <snapshot p0="0.000000" p1="0.000000" p2="1.000000" p3="0.000000" p4="-12.728600" p5="0.316072" p6="0.760714" p7="-7.328576" name="Peak Suppressor" />
+        <snapshot p0="0.000000" p1="0.000000" p2="1.000000" p3="0.000000" p4="-17.742889" p5="-0.085714" p6="0.000000" p7="-9.257149" name="Limiter" />
+    </type>
+    <type i="7" name="Frequency Shifter">
+        <snapshot p0="0.000000" p1="1.000000" p2="-8.000000" p3="0.000000" p4="1.000000" name="Init" />
+        <snapshot p0="9.892857" p1="1.000000" p2="-3.000000" p2_temposync="1" p3="0.843750" p4="0.322321" name="I Am Building Robot Monkeys" />
+        <snapshot p0="-3.767862" p1="1.000000" p2="-1.415038" p2_temposync="1" p3="0.841071" p4="0.367857" name="Falling Down" />
+        <snapshot p0="-0.071431" p1="0.925000" p2="-8.000000" p2_temposync="1" p3="0.000000" p4="0.291964" name="Chorusy" />
+        <snapshot p0="1.428571" p0_extend_range="1" p1="1.000000" p2="-3.000000" p2_temposync="1" p3="0.811607" p4="0.200893" name="The Future Will Be Like This" />
+    </type>
+    <type i="13" name="Ring Modulator">
+        <snapshot name="Init" />
+    </type>
+    <type i="10" name="Vocoder">
+        <snapshot name="Init" />
+    </type>
+    <separator/>
+    <type i="9" name="Chorus">
+        <snapshot p0="-7.885717" p1="-2.850000" p2="0.669643" p3="0.000000" p4="-23.625008" p5="65.662498" p6="0.500000" name="Init (Dry)" />
+        <snapshot p0="-7.885717" p1="-2.850000" p2="0.669643" p3="0.000000" p4="-23.625008" p5="65.662498" p6="1.000000" name="Init (Send)" />
+        <snapshot p0="-7.885717" p1="-0.693749" p2="0.530357" p3="0.000000" p4="-23.625008" p5="65.662498" p6="0.386607" name="Faster" />
+        <snapshot p0="-6.385716" p1="-0.431251" p2="0.503571" p3="0.000000" p4="-11.137505" p5="56.212494" p6="0.431250" name="Deep" />
+    </type>
+    <type i="12" name="Flanger">
+        <snapshot name="Init" />
+        <snapshot p0="-0.374252" p1="1" p2="1" p3="0" p4="4" p5="55.5082" p6="0.227762" p7="6" p8="0.269717" p9="0.1" p10="16.5444" p11="0.8" name="Wider" />
+        <snapshot p0="-1.98636" p1="1" p2="5" p3="1" p4="2.97601" p5="48.2473" p6="0.227762" p7="6" p8="0.910401" p9="0.128548" p10="9.26143" p11="0.8" name="Ray Gun Invasion" />
+        <snapshot p0="1.95172" p1="1" p2="5" p3="1" p4="3.83918" p5="25.549" p6="0.227762" p7="8" p8="0.291084" p9="0.128548" p10="9.26143" p11="0.8" name="Bouncing Tones" />
+        <snapshot p0="-2.71594" p1="1" p2="3" p3="3" p4="3.30176" p5="37.9414" p6="0.227762" p7="9" p8="0.291084" p9="0.128548" p10="13.691" p11="0.680852" name="Lots of Voices" />
+        <snapshot p0="2.34525" p1="0.869379" p2="1" p3="3" p4="3.59845" p5="42.0066" p6="0.486939" p7="9" p8="0.746892" p9="0.264491" p10="17.1806" p11="-0.732991" name="Robot Sheen" />
+    </type>
+    <type i="3" name="Phaser">
+        <snapshot p0="0.000000" p1="0.000000" p2="0.000000" p3="-2.00000" p4="0.500000" p5="0.500000" p6="0.500000" name="Init (Dry)" />
+        <snapshot p0="0.000000" p1="0.000000" p2="0.000000" p3="-2.00000" p4="0.500000" p5="0.500000" p6="1.000000" name="Init (Send)" />
+        <snapshot p0="0.000000" p1="-0.625000" p2="0.283929" p3="-1.352413" p4="0.817857" p5="0.747321" p6="0.493750" name="Stereo Phaser" />
+        <snapshot p0="0.057143" p1="0.858929" p2="-0.401786" p3="-1.998566" p4="0.718750" p5="0.586607" p6="0.694643" name="Talky" />
+    </type>
+    <type i="4" name="Rotary Speaker">
+        <snapshot p0="-7.00000" p1="0.000000" p2="0.000000" name="Init" />
+        <snapshot p0="1.293751" p1="0.251786" p2="0.495536" name="Slow" />
+        <snapshot p0="2.981253" p1="0.251786" p2="0.495536" name="Fast" />
+    </type>
+    <separator/>
     <type i="1" name="Delay">
-        <snapshot p0="-1.000000" p0_temposync="1" p1="-1.000000" p1_temposync="1" p2="0.000000" p3="0.000000" p4="-14.105346" p5="48.289276" p6="-1.179463" p7="0.000000" p8="0.000000" p9="0.000000" p10="0.250000" name="Init" />
+        <snapshot p0="-1.000000" p0_temposync="1" p1="-1.000000" p1_temposync="1" p2="0.000000" p3="0.000000" p4="-14.105346" p5="48.289276" p6="-1.179463" p7="0.000000" p8="0.000000" p9="0.000000" p10="0.250000" name="Init (Dry)" />
         <snapshot p0="-1.000000" p0_temposync="1" p1="-1.000000" p1_temposync="1" p2="0.000000" p3="0.000000" p4="-14.105346" p5="48.289276" p6="-1.179463" p7="0.000000" p8="0.000000" p9="0.000000" p10="1.000000" name="Init (Send)" />
         <snapshot p0="-1.000000" p0_temposync="1" p1="-1.000000" p1_temposync="1" p2="0.709821" p3="0.000000" p4="-14.105346" p5="48.289276" p6="-1.179463" p7="0.337500" p8="0.000000" p9="0.000000" p10="1.000000" name="Wide 1/4" />
         <snapshot p0="-2.000000" p0_temposync="1" p1="-2.000000" p1_temposync="1" p2="0.709821" p3="0.000000" p4="-14.105346" p5="48.289276" p6="-1.179463" p7="0.337500" p8="0.000000" p9="0.000000" p10="1.000000" name="Wide 1/8" />
@@ -37,7 +104,6 @@
         <snapshot p0="0.000000" p0_temposync="1" p1="0.000000" p1_temposync="1" p2="0.000000" p3="0.000000" p4="-52.242855" p5="66.000000" p6="-1.179463" p7="0.000000" p8="0.000000" p10="1.000000" name="Repeat" />
         <snapshot p0="-8.000000" p1="-8.000000" p2="0.000000" p3="0.000000" p4="-15.792830" p5="39.851772" p6="0.583039" p7="0.332143" p8="0.000000" p9="0.000000" p10="0.563393" name="Chorus" />
         <snapshot p0="-8.000000" p1="-8.000000" p2="0.000000" p3="0.000000" p4="-15.792830" p5="39.851772" p6="1.764290" p7="0.476786" p8="0.000000" p10="0.305357" p11="12.985722" name="Wide Chorus" />
-
         <type i="1" name="Arty">
             <snapshot p0="-5.000000" p0_temposync="1" p1="-5.000000" p1_temposync="1" p2="0.680688" p3="0.000000" p4="-60.000000" p5="70.000000" p6="-7.000000" p7="0.000000" p8="0.000000" p10="1.000000" p11="0.000000" name="Delay 1/64" />
             <snapshot p0="-4.000000" p0_temposync="1" p1="-4.000000" p1_temposync="1" p2="0.680688" p3="0.000000" p4="-60.000000" p5="70.000000" p6="-7.000000" p7="0.000000" p8="0.000000" p10="1.000000" p11="0.000000" name="Delay 1/32" />
@@ -53,7 +119,7 @@
         </type>
     </type>
     <type i="2" name="Reverb 1">
-        <snapshot p0="-4.000000" p1="2" p2="0.500000" p3="1.000000" p4="0.500000" p5="3.000000" p6="3.000000" p7="0.000000" p8="3.0000000" p9="0.500000" name="Init" />
+        <snapshot p0="-4.000000" p1="2" p2="0.500000" p3="1.000000" p4="0.500000" p5="3.000000" p6="3.000000" p7="0.000000" p8="3.0000000" p9="0.500000" name="Init (Dry)" />
         <snapshot p0="-4.000000" p1="2" p2="0.500000" p3="1.000000" p4="0.500000" p5="3.000000" p6="3.000000" p7="0.000000" p8="3.0000000" p9="1.000000" name="Init (Send)" />
         <snapshot p0="-5.432145" p1="2" p2="0.232141" p3="0.004462" p4="0.278571" p5="-1.275021" p6="0.000000" p7="0.000000" p8="36.991055" p9="1.000000" name="Room" />
         <snapshot p0="-5.432145" p1="2" p2="0.368748" p3="1.558035" p4="0.278571" p5="-29.367893" p6="2.999999" p7="0.000000" p8="37.296410" p9="1.000000" name="Hall 1" />
@@ -62,7 +128,6 @@
         <snapshot p0="-6.337502" p1="0" p2="0.465177" p3="0.620535" p4="0.249107" p5="-11.662504" p6="0.000000" p7="0.000000" p8="46.762489" p9="1.000000" name="Hall 4" />
         <snapshot p0="-5.188394" p1="3" p2="0.540177" p3="2.924107" p4="0.479464" p5="-11.400028" p6="14.850006" p7="-4.371426" p8="39.337486" p9="1.000000" name="Long 1" />
         <snapshot p0="-5.188394" p1="3" p2="0.540177" p3="2.924107" p4="0.479464" p5="-11.400028" p6="14.850006" p7="-4.371426" p8="39.337486" p9="1.000000" name="Long 2" />
-
         <type i="2" name="Arty">
             <snapshot p0="-5.432145" p1="2" p2="0.400302" p3="-0.735899" p4="0.278571" p5="-1.275021" p6="0.000000" p7="0.000000" p8="36.991055" p9="1.000000" p10="0.000000" name="Standard Reverb" />
             <snapshot p0="-8.000000" p1="1" p2="0.420187" p3="1.201775" p4="0.399732" p5="33.235435" p6="-1.592857" p7="24.004318" p8="26.215553" p9="0.250241" p10="0.000000" name="HDIR Opera House Reverb" />
@@ -70,97 +135,14 @@
             <snapshot p0="-8.000000" p1="1" p2="0.449729" p3="0.765167" p4="0.249645" p5="21.241875" p6="52.345413" p7="10.002838" p8="26.403572" p9="0.350447" p10="0.000000" name="Warm Hall Reverb" />
         </type>
     </type>
-
     <type i="11" name="Reverb 2">
-        <snapshot p0="-3.000000" p1="0.000000" p2="1.000000" p3="0.500000" p4="0.500000" p5="0.500000" p6="0.500000" p7="0.500000" p8="0.500000" p9="0.500000" name="Init" />
+        <snapshot p0="-3.000000" p1="0.000000" p2="1.000000" p3="0.500000" p4="0.500000" p5="0.500000" p6="0.500000" p7="0.500000" p8="0.500000" p9="0.500000" name="Init (Dry)" />
         <snapshot p0="-3.000000" p1="0.000000" p2="1.000000" p3="0.500000" p4="0.500000" p5="0.500000" p6="0.500000" p7="0.500000" p8="0.500000" p9="1.000000" name="Init (Send)" />
-        <snapshot  p0="-3.31105" p1="0.534785" p2="4.10847" p3="0.545083" p4="0.225994" p5="0.431124" p6="0.171199" p7="1" p8="0.693247" p9="0.712106" p10="1050882867" p11="1085875348" name="Ghostly Chamber"/>
-        <snapshot  p0="-4" p1="0.534785" p2="4.90419" p3="0.545083" p4="0.700273" p5="0.0826876" p6="0.0833598" p7="1" p8="0.714845" p9="0.820355" p10="1050882867" p11="1085875348" name="Anybody Canyon"/>
-        <snapshot  p0="-1.99947" p1="-0.470558" p2="-1.60312" p3="0.140042" p4="0.234753" p5="0.0826876" p6="0.0833598" p7="1" p8="0.56681" p9="0.820355" p10="1050882867" p11="1085875348" name="Blurred Echo"/>
-    </type>
-
-    <separator/>
-
-    <type i="9" name="Chorus">
-        <snapshot p0="-7.885717" p1="-2.850000" p2="0.669643" p3="0.000000" p4="-23.625008" p5="65.662498" p6="0.500000" name="Init" />
-        <snapshot p0="-7.885717" p1="-2.850000" p2="0.669643" p3="0.000000" p4="-23.625008" p5="65.662498" p6="1.000000" name="Init (Send)" />
-        <snapshot p0="-7.885717" p1="-0.693749" p2="0.530357" p3="0.000000" p4="-23.625008" p5="65.662498" p6="0.386607" name="Faster" />
-        <snapshot p0="-6.385716" p1="-0.431251" p2="0.503571" p3="0.000000" p4="-11.137505" p5="56.212494" p6="0.431250" name="Deep" />
-    </type>
-
-    <type i="12" name="Flanger (WIP)">
-      <snapshot name="Init" />
-      <snapshot  p0="-0.374252" p1="1" p2="1" p3="0" p4="4" p5="55.5082" p6="0.227762" p7="6" p8="0.269717" p9="0.1" p10="16.5444" p11="0.8" name="Wider"/>
-      <snapshot  p0="-1.98636" p1="1" p2="5" p3="1" p4="2.97601" p5="48.2473" p6="0.227762" p7="6" p8="0.910401" p9="0.128548" p10="9.26143" p11="0.8" name="Ray Gun Invasion"/>
-      <snapshot  p0="1.95172" p1="1" p2="5" p3="1" p4="3.83918" p5="25.549" p6="0.227762" p7="8" p8="0.291084" p9="0.128548" p10="9.26143" p11="0.8" name="Bouncing Tones"/>
-      <snapshot  p0="-2.71594" p1="1" p2="3" p3="3" p4="3.30176" p5="37.9414" p6="0.227762" p7="9" p8="0.291084" p9="0.128548" p10="13.691" p11="0.680852" name="Lots of Voices"/>
-      <snapshot  p0="2.34525" p1="0.869379" p2="1" p3="3" p4="3.59845" p5="42.0066" p6="0.486939" p7="9" p8="0.746892" p9="0.264491" p10="17.1806" p11="-0.732991" name="Robot Sheen"/>
-    </type>
-
-    <type i="3" name="Phaser">
-        <snapshot p0="0.000000" p1="0.000000" p2="0.000000" p3="-2.00000" p4="0.500000" p5="0.500000" p6="0.500000" name="Init" />
-        <snapshot p0="0.000000" p1="0.000000" p2="0.000000" p3="-2.00000" p4="0.500000" p5="0.500000" p6="1.000000" name="Init (Send)" />
-        <snapshot p0="0.000000" p1="-0.625000" p2="0.283929" p3="-1.352413" p4="0.817857" p5="0.747321" p6="0.493750" name="Stereo Phaser" />
-        <snapshot p0="0.057143" p1="0.858929" p2="-0.401786" p3="-1.998566" p4="0.718750" p5="0.586607" p6="0.694643" name="Talky" />
-    </type>
-
-    <type i="4" name="Rotary Speaker">
-        <snapshot p0="-7.00000" p1="0.000000" p2="0.000000" name="Init" />
-        <snapshot p0="1.293751" p1="0.251786" p2="0.495536" name="Slow" />
-        <snapshot p0="2.981253" p1="0.251786" p2="0.495536" name="Fast" />
-    </type>
-
-    <type i="5" name="Distortion">
-        <snapshot p0="0.000000" p1="3.817860" p2="1.944644" p3="38.421448" p4="0.000000" p5="0.000000" p6="0.000000" p7="3.000000" p8="2.031250" p9="30.535736" name="Init" />
-        <snapshot p0="-6.171432" p1="-6.564289" p2="1.234822" p3="59.491096" p4="-4.500006" p5="0.000000" p6="7.971436" p7="20.100006" p8="2.031250" p9="50.994675" name="Subtle" />
-        <snapshot p0="0.000000" p1="3.817860" p2="1.944644" p3="66.000000" p4="0.000000" p5="0.000000" p6="0.000000" p7="3.000000" p8="2.031250" p9="66.000000" name="Full Range" />
-        <snapshot p0="14.657152" p1="16.305359" p2="1.944644" p3="38.421448" p4="4.457139" p5="0.767859" p6="13.628580" p7="36.750023" p8="2.263393" p9="32.223236" p10="-8.314284" name="Round" />
-        <snapshot p0="-7.457146" p1="-17.444653" p2="1.944644" p3="43.483955" p4="3.728577" p5="0.903571" p6="3.085716" p7="36.412521" p8="2.031250" p9="43.023239" p10="0.000000" name="Low End" />
-        <snapshot p0="-5.142868" p1="20.435730" p2="2.654465" p3="61.178596" p4="18.900009" p5="-0.614286" p6="7.714291" p7="35.625015" p8="3.691965" p9="55.382172" p10="-11.314293" name="Kind" />
-
-        <type i="5" name="Arty">
-          <snapshot p0="-14.400009" p1="43.723221" p2="1.944644" p3="70.000000" p4="0.000000" p5="0.000000" p6="0.000000" p7="3.000000" p8="2.031250" p9="33.333015" p10="0.000000" name="Warm 1" />
-          <snapshot p0="-14.400009" p1="43.723221" p2="1.944644" p3="70.000000" p4="0.000000" p5="0.000000" p6="-20.057150" p7="37.125023" p8="2.031250" p9="33.333015" p10="0.000000" name="Warm 2" />
-          <snapshot p0="0.000000" p1="3.873554" p2="1.944644" p3="33.234497" p4="0.000000" p5="0.000000" p6="0.000000" p7="2.240891" p8="2.031250" p9="61.103157" p10="0.000000" name="Warm 3" />
-          <snapshot p0="5.039993" p1="21.238914" p2="1.944644" p3="26.235390" p4="0.000000" p5="0.000000" p6="3.985725" p7="2.237354" p8="2.031250" p9="42.229935" p10="0.000000" name="Warm 4" />
-          <snapshot p0="5.039993" p1="21.238914" p2="1.944644" p3="14.228958" p4="0.000000" p5="0.000000" p6="3.985725" p7="2.237354" p8="2.031250" p9="26.222519" p10="0.000000" name="Warm 5" />
-          <snapshot p0="6.004265" p1="47.901802" p2="2.999101" p3="70.000000" p4="0.000000" p5="0.000000" p6="6.004417" p7="54.079567" p8="2.998620" p9="70.000000" p10="0.000000" name="Bright 1" />
-          <snapshot p0="9.995064" p1="52.254967" p2="2.003750" p3="70.000000" p4="0.000000" p5="0.000000" p6="10.000389" p7="61.096107" p8="1.999999" p9="70.000000" p10="9.995163" name="Bright 2" />
-          <snapshot p0="19.997894" p1="-13.645096" p2="5.000000" p3="45.234993" p4="-0.428587" p5="0.000000" p6="14.001465" p7="2.237419" p8="5.000000" p9="30.083092" p10="-8.004837" name="Deep 1" />
-          <snapshot p0="19.997894" p1="-13.645088" p2="5.000000" p3="45.234993" p4="-24.000000" p5="0.000000" p6="14.001465" p7="-9.079617" p8="5.000000" p9="30.083092" p10="-8.004837" name="Deep 2" />
-        </type>
-    </type>
-
-    <type i="6" name="EQ">
-        <snapshot p0="0.000000" p1="-27.251785" p2="2.000000" p3="0.000000" p4="6.000000" p5="2.000000" p6="0.000000" p7="54.964317" p8="2.223215" name="Init" />
-        <snapshot p0="10.285721" p1="-27.251785" p2="2.000000" p3="0.000000" p4="6.000000" p5="2.000000" p6="11.057152" p7="54.964317" p8="2.223215" name="Smiley Curve" />
-        <snapshot p0="0.000000" p1="-27.251785" p2="2.000000" p3="-10.285713" p4="14.855362" p5="0.924107" p6="0.000000" p7="54.964317" p8="2.223215" name="Mid Cut" />
-        <snapshot p0="0.000000" p1="-27.251785" p2="2.000000" p3="0.000000" p4="6.000000" p5="2.000000" p6="7.971434" p7="61.039318" p8="2.785716" name="Air" />
-    </type>
-
-    <type i="8" name="Conditioner">
-        <snapshot p0="0.000000" p1="0.000000" p2="1.000000" p3="0.000000" p4="-17.014269" p5="0.000000" p6="0.000000" p7="0.000000" name="Init" />
-        <snapshot p0="0.000000" p1="0.000000" p2="1.000000" p3="0.000000" p4="-12.728600" p5="0.316072" p6="0.760714" p7="-7.328576" name="Peak Suppressor" />
-        <snapshot p0="0.000000" p1="0.000000" p2="1.000000" p3="0.000000" p4="-17.742889" p5="-0.085714" p6="0.000000" p7="-9.257149" name="Limiter" />
-    </type>
-
-    <type i="7" name="Frequency Shifter">
-        <snapshot p0="0.000000" p1="1.000000" p2="-8.000000" p3="0.000000" p4="1.000000" name="Init" />
-        <snapshot p0="9.892857" p1="1.000000" p2="-3.000000" p2_temposync="1" p3="0.843750" p4="0.322321" name="I Am Building Robot Monkeys" />
-        <snapshot p0="-3.767862" p1="1.000000" p2="-1.415038" p2_temposync="1" p3="0.841071" p4="0.367857" name="Falling Down" />
-        <snapshot p0="-0.071431" p1="0.925000" p2="-8.000000" p2_temposync="1" p3="0.000000" p4="0.291964" name="Chorusy" />
-        <snapshot p0="1.428571" p0_extend_range="1" p1="1.000000" p2="-3.000000" p2_temposync="1" p3="0.811607" p4="0.200893" name="The Future Will Be Like This" />
-    </type>
-
-    <type i="13" name="Ring Modulator (WIP)">
-        <snapshot name="Init"/>
-    </type>
-
-    <type i="10" name="Vocoder">
-         <snapshot name="Init" />
+        <snapshot p0="-3.31105" p1="0.534785" p2="4.10847" p3="0.545083" p4="0.225994" p5="0.431124" p6="0.171199" p7="1" p8="0.693247" p9="0.712106" name="Ghostly Chamber" />
+        <snapshot p0="-4" p1="0.534785" p2="4.90419" p3="0.545083" p4="0.700273" p5="0.0826876" p6="0.0833598" p7="1" p8="0.714845" p9="0.820355" name="Anybody Canyon" />
+        <snapshot p0="-1.99947" p1="-0.470558" p2="-1.60312" p3="0.140042" p4="0.234753" p5="0.0826876" p6="0.0833598" p7="1" p8="0.56681" p9="0.820355" name="Blurred Echo" />
     </type>
 </fx>
-
 <customctrl>
     <entry p="0" ctrl="41" />
     <entry p="1" ctrl="42" />
@@ -171,6 +153,6 @@
     <entry p="6" ctrl="47" />
     <entry p="7" ctrl="48" />
 </customctrl>
-
 <midictrl>
 </midictrl>
+
diff --git a/src/common/gui/CSnapshotMenu.cpp b/src/common/gui/CSnapshotMenu.cpp
index 172e74f85c0..4c19ff4a352 100644
--- a/src/common/gui/CSnapshotMenu.cpp
+++ b/src/common/gui/CSnapshotMenu.cpp
@@ -46,7 +46,7 @@ void CSnapshotMenu::populate()
 {
    int main = 0, sub = 0;
    bool do_nothing = false;
-   const long max_main = 16, max_sub = 256;
+   const long max_main = 128, max_sub = 256;
 
    int idx = 0;
    TiXmlElement* sect = storage->getSnapshotSection(mtype);