diff --git a/flake.lock b/flake.lock
index 9b990c7..10104d2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,22 @@
         "type": "github"
       }
     },
+    "advisory-db_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1683272394,
+        "narHash": "sha256-4XQZbSZ8XYAeASpr0Er8mNPnjbYLJwvaB+VyH+bt6DE=",
+        "owner": "rustsec",
+        "repo": "advisory-db",
+        "rev": "50bed3ba4066e6255dab434dc845e7f655812ce1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rustsec",
+        "repo": "advisory-db",
+        "type": "github"
+      }
+    },
     "agenix": {
       "inputs": {
         "darwin": "darwin",
@@ -79,6 +95,30 @@
         "type": "github"
       }
     },
+    "crane_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "maildir-notify-daemon",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1683505101,
+        "narHash": "sha256-VBU64Jfu2V4sUR5+tuQS9erBRAe/QEYUxdVMcJGMZZs=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "7b5bd9e5acb2bb0cfba2d65f34d8568a894cdb6c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -203,6 +243,22 @@
       }
     },
     "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
       "locked": {
         "lastModified": 1696426674,
         "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -216,7 +272,7 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1650374568,
@@ -232,7 +288,7 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_5": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -268,7 +324,7 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils_4"
+        "flake-utils": "flake-utils_6"
       },
       "locked": {
         "lastModified": 1696331477,
@@ -319,14 +375,14 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -337,7 +393,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -355,7 +411,43 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_9"
+        "systems": "systems_8"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_7": {
+      "inputs": {
+        "systems": "systems_10"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_8": {
+      "inputs": {
+        "systems": "systems_11"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -544,6 +636,61 @@
         "type": "github"
       }
     },
+    "lipsum": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1630421397,
+        "narHash": "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=",
+        "owner": "hannenz",
+        "repo": "lipsum",
+        "rev": "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hannenz",
+        "repo": "lipsum",
+        "type": "github"
+      }
+    },
+    "maildir-notify-daemon": {
+      "inputs": {
+        "advisory-db": "advisory-db_2",
+        "crane": "crane_2",
+        "flake-utils": "flake-utils_5",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1683946606,
+        "narHash": "sha256-nzI8XDjf7Q0NZdVuxEvkkU4x0w229DmJZAN2yB92oMc=",
+        "owner": "lelgenio",
+        "repo": "maildir-notify-daemon",
+        "rev": "f609cbd6dd6accce8f24594bc2e13822023e3d79",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lelgenio",
+        "repo": "maildir-notify-daemon",
+        "type": "github"
+      }
+    },
+    "material-wifi-icons": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1703850449,
+        "narHash": "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=",
+        "owner": "dcousens",
+        "repo": "material-wifi-icons",
+        "rev": "2daf6b3d96d65beb2a3e37a9a53556aab3826d97",
+        "type": "github"
+      },
+      "original": {
+        "owner": "dcousens",
+        "repo": "material-wifi-icons",
+        "type": "github"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -612,7 +759,7 @@
     },
     "nixos-conf-editor": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": "nixpkgs_3",
         "snowfall-lib": "snowfall-lib"
       },
@@ -633,7 +780,7 @@
     "nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_5",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -772,6 +919,9 @@
         "dzgui-nix": "dzgui-nix",
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
+        "lipsum": "lipsum",
+        "maildir-notify-daemon": "maildir-notify-daemon",
+        "material-wifi-icons": "material-wifi-icons",
         "nix-index-database": "nix-index-database",
         "nix-software-center": "nix-software-center",
         "nixos-conf-editor": "nixos-conf-editor",
@@ -827,9 +977,36 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "flake-utils": [
+          "maildir-notify-daemon",
+          "crane",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "maildir-notify-daemon",
+          "crane",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1683080331,
+        "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "snowfall-lib": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "flake-utils-plus": "flake-utils-plus",
         "nixpkgs": [
           "nixos-conf-editor",
@@ -865,6 +1042,36 @@
         "type": "github"
       }
     },
+    "systems_10": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_11": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -987,7 +1194,7 @@
     },
     "tlauncher": {
       "inputs": {
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_7",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1008,7 +1215,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -1026,7 +1233,7 @@
     },
     "utils_2": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1709126324,
@@ -1044,7 +1251,7 @@
     },
     "wl-crosshair": {
       "inputs": {
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_8",
         "nixpkgs": [
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index fd2fc09..44746ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,9 +18,15 @@
     ranger-icons.url = "github:alexanderjeurissen/ranger_devicons";
     ranger-icons.flake = false;
 
+    material-wifi-icons.url = "github:dcousens/material-wifi-icons";
+    material-wifi-icons.flake = false;
+
     plymouth-themes.url = "github:adi1090x/plymouth-themes";
     plymouth-themes.flake = false;
 
+    lipsum.url = "github:hannenz/lipsum";
+    lipsum.flake = false;
+
     agenix = {
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -49,6 +55,10 @@
       url = "github:lelgenio/demoji";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    maildir-notify-daemon = {
+      url = "github:lelgenio/maildir-notify-daemon";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     wl-crosshair = {
       url = "github:lelgenio/wl-crosshair";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/monolith.nix b/hosts/monolith.nix
index 5f1bc66..2e33fd8 100644
--- a/hosts/monolith.nix
+++ b/hosts/monolith.nix
@@ -40,7 +40,6 @@ in
     "zenpower"
   ];
   boot.kernelParams = [
-    "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
     "video=DP-1:1920x1080@144"
     # hibernation
     "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/
@@ -64,16 +63,6 @@ in
     rocmPackages.rocm-smi
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_6_1;
-
-  programs.corectrl = {
-    enable = true;
-    gpuOverclock = {
-      enable = true;
-      ppfeaturemask = "0xffffffff";
-    };
-  };
-
   fileSystems."/" = {
     device = "/dev/disk/by-label/BTRFS_ROOT";
     fsType = "btrfs";
diff --git a/overlays/default.nix b/overlays/default.nix
index 3de7b1a..8d4046b 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -15,6 +15,13 @@ rec {
 
   themes = (
     final: prev: {
+      material-wifi-icons = final.stdenv.mkDerivation rec {
+        name = "material-wifi-icons";
+        src = inputs.material-wifi-icons;
+        installPhase = ''
+          install -D material-wifi.ttf $out/share/fonts/${name}
+        '';
+      };
       papirus_red = (final.papirus-icon-theme.override { color = "red"; });
       orchis_theme_compact = (
         final.orchis-theme.override {
@@ -43,17 +50,32 @@ rec {
       dhist = inputs.dhist.packages.${prev.system}.dhist;
       demoji = inputs.demoji.packages.${prev.system}.default;
       tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
+      maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
       wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
     }
   );
 
   patches = (
     final: prev: {
+      bemenu = prev.bemenu.overrideAttrs (o: {
+        postPatch = ''
+          substituteInPlace lib/renderers/wayland/window.c \
+            --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY
+        '';
+      });
       mySway = prev.sway.override {
         sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
           patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
         });
       };
+      mangohud = prev.mangohud.overrideAttrs (o: {
+        patches = o.patches ++ [
+          (prev.fetchpatch {
+            url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
+            hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
+          })
+        ];
+      });
     }
   );
 
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4bfc896..00600fc 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -5,7 +5,6 @@
 {
   blade-formatter = pkgs.callPackage ./blade-formatter { };
   cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
-  lipsum = pkgs.callPackage ./lipsum.nix { };
+  lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; };
   emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
-  material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
 }
diff --git a/pkgs/lipsum.nix b/pkgs/lipsum.nix
index de1b75a..427f04e 100644
--- a/pkgs/lipsum.nix
+++ b/pkgs/lipsum.nix
@@ -1,22 +1,11 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  vala,
-  wrapGAppsHook,
-}:
-stdenv.mkDerivation rec {
+{ pkgs, inputs }:
+pkgs.stdenv.mkDerivation rec {
   pname = "lipsum";
   version = "0.0.1";
 
-  src = fetchFromGitHub {
-    owner = "hannenz";
-    repo = "lipsum";
-    rev = "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed";
-    hash = "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=";
-  };
+  src = inputs.lipsum;
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with pkgs; [
     pkg-config
     vala
     wrapGAppsHook
diff --git a/pkgs/material-wifi-icons.nix b/pkgs/material-wifi-icons.nix
deleted file mode 100644
index c8b0dcc..0000000
--- a/pkgs/material-wifi-icons.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
-  pname = "material-wifi-icons";
-  version = "0.0.1";
-
-  src = fetchFromGitHub {
-    owner = "dcousens";
-    repo = "material-wifi-icons";
-    rev = "2daf6b3d96d65beb2a3e37a9a53556aab3826d97";
-    hash = "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=";
-  };
-
-  installPhase = ''
-    install -D material-wifi.ttf $out/share/fonts/${pname}
-  '';
-}
diff --git a/user/desktop-entries.nix b/user/desktop-entries.nix
index c513d45..1b809d3 100644
--- a/user/desktop-entries.nix
+++ b/user/desktop-entries.nix
@@ -41,6 +41,24 @@
         TryExec = "kak";
       };
     };
+    neomutt = {
+      name = "Neomutt";
+      genericName = "Email Client";
+      comment = "View and Send Emails";
+      exec = "neomutt %U";
+      terminal = true;
+      type = "Application";
+      icon = "mutt";
+      categories = [
+        "Network"
+        "Email"
+      ];
+      startupNotify = false;
+      mimeType = [ "x-scheme-handler/mailto" ];
+      settings = {
+        Keywords = "Mail;E-mail;";
+      };
+    };
     down_meme = {
       name = "DownMeme";
       genericName = "Download memes";
diff --git a/user/pqiv.nix b/user/pqiv.nix
index 755d417..70cf9de 100644
--- a/user/pqiv.nix
+++ b/user/pqiv.nix
@@ -32,6 +32,7 @@ let
   );
 in
 {
+  # My bemenu wrapper
   xdg.configFile = {
     "pqivrc".text = ''
       [options]
diff --git a/user/sway/default.nix b/user/sway/default.nix
index 0ad5a6b..d98b0d7 100644
--- a/user/sway/default.nix
+++ b/user/sway/default.nix
@@ -104,7 +104,6 @@ in
         exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
         exec swaymsg workspace 2
         exec_always systemctl --user restart waybar.service
-        exec corectrl --minimize-systray
       '';
     };
     services.gammastep = {