diff --git a/MicroDexed.ino b/MicroDexed.ino
index 4a94879..a5ade38 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -41,8 +41,12 @@ using namespace TeensyTimerTool;
 #ifdef USE_PLATEREVERB
 #include "effect_platervbstereo.h"
 #else
+#ifndef TEENSY_4
+#include "effect_freeverb_simd.h"
+#else
 #include "effect_freeverbf.h"
 #endif
+#endif
 #include "template_mixer.hpp"
 #include "UI.hpp"
 #if NUM_DRUMS > 0
@@ -77,9 +81,13 @@ AudioMixer<4>                     reverb_mixer_l;
 #ifdef USE_PLATEREVERB
 AudioEffectPlateReverb          reverb;
 #else
+#ifndef TEENSY_4
+AudioEffectFreeverbSIMDStereo  freeverb;
+#else
 AudioEffectFreeverbStereoFloat  freeverb;
 #endif
 #endif
+#endif
 AudioMixer<4>                     master_mixer_r;
 AudioMixer<4>                     master_mixer_l;
 AudioAmplifier                  volume_r;
diff --git a/UI.hpp b/UI.hpp
index ba0e68b..72feacd 100644
--- a/UI.hpp
+++ b/UI.hpp
@@ -35,8 +35,12 @@
 #ifdef USE_PLATEREVERB
 #include "effect_platervbstereo.h"
 #else
+#ifndef TEENSY_4
+#include "effect_freeverb_simd.h"
+#else
 #include "effect_freeverbf.h"
 #endif
+#endif
 #include "template_mixer.hpp"
 #include "drumset.h"
 
@@ -80,7 +84,7 @@ extern uint8_t seq_track_type[NUM_SEQ_TRACKS];
 extern uint8_t seq_step;
 extern uint8_t seq_chord_key_ammount;
 extern int seq_tempo_ms;
-extern uint8_t seq_bpm;
+extern int seq_bpm;
 extern uint8_t seq_chain_lenght;
 extern bool seq_running;
 extern bool seq_recording;
@@ -140,9 +144,13 @@ extern AudioAnalyzePeak           microdexed_peak;
 extern AudioMixer<4>                reverb_mixer_r;
 extern AudioMixer<4>                reverb_mixer_l;
 #ifdef USE_PLATEREVERB
-extern AudioEffectPlateReverb     reverb;
+extern AudioEffectPlateReverb          reverb;
 #else
-extern AudioEffectFreeverbStereoFloat        freeverb;
+#ifndef TEENSY_4
+extern AudioEffectFreeverbSIMDStereo  freeverb;
+#else
+extern AudioEffectFreeverbStereoFloat  freeverb;
+#endif
 #endif
 #endif
 extern AudioMixer<4>                master_mixer_r;
diff --git a/config.h b/config.h
index 84690d9..498a234 100644
--- a/config.h
+++ b/config.h
@@ -54,7 +54,7 @@
 // sed -i.orig 's/^#define USB_MIDI_SYSEX_MAX 290/#define USB_MIDI_SYSEX_MAX 4104/' /usr/local/arduino-teensy/hardware/teensy/avr/cores/teensy4/usb_midi.h
 //#define USB_MIDI_SYSEX_MAX 4104
 
-#define VERSION "1.1.1"
+#define VERSION "1.1.2"
 
 //*************************************************************************************************
 //* DEVICE SETTINGS
diff --git a/drumset.h b/drumset.h
index 95ef25c..eae337e 100644
--- a/drumset.h
+++ b/drumset.h
@@ -5338,7 +5338,8 @@ PROGMEM const uint8_t DRUM_SQBass[] = {
   0x00, 0x00, 0xfa, 0xff, 0x01, 0x00, 0xfa, 0xff, 0x00, 0x00, 0xfc, 0xff,
   0xfe, 0xff, 0x00, 0x00, 0xfc, 0xff, 0x01, 0x00, 0xfd, 0xff, 0xff, 0xff,
   0x01, 0x00, 0xfc, 0xff, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00
-,0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from I_CALLIOP.wav, length = 45056 bytes
 PROGMEM const uint8_t DRUM_CALLIOP[] = {
   0x95, 0x03, 0x2b, 0x24, 0x6a, 0x46, 0xd9, 0x57, 0x59, 0x58, 0xa8, 0x54,
@@ -12841,20 +12842,20 @@ PROGMEM const uint8_t DRUM_CALLIOP[] = {
   0xfc, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xf9, 0xff,
   0x01, 0x00, 0xfb, 0xff, 0x00, 0x00, 0xfc, 0xff, 0x03, 0x00, 0xf9, 0xff,
   0x06, 0x00, 0xfa, 0xff, 0x03, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from I_ssaw.wav, length = 45120 bytes
 PROGMEM const uint8_t DRUM_ssaw[] = {
@@ -20373,14 +20374,15 @@ PROGMEM const uint8_t DRUM_ssaw[] = {
   0xfe, 0xff, 0x01, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xfe, 0xff,
   0x03, 0x00, 0xfc, 0xff, 0x05, 0x00, 0xfa, 0xff, 0x06, 0x00, 0xfb, 0xff,
   0x03, 0x00, 0xff, 0xff, 0x01, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfb, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from I_ARR1.wav, length = 21248 bytes
 PROGMEM const uint8_t DRUM_ARR1[] = {
   0xe5, 0x00, 0xff, 0xff, 0xde, 0xfd, 0xb9, 0x00, 0x3a, 0x05, 0x67, 0x06,
@@ -23917,18 +23919,19 @@ PROGMEM const uint8_t DRUM_ARR1[] = {
   0x70, 0x00, 0x68, 0x00, 0x6d, 0x00, 0x66, 0x00, 0x69, 0x00, 0x66, 0x00,
   0x6b, 0x00, 0x5f, 0x00, 0x69, 0x00, 0x69, 0x00, 0x64, 0x00, 0x6a, 0x00,
   0x68, 0x00, 0x65, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x4c, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from I_FVoicG2.wav, length = 39040 bytes
 PROGMEM const uint8_t DRUM_FVoice[] = {
   0x00, 0x00, 0x0e, 0x00, 0x10, 0x00, 0xfd, 0xff, 0xd9, 0xff, 0xb6, 0xff,
@@ -30428,22 +30431,23 @@ PROGMEM const uint8_t DRUM_FVoice[] = {
   0xfb, 0xff, 0x05, 0x00, 0xfa, 0xff, 0x03, 0x00, 0xff, 0xff, 0x00, 0x00,
   0x00, 0x00, 0xfd, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x03, 0x00, 0xfe, 0xff,
   0x00, 0x00, 0x01, 0x00, 0xff, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from I_SlapB-M1.wav, length = 30528 bytes
 PROGMEM const uint8_t DRUM_SlapB_M1[] = {
   0xfe, 0xff, 0x02, 0x00, 0xd3, 0xff, 0x31, 0xff, 0x95, 0xfd, 0x7a, 0xfb,
@@ -35526,19 +35530,20 @@ PROGMEM const uint8_t DRUM_SlapB_M1[] = {
   0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff,
   0x02, 0x00, 0xfc, 0xff, 0x05, 0x00, 0xfc, 0xff, 0x03, 0x00, 0xfd, 0xff,
   0x02, 0x00, 0xfe, 0xff, 0x03, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from SnapR50.wav, length = 4160 bytes
 PROGMEM const uint8_t DRUM_SnapR50[] = {
   0x01, 0x00, 0xe0, 0xff, 0xd7, 0xfe, 0x32, 0x00, 0x75, 0xfe, 0x92, 0x01,
@@ -36230,13 +36235,14 @@ PROGMEM const uint8_t DRUM_SnapR50[] = {
   0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
   0x02, 0x00, 0xfd, 0xff, 0x02, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xff, 0xff,
   0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from SNARE808.wav, length = 6592 bytes
 PROGMEM const uint8_t DRUM_SNARE808[] = {
   0xae, 0x06, 0x1d, 0xe5, 0x40, 0xd3, 0xbd, 0xd1, 0xde, 0xdc, 0x8e, 0xeb,
@@ -37335,10 +37341,10 @@ PROGMEM const uint8_t DRUM_SNARE808[] = {
   0xfe, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xfe, 0xff,
   0x03, 0x00, 0xfd, 0xff, 0x01, 0x00, 0x02, 0x00, 0xfd, 0xff, 0x05, 0x00,
   0xfb, 0xff, 0x04, 0x00, 0xfd, 0xff, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from Clap808.wav, length = 7744 bytes
 PROGMEM const uint8_t DRUM_Clap808[] = {
@@ -38629,13 +38635,14 @@ PROGMEM const uint8_t DRUM_Clap808[] = {
   0x07, 0x00, 0x0e, 0x00, 0x10, 0x00, 0x16, 0x00, 0x0f, 0x00, 0x15, 0x00,
   0x0c, 0x00, 0x0d, 0x00, 0x07, 0x00, 0x05, 0x00, 0x03, 0x00, 0x01, 0x00,
   0xfe, 0xff, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xfe, 0xff, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
-#if defined(ARDUINO_TEENSY41) 
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
+#if defined(TEENSY4_1)
 // Converted from S_kick_1.wav, length = 19520 bytes
 PROGMEM const uint8_t DRUM_S_kick_1[] = {
   0x6c, 0x00, 0x9c, 0x00, 0xd9, 0x00, 0x2e, 0x01, 0xae, 0x01, 0x88, 0x02,
@@ -41882,21 +41889,21 @@ PROGMEM const uint8_t DRUM_S_kick_1[] = {
   0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x03, 0x00,
   0xfd, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x01, 0x00, 0xfe, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from S_kick2_8.wav, length = 19200 bytes
 PROGMEM const uint8_t DRUM_S_kick2_8[] = {
@@ -45095,14 +45102,14 @@ PROGMEM const uint8_t DRUM_S_kick2_8[] = {
   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x04, 0x00,
   0xfc, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x01, 0x00, 0xfd, 0xff, 0x04, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from S_snareStick_1.wav, length = 10432 bytes
 PROGMEM const uint8_t DRUM_S_Stick_1[] = {
@@ -46838,17 +46845,18 @@ PROGMEM const uint8_t DRUM_S_Stick_1[] = {
   0x00, 0x00, 0x02, 0x00, 0xfd, 0xff, 0x03, 0x00, 0xff, 0xff, 0x00, 0x00,
   0x02, 0x00, 0xfc, 0xff, 0x05, 0x00, 0xfb, 0xff, 0x05, 0x00, 0xfb, 0xff,
   0x05, 0x00, 0xfc, 0xff, 0x02, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from S_snare_Ghost_1.wav, length = 19008 bytes
 PROGMEM const uint8_t DRUM_S_snare_Ghost_1[] = {
   0xf6, 0xff, 0xf6, 0xff, 0xf6, 0xff, 0xf0, 0xff, 0xf2, 0xff, 0xee, 0xff,
@@ -50013,16 +50021,17 @@ PROGMEM const uint8_t DRUM_S_snare_Ghost_1[] = {
   0x02, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x01, 0x00, 0xfe, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from S_snare2_Ghost_1.wav, length = 22464 bytes
 PROGMEM const uint8_t DRUM_S_snare2_Ghost_1[] = {
   0x09, 0x00, 0x3f, 0x00, 0x79, 0x00, 0xce, 0x01, 0x1b, 0x06, 0x2c, 0x0e,
@@ -53761,19 +53770,19 @@ PROGMEM const uint8_t DRUM_S_snare2_Ghost_1[] = {
   0x02, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0xff, 0xff,
   0x01, 0x00, 0xfe, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from S_snare_2.wav, length = 17920 bytes
 PROGMEM const uint8_t DRUM_S_snare_2[] = {
@@ -56762,10 +56771,11 @@ PROGMEM const uint8_t DRUM_S_snare_2[] = {
   0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x02, 0x00, 0xfd, 0xff,
   0x04, 0x00, 0xfb, 0xff, 0x05, 0x00, 0xfc, 0xff, 0x03, 0x00, 0xfe, 0xff,
   0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from S_loTom_1.wav, length = 40320 bytes
 PROGMEM const uint8_t DRUM_S_loTom_1[] = {
   0x4e, 0x00, 0x59, 0x00, 0x58, 0x00, 0x57, 0x00, 0x5e, 0x00, 0x53, 0x00,
@@ -63481,18 +63491,19 @@ PROGMEM const uint8_t DRUM_S_loTom_1[] = {
   0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0xfe, 0xff, 0x02, 0x00,
   0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, 0xfd, 0xff,
   0x01, 0x00, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from S_hhClosed_1.wav, length = 6784 bytes
 PROGMEM const uint8_t DRUM_S_hhClosed_1[] = {
   0xd4, 0x00, 0xca, 0xff, 0x86, 0x01, 0x89, 0xff, 0x13, 0x01, 0x37, 0xfe,
@@ -64616,21 +64627,21 @@ PROGMEM const uint8_t DRUM_S_hhClosed_1[] = {
   0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xff, 0xff,
   0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00,
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from S_hh_o_1_2.wav, length = 18240 bytes
 PROGMEM const uint8_t DRUM_S_hh_o_1_2[] = {
@@ -67670,13 +67681,14 @@ PROGMEM const uint8_t DRUM_S_hh_o_1_2[] = {
   0xfe, 0xff, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0xfe, 0xff,
   0x02, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0xfe, 0xff, 0x02, 0x00,
   0xff, 0xff, 0xff, 0xff, 0x02, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from S_hiTom_5.wav, length = 23040 bytes
 PROGMEM const uint8_t DRUM_S_hiTom_5[] = {
   0x46, 0x00, 0x8e, 0x00, 0x3f, 0x00, 0x9e, 0x00, 0x0e, 0x00, 0x6b, 0x00,
@@ -71517,10 +71529,11 @@ PROGMEM const uint8_t DRUM_S_hiTom_5[] = {
   0x0a, 0x00, 0xfd, 0xff, 0x0a, 0x00, 0x01, 0x00, 0x05, 0x00, 0x04, 0x00,
   0x02, 0x00, 0x08, 0x00, 0xff, 0xff, 0x08, 0x00, 0xff, 0xff, 0x07, 0x00,
   0x02, 0x00, 0x05, 0x00, 0xff, 0xff, 0x09, 0x00, 0xfb, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from S_hh_o_5_4.wav, length = 80320 bytes
 PROGMEM const uint8_t DRUM_S_hh_o_5_4[] = {
   0xb0, 0x00, 0xf6, 0xff, 0x55, 0x00, 0x82, 0xff, 0x45, 0x01, 0xf3, 0x00,
@@ -84908,10 +84921,11 @@ PROGMEM const uint8_t DRUM_S_hh_o_5_4[] = {
   0xfe, 0xff, 0x02, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from S_splash1_1.wav, length = 57856 bytes
 PROGMEM const uint8_t DRUM_S_splash1_1[] = {
   0x03, 0x00, 0x06, 0x00, 0x04, 0x00, 0x06, 0x00, 0x04, 0x00, 0x05, 0x00,
@@ -94553,13 +94567,14 @@ PROGMEM const uint8_t DRUM_S_splash1_1[] = {
   0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xfe, 0xff,
   0x02, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00,
   0xfe, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from S_china1_4.wav, length = 75840 bytes
 PROGMEM const uint8_t DRUM_S_china1_4[] = {
   0xfa, 0xff, 0x01, 0x00, 0xfb, 0xff, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff,
@@ -107192,22 +107207,22 @@ PROGMEM const uint8_t DRUM_S_china1_4[] = {
   0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xfd, 0xff, 0x03, 0x00,
   0xfe, 0xff, 0x02, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff,
   0x01, 0x00, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from S_china2_1.wav, length = 68864 bytes
 PROGMEM const uint8_t DRUM_S_china2_1[] = {
@@ -118688,7 +118703,8 @@ PROGMEM const uint8_t DRUM_S_china2_1[] = {
   0x02, 0x00, 0xfc, 0xff, 0x04, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x01, 0x00,
   0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xff, 0xff,
   0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x04, 0x00, 0xfc, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from S_ride1Bell_1.wav, length = 58752 bytes
 PROGMEM const uint8_t DRUM_S_ride1Bell_1[] = {
   0x17, 0x00, 0xbe, 0xff, 0x69, 0x00, 0x5a, 0x00, 0x2d, 0x00, 0x70, 0x07,
@@ -128479,14 +128495,15 @@ PROGMEM const uint8_t DRUM_S_ride1Bell_1[] = {
   0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff,
   0x03, 0x00, 0xfd, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x03, 0x00, 0xfd, 0xff,
   0x02, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from S_crash1_1.wav, length = 112064 bytes
 PROGMEM const uint8_t DRUM_S_crash1_1[] = {
   0x24, 0x00, 0xdf, 0xff, 0x5f, 0x00, 0xb0, 0xff, 0xdd, 0x00, 0x6c, 0xfc,
@@ -147157,20 +147174,20 @@ PROGMEM const uint8_t DRUM_S_crash1_1[] = {
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff,
   0xff, 0xff, 0x02, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfc, 0xff, 0x03, 0x00,
   0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from S_cowbell_2.wav, length = 18368 bytes
 PROGMEM const uint8_t DRUM_S_cowbell_2[] = {
@@ -150234,10 +150251,11 @@ PROGMEM const uint8_t DRUM_S_cowbell_2[] = {
   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0xfe, 0xff,
   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from S_ride2Crash_2.wav, length = 132160 bytes
 PROGMEM const uint8_t DRUM_S_ride2Crash_2[] = {
   0xf3, 0xfe, 0xe6, 0x00, 0x98, 0xfc, 0x84, 0x03, 0x91, 0x1c, 0x2d, 0xf3,
@@ -172256,22 +172274,22 @@ PROGMEM const uint8_t DRUM_S_ride2Crash_2[] = {
   0x00, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x02, 0x00, 0x00, 0x00,
   0xfe, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x02, 0x00, 0x01, 0x00, 0xfd, 0xff,
   0x02, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x04, 0x00, 0xfb, 0xff, 0x05, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from S_ride2_1.wav, length = 77504 bytes
 PROGMEM const uint8_t DRUM_S_ride2_1[] = {
@@ -185186,17 +185204,18 @@ PROGMEM const uint8_t DRUM_S_ride2_1[] = {
   0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x04, 0x00,
   0xfc, 0xff, 0x03, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xfe, 0xff, 0x02, 0x00,
   0xfe, 0xff, 0x02, 0x00, 0xfe, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 #endif
 // Converted from Kick808.wav, length = 26688 bytes
 PROGMEM const uint8_t DRUM_808Kick[] = {
@@ -189642,16 +189661,17 @@ PROGMEM const uint8_t DRUM_808Kick[] = {
   0x9c, 0xff, 0x9f, 0xff, 0x99, 0xff, 0xa4, 0xff, 0x9c, 0xff, 0xa4, 0xff,
   0x9f, 0xff, 0xa4, 0xff, 0x9f, 0xff, 0xa7, 0xff, 0xa3, 0xff, 0xa5, 0xff,
   0xa8, 0xff, 0xa7, 0xff, 0xa6, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from phKick1.wav, length = 4800 bytes
 PROGMEM const uint8_t DRUM_phkick1[] = {
   0x02, 0x00, 0x51, 0xfd, 0x2d, 0x10, 0xce, 0xfc, 0xaa, 0xef, 0xed, 0xe4,
@@ -190451,12 +190471,13 @@ PROGMEM const uint8_t DRUM_phkick1[] = {
   0x9d, 0xff, 0x9f, 0xff, 0x9d, 0xff, 0xa4, 0xff, 0x99, 0xff, 0xa4, 0xff,
   0x9c, 0xff, 0x9f, 0xff, 0xa1, 0xff, 0xa0, 0xff, 0x9c, 0xff, 0xa4, 0xff,
   0x9b, 0xff, 0xa5, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from Rim808.wav, length = 768 bytes
 PROGMEM const uint8_t DRUM_rims1[] = {
   0xe1, 0xff, 0x33, 0xff, 0xd3, 0xfd, 0x2d, 0xfd, 0x3e, 0xfc, 0xb9, 0xfa,
@@ -190577,22 +190598,23 @@ PROGMEM const uint8_t DRUM_rims1[] = {
   0xd2, 0x00, 0xc0, 0x00, 0xb0, 0x00, 0xa0, 0x00, 0x8d, 0x00, 0x7b, 0x00,
   0x6b, 0x00, 0x57, 0x00, 0x47, 0x00, 0x37, 0x00, 0x2b, 0x00, 0x18, 0x00,
   0x11, 0x00, 0x04, 0x00, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from Shaker.wav, length = 1792 bytes
 PROGMEM const uint8_t DRUM_Shaker[] = {
   0x44, 0x00, 0x8d, 0xfb, 0xf2, 0x00, 0x64, 0x02, 0xc8, 0xfd, 0xa3, 0x00,
@@ -190888,16 +190910,17 @@ PROGMEM const uint8_t DRUM_Shaker[] = {
   0xa5, 0xff, 0xe4, 0x00, 0x85, 0x02, 0x41, 0x00, 0x93, 0xff, 0x14, 0xfe,
   0x71, 0xff, 0xa6, 0x01, 0x5a, 0xff, 0xcd, 0xff, 0x22, 0x00, 0x1c, 0x00,
   0xfe, 0xff, 0xf5, 0xff, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from LnClap.wav, length = 6976 bytes
 PROGMEM const uint8_t DRUM_LNclap1[] = {
   0x03, 0x00, 0xeb, 0xff, 0x4b, 0xfb, 0xf9, 0xf4, 0x3e, 0xee, 0x98, 0xea,
@@ -192055,18 +192078,18 @@ PROGMEM const uint8_t DRUM_LNclap1[] = {
   0x92, 0xff, 0x91, 0xff, 0x93, 0xff, 0x94, 0xff, 0x94, 0xff, 0x90, 0xff,
   0x95, 0xff, 0x91, 0xff, 0x95, 0xff, 0x90, 0xff, 0x95, 0xff, 0x92, 0xff,
   0x98, 0xff, 0x8e, 0xff, 0x9a, 0xff, 0x87, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from LnSnare1.wav, length = 10560 bytes
 PROGMEM const uint8_t DRUM_LNsnare1[] = {
@@ -193825,15 +193848,16 @@ PROGMEM const uint8_t DRUM_LNsnare1[] = {
   0xfc, 0xff, 0x07, 0x00, 0xf9, 0xff, 0x08, 0x00, 0xf9, 0xff, 0x07, 0x00,
   0xfe, 0xff, 0x00, 0x00, 0x02, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00,
   0xff, 0xff, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from BDTrancy.wav, length = 7872 bytes
 PROGMEM const uint8_t DRUM_Bdtrancy[] = {
   0xfe, 0xff, 0x9f, 0xfe, 0x31, 0xfc, 0x05, 0xfd, 0x0f, 0xfe, 0x82, 0xfa,
@@ -195147,8 +195171,9 @@ PROGMEM const uint8_t DRUM_Bdtrancy[] = {
   0xef, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf2, 0xff, 0xf4, 0xff, 0xf2, 0xff,
   0xf8, 0xff, 0xf3, 0xff, 0xf9, 0xff, 0xf6, 0xff, 0xfb, 0xff, 0xf9, 0xff,
   0xfb, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xfc, 0xff, 0x02, 0x00, 0xfb, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from HhCL1-808.wav, length = 6208 bytes
 PROGMEM const uint8_t DRUM_hhcl808[] = {
   0xb1, 0xff, 0x6d, 0x00, 0x8c, 0xff, 0x6f, 0x00, 0x75, 0xff, 0xc9, 0x00,
@@ -196178,18 +196203,19 @@ PROGMEM const uint8_t DRUM_hhcl808[] = {
   0xff, 0xff, 0xf5, 0xff, 0x06, 0x00, 0x01, 0x00, 0xfe, 0xff, 0xfe, 0xff,
   0x05, 0x00, 0x06, 0x00, 0xfd, 0xff, 0xfb, 0xff, 0xfb, 0xff, 0x02, 0x00,
   0xff, 0xff, 0x04, 0x00, 0x03, 0x00, 0xfd, 0xff, 0xff, 0xff, 0xf9, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from Belltree.wav, length = 121408 bytes
 PROGMEM const uint8_t DRUM_Belltree[] = {
   0x11, 0x03, 0x4a, 0xfe, 0xb9, 0xfb, 0x65, 0xfc, 0x93, 0x04, 0x40, 0xff,
@@ -216419,18 +216445,18 @@ PROGMEM const uint8_t DRUM_Belltree[] = {
   0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0x00, 0x00,
   0x02, 0x00, 0xfc, 0xff, 0x05, 0x00, 0xfb, 0xff, 0x04, 0x00, 0xff, 0xff,
   0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from Bongo16.wav, length = 6464 bytes
 PROGMEM const uint8_t DRUM_Bongo16[] = {
@@ -217506,14 +217532,14 @@ PROGMEM const uint8_t DRUM_Bongo16[] = {
   0xfb, 0xff, 0x05, 0x00, 0xfb, 0xff, 0x04, 0x00, 0xfe, 0xff, 0x00, 0x00,
   0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x03, 0x00,
   0xfc, 0xff, 0x04, 0x00, 0xfd, 0xff, 0x02, 0x00, 0xff, 0xff, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from Bongo27.wav, length = 11712 bytes
 PROGMEM const uint8_t DRUM_Bongo27[] = {
@@ -219461,19 +219487,20 @@ PROGMEM const uint8_t DRUM_Bongo27[] = {
   0xfd, 0xff, 0x03, 0x00, 0xff, 0xff, 0x02, 0x00, 0xff, 0xff, 0x02, 0x00,
   0xfe, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x04, 0x00, 0xfc, 0xff, 0x04, 0x00,
   0xfe, 0xff, 0x00, 0x00, 0x02, 0x00, 0xfd, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from Casta.wav, length = 2048 bytes
 PROGMEM const uint8_t DRUM_Casta[] = {
   0x74, 0x00, 0x79, 0xff, 0x80, 0x00, 0x79, 0xff, 0x81, 0x00, 0x79, 0xff,
@@ -219809,20 +219836,21 @@ PROGMEM const uint8_t DRUM_Casta[] = {
   0xe7, 0xff, 0x8e, 0xff, 0x80, 0xff, 0x56, 0xff, 0x18, 0x00, 0x01, 0x00,
   0x55, 0xff, 0x24, 0x00, 0x13, 0x00, 0xc4, 0xff, 0xa4, 0xff, 0x4a, 0x00,
   0x6b, 0x00, 0x5d, 0x00, 0x4b, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from CR78Kick.wav, length = 10048 bytes
 PROGMEM const uint8_t DRUM_Cr78kick[] = {
   0x3b, 0x00, 0xa7, 0xff, 0x10, 0x00, 0x29, 0xf9, 0xdc, 0xf1, 0x8a, 0xf7,
@@ -221492,18 +221520,19 @@ PROGMEM const uint8_t DRUM_Cr78kick[] = {
   0xea, 0xff, 0xeb, 0xff, 0xe7, 0xff, 0xed, 0xff, 0xe6, 0xff, 0xec, 0xff,
   0xe6, 0xff, 0xed, 0xff, 0xe9, 0xff, 0xeb, 0xff, 0xeb, 0xff, 0xe9, 0xff,
   0xec, 0xff, 0xea, 0xff, 0xef, 0xff, 0xeb, 0xff, 0xf3, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from CR78Tmb1.wav, length = 7552 bytes
 PROGMEM const uint8_t DRUM_Cr78tmb1[] = {
   0xff, 0xff, 0xf7, 0xff, 0xf8, 0xff, 0x0b, 0x00, 0x00, 0x00, 0xf7, 0xff,
@@ -222758,17 +222787,18 @@ PROGMEM const uint8_t DRUM_Cr78tmb1[] = {
   0x1b, 0x00, 0xff, 0xff, 0xe3, 0xff, 0xcf, 0xff, 0xea, 0xff, 0xfc, 0xff,
   0x0f, 0x00, 0x1e, 0x00, 0x25, 0x00, 0x05, 0x00, 0xfc, 0xff, 0xda, 0xff,
   0xce, 0xff, 0xd9, 0xff, 0xff, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from CR78Tmb2.wav, length = 10880 bytes
 PROGMEM const uint8_t DRUM_Cr78tmb2[] = {
   0x07, 0x00, 0x28, 0x00, 0x40, 0x00, 0x4d, 0x00, 0x2f, 0x00, 0xb5, 0xff,
@@ -224584,7 +224614,8 @@ PROGMEM const uint8_t DRUM_Cr78tmb2[] = {
   0x2f, 0x00, 0x9a, 0x00, 0xba, 0x00, 0x67, 0x00, 0x08, 0x00, 0xac, 0xff,
   0x56, 0xff, 0x58, 0xff, 0xb2, 0xff, 0x1a, 0x00, 0x77, 0x00, 0x9e, 0x00,
   0x71, 0x00, 0x1c, 0x00, 0xc7, 0xff, 0x7f, 0xff, 0x68, 0xff, 0x8c, 0xff
-,0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from Crash1.wav, length = 72768 bytes
 PROGMEM const uint8_t DRUM_Crash1[] = {
   0x75, 0x00, 0x74, 0x00, 0x89, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x4e, 0x00,
@@ -236709,15 +236740,15 @@ PROGMEM const uint8_t DRUM_Crash1[] = {
   0x03, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xfc, 0xff, 0x05, 0x00, 0xfc, 0xff,
   0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
   0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from DMpop.wav, length = 7808 bytes
 PROGMEM const uint8_t DRUM_Dmpop[] = {
@@ -238020,11 +238051,12 @@ PROGMEM const uint8_t DRUM_Dmpop[] = {
   0x1d, 0x00, 0x14, 0x00, 0x01, 0x00, 0x07, 0x00, 0xf2, 0xff, 0xf2, 0xff,
   0xda, 0xff, 0xd8, 0xff, 0xcb, 0xff, 0xc3, 0xff, 0xba, 0xff, 0xb0, 0xff,
   0xa5, 0xff, 0x9f, 0xff, 0x98, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from Electr1.wav, length = 2880 bytes
 PROGMEM const uint8_t DRUM_Electr1[] = {
   0x00, 0x00, 0xd2, 0x10, 0x97, 0x13, 0x9f, 0x0c, 0x29, 0xfb, 0xa5, 0xe8,
@@ -238499,19 +238531,19 @@ PROGMEM const uint8_t DRUM_Electr1[] = {
   0x74, 0x00, 0x75, 0x00, 0x71, 0x00, 0x6e, 0x00, 0x6d, 0x00, 0x6a, 0x00,
   0x6e, 0x00, 0x77, 0x00, 0x72, 0x00, 0x71, 0x00, 0x71, 0x00, 0x77, 0x00,
   0x72, 0x00, 0x70, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from EXcow.wav, length = 18368 bytes
 PROGMEM const uint8_t DRUM_Excow[] = {
@@ -241575,8 +241607,8 @@ PROGMEM const uint8_t DRUM_Excow[] = {
   0xff, 0xff, 0x01, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x01, 0x00,
   0xfd, 0xff, 0x05, 0x00, 0xfb, 0xff, 0x03, 0x00, 0xff, 0xff, 0x01, 0x00,
   0xfd, 0xff, 0x05, 0x00, 0xfa, 0xff, 0x06, 0x00, 0xfc, 0xff, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from Tamb.wav, length = 8128 bytes
 PROGMEM const uint8_t DRUM_Tamb[] = {
@@ -242931,13 +242963,14 @@ PROGMEM const uint8_t DRUM_Tamb[] = {
   0x26, 0x00, 0x1d, 0x00, 0x23, 0x00, 0x1b, 0x00, 0x20, 0x00, 0x1b, 0x00,
   0x21, 0x00, 0x1a, 0x00, 0x27, 0x00, 0x16, 0x00, 0x26, 0x00, 0x1a, 0x00,
   0x1e, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from CowBell.wav, length = 7296 bytes
 PROGMEM const uint8_t DRUM_Cowbell[] = {
   0x00, 0x00, 0x47, 0x00, 0x72, 0x00, 0x8b, 0x00, 0x82, 0x00, 0x64, 0x00,
@@ -244152,13 +244185,14 @@ PROGMEM const uint8_t DRUM_Cowbell[] = {
   0xde, 0xff, 0xd6, 0xff, 0xdc, 0xff, 0xdc, 0xff, 0xda, 0xff, 0xd5, 0xff,
   0xd2, 0xff, 0xda, 0xff, 0xd6, 0xff, 0xd9, 0xff, 0xdc, 0xff, 0xde, 0xff,
   0xd8, 0xff, 0xdc, 0xff, 0xd4, 0xff, 0xdc, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from HatC660.wav, length = 5952 bytes
 PROGMEM const uint8_t DRUM_660HatC1[] = {
   0x4d, 0xfb, 0x32, 0xe7, 0x25, 0x21, 0x90, 0xf9, 0x49, 0xc4, 0xdd, 0x2f,
@@ -245150,12 +245184,13 @@ PROGMEM const uint8_t DRUM_660HatC1[] = {
   0xff, 0xff, 0x03, 0x00, 0xfb, 0xff, 0x05, 0x00, 0xfb, 0xff, 0x04, 0x00,
   0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00,
   0xff, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from HHopen1.wav, length = 11200 bytes
 PROGMEM const uint8_t DRUM_Hhopen1[] = {
   0x90, 0xff, 0x0d, 0x00, 0x0e, 0xfe, 0xd4, 0xfe, 0x45, 0x02, 0x90, 0xfe,
@@ -247016,20 +247051,21 @@ PROGMEM const uint8_t DRUM_Hhopen1[] = {
   0xe4, 0xff, 0xf6, 0xff, 0x16, 0x00, 0xfc, 0xff, 0xdf, 0xff, 0xdd, 0xff,
   0xdb, 0xff, 0xf7, 0xff, 0xf4, 0xff, 0xfd, 0xff, 0xeb, 0xff, 0xec, 0xff,
   0xf9, 0xff, 0xef, 0xff, 0x03, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from HiSticks.wav, length = 2432 bytes
 PROGMEM const uint8_t DRUM_Histicks[] = {
   0x15, 0x00, 0xe1, 0xff, 0x0f, 0x00, 0xef, 0xff, 0x21, 0x00, 0x57, 0xff,
@@ -247436,9 +247472,10 @@ PROGMEM const uint8_t DRUM_Histicks[] = {
   0xb1, 0xff, 0xd3, 0xff, 0xe9, 0xff, 0xed, 0xff, 0xf5, 0xff, 0xff, 0xff,
   0x0f, 0x00, 0x0c, 0x00, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xea, 0xff,
   0xec, 0xff, 0xe7, 0xff, 0xea, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from HR16Snr2.wav, length = 15168 bytes
 PROGMEM const uint8_t DRUM_Hr16snr2[] = {
   0x6b, 0xfe, 0xde, 0xfb, 0x62, 0xf7, 0xd2, 0xf0, 0x07, 0xea, 0x14, 0xe3,
@@ -249965,13 +250002,14 @@ PROGMEM const uint8_t DRUM_Hr16snr2[] = {
   0xab, 0xff, 0xb4, 0xff, 0xab, 0xff, 0xab, 0xff, 0xb4, 0xff, 0xac, 0xff,
   0xb5, 0xff, 0xb6, 0xff, 0xb6, 0xff, 0xb7, 0xff, 0xbf, 0xff, 0xb8, 0xff,
   0xbe, 0xff, 0xad, 0xff, 0xad, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from XRHiTom.wav, length = 13504 bytes
 PROGMEM const uint8_t DRUM_Xrhitom[] = {
   0x00, 0x00, 0xf9, 0xff, 0xfe, 0xff, 0xf9, 0xff, 0xd6, 0xff, 0x45, 0xff,
@@ -252220,13 +252258,13 @@ PROGMEM const uint8_t DRUM_Xrhitom[] = {
   0xfd, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x03, 0x00, 0xfe, 0xff, 0x00, 0x00,
   0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x01, 0x00,
   0x01, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x01, 0x00, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from Tick1.wav, length = 640 bytes
 PROGMEM const uint8_t DRUM_Tick1[] = {
@@ -252337,7 +252375,8 @@ PROGMEM const uint8_t DRUM_Tick1[] = {
   0x95, 0x00, 0x79, 0x00, 0x47, 0x00, 0x85, 0x00, 0x43, 0x00, 0x37, 0x00,
   0x91, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x4c, 0x00, 0x3d, 0x00, 0x4d, 0x00,
   0xf7, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from M1-18.wav, length = 2240 bytes
 PROGMEM const uint8_t DRUM_M1_18[] = {
   0xdd, 0xfe, 0xa0, 0xfd, 0xe4, 0xfd, 0x73, 0xfd, 0x7f, 0xfd, 0x2b, 0xfd,
@@ -252711,11 +252750,12 @@ PROGMEM const uint8_t DRUM_M1_18[] = {
   0x04, 0x00, 0xfd, 0xff, 0x00, 0x00, 0x02, 0x00, 0xfd, 0xff, 0x02, 0x00,
   0x00, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x03, 0x00, 0xfe, 0xff,
   0x00, 0x00, 0x02, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from MD16_CLP.wav, length = 13312 bytes
 PROGMEM const uint8_t DRUM_Md16_clp[] = {
   0x16, 0x00, 0x39, 0x00, 0x3f, 0xff, 0xd8, 0xfd, 0xff, 0xff, 0x19, 0x01,
@@ -254927,22 +254967,23 @@ PROGMEM const uint8_t DRUM_Md16_clp[] = {
   0x1a, 0x00, 0x11, 0x00, 0x1d, 0x00, 0x15, 0x00, 0x12, 0x00, 0x16, 0x00,
   0x11, 0x00, 0x11, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x1e, 0x00, 0x1c, 0x00,
   0x1c, 0x00, 0x18, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from OHH909.wav, length = 23488 bytes
 PROGMEM const uint8_t DRUM_Ohh909[] = {
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0x02, 0xe6, 0xf2, 0xbb, 0xf3,
@@ -258850,22 +258891,23 @@ PROGMEM const uint8_t DRUM_Ohh909[] = {
   0xf0, 0xff, 0xfe, 0xff, 0x1d, 0x00, 0x18, 0x00, 0x03, 0x00, 0xe7, 0xff,
   0xf9, 0xff, 0xf9, 0xff, 0xfa, 0xff, 0xfb, 0xff, 0xfa, 0xff, 0xf9, 0xff,
   0xfa, 0xff, 0x1e, 0x00, 0xff, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from Quijada.wav, length = 36096 bytes
 PROGMEM const uint8_t DRUM_Quijada[] = {
   0xff, 0xff, 0x2a, 0x00, 0xde, 0x00, 0x82, 0x01, 0x89, 0x02, 0xe7, 0x02,
@@ -264880,13 +264922,14 @@ PROGMEM const uint8_t DRUM_Quijada[] = {
   0x03, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfd, 0xff, 0x02, 0x00,
   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from R8Tabla1.wav, length = 15488 bytes
 PROGMEM const uint8_t DRUM_tabla1[] = {
   0x26, 0x00, 0x6d, 0xff, 0x6f, 0xfd, 0xf8, 0xfb, 0xd2, 0xfa, 0xba, 0xfa,
@@ -267466,13 +267509,14 @@ PROGMEM const uint8_t DRUM_tabla1[] = {
   0x91, 0x00, 0x79, 0x00, 0x67, 0x00, 0x4e, 0x00, 0x4c, 0x00, 0x5a, 0x00,
   0x65, 0x00, 0x72, 0x00, 0x89, 0x00, 0x98, 0x00, 0x9d, 0x00, 0x99, 0x00,
   0x92, 0x00, 0x71, 0x00, 0x56, 0x00, 0x43, 0x00, 0x1f, 0x00, 0x14, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from Ride808.wav, length = 21696 bytes
 PROGMEM const uint8_t DRUM_Ride808[] = {
   0x58, 0x00, 0x54, 0xfb, 0x0f, 0xf7, 0xfc, 0xed, 0xc5, 0xf5, 0xf6, 0x2d,
@@ -271090,9 +271134,10 @@ PROGMEM const uint8_t DRUM_Ride808[] = {
   0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff,
   0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00,
   0x00, 0x00, 0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
 // Converted from scratch1.wav, length = 5888 bytes
 PROGMEM const uint8_t DRUM_Scratch1[] = {
   0xd5, 0xfb, 0xa9, 0xfa, 0x05, 0xfb, 0x0a, 0xfb, 0x3a, 0xfb, 0xb6, 0xfa,
@@ -272071,15 +272116,15 @@ PROGMEM const uint8_t DRUM_Scratch1[] = {
   0x04, 0x00, 0x07, 0x00, 0x02, 0x00, 0x07, 0x00, 0x01, 0x00, 0x05, 0x00,
   0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00, 0xfe, 0xff, 0x03, 0x00,
   0x02, 0x00, 0xfc, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 // Converted from TomLow.wav, length = 15360 bytes
 PROGMEM const uint8_t DRUM_Tomlow[] = {
@@ -274642,9 +274687,10 @@ PROGMEM const uint8_t DRUM_Tomlow[] = {
   0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x02, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00,
   0x00, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 // Converted from Tom808.wav, length = 6272 bytes
 PROGMEM const uint8_t DRUM_Tom808[] = {
   0x97, 0xfc, 0xf7, 0xeb, 0x0f, 0xd6, 0xb2, 0xc2, 0x55, 0xb2, 0xe7, 0xa2,
@@ -275687,16 +275733,17 @@ PROGMEM const uint8_t DRUM_Tom808[] = {
   0x71, 0x00, 0x5d, 0x00, 0x5d, 0x00, 0x4a, 0x00, 0x48, 0x00, 0x39, 0x00,
   0x32, 0x00, 0x28, 0x00, 0x1f, 0x00, 0x16, 0x00, 0x0d, 0x00, 0x07, 0x00,
   0xfc, 0xff
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00,
+};
 // Converted from vl1-Lbeep.wav, length = 3008 bytes
 PROGMEM const uint8_t DRUM_Vl1Lbeep[] = {
   0xeb, 0xf9, 0x17, 0x07, 0xe8, 0x63, 0x8b, 0x7b, 0x80, 0x6f, 0x4d, 0x75,
@@ -276194,17 +276241,18 @@ PROGMEM const uint8_t DRUM_Vl1Lbeep[] = {
   0x02, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0xff, 0xff, 0x02, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff,
   0x02, 0x00
-,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
 
 drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
 {
@@ -276336,7 +276384,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
     0.0
   },
 #endif
-#if defined(ARDUINO_TEENSY41) 
+#if defined(TEENSY4_1)
   {
     DRUM_BASS,
     MIDI_B2,
diff --git a/effect_freeverb_simd.cpp b/effect_freeverb_simd.cpp
new file mode 100644
index 0000000..3371a95
--- /dev/null
+++ b/effect_freeverb_simd.cpp
@@ -0,0 +1,837 @@
+/* Audio Library for Teensy 3.X
+   Copyright (c) 2018, Paul Stoffregen, paul@pjrc.com
+
+   Development of this audio library was funded by PJRC.COM, LLC by sales of
+   Teensy and Audio Adaptor boards.  Please support PJRC's efforts to develop
+   open source software by purchasing Teensy or other PJRC products.
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice, development funding notice, and this permission
+   notice shall be included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+*/
+
+// A fixed point implementation of Freeverb by Jezar at Dreampoint
+//  http://blog.bjornroche.com/2012/06/freeverb-original-public-domain-code-by.html
+//  https://music.columbia.edu/pipermail/music-dsp/2001-October/045433.html
+
+#include <Arduino.h>
+#include "effect_freeverb_simd.h"
+#include "utility/dspinst.h"
+
+AudioEffectFreeverbSIMD::AudioEffectFreeverbSIMD() : AudioStream(1, inputQueueArray)
+{
+  memset(comb1buf, 0, sizeof(comb1buf));
+  memset(comb2buf, 0, sizeof(comb2buf));
+  memset(comb3buf, 0, sizeof(comb3buf));
+  memset(comb4buf, 0, sizeof(comb4buf));
+  memset(comb5buf, 0, sizeof(comb5buf));
+  memset(comb6buf, 0, sizeof(comb6buf));
+  memset(comb7buf, 0, sizeof(comb7buf));
+  memset(comb8buf, 0, sizeof(comb8buf));
+  comb1index = 0;
+  comb2index = 0;
+  comb3index = 0;
+  comb4index = 0;
+  comb5index = 0;
+  comb6index = 0;
+  comb7index = 0;
+  comb8index = 0;
+  comb1filter = 0;
+  comb2filter = 0;
+  comb3filter = 0;
+  comb4filter = 0;
+  comb5filter = 0;
+  comb6filter = 0;
+  comb7filter = 0;
+  comb8filter = 0;
+  combdamp1 = 6553;
+  combdamp2 = 26215;
+  combfeeback = 27524;
+  memset(allpass1buf, 0, sizeof(allpass1buf));
+  memset(allpass2buf, 0, sizeof(allpass2buf));
+  memset(allpass3buf, 0, sizeof(allpass3buf));
+  memset(allpass4buf, 0, sizeof(allpass4buf));
+  allpass1index = 0;
+  allpass2index = 0;
+  allpass3index = 0;
+  allpass4index = 0;
+}
+
+
+// cleaner sat16 by http://www.moseleyinstruments.com/
+__attribute__((unused))
+static int16_t sat16(int32_t n, int rshift) {
+  // we should always round towards 0
+  // to avoid recirculating round-off noise
+  //
+  // a 2s complement positive number is always
+  // rounded down, so we only need to take
+  // care of negative numbers
+  if (n < 0) {
+    n = n + (~(0xFFFFFFFFUL << rshift));
+  }
+  n = n >> rshift;
+  if (n > 32767) {
+    return 32767;
+  }
+  if (n < -32768) {
+    return -32768;
+  }
+  return n;
+}
+
+// TODO: move this to one of the data files, use in output_adat.cpp, output_tdm.cpp, etc
+static const audio_block_t zeroblock = {
+  0, 0, 0, {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#if AUDIO_BLOCK_SAMPLES > 16
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
+#if AUDIO_BLOCK_SAMPLES > 32
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
+#if AUDIO_BLOCK_SAMPLES > 48
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
+#if AUDIO_BLOCK_SAMPLES > 64
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
+#if AUDIO_BLOCK_SAMPLES > 80
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
+#if AUDIO_BLOCK_SAMPLES > 96
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
+#if AUDIO_BLOCK_SAMPLES > 112
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+#endif
+  }
+};
+
+void AudioEffectFreeverbSIMD::update()
+{
+#if defined(__ARM_ARCH_7EM__)
+  const audio_block_t *block;
+  audio_block_t *outblock;
+  int i;
+  int16_t input, bufout, output;
+  int32_t sum;
+
+  uint32_t PackA, PackB;
+
+
+  outblock = allocate();
+  if (!outblock) {
+    audio_block_t *tmp = receiveReadOnly(0);
+    if (tmp) release(tmp);
+    return;
+  }
+  block = receiveReadOnly(0);
+  if (!block) block = &zeroblock;
+
+
+  for (i = 0; i < AUDIO_BLOCK_SAMPLES; i++) {
+
+    // TODO: scale numerical range depending on roomsize & damping
+
+    asm volatile(
+      "MUL %[RESULT], %[BLOCK], %[CONST]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(input)
+      :[BLOCK]"r"((int32_t)block->data[i]), [CONST]"r"(8738), [R_RND]"r"(0x1FFFF), [I_SHIFT]"i"(17)
+      :
+    );
+
+    sum = 0;
+
+    asm volatile (
+      "QADD %[SUM], %[C1], %[C2]\n"
+      "QADD %[SUM], %[C3], %[SUM]\n"
+      "QADD %[SUM], %[C4], %[SUM]\n"
+      "QADD %[SUM], %[C5], %[SUM]\n"
+      "QADD %[SUM], %[C6], %[SUM]\n"
+      "QADD %[SUM], %[C7], %[SUM]\n"
+      "QADD %[SUM], %[C8], %[SUM]\n"
+      :[SUM]"=r"(sum)
+      :[C1]"r"((int32_t)comb1buf[comb1index]), [C2]"r"((int32_t)comb2buf[comb2index]), [C3]"r"((int32_t)comb3buf[comb3index]), [C4]"r"((int32_t)comb4buf[comb4index]), [C5]"r"((int32_t)comb5buf[comb5index]), [C6]"r"((int32_t)comb6buf[comb6index]), [C7]"r"((int32_t)comb7buf[comb7index]), [C8]"r"((int32_t)comb8buf[comb8index])
+      :
+    );
+
+    //output = asm_sat16((sum * 31457), 0x1FFFF, 17);
+
+    asm volatile (
+      "MUL %[RESULT], %[SUM], %[CONST]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(output)
+      :[SUM]"r"((int32_t)sum), [CONST]"r"(31457), [R_RND]"r"(0x1FFFF), [I_SHIFT]"i"(17)
+      :
+    );
+
+    // Comb1
+    asm volatile (
+      "PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKA]"=&r"(PackA)
+      :[INTOP]"r"(comb1buf[comb1index]), [INBOT]"r"(comb1filter)
+      :
+    );
+    asm volatile (
+      "PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKB]"=&r"(PackB)
+      :[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1)
+      :
+    );
+    asm volatile(
+      "BIC %[RESULT], %[RESULT], #0\n"
+      "SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(comb1filter)
+      :[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :"memory"
+    );
+    asm volatile (
+      "MUL %[RESULT], %[FIL], %[FB]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      "ADD %[RESULT], %[RESULT], %[IN]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(comb1buf[comb1index])
+      :[FIL]"r"(comb1filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :
+    );
+
+    // Comb2
+    asm volatile (
+      "PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKA]"=&r"(PackA)
+      :[INTOP]"r"(comb2buf[comb2index]), [INBOT]"r"(comb2filter)
+      :
+    );
+    asm volatile (
+      "PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKB]"=&r"(PackB)
+      :[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1)
+      :
+    );
+    asm volatile(
+      "BIC %[RESULT], %[RESULT], #0\n"
+      "SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(comb2filter)
+      :[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :"memory"
+    );
+    asm volatile (
+      "MUL %[RESULT], %[FIL], %[FB]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      "ADD %[RESULT], %[RESULT], %[IN]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(comb2buf[comb2index])
+      :[FIL]"r"(comb2filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :
+    );
+
+
+    // Comb3
+
+    asm volatile (
+      "PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKA]"=&r"(PackA)
+      :[INTOP]"r"(comb3buf[comb3index]), [INBOT]"r"(comb3filter)
+      :
+    );
+    asm volatile (
+      "PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKB]"=&r"(PackB)
+      :[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1)
+      :
+    );
+    asm volatile(
+      "BIC %[RESULT], %[RESULT], #0\n"
+      "SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(comb3filter)
+      :[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :"memory"
+    );
+    asm volatile (
+      "MUL %[RESULT], %[FIL], %[FB]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      "ADD %[RESULT], %[RESULT], %[IN]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(comb3buf[comb3index])
+      :[FIL]"r"(comb3filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :
+    );
+
+    // Comb4
+    asm volatile (
+      "PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKA]"=&r"(PackA)
+      :[INTOP]"r"(comb4buf[comb4index]), [INBOT]"r"(comb4filter)
+      :
+    );
+    asm volatile (
+      "PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKB]"=&r"(PackB)
+      :[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1)
+      :
+    );
+    asm volatile(
+      "BIC %[RESULT], %[RESULT], #0\n"
+      "SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(comb4filter)
+      :[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :"memory"
+    );
+    asm volatile (
+      "MUL %[RESULT], %[FIL], %[FB]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      "ADD %[RESULT], %[RESULT], %[IN]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(comb4buf[comb4index])
+      :[FIL]"r"(comb4filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :
+    );
+
+
+
+    // Comb5
+    asm volatile (
+      "PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKA]"=&r"(PackA)
+      :[INTOP]"r"(comb5buf[comb5index]), [INBOT]"r"(comb5filter)
+      :
+    );
+    asm volatile (
+      "PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKB]"=&r"(PackB)
+      :[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1)
+      :
+    );
+    asm volatile(
+      "BIC %[RESULT], %[RESULT], #0\n"
+      "SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(comb5filter)
+      :[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :"memory"
+    );
+    asm volatile (
+      "MUL %[RESULT], %[FIL], %[FB]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      "ADD %[RESULT], %[RESULT], %[IN]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(comb5buf[comb5index])
+      :[FIL]"r"(comb5filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :
+    );
+
+
+    // Comb6
+    asm volatile (
+      "PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKA]"=&r"(PackA)
+      :[INTOP]"r"(comb6buf[comb6index]), [INBOT]"r"(comb6filter)
+      :
+    );
+    asm volatile (
+      "PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKB]"=&r"(PackB)
+      :[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1)
+      :
+    );
+    asm volatile(
+      "BIC %[RESULT], %[RESULT], #0\n"
+      "SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(comb6filter)
+      :[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :"memory"
+    );
+    asm volatile (
+      "MUL %[RESULT], %[FIL], %[FB]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      "ADD %[RESULT], %[RESULT], %[IN]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(comb6buf[comb6index])
+      :[FIL]"r"(comb6filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :
+    );
+
+    // Comb7
+    asm volatile (
+      "PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKA]"=&r"(PackA)
+      :[INTOP]"r"(comb7buf[comb7index]), [INBOT]"r"(comb7filter)
+      :
+    );
+    asm volatile (
+      "PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKB]"=&r"(PackB)
+      :[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1)
+      :
+    );
+    asm volatile(
+      "BIC %[RESULT], %[RESULT], #0\n"
+      "SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(comb7filter)
+      :[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :"memory"
+    );
+    asm volatile (
+      "MUL %[RESULT], %[FIL], %[FB]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      "ADD %[RESULT], %[RESULT], %[IN]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(comb7buf[comb7index])
+      :[FIL]"r"(comb7filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :
+    );
+
+
+    // Comb8
+    asm volatile (
+      "PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKA]"=&r"(PackA)
+      :[INTOP]"r"(comb8buf[comb8index]), [INBOT]"r"(comb8filter)
+      :
+    );
+    asm volatile (
+      "PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n"
+      :[PACKB]"=&r"(PackB)
+      :[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1)
+      :
+    );
+    asm volatile(
+      "BIC %[RESULT], %[RESULT], #0\n"
+      "SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(comb8filter)
+      :[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :"memory"
+    );
+
+
+    asm volatile(
+      "MUL %[RESULT], %[FIL], %[FB]\n"
+      "CMN %[RESULT], #0\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      "ADD %[RESULT], %[RESULT], %[IN]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(comb8buf[comb8index])
+      :[FIL]"r"(comb8filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15)
+      :
+    );
+
+
+    bufout = allpass1buf[allpass1index];
+    allpass1buf[allpass1index] = output + (bufout >> 1);
+    asm volatile(
+      "SUBS %[RESULT], %[BUF], %[OUT]\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(output)
+      :[BUF]"r"((int32_t)bufout), [OUT]"r"((int32_t)output), [R_RND]"r"(0x1), [I_SHIFT]"i"(1)
+      :
+    );
+
+
+    bufout = allpass2buf[allpass2index];
+    allpass2buf[allpass2index] = output + (bufout >> 1);
+    asm volatile(
+      "SUBS %[RESULT], %[BUF], %[OUT]\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(output)
+      :[BUF]"r"((int32_t)bufout), [OUT]"r"((int32_t)output), [R_RND]"r"(0x1), [I_SHIFT]"i"(1)
+      :
+    );
+
+
+    bufout = allpass3buf[allpass3index];
+    allpass3buf[allpass3index] = output + (bufout >> 1);
+    asm volatile(
+      "SUBS %[RESULT], %[BUF], %[OUT]\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(output)
+      :[BUF]"r"((int32_t)bufout), [OUT]"r"((int32_t)output), [R_RND]"r"(0x1), [I_SHIFT]"i"(1)
+      :
+    );
+
+
+    bufout = allpass4buf[allpass4index];
+    allpass4buf[allpass4index] = output + (bufout >> 1);
+    asm volatile(
+      "SUBS %[RESULT], %[BUF], %[OUT]\n"
+      "IT MI\n"
+      "ADDMI %[RESULT], %[RESULT], %[R_RND]\n"
+      "SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n"
+      :[RESULT]"=&r"(output)
+      :[BUF]"r"((int32_t)bufout), [OUT]"r"((int32_t)output), [R_RND]"r"(0x1), [I_SHIFT]"i"(1)
+      :
+    );
+
+
+    asm volatile(
+      "MUL %[RESULT], %[OUT], %[CONST]\n"
+      "SSAT %[RESULT], #16, %[RESULT]\n"
+      :[RESULT]"=&r"(outblock->data[i])
+      :[OUT]"r"((int32_t)output), [CONST]"r"(30)
+      :
+    );
+
+
+    if (++allpass1index >= sizeof(allpass1buf) / sizeof(int16_t)) allpass1index = 0;
+    if (++allpass2index >= sizeof(allpass2buf) / sizeof(int16_t)) allpass2index = 0;
+    if (++allpass3index >= sizeof(allpass3buf) / sizeof(int16_t)) allpass3index = 0;
+    if (++allpass4index >= sizeof(allpass4buf) / sizeof(int16_t)) allpass4index = 0;
+
+    if (++comb1index >= sizeof(comb1buf) / sizeof(int16_t)) comb1index = 0;
+    if (++comb2index >= sizeof(comb2buf) / sizeof(int16_t)) comb2index = 0;
+    if (++comb3index >= sizeof(comb3buf) / sizeof(int16_t)) comb3index = 0;
+    if (++comb4index >= sizeof(comb4buf) / sizeof(int16_t)) comb4index = 0;
+    if (++comb5index >= sizeof(comb5buf) / sizeof(int16_t)) comb5index = 0;
+    if (++comb6index >= sizeof(comb6buf) / sizeof(int16_t)) comb6index = 0;
+    if (++comb7index >= sizeof(comb7buf) / sizeof(int16_t)) comb7index = 0;
+    if (++comb8index >= sizeof(comb8buf) / sizeof(int16_t)) comb8index = 0;
+
+
+
+  }
+  transmit(outblock);
+  release(outblock);
+  if (block != &zeroblock) release((audio_block_t *)block);
+
+#elif defined(KINETISL)
+  audio_block_t *block;
+  block = receiveReadOnly(0);
+  if (block) release(block);
+#endif
+}
+
+AudioEffectFreeverbSIMDStereo::AudioEffectFreeverbSIMDStereo() : AudioStream(1, inputQueueArray)
+{
+  memset(comb1bufL, 0, sizeof(comb1bufL));
+  memset(comb2bufL, 0, sizeof(comb2bufL));
+  memset(comb3bufL, 0, sizeof(comb3bufL));
+  memset(comb4bufL, 0, sizeof(comb4bufL));
+  memset(comb5bufL, 0, sizeof(comb5bufL));
+  memset(comb6bufL, 0, sizeof(comb6bufL));
+  memset(comb7bufL, 0, sizeof(comb7bufL));
+  memset(comb8bufL, 0, sizeof(comb8bufL));
+  comb1indexL = 0;
+  comb2indexL = 0;
+  comb3indexL = 0;
+  comb4indexL = 0;
+  comb5indexL = 0;
+  comb6indexL = 0;
+  comb7indexL = 0;
+  comb8indexL = 0;
+  comb1filterL = 0;
+  comb2filterL = 0;
+  comb3filterL = 0;
+  comb4filterL = 0;
+  comb5filterL = 0;
+  comb6filterL = 0;
+  comb7filterL = 0;
+  comb8filterL = 0;
+  memset(comb1bufR, 0, sizeof(comb1bufR));
+  memset(comb2bufR, 0, sizeof(comb2bufR));
+  memset(comb3bufR, 0, sizeof(comb3bufR));
+  memset(comb4bufR, 0, sizeof(comb4bufR));
+  memset(comb5bufR, 0, sizeof(comb5bufR));
+  memset(comb6bufR, 0, sizeof(comb6bufR));
+  memset(comb7bufR, 0, sizeof(comb7bufR));
+  memset(comb8bufR, 0, sizeof(comb8bufR));
+  comb1indexR = 0;
+  comb2indexR = 0;
+  comb3indexR = 0;
+  comb4indexR = 0;
+  comb5indexR = 0;
+  comb6indexR = 0;
+  comb7indexR = 0;
+  comb8indexR = 0;
+  comb1filterR = 0;
+  comb2filterR = 0;
+  comb3filterR = 0;
+  comb4filterR = 0;
+  comb5filterR = 0;
+  comb6filterR = 0;
+  comb7filterR = 0;
+  comb8filterR = 0;
+  combdamp1 = 6553;
+  combdamp2 = 26215;
+  combfeeback = 27524;
+  memset(allpass1bufL, 0, sizeof(allpass1bufL));
+  memset(allpass2bufL, 0, sizeof(allpass2bufL));
+  memset(allpass3bufL, 0, sizeof(allpass3bufL));
+  memset(allpass4bufL, 0, sizeof(allpass4bufL));
+  allpass1indexL = 0;
+  allpass2indexL = 0;
+  allpass3indexL = 0;
+  allpass4indexL = 0;
+  memset(allpass1bufR, 0, sizeof(allpass1bufR));
+  memset(allpass2bufR, 0, sizeof(allpass2bufR));
+  memset(allpass3bufR, 0, sizeof(allpass3bufR));
+  memset(allpass4bufR, 0, sizeof(allpass4bufR));
+  allpass1indexR = 0;
+  allpass2indexR = 0;
+  allpass3indexR = 0;
+  allpass4indexR = 0;
+}
+
+void AudioEffectFreeverbSIMDStereo::update()
+{
+#if defined(__ARM_ARCH_7EM__)
+  const audio_block_t *block;
+  audio_block_t *outblockL;
+  audio_block_t *outblockR;
+  int i;
+  int16_t input, bufout, outputL, outputR;
+  int32_t sum;
+
+  block = receiveReadOnly(0);
+  outblockL = allocate();
+  outblockR = allocate();
+  if (!outblockL || !outblockR) {
+    if (outblockL) release(outblockL);
+    if (outblockR) release(outblockR);
+    if (block) release((audio_block_t *)block);
+    return;
+  }
+  if (!block) block = &zeroblock;
+
+  for (i = 0; i < AUDIO_BLOCK_SAMPLES; i++) {
+    // TODO: scale numerical range depending on roomsize & damping
+    input = sat16(block->data[i] * 8738, 17); // for numerical headroom
+    sum = 0;
+
+    bufout = comb1bufL[comb1indexL];
+    sum += bufout;
+    comb1filterL = sat16(bufout * combdamp2 + comb1filterL * combdamp1, 15);
+    comb1bufL[comb1indexL] = sat16(input + sat16(comb1filterL * combfeeback, 15), 0);
+    if (++comb1indexL >= sizeof(comb1bufL) / sizeof(int16_t)) comb1indexL = 0;
+
+    bufout = comb2bufL[comb2indexL];
+    sum += bufout;
+    comb2filterL = sat16(bufout * combdamp2 + comb2filterL * combdamp1, 15);
+    comb2bufL[comb2indexL] = sat16(input + sat16(comb2filterL * combfeeback, 15), 0);
+    if (++comb2indexL >= sizeof(comb2bufL) / sizeof(int16_t)) comb2indexL = 0;
+
+    bufout = comb3bufL[comb3indexL];
+    sum += bufout;
+    comb3filterL = sat16(bufout * combdamp2 + comb3filterL * combdamp1, 15);
+    comb3bufL[comb3indexL] = sat16(input + sat16(comb3filterL * combfeeback, 15), 0);
+    if (++comb3indexL >= sizeof(comb3bufL) / sizeof(int16_t)) comb3indexL = 0;
+
+    bufout = comb4bufL[comb4indexL];
+    sum += bufout;
+    comb4filterL = sat16(bufout * combdamp2 + comb4filterL * combdamp1, 15);
+    comb4bufL[comb4indexL] = sat16(input + sat16(comb4filterL * combfeeback, 15), 0);
+    if (++comb4indexL >= sizeof(comb4bufL) / sizeof(int16_t)) comb4indexL = 0;
+
+    bufout = comb5bufL[comb5indexL];
+    sum += bufout;
+    comb5filterL = sat16(bufout * combdamp2 + comb5filterL * combdamp1, 15);
+    comb5bufL[comb5indexL] = sat16(input + sat16(comb5filterL * combfeeback, 15), 0);
+    if (++comb5indexL >= sizeof(comb5bufL) / sizeof(int16_t)) comb5indexL = 0;
+
+    bufout = comb6bufL[comb6indexL];
+    sum += bufout;
+    comb6filterL = sat16(bufout * combdamp2 + comb6filterL * combdamp1, 15);
+    comb6bufL[comb6indexL] = sat16(input + sat16(comb6filterL * combfeeback, 15), 0);
+    if (++comb6indexL >= sizeof(comb6bufL) / sizeof(int16_t)) comb6indexL = 0;
+
+    bufout = comb7bufL[comb7indexL];
+    sum += bufout;
+    comb7filterL = sat16(bufout * combdamp2 + comb7filterL * combdamp1, 15);
+    comb7bufL[comb7indexL] = sat16(input + sat16(comb7filterL * combfeeback, 15), 0);
+    if (++comb7indexL >= sizeof(comb7bufL) / sizeof(int16_t)) comb7indexL = 0;
+
+    bufout = comb8bufL[comb8indexL];
+    sum += bufout;
+    comb8filterL = sat16(bufout * combdamp2 + comb8filterL * combdamp1, 15);
+    comb8bufL[comb8indexL] = sat16(input + sat16(comb8filterL * combfeeback, 15), 0);
+    if (++comb8indexL >= sizeof(comb8bufL) / sizeof(int16_t)) comb8indexL = 0;
+
+    outputL = sat16(sum * 31457, 17);
+    sum = 0;
+
+    bufout = comb1bufR[comb1indexR];
+    sum += bufout;
+    comb1filterR = sat16(bufout * combdamp2 + comb1filterR * combdamp1, 15);
+    comb1bufR[comb1indexR] = sat16(input + sat16(comb1filterR * combfeeback, 15), 0);
+    if (++comb1indexR >= sizeof(comb1bufR) / sizeof(int16_t)) comb1indexR = 0;
+
+    bufout = comb2bufR[comb2indexR];
+    sum += bufout;
+    comb2filterR = sat16(bufout * combdamp2 + comb2filterR * combdamp1, 15);
+    comb2bufR[comb2indexR] = sat16(input + sat16(comb2filterR * combfeeback, 15), 0);
+    if (++comb2indexR >= sizeof(comb2bufR) / sizeof(int16_t)) comb2indexR = 0;
+
+    bufout = comb3bufR[comb3indexR];
+    sum += bufout;
+    comb3filterR = sat16(bufout * combdamp2 + comb3filterR * combdamp1, 15);
+    comb3bufR[comb3indexR] = sat16(input + sat16(comb3filterR * combfeeback, 15), 0);
+    if (++comb3indexR >= sizeof(comb3bufR) / sizeof(int16_t)) comb3indexR = 0;
+
+    bufout = comb4bufR[comb4indexR];
+    sum += bufout;
+    comb4filterR = sat16(bufout * combdamp2 + comb4filterR * combdamp1, 15);
+    comb4bufR[comb4indexR] = sat16(input + sat16(comb4filterR * combfeeback, 15), 0);
+    if (++comb4indexR >= sizeof(comb4bufR) / sizeof(int16_t)) comb4indexR = 0;
+
+    bufout = comb5bufR[comb5indexR];
+    sum += bufout;
+    comb5filterR = sat16(bufout * combdamp2 + comb5filterR * combdamp1, 15);
+    comb5bufR[comb5indexR] = sat16(input + sat16(comb5filterR * combfeeback, 15), 0);
+    if (++comb5indexR >= sizeof(comb5bufR) / sizeof(int16_t)) comb5indexR = 0;
+
+    bufout = comb6bufR[comb6indexR];
+    sum += bufout;
+    comb6filterR = sat16(bufout * combdamp2 + comb6filterR * combdamp1, 15);
+    comb6bufR[comb6indexR] = sat16(input + sat16(comb6filterR * combfeeback, 15), 0);
+    if (++comb6indexR >= sizeof(comb6bufR) / sizeof(int16_t)) comb6indexR = 0;
+
+    bufout = comb7bufR[comb7indexR];
+    sum += bufout;
+    comb7filterR = sat16(bufout * combdamp2 + comb7filterR * combdamp1, 15);
+    comb7bufR[comb7indexR] = sat16(input + sat16(comb7filterR * combfeeback, 15), 0);
+    if (++comb7indexR >= sizeof(comb7bufR) / sizeof(int16_t)) comb7indexR = 0;
+
+    bufout = comb8bufR[comb8indexR];
+    sum += bufout;
+    comb8filterR = sat16(bufout * combdamp2 + comb8filterR * combdamp1, 15);
+    comb8bufR[comb8indexR] = sat16(input + sat16(comb8filterR * combfeeback, 15), 0);
+    if (++comb8indexR >= sizeof(comb8bufR) / sizeof(int16_t)) comb8indexR = 0;
+
+    outputR = sat16(sum * 31457, 17);
+
+    bufout = allpass1bufL[allpass1indexL];
+    allpass1bufL[allpass1indexL] = outputL + (bufout >> 1);
+    outputL = sat16(bufout - outputL, 1);
+    if (++allpass1indexL >= sizeof(allpass1bufL) / sizeof(int16_t)) allpass1indexL = 0;
+
+    bufout = allpass2bufL[allpass2indexL];
+    allpass2bufL[allpass2indexL] = outputL + (bufout >> 1);
+    outputL = sat16(bufout - outputL, 1);
+    if (++allpass2indexL >= sizeof(allpass2bufL) / sizeof(int16_t)) allpass2indexL = 0;
+
+    bufout = allpass3bufL[allpass3indexL];
+    allpass3bufL[allpass3indexL] = outputL + (bufout >> 1);
+    outputL = sat16(bufout - outputL, 1);
+    if (++allpass3indexL >= sizeof(allpass3bufL) / sizeof(int16_t)) allpass3indexL = 0;
+
+    bufout = allpass4bufL[allpass4indexL];
+    allpass4bufL[allpass4indexL] = outputL + (bufout >> 1);
+    outputL = sat16(bufout - outputL, 1);
+    if (++allpass4indexL >= sizeof(allpass4bufL) / sizeof(int16_t)) allpass4indexL = 0;
+
+    outblockL->data[i] = sat16(outputL * 30, 0);
+
+    bufout = allpass1bufR[allpass1indexR];
+    allpass1bufR[allpass1indexR] = outputR + (bufout >> 1);
+    outputR = sat16(bufout - outputR, 1);
+    if (++allpass1indexR >= sizeof(allpass1bufR) / sizeof(int16_t)) allpass1indexR = 0;
+
+    bufout = allpass2bufR[allpass2indexR];
+    allpass2bufR[allpass2indexR] = outputR + (bufout >> 1);
+    outputR = sat16(bufout - outputR, 1);
+    if (++allpass2indexR >= sizeof(allpass2bufR) / sizeof(int16_t)) allpass2indexR = 0;
+
+    bufout = allpass3bufR[allpass3indexR];
+    allpass3bufR[allpass3indexR] = outputR + (bufout >> 1);
+    outputR = sat16(bufout - outputR, 1);
+    if (++allpass3indexR >= sizeof(allpass3bufR) / sizeof(int16_t)) allpass3indexR = 0;
+
+    bufout = allpass4bufR[allpass4indexR];
+    allpass4bufR[allpass4indexR] = outputR + (bufout >> 1);
+    outputR = sat16(bufout - outputR, 1);
+    if (++allpass4indexR >= sizeof(allpass4bufR) / sizeof(int16_t)) allpass4indexR = 0;
+
+    outblockR->data[i] = sat16(outputL * 30, 0);
+  }
+  transmit(outblockL, 0);
+  transmit(outblockR, 1);
+  release(outblockL);
+  release(outblockR);
+  if (block != &zeroblock) release((audio_block_t *)block);
+
+#elif defined(KINETISL)
+  audio_block_t *block;
+  block = receiveReadOnly(0);
+  if (block) release(block);
+#endif
+}
diff --git a/effect_freeverb_simd.h b/effect_freeverb_simd.h
new file mode 100644
index 0000000..863f06d
--- /dev/null
+++ b/effect_freeverb_simd.h
@@ -0,0 +1,184 @@
+/* Audio Library for Teensy 3.X
+   Copyright (c) 2018, Paul Stoffregen, paul@pjrc.com
+
+   Development of this audio library was funded by PJRC.COM, LLC by sales of
+   Teensy and Audio Adaptor boards.  Please support PJRC's efforts to develop
+   open source software by purchasing Teensy or other PJRC products.
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice, development funding notice, and this permission
+   notice shall be included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+*/
+
+#ifndef effect_freeverb_simd_h_
+#define effect_freeverb_simd_h_
+#include <Arduino.h>
+#include "AudioStream.h"
+
+class AudioEffectFreeverbSIMD : public AudioStream
+{
+  public:
+    AudioEffectFreeverbSIMD();
+    virtual void update();
+    void roomsize(float n) {
+      if (n > 1.0f) n = 1.0f;
+      else if (n < 0.0f) n = 0.0f;
+      combfeeback = (int)(n * 9175.04f) + 22937;
+    }
+    void damping(float n) {
+      if (n > 1.0f) n = 1.0f;
+      else if (n < 0.0f) n = 0.0f;
+      int x1 = (int)(n * 13107.2f);
+      int x2 = 32768 - x1;
+      __disable_irq();
+      combdamp1 = x1;
+      combdamp2 = x2;
+      __enable_irq();
+    }
+  private:
+    audio_block_t *inputQueueArray[1];
+    int16_t comb1buf[1116];
+    int16_t comb2buf[1188];
+    int16_t comb3buf[1277];
+    int16_t comb4buf[1356];
+    int16_t comb5buf[1422];
+    int16_t comb6buf[1491];
+    int16_t comb7buf[1557];
+    int16_t comb8buf[1617];
+    uint16_t comb1index;
+    uint16_t comb2index;
+    uint16_t comb3index;
+    uint16_t comb4index;
+    uint16_t comb5index;
+    uint16_t comb6index;
+    uint16_t comb7index;
+    uint16_t comb8index;
+    int16_t comb1filter;
+    int16_t comb2filter;
+    int16_t comb3filter;
+    int16_t comb4filter;
+    int16_t comb5filter;
+    int16_t comb6filter;
+    int16_t comb7filter;
+    int16_t comb8filter;
+    int16_t combdamp1;
+    int16_t combdamp2;
+    int16_t combfeeback;
+    int16_t allpass1buf[556];
+    int16_t allpass2buf[441];
+    int16_t allpass3buf[341];
+    int16_t allpass4buf[225];
+    uint16_t allpass1index;
+    uint16_t allpass2index;
+    uint16_t allpass3index;
+    uint16_t allpass4index;
+};
+
+
+class AudioEffectFreeverbSIMDStereo : public AudioStream
+{
+  public:
+    AudioEffectFreeverbSIMDStereo();
+    virtual void update();
+    void roomsize(float n) {
+      if (n > 1.0f) n = 1.0f;
+      else if (n < 0.0f) n = 0.0f;
+      combfeeback = (int)(n * 9175.04f) + 22937;
+    }
+    void damping(float n) {
+      if (n > 1.0f) n = 1.0f;
+      else if (n < 0.0f) n = 0.0f;
+      int x1 = (int)(n * 13107.2f);
+      int x2 = 32768 - x1;
+      __disable_irq();
+      combdamp1 = x1;
+      combdamp2 = x2;
+      __enable_irq();
+    }
+  private:
+    audio_block_t *inputQueueArray[1];
+    int16_t comb1bufL[1116];
+    int16_t comb2bufL[1188];
+    int16_t comb3bufL[1277];
+    int16_t comb4bufL[1356];
+    int16_t comb5bufL[1422];
+    int16_t comb6bufL[1491];
+    int16_t comb7bufL[1557];
+    int16_t comb8bufL[1617];
+    uint16_t comb1indexL;
+    uint16_t comb2indexL;
+    uint16_t comb3indexL;
+    uint16_t comb4indexL;
+    uint16_t comb5indexL;
+    uint16_t comb6indexL;
+    uint16_t comb7indexL;
+    uint16_t comb8indexL;
+    int16_t comb1filterL;
+    int16_t comb2filterL;
+    int16_t comb3filterL;
+    int16_t comb4filterL;
+    int16_t comb5filterL;
+    int16_t comb6filterL;
+    int16_t comb7filterL;
+    int16_t comb8filterL;
+    int16_t comb1bufR[1139];
+    int16_t comb2bufR[1211];
+    int16_t comb3bufR[1300];
+    int16_t comb4bufR[1379];
+    int16_t comb5bufR[1445];
+    int16_t comb6bufR[1514];
+    int16_t comb7bufR[1580];
+    int16_t comb8bufR[1640];
+    uint16_t comb1indexR;
+    uint16_t comb2indexR;
+    uint16_t comb3indexR;
+    uint16_t comb4indexR;
+    uint16_t comb5indexR;
+    uint16_t comb6indexR;
+    uint16_t comb7indexR;
+    uint16_t comb8indexR;
+    int16_t comb1filterR;
+    int16_t comb2filterR;
+    int16_t comb3filterR;
+    int16_t comb4filterR;
+    int16_t comb5filterR;
+    int16_t comb6filterR;
+    int16_t comb7filterR;
+    int16_t comb8filterR;
+    int16_t combdamp1;
+    int16_t combdamp2;
+    int16_t combfeeback;
+    int16_t allpass1bufL[556];
+    int16_t allpass2bufL[441];
+    int16_t allpass3bufL[341];
+    int16_t allpass4bufL[225];
+    uint16_t allpass1indexL;
+    uint16_t allpass2indexL;
+    uint16_t allpass3indexL;
+    uint16_t allpass4indexL;
+    int16_t allpass1bufR[579];
+    int16_t allpass2bufR[464];
+    int16_t allpass3bufR[364];
+    int16_t allpass4bufR[248];
+    uint16_t allpass1indexR;
+    uint16_t allpass2indexR;
+    uint16_t allpass3indexR;
+    uint16_t allpass4indexR;
+};
+
+
+#endif