diff --git a/source/funkin/mobile/ui/FunkinButton.hx b/source/funkin/mobile/ui/FunkinButton.hx
index 496faf2e5..ca96a82a9 100644
--- a/source/funkin/mobile/ui/FunkinButton.hx
+++ b/source/funkin/mobile/ui/FunkinButton.hx
@@ -12,7 +12,7 @@ import flixel.input.touch.FlxTouch;
 import flixel.math.FlxPoint;
 import flixel.util.FlxDestroyUtil;
 import flixel.util.FlxSignal;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.SwipeUtil;
 import openfl.display.Graphics;
 import haxe.ds.Map;
 
@@ -211,11 +211,9 @@ class FunkinButton extends FunkinSprite implements IFlxInput
           touchID = touch.touchPointID;
           if (buttonsTouchID.exists(touchID) && buttonsTouchID.get(touchID) != this)
           {
-            var prevButton = buttonsTouchID.get(touchID);
-            if (prevButton != null && !prevButton.limitToBounds)
-            {
-              prevButton.onOutHandler();
-            }
+            final prevButton:Null<FunkinButton> = buttonsTouchID.get(touchID);
+
+            if (prevButton != null && !prevButton.limitToBounds) prevButton.onOutHandler();
           }
           buttonsTouchID.set(touchID, this);
 
diff --git a/source/funkin/mobile/ui/TouchPointer.hx b/source/funkin/mobile/ui/TouchPointer.hx
index df877e310..4141e56b7 100644
--- a/source/funkin/mobile/ui/TouchPointer.hx
+++ b/source/funkin/mobile/ui/TouchPointer.hx
@@ -14,7 +14,7 @@ import openfl.display.BitmapData;
 import flixel.util.FlxDestroyUtil;
 import openfl.display.Sprite;
 import flixel.FlxSprite;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 import flixel.math.FlxAngle;
 import funkin.util.MathUtil;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
diff --git a/source/funkin/mobile/ui/mods/ModsManager.hx b/source/funkin/mobile/ui/mods/ModsManager.hx
index b30b493e0..8271c56c5 100644
--- a/source/funkin/mobile/ui/mods/ModsManager.hx
+++ b/source/funkin/mobile/ui/mods/ModsManager.hx
@@ -5,7 +5,7 @@ import flixel.graphics.FlxGraphic;
 import flixel.text.FlxText;
 import flixel.util.FlxColor;
 import flixel.util.FlxSpriteUtil;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 import funkin.util.FileUtil;
 import funkin.ui.MusicBeatSubState;
 import funkin.modding.PolymodHandler;
diff --git a/source/funkin/mobile/ui/options/MobileControlsSchemeMenu.hx b/source/funkin/mobile/ui/options/MobileControlsSchemeMenu.hx
index c05f02cba..834966804 100644
--- a/source/funkin/mobile/ui/options/MobileControlsSchemeMenu.hx
+++ b/source/funkin/mobile/ui/options/MobileControlsSchemeMenu.hx
@@ -8,8 +8,8 @@ import flixel.FlxG;
 import funkin.mobile.ui.options.objects.SchemeMenuButton;
 import funkin.mobile.ui.options.objects.HitboxShowcase;
 import funkin.mobile.ui.FunkinHitbox;
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 import funkin.ui.MusicBeatSubState;
 import funkin.ui.AtlasText;
 import funkin.graphics.shaders.HSVShader;
diff --git a/source/funkin/mobile/ui/options/objects/SchemeMenuButton.hx b/source/funkin/mobile/ui/options/objects/SchemeMenuButton.hx
index 05c288c02..208a82ac4 100644
--- a/source/funkin/mobile/ui/options/objects/SchemeMenuButton.hx
+++ b/source/funkin/mobile/ui/options/objects/SchemeMenuButton.hx
@@ -5,8 +5,8 @@ import flixel.effects.FlxFlicker;
 import flixel.group.FlxSpriteGroup;
 import flixel.util.FlxSignal;
 import flixel.util.FlxColor;
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 import funkin.audio.FunkinSound;
 import funkin.ui.AtlasText;
 
diff --git a/source/funkin/play/GameOverSubState.hx b/source/funkin/play/GameOverSubState.hx
index 70656686b..105f2174e 100644
--- a/source/funkin/play/GameOverSubState.hx
+++ b/source/funkin/play/GameOverSubState.hx
@@ -19,7 +19,7 @@ import funkin.ui.story.StoryMenuState;
 import funkin.util.MathUtil;
 import funkin.effects.RetroCameraFade;
 import flixel.math.FlxPoint;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 import openfl.utils.Assets;
 
 /**
diff --git a/source/funkin/play/GitarooPause.hx b/source/funkin/play/GitarooPause.hx
index 8fdce4362..077f41ac1 100644
--- a/source/funkin/play/GitarooPause.hx
+++ b/source/funkin/play/GitarooPause.hx
@@ -7,8 +7,8 @@ import funkin.ui.MusicBeatState;
 import flixel.addons.transition.FlxTransitionableState;
 import funkin.ui.mainmenu.MainMenuState;
 #if mobile
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 #end
 
 class GitarooPause extends MusicBeatState
diff --git a/source/funkin/play/PauseSubState.hx b/source/funkin/play/PauseSubState.hx
index ad94814fa..3218958a7 100644
--- a/source/funkin/play/PauseSubState.hx
+++ b/source/funkin/play/PauseSubState.hx
@@ -19,8 +19,8 @@ import funkin.play.cutscene.VideoCutscene;
 import funkin.ui.AtlasText;
 import funkin.ui.MusicBeatSubState;
 import funkin.ui.transition.StickerSubState;
-import funkin.mobile.util.SwipeUtil;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.SwipeUtil;
+import funkin.util.TouchUtil;
 #if NO_DISABLE_ADMOB_ADS
 import funkin.mobile.util.AdMobUtil;
 #end
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 2965af667..d3899daac 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -58,7 +58,7 @@ import funkin.util.SerializerUtil;
 import funkin.util.HapticUtil;
 import haxe.Int64;
 #if mobile
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 import funkin.mobile.ui.FunkinHitbox;
 import funkin.mobile.ui.FunkinHitbox.FunkinHitboxControlSchemes;
 #if NO_DISABLE_ADMOB_ADS
diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx
index 7d87dee46..b0efc9682 100644
--- a/source/funkin/play/ResultState.hx
+++ b/source/funkin/play/ResultState.hx
@@ -35,7 +35,7 @@ import funkin.play.components.ClearPercentCounter;
 import funkin.api.newgrounds.Medals;
 #end
 #if mobile
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 #if NO_DISABLE_ADMOB_ADS
 import funkin.mobile.util.AdMobUtil;
 #end
diff --git a/source/funkin/ui/MenuList.hx b/source/funkin/ui/MenuList.hx
index d09150338..e32f3b6b9 100644
--- a/source/funkin/ui/MenuList.hx
+++ b/source/funkin/ui/MenuList.hx
@@ -6,8 +6,8 @@ import flixel.effects.FlxFlicker;
 import flixel.group.FlxGroup.FlxTypedGroup;
 import flixel.util.FlxSignal.FlxTypedSignal;
 import funkin.audio.FunkinSound;
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 import funkin.ui.options.OptionsState.PageName;
 
 class MenuTypedList<T:MenuListItem> extends FlxTypedGroup<T>
diff --git a/source/funkin/ui/charSelect/CharSelectSubState.hx b/source/funkin/ui/charSelect/CharSelectSubState.hx
index 9e0217780..aadc67e14 100644
--- a/source/funkin/ui/charSelect/CharSelectSubState.hx
+++ b/source/funkin/ui/charSelect/CharSelectSubState.hx
@@ -35,10 +35,8 @@ import funkin.graphics.FunkinSprite;
 #if FEATURE_NEWGROUNDS
 import funkin.api.newgrounds.Medals;
 #end
-#if mobile
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
-#end
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 
 class CharSelectSubState extends MusicBeatSubState
 {
diff --git a/source/funkin/ui/charSelect/CharacterUnlockState.hx b/source/funkin/ui/charSelect/CharacterUnlockState.hx
index a38f29dd2..c35498ac6 100644
--- a/source/funkin/ui/charSelect/CharacterUnlockState.hx
+++ b/source/funkin/ui/charSelect/CharacterUnlockState.hx
@@ -14,7 +14,7 @@ import funkin.ui.freeplay.charselect.PlayableCharacter;
 import funkin.data.freeplay.player.PlayerRegistry;
 import funkin.ui.mainmenu.MainMenuState;
 #if mobile
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 #end
 
 using flixel.util.FlxSpriteUtil;
diff --git a/source/funkin/ui/credits/CreditsState.hx b/source/funkin/ui/credits/CreditsState.hx
index 6be11bf90..775336431 100644
--- a/source/funkin/ui/credits/CreditsState.hx
+++ b/source/funkin/ui/credits/CreditsState.hx
@@ -6,7 +6,7 @@ import funkin.audio.FunkinSound;
 import flixel.FlxSprite;
 import funkin.ui.mainmenu.MainMenuState;
 import flixel.group.FlxSpriteGroup;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 
 /**
  * The state used to display the credits scroll.
diff --git a/source/funkin/ui/debug/latency/LatencyState.hx b/source/funkin/ui/debug/latency/LatencyState.hx
index 0ec7b1ee8..ea9e80dec 100644
--- a/source/funkin/ui/debug/latency/LatencyState.hx
+++ b/source/funkin/ui/debug/latency/LatencyState.hx
@@ -13,7 +13,7 @@ import funkin.play.notes.Strumline;
 import funkin.ui.mainmenu.MainMenuState;
 import funkin.data.song.SongData.SongNoteData;
 #if mobile
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 import funkin.mobile.ui.FunkinHitbox;
 import funkin.play.notes.NoteDirection;
 import funkin.graphics.FunkinSprite;
diff --git a/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx b/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx
index 1d0c48d5e..4ee3c846e 100644
--- a/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx
+++ b/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx
@@ -9,7 +9,7 @@ import flixel.util.FlxTimer;
 import flixel.text.FlxText;
 import flixel.text.FlxText.FlxTextAlign;
 #if mobile
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 #end
 
 @:nullSafety
@@ -94,8 +94,10 @@ class CapsuleOptionsMenu extends FlxSpriteGroup
         currentInstrumentalIndex = (currentInstrumentalIndex - 1 + instrumentalIds.length) % instrumentalIds.length;
         changedInst = true;
       }
-      if (parent.getControls().ACCEPT #if mobile || ((TouchUtil.overlapsComplex(currentInstrumental) && TouchUtil.justPressed)
-        && !(TouchUtil.overlapsComplex(leftArrow) || TouchUtil.overlapsComplex(rightArrow))) #end)
+      if (parent.getControls()
+        .ACCEPT #if mobile
+        || ((TouchUtil.overlapsComplex(currentInstrumental) && TouchUtil.justPressed)
+          && !(TouchUtil.overlapsComplex(leftArrow) || TouchUtil.overlapsComplex(rightArrow))) #end)
       {
         busy = true;
         onConfirm(instrumentalIds[currentInstrumentalIndex] ?? '');
@@ -109,6 +111,15 @@ class CapsuleOptionsMenu extends FlxSpriteGroup
       currentInstrumental.text = instrumentalIds[currentInstrumentalIndex].toTitleCase() ?? '';
       if (currentInstrumental.text == '') currentInstrumental.text = 'Default';
     }
+
+    if (parent.getControls().ACCEPT #if mobile
+      || TouchUtil.overlapsComplex(currentInstrumental)
+      && TouchUtil.justPressed
+      && !TouchUtil.overlapsComplex(leftArrow)
+      && !TouchUtil.overlapsComplex(rightArrow) #end)
+    {
+      onConfirm(instrumentalIds[currentInstrumentalIndex] ?? '');
+    }
   }
 
   public function close():Void
diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx
index 577f4f87b..1ff61d53c 100644
--- a/source/funkin/ui/freeplay/FreeplayState.hx
+++ b/source/funkin/ui/freeplay/FreeplayState.hx
@@ -49,10 +49,8 @@ import funkin.data.freeplay.style.FreeplayStyleRegistry;
 #if FEATURE_DISCORD_RPC
 import funkin.api.discord.DiscordClient;
 #end
-#if TOUCH_CONTROLS
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
-#end
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 import flixel.system.scaleModes.FullScreenScaleMode;
 
 /**
diff --git a/source/funkin/ui/freeplay/LetterSort.hx b/source/funkin/ui/freeplay/LetterSort.hx
index 0e424f349..a69e456c6 100644
--- a/source/funkin/ui/freeplay/LetterSort.hx
+++ b/source/funkin/ui/freeplay/LetterSort.hx
@@ -10,8 +10,8 @@ import flixel.tweens.FlxEase;
 import flixel.util.FlxColor;
 import flixel.util.FlxTimer;
 import funkin.input.Controls;
-import funkin.mobile.util.SwipeUtil;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.SwipeUtil;
+import funkin.util.TouchUtil;
 import funkin.graphics.adobeanimate.FlxAtlasSprite;
 
 class LetterSort extends FlxSpriteGroup
diff --git a/source/funkin/ui/freeplay/SongMenuItem.hx b/source/funkin/ui/freeplay/SongMenuItem.hx
index 7af970e7a..eb1fb1aa9 100644
--- a/source/funkin/ui/freeplay/SongMenuItem.hx
+++ b/source/funkin/ui/freeplay/SongMenuItem.hx
@@ -19,8 +19,8 @@ import flixel.addons.effects.FlxTrail;
 import funkin.play.scoring.Scoring.ScoringRank;
 import flixel.util.FlxColor;
 import funkin.ui.PixelatedIcon;
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 
 using StringTools;
 
diff --git a/source/funkin/ui/mainmenu/MainMenuState.hx b/source/funkin/ui/mainmenu/MainMenuState.hx
index 48316754b..265d40418 100644
--- a/source/funkin/ui/mainmenu/MainMenuState.hx
+++ b/source/funkin/ui/mainmenu/MainMenuState.hx
@@ -11,7 +11,7 @@ import flixel.util.FlxColor;
 import flixel.tweens.FlxEase;
 import funkin.graphics.FunkinCamera;
 import funkin.audio.FunkinSound;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.SwipeUtil;
 import flixel.tweens.FlxTween;
 import funkin.ui.MusicBeatState;
 import flixel.util.FlxTimer;
@@ -23,7 +23,7 @@ import funkin.ui.title.TitleState;
 import funkin.ui.story.StoryMenuState;
 import funkin.ui.Prompt;
 import funkin.util.WindowUtil;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 #if FEATURE_DISCORD_RPC
 import funkin.api.discord.DiscordClient;
 #end
diff --git a/source/funkin/ui/options/OptionsState.hx b/source/funkin/ui/options/OptionsState.hx
index f949676f1..1f9df2472 100644
--- a/source/funkin/ui/options/OptionsState.hx
+++ b/source/funkin/ui/options/OptionsState.hx
@@ -17,7 +17,7 @@ import funkin.api.newgrounds.NewgroundsClient;
 #end
 #if mobile
 import funkin.mobile.ui.FunkinBackspace;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 import funkin.mobile.ui.options.MobileControlsSchemeMenu;
 #end
 import flixel.util.FlxColor;
diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx
index d10c4c7d7..8b71b49af 100644
--- a/source/funkin/ui/options/PreferencesMenu.hx
+++ b/source/funkin/ui/options/PreferencesMenu.hx
@@ -19,8 +19,8 @@ import funkin.ui.options.items.EnumPreferenceItem;
 import funkin.mobile.ui.FunkinBackspace;
 #if mobile
 import funkin.mobile.ui.FunkinHitbox;
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 #end
 
 class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
diff --git a/source/funkin/ui/options/items/EnumPreferenceItem.hx b/source/funkin/ui/options/items/EnumPreferenceItem.hx
index f658cc2d0..ff63b0541 100644
--- a/source/funkin/ui/options/items/EnumPreferenceItem.hx
+++ b/source/funkin/ui/options/items/EnumPreferenceItem.hx
@@ -4,7 +4,7 @@ import funkin.ui.TextMenuList.TextMenuItem;
 import funkin.ui.AtlasText;
 import funkin.input.Controls;
 #if mobile
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.SwipeUtil;
 #end
 
 /**
diff --git a/source/funkin/ui/options/items/NumberPreferenceItem.hx b/source/funkin/ui/options/items/NumberPreferenceItem.hx
index 7f722bcbe..5712b6bc7 100644
--- a/source/funkin/ui/options/items/NumberPreferenceItem.hx
+++ b/source/funkin/ui/options/items/NumberPreferenceItem.hx
@@ -4,7 +4,7 @@ import funkin.ui.TextMenuList.TextMenuItem;
 import funkin.ui.AtlasText;
 import funkin.input.Controls;
 #if mobile
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.SwipeUtil;
 #end
 
 /**
diff --git a/source/funkin/ui/story/StoryMenuState.hx b/source/funkin/ui/story/StoryMenuState.hx
index 70ac4bd1d..856901240 100644
--- a/source/funkin/ui/story/StoryMenuState.hx
+++ b/source/funkin/ui/story/StoryMenuState.hx
@@ -23,8 +23,8 @@ import funkin.ui.MusicBeatState;
 import funkin.ui.transition.LoadingState;
 import funkin.ui.transition.StickerSubState;
 import funkin.util.MathUtil;
-import funkin.mobile.util.SwipeUtil;
-import funkin.mobile.util.TouchUtil;
+import funkin.util.SwipeUtil;
+import funkin.util.TouchUtil;
 import openfl.utils.Assets;
 import flixel.system.scaleModes.FullScreenScaleMode;
 #if FEATURE_DISCORD_RPC
diff --git a/source/funkin/ui/title/TitleState.hx b/source/funkin/ui/title/TitleState.hx
index c1224d270..68c28fa9d 100644
--- a/source/funkin/ui/title/TitleState.hx
+++ b/source/funkin/ui/title/TitleState.hx
@@ -34,8 +34,8 @@ import funkin.ui.freeplay.FreeplayState;
 import openfl.display.BlendMode;
 import funkin.save.Save;
 #if mobile
-import funkin.mobile.util.TouchUtil;
-import funkin.mobile.util.SwipeUtil;
+import funkin.util.TouchUtil;
+import funkin.util.SwipeUtil;
 #end
 
 #if desktop
diff --git a/source/funkin/mobile/util/SwipeUtil.hx b/source/funkin/util/SwipeUtil.hx
similarity index 99%
rename from source/funkin/mobile/util/SwipeUtil.hx
rename to source/funkin/util/SwipeUtil.hx
index b747655f8..e01665b4d 100644
--- a/source/funkin/mobile/util/SwipeUtil.hx
+++ b/source/funkin/util/SwipeUtil.hx
@@ -1,10 +1,10 @@
-package funkin.mobile.util;
+package funkin.util;
 
 #if FLX_POINTER_INPUT
 import flixel.FlxG;
 import flixel.input.FlxSwipe;
 #end
-import funkin.mobile.util.TouchUtil;
+import funkin.util.TouchUtil;
 
 // Turning this into a library or something would be nice -Zack
 // NOTE DO NOT TOUCH THIS, I have a draft of a rework, and touching this would be a pain in the ass. -Zack
diff --git a/source/funkin/mobile/util/TouchUtil.hx b/source/funkin/util/TouchUtil.hx
similarity index 99%
rename from source/funkin/mobile/util/TouchUtil.hx
rename to source/funkin/util/TouchUtil.hx
index 9700c893f..b91a110f5 100644
--- a/source/funkin/mobile/util/TouchUtil.hx
+++ b/source/funkin/util/TouchUtil.hx
@@ -5,7 +5,7 @@
 // Another slight note from little me, it turns out it WAS accurate, my ass during clean up just completely forgot. My fault!! I gotta focus on multi-touch next time.
 // Easy to fix but I'll tackle it for later.
 // - Zack
-package funkin.mobile.util;
+package funkin.util;
 
 import funkin.mobile.ui.TouchPointer;
 import flixel.FlxBasic;