diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf
index b81bedc07b..7513b1df16 100644
--- a/addons/nightvision/XEH_postInitClient.sqf
+++ b/addons/nightvision/XEH_postInitClient.sqf
@@ -35,3 +35,40 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
 ["cameraViewChanged",       {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
 ["playerVehicleChanged",    {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
 ["playerTurretChanged",     {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
+
+// Add keybinds
+["ACE3",
+localize "STR_ACE_NightVision_IncreaseNVGBrightness",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(captives,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if ((currentVisionMode _player != 1)) exitWith {false};
+
+    // Statement
+    [ACE_player, 1] call FUNC(changeNVGBrightness);
+    true
+},
+[201, [false, false, true]], //PageUp + ALT
+false,
+"keydown"
+] call cba_fnc_registerKeybind;
+
+["ACE3",
+localize "STR_ACE_NightVision_DecreaseNVGBrightness",
+{
+    // Conditions: canInteract
+    _exceptions = [QEGVAR(captives,isNotEscorting)];
+    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // Conditions: specific
+    if ((currentVisionMode _player != 1)) exitWith {false};
+
+    // Statement
+    [ACE_player, -1] call FUNC(changeNVGBrightness);
+    true
+},
+[209, [false, false, true]], //PageDown + ALT
+false,
+"keydown"
+] call cba_fnc_registerKeybind;
diff --git a/addons/nightvision/config.cpp b/addons/nightvision/config.cpp
index 32c563bfb6..4e6aa2e39a 100644
--- a/addons/nightvision/config.cpp
+++ b/addons/nightvision/config.cpp
@@ -1,42 +1,17 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-  class ADDON {
-    units[] = {};
-    weapons[] = {"ACE_NVG_Gen1", "ACE_NVG_Gen2", /*"ACE_NVG_Gen3",*/ "ACE_NVG_Gen4", "ACE_NVG_Wide"};
-    requiredVersion = REQUIRED_VERSION;
-    requiredAddons[] = {"ace_common"};
-    author[] = {"commy2", "KoffeinFlummi", "PabstMirror"};
-    authorUrl = "https://github.com/commy2/";
-    VERSION_CONFIG;
-  };
+    class ADDON {
+        units[] = {};
+        weapons[] = {"ACE_NVG_Gen1", "ACE_NVG_Gen2", /*"ACE_NVG_Gen3",*/ "ACE_NVG_Gen4", "ACE_NVG_Wide"};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"ace_common"};
+        author[] = {"commy2", "KoffeinFlummi", "PabstMirror"};
+        authorUrl = "https://github.com/commy2/";
+        VERSION_CONFIG;
+    };
 };
 
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
-
-
-// class EGVAR(common,Default_Keys) {  //???
-class ACE_common_Default_Keys {
-  class increaseNVGBrightness {
-    displayName = "$STR_ACE_NightVision_IncreaseNVGBrightness";
-    condition = QUOTE( currentVisionMode _player == 1 );
-    statement = QUOTE( [_player, _vehicle] call FUNC(increaseNVGBrightness) );
-    key = 201;
-    shift = 0;
-    control = 0;
-    alt = 1;
-    allowHolding = 1;
-  };
-  class decreaseNVGBrightness {
-    displayName = "$STR_ACE_NightVision_DecreaseNVGBrightness";
-    condition = QUOTE( currentVisionMode _player == 1 );
-    statement = QUOTE( [_player, _vehicle] call FUNC(decreaseNVGBrightness) );
-    key = 209;
-    shift = 0;
-    control = 0;
-    alt = 1;
-    allowHolding = 1;
-  };
-};