diff --git a/osu.Game.Resources/Samples/Checkbox/check-off.mp3 b/osu.Game.Resources/Samples/Checkbox/check-off.mp3
deleted file mode 100644
index 2994f38..0000000
Binary files a/osu.Game.Resources/Samples/Checkbox/check-off.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Checkbox/check-on.mp3 b/osu.Game.Resources/Samples/Checkbox/check-on.mp3
deleted file mode 100644
index d978660..0000000
Binary files a/osu.Game.Resources/Samples/Checkbox/check-on.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Gameplay/restart.wav b/osu.Game.Resources/Samples/Gameplay/restart.wav
new file mode 100644
index 0000000..4645a3e
Binary files /dev/null and b/osu.Game.Resources/Samples/Gameplay/restart.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/menu-edit-click.mp3 b/osu.Game.Resources/Samples/Menu/menu-edit-click.mp3
deleted file mode 100644
index 34df880..0000000
Binary files a/osu.Game.Resources/Samples/Menu/menu-edit-click.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/menu-freeplay-click.mp3 b/osu.Game.Resources/Samples/Menu/menu-freeplay-click.mp3
deleted file mode 100644
index 74fb63c..0000000
Binary files a/osu.Game.Resources/Samples/Menu/menu-freeplay-click.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/menu-multiplayer-click.mp3 b/osu.Game.Resources/Samples/Menu/menu-multiplayer-click.mp3
deleted file mode 100644
index 2beb576..0000000
Binary files a/osu.Game.Resources/Samples/Menu/menu-multiplayer-click.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/menu-play-click.mp3 b/osu.Game.Resources/Samples/Menu/menu-play-click.mp3
deleted file mode 100644
index ec92000..0000000
Binary files a/osu.Game.Resources/Samples/Menu/menu-play-click.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/menuback.mp3 b/osu.Game.Resources/Samples/Menu/menuback.mp3
deleted file mode 100644
index 42b67f7..0000000
Binary files a/osu.Game.Resources/Samples/Menu/menuback.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/menuclick.mp3 b/osu.Game.Resources/Samples/Menu/menuclick.mp3
deleted file mode 100644
index 9c2ef39..0000000
Binary files a/osu.Game.Resources/Samples/Menu/menuclick.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/menuhit.mp3 b/osu.Game.Resources/Samples/Menu/menuhit.mp3
deleted file mode 100644
index f7c344f..0000000
Binary files a/osu.Game.Resources/Samples/Menu/menuhit.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/select-1.wav b/osu.Game.Resources/Samples/Menu/select-1.wav
new file mode 100644
index 0000000..6ce83b5
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/select-1.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/select-2.wav b/osu.Game.Resources/Samples/Menu/select-2.wav
new file mode 100644
index 0000000..8e054b6
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/select-2.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/select-3.wav b/osu.Game.Resources/Samples/Menu/select-3.wav
new file mode 100644
index 0000000..fdb3d81
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/select-3.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/select-4.wav b/osu.Game.Resources/Samples/Menu/select-4.wav
new file mode 100644
index 0000000..91811d1
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/select-4.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/select-5.wav b/osu.Game.Resources/Samples/Menu/select-5.wav
new file mode 100644
index 0000000..127be06
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/select-5.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/select-6.wav b/osu.Game.Resources/Samples/Menu/select-6.wav
new file mode 100644
index 0000000..8da6def
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/select-6.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/select-7.wav b/osu.Game.Resources/Samples/Menu/select-7.wav
new file mode 100644
index 0000000..4645a3e
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/select-7.wav differ
diff --git a/osu.Game.Resources/Samples/Sliderbar/sliderbar.mp3 b/osu.Game.Resources/Samples/Sliderbar/sliderbar.mp3
deleted file mode 100644
index bcfe542..0000000
Binary files a/osu.Game.Resources/Samples/Sliderbar/sliderbar.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/UI/check-off.wav b/osu.Game.Resources/Samples/UI/check-off.wav
new file mode 100644
index 0000000..bb7ec2c
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/check-off.wav differ
diff --git a/osu.Game.Resources/Samples/UI/check-on.wav b/osu.Game.Resources/Samples/UI/check-on.wav
new file mode 100644
index 0000000..fd29c3d
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/check-on.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-click.wav b/osu.Game.Resources/Samples/UI/generic-click.wav
new file mode 100644
index 0000000..759894f
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/generic-click.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-hover.wav b/osu.Game.Resources/Samples/UI/generic-hover.wav
new file mode 100644
index 0000000..c73822b
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/generic-hover.wav differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-1.wav b/osu.Game.Resources/Samples/UI/melodic-1.wav
new file mode 100644
index 0000000..bb07dc8
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/melodic-1.wav differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-2.wav b/osu.Game.Resources/Samples/UI/melodic-2.wav
new file mode 100644
index 0000000..5ef9b88
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/melodic-2.wav differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-3.wav b/osu.Game.Resources/Samples/UI/melodic-3.wav
new file mode 100644
index 0000000..f4eef21
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/melodic-3.wav differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-4.wav b/osu.Game.Resources/Samples/UI/melodic-4.wav
new file mode 100644
index 0000000..0802bd8
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/melodic-4.wav differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-5.wav b/osu.Game.Resources/Samples/UI/melodic-5.wav
new file mode 100644
index 0000000..d92eb06
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/melodic-5.wav differ
diff --git a/osu.Game.Resources/Samples/UI/sliderbar-notch.wav b/osu.Game.Resources/Samples/UI/sliderbar-notch.wav
new file mode 100644
index 0000000..3076277
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/sliderbar-notch.wav differ
diff --git a/osu.Game.Resources/osu.Game.Resources.csproj b/osu.Game.Resources/osu.Game.Resources.csproj
index 1fcb89b..388e99c 100644
--- a/osu.Game.Resources/osu.Game.Resources.csproj
+++ b/osu.Game.Resources/osu.Game.Resources.csproj
@@ -44,7 +44,6 @@
     <EmbeddedResource Include="Textures\KeyCounter\key-hit.png" />
     <EmbeddedResource Include="Textures\KeyCounter\key-up.png" />
     <EmbeddedResource Include="Beatmaps\241526 Soleily - Renatus.osz" />
-    <EmbeddedResource Include="Samples\Sliderbar\sliderbar.mp3" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Textures\Gameplay\Catch\fruit-catcher-fail.png" />
@@ -160,19 +159,6 @@
   <ItemGroup>
     <EmbeddedResource Include="Samples\seeya.mp3" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Samples\Checkbox\check-off.mp3" />
-    <EmbeddedResource Include="Samples\Checkbox\check-on.mp3" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Samples\Menu\menu-edit-click.mp3" />
-    <EmbeddedResource Include="Samples\Menu\menu-freeplay-click.mp3" />
-    <EmbeddedResource Include="Samples\Menu\menu-multiplayer-click.mp3" />
-    <EmbeddedResource Include="Samples\Menu\menu-play-click.mp3" />
-    <EmbeddedResource Include="Samples\Menu\menuback.mp3" />
-    <EmbeddedResource Include="Samples\Menu\menuclick.mp3" />
-    <EmbeddedResource Include="Samples\Menu\menuhit.mp3" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Samples\SongSelect\select-difficulty.mp3" />
     <EmbeddedResource Include="Samples\SongSelect\select-expand.mp3" />
@@ -641,6 +627,34 @@
     <EmbeddedResource Include="Textures\Profile\levelbadge.png" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Samples\UI\check-off.wav" />
+    <EmbeddedResource Include="Samples\UI\check-on.wav" />
+    <EmbeddedResource Include="Samples\UI\sliderbar-notch.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Samples\UI\generic-hover.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Samples\UI\generic-click.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Samples\UI\melodic-1.wav" />
+    <EmbeddedResource Include="Samples\UI\melodic-2.wav" />
+    <EmbeddedResource Include="Samples\UI\melodic-3.wav" />
+    <EmbeddedResource Include="Samples\UI\melodic-4.wav" />
+    <EmbeddedResource Include="Samples\UI\melodic-5.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Samples\Gameplay\restart.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Samples\Menu\select-1.wav" />
+    <EmbeddedResource Include="Samples\Menu\select-2.wav" />
+    <EmbeddedResource Include="Samples\Menu\select-3.wav" />
+    <EmbeddedResource Include="Samples\Menu\select-4.wav" />
+    <EmbeddedResource Include="Samples\Menu\select-5.wav" />
+    <EmbeddedResource Include="Samples\Menu\select-6.wav" />
+    <EmbeddedResource Include="Samples\Menu\select-7.wav" />
     <EmbeddedResource Include="Textures\Menu\menu-background-1.jpg" />
     <EmbeddedResource Include="Textures\Menu\menu-background-2.jpg" />
     <EmbeddedResource Include="Textures\Menu\menu-background-3.jpg" />