diff --git a/js/conf/ExtensionConf.js b/js/conf/ExtensionConf.js
index ce3cf6e..d13bf65 100644
--- a/js/conf/ExtensionConf.js
+++ b/js/conf/ExtensionConf.js
@@ -180,8 +180,8 @@ var ExtensionConf = {
       metaKey: false,
       altKey: false, 
       shiftKey: false,
-      onKeyUp: false,
-      onKeyDown: true,
+      onKeyUp: true,
+      onKeyDown: false,
     }],
     popup: true,
     ui: true,
diff --git a/js/modules/ActionHandler.js b/js/modules/ActionHandler.js
index 5396246..0d8359c 100644
--- a/js/modules/ActionHandler.js
+++ b/js/modules/ActionHandler.js
@@ -34,25 +34,26 @@ class ActionHandler {
     }
 
     for (var action of actions) {
-      if (action.onKeyDown) {
+      var shortcut = action.shortcut[0];
+      if (shortcut.onKeyDown) {
         this.keyDownActions.push(action);
       }
-      if (action.onKeyUp) {
+      if (shortcut.onKeyUp) {
         this.keyUpActions.push(action);
       }
-      if (action.onScrollUp) {
+      if (shortcut.onScrollUp) {
         this.mouseScrollUpActions.push(action);
       }
-      if (action.onScrollDown) {
+      if (shortcut.onScrollDown) {
         this.mouseScrollDownActions.push(action);
       }
-      if (action.onMouseEnter) {
+      if (shortcut.onMouseEnter) {
         this.mouseEnterActions.push(action);
       }
-      if (action.onMouseLeave) {
+      if (shortcut.onMouseLeave) {
         this.mouseLeaveActions.push(action);
       }
-      if (action.onMouseMove) {
+      if (shortcut.onMouseMove) {
         this.mouseMoveActions.push(action);
       }
     }
@@ -69,7 +70,7 @@ class ActionHandler {
       
       console.log("[ActionHandler::preventAction] Testing whether we're in a textbox or something. Detailed rundown of conditions:\n" +
       "is full screen? (yes->allow):", PlayerData.isFullScreen(),
-      "\nis tag one of defined inputs? (no->prevent):", this.inputs.indexOf(activeElement.tagName.toLocaleLowerCase()) !== -1,
+      "\nis tag one of defined inputs? (yes->prevent):", this.inputs.indexOf(activeElement.tagName.toLocaleLowerCase()) !== -1,
       "\nis role = textbox? (yes -> prevent):", activeElement.getAttribute("role") === "textbox",
       "\nis type === 'text'? (yes -> prevent):", activeElement.getAttribute("type") === "text",
       "\nwill the action be prevented? (yes -> prevent)", this.preventAction(),
@@ -108,7 +109,7 @@ class ActionHandler {
 
   execAction(actions, event, shortcutIndex) {
     if(Debug.debug  && Debug.keyboard ){
-      console.log("%c[ActionHandler::execAction] Trying to find and execute action for event.: ", "color: #ff0");
+      console.log("%c[ActionHandler::execAction] Trying to find and execute action for event. Actions/event: ", "color: #ff0", actions, event);
     }
 
     if (!shortcutIndex) {
@@ -123,10 +124,8 @@ class ActionHandler {
 
         for (var cmd of action.cmd) {
           if (cmd.action === "crop") {
-            this.pageInfo.stopArDetection();
             this.pageInfo.setAr(cmd.arg);
           } else if (cmd.action === "zoom") {
-            this.pageInfo.stopArDetection();
             this.pageInfo.zoomStep(cmd.arg);
           } else if (cmd.action === "stretch") {
             this.pageInfo.setStretchMode(cmd.arg);
@@ -145,14 +144,26 @@ class ActionHandler {
 
   handleKeyup(event) {
     if(Debug.debug  && Debug.keyboard ){
-      console.log("%c[ActionHandler::handleKeyup] we pressed a key: ", "color: #ff0", event.key , " | keydown: ", event.keydown, "event:", event);
+      console.log("%c[ActionHandler::handleKeyup] we pressed a key: ", "color: #ff0", event.key , " | keydown: ", event.keyup, "event:", event);
     }
 
     if (this.preventAction()) {
       return;
     }
 
+    this.execAction(this.keyUpActions, event, 0);
+  }
 
+  handleKeydown(event) {
+    if(Debug.debug  && Debug.keyboard ){
+      console.log("%c[ActionHandler::handleKeydown] we pressed a key: ", "color: #ff0", event.key , " | keydown: ", event.keydown, "event:", event);
+    }
+
+    if (this.preventAction()) {
+      return;
+    }
+
+    this.execAction(this.keyDownActions, event, 0);
   }
 
 }
\ No newline at end of file
diff --git a/js/modules/PageInfo.js b/js/modules/PageInfo.js
index e2a9e7c..5609eaa 100644
--- a/js/modules/PageInfo.js
+++ b/js/modules/PageInfo.js
@@ -237,6 +237,12 @@ class PageInfo {
   setAr(ar){
     if(ar !== 'auto') {
       this.stopArDetection();
+    } else {
+      for (var vd of this.videos) {
+        vd.resetLastAr();
+      }
+      this.startArDetection();
+      return;
     }
 
     // TODO: find a way to only change aspect ratio for one video
diff --git a/js/uw.js b/js/uw.js
index 65c6c54..c05ff76 100644
--- a/js/uw.js
+++ b/js/uw.js
@@ -21,7 +21,7 @@ class UW {
     this.pageInfo = undefined;
     this.comms = undefined;
     this.settings = undefined;
-    this.keybinds = undefined;
+    this.actionHandler = undefined;
   }
 
   async init(){
@@ -71,8 +71,12 @@ class UW {
       }
       this.comms.setPageInfo(this.pageInfo);
   
-      this.keybinds = new Keybinds(this.pageInfo);
-      this.keybinds.setup();
+      if(Debug.debug) {
+        console.log("[uw.js::setup] will try to initate ActionHandler. Settings are:", this.settings, this.settings.active)
+      }
+
+      this.actionHandler = new ActionHandler(this.pageInfo);
+      this.actionHandler.init();
       
     } catch (e) {
       console.log("[uw::init] FAILED TO START EXTENSION. Error:", e);
diff --git a/manifest.json b/manifest.json
index ebfa330..c80a7c0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Ultrawidify",
-  "version": "3.3.0-a1",
+  "version": "3.3.0-a2",
   "applications": {
     "gecko": {
       "id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}"
@@ -45,7 +45,7 @@
     "js/lib/PlayerData.js", 
     "js/lib/VideoData.js",
 
-    "js/conf/Keybinds.js",
+    "js/modules/ActionHandler.js",
     
     "js/uw.js" ], 
     "all_frames": true
@@ -63,7 +63,7 @@
     "js/lib/ObjectCopy.js",
     "js/lib/Settings.js",
     
-    "js/conf/Keybinds.js",
+    "js/modules/ActionHandler.js",
     
     "js/uw-bg.js"
     ]