diff --git a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua
index b831602232..4894b5921b 100644
--- a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua	
+++ b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua	
@@ -161,4 +161,77 @@ function ComboMaintain()
 		para = "TapNoteScore_W4",
 	};
 	return Maintain[sGame]
+end;
+
+function ComboPerRow()
+	sGame = GAMESTATE:GetCurrentGame():GetName();
+	if sGame == "pump" then
+		return true;
+	elseif GAMESTATE:GetPlayMode() == "PlayMode_Oni" then
+		return true;
+	else return false;
+	end;
+end;
+
+function HoldTiming()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return "0";
+	else return PREFSMAN:GetPreference("TimingWindowSecondsHold");
+	end;
+end;
+
+function HoldJudgmentFail()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return "";
+	else return "shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0";
+	end;
+end;
+
+function HoldJudgmentPass()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return "";
+	else return "shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0";
+	end;
+end;
+
+function HoldHeadStep()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return false;
+	else return true;
+	end;
+end;
+
+function InitialHoldLife()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return 0.05;
+	else return 1;
+	end;
+end;
+
+function ImmediateHoldLetGo()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return false;
+	else return true;
+	end;
+end;
+
+function RollBodyIncrementsCombo()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return false;
+	else return true;
+	end;
+end;
+
+function CheckpointsTapsSeparateJudgment()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return false;
+	else return true;
+	end;
+end;
+
+function ScoreMissedHoldsAndRolls()
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return false;
+	else return true;
+	end;
 end;
\ No newline at end of file
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 603c495b58..5bc3f07878 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -34,6 +34,9 @@ PercentScoreDecimalPlaces=2
 ColorP1Command=diffuse,PlayerColor(PLAYER_1)
 ColorP2Command=diffuse,PlayerColor(PLAYER_2)
 
+[Preferences]
+TimingWindowSecondsHold=HoldTiming()
+
 # 02 #
 [LightsManager]
 GameButtonsToShow=""
@@ -158,7 +161,8 @@ MeterWidth=0.0
 MeterHeight=0.0
 
 [Combo]
-ShowComboAt=2
+ShowComboAt=(GAMESTATE:GetCurrentGame():GetName() == "pump") and 4 or 2
+ShowMissesAt=(GAMESTATE:GetCurrentGame():GetName() == "pump") and 4 or ""
 
 NumberMinZoom=0.8
 NumberMaxZoom=1
@@ -170,8 +174,8 @@ LabelOnCommand=x,6;y,22;shadowlength,1;horizalign,left;vertalign,bottom
 
 [HoldJudgment]
 # !!! #
-HoldJudgmentLetGoCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
-HoldJudgmentHeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
+HoldJudgmentLetGoCommand=HoldJudgmentFail()
+HoldJudgmentHeldCommand=HoldJudgmentPass()
 
 [HelpDisplay]
 TipShowTime=4
@@ -266,7 +270,7 @@ BannerResetFadeCommand=diffusealpha,1
 
 [Gameplay]
 # todo: make some of these play nice with other gametypes
-ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni"
+ComboIsPerRow=ComboPerRow()
 MinScoreToContinueCombo=ComboContinue()
 MinScoreToMaintainCombo=ComboMaintain()
 ToastyTriggersAt=250
@@ -701,15 +705,15 @@ TapJudgmentsUnderField=false
 HoldJudgmentsUnderField=false
 ComboUnderField=true
 PenalizeTapScoreNone=false
-JudgeHoldNotesOnSameRowTogether=false
+JudgeHoldNotesOnSameRowTogether=(GAMESTATE:GetCurrentGame():GetName() == "pump")
 HoldCheckpoints=(GAMESTATE:GetCurrentGame():GetName() == "pump")
-ImmediateHoldLetGo=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
-RequireStepOnHoldHeads=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
-CheckpointsUseTimeSignatures=false
-InitialHoldLife=1
-RollBodyIncrementsCombo=true
-CheckpointsTapsSeparateJudgment=true
-ScoreMissedHoldsAndRolls=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
+ImmediateHoldLetGo=ImmediateHoldLetGo()
+RequireStepOnHoldHeads=HoldHeadStep()
+CheckpointsUseTimeSignatures=(GAMESTATE:GetCurrentGame():GetName() == "pump")
+InitialHoldLife=InitialHoldLife()
+RollBodyIncrementsCombo=RollBodyIncrementsCombo()
+CheckpointsTapsSeparateJudgment=CheckpointsTapsSeparateJudgment()
+ScoreMissedHoldsAndRolls=ScoreMissedHoldsAndRolls()
 
 [Profile]
 ShowCoinData=true
@@ -3276,4 +3280,4 @@ UsersBG2OffCommand=
 UserDX=0
 UserDY=24
 UserOnCommand=
-UserOffCommand=
\ No newline at end of file
+UserOffCommand=