diff --git a/apps/fastfetch/default.nix b/apps/fastfetch/default.nix
index d83a884..555326a 100644
--- a/apps/fastfetch/default.nix
+++ b/apps/fastfetch/default.nix
@@ -10,69 +10,98 @@
         };
       };
       display = {
-        separator = "  ";
+        separator = " : ";
       };
       modules = [
-        "break"
-        "break"
-        "title"
+        {
+          type = "command";
+          key = "  ";
+          keyColor = "blue";
+          text = "splash=$(hakase-hyprlock-text-generator);echo $splash";
+        }
+        {
+          type = "custom";
+          format = "╭──────────────────────────────────────────╮";
+        }
         {
           type = "os";
-          key = "os    ";
-          keyColor = "33";
+          key = "  󰣇 OS";
+          format = "{2}";
+          keyColor = "red";
         }
         {
           type = "kernel";
-          key = "kernel";
-          keyColor = "33";
-        }
-
-        {
-          type = "host";
-          format = "{2} {1}";
-          key = "host  ";
-          keyColor = "33";
+          key = "  󰌽 Kernel";
+          format = "{2}";
+          keyColor = "red";
         }
         {
           type = "packages";
-          format = "{} (nix)";
-          key = "pkgs  ";
-          keyColor = "33";
+          key = "  󰏗 Pkgs";
+          keyColor = "green";
+        }
+        {
+          type = "terminal";
+          key = "  󰆍 Terminal";
+          keyColor = "yellow";
+        }
+        {
+          type = "wm";
+          key = "  󱗃 WM";
+          format = "{2}";
+          keyColor = "yellow";
+        }
+        {
+          type = "custom";
+          format = "╰──────────────────────────────────────────╯";
+        }
+        "break"
+        {
+          type = "title";
+          key = "  ";
+          format = "{6} {7} {8}";
+        }
+        {
+          type = "custom";
+          format = "╭──────────────────────────────────────────╮";
         }
         {
           type = "cpu";
-          format = "   {1}";
-          key = "cpu";
-          keyColor = "33";
+          format = "{1} @ {7}";
+          key = "  󰻠 CPU";
+          keyColor = "blue";
         }
         {
           type = "gpu";
-          format = "   {2}";
-          key = "gpu";
+          format = "{1} {2}";
+          key = "  󰊴 GPU";
+          keyColor = "blue";
           hideType = "integrated";
-          keyColor = "33";
         }
         {
           type = "memory";
-          key = "memory";
-          keyColor = "33";
+          key = "  󰍛 Memory";
+          keyColor = "magenta";
         }
         {
           type = "disk";
-          key = "disk";
-          keyColor = "33";
-          folders = ["/"]; # Restricts output to only the root partition
-          format = "  {1} / {2} ({3})"; # Output: Used / Total (Percentage)
+          key = "  󰃭 OS Age";
+          folders = "/";
+          keyColor = "red";
+          format = "{days} days";
+        }
+        {
+          type = "uptime";
+          key = "  󰅐 Uptime";
+          keyColor = "red";
+        }
+        {
+          type = "custom";
+          format = "╰──────────────────────────────────────────╯";
         }
-        # {
-        #   type = "uptime";
-        #   key = "uptime";
-        #   keyColor = "33";
-        # }
-        "break"
         {
           type = "colors";
-          paddingLeft = "2";
+          paddingLeft = 2;
           symbol = "circle";
         }
         "break"