diff --git a/Courses/Default/Jupiter.crs b/Courses/Default/Jupiter.crs
index dc69cce359..529005cdb3 100644
--- a/Courses/Default/Jupiter.crs
+++ b/Courses/Default/Jupiter.crs
@@ -2,7 +2,7 @@
 #SCRIPTER:Midiman;
 
 #GAINSECONDS:120;
-#SONG:StepMania 5/Springtime:Hard;
+#SONG:StepMania 5\Springtime:Hard;
 
 #GAINSECONDS:25;
-#SONG:StepMania 5/MechaTribe Assault:Hard;
\ No newline at end of file
+#SONG:StepMania 5\MechaTribe Assault:Hard;
\ No newline at end of file
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 21ed60c024..9cac832671 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2267,14 +2267,14 @@ Effect,13="mod,bumpy;name,Bumpy"
 Effect,14="mod,beat;name,Beat"
 Effect,15="mod,45% xmode;name,XMode"
 
-EffectsReceptor="5;selectmultiple"
+EffectsReceptor="6;selectmultiple"
 EffectsReceptorDefault="mod,no confusion,no invert,no flip,no mini,no xmode"
 EffectsReceptor,1="mod,confusion;name,Confusion"
 EffectsReceptor,2="mod,invert;name,Invert"
 EffectsReceptor,3="mod,Flip;name,Flip"
 EffectsReceptor,4="mod,mini;name,Mini"
-# EffectsReceptor,5="mod,-100% mini;name,Big"
-EffectsReceptor,5="mod,45% xmode;name,XMode"
+EffectsReceptor,5="mod,-35% mini;name,Big"
+EffectsReceptor,6="mod,45% xmode;name,XMode"
 
 EffectsArrow="8;selectmultiple"
 EffectsArrowDefault="mod,no drunk,no dizzy,no twirl,no roll,no beat,no tipsy,no tornado,no bumpy"
diff --git a/Themes/default/Scripts/02 ThemePrefs.lua b/Themes/default/Scripts/02 ThemePrefs.lua
index 546473cc8c..3745a3d2fc 100644
--- a/Themes/default/Scripts/02 ThemePrefs.lua	
+++ b/Themes/default/Scripts/02 ThemePrefs.lua	
@@ -191,34 +191,4 @@ function OptionRowProTiming()
 	return t
 end
 
-function GetDefaultOptionLines()
-	local LineSets = { -- none of these include characters yet.
-		"1,8,14,2,3A,3B,4,5,6,R,7,9,10,11,12,13,16,SF,17", -- All
-		"1,8,14,2,7,13,16,SF,17", -- DDR Essentials ( no turns, fx )
-	};
-	local function IsExtra()
-		if GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() then
-			return true
-		else
-			return false
-		end
-	end
-
-	local function CheckCharacters(mods)
-		if CHARMAN:GetCharacterCount() > 0 then
-			return mods .. ",18" --TODO: Better line name.
-		end
-		return mods
-	end
-
-	modLines = LineSets[2]
-
-	if not IsExtra() then
-		modLines = GetUserPrefB("UserPrefShowLotsaOptions")
-			and LineSets[1] or LineSets[2]
-	end
-
-	return CheckCharacters(modLines)
-end
-
 --[[ end option rows ]]
diff --git a/Themes/default/Sounds/ScreenEdit freeze.ogg b/Themes/default/Sounds/ScreenEdit freeze.ogg
new file mode 100644
index 0000000000..a6288e66ac
Binary files /dev/null and b/Themes/default/Sounds/ScreenEdit freeze.ogg differ
diff --git a/Themes/default/Sounds/ScreenEdit line.redir b/Themes/default/Sounds/ScreenEdit line.redir
new file mode 100644
index 0000000000..6e1d92da8b
--- /dev/null
+++ b/Themes/default/Sounds/ScreenEdit line.redir	
@@ -0,0 +1 @@
+_common row
diff --git a/Themes/default/Sounds/ScreenEdit marker.ogg b/Themes/default/Sounds/ScreenEdit marker.ogg
new file mode 100644
index 0000000000..ae0052749b
Binary files /dev/null and b/Themes/default/Sounds/ScreenEdit marker.ogg differ
diff --git a/Themes/default/Sounds/ScreenEdit save.ogg b/Themes/default/Sounds/ScreenEdit save.ogg
new file mode 100644
index 0000000000..afa38a7031
Binary files /dev/null and b/Themes/default/Sounds/ScreenEdit save.ogg differ
diff --git a/Themes/default/Sounds/ScreenEdit snap.ogg b/Themes/default/Sounds/ScreenEdit snap.ogg
new file mode 100644
index 0000000000..7c1f6af6a1
Binary files /dev/null and b/Themes/default/Sounds/ScreenEdit snap.ogg differ
diff --git a/Themes/default/Sounds/ScreenEdit switch player.ogg b/Themes/default/Sounds/ScreenEdit switch player.ogg
new file mode 100644
index 0000000000..74d0db1f25
Binary files /dev/null and b/Themes/default/Sounds/ScreenEdit switch player.ogg differ
diff --git a/Themes/default/Sounds/ScreenEdit switch steps.redir b/Themes/default/Sounds/ScreenEdit switch steps.redir
new file mode 100644
index 0000000000..de1c54532a
--- /dev/null
+++ b/Themes/default/Sounds/ScreenEdit switch steps.redir	
@@ -0,0 +1 @@
+_Music menu
\ No newline at end of file
diff --git a/Themes/default/Sounds/ScreenEdit switch timing.redir b/Themes/default/Sounds/ScreenEdit switch timing.redir
new file mode 100644
index 0000000000..ddb8831dc3
--- /dev/null
+++ b/Themes/default/Sounds/ScreenEdit switch timing.redir	
@@ -0,0 +1 @@
+ScreenEdit switch player
\ No newline at end of file
diff --git a/Themes/default/Sounds/ScreenEdit value decrease.redir b/Themes/default/Sounds/ScreenEdit value decrease.redir
new file mode 100644
index 0000000000..6b08d8884c
--- /dev/null
+++ b/Themes/default/Sounds/ScreenEdit value decrease.redir	
@@ -0,0 +1 @@
+ScreenEdit value increase
\ No newline at end of file
diff --git a/Themes/default/Sounds/ScreenEdit value increase.ogg b/Themes/default/Sounds/ScreenEdit value increase.ogg
new file mode 100644
index 0000000000..cde2dc1cd5
Binary files /dev/null and b/Themes/default/Sounds/ScreenEdit value increase.ogg differ
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 3a60559fd2..51aca9df5d 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -1308,7 +1308,7 @@ LineFancyUIBG="lua,ThemePrefRow('FancyUIBG')"
 [ScreenReloadSongs]
 
 [ScreenPlayerOptions]
-LineNames=GetDefaultOptionLines()
+LineNames="1,8,14,2,3A,3B,4,5,6,R,7,9,10,11,12,13,16,SF,17"
 LineSF="lua,OptionRowScreenFilter()"
 Line17="lua,OptionRowProTiming()"
 Line18="list,Characters"