diff --git a/data/drumkit/clap.wav b/data/drumkit/clap.wav
deleted file mode 100644
index 01c3510..0000000
Binary files a/data/drumkit/clap.wav and /dev/null differ
diff --git a/data/drumkit/crash-1.wav b/data/drumkit/crash-1.wav
new file mode 100644
index 0000000..f890397
Binary files /dev/null and b/data/drumkit/crash-1.wav differ
diff --git a/data/drumkit/crash-2.wav b/data/drumkit/crash-2.wav
new file mode 100644
index 0000000..aac50be
Binary files /dev/null and b/data/drumkit/crash-2.wav differ
diff --git a/data/drumkit/crash.wav b/data/drumkit/crash.wav
deleted file mode 100644
index d661181..0000000
Binary files a/data/drumkit/crash.wav and /dev/null differ
diff --git a/data/drumkit/hihat-1.wav b/data/drumkit/hihat-1.wav
new file mode 100644
index 0000000..957bf81
Binary files /dev/null and b/data/drumkit/hihat-1.wav differ
diff --git a/data/drumkit/hihat-2.wav b/data/drumkit/hihat-2.wav
index 79aea7f..70963b0 100644
Binary files a/data/drumkit/hihat-2.wav and b/data/drumkit/hihat-2.wav differ
diff --git a/data/drumkit/hihat-3.wav b/data/drumkit/hihat-3.wav
new file mode 100644
index 0000000..de5b83d
Binary files /dev/null and b/data/drumkit/hihat-3.wav differ
diff --git a/data/drumkit/hihat.wav b/data/drumkit/hihat.wav
deleted file mode 100644
index e801dd7..0000000
Binary files a/data/drumkit/hihat.wav and /dev/null differ
diff --git a/data/drumkit/kick-2.wav b/data/drumkit/kick-2.wav
deleted file mode 100644
index d5a6d46..0000000
Binary files a/data/drumkit/kick-2.wav and /dev/null differ
diff --git a/data/drumkit/kick-3.wav b/data/drumkit/kick-3.wav
deleted file mode 100644
index 12e44f8..0000000
Binary files a/data/drumkit/kick-3.wav and /dev/null differ
diff --git a/data/drumkit/kick.wav b/data/drumkit/kick.wav
index 8fe46de..c9b5f7d 100644
Binary files a/data/drumkit/kick.wav and b/data/drumkit/kick.wav differ
diff --git a/data/drumkit/meson.build b/data/drumkit/meson.build
index e28ca49..38d957f 100644
--- a/data/drumkit/meson.build
+++ b/data/drumkit/meson.build
@@ -2,15 +2,15 @@ drumkit_dir = meson.current_source_dir()
 
 drumkit_files = [
   'kick.wav',
-  'kick-2.wav',
-  'kick-3.wav',
   'snare.wav',
-  'snare-2.wav',
-  'hihat.wav',
+  'hihat-1.wav',
   'hihat-2.wav',
-  'clap.wav',
-  'tom.wav',
-  'crash.wav',
+  'hihat-3.wav',
+  'tom-1.wav',
+  'tom-2.wav',
+  'tom-3.wav',
+  'crash-1.wav',
+  'crash-2.wav',
 ]
 
 install_data(drumkit_files, install_dir: get_option('datadir') / 'drum-machine' / 'data' / 'drumkit')
\ No newline at end of file
diff --git a/data/drumkit/snare-2.wav b/data/drumkit/snare-2.wav
deleted file mode 100644
index 075f233..0000000
Binary files a/data/drumkit/snare-2.wav and /dev/null differ
diff --git a/data/drumkit/snare.wav b/data/drumkit/snare.wav
index 6c0f39c..2eea013 100644
Binary files a/data/drumkit/snare.wav and b/data/drumkit/snare.wav differ
diff --git a/data/drumkit/tom-1.wav b/data/drumkit/tom-1.wav
new file mode 100644
index 0000000..7b368fa
Binary files /dev/null and b/data/drumkit/tom-1.wav differ
diff --git a/data/drumkit/tom-2.wav b/data/drumkit/tom-2.wav
new file mode 100644
index 0000000..0ece0c9
Binary files /dev/null and b/data/drumkit/tom-2.wav differ
diff --git a/data/drumkit/tom-3.wav b/data/drumkit/tom-3.wav
new file mode 100644
index 0000000..55d4337
Binary files /dev/null and b/data/drumkit/tom-3.wav differ
diff --git a/data/drumkit/tom.wav b/data/drumkit/tom.wav
deleted file mode 100644
index 9e2cdf6..0000000
Binary files a/data/drumkit/tom.wav and /dev/null differ
diff --git a/src/config.py b/src/config.py
index 1ac19c8..09416e9 100644
--- a/src/config.py
+++ b/src/config.py
@@ -19,15 +19,15 @@
 
 DRUM_PARTS = [
     "kick",
-    "kick-2",
-    "kick-3",
     "snare",
-    "snare-2",
-    "hihat",
+    "hihat-1",
     "hihat-2",
-    "clap",
-    "tom",
-    "crash",
+    "hihat-3",
+    "tom-1",
+    "tom-2",
+    "tom-3",
+    "crash-1",
+    "crash-2",
 ]
 DEFAULT_PRESETS = [
     "Shoot",
diff --git a/src/services/preset_service.py b/src/services/preset_service.py
index 4ccc233..8e3cbbd 100644
--- a/src/services/preset_service.py
+++ b/src/services/preset_service.py
@@ -26,30 +26,30 @@ class PresetService:
     def _get_midi_note_for_part(self, part):
         mapping = {
             "kick": 36,
-            "kick-2": 35,
-            "kick-3": 34,
-            "snare": 38,
-            "snare-2": 37,
-            "hihat": 42,
-            "hihat-2": 44,
-            "clap": 39,
-            "tom": 41,
-            "crash": 49,
+            "snare": 35,
+            "hihat": 34,
+            "hihat-2": 38,
+            "hihat-3": 37,
+            "tom-1": 42,
+            "tom-2": 44,
+            "tom-3": 39,
+            "crash-1": 41,
+            "crash-2": 49,
         }
         return mapping.get(part, 0)
 
     def _get_part_for_midi_note(self, note):
         mapping = {
             36: "kick",
-            35: "kick-2",
-            34: "kick-3",
-            38: "snare",
-            37: "snare-2",
-            42: "hihat",
-            44: "hihat-2",
-            39: "clap",
-            41: "tom",
-            49: "crash",
+            35: "snare",
+            34: "hihat-1",
+            38: "hihat-2",
+            37: "hihat-3",
+            42: "tom-1",
+            44: "tom-2",
+            39: "tom-3",
+            41: "crash-1",
+            49: "crash-2",
         }
         return mapping.get(note, None)