diff --git a/osu.Game.Resources/Samples/Menu/button-back-select.wav b/osu.Game.Resources/Samples/Menu/button-back-select.wav
new file mode 100644
index 0000000..4467dfa
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/button-back-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-direct-select.wav b/osu.Game.Resources/Samples/Menu/button-direct-select.wav
new file mode 100644
index 0000000..4376b72
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/button-direct-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-generic-select.wav b/osu.Game.Resources/Samples/Menu/button-generic-select.wav
new file mode 100644
index 0000000..7e8843d
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/button-generic-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-hover.wav b/osu.Game.Resources/Samples/Menu/button-hover.wav
new file mode 100644
index 0000000..dee7f3a
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/button-hover.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-play-select.wav b/osu.Game.Resources/Samples/Menu/button-play-select.wav
new file mode 100644
index 0000000..3fba26d
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/button-play-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-solo-select.wav b/osu.Game.Resources/Samples/Menu/button-solo-select.wav
new file mode 100644
index 0000000..15e2f44
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/button-solo-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/heartbeat.mp3 b/osu.Game.Resources/Samples/Menu/heartbeat.mp3
deleted file mode 100644
index 6355697..0000000
Binary files a/osu.Game.Resources/Samples/Menu/heartbeat.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.mp3 b/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.mp3
new file mode 100644
index 0000000..5b7c14e
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.mp3 differ
diff --git a/osu.Game.Resources/Samples/Menu/osu-logo-select.wav b/osu.Game.Resources/Samples/Menu/osu-logo-select.wav
new file mode 100644
index 0000000..7e8843d
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/osu-logo-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/select-1.wav b/osu.Game.Resources/Samples/Menu/select-1.wav
deleted file mode 100644
index 6ce83b5..0000000
Binary files a/osu.Game.Resources/Samples/Menu/select-1.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/select-2.wav b/osu.Game.Resources/Samples/Menu/select-2.wav
deleted file mode 100644
index 8e054b6..0000000
Binary files a/osu.Game.Resources/Samples/Menu/select-2.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/select-3.wav b/osu.Game.Resources/Samples/Menu/select-3.wav
deleted file mode 100644
index fdb3d81..0000000
Binary files a/osu.Game.Resources/Samples/Menu/select-3.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/select-4.wav b/osu.Game.Resources/Samples/Menu/select-4.wav
deleted file mode 100644
index 91811d1..0000000
Binary files a/osu.Game.Resources/Samples/Menu/select-4.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/select-5.wav b/osu.Game.Resources/Samples/Menu/select-5.wav
deleted file mode 100644
index 127be06..0000000
Binary files a/osu.Game.Resources/Samples/Menu/select-5.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/select-6.wav b/osu.Game.Resources/Samples/Menu/select-6.wav
deleted file mode 100644
index 8da6def..0000000
Binary files a/osu.Game.Resources/Samples/Menu/select-6.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/Menu/select-7.wav b/osu.Game.Resources/Samples/Menu/select-7.wav
deleted file mode 100644
index 4645a3e..0000000
Binary files a/osu.Game.Resources/Samples/Menu/select-7.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/UI/generic-click.wav b/osu.Game.Resources/Samples/UI/generic-click.wav
deleted file mode 100644
index 759894f..0000000
Binary files a/osu.Game.Resources/Samples/UI/generic-click.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/UI/generic-hover.wav b/osu.Game.Resources/Samples/UI/generic-hover.wav
index c73822b..6e16ee1 100644
Binary files a/osu.Game.Resources/Samples/UI/generic-hover.wav and b/osu.Game.Resources/Samples/UI/generic-hover.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-select.wav b/osu.Game.Resources/Samples/UI/generic-select.wav
new file mode 100644
index 0000000..787ebbe
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/generic-select.wav differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-2.wav b/osu.Game.Resources/Samples/UI/melodic-2.wav
deleted file mode 100644
index 5ef9b88..0000000
Binary files a/osu.Game.Resources/Samples/UI/melodic-2.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-3.wav b/osu.Game.Resources/Samples/UI/melodic-3.wav
deleted file mode 100644
index f4eef21..0000000
Binary files a/osu.Game.Resources/Samples/UI/melodic-3.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-4.wav b/osu.Game.Resources/Samples/UI/melodic-4.wav
deleted file mode 100644
index 0802bd8..0000000
Binary files a/osu.Game.Resources/Samples/UI/melodic-4.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-5.wav b/osu.Game.Resources/Samples/UI/melodic-5.wav
deleted file mode 100644
index d92eb06..0000000
Binary files a/osu.Game.Resources/Samples/UI/melodic-5.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/UI/overlay-pop-in.wav b/osu.Game.Resources/Samples/UI/overlay-pop-in.wav
new file mode 100644
index 0000000..51b039b
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/overlay-pop-in.wav differ
diff --git a/osu.Game.Resources/Samples/UI/overlay-pop-out.wav b/osu.Game.Resources/Samples/UI/overlay-pop-out.wav
new file mode 100644
index 0000000..c7bdff3
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/overlay-pop-out.wav differ
diff --git a/osu.Game.Resources/Samples/UI/melodic-1.wav b/osu.Game.Resources/Samples/UI/screen-back.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/melodic-1.wav
rename to osu.Game.Resources/Samples/UI/screen-back.wav
diff --git a/osu.Game.Resources/osu.Game.Resources.csproj b/osu.Game.Resources/osu.Game.Resources.csproj
index e311c1a..8ba619b 100644
--- a/osu.Game.Resources/osu.Game.Resources.csproj
+++ b/osu.Game.Resources/osu.Game.Resources.csproj
@@ -39,6 +39,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Samples\UI\check-off.wav" />
+    <EmbeddedResource Include="Samples\UI\check-on.wav" />
+    <EmbeddedResource Include="Samples\UI\generic-select.wav" />
+    <EmbeddedResource Include="Samples\UI\generic-hover.wav" />
+    <EmbeddedResource Include="Samples\UI\sliderbar-notch.wav" />
     <EmbeddedResource Include="Textures\Menu\logo.png" />
     <EmbeddedResource Include="Textures\KeyCounter\key-glow.png" />
     <EmbeddedResource Include="Textures\KeyCounter\key-hit.png" />
@@ -158,9 +163,6 @@
     <EmbeddedResource Include="Samples\SongSelect\select-difficulty.mp3" />
     <EmbeddedResource Include="Samples\SongSelect\select-expand.mp3" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Samples\Menu\heartbeat.mp3" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Samples\Gameplay\drum-hitclap.wav" />
     <EmbeddedResource Include="Samples\Gameplay\drum-hitfinish.wav" />
@@ -621,35 +623,10 @@
   <ItemGroup>
     <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" />
@@ -661,6 +638,21 @@
     <EmbeddedResource Include="Textures\Play\Catch\fruit-catcher-idle.png" />
     <EmbeddedResource Include="Textures\Play\Catch\fruit-catcher-kiai.png" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Samples\UI\overlay-pop-in.wav" />
+    <EmbeddedResource Include="Samples\UI\overlay-pop-out.wav" />
+    <EmbeddedResource Include="Samples\UI\screen-back.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Samples\Menu\button-back-select.wav" />
+    <EmbeddedResource Include="Samples\Menu\button-direct-select.wav" />
+    <EmbeddedResource Include="Samples\Menu\button-generic-select.wav" />
+    <EmbeddedResource Include="Samples\Menu\button-hover.wav" />
+    <EmbeddedResource Include="Samples\Menu\button-play-select.wav" />
+    <EmbeddedResource Include="Samples\Menu\button-solo-select.wav" />
+    <EmbeddedResource Include="Samples\Menu\osu-logo-heartbeat.mp3" />
+    <EmbeddedResource Include="Samples\Menu\osu-logo-select.wav" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.