diff --git a/flake.nix b/flake.nix
index 846b2ed..c19742a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,6 +68,7 @@
           bright-white =    "ffffff"; # #ffffff
           yellow =          "ff4000"; # #ff4000
           bright-yellow =   "ff8454"; # #ff8454
+          border = red;
         };
         font = {
           code = {
diff --git a/home-modules/email.nix b/home-modules/email.nix
new file mode 100644
index 0000000..9318cc2
--- /dev/null
+++ b/home-modules/email.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, lib, system, user, allowed, secrets, ... }: 
+
+{
+  home.packages = with pkgs; [
+    thunderbird
+  ];
+
+  
+  
+
+
+  # home.file.".config/meli.config" = {
+
+  # };
+}
+
+
+
diff --git a/home-modules/git.nix b/home-modules/git.nix
index bbb5d63..491e9d5 100644
--- a/home-modules/git.nix
+++ b/home-modules/git.nix
@@ -6,27 +6,27 @@
     delta
 
     # only works on spec arch, chage url for others
-    (stdenv.mkDerivation {
-      name = "easycommit";
-      src = pkgs.fetchurl {
-        url = "https://github.com/blackironj/easycommit/releases/download/v0.0.1/easycommit-v0.0.1-linux-amd64.tar.gz";
-        sha256 = "sha256-Ip5wfVe/RzCxGGh1YFBllAn84nD7mUXbnMko+ue/C2E=";
-      };
-      phases = ["installPhase"];
-      installPhase = ''
-        mkdir -p $out/bin
-        tar xf $src -C $out/
-        ls -la $out
-        mv $out/easycommit $out/bin/
-        chmod +x $out/bin/easycommit
-      '';
-    })
+    # (stdenv.mkDerivation {
+    #   name = "easycommit";
+    #   src = pkgs.fetchurl {
+    #     url = "https://github.com/blackironj/easycommit/releases/download/v0.0.1/easycommit-v0.0.1-linux-amd64.tar.gz";
+    #     sha256 = "sha256-Ip5wfVe/RzCxGGh1YFBllAn84nD7mUXbnMko+ue/C2E=";
+    #   };
+    #   phases = ["installPhase"];
+    #   installPhase = ''
+    #     mkdir -p $out/bin
+    #     tar xf $src -C $out/
+    #     ls -la $out
+    #     mv $out/easycommit $out/bin/
+    #     chmod +x $out/bin/easycommit
+    #   '';
+    # })
   ];
 
   programs.git = {
     enable = true;
     userName = ''Lennart J. Kurzweg (Nx2)'';
-    userEmail = "nx2@nx2.site";
+    userEmail = "git@nx2.site";
     delta = {
       enable = true;
       options = {
diff --git a/home-modules/mako.nix b/home-modules/mako.nix
index 458a53f..e5d5f3f 100644
--- a/home-modules/mako.nix
+++ b/home-modules/mako.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, rice, ... }:
 
 {
   home.packages = [
@@ -7,6 +7,10 @@
   ];
   services.mako = {
     enable = true;
-    defaultTimeout = 60000;
+    defaultTimeout = 5;
+    backgroundColor = "#${rice.color.background}";
+    textColor = "#${rice.color.foreground}";
+    borderColor = "#${rice.color.border}";
+    font = "#${rice.font.code.name}";
   };
 }
\ No newline at end of file
diff --git a/home.nix b/home.nix
index 7af955a..da2eb5c 100644
--- a/home.nix
+++ b/home.nix
@@ -4,7 +4,9 @@
     ./home-modules/vscode.nix
     ./home-modules/discord.nix
     ./home-modules/chatterino.nix
-    ./home-modules/meli/meli.nix
+    # ./home-modules/meli/meli.nix
+    ./home-modules/email.nix
+
     # ./home-modules/mutt/neomutt.nix
     ./home-modules/gestures.nix
     
@@ -83,21 +85,26 @@
     stateHome = /home/${user}/.local/state;
     mimeApps = {
       enable =  true;
-      defaultApplications = {
-        "default-web-browser" = [ "firefox.desktop" ];
-        "text/html" = [ "firefox.desktop" ];
-        "text/htm" = [ "firefox.desktop" ];
-        "x-scheme-handler/http" = [ "firefox.desktop" ];
-        "x-scheme-handler/https" = [ "firefox.desktop" ];
-        "x-scheme-handler/about" = [ "firefox.desktop" ];
-        "x-scheme-handler/unknown" = [ "firefox.desktop" ];
-        "image/png" = "imv.desktop";
-        "image/jpg" = "imv.desktop";
-        "image/jpeg" = "imv.desktop";
-        "image/webp" = "imv.desktop";
-        "image/gif" = "imv.desktop";
-        "application/pdf" = "zathura.desktop";
-      };
+      defaultApplications = 
+        let
+          browser = "firefox.desktop";
+        in
+        {
+          "default-web-browser" = [ browser ];
+          "text/html" = [ browser ];
+          "text/htm" = [ browser ];
+          "x-scheme-handler/http" = [ browser ];
+          "x-scheme-handler/https" = [ browser ];
+          "x-scheme-handler/about" = [ browser ];
+          "x-scheme-handler/unknown" = [ browser ];
+          "x-scheme-handler/mailto" = "thunderbird.desktop";
+          "image/png" = "imv.desktop";
+          "image/jpg" = "imv.desktop";
+          "image/jpeg" = "imv.desktop";
+          "image/webp" = "imv.desktop";
+          "image/gif" = "imv.desktop";
+          "application/pdf" = "zathura.desktop";
+        };
     };
   };
   # Wayland, X, etc. support for session vars