Move inputaction into separate file.

49 files changed, 1619 insertions, 1560 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d5cb4f2b..31b12fe23 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -751,6 +751,7 @@ SET(SRCS
     spellshortcut.h
     textcommand.cpp
     textcommand.h
+    input/inputaction.h
     input/inputcondition.h
     input/inputmanager.cpp
     input/inputmanager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 24e021a44..5c781641f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -856,6 +856,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      textcommand.cpp \
 	      textcommand.h \
 	      events/inputevent.h \
+	      input/inputaction.h \
 	      input/inputcondition.h \
 	      input/inputmanager.cpp \
 	      input/inputmanager.h \
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 3213b2e0a..0c2814d75 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -113,56 +113,56 @@ static bool closeMoveNpcDialog(bool focus)
 
 impHandler(moveUp)
 {
-    if (inputManager.isActionActive(Input::KEY_EMOTE))
+    if (inputManager.isActionActive(InputAction::EMOTE))
         return directUp(event);
     return closeMoveNpcDialog(false);
 }
 
 impHandler(moveDown)
 {
-    if (inputManager.isActionActive(Input::KEY_EMOTE))
+    if (inputManager.isActionActive(InputAction::EMOTE))
         return directDown(event);
     return closeMoveNpcDialog(false);
 }
 
 impHandler(moveLeft)
 {
-    if (outfitWindow && inputManager.isActionActive(Input::KEY_WEAR_OUTFIT))
+    if (outfitWindow && inputManager.isActionActive(InputAction::WEAR_OUTFIT))
     {
         outfitWindow->wearPreviousOutfit();
         if (Game::instance())
             Game::instance()->setValidSpeed();
         return true;
     }
-    if (inputManager.isActionActive(Input::KEY_EMOTE))
+    if (inputManager.isActionActive(InputAction::EMOTE))
         return directLeft(event);
     return closeMoveNpcDialog(false);
 }
 
 impHandler(moveRight)
 {
-    if (outfitWindow && inputManager.isActionActive(Input::KEY_WEAR_OUTFIT))
+    if (outfitWindow && inputManager.isActionActive(InputAction::WEAR_OUTFIT))
     {
         outfitWindow->wearNextOutfit();
         if (Game::instance())
             Game::instance()->setValidSpeed();
         return true;
     }
-    if (inputManager.isActionActive(Input::KEY_EMOTE))
+    if (inputManager.isActionActive(InputAction::EMOTE))
         return directRight(event);
     return closeMoveNpcDialog(false);
 }
 
 impHandler(moveForward)
 {
-    if (inputManager.isActionActive(Input::KEY_EMOTE))
+    if (inputManager.isActionActive(InputAction::EMOTE))
         return directRight(event);
     return closeMoveNpcDialog(false);
 }
 
 impHandler(emote)
 {
-    const int emotion = 1 + event.action - Input::KEY_EMOTE_1;
+    const int emotion = 1 + event.action - InputAction::EMOTE_1;
     if (emotion > 0)
     {
         if (emoteShortcut)
@@ -177,7 +177,7 @@ impHandler(emote)
 
 impHandler(moveToPoint)
 {
-    const int num = event.action - Input::KEY_MOVE_TO_POINT_1;
+    const int num = event.action - InputAction::MOVE_TO_POINT_1;
     if (socialWindow && num >= 0)
     {
         socialWindow->selectPortal(num);
@@ -189,9 +189,9 @@ impHandler(moveToPoint)
 
 impHandler(outfit)
 {
-    if (inputManager.isActionActive(Input::KEY_WEAR_OUTFIT))
+    if (inputManager.isActionActive(InputAction::WEAR_OUTFIT))
     {
-        const int num = event.action - Input::KEY_OUTFIT_1;
+        const int num = event.action - InputAction::OUTFIT_1;
         if (outfitWindow && num >= 0)
         {
             outfitWindow->wearOutfit(num);
@@ -200,9 +200,9 @@ impHandler(outfit)
             return true;
         }
     }
-    else if (inputManager.isActionActive(Input::KEY_COPY_OUTFIT))
+    else if (inputManager.isActionActive(InputAction::COPY_OUTFIT))
     {
-        const int num = event.action - Input::KEY_OUTFIT_1;
+        const int num = event.action - InputAction::OUTFIT_1;
         if (outfitWindow && num >= 0)
         {
             outfitWindow->copyOutfit(num);
@@ -258,7 +258,7 @@ impHandler(shortcut)
             if (itemShortcut[num])
             {
                 itemShortcut[num]->useItem(event.action
-                    - Input::KEY_SHORTCUT_1);
+                    - InputAction::SHORTCUT_1);
             }
         }
         return true;
@@ -394,7 +394,7 @@ impHandler0(heal)
 {
     if (actorManager)
     {
-        if (inputManager.isActionActive(Input::KEY_STOP_ATTACK))
+        if (inputManager.isActionActive(InputAction::STOP_ATTACK))
         {
             Being *target = player_node->getTarget();
             if (!target || target->getType() != ActorType::PLAYER)
@@ -460,8 +460,8 @@ impHandler0(changePickupType)
 
 impHandler0(moveToTarget)
 {
-    if (player_node && !inputManager.isActionActive(Input::KEY_TARGET_ATTACK)
-        && !inputManager.isActionActive(Input::KEY_ATTACK))
+    if (player_node && !inputManager.isActionActive(InputAction::TARGET_ATTACK)
+        && !inputManager.isActionActive(InputAction::ATTACK))
     {
         player_node->moveToTarget();
         return true;
@@ -471,8 +471,8 @@ impHandler0(moveToTarget)
 
 impHandler0(moveToHome)
 {
-    if (player_node && !inputManager.isActionActive(Input::KEY_TARGET_ATTACK)
-        && !inputManager.isActionActive(Input::KEY_ATTACK))
+    if (player_node && !inputManager.isActionActive(InputAction::TARGET_ATTACK)
+        && !inputManager.isActionActive(InputAction::ATTACK))
     {
         player_node->moveToHome();
         if (Game::instance())
@@ -665,7 +665,7 @@ impHandler0(sit)
 {
     if (player_node)
     {
-        if (inputManager.isActionActive(Input::KEY_EMOTE))
+        if (inputManager.isActionActive(InputAction::EMOTE))
             player_node->updateSit();
         else
             player_node->toggleSit();
@@ -1033,7 +1033,7 @@ impHandler0(stopAttack)
     {
         player_node->stopAttack();
         // not consume if target attack key pressed
-        if (inputManager.isActionActive(Input::KEY_TARGET_ATTACK))
+        if (inputManager.isActionActive(InputAction::TARGET_ATTACK))
             return false;
         return true;
     }
@@ -1069,7 +1069,7 @@ impHandler0(targetAttack)
         Being *target = nullptr;
 
         const bool newTarget = !inputManager.isActionActive(
-            Input::KEY_STOP_ATTACK);
+            InputAction::STOP_ATTACK);
         // A set target has highest priority
         if (!player_node->getTarget())
         {
@@ -1132,11 +1132,11 @@ impHandler0(stopSit)
     {
         player_node->stopAttack();
         // not consume if target attack key pressed
-        if (inputManager.isActionActive(Input::KEY_TARGET_ATTACK))
+        if (inputManager.isActionActive(InputAction::TARGET_ATTACK))
             return false;
         if (!player_node->getTarget())
         {
-            if (inputManager.isActionActive(Input::KEY_EMOTE))
+            if (inputManager.isActionActive(InputAction::EMOTE))
                 player_node->updateSit();
             else
                 player_node->toggleSit();
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 0ffed88be..518a65553 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -317,7 +317,7 @@ Being *ActorManager::findBeingByPixel(const int x, const int y,
         return nullptr;
 
     const bool targetDead = mTargetDeadPlayers;
-    const bool modActive = inputManager.isActionActive(Input::KEY_STOP_ATTACK);
+    const bool modActive = inputManager.isActionActive(InputAction::STOP_ATTACK);
 
     if (mExtMouseTargeting)
     {
@@ -427,7 +427,7 @@ void ActorManager::findBeingsByPixel(std::vector<ActorSprite*> &beings,
 
     const int xtol = mapTileSize / 2;
     const int uptol = mapTileSize;
-    const bool modActive = inputManager.isActionActive(Input::KEY_STOP_ATTACK);
+    const bool modActive = inputManager.isActionActive(InputAction::STOP_ATTACK);
 
     for_actors
     {
@@ -875,7 +875,7 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing,
 
     const bool filtered = config.getBoolValue("enableAttackFilter")
         && type == ActorType::MONSTER;
-    const bool modActive = inputManager.isActionActive(Input::KEY_STOP_ATTACK);
+    const bool modActive = inputManager.isActionActive(InputAction::STOP_ATTACK);
 
     bool ignoreDefault = false;
     if (filtered)
diff --git a/src/client.cpp b/src/client.cpp
index 5efbd08a9..59b19392d 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1846,12 +1846,12 @@ void Client::action(const ActionEvent &event)
     }
     else if (eventId == "help")
     {
-        inputManager.executeAction(Input::KEY_WINDOW_HELP);
+        inputManager.executeAction(InputAction::WINDOW_HELP);
         return;
     }
     else if (eventId == "about")
     {
-        inputManager.executeAction(Input::KEY_WINDOW_ABOUT);
+        inputManager.executeAction(InputAction::WINDOW_ABOUT);
         return;
     }
     else if (eventId == "Video")
diff --git a/src/commands.h b/src/commands.h
index a27f430db..807f0ef06 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -23,6 +23,7 @@
 #ifndef COMMANDS_H
 #define COMMANDS_H
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include <string>
@@ -322,12 +323,12 @@ static const CommandInfo commands[] =
     {"", &Commands::removeName, -1, false},
     {"disableaway", &Commands::disableAway, -1, false},
     {"enableaway", &Commands::enableAway, -1, false},
-    {"drop", nullptr, Input::KEY_QUICK_DROP, false},
-    {"dropn", nullptr, Input::KEY_QUICK_DROPN, false},
-    {"movetotarget", nullptr, Input::KEY_MOVE_TO_TARGET, false},
-    {"movetohome", nullptr, Input::KEY_MOVE_TO_HOME, false},
-    {"sethome", nullptr, Input::KEY_SET_HOME, false},
-    {"magicattack", nullptr, Input::KEY_MAGIC_ATTACK, false},
+    {"drop", nullptr, InputAction::QUICK_DROP, false},
+    {"dropn", nullptr, InputAction::QUICK_DROPN, false},
+    {"movetotarget", nullptr, InputAction::MOVE_TO_TARGET, false},
+    {"movetohome", nullptr, InputAction::MOVE_TO_HOME, false},
+    {"sethome", nullptr, InputAction::SET_HOME, false},
+    {"magicattack", nullptr, InputAction::MAGIC_ATTACK, false},
     {"testparticle", &Commands::testParticle, -1, true},
     {"createitems", &Commands::createItems, -1, false},
     {"talkraw", &Commands::talkRaw, -1, true},
diff --git a/src/defaults.cpp b/src/defaults.cpp
index a215730c4..c39c3abd0 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -26,6 +26,7 @@
 
 #include "being/beingspeech.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "render/graphics.h"
@@ -321,19 +322,19 @@ DefaultsData* getConfigDefaults()
     AddDEF("selfMouseHeal", true);
     AddDEF("serverslistupdate", "");
     AddDEF("fadeoutmusic", true);
-    AddDEF("screenActionKeyboard", Input::KEY_SHOW_KEYBOARD);
-    AddDEF("screenActionButton0", Input::KEY_TALK);
-    AddDEF("screenActionButton1", Input::KEY_TARGET_ATTACK);
-    AddDEF("screenActionButton2", Input::KEY_PICKUP);
-    AddDEF("screenActionButton3", Input::KEY_STOP_SIT);
-    AddDEF("screenActionButton4", Input::KEY_TARGET_NPC);
-    AddDEF("screenActionButton5", Input::KEY_WINDOW_STATUS);
-    AddDEF("screenActionButton6", Input::KEY_WINDOW_INVENTORY);
-    AddDEF("screenActionButton7", Input::KEY_WINDOW_SKILL);
-    AddDEF("screenActionButton8", Input::KEY_WINDOW_SOCIAL);
-    AddDEF("screenActionButton9", Input::KEY_WINDOW_DEBUG);
-    AddDEF("screenActionButton10", Input::KEY_TRADE);
-    AddDEF("screenActionButton11", Input::KEY_DIRECT_DOWN);
+    AddDEF("screenActionKeyboard", InputAction::SHOW_KEYBOARD);
+    AddDEF("screenActionButton0", InputAction::TALK);
+    AddDEF("screenActionButton1", InputAction::TARGET_ATTACK);
+    AddDEF("screenActionButton2", InputAction::PICKUP);
+    AddDEF("screenActionButton3", InputAction::STOP_SIT);
+    AddDEF("screenActionButton4", InputAction::TARGET_NPC);
+    AddDEF("screenActionButton5", InputAction::WINDOW_STATUS);
+    AddDEF("screenActionButton6", InputAction::WINDOW_INVENTORY);
+    AddDEF("screenActionButton7", InputAction::WINDOW_SKILL);
+    AddDEF("screenActionButton8", InputAction::WINDOW_SOCIAL);
+    AddDEF("screenActionButton9", InputAction::WINDOW_DEBUG);
+    AddDEF("screenActionButton10", InputAction::TRADE);
+    AddDEF("screenActionButton11", InputAction::DIRECT_DOWN);
     AddDEF("screenButtonsFormat", 0);
     AddDEF("autoresizeminimaps", false);
     AddDEF("showGuildOnline", false);
diff --git a/src/game.cpp b/src/game.cpp
index b0caf54d9..d4a75803e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -856,8 +856,8 @@ void Game::handleMove()
         // Ignore input if either "ignore" key is pressed
         // Stops the character moving about if the user's window manager
         // uses "ignore+arrow key" to switch virtual desktops.
-        if (inputManager.isActionActive(Input::KEY_IGNORE_INPUT_1) ||
-            inputManager.isActionActive(Input::KEY_IGNORE_INPUT_2))
+        if (inputManager.isActionActive(InputAction::IGNORE_INPUT_1) ||
+            inputManager.isActionActive(InputAction::IGNORE_INPUT_2))
         {
             return;
         }
@@ -865,14 +865,14 @@ void Game::handleMove()
         unsigned char direction = 0;
 
         // Translate pressed keys to movement and direction
-        if (inputManager.isActionActive(Input::KEY_MOVE_UP) ||
+        if (inputManager.isActionActive(InputAction::MOVE_UP) ||
             (joystick && joystick->isUp()))
         {
             direction |= BeingDirection::UP;
             setValidSpeed();
             player_node->cancelFollow();
         }
-        else if (inputManager.isActionActive(Input::KEY_MOVE_DOWN) ||
+        else if (inputManager.isActionActive(InputAction::MOVE_DOWN) ||
                  (joystick && joystick->isDown()))
         {
             direction |= BeingDirection::DOWN;
@@ -880,28 +880,28 @@ void Game::handleMove()
             player_node->cancelFollow();
         }
 
-        if (inputManager.isActionActive(Input::KEY_MOVE_LEFT) ||
+        if (inputManager.isActionActive(InputAction::MOVE_LEFT) ||
             (joystick && joystick->isLeft()))
         {
             direction |= BeingDirection::LEFT;
             setValidSpeed();
             player_node->cancelFollow();
         }
-        else if (inputManager.isActionActive(Input::KEY_MOVE_RIGHT) ||
+        else if (inputManager.isActionActive(InputAction::MOVE_RIGHT) ||
                  (joystick && joystick->isRight()))
         {
             direction |= BeingDirection::RIGHT;
             setValidSpeed();
             player_node->cancelFollow();
         }
-        else if (inputManager.isActionActive(Input::KEY_MOVE_FORWARD))
+        else if (inputManager.isActionActive(InputAction::MOVE_FORWARD))
         {
             direction = player_node->getDirection();
             setValidSpeed();
             player_node->cancelFollow();
         }
 
-        if (!inputManager.isActionActive(Input::KEY_EMOTE) || direction == 0)
+        if (!inputManager.isActionActive(InputAction::EMOTE) || direction == 0)
             moveInDirection(direction);
     }
 }
@@ -972,8 +972,8 @@ void Game::handleInput()
     }
 
     // If pressed outfits keys, stop processing keys.
-    if (inputManager.isActionActive(Input::KEY_WEAR_OUTFIT)
-        || inputManager.isActionActive(Input::KEY_COPY_OUTFIT)
+    if (inputManager.isActionActive(InputAction::WEAR_OUTFIT)
+        || inputManager.isActionActive(InputAction::COPY_OUTFIT)
         || (setupWindow && setupWindow->isWindowVisible()))
     {
         BLOCK_END("Game::handleInput 1")
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index b695b669b..6a7727c07 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -439,10 +439,10 @@ bool Gui::handleKeyInput()
             // tabbing is enable check for tab press and
             // change focus.
             if (!eventConsumed && keyInput.getActionId()
-                == static_cast<int>(Input::KEY_GUI_TAB)
+                == static_cast<int>(InputAction::GUI_TAB)
                 && keyInput.getType() == KeyInput::PRESSED)
             {
-                if (inputManager.isActionActive(Input::KEY_GUI_MOD))
+                if (inputManager.isActionActive(InputAction::GUI_MOD))
                     mFocusHandler->tabPrevious();
                 else
                     mFocusHandler->tabNext();
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 2c149f755..a1e0b502c 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -125,7 +125,7 @@ void StatusPopup::view(const int x, const int y)
 
 void StatusPopup::setLabelText(const int num,
                                const std::string &text,
-                               const Input::KeyAction key) const
+                               const InputAction::Type key) const
 {
     Label *const label = mLabels[num];
     label->setCaption(strprintf("%s  %s", text.c_str(),
@@ -139,33 +139,33 @@ void StatusPopup::updateLabels() const
         return;
 
     setLabelText(0, player_node->getInvertDirectionString(),
-        Input::KEY_INVERT_DIRECTION);
+        InputAction::INVERT_DIRECTION);
     setLabelText(1, player_node->getCrazyMoveTypeString(),
-        Input::KEY_CHANGE_CRAZY_MOVES_TYPE);
+        InputAction::CHANGE_CRAZY_MOVES_TYPE);
     setLabelText(2, player_node->getMoveToTargetTypeString(),
-        Input::KEY_CHANGE_MOVE_TO_TARGET);
+        InputAction::CHANGE_MOVE_TO_TARGET);
     setLabelText(3, player_node->getFollowModeString(),
-        Input::KEY_CHANGE_FOLLOW_MODE);
+        InputAction::CHANGE_FOLLOW_MODE);
     setLabelText(4, player_node->getAttackWeaponTypeString(),
-        Input::KEY_CHANGE_ATTACK_WEAPON_TYPE);
+        InputAction::CHANGE_ATTACK_WEAPON_TYPE);
     setLabelText(5, player_node->getAttackTypeString(),
-        Input::KEY_CHANGE_ATTACK_TYPE);
+        InputAction::CHANGE_ATTACK_TYPE);
     setLabelText(6, player_node->getQuickDropCounterString(),
-        Input::KEY_SWITCH_QUICK_DROP);
+        InputAction::SWITCH_QUICK_DROP);
     setLabelText(7, player_node->getPickUpTypeString(),
-        Input::KEY_CHANGE_PICKUP_TYPE);
+        InputAction::CHANGE_PICKUP_TYPE);
     setLabelText(8, LocalPlayer::getDebugPathString(),
-        Input::KEY_PATHFIND);
+        InputAction::PATHFIND);
     setLabelText(9, player_node->getMagicAttackString(),
-        Input::KEY_SWITCH_MAGIC_ATTACK);
+        InputAction::SWITCH_MAGIC_ATTACK);
     setLabelText(10, player_node->getPvpAttackString(),
-        Input::KEY_SWITCH_PVP_ATTACK);
+        InputAction::SWITCH_PVP_ATTACK);
     setLabelText(11, player_node->getGameModifiersString(),
-        Input::KEY_DISABLE_GAME_MODIFIERS);
+        InputAction::DISABLE_GAME_MODIFIERS);
     setLabelText(12, player_node->getImitationModeString(),
-        Input::KEY_CHANGE_IMITATION_MODE);
+        InputAction::CHANGE_IMITATION_MODE);
     setLabelText(13, player_node->getAwayModeString(),
-        Input::KEY_AWAY);
+        InputAction::AWAY);
     setLabelText(14, LocalPlayer::getCameraModeString(),
-        Input::KEY_CAMERA);
+        InputAction::CAMERA);
 }
diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h
index 6b9b917b7..e0fe09d14 100644
--- a/src/gui/popups/statuspopup.h
+++ b/src/gui/popups/statuspopup.h
@@ -24,6 +24,7 @@
 #ifndef GUI_POPUPS_STATUSPOPUP_H
 #define GUI_POPUPS_STATUSPOPUP_H
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/widgets/popup.h"
@@ -63,7 +64,7 @@ class StatusPopup final : public Popup
         void updateLabels() const;
 
         void setLabelText(const int num, const std::string &text,
-                          const Input::KeyAction key) const;
+                          const InputAction::Type key) const;
 
         Label *mLabels[STATUSPOPUP_NUM_LABELS];
 };
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index 891875d7c..7a3131a74 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -24,6 +24,7 @@
 #ifndef GUI_SETUPACTIONDATA_H
 #define GUI_SETUPACTIONDATA_H
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "utils/gettext.h"
@@ -55,162 +56,162 @@ static SetupActionData setupActionData0[] =
     {
         // TRANSLATORS: input action name
         N_("Target and attack keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Attack"),
-        Input::KEY_ATTACK,
+        InputAction::ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Target & Attack"),
-        Input::KEY_TARGET_ATTACK,
+        InputAction::TARGET_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move to Target"),
-        Input::KEY_MOVE_TO_TARGET,
+        InputAction::MOVE_TO_TARGET,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Move to Target type"),
-        Input::KEY_CHANGE_MOVE_TO_TARGET,
+        InputAction::CHANGE_MOVE_TO_TARGET,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move to Home location"),
-        Input::KEY_MOVE_TO_HOME,
+        InputAction::MOVE_TO_HOME,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Set home location"),
-        Input::KEY_SET_HOME,
+        InputAction::SET_HOME,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move to navigation point"),
-        Input::KEY_MOVE_TO_POINT,
+        InputAction::MOVE_TO_POINT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Talk"),
-        Input::KEY_TALK,
+        InputAction::TALK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Stop Attack / Modifier key"),
-        Input::KEY_STOP_ATTACK,
+        InputAction::STOP_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Untarget"),
-        Input::KEY_UNTARGET,
+        InputAction::UNTARGET,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Target monster"),
-        Input::KEY_TARGET_MONSTER,
+        InputAction::TARGET_MONSTER,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Target NPC"),
-        Input::KEY_TARGET_NPC,
+        InputAction::TARGET_NPC,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Target Player"),
-        Input::KEY_TARGET_PLAYER,
+        InputAction::TARGET_PLAYER,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Other Keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Pickup"),
-        Input::KEY_PICKUP,
+        InputAction::PICKUP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Pickup Type"),
-        Input::KEY_CHANGE_PICKUP_TYPE,
+        InputAction::CHANGE_PICKUP_TYPE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Sit"),
-        Input::KEY_SIT,
+        InputAction::SIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Screenshot"),
-        Input::KEY_SCREENSHOT,
+        InputAction::SCREENSHOT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Enable/Disable Trading"),
-        Input::KEY_TRADE,
+        InputAction::TRADE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Open trade window"),
-        Input::KEY_OPEN_TRADE,
+        InputAction::OPEN_TRADE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Map View Mode"),
-        Input::KEY_PATHFIND,
+        InputAction::PATHFIND,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Select OK"),
-        Input::KEY_OK,
+        InputAction::OK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quit"),
-        Input::KEY_QUIT,
+        InputAction::QUIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Stop or sit"),
-        Input::KEY_STOP_SIT,
+        InputAction::STOP_SIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Return to safe video mode"),
-        Input::KEY_SAFE_VIDEO,
+        InputAction::SAFE_VIDEO,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -220,144 +221,144 @@ static SetupActionData setupActionData1[] =
     {
         // TRANSLATORS: input action name
         N_("Shortcuts modifiers keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         N_("Item Shortcuts Key"),
-        Input::KEY_SHORTCUTS_KEY,
+        InputAction::SHORTCUTS_KEY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Shortcuts keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 1),
-        Input::KEY_SHORTCUT_1,
+        InputAction::SHORTCUT_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 2),
-        Input::KEY_SHORTCUT_2,
+        InputAction::SHORTCUT_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 3),
-        Input::KEY_SHORTCUT_3,
+        InputAction::SHORTCUT_3,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 4),
-        Input::KEY_SHORTCUT_4,
+        InputAction::SHORTCUT_4,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 5),
-        Input::KEY_SHORTCUT_5,
+        InputAction::SHORTCUT_5,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 6),
-        Input::KEY_SHORTCUT_6,
+        InputAction::SHORTCUT_6,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 7),
-        Input::KEY_SHORTCUT_7,
+        InputAction::SHORTCUT_7,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 8),
-        Input::KEY_SHORTCUT_8,
+        InputAction::SHORTCUT_8,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 9),
-        Input::KEY_SHORTCUT_9,
+        InputAction::SHORTCUT_9,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 10),
-        Input::KEY_SHORTCUT_10,
+        InputAction::SHORTCUT_10,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 11),
-        Input::KEY_SHORTCUT_11,
+        InputAction::SHORTCUT_11,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 12),
-        Input::KEY_SHORTCUT_12,
+        InputAction::SHORTCUT_12,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 13),
-        Input::KEY_SHORTCUT_13,
+        InputAction::SHORTCUT_13,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 14),
-        Input::KEY_SHORTCUT_14,
+        InputAction::SHORTCUT_14,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 15),
-        Input::KEY_SHORTCUT_15,
+        InputAction::SHORTCUT_15,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 16),
-        Input::KEY_SHORTCUT_16,
+        InputAction::SHORTCUT_16,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 17),
-        Input::KEY_SHORTCUT_17,
+        InputAction::SHORTCUT_17,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 18),
-        Input::KEY_SHORTCUT_18,
+        InputAction::SHORTCUT_18,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 19),
-        Input::KEY_SHORTCUT_19,
+        InputAction::SHORTCUT_19,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 20),
-        Input::KEY_SHORTCUT_20,
+        InputAction::SHORTCUT_20,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -367,186 +368,186 @@ static SetupActionData setupActionData2[] =
     {
         // TRANSLATORS: input action name
         N_("Show Windows Menu"),
-        Input::KEY_SHOW_WINDOWS,
+        InputAction::SHOW_WINDOWS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Hide Windows"),
-        Input::KEY_HIDE_WINDOWS,
+        InputAction::HIDE_WINDOWS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("About Window"),
-        Input::KEY_WINDOW_ABOUT,
+        InputAction::WINDOW_ABOUT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Help Window"),
-        Input::KEY_WINDOW_HELP,
+        InputAction::WINDOW_HELP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Status Window"),
-        Input::KEY_WINDOW_STATUS,
+        InputAction::WINDOW_STATUS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Inventory Window"),
-        Input::KEY_WINDOW_INVENTORY,
+        InputAction::WINDOW_INVENTORY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Equipment Window"),
-        Input::KEY_WINDOW_EQUIPMENT,
+        InputAction::WINDOW_EQUIPMENT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Skill Window"),
-        Input::KEY_WINDOW_SKILL,
+        InputAction::WINDOW_SKILL,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Minimap Window"),
-        Input::KEY_WINDOW_MINIMAP,
+        InputAction::WINDOW_MINIMAP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Chat Window"),
-        Input::KEY_WINDOW_CHAT,
+        InputAction::WINDOW_CHAT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Item Shortcut Window"),
-        Input::KEY_WINDOW_SHORTCUT,
+        InputAction::WINDOW_SHORTCUT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Setup Window"),
-        Input::KEY_WINDOW_SETUP,
+        InputAction::WINDOW_SETUP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Debug Window"),
-        Input::KEY_WINDOW_DEBUG,
+        InputAction::WINDOW_DEBUG,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Social Window"),
-        Input::KEY_WINDOW_SOCIAL,
+        InputAction::WINDOW_SOCIAL,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Emote Shortcut Window"),
-        Input::KEY_WINDOW_EMOTE_SHORTCUT,
+        InputAction::WINDOW_EMOTE_SHORTCUT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Outfits Window"),
-        Input::KEY_WINDOW_OUTFIT,
+        InputAction::WINDOW_OUTFIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Shop Window"),
-        Input::KEY_WINDOW_SHOP,
+        InputAction::WINDOW_SHOP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quick drop Window"),
-        Input::KEY_WINDOW_DROP,
+        InputAction::WINDOW_DROP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Kill Stats Window"),
-        Input::KEY_WINDOW_KILLS,
+        InputAction::WINDOW_KILLS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Commands Window"),
-        Input::KEY_WINDOW_SPELLS,
+        InputAction::WINDOW_SPELLS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Bot Checker Window"),
-        Input::KEY_WINDOW_BOT_CHECKER,
+        InputAction::WINDOW_BOT_CHECKER,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Who Is Online Window"),
-        Input::KEY_WINDOW_ONLINE,
+        InputAction::WINDOW_ONLINE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Did you know Window"),
-        Input::KEY_WINDOW_DIDYOUKNOW,
+        InputAction::WINDOW_DIDYOUKNOW,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quests Window"),
-        Input::KEY_WINDOW_QUESTS,
+        InputAction::WINDOW_QUESTS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous Social Tab"),
-        Input::KEY_PREV_SOCIAL_TAB,
+        InputAction::PREV_SOCIAL_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next Social Tab"),
-        Input::KEY_NEXT_SOCIAL_TAB,
+        InputAction::NEXT_SOCIAL_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous Shortcuts tab"),
-        Input::KEY_PREV_SHORTCUTS_TAB,
+        InputAction::PREV_SHORTCUTS_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next Shortcuts tab"),
-        Input::KEY_NEXT_SHORTCUTS_TAB,
+        InputAction::NEXT_SHORTCUTS_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous Commands tab"),
-        Input::KEY_PREV_COMMANDS_TAB,
+        InputAction::PREV_COMMANDS_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next Commands tab"),
-        Input::KEY_NEXT_COMMANDS_TAB,
+        InputAction::NEXT_COMMANDS_TAB,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -556,312 +557,312 @@ static SetupActionData setupActionData3[] =
     {
         // TRANSLATORS: input action name
         N_("Emote modifiers keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         N_("Emote modifier key"),
-        Input::KEY_EMOTE,
+        InputAction::EMOTE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Emote shortcuts"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 1),
-        Input::KEY_EMOTE_1,
+        InputAction::EMOTE_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 2),
-        Input::KEY_EMOTE_2,
+        InputAction::EMOTE_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 3),
-        Input::KEY_EMOTE_3,
+        InputAction::EMOTE_3,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 4),
-        Input::KEY_EMOTE_4,
+        InputAction::EMOTE_4,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 5),
-        Input::KEY_EMOTE_5,
+        InputAction::EMOTE_5,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 6),
-        Input::KEY_EMOTE_6,
+        InputAction::EMOTE_6,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 7),
-        Input::KEY_EMOTE_7,
+        InputAction::EMOTE_7,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 8),
-        Input::KEY_EMOTE_8,
+        InputAction::EMOTE_8,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 9),
-        Input::KEY_EMOTE_9,
+        InputAction::EMOTE_9,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 10),
-        Input::KEY_EMOTE_10,
+        InputAction::EMOTE_10,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 11),
-        Input::KEY_EMOTE_11,
+        InputAction::EMOTE_11,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 12),
-        Input::KEY_EMOTE_12,
+        InputAction::EMOTE_12,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 13),
-        Input::KEY_EMOTE_13,
+        InputAction::EMOTE_13,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 14),
-        Input::KEY_EMOTE_14,
+        InputAction::EMOTE_14,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 15),
-        Input::KEY_EMOTE_15,
+        InputAction::EMOTE_15,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 16),
-        Input::KEY_EMOTE_16,
+        InputAction::EMOTE_16,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 17),
-        Input::KEY_EMOTE_17,
+        InputAction::EMOTE_17,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 18),
-        Input::KEY_EMOTE_18,
+        InputAction::EMOTE_18,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 19),
-        Input::KEY_EMOTE_19,
+        InputAction::EMOTE_19,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 20),
-        Input::KEY_EMOTE_20,
+        InputAction::EMOTE_20,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 21),
-        Input::KEY_EMOTE_21,
+        InputAction::EMOTE_21,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 22),
-        Input::KEY_EMOTE_22,
+        InputAction::EMOTE_22,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 23),
-        Input::KEY_EMOTE_23,
+        InputAction::EMOTE_23,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 24),
-        Input::KEY_EMOTE_24,
+        InputAction::EMOTE_24,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 25),
-        Input::KEY_EMOTE_25,
+        InputAction::EMOTE_25,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 26),
-        Input::KEY_EMOTE_26,
+        InputAction::EMOTE_26,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 27),
-        Input::KEY_EMOTE_27,
+        InputAction::EMOTE_27,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 28),
-        Input::KEY_EMOTE_28,
+        InputAction::EMOTE_28,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 29),
-        Input::KEY_EMOTE_29,
+        InputAction::EMOTE_29,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 30),
-        Input::KEY_EMOTE_30,
+        InputAction::EMOTE_30,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 31),
-        Input::KEY_EMOTE_31,
+        InputAction::EMOTE_31,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 32),
-        Input::KEY_EMOTE_32,
+        InputAction::EMOTE_32,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 33),
-        Input::KEY_EMOTE_33,
+        InputAction::EMOTE_33,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 34),
-        Input::KEY_EMOTE_34,
+        InputAction::EMOTE_34,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 35),
-        Input::KEY_EMOTE_35,
+        InputAction::EMOTE_35,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 36),
-        Input::KEY_EMOTE_36,
+        InputAction::EMOTE_36,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 37),
-        Input::KEY_EMOTE_37,
+        InputAction::EMOTE_37,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 38),
-        Input::KEY_EMOTE_38,
+        InputAction::EMOTE_38,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 39),
-        Input::KEY_EMOTE_39,
+        InputAction::EMOTE_39,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 40),
-        Input::KEY_EMOTE_40,
+        InputAction::EMOTE_40,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 41),
-        Input::KEY_EMOTE_41,
+        InputAction::EMOTE_41,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 42),
-        Input::KEY_EMOTE_42,
+        InputAction::EMOTE_42,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 43),
-        Input::KEY_EMOTE_43,
+        InputAction::EMOTE_43,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 44),
-        Input::KEY_EMOTE_44,
+        InputAction::EMOTE_44,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 45),
-        Input::KEY_EMOTE_45,
+        InputAction::EMOTE_45,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 46),
-        Input::KEY_EMOTE_46,
+        InputAction::EMOTE_46,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 47),
-        Input::KEY_EMOTE_47,
+        InputAction::EMOTE_47,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 48),
-        Input::KEY_EMOTE_48,
+        InputAction::EMOTE_48,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -871,324 +872,324 @@ static SetupActionData setupActionData4[] =
     {
         // TRANSLATORS: input action name
         N_("Outfits keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         N_("Wear Outfit"),
-        Input::KEY_WEAR_OUTFIT,
+        InputAction::WEAR_OUTFIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Copy Outfit"),
-        Input::KEY_COPY_OUTFIT,
+        InputAction::COPY_OUTFIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Copy equipped to Outfit"),
-        Input::KEY_COPY_EQUIPED_OUTFIT,
+        InputAction::COPY_EQUIPED_OUTFIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Outfits shortcuts"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 1),
-        Input::KEY_OUTFIT_1,
+        InputAction::OUTFIT_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 2),
-        Input::KEY_OUTFIT_2,
+        InputAction::OUTFIT_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 3),
-        Input::KEY_OUTFIT_3,
+        InputAction::OUTFIT_3,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 4),
-        Input::KEY_OUTFIT_4,
+        InputAction::OUTFIT_4,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 5),
-        Input::KEY_OUTFIT_5,
+        InputAction::OUTFIT_5,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 6),
-        Input::KEY_OUTFIT_6,
+        InputAction::OUTFIT_6,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 7),
-        Input::KEY_OUTFIT_7,
+        InputAction::OUTFIT_7,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 8),
-        Input::KEY_OUTFIT_8,
+        InputAction::OUTFIT_8,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 9),
-        Input::KEY_OUTFIT_9,
+        InputAction::OUTFIT_9,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 10),
-        Input::KEY_OUTFIT_10,
+        InputAction::OUTFIT_10,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 11),
-        Input::KEY_OUTFIT_11,
+        InputAction::OUTFIT_11,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 12),
-        Input::KEY_OUTFIT_12,
+        InputAction::OUTFIT_12,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 13),
-        Input::KEY_OUTFIT_13,
+        InputAction::OUTFIT_13,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 14),
-        Input::KEY_OUTFIT_14,
+        InputAction::OUTFIT_14,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 15),
-        Input::KEY_OUTFIT_15,
+        InputAction::OUTFIT_15,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 16),
-        Input::KEY_OUTFIT_16,
+        InputAction::OUTFIT_16,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 17),
-        Input::KEY_OUTFIT_17,
+        InputAction::OUTFIT_17,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 18),
-        Input::KEY_OUTFIT_18,
+        InputAction::OUTFIT_18,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 19),
-        Input::KEY_OUTFIT_19,
+        InputAction::OUTFIT_19,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 20),
-        Input::KEY_OUTFIT_20,
+        InputAction::OUTFIT_20,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 21),
-        Input::KEY_OUTFIT_21,
+        InputAction::OUTFIT_21,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 22),
-        Input::KEY_OUTFIT_22,
+        InputAction::OUTFIT_22,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 23),
-        Input::KEY_OUTFIT_23,
+        InputAction::OUTFIT_23,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 24),
-        Input::KEY_OUTFIT_24,
+        InputAction::OUTFIT_24,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 25),
-        Input::KEY_OUTFIT_25,
+        InputAction::OUTFIT_25,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 26),
-        Input::KEY_OUTFIT_26,
+        InputAction::OUTFIT_26,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 27),
-        Input::KEY_OUTFIT_27,
+        InputAction::OUTFIT_27,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 28),
-        Input::KEY_OUTFIT_28,
+        InputAction::OUTFIT_28,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 29),
-        Input::KEY_OUTFIT_29,
+        InputAction::OUTFIT_29,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 30),
-        Input::KEY_OUTFIT_30,
+        InputAction::OUTFIT_30,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 31),
-        Input::KEY_OUTFIT_31,
+        InputAction::OUTFIT_31,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 32),
-        Input::KEY_OUTFIT_32,
+        InputAction::OUTFIT_32,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 33),
-        Input::KEY_OUTFIT_33,
+        InputAction::OUTFIT_33,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 34),
-        Input::KEY_OUTFIT_34,
+        InputAction::OUTFIT_34,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 35),
-        Input::KEY_OUTFIT_35,
+        InputAction::OUTFIT_35,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 36),
-        Input::KEY_OUTFIT_36,
+        InputAction::OUTFIT_36,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 37),
-        Input::KEY_OUTFIT_37,
+        InputAction::OUTFIT_37,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 38),
-        Input::KEY_OUTFIT_38,
+        InputAction::OUTFIT_38,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 39),
-        Input::KEY_OUTFIT_39,
+        InputAction::OUTFIT_39,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 40),
-        Input::KEY_OUTFIT_40,
+        InputAction::OUTFIT_40,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 41),
-        Input::KEY_OUTFIT_41,
+        InputAction::OUTFIT_41,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 42),
-        Input::KEY_OUTFIT_42,
+        InputAction::OUTFIT_42,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 43),
-        Input::KEY_OUTFIT_43,
+        InputAction::OUTFIT_43,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 44),
-        Input::KEY_OUTFIT_44,
+        InputAction::OUTFIT_44,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 45),
-        Input::KEY_OUTFIT_45,
+        InputAction::OUTFIT_45,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 46),
-        Input::KEY_OUTFIT_46,
+        InputAction::OUTFIT_46,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 47),
-        Input::KEY_OUTFIT_47,
+        InputAction::OUTFIT_47,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 48),
-        Input::KEY_OUTFIT_48,
+        InputAction::OUTFIT_48,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -1198,121 +1199,121 @@ static SetupActionData setupActionData5[] =
     {
         // TRANSLATORS: input action name
         N_("Toggle Chat"),
-        Input::KEY_TOGGLE_CHAT,
+        InputAction::TOGGLE_CHAT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Scroll Chat Up"),
-        Input::KEY_SCROLL_CHAT_UP,
+        InputAction::SCROLL_CHAT_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Scroll Chat Down"),
-        Input::KEY_SCROLL_CHAT_DOWN,
+        InputAction::SCROLL_CHAT_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous Chat Tab"),
-        Input::KEY_PREV_CHAT_TAB,
+        InputAction::PREV_CHAT_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next Chat Tab"),
-        Input::KEY_NEXT_CHAT_TAB,
+        InputAction::NEXT_CHAT_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Close current Chat Tab"),
-        Input::KEY_CLOSE_CHAT_TAB,
+        InputAction::CLOSE_CHAT_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous chat line"),
-        Input::KEY_CHAT_PREV_HISTORY,
+        InputAction::CHAT_PREV_HISTORY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next chat line"),
-        Input::KEY_CHAT_NEXT_HISTORY,
+        InputAction::CHAT_NEXT_HISTORY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Chat modifier key"),
-        Input::KEY_CHAT_MOD,
+        InputAction::CHAT_MOD,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Show smiles"),
-        Input::KEY_GUI_F1,
+        InputAction::GUI_F1,
         "",
     },
     {
         "F2",
-        Input::KEY_GUI_F2,
+        InputAction::GUI_F2,
         "",
     },
     {
         "F3",
-        Input::KEY_GUI_F3,
+        InputAction::GUI_F3,
         "",
     },
     {
         "F4",
-        Input::KEY_GUI_F4,
+        InputAction::GUI_F4,
         "",
     },
     {
         "F5",
-        Input::KEY_GUI_F5,
+        InputAction::GUI_F5,
         "",
     },
     {
         "F6",
-        Input::KEY_GUI_F6,
+        InputAction::GUI_F6,
         "",
     },
     {
         "F7",
-        Input::KEY_GUI_F7,
+        InputAction::GUI_F7,
         "",
     },
     {
         "F8",
-        Input::KEY_GUI_F8,
+        InputAction::GUI_F8,
         "",
     },
     {
         "F9",
-        Input::KEY_GUI_F9,
+        InputAction::GUI_F9,
         "",
     },
     {
         "F10",
-        Input::KEY_GUI_F10,
+        InputAction::GUI_F10,
         "",
     },
     {
         "F11",
-        Input::KEY_GUI_F11,
+        InputAction::GUI_F11,
         "",
     },
     {
         "F12",
-        Input::KEY_GUI_F12,
+        InputAction::GUI_F12,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -1322,168 +1323,168 @@ static SetupActionData setupActionData6[] =
     {
         // TRANSLATORS: input action name
         N_("Ignore input 1"),
-        Input::KEY_IGNORE_INPUT_1,
+        InputAction::IGNORE_INPUT_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Ignore input 2"),
-        Input::KEY_IGNORE_INPUT_2,
+        InputAction::IGNORE_INPUT_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Direct Up"),
-        Input::KEY_DIRECT_UP,
+        InputAction::DIRECT_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Direct Down"),
-        Input::KEY_DIRECT_DOWN,
+        InputAction::DIRECT_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Direct Left"),
-        Input::KEY_DIRECT_LEFT,
+        InputAction::DIRECT_LEFT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Direct Right"),
-        Input::KEY_DIRECT_RIGHT,
+        InputAction::DIRECT_RIGHT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Crazy moves"),
-        Input::KEY_CRAZY_MOVES,
+        InputAction::CRAZY_MOVES,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Crazy Move mode"),
-        Input::KEY_CHANGE_CRAZY_MOVES_TYPE,
+        InputAction::CHANGE_CRAZY_MOVES_TYPE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quick Drop N Items from 0 slot"),
-        Input::KEY_QUICK_DROP,
+        InputAction::QUICK_DROP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quick Drop N Items"),
-        Input::KEY_QUICK_DROPN,
+        InputAction::QUICK_DROPN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Switch Quick Drop Counter"),
-        Input::KEY_SWITCH_QUICK_DROP,
+        InputAction::SWITCH_QUICK_DROP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quick heal target or self"),
-        Input::KEY_MAGIC_INMA1,
+        InputAction::MAGIC_INMA1,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Use #itenplz spell"),
-        Input::KEY_MAGIC_ITENPLZ,
+        InputAction::MAGIC_ITENPLZ,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Use magic attack"),
-        Input::KEY_MAGIC_ATTACK,
+        InputAction::MAGIC_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Switch magic attack"),
-        Input::KEY_SWITCH_MAGIC_ATTACK,
+        InputAction::SWITCH_MAGIC_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Switch pvp attack"),
-        Input::KEY_SWITCH_PVP_ATTACK,
+        InputAction::SWITCH_PVP_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change move type"),
-        Input::KEY_INVERT_DIRECTION,
+        InputAction::INVERT_DIRECTION,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Attack Weapon Type"),
-        Input::KEY_CHANGE_ATTACK_WEAPON_TYPE,
+        InputAction::CHANGE_ATTACK_WEAPON_TYPE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Attack Type"),
-        Input::KEY_CHANGE_ATTACK_TYPE,
+        InputAction::CHANGE_ATTACK_TYPE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Follow mode"),
-        Input::KEY_CHANGE_FOLLOW_MODE,
+        InputAction::CHANGE_FOLLOW_MODE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Imitation mode"),
-        Input::KEY_CHANGE_IMITATION_MODE,
+        InputAction::CHANGE_IMITATION_MODE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Disable / Enable Game modifier keys"),
-        Input::KEY_DISABLE_GAME_MODIFIERS,
+        InputAction::DISABLE_GAME_MODIFIERS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("On / Off audio"),
-        Input::KEY_CHANGE_AUDIO,
+        InputAction::CHANGE_AUDIO,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Enable / Disable away mode"),
-        Input::KEY_AWAY,
+        InputAction::AWAY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Emulate right click from keyboard"),
-        Input::KEY_RIGHT_CLICK,
+        InputAction::RIGHT_CLICK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Toggle camera mode"),
-        Input::KEY_CAMERA,
+        InputAction::CAMERA,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Show onscreen keyboard"),
-        Input::KEY_SHOW_KEYBOARD,
+        InputAction::SHOW_KEYBOARD,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -1493,336 +1494,336 @@ static SetupActionData setupActionData7[] =
     {
         // TRANSLATORS: input action name
         N_("Move Keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Up"),
-        Input::KEY_MOVE_UP,
+        InputAction::MOVE_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Down"),
-        Input::KEY_MOVE_DOWN,
+        InputAction::MOVE_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Left"),
-        Input::KEY_MOVE_LEFT,
+        InputAction::MOVE_LEFT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Right"),
-        Input::KEY_MOVE_RIGHT,
+        InputAction::MOVE_RIGHT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Forward"),
-        Input::KEY_MOVE_FORWARD,
+        InputAction::MOVE_FORWARD,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move to navigation point shortcuts"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 1),
-        Input::KEY_MOVE_TO_POINT_1,
+        InputAction::MOVE_TO_POINT_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 2),
-        Input::KEY_MOVE_TO_POINT_2,
+        InputAction::MOVE_TO_POINT_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 3),
-        Input::KEY_MOVE_TO_POINT_3,
+        InputAction::MOVE_TO_POINT_3,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 4),
-        Input::KEY_MOVE_TO_POINT_4,
+        InputAction::MOVE_TO_POINT_4,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 5),
-        Input::KEY_MOVE_TO_POINT_5,
+        InputAction::MOVE_TO_POINT_5,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 6),
-        Input::KEY_MOVE_TO_POINT_6,
+        InputAction::MOVE_TO_POINT_6,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 7),
-        Input::KEY_MOVE_TO_POINT_7,
+        InputAction::MOVE_TO_POINT_7,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 8),
-        Input::KEY_MOVE_TO_POINT_8,
+        InputAction::MOVE_TO_POINT_8,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 9),
-        Input::KEY_MOVE_TO_POINT_9,
+        InputAction::MOVE_TO_POINT_9,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 10),
-        Input::KEY_MOVE_TO_POINT_10,
+        InputAction::MOVE_TO_POINT_10,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 11),
-        Input::KEY_MOVE_TO_POINT_11,
+        InputAction::MOVE_TO_POINT_11,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 12),
-        Input::KEY_MOVE_TO_POINT_12,
+        InputAction::MOVE_TO_POINT_12,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 13),
-        Input::KEY_MOVE_TO_POINT_13,
+        InputAction::MOVE_TO_POINT_13,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 14),
-        Input::KEY_MOVE_TO_POINT_14,
+        InputAction::MOVE_TO_POINT_14,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 15),
-        Input::KEY_MOVE_TO_POINT_15,
+        InputAction::MOVE_TO_POINT_15,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 16),
-        Input::KEY_MOVE_TO_POINT_16,
+        InputAction::MOVE_TO_POINT_16,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 17),
-        Input::KEY_MOVE_TO_POINT_17,
+        InputAction::MOVE_TO_POINT_17,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 18),
-        Input::KEY_MOVE_TO_POINT_18,
+        InputAction::MOVE_TO_POINT_18,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 19),
-        Input::KEY_MOVE_TO_POINT_19,
+        InputAction::MOVE_TO_POINT_19,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 20),
-        Input::KEY_MOVE_TO_POINT_20,
+        InputAction::MOVE_TO_POINT_20,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 21),
-        Input::KEY_MOVE_TO_POINT_21,
+        InputAction::MOVE_TO_POINT_21,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 22),
-        Input::KEY_MOVE_TO_POINT_22,
+        InputAction::MOVE_TO_POINT_22,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 23),
-        Input::KEY_MOVE_TO_POINT_23,
+        InputAction::MOVE_TO_POINT_23,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 24),
-        Input::KEY_MOVE_TO_POINT_24,
+        InputAction::MOVE_TO_POINT_24,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 25),
-        Input::KEY_MOVE_TO_POINT_25,
+        InputAction::MOVE_TO_POINT_25,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 26),
-        Input::KEY_MOVE_TO_POINT_26,
+        InputAction::MOVE_TO_POINT_26,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 27),
-        Input::KEY_MOVE_TO_POINT_27,
+        InputAction::MOVE_TO_POINT_27,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 28),
-        Input::KEY_MOVE_TO_POINT_28,
+        InputAction::MOVE_TO_POINT_28,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 29),
-        Input::KEY_MOVE_TO_POINT_29,
+        InputAction::MOVE_TO_POINT_29,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 30),
-        Input::KEY_MOVE_TO_POINT_30,
+        InputAction::MOVE_TO_POINT_30,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 31),
-        Input::KEY_MOVE_TO_POINT_31,
+        InputAction::MOVE_TO_POINT_31,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 32),
-        Input::KEY_MOVE_TO_POINT_32,
+        InputAction::MOVE_TO_POINT_32,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 33),
-        Input::KEY_MOVE_TO_POINT_33,
+        InputAction::MOVE_TO_POINT_33,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 34),
-        Input::KEY_MOVE_TO_POINT_34,
+        InputAction::MOVE_TO_POINT_34,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 35),
-        Input::KEY_MOVE_TO_POINT_35,
+        InputAction::MOVE_TO_POINT_35,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 36),
-        Input::KEY_MOVE_TO_POINT_36,
+        InputAction::MOVE_TO_POINT_36,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 37),
-        Input::KEY_MOVE_TO_POINT_37,
+        InputAction::MOVE_TO_POINT_37,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 38),
-        Input::KEY_MOVE_TO_POINT_38,
+        InputAction::MOVE_TO_POINT_38,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 39),
-        Input::KEY_MOVE_TO_POINT_39,
+        InputAction::MOVE_TO_POINT_39,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 40),
-        Input::KEY_MOVE_TO_POINT_40,
+        InputAction::MOVE_TO_POINT_40,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 41),
-        Input::KEY_MOVE_TO_POINT_41,
+        InputAction::MOVE_TO_POINT_41,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 42),
-        Input::KEY_MOVE_TO_POINT_42,
+        InputAction::MOVE_TO_POINT_42,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 43),
-        Input::KEY_MOVE_TO_POINT_43,
+        InputAction::MOVE_TO_POINT_43,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 44),
-        Input::KEY_MOVE_TO_POINT_44,
+        InputAction::MOVE_TO_POINT_44,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 45),
-        Input::KEY_MOVE_TO_POINT_45,
+        InputAction::MOVE_TO_POINT_45,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 46),
-        Input::KEY_MOVE_TO_POINT_46,
+        InputAction::MOVE_TO_POINT_46,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 47),
-        Input::KEY_MOVE_TO_POINT_47,
+        InputAction::MOVE_TO_POINT_47,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 48),
-        Input::KEY_MOVE_TO_POINT_48,
+        InputAction::MOVE_TO_POINT_48,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -1832,170 +1833,170 @@ static SetupActionData setupActionData8[] =
     {
         // TRANSLATORS: input action name
         N_("Move & selection"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Up"),
-        Input::KEY_GUI_UP,
+        InputAction::GUI_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Down"),
-        Input::KEY_GUI_DOWN,
+        InputAction::GUI_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Left"),
-        Input::KEY_GUI_LEFT,
+        InputAction::GUI_LEFT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Right"),
-        Input::KEY_GUI_RIGHT,
+        InputAction::GUI_RIGHT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Home"),
-        Input::KEY_GUI_HOME,
+        InputAction::GUI_HOME,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move End"),
-        Input::KEY_GUI_END,
+        InputAction::GUI_END,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Page up"),
-        Input::KEY_GUI_PAGE_UP,
+        InputAction::GUI_PAGE_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Page down"),
-        Input::KEY_GUI_PAGE_DOWN,
+        InputAction::GUI_PAGE_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Other"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Select"),
-        Input::KEY_GUI_SELECT,
+        InputAction::GUI_SELECT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Select2"),
-        Input::KEY_GUI_SELECT2,
+        InputAction::GUI_SELECT2,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Cancel"),
-        Input::KEY_GUI_CANCEL,
+        InputAction::GUI_CANCEL,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Delete"),
-        Input::KEY_GUI_DELETE,
+        InputAction::GUI_DELETE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Backspace"),
-        Input::KEY_GUI_BACKSPACE,
+        InputAction::GUI_BACKSPACE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Insert"),
-        Input::KEY_GUI_INSERT,
+        InputAction::GUI_INSERT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Tab"),
-        Input::KEY_GUI_TAB,
+        InputAction::GUI_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Mod"),
-        Input::KEY_GUI_MOD,
+        InputAction::GUI_MOD,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Ctrl"),
-        Input::KEY_GUI_CTRL,
+        InputAction::GUI_CTRL,
         "",
     },
     {
         "B",
-        Input::KEY_GUI_B,
+        InputAction::GUI_B,
         "",
     },
     {
         "C",
-        Input::KEY_GUI_C,
+        InputAction::GUI_C,
         "",
     },
     {
         "D",
-        Input::KEY_GUI_D,
+        InputAction::GUI_D,
         "",
     },
     {
         "E",
-        Input::KEY_GUI_E,
+        InputAction::GUI_E,
         "",
     },
     {
         "F",
-        Input::KEY_GUI_F,
+        InputAction::GUI_F,
         "",
     },
     {
         "H",
-        Input::KEY_GUI_H,
+        InputAction::GUI_H,
         "",
     },
     {
         "K",
-        Input::KEY_GUI_K,
+        InputAction::GUI_K,
         "",
     },
     {
         "U",
-        Input::KEY_GUI_U,
+        InputAction::GUI_U,
         "",
     },
     {
         "V",
-        Input::KEY_GUI_V,
+        InputAction::GUI_V,
         "",
     },
     {
         "W",
-        Input::KEY_GUI_W,
+        InputAction::GUI_W,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 89bf2fcd2..b6d805b11 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -441,19 +441,19 @@ bool Viewport::leftMouseAction()
             {
                 if (player_node->withinAttackRange(mHoverBeing) ||
                     inputManager.isActionActive(static_cast<int>(
-                    Input::KEY_ATTACK)))
+                    InputAction::ATTACK)))
                 {
                     validateSpeed();
                     if (!mStatsReUpdated && player_node != mHoverBeing)
                     {
                         player_node->attack(mHoverBeing,
                             !inputManager.isActionActive(
-                            static_cast<int>(Input::KEY_STOP_ATTACK)));
+                            static_cast<int>(InputAction::STOP_ATTACK)));
                         return true;
                     }
                 }
                 else if (!inputManager.isActionActive(static_cast<int>(
-                         Input::KEY_ATTACK)))
+                         InputAction::ATTACK)))
                 {
                     validateSpeed();
                     if (!mStatsReUpdated && player_node != mHoverBeing)
@@ -473,7 +473,7 @@ bool Viewport::leftMouseAction()
     }
     // Just walk around
     else if (!inputManager.isActionActive(static_cast<int>(
-             Input::KEY_ATTACK)))
+             InputAction::ATTACK)))
     {
         validateSpeed();
         player_node->stopAttack();
@@ -552,8 +552,8 @@ void Viewport::walkByMouse(const MouseEvent &event)
     if (!mMap || !player_node)
         return;
     if (mPlayerFollowMouse
-        && !inputManager.isActionActive(Input::KEY_STOP_ATTACK)
-        && !inputManager.isActionActive(Input::KEY_UNTARGET))
+        && !inputManager.isActionActive(InputAction::STOP_ATTACK)
+        && !inputManager.isActionActive(InputAction::UNTARGET))
     {
         if (!mMouseDirectionMove)
             mPlayerFollowMouse = false;
@@ -1088,8 +1088,8 @@ void Viewport::returnCamera()
 void Viewport::validateSpeed()
 {
     if (!inputManager.isActionActive(static_cast<int>(
-        Input::KEY_TARGET_ATTACK)) && !inputManager.isActionActive(
-        static_cast<int>(Input::KEY_ATTACK)))
+        InputAction::TARGET_ATTACK)) && !inputManager.isActionActive(
+        static_cast<int>(InputAction::ATTACK)))
     {
         if (Game::instance())
             Game::instance()->setValidSpeed();
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 3b3c97911..661dfc66d 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -70,6 +70,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "resources/image.h"
@@ -674,7 +675,7 @@ void Button::keyPressed(KeyEvent& event)
 {
     const int action = event.getActionId();
 
-    if (action == Input::KEY_GUI_SELECT)
+    if (action == InputAction::GUI_SELECT)
     {
         mKeyPressed = true;
         event.consume();
@@ -685,7 +686,7 @@ void Button::keyReleased(KeyEvent& event)
 {
     const int action = event.getActionId();
 
-    if (action == Input::KEY_GUI_SELECT && mKeyPressed)
+    if (action == InputAction::GUI_SELECT && mKeyPressed)
     {
         mKeyPressed = false;
         if (mStick)
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index b9d74e067..48f603532 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -67,6 +67,7 @@
 
 #include "client.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "resources/image.h"
@@ -241,7 +242,7 @@ void CheckBox::keyPressed(KeyEvent& event)
 {
     const int action = event.getActionId();
 
-    if (action == Input::KEY_GUI_SELECT)
+    if (action == InputAction::GUI_SELECT)
     {
         toggleSelected();
         event.consume();
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index a1158a59b..0a0b98b4c 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -209,5 +209,5 @@ void Desktop::setBestFittingWallpaper()
 void Desktop::handleLink(const std::string &link, MouseEvent *event A_UNUSED)
 {
     if (link == "copyright")
-        inputManager.executeAction(Input::KEY_WINDOW_ABOUT);
+        inputManager.executeAction(InputAction::WINDOW_ABOUT);
 }
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 65a5b10c9..71e546faa 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -26,6 +26,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/gui.h"
@@ -317,24 +318,24 @@ void DropDown::keyPressed(KeyEvent& event)
     const int actionId = event.getActionId();
     switch (actionId)
     {
-        case Input::KEY_GUI_SELECT:
-        case Input::KEY_GUI_SELECT2:
+        case InputAction::GUI_SELECT:
+        case InputAction::GUI_SELECT2:
             dropDown();
             break;
 
-        case Input::KEY_GUI_UP:
+        case InputAction::GUI_UP:
             setSelected(getSelected() - 1);
             break;
 
-        case Input::KEY_GUI_DOWN:
+        case InputAction::GUI_DOWN:
             setSelected(getSelected() + 1);
             break;
 
-        case Input::KEY_GUI_HOME:
+        case InputAction::GUI_HOME:
             setSelected(0);
             break;
 
-        case Input::KEY_GUI_END:
+        case InputAction::GUI_END:
             if (mPopup->getListModel())
             {
                 setSelected(mPopup->getListModel()->
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 9d9aa8d92..79a4021a4 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -125,7 +125,7 @@ void EmoteShortcutContainer::draw(Graphics *graphics)
 
         // Draw emote keyboard shortcut.
         const std::string key = inputManager.getKeyValueString(
-            Input::KEY_EMOTE_1 + i);
+            InputAction::EMOTE_1 + i);
 
         font->drawString(graphics, key, emoteX + 2, emoteY + 2);
     }
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 9aa17c512..ba2c36713 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -28,6 +28,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "listeners/guitableactionlistener.h"
@@ -370,38 +371,38 @@ void GuiTable::keyPressed(KeyEvent& event)
 {
     const int action = event.getActionId();
 
-    if (action == Input::KEY_GUI_SELECT)
+    if (action == InputAction::GUI_SELECT)
     {
         distributeActionEvent();
         event.consume();
     }
-    else if (action == Input::KEY_GUI_UP)
+    else if (action == InputAction::GUI_UP)
     {
         setSelectedRow(mSelectedRow - 1);
         event.consume();
     }
-    else if (action == Input::KEY_GUI_DOWN)
+    else if (action == InputAction::GUI_DOWN)
     {
         setSelectedRow(mSelectedRow + 1);
         event.consume();
     }
-    else if (action == Input::KEY_GUI_LEFT)
+    else if (action == InputAction::GUI_LEFT)
     {
         setSelectedColumn(mSelectedColumn - 1);
         event.consume();
     }
-    else if (action == Input::KEY_GUI_RIGHT)
+    else if (action == InputAction::GUI_RIGHT)
     {
         setSelectedColumn(mSelectedColumn + 1);
         event.consume();
     }
-    else if (action == Input::KEY_GUI_HOME)
+    else if (action == InputAction::GUI_HOME)
     {
         setSelectedRow(0);
         setSelectedColumn(0);
         event.consume();
     }
-    else if (action == Input::KEY_GUI_END && mModel)
+    else if (action == InputAction::GUI_END && mModel)
     {
         setSelectedRow(mModel->getRows() - 1);
         setSelectedColumn(mModel->getColumns() - 1);
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index 160cfe5de..fcec92a39 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -28,6 +28,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "utils/stringutils.h"
@@ -57,7 +58,8 @@ void IntTextField::keyPressed(KeyEvent &event)
 {
     const int action = event.getActionId();
 
-    if (action == Input::KEY_GUI_DELETE || action == Input::KEY_GUI_BACKSPACE)
+    if (action == InputAction::GUI_DELETE
+        || action == InputAction::GUI_BACKSPACE)
     {
         setText(std::string());
         if (mSendAlwaysEvents)
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index a993afcd0..4cf0e76f7 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -149,7 +149,7 @@ void ItemShortcutContainer::draw(Graphics *graphics)
 
         // Draw item keyboard shortcut.
         const std::string key = inputManager.getKeyValueString(
-            Input::KEY_SHORTCUT_1 + i);
+            InputAction::SHORTCUT_1 + i);
         graphics->setColorAll(mForegroundColor, mForegroundColor);
         font->drawString(graphics, key, itemX + 2, itemY + 2);
 
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index ceb3c1669..ab5e8dccb 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -67,6 +67,7 @@
 
 #include "client.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "listeners/selectionlistener.h"
@@ -230,12 +231,12 @@ void ListBox::draw(Graphics *graphics)
 void ListBox::keyPressed(KeyEvent &event)
 {
     const int action = event.getActionId();
-    if (action == Input::KEY_GUI_SELECT)
+    if (action == InputAction::GUI_SELECT)
     {
         distributeActionEvent();
         event.consume();
     }
-    else if (action == Input::KEY_GUI_UP)
+    else if (action == InputAction::GUI_UP)
     {
         if (mSelected > 0)
             setSelected(mSelected - 1);
@@ -243,7 +244,7 @@ void ListBox::keyPressed(KeyEvent &event)
             setSelected(getListModel()->getNumberOfElements() - 1);
         event.consume();
     }
-    else if (action == Input::KEY_GUI_DOWN)
+    else if (action == InputAction::GUI_DOWN)
     {
         const int num = getListModel()->getNumberOfElements() - 1;
         if (mSelected < num)
@@ -252,12 +253,12 @@ void ListBox::keyPressed(KeyEvent &event)
             setSelected(0);
         event.consume();
     }
-    else if (action == Input::KEY_GUI_HOME)
+    else if (action == InputAction::GUI_HOME)
     {
         setSelected(0);
         event.consume();
     }
-    else if (action == Input::KEY_GUI_END && getListModel())
+    else if (action == InputAction::GUI_END && getListModel())
     {
         setSelected(getListModel()->getNumberOfElements() - 1);
         event.consume();
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index ad1b5d902..87621e945 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -67,6 +67,7 @@
 
 #include "client.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "resources/image.h"
@@ -240,7 +241,7 @@ void RadioButton::mouseExited(MouseEvent& event A_UNUSED)
 void RadioButton::keyPressed(KeyEvent& event)
 {
     const int action = event.getActionId();
-    if (action == Input::KEY_GUI_SELECT)
+    if (action == InputAction::GUI_SELECT)
     {
         setSelected(true);
         distributeActionEvent();
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 77ae38931..848027c94 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -70,6 +70,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/gui.h"
@@ -409,13 +410,13 @@ void Slider::keyPressed(KeyEvent& event)
 
     if (mOrientation == HORIZONTAL)
     {
-        if (action == Input::KEY_GUI_RIGHT)
+        if (action == InputAction::GUI_RIGHT)
         {
             setValue(mValue + mStepLength);
             distributeActionEvent();
             event.consume();
         }
-        else if (action == Input::KEY_GUI_LEFT)
+        else if (action == InputAction::GUI_LEFT)
         {
             setValue(mValue - mStepLength);
             distributeActionEvent();
@@ -424,13 +425,13 @@ void Slider::keyPressed(KeyEvent& event)
     }
     else
     {
-        if (action == Input::KEY_GUI_UP)
+        if (action == InputAction::GUI_UP)
         {
             setValue(mValue + mStepLength);
             distributeActionEvent();
             event.consume();
         }
-        else if (action == Input::KEY_GUI_DOWN)
+        else if (action == InputAction::GUI_DOWN)
         {
             setValue(mValue - mStepLength);
             distributeActionEvent();
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index f99f6ccc8..81cf34dd2 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -67,6 +67,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/gui.h"
@@ -728,7 +729,7 @@ void TabbedArea::keyPressed(KeyEvent& event)
 
     const int actionId = event.getActionId();
 
-    if (actionId == Input::KEY_GUI_LEFT)
+    if (actionId == InputAction::GUI_LEFT)
     {
         int index = getSelectedTabIndex();
         index--;
@@ -740,7 +741,7 @@ void TabbedArea::keyPressed(KeyEvent& event)
 
         event.consume();
     }
-    else if (actionId == Input::KEY_GUI_RIGHT)
+    else if (actionId == InputAction::GUI_RIGHT)
     {
         int index = getSelectedTabIndex();
         index++;
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 4fae66b47..97aa7421f 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -177,7 +177,7 @@ void Setup_Input::action(const ActionEvent &event)
             if (i >= 0 && i < mActionDataSize[selectedData])
             {
                 if (setupActionData[selectedData][i].actionId
-                    == static_cast<int>(Input::KEY_NO_VALUE))
+                    == static_cast<int>(InputAction::NO_VALUE))
                 {
                     mAssignKeyButton->setEnabled(false);
                     mUnassignKeyButton->setEnabled(false);
@@ -215,7 +215,7 @@ void Setup_Input::action(const ActionEvent &event)
             inputManager.setNewKeyIndex(ik);
             refreshAssignedKey(mKeyList->getSelected());
             inputManager.unassignKey();
-            inputManager.setNewKeyIndex(static_cast<int>(Input::KEY_NO_VALUE));
+            inputManager.setNewKeyIndex(static_cast<int>(InputAction::NO_VALUE));
         }
         mAssignKeyButton->setEnabled(true);
     }
@@ -260,7 +260,7 @@ void Setup_Input::refreshAssignedKey(const int index)
 {
     const int selectedData = mKeyListModel->getSelectedData();
     const SetupActionData &key = setupActionData[selectedData][index];
-    if (key.actionId == static_cast<int>(Input::KEY_NO_VALUE))
+    if (key.actionId == static_cast<int>(InputAction::NO_VALUE))
     {
         const std::string str(" \342\200\225\342\200\225\342\200\225"
             "\342\200\225\342\200\225 ");
@@ -328,7 +328,7 @@ void Setup_Input::keyUnresolved()
     if (mKeySetting)
     {
         newKeyCallback(inputManager.getNewKeyIndex());
-        inputManager.setNewKeyIndex(static_cast<int>(Input::KEY_NO_VALUE));
+        inputManager.setNewKeyIndex(static_cast<int>(InputAction::NO_VALUE));
     }
 }
 
@@ -355,17 +355,17 @@ void Setup_Input::fixTranslation(SetupActionData *const actionDatas,
 
 void Setup_Input::fixTranslations()
 {
-    fixTranslation(setupActionData1, static_cast<int>(Input::KEY_SHORTCUT_1),
-        static_cast<int>(Input::KEY_SHORTCUT_20), "Item Shortcut %d");
+    fixTranslation(setupActionData1, static_cast<int>(InputAction::SHORTCUT_1),
+        static_cast<int>(InputAction::SHORTCUT_20), "Item Shortcut %d");
 
-    fixTranslation(setupActionData3, static_cast<int>(Input::KEY_EMOTE_1),
-        static_cast<int>(Input::KEY_EMOTE_48), "Emote Shortcut %d");
+    fixTranslation(setupActionData3, static_cast<int>(InputAction::EMOTE_1),
+        static_cast<int>(InputAction::EMOTE_48), "Emote Shortcut %d");
 
-    fixTranslation(setupActionData4, static_cast<int>(Input::KEY_OUTFIT_1),
-        static_cast<int>(Input::KEY_OUTFIT_48), "Outfit Shortcut %d");
+    fixTranslation(setupActionData4, static_cast<int>(InputAction::OUTFIT_1),
+        static_cast<int>(InputAction::OUTFIT_48), "Outfit Shortcut %d");
 
     fixTranslation(setupActionData7, static_cast<int>(
-        Input::KEY_MOVE_TO_POINT_1),
-        static_cast<int>(Input::KEY_MOVE_TO_POINT_48),
+        InputAction::MOVE_TO_POINT_1),
+        static_cast<int>(InputAction::MOVE_TO_POINT_48),
         "Move to point Shortcut %d");
 }
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 917c613c5..23fa63a07 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -65,6 +65,7 @@
 
 #include "gui/widgets/textbox.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/gui.h"
@@ -256,7 +257,7 @@ void TextBox::keyPressed(KeyEvent& event)
 
     switch (action)
     {
-        case Input::KEY_GUI_LEFT:
+        case InputAction::GUI_LEFT:
         {
             --mCaretColumn;
             if (mCaretColumn < 0)
@@ -277,7 +278,7 @@ void TextBox::keyPressed(KeyEvent& event)
             break;
         }
 
-        case Input::KEY_GUI_RIGHT:
+        case InputAction::GUI_RIGHT:
         {
             ++mCaretColumn;
             if (mCaretColumn > static_cast<int>(mTextRows[mCaretRow].size()))
@@ -302,28 +303,28 @@ void TextBox::keyPressed(KeyEvent& event)
             break;
         }
 
-        case Input::KEY_GUI_DOWN:
+        case InputAction::GUI_DOWN:
         {
             setCaretRow(mCaretRow + 1);
             break;
         }
-        case Input::KEY_GUI_UP:
+        case InputAction::GUI_UP:
         {
             setCaretRow(mCaretRow - 1);
             break;
         }
-        case Input::KEY_GUI_HOME:
+        case InputAction::GUI_HOME:
         {
             mCaretColumn = 0;
             break;
         }
-        case Input::KEY_GUI_END:
+        case InputAction::GUI_END:
         {
             mCaretColumn = static_cast<int>(mTextRows[mCaretRow].size());
             break;
         }
 
-        case Input::KEY_GUI_SELECT2:
+        case InputAction::GUI_SELECT2:
         {
             if (mEditable)
             {
@@ -337,7 +338,7 @@ void TextBox::keyPressed(KeyEvent& event)
             break;
         }
 
-        case Input::KEY_GUI_BACKSPACE:
+        case InputAction::GUI_BACKSPACE:
         {
             if (mCaretColumn != 0 && mEditable)
             {
@@ -355,7 +356,7 @@ void TextBox::keyPressed(KeyEvent& event)
             break;
         }
 
-        case Input::KEY_GUI_DELETE:
+        case InputAction::GUI_DELETE:
         {
             if (mCaretColumn < static_cast<int>(
                 mTextRows[mCaretRow].size()) && mEditable)
@@ -373,7 +374,7 @@ void TextBox::keyPressed(KeyEvent& event)
             break;
         }
 
-        case Input::KEY_GUI_PAGE_UP:
+        case InputAction::GUI_PAGE_UP:
         {
             Widget *const par = getParent();
 
@@ -389,7 +390,7 @@ void TextBox::keyPressed(KeyEvent& event)
             break;
         }
 
-        case Input::KEY_GUI_PAGE_DOWN:
+        case InputAction::GUI_PAGE_DOWN:
         {
             Widget *const par = getParent();
 
@@ -406,7 +407,7 @@ void TextBox::keyPressed(KeyEvent& event)
             break;
         }
 
-        case Input::KEY_GUI_TAB:
+        case InputAction::GUI_TAB:
         {
             if (mEditable)
             {
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 7aec5e4fc..14faad2f0 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -327,7 +327,7 @@ void TextField::keyPressed(KeyEvent &event)
 
     const int action = event.getActionId();
     if (!inputManager.isActionActive(static_cast<int>(
-        Input::KEY_GUI_CTRL)))
+        InputAction::GUI_CTRL)))
     {
         if (!handleNormalKeys(action, consumed))
         {
@@ -353,7 +353,7 @@ bool TextField::handleNormalKeys(const int action, bool &consumed)
 {
     switch (action)
     {
-        case Input::KEY_GUI_LEFT:
+        case InputAction::GUI_LEFT:
         {
             consumed = true;
             while (mCaretPosition > 0)
@@ -365,7 +365,7 @@ bool TextField::handleNormalKeys(const int action, bool &consumed)
             break;
         }
 
-        case Input::KEY_GUI_RIGHT:
+        case InputAction::GUI_RIGHT:
         {
             consumed = true;
             const unsigned sz = static_cast<unsigned>(mText.size());
@@ -381,7 +381,7 @@ bool TextField::handleNormalKeys(const int action, bool &consumed)
             break;
         }
 
-        case Input::KEY_GUI_DELETE:
+        case InputAction::GUI_DELETE:
         {
             consumed = true;
             unsigned sz = static_cast<unsigned>(mText.size());
@@ -398,28 +398,28 @@ bool TextField::handleNormalKeys(const int action, bool &consumed)
             break;
         }
 
-        case Input::KEY_GUI_BACKSPACE:
+        case InputAction::GUI_BACKSPACE:
             consumed = true;
             deleteCharLeft(mText, &mCaretPosition);
             break;
 
-        case Input::KEY_GUI_SELECT2:
+        case InputAction::GUI_SELECT2:
             distributeActionEvent();
             consumed = true;
             fixScroll();
             return false;
 
-        case Input::KEY_GUI_HOME:
+        case InputAction::GUI_HOME:
             mCaretPosition = 0;
             consumed = true;
             break;
 
-        case Input::KEY_GUI_END:
+        case InputAction::GUI_END:
             mCaretPosition = static_cast<unsigned>(mText.size());
             consumed = true;
             break;
 
-        case Input::KEY_GUI_TAB:
+        case InputAction::GUI_TAB:
             if (mLoseFocusOnTab)
                 return false;
             consumed = true;
@@ -435,19 +435,19 @@ void TextField::handleCtrlKeys(const int action, bool &consumed)
 {
     switch (action)
     {
-        case Input::KEY_GUI_LEFT:
+        case InputAction::GUI_LEFT:
         {
             moveCaretWordBack();
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_RIGHT:
+        case InputAction::GUI_RIGHT:
         {
             moveCaretWordForward();
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_B:
+        case InputAction::GUI_B:
         {
             if (mAllowSpecialActions)
             {
@@ -456,49 +456,49 @@ void TextField::handleCtrlKeys(const int action, bool &consumed)
             }
             break;
         }
-        case Input::KEY_GUI_F:
+        case InputAction::GUI_F:
         {
             moveCaretForward();
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_D:
+        case InputAction::GUI_D:
         {
             caretDelete();
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_E:
+        case InputAction::GUI_E:
         {
             mCaretPosition = static_cast<int>(mText.size());
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_H:
+        case InputAction::GUI_H:
         {
             deleteCharLeft(mText, &mCaretPosition);
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_K:
+        case InputAction::GUI_K:
         {
             mText = mText.substr(0, mCaretPosition);
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_U:
+        case InputAction::GUI_U:
         {
             caretDeleteToStart();
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_C:
+        case InputAction::GUI_C:
         {
             handleCopy();
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_V:
+        case InputAction::GUI_V:
         {
 #ifdef USE_SDL2
             handlePaste();
@@ -512,7 +512,7 @@ void TextField::handleCtrlKeys(const int action, bool &consumed)
             consumed = true;
             break;
         }
-        case Input::KEY_GUI_W:
+        case InputAction::GUI_W:
         {
             caretDeleteWord();
             consumed = true;
@@ -699,7 +699,7 @@ void TextField::mousePressed(MouseEvent &event)
 {
 #ifdef ANDROID
     if (!client->isKeyboardVisible())
-        inputManager.executeAction(Input::KEY_SHOW_KEYBOARD);
+        inputManager.executeAction(InputAction::SHOW_KEYBOARD);
 #endif
     event.consume();
     if (event.getButton() == MouseButton::RIGHT)
@@ -736,7 +736,7 @@ void TextField::focusGained(const Event &event A_UNUSED)
 {
 #ifdef ANDROID
     if (!client->isKeyboardVisible())
-        inputManager.executeAction(Input::KEY_SHOW_KEYBOARD);
+        inputManager.executeAction(InputAction::SHOW_KEYBOARD);
 #endif
 }
 
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index cb8e0c84d..b30306c3f 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -68,24 +68,24 @@ WindowMenu::WindowMenu(const Widget2 *const widget) :
     setFocusable(false);
     // TRANSLATORS: short button name for who is online window.
     addButton(N_("ONL"),
-        _("Who is online"), x, h, Input::KEY_WINDOW_ONLINE);
+        _("Who is online"), x, h, InputAction::WINDOW_ONLINE);
     // TRANSLATORS: short button name for help window.
     addButton(N_("HLP"),
-        _("Help"), x, h, Input::KEY_WINDOW_HELP);
+        _("Help"), x, h, InputAction::WINDOW_HELP);
     // TRANSLATORS: short button name for quests window.
     addButton(N_("QE"),
-        _("Quests"), x, h, Input::KEY_WINDOW_QUESTS);
+        _("Quests"), x, h, InputAction::WINDOW_QUESTS);
     // TRANSLATORS: short button name for bot checker window.
     addButton(N_("BC"),
-        _("Bot checker"), x, h, Input::KEY_WINDOW_BOT_CHECKER, false);
+        _("Bot checker"), x, h, InputAction::WINDOW_BOT_CHECKER, false);
     // TRANSLATORS: short button name for kill stats window.
     addButton(N_("KS"),
-        _("Kill stats"), x, h, Input::KEY_WINDOW_KILLS);
+        _("Kill stats"), x, h, InputAction::WINDOW_KILLS);
     addButton(":-)",
-        _("Smilies"), x, h, Input::KEY_WINDOW_EMOTE_SHORTCUT);
+        _("Smilies"), x, h, InputAction::WINDOW_EMOTE_SHORTCUT);
     // TRANSLATORS: short button name for chat window.
     addButton(N_("CH"),
-        _("Chat"), x, h, Input::KEY_WINDOW_CHAT,
+        _("Chat"), x, h, InputAction::WINDOW_CHAT,
 #ifdef ANDROID
         true);
 #else
@@ -93,56 +93,56 @@ WindowMenu::WindowMenu(const Widget2 *const widget) :
 #endif
     // TRANSLATORS: short button name for status window.
     addButton(N_("STA"),
-        _("Status"), x, h, Input::KEY_WINDOW_STATUS);
+        _("Status"), x, h, InputAction::WINDOW_STATUS);
     // TRANSLATORS: short button name for equipment window.
     addButton(N_("EQU"),
-        _("Equipment"), x, h, Input::KEY_WINDOW_EQUIPMENT);
+        _("Equipment"), x, h, InputAction::WINDOW_EQUIPMENT);
     // TRANSLATORS: short button name for inventory window.
     addButton(N_("INV"),
-        _("Inventory"), x, h, Input::KEY_WINDOW_INVENTORY);
+        _("Inventory"), x, h, InputAction::WINDOW_INVENTORY);
     // TRANSLATORS: short button name for map window.
     addButton(N_("MAP"),
-        _("Map"), x, h, Input::KEY_WINDOW_MINIMAP, false);
+        _("Map"), x, h, InputAction::WINDOW_MINIMAP, false);
 
     if (skillDialog->hasSkills())
     {
         // TRANSLATORS: short button name for skills window.
         addButton(N_("SKI"),
-            _("Skills"), x, h, Input::KEY_WINDOW_SKILL);
+            _("Skills"), x, h, InputAction::WINDOW_SKILL);
     }
 
     // TRANSLATORS: short button name for social window.
     addButton(N_("SOC"),
     // TRANSLATORS: full button name
-        _("Social"), x, h, Input::KEY_WINDOW_SOCIAL);
+        _("Social"), x, h, InputAction::WINDOW_SOCIAL);
     // TRANSLATORS: short button name for shortcuts window.
     addButton(N_("SH"),
         // TRANSLATORS: full button name
-        _("Shortcuts"), x, h, Input::KEY_WINDOW_SHORTCUT);
+        _("Shortcuts"), x, h, InputAction::WINDOW_SHORTCUT);
     // TRANSLATORS: short button name for spells window.
     addButton(N_("SP"),
         // TRANSLATORS: full button name
-        _("Spells"), x, h, Input::KEY_WINDOW_SPELLS);
+        _("Spells"), x, h, InputAction::WINDOW_SPELLS);
     // TRANSLATORS: short button name for drops window.
     addButton(N_("DR"),
         // TRANSLATORS: full button name
-        _("Drop"), x, h, Input::KEY_WINDOW_DROP, false);
+        _("Drop"), x, h, InputAction::WINDOW_DROP, false);
     // TRANSLATORS: short button name for did you know window.
     addButton(N_("YK"),
         // TRANSLATORS: full button name
-        _("Did you know"), x, h, Input::KEY_WINDOW_DIDYOUKNOW, false);
+        _("Did you know"), x, h, InputAction::WINDOW_DIDYOUKNOW, false);
     // TRANSLATORS: short button name for shop window.
     addButton(N_("SHP"),
         // TRANSLATORS: full button name
-        _("Shop"), x, h, Input::KEY_WINDOW_SHOP, false);
+        _("Shop"), x, h, InputAction::WINDOW_SHOP, false);
     // TRANSLATORS: short button name for outfits window.
     addButton(N_("OU"),
         // TRANSLATORS: full button name
-        _("Outfits"), x, h, Input::KEY_WINDOW_OUTFIT, false);
+        _("Outfits"), x, h, InputAction::WINDOW_OUTFIT, false);
     // TRANSLATORS: short button name for debug window.
     addButton(N_("DBG"),
         // TRANSLATORS: full button name
-        _("Debug"), x, h, Input::KEY_WINDOW_DEBUG,
+        _("Debug"), x, h, InputAction::WINDOW_DEBUG,
 #ifdef ANDROID
         true);
 #else
@@ -151,11 +151,11 @@ WindowMenu::WindowMenu(const Widget2 *const widget) :
     // TRANSLATORS: short button name for windows list menu.
     addButton(N_("WIN"),
         // TRANSLATORS: full button name
-        _("Windows"), x, h, Input::KEY_SHOW_WINDOWS, false);
+        _("Windows"), x, h, InputAction::SHOW_WINDOWS, false);
     // TRANSLATORS: short button name for setup window.
     addButton(N_("SET"),
         // TRANSLATORS: full button name
-        _("Setup"), x, h, Input::KEY_WINDOW_SETUP);
+        _("Setup"), x, h, InputAction::WINDOW_SETUP);
 
     x += mPadding - mSpacing;
     if (mainGraphics)
@@ -233,7 +233,7 @@ void WindowMenu::addButton(const char *const text,
     h = btn->getHeight() + 2 * mPadding;
     mButtons.push_back(btn);
     mButtonNames[text] = new ButtonInfo(btn, key, visible);
-    if (key != Input::KEY_SHOW_WINDOWS)
+    if (key != InputAction::SHOW_WINDOWS)
         mButtonTexts.push_back(new ButtonText(description, key));
 }
 
@@ -285,7 +285,7 @@ void WindowMenu::mouseMoved(MouseEvent &event)
     const int y = event.getY();
     const int key = btn->getTag();
     const Rect &rect = mDimension;
-    if (key != Input::KEY_NO_VALUE)
+    if (key != InputAction::NO_VALUE)
     {
         mTextPopup->show(x + rect.x, y + rect.y, btn->getDescription(),
             // TRANSLATORS: short key name
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index cc254bce0..e8f92e343 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -26,6 +26,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/windows/okdialog.h"
@@ -665,7 +666,7 @@ void CharCreateDialog::keyPressed(KeyEvent &event)
     const int actionId = event.getActionId();
     switch (actionId)
     {
-        case Input::KEY_GUI_CANCEL:
+        case InputAction::GUI_CANCEL:
             event.consume();
             action(ActionEvent(mCancelButton,
                 mCancelButton->getActionEventId()));
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 74a135bab..73ebb90b6 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -28,6 +28,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "being/attributes.h"
@@ -297,13 +298,13 @@ void CharSelectDialog::keyPressed(KeyEvent &event)
     const int actionId = event.getActionId();
     switch (actionId)
     {
-        case Input::KEY_GUI_CANCEL:
+        case InputAction::GUI_CANCEL:
             event.consume();
             action(ActionEvent(mSwitchLoginButton,
                 mSwitchLoginButton->getActionEventId()));
             break;
 
-        case Input::KEY_GUI_RIGHT:
+        case InputAction::GUI_RIGHT:
         {
             event.consume();
             int idx = mCharacterView->getSelected();
@@ -318,7 +319,7 @@ void CharSelectDialog::keyPressed(KeyEvent &event)
             break;
         }
 
-        case Input::KEY_GUI_LEFT:
+        case InputAction::GUI_LEFT:
         {
             event.consume();
             int idx = mCharacterView->getSelected();
@@ -333,7 +334,7 @@ void CharSelectDialog::keyPressed(KeyEvent &event)
             break;
         }
 
-        case Input::KEY_GUI_UP:
+        case InputAction::GUI_UP:
         {
             event.consume();
             int idx = mCharacterView->getSelected();
@@ -348,7 +349,7 @@ void CharSelectDialog::keyPressed(KeyEvent &event)
             break;
         }
 
-        case Input::KEY_GUI_DOWN:
+        case InputAction::GUI_DOWN:
         {
             event.consume();
             int idx = mCharacterView->getSelected();
@@ -363,7 +364,7 @@ void CharSelectDialog::keyPressed(KeyEvent &event)
             break;
         }
 
-        case Input::KEY_GUI_DELETE:
+        case InputAction::GUI_DELETE:
         {
             event.consume();
             const int idx = mCharacterView->getSelected();
@@ -375,7 +376,7 @@ void CharSelectDialog::keyPressed(KeyEvent &event)
             break;
         }
 
-        case Input::KEY_GUI_SELECT:
+        case InputAction::GUI_SELECT:
         {
             event.consume();
             use(mCharacterView->getSelected());
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 262700fc6..bd0f68453 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -662,7 +662,7 @@ void ChatWindow::mousePressed(MouseEvent &event)
             {
                 event.consume();
                 if (inputManager.isActionActive(static_cast<int>(
-                    Input::KEY_CHAT_MOD)))
+                    InputAction::CHAT_MOD)))
                 {
                     ChatTab *const wTab = dynamic_cast<WhisperTab*>(tab);
                     if (wTab)
@@ -721,7 +721,7 @@ void ChatWindow::keyPressed(KeyEvent &event)
 {
     const int actionId = event.getActionId();
     std::string temp;
-    if (actionId == static_cast<int>(Input::KEY_GUI_DOWN))
+    if (actionId == static_cast<int>(InputAction::GUI_DOWN))
     {
         if (mCurHist != mHistory.end())
         {
@@ -745,7 +745,7 @@ void ChatWindow::keyPressed(KeyEvent &event)
             mChatInput->setText("");
         }
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_UP) &&
+    else if (actionId == static_cast<int>(InputAction::GUI_UP) &&
              mCurHist != mHistory.begin() && !mHistory.empty())
     {
         // Move backward through the history
@@ -754,7 +754,7 @@ void ChatWindow::keyPressed(KeyEvent &event)
         mChatInput->setCaretPosition(static_cast<unsigned>(
                 mChatInput->getText().length()));
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_INSERT) &&
+    else if (actionId == static_cast<int>(InputAction::GUI_INSERT) &&
              mChatInput->getText() != "")
     {
         // Add the current message to the history and clear the text
@@ -763,18 +763,18 @@ void ChatWindow::keyPressed(KeyEvent &event)
         mCurHist = mHistory.end();
         mChatInput->setText("");
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_TAB) &&
+    else if (actionId == static_cast<int>(InputAction::GUI_TAB) &&
              !mChatInput->getText().empty())
     {
         autoComplete();
         return;
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL) &&
+    else if (actionId == static_cast<int>(InputAction::GUI_CANCEL) &&
              mChatInput->isVisibleLocal())
     {
         mChatInput->processVisible(false);
     }
-    else if (actionId == static_cast<int>(Input::KEY_CHAT_PREV_HISTORY) &&
+    else if (actionId == static_cast<int>(InputAction::CHAT_PREV_HISTORY) &&
              mChatInput->isVisibleLocal())
     {
         const ChatTab *const tab = getFocused();
@@ -806,7 +806,7 @@ void ChatWindow::keyPressed(KeyEvent &event)
                 mChatInput->getText().length()));
         }
     }
-    else if (actionId == static_cast<int>(Input::KEY_CHAT_NEXT_HISTORY) &&
+    else if (actionId == static_cast<int>(InputAction::CHAT_NEXT_HISTORY) &&
              mChatInput->isVisibleLocal())
     {
         const ChatTab *const tab = getFocused();
@@ -842,7 +842,7 @@ void ChatWindow::keyPressed(KeyEvent &event)
                     mChatInput->getText().length()));
         }
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_F1))
+    else if (actionId == static_cast<int>(InputAction::GUI_F1))
     {
         if (emoteWindow)
         {
@@ -852,21 +852,21 @@ void ChatWindow::keyPressed(KeyEvent &event)
                 emoteWindow->show();
         }
     }
-    ifKey(Input::KEY_GUI_F2, "\u2318")
-    ifKey(Input::KEY_GUI_F3, "\u263A")
-    ifKey(Input::KEY_GUI_F4, "\u2665")
-    ifKey(Input::KEY_GUI_F5, "\u266A")
-    ifKey(Input::KEY_GUI_F6, "\u266B")
-    ifKey(Input::KEY_GUI_F7, "\u26A0")
-    ifKey(Input::KEY_GUI_F8, "\u2622")
-    ifKey(Input::KEY_GUI_F9, "\u262E")
-    ifKey(Input::KEY_GUI_F10, "\u2605")
-    ifKey(Input::KEY_GUI_F11, "\u2618")
-    ifKey(Input::KEY_GUI_F12, "\u2592")
-
-    if (inputManager.isActionActive(static_cast<int>(Input::KEY_GUI_CTRL)))
-    {
-        if (actionId == static_cast<int>(Input::KEY_GUI_B))
+    ifKey(InputAction::GUI_F2, "\u2318")
+    ifKey(InputAction::GUI_F3, "\u263A")
+    ifKey(InputAction::GUI_F4, "\u2665")
+    ifKey(InputAction::GUI_F5, "\u266A")
+    ifKey(InputAction::GUI_F6, "\u266B")
+    ifKey(InputAction::GUI_F7, "\u26A0")
+    ifKey(InputAction::GUI_F8, "\u2622")
+    ifKey(InputAction::GUI_F9, "\u262E")
+    ifKey(InputAction::GUI_F10, "\u2605")
+    ifKey(InputAction::GUI_F11, "\u2618")
+    ifKey(InputAction::GUI_F12, "\u2592")
+
+    if (inputManager.isActionActive(static_cast<int>(InputAction::GUI_CTRL)))
+    {
+        if (actionId == static_cast<int>(InputAction::GUI_B))
         {
             std::string inputText = mChatInput->getTextBeforeCaret();
             toLower(inputText);
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index 516efea4d..da0de7026 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -23,6 +23,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/models/typelistmodel.h"
@@ -256,12 +257,12 @@ void EditServerDialog::keyPressed(KeyEvent &event)
 
     const int actionId = event.getActionId();
 
-    if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
+    if (actionId == static_cast<int>(InputAction::GUI_CANCEL))
     {
         scheduleDelete();
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
-             || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
+    else if (actionId == static_cast<int>(InputAction::GUI_SELECT)
+             || actionId == static_cast<int>(InputAction::GUI_SELECT2))
     {
         action(ActionEvent(nullptr, mOkButton->getActionEventId()));
     }
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index ee920f8a1..2049d2a12 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -396,7 +396,7 @@ void InventoryWindow::action(const ActionEvent &event)
                 return;
 
             if (inputManager.isActionActive(static_cast<int>(
-                Input::KEY_STOP_ATTACK)))
+                InputAction::STOP_ATTACK)))
             {
                 PlayerInfo::dropItem(item, item->getQuantity(), true);
             }
@@ -445,11 +445,11 @@ void InventoryWindow::mouseClicked(MouseEvent &event)
         gui->resetClickCount();
 
     const bool mod = (isStorageActive() && inputManager.isActionActive(
-        static_cast<int>(Input::KEY_STOP_ATTACK)));
+        static_cast<int>(InputAction::STOP_ATTACK)));
 
     const bool mod2 = (tradeWindow && tradeWindow->isWindowVisible()
         && inputManager.isActionActive(static_cast<int>(
-        Input::KEY_STOP_ATTACK)));
+        InputAction::STOP_ATTACK)));
 
     if (!mod && !mod2 && event.getButton() == MouseButton::RIGHT)
     {
@@ -584,13 +584,13 @@ void InventoryWindow::mouseExited(MouseEvent &event A_UNUSED)
 
 void InventoryWindow::keyPressed(KeyEvent &event)
 {
-    if (event.getActionId() == static_cast<int>(Input::KEY_GUI_MOD))
+    if (event.getActionId() == static_cast<int>(InputAction::GUI_MOD))
         mSplit = true;
 }
 
 void InventoryWindow::keyReleased(KeyEvent &event)
 {
-    if (event.getActionId() == static_cast<int>(Input::KEY_GUI_MOD))
+    if (event.getActionId() == static_cast<int>(InputAction::GUI_MOD))
         mSplit = false;
 }
 
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 99354f4fb..f03507320 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -27,6 +27,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "listeners/openurllistener.h"
@@ -245,12 +246,12 @@ void LoginDialog::keyPressed(KeyEvent &event)
     }
 
     const int actionId = event.getActionId();
-    if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
+    if (actionId == static_cast<int>(InputAction::GUI_CANCEL))
     {
         action(ActionEvent(nullptr, mServerButton->getActionEventId()));
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
-             || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
+    else if (actionId == static_cast<int>(InputAction::GUI_SELECT)
+             || actionId == static_cast<int>(InputAction::GUI_SELECT2))
     {
         action(ActionEvent(nullptr, mLoginButton->getActionEventId()));
     }
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index fb2b4a4e7..f9ac83ada 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -529,7 +529,7 @@ std::string OutfitWindow::keyName(const int number)
     if (number < 0 || number >= SHORTCUT_EMOTES)
         return "";
     return inputManager.getKeyStringLong(static_cast<int>(
-        Input::KEY_EMOTE_1) + number);
+        InputAction::EMOTE_1) + number);
 }
 
 void OutfitWindow::next()
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index e3276fae6..c34801c8e 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -30,6 +30,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/viewport.h"
@@ -208,17 +209,17 @@ void QuitDialog::keyPressed(KeyEvent &event)
 
     switch (actionId)
     {
-        case Input::KEY_GUI_SELECT:
-        case Input::KEY_GUI_SELECT2:
+        case InputAction::GUI_SELECT:
+        case InputAction::GUI_SELECT2:
             action(ActionEvent(nullptr, mOkButton->getActionEventId()));
             break;
-        case Input::KEY_GUI_CANCEL:
+        case InputAction::GUI_CANCEL:
             action(ActionEvent(nullptr, mCancelButton->getActionEventId()));
             break;
-        case Input::KEY_GUI_UP:
+        case InputAction::GUI_UP:
             dir = -1;
             break;
-        case Input::KEY_GUI_DOWN:
+        case InputAction::GUI_DOWN:
             dir = 1;
             break;
         default:
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index 61b7e0dac..3a906b00e 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -26,6 +26,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "listeners/wrongdatanoticelistener.h"
@@ -276,12 +277,12 @@ void RegisterDialog::keyPressed(KeyEvent &event)
         return;
     }
     const int actionId = event.getActionId();
-    if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
+    if (actionId == static_cast<int>(InputAction::GUI_CANCEL))
     {
         action(ActionEvent(nullptr, mCancelButton->getActionEventId()));
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
-             || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
+    else if (actionId == static_cast<int>(InputAction::GUI_SELECT)
+             || actionId == static_cast<int>(InputAction::GUI_SELECT2))
     {
         action(ActionEvent(nullptr, mRegisterButton->getActionEventId()));
     }
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 74906dc25..5a0bf0478 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -29,6 +29,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/gui.h"
@@ -300,23 +301,23 @@ void ServerDialog::keyPressed(KeyEvent &event)
 {
     switch (event.getActionId())
     {
-        case Input::KEY_GUI_CANCEL:
+        case InputAction::GUI_CANCEL:
             event.consume();
             client->setState(STATE_EXIT);
             return;
 
-        case Input::KEY_GUI_SELECT:
-        case Input::KEY_GUI_SELECT2:
+        case InputAction::GUI_SELECT:
+        case InputAction::GUI_SELECT2:
             event.consume();
             action(ActionEvent(nullptr,
                 mConnectButton->getActionEventId()));
             return;
 
-        case Input::KEY_GUI_INSERT:
+        case InputAction::GUI_INSERT:
             (new EditServerDialog(this, ServerInfo(), -1))->postInit();
             return;
 
-        case Input::KEY_GUI_DELETE:
+        case InputAction::GUI_DELETE:
         {
             const int index = mServersList->getSelected();
             if (index >= 0)
@@ -328,7 +329,7 @@ void ServerDialog::keyPressed(KeyEvent &event)
             return;
         }
 
-        case Input::KEY_GUI_BACKSPACE:
+        case InputAction::GUI_BACKSPACE:
         {
             const int index = mServersList->getSelected();
             if (index >= 0)
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 40b8014e2..475144f61 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -27,6 +27,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/widgets/browserbox.h"
@@ -302,13 +303,13 @@ void UpdaterWindow::action(const ActionEvent &event)
 void UpdaterWindow::keyPressed(KeyEvent &event)
 {
     const int actionId = event.getActionId();
-    if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
+    if (actionId == static_cast<int>(InputAction::GUI_CANCEL))
     {
         action(ActionEvent(nullptr, mCancelButton->getActionEventId()));
         client->setState(STATE_LOGIN);
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
-             || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
+    else if (actionId == static_cast<int>(InputAction::GUI_SELECT)
+             || actionId == static_cast<int>(InputAction::GUI_SELECT2))
     {
         if (mDownloadStatus == UPDATE_COMPLETE ||
             mDownloadStatus == UPDATE_ERROR)
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index 4a70e3750..f81f14399 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -26,6 +26,7 @@
 
 #include "events/keyevent.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/widgets/button.h"
@@ -123,13 +124,13 @@ void WorldSelectDialog::keyPressed(KeyEvent &event)
 {
     const int actionId = event.getActionId();
 
-    if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL))
+    if (actionId == static_cast<int>(InputAction::GUI_CANCEL))
     {
         action(ActionEvent(nullptr,
             mChangeLoginButton->getActionEventId()));
     }
-    else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT)
-             || actionId == static_cast<int>(Input::KEY_GUI_SELECT2))
+    else if (actionId == static_cast<int>(InputAction::GUI_SELECT)
+             || actionId == static_cast<int>(InputAction::GUI_SELECT2))
     {
         action(ActionEvent(nullptr, mChooseWorld->getActionEventId()));
     }
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
new file mode 100644
index 000000000..5c3611233
--- /dev/null
+++ b/src/input/inputaction.h
@@ -0,0 +1,346 @@
+/*
+ *  Custom keyboard shortcuts configuration
+ *  Copyright (C) 2007  Joshua Langley <joshlangley@optusnet.com.au>
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INPUT_INPUTACTION_H
+#define INPUT_INPUTACTION_H
+
+namespace InputAction
+{
+    /**
+      * All the key functions.
+      * KEY_NO_VALUE is used in initialization, and should be unchanged.
+      * KEY_TOTAL should always be last (used as a conditional in loops).
+      * The key assignment view gets arranged according to the order of
+      * these values.
+      */
+    enum Type
+    {
+        NO_VALUE = -1,
+        MOVE_UP,
+        MOVE_DOWN,
+        MOVE_LEFT,
+        MOVE_RIGHT,
+        ATTACK,
+        TARGET_ATTACK,
+        MOVE_TO_TARGET,
+        CHANGE_MOVE_TO_TARGET,
+        MOVE_TO_HOME,
+        SET_HOME,
+        MOVE_TO_POINT,
+        TALK,
+        STOP_ATTACK,
+        UNTARGET,
+        TARGET_MONSTER,
+        TARGET_NPC,
+        TARGET_PLAYER,
+        PICKUP,
+        CHANGE_PICKUP_TYPE,
+        HIDE_WINDOWS,
+        SIT,
+        SCREENSHOT,
+        TRADE,
+        PATHFIND,
+        OK,
+        QUIT,
+        SHORTCUTS_KEY,
+        SHORTCUT_1,
+        SHORTCUT_2,
+        SHORTCUT_3,
+        SHORTCUT_4,
+        SHORTCUT_5,
+        SHORTCUT_6,
+        SHORTCUT_7,
+        SHORTCUT_8,
+        SHORTCUT_9,
+        SHORTCUT_10,
+        SHORTCUT_11,
+        SHORTCUT_12,
+        SHORTCUT_13,
+        SHORTCUT_14,
+        SHORTCUT_15,
+        SHORTCUT_16,
+        SHORTCUT_17,
+        SHORTCUT_18,
+        SHORTCUT_19,
+        SHORTCUT_20,
+        WINDOW_HELP,
+        WINDOW_STATUS,
+        WINDOW_INVENTORY,
+        WINDOW_EQUIPMENT,
+        WINDOW_SKILL,
+        WINDOW_MINIMAP,
+        WINDOW_CHAT,
+        WINDOW_SHORTCUT,
+        WINDOW_SETUP,
+        WINDOW_DEBUG,
+        WINDOW_SOCIAL,
+        WINDOW_EMOTE_SHORTCUT,
+        WINDOW_OUTFIT,
+        WINDOW_SHOP,
+        WINDOW_DROP,
+        WINDOW_KILLS,
+        WINDOW_SPELLS,
+        WINDOW_BOT_CHECKER,
+        WINDOW_ONLINE,
+        WINDOW_DIDYOUKNOW,
+        WINDOW_QUESTS,
+        PREV_SOCIAL_TAB,
+        NEXT_SOCIAL_TAB,
+        EMOTE,
+        EMOTE_1,
+        EMOTE_2,
+        EMOTE_3,
+        EMOTE_4,
+        EMOTE_5,
+        EMOTE_6,
+        EMOTE_7,
+        EMOTE_8,
+        EMOTE_9,
+        EMOTE_10,
+        EMOTE_11,
+        EMOTE_12,
+        EMOTE_13,
+        EMOTE_14,
+        EMOTE_15,
+        EMOTE_16,
+        EMOTE_17,
+        EMOTE_18,
+        EMOTE_19,
+        EMOTE_20,
+        EMOTE_21,
+        EMOTE_22,
+        EMOTE_23,
+        EMOTE_24,
+        EMOTE_25,
+        EMOTE_26,
+        EMOTE_27,
+        EMOTE_28,
+        EMOTE_29,
+        EMOTE_30,
+        EMOTE_31,
+        EMOTE_32,
+        EMOTE_33,
+        EMOTE_34,
+        EMOTE_35,
+        EMOTE_36,
+        EMOTE_37,
+        EMOTE_38,
+        EMOTE_39,
+        EMOTE_40,
+        EMOTE_41,
+        EMOTE_42,
+        EMOTE_43,
+        EMOTE_44,
+        EMOTE_45,
+        EMOTE_46,
+        EMOTE_47,
+        EMOTE_48,
+        WEAR_OUTFIT,
+        COPY_OUTFIT,
+        COPY_EQUIPED_OUTFIT,
+        OUTFIT_1,
+        OUTFIT_2,
+        OUTFIT_3,
+        OUTFIT_4,
+        OUTFIT_5,
+        OUTFIT_6,
+        OUTFIT_7,
+        OUTFIT_8,
+        OUTFIT_9,
+        OUTFIT_10,
+        OUTFIT_11,
+        OUTFIT_12,
+        OUTFIT_13,
+        OUTFIT_14,
+        OUTFIT_15,
+        OUTFIT_16,
+        OUTFIT_17,
+        OUTFIT_18,
+        OUTFIT_19,
+        OUTFIT_20,
+        OUTFIT_21,
+        OUTFIT_22,
+        OUTFIT_23,
+        OUTFIT_24,
+        OUTFIT_25,
+        OUTFIT_26,
+        OUTFIT_27,
+        OUTFIT_28,
+        OUTFIT_29,
+        OUTFIT_30,
+        OUTFIT_31,
+        OUTFIT_32,
+        OUTFIT_33,
+        OUTFIT_34,
+        OUTFIT_35,
+        OUTFIT_36,
+        OUTFIT_37,
+        OUTFIT_38,
+        OUTFIT_39,
+        OUTFIT_40,
+        OUTFIT_41,
+        OUTFIT_42,
+        OUTFIT_43,
+        OUTFIT_44,
+        OUTFIT_45,
+        OUTFIT_46,
+        OUTFIT_47,
+        OUTFIT_48,
+        MOVE_TO_POINT_1,
+        MOVE_TO_POINT_2,
+        MOVE_TO_POINT_3,
+        MOVE_TO_POINT_4,
+        MOVE_TO_POINT_5,
+        MOVE_TO_POINT_6,
+        MOVE_TO_POINT_7,
+        MOVE_TO_POINT_8,
+        MOVE_TO_POINT_9,
+        MOVE_TO_POINT_10,
+        MOVE_TO_POINT_11,
+        MOVE_TO_POINT_12,
+        MOVE_TO_POINT_13,
+        MOVE_TO_POINT_14,
+        MOVE_TO_POINT_15,
+        MOVE_TO_POINT_16,
+        MOVE_TO_POINT_17,
+        MOVE_TO_POINT_18,
+        MOVE_TO_POINT_19,
+        MOVE_TO_POINT_20,
+        MOVE_TO_POINT_21,
+        MOVE_TO_POINT_22,
+        MOVE_TO_POINT_23,
+        MOVE_TO_POINT_24,
+        MOVE_TO_POINT_25,
+        MOVE_TO_POINT_26,
+        MOVE_TO_POINT_27,
+        MOVE_TO_POINT_28,
+        MOVE_TO_POINT_29,
+        MOVE_TO_POINT_30,
+        MOVE_TO_POINT_31,
+        MOVE_TO_POINT_32,
+        MOVE_TO_POINT_33,
+        MOVE_TO_POINT_34,
+        MOVE_TO_POINT_35,
+        MOVE_TO_POINT_36,
+        MOVE_TO_POINT_37,
+        MOVE_TO_POINT_38,
+        MOVE_TO_POINT_39,
+        MOVE_TO_POINT_40,
+        MOVE_TO_POINT_41,
+        MOVE_TO_POINT_42,
+        MOVE_TO_POINT_43,
+        MOVE_TO_POINT_44,
+        MOVE_TO_POINT_45,
+        MOVE_TO_POINT_46,
+        MOVE_TO_POINT_47,
+        MOVE_TO_POINT_48,
+        TOGGLE_CHAT,
+        SCROLL_CHAT_UP,
+        SCROLL_CHAT_DOWN,
+        PREV_CHAT_TAB,
+        NEXT_CHAT_TAB,
+        CLOSE_CHAT_TAB,
+        CHAT_PREV_HISTORY,
+        CHAT_NEXT_HISTORY,
+        IGNORE_INPUT_1,
+        IGNORE_INPUT_2,
+        DIRECT_UP,
+        DIRECT_DOWN,
+        DIRECT_LEFT,
+        DIRECT_RIGHT,
+        CRAZY_MOVES,
+        CHANGE_CRAZY_MOVES_TYPE,
+        QUICK_DROP,
+        QUICK_DROPN,
+        SWITCH_QUICK_DROP,
+        MAGIC_INMA1,
+        MAGIC_ITENPLZ,
+        MAGIC_ATTACK,
+        SWITCH_MAGIC_ATTACK,
+        SWITCH_PVP_ATTACK,
+        INVERT_DIRECTION,
+        CHANGE_ATTACK_WEAPON_TYPE,
+        CHANGE_ATTACK_TYPE,
+        CHANGE_FOLLOW_MODE,
+        CHANGE_IMITATION_MODE,
+        DISABLE_GAME_MODIFIERS,
+        CHANGE_AUDIO,
+        AWAY,
+        RIGHT_CLICK,
+        CAMERA,
+        RESERVED1,
+        GUI_UP,
+        GUI_DOWN,
+        GUI_LEFT,
+        GUI_RIGHT,
+        GUI_SELECT,
+        GUI_SELECT2,
+        GUI_CANCEL,
+        GUI_HOME,
+        GUI_END,
+        GUI_DELETE,
+        GUI_BACKSPACE,
+        GUI_TAB,
+        GUI_PAGE_UP,
+        GUI_PAGE_DOWN,
+        GUI_INSERT,
+        GUI_MOD,
+        SAFE_VIDEO,
+        STOP_SIT,
+        SHOW_KEYBOARD,
+        SHOW_WINDOWS,
+        CHAT_MOD,
+        MOVE_FORWARD,
+        GUI_CTRL,
+        GUI_B,
+        GUI_C,
+        GUI_D,
+        GUI_E,
+        GUI_F,
+        GUI_H,
+        GUI_K,
+        GUI_U,
+        GUI_V,
+        GUI_W,
+        PREV_SHORTCUTS_TAB,
+        NEXT_SHORTCUTS_TAB,
+        PREV_COMMANDS_TAB,
+        NEXT_COMMANDS_TAB,
+        OPEN_TRADE,
+        GUI_F1,
+        GUI_F2,
+        GUI_F3,
+        GUI_F4,
+        GUI_F5,
+        GUI_F6,
+        GUI_F7,
+        GUI_F8,
+        GUI_F9,
+        GUI_F10,
+        GUI_F11,
+        GUI_F12,
+        WINDOW_ABOUT,
+        TOTAL
+    };
+}  // namespace InputAction
+
+#endif  // INPUT_INPUTACTION_H
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 27d41e1fd..813880209 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -69,7 +69,7 @@ namespace
 
 InputManager::InputManager() :
     mSetupInput(nullptr),
-    mNewKeyIndex(Input::KEY_NO_VALUE),
+    mNewKeyIndex(InputAction::NO_VALUE),
     mMask(1),
     mNameMap()
 {
@@ -77,7 +77,7 @@ InputManager::InputManager() :
 
 void InputManager::init()
 {
-    for (unsigned int i = 0; i < Input::KEY_TOTAL; i++)
+    for (unsigned int i = 0; i < InputAction::TOTAL; i++)
     {
         KeyFunction &kf = mKey[i];
         for (unsigned int f = 0; f < KeyFunctionSize; f ++)
@@ -88,7 +88,7 @@ void InputManager::init()
         }
     }
 
-    mNewKeyIndex = Input::KEY_NO_VALUE;
+    mNewKeyIndex = InputAction::NO_VALUE;
 
     resetKeys();
     retrieve();
@@ -104,7 +104,7 @@ void InputManager::update()
 
 void InputManager::retrieve()
 {
-    for (int i = 0; i < Input::KEY_TOTAL; i++)
+    for (int i = 0; i < InputAction::TOTAL; i++)
     {
 #ifdef USE_SDL2
         const std::string cf = std::string("sdl2") + keyData[i].configField;
@@ -159,7 +159,7 @@ void InputManager::retrieve()
 
 void InputManager::store() const
 {
-    for (int i = 0; i < Input::KEY_TOTAL; i++)
+    for (int i = 0; i < InputAction::TOTAL; i++)
     {
 #ifdef USE_SDL2
         const std::string cf = std::string("sdl2") + keyData[i].configField;
@@ -241,13 +241,13 @@ void InputManager::resetKey(const int i)
 
 void InputManager::resetKeys()
 {
-    for (int i = 0; i < Input::KEY_TOTAL; i++)
+    for (int i = 0; i < InputAction::TOTAL; i++)
         resetKey(i);
 }
 
 void InputManager::makeDefault(const int i)
 {
-    if (i >= 0 && i < Input::KEY_TOTAL)
+    if (i >= 0 && i < InputAction::TOTAL)
     {
         resetKey(i);
         update();
@@ -260,7 +260,7 @@ bool InputManager::hasConflicts(int &restrict key1, int &restrict key2) const
      * No need to parse the square matrix: only check one triangle
      * that's enough to detect conflicts
      */
-    for (int i = 0; i < Input::KEY_TOTAL; i++)
+    for (int i = 0; i < InputAction::TOTAL; i++)
     {
         const KeyData &kdi = keyData[i];
         if (!*kdi.configField)
@@ -270,11 +270,11 @@ bool InputManager::hasConflicts(int &restrict key1, int &restrict key2) const
         for (size_t i2 = 0; i2 < KeyFunctionSize; i2 ++)
         {
             const KeyItem &vali2 = ki.values[i2];
-            if (vali2.value == Input::KEY_NO_VALUE)
+            if (vali2.value == InputAction::NO_VALUE)
                 continue;
 
             size_t j;
-            for (j = i, j++; j < Input::KEY_TOTAL; j++)
+            for (j = i, j++; j < InputAction::TOTAL; j++)
             {
                 if ((kdi.grp & keyData[j].grp) == 0 || !*kdi.configField)
                     continue;
@@ -328,7 +328,7 @@ bool InputManager::isActionActive0(const int index)
 
 KeyFunction &InputManager::getKey(int index)
 {
-    if (index < 0 || index >= Input::KEY_TOTAL)
+    if (index < 0 || index >= InputAction::TOTAL)
         index = 0;
     return mKey[index];
 }
@@ -433,7 +433,7 @@ std::string InputManager::getKeyValueByName(const std::string &keyName)
 void InputManager::addActionKey(const int action, const int type,
                                 const int val)
 {
-    if (action < 0 || action >= Input::KEY_TOTAL)
+    if (action < 0 || action >= InputAction::TOTAL)
         return;
 
     int idx = -1;
@@ -493,11 +493,11 @@ void InputManager::unassignKey()
 bool InputManager::handleAssignKey(const SDL_Event &event, const int type)
 {
     if (setupWindow && setupWindow->isWindowVisible() &&
-        getNewKeyIndex() > Input::KEY_NO_VALUE)
+        getNewKeyIndex() > InputAction::NO_VALUE)
     {
         setNewKey(event, type);
         callbackNewKey();
-        setNewKeyIndex(Input::KEY_NO_VALUE);
+        setNewKeyIndex(InputAction::NO_VALUE);
         return true;
     }
     return false;
@@ -654,8 +654,8 @@ void InputManager::updateConditionMask()
     if (!player_node || !player_node->getDisableGameModifiers())
         mMask |= InputCondition::EMODS;
 
-    if (!isActionActive0(Input::KEY_STOP_ATTACK)
-        && !isActionActive0(Input::KEY_UNTARGET))
+    if (!isActionActive0(InputAction::STOP_ATTACK)
+        && !isActionActive0(InputAction::UNTARGET))
     {
         mMask |= InputCondition::NOTARGET;
     }
@@ -672,7 +672,7 @@ bool InputManager::checkKey(const KeyData *const key) const
     if (!key || (key->condition & mMask) != key->condition)
         return false;
 
-    return (key->modKeyIndex == Input::KEY_NO_VALUE
+    return (key->modKeyIndex == InputAction::NO_VALUE
         || isActionActive0(key->modKeyIndex));
 }
 
@@ -692,7 +692,7 @@ bool InputManager::invokeKey(const KeyData *const key, const int keyNum)
 
 void InputManager::executeAction(const int keyNum)
 {
-    if (keyNum < 0 || keyNum >= Input::KEY_TOTAL)
+    if (keyNum < 0 || keyNum >= InputAction::TOTAL)
         return;
 
     InputEvent evt(keyNum, mMask);
@@ -709,7 +709,7 @@ void InputManager::updateKeyActionMap(KeyToActionMap &actionMap,
     actionMap.clear();
     keyTimeMap.clear();
 
-    for (size_t i = 0; i < Input::KEY_TOTAL; i ++)
+    for (size_t i = 0; i < InputAction::TOTAL; i ++)
     {
         const KeyFunction &key = mKey[i];
         const KeyData &kd = keyData[i];
@@ -761,7 +761,7 @@ bool InputManager::triggerAction(const KeysVector *const ptrs)
     FOR_EACHP (KeysVectorCIter, it, ptrs)
     {
         const int keyNum = *it;
-        if (keyNum < 0 || keyNum >= Input::KEY_TOTAL)
+        if (keyNum < 0 || keyNum >= InputAction::TOTAL)
             continue;
 
         if (invokeKey(&keyData[keyNum], keyNum))
@@ -773,7 +773,7 @@ bool InputManager::triggerAction(const KeysVector *const ptrs)
 int InputManager::getKeyIndex(const int value, const int grp,
                               const int type) const
 {
-    for (size_t i = 0; i < Input::KEY_TOTAL; i++)
+    for (size_t i = 0; i < InputAction::TOTAL; i++)
     {
         const KeyFunction &key = mKey[i];
         const KeyData &kd = keyData[i];
@@ -787,7 +787,7 @@ int InputManager::getKeyIndex(const int value, const int grp,
             }
         }
     }
-    return Input::KEY_NO_VALUE;
+    return InputAction::NO_VALUE;
 }
 
 int InputManager::getActionByKey(const SDL_Event &event) const
@@ -799,5 +799,5 @@ int InputManager::getActionByKey(const SDL_Event &event) const
         if (idx >= 0 && checkKey(&keyData[idx]))
             return idx;
     }
-    return Input::KEY_NO_VALUE;
+    return InputAction::NO_VALUE;
 }
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index c76d5728c..6b0634a96 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -21,6 +21,7 @@
 #ifndef INPUT_INPUTMANAGER_H
 #define INPUT_INPUTMANAGER_H
 
+#include "input/inputaction.h"
 #include "input/keyfunction.h"
 #include "input/keydata.h"
 
@@ -129,7 +130,7 @@ class InputManager final
 
         std::map<std::string, int> mNameMap;
 
-        KeyFunction mKey[Input::KEY_TOTAL]; /**< Pointer to all the key data */
+        KeyFunction mKey[InputAction::TOTAL];
 };
 
 extern InputManager inputManager;
diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp
index 58ef2007a..2b6ccce27 100644
--- a/src/input/keyboardconfig.cpp
+++ b/src/input/keyboardconfig.cpp
@@ -86,7 +86,7 @@ void KeyboardConfig::refreshActiveKeys()
 
 std::string KeyboardConfig::getKeyName(const int key)
 {
-    if (key == Input::KEY_NO_VALUE)
+    if (key == InputAction::NO_VALUE)
         return "";
     if (key >= 0)
     {
diff --git a/src/input/keyboarddata.h b/src/input/keyboarddata.h
index f947021a4..5d02e1dab 100644
--- a/src/input/keyboarddata.h
+++ b/src/input/keyboarddata.h
@@ -26,6 +26,7 @@
 #include "actionmanager.h"
 #include "localconsts.h"
 
+#include "input/inputaction.h"
 #include "input/inputcondition.h"
 #include "input/inputmanager.h"
 #include "input/inputtype.h"
@@ -35,41 +36,41 @@
 #include <string>
 
 // keyData must be in same order as enum keyAction.
-static const KeyData keyData[Input::KEY_TOTAL] = {
+static const KeyData keyData[InputAction::TOTAL] = {
     {"keyMoveUp",
         InputType::KEYBOARD, SDLK_UP,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::moveUp,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::ARROWKEYS},
     {"keyMoveDown",
         InputType::KEYBOARD, SDLK_DOWN,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::moveDown,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::ARROWKEYS},
     {"keyMoveLeft",
         InputType::KEYBOARD, SDLK_LEFT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::moveLeft,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::ARROWKEYS},
     {"keyMoveRight",
         InputType::KEYBOARD, SDLK_RIGHT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::moveRight,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::ARROWKEYS},
     {"keyAttack",
         InputType::KEYBOARD, SDLK_x,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_REPEAT,
         &ActionManager::attack,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOFOLLOW
             | InputCondition::VALIDSPEED},
     {"keyTargetAttack",
@@ -77,145 +78,145 @@ static const KeyData keyData[Input::KEY_TOTAL] = {
         InputType::JOYSTICK, 0,
         Input::GRP_DEFAULT,
         &ActionManager::targetAttack,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOFOLLOW
             | InputCondition::VALIDSPEED},
     {"keyMoveToTarget",
         InputType::KEYBOARD, SDLK_v,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::moveToTarget,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyChangeMoveToTarget",
         InputType::KEYBOARD, SDLK_PERIOD,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeMoveToTarget,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyMoveToHome",
         InputType::KEYBOARD, SDLK_d,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::moveToHome,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keySetHome",
         InputType::KEYBOARD, SDLK_KP5,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::setHome,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyMoveToPoint",
         InputType::KEYBOARD, SDLK_RSHIFT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyTalk",
         InputType::KEYBOARD, SDLK_t,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::talk,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME},
     {"keyTarget",
         InputType::KEYBOARD, SDLK_LSHIFT,
         InputType::JOYSTICK, 4,
         Input::GRP_DEFAULT,
         &ActionManager::stopAttack,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME},
     {"keyUnTarget",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::untarget,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME},
     {"keyTargetMonster",
         InputType::KEYBOARD, SDLK_a,
         InputType::JOYSTICK, 3,
         Input::GRP_DEFAULT | Input::GRP_REPEAT,
         &ActionManager::targetMonster,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET
             | InputCondition::VALIDSPEED},
     {"keyTargetNPC",
         InputType::KEYBOARD, SDLK_n,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::targetNPC,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyTargetPlayer",
         InputType::KEYBOARD, SDLK_q,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::targetPlayer,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyPickup",
         InputType::KEYBOARD, SDLK_z,
         InputType::JOYSTICK, 1,
         Input::GRP_DEFAULT,
         &ActionManager::pickup,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyChangePickupType",
         InputType::KEYBOARD, SDLK_o,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changePickupType,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyHideWindows",
         InputType::KEYBOARD, SDLK_h,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::hideWindows,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyBeingSit",
         InputType::KEYBOARD, SDLK_s,
         InputType::JOYSTICK, 2,
         Input::GRP_DEFAULT,
         &ActionManager::sit,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyScreenshot",
         InputType::KEYBOARD, SDLK_p,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::screenshot,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOTARGET},
     {"keyTrade",
         InputType::KEYBOARD, SDLK_r,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeTrade,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyPathfind",
         InputType::KEYBOARD, SDLK_f,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeMapMode,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET
             | InputCondition::EMODS},
     {"keyOK",
         InputType::KEYBOARD, SDLK_SPACE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::ok,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOMODAL | InputCondition::NOAWAY
             | InputCondition::NONPCINPUT},
     {"keyQuit",
@@ -223,1982 +224,1982 @@ static const KeyData keyData[Input::KEY_TOTAL] = {
 #if defined(USE_SDL2) && defined(ANDROID)
         InputType::KEYBOARD, SDLK_AC_BACK,
 #else
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
 #endif
         Input::GRP_DEFAULT,
         &ActionManager::quit,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyShortcutsKey",
         InputType::KEYBOARD, SDLK_MENU,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyShortcut1",
         InputType::KEYBOARD, SDLK_1,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut2",
         InputType::KEYBOARD, SDLK_2,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut3",
         InputType::KEYBOARD, SDLK_3,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut4",
         InputType::KEYBOARD, SDLK_4,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut5",
         InputType::KEYBOARD, SDLK_5,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut6",
         InputType::KEYBOARD, SDLK_6,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut7",
         InputType::KEYBOARD, SDLK_7,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut8",
         InputType::KEYBOARD, SDLK_8,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut9",
         InputType::KEYBOARD, SDLK_9,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut10",
         InputType::KEYBOARD, SDLK_0,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut11",
         InputType::KEYBOARD, SDLK_MINUS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut12",
         InputType::KEYBOARD, SDLK_EQUALS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut13",
         InputType::KEYBOARD, SDLK_BACKSPACE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut14",
         InputType::KEYBOARD, SDLK_INSERT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut15",
         InputType::KEYBOARD, SDLK_HOME,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut16",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut17",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut18",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut19",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyShortcut20",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT},
     {"keyWindowHelp",
         InputType::KEYBOARD, SDLK_F1,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::helpWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT0},
     {"keyWindowStatus",
         InputType::KEYBOARD, SDLK_F2,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::statusWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowInventory",
         InputType::KEYBOARD, SDLK_F3,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::inventoryWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowEquipment",
         InputType::KEYBOARD, SDLK_F4,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::equipmentWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowSkill",
         InputType::KEYBOARD, SDLK_F5,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::skillDialogShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowMinimap",
         InputType::KEYBOARD, SDLK_F6,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::minimapWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowChat",
         InputType::KEYBOARD, SDLK_F7,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::chatWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowShortcut",
         InputType::KEYBOARD, SDLK_F8,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::shortcutWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowSetup",
         InputType::KEYBOARD, SDLK_F9,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::setupWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOTARGET | InputCondition::NOINPUT
             | InputCondition::ENABLED},
     {"keyWindowDebug",
         InputType::KEYBOARD, SDLK_F10,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::debugWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowSocial",
         InputType::KEYBOARD, SDLK_F11,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::socialWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowEmoteBar",
         InputType::KEYBOARD, SDLK_F12,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::emoteShortcutWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowOutfit",
         InputType::KEYBOARD, SDLK_BACKQUOTE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::outfitWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowShop",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::shopWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowDrop",
         InputType::KEYBOARD, SDLK_w,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::dropShortcutWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowKills",
         InputType::KEYBOARD, SDLK_e,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::killStatsWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowSpells",
         InputType::KEYBOARD, SDLK_j,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::spellShortcutWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowBotChecker",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::botcheckerWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowOnline",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::whoIsOnlineWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keyWindowDidYouKnow",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::didYouKnowWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT0},
     {"keyWindowQuests",
         InputType::KEYBOARD, SDLK_LEFTBRACKET,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::questsWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
     {"keySocialPrevTab",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::prevSocialTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keySocialNextTab",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::nextSocialTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keySmilie",
         InputType::KEYBOARD, SDLK_LALT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyEmoteShortcut1",
         InputType::KEYBOARD, SDLK_1,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut2",
         InputType::KEYBOARD, SDLK_2,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut3",
         InputType::KEYBOARD, SDLK_3,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut4",
         InputType::KEYBOARD, SDLK_4,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut5",
         InputType::KEYBOARD, SDLK_5,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut6",
         InputType::KEYBOARD, SDLK_6,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut7",
         InputType::KEYBOARD, SDLK_7,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut8",
         InputType::KEYBOARD, SDLK_8,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut9",
         InputType::KEYBOARD, SDLK_9,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut10",
         InputType::KEYBOARD, SDLK_0,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut11",
         InputType::KEYBOARD, SDLK_MINUS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut12",
         InputType::KEYBOARD, SDLK_EQUALS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut13",
         InputType::KEYBOARD, SDLK_BACKSPACE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut14",
         InputType::KEYBOARD, SDLK_INSERT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut15",
         InputType::KEYBOARD, SDLK_HOME,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut16",
         InputType::KEYBOARD, SDLK_q,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut17",
         InputType::KEYBOARD, SDLK_w,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut18",
         InputType::KEYBOARD, SDLK_e,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut19",
         InputType::KEYBOARD, SDLK_r,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut20",
         InputType::KEYBOARD, SDLK_t,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut21",
         InputType::KEYBOARD, SDLK_y,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut22",
         InputType::KEYBOARD, SDLK_u,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut23",
         InputType::KEYBOARD, SDLK_i,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut24",
         InputType::KEYBOARD, SDLK_o,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut25",
         InputType::KEYBOARD, SDLK_p,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut26",
         InputType::KEYBOARD, SDLK_LEFTBRACKET,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut27",
         InputType::KEYBOARD, SDLK_RIGHTBRACKET,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut28",
         InputType::KEYBOARD, SDLK_BACKSLASH,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut29",
         InputType::KEYBOARD, SDLK_a,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut30",
         InputType::KEYBOARD, SDLK_s,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut31",
         InputType::KEYBOARD, SDLK_d,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut32",
         InputType::KEYBOARD, SDLK_f,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut33",
         InputType::KEYBOARD, SDLK_g,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut34",
         InputType::KEYBOARD, SDLK_h,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut35",
         InputType::KEYBOARD, SDLK_j,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut36",
         InputType::KEYBOARD, SDLK_k,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut37",
         InputType::KEYBOARD, SDLK_l,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut38",
         InputType::KEYBOARD, SDLK_SEMICOLON,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut39",
         InputType::KEYBOARD, SDLK_QUOTE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut40",
         InputType::KEYBOARD, SDLK_z,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut41",
         InputType::KEYBOARD, SDLK_x,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut42",
         InputType::KEYBOARD, SDLK_c,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut43",
         InputType::KEYBOARD, SDLK_v,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut44",
         InputType::KEYBOARD, SDLK_b,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut45",
         InputType::KEYBOARD, SDLK_n,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut46",
         InputType::KEYBOARD, SDLK_m,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut47",
         InputType::KEYBOARD, SDLK_COMMA,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyEmoteShortcut48",
         InputType::KEYBOARD, SDLK_PERIOD,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_EMOTION,
         &ActionManager::emote,
-        Input::KEY_EMOTE, 100,
+        InputAction::EMOTE, 100,
         InputCondition::GAME},
     {"keyWearOutfit",
         InputType::KEYBOARD, SDLK_RCTRL,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyCopyOutfit",
         InputType::KEYBOARD, SDLK_RALT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyCopyEquipedOutfit",
         InputType::KEYBOARD, SDLK_RIGHTBRACKET,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::copyEquippedToOutfit,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyOutfitShortcut1",
         InputType::KEYBOARD, SDLK_1,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut2",
         InputType::KEYBOARD, SDLK_2,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut3",
         InputType::KEYBOARD, SDLK_3,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut4",
         InputType::KEYBOARD, SDLK_4,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut5",
         InputType::KEYBOARD, SDLK_5,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut6",
         InputType::KEYBOARD, SDLK_6,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut7",
         InputType::KEYBOARD, SDLK_7,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut8",
         InputType::KEYBOARD, SDLK_8,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut9",
         InputType::KEYBOARD, SDLK_9,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut10",
         InputType::KEYBOARD, SDLK_0,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut11",
         InputType::KEYBOARD, SDLK_MINUS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut12",
         InputType::KEYBOARD, SDLK_EQUALS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut13",
         InputType::KEYBOARD, SDLK_BACKSPACE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut14",
         InputType::KEYBOARD, SDLK_INSERT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut15",
         InputType::KEYBOARD, SDLK_HOME,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut16",
         InputType::KEYBOARD, SDLK_q,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut17",
         InputType::KEYBOARD, SDLK_w,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut18",
         InputType::KEYBOARD, SDLK_e,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut19",
         InputType::KEYBOARD, SDLK_r,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut20",
         InputType::KEYBOARD, SDLK_t,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut21",
         InputType::KEYBOARD, SDLK_y,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut22",
         InputType::KEYBOARD, SDLK_u,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut23",
         InputType::KEYBOARD, SDLK_i,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut24",
         InputType::KEYBOARD, SDLK_o,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut25",
         InputType::KEYBOARD, SDLK_p,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut26",
         InputType::KEYBOARD, SDLK_LEFTBRACKET,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut27",
         InputType::KEYBOARD, SDLK_RIGHTBRACKET,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut28",
         InputType::KEYBOARD, SDLK_BACKSLASH,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut29",
         InputType::KEYBOARD, SDLK_a,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut30",
         InputType::KEYBOARD, SDLK_s,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut31",
         InputType::KEYBOARD, SDLK_d,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut32",
         InputType::KEYBOARD, SDLK_f,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut33",
         InputType::KEYBOARD, SDLK_g,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut34",
         InputType::KEYBOARD, SDLK_h,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut35",
         InputType::KEYBOARD, SDLK_j,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut36",
         InputType::KEYBOARD, SDLK_k,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut37",
         InputType::KEYBOARD, SDLK_l,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut38",
         InputType::KEYBOARD, SDLK_SEMICOLON,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut39",
         InputType::KEYBOARD, SDLK_QUOTE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut40",
         InputType::KEYBOARD, SDLK_z,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut41",
         InputType::KEYBOARD, SDLK_x,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut42",
         InputType::KEYBOARD, SDLK_c,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut43",
         InputType::KEYBOARD, SDLK_v,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut44",
         InputType::KEYBOARD, SDLK_b,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut45",
         InputType::KEYBOARD, SDLK_n,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut46",
         InputType::KEYBOARD, SDLK_m,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut47",
         InputType::KEYBOARD, SDLK_COMMA,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyOutfitShortcut48",
         InputType::KEYBOARD, SDLK_PERIOD,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_OUTFIT,
         &ActionManager::outfit,
-        Input::KEY_NO_VALUE, 100,
+        InputAction::NO_VALUE, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut1",
         InputType::KEYBOARD, SDLK_1,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut2",
         InputType::KEYBOARD, SDLK_2,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut3",
         InputType::KEYBOARD, SDLK_3,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut4",
         InputType::KEYBOARD, SDLK_4,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut5",
         InputType::KEYBOARD, SDLK_5,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut6",
         InputType::KEYBOARD, SDLK_6,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut7",
         InputType::KEYBOARD, SDLK_7,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut8",
         InputType::KEYBOARD, SDLK_8,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut9",
         InputType::KEYBOARD, SDLK_9,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut10",
         InputType::KEYBOARD, SDLK_0,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut11",
         InputType::KEYBOARD, SDLK_MINUS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut12",
         InputType::KEYBOARD, SDLK_EQUALS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut13",
         InputType::KEYBOARD, SDLK_BACKSPACE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut14",
         InputType::KEYBOARD, SDLK_INSERT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut15",
         InputType::KEYBOARD, SDLK_HOME,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut16",
         InputType::KEYBOARD, SDLK_q,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut17",
         InputType::KEYBOARD, SDLK_w,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut18",
         InputType::KEYBOARD, SDLK_e,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut19",
         InputType::KEYBOARD, SDLK_r,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut20",
         InputType::KEYBOARD, SDLK_t,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut21",
         InputType::KEYBOARD, SDLK_y,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut22",
         InputType::KEYBOARD, SDLK_u,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut23",
         InputType::KEYBOARD, SDLK_i,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut24",
         InputType::KEYBOARD, SDLK_o,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut25",
         InputType::KEYBOARD, SDLK_p,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut26",
         InputType::KEYBOARD, SDLK_LEFTBRACKET,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut27",
         InputType::KEYBOARD, SDLK_RIGHTBRACKET,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut28",
         InputType::KEYBOARD, SDLK_BACKSLASH,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut29",
         InputType::KEYBOARD, SDLK_a,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut30",
         InputType::KEYBOARD, SDLK_s,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut31",
         InputType::KEYBOARD, SDLK_d,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut32",
         InputType::KEYBOARD, SDLK_f,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut33",
         InputType::KEYBOARD, SDLK_g,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut34",
         InputType::KEYBOARD, SDLK_h,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut35",
         InputType::KEYBOARD, SDLK_j,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut36",
         InputType::KEYBOARD, SDLK_k,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut37",
         InputType::KEYBOARD, SDLK_l,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut38",
         InputType::KEYBOARD, SDLK_SEMICOLON,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut39",
         InputType::KEYBOARD, SDLK_QUOTE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut40",
         InputType::KEYBOARD, SDLK_z,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut41",
         InputType::KEYBOARD, SDLK_x,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut42",
         InputType::KEYBOARD, SDLK_c,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut43",
         InputType::KEYBOARD, SDLK_v,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut44",
         InputType::KEYBOARD, SDLK_b,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut45",
         InputType::KEYBOARD, SDLK_n,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut46",
         InputType::KEYBOARD, SDLK_m,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut47",
         InputType::KEYBOARD, SDLK_COMMA,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyMoveToPointShortcut48",
         InputType::KEYBOARD, SDLK_PERIOD,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_MOVETOPOINT,
         &ActionManager::moveToPoint,
-        Input::KEY_MOVE_TO_POINT, 100,
+        InputAction::MOVE_TO_POINT, 100,
         InputCondition::GAME},
     {"keyChat",
         InputType::KEYBOARD, SDLK_RETURN,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_CHAT,
         &ActionManager::toggleChat,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::NOAWAY
             | InputCondition::NOMODAL | InputCondition::INGAME},
     {"keyChatScrollUp",
         InputType::KEYBOARD, SDLK_PAGEUP,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::scrollChatUp,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyChatScrollDown",
         InputType::KEYBOARD, SDLK_PAGEDOWN,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::scrollChatDown,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyChatPrevTab",
         InputType::KEYBOARD, SDLK_KP7,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::prevChatTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keyChatNextTab",
         InputType::KEYBOARD, SDLK_KP9,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::nextChatTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keyChatCloseTab",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::closeChatTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keyChatPrevHistory",
         InputType::KEYBOARD, SDLK_KP7,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_CHAT | Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyChatNextHistory",
         InputType::KEYBOARD, SDLK_KP9,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_CHAT | Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyIgnoreInput1",
 #ifdef USE_SDL2
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
 #else
         InputType::KEYBOARD, SDLK_LSUPER,
 #endif
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::ignoreInput,
-        Input::KEY_NO_VALUE, 500,
+        InputAction::NO_VALUE, 500,
         InputCondition::DEFAULT},
     {"keyIgnoreInput2",
 #ifdef USE_SDL2
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
 #else
         InputType::KEYBOARD, SDLK_RSUPER,
 #endif
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::ignoreInput,
-        Input::KEY_NO_VALUE, 500,
+        InputAction::NO_VALUE, 500,
         InputCondition::DEFAULT},
     {"keyDirectUp",
         InputType::KEYBOARD, SDLK_l,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::directUp,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME},
     {"keyDirectDown",
         InputType::KEYBOARD, SDLK_SEMICOLON,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::directDown,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME},
     {"keyDirectLeft",
         InputType::KEYBOARD, SDLK_k,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::directLeft,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME},
     {"keyDirectRight",
         InputType::KEYBOARD, SDLK_QUOTE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::directRight,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME},
     {"keyCrazyMoves",
         InputType::KEYBOARD, SDLK_SLASH,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::crazyMoves,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyChangeCrazyMoveType",
         InputType::KEYBOARD, SDLK_BACKSLASH,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeCrazyMove,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyQuickDrop",
         InputType::KEYBOARD, SDLK_y,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::dropItem0,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyQuickDropN",
         InputType::KEYBOARD, SDLK_u,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::dropItem,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keySwitchQuickDrop",
         InputType::KEYBOARD, SDLK_i,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::switchQuickDrop,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyMagicInma1",
         InputType::KEYBOARD, SDLK_c,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::heal,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyMagicItenplz",
         InputType::KEYBOARD, SDLK_m,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::itenplz,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyMagicAttack",
         InputType::KEYBOARD, SDLK_b,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::magicAttack,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keySwitchMagicAttack",
         InputType::KEYBOARD, SDLK_COMMA,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeMagicAttack,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keySwitchPvpAttack",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changePvpMode,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyInvertDirection",
-        InputType::KEYBOARD, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::KEYBOARD, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeMoveType,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyChangeAttackWeaponType",
         InputType::KEYBOARD, SDLK_g,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeAttackWeaponType,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyChangeAttackType",
         InputType::KEYBOARD, SDLK_END,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeAttackType,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyChangeFollowMode",
         InputType::KEYBOARD, SDLK_KP1,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeFollowMode,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyChangeImitationMode",
         InputType::KEYBOARD, SDLK_KP4,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeImitationMode,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyDisableGameModifiers",
         InputType::KEYBOARD, SDLK_KP8,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeGameModifier,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyChangeAudio",
         InputType::KEYBOARD, SDLK_KP3,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::changeAudio,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyAway",
         InputType::KEYBOARD, SDLK_KP2,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::away,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED},
     {"keyRightClick",
         InputType::KEYBOARD, SDLK_TAB,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::mouseClick,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::NOAWAY
             | InputCondition::NOMODAL | InputCondition::INGAME},
     {"keyCameraMode",
         InputType::KEYBOARD, SDLK_KP_PLUS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::camera,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::VALIDSPEED
             | InputCondition::EMODS},
     {"keyMod",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         0,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIUp",
         InputType::KEYBOARD, SDLK_UP,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIDown",
         InputType::KEYBOARD, SDLK_DOWN,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUILeft",
         InputType::KEYBOARD, SDLK_LEFT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIRight",
         InputType::KEYBOARD, SDLK_RIGHT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUISelect",
         InputType::KEYBOARD, SDLK_SPACE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUISelect2",
         InputType::KEYBOARD, SDLK_RETURN,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUICancel",
         InputType::KEYBOARD, SDLK_ESCAPE,
 #if defined(USE_SDL2) && defined(ANDROID)
         InputType::KEYBOARD, SDLK_AC_BACK,
 #else
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
 #endif
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIHome",
         InputType::KEYBOARD, SDLK_HOME,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIEnd",
         InputType::KEYBOARD, SDLK_END,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIDelete",
         InputType::KEYBOARD, SDLK_DELETE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIBackSpace",
         InputType::KEYBOARD, SDLK_BACKSPACE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUITab",
         InputType::KEYBOARD, SDLK_TAB,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIPageUp",
         InputType::KEYBOARD, SDLK_PAGEUP,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIPageDown",
         InputType::KEYBOARD, SDLK_PAGEDOWN,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIInsert",
         InputType::KEYBOARD, SDLK_INSERT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIMod",
         InputType::KEYBOARD, SDLK_LSHIFT,
         InputType::KEYBOARD, SDLK_RSHIFT,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keySafeVideo",
         InputType::KEYBOARD, SDLK_KP_MINUS,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::safeVideoMode,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyStopSit",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::stopSit,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyShowKeyboard",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::showKeyboard,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyShowWindows",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::showWindows,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyChatMod",
         InputType::KEYBOARD, SDLK_LSHIFT,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT | InputCondition::INGAME},
     {"keyMoveForward",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::moveForward,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::ARROWKEYS},
     {"keyGUICtrl",
         InputType::KEYBOARD, SDLK_LCTRL,
         InputType::KEYBOARD, SDLK_RCTRL,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIb",
         InputType::KEYBOARD, SDLK_b,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIc",
         InputType::KEYBOARD, SDLK_c,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUId",
         InputType::KEYBOARD, SDLK_d,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIe",
         InputType::KEYBOARD, SDLK_e,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIf",
         InputType::KEYBOARD, SDLK_f,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIh",
         InputType::KEYBOARD, SDLK_h,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIk",
         InputType::KEYBOARD, SDLK_k,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIu",
         InputType::KEYBOARD, SDLK_u,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIv",
         InputType::KEYBOARD, SDLK_v,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIw",
         InputType::KEYBOARD, SDLK_w,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyShortcutsPrevTab",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::prevShortcutsTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keyShortcutsNextTab",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::nextShortcutsTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keyCommandsPrevTab",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::prevCommandsTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keyCommandsNextTab",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::nextCommandsTab,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::NOINPUT | InputCondition::INGAME},
     {"keyOpenTrade",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT,
         &ActionManager::openTrade,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::GAME | InputCondition::NOTARGET},
 
     {"keyGUIF1",
         InputType::KEYBOARD, SDLK_F1,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF2",
         InputType::KEYBOARD, SDLK_F2,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF3",
         InputType::KEYBOARD, SDLK_F3,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF4",
         InputType::KEYBOARD, SDLK_F4,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF5",
         InputType::KEYBOARD, SDLK_F5,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF6",
         InputType::KEYBOARD, SDLK_F6,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF7",
         InputType::KEYBOARD, SDLK_F7,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF8",
         InputType::KEYBOARD, SDLK_F8,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF9",
         InputType::KEYBOARD, SDLK_F9,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF10",
         InputType::KEYBOARD, SDLK_F10,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF11",
         InputType::KEYBOARD, SDLK_F11,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyGUIF12",
         InputType::KEYBOARD, SDLK_F12,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_GUICHAN | Input::GRP_CHAT,
         nullptr,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::DEFAULT},
     {"keyWindowAbout",
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
-        InputType::UNKNOWN, Input::KEY_NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
         Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::aboutWindowShow,
-        Input::KEY_NO_VALUE, 50,
+        InputAction::NO_VALUE, 50,
         InputCondition::SHORTCUT0},
 };
 
diff --git a/src/input/keydata.h b/src/input/keydata.h
index 41a0e85a5..2004936d7 100644
--- a/src/input/keydata.h
+++ b/src/input/keydata.h
@@ -57,322 +57,6 @@ namespace Input
         GRP_REPEAT = 128           // repeat emulation keys
     };
 
-    /**
-      * All the key functions.
-      * KEY_NO_VALUE is used in initialization, and should be unchanged.
-      * KEY_TOTAL should always be last (used as a conditional in loops).
-      * The key assignment view gets arranged according to the order of
-      * these values.
-      */
-    enum KeyAction
-    {
-        KEY_NO_VALUE = -1,
-        KEY_MOVE_UP,
-        KEY_MOVE_DOWN,
-        KEY_MOVE_LEFT,
-        KEY_MOVE_RIGHT,
-        KEY_ATTACK,
-        KEY_TARGET_ATTACK,
-        KEY_MOVE_TO_TARGET,
-        KEY_CHANGE_MOVE_TO_TARGET,
-        KEY_MOVE_TO_HOME,
-        KEY_SET_HOME,
-        KEY_MOVE_TO_POINT,
-        KEY_TALK,
-        KEY_STOP_ATTACK,
-        KEY_UNTARGET,
-        KEY_TARGET_MONSTER,
-        KEY_TARGET_NPC,
-        KEY_TARGET_PLAYER,
-        KEY_PICKUP,
-        KEY_CHANGE_PICKUP_TYPE,
-        KEY_HIDE_WINDOWS,
-        KEY_SIT,
-        KEY_SCREENSHOT,
-        KEY_TRADE,
-        KEY_PATHFIND,
-        KEY_OK,
-        KEY_QUIT,
-        KEY_SHORTCUTS_KEY,
-        KEY_SHORTCUT_1,
-        KEY_SHORTCUT_2,
-        KEY_SHORTCUT_3,
-        KEY_SHORTCUT_4,
-        KEY_SHORTCUT_5,
-        KEY_SHORTCUT_6,
-        KEY_SHORTCUT_7,
-        KEY_SHORTCUT_8,
-        KEY_SHORTCUT_9,
-        KEY_SHORTCUT_10,
-        KEY_SHORTCUT_11,
-        KEY_SHORTCUT_12,
-        KEY_SHORTCUT_13,
-        KEY_SHORTCUT_14,
-        KEY_SHORTCUT_15,
-        KEY_SHORTCUT_16,
-        KEY_SHORTCUT_17,
-        KEY_SHORTCUT_18,
-        KEY_SHORTCUT_19,
-        KEY_SHORTCUT_20,
-        KEY_WINDOW_HELP,
-        KEY_WINDOW_STATUS,
-        KEY_WINDOW_INVENTORY,
-        KEY_WINDOW_EQUIPMENT,
-        KEY_WINDOW_SKILL,
-        KEY_WINDOW_MINIMAP,
-        KEY_WINDOW_CHAT,
-        KEY_WINDOW_SHORTCUT,
-        KEY_WINDOW_SETUP,
-        KEY_WINDOW_DEBUG,
-        KEY_WINDOW_SOCIAL,
-        KEY_WINDOW_EMOTE_SHORTCUT,
-        KEY_WINDOW_OUTFIT,
-        KEY_WINDOW_SHOP,
-        KEY_WINDOW_DROP,
-        KEY_WINDOW_KILLS,
-        KEY_WINDOW_SPELLS,
-        KEY_WINDOW_BOT_CHECKER,
-        KEY_WINDOW_ONLINE,
-        KEY_WINDOW_DIDYOUKNOW,
-        KEY_WINDOW_QUESTS,
-        KEY_PREV_SOCIAL_TAB,
-        KEY_NEXT_SOCIAL_TAB,
-        KEY_EMOTE,
-        KEY_EMOTE_1,
-        KEY_EMOTE_2,
-        KEY_EMOTE_3,
-        KEY_EMOTE_4,
-        KEY_EMOTE_5,
-        KEY_EMOTE_6,
-        KEY_EMOTE_7,
-        KEY_EMOTE_8,
-        KEY_EMOTE_9,
-        KEY_EMOTE_10,
-        KEY_EMOTE_11,
-        KEY_EMOTE_12,
-        KEY_EMOTE_13,
-        KEY_EMOTE_14,
-        KEY_EMOTE_15,
-        KEY_EMOTE_16,
-        KEY_EMOTE_17,
-        KEY_EMOTE_18,
-        KEY_EMOTE_19,
-        KEY_EMOTE_20,
-        KEY_EMOTE_21,
-        KEY_EMOTE_22,
-        KEY_EMOTE_23,
-        KEY_EMOTE_24,
-        KEY_EMOTE_25,
-        KEY_EMOTE_26,
-        KEY_EMOTE_27,
-        KEY_EMOTE_28,
-        KEY_EMOTE_29,
-        KEY_EMOTE_30,
-        KEY_EMOTE_31,
-        KEY_EMOTE_32,
-        KEY_EMOTE_33,
-        KEY_EMOTE_34,
-        KEY_EMOTE_35,
-        KEY_EMOTE_36,
-        KEY_EMOTE_37,
-        KEY_EMOTE_38,
-        KEY_EMOTE_39,
-        KEY_EMOTE_40,
-        KEY_EMOTE_41,
-        KEY_EMOTE_42,
-        KEY_EMOTE_43,
-        KEY_EMOTE_44,
-        KEY_EMOTE_45,
-        KEY_EMOTE_46,
-        KEY_EMOTE_47,
-        KEY_EMOTE_48,
-        KEY_WEAR_OUTFIT,
-        KEY_COPY_OUTFIT,
-        KEY_COPY_EQUIPED_OUTFIT,
-        KEY_OUTFIT_1,
-        KEY_OUTFIT_2,
-        KEY_OUTFIT_3,
-        KEY_OUTFIT_4,
-        KEY_OUTFIT_5,
-        KEY_OUTFIT_6,
-        KEY_OUTFIT_7,
-        KEY_OUTFIT_8,
-        KEY_OUTFIT_9,
-        KEY_OUTFIT_10,
-        KEY_OUTFIT_11,
-        KEY_OUTFIT_12,
-        KEY_OUTFIT_13,
-        KEY_OUTFIT_14,
-        KEY_OUTFIT_15,
-        KEY_OUTFIT_16,
-        KEY_OUTFIT_17,
-        KEY_OUTFIT_18,
-        KEY_OUTFIT_19,
-        KEY_OUTFIT_20,
-        KEY_OUTFIT_21,
-        KEY_OUTFIT_22,
-        KEY_OUTFIT_23,
-        KEY_OUTFIT_24,
-        KEY_OUTFIT_25,
-        KEY_OUTFIT_26,
-        KEY_OUTFIT_27,
-        KEY_OUTFIT_28,
-        KEY_OUTFIT_29,
-        KEY_OUTFIT_30,
-        KEY_OUTFIT_31,
-        KEY_OUTFIT_32,
-        KEY_OUTFIT_33,
-        KEY_OUTFIT_34,
-        KEY_OUTFIT_35,
-        KEY_OUTFIT_36,
-        KEY_OUTFIT_37,
-        KEY_OUTFIT_38,
-        KEY_OUTFIT_39,
-        KEY_OUTFIT_40,
-        KEY_OUTFIT_41,
-        KEY_OUTFIT_42,
-        KEY_OUTFIT_43,
-        KEY_OUTFIT_44,
-        KEY_OUTFIT_45,
-        KEY_OUTFIT_46,
-        KEY_OUTFIT_47,
-        KEY_OUTFIT_48,
-        KEY_MOVE_TO_POINT_1,
-        KEY_MOVE_TO_POINT_2,
-        KEY_MOVE_TO_POINT_3,
-        KEY_MOVE_TO_POINT_4,
-        KEY_MOVE_TO_POINT_5,
-        KEY_MOVE_TO_POINT_6,
-        KEY_MOVE_TO_POINT_7,
-        KEY_MOVE_TO_POINT_8,
-        KEY_MOVE_TO_POINT_9,
-        KEY_MOVE_TO_POINT_10,
-        KEY_MOVE_TO_POINT_11,
-        KEY_MOVE_TO_POINT_12,
-        KEY_MOVE_TO_POINT_13,
-        KEY_MOVE_TO_POINT_14,
-        KEY_MOVE_TO_POINT_15,
-        KEY_MOVE_TO_POINT_16,
-        KEY_MOVE_TO_POINT_17,
-        KEY_MOVE_TO_POINT_18,
-        KEY_MOVE_TO_POINT_19,
-        KEY_MOVE_TO_POINT_20,
-        KEY_MOVE_TO_POINT_21,
-        KEY_MOVE_TO_POINT_22,
-        KEY_MOVE_TO_POINT_23,
-        KEY_MOVE_TO_POINT_24,
-        KEY_MOVE_TO_POINT_25,
-        KEY_MOVE_TO_POINT_26,
-        KEY_MOVE_TO_POINT_27,
-        KEY_MOVE_TO_POINT_28,
-        KEY_MOVE_TO_POINT_29,
-        KEY_MOVE_TO_POINT_30,
-        KEY_MOVE_TO_POINT_31,
-        KEY_MOVE_TO_POINT_32,
-        KEY_MOVE_TO_POINT_33,
-        KEY_MOVE_TO_POINT_34,
-        KEY_MOVE_TO_POINT_35,
-        KEY_MOVE_TO_POINT_36,
-        KEY_MOVE_TO_POINT_37,
-        KEY_MOVE_TO_POINT_38,
-        KEY_MOVE_TO_POINT_39,
-        KEY_MOVE_TO_POINT_40,
-        KEY_MOVE_TO_POINT_41,
-        KEY_MOVE_TO_POINT_42,
-        KEY_MOVE_TO_POINT_43,
-        KEY_MOVE_TO_POINT_44,
-        KEY_MOVE_TO_POINT_45,
-        KEY_MOVE_TO_POINT_46,
-        KEY_MOVE_TO_POINT_47,
-        KEY_MOVE_TO_POINT_48,
-        KEY_TOGGLE_CHAT,
-        KEY_SCROLL_CHAT_UP,
-        KEY_SCROLL_CHAT_DOWN,
-        KEY_PREV_CHAT_TAB,
-        KEY_NEXT_CHAT_TAB,
-        KEY_CLOSE_CHAT_TAB,
-        KEY_CHAT_PREV_HISTORY,
-        KEY_CHAT_NEXT_HISTORY,
-        KEY_IGNORE_INPUT_1,
-        KEY_IGNORE_INPUT_2,
-        KEY_DIRECT_UP,
-        KEY_DIRECT_DOWN,
-        KEY_DIRECT_LEFT,
-        KEY_DIRECT_RIGHT,
-        KEY_CRAZY_MOVES,
-        KEY_CHANGE_CRAZY_MOVES_TYPE,
-        KEY_QUICK_DROP,
-        KEY_QUICK_DROPN,
-        KEY_SWITCH_QUICK_DROP,
-        KEY_MAGIC_INMA1,
-        KEY_MAGIC_ITENPLZ,
-        KEY_MAGIC_ATTACK,
-        KEY_SWITCH_MAGIC_ATTACK,
-        KEY_SWITCH_PVP_ATTACK,
-        KEY_INVERT_DIRECTION,
-        KEY_CHANGE_ATTACK_WEAPON_TYPE,
-        KEY_CHANGE_ATTACK_TYPE,
-        KEY_CHANGE_FOLLOW_MODE,
-        KEY_CHANGE_IMITATION_MODE,
-        KEY_DISABLE_GAME_MODIFIERS,
-        KEY_CHANGE_AUDIO,
-        KEY_AWAY,
-        KEY_RIGHT_CLICK,
-        KEY_CAMERA,
-        KEY_RESERVED1,
-        KEY_GUI_UP,
-        KEY_GUI_DOWN,
-        KEY_GUI_LEFT,
-        KEY_GUI_RIGHT,
-        KEY_GUI_SELECT,
-        KEY_GUI_SELECT2,
-        KEY_GUI_CANCEL,
-        KEY_GUI_HOME,
-        KEY_GUI_END,
-        KEY_GUI_DELETE,
-        KEY_GUI_BACKSPACE,
-        KEY_GUI_TAB,
-        KEY_GUI_PAGE_UP,
-        KEY_GUI_PAGE_DOWN,
-        KEY_GUI_INSERT,
-        KEY_GUI_MOD,
-        KEY_SAFE_VIDEO,
-        KEY_STOP_SIT,
-        KEY_SHOW_KEYBOARD,
-        KEY_SHOW_WINDOWS,
-        KEY_CHAT_MOD,
-        KEY_MOVE_FORWARD,
-        KEY_GUI_CTRL,
-        KEY_GUI_B,
-        KEY_GUI_C,
-        KEY_GUI_D,
-        KEY_GUI_E,
-        KEY_GUI_F,
-        KEY_GUI_H,
-        KEY_GUI_K,
-        KEY_GUI_U,
-        KEY_GUI_V,
-        KEY_GUI_W,
-        KEY_PREV_SHORTCUTS_TAB,
-        KEY_NEXT_SHORTCUTS_TAB,
-        KEY_PREV_COMMANDS_TAB,
-        KEY_NEXT_COMMANDS_TAB,
-        KEY_OPEN_TRADE,
-        KEY_GUI_F1,
-        KEY_GUI_F2,
-        KEY_GUI_F3,
-        KEY_GUI_F4,
-        KEY_GUI_F5,
-        KEY_GUI_F6,
-        KEY_GUI_F7,
-        KEY_GUI_F8,
-        KEY_GUI_F9,
-        KEY_GUI_F10,
-        KEY_GUI_F11,
-        KEY_GUI_F12,
-        KEY_WINDOW_ABOUT,
-        KEY_TOTAL
-    };
 }  // namespace Input
 
 #endif  // INPUT_KEYDATA_H
diff --git a/src/touchactions.cpp b/src/touchactions.cpp
index 17e9591af..1224ae9c2 100644
--- a/src/touchactions.cpp
+++ b/src/touchactions.cpp
@@ -70,33 +70,33 @@ static void moveChar(int x, int y)
     // detecting direction
     if (x > 0)
     {
-        touchManager.setActionActive(Input::KEY_MOVE_LEFT, false);
-        touchManager.setActionActive(Input::KEY_MOVE_RIGHT, true);
+        touchManager.setActionActive(InputAction::MOVE_LEFT, false);
+        touchManager.setActionActive(InputAction::MOVE_RIGHT, true);
     }
     else if (x < 0)
     {
-        touchManager.setActionActive(Input::KEY_MOVE_LEFT, true);
-        touchManager.setActionActive(Input::KEY_MOVE_RIGHT, false);
+        touchManager.setActionActive(InputAction::MOVE_LEFT, true);
+        touchManager.setActionActive(InputAction::MOVE_RIGHT, false);
     }
     else
     {
-        touchManager.setActionActive(Input::KEY_MOVE_LEFT, false);
-        touchManager.setActionActive(Input::KEY_MOVE_RIGHT, false);
+        touchManager.setActionActive(InputAction::MOVE_LEFT, false);
+        touchManager.setActionActive(InputAction::MOVE_RIGHT, false);
     }
     if (y > 0)
     {
-        touchManager.setActionActive(Input::KEY_MOVE_DOWN, true);
-        touchManager.setActionActive(Input::KEY_MOVE_UP, false);
+        touchManager.setActionActive(InputAction::MOVE_DOWN, true);
+        touchManager.setActionActive(InputAction::MOVE_UP, false);
     }
     else if (y < 0)
     {
-        touchManager.setActionActive(Input::KEY_MOVE_DOWN, false);
-        touchManager.setActionActive(Input::KEY_MOVE_UP, true);
+        touchManager.setActionActive(InputAction::MOVE_DOWN, false);
+        touchManager.setActionActive(InputAction::MOVE_UP, true);
     }
     else
     {
-        touchManager.setActionActive(Input::KEY_MOVE_DOWN, false);
-        touchManager.setActionActive(Input::KEY_MOVE_UP, false);
+        touchManager.setActionActive(InputAction::MOVE_DOWN, false);
+        touchManager.setActionActive(InputAction::MOVE_UP, false);
     }
     inputManager.updateConditionMask();
 }
diff --git a/src/touchmanager.h b/src/touchmanager.h
index d874ec452..6033dc951 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -23,6 +23,7 @@
 
 #include "listeners/configlistener.h"
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "gui/rect.h"
@@ -39,7 +40,7 @@ class MouseInput;
 
 typedef void (*TouchFuncPtr) (const MouseInput &mouseInput);
 
-const int actionsSize = Input::KEY_TOTAL;
+const int actionsSize = InputAction::TOTAL;
 const int buttonsCount = 12;
 
 struct TouchItem final