diff --git a/Themes/_fallback/Scripts/01 alias.lua b/Themes/_fallback/Scripts/01 alias.lua
index 05935425bf..126d9c69ef 100644
--- a/Themes/_fallback/Scripts/01 alias.lua	
+++ b/Themes/_fallback/Scripts/01 alias.lua	
@@ -20,4 +20,4 @@ local _screen = {
 	h  = SCREEN_HEIGHT,
 	cx = SCREEN_CENTER_X,
 	cy = SCREEN_CENTER_Y
-}
\ No newline at end of file
+}
diff --git a/Themes/_fallback/Scripts/01 compat.lua b/Themes/_fallback/Scripts/01 compat.lua
index c2f171e1f0..dbdf4a819c 100644
--- a/Themes/_fallback/Scripts/01 compat.lua	
+++ b/Themes/_fallback/Scripts/01 compat.lua	
@@ -63,4 +63,14 @@ end
 
 if ScreenMetric then
 	ScreenMetric = Screen.Metric
-end
\ No newline at end of file
+end
+
+--[[ GameState ]]
+--Aliases for old GAMESTATE timing functions.
+--These have been converted to SongPosition, but most themes still use these old functions.
+
+function GameState:GetSongBeat() return self:GetSongPosition():GetSongBeat() end
+function GameState:GetSongBeatNoOffset() return self:GetSongPosition():GetSongBeatNoOffset() end
+function GameState:GetSongBPS() return self:GetSongPosition():GetCurBPS() end
+function GameState:GetSongDelay() return self:GetSongPosition:GetDelay() end
+function GameState:GetSongFreeze() return self:GetSongPosition:GetFreeze() end
diff --git a/src/GameState.cpp b/src/GameState.cpp
index 7b1be3f3c9..f9451ff119 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -2462,11 +2462,11 @@ public:
 		ADD_METHOD( GetHardestStepsDifficulty );
 		ADD_METHOD( IsEventMode );
 		ADD_METHOD( GetNumPlayersEnabled );
-		ADD_METHOD( GetSongBeat );
+		/*ADD_METHOD( GetSongBeat );
 		ADD_METHOD( GetSongBeatVisible );
 		ADD_METHOD( GetSongBPS );
 		ADD_METHOD( GetSongFreeze );
-		ADD_METHOD( GetSongDelay );
+		ADD_METHOD( GetSongDelay );*/
 		ADD_METHOD( GetSongPosition );
 		ADD_METHOD( GetGameplayLeadIn );
 		ADD_METHOD( GetCoins );