diff --git a/homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix b/homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix
index 70d27d9..bfa86a7 100644
--- a/homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix
+++ b/homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix
@@ -2,14 +2,6 @@
   lib,
   pkgs,
   inputs,
-
-  namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
-  home, # The home architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
   config,
   ...
 }: {
@@ -20,15 +12,11 @@
     appindicator
     unite
     color-picker
+    clipboard-history
   ];
 
   # Use `dconf watch /` to track stateful changes you are doing, then set them here.
   dconf.settings = {
-    "org/gnome/desktop/background" = {
-      picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/maid_in_forest_with_lantern.jpg";
-      picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/maid_in_forest_with_lantern.jpg";
-    };
-
     "org/gnome/shell" = {
       favorite-apps = [
         "org.gnome.Nautilus.desktop"
@@ -44,6 +32,7 @@
         "appindicatorsupport@rgcjonas.gmail.com"
         "unite@hardpixel.eu"
         "color-picker@tuberry"
+        "clipboard-history@alexsaveau.dev"
       ];
     };
 
diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix
index 3b43334..a02c72e 100644
--- a/homes/x86_64-linux/jo@puzzlevision/default.nix
+++ b/homes/x86_64-linux/jo@puzzlevision/default.nix
@@ -69,7 +69,7 @@ in
 
     ### Rust development specific
     rustup
-    jetbrains.rust-rover
+    gcc
 
     ### Work
     teams-for-linux
@@ -82,7 +82,7 @@ in
     sidequest
   ];
 
-  #lib.puzzlevision.apps.zed-editor.enable = true;
+  #puzzlevision.apps.zed-editor.enable = true;
 
   home.stateVersion = "24.05";
 }
diff --git a/modules/home/apps/development/zed-editor.nix b/modules/home/apps/development/zed-editor.nix
index c9669b6..adca1ad 100644
--- a/modules/home/apps/development/zed-editor.nix
+++ b/modules/home/apps/development/zed-editor.nix
@@ -2,32 +2,25 @@
   lib,
   pkgs,
   inputs,
-
-  namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
-  home, # The home architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
+  namespace,
   config,
   ...
 }: with lib; with lib.${namespace};
 let
-    cfg = config.${namespace}.apps.zed-editor;
+  cfg = config.${namespace}.apps.zed-editor;
 
-    zed-fhs = pkgs.buildFHSUserEnv {
-        name = "zed";
-        targetPkgs = pkgs:
-        with pkgs; [
-            zed-editor
-        ];
-        runScript = "zed";
-    };
+  zed-fhs = pkgs.buildFHSUserEnv {
+    name = "zed";
+    targetPkgs = pkgs:
+    with pkgs; [
+      zed-editor
+    ];
+    runScript = "zed";
+  };
 in {
-    options.${namespace}.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
+  options.${namespace}.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
 
-    config = mkIf cfg.enable {
-        home.packages = [zed-fhs];
-    };
+  config = mkIf cfg.enable {
+    home.packages = [zed-fhs];
+  };
 }
diff --git a/modules/home/development/ssh/default.nix b/modules/home/development/ssh/default.nix
index a3e60d1..fbc7642 100644
--- a/modules/home/development/ssh/default.nix
+++ b/modules/home/development/ssh/default.nix
@@ -2,14 +2,7 @@
   lib,
   pkgs,
   inputs,
-
-  namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
-  system, # The home architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
+  namespace,
   config,
   ...
 }: let
@@ -45,4 +38,4 @@ in {
       };
      };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/home/themes/catppuccin/fish/default.nix b/modules/home/themes/catppuccin/fish/default.nix
index 9ac9a59..999e755 100644
--- a/modules/home/themes/catppuccin/fish/default.nix
+++ b/modules/home/themes/catppuccin/fish/default.nix
@@ -2,5 +2,5 @@
   lib,
   ...
 }: {
-  home.file.".config/fish/themes/Catppuccin\ Frappe.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Frappe.theme";
+  home.file.".config/fish/themes/Catppuccin\ Macchiato.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Macchiato.theme";
 }
diff --git a/modules/home/themes/catppuccin/global/default.nix b/modules/home/themes/catppuccin/global/default.nix
index 1dca3da..1fd74c4 100644
--- a/modules/home/themes/catppuccin/global/default.nix
+++ b/modules/home/themes/catppuccin/global/default.nix
@@ -22,4 +22,4 @@
     pointerCursor.accent = "blue";
     pointerCursor.flavor = "macchiato";
   };
-}
\ No newline at end of file
+}
diff --git a/modules/home/themes/catppuccin/gnome/default.nix b/modules/home/themes/catppuccin/gnome/default.nix
index ec115c7..84d91b9 100644
--- a/modules/home/themes/catppuccin/gnome/default.nix
+++ b/modules/home/themes/catppuccin/gnome/default.nix
@@ -31,29 +31,24 @@
     };
 
     theme = {
-      #name = "Colloid-Dark-Catppuccin";
-      #package = pkgs.colloid-gtk-theme.override {
-        #themeVariants = ["default"];
-        #colorVariants = ["dark"];
-        #sizeVariants = ["standard"];
-        #tweaks = ["catppuccin"];
-      #};
-
-      name = "Graphite-teal-Dark-nord";
-      package = pkgs.graphite-gtk-theme.override {
-          themeVariants = ["blue" "teal"];
-          colorVariants = ["dark"];
-          sizeVariants = ["standard"];
-          tweaks = ["nord"];
-          withGrub = true;
-          grubScreens = ["1080p"];
+      name = "Colloid-Dark-Catppuccin";
+      package = pkgs.colloid-gtk-theme.override {
+        themeVariants = ["default"];
+        colorVariants = ["dark"];
+        sizeVariants = ["standard"];
+        tweaks = ["catppuccin"];
       };
     };
   };
 
   dconf.settings = {
     "org/gnome/shell/extensions/user-theme" = {
-      name = "Graphite-teal-Dark-nord";
+      name = "Colloid-Dark-Catppuccin";
+    };
+
+    "org/gnome/desktop/background" = {
+      picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
+      picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
     };
 
     "org/gnome/desktop/interface" = {
diff --git a/modules/nixos/archetypes/workstation/default.nix b/modules/nixos/archetypes/workstation/default.nix
index 6f1d872..de87e55 100644
--- a/modules/nixos/archetypes/workstation/default.nix
+++ b/modules/nixos/archetypes/workstation/default.nix
@@ -19,7 +19,10 @@ in {
     # Enable modules
     puzzlevision = {
       common = {
-        nix.enable = true; # Standard Nix configuration
+        nix = {
+          enable = true; # Standard Nix configuration
+          use-lix = true;
+        };
         grub.enable = true; # Bootloader grub
         networking.enable = true; # Networkmanager configuration
         kernel.enable = true; # Kernel modifications
diff --git a/modules/nixos/common/bluetooth/default.nix b/modules/nixos/common/bluetooth/default.nix
index 2939940..38cdbff 100644
--- a/modules/nixos/common/bluetooth/default.nix
+++ b/modules/nixos/common/bluetooth/default.nix
@@ -11,7 +11,7 @@ in {
   options.${namespace}.common.bluetooth = { enable = mkEnableOption "Enable bluetooth support on your current system"; };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ bluez ];
+    environment.systemPackages = with pkgs; [ bluez blueman ];
 
     hardware.bluetooth = {
       enable = true;
@@ -24,6 +24,7 @@ in {
           FastConnectable = "true";
           Experimental = "true";
           KernelExperimental = "true";
+          Disable= "Handsfree";
         };
       };
     };
diff --git a/modules/nixos/common/fonts/default.nix b/modules/nixos/common/fonts/default.nix
index 23e2746..99e272e 100644
--- a/modules/nixos/common/fonts/default.nix
+++ b/modules/nixos/common/fonts/default.nix
@@ -7,16 +7,16 @@
   ...
 }: with lib; with lib.${namespace};
 let
-  cfg = config.${namespace}.system.fonts;
+  cfg = config.${namespace}.common.fonts;
 in {
-  options.${namespace}.system.fonts = {
+  options.${namespace}.common.fonts = {
     enable = mkEnableOption "Enable system font management";
-    fonts = mkOption {
-      type = types.package;
-      default = [ ];
-      example = [ noto-fonts noto-fonts-emoji ];
-      description = "Install additional font packages";
-    }
+    #fonts = mkOption {
+    #  type = types.package;
+    #  default = noto-fonts;
+    #  example = [ noto-fonts noto-fonts-emoji ];
+    #  description = "Install additional font packages";
+    #};
   };
 
   config = mkIf cfg.enable {
@@ -31,7 +31,7 @@ in {
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       noto-fonts-emoji
-      (nerdfonts.override { fonts = [ "Hack" ]; })
-    ] ++ cfg.fonts;
+      nerdfonts
+    ]; # ++ cfg.fonts;
   };
 }
diff --git a/modules/nixos/common/locale/default.nix b/modules/nixos/common/locale/default.nix
index 7f1b7d2..55e3a13 100644
--- a/modules/nixos/common/locale/default.nix
+++ b/modules/nixos/common/locale/default.nix
@@ -49,9 +49,9 @@ in {
     };
 
     # Set console keymap.
-    console.keyMap = ${cfg.keymap};
+    console.keyMap = cfg.keymap;
     services.xserver = {
-      xkb.layout = ${cfg.keymap};
+      xkb.layout = cfg.keymap;
     };
   };
 }
diff --git a/modules/nixos/common/nix/default.nix b/modules/nixos/common/nix/default.nix
index 9b7eaee..b35f5a1 100644
--- a/modules/nixos/common/nix/default.nix
+++ b/modules/nixos/common/nix/default.nix
@@ -2,21 +2,17 @@
   lib,
   pkgs,
   inputs,
-
-  namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
-  system, # The system architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
-  format, # A normalized name for the system target (eg. `iso`).
-  virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
-  systems, # An attribute map of your defined hosts.
-
+  namespace,
   config,
   ...
 }: with lib; with lib.${namespace};
 let
   cfg = config.${namespace}.common.nix;
 in {
-  options.${namespace}.common.nix = { enable = mkEnableOption "nix"; };
+  options.${namespace}.common.nix = {
+    enable = mkEnableOption "Overwrite the default Nix configuration.";
+    use-lix = mkEnableOption "Enable Lix as an alternative to CppNix.";
+  };
 
   config = mkIf cfg.enable {
     nix = {
@@ -35,6 +31,8 @@ in {
         dates = "daily";
         options = "--delete-older-than 3d";
       };
+
+      package = mkIf cfg.use-lix pkgs.lix; # Enable LIX
     };
   };
 }
diff --git a/modules/nixos/common/shell/default.nix b/modules/nixos/common/shell/default.nix
index e4533a0..183718e 100644
--- a/modules/nixos/common/shell/default.nix
+++ b/modules/nixos/common/shell/default.nix
@@ -18,17 +18,11 @@ let
 in {
   options.${namespace}.common.shell = {
     enable = mkEnableOption "Modify the standard shell options";
-    package = mkOption {
-      type = types.str;
-      default = "fish";
-      example = "fish";
-      description = "Select an appropriate shell environment (bash, fish, zsh...)";
-    };
   };
 
   config = mkIf cfg.enable {
-    environment.shells = with pkgs; [ ${cfg.package} ];
-    users.defaultUserShell = pkgs.${cfg.package};
-    programs.${cfg.package}.enable = true;
+    environment.shells = with pkgs; [ fish ];
+    users.defaultUserShell = pkgs.fish;
+    programs.fish.enable = true;
   };
 }
diff --git a/resources/apps/fish/Catppuccin Frappe.theme b/resources/apps/fish/Catppuccin Frappe.theme
deleted file mode 100644
index b4c1994..0000000
--- a/resources/apps/fish/Catppuccin Frappe.theme	
+++ /dev/null
@@ -1,30 +0,0 @@
-# name: 'Catppuccin Frappé'
-# url: 'https://github.com/catppuccin/fish'
-# preferred_background: 303446
-
-fish_color_normal c6d0f5
-fish_color_command 8caaee
-fish_color_param eebebe
-fish_color_keyword e78284
-fish_color_quote a6d189
-fish_color_redirection f4b8e4
-fish_color_end ef9f76
-fish_color_comment 838ba7
-fish_color_error e78284
-fish_color_gray 737994
-fish_color_selection --background=414559
-fish_color_search_match --background=414559
-fish_color_option a6d189
-fish_color_operator f4b8e4
-fish_color_escape ea999c
-fish_color_autosuggestion 737994
-fish_color_cancel e78284
-fish_color_cwd e5c890
-fish_color_user 81c8be
-fish_color_host 8caaee
-fish_color_host_remote a6d189
-fish_color_status e78284
-fish_pager_color_progress 737994
-fish_pager_color_prefix f4b8e4
-fish_pager_color_completion c6d0f5
-fish_pager_color_description 737994
\ No newline at end of file
diff --git a/resources/apps/fish/Catppuccin Macchiato.theme b/resources/apps/fish/Catppuccin Macchiato.theme
new file mode 100644
index 0000000..c8be912
--- /dev/null
+++ b/resources/apps/fish/Catppuccin Macchiato.theme	
@@ -0,0 +1,30 @@
+# name: 'Catppuccin Macchiato'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 24273a
+
+fish_color_normal cad3f5
+fish_color_command 8aadf4
+fish_color_param f0c6c6
+fish_color_keyword ed8796
+fish_color_quote a6da95
+fish_color_redirection f5bde6
+fish_color_end f5a97f
+fish_color_comment 8087a2
+fish_color_error ed8796
+fish_color_gray 6e738d
+fish_color_selection --background=363a4f
+fish_color_search_match --background=363a4f
+fish_color_option a6da95
+fish_color_operator f5bde6
+fish_color_escape ee99a0
+fish_color_autosuggestion 6e738d
+fish_color_cancel ed8796
+fish_color_cwd eed49f
+fish_color_user 8bd5ca
+fish_color_host 8aadf4
+fish_color_host_remote a6da95
+fish_color_status ed8796
+fish_pager_color_progress 6e738d
+fish_pager_color_prefix f5bde6
+fish_pager_color_completion cad3f5
+fish_pager_color_description 6e738d
\ No newline at end of file
diff --git a/resources/wallpapers/catppuccin_blue_cat.png b/resources/wallpapers/catppuccin_blue_cat.png
new file mode 100644
index 0000000..a9b050d
Binary files /dev/null and b/resources/wallpapers/catppuccin_blue_cat.png differ