diff --git a/Assets/Scripts/Games/Fillbots/Fillbots.cs b/Assets/Scripts/Games/Fillbots/Fillbots.cs
index cfe4df4b1..5e316d232 100644
--- a/Assets/Scripts/Games/Fillbots/Fillbots.cs
+++ b/Assets/Scripts/Games/Fillbots/Fillbots.cs
@@ -17,7 +17,9 @@ namespace HeavenStudio.Games.Loaders
                     preFunction = delegate { Fillbots.PreSpawnFillbot(eventCaller.currentEntity.beat, 3, Scripts_Fillbots.BotSize.Medium, Scripts_Fillbots.BotVariant.Normal); },
                     defaultLength = 8f
                 }
-            });
+            },
+            new List<string>() { "ntr", "normal" }, "ntrFillbots", "en", new List<string>() { }
+            );
         }
     }
 }
@@ -79,12 +81,12 @@ namespace HeavenStudio.Games
                     }
                     queuedBots.Clear();
                 }
-                if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN))
+                if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress))
                 {
                     filler.DoScaledAnimationAsync("Hold", 0.5f);
                     SoundByte.PlayOneShotGame("fillbots/armExtension");
                 }
-                if (PlayerInput.PressedUp() && !IsExpectingInputNow(InputType.STANDARD_UP))
+                if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease))
                 {
                     filler.DoScaledAnimationAsync("ReleaseWhiff", 0.5f);
                     SoundByte.PlayOneShotGame("fillbots/armRetractionWhiff");
@@ -161,7 +163,7 @@ namespace HeavenStudio.Games
                 spawnedBot.holdLength = holdLength;
             }
             spawnedBot.Init(beat);
-            BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
+            BeatAction.New(instance, new List<BeatAction.Action>()
             {
                 new BeatAction.Action(beat, delegate
                 {
@@ -170,7 +172,7 @@ namespace HeavenStudio.Games
                 }),
                 new BeatAction.Action(beat + 3, delegate
                 {
-                    if (!PlayerInput.Pressing()) filler.DoScaledAnimationAsync("FillerPrepare", 0.5f);
+                    if (!PlayerInput.GetIsAction(InputAction_BasicPress)) filler.DoScaledAnimationAsync("FillerPrepare", 0.5f);
                     conveyerStartBeat = beat + 3;
                 })
             });
diff --git a/Assets/Scripts/Games/Fillbots/NtrFillbot.cs b/Assets/Scripts/Games/Fillbots/NtrFillbot.cs
index 567b4bd8f..26debd387 100644
--- a/Assets/Scripts/Games/Fillbots/NtrFillbot.cs
+++ b/Assets/Scripts/Games/Fillbots/NtrFillbot.cs
@@ -116,7 +116,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots
         {
             startBeat = beat;
 
-            BeatAction.New(gameObject, new List<BeatAction.Action>()
+            BeatAction.New(game, new List<BeatAction.Action>()
             {
                 new BeatAction.Action(beat, delegate { legs.Play("Impact", 0, 0); legsHaveFallen = true; legsTrans.position = new Vector3(legsTrans.position.x, legsPosY); }),
                 new BeatAction.Action(beat + 1, delegate { body.Play("Impact", 0, 0); bodyHasFallen = true; bodyTrans.position = new Vector3(bodyTrans.position.x, bodyPosY);}),
@@ -145,7 +145,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots
                 new MultiSound.Sound("fillbots/" + sizePrefix + "Fall", beat + 2),
             });
 
-            game.ScheduleInput(startBeat, 4, InputType.STANDARD_DOWN, JustHold, HoldOut, HoldOut);
+            game.ScheduleInput(startBeat, 4, Fillbots.InputAction_BasicPress, JustHold, HoldOut, HoldOut);
 
             game.currentBots.Add(this);
         }
@@ -194,13 +194,13 @@ namespace HeavenStudio.Games.Scripts_Fillbots
                     }
 
                     fillAnim.DoNormalizedAnimation("Fill", Mathf.Clamp(normalizedBeat, 0, 1));
-                    if (!game.IsExpectingInputNow(InputType.STANDARD_UP) && normalizedExplodeBeat >= 1f)
+                    if (!game.IsExpectingInputNow(Fillbots.InputAction_BasicRelease) && normalizedExplodeBeat >= 1f)
                     {
                         SoundByte.PlayOneShotGame("fillbots/explosion");
                         game.currentBots.Remove(this);
                         Destroy(gameObject);
                     }
-                    else if (PlayerInput.PressedUp() && !game.IsExpectingInputNow(InputType.STANDARD_UP))
+                    else if (PlayerInput.GetIsAction(Fillbots.InputAction_BasicRelease) && !game.IsExpectingInputNow(Fillbots.InputAction_BasicRelease))
                     {
                         if (normalizedBeat < 1)
                         {
@@ -248,7 +248,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots
             fullBody.DoScaledAnimationAsync("Hold", 1f);
             SoundByte.PlayOneShotGame("fillbots/beep");
             fillSound = SoundByte.PlayOneShotGame("fillbots/water", -1, 1 / (float)(holdLength / 3), 1, true);
-            releaseEvent = game.ScheduleInput(startBeat + 4, holdLength, InputType.STANDARD_UP, JustRelease, OutRelease, OutRelease);
+            releaseEvent = game.ScheduleInput(startBeat + 4, holdLength, Fillbots.InputAction_BasicRelease, JustRelease, OutRelease, OutRelease);
             beepEvent = new GameEvent()
             {
                 startBeat = startBeat + 4,
diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
index db95ded5d..433090404 100644
--- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
+++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
@@ -193,6 +193,16 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrIdolLoader failed!");
             }
 
+            game = NtrFillbotsLoader.AddGame(eventCaller);
+            if (game != null)
+            {
+                eventCaller.minigames.Add(game.name, game);
+            }
+            else
+            {
+                Debug.LogWarning("Game loader NtrFillbotsLoader failed!");
+            }
+
             game = AgbFireworkLoader.AddGame(eventCaller);
             if (game != null)
             {