diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini
index a218c690e5..db628f600e 100644
--- a/stepmania/Themes/default/Languages/de.ini
+++ b/stepmania/Themes/default/Languages/de.ini
@@ -485,7 +485,6 @@ Key Joy Mappings=Tastatur und Joystickbelegung verändern.
 Language=Wählen Sie Ihre Sprache.
 LifeDifficulty=Wenn dieser Wert erhöht wird, fällt die Lebensenergieanzeige schneller und wird langsamer aufgefüllt.
 LifeType=Lebenstyp
-Machine Options=Punktezählungssystem und Lebensenergieoptionen ändern
 MaxTextureResolution=Maximale Texturgröße wählen.  Bei Einstellungen unter 1024 sind einige Schriftsätze verschwommen, dafür könnte die Bildwiederholrate steigen.
 MenuTimer=Schalten Sie diese Option &oq;AUS&cq;, um die Zeitbegrenzung der Menüs zu deaktivieren.
 Mines=Minen
@@ -904,7 +903,6 @@ Layer=Ebene
 LifeDifficulty=Leben\nSchwierigkeitsgrad
 LifeType=Leben\Typ
 Low Meter=Schwache Anzeige
-Machine Options=Maschinoptionen
 Main title=Haupttitel
 Main title transliteration=Transliteration Haupttitel
 MaxTextureResolution=Textur\nAuflösung
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 446642c345..acc1cd7386 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -326,7 +326,7 @@ FastLoad=If enabled, don't check songs for changes on load.
 Fill Machine Stats=
 Game=Change the current game type with this option.
 GetRankingName=Determines if name entry should never be shown, always be shown, or shown when the course is listed on the high scores screen.
-Graphic Options=Change resolution and texture options.
+Graphics/Sound Options=Change full screen, resolution, and sound options.
 Group=
 HiddenSongs=Some songs are only playable during Oni courses and with roulette.  Leave this &oq;OFF&cq; to always display all songs.
 Hide=Hide
@@ -337,7 +337,7 @@ Key Joy Mappings=Map keys and joystick buttons to game functions.
 Language=Choose your language.
 LifeDifficulty=Increase this value to cause your life meter to drain faster and refill slower.
 LifeType=LifeType
-Machine Options=Change scoring and life meter options
+Advanced Options=Change advanced options such as scoring, timing window, and life meter settings.
 MasterVolume=
 MaxTextureResolution=Choose the maximum texture resolution.  Setting this to anything below 1024 will cause some textures to appear blurry, but may increase your frame rate.
 MenuTimer=When &oq;OFF&cq;, the time limit in menus is disabled.
@@ -768,7 +768,7 @@ Force Transition=Force Transition
 Freeze=Freeze
 Game=Game
 GetRankingName=Show Name Entry
-Graphic Options=Graphic Options
+Graphics/Sound Options=Graphics/Sound Options
 Group=Group
 Hands=Hands
 HiddenSongs=Hidden Songs
@@ -787,7 +787,7 @@ Layer=Layer
 LifeDifficulty=Life Difficulty
 LifeType=Life Type
 Low Meter=Low Meter
-Machine Options=Machine Options
+Advanced Options=Advanced Options
 Main title=Main title
 Main title transliteration=Main title transliteration
 MaxTextureResolution=Texture Resolution
@@ -990,8 +990,16 @@ Players=Players
 Could not find '%s'.=Could not find '%s'.
 
 [ScreenAppearanceOptions]
-HeaderText=Appearance Options
-HeaderSubText=Make the game play your way
+HeaderText=Appearance
+HeaderSubText=Customize your game
+
+[ScreenOptionsGraphicsSound]
+HeaderText=Graphics/Sound
+HeaderSubText=Get the best performance
+
+[ScreenOptionsAdvanced]
+HeaderText=Advanced Options
+HeaderSubText=These settings are for advanced users
 
 [ScreenBookkeeping]
 All-time Total:=All-time Total:
diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini
index 0b11da4f44..c67322cfbe 100644
--- a/stepmania/Themes/default/Languages/es.ini
+++ b/stepmania/Themes/default/Languages/es.ini
@@ -474,7 +474,6 @@ Fail=Fallar
 FastLoad=Si está activado, no busques canciones para realizar cambios si está cargando.
 Game=Cambiar el tipo de juego actual con esta opción.
 GetRankingName=Determina si el nombre de la entrada debiera permanecer siempre oculto, mostrarse siempre o aparecer cuando el course aparezca en la pantalla de mejores puntuaciones.
-Graphic Options=Cambiar la resolución y las opciones de textura.
 HiddenSongs=Algunas canciones sólo se pueden reproducir durante los courses ONI y con la ruleta. Deja este &oq;APAGADO&cq; para que muestre siempre todas las canciones.
 Hide=Ocultar
 Holds=Holds
@@ -484,7 +483,6 @@ Key Joy Mappings=Asigna las teclas y botones del joystick para las funciones del
 Language=Escoge tu idioma.
 LifeDifficulty=Incrementa este valor para que tu medidor de vida se agote más rapidamente y se rellene de manera más lenta.
 LifeType=Tipo de vida
-Machine Options=Cambiar las opciones de puntuaciones y el medidor de vida
 MaxTextureResolution=Escoge la resolución máxima de textura. Si eliges cualquiera que esté por debajo de 1024, provocará que algunas texturas aparezcan borrosas aunque puede que incremente tu tasa de marcos.
 MenuTimer=El valor &oq;DESACTÍVALO&cq; para desactivar el tiempo límite en los menus.
 Mines=Bombas
@@ -845,7 +843,6 @@ Force Transition=Forzar Transición
 Freeze=Detener
 Game=Juego
 GetRankingName=Mostrar Entrada\nNombre
-Graphic Options=Opciones de Gráficos
 Group=Grupo
 Hands=Manos
 HiddenSongs=Canciones\nOcultas
@@ -863,7 +860,6 @@ Layer=Capa
 LifeDifficulty=Dificultad\nde vida
 LifeType=Tipo\nde vida
 Low Meter=medidor bajo
-Machine Options=Opciones de la Máquina
 Main title=Título Principal
 Main title transliteration=Transcripción del título principal
 MaxTextureResolution=Resolución\nde la Textura
diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini
index c37b2e48c3..b7ad7bef9e 100644
--- a/stepmania/Themes/default/Languages/fr.ini
+++ b/stepmania/Themes/default/Languages/fr.ini
@@ -452,7 +452,6 @@ Fail=Echec
 FastLoad=Si activé, ne recherche pas les modifications apportées aux chansons lors du chargement.
 Game=Changez le type de jeu actuel avec cette option.
 GetRankingName=Détermine si l'enregistrement du nom ne doit pas apparaître, toujours apparaître ou apparaître quand la course est reprise sur l'écran des meilleurs scores.
-Graphic Options=Changer les options de résolution et de texture.
 HiddenSongs=Certaines chansons ne peuvent être sélectionnées que pendant les courses Oni et avec la roulette. Sélectionnez &oq;OFF&cq; pour toujours afficher toutes les chansons.
 Hide=Cacher
 Holds=Pas figés
@@ -462,7 +461,6 @@ Key Joy Mappings=Configurer les touches et\nles boutons des contrôleurs.
 Language=Choisissez votre langue.
 LifeDifficulty=Augmentez cette valeur pour que votre barre de vie s'épuise plus vite et se recharge plus lentement.
 LifeType=TypeDeVie
-Machine Options=Changer les options de score et de barre de vie
 MaxTextureResolution=Choisissez la résolution de texture maximum. Choisir une résolution inférieure à 1024 pourra donner une apparence floue à certaines textures, mais pourra augmenter le nombre d'images par seconde.
 MenuTimer=Sélectionnez &oq;OFF&cq; pour désactiver la limite de temps dans les menus.
 Mines=Mines
@@ -863,7 +861,6 @@ Force Transition=Forcer la transition
 Freeze=Pas figés
 Game=Jeu
 GetRankingName=Afficher Nom
-Graphic Options=Options Graphiques
 Group=Groupe
 Hands=Mains
 HiddenSongs=Chansons\nCachées
@@ -881,7 +878,6 @@ Layer=Couche
 LifeDifficulty=Difficulté\nVie
 LifeType=Type\nVie
 Low Meter=Difficulté minimale
-Machine Options=Options Machine
 Main title=Titre principal
 Main title transliteration=Translittération titre principal
 MaxTextureResolution=Résolution\nTexture
diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini
index 6f54e528c6..8c03b0cdaf 100644
--- a/stepmania/Themes/default/Languages/it.ini
+++ b/stepmania/Themes/default/Languages/it.ini
@@ -447,7 +447,6 @@ Fail=Eliminato
 FastLoad=Se abilitato, durante il caricamento non controllate se le canzoni hanno subito modifiche.
 Game=Cambia l'attuale tipo di gioco con questa opzione.
 GetRankingName=Determina se l'immissione del nome non deve mai essere visualizzata, se deve sempre essere visualizzata, o se deve essere visualizzata solo quando il percorso è elencato nella schermata dei punteggi più alti.
-Graphic Options=Cambia la risoluzione e le impostazioni della struttura.
 HiddenSongs=Alcune canzoni sono ascoltabili solo durante i percorsi Oni e con la roulette. Lasciate &oq;OFF&cq; per visualizzare sempre tutte le canzoni.
 Hide=Nascondi
 Holds=Fermate
@@ -457,7 +456,6 @@ Key Joy Mappings=Imposta i tasti e i bottoni del joystick per le funzioni del gi
 Language=Scegli la lingua.
 LifeDifficulty=Aumenta questo valore per far sì che il tuo contatore di vita si esaurisca più in fretta e si ricarichi più lentamente.
 LifeType=Tipo di vita
-Machine Options=Cambia le impostazioni del punteggio e del contatore di vita
 MaxTextureResolution=Scegli la massima risoluzione per la struttura. Impostandola su un valore inferiore a 1024 alcune strutture possono apparire offuscate ma il frame rate aumenta.
 MenuTimer=Mettere &oq;OFF&cq; per disattivare il limite di tempo nei menu.
 Mines=Mine
@@ -858,7 +856,6 @@ Force Transition=Forza transizione
 Freeze=Freeze
 Game=Gioco
 GetRankingName=Mostra Nomi\n
-Graphic Options=Opzioni grafiche
 Group=Gruppo
 Hands=Mani
 HiddenSongs=Canzoni\nSegrete
@@ -876,7 +873,6 @@ Layer=Strato
 LifeDifficulty=Difficoltà\nVita
 LifeType=Tipo\nVita
 Low Meter=Contatore basso
-Machine Options=Opzioni macchina
 Main title=Titolo principale canzone
 Main title transliteration=Traslitterazione titolo principale canzone
 MaxTextureResolution=Risoluzione\ntexture
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 0c9e4fc251..52b8b9573c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2912,7 +2912,7 @@ MorePage2OffCommand=
 IdleCommentSeconds=0
 IdleTimeoutSeconds=0
 
-[ScreenMachineOptions]
+[ScreenOptionsAdvanced]
 Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30"
 Line1="conf,MenuTimer"
@@ -2946,7 +2946,7 @@ Line28="conf,AutogenSteps"
 Line29="conf,AutogenGroupCourses"
 Line30="conf,FastLoad"
 
-[ScreenGraphicOptions]
+[ScreenOptionsGraphicsSound]
 Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14"
 Line1="conf,Windowed"
@@ -3446,19 +3446,19 @@ ShowStyleIcon=false
 TimerSeconds=-1
 
 AllowOperatorMenuButton=false
-LineNames="1,5,8,9,11,13,14,15,16"
+LineNames="1,2,3,4,5,6,7,8,9"
 # This NextScreen is only used for the "exit" choice.
-Line1="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
-Line5="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
-Line8="gamecommand;screen,ScreenGraphicOptions;name,Graphic Options"
-Line9="gamecommand;screen,ScreenMachineOptions;name,Machine Options"
-Line11="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
-Line13="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
-Line14="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
-Line15="gamecommand;screen,ScreenTestInput;name,Test Input"
-Line16="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
-GroupedScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput"
-PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput"
+Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
+Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
+Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
+Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
+Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
+Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
+Line7="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+Line8="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
+Line9="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
+GroupedScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenOptionsGraphicsSound,ScreenOptionsAdvanced,ScreenOptionsManageProfiles,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput"
+PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenOptionsGraphicsSound,ScreenOptionsAdvanced,ScreenOptionsManageProfiles,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput"
 
 [ScreenOptionsServiceChild]
 Fallback="ScreenOptionsMaster"
diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp
index f877366cdc..b2a07d43bb 100644
--- a/stepmania/src/ScreenSMOnlineLogin.cpp
+++ b/stepmania/src/ScreenSMOnlineLogin.cpp
@@ -51,7 +51,7 @@ void ScreenSMOnlineLogin::Init()
 		vHands.push_back( pHand );
 
 	InitMenu( vHands );
-  	SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions", "music"));
+  	SOUND->PlayMusic( THEME->GetPathS("ScreenOptionsServiceChild", "music"));
 	OptionRow &row = *m_pRows.back();
 	row.SetExitText("Login");
 }