diff --git a/flake.nix b/flake.nix
index 0ffa87d..5843aa6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,6 @@
     zellij-switch.url = "github:mostafaqanbaryan/zellij-switch";
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
     firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-    zjstatus.url = "github:dj95/zjstatus";
   };
 
   outputs =
@@ -29,7 +28,6 @@
       nix-homebrew,
       agenix,
       zellij-switch,
-      zjstatus,
       ...
     }@inputs:
     let
diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix
index 6d9fc73..0ba70db 100644
--- a/hosts/dnsc-air/default.nix
+++ b/hosts/dnsc-air/default.nix
@@ -29,9 +29,6 @@
   # in modules/default.nix
   nixpkgs.overlays = [
     inputs.zellij-switch.overlays.default
-    (final: prev: {
-      zjstatus = inputs.zjstatus.packages.${prev.system}.default;
-    })
   ];
 
   # System Packages
@@ -43,7 +40,6 @@
       devenv
       zellij
       zellij-switch
-      zjstatus
       rsync
     ]
   );
diff --git a/modules/zellij/default.nix b/modules/zellij/default.nix
index baa8984..e5ea8bd 100644
--- a/modules/zellij/default.nix
+++ b/modules/zellij/default.nix
@@ -4,63 +4,9 @@
     source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/zellij/config.kdl";
   };
 
-  xdg.configFile."zellij/layouts/default.kdl".text = ''
-  layout {
-    default_tab_template {
-        children
-        pane size=1 {
-            plugin location="https://github.com/dj95/zjstatus/releases/latest/download/zjstatus.wasm" {
-                color_fg "#ffffff"
-                color_fg_alt "#bf8a9f"
-                color_fg_dim "#807c9f"
-                color_bg "#0f0b15"
-                color_bg_secondary "#1d202f"
-                color_grey "#807c9f"
-                color_grey_bright "#807c9f"
-                color_red "#f47359"
-                color_red_bright "#ff6a7a"
-                color_red_subtle_bg "#67182f"
-                color_green "#29a444"
-                color_green_bright "#00a392"
-                color_green_subtle_bg "#10452f"
-                color_yellow "#b58a52"
-                color_yellow_bright "#df9080"
-                color_yellow_brighter "#FCC1B6"
-                color_yellow_subtle_bg "#54362a"
-                color_blue "#3f95f6"
-                color_blue_bright "#029fff"
-                color_blue_subtle_bg "#2a346e"
-                color_blue_subtle_dark_bg "#003045"
-                color_magenta "#d369af"
-                color_magenta_bright "#af85ea"
-                color_magenta_brighter "#c57faf"
-                color_magenta_subtle_bg "#572454"
-                color_magenta_subtle_bg_darker "#331531"
-                color_cyan "#4fbaef"
-                color_cyan_bright "#35afbf"
-                color_cyan_subtle_bg "#133d56"
-                color_silver "#b8c6d5"
-                color_silver_bright "#ffffff"
-
-                format_left "#[bg=$bg_secondary]{tabs}"
-                format_center ""
-                format_right "#[fg=$magenta_brighter,italic][{session}] "
-
-                tab_normal "#[fg=$fg_dim][{index}] {name}"
-                tab_normal_fullscreen "#[fg=$fg_dim][{index}] {name} [Z]"
-                tab_normal_sync "#[fg=$fg_dim][{index}] {name} [S]"
-
-                tab_active "#[fg=$magenta_brighter,bold][{index}] {name}"
-                tab_active_fullscreen "#[fg=$magenta_brighter,bold][{index}] {name} [Z]"
-                tab_active_sync "#[fg=$magenta_brighter,bold][{index}] {name} [S]"
-
-                tab_rename "#[fg=$cyan_bright]{name}"
-                tab_separator "#[fg=$fg_dim] | "
-            }
-        }
-    }
-  }
-  '';
+  xdg.configFile."zellij/layouts/default.kdl" = {
+    source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/zellij/layouts/default.kdl";
+  };
 
   programs.zellij = {
     enable = true;
diff --git a/modules/zellij/layouts/default.kdl b/modules/zellij/layouts/default.kdl
new file mode 100644
index 0000000..4c5bd38
--- /dev/null
+++ b/modules/zellij/layouts/default.kdl
@@ -0,0 +1,55 @@
+layout {
+    default_tab_template {
+        children
+        pane size=1 borderless=false {
+            plugin location="https://github.com/dj95/zjstatus/releases/latest/download/zjstatus.wasm" {
+                color_fg "#ffffff"
+                color_fg_alt "#bf8a9f"
+                color_fg_dim "#807c9f"
+                color_bg "#0f0b15"
+                color_bg_secondary "#1d202f"
+                color_grey "#807c9f"
+                color_grey_bright "#807c9f"
+                color_red "#f47359"
+                color_red_bright "#ff6a7a"
+                color_red_subtle_bg "#67182f"
+                color_green "#29a444"
+                color_green_bright "#00a392"
+                color_green_subtle_bg "#10452f"
+                color_yellow "#b58a52"
+                color_yellow_bright "#df9080"
+                color_yellow_brighter "#FCC1B6"
+                color_yellow_subtle_bg "#54362a"
+                color_blue "#3f95f6"
+                color_blue_bright "#029fff"
+                color_blue_subtle_bg "#2a346e"
+                color_blue_subtle_dark_bg "#003045"
+                color_magenta "#d369af"
+                color_magenta_bright "#af85ea"
+                color_magenta_brighter "#c57faf"
+                color_magenta_subtle_bg "#572454"
+                color_magenta_subtle_bg_darker "#331531"
+                color_cyan "#4fbaef"
+                color_cyan_bright "#35afbf"
+                color_cyan_subtle_bg "#133d56"
+                color_silver "#b8c6d5"
+                color_silver_bright "#ffffff"
+
+                format_left "#[bg=$bg_secondary]{tabs}"
+                format_center ""
+                format_right "#[fg=$magenta_brighter,italic][{session}] "
+
+                tab_normal "#[fg=$fg_dim][{index}] {name}"
+                tab_normal_fullscreen "#[fg=$fg_dim][{index}] {name} [Z]"
+                tab_normal_sync "#[fg=$fg_dim][{index}] {name} [S]"
+
+                tab_active "#[fg=$magenta_brighter,bold][{index}] {name}"
+                tab_active_fullscreen "#[fg=$magenta_brighter,bold][{index}] {name} [Z]"
+                tab_active_sync "#[fg=$magenta_brighter,bold][{index}] {name} [S]"
+
+                tab_rename "#[fg=$cyan_bright]{name}"
+                tab_separator "#[fg=$fg_dim] | "
+            }
+        }
+    }
+  }