Move enums from keyboardconfig.h to keydata.h.

16 files changed, 793 insertions, 798 deletions

diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index a1c423b2c..5f80f4269 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -85,7 +85,7 @@ impHandler0(moveUp)
         dialog->refocus();
         return false;
     }
-    if (keyboard.isActionActive(keyboard.KEY_EMOTE))
+    if (keyboard.isActionActive(Input::KEY_EMOTE))
         return directUp(event);
     return false;
 }
@@ -97,45 +97,45 @@ impHandler0(moveDown)
         dialog->refocus();
         return false;
     }
-    if (keyboard.isActionActive(keyboard.KEY_EMOTE))
+    if (keyboard.isActionActive(Input::KEY_EMOTE))
         return directDown(event);
     return false;
 }
 
 impHandler0(moveLeft)
 {
-    if (outfitWindow && keyboard.isActionActive(keyboard.KEY_WEAR_OUTFIT))
+    if (outfitWindow && keyboard.isActionActive(Input::KEY_WEAR_OUTFIT))
     {
         outfitWindow->wearPreviousOutfit();
         if (Game::instance())
             Game::instance()->setValidSpeed();
         return true;
     }
-    if (keyboard.isActionActive(keyboard.KEY_EMOTE))
+    if (keyboard.isActionActive(Input::KEY_EMOTE))
         return directLeft(event);
     return false;
 }
 
 impHandler0(moveRight)
 {
-    if (outfitWindow && keyboard.isActionActive(keyboard.KEY_WEAR_OUTFIT))
+    if (outfitWindow && keyboard.isActionActive(Input::KEY_WEAR_OUTFIT))
     {
         outfitWindow->wearNextOutfit();
         if (Game::instance())
             Game::instance()->setValidSpeed();
         return true;
     }
-    if (keyboard.isActionActive(keyboard.KEY_EMOTE))
+    if (keyboard.isActionActive(Input::KEY_EMOTE))
         return directRight(event);
     return false;
 }
 
 impHandler(emote)
 {
-    if (keyboard.isActionActive(keyboard.KEY_EMOTE))
+    if (keyboard.isActionActive(Input::KEY_EMOTE))
     {
         // emote keys
-        int emotion = 1 + event.action - KeyboardConfig::KEY_EMOTE_1;
+        int emotion = 1 + event.action - Input::KEY_EMOTE_1;
         if (emotion > 0)
         {
             if (emoteShortcut)
@@ -145,19 +145,19 @@ impHandler(emote)
             return true;
         }
     }
-    else if (keyboard.isActionActive(keyboard.KEY_MOVE_TO_POINT))
+    else if (keyboard.isActionActive(Input::KEY_MOVE_TO_POINT))
     {
         // move to point keys
-        int num = event.action - KeyboardConfig::KEY_EMOTE_1;
+        int num = event.action - Input::KEY_EMOTE_1;
         if (socialWindow && num >= 0)
         {
             socialWindow->selectPortal(num);
             return true;
         }
     }
-    else if (keyboard.isActionActive(keyboard.KEY_WEAR_OUTFIT))
+    else if (keyboard.isActionActive(Input::KEY_WEAR_OUTFIT))
     {
-        int num = event.action - KeyboardConfig::KEY_EMOTE_1;
+        int num = event.action - Input::KEY_EMOTE_1;
         if (outfitWindow && num >= 0)
         {
             outfitWindow->wearOutfit(num);
@@ -166,9 +166,9 @@ impHandler(emote)
             return true;
         }
     }
-    else if (keyboard.isActionActive(keyboard.KEY_COPY_OUTFIT))
+    else if (keyboard.isActionActive(Input::KEY_COPY_OUTFIT))
     {
-        int num = event.action - KeyboardConfig::KEY_EMOTE_1;
+        int num = event.action - Input::KEY_EMOTE_1;
         if (outfitWindow && num >= 0)
         {
             outfitWindow->copyOutfit(num);
@@ -226,7 +226,7 @@ impHandler(shortcut)
         if (num >= 0 && num < SHORTCUT_TABS)
         {
             itemShortcut[num]->useItem(event.action
-                - KeyboardConfig::KEY_SHORTCUT_1);
+                - Input::KEY_SHORTCUT_1);
         }
         return true;
     }
@@ -412,8 +412,8 @@ impHandler0(changePickupType)
 
 impHandler0(moveToTarget)
 {
-    if (player_node && !keyboard.isActionActive(keyboard.KEY_TARGET_ATTACK)
-        && !keyboard.isActionActive(keyboard.KEY_ATTACK))
+    if (player_node && !keyboard.isActionActive(Input::KEY_TARGET_ATTACK)
+        && !keyboard.isActionActive(Input::KEY_ATTACK))
     {
         player_node->moveToTarget();
         return true;
@@ -423,8 +423,8 @@ impHandler0(moveToTarget)
 
 impHandler0(moveToHome)
 {
-    if (player_node && !keyboard.isActionActive(keyboard.KEY_TARGET_ATTACK)
-        && !keyboard.isActionActive(keyboard.KEY_ATTACK))
+    if (player_node && !keyboard.isActionActive(Input::KEY_TARGET_ATTACK)
+        && !keyboard.isActionActive(Input::KEY_ATTACK))
     {
         player_node->moveToHome();
         if (Game::instance())
@@ -617,7 +617,7 @@ impHandler0(sit)
 {
     if (player_node)
     {
-        if (keyboard.isActionActive(keyboard.KEY_EMOTE))
+        if (keyboard.isActionActive(Input::KEY_EMOTE))
             player_node->updateSit();
         else
             player_node->toggleSit();
diff --git a/src/game.cpp b/src/game.cpp
index 786b72e6f..eda5fd638 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -722,8 +722,8 @@ void Game::handleMoveAndAttack()
         // 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 (keyboard.isActionActive(keyboard.KEY_IGNORE_INPUT_1) ||
-            keyboard.isActionActive(keyboard.KEY_IGNORE_INPUT_2))
+        if (keyboard.isActionActive(Input::KEY_IGNORE_INPUT_1) ||
+            keyboard.isActionActive(Input::KEY_IGNORE_INPUT_2))
         {
             return;
         }
@@ -731,14 +731,14 @@ void Game::handleMoveAndAttack()
         unsigned char direction = 0;
 
         // Translate pressed keys to movement and direction
-        if (keyboard.isActionActive(keyboard.KEY_MOVE_UP) ||
+        if (keyboard.isActionActive(Input::KEY_MOVE_UP) ||
             (joystick && joystick->isUp()))
         {
             direction |= Being::UP;
             setValidSpeed();
             player_node->cancelFollow();
         }
-        else if (keyboard.isActionActive(keyboard.KEY_MOVE_DOWN) ||
+        else if (keyboard.isActionActive(Input::KEY_MOVE_DOWN) ||
                  (joystick && joystick->isDown()))
         {
             direction |= Being::DOWN;
@@ -746,14 +746,14 @@ void Game::handleMoveAndAttack()
             player_node->cancelFollow();
         }
 
-        if (keyboard.isActionActive(keyboard.KEY_MOVE_LEFT) ||
+        if (keyboard.isActionActive(Input::KEY_MOVE_LEFT) ||
             (joystick && joystick->isLeft()))
         {
             direction |= Being::LEFT;
             setValidSpeed();
             player_node->cancelFollow();
         }
-        else if (keyboard.isActionActive(keyboard.KEY_MOVE_RIGHT) ||
+        else if (keyboard.isActionActive(Input::KEY_MOVE_RIGHT) ||
                  (joystick && joystick->isRight()))
         {
             direction |= Being::RIGHT;
@@ -761,7 +761,7 @@ void Game::handleMoveAndAttack()
             player_node->cancelFollow();
         }
 
-        if (!keyboard.isActionActive(keyboard.KEY_EMOTE) || direction == 0)
+        if (!keyboard.isActionActive(Input::KEY_EMOTE) || direction == 0)
         {
             if (!viewport->getCameraMode())
             {
@@ -791,20 +791,20 @@ void Game::handleMoveAndAttack()
         if ((player_node->getFollow().empty() || joyAttack) && mValidSpeed)
         {
             // Attacking monsters
-            if (keyboard.isActionActive(keyboard.KEY_ATTACK))
+            if (keyboard.isActionActive(Input::KEY_ATTACK))
             {
                 if (player_node->getTarget())
                     player_node->attack(player_node->getTarget(), true);
             }
 
-            if ((keyboard.isActionActive(keyboard.KEY_TARGET_ATTACK)
+            if ((keyboard.isActionActive(Input::KEY_TARGET_ATTACK)
                 || joyAttack)
-                /*&& !keyboard.isActionActive(keyboard.KEY_MOVE_TO_TARGET)*/
+                /*&& !keyboard.isActionActive(Input::KEY_MOVE_TO_TARGET)*/
                 )
             {
                 Being *target = nullptr;
 
-                bool newTarget = !keyboard.isActionActive(keyboard.KEY_TARGET);
+                bool newTarget = !keyboard.isActionActive(Input::KEY_TARGET);
                 // A set target has highest priority
                 if (!player_node->getTarget())
                 {
@@ -821,27 +821,27 @@ void Game::handleMoveAndAttack()
             }
         }
 
-        if (!keyboard.isActionActive(keyboard.KEY_EMOTE))
+        if (!keyboard.isActionActive(Input::KEY_EMOTE))
         {
             // Target the nearest player/monster/npc
-            if ((keyboard.isActionActive(keyboard.KEY_TARGET_PLAYER) ||
-                keyboard.isActionActive(keyboard.KEY_TARGET_CLOSEST) ||
-                keyboard.isActionActive(keyboard.KEY_TARGET_NPC) ||
+            if ((keyboard.isActionActive(Input::KEY_TARGET_PLAYER) ||
+                keyboard.isActionActive(Input::KEY_TARGET_CLOSEST) ||
+                keyboard.isActionActive(Input::KEY_TARGET_NPC) ||
                 (joystick && joystick->buttonPressed(3))) &&
-                !keyboard.isActionActive(keyboard.KEY_TARGET) &&
-                !keyboard.isActionActive(keyboard.KEY_UNTARGET))
+                !keyboard.isActionActive(Input::KEY_TARGET) &&
+                !keyboard.isActionActive(Input::KEY_UNTARGET))
             {
                 ActorSprite::Type currentTarget = ActorSprite::UNKNOWN;
-                if (keyboard.isActionActive(keyboard.KEY_TARGET_CLOSEST) ||
+                if (keyboard.isActionActive(Input::KEY_TARGET_CLOSEST) ||
                     (joystick && joystick->buttonPressed(3)))
                 {
                     currentTarget = ActorSprite::MONSTER;
                 }
-                else if (keyboard.isActionActive(keyboard.KEY_TARGET_PLAYER))
+                else if (keyboard.isActionActive(Input::KEY_TARGET_PLAYER))
                 {
                     currentTarget = ActorSprite::PLAYER;
                 }
-                else if (keyboard.isActionActive(keyboard.KEY_TARGET_NPC))
+                else if (keyboard.isActionActive(Input::KEY_TARGET_NPC))
                 {
                     currentTarget = ActorSprite::NPC;
                 }
@@ -863,15 +863,15 @@ void Game::handleMoveAndAttack()
         }
 
         // Stop attacking if the right key is pressed
-        if (!keyboard.isActionActive(keyboard.KEY_ATTACK)
-            && !keyboard.isActionActive(keyboard.KEY_EMOTE))
+        if (!keyboard.isActionActive(Input::KEY_ATTACK)
+            && !keyboard.isActionActive(Input::KEY_EMOTE))
         {
-            if (keyboard.isActionActive(keyboard.KEY_TARGET)
+            if (keyboard.isActionActive(Input::KEY_TARGET)
                 || (joystick && joystick->buttonPressed(4)))
             {
                 player_node->stopAttack();
             }
-            else if (keyboard.isActionActive(keyboard.KEY_UNTARGET))
+            else if (keyboard.isActionActive(Input::KEY_UNTARGET))
             {
                 player_node->untarget();
             }
@@ -982,8 +982,8 @@ void Game::handleInput()
         return;
 
     // If pressed outfits keys, stop processing keys.
-    if (keyboard.isActionActive(keyboard.KEY_WEAR_OUTFIT)
-        || keyboard.isActionActive(keyboard.KEY_COPY_OUTFIT)
+    if (keyboard.isActionActive(Input::KEY_WEAR_OUTFIT)
+        || keyboard.isActionActive(Input::KEY_COPY_OUTFIT)
         || (setupWindow && setupWindow->isVisible()))
     {
         return;
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 223737a59..4040c3ce0 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -783,18 +783,18 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
         mCurHist = mHistory.end();
         mChatInput->setText("");
     }
-    else if (keyboard.isActionActive(keyboard.KEY_AUTOCOMPLETE_CHAT) &&
+    else if (keyboard.isActionActive(Input::KEY_AUTOCOMPLETE_CHAT) &&
              mChatInput->getText() != "")
     {
         autoComplete();
         return;
     }
-    else if (keyboard.isActionActive(keyboard.KEY_DEACTIVATE_CHAT) &&
+    else if (keyboard.isActionActive(Input::KEY_DEACTIVATE_CHAT) &&
              mChatInput->isVisible())
     {
         mChatInput->processVisible(false);
     }
-    else if (keyboard.isActionActive(keyboard.KEY_CHAT_PREV_HISTORY) &&
+    else if (keyboard.isActionActive(Input::KEY_CHAT_PREV_HISTORY) &&
              mChatInput->isVisible())
     {
         ChatTab *tab = getFocused();
@@ -826,7 +826,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
                     mChatInput->getText().length()));
         }
     }
-    else if (keyboard.isActionActive(keyboard.KEY_CHAT_NEXT_HISTORY) &&
+    else if (keyboard.isActionActive(Input::KEY_CHAT_NEXT_HISTORY) &&
              mChatInput->isVisible())
     {
         ChatTab *tab = getFocused();
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e21b07f44..54b1801b8 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -344,7 +344,7 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
         }
         else
         {
-            if (keyboard.isActionActive(keyboard.KEY_MOD))
+            if (keyboard.isActionActive(Input::KEY_MOD))
             {
                 Net::getInventoryHandler()->dropItem(
                     item, item->getQuantity());
@@ -390,10 +390,10 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     Window::mouseClicked(event);
 
     const bool mod = (isStorageActive() && keyboard.isActionActive(
-        keyboard.KEY_MOD));
+        Input::KEY_MOD));
 
     const bool mod2 = (tradeWindow && tradeWindow->isVisible()
-        && keyboard.isActionActive(keyboard.KEY_MOD));
+        && keyboard.isActionActive(Input::KEY_MOD));
 
     if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT)
     {
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 265932cbb..6168af665 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -506,7 +506,7 @@ std::string OutfitWindow::keyName(int number)
 {
     if (number < 0 || number >= SHORTCUT_EMOTES)
         return "";
-    return keyboard.getKeyStringLong(KeyboardConfig::KEY_EMOTE_1 + number);
+    return keyboard.getKeyStringLong(Input::KEY_EMOTE_1 + number);
 }
 
 void OutfitWindow::next()
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index d014ea11e..2d8c1c28d 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -51,663 +51,663 @@ static SetupActionData const setupActionData[] =
 {
     {
         N_("Basic Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Move Up"),
-        KeyboardConfig::KEY_MOVE_UP
+        Input::KEY_MOVE_UP
     },
     {
         N_("Move Down"),
-        KeyboardConfig::KEY_MOVE_DOWN
+        Input::KEY_MOVE_DOWN
     },
     {
         N_("Move Left"),
-        KeyboardConfig::KEY_MOVE_LEFT
+        Input::KEY_MOVE_LEFT
     },
     {
         N_("Move Right"),
-        KeyboardConfig::KEY_MOVE_RIGHT
+        Input::KEY_MOVE_RIGHT
     },
     {
         N_("Attack"),
-        KeyboardConfig::KEY_ATTACK
+        Input::KEY_ATTACK
     },
     {
         N_("Target & Attack"),
-        KeyboardConfig::KEY_TARGET_ATTACK
+        Input::KEY_TARGET_ATTACK
     },
     {
         N_("Move to Target"),
-        KeyboardConfig::KEY_MOVE_TO_TARGET
+        Input::KEY_MOVE_TO_TARGET
     },
     {
         N_("Change Move to Target type"),
-        KeyboardConfig::KEY_CHANGE_MOVE_TO_TARGET
+        Input::KEY_CHANGE_MOVE_TO_TARGET
     },
     {
         N_("Move to Home location"),
-        KeyboardConfig::KEY_MOVE_TO_HOME
+        Input::KEY_MOVE_TO_HOME
     },
     {
         N_("Set home location"),
-        KeyboardConfig::KEY_SET_HOME
+        Input::KEY_SET_HOME
     },
     {
         N_("Move to navigation point"),
-        KeyboardConfig::KEY_MOVE_TO_POINT
+        Input::KEY_MOVE_TO_POINT
     },
     {
         N_("Talk"),
-        KeyboardConfig::KEY_TALK
+        Input::KEY_TALK
     },
     {
         N_("Stop Attack"),
-        KeyboardConfig::KEY_TARGET
+        Input::KEY_TARGET
     },
     {
         N_("Untarget"),
-        KeyboardConfig::KEY_UNTARGET
+        Input::KEY_UNTARGET
     },
     {
         N_("Target Closest"),
-        KeyboardConfig::KEY_TARGET_CLOSEST
+        Input::KEY_TARGET_CLOSEST
     },
     {
         N_("Target NPC"),
-        KeyboardConfig::KEY_TARGET_NPC
+        Input::KEY_TARGET_NPC
     },
     {
         N_("Target Player"),
-        KeyboardConfig::KEY_TARGET_PLAYER
+        Input::KEY_TARGET_PLAYER
     },
     {
         N_("Pickup"),
-        KeyboardConfig::KEY_PICKUP
+        Input::KEY_PICKUP
     },
     {
         N_("Change Pickup Type"),
-        KeyboardConfig::KEY_CHANGE_PICKUP_TYPE
+        Input::KEY_CHANGE_PICKUP_TYPE
     },
     {
         N_("Hide Windows"),
-        KeyboardConfig::KEY_HIDE_WINDOWS
+        Input::KEY_HIDE_WINDOWS
     },
     {
         N_("Sit"),
-        KeyboardConfig::KEY_SIT
+        Input::KEY_SIT
     },
     {
         N_("Screenshot"),
-        KeyboardConfig::KEY_SCREENSHOT
+        Input::KEY_SCREENSHOT
     },
     {
         N_("Enable/Disable Trading"),
-        KeyboardConfig::KEY_TRADE
+        Input::KEY_TRADE
     },
     {
         N_("Change Map View Mode"),
-        KeyboardConfig::KEY_PATHFIND
+        Input::KEY_PATHFIND
     },
     {
         N_("Select OK"),
-        KeyboardConfig::KEY_OK
+        Input::KEY_OK
     },
     {
         N_("Quit"),
-        KeyboardConfig::KEY_QUIT
+        Input::KEY_QUIT
     },
     {
         N_("Shortcuts Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Item Shortcuts Key"),
-        KeyboardConfig::KEY_SHORTCUTS_KEY
+        Input::KEY_SHORTCUTS_KEY
     },
     {
         strprintf(N_("Item Shortcut %d"), 1),
-        KeyboardConfig::KEY_SHORTCUT_1
+        Input::KEY_SHORTCUT_1
     },
     {
         strprintf(N_("Item Shortcut %d"), 2),
-        KeyboardConfig::KEY_SHORTCUT_2
+        Input::KEY_SHORTCUT_2
     },
     {
         strprintf(N_("Item Shortcut %d"), 3),
-        KeyboardConfig::KEY_SHORTCUT_3
+        Input::KEY_SHORTCUT_3
     },
     {
         strprintf(N_("Item Shortcut %d"), 4),
-        KeyboardConfig::KEY_SHORTCUT_4
+        Input::KEY_SHORTCUT_4
     },
     {
         strprintf(N_("Item Shortcut %d"), 5),
-        KeyboardConfig::KEY_SHORTCUT_5
+        Input::KEY_SHORTCUT_5
     },
     {
         strprintf(N_("Item Shortcut %d"), 6),
-        KeyboardConfig::KEY_SHORTCUT_6
+        Input::KEY_SHORTCUT_6
     },
     {
         strprintf(N_("Item Shortcut %d"), 7),
-        KeyboardConfig::KEY_SHORTCUT_7
+        Input::KEY_SHORTCUT_7
     },
     {
         strprintf(N_("Item Shortcut %d"), 8),
-        KeyboardConfig::KEY_SHORTCUT_8
+        Input::KEY_SHORTCUT_8
     },
     {
         strprintf(N_("Item Shortcut %d"), 9),
-        KeyboardConfig::KEY_SHORTCUT_9
+        Input::KEY_SHORTCUT_9
     },
     {
         strprintf(N_("Item Shortcut %d"), 10),
-        KeyboardConfig::KEY_SHORTCUT_10
+        Input::KEY_SHORTCUT_10
     },
     {
         strprintf(N_("Item Shortcut %d"), 11),
-        KeyboardConfig::KEY_SHORTCUT_11
+        Input::KEY_SHORTCUT_11
     },
     {
         strprintf(N_("Item Shortcut %d"), 12),
-        KeyboardConfig::KEY_SHORTCUT_12
+        Input::KEY_SHORTCUT_12
     },
     {
         strprintf(N_("Item Shortcut %d"), 13),
-        KeyboardConfig::KEY_SHORTCUT_13
+        Input::KEY_SHORTCUT_13
     },
     {
         strprintf(N_("Item Shortcut %d"), 14),
-        KeyboardConfig::KEY_SHORTCUT_14
+        Input::KEY_SHORTCUT_14
     },
     {
         strprintf(N_("Item Shortcut %d"), 15),
-        KeyboardConfig::KEY_SHORTCUT_15
+        Input::KEY_SHORTCUT_15
     },
     {
         strprintf(N_("Item Shortcut %d"), 16),
-        KeyboardConfig::KEY_SHORTCUT_16
+        Input::KEY_SHORTCUT_16
     },
     {
         strprintf(N_("Item Shortcut %d"), 17),
-        KeyboardConfig::KEY_SHORTCUT_17
+        Input::KEY_SHORTCUT_17
     },
     {
         strprintf(N_("Item Shortcut %d"), 18),
-        KeyboardConfig::KEY_SHORTCUT_18
+        Input::KEY_SHORTCUT_18
     },
     {
         strprintf(N_("Item Shortcut %d"), 19),
-        KeyboardConfig::KEY_SHORTCUT_19
+        Input::KEY_SHORTCUT_19
     },
     {
         strprintf(N_("Item Shortcut %d"), 20),
-        KeyboardConfig::KEY_SHORTCUT_20
+        Input::KEY_SHORTCUT_20
     },
     {
         N_("Windows Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Help Window"),
-        KeyboardConfig::KEY_WINDOW_HELP
+        Input::KEY_WINDOW_HELP
     },
     {
         N_("Status Window"),
-        KeyboardConfig::KEY_WINDOW_STATUS
+        Input::KEY_WINDOW_STATUS
     },
     {
         N_("Inventory Window"),
-        KeyboardConfig::KEY_WINDOW_INVENTORY
+        Input::KEY_WINDOW_INVENTORY
     },
     {
         N_("Equipment Window"),
-        KeyboardConfig::KEY_WINDOW_EQUIPMENT
+        Input::KEY_WINDOW_EQUIPMENT
     },
     {
         N_("Skill Window"),
-        KeyboardConfig::KEY_WINDOW_SKILL
+        Input::KEY_WINDOW_SKILL
     },
     {
         N_("Minimap Window"),
-        KeyboardConfig::KEY_WINDOW_MINIMAP
+        Input::KEY_WINDOW_MINIMAP
     },
     {
         N_("Chat Window"),
-        KeyboardConfig::KEY_WINDOW_CHAT
+        Input::KEY_WINDOW_CHAT
     },
     {
         N_("Item Shortcut Window"),
-        KeyboardConfig::KEY_WINDOW_SHORTCUT
+        Input::KEY_WINDOW_SHORTCUT
     },
     {
         N_("Setup Window"),
-        KeyboardConfig::KEY_WINDOW_SETUP
+        Input::KEY_WINDOW_SETUP
     },
     {
         N_("Debug Window"),
-        KeyboardConfig::KEY_WINDOW_DEBUG
+        Input::KEY_WINDOW_DEBUG
     },
     {
         N_("Social Window"),
-        KeyboardConfig::KEY_WINDOW_SOCIAL
+        Input::KEY_WINDOW_SOCIAL
     },
     {
         N_("Emote Shortcut Window"),
-        KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT
+        Input::KEY_WINDOW_EMOTE_SHORTCUT
     },
     {
         N_("Outfits Window"),
-        KeyboardConfig::KEY_WINDOW_OUTFIT
+        Input::KEY_WINDOW_OUTFIT
     },
     {
         N_("Shop Window"),
-        KeyboardConfig::KEY_WINDOW_SHOP
+        Input::KEY_WINDOW_SHOP
     },
     {
         N_("Quick drop Window"),
-        KeyboardConfig::KEY_WINDOW_DROP
+        Input::KEY_WINDOW_DROP
     },
     {
         N_("Kill Stats Window"),
-        KeyboardConfig::KEY_WINDOW_KILLS
+        Input::KEY_WINDOW_KILLS
     },
     {
         N_("Commands Window"),
-        KeyboardConfig::KEY_WINDOW_SPELLS
+        Input::KEY_WINDOW_SPELLS
     },
     {
         N_("Bot Checker Window"),
-        KeyboardConfig::KEY_WINDOW_BOT_CHECKER
+        Input::KEY_WINDOW_BOT_CHECKER
     },
     {
         N_("Who Is Online Window"),
-        KeyboardConfig::KEY_WINDOW_ONLINE
+        Input::KEY_WINDOW_ONLINE
     },
     {
         N_("Did you know Window"),
-        KeyboardConfig::KEY_WINDOW_DIDYOUKNOW
+        Input::KEY_WINDOW_DIDYOUKNOW
     },
     {
         N_("Previous Social Tab"),
-        KeyboardConfig::KEY_PREV_SOCIAL_TAB
+        Input::KEY_PREV_SOCIAL_TAB
     },
     {
         N_("Next Social Tab"),
-        KeyboardConfig::KEY_NEXT_SOCIAL_TAB
+        Input::KEY_NEXT_SOCIAL_TAB
     },
     {
         N_("Emotes Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Smilie"),
-        KeyboardConfig::KEY_EMOTE
+        Input::KEY_EMOTE
     },
     {
         strprintf(N_("Emote Shortcut %d"), 1),
-        KeyboardConfig::KEY_EMOTE_1
+        Input::KEY_EMOTE_1
     },
     {
         strprintf(N_("Emote Shortcut %d"), 2),
-        KeyboardConfig::KEY_EMOTE_2
+        Input::KEY_EMOTE_2
     },
     {
         strprintf(N_("Emote Shortcut %d"), 3),
-        KeyboardConfig::KEY_EMOTE_3
+        Input::KEY_EMOTE_3
     },
     {
         strprintf(N_("Emote Shortcut %d"), 4),
-        KeyboardConfig::KEY_EMOTE_4
+        Input::KEY_EMOTE_4
     },
     {
         strprintf(N_("Emote Shortcut %d"), 5),
-        KeyboardConfig::KEY_EMOTE_5
+        Input::KEY_EMOTE_5
     },
     {
         strprintf(N_("Emote Shortcut %d"), 6),
-        KeyboardConfig::KEY_EMOTE_6
+        Input::KEY_EMOTE_6
     },
     {
         strprintf(N_("Emote Shortcut %d"), 7),
-        KeyboardConfig::KEY_EMOTE_7
+        Input::KEY_EMOTE_7
     },
     {
         strprintf(N_("Emote Shortcut %d"), 8),
-        KeyboardConfig::KEY_EMOTE_8
+        Input::KEY_EMOTE_8
     },
     {
         strprintf(N_("Emote Shortcut %d"), 9),
-        KeyboardConfig::KEY_EMOTE_9
+        Input::KEY_EMOTE_9
     },
     {
         strprintf(N_("Emote Shortcut %d"), 10),
-        KeyboardConfig::KEY_EMOTE_10
+        Input::KEY_EMOTE_10
     },
     {
         strprintf(N_("Emote Shortcut %d"), 11),
-        KeyboardConfig::KEY_EMOTE_11
+        Input::KEY_EMOTE_11
     },
     {
         strprintf(N_("Emote Shortcut %d"), 12),
-        KeyboardConfig::KEY_EMOTE_12
+        Input::KEY_EMOTE_12
     },
     {
         strprintf(N_("Emote Shortcut %d"), 13),
-        KeyboardConfig::KEY_EMOTE_13
+        Input::KEY_EMOTE_13
     },
     {
         strprintf(N_("Emote Shortcut %d"), 14),
-        KeyboardConfig::KEY_EMOTE_14
+        Input::KEY_EMOTE_14
     },
     {
         strprintf(N_("Emote Shortcut %d"), 15),
-        KeyboardConfig::KEY_EMOTE_15
+        Input::KEY_EMOTE_15
     },
     {
         strprintf(N_("Emote Shortcut %d"), 16),
-        KeyboardConfig::KEY_EMOTE_16
+        Input::KEY_EMOTE_16
     },
     {
         strprintf(N_("Emote Shortcut %d"), 17),
-        KeyboardConfig::KEY_EMOTE_17
+        Input::KEY_EMOTE_17
     },
     {
         strprintf(N_("Emote Shortcut %d"), 18),
-        KeyboardConfig::KEY_EMOTE_18
+        Input::KEY_EMOTE_18
     },
     {
         strprintf(N_("Emote Shortcut %d"), 19),
-        KeyboardConfig::KEY_EMOTE_19
+        Input::KEY_EMOTE_19
     },
     {
         strprintf(N_("Emote Shortcut %d"), 20),
-        KeyboardConfig::KEY_EMOTE_20
+        Input::KEY_EMOTE_20
     },
     {
         strprintf(N_("Emote Shortcut %d"), 21),
-        KeyboardConfig::KEY_EMOTE_21
+        Input::KEY_EMOTE_21
     },
     {
         strprintf(N_("Emote Shortcut %d"), 22),
-        KeyboardConfig::KEY_EMOTE_22
+        Input::KEY_EMOTE_22
     },
     {
         strprintf(N_("Emote Shortcut %d"), 23),
-        KeyboardConfig::KEY_EMOTE_23
+        Input::KEY_EMOTE_23
     },
     {
         strprintf(N_("Emote Shortcut %d"), 24),
-        KeyboardConfig::KEY_EMOTE_24
+        Input::KEY_EMOTE_24
     },
     {
         strprintf(N_("Emote Shortcut %d"), 25),
-        KeyboardConfig::KEY_EMOTE_25
+        Input::KEY_EMOTE_25
     },
     {
         strprintf(N_("Emote Shortcut %d"), 26),
-        KeyboardConfig::KEY_EMOTE_26
+        Input::KEY_EMOTE_26
     },
     {
         strprintf(N_("Emote Shortcut %d"), 27),
-        KeyboardConfig::KEY_EMOTE_27
+        Input::KEY_EMOTE_27
     },
     {
         strprintf(N_("Emote Shortcut %d"), 28),
-        KeyboardConfig::KEY_EMOTE_28
+        Input::KEY_EMOTE_28
     },
     {
         strprintf(N_("Emote Shortcut %d"), 29),
-        KeyboardConfig::KEY_EMOTE_29
+        Input::KEY_EMOTE_29
     },
     {
         strprintf(N_("Emote Shortcut %d"), 30),
-        KeyboardConfig::KEY_EMOTE_30
+        Input::KEY_EMOTE_30
     },
     {
         strprintf(N_("Emote Shortcut %d"), 31),
-        KeyboardConfig::KEY_EMOTE_31
+        Input::KEY_EMOTE_31
     },
     {
         strprintf(N_("Emote Shortcut %d"), 32),
-        KeyboardConfig::KEY_EMOTE_32
+        Input::KEY_EMOTE_32
     },
     {
         strprintf(N_("Emote Shortcut %d"), 33),
-        KeyboardConfig::KEY_EMOTE_33
+        Input::KEY_EMOTE_33
     },
     {
         strprintf(N_("Emote Shortcut %d"), 34),
-        KeyboardConfig::KEY_EMOTE_34
+        Input::KEY_EMOTE_34
     },
     {
         strprintf(N_("Emote Shortcut %d"), 35),
-        KeyboardConfig::KEY_EMOTE_35
+        Input::KEY_EMOTE_35
     },
     {
         strprintf(N_("Emote Shortcut %d"), 36),
-        KeyboardConfig::KEY_EMOTE_36
+        Input::KEY_EMOTE_36
     },
     {
         strprintf(N_("Emote Shortcut %d"), 37),
-        KeyboardConfig::KEY_EMOTE_37
+        Input::KEY_EMOTE_37
     },
     {
         strprintf(N_("Emote Shortcut %d"), 38),
-        KeyboardConfig::KEY_EMOTE_38
+        Input::KEY_EMOTE_38
     },
     {
         strprintf(N_("Emote Shortcut %d"), 39),
-        KeyboardConfig::KEY_EMOTE_39
+        Input::KEY_EMOTE_39
     },
     {
         strprintf(N_("Emote Shortcut %d"), 40),
-        KeyboardConfig::KEY_EMOTE_40
+        Input::KEY_EMOTE_40
     },
     {
         strprintf(N_("Emote Shortcut %d"), 41),
-        KeyboardConfig::KEY_EMOTE_41
+        Input::KEY_EMOTE_41
     },
     {
         strprintf(N_("Emote Shortcut %d"), 42),
-        KeyboardConfig::KEY_EMOTE_42
+        Input::KEY_EMOTE_42
     },
     {
         strprintf(N_("Emote Shortcut %d"), 43),
-        KeyboardConfig::KEY_EMOTE_43
+        Input::KEY_EMOTE_43
     },
     {
         strprintf(N_("Emote Shortcut %d"), 44),
-        KeyboardConfig::KEY_EMOTE_44
+        Input::KEY_EMOTE_44
     },
     {
         strprintf(N_("Emote Shortcut %d"), 45),
-        KeyboardConfig::KEY_EMOTE_45
+        Input::KEY_EMOTE_45
     },
     {
         strprintf(N_("Emote Shortcut %d"), 46),
-        KeyboardConfig::KEY_EMOTE_46
+        Input::KEY_EMOTE_46
     },
     {
         strprintf(N_("Emote Shortcut %d"), 47),
-        KeyboardConfig::KEY_EMOTE_47
+        Input::KEY_EMOTE_47
     },
     {
         strprintf(N_("Emote Shortcut %d"), 48),
-        KeyboardConfig::KEY_EMOTE_48
+        Input::KEY_EMOTE_48
     },
     {
         N_("Outfits Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Wear Outfit"),
-        KeyboardConfig::KEY_WEAR_OUTFIT
+        Input::KEY_WEAR_OUTFIT
     },
     {
         N_("Copy Outfit"),
-        KeyboardConfig::KEY_COPY_OUTFIT
+        Input::KEY_COPY_OUTFIT
     },
     {
         N_("Copy equipped to Outfit"),
-        KeyboardConfig::KEY_COPY_EQUIPED_OUTFIT
+        Input::KEY_COPY_EQUIPED_OUTFIT
     },
     {
         N_("Chat Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Toggle Chat"),
-        KeyboardConfig::KEY_TOGGLE_CHAT
+        Input::KEY_TOGGLE_CHAT
     },
     {
         N_("Scroll Chat Up"),
-        KeyboardConfig::KEY_SCROLL_CHAT_UP
+        Input::KEY_SCROLL_CHAT_UP
     },
     {
         N_("Scroll Chat Down"),
-        KeyboardConfig::KEY_SCROLL_CHAT_DOWN
+        Input::KEY_SCROLL_CHAT_DOWN
     },
     {
         N_("Previous Chat Tab"),
-        KeyboardConfig::KEY_PREV_CHAT_TAB
+        Input::KEY_PREV_CHAT_TAB
     },
     {
         N_("Next Chat Tab"),
-        KeyboardConfig::KEY_NEXT_CHAT_TAB
+        Input::KEY_NEXT_CHAT_TAB
     },
     {
         N_("Close current Chat Tab"),
-        KeyboardConfig::KEY_CLOSE_CHAT_TAB
+        Input::KEY_CLOSE_CHAT_TAB
     },
     {
         N_("Previous chat line"),
-        KeyboardConfig::KEY_CHAT_PREV_HISTORY
+        Input::KEY_CHAT_PREV_HISTORY
     },
     {
         N_("Next chat line"),
-        KeyboardConfig::KEY_CHAT_NEXT_HISTORY
+        Input::KEY_CHAT_NEXT_HISTORY
     },
     {
         N_("Chat Auto Complete"),
-        KeyboardConfig::KEY_AUTOCOMPLETE_CHAT
+        Input::KEY_AUTOCOMPLETE_CHAT
     },
     {
         N_("Deactivate Chat Input"),
-        KeyboardConfig::KEY_DEACTIVATE_CHAT
+        Input::KEY_DEACTIVATE_CHAT
     },
     {
         N_("Other Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Ignore input 1"),
-        KeyboardConfig::KEY_IGNORE_INPUT_1
+        Input::KEY_IGNORE_INPUT_1
     },
     {
         N_("Ignore input 2"),
-        KeyboardConfig::KEY_IGNORE_INPUT_2
+        Input::KEY_IGNORE_INPUT_2
     },
     {
         N_("Direct Up"),
-        KeyboardConfig::KEY_DIRECT_UP
+        Input::KEY_DIRECT_UP
     },
     {
         N_("Direct Down"),
-        KeyboardConfig::KEY_DIRECT_DOWN
+        Input::KEY_DIRECT_DOWN
     },
     {
         N_("Direct Left"),
-        KeyboardConfig::KEY_DIRECT_LEFT
+        Input::KEY_DIRECT_LEFT
     },
     {
         N_("Direct Right"),
-        KeyboardConfig::KEY_DIRECT_RIGHT
+        Input::KEY_DIRECT_RIGHT
     },
     {
         N_("Crazy moves"),
-        KeyboardConfig::KEY_CRAZY_MOVES
+        Input::KEY_CRAZY_MOVES
     },
     {
         N_("Change Crazy Move mode"),
-        KeyboardConfig::KEY_CHANGE_CRAZY_MOVES_TYPE
+        Input::KEY_CHANGE_CRAZY_MOVES_TYPE
     },
     {
         N_("Quick Drop N Items from 0 slot"),
-        KeyboardConfig::KEY_QUICK_DROP
+        Input::KEY_QUICK_DROP
     },
     {
         N_("Quick Drop N Items"),
-        KeyboardConfig::KEY_QUICK_DROPN
+        Input::KEY_QUICK_DROPN
     },
     {
         N_("Switch Quick Drop Counter"),
-        KeyboardConfig::KEY_SWITCH_QUICK_DROP
+        Input::KEY_SWITCH_QUICK_DROP
     },
     {
         N_("Quick heal target or self"),
-        KeyboardConfig::KEY_MAGIC_INMA1
+        Input::KEY_MAGIC_INMA1
     },
     {
         N_("Use #itenplz spell"),
-        KeyboardConfig::KEY_MAGIC_ITENPLZ
+        Input::KEY_MAGIC_ITENPLZ
     },
     {
         N_("Use magic attack"),
-        KeyboardConfig::KEY_MAGIC_ATTACK
+        Input::KEY_MAGIC_ATTACK
     },
     {
         N_("Switch magic attack"),
-        KeyboardConfig::KEY_SWITCH_MAGIC_ATTACK
+        Input::KEY_SWITCH_MAGIC_ATTACK
     },
     {
         N_("Switch pvp attack"),
-        KeyboardConfig::KEY_SWITCH_PVP_ATTACK
+        Input::KEY_SWITCH_PVP_ATTACK
     },
     {
         N_("Change move type"),
-        KeyboardConfig::KEY_INVERT_DIRECTION
+        Input::KEY_INVERT_DIRECTION
     },
     {
         N_("Change Attack Weapon Type"),
-        KeyboardConfig::KEY_CHANGE_ATTACK_WEAPON_TYPE
+        Input::KEY_CHANGE_ATTACK_WEAPON_TYPE
     },
     {
         N_("Change Attack Type"),
-        KeyboardConfig::KEY_CHANGE_ATTACK_TYPE
+        Input::KEY_CHANGE_ATTACK_TYPE
     },
     {
         N_("Change Follow mode"),
-        KeyboardConfig::KEY_CHANGE_FOLLOW_MODE
+        Input::KEY_CHANGE_FOLLOW_MODE
     },
     {
         N_("Change Imitation mode"),
-        KeyboardConfig::KEY_CHANGE_IMITATION_MODE
+        Input::KEY_CHANGE_IMITATION_MODE
     },
     {
         N_("Disable / Enable Game modifier keys"),
-        KeyboardConfig::KEY_DISABLE_GAME_MODIFIERS
+        Input::KEY_DISABLE_GAME_MODIFIERS
     },
     {
         N_("On / Off audio"),
-        KeyboardConfig::KEY_CHANGE_AUDIO
+        Input::KEY_CHANGE_AUDIO
     },
     {
         N_("Enable / Disable away mode"),
-        KeyboardConfig::KEY_AWAY
+        Input::KEY_AWAY
     },
     {
         N_("Emulate right click from keyboard"),
-        KeyboardConfig::KEY_RIGHT_CLICK
+        Input::KEY_RIGHT_CLICK
     },
     {
         N_("Toggle camera mode"),
-        KeyboardConfig::KEY_CAMERA
+        Input::KEY_CAMERA
     },
     {
         N_("Modifier key"),
-        KeyboardConfig::KEY_MOD
+        Input::KEY_MOD
     }
 };
 
@@ -835,7 +835,7 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
             if (i >= 0 && i < keysSize)
             {
                 if (setupActionData[i].actionId
-                    == KeyboardConfig::KEY_NO_VALUE)
+                    == Input::KEY_NO_VALUE)
                 {
                     mAssignKeyButton->setEnabled(false);
                     mUnassignKeyButton->setEnabled(false);
@@ -886,7 +886,7 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
 void Setup_Keyboard::refreshAssignedKey(int index)
 {
     const SetupActionData &key = setupActionData[index];
-    if (key.actionId == KeyboardConfig::KEY_NO_VALUE)
+    if (key.actionId == Input::KEY_NO_VALUE)
     {
         const std::string str = " \342\200\225\342\200\225\342\200\225"
             "\342\200\225\342\200\225 ";
@@ -932,6 +932,6 @@ void Setup_Keyboard::keyUnresolved()
     if (mKeySetting)
     {
         newKeyCallback(keyboard.getNewKeyIndex());
-        keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+        keyboard.setNewKeyIndex(Input::KEY_NO_VALUE);
     }
 }
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 2d9cc69b6..420ffaf3d 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -204,33 +204,33 @@ void StatusPopup::updateLabels()
         return;
 
     setLabelText2(mMoveType, player_node->getInvertDirectionString(),
-        keyboard.KEY_INVERT_DIRECTION);
+        Input::KEY_INVERT_DIRECTION);
     setLabelText2(mCrazyMoveType, player_node->getCrazyMoveTypeString(),
-        keyboard.KEY_CHANGE_CRAZY_MOVES_TYPE);
+        Input::KEY_CHANGE_CRAZY_MOVES_TYPE);
     setLabelText2(mMoveToTargetType, player_node->getMoveToTargetTypeString(),
-        keyboard.KEY_CHANGE_MOVE_TO_TARGET);
+        Input::KEY_CHANGE_MOVE_TO_TARGET);
     setLabelText2(mFollowMode, player_node->getFollowModeString(),
-        keyboard.KEY_CHANGE_FOLLOW_MODE);
+        Input::KEY_CHANGE_FOLLOW_MODE);
     setLabelText2(mAttackWeaponType, player_node->getAttackWeaponTypeString(),
-        keyboard.KEY_CHANGE_ATTACK_WEAPON_TYPE);
+        Input::KEY_CHANGE_ATTACK_WEAPON_TYPE);
     setLabelText2(mAttackType, player_node->getAttackTypeString(),
-        keyboard.KEY_CHANGE_ATTACK_TYPE);
+        Input::KEY_CHANGE_ATTACK_TYPE);
     setLabelText2(mDropCounter, player_node->getQuickDropCounterString(),
-        keyboard.KEY_SWITCH_QUICK_DROP);
+        Input::KEY_SWITCH_QUICK_DROP);
     setLabelText2(mPickUpType, player_node->getPickUpTypeString(),
-        keyboard.KEY_CHANGE_PICKUP_TYPE);
+        Input::KEY_CHANGE_PICKUP_TYPE);
     setLabelText2(mMapType, player_node->getDebugPathString(),
-        keyboard.KEY_PATHFIND);
+        Input::KEY_PATHFIND);
     setLabelText2(mMagicAttackType, player_node->getMagicAttackString(),
-        keyboard.KEY_SWITCH_MAGIC_ATTACK);
+        Input::KEY_SWITCH_MAGIC_ATTACK);
     setLabelText2(mPvpAttackType, player_node->getPvpAttackString(),
-        keyboard.KEY_SWITCH_PVP_ATTACK);
+        Input::KEY_SWITCH_PVP_ATTACK);
     setLabelText2(mImitationMode, player_node->getImitationModeString(),
-        keyboard.KEY_CHANGE_IMITATION_MODE);
+        Input::KEY_CHANGE_IMITATION_MODE);
     setLabelText2(mAwayMode, player_node->getAwayModeString(),
-        keyboard.KEY_AWAY);
+        Input::KEY_AWAY);
     setLabelText2(mCameraMode, player_node->getCameraModeString(),
-        keyboard.KEY_CAMERA);
+        Input::KEY_CAMERA);
     setLabelText2(mDisableGameModifiers, player_node->getGameModifiersString(),
-        keyboard.KEY_DISABLE_GAME_MODIFIERS);
+        Input::KEY_DISABLE_GAME_MODIFIERS);
 }
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 7fa0dc464..6c6580f21 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -504,17 +504,17 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     }
                 }
                 else if (player_node->withinAttackRange(mHoverBeing) ||
-                         keyboard.isActionActive(keyboard.KEY_ATTACK))
+                         keyboard.isActionActive(Input::KEY_ATTACK))
                 {
                     validateSpeed();
                     if (player_node != mHoverBeing)
                     {
                         player_node->attack(mHoverBeing,
-                            !keyboard.isActionActive(keyboard.KEY_TARGET));
+                            !keyboard.isActionActive(Input::KEY_TARGET));
                         return;
                     }
                 }
-                else if (!keyboard.isActionActive(keyboard.KEY_ATTACK))
+                else if (!keyboard.isActionActive(Input::KEY_ATTACK))
                 {
                     validateSpeed();
                     if (player_node != mHoverBeing)
@@ -532,7 +532,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
             player_node->pickUp(mHoverItem);
         }
         // Just walk around
-        else if (!keyboard.isActionActive(keyboard.KEY_ATTACK))
+        else if (!keyboard.isActionActive(Input::KEY_ATTACK))
         {
             validateSpeed();
             player_node->stopAttack();
@@ -933,8 +933,8 @@ void Viewport::returnCamera()
 
 void Viewport::validateSpeed()
 {
-    if (!keyboard.isActionActive(keyboard.KEY_TARGET_ATTACK)
-        && !keyboard.isActionActive(keyboard.KEY_ATTACK))
+    if (!keyboard.isActionActive(Input::KEY_TARGET_ATTACK)
+        && !keyboard.isActionActive(Input::KEY_ATTACK))
     {
         if (Game::instance())
             Game::instance()->setValidSpeed();
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 4f6524cdd..f46ee579c 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -118,7 +118,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 
         // Draw emote keyboard shortcut.
         std::string key = keyboard.getKeyValueString(
-            keyboard.KEY_EMOTE_1 + i);
+            Input::KEY_EMOTE_1 + i);
 
         graphics->setColor(getForegroundColor());
         g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index ac7caae34..981491dd7 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -122,7 +122,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 
         // Draw item keyboard shortcut.
         std::string key = keyboard.getKeyValueString(
-            keyboard.KEY_SHORTCUT_1 + i);
+            Input::KEY_SHORTCUT_1 + i);
         graphics->setColor(getForegroundColor());
 
         g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 6133c69e0..bb7a989ea 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -65,41 +65,41 @@ WindowMenu::WindowMenu():
     int x = 0, h = 0;
 
     addButton(N_("BC"), _("Bot checker"), x, h,
-              KeyboardConfig::KEY_WINDOW_BOT_CHECKER);
+              Input::KEY_WINDOW_BOT_CHECKER);
     addButton(N_("ONL"), _("Who is online"), x, h,
-              KeyboardConfig::KEY_NO_VALUE);
+              Input::KEY_NO_VALUE);
     addButton(N_("KS"), _("Kill stats"), x, h,
-              KeyboardConfig::KEY_WINDOW_KILLS);
+              Input::KEY_WINDOW_KILLS);
     addButton(":-)", _("Smilies"), x, h,
-              KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT);
-    addButton(N_("STA"), _("Status"), x, h, KeyboardConfig::KEY_WINDOW_STATUS);
+              Input::KEY_WINDOW_EMOTE_SHORTCUT);
+    addButton(N_("STA"), _("Status"), x, h, Input::KEY_WINDOW_STATUS);
     addButton(N_("EQU"), _("Equipment"), x, h,
-              KeyboardConfig::KEY_WINDOW_EQUIPMENT);
+              Input::KEY_WINDOW_EQUIPMENT);
     addButton(N_("INV"), _("Inventory"), x, h,
-              KeyboardConfig::KEY_WINDOW_INVENTORY);
+              Input::KEY_WINDOW_INVENTORY);
 
     if (skillDialog->hasSkills())
     {
         addButton(N_("SKI"), _("Skills"), x, h,
-                  KeyboardConfig::KEY_WINDOW_SKILL);
+                  Input::KEY_WINDOW_SKILL);
     }
 
 #ifdef MANASERV_SUPPORT
     if (Net::getNetworkType() == ServerInfo::MANASERV)
     {
         addButton(N_("SPE"), _("Specials"), x, h,
-                  KeyboardConfig::KEY_NO_VALUE);
+                  Input::KEY_NO_VALUE);
     }
 #endif
 
-    addButton(N_("SOC"), _("Social"), x, h, KeyboardConfig::KEY_WINDOW_SOCIAL);
+    addButton(N_("SOC"), _("Social"), x, h, Input::KEY_WINDOW_SOCIAL);
     addButton(N_("SH"), _("Shortcuts"), x, h,
-              KeyboardConfig::KEY_WINDOW_SHORTCUT);
-    addButton(N_("SP"), _("Spells"), x, h, KeyboardConfig::KEY_WINDOW_SPELLS);
-    addButton(N_("DR"), _("Drop"), x, h, KeyboardConfig::KEY_WINDOW_DROP);
+              Input::KEY_WINDOW_SHORTCUT);
+    addButton(N_("SP"), _("Spells"), x, h, Input::KEY_WINDOW_SPELLS);
+    addButton(N_("DR"), _("Drop"), x, h, Input::KEY_WINDOW_DROP);
     addButton(N_("YK"), _("Did you know"), x, h,
-        KeyboardConfig::KEY_WINDOW_DIDYOUKNOW);
-    addButton(N_("SET"), _("Setup"), x, h, KeyboardConfig::KEY_WINDOW_SETUP);
+        Input::KEY_WINDOW_DIDYOUKNOW);
+    addButton(N_("SET"), _("Setup"), x, h, Input::KEY_WINDOW_SETUP);
 
     if (mainGraphics)
     {
@@ -305,7 +305,7 @@ void WindowMenu::mouseMoved(gcn::MouseEvent &event)
     const int x = event.getX();
     const int y = event.getY();
     int key = btn->getTag();
-    if (key != KeyboardConfig::KEY_NO_VALUE)
+    if (key != Input::KEY_NO_VALUE)
     {
         mTextPopup->show(x + getX(), y + getY(), btn->getDescription(),
             strprintf(_("Key: %s"), keyboard.getKeyValueString(key).c_str()));
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 32c4ac1f1..7610acf29 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -52,11 +52,11 @@ bool InputManager::handleEvent(const SDL_Event &event)
     if (event.type == SDL_KEYDOWN)
     {
         if (setupWindow && setupWindow->isVisible() &&
-            keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+            keyboard.getNewKeyIndex() > Input::KEY_NO_VALUE)
         {
             keyboard.setNewKey(event);
             keyboard.callbackNewKey();
-            keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+            keyboard.setNewKeyIndex(Input::KEY_NO_VALUE);
             return true;
         }
 
@@ -143,8 +143,8 @@ int InputManager::getInputConditionMask()
     if (!player_node || !player_node->getDisableGameModifiers())
         mask += COND_EMODS;
 
-    if (!keyboard.isActionActive(keyboard.KEY_TARGET)
-        && !keyboard.isActionActive(keyboard.KEY_UNTARGET))
+    if (!keyboard.isActionActive(Input::KEY_TARGET)
+        && !keyboard.isActionActive(Input::KEY_UNTARGET))
     {
         mask += COND_NOTARGET;
     }
@@ -157,6 +157,6 @@ bool InputManager::checkKey(const KeyData *key, int mask)
     if (!key || (key->condition & mask) != key->condition)
         return false;
 
-    return (key->modKeyIndex == KeyboardConfig::KEY_NO_VALUE
+    return (key->modKeyIndex == Input::KEY_NO_VALUE
         || keyboard.isActionActive(key->modKeyIndex));
 }
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index e2b226b5d..988229cd3 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -54,7 +54,7 @@ class KeyFunctor
 
 void KeyboardConfig::init()
 {
-    for (int i = 0; i < KEY_TOTAL; i++)
+    for (int i = 0; i < Input::KEY_TOTAL; i++)
     {
         for (int f = 0; f < KeyFunctionSize; f ++)
         {
@@ -63,7 +63,7 @@ void KeyboardConfig::init()
         }
     }
 
-    mNewKeyIndex = KEY_NO_VALUE;
+    mNewKeyIndex = Input::KEY_NO_VALUE;
     mEnabled = true;
 
     makeDefault();
@@ -73,7 +73,7 @@ void KeyboardConfig::init()
 
 void KeyboardConfig::retrieve()
 {
-    for (int i = 0; i < KEY_TOTAL; i++)
+    for (int i = 0; i < Input::KEY_TOTAL; i++)
     {
         if (*keyData[i].configField)
         {
@@ -120,7 +120,7 @@ void KeyboardConfig::retrieve()
 
 void KeyboardConfig::store()
 {
-    for (int i = 0; i < KEY_TOTAL; i++)
+    for (int i = 0; i < Input::KEY_TOTAL; i++)
     {
         if (*keyData[i].configField)
         {
@@ -166,7 +166,7 @@ void KeyboardConfig::store()
 
 void KeyboardConfig::makeDefault()
 {
-    for (int i = 0; i < KEY_TOTAL; i++)
+    for (int i = 0; i < Input::KEY_TOTAL; i++)
     {
         for (size_t i2 = 1; i2 < KeyFunctionSize; i2 ++)
         {
@@ -186,17 +186,17 @@ bool KeyboardConfig::hasConflicts(int &key1, int &key2)
      * No need to parse the square matrix: only check one triangle
      * that's enough to detect conflicts
      */
-    for (i = 0; i < KEY_TOTAL; i++)
+    for (i = 0; i < Input::KEY_TOTAL; i++)
     {
         if (!*keyData[i].configField)
             continue;
 
         for (size_t i2 = 0; i2 < KeyFunctionSize; i2 ++)
         {
-            if (mKey[i].values[i2].value == KEY_NO_VALUE)
+            if (mKey[i].values[i2].value == Input::KEY_NO_VALUE)
                 continue;
 
-            for (j = i, j++; j < KEY_TOTAL; j++)
+            for (j = i, j++; j < Input::KEY_TOTAL; j++)
             {
 
                 if ((keyData[i].grp & keyData[j].grp) == 0 ||
@@ -241,7 +241,7 @@ int KeyboardConfig::getKeyValueFromEvent(const SDL_Event &event) const
 int KeyboardConfig::getKeyIndex(const SDL_Event &event, int grp) const
 {
     const int keyValue = getKeyValueFromEvent(event);
-    for (size_t i = 0; i < KEY_TOTAL; i++)
+    for (size_t i = 0; i < Input::KEY_TOTAL; i++)
     {
         for (size_t i2 = 0; i2 < KeyFunctionSize; i2 ++)
         {
@@ -253,7 +253,7 @@ int KeyboardConfig::getKeyIndex(const SDL_Event &event, int grp) const
             }
         }
     }
-    return KEY_NO_VALUE;
+    return Input::KEY_NO_VALUE;
 }
 
 bool KeyboardConfig::isActionActive(int index) const
@@ -398,7 +398,7 @@ void KeyboardConfig::updateKeyActionMap()
 {
     mKeyToAction.clear();
 
-    for (size_t i = 0; i < KEY_TOTAL; i++)
+    for (size_t i = 0; i < Input::KEY_TOTAL; i++)
     {
         if (keyData[i].action)
         {
@@ -437,7 +437,7 @@ bool KeyboardConfig::triggerAction(const SDL_Event &event)
         for (; it != it_end; ++ it)
         {
             const int keyNum = *it;
-            if (keyNum < 0 || keyNum >= KEY_TOTAL)
+            if (keyNum < 0 || keyNum >= Input::KEY_TOTAL)
                 continue;
 
             if (inputManager.checkKey(&keyData[keyNum], mask))
@@ -452,8 +452,3 @@ bool KeyboardConfig::triggerAction(const SDL_Event &event)
     }
     return false;
 }
-
-int KeyboardConfig::getKeyValue(int index) const
-{
-    return mKey[index].values[0].value;
-}
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 5ebbe075e..79719518b 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -27,6 +27,7 @@
 #include <SDL_keyboard.h>
 
 #include "inputevent.h"
+#include "keydata.h"
 
 #include <map>
 #include <string>
@@ -108,11 +109,6 @@ class KeyboardConfig
         void callbackNewKey();
 
         /**
-         * Obtain the value stored in memory.
-         */
-        int getKeyValue(int index) const;
-
-        /**
          * Get the index of the new key to be assigned.
          */
         int getNewKeyIndex() const
@@ -178,193 +174,13 @@ class KeyboardConfig
 
         bool triggerAction(const SDL_Event &event);
 
-        /**
-         * 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_TARGET,
-            KEY_UNTARGET,
-            KEY_TARGET_CLOSEST,
-            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_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_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_AUTOCOMPLETE_CHAT,
-            KEY_DEACTIVATE_CHAT,
-            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_MOD,
-            KEY_TOTAL
-        };
-
-        enum KeyGroup
-        {
-            GRP_DEFAULT = 1,           // default game key
-            GRP_CHAT = 2,              // chat key
-            GRP_EMOTION = 4,           // emotions key
-            GRP_OUTFIT = 8,            // outfit key
-            GRP_GUI = 16               // gui key
-        };
-
     private:
         int mNewKeyIndex;              /**< Index of new key to be assigned */
         bool mEnabled;                 /**< Flag to respond to key input */
 
         Setup_Keyboard *mSetupKey;     /**< Reference to setup window */
 
-        KeyFunction mKey[KEY_TOTAL];   /**< Pointer to all the key data */
+        KeyFunction mKey[Input::KEY_TOTAL];   /**< Pointer to all the key data */
 
         Uint8 *mActiveKeys;            /**< Stores a list of all the keys */
 
diff --git a/src/keyboarddata.h b/src/keyboarddata.h
index 7ade46d6e..5f8294104 100644
--- a/src/keyboarddata.h
+++ b/src/keyboarddata.h
@@ -35,796 +35,796 @@
 #include <string>
 
 // keyData must be in same order as enum keyAction.
-static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
+static KeyData const keyData[Input::KEY_TOTAL] = {
     {"keyMoveUp", SDLK_UP,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::moveUp,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME2},
     {"keyMoveDown", SDLK_DOWN,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::moveDown,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME2},
     {"keyMoveLeft", SDLK_LEFT,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::moveLeft,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME},
     {"keyMoveRight", SDLK_RIGHT,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::moveRight,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME},
     {"keyAttack", SDLK_LCTRL,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyTargetAttack", SDLK_x,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyMoveToTarget", SDLK_v,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::moveToTarget,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyChangeMoveToTarget", SDLK_PERIOD,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeMoveToTarget,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyMoveToHome", SDLK_d,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::moveToHome,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keySetHome", SDLK_KP5,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::setHome,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyMoveToPoint", SDLK_RSHIFT, 
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyTalk", SDLK_t,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::talk,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME},
     {"keyTarget", SDLK_LSHIFT,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME},
-    {"keyUnTarget", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT,
+    {"keyUnTarget", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyTargetClosest", SDLK_a,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyTargetNPC", SDLK_n,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyTargetPlayer", SDLK_q,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyPickup", SDLK_z,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::pickup,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyChangePickupType", SDLK_o,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changePickupType,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyHideWindows", SDLK_h,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::hideWindows,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyBeingSit", SDLK_s,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::sit,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyScreenshot", SDLK_p,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::screenshot,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyTrade", SDLK_r,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeTrade,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyPathfind", SDLK_f,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeMapMode,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET | COND_EMODS},
     {"keyOK", SDLK_SPACE,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::ok,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_NOMODAL | COND_NOAWAY | COND_NONPCINPUT},
     {"keyQuit", SDLK_ESCAPE,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::quit,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyShortcutsKey", SDLK_MENU,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyShortcut1", SDLK_1,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut2", SDLK_2,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut3", SDLK_3,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut4", SDLK_4,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut5", SDLK_5,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut6", SDLK_6,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut7", SDLK_7,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut8", SDLK_8,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut9", SDLK_9,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut10", SDLK_0,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut11", SDLK_MINUS,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut12", SDLK_EQUALS,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut13", SDLK_BACKSPACE,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut14", SDLK_INSERT,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyShortcut15", SDLK_HOME,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
-    {"keyShortcut16", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT,
+    {"keyShortcut16", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
-    {"keyShortcut17", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT,
+    {"keyShortcut17", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
-    {"keyShortcut18", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT,
+    {"keyShortcut18", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
-    {"keyShortcut19", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT,
+    {"keyShortcut19", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
-    {"keyShortcut20", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT,
+    {"keyShortcut20", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT,
         &ActionManager::shortcut,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_SHORTCUT},
     {"keyWindowHelp", SDLK_F1,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::helpWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowStatus", SDLK_F2,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::statusWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowInventory", SDLK_F3,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::inventoryWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowEquipment", SDLK_F4,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::equipmentWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowSkill", SDLK_F5,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::skillDialogShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowMinimap", SDLK_F6,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::minimapWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowChat", SDLK_F7,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::chatWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowShortcut", SDLK_F8,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::shortcutWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowSetup", SDLK_F9,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::setupWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_NOTARGET | COND_NOINPUT | COND_ENABLED},
     {"keyWindowDebug", SDLK_F10,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::debugWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowSocial", SDLK_F11,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::socialWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowEmoteBar", SDLK_F12,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::emoteShortcutWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowOutfit", SDLK_BACKQUOTE,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::outfitWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowShop", -1,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::shopWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowDrop", SDLK_w,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::dropShortcutWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowKills", SDLK_e,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::killStatsWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowSpells", SDLK_j,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::spellShortcutWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
     {"keyWindowBotChecker", SDLK_LEFTBRACKET,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::botcheckerWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
-    {"keyWindowOnline", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+    {"keyWindowOnline", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::whoIsOnlineWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
-    {"keyWindowDidYouKnow", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+    {"keyWindowDidYouKnow", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::didYouKnowWindowShow,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_NOTARGET},
-    {"keySocialPrevTab", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+    {"keySocialPrevTab", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::prevSocialTab,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_NOINPUT},
-    {"keySocialNextTab", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+    {"keySocialNextTab", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::nextSocialTab,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_NOINPUT},
     {"keySmilie", SDLK_LALT,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyEmoteShortcut1", SDLK_1,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut2", SDLK_2,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut3", SDLK_3,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut4", SDLK_4,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut5", SDLK_5,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut6", SDLK_6,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut7", SDLK_7,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut8", SDLK_8,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut9", SDLK_9,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut10", SDLK_0,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut11", SDLK_MINUS,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut12", SDLK_EQUALS,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut13", SDLK_BACKSPACE,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut14", SDLK_INSERT,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut15", SDLK_HOME,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut16", SDLK_q,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut17", SDLK_w,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut18", SDLK_e,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut19", SDLK_r,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut20", SDLK_t,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut21", SDLK_y,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut22", SDLK_u,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut23", SDLK_i,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut24", SDLK_o,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut25", SDLK_p,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut26", SDLK_LEFTBRACKET,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut27", SDLK_RIGHTBRACKET,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut28", SDLK_BACKSLASH,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut29", SDLK_a,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut30", SDLK_s,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut31", SDLK_d,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut32", SDLK_f,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut33", SDLK_g,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut34", SDLK_h,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut35", SDLK_j,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut36", SDLK_k,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut37", SDLK_l,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut38", SDLK_SEMICOLON,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut39", SDLK_QUOTE,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut40", SDLK_z,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut41", SDLK_x,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut42", SDLK_c,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut43", SDLK_v,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut44", SDLK_b,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut45", SDLK_n,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut46", SDLK_m,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut47", SDLK_COMMA,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyEmoteShortcut48", SDLK_PERIOD,
-        KeyboardConfig::GRP_EMOTION,
+        Input::GRP_EMOTION,
         &ActionManager::emote,
-        KeyboardConfig::KEY_NO_VALUE, 100,
+        Input::KEY_NO_VALUE, 100,
         COND_GAME},
     {"keyWearOutfit", SDLK_RCTRL,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyCopyOutfit", SDLK_RALT,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyCopyEquipedOutfit", SDLK_RIGHTBRACKET,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::copyEquippedToOutfit,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyChat", SDLK_RETURN,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_CHAT,
+        Input::GRP_DEFAULT | Input::GRP_CHAT,
         &ActionManager::toggleChat,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_ENABLED | COND_NOINPUT | COND_NOAWAY | COND_NOMODAL},
     {"keyChatScrollUp", SDLK_PAGEUP,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::scrollChatUp,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyChatScrollDown", SDLK_PAGEDOWN,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::scrollChatDown,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyChatPrevTab", SDLK_KP7,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::prevChatTab,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_NOINPUT},
     {"keyChatNextTab", SDLK_KP9,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::nextChatTab,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_NOINPUT},
-    {"keyChatCloseTab", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI,
+    {"keyChatCloseTab", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT | Input::GRP_GUI,
         &ActionManager::closeChatTab,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_NOINPUT},
     {"keyChatPrevHistory", SDLK_KP7,
-        KeyboardConfig::GRP_CHAT,
+        Input::GRP_CHAT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyChatNextHistory", SDLK_KP9,
-        KeyboardConfig::GRP_CHAT,
+        Input::GRP_CHAT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyAutoCompleteChat", SDLK_TAB,
-        KeyboardConfig::GRP_CHAT,
+        Input::GRP_CHAT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyDeActivateChat", SDLK_ESCAPE,
-        KeyboardConfig::GRP_CHAT,
+        Input::GRP_CHAT,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT},
     {"keyIgnoreInput1", SDLK_LSUPER,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::ignoreInput,
-        KeyboardConfig::KEY_NO_VALUE, 500,
+        Input::KEY_NO_VALUE, 500,
         COND_DEFAULT},
     {"keyIgnoreInput2", SDLK_RSUPER,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::ignoreInput,
-        KeyboardConfig::KEY_NO_VALUE, 500,
+        Input::KEY_NO_VALUE, 500,
         COND_DEFAULT},
     {"keyDirectUp", SDLK_l,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::directUp,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME},
     {"keyDirectDown", SDLK_SEMICOLON,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::directDown,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME},
     {"keyDirectLeft", SDLK_k,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::directLeft,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME},
     {"keyDirectRight", SDLK_QUOTE,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::directRight,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME},
     {"keyCrazyMoves", SDLK_SLASH,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::crazyMoves,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyChangeCrazyMoveType", SDLK_BACKSLASH,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeCrazyMove,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyQuickDrop", SDLK_y,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::dropItem0,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyQuickDropN", SDLK_u,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::dropItem,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keySwitchQuickDrop", SDLK_i,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::switchQuickDrop,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyMagicInma1", SDLK_c,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::heal,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyMagicItenplz", SDLK_m,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::itenplz,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyMagicAttack", SDLK_b,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::magicAttack,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keySwitchMagicAttack", SDLK_COMMA,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeMagicAttack,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
-    {"keySwitchPvpAttack", KeyboardConfig::KEY_NO_VALUE,
-        KeyboardConfig::GRP_DEFAULT,
+    {"keySwitchPvpAttack", Input::KEY_NO_VALUE,
+        Input::GRP_DEFAULT,
         &ActionManager::changePvpMode,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyInvertDirection", SDLK_KP0,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeMoveType,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyChangeAttackWeaponType", SDLK_g,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeAttackWeaponType,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyChangeAttackType", SDLK_END,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeAttackType,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyChangeFollowMode", SDLK_KP1,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeFollowMode,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyChangeImitationMode", SDLK_KP4,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeImitationMode,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyDisableGameModifiers", SDLK_KP8,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeGameModifier,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyChangeAudio", SDLK_KP3,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::changeAudio,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyAway", SDLK_KP2,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::away,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED},
     {"keyRightClick", SDLK_TAB,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::mouseClick,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_NOINPUT | COND_NOAWAY | COND_NOMODAL},
     {"keyCameraMode", SDLK_KP_PLUS,
-        KeyboardConfig::GRP_DEFAULT,
+        Input::GRP_DEFAULT,
         &ActionManager::camera,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_GAME | COND_VALIDSPEED | COND_EMODS},
     {"keyMod", SDLK_LSHIFT,
-        KeyboardConfig::GRP_GUI,
+        Input::GRP_GUI,
         nullptr,
-        KeyboardConfig::KEY_NO_VALUE, 50,
+        Input::KEY_NO_VALUE, 50,
         COND_DEFAULT}
 };
 
diff --git a/src/keydata.h b/src/keydata.h
index 841e0adaa..8f918b667 100644
--- a/src/keydata.h
+++ b/src/keydata.h
@@ -37,4 +37,188 @@ struct KeyData
     int priority;
     int condition;
 };
+
+namespace Input
+{
+    enum KeyGroup
+    {
+        GRP_DEFAULT = 1,           // default game key
+        GRP_CHAT = 2,              // chat key
+        GRP_EMOTION = 4,           // emotions key
+        GRP_OUTFIT = 8,            // outfit key
+        GRP_GUI = 16               // gui key
+    };
+  
+    /**
+      * 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_TARGET,
+        KEY_UNTARGET,
+        KEY_TARGET_CLOSEST,
+        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_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_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_AUTOCOMPLETE_CHAT,
+        KEY_DEACTIVATE_CHAT,
+        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_MOD,
+        KEY_TOTAL
+    };
+}
+
 #endif