diff --git a/README.org b/README.org
index a1c4faa..a74cafd 100755
--- a/README.org
+++ b/README.org
@@ -103,6 +103,4 @@ nix develop .#shells.x86_64-linux.debugTexShell
 ** Things to work out
 
 *** Mail
-*** Steam
-*** Reaper
 *** Notebook tempaltes
diff --git a/azos-core b/azos-core
index 585df87..edc8d1f 160000
--- a/azos-core
+++ b/azos-core
@@ -1 +1 @@
-Subproject commit 585df87d537867b8193b70ffe4cb1b201291e22b
+Subproject commit edc8d1fa7ae227dea6543c97f6d7cceb2dd256ab
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index b7f1cc0..55ac945 100755
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -8,6 +8,5 @@
     ./qutebrowser-config.nix
     ./audio.nix
     ./reaper.nix
-    ./steam.nix
   ];
 }
diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix
index a687513..6a485c2 100755
--- a/modules/home-manager/git.nix
+++ b/modules/home-manager/git.nix
@@ -11,7 +11,7 @@ in {
 
     config = lib.mkIf isEnabled {
 
-      home.packages = with pkgs; [ pass-git-helper ];
+      home.packages = with pkgs; [ pass-git-helper unzip ];
 
       programs.git = {
         enable = true;
diff --git a/modules/home-manager/kubernetes.nix b/modules/home-manager/kubernetes.nix
index 5127f4c..9b7bdc5 100755
--- a/modules/home-manager/kubernetes.nix
+++ b/modules/home-manager/kubernetes.nix
@@ -12,7 +12,7 @@ in {
     config = lib.mkIf isEnabled {
       home.packages = with pkgs; [
         kubectl
-        # kubernetes-helm
+        kubernetes-helm
         velero
       ];
     };
diff --git a/modules/home-manager/mail.nix b/modules/home-manager/mail.nix
index 076d576..2cfba0a 100755
--- a/modules/home-manager/mail.nix
+++ b/modules/home-manager/mail.nix
@@ -3,6 +3,24 @@
 let
   isEnabled =
     config.azos.mail.enable;
+  default_account_params = {
+    realName = "Aner Zakobar";
+    notmuch.enable = true;
+  };
+  default_lieer_params = default_account_params // {
+    lieer.enable = true;
+    lieer.sync.enable = true;
+    flavor = "gmail.com";
+  };
+  default_smtp = {
+    tls = {
+      enable = true;
+      certificatesFile = "/etc/ssl/certs/ca-certificates.crt";
+    };
+  };
+  default_gmail_smtp = default_smtp // {
+    host = "smtp.gmail.com";
+  };
 in {
     options.azos.mail.enable = lib.mkOption {
       default = true;
@@ -11,6 +29,57 @@ in {
     };
 
     config = lib.mkIf isEnabled {
-      home.file."mail.txt".text = ''Mail enabled'';
+      programs= {
+        notmuch = {
+          enable = true;
+          hooks = {
+            preNew = "mbsync -a && gmi sync";
+          };
+        };
+        mbsync = {
+          enable = true;
+        };
+        msmtp = {
+          enable = true;
+        };
+        lieer = {
+          enable = true;
+        };
+      };
+      accounts.email.accounts = {
+        gmail = default_lieer_params // {
+          address = "anerisgreat@gmail.com";
+          userName = "anerisgreat";
+          smtp = default_gmail_smtp;
+          passwordCommand = "pass gmail.com/mbsync-anerz";
+        };
+        bgu = default_lieer_params // {
+          address = "anerz@post.bgu.ac.il";
+          userName = "anerz@post.bgu.ac.il";
+          smtp = default_gmail_smtp;
+          passwordCommand = "pass post.bgu.ac.il/mbsync-anerz";
+        };
+        zakobar = default_account_params // {
+          address = "aner@zakobar.com";
+          msmtp.enable = true;
+
+          primary = true;
+          userName = "aner@zakobar.com";
+          imap = {
+            host = "mail.privateemail.com";
+          };
+          mbsync = {
+              enable = true;
+              create = "maildir";
+          };
+
+          smtp = default_smtp // {
+            port = 587;
+            host = "mail.privateemail.com";
+          };
+          passwordCommand = "pass zakobar.com/mail/aner";
+        };
+
+      };
     };
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 55273f1..f079d50 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,4 +1,4 @@
 {
-  imports = [./audio.nix ./bluetooth.nix];
+  imports = [./audio.nix ./bluetooth.nix ./steam.nix];
 }
 
diff --git a/modules/home-manager/steam.nix b/modules/nixos/steam.nix
similarity index 81%
rename from modules/home-manager/steam.nix
rename to modules/nixos/steam.nix
index e973e1a..6fbebab 100755
--- a/modules/home-manager/steam.nix
+++ b/modules/nixos/steam.nix
@@ -10,8 +10,6 @@ in {
     };
 
     config = lib.mkIf isEnabled {
-      home.packages = with pkgs; [
-        steam
-      ];
+      programs.steam.enable = true;
     };
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 9ae4b37..1c0f553 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -6,7 +6,7 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
       ./hardware-configuration.nix
       inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
       inputs.musnix.nixosModules.musnix
@@ -24,6 +24,7 @@
       outputs.overlays.modifications
       outputs.overlays.unstable-packages
       inputs.azos-core.overlays.addpkgs
+      # outputs.overlays.addpkgs
     ];
     config = {
       allowUnfree = true;
@@ -35,7 +36,6 @@
   nix.nixPath = ["/etc/nix/path"];
 
   networking.hostName = "lauretta"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -59,9 +59,12 @@
   };
 
   # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us,il";
-    variant = "";
+  services.xserver = {
+    xkb = {
+        layout = "us,il";
+        variant = "";
+    };
+    xkb.options = "grp:alt_shift_toggle";
   };
 
   # Configure console keymap
@@ -71,7 +74,8 @@
   users.users.aner = {
     isNormalUser = true;
     description = "Aner Zakobar";
-    extraGroups = [ "networkmanager" "wheel" "audio"];
+    #Audio group for audio config, video group necessary for backlight.
+    extraGroups = [ "networkmanager" "wheel" "audio" "video"];
     packages = with pkgs; [];
   };
 
@@ -81,7 +85,7 @@
   };
 
   home-manager = {
-    extraSpecialArgs = {inherit inputs outputs; };
+    extraSpecialArgs = {inherit inputs outputs pkgs; };
     users = {
       aner = import ../home-manager/home.nix;
     };
@@ -99,6 +103,7 @@
   fonts.enableDefaultPackages = true;
 
   services.upower.enable = true;
+  programs.light.enable = true;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
diff --git a/overlays/default.nix b/overlays/default.nix
index a13ea3c..a217b48 100755
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -7,9 +7,11 @@
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays
   modifications = final: prev: {
-    # example = prev.example.overrideAttrs (oldAttrs: rec {
-    # ...
-    # });
+    helm = prev.helm.overrideAttrs (oldAttrs: rec {
+      patches = oldAttrs.patches or [] ++ [
+        ./helm.patch
+      ];
+    });
   };
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will
diff --git a/overlays/helm.patch b/overlays/helm.patch
new file mode 100644
index 0000000..3412d32
--- /dev/null
+++ b/overlays/helm.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 8b8db501..a79fe5b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -121,7 +121,7 @@ ifdef PAID
+ 	cp docs/thank_you.txt $(PATCHES)
+ endif
+ 
+-install: install_standalone install_vst install_lv2 thank_you
++install: install_vst install_lv2 thank_you
+ 
+ dist:
+ 	rm -rf $(PROGRAM)
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 0c0c426..7be00bd 100755
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,2 +1,11 @@
 { pkgs } @ args:
-{}
+let
+  inherit args;
+  emacs-pkg = pkgs.emacs;
+  epkgs = emacs-pkg.pkgs;
+  trivialBuild = epkgs.trivialBuild;
+  localEmacsPkg = (src: pkgs.callPackage src { orgTrivialBuild = pkgs.orgTrivialBuild; epkgs = epkgs; pkgs = pkgs; });
+in
+{
+  azos.emacs.exwm = localEmacsPkg ./azos-emacs-lauretta.nix;
+}