diff --git a/src/game/frontend/GUI.hpp b/src/game/frontend/GUI.hpp
index 768a99fc..81438c65 100644
--- a/src/game/frontend/GUI.hpp
+++ b/src/game/frontend/GUI.hpp
@@ -33,7 +33,7 @@ namespace YimMenu
 
 		static bool IsUsingKeyboard()
 		{
-			return ImGui::GetIO().WantCaptureKeyboard;
+			return ImGui::GetIO().WantTextInput;
 		}
 
 		static void RunScript()
diff --git a/src/types/pad/ControllerInputs.hpp b/src/types/pad/ControllerInputs.hpp
index 654d4f0e..50216c67 100644
--- a/src/types/pad/ControllerInputs.hpp
+++ b/src/types/pad/ControllerInputs.hpp
@@ -251,7 +251,7 @@ enum class ControllerInputs : uint32_t
 	INPUT_MP_TEXT_CHAT_TEAM,
 	INPUT_MP_TEXT_CHAT_FRIENDS,
 	INPUT_MP_TEXT_CHAT_CREW,
-	INPUT_PUSH_TO_TALK,
+	INPUT_PC_PUSH_TO_TALK,
 	INPUT_CREATOR_LS,
 	INPUT_CREATOR_RS,
 	INPUT_CREATOR_LT,
@@ -259,6 +259,43 @@ enum class ControllerInputs : uint32_t
 	INPUT_CREATOR_MENU_TOGGLE,
 	INPUT_CREATOR_ACCEPT,
 	INPUT_CREATOR_DELETE,
+	INPUT_CREATOR_SWITCH_CAMERA,
+	INPUT_CREATOR_TOGGLE_ORBIT_CAMERA,
+	INPUT_CREATOR_CAMERA_DECREASE,
+	INPUT_CREATOR_CAMERA_INCREASE,
+	INPUT_CREATOR_MENU_ACCEPT,
+	INPUT_CREATOR_MENU_CANCEL,
+	INPUT_CREATOR_FAST_ADJUST,
+	INPUT_CREATOR_FINE_ADJUST,
+	INPUT_CREATOR_FAST_ZOOM,
+	INPUT_CREATOR_LIST,
+	INPUT_CREATOR_ALT_MENU_ENTRY,
+	INPUT_CREATOR_WARP_AND_EDIT,
+	INPUT_CREATOR_TAB_LEFT,
+	INPUT_CREATOR_TAB_RIGHT,
+	INPUT_CREATOR_ROTATE_LEFT,
+	INPUT_CREATOR_ROTATE_RIGHT,
+	INPUT_CREATOR_FOV_INCREASE,
+	INPUT_CREATOR_FOV_DECREASE,
+	INPUT_CREATOR_EXTRA_OPTIONS1,
+	INPUT_CREATOR_EXTRA_OPTIONS2,
+	INPUT_CREATOR_CONTEXT_MENU,
+	INPUT_CREATOR_MENU_UP,
+	INPUT_CREATOR_MENU_DOWN,
+	INPUT_CREATOR_ADJUST_LEFT,
+	INPUT_CREATOR_ADJUST_RIGHT,
+	INPUT_CREATOR_RESET_FOV,
+	INPUT_CREATOR_ENTITY_RAISE,
+	INPUT_CREATOR_ENTITY_LOWER,
+	INPUT_CREATOR_TOGGLE_DESCRIPTIONS,
+	INPUT_CREATOR_MENU,
+	INPUT_CREATOR_MENU_DELETE,
+	INPUT_CREATOR_MOVE_LR,
+	INPUT_CREATOR_MOVE_UD,
+	INPUT_CREATOR_MOVE_UP_ONLY,
+	INPUT_CREATOR_MOVE_DOWN_ONLY,
+	INPUT_CREATOR_MOVE_LEFT_ONLY,
+	INPUT_CREATOR_MOVE_RIGHT_ONLY,
 	INPUT_ATTACK2,
 	INPUT_RAPPEL_JUMP,
 	INPUT_RAPPEL_LONG_JUMP,
@@ -336,7 +373,7 @@ enum class ControllerInputs : uint32_t
 	INPUT_VEH_FLY_ATTACK2,
 	INPUT_RADIO_WHEEL_UD,
 	INPUT_RADIO_WHEEL_LR,
-	INPUT_VEH_SLOWMO_UD,
+	INPUT_VEH_SLOWMO_UP,
 	INPUT_VEH_SLOWMO_UP_ONLY,
 	INPUT_VEH_SLOWMO_DOWN_ONLY,
 	INPUT_VEH_HYDRAULICS_CONTROL_TOGGLE,
@@ -360,6 +397,8 @@ enum class ControllerInputs : uint32_t
 	INPUT_VEH_FLY_BOMB_BAY,
 	INPUT_VEH_FLY_COUNTER,
 	INPUT_VEH_TRANSFORM,
+	INPUT_VEH_SHIFT_GEAR_UP,
+	INPUT_VEH_SHIFT_GEAR_DOWN,
 	MAX_INPUTS,
 	UNDEFINED_INPUT,
 	DYNAMIC_MAPPING_MOUSE_X,