From 0919e597198b969e53fb828cd29940f5e7dff719 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Thu, 5 Mar 2015 01:32:26 -0600
Subject: [PATCH] Key Bind Redo (except vector)

---
 addons/fcs/initKeybinds.sqf               | 122 +++----
 addons/goggles/XEH_postInit.sqf           | 128 +++----
 addons/grenades/XEH_postInit.sqf          |  27 +-
 addons/interact_menu/XEH_clientInit.sqf   |  26 +-
 addons/interaction/XEH_clientInit.sqf     | 147 ++++----
 addons/movement/XEH_postInit.sqf          |  29 +-
 addons/nametags/XEH_postInit.sqf          |  29 +-
 addons/nightvision/XEH_postInitClient.sqf |  18 +-
 addons/overheating/XEH_postInit.sqf       |  33 +-
 addons/parachute/XEH_postInit.sqf         |  34 +-
 addons/reload/XEH_postInit.sqf            |  31 +-
 addons/resting/XEH_postInit.sqf           |  37 +-
 addons/safemode/XEH_postInit.sqf          |  31 +-
 addons/scopes/XEH_postInit.sqf            | 124 +++----
 addons/vehicles/XEH_postInit.sqf          |  33 +-
 addons/weaponselect/XEH_postInit.sqf      | 406 ++++++++++------------
 16 files changed, 565 insertions(+), 690 deletions(-)

diff --git a/addons/fcs/initKeybinds.sqf b/addons/fcs/initKeybinds.sqf
index dd1a94b78e..31fae97601 100644
--- a/addons/fcs/initKeybinds.sqf
+++ b/addons/fcs/initKeybinds.sqf
@@ -1,81 +1,57 @@
 // by commy2
 
-["ACE3",
-    localize "STR_ACE_FCS_LaseTarget",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !((!GVAR(enabled) && FUNC(canUseFCS)) || FUNC(canUseRangefinder)) exitWith {false};
+["ACE3", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !((!GVAR(enabled) && FUNC(canUseFCS)) || FUNC(canUseRangefinder)) exitWith {false};
 
-        // prevent holding down
-        if (GETGVAR(isDownStateKey1,false)) exitWith {false};
-        GVAR(isDownStateKey1) = true;
+    // Statement
+    [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyDown);
+    // Return false so it doesn't block the rest weapon action
+    false
+}, 
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(GVAR(enabled) && FUNC(canUseFCS)) exitWith {false};
 
-        // Statement
-        [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyDown);
-        // Return false so it doesn't block the rest weapon action
-        false
-    },
-    [15, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyUp);
+    false
+},
+[15, [false, false, false]], false] call cba_fnc_addKeybind;  //Tab Key
 
-["ACE3",
-    localize "STR_ACE_FCS_LaseTarget",
-    {
-        // prevent holding down
-        GVAR(isDownStateKey1) = false;
+["ACE3", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(call FUNC(canUseRangefinder) || FUNC(canUseFCS)) exitWith {false};
 
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(GVAR(enabled) && FUNC(canUseFCS)) exitWith {false};
+    // Statement
+    [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex), 50] call FUNC(adjustRange);
+    true
+},
+{}, 
+[201, [false, false, false]], false] call cba_fnc_addKeybind;  //PageUp Key
 
-        // Statement
-        [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyUp);
-        false
-    },
-    [15, [false, false, false]],
-    false,
-    "keyup"
-] call cba_fnc_registerKeybind;
+["ACE3", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(call FUNC(canUseRangefinder) || FUNC(canUseFCS)) exitWith {false};
 
-["ACE3",
-    localize "STR_ACE_FCS_AdjustRangeUp",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(call FUNC(canUseRangefinder) || FUNC(canUseFCS)) exitWith {false};
-
-        // Statement
-        [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex), 50] call FUNC(adjustRange);
-        true
-    },
-    [201, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
-
-["ACE3",
-    localize "STR_ACE_FCS_AdjustRangeDown",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(call FUNC(canUseRangefinder) || FUNC(canUseFCS)) exitWith {false};
-
-        // Statement
-        [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex), -50] call FUNC(adjustRange);
-        true
-    },
-    [209, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex), -50] call FUNC(adjustRange);
+    true
+},
+{}, 
+[209, [false, false, false]], false] call cba_fnc_addKeybind; //PageDown Key
diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf
index 4c7160bdb3..6b90564746 100644
--- a/addons/goggles/XEH_postInit.sqf
+++ b/addons/goggles/XEH_postInit.sqf
@@ -17,17 +17,19 @@
 #include "script_component.hpp"
 if (!hasInterface) exitWith {};
 
-["ACE3", localize "STR_ACE_Goggles_WipeGlasses",
+["ACE3", QGVAR(wipeGlasses), localize "STR_ACE_Goggles_WipeGlasses",
 {
-  if (!(GETVAR(ace_player,ACE_isUnconscious,false))) exitWith {
-    call FUNC(clearGlasses);
-    true
-  };
-  false
-}, [20, true, true, false], false, "keydown"] call CALLSTACK(cba_fnc_registerKeybind);
+    if (!(GETVAR(ace_player,ACE_isUnconscious,false))) exitWith {
+        call FUNC(clearGlasses);
+        true
+    };
+    false
+},
+{},
+[20, true, true, false], false] call CALLSTACK(cba_fnc_addKeybind);
 
 if isNil(QGVAR(UsePP)) then {
-  GVAR(UsePP) = true;
+    GVAR(UsePP) = true;
 };
 
 GVAR(PostProcess) = ppEffectCreate ["ColorCorrections", 1995];
@@ -47,78 +49,78 @@ GVAR(RainActive) = false;
 GVAR(RainLastLevel) = 0;
 
 FUNC(CheckGlasses) = {
-  if (GVAR(Current) != (goggles ace_player)) then {
-    GVAR(Current) = (goggles ace_player);
-    ["GlassesChanged",[GVAR(Current)]] call EFUNC(common,localEvent);
-  };
+    if (GVAR(Current) != (goggles ace_player)) then {
+        GVAR(Current) = (goggles ace_player);
+        ["GlassesChanged",[GVAR(Current)]] call EFUNC(common,localEvent);
+    };
 };
 
 player addEventHandler ["Explosion", {
-  if (alive ace_player) then {
-    call FUNC(ApplyDirtEffect);
-    if (GETBROKEN) exitWith {};
-    if (((_this select 1) call FUNC(GetExplosionIndex)) < getNumber(ConfigFile >> "CfgGlasses" >> GVAR(Current) >> "ACE_Resistance")) exitWith {};
-    if !([ace_player] call FUNC(isGogglesVisible)) exitWith {["GlassesCracked",[ace_player]] call EFUNC(common,localEvent);};
-    _effects = GETGLASSES(ace_player);
-    _effects set [BROKEN, true];
-    SETGLASSES(ace_player,_effects);
-    if (getText(ConfigFile >> "CfgGlasses" >> GVAR(Current) >> "ACE_OverlayCracked") != "" && {cameraOn == ace_player}) then {
-      if (call FUNC(ExternalCamera)) exitWith {};
-      if (isNull(GLASSDISPLAY)) then {
-        150 cutRsc["RscACE_Goggles", "PLAIN",1, false];
-      };
-      (GLASSDISPLAY displayCtrl 10650) ctrlSetText getText(ConfigFile >> "CfgGlasses" >> GVAR(Current) >> "ACE_OverlayCracked");
+    if (alive ace_player) then {
+        call FUNC(ApplyDirtEffect);
+        if (GETBROKEN) exitWith {};
+        if (((_this select 1) call FUNC(GetExplosionIndex)) < getNumber(ConfigFile >> "CfgGlasses" >> GVAR(Current) >> "ACE_Resistance")) exitWith {};
+        if !([ace_player] call FUNC(isGogglesVisible)) exitWith {["GlassesCracked",[ace_player]] call EFUNC(common,localEvent);};
+        _effects = GETGLASSES(ace_player);
+        _effects set [BROKEN, true];
+        SETGLASSES(ace_player,_effects);
+        if (getText(ConfigFile >> "CfgGlasses" >> GVAR(Current) >> "ACE_OverlayCracked") != "" && {cameraOn == ace_player}) then {
+            if (call FUNC(ExternalCamera)) exitWith {};
+            if (isNull(GLASSDISPLAY)) then {
+                150 cutRsc["RscACE_Goggles", "PLAIN",1, false];
+            };
+            (GLASSDISPLAY displayCtrl 10650) ctrlSetText getText(ConfigFile >> "CfgGlasses" >> GVAR(Current) >> "ACE_OverlayCracked");
+        };
+        ["GlassesCracked",[ace_player]] call EFUNC(common,localEvent);
     };
-    ["GlassesCracked",[ace_player]] call EFUNC(common,localEvent);
-  };
 }];
 player addEventHandler ["Killed",{
-  GVAR(PostProcessEyes) ppEffectEnable false;
-  SETGLASSES(ace_player,GLASSESDEFAULT);
-  call FUNC(removeGlassesEffect);
-  GVAR(EffectsActive)=false;
-  ace_player setVariable ["ACE_EyesDamaged", false];
-  if (GVAR(EyesDamageScript) != -1) then {
-    [GVAR(EyesDamageScript)] call CALLSTACK(cba_fnc_removePreFrameHandler);
-  };
-  if (GVAR(DustHandler) != -1) then {
-    [GVAR(DustHandler)] call CALLSTACK(cba_fnc_removePerFrameHandler);
-    GVAR(DustHandler) = -1;
-  };
+    GVAR(PostProcessEyes) ppEffectEnable false;
+    SETGLASSES(ace_player,GLASSESDEFAULT);
+    call FUNC(removeGlassesEffect);
+    GVAR(EffectsActive)=false;
+    ace_player setVariable ["ACE_EyesDamaged", false];
+    if (GVAR(EyesDamageScript) != -1) then {
+        [GVAR(EyesDamageScript)] call CALLSTACK(cba_fnc_removePreFrameHandler);
+    };
+    if (GVAR(DustHandler) != -1) then {
+        [GVAR(DustHandler)] call CALLSTACK(cba_fnc_removePerFrameHandler);
+        GVAR(DustHandler) = -1;
+    };
 }];
 player addEventHandler ["Fired",{[_this select 0, _this select 1] call FUNC(dustHandler);}];
 player AddEventHandler ["Take",{call FUNC(checkGlasses);}];
 player AddEventHandler ["Put", {call FUNC(checkGlasses);}];
 
 ["GlassesChanged",{
-  SETGLASSES(ace_player,GLASSESDEFAULT);
+    SETGLASSES(ace_player,GLASSESDEFAULT);
 
-  if (call FUNC(ExternalCamera)) exitWith {call FUNC(RemoveGlassesEffect)};
+    if (call FUNC(ExternalCamera)) exitWith {call FUNC(RemoveGlassesEffect)};
 
-  if ([ace_player] call FUNC(isGogglesVisible)) then {
-    [_this select 0] call FUNC(applyGlassesEffect);
-  } else {
-    call FUNC(removeGlassesEffect);
-  };
+    if ([ace_player] call FUNC(isGogglesVisible)) then {
+        [_this select 0] call FUNC(applyGlassesEffect);
+    } else {
+        call FUNC(removeGlassesEffect);
+    };
 }] call EFUNC(common,addEventHandler);
 ["GlassesCracked",{
-  if (_this select 0 != ace_player) exitWith {};
-  ace_player setVariable ["ACE_EyesDamaged", true];
-  if (GVAR(EyesDamageScript) != -1) then {
-    [GVAR(EyesDamageScript)] call CALLSTACK(cba_fnc_removePreFrameHandler);
-  };
-  GVAR(PostProcessEyes) ppEffectAdjust[1, 1, 0, [0,0,0,0], [0.5,0.5,0.5,0.5],[1,1,1,0]];
-  GVAR(PostProcessEyes) ppEffectCommit 0;
-  GVAR(PostProcessEyes) ppEffectEnable true;
-  GVAR(EyesDamageScript) = [{
-    GVAR(PostProcessEyes) ppEffectAdjust[1, 1, 0, [0,0,0,0], [1,1,1,1],[1,1,1,0]];
-    GVAR(PostProcessEyes) ppEffectCommit 5;
+    if (_this select 0 != ace_player) exitWith {};
+    ace_player setVariable ["ACE_EyesDamaged", true];
+    if (GVAR(EyesDamageScript) != -1) then {
+        [GVAR(EyesDamageScript)] call CALLSTACK(cba_fnc_removePreFrameHandler);
+    };
+    GVAR(PostProcessEyes) ppEffectAdjust[1, 1, 0, [0,0,0,0], [0.5,0.5,0.5,0.5],[1,1,1,0]];
+    GVAR(PostProcessEyes) ppEffectCommit 0;
+    GVAR(PostProcessEyes) ppEffectEnable true;
     GVAR(EyesDamageScript) = [{
-      GVAR(PostProcessEyes) ppEffectEnable false;
-      ace_player setVariable ["ACE_EyesDamaged", false];
-      GVAR(EyesDamageScript) = -1;
-    }, [], 5, 1] call EFUNC(common,waitAndExecute);
-  }, [], 25, 5] call EFUNC(common,waitAndExecute);
+        GVAR(PostProcessEyes) ppEffectAdjust[1, 1, 0, [0,0,0,0], [1,1,1,1],[1,1,1,0]];
+        GVAR(PostProcessEyes) ppEffectCommit 5;
+        GVAR(EyesDamageScript) = [{
+            GVAR(PostProcessEyes) ppEffectEnable false;
+            ace_player setVariable ["ACE_EyesDamaged", false];
+            GVAR(EyesDamageScript) = -1;
+        }, [], 5, 1] call EFUNC(common,waitAndExecute);
+    }, [], 25, 5] call EFUNC(common,waitAndExecute);
 }] call EFUNC(common,addEventHandler);
 call FUNC(checkGlasses);
 [FUNC(CheckGoggles), 1, []] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/grenades/XEH_postInit.sqf b/addons/grenades/XEH_postInit.sqf
index 0b6bb16ffb..f9aef6bef1 100644
--- a/addons/grenades/XEH_postInit.sqf
+++ b/addons/grenades/XEH_postInit.sqf
@@ -10,19 +10,16 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
 GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_Grenades_SwitchGrenadeMode",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(captives,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if (!([ACE_player] call EFUNC(common,canUseWeapon))) exitWith {false};
+["ACE3", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(captives,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if (!([ACE_player] call EFUNC(common,canUseWeapon))) exitWith {false};
 
-        // Statement
-        [] call FUNC(nextMode);
-    },
-    [9, [false, false, false]],  //8 key
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [] call FUNC(nextMode);
+},
+{},
+[9, [false, false, false]], false] call cba_fnc_addKeybind; //8 Key
diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf
index c068a15882..b804ea970f 100644
--- a/addons/interact_menu/XEH_clientInit.sqf
+++ b/addons/interact_menu/XEH_clientInit.sqf
@@ -6,30 +6,12 @@ _fnc = {
 };
 addMissionEventHandler ["Draw3D", _fnc];
 
-["ACE3",
-"Interact Key",
+["ACE3", QGVAR(InteractKey), "Interact Key",
 {_this call FUNC(keyDown)},
-[219, [false, false, false]],
-false,
-"keydown"] call cba_fnc_registerKeybind;
-
-["ACE3",
-"Interact Key",
 {_this call FUNC(keyUp)},
-[219, [false, false, false]],
-false,
-"keyUp"] call cba_fnc_registerKeybind;
+[219, [false, false, false]], false] call cba_fnc_addKeybind;  //Left Windows Key
 
-["ACE3",
-"Self Actions Key",
+["ACE3", QGVAR(SelfInteractKey), "Self Actions Key",
 {_this call FUNC(keyDownSelfAction)},
-[219, [false, true, false]],
-false,
-"keydown"] call cba_fnc_registerKeybind;
-
-["ACE3",
-"Self Actions Key",
 {_this call FUNC(keyUpSelfAction)},
-[219, [false, true, false]],
-false,
-"keyUp"] call cba_fnc_registerKeybind;
\ No newline at end of file
+[219, [false, true, false]], false] call cba_fnc_addKeybind; //Left Windows Key + Ctrl/Strg
diff --git a/addons/interaction/XEH_clientInit.sqf b/addons/interaction/XEH_clientInit.sqf
index 85232d1fcd..89001b0039 100644
--- a/addons/interaction/XEH_clientInit.sqf
+++ b/addons/interaction/XEH_clientInit.sqf
@@ -16,92 +16,89 @@ GVAR(isOpeningDoor) = false;
 
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_Interaction_OpenDoor",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(!GVAR(isOpeningDoor) &&
-             {[2] call FUNC(getDoor) select 1 != ''}
-            ) exitWith {false};
+["ACE3", QGVAR(openDoor), localize "STR_ACE_Interaction_OpenDoor",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(!GVAR(isOpeningDoor) &&
+    {[2] call FUNC(getDoor) select 1 != ''}
+    ) exitWith {false};
 
-        // Statement
-        call EFUNC(interaction,openDoor);
-        true
-    },
-    [57, [false, true, false]],
-    false,
-    "keydown"
+    // Statement
+    call EFUNC(interaction,openDoor);
+    true
+},
+{},
+[57, [false, true, false]], false] call cba_fnc_addKeybind;
+
+["ACE3",
+localize "STR_ACE_Interaction_OpenDoor",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(GVAR(isOpeningDoor)) exitWith {false};
+
+    // Statement
+    GVAR(isOpeningDoor) = false;
+    true
+},
+[57, [false, true, false]],
+false,
+"keyup"
 ] call cba_fnc_registerKeybind;
 
 ["ACE3",
-    localize "STR_ACE_Interaction_OpenDoor",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(GVAR(isOpeningDoor)) exitWith {false};
+localize "STR_ACE_Interaction_TapShoulder",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player, cursorTarget] call FUNC(canTapShoulder)) exitWith {false};
 
-        // Statement
-        GVAR(isOpeningDoor) = false;
-        true
-    },
-    [57, [false, true, false]],
-    false,
-    "keyup"
+    // Statement
+    [ACE_player, cursorTarget] call FUNC(tapShoulder);
+    true
+},
+[20, [true, false, false]],
+false,
+"keydown"
 ] call cba_fnc_registerKeybind;
 
 ["ACE3",
-    localize "STR_ACE_Interaction_TapShoulder",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player, cursorTarget] call FUNC(canTapShoulder)) exitWith {false};
+localize "STR_ACE_Interaction_ModifierKey",
+{
+    // Conditions: canInteract
+    _exceptions = ["ACE_Drag_isNotDragging"];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
 
-        // Statement
-        [ACE_player, cursorTarget] call FUNC(tapShoulder);
-        true
-    },
-    [20, [true, false, false]],
-    false,
-    "keydown"
+    // Statement
+    ACE_Modifier = 1;
+    // Return false so it doesn't block other actions
+    false
+},
+[29, [false, false, false]],
+false,
+"keydown"
 ] call cba_fnc_registerKeybind;
 
 ["ACE3",
-    localize "STR_ACE_Interaction_ModifierKey",
-    {
-        // Conditions: canInteract
-        _exceptions = ["ACE_Drag_isNotDragging"];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+localize "STR_ACE_Interaction_ModifierKey",
+{
+    // Conditions: canInteract
+    _exceptions = ["ACE_Drag_isNotDragging"];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
 
-        // Statement
-        ACE_Modifier = 1;
-        // Return false so it doesn't block other actions
-        false
-    },
-    [29, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
-
-["ACE3",
-    localize "STR_ACE_Interaction_ModifierKey",
-    {
-        // Conditions: canInteract
-        _exceptions = ["ACE_Drag_isNotDragging"];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-
-        // Statement
-        ACE_Modifier = 0;
-        // Return false so it doesn't block other actions
-        false
-    },
-    [29, [false, false, false]],
-    false,
-    "keyup"
+    // Statement
+    ACE_Modifier = 0;
+    // Return false so it doesn't block other actions
+    false
+},
+[29, [false, false, false]],
+false,
+"keyup"
 ] call cba_fnc_registerKeybind;
diff --git a/addons/movement/XEH_postInit.sqf b/addons/movement/XEH_postInit.sqf
index 54a94ad21f..42c5c17ad1 100644
--- a/addons/movement/XEH_postInit.sqf
+++ b/addons/movement/XEH_postInit.sqf
@@ -18,20 +18,17 @@
 
 }] call EFUNC(common,addEventHandler);
 
-["ACE3",
-    localize "STR_ACE_Movement_Climb",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if (ACE_player != (vehicle ACE_player)) exitWith {false};
+["ACE3", QGVAR(climb), localize "STR_ACE_Movement_Climb",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if (ACE_player != (vehicle ACE_player)) exitWith {false};
 
-        // Statement
-        [ACE_player] call FUNC(climb);
-        true
-    },
-    [47, [false, true, false]], //DIK_V + CTRL//STRG
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player] call FUNC(climb);
+    true
+},
+{},
+[47, [false, true, false]], false] call cba_fnc_addKeybind; //DIK_V + CTRL//STRG
diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf
index 1ad0e38879..406bf867e3 100644
--- a/addons/nametags/XEH_postInit.sqf
+++ b/addons/nametags/XEH_postInit.sqf
@@ -7,23 +7,20 @@ if (!hasInterface) exitWith {};
 
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_NameTags_ShowNames",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+["ACE3", QGVAR(showNameTags), localize "STR_ACE_NameTags_ShowNames",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
 
-        // Statement
-        GVAR(ShowNamesTime) = time;
-        if (call FUNC(canShow)) then{ call FUNC(doShow); };
-        // Return false so it doesn't block other actions
-        false
-    },
-    [29, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    GVAR(ShowNamesTime) = time;
+    if (call FUNC(canShow)) then{ call FUNC(doShow); };
+    // Return false so it doesn't block other actions
+    false
+},
+{},
+[29, [false, false, false]], false] call cba_fnc_addKeybind; //LeftControl Key
 
 
 // Draw handle
diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf
index 7513b1df16..d9f5e90aef 100644
--- a/addons/nightvision/XEH_postInitClient.sqf
+++ b/addons/nightvision/XEH_postInitClient.sqf
@@ -37,8 +37,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
 ["playerTurretChanged",     {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
 
 // Add keybinds
-["ACE3",
-localize "STR_ACE_NightVision_IncreaseNVGBrightness",
+["ACE3", QGVAR(IncreaseNVGBrightness), localize "STR_ACE_NightVision_IncreaseNVGBrightness",
 {
     // Conditions: canInteract
     _exceptions = [QEGVAR(captives,isNotEscorting)];
@@ -50,13 +49,10 @@ localize "STR_ACE_NightVision_IncreaseNVGBrightness",
     [ACE_player, 1] call FUNC(changeNVGBrightness);
     true
 },
-[201, [false, false, true]], //PageUp + ALT
-false,
-"keydown"
-] call cba_fnc_registerKeybind;
+{},
+[201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT
 
-["ACE3",
-localize "STR_ACE_NightVision_DecreaseNVGBrightness",
+["ACE3", QGVAR(DecreaseNVGBrightness), localize "STR_ACE_NightVision_DecreaseNVGBrightness",
 {
     // Conditions: canInteract
     _exceptions = [QEGVAR(captives,isNotEscorting)];
@@ -68,7 +64,5 @@ localize "STR_ACE_NightVision_DecreaseNVGBrightness",
     [ACE_player, -1] call FUNC(changeNVGBrightness);
     true
 },
-[209, [false, false, true]], //PageDown + ALT
-false,
-"keydown"
-] call cba_fnc_registerKeybind;
+{},
+[209, [false, false, true]], false] call cba_fnc_addKeybind; //PageDown + ALT
diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf
index 6d0014c2a2..5d3a39ffd3 100644
--- a/addons/overheating/XEH_postInit.sqf
+++ b/addons/overheating/XEH_postInit.sqf
@@ -4,22 +4,19 @@
 if !(hasInterface) exitWith {};
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_Overheating_UnjamWeapon",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon) &&
-             {currentWeapon ACE_player in (ACE_player getVariable [QGVAR(jammedWeapons), []])}
-            ) exitWith {false};
+["ACE3", QGVAR(unjamWeapon), localize "STR_ACE_Overheating_UnjamWeapon",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon) &&
+    {currentWeapon ACE_player in (ACE_player getVariable [QGVAR(jammedWeapons), []])}
+    ) exitWith {false};
 
-        // Statement
-        [ACE_player, currentMuzzle ACE_player, false] call FUNC(clearJam);
-        true
-    },
-    [19, [true, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, currentMuzzle ACE_player, false] call FUNC(clearJam);
+    true
+},
+{},
+[19, [true, false, false]], false] call cba_fnc_addKeybind; //R Key
diff --git a/addons/parachute/XEH_postInit.sqf b/addons/parachute/XEH_postInit.sqf
index a15e125edd..e25d85caea 100644
--- a/addons/parachute/XEH_postInit.sqf
+++ b/addons/parachute/XEH_postInit.sqf
@@ -16,26 +16,28 @@
 #include "script_component.hpp"
 if (!hasInterface) exitWith {};
 
-["ACE3", localize "STR_ACE_Parachute_showAltimeter",
+["ACE3", QGVAR(showAltimeter), localize "STR_ACE_Parachute_showAltimeter",
 {
-  // Conditions: canInteract
-  _exceptions = [QEGVAR(interaction,isNotEscorting)];
-  if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-  if (!('ACE_Altimeter' in assignedItems ace_player)) exitWith {false};
-  if (!(missionNamespace getVariable [QGVAR(AltimeterActive), false])) then {
-    [ace_player] call FUNC(showAltimeter);
-  } else {
-    call FUNC(hideAltimeter);
-  };
-  true
-}, [24, false, false, false], false, "keydown"] call CALLSTACK(cba_fnc_registerKeybind);
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    if (!('ACE_Altimeter' in assignedItems ace_player)) exitWith {false};
+    if (!(missionNamespace getVariable [QGVAR(AltimeterActive), false])) then {
+        [ace_player] call FUNC(showAltimeter);
+    } else {
+        call FUNC(hideAltimeter);
+    };
+    true
+},
+{},
+[24, false, false, false], false] call CALLSTACK(cba_fnc_addKeybind);
 
 GVAR(PFH) = false;
 ["playerVehicleChanged",{
-  if (!GVAR(PFH) && {(vehicle ACE_player) isKindOf "ParachuteBase"}) then {
-    GVAR(PFH) = true;
-    [FUNC(onEachFrame), 0.1, []] call CALLSTACK(cba_fnc_addPerFrameHandler);
-  };
+    if (!GVAR(PFH) && {(vehicle ACE_player) isKindOf "ParachuteBase"}) then {
+        GVAR(PFH) = true;
+        [FUNC(onEachFrame), 0.1, []] call CALLSTACK(cba_fnc_addPerFrameHandler);
+    };
 }] call EFUNC(common,addEventHandler);
 
 // don't show speed and height when in expert mode
diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf
index d40e5e0442..6969df4c6a 100644
--- a/addons/reload/XEH_postInit.sqf
+++ b/addons/reload/XEH_postInit.sqf
@@ -4,21 +4,18 @@
 if !(hasInterface) exitWith {};
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_Reload_checkAmmo",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon) ||
-             {(vehicle ACE_player) isKindOf 'StaticWeapon'}) exitWith {false};
+["ACE3", QGVAR(checkAmmo), localize "STR_ACE_Reload_checkAmmo",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon) ||
+    {(vehicle ACE_player) isKindOf 'StaticWeapon'}) exitWith {false};
 
-        // Statement
-        [ACE_player, vehicle ACE_player, false] call FUNC(checkAmmo);
-        true
-    },
-    [19, [false, true, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, vehicle ACE_player, false] call FUNC(checkAmmo);
+    true
+},
+{},
+[19, [false, true, false]], false] call cba_fnc_addKeybind;
diff --git a/addons/resting/XEH_postInit.sqf b/addons/resting/XEH_postInit.sqf
index 0d999bab86..6af44c36c9 100644
--- a/addons/resting/XEH_postInit.sqf
+++ b/addons/resting/XEH_postInit.sqf
@@ -4,24 +4,21 @@
 if !(hasInterface) exitWith {};
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_Resting_RestWeapon",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon) &&
-             {inputAction 'reloadMagazine' == 0} &&
-             {!weaponLowered ACE_player} &&
-             {speed ACE_player < 1}) exitWith {false};
+["ACE3", QGVAR(RestWeapon), localize "STR_ACE_Resting_RestWeapon",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon) &&
+    {inputAction 'reloadMagazine' == 0} &&
+    {!weaponLowered ACE_player} &&
+    {speed ACE_player < 1}) exitWith {false};
 
-        // Statement
-        [ACE_player, vehicle ACE_player, currentWeapon ACE_player] call FUNC(restWeapon);
-        // Return false so it doesn't block other actions
-        false
-    },
-    [15, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, vehicle ACE_player, currentWeapon ACE_player] call FUNC(restWeapon);
+    // Return false so it doesn't block other actions
+    false
+},
+{},
+[15, [false, false, false]], false] call cba_fnc_addKeybind;
diff --git a/addons/safemode/XEH_postInit.sqf b/addons/safemode/XEH_postInit.sqf
index 8ae1155d53..60f8c6a60d 100644
--- a/addons/safemode/XEH_postInit.sqf
+++ b/addons/safemode/XEH_postInit.sqf
@@ -2,24 +2,21 @@
 #include "script_component.hpp"
 
 //["Soldier", {_player = ACE_player; if (currentWeapon _player in (_player getVariable [QGVAR(safedWeapons), []])) then {[false] call FUNC(setSafeModeVisual)}] call EFUNC(common,addInfoDisplayEventHandler);
-  //@todo addEventHandler infoDisplayChanged with select 1 == "Soldier"
+//@todo addEventHandler infoDisplayChanged with select 1 == "Soldier"
 
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_SafeMode_SafeMode",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(safeMode), localize "STR_ACE_SafeMode_SafeMode",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player, currentWeapon ACE_player, currentMuzzle ACE_player] call FUNC(lockSafety);
-        true
-    },
-    [41, [false, true, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, currentWeapon ACE_player, currentMuzzle ACE_player] call FUNC(lockSafety);
+    true
+},
+{},
+[41, [false, true, false]], false] call cba_fnc_addKeybind;
diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf
index 8de7ff8af0..1ba21b41f0 100644
--- a/addons/scopes/XEH_postInit.sqf
+++ b/addons/scopes/XEH_postInit.sqf
@@ -33,78 +33,66 @@ if !(hasInterface) exitWith {};
 
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_Scopes_AdjustUp",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        [ACE_player] call FUNC(inventoryCheck);
-        if !([ACE_player, 0, 0.1] call FUNC(canAdjustScope)) exitWith {false};
+["ACE3", QGVAR(AdjustUp), localize "STR_ACE_Scopes_AdjustUp",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    [ACE_player] call FUNC(inventoryCheck);
+    if !([ACE_player, 0, 0.1] call FUNC(canAdjustScope)) exitWith {false};
 
-        // Statement
-        [ACE_player, 0, 0.1] call FUNC(adjustScope);
-        true
-    },
-    [201, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, 0, 0.1] call FUNC(adjustScope);
+    true
+},
+{},
+[201, [false, false, false]], false] call cba_fnc_addKeybind;
 
-["ACE3",
-    localize "STR_ACE_Scopes_AdjustDown",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        [ACE_player] call FUNC(inventoryCheck);
-        if !([ACE_player, 0, -0.1] call FUNC(canAdjustScope)) exitWith {false};
+["ACE3", QGVAR(AdjustDown), localize "STR_ACE_Scopes_AdjustDown",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    [ACE_player] call FUNC(inventoryCheck);
+    if !([ACE_player, 0, -0.1] call FUNC(canAdjustScope)) exitWith {false};
 
-        // Statement
-        [ACE_player, 0, -0.1] call FUNC(adjustScope);
-        true
-    },
-    [209, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, 0, -0.1] call FUNC(adjustScope);
+    true
+},
+{},
+[209, [false, false, false]], false] call cba_fnc_addKeybind;
 
-["ACE3",
-    localize "STR_ACE_Scopes_AdjustLeft",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        [ACE_player] call FUNC(inventoryCheck);
-        if !([ACE_player, -0.1, 0] call FUNC(canAdjustScope)) exitWith {false};
+["ACE3", QGVAR(AdjustLeft), localize "STR_ACE_Scopes_AdjustLeft",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    [ACE_player] call FUNC(inventoryCheck);
+    if !([ACE_player, -0.1, 0] call FUNC(canAdjustScope)) exitWith {false};
 
-        // Statement
-        [ACE_player, -0.1, 0] call FUNC(adjustScope);
-        true
-    },
-    [209, [false, true, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, -0.1, 0] call FUNC(adjustScope);
+    true
+},
+{},
+[209, [false, true, false]], false] call cba_fnc_addKeybind;
 
-["ACE3",
-    localize "STR_ACE_Scopes_AdjustRight",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        [ACE_player] call FUNC(inventoryCheck);
-        if !([ACE_player, 0.1, 0] call FUNC(canAdjustScope)) exitWith {false};
+["ACE3", QGVAR(AdjustRight), localize "STR_ACE_Scopes_AdjustRight",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    [ACE_player] call FUNC(inventoryCheck);
+    if !([ACE_player, 0.1, 0] call FUNC(canAdjustScope)) exitWith {false};
 
-        // Statement
-        [ACE_player, 0.1, 0] call FUNC(adjustScope);
-        true
-    },
-    [201, [false, true, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, 0.1, 0] call FUNC(adjustScope);
+    true
+},
+{},
+[201, [false, true, false]], false] call cba_fnc_addKeybind;
diff --git a/addons/vehicles/XEH_postInit.sqf b/addons/vehicles/XEH_postInit.sqf
index efff70306f..64d2cbc1c0 100644
--- a/addons/vehicles/XEH_postInit.sqf
+++ b/addons/vehicles/XEH_postInit.sqf
@@ -4,22 +4,19 @@
 if !(hasInterface) exitWith {};
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_SpeedLimiter",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(ACE_player == driver vehicle ACE_player &&
-              {vehicle ACE_player isKindOf 'Car' ||
-              {vehicle ACE_player isKindOf 'Tank'}}) exitWith {false};
+["ACE3", QGVAR(speedLimiter), localize "STR_ACE_SpeedLimiter",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(ACE_player == driver vehicle ACE_player &&
+    {vehicle ACE_player isKindOf 'Car' ||
+        {vehicle ACE_player isKindOf 'Tank'}}) exitWith {false};
 
-        // Statement
-        [ACE_player, vehicle ACE_player] call FUNC(speedLimiter);
-        true
-    },
-    [211, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, vehicle ACE_player] call FUNC(speedLimiter);
+    true
+},
+{},
+[211, [false, false, false]], false] call cba_fnc_addKeybind; //DELETE Key
diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf
index 3414f64c52..e0f3272c62 100644
--- a/addons/weaponselect/XEH_postInit.sqf
+++ b/addons/weaponselect/XEH_postInit.sqf
@@ -4,254 +4,212 @@
 if !(hasInterface) exitWith {};
 
 // Add keybinds
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectPistol",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(SelectPistol), localize "STR_ACE_WeaponSelect_SelectPistol",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player, handgunWeapon ACE_player] call FUNC(selectWeaponMode);
-        true
-    },
-    [2, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, handgunWeapon ACE_player] call FUNC(selectWeaponMode);
+    true
+},
+{},
+[2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectRifle",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(SelectRifle), localize "STR_ACE_WeaponSelect_SelectRifle",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMode);
-        true
-    },
-    [3, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMode);
+    true
+},
+{},
+[3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectLauncher",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(SelectRifleMuzzle), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player, secondaryWeapon ACE_player] call FUNC(selectWeaponMode);
-        true
-    },
-    [5, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMuzzle);
+    true
+},
+{},
+[4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(SelectLauncher), localize "STR_ACE_WeaponSelect_SelectLauncher",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMuzzle);
-        true
-    },
-    [4, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, secondaryWeapon ACE_player] call FUNC(selectWeaponMode);
+    true
+},
+{},
+[5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectBinocular",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(SelectBinocular), localize "STR_ACE_WeaponSelect_SelectBinocular",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player, binocular ACE_player] call FUNC(selectWeaponMode);
-        true
-    },
-    [6, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, binocular ACE_player] call FUNC(selectWeaponMode);
+    true
+},
+{},
+[6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectGrenadeFrag",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player] call FUNC(selectGrenadeFrag);
-        true
-    },
-    [7, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player] call FUNC(selectGrenadeFrag);
+    true
+},
+{},
+[7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectGrenadeOther",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player] call FUNC(selectGrenadeOther);
-        true
-    },
-    [8, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player] call FUNC(selectGrenadeOther);
+    true
+},
+{},
+[8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_HolsterWeapon",
-    {
-        // Conditions: canInteract
-        _exceptions = [QEGVAR(interaction,isNotEscorting)];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
+["ACE3", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(interaction,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
-        // Statement
-        [ACE_player] call FUNC(putWeaponAway);
-        true
-    },
-    [11, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player] call FUNC(putWeaponAway);
+    true
+},
+{},
+[11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_EngineOn",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {!isEngineOn vehicle ACE_player}) exitWith {false};
+["ACE3", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {!isEngineOn vehicle ACE_player}) exitWith {false};
 
-        // Statement
-        (vehicle ACE_player) engineOn true;
-        true
-    },
-    [3, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    (vehicle ACE_player) engineOn true;
+    true
+},
+{},
+[3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_EngineOff",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {isEngineOn vehicle ACE_player}) exitWith {false};
+["ACE3", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {isEngineOn vehicle ACE_player}) exitWith {false};
 
-        // Statement
-        (vehicle ACE_player) engineOn false;
-        true
-    },
-    [2, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    (vehicle ACE_player) engineOn false;
+    true
+},
+{},
+[2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectMainGun",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(ACE_player != vehicle ACE_player) exitWith {false};
+["ACE3", QGVAR(SelectMainGun), localize "STR_ACE_WeaponSelect_SelectMainGun",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(ACE_player != vehicle ACE_player) exitWith {false};
 
-        // Statement
-        [ACE_player, vehicle ACE_player, 0] call FUNC(selectWeaponVehicle);
-        true
-    },
-    [4, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, vehicle ACE_player, 0] call FUNC(selectWeaponVehicle);
+    true
+},
+{},
+[4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectMachineGun",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(ACE_player != vehicle ACE_player) exitWith {false};
+["ACE3", QGVAR(SelectMachineGun), localize "STR_ACE_WeaponSelect_SelectMachineGun",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(ACE_player != vehicle ACE_player) exitWith {false};
 
-        // Statement
-        [ACE_player, vehicle ACE_player, 1] call FUNC(selectWeaponVehicle);
-        true
-    },
-    [5, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, vehicle ACE_player, 1] call FUNC(selectWeaponVehicle);
+    true
+},
+{},
+[5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_SelectMissiles",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(ACE_player != vehicle ACE_player) exitWith {false};
+["ACE3", QGVAR(SelectMissiles), localize "STR_ACE_WeaponSelect_SelectMissiles",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(ACE_player != vehicle ACE_player) exitWith {false};
 
-        // Statement
-        [ACE_player, vehicle ACE_player, 2] call FUNC(selectWeaponVehicle);
-        true
-    },
-    [6, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [ACE_player, vehicle ACE_player, 2] call FUNC(selectWeaponVehicle);
+    true
+},
+{},
+[6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
 
-["ACE3",
-    localize "STR_ACE_WeaponSelect_FireSmokeLauncher",
-    {
-        // Conditions: canInteract
-        _exceptions = [];
-        if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
-        // Conditions: specific
-        if !(ACE_player != vehicle ACE_player && {ACE_player == commander vehicle ACE_player}) exitWith {false};
+["ACE3", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher",
+{
+    // Conditions: canInteract
+    _exceptions = [];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if !(ACE_player != vehicle ACE_player && {ACE_player == commander vehicle ACE_player}) exitWith {false};
 
-        // Statement
-        [vehicle ACE_player] call FUNC(fireSmokeLauncher);
-        true
-    },
-    [10, [false, false, false]],
-    false,
-    "keydown"
-] call cba_fnc_registerKeybind;
+    // Statement
+    [vehicle ACE_player] call FUNC(fireSmokeLauncher);
+    true
+},
+{},
+[10, [false, false, false]], false] call cba_fnc_addKeybind; //9 Key