It seems that you have made it so that the "gamepad mode" is only triggered by gamepad buttons rather than gamepad axis, which is a great improvement, thank you very much! This still leaves the issue of going from gamepad back to using keyboard however (i.e disabling "gamepad mode"). It would be great if there was a way to do this as restarting the game every time is rather tedious. An example of a way to do this would be to simply add a toggle in the controls options for "gamepad mode".