diff --git a/Globals/translations.csv b/Globals/translations.csv
index 00430d51..03ae918b 100644
--- a/Globals/translations.csv
+++ b/Globals/translations.csv
@@ -10,6 +10,7 @@ CONTROLS_TITLE_TYPE_QWER,QWERT,QWERT
 CONTROLS_TITLE_TYPE_ARROW,Arrow,箭头键
 CONTROLS_TITLE_SELECTED,Selected,已选择
 CONTROLS_WASD_BUTTON,WASD,WASD
+CONTROLS_CONTROLLER_BUTTON,Controller,控制杆
 CONTROLS_QWER_BUTTON,QWER,QWER
 CONTROLS_ARROW_BUTTON,Arrow Keys,箭头键
 CONTROLS_RETURN_BUTTON,Return,返回
diff --git a/project.godot b/project.godot
index c29c5c15..79c32531 100644
--- a/project.godot
+++ b/project.godot
@@ -39,10 +39,24 @@ project/assembly_name="Funk Engine"
 
 [game]
 
-input_scheme="ARROWS"
 
 [input]
 
+ui_accept={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194310,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+ui_cancel={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194305,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null)
+]
+}
 ui_left={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
@@ -75,55 +89,106 @@ ui_down={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
 ]
 }
-arrowUp={
+ARROWS_arrowUp={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"location":0,"echo":false,"script":null)
 ]
 }
-arrowDown={
+ARROWS_arrowDown={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null)
 ]
 }
-arrowLeft={
+ARROWS_arrowLeft={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":90,"key_label":0,"unicode":122,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"location":0,"echo":false,"script":null)
 ]
 }
-arrowRight={
+ARROWS_arrowRight={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":86,"key_label":0,"unicode":118,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"location":0,"echo":false,"script":null)
 ]
 }
 Pause={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 Inventory={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":73,"key_label":0,"unicode":105,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":4,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 Secondary={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+CONTROLLER_arrowUp={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+CONTROLLER_arrowDown={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+CONTROLLER_arrowLeft={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+CONTROLLER_arrowRight={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+WASD_arrowUp={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
+]
+}
+WASD_arrowDown={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
+]
+}
+WASD_arrowLeft={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
+]
+}
+WASD_arrowRight={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
+]
+}
+QWERT_arrowUp={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
+]
+}
+QWERT_arrowDown={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
+]
+}
+QWERT_arrowLeft={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null)
+]
+}
+QWERT_arrowRight={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null)
 ]
 }
 
diff --git a/scenes/ChartViewport/scripts/ChartManager.cs b/scenes/ChartViewport/scripts/ChartManager.cs
index e6ebc908..b2ab47f0 100644
--- a/scenes/ChartViewport/scripts/ChartManager.cs
+++ b/scenes/ChartViewport/scripts/ChartManager.cs
@@ -96,7 +96,7 @@ public NoteArrow AddArrowToLane(
     )
     {
         var newNote = CreateNote(type, note, beat); //TODO: Notes on track have unqiue visuals
-        var loopArrow = CreateNote(type, note, beat + BeatsPerLoop); //Create a dummy arrow for looping visuals
+        var loopArrow = CreateNote(type, note, beat, 1); //Create a dummy arrow for looping visuals
         if (colorOverride != default)
         {
             newNote.SelfModulate = colorOverride;
@@ -106,7 +106,7 @@ public NoteArrow AddArrowToLane(
         return newNote;
     }
 
-    private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0)
+    private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0, int loopOffset = 0)
     {
         var noteScene = ResourceLoader.Load<PackedScene>("res://scenes/NoteManager/note.tscn");
         NoteArrow newArrow = noteScene.Instantiate<NoteArrow>();
@@ -114,7 +114,9 @@ private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0)
         newArrow.OutlineSprite.Modulate = IH.Arrows[(int)arrow].Color;
 
         _arrowGroup.AddChild(newArrow);
-        newArrow.Bounds = (float)(beat / TrueBeatsPerLoop * (ChartLength / 2));
+        newArrow.Bounds = (float)(
+            beat / TrueBeatsPerLoop * (ChartLength / 2) + loopOffset * (ChartLength / 2)
+        );
         newArrow.Position += Vector2.Right * newArrow.Bounds * 10; //temporary fix for notes spawning and instantly calling loop from originating at 0,0
         return newArrow;
     }
diff --git a/scenes/NoteManager/scripts/InputHandler.cs b/scenes/NoteManager/scripts/InputHandler.cs
index 1b6f32c5..f11b79fd 100644
--- a/scenes/NoteManager/scripts/InputHandler.cs
+++ b/scenes/NoteManager/scripts/InputHandler.cs
@@ -81,43 +81,32 @@ public void FeedbackEffect(ArrowType arrow, string text)
     public override void _Ready()
     {
         InitializeArrowCheckers();
-        LoadControlScheme();
     }
 
-    private void LoadControlScheme()
+    public override void _UnhandledInput(InputEvent @event)
     {
-        string scheme = SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey).As<string>();
-        foreach (var arrow in Arrows)
-        {
-            var events = InputMap.ActionGetEvents(arrow.Key);
-            foreach (var inputEvent in events)
-            {
-                InputMap.ActionEraseEvent(arrow.Key, inputEvent);
-            }
-        }
-
-        var selectedScheme = ControlSchemes.Schemes[scheme];
-        foreach (var arrow in Arrows)
+        if (@event is InputEventJoypadButton)
         {
-            if (selectedScheme.ContainsKey(arrow.Key))
-            {
-                InputEventKey eventKey = new InputEventKey();
-                eventKey.Keycode = (Key)Enum.Parse(typeof(Key), selectedScheme[arrow.Key]);
-                InputMap.ActionAddEvent(arrow.Key, eventKey);
-            }
+            SaveSystem.UpdateConfig(SaveSystem.ConfigSettings.InputKey, "CONTROLLER");
         }
     }
 
     public override void _Process(double delta)
     {
+        string scheme = SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey).As<string>();
+        if (Input.GetConnectedJoypads().Count <= 0 && scheme == "CONTROLLER")
+        {
+            SaveSystem.UpdateConfig(SaveSystem.ConfigSettings.InputKey, "ARROWS");
+        }
+
         foreach (var arrow in Arrows)
         {
-            if (Input.IsActionJustPressed(arrow.Key))
+            if (Input.IsActionJustPressed(scheme + "_" + arrow.Key))
             {
                 EmitSignal(nameof(NotePressed), (int)arrow.Type);
                 arrow.Node.SetPressed(true);
             }
-            else if (Input.IsActionJustReleased(arrow.Key))
+            else if (Input.IsActionJustReleased(scheme + "_" + arrow.Key))
             {
                 EmitSignal(nameof(NoteReleased), (int)arrow.Type);
                 arrow.Node.SetPressed(false);
diff --git a/scenes/Options/OptionsMenu.cs b/scenes/Options/OptionsMenu.cs
index 587cb621..a245ea9a 100644
--- a/scenes/Options/OptionsMenu.cs
+++ b/scenes/Options/OptionsMenu.cs
@@ -48,7 +48,7 @@ public override void _Ready()
 
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("Pause"))
+        if (@event.IsActionPressed("ui_cancel"))
         {
             CloseMenu();
             GetViewport().SetInputAsHandled();
diff --git a/scenes/Remapping/ControlSchemes.cs b/scenes/Remapping/ControlSchemes.cs
index 7d8ac898..3829747a 100644
--- a/scenes/Remapping/ControlSchemes.cs
+++ b/scenes/Remapping/ControlSchemes.cs
@@ -3,43 +3,6 @@
 
 public static class ControlSchemes
 {
-    public static Dictionary<string, Dictionary<string, string>> Schemes = new Dictionary<
-        string,
-        Dictionary<string, string>
-    >()
-    {
-        {
-            "WASD",
-            new Dictionary<string, string>()
-            {
-                { "arrowUp", "W" },
-                { "arrowDown", "S" },
-                { "arrowLeft", "A" },
-                { "arrowRight", "D" },
-            }
-        },
-        {
-            "ARROWS",
-            new Dictionary<string, string>()
-            {
-                { "arrowUp", "Up" },
-                { "arrowDown", "Down" },
-                { "arrowLeft", "Left" },
-                { "arrowRight", "Right" },
-            }
-        },
-        {
-            "QWERT",
-            new Dictionary<string, string>()
-            {
-                { "arrowUp", "W" },
-                { "arrowDown", "E" },
-                { "arrowLeft", "Q" },
-                { "arrowRight", "R" },
-            }
-        },
-    };
-
     public static Dictionary<string, Dictionary<string, string>> SpriteMappings = new Dictionary<
         string,
         Dictionary<string, string>
@@ -75,5 +38,15 @@ public static class ControlSchemes
                 { "down", "res://scenes/Remapping/assets/E_Key_Light.png" },
             }
         },
+        {
+            "CONTROLLER",
+            new Dictionary<string, string>()
+            {
+                { "left", "res://scenes/Remapping/assets/Positional_Prompts_Left.png" },
+                { "right", "res://scenes/Remapping/assets/Positional_Prompts_Right.png" },
+                { "up", "res://scenes/Remapping/assets/Positional_Prompts_Up.png" },
+                { "down", "res://scenes/Remapping/assets/Positional_Prompts_Down.png" },
+            }
+        },
     };
 }
diff --git a/scenes/Remapping/ControlSettings.cs b/scenes/Remapping/ControlSettings.cs
index 21d3d3b0..aaf99269 100644
--- a/scenes/Remapping/ControlSettings.cs
+++ b/scenes/Remapping/ControlSettings.cs
@@ -21,6 +21,8 @@ public partial class ControlSettings : Node2D
     [Export]
     private Button _closeButton;
 
+    private Button _controllerButton;
+
     public override void _Ready()
     {
         GetNode<Button>("Panel/WASDButton").Connect("pressed", Callable.From(OnWASDButtonPressed));
@@ -28,6 +30,11 @@ public override void _Ready()
             .Connect("pressed", Callable.From(OnArrowButtonPressed));
         GetNode<Button>("Panel/QWERTButton")
             .Connect("pressed", Callable.From(OnQWERTButtonPressed));
+        _controllerButton = GetNode<Button>("Panel/ControllerButton");
+        _controllerButton.Connect("pressed", Callable.From(OnControllerButtonPressed));
+
+        ControllerConnectionChanged(-1, false);
+        Input.JoyConnectionChanged += ControllerConnectionChanged;
 
         string scheme = SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey).As<string>();
         switch (scheme)
@@ -44,6 +51,10 @@ public override void _Ready()
                 OnWASDButtonPressed();
                 GetNode<Button>("Panel/WASDButton").GrabFocus();
                 break;
+            case "CONTROLLER":
+                OnControllerButtonPressed();
+                GetNode<Button>("Panel/ControllerButton").GrabFocus();
+                break;
         }
 
         _closeButton.Pressed += CloseMenu;
@@ -64,7 +75,7 @@ private void CloseMenu()
 
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("Pause"))
+        if (@event.IsActionPressed("ui_cancel"))
         {
             CloseMenu();
             GetViewport().SetInputAsHandled();
@@ -95,6 +106,25 @@ private void OnQWERTButtonPressed()
         ChangeKeySprites("QWERT");
     }
 
+    private void OnControllerButtonPressed()
+    {
+        GetNode<Label>("Panel/Label").Text = "Controller Selected";
+        SaveSystem.UpdateConfig(SaveSystem.ConfigSettings.InputKey, "CONTROLLER");
+        ChangeKeySprites("CONTROLLER");
+    }
+
+    private void ControllerConnectionChanged(long id, bool connected)
+    {
+        _controllerButton.Visible = Input.GetConnectedJoypads().Count > 0;
+        if (
+            (string)SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey) == "CONTROLLER"
+            && !_closeButton.Visible
+        )
+        {
+            OnArrowButtonPressed();
+        }
+    }
+
     private void ChangeKeySprites(string scheme)
     {
         var selectedScheme = ControlSchemes.SpriteMappings[scheme];
diff --git a/scenes/Remapping/Remap.tscn b/scenes/Remapping/Remap.tscn
index 170b997f..99227dda 100644
--- a/scenes/Remapping/Remap.tscn
+++ b/scenes/Remapping/Remap.tscn
@@ -37,11 +37,11 @@ text = "Choose Control Scheme"
 horizontal_alignment = 1
 
 [node name="WASDButton" type="Button" parent="Panel"]
-layout_mode = 2
-offset_left = 450.0
-offset_top = 50.0
-offset_right = 555.0
-offset_bottom = 81.0
+layout_mode = 0
+offset_left = 507.0
+offset_top = 54.0
+offset_right = 515.0
+offset_bottom = 62.0
 text = "CONTROLS_WASD_BUTTON"
 
 [node name="ArrowButton" type="Button" parent="Panel"]
@@ -60,6 +60,14 @@ offset_right = 603.0
 offset_bottom = 125.0
 text = "CONTROLS_QWER_BUTTON"
 
+[node name="ControllerButton" type="Button" parent="Panel"]
+layout_mode = 0
+offset_left = 399.0
+offset_top = 57.0
+offset_right = 486.0
+offset_bottom = 88.0
+text = "CONTROLS_CONTROLLER_BUTTON"
+
 [node name="TitleButton" type="Button" parent="Panel"]
 layout_mode = 0
 offset_left = 232.0
@@ -131,20 +139,20 @@ text = "="
 
 [node name="LeftRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(225, 160)
-scale = Vector2(0.5, 0.5)
+scale = Vector2(0.4, 0.4)
 texture = ExtResource("5_xn13c")
 
 [node name="UpRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(225, 200)
-scale = Vector2(0.5, 0.5)
+scale = Vector2(0.4, 0.4)
 texture = ExtResource("7_1a2jy")
 
 [node name="DownRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(225, 243)
-scale = Vector2(0.5, 0.5)
+scale = Vector2(0.4, 0.4)
 texture = ExtResource("6_qrl0g")
 
 [node name="RightRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(225, 284)
-scale = Vector2(0.5, 0.5)
+scale = Vector2(0.4, 0.4)
 texture = ExtResource("8_o7swo")
diff --git a/scenes/Remapping/assets/Positional_Prompts_Down.png b/scenes/Remapping/assets/Positional_Prompts_Down.png
new file mode 100644
index 00000000..78da86ff
Binary files /dev/null and b/scenes/Remapping/assets/Positional_Prompts_Down.png differ
diff --git a/scenes/Remapping/assets/Positional_Prompts_Down.png.import b/scenes/Remapping/assets/Positional_Prompts_Down.png.import
new file mode 100644
index 00000000..00f28579
--- /dev/null
+++ b/scenes/Remapping/assets/Positional_Prompts_Down.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d2228hw1busi"
+path="res://.godot/imported/Positional_Prompts_Down.png-b3e15455423619c63428f07cb50299dc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/Remapping/assets/Positional_Prompts_Down.png"
+dest_files=["res://.godot/imported/Positional_Prompts_Down.png-b3e15455423619c63428f07cb50299dc.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/scenes/Remapping/assets/Positional_Prompts_Left.png b/scenes/Remapping/assets/Positional_Prompts_Left.png
new file mode 100644
index 00000000..ccf72ae1
Binary files /dev/null and b/scenes/Remapping/assets/Positional_Prompts_Left.png differ
diff --git a/scenes/Remapping/assets/Positional_Prompts_Left.png.import b/scenes/Remapping/assets/Positional_Prompts_Left.png.import
new file mode 100644
index 00000000..55caa19a
--- /dev/null
+++ b/scenes/Remapping/assets/Positional_Prompts_Left.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dhnaqfw7ev076"
+path="res://.godot/imported/Positional_Prompts_Left.png-a65d4cc25e7277af3c038537e36204a9.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/Remapping/assets/Positional_Prompts_Left.png"
+dest_files=["res://.godot/imported/Positional_Prompts_Left.png-a65d4cc25e7277af3c038537e36204a9.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/scenes/Remapping/assets/Positional_Prompts_Right.png b/scenes/Remapping/assets/Positional_Prompts_Right.png
new file mode 100644
index 00000000..8a821aa8
Binary files /dev/null and b/scenes/Remapping/assets/Positional_Prompts_Right.png differ
diff --git a/scenes/Remapping/assets/Positional_Prompts_Right.png.import b/scenes/Remapping/assets/Positional_Prompts_Right.png.import
new file mode 100644
index 00000000..5e3c9a34
--- /dev/null
+++ b/scenes/Remapping/assets/Positional_Prompts_Right.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bm2i63ejobjdb"
+path="res://.godot/imported/Positional_Prompts_Right.png-7a91b0b4600d650c6bfcac6dd3e771e5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/Remapping/assets/Positional_Prompts_Right.png"
+dest_files=["res://.godot/imported/Positional_Prompts_Right.png-7a91b0b4600d650c6bfcac6dd3e771e5.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/scenes/Remapping/assets/Positional_Prompts_Up.png b/scenes/Remapping/assets/Positional_Prompts_Up.png
new file mode 100644
index 00000000..888a3439
Binary files /dev/null and b/scenes/Remapping/assets/Positional_Prompts_Up.png differ
diff --git a/scenes/Remapping/assets/Positional_Prompts_Up.png.import b/scenes/Remapping/assets/Positional_Prompts_Up.png.import
new file mode 100644
index 00000000..c1def7b1
--- /dev/null
+++ b/scenes/Remapping/assets/Positional_Prompts_Up.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dlj21le4bp7cw"
+path="res://.godot/imported/Positional_Prompts_Up.png-7d12b23f22144d5032611d5d3d789658.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/Remapping/assets/Positional_Prompts_Up.png"
+dest_files=["res://.godot/imported/Positional_Prompts_Up.png-7d12b23f22144d5032611d5d3d789658.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/scenes/UI/Pause.tscn b/scenes/UI/Pause.tscn
index 04dc7dbd..eefb1b39 100644
--- a/scenes/UI/Pause.tscn
+++ b/scenes/UI/Pause.tscn
@@ -44,6 +44,8 @@ theme_override_constants/margin_bottom = 20
 
 [node name="ResumeButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer"]
 layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer3/PlaceHolderButton")
+focus_neighbor_bottom = NodePath("../../MarginContainer4/OptionsButton")
 text = "ESCAPE_MENU_RESUME"
 
 [node name="MarginContainer4" type="MarginContainer" parent="MarginContainer/VBoxContainer"]
@@ -56,7 +58,7 @@ theme_override_constants/margin_bottom = 20
 
 [node name="OptionsButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer4"]
 layout_mode = 2
-focus_neighbor_top = NodePath("../../MarginContainer3/PlaceHolderButton")
+focus_neighbor_top = NodePath("../../MarginContainer/ResumeButton")
 focus_neighbor_bottom = NodePath("../../MarginContainer2/QuitButton")
 text = "TITLE_OPTIONS"
 
@@ -70,6 +72,8 @@ theme_override_constants/margin_bottom = 20
 
 [node name="QuitButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer2"]
 layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer4/OptionsButton")
+focus_neighbor_bottom = NodePath("../../MarginContainer3/PlaceHolderButton")
 text = "ESCAPE_MENU_QUIT"
 
 [node name="MarginContainer3" type="MarginContainer" parent="MarginContainer/VBoxContainer"]
@@ -82,4 +86,6 @@ theme_override_constants/margin_bottom = 20
 
 [node name="PlaceHolderButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer3"]
 layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer2/QuitButton")
+focus_neighbor_bottom = NodePath("../../MarginContainer/ResumeButton")
 text = "ESCAPE_MENU_TITLE"
diff --git a/scenes/UI/scripts/Inventory.cs b/scenes/UI/scripts/Inventory.cs
index a068f760..b8d1cede 100644
--- a/scenes/UI/scripts/Inventory.cs
+++ b/scenes/UI/scripts/Inventory.cs
@@ -52,7 +52,7 @@ public override void _Ready()
 
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("Pause") || @event.IsActionPressed("Inventory"))
+        if (@event.IsActionPressed("ui_cancel") || @event.IsActionPressed("Inventory"))
         {
             Resume();
             GetViewport().SetInputAsHandled();
diff --git a/scenes/UI/scripts/PauseMenu.cs b/scenes/UI/scripts/PauseMenu.cs
index a7063903..7f78cf79 100644
--- a/scenes/UI/scripts/PauseMenu.cs
+++ b/scenes/UI/scripts/PauseMenu.cs
@@ -34,7 +34,7 @@ private void OpenOptions()
 
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("Pause"))
+        if (@event.IsActionPressed("ui_cancel"))
         {
             Resume();
             GetViewport().SetInputAsHandled();