diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini
index 3b00a257ec..bb2dea259b 100644
--- a/stepmania/Themes/default/Languages/de.ini
+++ b/stepmania/Themes/default/Languages/de.ini
@@ -433,7 +433,6 @@ Announcer=Wählen Sie aus dieser Liste der Kommentatoren.
 Appearance=Aussehen
 Appearance Options=Ändern Sie Motiv, den Kommentator und andere Stiloptionen.
 ArcadeOptionsNavigation=Wenn Sie &oq;SM style&cq; benutzen, gelangen Sie mit dem Startknopf zum nächsten Fenster, und mit den Pfeiltasten können Sie die Zeilen wechseln.  Wenn Sie die &oq;Arcade Style&cq; benutzen, bewegt der Startknopf den Zeiger zur nächsten Zeile und die Pfeiltasten sind ohne Funktion.
-AssistTick=Metronom
 AttractSoundFrequency=Auf IMMER einstellen, um Musik bei jedem Startbildschirm zu spielen.  Auf N MAL stellen, um Klang alle N Startbildschirme zu spielen.
 AutoAdjust=Automatische Kalibrierung
 AutoMapOnJoyChange=Bei eingeschaltetem &oq;ON&cq;  erstellt das Spiel automatisch eine neue Funktionsbelegung für alle Joysticks, die an Ihr System angeschlossen sind, sofern diese andere als beim letzten Programmstart sind.
@@ -802,7 +801,6 @@ Appearance Options=Erscheinungsoptionen
 ArcadeOptionsNavigation=Optionen\nNavigation
 Artist=Interpret
 Artist transliteration=Interpreten Beschreibung
-AssistTick=Matro\nnom
 AttractSoundFrequency=Klang\nFrequenz anziehen
 AutoAdjust=Auto\nAnpassen
 AutoMapOnJoyChange=Auto Karte\nAuf Joystick Wechsel
@@ -1123,7 +1121,6 @@ HelpText=&UP; &DOWN; schaltet zwischen Zeilen um    &LEFT; &RIGHT; wählt Option
 
 [ScreenDebugOverlay]
 %s in gameplay=%s im Spielverlauf
-AssistTick=Unterstützendes Ticken
 AutoPlay=AutoSpielen
 Autosync=Autosynchronisieren
 CPU=CPU
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 303816956a..588a47435e 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -250,7 +250,7 @@ Announcer=Choose from this list of installed announcer packs.
 Appearance=Appearance
 Appearance Options=Change the theme, announcer, and other style options.
 ArcadeOptionsNavigation=When using &oq;SM style&cq;, the Start button will take you to the next screen and Up/Down will switch option lines. When using &oq;Arcade style&cq;, the Start button will move the cursor to the next line and Up/Down will be ignored.
-AssistTick=AssistTick
+Assist=Assist
 AttractSoundFrequency=Set to ALWAYS to play sound every during the attract screens. Set to N TIMES to play sounds every N attract sequences.
 AutoAdjust=AutoAdjust
 AutoMapOnJoyChange=&oq;ON&cq; will cause the game to automatically remap all the joysticks attached to your computer if the joysticks attached to your system are different than the last time you started the game.  Auto mapping will override any manually defined mappings.
@@ -650,7 +650,7 @@ Appearance Options=Appearance Options
 ArcadeOptionsNavigation=Options\nNavigation
 Artist=Artist
 Artist transliteration=Artist transliteration
-AssistTick=Assist\nTick
+Assist=Assist
 AttractSoundFrequency=Attract Sound\nFrequency
 AutoAdjust=Auto\nAdjust
 AutoMapOnJoyChange=Auto Map\nOn Joy Change
@@ -986,7 +986,7 @@ HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::
 
 [ScreenDebugOverlay]
 %s in gameplay=%s in gameplay
-AssistTick=AssistTick
+Assist=Assist
 AutoPlay=AutoPlay
 Autosync=Autosync
 CPU=CPU
diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini
index 3772610f68..34a5c2819c 100644
--- a/stepmania/Themes/default/Languages/fr.ini
+++ b/stepmania/Themes/default/Languages/fr.ini
@@ -410,7 +410,6 @@ Announcer=Choisissez dans cette liste de paquets annonceur installés.
 Appearance=Apparence
 Appearance Options=Changer le thème, l'annonceur et d'autres options de style.
 ArcadeOptionsNavigation=Quand vous utilisez &oq;Style SM&cq;, le bouton Démarrer vous conduira à l'écran suivant et Haut/Bas changeront le curseur de ligne d'options. Quand vous utilisez &oq;style Arcade&cq;, le bouton Démarrer déplacera le curseur à la ligne suivante et Haut/Bas seront ignorés.
-AssistTick=Métronome
 AttractSoundFrequency=Choisissez TOUJOURS pour avoir le son pendant les écrans de séduction Choisissez N FOIS pour avoir le son toutes les N séquences de séduction.
 AutoAdjust=Ajustement Auto
 AutoMapOnJoyChange=Si sur &oq;ON&cq;, le jeu configurera automatiquement toutes les manettes reliées à votre ordinateur, si les manettes reliées à votre système sont différentes de celles qu'il y avait la dernière fois que vous avez démarré le jeu. La configuration automatique écrasera toutes celles définies manuellement.
@@ -779,7 +778,6 @@ Appearance Options=Options d'apparence
 ArcadeOptionsNavigation=Options\nde navigation
 Artist=Artiste
 Artist transliteration=Translittération artiste
-AssistTick=Métronome
 AttractSoundFrequency=Fréquence\nSon de Séduction
 AutoAdjust=Auto\nAjustement
 AutoMapOnJoyChange=Configuration automatique\nlors d'un changement de manette
@@ -1100,7 +1098,6 @@ HelpText=&UP; &DOWN; pour changer de ligne &LEFT; &RIGHT; pour sélectionner les
 
 [ScreenDebugOverlay]
 %s in gameplay=%s dans jeu
-AssistTick=Métronome
 AutoPlay=AutoPlay
 Autosync=Autosync
 CPU=CPU
diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini
index 040aae5a92..700e10e5c7 100644
--- a/stepmania/Themes/default/Languages/it.ini
+++ b/stepmania/Themes/default/Languages/it.ini
@@ -405,7 +405,6 @@ Announcer=Scegli nell'elenco di pacchetti di announcer installati.
 Appearance=Aspetto
 Appearance Options=Cambia il tema, l'announcer e altre opzioni di stile.
 ArcadeOptionsNavigation=Quando usate &oq;SM style&cq; il bottone Start vi porterà alla prossima schermata e Su/Giù alterna le righe delle opzioni. Quando usate &oq;Arcade style&cq; il bottone Start sposterà il cursore sulla riga successiva e Su/Giù verrà ignorato.
-AssistTick=AssistTick
 AttractSoundFrequency=Impostato su SEMPRE per suonare sempre i  suoni durante le schermate di attrazione. Impostato su N VOLTE per suonare i suoni ogni N sequenze di attrazione.
 AutoAdjust=Auto Regola
 AutoMapOnJoyChange=Con &oq;ON&cq; il gioco eseguae la rimappatura automatica di tutti i joystick collegati al computer se essi sono diversi rispetto all'ultima volta che avete lanciato il gioco. Auto mappatura annullerà tutte le mappature definite manualmente.
@@ -774,7 +773,6 @@ Appearance Options=Opzioni di aspetto
 ArcadeOptionsNavigation=Opzioni\nNavigazione
 Artist=Artista
 Artist transliteration=Traslitterazione
-AssistTick=Assisti\nTick
 AttractSoundFrequency=Attira Suono\nFrequenza
 AutoAdjust=Auto\nAdjust
 AutoMapOnJoyChange=Auto Map\nOn Joy Change
@@ -1095,7 +1093,6 @@ HelpText=&UP; &DOWN; per cambiare linea   &LEFT; &RIGHT; per selezionare tra le
 
 [ScreenDebugOverlay]
 %s in gameplay=%s nel gioco elettronico
-AssistTick=AssistTick
 AutoPlay=Gioco Automatico
 Autosync=Autosincronizzazione
 CPU=CPU
diff --git a/stepmania/Themes/default/Sounds/GameplayAssist clap.redir b/stepmania/Themes/default/Sounds/GameplayAssist clap.redir
new file mode 100644
index 0000000000..5f5b4d3302
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/GameplayAssist clap.redir	
@@ -0,0 +1 @@
+_clap
\ No newline at end of file
diff --git a/stepmania/Themes/default/Sounds/GameplayAssist metronome beat.redir b/stepmania/Themes/default/Sounds/GameplayAssist metronome beat.redir
new file mode 100644
index 0000000000..5f5b4d3302
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/GameplayAssist metronome beat.redir	
@@ -0,0 +1 @@
+_clap
\ No newline at end of file
diff --git a/stepmania/Themes/default/Sounds/GameplayAssist metronome measure.redir b/stepmania/Themes/default/Sounds/GameplayAssist metronome measure.redir
new file mode 100644
index 0000000000..5f5b4d3302
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/GameplayAssist metronome measure.redir	
@@ -0,0 +1 @@
+_clap
\ No newline at end of file
diff --git a/stepmania/Themes/default/Sounds/_clap.ogg b/stepmania/Themes/default/Sounds/_clap.ogg
new file mode 100644
index 0000000000..bf97847b66
Binary files /dev/null and b/stepmania/Themes/default/Sounds/_clap.ogg differ
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index abcbd98039..bf4f491863 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3613,7 +3613,7 @@ Line1="list,LifeType"
 Line2="list,BarDrain"
 Line3="list,BatLives"
 Line4="list,Fail"
-Line5="list,AssistTick"
+Line5="list,Assist"
 Line6="list,Rate"
 Line7="list,SoundEffect"
 Line8="list,AutoAdjust"
@@ -3841,10 +3841,12 @@ Fail,1="mod,failImmediate;name,Immediate"
 Fail,2="mod,FailImmediateContinue;name,ImmediateContinue"
 Fail,3="mod,FailAtEnd;name,FailAtEnd"
 Fail,4="mod,failoff;name,Off"
-AssistTick="2;together"
-AssistTickDefault=""
-AssistTick,1="mod,no assisttick;name,Off"
-AssistTick,2="mod,assisttick;name,On"
+Assist="4;together"
+AssistDefault=""
+Assist,1="mod,no clap,no metronome;name,Off"
+Assist,2="mod,clap,no metronome;name,Clap"
+Assist,3="mod,no clap,metronome;name,Metronome"
+Assist,4="mod,clap,metronome;name,Both"
 Rate="13;together"
 RateDefault="mod,1.0xmusic;mod,no haste"
 Rate,1="mod,0.25xmusic;name,0.25x"
@@ -4050,7 +4052,7 @@ Line9="list,Holds"
 Line10="list,Mines"
 Line11="list,Hide"
 Line12="list,Persp"
-Line13="list,AssistTick"
+Line13="list,Assist"
 Line14="list,Rate"
 Line15="list,AutoAdjust"
 Line16="conf,EditorShowBGChangesPlay"
diff --git a/stepmania/Themes/techno/metrics.ini b/stepmania/Themes/techno/metrics.ini
index fc76e9c662..989e175ac5 100644
--- a/stepmania/Themes/techno/metrics.ini
+++ b/stepmania/Themes/techno/metrics.ini
@@ -118,10 +118,6 @@ FailDefault=
 Fail,1=mod,failImmediate;name,Immediate
 Fail,2=mod,failendofsong;name,EndOfSong
 Fail,3=mod,failoff;name,Off
-AssistTick=2,together
-AssistTickDefault=
-AssistTick,1=mod,no assisttick;name,Off
-AssistTick,2=mod,assisttick;name,On
 Rate=18,together
 RateDefault=
 Rate,1=mod,0.3xmusic;name,0.3x