diff --git a/err1.txt b/err1.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/err2.txt b/err2.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/modifiedeight-newadditions/CMakeLists.txt b/modifiedeight-newadditions/CMakeLists.txt
index 903edb28..6ef476c7 100644
--- a/modifiedeight-newadditions/CMakeLists.txt
+++ b/modifiedeight-newadditions/CMakeLists.txt
@@ -104,6 +104,7 @@ elseif(MCPE_IOS)
         "-framework OpenGLES"
         "-framework OpenAL"
         "-framework AVFoundation"
+        "-framework GameController"
     )
     set_target_properties(modifiedeight-newadditions PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build"
diff --git a/modifiedeight-newadditions/assets/lang/en_US.lang b/modifiedeight-newadditions/assets/lang/en_US.lang
index 0e3ba6cd..dcc8a0b4 100644
--- a/modifiedeight-newadditions/assets/lang/en_US.lang
+++ b/modifiedeight-newadditions/assets/lang/en_US.lang
@@ -160,6 +160,8 @@ options.gamma.min=Moody
 options.gamma.max=Bright
 options.hidegui=Hide GUI
 options.sensitivity=Sensitivity
+options.controllersensitivity=Controller Sensitivity
+options.controllercursorsensitivity=Controller Cursor Sensitivity
 options.sensitivity.min=*yawn*
 options.sensitivity.max=HYPERSPEED!!!
 options.renderDistance=View Distance
diff --git a/modifiedeight-newadditions/headers/Options.hpp b/modifiedeight-newadditions/headers/Options.hpp
index 09d81e66..f8b50bbc 100644
--- a/modifiedeight-newadditions/headers/Options.hpp
+++ b/modifiedeight-newadditions/headers/Options.hpp
@@ -16,6 +16,8 @@ struct Options{
 		static Options::Option FANCY_SKIES;
 		static Options::Option LEFT_HANDED;
 		static Options::Option SENSITIVITY;
+		static Options::Option CONTROLLER_SENSITIVITY;
+		static Options::Option CONTROLLER_CURSOR_SENSITIVITY;
 		static Options::Option INVERT_MOUSE;
 		static Options::Option THIRD_PERSON;
 		static Options::Option VIEW_BOBBING;
@@ -70,7 +72,6 @@ struct Options{
 		static Options::Option REALISM_SCREEN_SPACE_LIGHTING;
 		static Options::Option REALISM_BLOOM;
 		static Options::Option EXTENDED_INVENTORY;
-		static Options::Option CONTROLLER_SUPPORT;
 	};
 
 	static Options* instance;
@@ -79,6 +80,8 @@ struct Options{
 	float soundVolume;
 	float brightness;
 	float sensitity;
+	float controllerSensitivity;
+	float controllerCursorSensitivity;
 	bool_t invertMouse;
 	char_t field_D;
 	char_t field_E;
@@ -162,7 +165,6 @@ struct Options{
 	bool_t realismSSL;
 	bool_t realismBloom;
 	bool_t extendedInventory;
-	bool_t controllerSupport;
 	char_t field_109;
 	char_t field_10A;
 	char_t field_10B;
diff --git a/modifiedeight-newadditions/headers/gui/ControllerLayoutOption.hpp b/modifiedeight-newadditions/headers/gui/ControllerLayoutOption.hpp
new file mode 100644
index 00000000..0cc62665
--- /dev/null
+++ b/modifiedeight-newadditions/headers/gui/ControllerLayoutOption.hpp
@@ -0,0 +1,19 @@
+#pragma once
+#include <gui/GuiElementContainer.hpp>
+#include <memory>
+
+struct Button;
+struct ControllerLayoutOption: GuiElementContainer
+{
+	std::shared_ptr<Button> customizeButton;
+	Button* pressedButton;
+	bool_t isInWorld;
+
+	ControllerLayoutOption(Minecraft*, bool_t);
+
+	virtual ~ControllerLayoutOption();
+	virtual void render(Minecraft*, int32_t, int32_t);
+	virtual void setupPositions();
+	virtual void mouseClicked(Minecraft*, int32_t, int32_t, int32_t);
+	virtual void mouseReleased(Minecraft*, int32_t, int32_t, int32_t);
+};
diff --git a/modifiedeight-newadditions/headers/gui/OptionsGroup.hpp b/modifiedeight-newadditions/headers/gui/OptionsGroup.hpp
index cc7116ff..b630dbbc 100644
--- a/modifiedeight-newadditions/headers/gui/OptionsGroup.hpp
+++ b/modifiedeight-newadditions/headers/gui/OptionsGroup.hpp
@@ -8,6 +8,7 @@ struct OptionsGroup: GuiElementContainer
 
 	OptionsGroup(std::string);
 	void addLoginItem(Minecraft*);
+	OptionsGroup* addControllerLayoutItem(Minecraft*, bool_t);
 	void createTextBox(const Options::Option*, Minecraft*);
 
 	virtual ~OptionsGroup();
diff --git a/modifiedeight-newadditions/headers/gui/buttons/SmallButton.hpp b/modifiedeight-newadditions/headers/gui/buttons/SmallButton.hpp
index 2b62be04..000accc6 100644
--- a/modifiedeight-newadditions/headers/gui/buttons/SmallButton.hpp
+++ b/modifiedeight-newadditions/headers/gui/buttons/SmallButton.hpp
@@ -1,9 +1,6 @@
 #pragma once
 #include <gui/buttons/Button.hpp>
-struct Options
-{
-	struct Option;
-};
+#include <Options.hpp>
 
 
 struct SmallButton: Button
diff --git a/modifiedeight-newadditions/headers/gui/screens/ControllerLayoutScreen.hpp b/modifiedeight-newadditions/headers/gui/screens/ControllerLayoutScreen.hpp
new file mode 100644
index 00000000..b221f403
--- /dev/null
+++ b/modifiedeight-newadditions/headers/gui/screens/ControllerLayoutScreen.hpp
@@ -0,0 +1,57 @@
+#pragma once
+#include <_types.h>
+#include <gui/Screen.hpp>
+#include <input/ControllerLayout.hpp>
+
+namespace Touch {
+	struct TButton;
+}
+struct NinePatchLayer;
+
+struct ControllerLayoutScreen: Screen
+{
+	Touch::TButton* buttonSave;
+	Touch::TButton* buttonReset;
+	Touch::TButton* buttonCancel;
+	NinePatchLayer* optBtn;
+	NinePatchLayer* playPressed;
+	NinePatchLayer* listBg;
+	NinePatchLayer* panelBg;
+
+	Binding working[CA_COUNT];
+	int32_t capturingAction;
+	float scrollOffset;
+	float scrollTarget;
+	int32_t contentHeight;
+	int32_t listTop, listBottom;
+	int32_t actionsColumnWidth, bindingsColumnWidth;
+	int32_t contentLeft, contentRight, scrollBarX;
+	int32_t dragStartY;
+	float dragStartOffset;
+	float dragVel;
+	int32_t lastDragMs;
+	bool_t isDragging;
+	bool_t draggingBar;
+	int32_t barGrabDY;
+	int32_t lastAnimMs;
+	bool_t isInWorld;
+
+	ControllerLayoutScreen(bool_t);
+
+	void closeScreen();
+	void clampScroll();
+	void calcBar(int32_t&, int32_t&);
+	int32_t rowIndexAt(int32_t, int32_t);
+
+	virtual ~ControllerLayoutScreen();
+	virtual void init();
+	virtual void setupPositions();
+	virtual void render(int32_t, int32_t, float);
+	virtual void tick();
+	virtual bool_t handleBackEvent(bool_t);
+	virtual bool_t renderGameBehind();
+	virtual void buttonClicked(Button*);
+	virtual void mouseClicked(int32_t, int32_t, int32_t);
+	virtual void mouseReleased(int32_t, int32_t, int32_t);
+	virtual void keyPressed(int32_t);
+};
diff --git a/modifiedeight-newadditions/headers/gui/screens/OptionsScreen.hpp b/modifiedeight-newadditions/headers/gui/screens/OptionsScreen.hpp
index 0789ec09..29480d96 100644
--- a/modifiedeight-newadditions/headers/gui/screens/OptionsScreen.hpp
+++ b/modifiedeight-newadditions/headers/gui/screens/OptionsScreen.hpp
@@ -10,6 +10,8 @@ struct NinePatchLayer;
 struct ImageButton;
 struct OptionsScreen: Screen
 {
+	static int32_t lastCategory;
+
 	Touch::THeader* headerOptions;
 	Touch::TButton* buttonBack;
 	ImageButton* field_5C;
diff --git a/modifiedeight-newadditions/headers/gui/screens/PauseScreen.hpp b/modifiedeight-newadditions/headers/gui/screens/PauseScreen.hpp
index 36605144..b46066e9 100644
--- a/modifiedeight-newadditions/headers/gui/screens/PauseScreen.hpp
+++ b/modifiedeight-newadditions/headers/gui/screens/PauseScreen.hpp
@@ -29,5 +29,6 @@ struct PauseScreen: Screen
 	virtual void setupPositions();
 	virtual void tick();
 	virtual bool_t renderGameBehind();
+	virtual bool_t handleBackEvent(bool_t);
 	virtual void buttonClicked(Button*);
 };
diff --git a/modifiedeight-newadditions/headers/input/ControllerHandler.hpp b/modifiedeight-newadditions/headers/input/ControllerHandler.hpp
new file mode 100644
index 00000000..d45e38cf
--- /dev/null
+++ b/modifiedeight-newadditions/headers/input/ControllerHandler.hpp
@@ -0,0 +1,38 @@
+#pragma once
+#include <_types.h>
+#include <input/ControllerLayout.hpp>
+
+struct Minecraft;
+struct IMoveInput;
+struct Player;
+
+struct ControllerHandler {
+	static bool_t captureMode;
+	static bool_t captureWantsAxis;
+	static bool_t hasCaptured;
+	static Binding capturedBinding;
+	static float cursorX, cursorY;
+	static int32_t scrollRepeat;
+	static int32_t lastPadCursorMs;
+
+	static void hideCursor();
+	static bool_t cursorVisible();
+	static float moveX, moveY;
+	static float frameDt;
+	static double lastFrameS;
+	static void clampVec(float&, float&);
+	static int32_t lastPerspectiveMs;
+	static bool_t jumpHeld, sneakHeld, sprintHeld;
+	static bool_t attackHeld, useHeld, confirmHeld;
+
+	static void beginCapture(bool_t);
+	static void endCapture();
+	static bool_t takeCaptured(Binding&);
+
+	static void tick(Minecraft*);
+	static void tickGame(Minecraft*);
+	static void tickMenu(Minecraft*);
+	static void applyMove(IMoveInput*, Player*);
+	static void releaseAll();
+	static bool_t isEnabled(Minecraft*);
+};
diff --git a/modifiedeight-newadditions/headers/input/ControllerLayout.hpp b/modifiedeight-newadditions/headers/input/ControllerLayout.hpp
new file mode 100644
index 00000000..7a965ea8
--- /dev/null
+++ b/modifiedeight-newadditions/headers/input/ControllerLayout.hpp
@@ -0,0 +1,42 @@
+#pragma once
+#include <_types.h>
+#include <input/Gamepad.hpp>
+#include <string>
+
+enum ControllerAction {
+	CA_JUMP = 0,
+	CA_DROP_ITEM = 1,
+	CA_ATTACK = 2,
+	CA_USE_ITEM = 3,
+	CA_CRAFTING = 4,
+	CA_INVENTORY = 5,
+	CA_CYCLE_LEFT = 6,
+	CA_CYCLE_RIGHT = 7,
+	CA_TOGGLE_PERSPECTIVE = 8,
+	CA_SNEAK = 9,
+	CA_GAME_MENU = 10,
+	CA_MOVE_AXIS_X = 11,
+	CA_MOVE_AXIS_Y = 12,
+	CA_LOOK_AXIS_X = 13,
+	CA_LOOK_AXIS_Y = 14,
+	CA_COUNT = 15
+};
+
+struct ControllerLayout {
+	static Binding bindings[CA_COUNT];
+	static std::string filePath;
+	static bool_t loaded;
+
+	static void init(const std::string&);
+	static void resetToDefaults();
+	static void load();
+	static void save();
+
+	static Binding get(int32_t);
+	static void set(int32_t, const Binding&);
+	static void clearConflicts(int32_t, const Binding&);
+	static bool_t isAxisAction(int32_t);
+	static const char_t* actionName(int32_t);
+	static const char_t* actionKey(int32_t);
+	static std::string describe(int32_t);
+};
diff --git a/modifiedeight-newadditions/headers/input/Gamepad.hpp b/modifiedeight-newadditions/headers/input/Gamepad.hpp
new file mode 100644
index 00000000..6c362d05
--- /dev/null
+++ b/modifiedeight-newadditions/headers/input/Gamepad.hpp
@@ -0,0 +1,101 @@
+#pragma once
+#include <_types.h>
+#include <string>
+
+enum GamepadButton {
+	GP_BTN_A = 0,
+	GP_BTN_B = 1,
+	GP_BTN_X = 2,
+	GP_BTN_Y = 3,
+	GP_BTN_LB = 4,
+	GP_BTN_RB = 5,
+	GP_BTN_BACK = 6,
+	GP_BTN_START = 7,
+	GP_BTN_L3 = 8,
+	GP_BTN_R3 = 9,
+	GP_BTN_LT = 10,
+	GP_BTN_RT = 11,
+	GP_BTN_DPAD_UP = 12,
+	GP_BTN_DPAD_DOWN = 13,
+	GP_BTN_DPAD_LEFT = 14,
+	GP_BTN_DPAD_RIGHT = 15,
+	GP_BTN_MODE = 16,
+	GP_BTN_C = 17,
+	GP_BTN_Z = 18,
+	GP_BTN_EXTRA_0 = 19,
+	GP_BTN_EXTRA_1 = 20,
+	GP_BTN_EXTRA_2 = 21,
+	GP_BTN_EXTRA_3 = 22,
+	GP_BTN_EXTRA_4 = 23,
+	GP_BTN_COUNT = 24
+};
+
+enum GamepadAxis {
+	GP_AXIS_LX = 0,
+	GP_AXIS_LY = 1,
+	GP_AXIS_RX = 2,
+	GP_AXIS_RY = 3,
+	GP_AXIS_LT = 4,
+	GP_AXIS_RT = 5,
+	GP_AXIS_COUNT = 6
+};
+
+enum BindingSource {
+	BIND_NONE = 0,
+	BIND_BUTTON = 1,
+	BIND_AXIS_POSITIVE = 2,
+	BIND_AXIS_NEGATIVE = 3,
+	BIND_AXIS_FULL = 4
+};
+
+struct Binding {
+	int32_t source;
+	int32_t code;
+	int32_t raw;
+
+	Binding();
+	Binding(int32_t, int32_t);
+	bool_t isSet() const;
+	bool_t equals(const Binding&) const;
+	std::string describe() const;
+	std::string serialize() const;
+	static Binding parse(const std::string&);
+};
+
+struct Gamepad {
+	static bool_t connected;
+	static bool_t buttons[GP_BTN_COUNT];
+	static bool_t pressLatch[GP_BTN_COUNT];
+	static bool_t releaseLatch[GP_BTN_COUNT];
+	static float axes[GP_AXIS_COUNT];
+	static float prevAxes[GP_AXIS_COUNT];
+	static int32_t buttonRaw[GP_BTN_COUNT];
+	static int32_t axisRaw[GP_AXIS_COUNT];
+	static float deadzone;
+	static float triggerThreshold;
+
+	static void reset();
+	static void beginFrame();
+	static void setConnected(bool_t);
+	static void feedButton(int32_t, bool_t, int32_t raw = -1);
+	static void feedAxis(int32_t, float, int32_t raw = -1);
+	static void feedHat(bool_t, bool_t, bool_t, bool_t);
+	static void syncDerivedButtons();
+	static int32_t mapRawButton(int32_t, int32_t);
+	static int32_t mapSdlButton(int32_t, int32_t, int32_t);
+
+	static float applyDeadzone(float);
+	static bool_t isButtonDown(int32_t);
+	static bool_t wasButtonPressed(int32_t);
+	static bool_t wasButtonReleased(int32_t);
+	static float getAxis(int32_t);
+	static float getPrevAxis(int32_t);
+
+	static bool_t isBindingDown(const Binding&);
+	static bool_t wasBindingPressed(const Binding&);
+	static bool_t wasBindingReleased(const Binding&);
+	static float getBindingValue(const Binding&);
+	static bool_t detectPressedBinding(Binding&, bool_t);
+	static const char_t* buttonName(int32_t);
+	static const char_t* axisName(int32_t);
+};
diff --git a/modifiedeight-newadditions/impl/AppPlatform_sdl.cpp b/modifiedeight-newadditions/impl/AppPlatform_sdl.cpp
index b1104309..3eaa15b7 100644
--- a/modifiedeight-newadditions/impl/AppPlatform_sdl.cpp
+++ b/modifiedeight-newadditions/impl/AppPlatform_sdl.cpp
@@ -6,6 +6,9 @@
 #include <gui/Screen.hpp>
 #include <_AssetFile.hpp>
 #include <entity/LocalPlayer.hpp>
+#include <input/ControllerHandler.hpp>
+#include <input/ControllerLayout.hpp>
+#include <input/Gamepad.hpp>
 #include <input/Keyboard.hpp>
 #include <input/KeyboardInput.hpp>
 #include <input/Mouse.hpp>
@@ -641,6 +644,9 @@ void AppPlatform_sdl::init() {
           break;
         _mx = appPlatform.sdl_event.motion.x;
         _my = appPlatform.sdl_event.motion.y;
+        if (appPlatform.sdl_event.motion.xrel != 0 || appPlatform.sdl_event.motion.yrel != 0) {
+          ControllerHandler::hideCursor();
+        }
         Mouse::feed(0, 0, _mx, _my, appPlatform.sdl_event.motion.xrel,
                     appPlatform.sdl_event.motion.yrel);
         break;
@@ -738,8 +744,18 @@ void AppPlatform_sdl::init() {
 
     static SDL_Joystick *s_gameControllers[8] = {nullptr};
     static int s_numOpenedControllers = 0;
+    static bool s_wasConnected = false;
     int curNumJoysticks = SDL_NumJoysticks();
     if (curNumJoysticks > 8) curNumJoysticks = 8;
+    if (curNumJoysticks < s_numOpenedControllers) {
+      for (int i = curNumJoysticks; i < s_numOpenedControllers; i++) {
+        if (s_gameControllers[i]) {
+          SDL_JoystickClose(s_gameControllers[i]);
+          s_gameControllers[i] = nullptr;
+        }
+      }
+      s_numOpenedControllers = curNumJoysticks;
+    }
     if (s_numOpenedControllers < curNumJoysticks) {
       for (int i = s_numOpenedControllers; i < curNumJoysticks; i++) {
         s_gameControllers[i] = SDL_JoystickOpen(i);
@@ -781,14 +797,22 @@ void AppPlatform_sdl::init() {
       }
     }
 
-    bool controllerEnabled = Options::instance ? Options::instance->controllerSupport : true;
-    if (activeJoy && controllerEnabled) {
+    if (!activeJoy) {
+      if (s_wasConnected) {
+        Gamepad::setConnected(0);
+        s_wasConnected = false;
+      }
+    } else {
+      if (!s_wasConnected) {
+        Gamepad::reset();
+        Gamepad::setConnected(1);
+        s_wasConnected = true;
+      }
       SDL_JoystickUpdate();
-      int numAxes = SDL_JoystickNumAxes(activeJoy);
-      int numButtons = SDL_JoystickNumButtons(activeJoy);
-      auto getJBtn = [&](int b) -> bool {
-        return (b >= 0 && b < numButtons) ? (SDL_JoystickGetButton(activeJoy, b) != 0) : false;
-      };
+
+      int s_numAxes = SDL_JoystickNumAxes(activeJoy);
+      int s_numButtons = SDL_JoystickNumButtons(activeJoy);
+      int s_numHats = SDL_JoystickNumHats(activeJoy);
 
       const char *jname = SDL_JoystickName(SDL_JoystickIndex(activeJoy));
       std::string nameStr = jname ? jname : "";
@@ -801,239 +825,78 @@ void AppPlatform_sdl::init() {
                      nameStr.find("ps5") != std::string::npos ||
                      nameStr.find("wireless controller") != std::string::npos);
 
-      int16_t rawLX = (numAxes > 0) ? SDL_JoystickGetAxis(activeJoy, 0) : 0;
-      int16_t rawLY = (numAxes > 1) ? SDL_JoystickGetAxis(activeJoy, 1) : 0;
-      int16_t rawRX = 0, rawRY = 0;
-      bool lt = false, rt = false;
-
+      int rxAxis = -1, ryAxis = -1, ltAxis = -1, rtAxis = -1, trigAxis = -1;
       if (isSony) {
-        if (numAxes >= 6) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 2);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 5);
-          int16_t rawLT = SDL_JoystickGetAxis(activeJoy, 3);
-          int16_t rawRT = SDL_JoystickGetAxis(activeJoy, 4);
-          if (rawLT > 8000) lt = true;
-          if (rawRT > 8000) rt = true;
-        } else if (numAxes >= 4) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 2);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 3);
+        if (s_numAxes >= 6) {
+          rxAxis = 2;
+          ryAxis = 5;
+          ltAxis = 3;
+          rtAxis = 4;
+        } else if (s_numAxes >= 4) {
+          rxAxis = 2;
+          ryAxis = 3;
         }
       } else {
-        if (numAxes >= 6) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 3);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 4);
-          int16_t rawLT = SDL_JoystickGetAxis(activeJoy, 2);
-          int16_t rawRT = SDL_JoystickGetAxis(activeJoy, 5);
-          if (rawLT > 8000) lt = true;
-          if (rawRT > 8000) rt = true;
-        } else if (numAxes == 5) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 4);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 3);
-          int16_t rawTrig = SDL_JoystickGetAxis(activeJoy, 2);
-          if (rawTrig > 8000) lt = true;
-          if (rawTrig < -8000) rt = true;
-        } else if (numAxes >= 4) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 2);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 3);
+        if (s_numAxes >= 6) {
+          rxAxis = 3;
+          ryAxis = 4;
+          ltAxis = 2;
+          rtAxis = 5;
+        } else if (s_numAxes == 5) {
+          rxAxis = 3;
+          ryAxis = 4;
+          trigAxis = 2;
+        } else if (s_numAxes == 4) {
+          rxAxis = 2;
+          ryAxis = 3;
+        } else if (s_numAxes == 3) {
+          trigAxis = 2;
         }
       }
 
-      float lx = (float)rawLX / 32767.0f;
-      float ly = (float)rawLY / 32767.0f;
-      float rx = (float)rawRX / 32767.0f;
-      float ry = (float)rawRY / 32767.0f;
-
-      const float deadzone = 0.22f;
-      if (fabsf(lx) < deadzone) lx = 0.0f; else lx = (lx > 0 ? (lx - deadzone) : (lx + deadzone)) / (1.0f - deadzone);
-      if (fabsf(ly) < deadzone) ly = 0.0f; else ly = (ly > 0 ? (ly - deadzone) : (ly + deadzone)) / (1.0f - deadzone);
-      if (fabsf(rx) < deadzone) rx = 0.0f; else rx = (rx > 0 ? (rx - deadzone) : (rx + deadzone)) / (1.0f - deadzone);
-      if (fabsf(ry) < deadzone) ry = 0.0f; else ry = (ry > 0 ? (ry - deadzone) : (ry + deadzone)) / (1.0f - deadzone);
-
-      bool btnA = false, btnB = false, btnX = false, btnY = false;
-      bool btnLB = false, btnRB = false, btnBack = false, btnStart = false;
-      bool btnL3 = false, btnR3 = false;
-
-      if (isSony) {
-#ifdef _WIN32
-        btnA = getJBtn(1);
-        btnB = getJBtn(2);
-        btnX = getJBtn(0);
-        btnY = getJBtn(3);
-        btnL3 = getJBtn(10);
-        btnR3 = getJBtn(11);
-#else
-        btnA = getJBtn(0);
-        btnB = getJBtn(1);
-        btnX = getJBtn(3);
-        btnY = getJBtn(2);
-        btnL3 = getJBtn(11);
-        btnR3 = getJBtn(12);
-#endif
-        btnLB = getJBtn(4);
-        btnRB = getJBtn(5);
-        if (getJBtn(6)) lt = true;
-        if (getJBtn(7)) rt = true;
-        btnBack = getJBtn(8);
-        btnStart = getJBtn(9);
-      } else {
-        btnA = getJBtn(0);
-        btnB = getJBtn(1);
-        btnX = getJBtn(2);
-        btnY = getJBtn(3);
-        btnLB = getJBtn(4);
-        btnRB = getJBtn(5);
-        btnBack = getJBtn(6);
-        btnStart = getJBtn(7);
-#ifdef _WIN32
-        btnL3 = getJBtn(8);
-        btnR3 = getJBtn(9);
-#else
-        btnL3 = getJBtn(9) || (numButtons <= 10 && getJBtn(8));
-        btnR3 = getJBtn(10) || (numButtons <= 10 && getJBtn(9));
-#endif
+      float lx = (s_numAxes > 0) ? (float)SDL_JoystickGetAxis(activeJoy, 0) / 32767.0f : 0.0f;
+      float ly = (s_numAxes > 1) ? (float)SDL_JoystickGetAxis(activeJoy, 1) / 32767.0f : 0.0f;
+      float rx = (rxAxis >= 0) ? (float)SDL_JoystickGetAxis(activeJoy, rxAxis) / 32767.0f : 0.0f;
+      float ry = (ryAxis >= 0) ? (float)SDL_JoystickGetAxis(activeJoy, ryAxis) / 32767.0f : 0.0f;
+
+      Gamepad::feedAxis(GP_AXIS_LX, lx, 0);
+      Gamepad::feedAxis(GP_AXIS_LY, ly, 1);
+      Gamepad::feedAxis(GP_AXIS_RX, rx, rxAxis);
+      Gamepad::feedAxis(GP_AXIS_RY, ry, ryAxis);
+
+      float lt = 0.0f;
+      float rt = 0.0f;
+      if (ltAxis >= 0 && rtAxis >= 0) {
+        lt = (float)SDL_JoystickGetAxis(activeJoy, ltAxis) / 32767.0f;
+        rt = (float)SDL_JoystickGetAxis(activeJoy, rtAxis) / 32767.0f;
+        if (lt < 0.0f) lt = 0.0f;
+        if (rt < 0.0f) rt = 0.0f;
+      } else if (trigAxis >= 0) {
+        float trig = (float)SDL_JoystickGetAxis(activeJoy, trigAxis) / 32767.0f;
+        if (trig > 0.0f) rt = trig;
+        if (trig < 0.0f) lt = -trig;
       }
+      Gamepad::feedAxis(GP_AXIS_LT, lt, (ltAxis >= 0) ? ltAxis : trigAxis);
+      Gamepad::feedAxis(GP_AXIS_RT, rt, (rtAxis >= 0) ? rtAxis : trigAxis);
 
-      uint8_t hat = (SDL_JoystickNumHats(activeJoy) > 0) ? SDL_JoystickGetHat(activeJoy, 0) : 0;
-      bool dpadUp = (hat & SDL_HAT_UP) != 0;
-      bool dpadDown = (hat & SDL_HAT_DOWN) != 0;
-      bool dpadLeft = (hat & SDL_HAT_LEFT) != 0;
-      bool dpadRight = (hat & SDL_HAT_RIGHT) != 0;
-
-      if (numAxes >= 8) {
-        int16_t hatX = SDL_JoystickGetAxis(activeJoy, 6);
-        int16_t hatY = SDL_JoystickGetAxis(activeJoy, 7);
-        if (hatX < -16000) dpadLeft = true;
-        if (hatX > 16000) dpadRight = true;
-        if (hatY < -16000) dpadUp = true;
-        if (hatY > 16000) dpadDown = true;
-      }
-
-      static bool prevJLB = false, prevJRB = false, prevJDpadL = false, prevJDpadR = false;
-      static bool prevJBtnX = false, prevJBtnY = false, prevJStart = false;
-      static bool prevJLT = false, prevJRT = false;
-      static bool prevJDpadUp = false, prevJDpadDown = false;
-      static bool prevJBtnA = false, prevJBtnB = false;
-
-      if (mc->player && !mc->currentScreen) {
-        if (mc->player->moveInput) {
-          if (fabsf(lx) > 0.0f || fabsf(ly) > 0.0f) {
-            mc->player->moveInput->strafeInput = -lx;
-            mc->player->moveInput->forwardInput = -ly;
-          }
-          if (btnA) mc->player->moveInput->jumpingMaybe = 1;
-          if (btnB || btnR3) mc->player->moveInput->sneakingMaybe = 1;
-        }
-
-        if (btnL3 || (ly < -0.85f)) {
-          mc->player->setSprinting(true);
-        } else if (ly >= -0.2f && !btnL3 && (fabsf(lx) < 0.2f)) {
-          mc->player->setSprinting(false);
-        }
-
-        if (fabsf(rx) > 0.0f || fabsf(ry) > 0.0f) {
-          float curveX = (rx > 0 ? 1.0f : -1.0f) * rx * rx;
-          float curveY = (ry > 0 ? 1.0f : -1.0f) * ry * ry;
-          float sens = (mc->options.sensitity * 0.6f + 0.2f) * 9.0f;
-          float turnX = curveX * sens;
-          float turnY = curveY * sens * (mc->options.invertMouse ? 1.0f : -1.0f);
-          mc->player->turn(turnX, turnY);
-        }
-
-        if ((btnLB && !prevJLB) || (dpadLeft && !prevJDpadL)) {
-          int newslot = mc->player->inventory->selectedSlot - 1;
-          if (newslot < 0) newslot = mc->gui.getNumSlots() - 2;
-          mc->player->inventory->selectSlot(newslot);
-        }
-        if ((btnRB && !prevJRB) || (dpadRight && !prevJDpadR)) {
-          int newslot = mc->player->inventory->selectedSlot + 1;
-          if (newslot >= mc->gui.getNumSlots() - 1) newslot = 0;
-          mc->player->inventory->selectSlot(newslot);
-        }
-
-        if (rt && !prevJRT && !Keyboard::_states[lbkey]) {
-          Keyboard::feed(lbkey, 1);
-        } else if (!rt && prevJRT && Keyboard::_states[lbkey]) {
-          Keyboard::feed(lbkey, 0);
-        }
-
-        if (lt && !prevJLT && !Keyboard::_states[rbkey]) {
-          Keyboard::feed(rbkey, 1);
-        } else if (!lt && prevJLT && Keyboard::_states[rbkey]) {
-          Keyboard::feed(rbkey, 0);
-        }
-
-        if ((btnX && !prevJBtnX) || (btnY && !prevJBtnY)) {
-          mc->player->startCrafting((int32_t)mc->player->posX, (int32_t)mc->player->posY, (int32_t)mc->player->posZ, 0);
-        }
-
-        if (btnStart && !prevJStart) {
-          mc->pauseGame(1);
-        }
-
-        if (dpadUp && !prevJDpadUp && mc->isCreativeMode()) {
-          performPickBlock(mc);
-        }
-        if (dpadDown && !prevJDpadDown) {
-          mc->options.toggle(&Options::Option::THIRD_PERSON, 1);
-        }
-      } else if (mc->currentScreen) {
-        static float vCursorX = -1.0f, vCursorY = -1.0f;
-        if (vCursorX < 0.0f || Mouse::getX() != (int32_t)vCursorX || Mouse::getY() != (int32_t)vCursorY) {
-          if (fabsf(lx) < 0.05f && fabsf(ly) < 0.05f) {
-            vCursorX = (float)Mouse::getX();
-            vCursorY = (float)Mouse::getY();
-          }
-        }
-
-        if (fabsf(lx) > 0.0f || fabsf(ly) > 0.0f) {
-          vCursorX += lx * 10.0f;
-          vCursorY += ly * 10.0f;
-          if (vCursorX < 0.0f) vCursorX = 0.0f;
-          if (vCursorX > (float)this->screenWidth) vCursorX = (float)this->screenWidth;
-          if (vCursorY < 0.0f) vCursorY = 0.0f;
-          if (vCursorY > (float)this->screenHeight) vCursorY = (float)this->screenHeight;
-          Mouse::feed(0, 0, (uint16_t)vCursorX, (uint16_t)vCursorY);
-        }
-
-        if (btnA && !prevJBtnA) {
-          Mouse::feed(1, 1, (uint16_t)vCursorX, (uint16_t)vCursorY);
-        } else if (!btnA && prevJBtnA) {
-          Mouse::feed(1, 0, (uint16_t)vCursorX, (uint16_t)vCursorY);
-        }
-
-        if (btnB && !prevJBtnB) {
-          mc->currentScreen->handleBackEvent(0);
+      for (int i = 0; i < s_numButtons; ++i) {
+        int mapped = Gamepad::mapSdlButton(i, s_numButtons, s_numAxes);
+        if (mapped >= 0) {
+          Gamepad::feedButton(mapped, SDL_JoystickGetButton(activeJoy, i) != 0, i);
         }
+      }
 
-        static int scrollTimer = 0;
-        if (dpadUp || ry < -0.5f) {
-          if (scrollTimer == 0 || (scrollTimer > 15 && scrollTimer % 6 == 0)) {
-            Mouse::feed(SDL_BUTTON_WHEELUP, 1, (uint16_t)vCursorX, (uint16_t)vCursorY);
-          }
-          scrollTimer++;
-        } else if (dpadDown || ry > 0.5f) {
-          if (scrollTimer == 0 || (scrollTimer > 15 && scrollTimer % 6 == 0)) {
-            Mouse::feed(SDL_BUTTON_WHEELDOWN, 1, (uint16_t)vCursorX, (uint16_t)vCursorY);
-          }
-          scrollTimer++;
-        } else {
-          scrollTimer = 0;
-        }
+      if (s_numHats > 0) {
+        uint8_t hat = SDL_JoystickGetHat(activeJoy, 0);
+        Gamepad::feedHat((hat & SDL_HAT_UP) != 0, (hat & SDL_HAT_DOWN) != 0,
+                         (hat & SDL_HAT_LEFT) != 0, (hat & SDL_HAT_RIGHT) != 0);
+      } else if (s_numAxes >= 8) {
+        float hatX = (float)SDL_JoystickGetAxis(activeJoy, 6) / 32767.0f;
+        float hatY = (float)SDL_JoystickGetAxis(activeJoy, 7) / 32767.0f;
+        Gamepad::feedHat(hatY < -0.5f, hatY > 0.5f, hatX < -0.5f, hatX > 0.5f);
       }
 
-      prevJLB = btnLB;
-      prevJRB = btnRB;
-      prevJDpadL = dpadLeft;
-      prevJDpadR = dpadRight;
-      prevJBtnX = btnX;
-      prevJBtnY = btnY;
-      prevJStart = btnStart;
-      prevJLT = lt;
-      prevJRT = rt;
-      prevJDpadUp = dpadUp;
-      prevJDpadDown = dpadDown;
-      prevJBtnA = btnA;
-      prevJBtnB = btnB;
+      Gamepad::syncDerivedButtons();
     }
 
     // TODO engine stuff
diff --git a/modifiedeight-newadditions/impl/I18n.cpp b/modifiedeight-newadditions/impl/I18n.cpp
index b938e611..32842d75 100644
--- a/modifiedeight-newadditions/impl/I18n.cpp
+++ b/modifiedeight-newadditions/impl/I18n.cpp
@@ -514,7 +514,19 @@ bool_t I18n::get(const std::string &a1, std::string &a2) {
   if (a1 == "options.realism.cavelighting") { a2 = "Atmospheric Caves"; return 1; }
   if (a1 == "options.realism.softshadows") { a2 = "Soft Shadows"; return 1; }
   if (a1 == "options.extendedinventory") { a2 = "Extended Inventory"; return 1; }
-  if (a1 == "options.controllersupport") { a2 = "Controller Support"; return 1; }
+  if (a1 == "options.controllersensitivity") { a2 = "Controller Sensitivity"; return 1; }
+  if (a1 == "options.controllercursorsensitivity") { a2 = "Controller Cursor Sensitivity"; return 1; }
+  if (a1 == "options.controllerlayout") { a2 = "Controller Layout"; return 1; }
+  if (a1 == "options.controllerlayout.customize") { a2 = "Customize"; return 1; }
+  if (a1 == "options.controllerlayout.actions") { a2 = "Actions"; return 1; }
+  if (a1 == "options.controllerlayout.bindings") { a2 = "Bindings"; return 1; }
+  if (a1 == "options.controllerlayout.press") { a2 = "> Press... <"; return 1; }
+  if (a1 == "options.controllerlayout.unbound") { a2 = "Unbound"; return 1; }
+  if (a1 == "options.controllerlayout.hint") { a2 = "Press a controller button or move a stick"; return 1; }
+  if (a1 == "options.controllerlayout.nogamepad") { a2 = "No controller detected"; return 1; }
+  if (a1 == "gui.save") { a2 = "Save"; return 1; }
+  if (a1 == "gui.reset") { a2 = "Reset"; return 1; }
+  if (a1 == "gui.cancel") { a2 = "Cancel"; return 1; }
   if (a1 == "options.realism.ssao") { a2 = "SSAO Occlusion"; return 1; }
   if (a1 == "options.realism.ssl") { a2 = "Screen-Space Lighting"; return 1; }
   if (a1 == "options.realism.bloom") { a2 = "Light Bloom"; return 1; }
@@ -641,6 +653,8 @@ std::string I18n::get(const std::string &a2) {
     return "ModifiedEight New Additions Options";
   if (a2 == "options.clientmode")
     return "Client mode";
+  if (a2 == "options.controllersensitivity") return "Controller Sensitivity";
+  if (a2 == "options.controllercursorsensitivity") return "Controller Cursor Sensitivity";
   if (a2 == "options.sprint")
     return "Sprint";
   if (a2 == "options.sprint.desc")
@@ -757,7 +771,17 @@ std::string I18n::get(const std::string &a2) {
   if (a2 == "options.realism.cavelighting") return "Atmospheric Caves";
   if (a2 == "options.realism.bloom") return "Bloom Effect";
   if (a2 == "options.extendedinventory") return "Extended Inventory";
-  if (a2 == "options.controllersupport") return "Controller Support";
+  if (a2 == "options.controllerlayout") return "Controller Layout";
+  if (a2 == "options.controllerlayout.customize") return "Customize";
+  if (a2 == "options.controllerlayout.actions") return "Actions";
+  if (a2 == "options.controllerlayout.bindings") return "Bindings";
+  if (a2 == "options.controllerlayout.press") return "> Press... <";
+  if (a2 == "options.controllerlayout.unbound") return "Unbound";
+  if (a2 == "options.controllerlayout.hint") return "Press a controller button or move a stick";
+  if (a2 == "options.controllerlayout.nogamepad") return "No controller detected";
+  if (a2 == "gui.save") return "Save";
+  if (a2 == "gui.reset") return "Reset";
+  if (a2 == "gui.cancel") return "Cancel";
   if (a2 == "options.realism.ssao") return "SSAO Occlusion";
   if (a2 == "options.realism.ssl") return "Screen-Space Lighting";
   if (a2 == "options.realism.bloom") return "Light Bloom";
diff --git a/modifiedeight-newadditions/impl/Minecraft.cpp b/modifiedeight-newadditions/impl/Minecraft.cpp
index 6a4363e9..f148d302 100644
--- a/modifiedeight-newadditions/impl/Minecraft.cpp
+++ b/modifiedeight-newadditions/impl/Minecraft.cpp
@@ -12,6 +12,8 @@
 #include <gui/screens/DeathScreen.hpp>
 #include <gui/screens/PauseScreen.hpp>
 #include <input/BuildActionIntention.hpp>
+#include <input/ControllerHandler.hpp>
+#include <input/ControllerLayout.hpp>
 #include <input/ControllerTurnInput.hpp>
 #include <input/CustomInputHolder.hpp>
 #include <input/Keyboard.hpp>
@@ -436,6 +438,7 @@ void Minecraft::init(void) {
 	this->supportsNonTouchScreen = !this->platform()->supportsTouchscreen();
 	this->options.init(this, this->field_D00);
 	this->options.update();
+	ControllerLayout::init(this->field_D00);
 	this->externalServerFile = std::shared_ptr<ExternalServerFile>(new ExternalServerFile(this->field_D00));
 	this->externalServerFile->load();
 	this->checkGLError("Init enter");
@@ -1219,6 +1222,7 @@ void Minecraft::unlockControl(void) {
 
 void Minecraft::update(void) {
 	this->cmutex->lock();
+	ControllerHandler::tick(this);
 	if(this->field_16C && this->level) {
 		float v14 = this->timer.field_8;
 		this->timer.advanceTime();
diff --git a/modifiedeight-newadditions/impl/Options.cpp b/modifiedeight-newadditions/impl/Options.cpp
index a7e903d3..f97945af 100644
--- a/modifiedeight-newadditions/impl/Options.cpp
+++ b/modifiedeight-newadditions/impl/Options.cpp
@@ -18,6 +18,8 @@ Options::Option Options::Option::MUSIC{1, "options.music", 0};
 Options::Option Options::Option::SOUND{1, "options.sound", 1};
 Options::Option Options::Option::INVERT_MOUSE{0, "options.invertMouse", 2};
 Options::Option Options::Option::SENSITIVITY{1, "options.sensitivity", 3};
+Options::Option Options::Option::CONTROLLER_SENSITIVITY{1, "options.controllersensitivity", 60};
+Options::Option Options::Option::CONTROLLER_CURSOR_SENSITIVITY{1, "options.controllercursorsensitivity", 61};
 Options::Option Options::Option::RENDER_DISTANCE{3, "options.renderDistance", 4};
 Options::Option Options::Option::VIEW_BOBBING{0, "options.viewBobbing", 5};
 Options::Option Options::Option::LIMIT_FRAMERATE{0, "options.limitFramerate", 7};
@@ -70,7 +72,6 @@ Options::Option Options::Option::REALISM_SSAO{0, "options.realism.ssao", 54};
 Options::Option Options::Option::REALISM_SCREEN_SPACE_LIGHTING{0, "options.realism.ssl", 55};
 Options::Option Options::Option::REALISM_BLOOM{0, "options.realism.bloom", 56};
 Options::Option Options::Option::EXTENDED_INVENTORY{0, "options.extendedinventory", 57};
-Options::Option Options::Option::CONTROLLER_SUPPORT{0, "options.controllersupport", 60};
 Options::Option Options::Option::MORNING_FOG{0, "options.morningfog", 58};
 Options::Option Options::Option::SUN_GLOW{0, "options.sunglow", 59};
 std::vector<int32_t> Options::DIFFICULTY_LEVELS = {0, 2};
@@ -99,6 +100,16 @@ void Options::update() {
 				if(this->readFloat(v13[i + 1], v12)) {
 					this->sensitity = (float)(powf(v12 * 1.1, 1.3) * 0.42) + 0.3;
 				}
+			} else if(v13[i] == "options.controllersensitivity") {
+				float v12;
+				if(this->readFloat(v13[i + 1], v12)) {
+					this->controllerSensitivity = v12;
+				}
+			} else if(v13[i] == "options.controllercursorsensitivity") {
+				float v12;
+				if(this->readFloat(v13[i + 1], v12)) {
+					this->controllerCursorSensitivity = v12;
+				}
 			} else {
 				if(v13[i] == OptionStrings::Controls_InvertMouse) {
 					this->readBool(v13[i + 1], this->invertMouse);
@@ -176,8 +187,6 @@ void Options::update() {
 							this->readBool(v13[i + 1], this->swapJumpAndSneak);
 						} else if(v13[i] == "options.extendedinventory") {
 							this->readBool(v13[i + 1], this->extendedInventory);
-						} else if(v13[i] == "options.controllersupport") {
-							this->readBool(v13[i + 1], this->controllerSupport);
 						} else if(v13[i] == "options.chatcolor") {
 							this->readInt(v13[i + 1], this->chatColor);
 						} else if(v13[i] == "options.chatbgcolor") {
@@ -351,8 +360,6 @@ void Options::toggle(const Options::Option* a2, int32_t a3) {
 		this->realismBloom ^= 1u;
 	} else if(a2 == &Options::Option::EXTENDED_INVENTORY || (a2 && a2->name == "options.extendedinventory")) {
 		this->extendedInventory ^= 1u;
-	} else if(a2 == &Options::Option::CONTROLLER_SUPPORT || (a2 && a2->name == "options.controllersupport")) {
-		this->controllerSupport ^= 1u;
 	} else if(a2 == &Options::Option::PANORAMA_ANGLE) {
 		this->panoramaAngle = (this->panoramaAngle + a3 + 7) % 7;
 	} else if(a2 == &Options::Option::LIMIT_FRAMERATE) {
@@ -409,6 +416,10 @@ void Options::set(const Options::Option* a2, float a3) {
 		this->fov = a3;
 	} else if(a2 == &Options::Option::SENSITIVITY) {
 		this->sensitity = a3;
+	} else if(a2 == &Options::Option::CONTROLLER_SENSITIVITY) {
+		this->controllerSensitivity = a3;
+	} else if(a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		this->controllerCursorSensitivity = a3;
 	} else if(a2 == &Options::Option::BRIGHTNESS) {
 		this->brightness = a3;
 		if(this->minecraft && this->minecraft->level && this->minecraft->level->dimensionPtr) {
@@ -431,6 +442,8 @@ void Options::save(void) {
 	this->addOptionToSaveOutput(v4, OptionStrings::Graphics_PixelsPerMilimeter, this->pixelDensity);
 	this->addOptionToSaveOutput(v4, OptionStrings::Multiplayer_ServerVisible, this->serverVisible);
 	this->addOptionToSaveOutput(v4, OptionStrings::Controls_Sensitivity, this->sensitity);
+	this->addOptionToSaveOutput(v4, "options.controllersensitivity", this->controllerSensitivity);
+	this->addOptionToSaveOutput(v4, "options.controllercursorsensitivity", this->controllerCursorSensitivity);
 	this->addOptionToSaveOutput(v4, OptionStrings::Controls_InvertMouse, this->invertMouse);
 	this->addOptionToSaveOutput(v4, OptionStrings::Controls_IsLefthanded, this->leftHanded);
 	this->addOptionToSaveOutput(v4, OptionStrings::Controls_UseTouchScreen, this->useTouchscreen);
@@ -466,7 +479,6 @@ void Options::save(void) {
 	this->addOptionToSaveOutput(v4, "options.sunglow", this->sunGlow);
 	this->addOptionToSaveOutput(v4, "options.swapjumpandsneak", this->swapJumpAndSneak);
 	this->addOptionToSaveOutput(v4, "options.extendedinventory", this->extendedInventory);
-	this->addOptionToSaveOutput(v4, "options.controllersupport", this->controllerSupport);
 	this->addOptionToSaveOutput(v4, "options.panoramaangle", this->panoramaAngle);
 	this->addOptionToSaveOutput(v4, OptionStrings::Graphics_HideGUI, this->hideGUI);
 	this->addOptionToSaveOutput(v4, OptionStrings::AUDIO_Sound, this->soundVolume);
@@ -576,7 +588,6 @@ void Options::initDefaultValues(void) {
 	this->realismSSL = 1;
 	this->realismBloom = 1;
 	this->extendedInventory = 0;
-	this->controllerSupport = 1;
 	this->chatColor = 0;
 	this->chatBgColor = 0;
 	this->panoramaAngle = 0;
@@ -591,6 +602,8 @@ void Options::initDefaultValues(void) {
 	this->soundVolume = 1.0;
 	this->invertMouse = 0;
 	this->sensitity = 0.5;
+	this->controllerSensitivity = 40.0f;
+	this->controllerCursorSensitivity = 2.25f;
 	this->limitFramerate = 0;
 	this->renderDistance = 2;
 	this->useTouchscreen = this->minecraft->supportNonTouchscreen();
@@ -702,6 +715,9 @@ float Options::getProgrssMin(const Options::Option* a2) {
 	if(a2 == &Options::Option::PIXELS_PER_MILLIMETER) {
 		return 3;
 	}
+	if(a2 == &Options::Option::CONTROLLER_SENSITIVITY || a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		return 0;
+	}
 	return 0;
 }
 float Options::getProgrssMax(const Options::Option* a2) {
@@ -714,6 +730,12 @@ float Options::getProgrssMax(const Options::Option* a2) {
 	if(a2 == &Options::Option::PIXELS_PER_MILLIMETER) {
 		return 12;
 	}
+	if(a2 == &Options::Option::CONTROLLER_SENSITIVITY) {
+		return 80;
+	}
+	if(a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		return 4.5f;
+	}
 	return 1;
 }
 float Options::getProgressValue(const Options::Option* a2) {
@@ -726,6 +748,12 @@ float Options::getProgressValue(const Options::Option* a2) {
 	if(a2 == &Options::Option::SENSITIVITY) {
 		return this->sensitity;
 	}
+	if(a2 == &Options::Option::CONTROLLER_SENSITIVITY) {
+		return this->controllerSensitivity;
+	}
+	if(a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		return this->controllerCursorSensitivity;
+	}
 	if(a2 == &Options::Option::BRIGHTNESS) {
 		return this->brightness;
 	}
@@ -805,6 +833,12 @@ std::string Options::getDescription(const Options::Option* a2, std::string a4) {
 		sprintf(v9, "%d", percent);
 		return a4 + ": +" + v9 + "%";
 	}
+	if(a2 == &Options::Option::CONTROLLER_SENSITIVITY) {
+		return a4;
+	}
+	if(a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		return a4;
+	}
 	return a4;
 }
 bool_t Options::getBooleanValue(const Options::Option* a2) {
@@ -914,8 +948,6 @@ bool_t Options::getBooleanValue(const Options::Option* a2) {
 		return this->realismBloom;
 	} else if(a2 == &Options::Option::EXTENDED_INVENTORY || (a2 && a2->name == "options.extendedinventory")) {
 		return this->extendedInventory;
-	} else if(a2 == &Options::Option::CONTROLLER_SUPPORT || (a2 && a2->name == "options.controllersupport")) {
-		return this->controllerSupport;
 	}
 	if(a2 == &Options::Option::GRAPHICS) {
 		return this->graphics;
diff --git a/modifiedeight-newadditions/impl/_pengine.cpp b/modifiedeight-newadditions/impl/_pengine.cpp
index a26d2fa8..87da5dcc 100644
--- a/modifiedeight-newadditions/impl/_pengine.cpp
+++ b/modifiedeight-newadditions/impl/_pengine.cpp
@@ -6,6 +6,8 @@
 #include <android/log.h>
 #include <android_native_app_glue.h>
 #include <input/Controller.hpp>
+#include <input/ControllerHandler.hpp>
+#include <input/Gamepad.hpp>
 #include <input/Keyboard.hpp>
 #include <input/Mouse.hpp>
 #include <input/Multitouch.hpp>
@@ -126,7 +128,82 @@ void engine_term_display(ENGINE* a1) {
 //         //67//       //
 static int _d6715384[] = {4, 0x13, 0x14, 0x15, 0x16, 0x17, 0x52, 0x63, 0x64, 0x66, 0x67, 0x6C, 0x6D};
 static char _D67153B8[] = {0xD, 8};
+
+static bool _isGamepadSource(int32_t source) {
+	if((source & AINPUT_SOURCE_JOYSTICK) == AINPUT_SOURCE_JOYSTICK) return true;
+	if((source & AINPUT_SOURCE_GAMEPAD) == AINPUT_SOURCE_GAMEPAD) return true;
+	return false;
+}
+
+static bool _isGamepadKeyCode(int32_t keyCode) {
+	if(keyCode >= 96 && keyCode <= 110) return true;
+	if(keyCode >= 188 && keyCode <= 202) return true;
+	return false;
+}
+
+static void _feedGamepadMotion(AInputEvent* event) {
+	Gamepad::setConnected(1);
+
+	float lx = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_X, 0);
+	float ly = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_Y, 0);
+	Gamepad::feedAxis(GP_AXIS_LX, lx, AMOTION_EVENT_AXIS_X);
+	Gamepad::feedAxis(GP_AXIS_LY, ly, AMOTION_EVENT_AXIS_Y);
+
+	float rx = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_Z, 0);
+	float ry = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RZ, 0);
+	int32_t rxRaw = AMOTION_EVENT_AXIS_Z;
+	int32_t ryRaw = AMOTION_EVENT_AXIS_RZ;
+	if(rx == 0.0f && ry == 0.0f) {
+		rx = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RX, 0);
+		ry = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RY, 0);
+		rxRaw = AMOTION_EVENT_AXIS_RX;
+		ryRaw = AMOTION_EVENT_AXIS_RY;
+	}
+	Gamepad::feedAxis(GP_AXIS_RX, rx, rxRaw);
+	Gamepad::feedAxis(GP_AXIS_RY, ry, ryRaw);
+
+	float lt = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_LTRIGGER, 0);
+	float rt = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RTRIGGER, 0);
+	int32_t ltRaw = AMOTION_EVENT_AXIS_LTRIGGER;
+	int32_t rtRaw = AMOTION_EVENT_AXIS_RTRIGGER;
+	if(lt == 0.0f) {
+		lt = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_BRAKE, 0);
+		ltRaw = AMOTION_EVENT_AXIS_BRAKE;
+	}
+	if(rt == 0.0f) {
+		rt = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_GAS, 0);
+		rtRaw = AMOTION_EVENT_AXIS_GAS;
+	}
+	if(lt < 0.0f) lt = 0.0f;
+	if(rt < 0.0f) rt = 0.0f;
+	Gamepad::feedAxis(GP_AXIS_LT, lt, ltRaw);
+	Gamepad::feedAxis(GP_AXIS_RT, rt, rtRaw);
+
+	float hatX = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_HAT_X, 0);
+	float hatY = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_HAT_Y, 0);
+	Gamepad::feedHat(hatY < -0.5f, hatY > 0.5f, hatX < -0.5f, hatX > 0.5f);
+
+	Gamepad::syncDerivedButtons();
+}
+
 int engine_handle_input(struct android_app* app, struct AInputEvent* event) {
+	int32_t evSource = AInputEvent_getSource(event);
+	if(AInputEvent_getType(event) == 2 && _isGamepadSource(evSource) && evSource != 0x100008) {
+		_feedGamepadMotion(event);
+		return 1;
+	}
+	if(AInputEvent_getType(event) == 1) {
+		int32_t gpKeyCode = AKeyEvent_getKeyCode(event);
+		if(_isGamepadKeyCode(gpKeyCode) || (_isGamepadSource(evSource) && gpKeyCode >= 19 && gpKeyCode <= 23)) {
+			Gamepad::setConnected(1);
+			int32_t mapped = Gamepad::mapRawButton(gpKeyCode, -1);
+			if(mapped >= 0) {
+				Gamepad::feedButton(mapped, AKeyEvent_getAction(event) == 0, gpKeyCode);
+				Gamepad::syncDerivedButtons();
+				return 1;
+			}
+		}
+	}
 	if(AInputEvent_getType(event) != 1) {
 		if(((ENGINE*)app->userData)->minecraft->useTouchscreen()) {
 			if(AInputEvent_getType(event) == 2 && AInputEvent_getSource(event) != 0x100008) {
diff --git a/modifiedeight-newadditions/impl/gui/ControllerLayoutOption.cpp b/modifiedeight-newadditions/impl/gui/ControllerLayoutOption.cpp
new file mode 100644
index 00000000..5bf7ae34
--- /dev/null
+++ b/modifiedeight-newadditions/impl/gui/ControllerLayoutOption.cpp
@@ -0,0 +1,49 @@
+#include <gui/ControllerLayoutOption.hpp>
+#include <I18n.hpp>
+#include <Minecraft.hpp>
+#include <gui/buttons/Touch_TButton.hpp>
+#include <gui/screens/ControllerLayoutScreen.hpp>
+#include <rendering/Font.hpp>
+
+ControllerLayoutOption::ControllerLayoutOption(Minecraft* a2, bool_t a3)
+	: GuiElementContainer(0, 1, 0, 0, 24, 20) {
+	this->isInWorld = a3;
+	this->pressedButton = 0;
+	this->customizeButton = std::shared_ptr<Button>(new Touch::TButton(9999998, 0, 0, 66, 20, I18n::get("options.controllerlayout.customize"), a2));
+	this->addChild(this->customizeButton);
+}
+
+ControllerLayoutOption::~ControllerLayoutOption() {
+}
+
+void ControllerLayoutOption::render(Minecraft* a2, int32_t a3, int32_t a4) {
+	int32_t v9 = (this->height - 8) / 2;
+	a2->font->drawShadow(I18n::get("options.controllerlayout"), this->posX, (float)this->posY + (float)v9, 0xFFBBBBBB);
+	GuiElementContainer::render(a2, a3, a4);
+}
+
+void ControllerLayoutOption::setupPositions() {
+	int32_t v3 = 0;
+	for(auto c: this->children) {
+		c->posX = this->posX + this->width - c->width - 15;
+		c->posY = this->posY + v3;
+		v3 += c->height;
+	}
+	this->height = v3;
+}
+
+void ControllerLayoutOption::mouseClicked(Minecraft* a2, int32_t a3, int32_t a4, int32_t a5) {
+	if(a5 != 1) return;
+	if(this->customizeButton->clicked(a2, a3, a4)) {
+		this->pressedButton = this->customizeButton.get();
+		this->pressedButton->setPressed();
+	}
+}
+
+void ControllerLayoutOption::mouseReleased(Minecraft* a2, int32_t a3, int32_t a4, int32_t a5) {
+	if(this->pressedButton == this->customizeButton.get() && this->pressedButton->clicked(a2, a3, a4)) {
+		a2->setScreen(new ControllerLayoutScreen(this->isInWorld));
+	}
+	this->pressedButton = 0;
+	this->customizeButton->released(a3, a4);
+}
diff --git a/modifiedeight-newadditions/impl/gui/OptionsGroup.cpp b/modifiedeight-newadditions/impl/gui/OptionsGroup.cpp
index 667aab00..b1a83fee 100644
--- a/modifiedeight-newadditions/impl/gui/OptionsGroup.cpp
+++ b/modifiedeight-newadditions/impl/gui/OptionsGroup.cpp
@@ -1,6 +1,7 @@
 #include <gui/OptionsGroup.hpp>
 #include <I18n.hpp>
 #include <Minecraft.hpp>
+#include <gui/ControllerLayoutOption.hpp>
 #include <gui/LoginOption.hpp>
 #include <gui/buttons/OptionButton.hpp>
 #include <gui/elements/OptionsItem.hpp>
@@ -19,6 +20,11 @@ void OptionsGroup::addLoginItem(Minecraft* a2) {
 	this->addChild(std::shared_ptr<LoginOption>(new LoginOption(a2)));
 	this->setupPositions();
 }
+OptionsGroup* OptionsGroup::addControllerLayoutItem(Minecraft* a2, bool_t a3) {
+	this->addChild(std::shared_ptr<ControllerLayoutOption>(new ControllerLayoutOption(a2, a3)));
+	this->setupPositions();
+	return this;
+}
 void OptionsGroup::createTextBox(const Options::Option* a2, Minecraft* a3) {
 	std::shared_ptr<TextBox> v13(new TextBox(a3, a2, I18n::get(a2->name)));
 	const char* extAscii = TextBox::extendedAcsii ? TextBox::extendedAcsii : " !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/modifiedeight-newadditions/impl/gui/screens/ControllerLayoutScreen.cpp b/modifiedeight-newadditions/impl/gui/screens/ControllerLayoutScreen.cpp
new file mode 100644
index 00000000..96bb35b7
--- /dev/null
+++ b/modifiedeight-newadditions/impl/gui/screens/ControllerLayoutScreen.cpp
@@ -0,0 +1,499 @@
+#include <gui/screens/ControllerLayoutScreen.hpp>
+#include <I18n.hpp>
+#include <Minecraft.hpp>
+#include <cpputils.hpp>
+#include <gui/Gui.hpp>
+#include <gui/NinePatchFactory.hpp>
+#include <gui/NinePatchLayer.hpp>
+#include <gui/buttons/Touch_TButton.hpp>
+#include <gui/screens/OptionsScreen.hpp>
+#include <input/ControllerHandler.hpp>
+#include <input/Gamepad.hpp>
+#include <input/Mouse.hpp>
+#include <rendering/Font.hpp>
+#include <rendering/Tesselator.hpp>
+#include <util/IntRectangle.hpp>
+#include <unigl.h>
+#include <utils.h>
+
+static const int32_t _clsRowHeight = 30;
+static const int32_t _clsRowGap = 1;
+static const int32_t _clsStride = 31;
+static const int32_t _clsScrollW = 10;
+static const int32_t _clsColGap = 2;
+
+ControllerLayoutScreen::ControllerLayoutScreen(bool_t a2) {
+	this->isInWorld = a2;
+	this->optBtn = 0;
+	this->playPressed = 0;
+	this->listBg = 0;
+	this->panelBg = 0;
+	this->buttonSave = 0;
+	this->buttonReset = 0;
+	this->buttonCancel = 0;
+	this->capturingAction = -1;
+	this->scrollOffset = 0.0f;
+	this->scrollTarget = 0.0f;
+	this->contentHeight = CA_COUNT * _clsStride;
+	this->listTop = 0;
+	this->listBottom = 0;
+	this->actionsColumnWidth = 0;
+	this->bindingsColumnWidth = 0;
+	this->dragStartY = 0;
+	this->dragStartOffset = 0.0f;
+	this->dragVel = 0.0f;
+	this->lastDragMs = 0;
+	this->isDragging = 0;
+	this->draggingBar = 0;
+	this->barGrabDY = 0;
+	this->lastAnimMs = 0;
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		this->working[i] = ControllerLayout::get(i);
+	}
+}
+
+ControllerLayoutScreen::~ControllerLayoutScreen() {
+	ControllerHandler::endCapture();
+	safeRemove(this->optBtn);
+	safeRemove(this->playPressed);
+	safeRemove(this->listBg);
+	safeRemove(this->panelBg);
+	if(this->buttonSave) {
+		delete this->buttonSave;
+		this->buttonSave = 0;
+	}
+	if(this->buttonReset) {
+		delete this->buttonReset;
+		this->buttonReset = 0;
+	}
+	if(this->buttonCancel) {
+		delete this->buttonCancel;
+		this->buttonCancel = 0;
+	}
+}
+
+void ControllerLayoutScreen::init() {
+	this->buttons.clear();
+	this->field_2C.clear();
+
+	this->buttonSave = new Touch::TButton(1, I18n::get("gui.save"), 0);
+	this->buttonReset = new Touch::TButton(2, I18n::get("gui.reset"), 0);
+	this->buttonCancel = new Touch::TButton(3, I18n::get("gui.cancel"), 0);
+
+	IntRectangle rOptions;
+	rOptions.minX = 112;
+	rOptions.minY = 0;
+	rOptions.width = 8;
+	rOptions.height = 67;
+	IntRectangle rOptionsPressed;
+	rOptionsPressed.minX = 120;
+	rOptionsPressed.minY = 0;
+	rOptionsPressed.width = 8;
+	rOptionsPressed.height = 67;
+	((Touch::TButton*)this->buttonSave)->init(this->minecraft, "gui/spritesheet.png", rOptions, rOptionsPressed, 2, 2, 66, 26);
+	((Touch::TButton*)this->buttonReset)->init(this->minecraft, "gui/spritesheet.png", rOptions, rOptionsPressed, 2, 2, 66, 26);
+	((Touch::TButton*)this->buttonCancel)->init(this->minecraft, "gui/spritesheet.png", rOptions, rOptionsPressed, 2, 2, 66, 26);
+
+	NinePatchFactory npf(this->minecraft->texturesPtr, "gui/spritesheet.png");
+	safeRemove(this->optBtn);
+	safeRemove(this->playPressed);
+	safeRemove(this->listBg);
+	safeRemove(this->panelBg);
+	IntRectangle rNormal;
+	rNormal.minX = 112;
+	rNormal.minY = 0;
+	rNormal.width = 8;
+	rNormal.height = 67;
+	this->optBtn = npf.createSymmetrical(rNormal, 2, 2, 32, 32);
+	IntRectangle rBlack;
+	rBlack.minX = 0;
+	rBlack.minY = 32;
+	rBlack.width = 8;
+	rBlack.height = 8;
+	this->playPressed = npf.createSymmetrical(rBlack, 2, 2, 32, 32);
+	this->listBg = npf.createSymmetrical(rBlack, 2, 2, 32, 32);
+	IntRectangle rPanel;
+	rPanel.minX = 34;
+	rPanel.minY = 43;
+	rPanel.width = 14;
+	rPanel.height = 14;
+	this->panelBg = npf.createSymmetrical(rPanel, 3, 3, 32, 32);
+
+	this->buttons.emplace_back(this->buttonSave);
+	this->buttons.emplace_back(this->buttonReset);
+	this->buttons.emplace_back(this->buttonCancel);
+}
+
+void ControllerLayoutScreen::setupPositions() {
+	int32_t sideMargin = this->width * 5 / 100;
+	if(sideMargin < 10) sideMargin = 10;
+	int32_t panelL = sideMargin;
+	int32_t panelR = this->width - sideMargin;
+
+	this->contentLeft = panelL + 10;
+	this->contentRight = panelR - 10 - _clsScrollW - 4;
+	this->scrollBarX = this->contentRight + 4;
+	if(this->contentRight < this->contentLeft + 80) {
+		this->contentRight = this->contentLeft + 80;
+	}
+	int32_t total = this->contentRight - this->contentLeft;
+	this->actionsColumnWidth = (total * 57) / 100;
+	this->bindingsColumnWidth = total - this->actionsColumnWidth;
+
+	int32_t btnH = 26;
+	int32_t gap = 6;
+	int32_t btnW = (panelR - 10 - this->contentLeft - gap * 2) / 3;
+	if(btnW < 20) btnW = 20;
+	int32_t btnY = this->height - btnH - 14;
+
+	this->buttonSave->width = btnW;
+	this->buttonSave->height = btnH;
+	this->buttonSave->posX = this->contentLeft;
+	this->buttonSave->posY = btnY;
+
+	this->buttonReset->width = btnW;
+	this->buttonReset->height = btnH;
+	this->buttonReset->posX = this->contentLeft + btnW + gap;
+	this->buttonReset->posY = btnY;
+
+	this->buttonCancel->width = btnW;
+	this->buttonCancel->height = btnH;
+	this->buttonCancel->posX = this->contentLeft + (btnW + gap) * 2;
+	this->buttonCancel->posY = btnY;
+
+	this->listTop = 56;
+	this->listBottom = btnY - 10;
+	if(this->listBottom < this->listTop + _clsRowHeight) {
+		this->listBottom = this->listTop + _clsRowHeight;
+	}
+
+	this->contentHeight = CA_COUNT * _clsStride;
+	this->clampScroll();
+}
+
+
+
+void ControllerLayoutScreen::clampScroll() {
+	float viewHeight = (float)(this->listBottom - this->listTop);
+	float maxScroll = (float)this->contentHeight - viewHeight;
+	if(maxScroll < 0.0f) maxScroll = 0.0f;
+	if(this->scrollOffset > maxScroll) this->scrollOffset = maxScroll;
+	if(this->scrollOffset < 0.0f) this->scrollOffset = 0.0f;
+	if(this->scrollTarget > maxScroll) this->scrollTarget = maxScroll;
+	if(this->scrollTarget < 0.0f) this->scrollTarget = 0.0f;
+}
+
+int32_t ControllerLayoutScreen::rowIndexAt(int32_t a2, int32_t a3) {
+	if(a3 < this->listTop || a3 >= this->listBottom) return -1;
+	int32_t bindingsX = this->contentLeft + this->actionsColumnWidth + _clsColGap;
+	if(a2 < bindingsX || a2 >= this->contentRight) return -1;
+	int32_t rel = a3 - this->listTop + (int32_t)this->scrollOffset;
+	if(rel < 0) return -1;
+	int32_t idx = rel / _clsStride;
+	if(idx < 0 || idx >= CA_COUNT) return -1;
+	if(rel % _clsStride >= _clsRowHeight) return -1;
+	return idx;
+}
+
+void ControllerLayoutScreen::closeScreen() {
+	this->minecraft->setScreen(new OptionsScreen(this->isInWorld));
+}
+
+void ControllerLayoutScreen::render(int32_t a2, int32_t a3, float a4) {
+	if(!this->isInWorld) {
+		if(this->renderGameBehind()) {
+			this->renderMenuBackground(a4);
+		}
+	}
+	this->renderBackground(0);
+
+	int32_t nowMs = getTimeMs();
+	int32_t animDt = nowMs - this->lastAnimMs;
+	if(this->lastAnimMs == 0 || animDt < 1) animDt = 17;
+	if(animDt > 100) animDt = 100;
+	this->lastAnimMs = nowMs;
+	if(this->draggingBar) {
+		int32_t mx = Mouse::getX();
+		int32_t my = Mouse::getY();
+		this->toGUICoordinate(mx, my);
+		int32_t viewHeight = this->listBottom - this->listTop;
+		int32_t barY = this->listTop;
+		int32_t barH = viewHeight;
+		this->calcBar(barY, barH);
+		int32_t maxScroll = this->contentHeight - viewHeight;
+		int32_t trackTop = this->listTop - 3;
+		int32_t trackH = viewHeight + 5;
+		if(maxScroll > 0 && trackH - barH > 0) {
+			int32_t wantY = my - this->barGrabDY;
+			if(wantY < trackTop) wantY = trackTop;
+			if(wantY > trackTop + trackH - barH) wantY = trackTop + trackH - barH;
+			float t = (float)(wantY - trackTop) / (float)(trackH - barH);
+			this->scrollOffset = t * (float)maxScroll;
+			this->scrollTarget = this->scrollOffset;
+			this->clampScroll();
+		}
+	} else if(this->isDragging) {
+		int32_t mx = Mouse::getX();
+		int32_t my = Mouse::getY();
+		this->toGUICoordinate(mx, my);
+		float prev = this->scrollOffset;
+		this->scrollOffset = this->dragStartOffset + (float)(this->dragStartY - my);
+		this->clampScroll();
+		this->scrollTarget = this->scrollOffset;
+		float v = (this->scrollOffset - prev) / (float)animDt;
+		this->dragVel = this->dragVel * 0.7f + v * 0.3f;
+		this->lastDragMs = nowMs;
+	} else {
+		float diff = this->scrollTarget - this->scrollOffset;
+		if(diff > 0.5f || diff < -0.5f) {
+			float k = (float)animDt * 0.025f;
+			if(k > 1.0f) k = 1.0f;
+			this->scrollOffset += diff * k;
+			this->clampScroll();
+		} else {
+			this->scrollOffset = this->scrollTarget;
+		}
+	}
+
+	int32_t sideMargin = this->width * 5 / 100;
+	if(sideMargin < 10) sideMargin = 10;
+	int32_t panelL = sideMargin;
+	int32_t panelR = this->width - sideMargin;
+	int32_t panelT = 6;
+	int32_t panelB = this->height - 6;
+
+	if(this->panelBg) {
+		this->panelBg->setSize((float)(panelR - panelL), (float)(panelB - panelT));
+		this->panelBg->draw(Tesselator::instance, (float)panelL, (float)panelT);
+	}
+
+	this->drawCenteredString(this->font, I18n::get("options.controllerlayout"), this->width / 2, 16, 0xFFFFFFFF);
+
+	int32_t actionsX = this->contentLeft;
+	int32_t bindingsX = this->contentLeft + this->actionsColumnWidth + _clsColGap;
+	int32_t rightX = this->contentRight;
+	int32_t actionsCX = actionsX + this->actionsColumnWidth / 2;
+	int32_t bindingsCX = bindingsX + (rightX - bindingsX) / 2;
+
+	this->drawCenteredString(this->font, I18n::get("options.controllerlayout.actions"), actionsCX, 40, 0xFFFFFFFF);
+	this->drawCenteredString(this->font, I18n::get("options.controllerlayout.bindings"), bindingsCX, 40, 0xFFFFFFFF);
+
+	if(this->listBg) {
+		this->listBg->setSize((float)(this->contentRight - this->contentLeft + 4), (float)(this->listBottom - this->listTop + 5));
+		this->listBg->draw(Tesselator::instance, (float)(this->contentLeft - 2), (float)(this->listTop - 3));
+	}
+
+	glEnable(0xC11u);
+	glScissor((uint32_t)(float)(Gui::GuiScale * (float)this->contentLeft), (uint32_t)(float)(this->minecraft->field_20 - (float)(Gui::GuiScale * (float)this->listBottom)), (uint32_t)(float)(Gui::GuiScale * (float)(this->scrollBarX + _clsScrollW - this->contentLeft)), (uint32_t)(float)(Gui::GuiScale * (float)(this->listBottom - this->listTop)));
+
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		int32_t rowY = this->listTop + i * _clsStride - (int32_t)this->scrollOffset;
+		if(rowY + _clsRowHeight <= this->listTop) continue;
+		if(rowY >= this->listBottom) break;
+
+		bool_t capturing = this->capturingAction == i;
+		if(this->optBtn) {
+			this->optBtn->setSize((float)this->actionsColumnWidth, (float)_clsRowHeight);
+			this->optBtn->draw(Tesselator::instance, (float)actionsX, (float)rowY);
+		}
+		NinePatchLayer* bindLayer = this->playPressed ? this->playPressed : this->optBtn;
+		if(bindLayer) {
+			bindLayer->setSize((float)(rightX - bindingsX), (float)_clsRowHeight);
+			bindLayer->draw(Tesselator::instance, (float)bindingsX, (float)rowY);
+		}
+
+		int32_t textY = rowY + (_clsRowHeight - 8) / 2;
+		this->drawCenteredString(this->font, ControllerLayout::actionName(i), actionsCX, textY, 0xFFE0E0E0);
+
+		std::string label;
+		uint32_t labelColor;
+		if(capturing) {
+			label = I18n::get("options.controllerlayout.press");
+			labelColor = 0xFFFFA0;
+		} else if(this->working[i].isSet()) {
+			label = this->working[i].describe();
+			labelColor = 0xFFE0E0E0;
+		} else {
+			label = I18n::get("options.controllerlayout.unbound");
+			labelColor = 0xFFA0A0A0;
+		}
+		this->drawCenteredString(this->font, label, bindingsCX, textY, labelColor);
+	}
+	glDisable(0xC11u);
+
+	int32_t barY = this->listTop;
+	int32_t barHeight = 0;
+	this->calcBar(barY, barHeight);
+	int32_t viewHeight = this->listBottom - this->listTop;
+	if(this->contentHeight > viewHeight && viewHeight > 0) {
+		if(this->playPressed) {
+			this->playPressed->setSize((float)_clsScrollW, (float)(viewHeight + 5));
+			this->playPressed->draw(Tesselator::instance, (float)this->scrollBarX, (float)(this->listTop - 3));
+		}
+		if(this->optBtn) {
+			this->optBtn->setSize((float)_clsScrollW, (float)barHeight);
+			this->optBtn->draw(Tesselator::instance, (float)this->scrollBarX, (float)barY);
+		}
+	}
+
+	if(!Gamepad::connected) {
+		std::string notice = I18n::get("options.controllerlayout.nogamepad");
+		int32_t noticeW = this->font->width(notice);
+		int32_t noticeCX = (this->contentLeft + this->scrollBarX + _clsScrollW) / 2;
+		int32_t noticeCY = (this->listTop + this->listBottom) / 2;
+		this->fill(noticeCX - noticeW / 2 - 10, noticeCY - 11, noticeCX + noticeW / 2 + 10, noticeCY + 11, 0xDD000000);
+		this->drawCenteredString(this->font, notice, noticeCX, noticeCY - 4, 0xFFFF5555);
+	}
+
+	Screen::render(a2, a3, a4);
+}
+
+void ControllerLayoutScreen::calcBar(int32_t& outY, int32_t& outH) {
+	int32_t viewHeight = this->listBottom - this->listTop;
+	outY = this->listTop - 3;
+	outH = viewHeight + 5;
+	if(this->contentHeight > viewHeight && viewHeight > 0) {
+		outH = (viewHeight * viewHeight) / this->contentHeight;
+		outH = (outH * 3) / 4;
+		if(outH < 10) outH = 10;
+		if(outH > viewHeight) outH = viewHeight;
+		int32_t maxScroll = this->contentHeight - viewHeight;
+		if(maxScroll > 0) {
+			outY = this->listTop - 3 + (int32_t)(((float)(viewHeight + 5 - outH) * this->scrollOffset) / (float)maxScroll);
+		} else {
+			outY = this->listTop - 3;
+		}
+	}
+}
+
+void ControllerLayoutScreen::tick() {
+	if(this->capturingAction >= 0) {
+		Binding captured;
+		if(ControllerHandler::takeCaptured(captured)) {
+			int32_t action = this->capturingAction;
+			this->capturingAction = -1;
+			bool_t axisTarget = ControllerLayout::isAxisAction(action);
+			bool_t axisBinding = captured.source == BIND_AXIS_FULL;
+			if(axisTarget == axisBinding) {
+				for(int32_t i = 0; i < CA_COUNT; ++i) {
+					if(i == action) continue;
+					if(ControllerLayout::isAxisAction(i) != axisTarget) continue;
+					if(this->working[i].equals(captured)) {
+						this->working[i] = Binding();
+					}
+				}
+				this->working[action] = captured;
+			}
+		}
+	}
+	Screen::tick();
+}
+
+bool_t ControllerLayoutScreen::handleBackEvent(bool_t a2) {
+	if(!a2) {
+		if(this->capturingAction >= 0) {
+			this->capturingAction = -1;
+			ControllerHandler::endCapture();
+			return 1;
+		}
+		this->closeScreen();
+	}
+	return 1;
+}
+
+bool_t ControllerLayoutScreen::renderGameBehind() {
+	return 1;
+}
+
+void ControllerLayoutScreen::buttonClicked(Button* a2) {
+	if(!a2) return;
+	if(a2 == this->buttonSave) {
+		for(int32_t i = 0; i < CA_COUNT; ++i) {
+			ControllerLayout::set(i, this->working[i]);
+		}
+		ControllerLayout::save();
+		this->closeScreen();
+		return;
+	}
+	if(a2 == this->buttonReset) {
+		this->capturingAction = -1;
+		ControllerHandler::endCapture();
+		Binding backup[CA_COUNT];
+		for(int32_t i = 0; i < CA_COUNT; ++i) {
+			backup[i] = ControllerLayout::get(i);
+		}
+		ControllerLayout::resetToDefaults();
+		for(int32_t i = 0; i < CA_COUNT; ++i) {
+			this->working[i] = ControllerLayout::get(i);
+			ControllerLayout::set(i, backup[i]);
+		}
+		return;
+	}
+	if(a2 == this->buttonCancel) {
+		this->closeScreen();
+		return;
+	}
+}
+
+void ControllerLayoutScreen::mouseClicked(int32_t a2, int32_t a3, int32_t a4) {
+	if(a4 == 4 || a4 == 5) {
+		this->scrollTarget += (a4 == 4) ? -((float)_clsStride * 2.0f) : ((float)_clsStride * 2.0f);
+		this->clampScroll();
+		return;
+	}
+
+	if(a4 == 1) {
+		int32_t barY = this->listTop;
+		int32_t barH = 0;
+		this->calcBar(barY, barH);
+		if(a2 >= this->scrollBarX && a2 < this->scrollBarX + _clsScrollW && a3 >= barY && a3 < barY + barH) {
+			this->draggingBar = 1;
+			this->barGrabDY = a3 - barY;
+			Screen::mouseClicked(a2, a3, a4);
+			return;
+		}
+		int32_t idx = this->rowIndexAt(a2, a3);
+		if(idx >= 0) {
+			if(this->capturingAction == idx) {
+				this->capturingAction = -1;
+				ControllerHandler::endCapture();
+			} else {
+				this->capturingAction = idx;
+				ControllerHandler::beginCapture(ControllerLayout::isAxisAction(idx));
+			}
+		} else if(a3 >= this->listTop && a3 < this->listBottom && a2 >= this->contentLeft && a2 <= this->scrollBarX + _clsScrollW) {
+			this->isDragging = 1;
+			this->dragStartY = a3;
+			this->dragStartOffset = this->scrollOffset;
+			this->scrollTarget = this->scrollOffset;
+			this->dragVel = 0.0f;
+			this->lastDragMs = getTimeMs();
+		}
+	}
+
+	Screen::mouseClicked(a2, a3, a4);
+}
+
+void ControllerLayoutScreen::mouseReleased(int32_t a2, int32_t a3, int32_t a4) {
+	if(a4 == 1) {
+		this->draggingBar = 0;
+		if(this->isDragging) {
+			this->isDragging = 0;
+			this->scrollTarget = this->scrollOffset + this->dragVel * 140.0f;
+			this->dragVel = 0.0f;
+			this->clampScroll();
+		}
+	}
+	Screen::mouseReleased(a2, a3, a4);
+}
+
+void ControllerLayoutScreen::keyPressed(int32_t a2) {
+	if(this->capturingAction >= 0) {
+		if(a2 == 255 || a2 == this->minecraft->options.keyMenuCancel.keyCode) {
+			this->capturingAction = -1;
+			ControllerHandler::endCapture();
+		}
+		return;
+	}
+	Screen::keyPressed(a2);
+}
diff --git a/modifiedeight-newadditions/impl/gui/screens/OptionsScreen.cpp b/modifiedeight-newadditions/impl/gui/screens/OptionsScreen.cpp
index 70c5f145..d732aedc 100644
--- a/modifiedeight-newadditions/impl/gui/screens/OptionsScreen.cpp
+++ b/modifiedeight-newadditions/impl/gui/screens/OptionsScreen.cpp
@@ -11,6 +11,8 @@
 #include <util/IntRectangle.hpp>
 #include <cpputils.hpp>
 
+int32_t OptionsScreen::lastCategory = 0;
+
 OptionsScreen::OptionsScreen(bool_t a2) {
 	this->isInWorld = a2;
 	this->headerOptions = 0;
@@ -69,7 +71,7 @@ void OptionsScreen::generateOptionScreens(void) {
 
 	this->optionPanes[0]->createOptionsGroup("options.group.game")->addOptionItem(&Options::Option::NAME, this->minecraft)->addOptionItem(&Options::Option::DIFFICULTY, this->minecraft)->addOptionItem(&Options::Option::THIRD_PERSON, this->minecraft)->addOptionItem(&Options::Option::SERVER_VISIBLE, this->minecraft)->addOptionItem(&Options::Option::SHOW_COORDINATES, this->minecraft)->addOptionItem(&Options::Option::DEBUG_SCREEN, this->minecraft)->addOptionItem(&Options::Option::HUD_CAMERA_BUTTON, this->minecraft)->addOptionItem(&Options::Option::EXTENDED_INVENTORY, this->minecraft);
 	this->optionPanes[0]->createOptionsGroup("options.group.realms")->addLoginItem(this->minecraft);
-	this->optionPanes[1]->createOptionsGroup("options.group.input")->addOptionItem(&Options::Option::SENSITIVITY, this->minecraft)->addOptionItem(&Options::Option::INVERT_MOUSE, this->minecraft)->addOptionItem(&Options::Option::LEFT_HANDED, this->minecraft)->addOptionItem(&Options::Option::USE_TOUCHSCREEN, this->minecraft)->addOptionItem(&Options::Option::USE_TOUCH_JOYPAD, this->minecraft)->addOptionItem(&Options::Option::PIXELS_PER_MILLIMETER, this->minecraft)->addOptionItem(&Options::Option::SPRINT, this->minecraft)->addOptionItem(&Options::Option::AUTO_JUMP, this->minecraft)->addOptionItem(&Options::Option::SWAP_JUMP_AND_SNEAK, this->minecraft)->addOptionItem(&Options::Option::CONTROLLER_SUPPORT, this->minecraft);
+	this->optionPanes[1]->createOptionsGroup("options.group.input")->addOptionItem(&Options::Option::SENSITIVITY, this->minecraft)->addOptionItem(&Options::Option::INVERT_MOUSE, this->minecraft)->addOptionItem(&Options::Option::LEFT_HANDED, this->minecraft)->addOptionItem(&Options::Option::USE_TOUCHSCREEN, this->minecraft)->addOptionItem(&Options::Option::USE_TOUCH_JOYPAD, this->minecraft)->addOptionItem(&Options::Option::PIXELS_PER_MILLIMETER, this->minecraft)->addControllerLayoutItem(this->minecraft, this->isInWorld)->addOptionItem(&Options::Option::CONTROLLER_SENSITIVITY, this->minecraft)->addOptionItem(&Options::Option::CONTROLLER_CURSOR_SENSITIVITY, this->minecraft)->addOptionItem(&Options::Option::SPRINT, this->minecraft)->addOptionItem(&Options::Option::AUTO_JUMP, this->minecraft)->addOptionItem(&Options::Option::SWAP_JUMP_AND_SNEAK, this->minecraft);
 	if(this->minecraft->platform()->supportsVibration()) {
 		this->optionPanes[1]->createOptionsGroup("options.group.feedback")->addOptionItem(&Options::Option::DESTROY_VIBRATION, this->minecraft);
 	}
@@ -104,6 +106,7 @@ void OptionsScreen::selectCategory(int32_t a2) {
 	}
 	if(a2 < this->optionPanes.size()) {
 		this->selectedCategory = this->optionPanes[a2];
+		OptionsScreen::lastCategory = a2;
 	}
 }
 
@@ -219,7 +222,9 @@ void OptionsScreen::setupPositions() {
 			p->setupPositions();
 		}
 	}
-	this->selectCategory(0);
+	int32_t startCategory = OptionsScreen::lastCategory;
+	if(startCategory < 0 || startCategory >= (int32_t)this->optionPanes.size()) startCategory = 0;
+	this->selectCategory(startCategory);
 }
 bool_t OptionsScreen::handleBackEvent(bool_t a2) {
 	if(!a2) {
diff --git a/modifiedeight-newadditions/impl/gui/screens/PauseScreen.cpp b/modifiedeight-newadditions/impl/gui/screens/PauseScreen.cpp
index cd5394b3..293b2060 100644
--- a/modifiedeight-newadditions/impl/gui/screens/PauseScreen.cpp
+++ b/modifiedeight-newadditions/impl/gui/screens/PauseScreen.cpp
@@ -127,6 +127,12 @@ void PauseScreen::tick() {
 bool_t PauseScreen::renderGameBehind() {
 	return 1;
 }
+bool_t PauseScreen::handleBackEvent(bool_t a2) {
+	if(!a2) {
+		this->minecraft->setScreen(0);
+	}
+	return 1;
+}
 void PauseScreen::buttonClicked(Button* a2) {
 	if(a2->buttonID == this->backToGameButton->buttonID) {
 		this->minecraft->setScreen(0);
diff --git a/modifiedeight-newadditions/impl/input/ControllerHandler.cpp b/modifiedeight-newadditions/impl/input/ControllerHandler.cpp
new file mode 100644
index 00000000..340ed31d
--- /dev/null
+++ b/modifiedeight-newadditions/impl/input/ControllerHandler.cpp
@@ -0,0 +1,366 @@
+#include <input/ControllerHandler.hpp>
+#include <Minecraft.hpp>
+#include <Options.hpp>
+#include <entity/LocalPlayer.hpp>
+#include <entity/Player.hpp>
+#include <gui/Gui.hpp>
+#include <gui/Screen.hpp>
+#include <input/IMoveInput.hpp>
+#include <input/Keyboard.hpp>
+#include <input/Mouse.hpp>
+#include <inventory/Inventory.hpp>
+#include <math.h>
+#include <utils.h>
+
+bool_t ControllerHandler::captureMode = 0;
+bool_t ControllerHandler::captureWantsAxis = 0;
+bool_t ControllerHandler::hasCaptured = 0;
+Binding ControllerHandler::capturedBinding;
+float ControllerHandler::cursorX = -1.0f;
+float ControllerHandler::cursorY = -1.0f;
+int32_t ControllerHandler::scrollRepeat = 0;
+int32_t ControllerHandler::lastPadCursorMs = -100000;
+
+void ControllerHandler::hideCursor() {
+	ControllerHandler::lastPadCursorMs = -100000;
+}
+
+bool_t ControllerHandler::cursorVisible() {
+	if(!Gamepad::connected) return 0;
+	return (getTimeMs() - ControllerHandler::lastPadCursorMs) < 3000;
+}
+float ControllerHandler::moveX = 0.0f;
+float ControllerHandler::moveY = 0.0f;
+bool_t ControllerHandler::jumpHeld = 0;
+bool_t ControllerHandler::sneakHeld = 0;
+bool_t ControllerHandler::sprintHeld = 0;
+bool_t ControllerHandler::attackHeld = 0;
+bool_t ControllerHandler::useHeld = 0;
+bool_t ControllerHandler::confirmHeld = 0;
+float ControllerHandler::frameDt = 1.0f;
+double ControllerHandler::lastFrameS = 0;
+void ControllerHandler::clampVec(float& x, float& y) {
+	float mag2 = x * x + y * y;
+	if(mag2 > 1.0f) {
+		float inv = 1.0f / sqrtf(mag2);
+		x *= inv;
+		y *= inv;
+	}
+}
+int32_t ControllerHandler::lastPerspectiveMs = -100000;
+
+static bool_t _chButtonFree(int32_t button) {
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		Binding b = ControllerLayout::get(i);
+		if(b.source == BIND_BUTTON && b.code == button) return 0;
+	}
+	return 1;
+}
+
+void ControllerHandler::beginCapture(bool_t wantAxis) {
+	ControllerHandler::captureMode = 1;
+	ControllerHandler::captureWantsAxis = wantAxis;
+	ControllerHandler::hasCaptured = 0;
+	ControllerHandler::capturedBinding = Binding();
+}
+
+void ControllerHandler::endCapture() {
+	ControllerHandler::captureMode = 0;
+	ControllerHandler::hasCaptured = 0;
+	ControllerHandler::capturedBinding = Binding();
+}
+
+bool_t ControllerHandler::takeCaptured(Binding& out) {
+	if(!ControllerHandler::hasCaptured) return 0;
+	out = ControllerHandler::capturedBinding;
+	ControllerHandler::hasCaptured = 0;
+	ControllerHandler::captureMode = 0;
+	return 1;
+}
+
+bool_t ControllerHandler::isEnabled(Minecraft* mc) {
+	if(!mc) return 0;
+	if(!Gamepad::connected) return 0;
+	return 1;
+}
+
+void ControllerHandler::releaseAll() {
+	ControllerHandler::moveX = 0.0f;
+	ControllerHandler::moveY = 0.0f;
+	ControllerHandler::jumpHeld = 0;
+	ControllerHandler::sneakHeld = 0;
+	ControllerHandler::sprintHeld = 0;
+	ControllerHandler::scrollRepeat = 0;
+	if(ControllerHandler::attackHeld) {
+		ControllerHandler::attackHeld = 0;
+		if(Options::instance) {
+			Keyboard::feed(Options::instance->keyDestroy.keyCode, 0);
+		}
+	}
+	if(ControllerHandler::useHeld) {
+		ControllerHandler::useHeld = 0;
+		if(Options::instance) {
+			Keyboard::feed(Options::instance->keyUse.keyCode, 0);
+		}
+	}
+}
+
+void ControllerHandler::tick(Minecraft* mc) {
+	double nowS = getTimeS();
+	float dtMs = (float)((nowS - ControllerHandler::lastFrameS) * 1000.0);
+	if(ControllerHandler::lastFrameS == 0) dtMs = 17.0f;
+	if(dtMs < 0.1f) dtMs = 0.1f;
+	if(dtMs > 100.0f) dtMs = 100.0f;
+	ControllerHandler::lastFrameS = nowS;
+	ControllerHandler::frameDt += ((dtMs / 16.6667f) - ControllerHandler::frameDt) * 0.2f;
+	if(!ControllerHandler::isEnabled(mc)) {
+		ControllerHandler::releaseAll();
+		ControllerHandler::confirmHeld = 0;
+		Gamepad::beginFrame();
+		return;
+	}
+
+	if(ControllerHandler::captureMode) {
+		ControllerHandler::releaseAll();
+		ControllerHandler::confirmHeld = 0;
+		if(!ControllerHandler::hasCaptured) {
+			Binding found;
+			if(Gamepad::detectPressedBinding(found, ControllerHandler::captureWantsAxis)) {
+				ControllerHandler::capturedBinding = found;
+				ControllerHandler::hasCaptured = 1;
+			}
+		}
+		Gamepad::beginFrame();
+		return;
+	}
+
+	if(mc->player && !mc->currentScreen) {
+		ControllerHandler::tickGame(mc);
+	} else {
+		ControllerHandler::releaseAll();
+		if(mc->currentScreen) {
+			mc->field_D14 = 1;
+			ControllerHandler::tickMenu(mc);
+			mc->field_D14 = 0;
+			if(mc->field_D15) {
+				mc->setScreen(mc->field_D18);
+				mc->field_D18 = 0;
+				mc->field_D15 = 0;
+			}
+		} else {
+			ControllerHandler::confirmHeld = 0;
+		}
+	}
+
+	Gamepad::beginFrame();
+}
+
+void ControllerHandler::tickGame(Minecraft* mc) {
+	ControllerHandler::confirmHeld = 0;
+
+	float mx = Gamepad::getBindingValue(ControllerLayout::get(CA_MOVE_AXIS_X));
+	float my = Gamepad::getBindingValue(ControllerLayout::get(CA_MOVE_AXIS_Y));
+	ControllerHandler::moveX = mx;
+	ControllerHandler::moveY = my;
+
+	ControllerHandler::jumpHeld = Gamepad::isBindingDown(ControllerLayout::get(CA_JUMP));
+	ControllerHandler::sneakHeld = Gamepad::isBindingDown(ControllerLayout::get(CA_SNEAK));
+
+	static int32_t lastFwdTapMs = 0;
+	static bool_t fwdWasDown = 0;
+	static bool_t sprintLatch = 0;
+	bool_t fwdDown = my < -0.5f;
+	if(fwdDown && !fwdWasDown) {
+		int32_t nowMs = getTimeMs();
+		if(nowMs - lastFwdTapMs < 300) {
+			sprintLatch = 1;
+		}
+		lastFwdTapMs = nowMs;
+	}
+	if(!fwdDown) {
+		sprintLatch = 0;
+	}
+	fwdWasDown = fwdDown;
+	bool_t wantSprint = sprintLatch;
+	if(_chButtonFree(GP_BTN_L3) && Gamepad::isButtonDown(GP_BTN_L3)) {
+		wantSprint = 1;
+	}
+	ControllerHandler::sprintHeld = wantSprint;
+
+	float lx = Gamepad::getBindingValue(ControllerLayout::get(CA_LOOK_AXIS_X));
+	float ly = Gamepad::getBindingValue(ControllerLayout::get(CA_LOOK_AXIS_Y));
+	ControllerHandler::clampVec(lx, ly);
+	if(lx != 0.0f || ly != 0.0f) {
+		float sens = mc->options.controllerSensitivity * ControllerHandler::frameDt;
+		float turnX = lx * sens;
+		float turnY = ly * sens * (mc->options.invertMouse ? 1.0f : -1.0f);
+		mc->player->turn(turnX, turnY);
+	}
+
+	bool_t attack = Gamepad::isBindingDown(ControllerLayout::get(CA_ATTACK));
+	if(attack && !ControllerHandler::attackHeld) {
+		ControllerHandler::attackHeld = 1;
+		Keyboard::feed(mc->options.keyDestroy.keyCode, 1);
+	} else if(!attack && ControllerHandler::attackHeld) {
+		ControllerHandler::attackHeld = 0;
+		Keyboard::feed(mc->options.keyDestroy.keyCode, 0);
+	}
+
+	bool_t use = Gamepad::isBindingDown(ControllerLayout::get(CA_USE_ITEM));
+	if(use && !ControllerHandler::useHeld) {
+		ControllerHandler::useHeld = 1;
+		Keyboard::feed(mc->options.keyUse.keyCode, 1);
+	} else if(!use && ControllerHandler::useHeld) {
+		ControllerHandler::useHeld = 0;
+		Keyboard::feed(mc->options.keyUse.keyCode, 0);
+	}
+
+	int32_t numSlots = mc->gui.getNumSlots();
+	if(numSlots < 3) numSlots = 3;
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_CYCLE_LEFT))) {
+		int32_t slot = mc->player->inventory->selectedSlot - 1;
+		if(slot < 0) slot = numSlots - 2;
+		mc->player->inventory->selectSlot(slot);
+	}
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_CYCLE_RIGHT))) {
+		int32_t slot = mc->player->inventory->selectedSlot + 1;
+		if(slot >= numSlots - 1) slot = 0;
+		mc->player->inventory->selectSlot(slot);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_DROP_ITEM))) {
+		mc->player->inventory->dropSlot(mc->player->inventory->selectedSlot, 0, 0);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_CRAFTING))) {
+		mc->player->startCrafting((int32_t)mc->player->posX, (int32_t)mc->player->posY, (int32_t)mc->player->posZ, 0);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_INVENTORY))) {
+		mc->gui.handleKeyPressed(100);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_TOGGLE_PERSPECTIVE))) {
+		int32_t nowMs = getTimeMs();
+		if(nowMs - ControllerHandler::lastPerspectiveMs >= 350) {
+			ControllerHandler::lastPerspectiveMs = nowMs;
+			mc->options.toggle(&Options::Option::THIRD_PERSON, 1);
+		}
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_GAME_MENU))) {
+		mc->pauseGame(1);
+	} else if(_chButtonFree(GP_BTN_START) && Gamepad::wasButtonPressed(GP_BTN_START)) {
+		mc->pauseGame(1);
+	}
+}
+
+void ControllerHandler::tickMenu(Minecraft* mc) {
+	float sw = (float)mc->field_1C;
+	float sh = (float)mc->field_20;
+	if(sw < 1.0f) sw = 1.0f;
+	if(sh < 1.0f) sh = 1.0f;
+
+	if(ControllerHandler::cursorX < 0.0f || ControllerHandler::cursorX > sw ||
+	   ControllerHandler::cursorY < 0.0f || ControllerHandler::cursorY > sh) {
+		ControllerHandler::cursorX = sw * 0.5f;
+		ControllerHandler::cursorY = sh * 0.5f;
+	}
+
+	float mx = Gamepad::getBindingValue(ControllerLayout::get(CA_MOVE_AXIS_X));
+	float my = Gamepad::getBindingValue(ControllerLayout::get(CA_MOVE_AXIS_Y));
+	ControllerHandler::clampVec(mx, my);
+	float speed = sh * 0.02f * mc->options.controllerCursorSensitivity * ControllerHandler::frameDt;
+	if(speed < 0.0f) speed = 0.0f;
+
+	if(mx != 0.0f || my != 0.0f) {
+		ControllerHandler::cursorX += mx * speed;
+		ControllerHandler::cursorY += my * speed;
+		if(ControllerHandler::cursorX < 0.0f) ControllerHandler::cursorX = 0.0f;
+		if(ControllerHandler::cursorX > sw) ControllerHandler::cursorX = sw;
+		if(ControllerHandler::cursorY < 0.0f) ControllerHandler::cursorY = 0.0f;
+		if(ControllerHandler::cursorY > sh) ControllerHandler::cursorY = sh;
+		Mouse::feed(0, 0, (int16_t)ControllerHandler::cursorX, (int16_t)ControllerHandler::cursorY);
+		ControllerHandler::lastPadCursorMs = getTimeMs();
+	}
+
+	int16_t cx = (int16_t)ControllerHandler::cursorX;
+	int16_t cy = (int16_t)ControllerHandler::cursorY;
+
+	bool_t confirm = Gamepad::isBindingDown(ControllerLayout::get(CA_JUMP));
+	if(confirm && !ControllerHandler::confirmHeld) {
+		ControllerHandler::confirmHeld = 1;
+		ControllerHandler::lastPadCursorMs = getTimeMs();
+		Mouse::feed(1, 1, cx, cy);
+	} else if(!confirm && ControllerHandler::confirmHeld) {
+		ControllerHandler::confirmHeld = 0;
+		Mouse::feed(1, 0, cx, cy);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_SNEAK))) {
+		mc->handleBack(0);
+		return;
+	}
+
+	float scroll = Gamepad::getBindingValue(ControllerLayout::get(CA_LOOK_AXIS_Y));
+	bool_t up = Gamepad::isBindingDown(ControllerLayout::get(CA_CYCLE_LEFT)) || scroll < -0.4f;
+	bool_t down = Gamepad::isBindingDown(ControllerLayout::get(CA_CYCLE_RIGHT)) || scroll > 0.4f;
+	if(_chButtonFree(GP_BTN_DPAD_UP) && Gamepad::isButtonDown(GP_BTN_DPAD_UP)) up = 1;
+	if(_chButtonFree(GP_BTN_DPAD_DOWN) && Gamepad::isButtonDown(GP_BTN_DPAD_DOWN)) down = 1;
+
+	if(up || down) {
+		if(++ControllerHandler::scrollRepeat % 4 == 1) {
+			int32_t gx = cx;
+			int32_t gy = cy;
+			mc->currentScreen->toGUICoordinate(gx, gy);
+			mc->currentScreen->mouseClicked(gx, gy, up ? 4 : 5);
+		}
+	} else {
+		ControllerHandler::scrollRepeat = 0;
+	}
+}
+
+void ControllerHandler::applyMove(IMoveInput* input, Player* player) {
+	if(!input || !player) return;
+	if(!Gamepad::connected) return;
+	if(ControllerHandler::captureMode) return;
+
+	float mx = ControllerHandler::moveX;
+	float my = ControllerHandler::moveY;
+	bool_t flying = player->abilities.flying;
+
+	if(mx != 0.0f || my != 0.0f) {
+		float strafe = -mx;
+		float forward = -my;
+		if(ControllerHandler::sneakHeld && !flying) {
+			strafe = strafe * 0.3f;
+			forward = forward * 0.3f;
+		}
+		input->strafeInput = strafe;
+		input->forwardInput = forward;
+	}
+
+	if(ControllerHandler::jumpHeld) {
+		input->jumpingMaybe = 1;
+		if(flying) {
+			input->flyUpPressed = 1;
+		}
+	}
+
+	if(ControllerHandler::sneakHeld) {
+		if(flying) {
+			input->flyDownPressed = 1;
+			input->sneakingMaybe = 0;
+		} else {
+			input->sneakingMaybe = 1;
+		}
+	}
+
+	if(player->isLocalPlayer()) {
+		LocalPlayer* lp = (LocalPlayer*)player;
+		if(ControllerHandler::sprintHeld && input->forwardInput > 0.5f && !ControllerHandler::sneakHeld) {
+			lp->setSprinting(1);
+		}
+	}
+}
diff --git a/modifiedeight-newadditions/impl/input/ControllerLayout.cpp b/modifiedeight-newadditions/impl/input/ControllerLayout.cpp
new file mode 100644
index 00000000..74d2578c
--- /dev/null
+++ b/modifiedeight-newadditions/impl/input/ControllerLayout.cpp
@@ -0,0 +1,148 @@
+#include <input/ControllerLayout.hpp>
+#include <stdio.h>
+#include <string.h>
+
+Binding ControllerLayout::bindings[CA_COUNT];
+std::string ControllerLayout::filePath = "";
+bool_t ControllerLayout::loaded = 0;
+
+static const char_t* _caNames[CA_COUNT] = {
+	"Jump/Fly Up",
+	"Drop Item",
+	"Attack/Destroy",
+	"Use Item/Place Block",
+	"Crafting",
+	"Inventory",
+	"Cycle Item Left",
+	"Cycle Item Right",
+	"Toggle Perspective",
+	"Sneak/Fly Down",
+	"Game Menu",
+	"Move Left/Right",
+	"Move Forward/Back",
+	"Look Left/Right",
+	"Look Up/Down"
+};
+
+static const char_t* _caKeys[CA_COUNT] = {
+	"jump",
+	"drop",
+	"attack",
+	"use",
+	"crafting",
+	"inventory",
+	"cycleleft",
+	"cycleright",
+	"perspective",
+	"sneak",
+	"gamemenu",
+	"movex",
+	"movey",
+	"lookx",
+	"looky"
+};
+
+void ControllerLayout::init(const std::string& a1) {
+	ControllerLayout::filePath = a1 + "/controller_layout.txt";
+	ControllerLayout::resetToDefaults();
+	ControllerLayout::load();
+}
+
+void ControllerLayout::resetToDefaults() {
+	ControllerLayout::bindings[CA_JUMP] = Binding(BIND_BUTTON, GP_BTN_A);
+	ControllerLayout::bindings[CA_DROP_ITEM] = Binding(BIND_BUTTON, GP_BTN_R3);
+	ControllerLayout::bindings[CA_ATTACK] = Binding(BIND_AXIS_POSITIVE, GP_AXIS_RT);
+	ControllerLayout::bindings[CA_USE_ITEM] = Binding(BIND_AXIS_POSITIVE, GP_AXIS_LT);
+	ControllerLayout::bindings[CA_CRAFTING] = Binding(BIND_BUTTON, GP_BTN_X);
+	ControllerLayout::bindings[CA_INVENTORY] = Binding(BIND_BUTTON, GP_BTN_Y);
+	ControllerLayout::bindings[CA_CYCLE_LEFT] = Binding(BIND_BUTTON, GP_BTN_LB);
+	ControllerLayout::bindings[CA_CYCLE_RIGHT] = Binding(BIND_BUTTON, GP_BTN_RB);
+	ControllerLayout::bindings[CA_TOGGLE_PERSPECTIVE] = Binding(BIND_BUTTON, GP_BTN_DPAD_DOWN);
+	ControllerLayout::bindings[CA_SNEAK] = Binding(BIND_BUTTON, GP_BTN_B);
+	ControllerLayout::bindings[CA_MOVE_AXIS_X] = Binding(BIND_AXIS_FULL, GP_AXIS_LX);
+	ControllerLayout::bindings[CA_MOVE_AXIS_Y] = Binding(BIND_AXIS_FULL, GP_AXIS_LY);
+	ControllerLayout::bindings[CA_LOOK_AXIS_X] = Binding(BIND_AXIS_FULL, GP_AXIS_RX);
+	ControllerLayout::bindings[CA_LOOK_AXIS_Y] = Binding(BIND_AXIS_FULL, GP_AXIS_RY);
+	ControllerLayout::bindings[CA_GAME_MENU] = Binding(BIND_BUTTON, GP_BTN_START);
+}
+
+void ControllerLayout::load() {
+	if(ControllerLayout::filePath.empty()) return;
+	FILE* f = fopen(ControllerLayout::filePath.c_str(), "r");
+	if(!f) {
+		ControllerLayout::loaded = 1;
+		return;
+	}
+	char_t line[128];
+	while(fgets(line, sizeof(line), f)) {
+		size_t len = strlen(line);
+		while(len > 0 && (line[len - 1] == '\n' || line[len - 1] == '\r' || line[len - 1] == ' ' || line[len - 1] == '\t')) {
+			line[--len] = 0;
+		}
+		if(len < 3) continue;
+		std::string s = line;
+		size_t sep = s.find(':');
+		if(sep == std::string::npos) continue;
+		std::string key = s.substr(0, sep);
+		std::string val = s.substr(sep + 1);
+		for(int32_t i = 0; i < CA_COUNT; ++i) {
+			if(key == _caKeys[i]) {
+				ControllerLayout::bindings[i] = Binding::parse(val);
+				break;
+			}
+		}
+	}
+	fclose(f);
+	ControllerLayout::loaded = 1;
+}
+
+void ControllerLayout::save() {
+	if(ControllerLayout::filePath.empty()) return;
+	FILE* f = fopen(ControllerLayout::filePath.c_str(), "w");
+	if(!f) return;
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		fprintf(f, "%s:%s\n", _caKeys[i], ControllerLayout::bindings[i].serialize().c_str());
+	}
+	fclose(f);
+}
+
+Binding ControllerLayout::get(int32_t a1) {
+	if(a1 < 0 || a1 >= CA_COUNT) return Binding();
+	return ControllerLayout::bindings[a1];
+}
+
+void ControllerLayout::set(int32_t a1, const Binding& a2) {
+	if(a1 < 0 || a1 >= CA_COUNT) return;
+	ControllerLayout::bindings[a1] = a2;
+}
+
+void ControllerLayout::clearConflicts(int32_t a1, const Binding& a2) {
+	if(!a2.isSet()) return;
+	bool_t axisTarget = ControllerLayout::isAxisAction(a1);
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		if(i == a1) continue;
+		if(ControllerLayout::isAxisAction(i) != axisTarget) continue;
+		if(ControllerLayout::bindings[i].equals(a2)) {
+			ControllerLayout::bindings[i] = Binding();
+		}
+	}
+}
+
+bool_t ControllerLayout::isAxisAction(int32_t a1) {
+	return a1 >= CA_MOVE_AXIS_X && a1 <= CA_LOOK_AXIS_Y;
+}
+
+const char_t* ControllerLayout::actionName(int32_t a1) {
+	if(a1 < 0 || a1 >= CA_COUNT) return "";
+	return _caNames[a1];
+}
+
+const char_t* ControllerLayout::actionKey(int32_t a1) {
+	if(a1 < 0 || a1 >= CA_COUNT) return "";
+	return _caKeys[a1];
+}
+
+std::string ControllerLayout::describe(int32_t a1) {
+	if(a1 < 0 || a1 >= CA_COUNT) return "Unbound";
+	return ControllerLayout::bindings[a1].describe();
+}
diff --git a/modifiedeight-newadditions/impl/input/Gamepad.cpp b/modifiedeight-newadditions/impl/input/Gamepad.cpp
new file mode 100644
index 00000000..44723600
--- /dev/null
+++ b/modifiedeight-newadditions/impl/input/Gamepad.cpp
@@ -0,0 +1,412 @@
+#include <input/Gamepad.hpp>
+#include <stdio.h>
+#include <stdlib.h>
+
+bool_t Gamepad::connected = 0;
+bool_t Gamepad::buttons[GP_BTN_COUNT];
+bool_t Gamepad::pressLatch[GP_BTN_COUNT];
+bool_t Gamepad::releaseLatch[GP_BTN_COUNT];
+float Gamepad::axes[GP_AXIS_COUNT];
+float Gamepad::prevAxes[GP_AXIS_COUNT];
+int32_t Gamepad::buttonRaw[GP_BTN_COUNT];
+int32_t Gamepad::axisRaw[GP_AXIS_COUNT];
+float Gamepad::deadzone = 0.18f;
+float Gamepad::triggerThreshold = 0.35f;
+
+static const char_t* _gpButtonNames[GP_BTN_COUNT] = {
+	"A", "B", "X", "Y",
+	"LB", "RB", "Back", "Start",
+	"L3", "R3", "LT", "RT",
+	"D-Pad Up", "D-Pad Down", "D-Pad Left", "D-Pad Right",
+	"Mode", "C", "Z",
+	"Button 19", "Button 20", "Button 21", "Button 22", "Button 23"
+};
+
+static const char_t* _gpAxisNames[GP_AXIS_COUNT] = {
+	"Left Stick X", "Left Stick Y",
+	"Right Stick X", "Right Stick Y",
+	"Left Trigger", "Right Trigger"
+};
+
+Binding::Binding() {
+	this->source = BIND_NONE;
+	this->code = 0;
+	this->raw = -1;
+}
+
+Binding::Binding(int32_t a2, int32_t a3) {
+	this->source = a2;
+	this->code = a3;
+	this->raw = -1;
+}
+
+bool_t Binding::isSet() const {
+	return this->source != BIND_NONE;
+}
+
+bool_t Binding::equals(const Binding& a2) const {
+	return this->source == a2.source && this->code == a2.code;
+}
+
+std::string Binding::describe() const {
+	char_t buf[32];
+	switch(this->source) {
+		case BIND_BUTTON:
+			if(this->code == GP_BTN_LT) {
+				return "Trigger 0";
+			}
+			if(this->code == GP_BTN_RT) {
+				return "Trigger 1";
+			}
+			sprintf(buf, "Button %d", this->raw >= 0 ? this->raw : this->code);
+			return buf;
+		case BIND_AXIS_POSITIVE:
+		case BIND_AXIS_NEGATIVE:
+			if(this->code == GP_AXIS_LT) {
+				return "Trigger 0";
+			}
+			if(this->code == GP_AXIS_RT) {
+				return "Trigger 1";
+			}
+			sprintf(buf, "Axis %d %c", this->code, this->source == BIND_AXIS_POSITIVE ? '+' : '-');
+			return buf;
+		case BIND_AXIS_FULL:
+			if(this->code == GP_AXIS_LT) {
+				return "Trigger 0";
+			}
+			if(this->code == GP_AXIS_RT) {
+				return "Trigger 1";
+			}
+			sprintf(buf, "Axis %d", this->code);
+			return buf;
+		default:
+			return "Unbound";
+	}
+}
+
+std::string Binding::serialize() const {
+	char_t buf[32];
+	if(this->raw >= 0) {
+		sprintf(buf, "%d/%d/%d", this->source, this->code, this->raw);
+	} else {
+		sprintf(buf, "%d/%d", this->source, this->code);
+	}
+	return buf;
+}
+
+Binding Binding::parse(const std::string& a1) {
+	Binding res;
+	if(a1.empty()) return res;
+	size_t sep = a1.find('/');
+	if(sep == std::string::npos) return res;
+	int32_t src = atoi(a1.substr(0, sep).c_str());
+	std::string rest = a1.substr(sep + 1);
+	int32_t code = atoi(rest.c_str());
+	int32_t raw = -1;
+	size_t sep2 = rest.find('/');
+	if(sep2 != std::string::npos) {
+		raw = atoi(rest.substr(sep2 + 1).c_str());
+	}
+	if(src <= BIND_NONE || src > BIND_AXIS_FULL) return res;
+	if(src == BIND_BUTTON) {
+		if(code < 0 || code >= GP_BTN_COUNT) return res;
+	} else {
+		if(code < 0 || code >= GP_AXIS_COUNT) return res;
+	}
+	res.source = src;
+	res.code = code;
+	res.raw = raw;
+	return res;
+}
+
+void Gamepad::reset() {
+	for(int32_t i = 0; i < GP_BTN_COUNT; ++i) {
+		Gamepad::buttons[i] = 0;
+		Gamepad::pressLatch[i] = 0;
+		Gamepad::releaseLatch[i] = 0;
+		Gamepad::buttonRaw[i] = -1;
+	}
+	for(int32_t i = 0; i < GP_AXIS_COUNT; ++i) {
+		Gamepad::axes[i] = 0.0f;
+		Gamepad::prevAxes[i] = 0.0f;
+		Gamepad::axisRaw[i] = -1;
+	}
+}
+
+void Gamepad::beginFrame() {
+	for(int32_t i = 0; i < GP_BTN_COUNT; ++i) {
+		Gamepad::pressLatch[i] = 0;
+		Gamepad::releaseLatch[i] = 0;
+	}
+	for(int32_t i = 0; i < GP_AXIS_COUNT; ++i) {
+		Gamepad::prevAxes[i] = Gamepad::axes[i];
+	}
+}
+
+void Gamepad::setConnected(bool_t a1) {
+	if(!a1 && Gamepad::connected) {
+		Gamepad::reset();
+	}
+	Gamepad::connected = a1;
+}
+
+void Gamepad::feedButton(int32_t a1, bool_t a2, int32_t raw) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return;
+	bool_t down = a2 ? 1 : 0;
+	if(down && !Gamepad::buttons[a1]) {
+		Gamepad::pressLatch[a1] = 1;
+	} else if(!down && Gamepad::buttons[a1]) {
+		Gamepad::releaseLatch[a1] = 1;
+	}
+	Gamepad::buttons[a1] = down;
+	if(raw >= 0) {
+		Gamepad::buttonRaw[a1] = raw;
+	}
+}
+
+void Gamepad::feedAxis(int32_t a1, float a2, int32_t raw) {
+	if(a1 < 0 || a1 >= GP_AXIS_COUNT) return;
+	if(a2 > 1.0f) a2 = 1.0f;
+	if(a2 < -1.0f) a2 = -1.0f;
+	Gamepad::axes[a1] = a2;
+	if(raw >= 0) {
+		Gamepad::axisRaw[a1] = raw;
+	}
+}
+
+void Gamepad::feedHat(bool_t up, bool_t down, bool_t left, bool_t right) {
+	Gamepad::feedButton(GP_BTN_DPAD_UP, up);
+	Gamepad::feedButton(GP_BTN_DPAD_DOWN, down);
+	Gamepad::feedButton(GP_BTN_DPAD_LEFT, left);
+	Gamepad::feedButton(GP_BTN_DPAD_RIGHT, right);
+}
+
+void Gamepad::syncDerivedButtons() {
+	if(Gamepad::axes[GP_AXIS_LT] > Gamepad::triggerThreshold) {
+		Gamepad::feedButton(GP_BTN_LT, 1);
+	} else if(Gamepad::axes[GP_AXIS_LT] < Gamepad::triggerThreshold * 0.5f) {
+		Gamepad::feedButton(GP_BTN_LT, 0);
+	}
+	if(Gamepad::axes[GP_AXIS_RT] > Gamepad::triggerThreshold) {
+		Gamepad::feedButton(GP_BTN_RT, 1);
+	} else if(Gamepad::axes[GP_AXIS_RT] < Gamepad::triggerThreshold * 0.5f) {
+		Gamepad::feedButton(GP_BTN_RT, 0);
+	}
+}
+
+int32_t Gamepad::mapRawButton(int32_t keyCode, int32_t fallbackIndex) {
+	switch(keyCode) {
+		case 96: return GP_BTN_A;
+		case 97: return GP_BTN_B;
+		case 98: return GP_BTN_C;
+		case 99: return GP_BTN_X;
+		case 100: return GP_BTN_Y;
+		case 101: return GP_BTN_Z;
+		case 102: return GP_BTN_LB;
+		case 103: return GP_BTN_RB;
+		case 104: return GP_BTN_LT;
+		case 105: return GP_BTN_RT;
+		case 106: return GP_BTN_L3;
+		case 107: return GP_BTN_R3;
+		case 108: return GP_BTN_START;
+		case 109: return GP_BTN_BACK;
+		case 110: return GP_BTN_MODE;
+		case 19: return GP_BTN_DPAD_UP;
+		case 20: return GP_BTN_DPAD_DOWN;
+		case 21: return GP_BTN_DPAD_LEFT;
+		case 22: return GP_BTN_DPAD_RIGHT;
+		case 23: return GP_BTN_A;
+		case 4: return GP_BTN_B;
+		case 82: return GP_BTN_START;
+		default:
+			if(keyCode >= 188 && keyCode <= 202) {
+				int32_t idx = GP_BTN_EXTRA_0 + (keyCode - 188);
+				if(idx < GP_BTN_COUNT) return idx;
+			}
+			return fallbackIndex;
+	}
+}
+
+int32_t Gamepad::mapSdlButton(int32_t index, int32_t numButtons, int32_t numAxes) {
+	if(index < 0) return -1;
+	if(numButtons >= 11 && numAxes >= 6) {
+		switch(index) {
+			case 8: return GP_BTN_MODE;
+			case 9: return GP_BTN_L3;
+			case 10: return GP_BTN_R3;
+			default: break;
+		}
+	}
+	if(index >= GP_BTN_COUNT) return -1;
+	return index;
+}
+
+float Gamepad::applyDeadzone(float a1) {
+	float mag = a1 < 0.0f ? -a1 : a1;
+	if(mag < Gamepad::deadzone) return 0.0f;
+	float scaled = (mag - Gamepad::deadzone) / (1.0f - Gamepad::deadzone);
+	if(scaled > 1.0f) scaled = 1.0f;
+	return a1 < 0.0f ? -scaled : scaled;
+}
+
+bool_t Gamepad::isButtonDown(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return 0;
+	return Gamepad::buttons[a1];
+}
+
+bool_t Gamepad::wasButtonPressed(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return 0;
+	return Gamepad::pressLatch[a1];
+}
+
+bool_t Gamepad::wasButtonReleased(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return 0;
+	return Gamepad::releaseLatch[a1];
+}
+
+float Gamepad::getAxis(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_AXIS_COUNT) return 0.0f;
+	return Gamepad::applyDeadzone(Gamepad::axes[a1]);
+}
+
+float Gamepad::getPrevAxis(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_AXIS_COUNT) return 0.0f;
+	return Gamepad::applyDeadzone(Gamepad::prevAxes[a1]);
+}
+
+bool_t Gamepad::isBindingDown(const Binding& a1) {
+	switch(a1.source) {
+		case BIND_BUTTON:
+			return Gamepad::isButtonDown(a1.code);
+		case BIND_AXIS_POSITIVE:
+			return Gamepad::getAxis(a1.code) > Gamepad::triggerThreshold;
+		case BIND_AXIS_NEGATIVE:
+			return Gamepad::getAxis(a1.code) < -Gamepad::triggerThreshold;
+		case BIND_AXIS_FULL:
+			{
+				float v = Gamepad::getAxis(a1.code);
+				return (v > Gamepad::triggerThreshold) || (v < -Gamepad::triggerThreshold);
+			}
+		default:
+			return 0;
+	}
+}
+
+static bool_t _axisWasDown(int32_t source, int32_t code) {
+	float v = Gamepad::getPrevAxis(code);
+	switch(source) {
+		case BIND_AXIS_POSITIVE:
+			return v > Gamepad::triggerThreshold;
+		case BIND_AXIS_NEGATIVE:
+			return v < -Gamepad::triggerThreshold;
+		case BIND_AXIS_FULL:
+			return (v > Gamepad::triggerThreshold) || (v < -Gamepad::triggerThreshold);
+		default:
+			return 0;
+	}
+}
+
+bool_t Gamepad::wasBindingPressed(const Binding& a1) {
+	if(a1.source == BIND_BUTTON) {
+		return Gamepad::wasButtonPressed(a1.code);
+	}
+	if(a1.source == BIND_NONE) {
+		return 0;
+	}
+	if(a1.code == GP_AXIS_LT) {
+		return Gamepad::wasButtonPressed(GP_BTN_LT);
+	}
+	if(a1.code == GP_AXIS_RT) {
+		return Gamepad::wasButtonPressed(GP_BTN_RT);
+	}
+	return Gamepad::isBindingDown(a1) && !_axisWasDown(a1.source, a1.code);
+}
+
+bool_t Gamepad::wasBindingReleased(const Binding& a1) {
+	if(a1.source == BIND_BUTTON) {
+		return Gamepad::wasButtonReleased(a1.code);
+	}
+	if(a1.source == BIND_NONE) {
+		return 0;
+	}
+	if(a1.code == GP_AXIS_LT) {
+		return Gamepad::wasButtonReleased(GP_BTN_LT);
+	}
+	if(a1.code == GP_AXIS_RT) {
+		return Gamepad::wasButtonReleased(GP_BTN_RT);
+	}
+	return !Gamepad::isBindingDown(a1) && _axisWasDown(a1.source, a1.code);
+}
+
+float Gamepad::getBindingValue(const Binding& a1) {
+	switch(a1.source) {
+		case BIND_BUTTON:
+			return Gamepad::isButtonDown(a1.code) ? 1.0f : 0.0f;
+		case BIND_AXIS_POSITIVE:
+			{
+				float v = Gamepad::getAxis(a1.code);
+				return v > 0.0f ? v : 0.0f;
+			}
+		case BIND_AXIS_NEGATIVE:
+			{
+				float v = Gamepad::getAxis(a1.code);
+				return v < 0.0f ? -v : 0.0f;
+			}
+		case BIND_AXIS_FULL:
+			return Gamepad::getAxis(a1.code);
+		default:
+			return 0.0f;
+	}
+}
+
+bool_t Gamepad::detectPressedBinding(Binding& out, bool_t wantAxis) {
+	if(wantAxis) {
+		for(int32_t i = 0; i < GP_AXIS_COUNT; ++i) {
+			if(i == GP_AXIS_LT || i == GP_AXIS_RT) continue;
+			float v = Gamepad::getAxis(i);
+			if(v > 0.6f || v < -0.6f) {
+				out.source = BIND_AXIS_FULL;
+				out.code = i;
+				out.raw = Gamepad::axisRaw[i];
+				return 1;
+			}
+		}
+		return 0;
+	}
+	for(int32_t i = 0; i < GP_BTN_COUNT; ++i) {
+		if(Gamepad::wasButtonPressed(i)) {
+			out.source = BIND_BUTTON;
+			out.code = i;
+			out.raw = Gamepad::buttonRaw[i];
+			return 1;
+		}
+	}
+	for(int32_t i = 0; i < GP_AXIS_COUNT; ++i) {
+		if(i == GP_AXIS_LT || i == GP_AXIS_RT) continue;
+		float v = Gamepad::getAxis(i);
+		float p = Gamepad::getPrevAxis(i);
+		if(v > 0.7f && p <= 0.7f) {
+			out.source = BIND_AXIS_POSITIVE;
+			out.code = i;
+			out.raw = Gamepad::axisRaw[i];
+			return 1;
+		}
+		if(v < -0.7f && p >= -0.7f) {
+			out.source = BIND_AXIS_NEGATIVE;
+			out.code = i;
+			out.raw = Gamepad::axisRaw[i];
+			return 1;
+		}
+	}
+	return 0;
+}
+
+const char_t* Gamepad::buttonName(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return "Unbound";
+	return _gpButtonNames[a1];
+}
+
+const char_t* Gamepad::axisName(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_AXIS_COUNT) return "Unbound";
+	return _gpAxisNames[a1];
+}
diff --git a/modifiedeight-newadditions/impl/input/KeyboardInput.cpp b/modifiedeight-newadditions/impl/input/KeyboardInput.cpp
index c4cb25ae..bb8a24a3 100644
--- a/modifiedeight-newadditions/impl/input/KeyboardInput.cpp
+++ b/modifiedeight-newadditions/impl/input/KeyboardInput.cpp
@@ -2,6 +2,7 @@
 #include <Options.hpp>
 #include <entity/Player.hpp>
 #include <entity/LocalPlayer.hpp>
+#include <input/ControllerHandler.hpp>
 
 KeyboardInput::KeyboardInput(Options* a2) {
 	this->strafeInput = 0;
@@ -68,6 +69,7 @@ void KeyboardInput::tick(Player* a2) {
 	if(this->inputs[6]) {
 		a2->startCrafting((int32_t)a2->posX, (int32_t)a2->posY, (int32_t)a2->posZ, 0);
 	}
+	ControllerHandler::applyMove(this, a2);
 }
 void KeyboardInput::setKey(int32_t a2, bool_t a3) {
 	Options* options; // r4
diff --git a/modifiedeight-newadditions/impl/input/TouchscreenInput.cpp b/modifiedeight-newadditions/impl/input/TouchscreenInput.cpp
index 4876cbaf..2fac0296 100644
--- a/modifiedeight-newadditions/impl/input/TouchscreenInput.cpp
+++ b/modifiedeight-newadditions/impl/input/TouchscreenInput.cpp
@@ -1,6 +1,7 @@
 #include <Config.hpp>
 #include <Minecraft.hpp>
 #include <entity/LocalPlayer.hpp>
+#include <input/ControllerHandler.hpp>
 #include <input/Multitouch.hpp>
 #include <input/TouchscreenInput.hpp>
 #include <math/Mth.hpp>
@@ -475,6 +476,7 @@ void TouchscreenInput::tick(Player *a2) {
       lp->setSprinting(false);
     }
   }
+  ControllerHandler::applyMove(this, a2);
 }
 void TouchscreenInput::render(float a2) {
   this->minecraft->texturesPtr->loadAndBindTexture("gui/gui.png");
diff --git a/modifiedeight-newadditions/impl/rendering/GameRenderer.cpp b/modifiedeight-newadditions/impl/rendering/GameRenderer.cpp
index 22b8f28f..8d09ec9d 100644
--- a/modifiedeight-newadditions/impl/rendering/GameRenderer.cpp
+++ b/modifiedeight-newadditions/impl/rendering/GameRenderer.cpp
@@ -3,6 +3,7 @@
 #include <entity/LocalPlayer.hpp>
 #include <entity/player/gamemode/GameMode.hpp>
 #include <gui/Screen.hpp>
+#include <input/ControllerHandler.hpp>
 #include <input/IInputHolder.hpp>
 #include <input/KeyboardInput.hpp>
 #include <input/Mouse.hpp>
@@ -640,6 +641,15 @@ void GameRenderer::render(float pt) {
 
 	if(this->minecraft->currentScreen) {
 		this->minecraft->currentScreen->render(mx, my, pt);
+		if(ControllerHandler::cursorVisible()) {
+			int32_t gx = (int32_t)(ControllerHandler::cursorX * Gui::InvGuiScale);
+			int32_t gy = (int32_t)(ControllerHandler::cursorY * Gui::InvGuiScale);
+			Screen* scr = this->minecraft->currentScreen;
+			scr->fill(gx - 5, gy - 1, gx + 6, gy + 2, 0xFF000000);
+			scr->fill(gx - 1, gy - 5, gx + 2, gy + 6, 0xFF000000);
+			scr->fill(gx - 4, gy, gx + 5, gy + 1, 0xFFFFFFFF);
+			scr->fill(gx, gy - 4, gx + 1, gy + 5, 0xFFFFFFFF);
+		}
 	}
 }
 void GameRenderer::renderItemInHand(float a2, int32_t a3) {
diff --git a/modifiedeight/CMakeLists.txt b/modifiedeight/CMakeLists.txt
index b1ced035..13ad2e96 100644
--- a/modifiedeight/CMakeLists.txt
+++ b/modifiedeight/CMakeLists.txt
@@ -98,6 +98,7 @@ elseif(MCPE_IOS)
         "-framework OpenGLES"
         "-framework OpenAL"
         "-framework AVFoundation"
+        "-framework GameController"
     )
     set_target_properties(modifiedeight PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build"
diff --git a/modifiedeight/headers/Options.hpp b/modifiedeight/headers/Options.hpp
index 838ff6b7..cf894900 100644
--- a/modifiedeight/headers/Options.hpp
+++ b/modifiedeight/headers/Options.hpp
@@ -16,6 +16,8 @@ struct Options{
 		static Options::Option FANCY_SKIES;
 		static Options::Option LEFT_HANDED;
 		static Options::Option SENSITIVITY;
+		static Options::Option CONTROLLER_SENSITIVITY;
+		static Options::Option CONTROLLER_CURSOR_SENSITIVITY;
 		static Options::Option INVERT_MOUSE;
 		static Options::Option THIRD_PERSON;
 		static Options::Option VIEW_BOBBING;
@@ -61,6 +63,8 @@ struct Options{
 	float musicVolume;
 	float soundVolume;
 	float sensitity;
+	float controllerSensitivity;
+	float controllerCursorSensitivity;
 	bool_t invertMouse;
 	char_t field_D;
 	char_t field_E;
diff --git a/modifiedeight/headers/gui/ControllerLayoutOption.hpp b/modifiedeight/headers/gui/ControllerLayoutOption.hpp
new file mode 100644
index 00000000..0cc62665
--- /dev/null
+++ b/modifiedeight/headers/gui/ControllerLayoutOption.hpp
@@ -0,0 +1,19 @@
+#pragma once
+#include <gui/GuiElementContainer.hpp>
+#include <memory>
+
+struct Button;
+struct ControllerLayoutOption: GuiElementContainer
+{
+	std::shared_ptr<Button> customizeButton;
+	Button* pressedButton;
+	bool_t isInWorld;
+
+	ControllerLayoutOption(Minecraft*, bool_t);
+
+	virtual ~ControllerLayoutOption();
+	virtual void render(Minecraft*, int32_t, int32_t);
+	virtual void setupPositions();
+	virtual void mouseClicked(Minecraft*, int32_t, int32_t, int32_t);
+	virtual void mouseReleased(Minecraft*, int32_t, int32_t, int32_t);
+};
diff --git a/modifiedeight/headers/gui/OptionsGroup.hpp b/modifiedeight/headers/gui/OptionsGroup.hpp
index cc7116ff..b630dbbc 100644
--- a/modifiedeight/headers/gui/OptionsGroup.hpp
+++ b/modifiedeight/headers/gui/OptionsGroup.hpp
@@ -8,6 +8,7 @@ struct OptionsGroup: GuiElementContainer
 
 	OptionsGroup(std::string);
 	void addLoginItem(Minecraft*);
+	OptionsGroup* addControllerLayoutItem(Minecraft*, bool_t);
 	void createTextBox(const Options::Option*, Minecraft*);
 
 	virtual ~OptionsGroup();
diff --git a/modifiedeight/headers/gui/buttons/SmallButton.hpp b/modifiedeight/headers/gui/buttons/SmallButton.hpp
index 2b62be04..000accc6 100644
--- a/modifiedeight/headers/gui/buttons/SmallButton.hpp
+++ b/modifiedeight/headers/gui/buttons/SmallButton.hpp
@@ -1,9 +1,6 @@
 #pragma once
 #include <gui/buttons/Button.hpp>
-struct Options
-{
-	struct Option;
-};
+#include <Options.hpp>
 
 
 struct SmallButton: Button
diff --git a/modifiedeight/headers/gui/screens/ControllerLayoutScreen.hpp b/modifiedeight/headers/gui/screens/ControllerLayoutScreen.hpp
new file mode 100644
index 00000000..b221f403
--- /dev/null
+++ b/modifiedeight/headers/gui/screens/ControllerLayoutScreen.hpp
@@ -0,0 +1,57 @@
+#pragma once
+#include <_types.h>
+#include <gui/Screen.hpp>
+#include <input/ControllerLayout.hpp>
+
+namespace Touch {
+	struct TButton;
+}
+struct NinePatchLayer;
+
+struct ControllerLayoutScreen: Screen
+{
+	Touch::TButton* buttonSave;
+	Touch::TButton* buttonReset;
+	Touch::TButton* buttonCancel;
+	NinePatchLayer* optBtn;
+	NinePatchLayer* playPressed;
+	NinePatchLayer* listBg;
+	NinePatchLayer* panelBg;
+
+	Binding working[CA_COUNT];
+	int32_t capturingAction;
+	float scrollOffset;
+	float scrollTarget;
+	int32_t contentHeight;
+	int32_t listTop, listBottom;
+	int32_t actionsColumnWidth, bindingsColumnWidth;
+	int32_t contentLeft, contentRight, scrollBarX;
+	int32_t dragStartY;
+	float dragStartOffset;
+	float dragVel;
+	int32_t lastDragMs;
+	bool_t isDragging;
+	bool_t draggingBar;
+	int32_t barGrabDY;
+	int32_t lastAnimMs;
+	bool_t isInWorld;
+
+	ControllerLayoutScreen(bool_t);
+
+	void closeScreen();
+	void clampScroll();
+	void calcBar(int32_t&, int32_t&);
+	int32_t rowIndexAt(int32_t, int32_t);
+
+	virtual ~ControllerLayoutScreen();
+	virtual void init();
+	virtual void setupPositions();
+	virtual void render(int32_t, int32_t, float);
+	virtual void tick();
+	virtual bool_t handleBackEvent(bool_t);
+	virtual bool_t renderGameBehind();
+	virtual void buttonClicked(Button*);
+	virtual void mouseClicked(int32_t, int32_t, int32_t);
+	virtual void mouseReleased(int32_t, int32_t, int32_t);
+	virtual void keyPressed(int32_t);
+};
diff --git a/modifiedeight/headers/gui/screens/OptionsScreen.hpp b/modifiedeight/headers/gui/screens/OptionsScreen.hpp
index 0789ec09..29480d96 100644
--- a/modifiedeight/headers/gui/screens/OptionsScreen.hpp
+++ b/modifiedeight/headers/gui/screens/OptionsScreen.hpp
@@ -10,6 +10,8 @@ struct NinePatchLayer;
 struct ImageButton;
 struct OptionsScreen: Screen
 {
+	static int32_t lastCategory;
+
 	Touch::THeader* headerOptions;
 	Touch::TButton* buttonBack;
 	ImageButton* field_5C;
diff --git a/modifiedeight/headers/gui/screens/PauseScreen.hpp b/modifiedeight/headers/gui/screens/PauseScreen.hpp
index 36605144..b46066e9 100644
--- a/modifiedeight/headers/gui/screens/PauseScreen.hpp
+++ b/modifiedeight/headers/gui/screens/PauseScreen.hpp
@@ -29,5 +29,6 @@ struct PauseScreen: Screen
 	virtual void setupPositions();
 	virtual void tick();
 	virtual bool_t renderGameBehind();
+	virtual bool_t handleBackEvent(bool_t);
 	virtual void buttonClicked(Button*);
 };
diff --git a/modifiedeight/headers/input/ControllerHandler.hpp b/modifiedeight/headers/input/ControllerHandler.hpp
new file mode 100644
index 00000000..d45e38cf
--- /dev/null
+++ b/modifiedeight/headers/input/ControllerHandler.hpp
@@ -0,0 +1,38 @@
+#pragma once
+#include <_types.h>
+#include <input/ControllerLayout.hpp>
+
+struct Minecraft;
+struct IMoveInput;
+struct Player;
+
+struct ControllerHandler {
+	static bool_t captureMode;
+	static bool_t captureWantsAxis;
+	static bool_t hasCaptured;
+	static Binding capturedBinding;
+	static float cursorX, cursorY;
+	static int32_t scrollRepeat;
+	static int32_t lastPadCursorMs;
+
+	static void hideCursor();
+	static bool_t cursorVisible();
+	static float moveX, moveY;
+	static float frameDt;
+	static double lastFrameS;
+	static void clampVec(float&, float&);
+	static int32_t lastPerspectiveMs;
+	static bool_t jumpHeld, sneakHeld, sprintHeld;
+	static bool_t attackHeld, useHeld, confirmHeld;
+
+	static void beginCapture(bool_t);
+	static void endCapture();
+	static bool_t takeCaptured(Binding&);
+
+	static void tick(Minecraft*);
+	static void tickGame(Minecraft*);
+	static void tickMenu(Minecraft*);
+	static void applyMove(IMoveInput*, Player*);
+	static void releaseAll();
+	static bool_t isEnabled(Minecraft*);
+};
diff --git a/modifiedeight/headers/input/ControllerLayout.hpp b/modifiedeight/headers/input/ControllerLayout.hpp
new file mode 100644
index 00000000..7a965ea8
--- /dev/null
+++ b/modifiedeight/headers/input/ControllerLayout.hpp
@@ -0,0 +1,42 @@
+#pragma once
+#include <_types.h>
+#include <input/Gamepad.hpp>
+#include <string>
+
+enum ControllerAction {
+	CA_JUMP = 0,
+	CA_DROP_ITEM = 1,
+	CA_ATTACK = 2,
+	CA_USE_ITEM = 3,
+	CA_CRAFTING = 4,
+	CA_INVENTORY = 5,
+	CA_CYCLE_LEFT = 6,
+	CA_CYCLE_RIGHT = 7,
+	CA_TOGGLE_PERSPECTIVE = 8,
+	CA_SNEAK = 9,
+	CA_GAME_MENU = 10,
+	CA_MOVE_AXIS_X = 11,
+	CA_MOVE_AXIS_Y = 12,
+	CA_LOOK_AXIS_X = 13,
+	CA_LOOK_AXIS_Y = 14,
+	CA_COUNT = 15
+};
+
+struct ControllerLayout {
+	static Binding bindings[CA_COUNT];
+	static std::string filePath;
+	static bool_t loaded;
+
+	static void init(const std::string&);
+	static void resetToDefaults();
+	static void load();
+	static void save();
+
+	static Binding get(int32_t);
+	static void set(int32_t, const Binding&);
+	static void clearConflicts(int32_t, const Binding&);
+	static bool_t isAxisAction(int32_t);
+	static const char_t* actionName(int32_t);
+	static const char_t* actionKey(int32_t);
+	static std::string describe(int32_t);
+};
diff --git a/modifiedeight/headers/input/Gamepad.hpp b/modifiedeight/headers/input/Gamepad.hpp
new file mode 100644
index 00000000..6c362d05
--- /dev/null
+++ b/modifiedeight/headers/input/Gamepad.hpp
@@ -0,0 +1,101 @@
+#pragma once
+#include <_types.h>
+#include <string>
+
+enum GamepadButton {
+	GP_BTN_A = 0,
+	GP_BTN_B = 1,
+	GP_BTN_X = 2,
+	GP_BTN_Y = 3,
+	GP_BTN_LB = 4,
+	GP_BTN_RB = 5,
+	GP_BTN_BACK = 6,
+	GP_BTN_START = 7,
+	GP_BTN_L3 = 8,
+	GP_BTN_R3 = 9,
+	GP_BTN_LT = 10,
+	GP_BTN_RT = 11,
+	GP_BTN_DPAD_UP = 12,
+	GP_BTN_DPAD_DOWN = 13,
+	GP_BTN_DPAD_LEFT = 14,
+	GP_BTN_DPAD_RIGHT = 15,
+	GP_BTN_MODE = 16,
+	GP_BTN_C = 17,
+	GP_BTN_Z = 18,
+	GP_BTN_EXTRA_0 = 19,
+	GP_BTN_EXTRA_1 = 20,
+	GP_BTN_EXTRA_2 = 21,
+	GP_BTN_EXTRA_3 = 22,
+	GP_BTN_EXTRA_4 = 23,
+	GP_BTN_COUNT = 24
+};
+
+enum GamepadAxis {
+	GP_AXIS_LX = 0,
+	GP_AXIS_LY = 1,
+	GP_AXIS_RX = 2,
+	GP_AXIS_RY = 3,
+	GP_AXIS_LT = 4,
+	GP_AXIS_RT = 5,
+	GP_AXIS_COUNT = 6
+};
+
+enum BindingSource {
+	BIND_NONE = 0,
+	BIND_BUTTON = 1,
+	BIND_AXIS_POSITIVE = 2,
+	BIND_AXIS_NEGATIVE = 3,
+	BIND_AXIS_FULL = 4
+};
+
+struct Binding {
+	int32_t source;
+	int32_t code;
+	int32_t raw;
+
+	Binding();
+	Binding(int32_t, int32_t);
+	bool_t isSet() const;
+	bool_t equals(const Binding&) const;
+	std::string describe() const;
+	std::string serialize() const;
+	static Binding parse(const std::string&);
+};
+
+struct Gamepad {
+	static bool_t connected;
+	static bool_t buttons[GP_BTN_COUNT];
+	static bool_t pressLatch[GP_BTN_COUNT];
+	static bool_t releaseLatch[GP_BTN_COUNT];
+	static float axes[GP_AXIS_COUNT];
+	static float prevAxes[GP_AXIS_COUNT];
+	static int32_t buttonRaw[GP_BTN_COUNT];
+	static int32_t axisRaw[GP_AXIS_COUNT];
+	static float deadzone;
+	static float triggerThreshold;
+
+	static void reset();
+	static void beginFrame();
+	static void setConnected(bool_t);
+	static void feedButton(int32_t, bool_t, int32_t raw = -1);
+	static void feedAxis(int32_t, float, int32_t raw = -1);
+	static void feedHat(bool_t, bool_t, bool_t, bool_t);
+	static void syncDerivedButtons();
+	static int32_t mapRawButton(int32_t, int32_t);
+	static int32_t mapSdlButton(int32_t, int32_t, int32_t);
+
+	static float applyDeadzone(float);
+	static bool_t isButtonDown(int32_t);
+	static bool_t wasButtonPressed(int32_t);
+	static bool_t wasButtonReleased(int32_t);
+	static float getAxis(int32_t);
+	static float getPrevAxis(int32_t);
+
+	static bool_t isBindingDown(const Binding&);
+	static bool_t wasBindingPressed(const Binding&);
+	static bool_t wasBindingReleased(const Binding&);
+	static float getBindingValue(const Binding&);
+	static bool_t detectPressedBinding(Binding&, bool_t);
+	static const char_t* buttonName(int32_t);
+	static const char_t* axisName(int32_t);
+};
diff --git a/modifiedeight/impl/AppPlatform_sdl.cpp b/modifiedeight/impl/AppPlatform_sdl.cpp
index ff1cfa06..387a059d 100644
--- a/modifiedeight/impl/AppPlatform_sdl.cpp
+++ b/modifiedeight/impl/AppPlatform_sdl.cpp
@@ -5,6 +5,9 @@
 #include <_AssetFile.hpp>
 #include <cmath>
 #include <entity/LocalPlayer.hpp>
+#include <input/ControllerHandler.hpp>
+#include <input/ControllerLayout.hpp>
+#include <input/Gamepad.hpp>
 #include <gui/Screen.hpp>
 #include <input/Keyboard.hpp>
 #include <input/KeyboardInput.hpp>
@@ -219,6 +222,8 @@ bool_t AppPlatform_sdl::sdlCtxInit() {
   SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
   SDL_EnableUNICODE(1);
+  SDL_InitSubSystem(SDL_INIT_JOYSTICK);
+  SDL_JoystickEventState(SDL_ENABLE);
   this->sdl_surface = this->setSDLVideoMode();
   if (!this->sdl_surface) {
     return 0;
@@ -565,6 +570,9 @@ void AppPlatform_sdl::init() {
           break;
         _mx = appPlatform.sdl_event.motion.x;
         _my = appPlatform.sdl_event.motion.y;
+        if (appPlatform.sdl_event.motion.xrel != 0 || appPlatform.sdl_event.motion.yrel != 0) {
+          ControllerHandler::hideCursor();
+        }
         Mouse::feed(0, 0, _mx, _my, appPlatform.sdl_event.motion.xrel,
                     appPlatform.sdl_event.motion.yrel);
         break;
@@ -662,9 +670,18 @@ void AppPlatform_sdl::init() {
 
     static SDL_Joystick *s_gameControllers[8] = {nullptr};
     static int s_numOpenedControllers = 0;
+    static bool s_wasConnected = false;
     int curNumJoysticks = SDL_NumJoysticks();
-    if (curNumJoysticks > 8)
-      curNumJoysticks = 8;
+    if (curNumJoysticks > 8) curNumJoysticks = 8;
+    if (curNumJoysticks < s_numOpenedControllers) {
+      for (int i = curNumJoysticks; i < s_numOpenedControllers; i++) {
+        if (s_gameControllers[i]) {
+          SDL_JoystickClose(s_gameControllers[i]);
+          s_gameControllers[i] = nullptr;
+        }
+      }
+      s_numOpenedControllers = curNumJoysticks;
+    }
     if (s_numOpenedControllers < curNumJoysticks) {
       for (int i = s_numOpenedControllers; i < curNumJoysticks; i++) {
         s_gameControllers[i] = SDL_JoystickOpen(i);
@@ -675,8 +692,7 @@ void AppPlatform_sdl::init() {
     SDL_Joystick *activeJoy = nullptr;
     for (int i = 0; i < s_numOpenedControllers; i++) {
       SDL_Joystick *j = s_gameControllers[i];
-      if (!j)
-        continue;
+      if (!j) continue;
       int numButtons = SDL_JoystickNumButtons(j);
       int numAxes = SDL_JoystickNumAxes(j);
       for (int b = 0; b < numButtons; b++) {
@@ -685,11 +701,9 @@ void AppPlatform_sdl::init() {
           break;
         }
       }
-      if (activeJoy)
-        break;
+      if (activeJoy) break;
       if (numAxes >= 2) {
-        if (abs(SDL_JoystickGetAxis(j, 0)) > 9000 ||
-            abs(SDL_JoystickGetAxis(j, 1)) > 9000) {
+        if (abs(SDL_JoystickGetAxis(j, 0)) > 9000 || abs(SDL_JoystickGetAxis(j, 1)) > 9000) {
           activeJoy = j;
           break;
         }
@@ -702,28 +716,33 @@ void AppPlatform_sdl::init() {
     if (!activeJoy) {
       for (int i = 0; i < s_numOpenedControllers; i++) {
         SDL_Joystick *j = s_gameControllers[i];
-        if (j && SDL_JoystickNumButtons(j) >= 4 &&
-            SDL_JoystickNumAxes(j) >= 2) {
+        if (j && SDL_JoystickNumButtons(j) >= 4 && SDL_JoystickNumAxes(j) >= 2) {
           activeJoy = j;
           break;
         }
       }
     }
 
-    if (activeJoy) {
+    if (!activeJoy) {
+      if (s_wasConnected) {
+        Gamepad::setConnected(0);
+        s_wasConnected = false;
+      }
+    } else {
+      if (!s_wasConnected) {
+        Gamepad::reset();
+        Gamepad::setConnected(1);
+        s_wasConnected = true;
+      }
       SDL_JoystickUpdate();
-      int numAxes = SDL_JoystickNumAxes(activeJoy);
-      int numButtons = SDL_JoystickNumButtons(activeJoy);
-      auto getJBtn = [&](int b) -> bool {
-        return (b >= 0 && b < numButtons)
-                   ? (SDL_JoystickGetButton(activeJoy, b) != 0)
-                   : false;
-      };
+
+      int s_numAxes = SDL_JoystickNumAxes(activeJoy);
+      int s_numButtons = SDL_JoystickNumButtons(activeJoy);
+      int s_numHats = SDL_JoystickNumHats(activeJoy);
 
       const char *jname = SDL_JoystickName(SDL_JoystickIndex(activeJoy));
       std::string nameStr = jname ? jname : "";
-      for (auto &c : nameStr)
-        c = (char)tolower((unsigned char)c);
+      for (auto &c : nameStr) c = (char)tolower((unsigned char)c);
       bool isSony = (nameStr.find("sony") != std::string::npos ||
                      nameStr.find("dualshock") != std::string::npos ||
                      nameStr.find("dualsense") != std::string::npos ||
@@ -732,280 +751,78 @@ void AppPlatform_sdl::init() {
                      nameStr.find("ps5") != std::string::npos ||
                      nameStr.find("wireless controller") != std::string::npos);
 
-      int16_t rawLX = (numAxes > 0) ? SDL_JoystickGetAxis(activeJoy, 0) : 0;
-      int16_t rawLY = (numAxes > 1) ? SDL_JoystickGetAxis(activeJoy, 1) : 0;
-      int16_t rawRX = 0, rawRY = 0;
-      bool lt = false, rt = false;
-
+      int rxAxis = -1, ryAxis = -1, ltAxis = -1, rtAxis = -1, trigAxis = -1;
       if (isSony) {
-        if (numAxes >= 6) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 2);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 5);
-          int16_t rawLT = SDL_JoystickGetAxis(activeJoy, 3);
-          int16_t rawRT = SDL_JoystickGetAxis(activeJoy, 4);
-          if (rawLT > 8000)
-            lt = true;
-          if (rawRT > 8000)
-            rt = true;
-        } else if (numAxes >= 4) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 2);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 3);
+        if (s_numAxes >= 6) {
+          rxAxis = 2;
+          ryAxis = 5;
+          ltAxis = 3;
+          rtAxis = 4;
+        } else if (s_numAxes >= 4) {
+          rxAxis = 2;
+          ryAxis = 3;
         }
       } else {
-        if (numAxes >= 6) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 3);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 4);
-          int16_t rawLT = SDL_JoystickGetAxis(activeJoy, 2);
-          int16_t rawRT = SDL_JoystickGetAxis(activeJoy, 5);
-          if (rawLT > 8000)
-            lt = true;
-          if (rawRT > 8000)
-            rt = true;
-        } else if (numAxes == 5) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 4);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 3);
-          int16_t rawTrig = SDL_JoystickGetAxis(activeJoy, 2);
-          if (rawTrig > 8000)
-            lt = true;
-          if (rawTrig < -8000)
-            rt = true;
-        } else if (numAxes >= 4) {
-          rawRX = SDL_JoystickGetAxis(activeJoy, 2);
-          rawRY = SDL_JoystickGetAxis(activeJoy, 3);
+        if (s_numAxes >= 6) {
+          rxAxis = 3;
+          ryAxis = 4;
+          ltAxis = 2;
+          rtAxis = 5;
+        } else if (s_numAxes == 5) {
+          rxAxis = 3;
+          ryAxis = 4;
+          trigAxis = 2;
+        } else if (s_numAxes == 4) {
+          rxAxis = 2;
+          ryAxis = 3;
+        } else if (s_numAxes == 3) {
+          trigAxis = 2;
         }
       }
 
-      float lx = (float)rawLX / 32767.0f;
-      float ly = (float)rawLY / 32767.0f;
-      float rx = (float)rawRX / 32767.0f;
-      float ry = (float)rawRY / 32767.0f;
-
-      const float deadzone = 0.22f;
-      if (fabsf(lx) < deadzone)
-        lx = 0.0f;
-      else
-        lx = (lx > 0 ? (lx - deadzone) : (lx + deadzone)) / (1.0f - deadzone);
-      if (fabsf(ly) < deadzone)
-        ly = 0.0f;
-      else
-        ly = (ly > 0 ? (ly - deadzone) : (ly + deadzone)) / (1.0f - deadzone);
-      if (fabsf(rx) < deadzone)
-        rx = 0.0f;
-      else
-        rx = (rx > 0 ? (rx - deadzone) : (rx + deadzone)) / (1.0f - deadzone);
-      if (fabsf(ry) < deadzone)
-        ry = 0.0f;
-      else
-        ry = (ry > 0 ? (ry - deadzone) : (ry + deadzone)) / (1.0f - deadzone);
-
-      bool btnA = false, btnB = false, btnX = false, btnY = false;
-      bool btnLB = false, btnRB = false, btnBack = false, btnStart = false;
-      bool btnL3 = false, btnR3 = false;
-
-      if (isSony) {
-#ifdef _WIN32
-        btnA = getJBtn(1);
-        btnB = getJBtn(2);
-        btnX = getJBtn(0);
-        btnY = getJBtn(3);
-        btnL3 = getJBtn(10);
-        btnR3 = getJBtn(11);
-#else
-        btnA = getJBtn(0);
-        btnB = getJBtn(1);
-        btnX = getJBtn(3);
-        btnY = getJBtn(2);
-        btnL3 = getJBtn(11);
-        btnR3 = getJBtn(12);
-#endif
-        btnLB = getJBtn(4);
-        btnRB = getJBtn(5);
-        if (getJBtn(6))
-          lt = true;
-        if (getJBtn(7))
-          rt = true;
-        btnBack = getJBtn(8);
-        btnStart = getJBtn(9);
-      } else {
-        btnA = getJBtn(0);
-        btnB = getJBtn(1);
-        btnX = getJBtn(2);
-        btnY = getJBtn(3);
-        btnLB = getJBtn(4);
-        btnRB = getJBtn(5);
-        btnBack = getJBtn(6);
-        btnStart = getJBtn(7);
-#ifdef _WIN32
-        btnL3 = getJBtn(8);
-        btnR3 = getJBtn(9);
-#else
-        btnL3 = getJBtn(9) || (numButtons <= 10 && getJBtn(8));
-        btnR3 = getJBtn(10) || (numButtons <= 10 && getJBtn(9));
-#endif
+      float lx = (s_numAxes > 0) ? (float)SDL_JoystickGetAxis(activeJoy, 0) / 32767.0f : 0.0f;
+      float ly = (s_numAxes > 1) ? (float)SDL_JoystickGetAxis(activeJoy, 1) / 32767.0f : 0.0f;
+      float rx = (rxAxis >= 0) ? (float)SDL_JoystickGetAxis(activeJoy, rxAxis) / 32767.0f : 0.0f;
+      float ry = (ryAxis >= 0) ? (float)SDL_JoystickGetAxis(activeJoy, ryAxis) / 32767.0f : 0.0f;
+
+      Gamepad::feedAxis(GP_AXIS_LX, lx, 0);
+      Gamepad::feedAxis(GP_AXIS_LY, ly, 1);
+      Gamepad::feedAxis(GP_AXIS_RX, rx, rxAxis);
+      Gamepad::feedAxis(GP_AXIS_RY, ry, ryAxis);
+
+      float lt = 0.0f;
+      float rt = 0.0f;
+      if (ltAxis >= 0 && rtAxis >= 0) {
+        lt = (float)SDL_JoystickGetAxis(activeJoy, ltAxis) / 32767.0f;
+        rt = (float)SDL_JoystickGetAxis(activeJoy, rtAxis) / 32767.0f;
+        if (lt < 0.0f) lt = 0.0f;
+        if (rt < 0.0f) rt = 0.0f;
+      } else if (trigAxis >= 0) {
+        float trig = (float)SDL_JoystickGetAxis(activeJoy, trigAxis) / 32767.0f;
+        if (trig > 0.0f) rt = trig;
+        if (trig < 0.0f) lt = -trig;
       }
+      Gamepad::feedAxis(GP_AXIS_LT, lt, (ltAxis >= 0) ? ltAxis : trigAxis);
+      Gamepad::feedAxis(GP_AXIS_RT, rt, (rtAxis >= 0) ? rtAxis : trigAxis);
 
-      uint8_t hat = (SDL_JoystickNumHats(activeJoy) > 0)
-                        ? SDL_JoystickGetHat(activeJoy, 0)
-                        : 0;
-      bool dpadUp = (hat & SDL_HAT_UP) != 0;
-      bool dpadDown = (hat & SDL_HAT_DOWN) != 0;
-      bool dpadLeft = (hat & SDL_HAT_LEFT) != 0;
-      bool dpadRight = (hat & SDL_HAT_RIGHT) != 0;
-
-      if (numAxes >= 8) {
-        int16_t hatX = SDL_JoystickGetAxis(activeJoy, 6);
-        int16_t hatY = SDL_JoystickGetAxis(activeJoy, 7);
-        if (hatX < -16000)
-          dpadLeft = true;
-        if (hatX > 16000)
-          dpadRight = true;
-        if (hatY < -16000)
-          dpadUp = true;
-        if (hatY > 16000)
-          dpadDown = true;
-      }
-
-      static bool prevJLB = false, prevJRB = false, prevJDpadL = false,
-                  prevJDpadR = false;
-      static bool prevJBtnX = false, prevJBtnY = false, prevJStart = false;
-      static bool prevJLT = false, prevJRT = false;
-      static bool prevJDpadUp = false, prevJDpadDown = false;
-      static bool prevJBtnA = false, prevJBtnB = false;
-
-      if (mc->player && !mc->currentScreen) {
-        if (mc->player->moveInput) {
-          if (fabsf(lx) > 0.0f || fabsf(ly) > 0.0f) {
-            mc->player->moveInput->strafeInput = -lx;
-            mc->player->moveInput->forwardInput = -ly;
-          }
-          if (btnA)
-            mc->player->moveInput->jumpingMaybe = 1;
-          if (btnB || btnR3)
-            mc->player->moveInput->sneakingMaybe = 1;
-        }
-
-        if (btnL3 || (ly < -0.85f)) {
-          mc->player->setSprinting(true);
-        } else if (ly >= -0.2f && !btnL3 && (fabsf(lx) < 0.2f)) {
-          mc->player->setSprinting(false);
-        }
-
-        if (fabsf(rx) > 0.0f || fabsf(ry) > 0.0f) {
-          float curveX = (rx > 0 ? 1.0f : -1.0f) * rx * rx;
-          float curveY = (ry > 0 ? 1.0f : -1.0f) * ry * ry;
-          float sens = (mc->options.sensitity * 0.6f + 0.2f) * 9.0f;
-          float turnX = curveX * sens;
-          float turnY =
-              curveY * sens * (mc->options.invertMouse ? 1.0f : -1.0f);
-          mc->player->turn(turnX, turnY);
-        }
-
-        if ((btnLB && !prevJLB) || (dpadLeft && !prevJDpadL)) {
-          int newslot = mc->player->inventory->selectedSlot - 1;
-          if (newslot < 0)
-            newslot = mc->gui.getNumSlots() - 2;
-          mc->player->inventory->selectSlot(newslot);
-        }
-        if ((btnRB && !prevJRB) || (dpadRight && !prevJDpadR)) {
-          int newslot = mc->player->inventory->selectedSlot + 1;
-          if (newslot >= mc->gui.getNumSlots() - 1)
-            newslot = 0;
-          mc->player->inventory->selectSlot(newslot);
-        }
-
-        if (rt && !prevJRT && !Keyboard::_states[lbkey]) {
-          Keyboard::feed(lbkey, 1);
-        } else if (!rt && prevJRT && Keyboard::_states[lbkey]) {
-          Keyboard::feed(lbkey, 0);
-        }
-
-        if (lt && !prevJLT && !Keyboard::_states[rbkey]) {
-          Keyboard::feed(rbkey, 1);
-        } else if (!lt && prevJLT && Keyboard::_states[rbkey]) {
-          Keyboard::feed(rbkey, 0);
-        }
-
-        if ((btnX && !prevJBtnX) || (btnY && !prevJBtnY)) {
-          mc->player->startCrafting((int32_t)mc->player->posX,
-                                    (int32_t)mc->player->posY,
-                                    (int32_t)mc->player->posZ, 0);
-        }
-
-        if (btnStart && !prevJStart) {
-          mc->pauseGame(1);
-        }
-
-        if (dpadUp && !prevJDpadUp && mc->isCreativeMode()) {
-          performPickBlock(mc);
-        }
-        if (dpadDown && !prevJDpadDown) {
-          mc->options.toggle(&Options::Option::THIRD_PERSON, 1);
-        }
-      } else if (mc->currentScreen) {
-        static float vCursorX = -1.0f, vCursorY = -1.0f;
-        if (vCursorX < 0.0f || Mouse::getX() != (int32_t)vCursorX ||
-            Mouse::getY() != (int32_t)vCursorY) {
-          if (fabsf(lx) < 0.05f && fabsf(ly) < 0.05f) {
-            vCursorX = (float)Mouse::getX();
-            vCursorY = (float)Mouse::getY();
-          }
-        }
-
-        if (fabsf(lx) > 0.0f || fabsf(ly) > 0.0f) {
-          vCursorX += lx * 10.0f;
-          vCursorY += ly * 10.0f;
-          if (vCursorX < 0.0f)
-            vCursorX = 0.0f;
-          if (vCursorX > (float)this->screenWidth)
-            vCursorX = (float)this->screenWidth;
-          if (vCursorY < 0.0f)
-            vCursorY = 0.0f;
-          if (vCursorY > (float)this->screenHeight)
-            vCursorY = (float)this->screenHeight;
-          Mouse::feed(0, 0, (uint16_t)vCursorX, (uint16_t)vCursorY);
-        }
-
-        if (btnA && !prevJBtnA) {
-          Mouse::feed(1, 1, (uint16_t)vCursorX, (uint16_t)vCursorY);
-        } else if (!btnA && prevJBtnA) {
-          Mouse::feed(1, 0, (uint16_t)vCursorX, (uint16_t)vCursorY);
-        }
-
-        if (btnB && !prevJBtnB) {
-          mc->currentScreen->handleBackEvent(0);
+      for (int i = 0; i < s_numButtons; ++i) {
+        int mapped = Gamepad::mapSdlButton(i, s_numButtons, s_numAxes);
+        if (mapped >= 0) {
+          Gamepad::feedButton(mapped, SDL_JoystickGetButton(activeJoy, i) != 0, i);
         }
+      }
 
-        static int scrollTimer = 0;
-        if (dpadUp || ry < -0.5f) {
-          if (scrollTimer == 0 || (scrollTimer > 15 && scrollTimer % 6 == 0)) {
-            Mouse::feed(SDL_BUTTON_WHEELUP, 1, (uint16_t)vCursorX,
-                        (uint16_t)vCursorY);
-          }
-          scrollTimer++;
-        } else if (dpadDown || ry > 0.5f) {
-          if (scrollTimer == 0 || (scrollTimer > 15 && scrollTimer % 6 == 0)) {
-            Mouse::feed(SDL_BUTTON_WHEELDOWN, 1, (uint16_t)vCursorX,
-                        (uint16_t)vCursorY);
-          }
-          scrollTimer++;
-        } else {
-          scrollTimer = 0;
-        }
+      if (s_numHats > 0) {
+        uint8_t hat = SDL_JoystickGetHat(activeJoy, 0);
+        Gamepad::feedHat((hat & SDL_HAT_UP) != 0, (hat & SDL_HAT_DOWN) != 0,
+                         (hat & SDL_HAT_LEFT) != 0, (hat & SDL_HAT_RIGHT) != 0);
+      } else if (s_numAxes >= 8) {
+        float hatX = (float)SDL_JoystickGetAxis(activeJoy, 6) / 32767.0f;
+        float hatY = (float)SDL_JoystickGetAxis(activeJoy, 7) / 32767.0f;
+        Gamepad::feedHat(hatY < -0.5f, hatY > 0.5f, hatX < -0.5f, hatX > 0.5f);
       }
 
-      prevJLB = btnLB;
-      prevJRB = btnRB;
-      prevJDpadL = dpadLeft;
-      prevJDpadR = dpadRight;
-      prevJBtnX = btnX;
-      prevJBtnY = btnY;
-      prevJStart = btnStart;
-      prevJLT = lt;
-      prevJRT = rt;
-      prevJDpadUp = dpadUp;
-      prevJDpadDown = dpadDown;
-      prevJBtnA = btnA;
-      prevJBtnB = btnB;
+      Gamepad::syncDerivedButtons();
     }
 
     // TODO engine stuff
diff --git a/modifiedeight/impl/I18n.cpp b/modifiedeight/impl/I18n.cpp
index e9a50f7c..80bb1838 100644
--- a/modifiedeight/impl/I18n.cpp
+++ b/modifiedeight/impl/I18n.cpp
@@ -93,6 +93,19 @@ bool_t I18n::get(const std::string& a1, std::string& a2) {
 	if (a1 == "options.animatefire") { a2 = "Animated Fire"; return 1; }
 	if (a1 == "options.smoothchunks") { a2 = "Smooth Chunk Loading"; return 1; }
 	if (a1 == "options.smoothchunks.desc") { a2 = "Smooths chunk rebuilds to eliminate frame drops"; return 1; }
+	if (a1 == "options.controllersensitivity") { a2 = "Controller Sensitivity"; return 1; }
+	if (a1 == "options.controllercursorsensitivity") { a2 = "Controller Cursor Sensitivity"; return 1; }
+	if (a1 == "options.controllerlayout") { a2 = "Controller Layout"; return 1; }
+	if (a1 == "options.controllerlayout.customize") { a2 = "Customize"; return 1; }
+	if (a1 == "options.controllerlayout.actions") { a2 = "Actions"; return 1; }
+	if (a1 == "options.controllerlayout.bindings") { a2 = "Bindings"; return 1; }
+	if (a1 == "options.controllerlayout.press") { a2 = "> Press... <"; return 1; }
+	if (a1 == "options.controllerlayout.unbound") { a2 = "Unbound"; return 1; }
+	if (a1 == "options.controllerlayout.hint") { a2 = "Press a controller button or move a stick"; return 1; }
+	if (a1 == "options.controllerlayout.nogamepad") { a2 = "No controller detected"; return 1; }
+	if (a1 == "gui.save") { a2 = "Save"; return 1; }
+	if (a1 == "gui.reset") { a2 = "Reset"; return 1; }
+	if (a1 == "gui.cancel") { a2 = "Cancel"; return 1; }
 
 	auto&& v3 = I18n::_strings.find(a1);
 	if(v3 == I18n::_strings.end()) return 0;
@@ -130,6 +143,19 @@ std::string I18n::get(const std::string& a2) {
 	if (a2 == "options.showfps") return "Show FPS";
 	if (a2 == "options.debugscreen") return "Debug Screen";
 	if (a2 == "options.discordrpc") return "Discord Integration";
+	if (a2 == "options.controllersensitivity") return "Controller Sensitivity";
+	if (a2 == "options.controllercursorsensitivity") return "Controller Cursor Sensitivity";
+	if (a2 == "options.controllerlayout") return "Controller Layout";
+	if (a2 == "options.controllerlayout.customize") return "Customize";
+	if (a2 == "options.controllerlayout.actions") return "Actions";
+	if (a2 == "options.controllerlayout.bindings") return "Bindings";
+	if (a2 == "options.controllerlayout.press") return "> Press... <";
+	if (a2 == "options.controllerlayout.unbound") return "Unbound";
+	if (a2 == "options.controllerlayout.hint") return "Press a controller button or move a stick";
+	if (a2 == "options.controllerlayout.nogamepad") return "No controller detected";
+	if (a2 == "gui.save") return "Save";
+	if (a2 == "gui.reset") return "Reset";
+	if (a2 == "gui.cancel") return "Cancel";
 
 	auto&& v3 = I18n::_strings.find(a2);
 	if(v3 == I18n::_strings.end()) return a2 + '<';
diff --git a/modifiedeight/impl/Minecraft.cpp b/modifiedeight/impl/Minecraft.cpp
index e531e9f7..9a45aff0 100644
--- a/modifiedeight/impl/Minecraft.cpp
+++ b/modifiedeight/impl/Minecraft.cpp
@@ -9,6 +9,8 @@
 #include <gui/screens/DeathScreen.hpp>
 #include <gui/screens/PauseScreen.hpp>
 #include <input/BuildActionIntention.hpp>
+#include <input/ControllerHandler.hpp>
+#include <input/ControllerLayout.hpp>
 #include <input/ControllerTurnInput.hpp>
 #include <input/CustomInputHolder.hpp>
 #include <input/Keyboard.hpp>
@@ -436,6 +438,7 @@ void Minecraft::init(void) {
 	this->supportsNonTouchScreen = !this->platform()->supportsTouchscreen();
 	this->options.init(this, this->field_D00);
 	this->options.update();
+	ControllerLayout::init(this->field_D00);
 	this->externalServerFile = std::shared_ptr<ExternalServerFile>(new ExternalServerFile(this->field_D00));
 	this->externalServerFile->load();
 	this->checkGLError("Init enter");
@@ -1224,6 +1227,7 @@ void Minecraft::unlockControl(void) {
 
 void Minecraft::update(void) {
 	this->cmutex->lock();
+	ControllerHandler::tick(this);
 	if(this->field_16C && this->level) {
 		float v14 = this->timer.field_8;
 		this->timer.advanceTime();
diff --git a/modifiedeight/impl/Options.cpp b/modifiedeight/impl/Options.cpp
index 490af5b7..ba459c7e 100644
--- a/modifiedeight/impl/Options.cpp
+++ b/modifiedeight/impl/Options.cpp
@@ -14,6 +14,9 @@ Options::Option Options::Option::MUSIC{1, "options.music", 0};
 Options::Option Options::Option::SOUND{1, "options.sound", 1};
 Options::Option Options::Option::INVERT_MOUSE{0, "options.invertMouse", 2};
 Options::Option Options::Option::SENSITIVITY{1, "options.sensitivity", 3};
+Options::Option Options::Option::CONTROLLER_SENSITIVITY{1, "options.controllersensitivity", 60};
+Options::Option Options::Option::CONTROLLER_CURSOR_SENSITIVITY{1, "options.controllercursorsensitivity", 61};
+
 Options::Option Options::Option::RENDER_DISTANCE{3, "options.renderDistance", 4};
 Options::Option Options::Option::VIEW_BOBBING{0, "options.viewBobbing", 5};
 Options::Option Options::Option::LIMIT_FRAMERATE{0, "options.limitFramerate", 7};
@@ -74,6 +77,16 @@ void Options::update() {
 				if(this->readFloat(v13[i + 1], v12)) {
 					this->sensitity = (float)(powf(v12 * 1.1, 1.3) * 0.42) + 0.3;
 				}
+			} else if(v13[i] == "options.controllersensitivity") {
+				float v12;
+				if(this->readFloat(v13[i + 1], v12)) {
+					this->controllerSensitivity = v12;
+				}
+			} else if(v13[i] == "options.controllercursorsensitivity") {
+				float v12;
+				if(this->readFloat(v13[i + 1], v12)) {
+					this->controllerCursorSensitivity = v12;
+				}
 			} else {
 				if(v13[i] == OptionStrings::Controls_InvertMouse) {
 					this->readBool(v13[i + 1], this->invertMouse);
@@ -310,6 +323,10 @@ void Options::set(const Options::Option* a2, float a3) {
 		this->fov = a3;
 	} else if(a2 == &Options::Option::SENSITIVITY) {
 		this->sensitity = a3;
+	} else if(a2 == &Options::Option::CONTROLLER_SENSITIVITY) {
+		this->controllerSensitivity = a3;
+	} else if(a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		this->controllerCursorSensitivity = a3;
 	} else if(a2 == &Options::Option::PIXELS_PER_MILLIMETER) {
 		this->pixelDensity = a3;
 	}
@@ -323,6 +340,8 @@ void Options::save(void) {
 	this->addOptionToSaveOutput(v4, OptionStrings::Graphics_PixelsPerMilimeter, this->pixelDensity);
 	this->addOptionToSaveOutput(v4, OptionStrings::Multiplayer_ServerVisible, this->serverVisible);
 	this->addOptionToSaveOutput(v4, OptionStrings::Controls_Sensitivity, this->sensitity);
+	this->addOptionToSaveOutput(v4, "options.controllersensitivity", this->controllerSensitivity);
+	this->addOptionToSaveOutput(v4, "options.controllercursorsensitivity", this->controllerCursorSensitivity);
 	this->addOptionToSaveOutput(v4, OptionStrings::Controls_InvertMouse, this->invertMouse);
 	this->addOptionToSaveOutput(v4, OptionStrings::Controls_IsLefthanded, this->leftHanded);
 	this->addOptionToSaveOutput(v4, OptionStrings::Controls_UseTouchScreen, this->useTouchscreen);
@@ -453,6 +472,8 @@ void Options::initDefaultValues(void) {
 	this->soundVolume = 1.0;
 	this->invertMouse = 0;
 	this->sensitity = 0.5;
+	this->controllerSensitivity = 40.0f;
+	this->controllerCursorSensitivity = 2.25f;
 	this->limitFramerate = 0;
 	this->renderDistance = 2;
 	this->useTouchscreen = this->minecraft->supportNonTouchscreen();
@@ -551,6 +572,9 @@ float Options::getProgrssMin(const Options::Option* a2) {
 	if(a2 == &Options::Option::MUSIC || a2 == &Options::Option::SOUND || a2 == &Options::Option::SENSITIVITY) {
 		return 0;
 	}
+	if(a2 == &Options::Option::CONTROLLER_SENSITIVITY || a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		return 0;
+	}
 	if(a2 == &Options::Option::FOV) {
 		return 30.0f;
 	}
@@ -563,6 +587,12 @@ float Options::getProgrssMax(const Options::Option* a2) {
 	if(a2 == &Options::Option::MUSIC || a2 == &Options::Option::SOUND || a2 == &Options::Option::SENSITIVITY) {
 		return 1;
 	}
+	if(a2 == &Options::Option::CONTROLLER_SENSITIVITY) {
+		return 80;
+	}
+	if(a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		return 4.5f;
+	}
 	if(a2 == &Options::Option::FOV) {
 		return 110.0f;
 	}
@@ -581,6 +611,13 @@ float Options::getProgressValue(const Options::Option* a2) {
 	if(a2 == &Options::Option::SENSITIVITY) {
 		return this->sensitity;
 	}
+	if(a2 == &Options::Option::CONTROLLER_SENSITIVITY) {
+		return this->controllerSensitivity;
+	}
+	if(a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		return this->controllerCursorSensitivity;
+	}
+
 	if(a2 == &Options::Option::FOV) {
 		return this->fov;
 	}
@@ -634,6 +671,12 @@ std::string Options::getDescription(const Options::Option* a2, std::string a4) {
 		int idx = 3 - this->renderDistance;
 		if(idx >= 0 && idx < 7) return a4 + ": " + modes[idx];
 	}
+	if(a2 == &Options::Option::CONTROLLER_SENSITIVITY) {
+		return a4;
+	}
+	if(a2 == &Options::Option::CONTROLLER_CURSOR_SENSITIVITY) {
+		return a4;
+	}
 	return a4;
 }
 bool_t Options::getBooleanValue(const Options::Option* a2) {
diff --git a/modifiedeight/impl/_pengine.cpp b/modifiedeight/impl/_pengine.cpp
index a26d2fa8..87da5dcc 100644
--- a/modifiedeight/impl/_pengine.cpp
+++ b/modifiedeight/impl/_pengine.cpp
@@ -6,6 +6,8 @@
 #include <android/log.h>
 #include <android_native_app_glue.h>
 #include <input/Controller.hpp>
+#include <input/ControllerHandler.hpp>
+#include <input/Gamepad.hpp>
 #include <input/Keyboard.hpp>
 #include <input/Mouse.hpp>
 #include <input/Multitouch.hpp>
@@ -126,7 +128,82 @@ void engine_term_display(ENGINE* a1) {
 //         //67//       //
 static int _d6715384[] = {4, 0x13, 0x14, 0x15, 0x16, 0x17, 0x52, 0x63, 0x64, 0x66, 0x67, 0x6C, 0x6D};
 static char _D67153B8[] = {0xD, 8};
+
+static bool _isGamepadSource(int32_t source) {
+	if((source & AINPUT_SOURCE_JOYSTICK) == AINPUT_SOURCE_JOYSTICK) return true;
+	if((source & AINPUT_SOURCE_GAMEPAD) == AINPUT_SOURCE_GAMEPAD) return true;
+	return false;
+}
+
+static bool _isGamepadKeyCode(int32_t keyCode) {
+	if(keyCode >= 96 && keyCode <= 110) return true;
+	if(keyCode >= 188 && keyCode <= 202) return true;
+	return false;
+}
+
+static void _feedGamepadMotion(AInputEvent* event) {
+	Gamepad::setConnected(1);
+
+	float lx = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_X, 0);
+	float ly = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_Y, 0);
+	Gamepad::feedAxis(GP_AXIS_LX, lx, AMOTION_EVENT_AXIS_X);
+	Gamepad::feedAxis(GP_AXIS_LY, ly, AMOTION_EVENT_AXIS_Y);
+
+	float rx = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_Z, 0);
+	float ry = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RZ, 0);
+	int32_t rxRaw = AMOTION_EVENT_AXIS_Z;
+	int32_t ryRaw = AMOTION_EVENT_AXIS_RZ;
+	if(rx == 0.0f && ry == 0.0f) {
+		rx = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RX, 0);
+		ry = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RY, 0);
+		rxRaw = AMOTION_EVENT_AXIS_RX;
+		ryRaw = AMOTION_EVENT_AXIS_RY;
+	}
+	Gamepad::feedAxis(GP_AXIS_RX, rx, rxRaw);
+	Gamepad::feedAxis(GP_AXIS_RY, ry, ryRaw);
+
+	float lt = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_LTRIGGER, 0);
+	float rt = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_RTRIGGER, 0);
+	int32_t ltRaw = AMOTION_EVENT_AXIS_LTRIGGER;
+	int32_t rtRaw = AMOTION_EVENT_AXIS_RTRIGGER;
+	if(lt == 0.0f) {
+		lt = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_BRAKE, 0);
+		ltRaw = AMOTION_EVENT_AXIS_BRAKE;
+	}
+	if(rt == 0.0f) {
+		rt = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_GAS, 0);
+		rtRaw = AMOTION_EVENT_AXIS_GAS;
+	}
+	if(lt < 0.0f) lt = 0.0f;
+	if(rt < 0.0f) rt = 0.0f;
+	Gamepad::feedAxis(GP_AXIS_LT, lt, ltRaw);
+	Gamepad::feedAxis(GP_AXIS_RT, rt, rtRaw);
+
+	float hatX = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_HAT_X, 0);
+	float hatY = AMotionEvent_getAxisValue(event, AMOTION_EVENT_AXIS_HAT_Y, 0);
+	Gamepad::feedHat(hatY < -0.5f, hatY > 0.5f, hatX < -0.5f, hatX > 0.5f);
+
+	Gamepad::syncDerivedButtons();
+}
+
 int engine_handle_input(struct android_app* app, struct AInputEvent* event) {
+	int32_t evSource = AInputEvent_getSource(event);
+	if(AInputEvent_getType(event) == 2 && _isGamepadSource(evSource) && evSource != 0x100008) {
+		_feedGamepadMotion(event);
+		return 1;
+	}
+	if(AInputEvent_getType(event) == 1) {
+		int32_t gpKeyCode = AKeyEvent_getKeyCode(event);
+		if(_isGamepadKeyCode(gpKeyCode) || (_isGamepadSource(evSource) && gpKeyCode >= 19 && gpKeyCode <= 23)) {
+			Gamepad::setConnected(1);
+			int32_t mapped = Gamepad::mapRawButton(gpKeyCode, -1);
+			if(mapped >= 0) {
+				Gamepad::feedButton(mapped, AKeyEvent_getAction(event) == 0, gpKeyCode);
+				Gamepad::syncDerivedButtons();
+				return 1;
+			}
+		}
+	}
 	if(AInputEvent_getType(event) != 1) {
 		if(((ENGINE*)app->userData)->minecraft->useTouchscreen()) {
 			if(AInputEvent_getType(event) == 2 && AInputEvent_getSource(event) != 0x100008) {
diff --git a/modifiedeight/impl/gui/ControllerLayoutOption.cpp b/modifiedeight/impl/gui/ControllerLayoutOption.cpp
new file mode 100644
index 00000000..5bf7ae34
--- /dev/null
+++ b/modifiedeight/impl/gui/ControllerLayoutOption.cpp
@@ -0,0 +1,49 @@
+#include <gui/ControllerLayoutOption.hpp>
+#include <I18n.hpp>
+#include <Minecraft.hpp>
+#include <gui/buttons/Touch_TButton.hpp>
+#include <gui/screens/ControllerLayoutScreen.hpp>
+#include <rendering/Font.hpp>
+
+ControllerLayoutOption::ControllerLayoutOption(Minecraft* a2, bool_t a3)
+	: GuiElementContainer(0, 1, 0, 0, 24, 20) {
+	this->isInWorld = a3;
+	this->pressedButton = 0;
+	this->customizeButton = std::shared_ptr<Button>(new Touch::TButton(9999998, 0, 0, 66, 20, I18n::get("options.controllerlayout.customize"), a2));
+	this->addChild(this->customizeButton);
+}
+
+ControllerLayoutOption::~ControllerLayoutOption() {
+}
+
+void ControllerLayoutOption::render(Minecraft* a2, int32_t a3, int32_t a4) {
+	int32_t v9 = (this->height - 8) / 2;
+	a2->font->drawShadow(I18n::get("options.controllerlayout"), this->posX, (float)this->posY + (float)v9, 0xFFBBBBBB);
+	GuiElementContainer::render(a2, a3, a4);
+}
+
+void ControllerLayoutOption::setupPositions() {
+	int32_t v3 = 0;
+	for(auto c: this->children) {
+		c->posX = this->posX + this->width - c->width - 15;
+		c->posY = this->posY + v3;
+		v3 += c->height;
+	}
+	this->height = v3;
+}
+
+void ControllerLayoutOption::mouseClicked(Minecraft* a2, int32_t a3, int32_t a4, int32_t a5) {
+	if(a5 != 1) return;
+	if(this->customizeButton->clicked(a2, a3, a4)) {
+		this->pressedButton = this->customizeButton.get();
+		this->pressedButton->setPressed();
+	}
+}
+
+void ControllerLayoutOption::mouseReleased(Minecraft* a2, int32_t a3, int32_t a4, int32_t a5) {
+	if(this->pressedButton == this->customizeButton.get() && this->pressedButton->clicked(a2, a3, a4)) {
+		a2->setScreen(new ControllerLayoutScreen(this->isInWorld));
+	}
+	this->pressedButton = 0;
+	this->customizeButton->released(a3, a4);
+}
diff --git a/modifiedeight/impl/gui/OptionsGroup.cpp b/modifiedeight/impl/gui/OptionsGroup.cpp
index 667aab00..b1a83fee 100644
--- a/modifiedeight/impl/gui/OptionsGroup.cpp
+++ b/modifiedeight/impl/gui/OptionsGroup.cpp
@@ -1,6 +1,7 @@
 #include <gui/OptionsGroup.hpp>
 #include <I18n.hpp>
 #include <Minecraft.hpp>
+#include <gui/ControllerLayoutOption.hpp>
 #include <gui/LoginOption.hpp>
 #include <gui/buttons/OptionButton.hpp>
 #include <gui/elements/OptionsItem.hpp>
@@ -19,6 +20,11 @@ void OptionsGroup::addLoginItem(Minecraft* a2) {
 	this->addChild(std::shared_ptr<LoginOption>(new LoginOption(a2)));
 	this->setupPositions();
 }
+OptionsGroup* OptionsGroup::addControllerLayoutItem(Minecraft* a2, bool_t a3) {
+	this->addChild(std::shared_ptr<ControllerLayoutOption>(new ControllerLayoutOption(a2, a3)));
+	this->setupPositions();
+	return this;
+}
 void OptionsGroup::createTextBox(const Options::Option* a2, Minecraft* a3) {
 	std::shared_ptr<TextBox> v13(new TextBox(a3, a2, I18n::get(a2->name)));
 	const char* extAscii = TextBox::extendedAcsii ? TextBox::extendedAcsii : " !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/modifiedeight/impl/gui/screens/ControllerLayoutScreen.cpp b/modifiedeight/impl/gui/screens/ControllerLayoutScreen.cpp
new file mode 100644
index 00000000..96bb35b7
--- /dev/null
+++ b/modifiedeight/impl/gui/screens/ControllerLayoutScreen.cpp
@@ -0,0 +1,499 @@
+#include <gui/screens/ControllerLayoutScreen.hpp>
+#include <I18n.hpp>
+#include <Minecraft.hpp>
+#include <cpputils.hpp>
+#include <gui/Gui.hpp>
+#include <gui/NinePatchFactory.hpp>
+#include <gui/NinePatchLayer.hpp>
+#include <gui/buttons/Touch_TButton.hpp>
+#include <gui/screens/OptionsScreen.hpp>
+#include <input/ControllerHandler.hpp>
+#include <input/Gamepad.hpp>
+#include <input/Mouse.hpp>
+#include <rendering/Font.hpp>
+#include <rendering/Tesselator.hpp>
+#include <util/IntRectangle.hpp>
+#include <unigl.h>
+#include <utils.h>
+
+static const int32_t _clsRowHeight = 30;
+static const int32_t _clsRowGap = 1;
+static const int32_t _clsStride = 31;
+static const int32_t _clsScrollW = 10;
+static const int32_t _clsColGap = 2;
+
+ControllerLayoutScreen::ControllerLayoutScreen(bool_t a2) {
+	this->isInWorld = a2;
+	this->optBtn = 0;
+	this->playPressed = 0;
+	this->listBg = 0;
+	this->panelBg = 0;
+	this->buttonSave = 0;
+	this->buttonReset = 0;
+	this->buttonCancel = 0;
+	this->capturingAction = -1;
+	this->scrollOffset = 0.0f;
+	this->scrollTarget = 0.0f;
+	this->contentHeight = CA_COUNT * _clsStride;
+	this->listTop = 0;
+	this->listBottom = 0;
+	this->actionsColumnWidth = 0;
+	this->bindingsColumnWidth = 0;
+	this->dragStartY = 0;
+	this->dragStartOffset = 0.0f;
+	this->dragVel = 0.0f;
+	this->lastDragMs = 0;
+	this->isDragging = 0;
+	this->draggingBar = 0;
+	this->barGrabDY = 0;
+	this->lastAnimMs = 0;
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		this->working[i] = ControllerLayout::get(i);
+	}
+}
+
+ControllerLayoutScreen::~ControllerLayoutScreen() {
+	ControllerHandler::endCapture();
+	safeRemove(this->optBtn);
+	safeRemove(this->playPressed);
+	safeRemove(this->listBg);
+	safeRemove(this->panelBg);
+	if(this->buttonSave) {
+		delete this->buttonSave;
+		this->buttonSave = 0;
+	}
+	if(this->buttonReset) {
+		delete this->buttonReset;
+		this->buttonReset = 0;
+	}
+	if(this->buttonCancel) {
+		delete this->buttonCancel;
+		this->buttonCancel = 0;
+	}
+}
+
+void ControllerLayoutScreen::init() {
+	this->buttons.clear();
+	this->field_2C.clear();
+
+	this->buttonSave = new Touch::TButton(1, I18n::get("gui.save"), 0);
+	this->buttonReset = new Touch::TButton(2, I18n::get("gui.reset"), 0);
+	this->buttonCancel = new Touch::TButton(3, I18n::get("gui.cancel"), 0);
+
+	IntRectangle rOptions;
+	rOptions.minX = 112;
+	rOptions.minY = 0;
+	rOptions.width = 8;
+	rOptions.height = 67;
+	IntRectangle rOptionsPressed;
+	rOptionsPressed.minX = 120;
+	rOptionsPressed.minY = 0;
+	rOptionsPressed.width = 8;
+	rOptionsPressed.height = 67;
+	((Touch::TButton*)this->buttonSave)->init(this->minecraft, "gui/spritesheet.png", rOptions, rOptionsPressed, 2, 2, 66, 26);
+	((Touch::TButton*)this->buttonReset)->init(this->minecraft, "gui/spritesheet.png", rOptions, rOptionsPressed, 2, 2, 66, 26);
+	((Touch::TButton*)this->buttonCancel)->init(this->minecraft, "gui/spritesheet.png", rOptions, rOptionsPressed, 2, 2, 66, 26);
+
+	NinePatchFactory npf(this->minecraft->texturesPtr, "gui/spritesheet.png");
+	safeRemove(this->optBtn);
+	safeRemove(this->playPressed);
+	safeRemove(this->listBg);
+	safeRemove(this->panelBg);
+	IntRectangle rNormal;
+	rNormal.minX = 112;
+	rNormal.minY = 0;
+	rNormal.width = 8;
+	rNormal.height = 67;
+	this->optBtn = npf.createSymmetrical(rNormal, 2, 2, 32, 32);
+	IntRectangle rBlack;
+	rBlack.minX = 0;
+	rBlack.minY = 32;
+	rBlack.width = 8;
+	rBlack.height = 8;
+	this->playPressed = npf.createSymmetrical(rBlack, 2, 2, 32, 32);
+	this->listBg = npf.createSymmetrical(rBlack, 2, 2, 32, 32);
+	IntRectangle rPanel;
+	rPanel.minX = 34;
+	rPanel.minY = 43;
+	rPanel.width = 14;
+	rPanel.height = 14;
+	this->panelBg = npf.createSymmetrical(rPanel, 3, 3, 32, 32);
+
+	this->buttons.emplace_back(this->buttonSave);
+	this->buttons.emplace_back(this->buttonReset);
+	this->buttons.emplace_back(this->buttonCancel);
+}
+
+void ControllerLayoutScreen::setupPositions() {
+	int32_t sideMargin = this->width * 5 / 100;
+	if(sideMargin < 10) sideMargin = 10;
+	int32_t panelL = sideMargin;
+	int32_t panelR = this->width - sideMargin;
+
+	this->contentLeft = panelL + 10;
+	this->contentRight = panelR - 10 - _clsScrollW - 4;
+	this->scrollBarX = this->contentRight + 4;
+	if(this->contentRight < this->contentLeft + 80) {
+		this->contentRight = this->contentLeft + 80;
+	}
+	int32_t total = this->contentRight - this->contentLeft;
+	this->actionsColumnWidth = (total * 57) / 100;
+	this->bindingsColumnWidth = total - this->actionsColumnWidth;
+
+	int32_t btnH = 26;
+	int32_t gap = 6;
+	int32_t btnW = (panelR - 10 - this->contentLeft - gap * 2) / 3;
+	if(btnW < 20) btnW = 20;
+	int32_t btnY = this->height - btnH - 14;
+
+	this->buttonSave->width = btnW;
+	this->buttonSave->height = btnH;
+	this->buttonSave->posX = this->contentLeft;
+	this->buttonSave->posY = btnY;
+
+	this->buttonReset->width = btnW;
+	this->buttonReset->height = btnH;
+	this->buttonReset->posX = this->contentLeft + btnW + gap;
+	this->buttonReset->posY = btnY;
+
+	this->buttonCancel->width = btnW;
+	this->buttonCancel->height = btnH;
+	this->buttonCancel->posX = this->contentLeft + (btnW + gap) * 2;
+	this->buttonCancel->posY = btnY;
+
+	this->listTop = 56;
+	this->listBottom = btnY - 10;
+	if(this->listBottom < this->listTop + _clsRowHeight) {
+		this->listBottom = this->listTop + _clsRowHeight;
+	}
+
+	this->contentHeight = CA_COUNT * _clsStride;
+	this->clampScroll();
+}
+
+
+
+void ControllerLayoutScreen::clampScroll() {
+	float viewHeight = (float)(this->listBottom - this->listTop);
+	float maxScroll = (float)this->contentHeight - viewHeight;
+	if(maxScroll < 0.0f) maxScroll = 0.0f;
+	if(this->scrollOffset > maxScroll) this->scrollOffset = maxScroll;
+	if(this->scrollOffset < 0.0f) this->scrollOffset = 0.0f;
+	if(this->scrollTarget > maxScroll) this->scrollTarget = maxScroll;
+	if(this->scrollTarget < 0.0f) this->scrollTarget = 0.0f;
+}
+
+int32_t ControllerLayoutScreen::rowIndexAt(int32_t a2, int32_t a3) {
+	if(a3 < this->listTop || a3 >= this->listBottom) return -1;
+	int32_t bindingsX = this->contentLeft + this->actionsColumnWidth + _clsColGap;
+	if(a2 < bindingsX || a2 >= this->contentRight) return -1;
+	int32_t rel = a3 - this->listTop + (int32_t)this->scrollOffset;
+	if(rel < 0) return -1;
+	int32_t idx = rel / _clsStride;
+	if(idx < 0 || idx >= CA_COUNT) return -1;
+	if(rel % _clsStride >= _clsRowHeight) return -1;
+	return idx;
+}
+
+void ControllerLayoutScreen::closeScreen() {
+	this->minecraft->setScreen(new OptionsScreen(this->isInWorld));
+}
+
+void ControllerLayoutScreen::render(int32_t a2, int32_t a3, float a4) {
+	if(!this->isInWorld) {
+		if(this->renderGameBehind()) {
+			this->renderMenuBackground(a4);
+		}
+	}
+	this->renderBackground(0);
+
+	int32_t nowMs = getTimeMs();
+	int32_t animDt = nowMs - this->lastAnimMs;
+	if(this->lastAnimMs == 0 || animDt < 1) animDt = 17;
+	if(animDt > 100) animDt = 100;
+	this->lastAnimMs = nowMs;
+	if(this->draggingBar) {
+		int32_t mx = Mouse::getX();
+		int32_t my = Mouse::getY();
+		this->toGUICoordinate(mx, my);
+		int32_t viewHeight = this->listBottom - this->listTop;
+		int32_t barY = this->listTop;
+		int32_t barH = viewHeight;
+		this->calcBar(barY, barH);
+		int32_t maxScroll = this->contentHeight - viewHeight;
+		int32_t trackTop = this->listTop - 3;
+		int32_t trackH = viewHeight + 5;
+		if(maxScroll > 0 && trackH - barH > 0) {
+			int32_t wantY = my - this->barGrabDY;
+			if(wantY < trackTop) wantY = trackTop;
+			if(wantY > trackTop + trackH - barH) wantY = trackTop + trackH - barH;
+			float t = (float)(wantY - trackTop) / (float)(trackH - barH);
+			this->scrollOffset = t * (float)maxScroll;
+			this->scrollTarget = this->scrollOffset;
+			this->clampScroll();
+		}
+	} else if(this->isDragging) {
+		int32_t mx = Mouse::getX();
+		int32_t my = Mouse::getY();
+		this->toGUICoordinate(mx, my);
+		float prev = this->scrollOffset;
+		this->scrollOffset = this->dragStartOffset + (float)(this->dragStartY - my);
+		this->clampScroll();
+		this->scrollTarget = this->scrollOffset;
+		float v = (this->scrollOffset - prev) / (float)animDt;
+		this->dragVel = this->dragVel * 0.7f + v * 0.3f;
+		this->lastDragMs = nowMs;
+	} else {
+		float diff = this->scrollTarget - this->scrollOffset;
+		if(diff > 0.5f || diff < -0.5f) {
+			float k = (float)animDt * 0.025f;
+			if(k > 1.0f) k = 1.0f;
+			this->scrollOffset += diff * k;
+			this->clampScroll();
+		} else {
+			this->scrollOffset = this->scrollTarget;
+		}
+	}
+
+	int32_t sideMargin = this->width * 5 / 100;
+	if(sideMargin < 10) sideMargin = 10;
+	int32_t panelL = sideMargin;
+	int32_t panelR = this->width - sideMargin;
+	int32_t panelT = 6;
+	int32_t panelB = this->height - 6;
+
+	if(this->panelBg) {
+		this->panelBg->setSize((float)(panelR - panelL), (float)(panelB - panelT));
+		this->panelBg->draw(Tesselator::instance, (float)panelL, (float)panelT);
+	}
+
+	this->drawCenteredString(this->font, I18n::get("options.controllerlayout"), this->width / 2, 16, 0xFFFFFFFF);
+
+	int32_t actionsX = this->contentLeft;
+	int32_t bindingsX = this->contentLeft + this->actionsColumnWidth + _clsColGap;
+	int32_t rightX = this->contentRight;
+	int32_t actionsCX = actionsX + this->actionsColumnWidth / 2;
+	int32_t bindingsCX = bindingsX + (rightX - bindingsX) / 2;
+
+	this->drawCenteredString(this->font, I18n::get("options.controllerlayout.actions"), actionsCX, 40, 0xFFFFFFFF);
+	this->drawCenteredString(this->font, I18n::get("options.controllerlayout.bindings"), bindingsCX, 40, 0xFFFFFFFF);
+
+	if(this->listBg) {
+		this->listBg->setSize((float)(this->contentRight - this->contentLeft + 4), (float)(this->listBottom - this->listTop + 5));
+		this->listBg->draw(Tesselator::instance, (float)(this->contentLeft - 2), (float)(this->listTop - 3));
+	}
+
+	glEnable(0xC11u);
+	glScissor((uint32_t)(float)(Gui::GuiScale * (float)this->contentLeft), (uint32_t)(float)(this->minecraft->field_20 - (float)(Gui::GuiScale * (float)this->listBottom)), (uint32_t)(float)(Gui::GuiScale * (float)(this->scrollBarX + _clsScrollW - this->contentLeft)), (uint32_t)(float)(Gui::GuiScale * (float)(this->listBottom - this->listTop)));
+
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		int32_t rowY = this->listTop + i * _clsStride - (int32_t)this->scrollOffset;
+		if(rowY + _clsRowHeight <= this->listTop) continue;
+		if(rowY >= this->listBottom) break;
+
+		bool_t capturing = this->capturingAction == i;
+		if(this->optBtn) {
+			this->optBtn->setSize((float)this->actionsColumnWidth, (float)_clsRowHeight);
+			this->optBtn->draw(Tesselator::instance, (float)actionsX, (float)rowY);
+		}
+		NinePatchLayer* bindLayer = this->playPressed ? this->playPressed : this->optBtn;
+		if(bindLayer) {
+			bindLayer->setSize((float)(rightX - bindingsX), (float)_clsRowHeight);
+			bindLayer->draw(Tesselator::instance, (float)bindingsX, (float)rowY);
+		}
+
+		int32_t textY = rowY + (_clsRowHeight - 8) / 2;
+		this->drawCenteredString(this->font, ControllerLayout::actionName(i), actionsCX, textY, 0xFFE0E0E0);
+
+		std::string label;
+		uint32_t labelColor;
+		if(capturing) {
+			label = I18n::get("options.controllerlayout.press");
+			labelColor = 0xFFFFA0;
+		} else if(this->working[i].isSet()) {
+			label = this->working[i].describe();
+			labelColor = 0xFFE0E0E0;
+		} else {
+			label = I18n::get("options.controllerlayout.unbound");
+			labelColor = 0xFFA0A0A0;
+		}
+		this->drawCenteredString(this->font, label, bindingsCX, textY, labelColor);
+	}
+	glDisable(0xC11u);
+
+	int32_t barY = this->listTop;
+	int32_t barHeight = 0;
+	this->calcBar(barY, barHeight);
+	int32_t viewHeight = this->listBottom - this->listTop;
+	if(this->contentHeight > viewHeight && viewHeight > 0) {
+		if(this->playPressed) {
+			this->playPressed->setSize((float)_clsScrollW, (float)(viewHeight + 5));
+			this->playPressed->draw(Tesselator::instance, (float)this->scrollBarX, (float)(this->listTop - 3));
+		}
+		if(this->optBtn) {
+			this->optBtn->setSize((float)_clsScrollW, (float)barHeight);
+			this->optBtn->draw(Tesselator::instance, (float)this->scrollBarX, (float)barY);
+		}
+	}
+
+	if(!Gamepad::connected) {
+		std::string notice = I18n::get("options.controllerlayout.nogamepad");
+		int32_t noticeW = this->font->width(notice);
+		int32_t noticeCX = (this->contentLeft + this->scrollBarX + _clsScrollW) / 2;
+		int32_t noticeCY = (this->listTop + this->listBottom) / 2;
+		this->fill(noticeCX - noticeW / 2 - 10, noticeCY - 11, noticeCX + noticeW / 2 + 10, noticeCY + 11, 0xDD000000);
+		this->drawCenteredString(this->font, notice, noticeCX, noticeCY - 4, 0xFFFF5555);
+	}
+
+	Screen::render(a2, a3, a4);
+}
+
+void ControllerLayoutScreen::calcBar(int32_t& outY, int32_t& outH) {
+	int32_t viewHeight = this->listBottom - this->listTop;
+	outY = this->listTop - 3;
+	outH = viewHeight + 5;
+	if(this->contentHeight > viewHeight && viewHeight > 0) {
+		outH = (viewHeight * viewHeight) / this->contentHeight;
+		outH = (outH * 3) / 4;
+		if(outH < 10) outH = 10;
+		if(outH > viewHeight) outH = viewHeight;
+		int32_t maxScroll = this->contentHeight - viewHeight;
+		if(maxScroll > 0) {
+			outY = this->listTop - 3 + (int32_t)(((float)(viewHeight + 5 - outH) * this->scrollOffset) / (float)maxScroll);
+		} else {
+			outY = this->listTop - 3;
+		}
+	}
+}
+
+void ControllerLayoutScreen::tick() {
+	if(this->capturingAction >= 0) {
+		Binding captured;
+		if(ControllerHandler::takeCaptured(captured)) {
+			int32_t action = this->capturingAction;
+			this->capturingAction = -1;
+			bool_t axisTarget = ControllerLayout::isAxisAction(action);
+			bool_t axisBinding = captured.source == BIND_AXIS_FULL;
+			if(axisTarget == axisBinding) {
+				for(int32_t i = 0; i < CA_COUNT; ++i) {
+					if(i == action) continue;
+					if(ControllerLayout::isAxisAction(i) != axisTarget) continue;
+					if(this->working[i].equals(captured)) {
+						this->working[i] = Binding();
+					}
+				}
+				this->working[action] = captured;
+			}
+		}
+	}
+	Screen::tick();
+}
+
+bool_t ControllerLayoutScreen::handleBackEvent(bool_t a2) {
+	if(!a2) {
+		if(this->capturingAction >= 0) {
+			this->capturingAction = -1;
+			ControllerHandler::endCapture();
+			return 1;
+		}
+		this->closeScreen();
+	}
+	return 1;
+}
+
+bool_t ControllerLayoutScreen::renderGameBehind() {
+	return 1;
+}
+
+void ControllerLayoutScreen::buttonClicked(Button* a2) {
+	if(!a2) return;
+	if(a2 == this->buttonSave) {
+		for(int32_t i = 0; i < CA_COUNT; ++i) {
+			ControllerLayout::set(i, this->working[i]);
+		}
+		ControllerLayout::save();
+		this->closeScreen();
+		return;
+	}
+	if(a2 == this->buttonReset) {
+		this->capturingAction = -1;
+		ControllerHandler::endCapture();
+		Binding backup[CA_COUNT];
+		for(int32_t i = 0; i < CA_COUNT; ++i) {
+			backup[i] = ControllerLayout::get(i);
+		}
+		ControllerLayout::resetToDefaults();
+		for(int32_t i = 0; i < CA_COUNT; ++i) {
+			this->working[i] = ControllerLayout::get(i);
+			ControllerLayout::set(i, backup[i]);
+		}
+		return;
+	}
+	if(a2 == this->buttonCancel) {
+		this->closeScreen();
+		return;
+	}
+}
+
+void ControllerLayoutScreen::mouseClicked(int32_t a2, int32_t a3, int32_t a4) {
+	if(a4 == 4 || a4 == 5) {
+		this->scrollTarget += (a4 == 4) ? -((float)_clsStride * 2.0f) : ((float)_clsStride * 2.0f);
+		this->clampScroll();
+		return;
+	}
+
+	if(a4 == 1) {
+		int32_t barY = this->listTop;
+		int32_t barH = 0;
+		this->calcBar(barY, barH);
+		if(a2 >= this->scrollBarX && a2 < this->scrollBarX + _clsScrollW && a3 >= barY && a3 < barY + barH) {
+			this->draggingBar = 1;
+			this->barGrabDY = a3 - barY;
+			Screen::mouseClicked(a2, a3, a4);
+			return;
+		}
+		int32_t idx = this->rowIndexAt(a2, a3);
+		if(idx >= 0) {
+			if(this->capturingAction == idx) {
+				this->capturingAction = -1;
+				ControllerHandler::endCapture();
+			} else {
+				this->capturingAction = idx;
+				ControllerHandler::beginCapture(ControllerLayout::isAxisAction(idx));
+			}
+		} else if(a3 >= this->listTop && a3 < this->listBottom && a2 >= this->contentLeft && a2 <= this->scrollBarX + _clsScrollW) {
+			this->isDragging = 1;
+			this->dragStartY = a3;
+			this->dragStartOffset = this->scrollOffset;
+			this->scrollTarget = this->scrollOffset;
+			this->dragVel = 0.0f;
+			this->lastDragMs = getTimeMs();
+		}
+	}
+
+	Screen::mouseClicked(a2, a3, a4);
+}
+
+void ControllerLayoutScreen::mouseReleased(int32_t a2, int32_t a3, int32_t a4) {
+	if(a4 == 1) {
+		this->draggingBar = 0;
+		if(this->isDragging) {
+			this->isDragging = 0;
+			this->scrollTarget = this->scrollOffset + this->dragVel * 140.0f;
+			this->dragVel = 0.0f;
+			this->clampScroll();
+		}
+	}
+	Screen::mouseReleased(a2, a3, a4);
+}
+
+void ControllerLayoutScreen::keyPressed(int32_t a2) {
+	if(this->capturingAction >= 0) {
+		if(a2 == 255 || a2 == this->minecraft->options.keyMenuCancel.keyCode) {
+			this->capturingAction = -1;
+			ControllerHandler::endCapture();
+		}
+		return;
+	}
+	Screen::keyPressed(a2);
+}
diff --git a/modifiedeight/impl/gui/screens/OptionsScreen.cpp b/modifiedeight/impl/gui/screens/OptionsScreen.cpp
index 7b4cac6b..8d51b33e 100644
--- a/modifiedeight/impl/gui/screens/OptionsScreen.cpp
+++ b/modifiedeight/impl/gui/screens/OptionsScreen.cpp
@@ -11,6 +11,8 @@
 #include <util/IntRectangle.hpp>
 #include <cpputils.hpp>
 
+int32_t OptionsScreen::lastCategory = 0;
+
 OptionsScreen::OptionsScreen(bool_t a2) {
 	this->isInWorld = a2;
 	this->headerOptions = 0;
@@ -69,7 +71,7 @@ void OptionsScreen::generateOptionScreens(void) {
 
 	this->optionPanes[0]->createOptionsGroup("options.group.game")->addOptionItem(&Options::Option::NAME, this->minecraft)->addOptionItem(&Options::Option::DIFFICULTY, this->minecraft)->addOptionItem(&Options::Option::THIRD_PERSON, this->minecraft)->addOptionItem(&Options::Option::SERVER_VISIBLE, this->minecraft)->addOptionItem(&Options::Option::SHOW_COORDINATES, this->minecraft)->addOptionItem(&Options::Option::DEBUG_SCREEN, this->minecraft)->addOptionItem(&Options::Option::HUD_CAMERA_BUTTON, this->minecraft);
 	this->optionPanes[0]->createOptionsGroup("options.group.realms")->addLoginItem(this->minecraft);
-	this->optionPanes[1]->createOptionsGroup("options.group.input")->addOptionItem(&Options::Option::SENSITIVITY, this->minecraft)->addOptionItem(&Options::Option::INVERT_MOUSE, this->minecraft)->addOptionItem(&Options::Option::LEFT_HANDED, this->minecraft)->addOptionItem(&Options::Option::USE_TOUCHSCREEN, this->minecraft)->addOptionItem(&Options::Option::USE_TOUCH_JOYPAD, this->minecraft)->addOptionItem(&Options::Option::PIXELS_PER_MILLIMETER, this->minecraft)->addOptionItem(&Options::Option::SPRINT, this->minecraft)->addOptionItem(&Options::Option::AUTO_JUMP, this->minecraft)->addOptionItem(&Options::Option::SWAP_JUMP_AND_SNEAK, this->minecraft);
+	this->optionPanes[1]->createOptionsGroup("options.group.input")->addOptionItem(&Options::Option::SENSITIVITY, this->minecraft)->addOptionItem(&Options::Option::INVERT_MOUSE, this->minecraft)->addOptionItem(&Options::Option::LEFT_HANDED, this->minecraft)->addOptionItem(&Options::Option::USE_TOUCHSCREEN, this->minecraft)->addOptionItem(&Options::Option::USE_TOUCH_JOYPAD, this->minecraft)->addOptionItem(&Options::Option::PIXELS_PER_MILLIMETER, this->minecraft)->addControllerLayoutItem(this->minecraft, this->isInWorld)->addOptionItem(&Options::Option::CONTROLLER_SENSITIVITY, this->minecraft)->addOptionItem(&Options::Option::CONTROLLER_CURSOR_SENSITIVITY, this->minecraft)->addOptionItem(&Options::Option::SPRINT, this->minecraft)->addOptionItem(&Options::Option::AUTO_JUMP, this->minecraft)->addOptionItem(&Options::Option::SWAP_JUMP_AND_SNEAK, this->minecraft);
 	if(this->minecraft->platform()->supportsVibration()) {
 		this->optionPanes[1]->createOptionsGroup("options.group.feedback")->addOptionItem(&Options::Option::DESTROY_VIBRATION, this->minecraft);
 	}
@@ -100,6 +102,7 @@ void OptionsScreen::selectCategory(int32_t a2) {
 	}
 	if(a2 < this->optionPanes.size()) {
 		this->selectedCategory = this->optionPanes[a2];
+		OptionsScreen::lastCategory = a2;
 	}
 }
 
@@ -215,7 +218,9 @@ void OptionsScreen::setupPositions() {
 			p->setupPositions();
 		}
 	}
-	this->selectCategory(0);
+	int32_t startCategory = OptionsScreen::lastCategory;
+	if(startCategory < 0 || startCategory >= (int32_t)this->optionPanes.size()) startCategory = 0;
+	this->selectCategory(startCategory);
 }
 bool_t OptionsScreen::handleBackEvent(bool_t a2) {
 	if(!a2) {
diff --git a/modifiedeight/impl/gui/screens/PauseScreen.cpp b/modifiedeight/impl/gui/screens/PauseScreen.cpp
index ddfaa340..e98b2f0e 100644
--- a/modifiedeight/impl/gui/screens/PauseScreen.cpp
+++ b/modifiedeight/impl/gui/screens/PauseScreen.cpp
@@ -125,6 +125,12 @@ void PauseScreen::tick() {
 bool_t PauseScreen::renderGameBehind() {
 	return 1;
 }
+bool_t PauseScreen::handleBackEvent(bool_t a2) {
+	if(!a2) {
+		this->minecraft->setScreen(0);
+	}
+	return 1;
+}
 void PauseScreen::buttonClicked(Button* a2) {
 	if(a2->buttonID == this->backToGameButton->buttonID) {
 		this->minecraft->setScreen(0);
diff --git a/modifiedeight/impl/input/ControllerHandler.cpp b/modifiedeight/impl/input/ControllerHandler.cpp
new file mode 100644
index 00000000..340ed31d
--- /dev/null
+++ b/modifiedeight/impl/input/ControllerHandler.cpp
@@ -0,0 +1,366 @@
+#include <input/ControllerHandler.hpp>
+#include <Minecraft.hpp>
+#include <Options.hpp>
+#include <entity/LocalPlayer.hpp>
+#include <entity/Player.hpp>
+#include <gui/Gui.hpp>
+#include <gui/Screen.hpp>
+#include <input/IMoveInput.hpp>
+#include <input/Keyboard.hpp>
+#include <input/Mouse.hpp>
+#include <inventory/Inventory.hpp>
+#include <math.h>
+#include <utils.h>
+
+bool_t ControllerHandler::captureMode = 0;
+bool_t ControllerHandler::captureWantsAxis = 0;
+bool_t ControllerHandler::hasCaptured = 0;
+Binding ControllerHandler::capturedBinding;
+float ControllerHandler::cursorX = -1.0f;
+float ControllerHandler::cursorY = -1.0f;
+int32_t ControllerHandler::scrollRepeat = 0;
+int32_t ControllerHandler::lastPadCursorMs = -100000;
+
+void ControllerHandler::hideCursor() {
+	ControllerHandler::lastPadCursorMs = -100000;
+}
+
+bool_t ControllerHandler::cursorVisible() {
+	if(!Gamepad::connected) return 0;
+	return (getTimeMs() - ControllerHandler::lastPadCursorMs) < 3000;
+}
+float ControllerHandler::moveX = 0.0f;
+float ControllerHandler::moveY = 0.0f;
+bool_t ControllerHandler::jumpHeld = 0;
+bool_t ControllerHandler::sneakHeld = 0;
+bool_t ControllerHandler::sprintHeld = 0;
+bool_t ControllerHandler::attackHeld = 0;
+bool_t ControllerHandler::useHeld = 0;
+bool_t ControllerHandler::confirmHeld = 0;
+float ControllerHandler::frameDt = 1.0f;
+double ControllerHandler::lastFrameS = 0;
+void ControllerHandler::clampVec(float& x, float& y) {
+	float mag2 = x * x + y * y;
+	if(mag2 > 1.0f) {
+		float inv = 1.0f / sqrtf(mag2);
+		x *= inv;
+		y *= inv;
+	}
+}
+int32_t ControllerHandler::lastPerspectiveMs = -100000;
+
+static bool_t _chButtonFree(int32_t button) {
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		Binding b = ControllerLayout::get(i);
+		if(b.source == BIND_BUTTON && b.code == button) return 0;
+	}
+	return 1;
+}
+
+void ControllerHandler::beginCapture(bool_t wantAxis) {
+	ControllerHandler::captureMode = 1;
+	ControllerHandler::captureWantsAxis = wantAxis;
+	ControllerHandler::hasCaptured = 0;
+	ControllerHandler::capturedBinding = Binding();
+}
+
+void ControllerHandler::endCapture() {
+	ControllerHandler::captureMode = 0;
+	ControllerHandler::hasCaptured = 0;
+	ControllerHandler::capturedBinding = Binding();
+}
+
+bool_t ControllerHandler::takeCaptured(Binding& out) {
+	if(!ControllerHandler::hasCaptured) return 0;
+	out = ControllerHandler::capturedBinding;
+	ControllerHandler::hasCaptured = 0;
+	ControllerHandler::captureMode = 0;
+	return 1;
+}
+
+bool_t ControllerHandler::isEnabled(Minecraft* mc) {
+	if(!mc) return 0;
+	if(!Gamepad::connected) return 0;
+	return 1;
+}
+
+void ControllerHandler::releaseAll() {
+	ControllerHandler::moveX = 0.0f;
+	ControllerHandler::moveY = 0.0f;
+	ControllerHandler::jumpHeld = 0;
+	ControllerHandler::sneakHeld = 0;
+	ControllerHandler::sprintHeld = 0;
+	ControllerHandler::scrollRepeat = 0;
+	if(ControllerHandler::attackHeld) {
+		ControllerHandler::attackHeld = 0;
+		if(Options::instance) {
+			Keyboard::feed(Options::instance->keyDestroy.keyCode, 0);
+		}
+	}
+	if(ControllerHandler::useHeld) {
+		ControllerHandler::useHeld = 0;
+		if(Options::instance) {
+			Keyboard::feed(Options::instance->keyUse.keyCode, 0);
+		}
+	}
+}
+
+void ControllerHandler::tick(Minecraft* mc) {
+	double nowS = getTimeS();
+	float dtMs = (float)((nowS - ControllerHandler::lastFrameS) * 1000.0);
+	if(ControllerHandler::lastFrameS == 0) dtMs = 17.0f;
+	if(dtMs < 0.1f) dtMs = 0.1f;
+	if(dtMs > 100.0f) dtMs = 100.0f;
+	ControllerHandler::lastFrameS = nowS;
+	ControllerHandler::frameDt += ((dtMs / 16.6667f) - ControllerHandler::frameDt) * 0.2f;
+	if(!ControllerHandler::isEnabled(mc)) {
+		ControllerHandler::releaseAll();
+		ControllerHandler::confirmHeld = 0;
+		Gamepad::beginFrame();
+		return;
+	}
+
+	if(ControllerHandler::captureMode) {
+		ControllerHandler::releaseAll();
+		ControllerHandler::confirmHeld = 0;
+		if(!ControllerHandler::hasCaptured) {
+			Binding found;
+			if(Gamepad::detectPressedBinding(found, ControllerHandler::captureWantsAxis)) {
+				ControllerHandler::capturedBinding = found;
+				ControllerHandler::hasCaptured = 1;
+			}
+		}
+		Gamepad::beginFrame();
+		return;
+	}
+
+	if(mc->player && !mc->currentScreen) {
+		ControllerHandler::tickGame(mc);
+	} else {
+		ControllerHandler::releaseAll();
+		if(mc->currentScreen) {
+			mc->field_D14 = 1;
+			ControllerHandler::tickMenu(mc);
+			mc->field_D14 = 0;
+			if(mc->field_D15) {
+				mc->setScreen(mc->field_D18);
+				mc->field_D18 = 0;
+				mc->field_D15 = 0;
+			}
+		} else {
+			ControllerHandler::confirmHeld = 0;
+		}
+	}
+
+	Gamepad::beginFrame();
+}
+
+void ControllerHandler::tickGame(Minecraft* mc) {
+	ControllerHandler::confirmHeld = 0;
+
+	float mx = Gamepad::getBindingValue(ControllerLayout::get(CA_MOVE_AXIS_X));
+	float my = Gamepad::getBindingValue(ControllerLayout::get(CA_MOVE_AXIS_Y));
+	ControllerHandler::moveX = mx;
+	ControllerHandler::moveY = my;
+
+	ControllerHandler::jumpHeld = Gamepad::isBindingDown(ControllerLayout::get(CA_JUMP));
+	ControllerHandler::sneakHeld = Gamepad::isBindingDown(ControllerLayout::get(CA_SNEAK));
+
+	static int32_t lastFwdTapMs = 0;
+	static bool_t fwdWasDown = 0;
+	static bool_t sprintLatch = 0;
+	bool_t fwdDown = my < -0.5f;
+	if(fwdDown && !fwdWasDown) {
+		int32_t nowMs = getTimeMs();
+		if(nowMs - lastFwdTapMs < 300) {
+			sprintLatch = 1;
+		}
+		lastFwdTapMs = nowMs;
+	}
+	if(!fwdDown) {
+		sprintLatch = 0;
+	}
+	fwdWasDown = fwdDown;
+	bool_t wantSprint = sprintLatch;
+	if(_chButtonFree(GP_BTN_L3) && Gamepad::isButtonDown(GP_BTN_L3)) {
+		wantSprint = 1;
+	}
+	ControllerHandler::sprintHeld = wantSprint;
+
+	float lx = Gamepad::getBindingValue(ControllerLayout::get(CA_LOOK_AXIS_X));
+	float ly = Gamepad::getBindingValue(ControllerLayout::get(CA_LOOK_AXIS_Y));
+	ControllerHandler::clampVec(lx, ly);
+	if(lx != 0.0f || ly != 0.0f) {
+		float sens = mc->options.controllerSensitivity * ControllerHandler::frameDt;
+		float turnX = lx * sens;
+		float turnY = ly * sens * (mc->options.invertMouse ? 1.0f : -1.0f);
+		mc->player->turn(turnX, turnY);
+	}
+
+	bool_t attack = Gamepad::isBindingDown(ControllerLayout::get(CA_ATTACK));
+	if(attack && !ControllerHandler::attackHeld) {
+		ControllerHandler::attackHeld = 1;
+		Keyboard::feed(mc->options.keyDestroy.keyCode, 1);
+	} else if(!attack && ControllerHandler::attackHeld) {
+		ControllerHandler::attackHeld = 0;
+		Keyboard::feed(mc->options.keyDestroy.keyCode, 0);
+	}
+
+	bool_t use = Gamepad::isBindingDown(ControllerLayout::get(CA_USE_ITEM));
+	if(use && !ControllerHandler::useHeld) {
+		ControllerHandler::useHeld = 1;
+		Keyboard::feed(mc->options.keyUse.keyCode, 1);
+	} else if(!use && ControllerHandler::useHeld) {
+		ControllerHandler::useHeld = 0;
+		Keyboard::feed(mc->options.keyUse.keyCode, 0);
+	}
+
+	int32_t numSlots = mc->gui.getNumSlots();
+	if(numSlots < 3) numSlots = 3;
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_CYCLE_LEFT))) {
+		int32_t slot = mc->player->inventory->selectedSlot - 1;
+		if(slot < 0) slot = numSlots - 2;
+		mc->player->inventory->selectSlot(slot);
+	}
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_CYCLE_RIGHT))) {
+		int32_t slot = mc->player->inventory->selectedSlot + 1;
+		if(slot >= numSlots - 1) slot = 0;
+		mc->player->inventory->selectSlot(slot);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_DROP_ITEM))) {
+		mc->player->inventory->dropSlot(mc->player->inventory->selectedSlot, 0, 0);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_CRAFTING))) {
+		mc->player->startCrafting((int32_t)mc->player->posX, (int32_t)mc->player->posY, (int32_t)mc->player->posZ, 0);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_INVENTORY))) {
+		mc->gui.handleKeyPressed(100);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_TOGGLE_PERSPECTIVE))) {
+		int32_t nowMs = getTimeMs();
+		if(nowMs - ControllerHandler::lastPerspectiveMs >= 350) {
+			ControllerHandler::lastPerspectiveMs = nowMs;
+			mc->options.toggle(&Options::Option::THIRD_PERSON, 1);
+		}
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_GAME_MENU))) {
+		mc->pauseGame(1);
+	} else if(_chButtonFree(GP_BTN_START) && Gamepad::wasButtonPressed(GP_BTN_START)) {
+		mc->pauseGame(1);
+	}
+}
+
+void ControllerHandler::tickMenu(Minecraft* mc) {
+	float sw = (float)mc->field_1C;
+	float sh = (float)mc->field_20;
+	if(sw < 1.0f) sw = 1.0f;
+	if(sh < 1.0f) sh = 1.0f;
+
+	if(ControllerHandler::cursorX < 0.0f || ControllerHandler::cursorX > sw ||
+	   ControllerHandler::cursorY < 0.0f || ControllerHandler::cursorY > sh) {
+		ControllerHandler::cursorX = sw * 0.5f;
+		ControllerHandler::cursorY = sh * 0.5f;
+	}
+
+	float mx = Gamepad::getBindingValue(ControllerLayout::get(CA_MOVE_AXIS_X));
+	float my = Gamepad::getBindingValue(ControllerLayout::get(CA_MOVE_AXIS_Y));
+	ControllerHandler::clampVec(mx, my);
+	float speed = sh * 0.02f * mc->options.controllerCursorSensitivity * ControllerHandler::frameDt;
+	if(speed < 0.0f) speed = 0.0f;
+
+	if(mx != 0.0f || my != 0.0f) {
+		ControllerHandler::cursorX += mx * speed;
+		ControllerHandler::cursorY += my * speed;
+		if(ControllerHandler::cursorX < 0.0f) ControllerHandler::cursorX = 0.0f;
+		if(ControllerHandler::cursorX > sw) ControllerHandler::cursorX = sw;
+		if(ControllerHandler::cursorY < 0.0f) ControllerHandler::cursorY = 0.0f;
+		if(ControllerHandler::cursorY > sh) ControllerHandler::cursorY = sh;
+		Mouse::feed(0, 0, (int16_t)ControllerHandler::cursorX, (int16_t)ControllerHandler::cursorY);
+		ControllerHandler::lastPadCursorMs = getTimeMs();
+	}
+
+	int16_t cx = (int16_t)ControllerHandler::cursorX;
+	int16_t cy = (int16_t)ControllerHandler::cursorY;
+
+	bool_t confirm = Gamepad::isBindingDown(ControllerLayout::get(CA_JUMP));
+	if(confirm && !ControllerHandler::confirmHeld) {
+		ControllerHandler::confirmHeld = 1;
+		ControllerHandler::lastPadCursorMs = getTimeMs();
+		Mouse::feed(1, 1, cx, cy);
+	} else if(!confirm && ControllerHandler::confirmHeld) {
+		ControllerHandler::confirmHeld = 0;
+		Mouse::feed(1, 0, cx, cy);
+	}
+
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_SNEAK))) {
+		mc->handleBack(0);
+		return;
+	}
+
+	float scroll = Gamepad::getBindingValue(ControllerLayout::get(CA_LOOK_AXIS_Y));
+	bool_t up = Gamepad::isBindingDown(ControllerLayout::get(CA_CYCLE_LEFT)) || scroll < -0.4f;
+	bool_t down = Gamepad::isBindingDown(ControllerLayout::get(CA_CYCLE_RIGHT)) || scroll > 0.4f;
+	if(_chButtonFree(GP_BTN_DPAD_UP) && Gamepad::isButtonDown(GP_BTN_DPAD_UP)) up = 1;
+	if(_chButtonFree(GP_BTN_DPAD_DOWN) && Gamepad::isButtonDown(GP_BTN_DPAD_DOWN)) down = 1;
+
+	if(up || down) {
+		if(++ControllerHandler::scrollRepeat % 4 == 1) {
+			int32_t gx = cx;
+			int32_t gy = cy;
+			mc->currentScreen->toGUICoordinate(gx, gy);
+			mc->currentScreen->mouseClicked(gx, gy, up ? 4 : 5);
+		}
+	} else {
+		ControllerHandler::scrollRepeat = 0;
+	}
+}
+
+void ControllerHandler::applyMove(IMoveInput* input, Player* player) {
+	if(!input || !player) return;
+	if(!Gamepad::connected) return;
+	if(ControllerHandler::captureMode) return;
+
+	float mx = ControllerHandler::moveX;
+	float my = ControllerHandler::moveY;
+	bool_t flying = player->abilities.flying;
+
+	if(mx != 0.0f || my != 0.0f) {
+		float strafe = -mx;
+		float forward = -my;
+		if(ControllerHandler::sneakHeld && !flying) {
+			strafe = strafe * 0.3f;
+			forward = forward * 0.3f;
+		}
+		input->strafeInput = strafe;
+		input->forwardInput = forward;
+	}
+
+	if(ControllerHandler::jumpHeld) {
+		input->jumpingMaybe = 1;
+		if(flying) {
+			input->flyUpPressed = 1;
+		}
+	}
+
+	if(ControllerHandler::sneakHeld) {
+		if(flying) {
+			input->flyDownPressed = 1;
+			input->sneakingMaybe = 0;
+		} else {
+			input->sneakingMaybe = 1;
+		}
+	}
+
+	if(player->isLocalPlayer()) {
+		LocalPlayer* lp = (LocalPlayer*)player;
+		if(ControllerHandler::sprintHeld && input->forwardInput > 0.5f && !ControllerHandler::sneakHeld) {
+			lp->setSprinting(1);
+		}
+	}
+}
diff --git a/modifiedeight/impl/input/ControllerLayout.cpp b/modifiedeight/impl/input/ControllerLayout.cpp
new file mode 100644
index 00000000..74d2578c
--- /dev/null
+++ b/modifiedeight/impl/input/ControllerLayout.cpp
@@ -0,0 +1,148 @@
+#include <input/ControllerLayout.hpp>
+#include <stdio.h>
+#include <string.h>
+
+Binding ControllerLayout::bindings[CA_COUNT];
+std::string ControllerLayout::filePath = "";
+bool_t ControllerLayout::loaded = 0;
+
+static const char_t* _caNames[CA_COUNT] = {
+	"Jump/Fly Up",
+	"Drop Item",
+	"Attack/Destroy",
+	"Use Item/Place Block",
+	"Crafting",
+	"Inventory",
+	"Cycle Item Left",
+	"Cycle Item Right",
+	"Toggle Perspective",
+	"Sneak/Fly Down",
+	"Game Menu",
+	"Move Left/Right",
+	"Move Forward/Back",
+	"Look Left/Right",
+	"Look Up/Down"
+};
+
+static const char_t* _caKeys[CA_COUNT] = {
+	"jump",
+	"drop",
+	"attack",
+	"use",
+	"crafting",
+	"inventory",
+	"cycleleft",
+	"cycleright",
+	"perspective",
+	"sneak",
+	"gamemenu",
+	"movex",
+	"movey",
+	"lookx",
+	"looky"
+};
+
+void ControllerLayout::init(const std::string& a1) {
+	ControllerLayout::filePath = a1 + "/controller_layout.txt";
+	ControllerLayout::resetToDefaults();
+	ControllerLayout::load();
+}
+
+void ControllerLayout::resetToDefaults() {
+	ControllerLayout::bindings[CA_JUMP] = Binding(BIND_BUTTON, GP_BTN_A);
+	ControllerLayout::bindings[CA_DROP_ITEM] = Binding(BIND_BUTTON, GP_BTN_R3);
+	ControllerLayout::bindings[CA_ATTACK] = Binding(BIND_AXIS_POSITIVE, GP_AXIS_RT);
+	ControllerLayout::bindings[CA_USE_ITEM] = Binding(BIND_AXIS_POSITIVE, GP_AXIS_LT);
+	ControllerLayout::bindings[CA_CRAFTING] = Binding(BIND_BUTTON, GP_BTN_X);
+	ControllerLayout::bindings[CA_INVENTORY] = Binding(BIND_BUTTON, GP_BTN_Y);
+	ControllerLayout::bindings[CA_CYCLE_LEFT] = Binding(BIND_BUTTON, GP_BTN_LB);
+	ControllerLayout::bindings[CA_CYCLE_RIGHT] = Binding(BIND_BUTTON, GP_BTN_RB);
+	ControllerLayout::bindings[CA_TOGGLE_PERSPECTIVE] = Binding(BIND_BUTTON, GP_BTN_DPAD_DOWN);
+	ControllerLayout::bindings[CA_SNEAK] = Binding(BIND_BUTTON, GP_BTN_B);
+	ControllerLayout::bindings[CA_MOVE_AXIS_X] = Binding(BIND_AXIS_FULL, GP_AXIS_LX);
+	ControllerLayout::bindings[CA_MOVE_AXIS_Y] = Binding(BIND_AXIS_FULL, GP_AXIS_LY);
+	ControllerLayout::bindings[CA_LOOK_AXIS_X] = Binding(BIND_AXIS_FULL, GP_AXIS_RX);
+	ControllerLayout::bindings[CA_LOOK_AXIS_Y] = Binding(BIND_AXIS_FULL, GP_AXIS_RY);
+	ControllerLayout::bindings[CA_GAME_MENU] = Binding(BIND_BUTTON, GP_BTN_START);
+}
+
+void ControllerLayout::load() {
+	if(ControllerLayout::filePath.empty()) return;
+	FILE* f = fopen(ControllerLayout::filePath.c_str(), "r");
+	if(!f) {
+		ControllerLayout::loaded = 1;
+		return;
+	}
+	char_t line[128];
+	while(fgets(line, sizeof(line), f)) {
+		size_t len = strlen(line);
+		while(len > 0 && (line[len - 1] == '\n' || line[len - 1] == '\r' || line[len - 1] == ' ' || line[len - 1] == '\t')) {
+			line[--len] = 0;
+		}
+		if(len < 3) continue;
+		std::string s = line;
+		size_t sep = s.find(':');
+		if(sep == std::string::npos) continue;
+		std::string key = s.substr(0, sep);
+		std::string val = s.substr(sep + 1);
+		for(int32_t i = 0; i < CA_COUNT; ++i) {
+			if(key == _caKeys[i]) {
+				ControllerLayout::bindings[i] = Binding::parse(val);
+				break;
+			}
+		}
+	}
+	fclose(f);
+	ControllerLayout::loaded = 1;
+}
+
+void ControllerLayout::save() {
+	if(ControllerLayout::filePath.empty()) return;
+	FILE* f = fopen(ControllerLayout::filePath.c_str(), "w");
+	if(!f) return;
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		fprintf(f, "%s:%s\n", _caKeys[i], ControllerLayout::bindings[i].serialize().c_str());
+	}
+	fclose(f);
+}
+
+Binding ControllerLayout::get(int32_t a1) {
+	if(a1 < 0 || a1 >= CA_COUNT) return Binding();
+	return ControllerLayout::bindings[a1];
+}
+
+void ControllerLayout::set(int32_t a1, const Binding& a2) {
+	if(a1 < 0 || a1 >= CA_COUNT) return;
+	ControllerLayout::bindings[a1] = a2;
+}
+
+void ControllerLayout::clearConflicts(int32_t a1, const Binding& a2) {
+	if(!a2.isSet()) return;
+	bool_t axisTarget = ControllerLayout::isAxisAction(a1);
+	for(int32_t i = 0; i < CA_COUNT; ++i) {
+		if(i == a1) continue;
+		if(ControllerLayout::isAxisAction(i) != axisTarget) continue;
+		if(ControllerLayout::bindings[i].equals(a2)) {
+			ControllerLayout::bindings[i] = Binding();
+		}
+	}
+}
+
+bool_t ControllerLayout::isAxisAction(int32_t a1) {
+	return a1 >= CA_MOVE_AXIS_X && a1 <= CA_LOOK_AXIS_Y;
+}
+
+const char_t* ControllerLayout::actionName(int32_t a1) {
+	if(a1 < 0 || a1 >= CA_COUNT) return "";
+	return _caNames[a1];
+}
+
+const char_t* ControllerLayout::actionKey(int32_t a1) {
+	if(a1 < 0 || a1 >= CA_COUNT) return "";
+	return _caKeys[a1];
+}
+
+std::string ControllerLayout::describe(int32_t a1) {
+	if(a1 < 0 || a1 >= CA_COUNT) return "Unbound";
+	return ControllerLayout::bindings[a1].describe();
+}
diff --git a/modifiedeight/impl/input/Gamepad.cpp b/modifiedeight/impl/input/Gamepad.cpp
new file mode 100644
index 00000000..44723600
--- /dev/null
+++ b/modifiedeight/impl/input/Gamepad.cpp
@@ -0,0 +1,412 @@
+#include <input/Gamepad.hpp>
+#include <stdio.h>
+#include <stdlib.h>
+
+bool_t Gamepad::connected = 0;
+bool_t Gamepad::buttons[GP_BTN_COUNT];
+bool_t Gamepad::pressLatch[GP_BTN_COUNT];
+bool_t Gamepad::releaseLatch[GP_BTN_COUNT];
+float Gamepad::axes[GP_AXIS_COUNT];
+float Gamepad::prevAxes[GP_AXIS_COUNT];
+int32_t Gamepad::buttonRaw[GP_BTN_COUNT];
+int32_t Gamepad::axisRaw[GP_AXIS_COUNT];
+float Gamepad::deadzone = 0.18f;
+float Gamepad::triggerThreshold = 0.35f;
+
+static const char_t* _gpButtonNames[GP_BTN_COUNT] = {
+	"A", "B", "X", "Y",
+	"LB", "RB", "Back", "Start",
+	"L3", "R3", "LT", "RT",
+	"D-Pad Up", "D-Pad Down", "D-Pad Left", "D-Pad Right",
+	"Mode", "C", "Z",
+	"Button 19", "Button 20", "Button 21", "Button 22", "Button 23"
+};
+
+static const char_t* _gpAxisNames[GP_AXIS_COUNT] = {
+	"Left Stick X", "Left Stick Y",
+	"Right Stick X", "Right Stick Y",
+	"Left Trigger", "Right Trigger"
+};
+
+Binding::Binding() {
+	this->source = BIND_NONE;
+	this->code = 0;
+	this->raw = -1;
+}
+
+Binding::Binding(int32_t a2, int32_t a3) {
+	this->source = a2;
+	this->code = a3;
+	this->raw = -1;
+}
+
+bool_t Binding::isSet() const {
+	return this->source != BIND_NONE;
+}
+
+bool_t Binding::equals(const Binding& a2) const {
+	return this->source == a2.source && this->code == a2.code;
+}
+
+std::string Binding::describe() const {
+	char_t buf[32];
+	switch(this->source) {
+		case BIND_BUTTON:
+			if(this->code == GP_BTN_LT) {
+				return "Trigger 0";
+			}
+			if(this->code == GP_BTN_RT) {
+				return "Trigger 1";
+			}
+			sprintf(buf, "Button %d", this->raw >= 0 ? this->raw : this->code);
+			return buf;
+		case BIND_AXIS_POSITIVE:
+		case BIND_AXIS_NEGATIVE:
+			if(this->code == GP_AXIS_LT) {
+				return "Trigger 0";
+			}
+			if(this->code == GP_AXIS_RT) {
+				return "Trigger 1";
+			}
+			sprintf(buf, "Axis %d %c", this->code, this->source == BIND_AXIS_POSITIVE ? '+' : '-');
+			return buf;
+		case BIND_AXIS_FULL:
+			if(this->code == GP_AXIS_LT) {
+				return "Trigger 0";
+			}
+			if(this->code == GP_AXIS_RT) {
+				return "Trigger 1";
+			}
+			sprintf(buf, "Axis %d", this->code);
+			return buf;
+		default:
+			return "Unbound";
+	}
+}
+
+std::string Binding::serialize() const {
+	char_t buf[32];
+	if(this->raw >= 0) {
+		sprintf(buf, "%d/%d/%d", this->source, this->code, this->raw);
+	} else {
+		sprintf(buf, "%d/%d", this->source, this->code);
+	}
+	return buf;
+}
+
+Binding Binding::parse(const std::string& a1) {
+	Binding res;
+	if(a1.empty()) return res;
+	size_t sep = a1.find('/');
+	if(sep == std::string::npos) return res;
+	int32_t src = atoi(a1.substr(0, sep).c_str());
+	std::string rest = a1.substr(sep + 1);
+	int32_t code = atoi(rest.c_str());
+	int32_t raw = -1;
+	size_t sep2 = rest.find('/');
+	if(sep2 != std::string::npos) {
+		raw = atoi(rest.substr(sep2 + 1).c_str());
+	}
+	if(src <= BIND_NONE || src > BIND_AXIS_FULL) return res;
+	if(src == BIND_BUTTON) {
+		if(code < 0 || code >= GP_BTN_COUNT) return res;
+	} else {
+		if(code < 0 || code >= GP_AXIS_COUNT) return res;
+	}
+	res.source = src;
+	res.code = code;
+	res.raw = raw;
+	return res;
+}
+
+void Gamepad::reset() {
+	for(int32_t i = 0; i < GP_BTN_COUNT; ++i) {
+		Gamepad::buttons[i] = 0;
+		Gamepad::pressLatch[i] = 0;
+		Gamepad::releaseLatch[i] = 0;
+		Gamepad::buttonRaw[i] = -1;
+	}
+	for(int32_t i = 0; i < GP_AXIS_COUNT; ++i) {
+		Gamepad::axes[i] = 0.0f;
+		Gamepad::prevAxes[i] = 0.0f;
+		Gamepad::axisRaw[i] = -1;
+	}
+}
+
+void Gamepad::beginFrame() {
+	for(int32_t i = 0; i < GP_BTN_COUNT; ++i) {
+		Gamepad::pressLatch[i] = 0;
+		Gamepad::releaseLatch[i] = 0;
+	}
+	for(int32_t i = 0; i < GP_AXIS_COUNT; ++i) {
+		Gamepad::prevAxes[i] = Gamepad::axes[i];
+	}
+}
+
+void Gamepad::setConnected(bool_t a1) {
+	if(!a1 && Gamepad::connected) {
+		Gamepad::reset();
+	}
+	Gamepad::connected = a1;
+}
+
+void Gamepad::feedButton(int32_t a1, bool_t a2, int32_t raw) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return;
+	bool_t down = a2 ? 1 : 0;
+	if(down && !Gamepad::buttons[a1]) {
+		Gamepad::pressLatch[a1] = 1;
+	} else if(!down && Gamepad::buttons[a1]) {
+		Gamepad::releaseLatch[a1] = 1;
+	}
+	Gamepad::buttons[a1] = down;
+	if(raw >= 0) {
+		Gamepad::buttonRaw[a1] = raw;
+	}
+}
+
+void Gamepad::feedAxis(int32_t a1, float a2, int32_t raw) {
+	if(a1 < 0 || a1 >= GP_AXIS_COUNT) return;
+	if(a2 > 1.0f) a2 = 1.0f;
+	if(a2 < -1.0f) a2 = -1.0f;
+	Gamepad::axes[a1] = a2;
+	if(raw >= 0) {
+		Gamepad::axisRaw[a1] = raw;
+	}
+}
+
+void Gamepad::feedHat(bool_t up, bool_t down, bool_t left, bool_t right) {
+	Gamepad::feedButton(GP_BTN_DPAD_UP, up);
+	Gamepad::feedButton(GP_BTN_DPAD_DOWN, down);
+	Gamepad::feedButton(GP_BTN_DPAD_LEFT, left);
+	Gamepad::feedButton(GP_BTN_DPAD_RIGHT, right);
+}
+
+void Gamepad::syncDerivedButtons() {
+	if(Gamepad::axes[GP_AXIS_LT] > Gamepad::triggerThreshold) {
+		Gamepad::feedButton(GP_BTN_LT, 1);
+	} else if(Gamepad::axes[GP_AXIS_LT] < Gamepad::triggerThreshold * 0.5f) {
+		Gamepad::feedButton(GP_BTN_LT, 0);
+	}
+	if(Gamepad::axes[GP_AXIS_RT] > Gamepad::triggerThreshold) {
+		Gamepad::feedButton(GP_BTN_RT, 1);
+	} else if(Gamepad::axes[GP_AXIS_RT] < Gamepad::triggerThreshold * 0.5f) {
+		Gamepad::feedButton(GP_BTN_RT, 0);
+	}
+}
+
+int32_t Gamepad::mapRawButton(int32_t keyCode, int32_t fallbackIndex) {
+	switch(keyCode) {
+		case 96: return GP_BTN_A;
+		case 97: return GP_BTN_B;
+		case 98: return GP_BTN_C;
+		case 99: return GP_BTN_X;
+		case 100: return GP_BTN_Y;
+		case 101: return GP_BTN_Z;
+		case 102: return GP_BTN_LB;
+		case 103: return GP_BTN_RB;
+		case 104: return GP_BTN_LT;
+		case 105: return GP_BTN_RT;
+		case 106: return GP_BTN_L3;
+		case 107: return GP_BTN_R3;
+		case 108: return GP_BTN_START;
+		case 109: return GP_BTN_BACK;
+		case 110: return GP_BTN_MODE;
+		case 19: return GP_BTN_DPAD_UP;
+		case 20: return GP_BTN_DPAD_DOWN;
+		case 21: return GP_BTN_DPAD_LEFT;
+		case 22: return GP_BTN_DPAD_RIGHT;
+		case 23: return GP_BTN_A;
+		case 4: return GP_BTN_B;
+		case 82: return GP_BTN_START;
+		default:
+			if(keyCode >= 188 && keyCode <= 202) {
+				int32_t idx = GP_BTN_EXTRA_0 + (keyCode - 188);
+				if(idx < GP_BTN_COUNT) return idx;
+			}
+			return fallbackIndex;
+	}
+}
+
+int32_t Gamepad::mapSdlButton(int32_t index, int32_t numButtons, int32_t numAxes) {
+	if(index < 0) return -1;
+	if(numButtons >= 11 && numAxes >= 6) {
+		switch(index) {
+			case 8: return GP_BTN_MODE;
+			case 9: return GP_BTN_L3;
+			case 10: return GP_BTN_R3;
+			default: break;
+		}
+	}
+	if(index >= GP_BTN_COUNT) return -1;
+	return index;
+}
+
+float Gamepad::applyDeadzone(float a1) {
+	float mag = a1 < 0.0f ? -a1 : a1;
+	if(mag < Gamepad::deadzone) return 0.0f;
+	float scaled = (mag - Gamepad::deadzone) / (1.0f - Gamepad::deadzone);
+	if(scaled > 1.0f) scaled = 1.0f;
+	return a1 < 0.0f ? -scaled : scaled;
+}
+
+bool_t Gamepad::isButtonDown(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return 0;
+	return Gamepad::buttons[a1];
+}
+
+bool_t Gamepad::wasButtonPressed(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return 0;
+	return Gamepad::pressLatch[a1];
+}
+
+bool_t Gamepad::wasButtonReleased(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return 0;
+	return Gamepad::releaseLatch[a1];
+}
+
+float Gamepad::getAxis(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_AXIS_COUNT) return 0.0f;
+	return Gamepad::applyDeadzone(Gamepad::axes[a1]);
+}
+
+float Gamepad::getPrevAxis(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_AXIS_COUNT) return 0.0f;
+	return Gamepad::applyDeadzone(Gamepad::prevAxes[a1]);
+}
+
+bool_t Gamepad::isBindingDown(const Binding& a1) {
+	switch(a1.source) {
+		case BIND_BUTTON:
+			return Gamepad::isButtonDown(a1.code);
+		case BIND_AXIS_POSITIVE:
+			return Gamepad::getAxis(a1.code) > Gamepad::triggerThreshold;
+		case BIND_AXIS_NEGATIVE:
+			return Gamepad::getAxis(a1.code) < -Gamepad::triggerThreshold;
+		case BIND_AXIS_FULL:
+			{
+				float v = Gamepad::getAxis(a1.code);
+				return (v > Gamepad::triggerThreshold) || (v < -Gamepad::triggerThreshold);
+			}
+		default:
+			return 0;
+	}
+}
+
+static bool_t _axisWasDown(int32_t source, int32_t code) {
+	float v = Gamepad::getPrevAxis(code);
+	switch(source) {
+		case BIND_AXIS_POSITIVE:
+			return v > Gamepad::triggerThreshold;
+		case BIND_AXIS_NEGATIVE:
+			return v < -Gamepad::triggerThreshold;
+		case BIND_AXIS_FULL:
+			return (v > Gamepad::triggerThreshold) || (v < -Gamepad::triggerThreshold);
+		default:
+			return 0;
+	}
+}
+
+bool_t Gamepad::wasBindingPressed(const Binding& a1) {
+	if(a1.source == BIND_BUTTON) {
+		return Gamepad::wasButtonPressed(a1.code);
+	}
+	if(a1.source == BIND_NONE) {
+		return 0;
+	}
+	if(a1.code == GP_AXIS_LT) {
+		return Gamepad::wasButtonPressed(GP_BTN_LT);
+	}
+	if(a1.code == GP_AXIS_RT) {
+		return Gamepad::wasButtonPressed(GP_BTN_RT);
+	}
+	return Gamepad::isBindingDown(a1) && !_axisWasDown(a1.source, a1.code);
+}
+
+bool_t Gamepad::wasBindingReleased(const Binding& a1) {
+	if(a1.source == BIND_BUTTON) {
+		return Gamepad::wasButtonReleased(a1.code);
+	}
+	if(a1.source == BIND_NONE) {
+		return 0;
+	}
+	if(a1.code == GP_AXIS_LT) {
+		return Gamepad::wasButtonReleased(GP_BTN_LT);
+	}
+	if(a1.code == GP_AXIS_RT) {
+		return Gamepad::wasButtonReleased(GP_BTN_RT);
+	}
+	return !Gamepad::isBindingDown(a1) && _axisWasDown(a1.source, a1.code);
+}
+
+float Gamepad::getBindingValue(const Binding& a1) {
+	switch(a1.source) {
+		case BIND_BUTTON:
+			return Gamepad::isButtonDown(a1.code) ? 1.0f : 0.0f;
+		case BIND_AXIS_POSITIVE:
+			{
+				float v = Gamepad::getAxis(a1.code);
+				return v > 0.0f ? v : 0.0f;
+			}
+		case BIND_AXIS_NEGATIVE:
+			{
+				float v = Gamepad::getAxis(a1.code);
+				return v < 0.0f ? -v : 0.0f;
+			}
+		case BIND_AXIS_FULL:
+			return Gamepad::getAxis(a1.code);
+		default:
+			return 0.0f;
+	}
+}
+
+bool_t Gamepad::detectPressedBinding(Binding& out, bool_t wantAxis) {
+	if(wantAxis) {
+		for(int32_t i = 0; i < GP_AXIS_COUNT; ++i) {
+			if(i == GP_AXIS_LT || i == GP_AXIS_RT) continue;
+			float v = Gamepad::getAxis(i);
+			if(v > 0.6f || v < -0.6f) {
+				out.source = BIND_AXIS_FULL;
+				out.code = i;
+				out.raw = Gamepad::axisRaw[i];
+				return 1;
+			}
+		}
+		return 0;
+	}
+	for(int32_t i = 0; i < GP_BTN_COUNT; ++i) {
+		if(Gamepad::wasButtonPressed(i)) {
+			out.source = BIND_BUTTON;
+			out.code = i;
+			out.raw = Gamepad::buttonRaw[i];
+			return 1;
+		}
+	}
+	for(int32_t i = 0; i < GP_AXIS_COUNT; ++i) {
+		if(i == GP_AXIS_LT || i == GP_AXIS_RT) continue;
+		float v = Gamepad::getAxis(i);
+		float p = Gamepad::getPrevAxis(i);
+		if(v > 0.7f && p <= 0.7f) {
+			out.source = BIND_AXIS_POSITIVE;
+			out.code = i;
+			out.raw = Gamepad::axisRaw[i];
+			return 1;
+		}
+		if(v < -0.7f && p >= -0.7f) {
+			out.source = BIND_AXIS_NEGATIVE;
+			out.code = i;
+			out.raw = Gamepad::axisRaw[i];
+			return 1;
+		}
+	}
+	return 0;
+}
+
+const char_t* Gamepad::buttonName(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_BTN_COUNT) return "Unbound";
+	return _gpButtonNames[a1];
+}
+
+const char_t* Gamepad::axisName(int32_t a1) {
+	if(a1 < 0 || a1 >= GP_AXIS_COUNT) return "Unbound";
+	return _gpAxisNames[a1];
+}
diff --git a/modifiedeight/impl/input/KeyboardInput.cpp b/modifiedeight/impl/input/KeyboardInput.cpp
index c4cb25ae..bb8a24a3 100644
--- a/modifiedeight/impl/input/KeyboardInput.cpp
+++ b/modifiedeight/impl/input/KeyboardInput.cpp
@@ -2,6 +2,7 @@
 #include <Options.hpp>
 #include <entity/Player.hpp>
 #include <entity/LocalPlayer.hpp>
+#include <input/ControllerHandler.hpp>
 
 KeyboardInput::KeyboardInput(Options* a2) {
 	this->strafeInput = 0;
@@ -68,6 +69,7 @@ void KeyboardInput::tick(Player* a2) {
 	if(this->inputs[6]) {
 		a2->startCrafting((int32_t)a2->posX, (int32_t)a2->posY, (int32_t)a2->posZ, 0);
 	}
+	ControllerHandler::applyMove(this, a2);
 }
 void KeyboardInput::setKey(int32_t a2, bool_t a3) {
 	Options* options; // r4
diff --git a/modifiedeight/impl/input/TouchscreenInput.cpp b/modifiedeight/impl/input/TouchscreenInput.cpp
index 7b9a5830..f7031019 100644
--- a/modifiedeight/impl/input/TouchscreenInput.cpp
+++ b/modifiedeight/impl/input/TouchscreenInput.cpp
@@ -1,6 +1,7 @@
 #include <Config.hpp>
 #include <Minecraft.hpp>
 #include <entity/LocalPlayer.hpp>
+#include <input/ControllerHandler.hpp>
 #include <input/Multitouch.hpp>
 #include <input/TouchscreenInput.hpp>
 #include <math/Mth.hpp>
@@ -471,6 +472,7 @@ void TouchscreenInput::tick(Player *a2) {
       lp->setSprinting(false);
     }
   }
+  ControllerHandler::applyMove(this, a2);
 }
 void TouchscreenInput::render(float a2) {
   this->minecraft->texturesPtr->loadAndBindTexture("gui/gui.png");
diff --git a/modifiedeight/impl/rendering/GameRenderer.cpp b/modifiedeight/impl/rendering/GameRenderer.cpp
index b4003d87..b9b2ce65 100644
--- a/modifiedeight/impl/rendering/GameRenderer.cpp
+++ b/modifiedeight/impl/rendering/GameRenderer.cpp
@@ -3,6 +3,7 @@
 #include <entity/LocalPlayer.hpp>
 #include <entity/player/gamemode/GameMode.hpp>
 #include <gui/Screen.hpp>
+#include <input/ControllerHandler.hpp>
 #include <input/IInputHolder.hpp>
 #include <input/KeyboardInput.hpp>
 #include <input/Mouse.hpp>
@@ -576,6 +577,15 @@ void GameRenderer::render(float pt) {
 
 	if(this->minecraft->currentScreen) {
 		this->minecraft->currentScreen->render(mx, my, pt);
+		if(ControllerHandler::cursorVisible()) {
+			int32_t gx = (int32_t)(ControllerHandler::cursorX * Gui::InvGuiScale);
+			int32_t gy = (int32_t)(ControllerHandler::cursorY * Gui::InvGuiScale);
+			Screen* scr = this->minecraft->currentScreen;
+			scr->fill(gx - 5, gy - 1, gx + 6, gy + 2, 0xFF000000);
+			scr->fill(gx - 1, gy - 5, gx + 2, gy + 6, 0xFF000000);
+			scr->fill(gx - 4, gy, gx + 5, gy + 1, 0xFFFFFFFF);
+			scr->fill(gx, gy - 4, gx + 1, gy + 5, 0xFFFFFFFF);
+		}
 	}
 }
 void GameRenderer::renderItemInHand(float a2, int32_t a3) {
diff --git a/platforms/android/app/src/classic/assets/lang/en_US.lang b/platforms/android/app/src/classic/assets/lang/en_US.lang
index 48a1a428..e9f3250a 100644
--- a/platforms/android/app/src/classic/assets/lang/en_US.lang
+++ b/platforms/android/app/src/classic/assets/lang/en_US.lang
@@ -160,6 +160,8 @@ options.gamma.min=Moody
 options.gamma.max=Bright
 options.hidegui=Hide GUI
 options.sensitivity=Sensitivity
+options.controllersensitivity=Controller Sensitivity
+options.controllercursorsensitivity=Controller Cursor Sensitivity
 options.sensitivity.min=*yawn*
 options.sensitivity.max=HYPERSPEED!!!
 options.renderDistance=View Distance
diff --git a/platforms/android/app/src/newadditions/assets/lang/en_US.lang b/platforms/android/app/src/newadditions/assets/lang/en_US.lang
index 0e3ba6cd..dcc8a0b4 100644
--- a/platforms/android/app/src/newadditions/assets/lang/en_US.lang
+++ b/platforms/android/app/src/newadditions/assets/lang/en_US.lang
@@ -160,6 +160,8 @@ options.gamma.min=Moody
 options.gamma.max=Bright
 options.hidegui=Hide GUI
 options.sensitivity=Sensitivity
+options.controllersensitivity=Controller Sensitivity
+options.controllercursorsensitivity=Controller Cursor Sensitivity
 options.sensitivity.min=*yawn*
 options.sensitivity.max=HYPERSPEED!!!
 options.renderDistance=View Distance
diff --git a/platforms/ios/AGENTS.md b/platforms/ios/AGENTS.md
index fcd4d8f9..f3216b38 100644
--- a/platforms/ios/AGENTS.md
+++ b/platforms/ios/AGENTS.md
@@ -52,6 +52,18 @@ NBCraft-style Linux cross-compile path for an iOS build of MCPE 0.8.1.
   excluded on iOS (no libcurl in the public SDK); `CreateJob` returns the
   stubbed job like Android. Re-implementing networking is a TODO.
 
+## MFi gamepad support (`GamepadMFi.h/.mm`, shared by both trees)
+- `main.mm` calls `GamepadMFi_poll()` every `tick:` before `g_app->update()`,
+  feeding the shared `Gamepad` state (same canonical indices as the SDL/Android
+  backends): A/B/X/Y → 0..3, shoulders → 4/5, L3/R3 → 8/9, sticks → axes 0..3
+  (Y negated to match SDL sign), analog triggers → axes 4/5, D-pad → hat,
+  menu button (via `controllerPausedHandler`) → momentary START (7).
+- Bindings UI, `ControllerHandler` and `controller_layout.txt` work unchanged.
+- Only iOS 7/8-era `GameController` APIs are used (extended profile only, no
+  `buttonMenu`/`microGamepad`); `GameController.framework` is linked in both
+  trees' `MCPE_IOS` CMake blocks. New `.mm` files are picked up automatically
+  by the existing `file(GLOB IOS_PLATFORM_SRC ...)` in both trees.
+
 ## App shell — DONE (it links + produces an ipa)
 The Objective-C++ shell now exists in this directory and matches THIS decomp's
 API:
diff --git a/platforms/ios/GamepadMFi.h b/platforms/ios/GamepadMFi.h
new file mode 100644
index 00000000..ebea168f
--- /dev/null
+++ b/platforms/ios/GamepadMFi.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void GamepadMFi_poll(void);
diff --git a/platforms/ios/GamepadMFi.mm b/platforms/ios/GamepadMFi.mm
new file mode 100644
index 00000000..fd064bf2
--- /dev/null
+++ b/platforms/ios/GamepadMFi.mm
@@ -0,0 +1,57 @@
+#import <Foundation/Foundation.h>
+#import <GameController/GameController.h>
+
+#include <input/Gamepad.hpp>
+
+static GCController *s_pad = nil;
+static BOOL s_menuTap = NO;
+
+void GamepadMFi_poll(void) {
+	@autoreleasepool {
+		GCController *pad = nil;
+		for (GCController *c in [GCController controllers]) {
+			if (c.extendedGamepad) {
+				pad = c;
+				break;
+			}
+		}
+		if (!pad) {
+			s_pad = nil;
+			s_menuTap = NO;
+			Gamepad::setConnected(0);
+			return;
+		}
+		if (s_pad != pad) {
+			s_pad = pad;
+			pad.controllerPausedHandler = ^(GCController *controller) {
+				(void)controller;
+				s_menuTap = YES;
+			};
+		}
+		GCExtendedGamepad *gp = pad.extendedGamepad;
+		Gamepad::setConnected(1);
+		Gamepad::feedButton(GP_BTN_A, gp.buttonA.pressed != 0, GP_BTN_A);
+		Gamepad::feedButton(GP_BTN_B, gp.buttonB.pressed != 0, GP_BTN_B);
+		Gamepad::feedButton(GP_BTN_X, gp.buttonX.pressed != 0, GP_BTN_X);
+		Gamepad::feedButton(GP_BTN_Y, gp.buttonY.pressed != 0, GP_BTN_Y);
+		Gamepad::feedButton(GP_BTN_LB, gp.leftShoulder.pressed != 0, GP_BTN_LB);
+		Gamepad::feedButton(GP_BTN_RB, gp.rightShoulder.pressed != 0, GP_BTN_RB);
+		Gamepad::feedButton(GP_BTN_L3, gp.leftThumbstickButton.pressed != 0, GP_BTN_L3);
+		Gamepad::feedButton(GP_BTN_R3, gp.rightThumbstickButton.pressed != 0, GP_BTN_R3);
+		Gamepad::feedAxis(GP_AXIS_LX, gp.leftThumbstick.xValue, 0);
+		Gamepad::feedAxis(GP_AXIS_LY, -gp.leftThumbstick.yValue, 1);
+		Gamepad::feedAxis(GP_AXIS_RX, gp.rightThumbstick.xValue, 2);
+		Gamepad::feedAxis(GP_AXIS_RY, -gp.rightThumbstick.yValue, 3);
+		Gamepad::feedAxis(GP_AXIS_LT, gp.leftTrigger.value, 4);
+		Gamepad::feedAxis(GP_AXIS_RT, gp.rightTrigger.value, 5);
+		Gamepad::feedHat(gp.dpad.up.pressed != 0, gp.dpad.down.pressed != 0,
+			gp.dpad.left.pressed != 0, gp.dpad.right.pressed != 0);
+		Gamepad::syncDerivedButtons();
+		if (s_menuTap) {
+			s_menuTap = NO;
+			Gamepad::feedButton(GP_BTN_START, 1, GP_BTN_START);
+		} else {
+			Gamepad::feedButton(GP_BTN_START, 0, GP_BTN_START);
+		}
+	}
+}
diff --git a/platforms/ios/main.mm b/platforms/ios/main.mm
index 58d0c1a1..8fa030b5 100644
--- a/platforms/ios/main.mm
+++ b/platforms/ios/main.mm
@@ -14,6 +14,7 @@
 
 #include "EAGLView.h"
 #include "AppPlatform_iOS.hpp"
+#include "GamepadMFi.h"
 
 static void MCPEConfigureAudioSession(void) {
 	Class sessionClass = NSClassFromString(@"AVAudioSession");
@@ -158,6 +159,7 @@ - (void)tick:(CADisplayLink*)link {
 		g_app->setSize(_glView.backingWidth, _glView.backingHeight);
 	}
 
+	GamepadMFi_poll();
 	g_app->update();
 
 	[_glView presentFramebuffer];