diff --git a/assets/wallpapers/evangelion.jpg b/assets/wallpapers/evangelion.jpg
new file mode 100644
index 0000000..7599dfb
Binary files /dev/null and b/assets/wallpapers/evangelion.jpg differ
diff --git a/assets/wallpapers/rei-aquarium.jpg b/assets/wallpapers/rei-aquarium.jpg
new file mode 100644
index 0000000..47b5c37
Binary files /dev/null and b/assets/wallpapers/rei-aquarium.jpg differ
diff --git a/assets/wallpapers/rei-wreckage.jpg b/assets/wallpapers/rei-wreckage.jpg
new file mode 100644
index 0000000..fdd5b45
Binary files /dev/null and b/assets/wallpapers/rei-wreckage.jpg differ
diff --git a/assets/wallpapers/shinji-tunes.png b/assets/wallpapers/shinji-tunes.png
new file mode 100644
index 0000000..1b0fc58
Binary files /dev/null and b/assets/wallpapers/shinji-tunes.png differ
diff --git a/dotfiles/kitagawa/equibop/equicord-settings.json b/dotfiles/kitagawa/equibop/equicord-settings.json
index 8effbde..23ef2eb 100644
--- a/dotfiles/kitagawa/equibop/equicord-settings.json
+++ b/dotfiles/kitagawa/equibop/equicord-settings.json
@@ -4,7 +4,7 @@
         "authenticated": false,
         "settingsSync": false,
         "url": "https://cloud.equicord.org/",
-        "settingsSyncVersion": 1789519293603
+        "settingsSyncVersion": 1789776786680
     },
     "enableOnlineThemes": true,
     "enabledThemeLinks": [
diff --git a/dotfiles/kitagawa/niri.kdl b/dotfiles/kitagawa/niri.kdl
index 12e345c..b1ba2d9 100644
--- a/dotfiles/kitagawa/niri.kdl
+++ b/dotfiles/kitagawa/niri.kdl
@@ -68,4 +68,5 @@ switch-events {
     lid-close { spawn "systemctl" "hibernate"; }
 }
 
+
 include "noctalia.kdl"
diff --git a/dotfiles/kitagawa/noctalia/settings.toml b/dotfiles/kitagawa/noctalia/settings.toml
index 91a0f80..0b75c3d 100644
--- a/dotfiles/kitagawa/noctalia/settings.toml
+++ b/dotfiles/kitagawa/noctalia/settings.toml
@@ -178,6 +178,10 @@ pre_action_fade_seconds = 30
 [location]
 auto_locate = true
 
+[lockscreen]
+blur_intensity = 0.54999998770654202
+tint_intensity = 0.24999999441206455
+
 [lockscreen_widgets]
 enabled = true
 schema_version = 2
@@ -195,8 +199,8 @@ widget_order = [
 
     [lockscreen_widgets.widget."lockscreen-login-box@eDP-1"]
     box_height = 196.0
-    box_width = 768.0
-    cx = 512.0
+    box_width = 720.0
+    cx = 488.0
     cy = 594.0
     output = "eDP-1"
     placement_height = 864.0
@@ -233,8 +237,8 @@ widget_order = [
 
     [lockscreen_widgets.widget.lockscreen-widget-0000000000000002]
     box_height = 128.0
-    box_width = 320.0
-    cx = 288.0
+    box_width = 304.0
+    cx = 280.0
     cy = 240.0
     output = "eDP-1"
     placement_height = 864.0
@@ -247,9 +251,9 @@ widget_order = [
         shadow = false
 
     [lockscreen_widgets.widget.lockscreen-widget-0000000000000004]
-    box_height = 288.0
-    box_width = 432.0
-    cx = 1192.0
+    box_height = 272.0
+    box_width = 400.0
+    cx = 1208.0
     cy = 432.0
     output = "eDP-1"
     placement_height = 864.0
@@ -327,7 +331,7 @@ polkit_agent = true
     wallpaper_placement = "floating"
 
     [shell.screen_corners]
-    enabled = true
+    size = 16
 
     [shell.screenshot]
     confirm_region = true
@@ -379,49 +383,48 @@ builtin = "Nord"
 community_palette = "Cherry Blossom"
 mode = "dark"
 source = "community"
-wallpaper_scheme = "m3-monochrome"
+wallpaper_scheme = "muted"
 
     [theme.templates]
-    builtin_ids = [ "gtk3", "gtk4", "kcolorscheme", "kitty", "niri", "qt" ]
-    community_ids = [ "papirus-icons" ]
-    enable_community_templates = true
+    builtin_ids = [ "niri" ]
+    community_ids = [ "spicetify" ]
 
 [wallpaper]
-directory = "~/Pictures/Wallpapers"
+directory = "~/flake/assets/wallpapers"
 
     [wallpaper.default]
-    path = "/home/grey/Pictures/Wallpapers/wallhaven-jewvzy.jpg"
+    path = "/home/grey/flake/assets/wallpapers/rei-aquarium.jpg"
 
     [wallpaper.last]
-    path = "/home/grey/Pictures/Wallpapers/wallhaven-jewvzy.jpg"
+    path = "/home/grey/flake/assets/wallpapers/rei-aquarium.jpg"
 
     [wallpaper.monitors.eDP-1]
-    path = "/home/grey/Pictures/Wallpapers/wallhaven-jewvzy.jpg"
-
-    [[wallpaper.favorite]]
-    palette_source = "wallpaper"
-    path = "/home/grey/Pictures/Wallpapers/evangelion.jpg"
-    theme_mode = "dark"
-    wallpaper_scheme = "muted"
-
-    [[wallpaper.favorite]]
-    palette_source = "wallpaper"
-    path = "/home/grey/Pictures/Wallpapers/wallhaven-yqv637.png"
-    theme_mode = "dark"
-    wallpaper_scheme = "m3-monochrome"
-
-    [[wallpaper.favorite]]
-    builtin_palette = "Nord"
-    palette_source = "builtin"
-    path = "/home/grey/Pictures/Wallpapers/wallhaven-og7x7p.jpg"
-    theme_mode = "dark"
+    path = "/home/grey/flake/assets/wallpapers/rei-aquarium.jpg"
 
     [[wallpaper.favorite]]
     community_palette = "Cherry Blossom"
     palette_source = "community"
-    path = "/home/grey/Pictures/Wallpapers/wallhaven-jewvzy.jpg"
+    path = "/home/grey/flake/assets/wallpapers/rei-aquarium.jpg"
     theme_mode = "dark"
 
+    [[wallpaper.favorite]]
+    palette_source = "wallpaper"
+    path = "/home/grey/flake/assets/wallpapers/shinji-tunes.png"
+    theme_mode = "dark"
+    wallpaper_scheme = "m3-monochrome"
+
+    [[wallpaper.favorite]]
+    palette_source = "wallpaper"
+    path = "/home/grey/flake/assets/wallpapers/rei-wreckage.jpg"
+    theme_mode = "dark"
+    wallpaper_scheme = "m3-content"
+
+    [[wallpaper.favorite]]
+    palette_source = "wallpaper"
+    path = "/home/grey/flake/assets/wallpapers/evangelion.jpg"
+    theme_mode = "dark"
+    wallpaper_scheme = "muted"
+
 [widget.active_window]
 enabled = true
 icon_size = 15
diff --git a/modules/features/applications/cli/nh.nix b/modules/features/applications/cli/nh.nix
index 2aa56bb..57f10a3 100644
--- a/modules/features/applications/cli/nh.nix
+++ b/modules/features/applications/cli/nh.nix
@@ -19,7 +19,7 @@ in {
         extraArgs = lib.mkOption {
           type = lib.types.str;
           description = "Any extra arguments that should be passed to the `nh clean` command when it is called by this service.";
-          default = "--keep 10 --keep-since 7d";
+          default = "--keep 10 --keep-since 7d --optimise";
         };
       };
     };
diff --git a/modules/features/applications/gui/floorp.nix b/modules/features/applications/gui/floorp.nix
index 2d680f8..98ff8af 100644
--- a/modules/features/applications/gui/floorp.nix
+++ b/modules/features/applications/gui/floorp.nix
@@ -35,7 +35,7 @@
           DisableTelemetry = true;
           NoDefaultBookmarks = true;
           EnableTrackingProtection = {
-            Value = true;
+            Value = false;
             Locked = true;
             Cryptomining = true;
             Fingerprinting = true;
@@ -109,7 +109,9 @@
             "browser.newtabpage.activity-stream.newtabWallpapers.user.enabled" = true;
             "browser.newtabpage.activity-stream.widgets.enabled" = false;
             "browser.newtabpage.activity-stream.discoverystream.enabled" = false;
-            "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "suspension-bridge";
+            "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "custom";
+            "browser.newtabpage.activity-stream.newtabWallpapers.customWallpaper.uploadedPreviously" = true;
+            "browser.newtabpage.activity-stream.newtabWallpapers.customWallpaper.uuid" = "c521696c-f5c9-4932-998f-8d0c245c4eb0";
             "floorp.design.configs" = {
               globalConfigs = {
                 userInterface = "proton";
diff --git a/modules/features/applications/gui/nautilus.nix b/modules/features/applications/gui/nautilus.nix
index df7bae3..b6ec214 100644
--- a/modules/features/applications/gui/nautilus.nix
+++ b/modules/features/applications/gui/nautilus.nix
@@ -19,6 +19,8 @@
         terminal = "kitty";
       };
 
+      services.gvfs.enable = true;
+
       home-manager.users.${config.info.userName} = lib.mkIf (config.features.nixos.home-manager.enable) {
         features.applications.gui.nautilus.enable = true;
       };
@@ -30,7 +32,7 @@
       home.packages = lib.mkIf (config.info.isStandalone) [ pkgs.nautilus ];
 
       gtk.gtk3.bookmarks = [
-        "file://${config.info.rootPath} NixOS"
+        "file://${config.info.rootPath} Flake"
         "file:///home/grey/Downloads Downloads"
         "file:///home/grey/Documents Documents"
         "file:///home/grey/Pictures Pictures"
diff --git a/modules/features/nixos/stylix.nix b/modules/features/nixos/stylix.nix
index bbbb186..e174046 100644
--- a/modules/features/nixos/stylix.nix
+++ b/modules/features/nixos/stylix.nix
@@ -1,6 +1,12 @@
 { inputs, self, ... }: {
   imports = [ (inputs.helpers.mkMirroredModulesFlakeModule "graphicsOptions" ({ lib, ... }: {
-    options.features.nixos.stylix.enable = lib.mkEnableOption "Stylix";
+    options.features.nixos.stylix = {
+      enable = lib.mkEnableOption "Stylix";
+      image = lib.mkOption {
+        type = lib.types.path;
+        default = /home/grey/Pictures/wallpaper.png;
+      };
+    };
   })) ];
 
   flake.nixosModules.graphics = { pkgs, lib, config, ... }: {
@@ -10,7 +16,7 @@
 
     stylix = lib.mkIf (config.features.nixos.stylix.enable) {
       enable = true;
-      image = builtins.path { path = "${self}/modules/hosts/${config.info.hostName}/wallpaper.jpg"; };
+      image = config.features.nixos.stylix.image;
       polarity = "dark";
     };
 
diff --git a/modules/hosts/kitagawa/kitagawa.nix b/modules/hosts/kitagawa/kitagawa.nix
index ff19968..5c17685 100644
--- a/modules/hosts/kitagawa/kitagawa.nix
+++ b/modules/hosts/kitagawa/kitagawa.nix
@@ -23,7 +23,10 @@
     features = {
       nixos = {
         home-manager.enable = true;
-        stylix.enable = false;
+        stylix = {
+          enable = true;
+          image = builtins.path { path = "${self}/assets/wallpapers/rei-aquarium.jpg"; };
+        };
       };
 
       shells.zsh.antidote.enable = true;
@@ -49,7 +52,10 @@
 
         cli = {
           fastfetch.enable = true;
-          nh.enable = true;
+          nh = {
+            enable = true;
+            clean.enable = true;
+          };
         };
 
         extraPackages = with pkgs; [
@@ -59,7 +65,9 @@
       };
     };
 
-    stylix.targets.nixos-icons.enable = false;
+    stylix.targets = {
+      nixos-icons.enable = false;
+    };
 
     nix.buildMachines = [
       {
diff --git a/modules/hosts/takamaki/takamaki.nix b/modules/hosts/takamaki/takamaki.nix
index eb84d70..b68a761 100644
--- a/modules/hosts/takamaki/takamaki.nix
+++ b/modules/hosts/takamaki/takamaki.nix
@@ -50,7 +50,10 @@
         cli = {
           fastfetch.enable = true;
           color-converter.enable = true;
-          nh.enable = true;
+          nh = {
+            enable = true;
+            clean.enable = true;
+          };
         };
 
         gui = {