diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 34a04ece81..f9613b6ad2 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -689,7 +689,7 @@ NextScreen=@SMOnlineScreen()
 PrevScreen=@ScreenTitleBranch()
 HelpText= 
 StyleIcon=0
-TimerSeconds=1
+TimerSeconds=-1
 
 [ScreenNetRoom]
 MusicSelectScreen=ScreenSMOnlineSelectMusic
@@ -2177,7 +2177,7 @@ Fallback=ScreenOptions
 NextScreen=ScreenJukebox
 PrevScreen=@ScreenTitleBranch()
 StyleIcon=0
-TimerSeconds=1
+TimerSeconds=-1
 InputMode=together
 ForceAllPlayers=1
 LineNames=1,2,3,4
@@ -3719,7 +3719,7 @@ IconsOnCommand=x,-30
 
 TimerOnCommand=hidden,1
 StyleIcon=0
-TimerSeconds=1
+TimerSeconds=-1
 
 AllowOperatorMenuButton=0
 LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
@@ -3748,7 +3748,7 @@ InputMode=together
 IconsOnCommand=x,-30
 TimerOnCommand=hidden,1
 StyleIcon=0
-TimerSeconds=1
+TimerSeconds=-1
 AllowOperatorMenuButton=0
 ForceAllPlayers=1
 PrevScreen=ScreenOptionsService
@@ -4216,7 +4216,7 @@ EmptyName=STEP
 [ScreenSetTime]
 Class=ScreenSetTime
 StyleIcon=0
-TimerSeconds=1
+TimerSeconds=-1
 TimerOnCommand=hidden,1
 Fallback=ScreenWithMenuElements
 NextScreen=ScreenOptionsService
@@ -4285,7 +4285,7 @@ Class=ScreenOptionsMaster
 NextScreen=none
 PrevScreen=none
 PlayMusic=0
-TimerSeconds=1
+TimerSeconds=-1
 StyleIcon=0
 LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
 Line1=list,Speed
@@ -4436,7 +4436,7 @@ Fallback=ScreenMiniMenu
 [ScreenTextEntry]
 Class=ScreenTextEntry
 Fallback=ScreenWithMenuElements
-TimerSeconds=1
+TimerSeconds=-1
 RowStartX=SCREEN_LEFT+100
 RowStartY=SCREEN_CENTER_Y-30
 RowEndX=SCREEN_RIGHT-100
@@ -4460,7 +4460,7 @@ KeysInitCommand=zoom,0.8;shadowlength,0
 [ScreenPrompt]
 Class=ScreenPrompt
 Fallback=ScreenWithMenuElementsBlank
-TimerSeconds=1
+TimerSeconds=-1
 
 QuestionX=SCREEN_CENTER_X
 QuestionY=SCREEN_CENTER_Y-60
@@ -4526,7 +4526,7 @@ Fallback=ScreenGameplay DifficultyMeterP2
 
 [ScreenOptionsManageCourses]
 Class=ScreenOptionsManageCourses
-Fallback=ScreenOptionsSimple
+Fallback=ScreenOptions
 EditMode=2
 PrevScreen=ScreenTitleMenu
 NextScreen=ScreenOptionsEditCourse
@@ -4538,6 +4538,9 @@ ShowExplanations=0
 CapitalizeAllOptionNames=0
 AllowRepeatingChangeValueInput=1
 WrapValueInRow=0
+NavigationMode=menu
+ForceAllPlayers=1
+InputMode=together
 
 [ScreenOptionsManageEditSteps]
 Class=ScreenOptionsManageEditSteps
@@ -4548,7 +4551,7 @@ NextScreen=ScreenOptionsEditCourse
 PrepareScreens=ScreenMiniMenuContext
 GroupedScreens=ScreenMiniMenuContext
 PersistScreens=ScreenMiniMenuContext
-TimerSeconds=1
+TimerSeconds=-1
 ShowExplanations=0
 CapitalizeAllOptionNames=0
 AllowRepeatingChangeValueInput=1
@@ -4562,7 +4565,7 @@ NextScreen=ScreenOptionsEditCourseEntry
 PrepareScreens=ScreenMiniMenuContext
 GroupedScreens=ScreenMiniMenuContext
 PersistScreens=ScreenMiniMenuContext
-TimerSeconds=1
+TimerSeconds=-1
 ShowExplanations=0
 CapitalizeAllOptionNames=0
 AllowRepeatingChangeValueInput=1
@@ -4576,7 +4579,7 @@ NextScreen=ScreenOptionsEditCourse
 PrepareScreens=ScreenMiniMenuContext
 GroupedScreens=ScreenMiniMenuContext
 PersistScreens=ScreenMiniMenuContext
-TimerSeconds=1
+TimerSeconds=-1
 ShowExplanations=0
 CapitalizeAllOptionNames=0
 AllowRepeatingChangeValueInput=1
@@ -4596,7 +4599,7 @@ PrepareScreens=ScreenMiniMenuContext
 GroupedScreens=ScreenMiniMenuContext
 PersistScreens=ScreenMiniMenuContext
 StyleIcon=0
-TimerSeconds=1
+TimerSeconds=-1
 ShowExplanations=0
 
 [ScreenOptionsEditProfile]
@@ -4604,7 +4607,7 @@ Class=ScreenOptionsEditProfile
 Fallback=ScreenOptionsServiceChild
 PrevScreen=ScreenOptionsManageProfiles
 NextScreen=ScreenOptionsManageProfiles
-TimerSeconds=1
+TimerSeconds=-1
 ShowExplanations=0
 CapitalizeAllOptionNames=0
 AllowRepeatingChangeValueInput=1
@@ -4617,7 +4620,7 @@ NumFixedProfiles=1
 [ScreenJoinMultiplayer]
 Class=ScreenJoinMultiplayer
 Fallback=ScreenWithMenuElements
-TimerSeconds=1
+TimerSeconds=-1
 
 [ScreenGameplayMultiplayer]
 Class=ScreenGameplayMultiplayer
@@ -4699,7 +4702,7 @@ ScoreOnCommand=x,-86
 [ScreenEvaluationMultiplayer]
 Class=ScreenEvaluationMultiplayer
 Fallback=ScreenWithMenuElements
-TimerSeconds=1
+TimerSeconds=-1
 LabelOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(indexOffset*40+116); end
 LineOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(SCREEN_CENTER_X); self:y(SCREEN_CENTER_Y+indexOffset*36+6); self:draworder(itemIndex); end
 BulletOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(SCREEN_CENTER_X-246); self:y(SCREEN_CENTER_Y+indexOffset*36+6); end