diff --git a/hosts/reykjavik/hardware.nix b/hosts/reykjavik/hardware.nix
index b93f561..c942207 100644
--- a/hosts/reykjavik/hardware.nix
+++ b/hosts/reykjavik/hardware.nix
@@ -38,4 +38,9 @@
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # # Keyboard light
+  # services.udev.extraRules = ''
+  #   SUBSYSTEM=="usb", ATTR{idVendor}=="048d", ATTR{idProduct}=="c101", MODE="0666"
+  # '';
 }
diff --git a/modules/app/firefox.nix b/modules/app/firefox.nix
index 2ce63f9..4620b5e 100644
--- a/modules/app/firefox.nix
+++ b/modules/app/firefox.nix
@@ -14,7 +14,7 @@ in
     ];
 
     samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
-      "${i3Cfg.mod}+Control+3" =  "exec ${pkgs.firefox}/bin/firefox";
+      "${i3Cfg.mod}+Shift+i" =  "exec ${pkgs.firefox}/bin/firefox";
     };
   };
 }
diff --git a/modules/app/spotify.nix b/modules/app/spotify.nix
index 6f72c23..13c78af 100644
--- a/modules/app/spotify.nix
+++ b/modules/app/spotify.nix
@@ -14,7 +14,7 @@ in
     ];
 
     samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
-      "${i3Cfg.mod}+Control+0" =  "exec ${pkgs.spotify}/bin/spotify";
+      "${i3Cfg.mod}+Shift+m" =  "exec ${pkgs.spotify}/bin/spotify";
     };
   };
 }
diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index cc83e22..10bf5fd 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -3,6 +3,9 @@
 with lib;
 let
   cfg = config.samfelag.modules.editors.emacs;
+  i3Cfg = config.samfelag.modules.desktop.i3;
+  emacsWithPackages = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages
+    (epkgs: [epkgs.vterm]));
 in {
   options.samfelag.modules.editors.emacs = {
     enable = mkEnableOption "emacs";
@@ -33,8 +36,8 @@ in {
     environment.systemPackages = with pkgs; [
       ## Emacs itself
       binutils
-      ((emacsPackagesFor emacsNativeComp).emacsWithPackages
-        (epkgs: [ epkgs.vterm ]))
+      emacsWithPackages
+
       # emacsPgtkGcc
 
       ## Doom dependencies
@@ -107,5 +110,9 @@ in {
       '';
     };
 
+    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+      "${i3Cfg.mod}+Shift+e" =  "exec ${emacsWithPackages}/bin/emacs";
+    };
+
   };
 }
diff --git a/modules/options.nix b/modules/options.nix
index f68374a..6dbd6d9 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -24,7 +24,7 @@ with lib.my;
   config = {
     user = {
       description = "The primary user account";
-      extraGroups = [ "wheel" ];
+      extraGroups = [ "wheel" "networkmanager" ];
       isNormalUser = true;
       home = "/home/${config.user.name}";
       group = "users";