diff --git a/stepmania/Themes/default/Sounds/Common coin.redir b/stepmania/Themes/default/Sounds/Common coin.redir
new file mode 100644
index 0000000000..76ff6c6306
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/Common coin.redir	
@@ -0,0 +1 @@
+Common start
diff --git a/stepmania/Themes/default/Sounds/Common invalid.ogg b/stepmania/Themes/default/Sounds/Common invalid.ogg
index 98b01cbfe7..eb5ff8c917 100644
Binary files a/stepmania/Themes/default/Sounds/Common invalid.ogg and b/stepmania/Themes/default/Sounds/Common invalid.ogg differ
diff --git a/stepmania/Themes/default/Sounds/Common start.ogg b/stepmania/Themes/default/Sounds/Common start.ogg
index 996230db78..fbbcee286b 100644
Binary files a/stepmania/Themes/default/Sounds/Common start.ogg and b/stepmania/Themes/default/Sounds/Common start.ogg differ
diff --git a/stepmania/Themes/default/Sounds/LifeMeterBattery gain.ogg b/stepmania/Themes/default/Sounds/LifeMeterBattery gain.ogg
index 009315cb02..3fdcc82090 100644
Binary files a/stepmania/Themes/default/Sounds/LifeMeterBattery gain.ogg and b/stepmania/Themes/default/Sounds/LifeMeterBattery gain.ogg differ
diff --git a/stepmania/Themes/default/Sounds/LifeMeterBattery lose.ogg b/stepmania/Themes/default/Sounds/LifeMeterBattery lose.ogg
index b5bf806e56..9343829ff7 100644
Binary files a/stepmania/Themes/default/Sounds/LifeMeterBattery lose.ogg and b/stepmania/Themes/default/Sounds/LifeMeterBattery lose.ogg differ
diff --git a/stepmania/Themes/default/Sounds/MenuTimer tick.ogg b/stepmania/Themes/default/Sounds/MenuTimer tick.ogg
index a34a364fa4..ac49126a88 100644
Binary files a/stepmania/Themes/default/Sounds/MenuTimer tick.ogg and b/stepmania/Themes/default/Sounds/MenuTimer tick.ogg differ
diff --git a/stepmania/Themes/default/Sounds/MusicWheel change.ogg b/stepmania/Themes/default/Sounds/MusicWheel change.ogg
index b1657b374d..73ecd9ccfe 100644
Binary files a/stepmania/Themes/default/Sounds/MusicWheel change.ogg and b/stepmania/Themes/default/Sounds/MusicWheel change.ogg differ
diff --git a/stepmania/Themes/default/Sounds/MusicWheel expand.redir b/stepmania/Themes/default/Sounds/MusicWheel expand.redir
new file mode 100644
index 0000000000..a46b83d1ef
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/MusicWheel expand.redir	
@@ -0,0 +1 @@
+_prompt
diff --git a/stepmania/Themes/default/Sounds/MusicWheel locked.ogg b/stepmania/Themes/default/Sounds/MusicWheel locked.ogg
index 6f0fcb9bf4..4190abc3f0 100644
Binary files a/stepmania/Themes/default/Sounds/MusicWheel locked.ogg and b/stepmania/Themes/default/Sounds/MusicWheel locked.ogg differ
diff --git a/stepmania/Themes/default/Sounds/MusicWheel sort.ogg b/stepmania/Themes/default/Sounds/MusicWheel sort.ogg
index 6a5a4e8876..1c6f660adb 100644
Binary files a/stepmania/Themes/default/Sounds/MusicWheel sort.ogg and b/stepmania/Themes/default/Sounds/MusicWheel sort.ogg differ
diff --git a/stepmania/Themes/default/Sounds/ScreenEdit save.ogg b/stepmania/Themes/default/Sounds/ScreenEdit save.ogg
index afa38a7031..1e59e952e1 100644
Binary files a/stepmania/Themes/default/Sounds/ScreenEdit save.ogg and b/stepmania/Themes/default/Sounds/ScreenEdit save.ogg differ
diff --git a/stepmania/Themes/default/Sounds/ScreenEdit switch steps.redir b/stepmania/Themes/default/Sounds/ScreenEdit switch steps.redir
index 584aee08c6..79774d5c65 100644
--- a/stepmania/Themes/default/Sounds/ScreenEdit switch steps.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenEdit switch steps.redir	
@@ -1 +1 @@
-_switch steps
\ No newline at end of file
+_switch down
diff --git a/stepmania/Themes/default/Sounds/ScreenEdit value decrease.redir b/stepmania/Themes/default/Sounds/ScreenEdit value decrease.redir
new file mode 100644
index 0000000000..79774d5c65
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenEdit value decrease.redir	
@@ -0,0 +1 @@
+_switch down
diff --git a/stepmania/Themes/default/Sounds/ScreenEdit value increase.redir b/stepmania/Themes/default/Sounds/ScreenEdit value increase.redir
new file mode 100644
index 0000000000..ea37451d46
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenEdit value increase.redir	
@@ -0,0 +1 @@
+_switch up
diff --git a/stepmania/Themes/default/Sounds/ScreenEditCourseSubmenu difficulty changed.redir b/stepmania/Themes/default/Sounds/ScreenEditCourseSubmenu difficulty changed.redir
index 584aee08c6..79774d5c65 100644
--- a/stepmania/Themes/default/Sounds/ScreenEditCourseSubmenu difficulty changed.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenEditCourseSubmenu difficulty changed.redir	
@@ -1 +1 @@
-_switch steps
\ No newline at end of file
+_switch down
diff --git a/stepmania/Themes/default/Sounds/ScreenGameplay oni die.ogg b/stepmania/Themes/default/Sounds/ScreenGameplay oni die.ogg
index 4c2b6a4e1a..bde5aa67e4 100644
Binary files a/stepmania/Themes/default/Sounds/ScreenGameplay oni die.ogg and b/stepmania/Themes/default/Sounds/ScreenGameplay oni die.ogg differ
diff --git a/stepmania/Themes/default/Sounds/ScreenNetSelectMusic change sel.redir b/stepmania/Themes/default/Sounds/ScreenNetSelectMusic change sel.redir
index 32cebd7123..5bb896bf54 100644
--- a/stepmania/Themes/default/Sounds/ScreenNetSelectMusic change sel.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenNetSelectMusic change sel.redir	
@@ -1 +1 @@
-_common change
\ No newline at end of file
+_common value
diff --git a/stepmania/Themes/default/Sounds/ScreenOptions change.redir b/stepmania/Themes/default/Sounds/ScreenOptions change.redir
new file mode 100644
index 0000000000..5bb896bf54
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenOptions change.redir	
@@ -0,0 +1 @@
+_common value
diff --git a/stepmania/Themes/default/Sounds/ScreenOptions next.redir b/stepmania/Themes/default/Sounds/ScreenOptions next.redir
index 584aee08c6..6e1d92da8b 100644
--- a/stepmania/Themes/default/Sounds/ScreenOptions next.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenOptions next.redir	
@@ -1 +1 @@
-_switch steps
\ No newline at end of file
+_common row
diff --git a/stepmania/Themes/default/Sounds/ScreenOptions prev.redir b/stepmania/Themes/default/Sounds/ScreenOptions prev.redir
new file mode 100644
index 0000000000..6e1d92da8b
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenOptions prev.redir	
@@ -0,0 +1 @@
+_common row
diff --git a/stepmania/Themes/default/Sounds/ScreenOptions toggle off.redir b/stepmania/Themes/default/Sounds/ScreenOptions toggle off.redir
index 6c8a2c357c..6f735d4f15 100644
--- a/stepmania/Themes/default/Sounds/ScreenOptions toggle off.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenOptions toggle off.redir	
@@ -1 +1 @@
-MusicWheel expand.ogg
\ No newline at end of file
+MusicWheel expand
diff --git a/stepmania/Themes/default/Sounds/ScreenSelectDifficulty change.redir b/stepmania/Themes/default/Sounds/ScreenSelectDifficulty change.redir
new file mode 100644
index 0000000000..5bb896bf54
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenSelectDifficulty change.redir	
@@ -0,0 +1 @@
+_common value
diff --git a/stepmania/Themes/default/Sounds/ScreenSelectGroup change.redir b/stepmania/Themes/default/Sounds/ScreenSelectGroup change.redir
index 35fb623d6e..5bb896bf54 100644
--- a/stepmania/Themes/default/Sounds/ScreenSelectGroup change.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenSelectGroup change.redir	
@@ -1 +1 @@
-_common change
+_common value
diff --git a/stepmania/Themes/default/Sounds/ScreenSelectMusic difficulty easier.redir b/stepmania/Themes/default/Sounds/ScreenSelectMusic difficulty easier.redir
index 34cabcf96e..ea37451d46 100644
--- a/stepmania/Themes/default/Sounds/ScreenSelectMusic difficulty easier.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenSelectMusic difficulty easier.redir	
@@ -1 +1 @@
-ScreenSelectMusic difficulty harder
\ No newline at end of file
+_switch up
diff --git a/stepmania/Themes/default/Sounds/ScreenSelectMusic difficulty harder.redir b/stepmania/Themes/default/Sounds/ScreenSelectMusic difficulty harder.redir
index 584aee08c6..79774d5c65 100644
--- a/stepmania/Themes/default/Sounds/ScreenSelectMusic difficulty harder.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenSelectMusic difficulty harder.redir	
@@ -1 +1 @@
-_switch steps
\ No newline at end of file
+_switch down
diff --git a/stepmania/Themes/default/Sounds/ScreenSelectMusic options.redir b/stepmania/Themes/default/Sounds/ScreenSelectMusic options.redir
new file mode 100644
index 0000000000..affd522e70
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenSelectMusic options.redir	
@@ -0,0 +1 @@
+ScreenEdit save
diff --git a/stepmania/Themes/default/Sounds/ScreenSelectStyle change.redir b/stepmania/Themes/default/Sounds/ScreenSelectStyle change.redir
index 35fb623d6e..5bb896bf54 100644
--- a/stepmania/Themes/default/Sounds/ScreenSelectStyle change.redir	
+++ b/stepmania/Themes/default/Sounds/ScreenSelectStyle change.redir	
@@ -1 +1 @@
-_common change
+_common value
diff --git a/stepmania/Themes/default/Sounds/ScreenTitleMenu change.redir b/stepmania/Themes/default/Sounds/ScreenTitleMenu change.redir
new file mode 100644
index 0000000000..6e1d92da8b
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenTitleMenu change.redir	
@@ -0,0 +1 @@
+_common row
diff --git a/stepmania/Themes/default/Sounds/_cancel.ogg b/stepmania/Themes/default/Sounds/_cancel.ogg
index 65f9cb0eea..9ab6f2eec7 100644
Binary files a/stepmania/Themes/default/Sounds/_cancel.ogg and b/stepmania/Themes/default/Sounds/_cancel.ogg differ
diff --git a/stepmania/Themes/default/Sounds/_common row.ogg b/stepmania/Themes/default/Sounds/_common row.ogg
index a1afdf000f..b516d2c9b0 100644
Binary files a/stepmania/Themes/default/Sounds/_common row.ogg and b/stepmania/Themes/default/Sounds/_common row.ogg differ
diff --git a/stepmania/Themes/default/Sounds/_common value.ogg b/stepmania/Themes/default/Sounds/_common value.ogg
index 5bd41a56ac..96c98e612f 100644
Binary files a/stepmania/Themes/default/Sounds/_common value.ogg and b/stepmania/Themes/default/Sounds/_common value.ogg differ
diff --git a/stepmania/Themes/default/Sounds/_edit marker.redir b/stepmania/Themes/default/Sounds/_edit marker.redir
new file mode 100644
index 0000000000..6e1d92da8b
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/_edit marker.redir	
@@ -0,0 +1 @@
+_common row
diff --git a/stepmania/Themes/default/Sounds/_extra1.ogg b/stepmania/Themes/default/Sounds/_extra1.ogg
index fbb181131a..7c44d3423a 100755
Binary files a/stepmania/Themes/default/Sounds/_extra1.ogg and b/stepmania/Themes/default/Sounds/_extra1.ogg differ
diff --git a/stepmania/Themes/default/Sounds/_failed.ogg b/stepmania/Themes/default/Sounds/_failed.ogg
index a0e33bb10d..641a9a28af 100755
Binary files a/stepmania/Themes/default/Sounds/_failed.ogg and b/stepmania/Themes/default/Sounds/_failed.ogg differ
diff --git a/stepmania/Themes/default/Sounds/_prompt.ogg b/stepmania/Themes/default/Sounds/_prompt.ogg
index 6f71485598..e8e2a7c7d0 100644
Binary files a/stepmania/Themes/default/Sounds/_prompt.ogg and b/stepmania/Themes/default/Sounds/_prompt.ogg differ
diff --git a/stepmania/Themes/default/Sounds/_switch down.ogg b/stepmania/Themes/default/Sounds/_switch down.ogg
new file mode 100644
index 0000000000..dd182be037
Binary files /dev/null and b/stepmania/Themes/default/Sounds/_switch down.ogg differ
diff --git a/stepmania/Themes/default/Sounds/_switch up.ogg b/stepmania/Themes/default/Sounds/_switch up.ogg
new file mode 100644
index 0000000000..b4199f27d4
Binary files /dev/null and b/stepmania/Themes/default/Sounds/_switch up.ogg differ
diff --git a/stepmania/Themes/default/Sounds/_swoosh normal.ogg b/stepmania/Themes/default/Sounds/_swoosh normal.ogg
index d1e1a69629..8b23d64047 100644
Binary files a/stepmania/Themes/default/Sounds/_swoosh normal.ogg and b/stepmania/Themes/default/Sounds/_swoosh normal.ogg differ