diff --git a/modules/fastfetch.nix b/modules/fastfetch.nix
index 4b4ec8b..c35dd17 100644
--- a/modules/fastfetch.nix
+++ b/modules/fastfetch.nix
@@ -31,7 +31,7 @@ in
           cat /etc/omni/branding/about.txt
           echo
           echo "Theme: ${cfg.theme}"
-          echo "Preset: ${cfg.preset or "custom"}"
+          echo "Preset: ${if cfg.preset == null then "custom" else cfg.preset}"
           echo "User: ${cfg.user}"
           echo "NixOS Version: $(nixos-version)"
           echo
diff --git a/modules/lib.nix b/modules/lib.nix
index e3b9a45..bcb0364 100644
--- a/modules/lib.nix
+++ b/modules/lib.nix
@@ -148,7 +148,7 @@ in
     environment.variables = {
       OMNI_USER = cfg.user;
       OMNI_THEME = cfg.theme;
-      OMNI_PRESET = cfg.preset or "custom";
+      OMNI_PRESET = if cfg.preset == null then "custom" else cfg.preset;
       OMNI_CONFIG_DIR = helpers.paths.config;
       OMNI_CACHE_DIR = helpers.paths.cache;
     };
@@ -174,7 +174,7 @@ in
         echo "Configuration:"
         echo "  User: ${cfg.user}"
         echo "  Theme: ${cfg.theme}"
-        echo "  Preset: ${cfg.preset or "none"}"
+        echo "  Preset: ${if cfg.preset == null then "none" else cfg.preset}"
         echo ""
         echo "Colors (base16 scheme):"
         echo "  Background: ${helpers.colors.bg}"
diff --git a/modules/menus.nix b/modules/menus.nix
index 8f3b94c..4d2c0fd 100644
--- a/modules/menus.nix
+++ b/modules/menus.nix
@@ -44,7 +44,7 @@ in
           echo -e "''${WHITE}           🚀 Declarative • 🎨 Beautiful • ⚡ Fast''${NC}"
           echo
           echo -e "''${BLUE}═══════════════════════════════════════════════════════''${NC}"
-          echo -e "''${WHITE}  Theme: ''${YELLOW}${cfg.theme}''${WHITE}  │  User: ''${GREEN}${cfg.user}''${WHITE}  │  Preset: ''${PURPLE}${cfg.preset or "custom"}''${NC}"
+          echo -e "''${WHITE}  Theme: ''${YELLOW}${cfg.theme}''${WHITE}  │  User: ''${GREEN}${cfg.user}''${WHITE}  │  Preset: ''${PURPLE}${if cfg.preset == null then "custom" else cfg.preset}''${NC}"
           echo -e "''${BLUE}═══════════════════════════════════════════════════════''${NC}"
           echo
         }
diff --git a/modules/scripts.nix b/modules/scripts.nix
index d235439..39fdcdf 100644
--- a/modules/scripts.nix
+++ b/modules/scripts.nix
@@ -25,7 +25,7 @@ in
         echo "│  🐧 OS: NixOS $(nixos-version)"
         echo "│  🎨 Theme: ${cfg.theme}"
         echo "│  👤 User: ${cfg.user}"
-        echo "│  🏠 Preset: ${cfg.preset or "custom"}"
+        echo "│  🏠 Preset: ${if cfg.preset == null then "custom" else cfg.preset}"
         echo "│"
         echo "│  🔧 Uptime: $(uptime -p)"
         echo "│  💾 Memory: $(free -h | awk 'NR==2{printf "%.1f/%.1fGB (%.0f%%)", $3/1024/1024, $2/1024/1024, $3*100/$2}')"