diff --git a/UI.hpp b/UI.hpp
index 2698588..d758846 100644
--- a/UI.hpp
+++ b/UI.hpp
@@ -4070,23 +4070,12 @@ void UI_func_drum_midi_channel(uint8_t param) {
   if (LCDML.FUNC_loop())  // ****** LOOP *********
   {
     if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up())) {
-      /*if (LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) {
-      
-        if (configuration.drums.midi_channel + ENCODER[ENC_R].speed() < MIDI_CHANNEL_MAX)
-          configuration.drums.midi_channel += ENCODER[ENC_R].speed();
-        else
-          configuration.drums.midi_channel = MIDI_CHANNEL_MAX;
-      } else if (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()) {
-        if (configuration.drums.midi_channel - ENCODER[ENC_R].speed() > MIDI_CHANNEL_MIN)
-          configuration.drums.midi_channel -= ENCODER[ENC_R].speed();
-        else
-          configuration.drums.midi_channel = MIDI_CHANNEL_MIN;
-      }*/
-
-      if (LCDML.BT_checkDown() && encoderDir[ENC_R].Down())
-        constrain(configuration.drums.midi_channel + ENCODER[ENC_R].speed(), MIDI_CHANNEL_MIN, MIDI_CHANNEL_MAX);
-      else if (LCDML.BT_checkUp() && encoderDir[ENC_R].Up())
-        constrain(configuration.drums.midi_channel - ENCODER[ENC_R].speed(), MIDI_CHANNEL_MIN, MIDI_CHANNEL_MAX);
+      int8_t tmp_midi_channel = 0;
+      if (LCDML.BT_checkDown())
+        tmp_midi_channel = configuration.drums.midi_channel + ENCODER[ENC_R].speed();
+      else if (LCDML.BT_checkUp())
+        tmp_midi_channel = configuration.drums.midi_channel - ENCODER[ENC_R].speed();
+      configuration.drums.midi_channel = constrain(tmp_midi_channel, MIDI_CHANNEL_MIN, MIDI_CHANNEL_MAX);
 
       display.setCursor(0, 1);
       if (configuration.drums.midi_channel == 0) {
diff --git a/drumset.h b/drumset.h
index 4455785..2918fcc 100644
--- a/drumset.h
+++ b/drumset.h
@@ -1312,7 +1312,7 @@ PROGMEM const uint8_t DRUM_Clap808[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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_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,
@@ -4573,7 +4573,7 @@ PROGMEM const uint8_t DRUM_S_kick_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -7779,7 +7779,7 @@ PROGMEM const uint8_t DRUM_S_kick2_8[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -9525,7 +9525,7 @@ PROGMEM const uint8_t DRUM_S_Stick_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -12699,7 +12699,7 @@ PROGMEM const uint8_t DRUM_S_snare_Ghost_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -16450,7 +16450,7 @@ PROGMEM const uint8_t DRUM_S_snare2_Ghost_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -19442,7 +19442,7 @@ PROGMEM const uint8_t DRUM_S_snare_2[] = {
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -26169,7 +26169,7 @@ PROGMEM const uint8_t DRUM_S_loTom_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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,
@@ -27307,7 +27307,7 @@ PROGMEM const uint8_t DRUM_S_hhClosed_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -30353,7 +30353,7 @@ PROGMEM const uint8_t DRUM_S_hh_o_1_2[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -34197,7 +34197,7 @@ PROGMEM const uint8_t DRUM_S_hiTom_5[] = {
 ,0x00, 0x00, 0x00, 0x00, 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,
@@ -47588,7 +47588,7 @@ PROGMEM const uint8_t DRUM_S_hh_o_5_4[] = {
 ,0x00, 0x00, 0x00, 0x00, 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,
@@ -57236,7 +57236,7 @@ PROGMEM const uint8_t DRUM_S_splash1_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -69884,7 +69884,7 @@ PROGMEM const uint8_t DRUM_S_china1_4[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -81365,7 +81365,7 @@ 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,
@@ -91163,7 +91163,7 @@ PROGMEM const uint8_t DRUM_S_ride1Bell_1[] = {
 0x00, 0x00, 0x00, 0x00, 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,
@@ -109847,7 +109847,7 @@ PROGMEM const uint8_t DRUM_S_crash1_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -112914,7 +112914,7 @@ PROGMEM const uint8_t DRUM_S_cowbell_2[] = {
 ,0x00, 0x00, 0x00, 0x00, 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,
@@ -134948,7 +134948,7 @@ PROGMEM const uint8_t DRUM_S_ride2Crash_2[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -147873,7 +147873,7 @@ PROGMEM const uint8_t DRUM_S_ride2_1[] = {
 0x00, 0x00, 0x00, 0x00, 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 Kick808.wav, length = 26688 bytes
 PROGMEM const uint8_t DRUM_808Kick[] = {
   0x08, 0x00, 0x0a, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0xfe, 0xff,
@@ -152327,7 +152327,7 @@ PROGMEM const uint8_t DRUM_808Kick[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -153132,7 +153132,7 @@ PROGMEM const uint8_t DRUM_phkick1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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,
@@ -153268,7 +153268,7 @@ PROGMEM const uint8_t DRUM_rims1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -153573,7 +153573,7 @@ PROGMEM const uint8_t DRUM_Shaker[] = {
 0x00, 0x00, 0x00, 0x00, 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,
@@ -154742,7 +154742,7 @@ PROGMEM const uint8_t DRUM_LNclap1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -156509,7 +156509,7 @@ PROGMEM const uint8_t DRUM_LNsnare1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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,
@@ -157824,7 +157824,7 @@ PROGMEM const uint8_t DRUM_Bdtrancy[] = {
   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 };
 // Converted from HhCL1-808.wav, length = 6208 bytes
 PROGMEM const uint8_t DRUM_hhcl1[] = {
   0xb1, 0xff, 0x6d, 0x00, 0x8c, 0xff, 0x6f, 0x00, 0x75, 0xff, 0xc9, 0x00,
@@ -158865,7 +158865,7 @@ PROGMEM const uint8_t DRUM_hhcl1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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,
@@ -179106,7 +179106,7 @@ PROGMEM const uint8_t DRUM_Belltree[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -180189,7 +180189,7 @@ PROGMEM const uint8_t DRUM_Bongo16[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -182149,7 +182149,7 @@ PROGMEM const uint8_t DRUM_Bongo27[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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,
@@ -182498,7 +182498,7 @@ PROGMEM const uint8_t DRUM_Casta[] = {
 0x00, 0x00, 0x00, 0x00, 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,
@@ -184179,7 +184179,7 @@ PROGMEM const uint8_t DRUM_Cr78kick[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -185444,7 +185444,7 @@ PROGMEM const uint8_t DRUM_Cr78tmb1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -187260,7 +187260,7 @@ 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,
@@ -199393,7 +199393,7 @@ PROGMEM const uint8_t DRUM_Crash1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -200700,7 +200700,7 @@ PROGMEM const uint8_t DRUM_Dmpop[] = {
 0x00, 0x00, 0x00, 0x00, 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,
@@ -201187,7 +201187,7 @@ PROGMEM const uint8_t DRUM_Electr1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -204252,7 +204252,7 @@ PROGMEM const uint8_t DRUM_Excow[] = {
   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
 };
 // Converted from Tamb.wav, length = 8128 bytes
 PROGMEM const uint8_t DRUM_Tamb[] = {
@@ -205613,7 +205613,7 @@ PROGMEM const uint8_t DRUM_Tamb[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -206834,7 +206834,7 @@ PROGMEM const uint8_t DRUM_Cowbell[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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,
@@ -207831,7 +207831,7 @@ PROGMEM const uint8_t DRUM_660HatC1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -209705,7 +209705,7 @@ PROGMEM const uint8_t DRUM_Hhopen1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -210114,7 +210114,7 @@ PROGMEM const uint8_t DRUM_Histicks[] = {
   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 };
 // 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,
@@ -212647,7 +212647,7 @@ PROGMEM const uint8_t DRUM_Hr16snr2[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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,
@@ -214902,7 +214902,7 @@ PROGMEM const uint8_t DRUM_Xrhitom[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -215013,7 +215013,7 @@ 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,
@@ -215391,7 +215391,7 @@ PROGMEM const uint8_t DRUM_M1_18[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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,
@@ -217618,7 +217618,7 @@ PROGMEM const uint8_t DRUM_Md16_clp[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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_Ohhwav[] = {
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0x02, 0xe6, 0xf2, 0xbb, 0xf3,
@@ -221541,7 +221541,7 @@ PROGMEM const uint8_t DRUM_Ohhwav[] = {
 0x00, 0x00, 0x00, 0x00, 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,
@@ -227562,7 +227562,7 @@ PROGMEM const uint8_t DRUM_Quijada[] = {
 0x00, 0x00, 0x00, 0x00, 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,
@@ -230148,7 +230148,7 @@ PROGMEM const uint8_t DRUM_tabla1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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,
@@ -233768,7 +233768,7 @@ PROGMEM const uint8_t DRUM_Ride808[] = {
   0x00, 0x00, 0x00, 0x00
 ,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,
@@ -234755,7 +234755,7 @@ PROGMEM const uint8_t DRUM_Scratch1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 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[] = {
@@ -237320,7 +237320,7 @@ PROGMEM const uint8_t DRUM_Tomlow[] = {
   0x00, 0x00
 ,0x00, 0x00, 0x00, 0x00, 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,
@@ -238372,7 +238372,7 @@ PROGMEM const uint8_t DRUM_Tom808[] = {
 0x00, 0x00, 0x00, 0x00, 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,
@@ -238880,7 +238880,7 @@ PROGMEM const uint8_t DRUM_Vl1lbeep[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 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-Hbeep.wav, length = 1984 bytes
 PROGMEM const uint8_t DRUM_Vl1hbeep[] = {
   0x06, 0x04, 0x16, 0xfd, 0xc9, 0x05, 0x94, 0x63, 0x7c, 0x79, 0xd6, 0x6e,