diff --git a/apps/hyprland/default.nix b/apps/hyprland/default.nix
index f993a37..834ce9e 100644
--- a/apps/hyprland/default.nix
+++ b/apps/hyprland/default.nix
@@ -1,4 +1,8 @@
-{pkgs, inputs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   imports = [
     ./hypr/binds.nix
     ./hypr/general.nix
diff --git a/apps/mako/default.nix b/apps/mako/default.nix
index f3ae16c..c3f0d43 100644
--- a/apps/mako/default.nix
+++ b/apps/mako/default.nix
@@ -1,34 +1,11 @@
-{pkgs, ...}: {
-  services.mako = {
-    enable = true;
+{
+  pkgs,
+  config,
+  ...
+}: {
+  home.packages = with pkgs; [
+    libnotify
+  ];
 
-    # Appearance
-    font = "Sans 11";
-    width = 350;
-    height = 150;
-    margin = "10";
-    padding = "15";
-    borderSize = 2;
-    borderRadius = 8;
-
-    # Behavior
-    defaultTimeout = 5000;
-    ignoreTimeout = false;
-    layer = "overlay";
-    anchor = "top-right";
-
-    # Interaction
-    markup = true;
-    actions = true;
-
-    # Grouping
-    groupBy = "app-name";
-    maxVisible = 5;
-    sort = "-time";
-
-    # Load matugen colors
-    extraConfig = ''
-      !include matugen
-    '';
-  };
+  services.mako.enable = true;
 }
diff --git a/apps/matugen/config.toml b/apps/matugen/config.toml
index 1f6ff30..8e31dbb 100644
--- a/apps/matugen/config.toml
+++ b/apps/matugen/config.toml
@@ -48,6 +48,6 @@ output_path = "~/.config/hypr/hyprlock-colors.conf"
 
 [templates.mako]
 input_path = "~/.config/matugen/templates/mako"
-output_path = "~/.config/mako/matugen"
+output_path = "~/.config/mako/config"
 post_hook = "makoctl reload"
 
diff --git a/apps/matugen/templates/mako b/apps/matugen/templates/mako
index 06ffbca..9b640ea 100644
--- a/apps/matugen/templates/mako
+++ b/apps/matugen/templates/mako
@@ -1,3 +1,31 @@
+# Mako notification daemon configuration
+# Generated by matugen
+
+# Appearance
+font=Sans 11
+width=350
+height=150
+margin=10
+padding=15
+border-size=2
+border-radius=8
+
+# Behavior
+default-timeout=5000
+ignore-timeout=false
+layer=overlay
+anchor=top-right
+
+# Interaction
+markup=true
+actions=true
+
+# Grouping
+group-by=app-name
+max-visible=5
+sort=-time
+
+# Theme colors from matugen
 background-color=#{{colors.surface_container_high.default.hex_stripped}}
 text-color=#{{colors.on_surface.default.hex_stripped}}
 border-color=#{{colors.primary.default.hex_stripped}}