diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e72fea1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+**/plugins/sources/**
diff --git a/assets/dotfiles/niri.kdl b/assets/dotfiles/niri.kdl
new file mode 100644
index 0000000..f03559a
--- /dev/null
+++ b/assets/dotfiles/niri.kdl
@@ -0,0 +1,124 @@
+include "./noctalia.kdl"
+
+input {
+    keyboard {
+        xkb {
+            layout "gb"
+            model ""
+            rules ""
+            variant ""
+        }
+        repeat-delay 600
+        repeat-rate 25
+        track-layout "global"
+    }
+    touchpad {
+        tap
+        dwt
+        natural-scroll
+        accel-speed 0.750000
+        accel-profile "flat"
+        click-method "clickfinger"
+    }
+    mouse {
+        accel-speed 0.050000
+        accel-profile "flat"
+    }
+}
+screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+prefer-no-csd
+overview { zoom 0.500000; }
+layout {
+    gaps 16
+    struts {
+        left 64
+        right 64
+        top 0
+        bottom 0
+    }
+    focus-ring {
+        width 2.500000
+        active-color "#b2b2b2d6"
+    }
+    border { off; }
+    shadow {
+        on
+        offset x=0.000000 y=5.000000
+        softness 30.000000
+        spread 5.000000
+        draw-behind-window false
+        color "#00000070"
+    }
+    tab-indicator {
+        gap 5.000000
+        width 4.000000
+        length total-proportion=0.500000
+        position "top"
+        gaps-between-tabs 10
+        corner-radius 0.000000
+    }
+    default-column-width
+    center-focused-column "never"
+    always-center-single-column
+}
+cursor {
+    xcursor-theme "Bibata-Modern-Ice"
+    xcursor-size 22
+}
+hotkey-overlay { skip-at-startup; }
+binds {
+    Mod+B { spawn "floorp"; }
+    Mod+C { spawn "gnome-calculator"; }
+    Mod+D { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
+    Mod+E { spawn "nautilus"; }
+    Mod+Return { spawn "kitty"; }
+
+    Mod+Z { spawn "kitty" "nh" "os" "switch" "./nixos"; }
+    
+    Mod+Space { toggle-overview; }
+    Mod+Q { close-window; }
+    Mod+F { fullscreen-window; }
+    Mod+Shift+E { quit; }
+    
+    Mod+Shift+D { spawn "noctalia" "msg" "desktop-widgets-edit"; }
+    Mod+Period { spawn "noctalia" "msg" "panel-toggle" "control-center"; }
+    Mod+Shift+P { spawn "noctalia" "msg" "panel-toggle" "session"; }
+
+    Mod+TouchpadScrollUp { focus-workspace-up; }
+    Mod+TouchpadScrollDown { focus-workspace-down; }
+    Mod+TouchpadScrollLeft { focus-column-left; }
+    Mod+TouchpadScrollRight { focus-column-right; }
+
+    Mod+Up { focus-workspace-up; }
+    Mod+Down { focus-workspace-down; }
+    Mod+Left { focus-column-left; }
+    Mod+Right { focus-column-right; }
+
+    Mod+Shift+Up { move-window-to-workspace-up; }
+    Mod+Shift+Down { move-window-to-workspace-down; }
+    Mod+Shift+Left { move-column-left; }
+    Mod+Shift+Right { move-column-right; }
+
+    XF86AudioLowerVolume { spawn "noctalia" "msg" "volume-down" "5"; }
+    XF86AudioRaiseVolume { spawn "noctalia" "msg" "volume-up" "5"; }
+    XF86AudioMute { spawn "noctalia" "msg" "volume-mute"; }
+    XF86MonBrightnessDown { spawn "noctalia" "msg" "brightness-down" "5"; }
+    XF86MonBrightnessUp { spawn "noctalia" "msg" "brightness-up" "5"; }
+}
+spawn-at-startup "noctalia"
+window-rule {
+    draw-border-with-background false
+    geometry-corner-radius 10.000000 10.000000 10.000000 10.000000
+    clip-to-geometry true
+}
+window-rule {
+    match app-id="^floorp$"
+    match app-id="^code$"
+    match app-id="^obsidian$"
+    default-column-width { proportion 1.000000; }
+}
+window-rule {
+    match app-id="^kitty$"
+    default-column-width { proportion 0.660000; }
+}
+gestures { hot-corners { off; }; }
diff --git a/assets/dotfiles/noctalia-state/.setup-complete b/assets/dotfiles/noctalia-state/.setup-complete
new file mode 100644
index 0000000..e69de29
diff --git a/assets/dotfiles/noctalia-state/settings.toml b/assets/dotfiles/noctalia-state/settings.toml
new file mode 100644
index 0000000..ea7c819
--- /dev/null
+++ b/assets/dotfiles/noctalia-state/settings.toml
@@ -0,0 +1,281 @@
+[backdrop]
+blur_intensity = 0.099999997764825821
+tint_intensity = 0.14999999664723873
+
+[bar.default]
+background_opacity = 0.74999998323619366
+center = [ "workspaces" ]
+end = [ "tray", "notifications", "clipboard", "network", "volume", "battery", "control-center", "session" ]
+margin_edge = 8
+margin_ends = 80
+margin_opposite_edge = 8
+start = [ "launcher", "clock", "media" ]
+thickness = 32
+widget_spacing = 16
+
+[desktop_widgets]
+schema_version = 2
+widget_order = [
+    "desktop-widget-0000000000000001",
+    "desktop-widget-0000000000000002",
+    "desktop-widget-0000000000000005",
+    "desktop-widget-0000000000000006",
+    "desktop-widget-0000000000000007",
+    "desktop-widget-0000000000000008"
+]
+
+    [desktop_widgets.grid]
+    cell_size = 16
+    major_interval = 4
+    visible = true
+
+    [desktop_widgets.widget.desktop-widget-0000000000000001]
+    box_height = 160.0
+    box_width = 160.0
+    cx = 176.0
+    cy = 160.0
+    output = "eDP-1"
+    rotation = 0.0
+    type = "clock"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000001.settings]
+        background_opacity = 0.75
+        center_text = true
+        clock_style = "analog"
+        color = "primary"
+        format = "{:%H:%M\\n%a %d %B}"
+        shadow = false
+
+    [desktop_widgets.widget.desktop-widget-0000000000000002]
+    box_height = 176.0
+    box_width = 208.0
+    cx = 1096.0
+    cy = 168.0
+    output = "eDP-1"
+    rotation = 0.0
+    type = "sysmon"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000002.settings]
+        background_opacity = 0.75
+        display = "graph"
+        shadow = false
+        show_label = true
+        stat = "cpu_usage"
+        stat2 = "cpu_temp"
+
+    [desktop_widgets.widget.desktop-widget-0000000000000005]
+    box_height = 176.0
+    box_width = 208.0
+    cx = 1344.0
+    cy = 168.0
+    output = "eDP-1"
+    rotation = 0.0
+    type = "sysmon"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000005.settings]
+        background_opacity = 0.75
+        display = "graph"
+        network_speed_compact = false
+        shadow = false
+        stat = "net_rx"
+        stat2 = "net_tx"
+
+    [desktop_widgets.widget.desktop-widget-0000000000000006]
+    box_height = 160.0
+    box_width = 384.0
+    cx = 288.0
+    cy = 704.0
+    output = "eDP-1"
+    rotation = 0.0
+    type = "media_player"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000006.settings]
+        background_opacity = 0.75
+        hide_when_no_media = true
+        shadow = false
+
+    [desktop_widgets.widget.desktop-widget-0000000000000007]
+    box_height = 96.0
+    box_width = 384.0
+    cx = 288.0
+    cy = 576.0
+    output = "eDP-1"
+    rotation = 0.0
+    type = "audio_visualizer"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000007.settings]
+        background = false
+        background_opacity = 0.0
+        bands = 64
+        centered = false
+        mirrored = false
+        show_when_idle = false
+
+    [desktop_widgets.widget.desktop-widget-0000000000000008]
+    box_height = 96.0
+    box_width = 144.0
+    cx = 360.0
+    cy = 128.0
+    output = "eDP-1"
+    rotation = 0.0
+    type = "weather"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000008.settings]
+        background_opacity = 0.75
+
+[idle]
+behavior_order = [ "lock", "screen-off", "lock-and-suspend" ]
+
+    [idle.behavior.lock]
+    action = "lock"
+    enabled = true
+    timeout = 600.0
+
+    [idle.behavior.lock-and-suspend]
+    action = "lock_and_suspend"
+    enabled = false
+    timeout = 900.0
+
+    [idle.behavior.screen-off]
+    action = "screen_off"
+    enabled = true
+    timeout = 660.0
+
+[location]
+auto_locate = true
+
+[lockscreen_widgets]
+enabled = false
+schema_version = 2
+widget_order = [ "lockscreen-login-box@eDP-1" ]
+
+    [lockscreen_widgets.grid]
+    cell_size = 16
+    major_interval = 4
+    visible = true
+
+    [lockscreen_widgets.widget."lockscreen-login-box@eDP-1"]
+    box_height = 70.0
+    box_width = 400.0
+    cx = 480.0
+    cy = 421.0
+    output = "eDP-1"
+    rotation = 0.0
+    type = "login_box"
+
+        [lockscreen_widgets.widget."lockscreen-login-box@eDP-1".settings]
+        background_color = "surface_variant"
+        background_opacity = 0.88
+        background_radius = 12.0
+        input_opacity = 1.0
+        input_radius = 6.0
+        show_caps_lock = true
+        show_keyboard_layout = true
+        show_login_button = true
+        show_password_hint = true
+
+[nightlight]
+enabled = true
+temperature_day = 6000
+temperature_night = 3800
+
+[shell]
+corner_radius_scale = 1.2500000186264515
+external_ip_enabled = true
+niri_overview_type_to_launch_enabled = true
+polkit_agent = true
+
+    [shell.animation]
+    speed = 1.3500000201165676
+
+    [shell.panel]
+    shadow = false
+    transparency_mode = "glass"
+
+    [shell.screen_corners]
+    enabled = true
+    size = 16
+
+    [[shell.session.actions]]
+    action = "lock"
+    countdown_seconds = 0.0
+    enabled = true
+    shortcut = "1"
+    variant = "default"
+
+    [[shell.session.actions]]
+    action = "logout"
+    countdown_seconds = 0.0
+    enabled = true
+    shortcut = "2"
+    variant = "default"
+
+    [[shell.session.actions]]
+    action = "lock_and_suspend"
+    countdown_seconds = 0.0
+    enabled = false
+    shortcut = "3"
+    variant = "default"
+
+    [[shell.session.actions]]
+    action = "reboot"
+    countdown_seconds = 0.0
+    enabled = true
+    shortcut = "4"
+    variant = "default"
+
+    [[shell.session.actions]]
+    action = "shutdown"
+    countdown_seconds = 0.0
+    enabled = true
+    shortcut = "5"
+    variant = "destructive"
+
+    [shell.shadow]
+    alpha = 0.44999998994171619
+
+[theme]
+builtin = "Rosé Pine"
+community_palette = "Ayu Blue"
+source = "wallpaper"
+wallpaper_scheme = "muted"
+
+    [theme.templates]
+    builtin_ids = [ "niri" ]
+    enable_community_templates = false
+
+[wallpaper]
+directory = "/home/grey/nixos/assets/wallpapers"
+transition_on_startup = true
+
+    [wallpaper.default]
+    path = "/home/grey/nixos/assets/wallpapers/kitagawa.jpg"
+
+    [wallpaper.last]
+    path = "/home/grey/nixos/assets/wallpapers/kitagawa.jpg"
+
+    [wallpaper.monitors.eDP-1]
+    path = "/home/grey/nixos/assets/wallpapers/kitagawa.jpg"
+
+    [[wallpaper.favorite]]
+    palette_source = "wallpaper"
+    path = "/home/grey/nixos/assets/wallpapers/kitagawa.jpg"
+    theme_mode = "dark"
+    wallpaper_scheme = "muted"
+
+[widget.control-center]
+custom_image = "/nix/store/ipwy1cafn30wy2fnr9hfa13xyrvbrnca-noctalia-5.0.0/share/noctalia/assets/images/distros/nixos.svg"
+
+[widget.media]
+album_art_only = true
+hide_when_no_media = true
+
+[widget.network]
+show_label = false
+
+[widget.volume]
+mute_color = "on_surface"
+show_label = false
+
+[widget.workspaces]
+minimal = true
\ No newline at end of file
diff --git a/assets/wallpapers/kitagawa.jpg b/assets/wallpapers/kitagawa.jpg
new file mode 100644
index 0000000..7599dfb
Binary files /dev/null and b/assets/wallpapers/kitagawa.jpg differ
diff --git a/flake.lock b/flake.lock
index c3c042b..a5699c5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,73 @@
 {
   "nodes": {
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1755819240,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "base16-fish": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1765809053,
+        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
+        "type": "github"
+      }
+    },
+    "base16-helix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1776754714,
+        "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
+    "base16-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732806396,
+        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      }
+    },
     "firefox-addons": {
       "inputs": {
         "nixpkgs": [
@@ -22,6 +90,76 @@
         "type": "gitlab"
       }
     },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1779670703,
+        "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731966426,
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
+    "gnome-shell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767737596,
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -63,95 +201,7 @@
         "type": "github"
       }
     },
-    "niri": {
-      "inputs": {
-        "niri-stable": "niri-stable",
-        "niri-unstable": "niri-unstable",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
-        "xwayland-satellite-stable": "xwayland-satellite-stable",
-        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
-      },
-      "locked": {
-        "lastModified": 1783267733,
-        "narHash": "sha256-DTvaM+0vanneOcKg3NKXV7ilf0ShY4BOBz/nde5GHos=",
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "rev": "74053f79cad0f6c3a4a0be6b7928795d2e6a9f4b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "type": "github"
-      }
-    },
-    "niri-stable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1756556321,
-        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "ref": "v25.08",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
-    "niri-unstable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1783248941,
-        "narHash": "sha256-citgYJbvR1iUKXpiWlFq3NO+fw6hXGL3Qk1ampU7lhA=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "a30ca7983b2f1fc3ddeb209b3fe18fa78e0dbd25",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1783224372,
-        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1782847189,
-        "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1783148766,
         "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=",
@@ -171,44 +221,44 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "noctalia-qs": "noctalia-qs"
+        ]
       },
       "locked": {
-        "lastModified": 1783017890,
-        "narHash": "sha256-bAzrtN0GDMH0dOZkgeI3zSxfFs2rdD3pMuzOxvTF0bs=",
+        "lastModified": 1783535738,
+        "narHash": "sha256-jVLb5HXJ4hcNp5BKpiPpXdyCzEYZVKMhk8UpcbPLVzg=",
         "owner": "noctalia-dev",
-        "repo": "noctalia-shell",
-        "rev": "a48885b9fec485c903c955749a7da6e30147cd38",
+        "repo": "noctalia",
+        "rev": "c0e0afc24db7ff7feb450fc5f5f316fdd1a273c6",
         "type": "github"
       },
       "original": {
         "owner": "noctalia-dev",
-        "ref": "legacy-v4",
-        "repo": "noctalia-shell",
+        "repo": "noctalia",
         "type": "github"
       }
     },
-    "noctalia-qs": {
+    "nur": {
       "inputs": {
-        "nixpkgs": [
-          "noctalia",
-          "nixpkgs"
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
         ],
-        "systems": "systems",
-        "treefmt-nix": "treefmt-nix"
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1780799499,
-        "narHash": "sha256-YloRtLqJabzYUWvdLyh67zH4DZrR3kQj+dlQJwLPmPM=",
-        "owner": "noctalia-dev",
-        "repo": "noctalia-qs",
-        "rev": "f308426239665e3bc3d624014e9295b2ae2f58ff",
+        "lastModified": 1779766384,
+        "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "57800b7ab648725ccd33551d01484ee14952ad3f",
         "type": "github"
       },
       "original": {
-        "owner": "noctalia-dev",
-        "repo": "noctalia-qs",
+        "owner": "nix-community",
+        "repo": "NUR",
         "type": "github"
       }
     },
@@ -240,80 +290,160 @@
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nh": "nh",
-        "niri": "niri",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "noctalia": "noctalia",
         "plasma-manager": "plasma-manager",
+        "spicetify": "spicetify",
+        "stylix": "stylix",
         "zen-browser": "zen-browser"
       }
     },
+    "spicetify": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1783303713,
+        "narHash": "sha256-d6Zs6wD0kvWQXn7qPU0YsuqoqBhT7zi5+1M365FINt8=",
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "rev": "d9d714243e2f8d10af28db5111f018ec2d77acc9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "type": "github"
+      }
+    },
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "base16-fish": "base16-fish",
+        "base16-helix": "base16-helix",
+        "base16-vim": "base16-vim",
+        "firefox-gnome-theme": "firefox-gnome-theme",
+        "flake-parts": "flake-parts",
+        "gnome-shell": "gnome-shell",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nur": "nur",
+        "systems": "systems_2",
+        "tinted-kitty": "tinted-kitty",
+        "tinted-schemes": "tinted-schemes",
+        "tinted-tmux": "tinted-tmux",
+        "tinted-zed": "tinted-zed"
+      },
+      "locked": {
+        "lastModified": 1783359251,
+        "narHash": "sha256-HUiCnEVlJ4n+qJlZojiz/zv+P0cqM5zsg1dxpz2J7Mg=",
+        "owner": "nix-community",
+        "repo": "stylix",
+        "rev": "e602ad042f00409f33c8ad2829cd8d59ba345c7e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-26.05",
+        "repo": "stylix",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "noctalia",
-          "noctalia-qs",
-          "nixpkgs"
-        ]
-      },
+    "systems_2": {
       "locked": {
-        "lastModified": 1780220602,
-        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
+        "owner": "nix-systems",
+        "repo": "default",
         "type": "github"
       }
     },
-    "xwayland-satellite-stable": {
+    "tinted-kitty": {
       "flake": false,
       "locked": {
-        "lastModified": 1755491097,
-        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "lastModified": 1735730497,
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
         "type": "github"
       },
       "original": {
-        "owner": "Supreeeme",
-        "ref": "v0.7",
-        "repo": "xwayland-satellite",
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
         "type": "github"
       }
     },
-    "xwayland-satellite-unstable": {
+    "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1781226823,
-        "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e",
+        "lastModified": 1777806186,
+        "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
         "type": "github"
       },
       "original": {
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
+    "tinted-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1778379944,
+        "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "fe0203a198690e71a5ff11e08812a4673de3678d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1778378178,
+        "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "9cd816033ff969415b190722cddf134e78a5665f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 606115c..bc73bc0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    stylix = {
+      url = "github:nix-community/stylix/release-26.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -33,22 +38,24 @@
       inputs.home-manager.follows = "home-manager";
     };
 
-    niri = {
-      url = "github:sodiboo/niri-flake";
+    noctalia = {
+      url = "github:noctalia-dev/noctalia";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    noctalia = {
-      url = "github:noctalia-dev/noctalia-shell/legacy-v4";
+    spicetify = {
+      url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = {self,nixpkgs,home-manager,plasma-manager,...}@inputs: {
+  outputs = {self,nixpkgs,home-manager,plasma-manager,stylix,...}@inputs: {
     nixosConfigurations = builtins.listToAttrs (map (name: {
       inherit name;
       value = nixpkgs.lib.nixosSystem {
         modules = [
           ./hosts/${name}
+          stylix.nixosModules.stylix
           home-manager.nixosModules.default {
             home-manager = {
               useGlobalPkgs = true;
diff --git a/global-configs/equibop.nix b/global-configs/equibop.nix
index cecb5b9..5dace25 100644
--- a/global-configs/equibop.nix
+++ b/global-configs/equibop.nix
@@ -22,7 +22,6 @@
         useQuickCss = true;
         enabledThemeLinks = [
           "https://raw.githubusercontent.com/refact0r/midnight-discord/refs/heads/master/themes/midnight.theme.css"
-          "https://raw.githubusercontent.com/DubyaDude/DubyasCleanupOfDiscord/main/DubyasCleanupOfDiscord.css"
         ];
         enableOnlineThemes = true;
         cloud = {
@@ -117,6 +116,26 @@
             settingsLocation = "aboveNitro";
             includeVencordInfoWhenCopying = true;
           };
+          "Declutter" = {
+            enabled = true;
+            removeAvatarDecoration = false;
+            removeNameplate = false;
+            removeProfileEffect = false;
+            removeClanTag = false;
+            alwaysShowUsername = true;
+
+            removeShopAboveDms = true;
+            removeQuestsAboveDms = true;
+          };
+          "AltKrispSwitch" = {
+            enabled = true;
+          };
+          "ClearURLs" = {
+            enabled = true;
+          };
+          "YoutubeAdblock" = {
+            enabled = true;
+          };
         };
       };
       extraQuickCss = ''
diff --git a/global-configs/floorp.nix b/global-configs/floorp.nix
index 4959692..e99aa47 100644
--- a/global-configs/floorp.nix
+++ b/global-configs/floorp.nix
@@ -24,7 +24,6 @@ in {
       DisablePocket = true;
       DisableTelemetry = true;
       NoDefaultBookmarks = true;
-      OfferToSaveLogins = false;
       EnableTrackingProtection = {
         Value = true;
         Locked = true;
@@ -86,13 +85,21 @@ in {
 
 
       settings = {
+        "signon.rememberSignons" = false;
+        "signon.autofillForms" = false;
         "floorp.panelSidebar.enabled" = false;
         "floorp.workspaces.enabled" = false;
         "browser.toolbars.bookmarks.visibility" = "newtab";
         "floorp.browser.welcome.page.shown" = true;
         "browser.newtabpage.activity-stream.feeds.topsites" = false;
+        "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
+        "browser.newtabpage.activity-stream.feeds.adsfeed" = false;
+        "browser.newtabpage.activity-stream.feeds.telemetry" = false;
+        "browser.newtabpage.activity-stream.feeds.weatherfeed" = false;
         "browser.newtabpage.activity-stream.newtabWallpapers.user.enabled" = true;
-        "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "abstract-purple";
+        "browser.newtabpage.activity-stream.widgets.enabled" = false;
+        "browser.newtabpage.activity-stream.discoverystream.enabled" = false;
+        "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "suspension-bridge";
         "floorp.design.configs" = {
           globalConfigs = {
             userInterface = "proton";
diff --git a/global-configs/gnome.nix b/global-configs/gnome.nix
index ef02608..e223729 100644
--- a/global-configs/gnome.nix
+++ b/global-configs/gnome.nix
@@ -27,14 +27,6 @@
         enable-hot-corners = false;
         clock-show-weekday = true;
       };
-      "org/gnome/desktop/background" = {
-        color-shading-type = lib.gvariant.mkValue "solid";
-        picture-options = lib.gvariant.mkValue "zoom";
-        picture-uri = lib.gvariant.mkValue "file:///run/current-system/sw/share/backgrounds/gnome/amber-l.jxl";
-        picture-uri-dark = lib.gvariant.mkValue "file:///run/current-system/sw/share/backgrounds/gnome/amber-d.jxl";
-        primary-color = lib.gvariant.mkValue "#ff7800";
-        secondary-color = lib.gvariant.mkValue "#000000";
-      };
       "org/gnome/desktop/wm/keybindings" = {
         close = lib.gvariant.mkArray [ "<Super>q" ];
         show-desktop = lib.gvariant.mkArray [ "<Super>d" ];
@@ -103,6 +95,7 @@
           "idea.desktop"
           "clion.desktop"
           "proton.vpn.app.gtk.desktop"
+          "io.ente.auth.desktop"
         ];
       };
       "org/gnome/shell/keybindings" = {
diff --git a/global-configs/kitty.nix b/global-configs/kitty.nix
index 4d7a35d..977061e 100644
--- a/global-configs/kitty.nix
+++ b/global-configs/kitty.nix
@@ -4,11 +4,8 @@
 }: {
   programs.kitty = {
     enable = true;
-    settings = {
-      confirm_os_window_close = -1;
-    };
 
     shellIntegration.enableBashIntegration = true;
-    themeFile = "Arthur";
+    enableGitIntegration = true;
   };
 }
\ No newline at end of file
diff --git a/global-configs/niri.nix b/global-configs/niri.nix
index 4c59510..ade0807 100644
--- a/global-configs/niri.nix
+++ b/global-configs/niri.nix
@@ -1,584 +1,34 @@
 {
+  config,
   pkgs,
   lib,
   ...
 }: {
-  programs.niri = {
-    enable = true;
-    package = pkgs.niri-stable;
-    settings = {
-      spawn-at-startup = [
-        { argv = ["noctalia-shell"]; }
-      ];
+  home.packages = with pkgs; [
+    gnome-calculator
+    nautilus
+  ];
 
-      hotkey-overlay.skip-at-startup = true;
+  home.activation = {
+    symlinkNiriConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
+      #!/bin/bash
+      if [ -f /home/grey/.config/niri/config.kdl ]; then
+        rm /home/grey/.config/niri/config.kdl
+      fi
+      ln -s /home/grey/nixos/assets/dotfiles/niri.kdl /home/grey/.config/niri/config.kdl
+    '';
 
-      cursor = {
-        size = 22;
-        theme = "Bibata-Modern-Ice";
-      };
+    symlinkNoctaliaState = lib.hm.dag.entryAfter ["writeBoundary"] ''
+      #!/bin/bash
+      if [ -f /home/grey/.local/state/noctalia/settings.toml ]; then
+        rm /home/grey/.local/state/noctalia/settings.toml
+      fi
+      ln -s /home/grey/nixos/assets/dotfiles/noctalia-state/settings.toml /home/grey/.local/state/noctalia/settings.toml
 
-      input.keyboard.xkb.layout = "gb";
-      input.mouse.accel-speed = 1.0;
-      input.touchpad = {
-        accel-profile = "flat";
-        accel-speed = 0.75;
-        disabled-on-external-mouse = true;
-        tap = true;
-        dwt = true;
-        natural-scroll = true;
-        click-method = "clickfinger";
-      };
-
-      binds = {
-        "Mod+Space".action.toggle-overview = {};
-        "Mod+Shift+E".action.quit = {};
-        "Mod+F".action.fullscreen-window = {};
-        "Mod+Return".action.spawn = "kitty";
-        "Mod+Q".action.close-window = {};
-        "Mod+E".action.spawn = "nautilus";
-        "Mod+B".action.spawn = "floorp";
-        "Mod+D".action.spawn = "fuzzel";
-        "Mod+Z".action.spawn = ["kitty" "nh" "os" "switch" "./nixos"];
-        "Mod+TouchpadScrollLeft".action.focus-column-left = {};
-        "Mod+TouchpadScrollRight".action.focus-column-right = {};
-        "Mod+TouchpadScrollUp".action.focus-workspace-up = {};
-        "Mod+TouchpadScrollDown".action.focus-workspace-down = {};
-        "Mod+Left".action.focus-column-left = {};
-        "Mod+Shift+Left".action.move-column-left = {};
-        "Mod+Right".action.focus-column-right = {};
-        "Mod+Shift+Right".action.move-column-right = {};
-        "Mod+Up".action.focus-workspace-up = {};
-        "Mod+Shift+Up".action.move-window-to-workspace-up = {};
-        "Mod+Down".action.focus-workspace-down = {};
-        "Mod+Shift+Down".action.move-window-to-workspace-down = {};
-        "XF86MonBrightnessUp".action.spawn = ["brightnessctl" "set" "+5%"];
-        "XF86MonBrightnessDown".action.spawn = ["brightnessctl" "set" "5%-"];
-        "XF86AudioRaiseVolume".action.spawn = ["noctalia-shell" "msg" "volume" "increase"];
-        "XF86AudioLowerVolume".action.spawn = ["noctalia-shell" "msg" "volume" "decrease"];
-        "Mod+Shift+P".action.spawn = ["noctalia-shell" "msg" "sessionMenu" "toggle"];
-      };
-
-      prefer-no-csd = true;
-
-      layout = {
-        gaps = 16;
-        struts.left = 64;
-        struts.right = 64;
-
-        always-center-single-column = true;
-
-        empty-workspace-above-first = true;
-
-        # fog of war
-        focus-ring = {
-          enable = true;
-          width = 2.5;
-          active.color = "#b2b2b2d6";
-        };
-
-        # border.active.gradient = {
-        #   from = "red";
-        #   to = "blue";
-        #   in' = "oklch shorter hue";
-        # };
-
-        shadow.enable = true;
-
-        # default-column-display = "tabbed";
-
-        tab-indicator = {
-          position = "top";
-          gaps-between-tabs = 10;
-
-          # hide-when-single-tab = true;
-          # place-within-column = true;
-
-          # active.color = "red";
-        };
-      };
-
-      overview.zoom = 0.5;
-
-      window-rules = [
-        {
-          draw-border-with-background = false;
-          geometry-corner-radius = let
-            n = 10.0;
-          in {
-            top-right = n;
-            top-left = n;
-            bottom-left = n;
-            bottom-right = n;
-          };
-          clip-to-geometry = true;
-        }
-        {
-          matches = [
-            {
-              app-id = "^floorp$";
-            }
-            {
-              app-id = "^code$";
-            }
-          ];
-          default-column-width.proportion = 1.0;
-        }
-        {
-          matches = [
-            {
-              app-id = "^kitty$";
-            }
-          ];
-          default-column-width.proportion = 0.66;
-        }
-      ];
-
-      debug = {
-        honor-xdg-activation-with-invalid-serial = {};
-      };
-
-      xwayland-satellite.path = "${lib.getExe pkgs.xwayland-satellite-unstable}";
-    };
-  };
-
-  programs.noctalia-shell = {
-    enable = true;
-    settings = {
-      settingsVersion = 0;
-      bar = {
-        barType = "simple";
-        position = "top";
-        monitors = [ ];
-        density = "default";
-        showOutline = false;
-        showCapsule = true;
-        capsuleOpacity = 1;
-        backgroundOpacity = 0.93;
-        useSeparateOpacity = false;
-        floating = false;
-        marginVertical = 4;
-        marginHorizontal = 4;
-        frameThickness = 8;
-        frameRadius = 12;
-        outerCorners = true;
-        hideOnOverview = false;
-        displayMode = "always_visible";
-        autoHideDelay = 500;
-        autoShowDelay = 150;
-        widgets = {
-          left = [
-            {
-              id = "Clock";
-		          formatHorizontal = "h:mm A";
-            }
-            {
-              id = "SystemMonitor";
-            }
-            {
-              id = "MediaMini";
-              scrollingMode="never";
-		          useFixedWidth = false;
-		          maxWidth = 900;             
-            }
-          ];
-          center = [
-            {
-              id = "Workspace";
-            }
-          ];
-          right = [
-            {
-              id = "Tray";
-            }
-            {
-              id = "NotificationHistory";
-            }
-	          {
-		          id = "Brightness";
-	          }
-            {
-              id = "Battery";
-		          displayMode="alwaysShow";
-            }
-            {
-              id = "Volume";
-		          displayMode="alwaysShow";
-            }
-	          {
-		          id = "Bluetooth";
-		          displayMode="alwaysShow";
-	          } 
-            {
-              id = "ControlCenter";
-		          useDistroLogo = true;
-            }
-          ];
-        };
-        screenOverrides = [ ];
-      };
-      general = {
-        avatarImage = "";
-        dimmerOpacity = 0.2;
-        showScreenCorners = true;
-        forceBlackScreenCorners = true;
-        scaleRatio = 1;
-        radiusRatio = 1;
-        iRadiusRatio = 1;
-        boxRadiusRatio = 1;
-        screenRadiusRatio = 1;
-        animationSpeed = 1.25;
-        animationDisabled = false;
-        compactLockScreen = false;
-        lockOnSuspend = true;
-        showSessionButtonsOnLockScreen = true;
-        showHibernateOnLockScreen = false;
-        enableShadows = true;
-        shadowDirection = "bottom_right";
-        shadowOffsetX = 1;
-        shadowOffsetY = 1;
-        language = "";
-        allowPanelsOnScreenWithoutBar = true;
-        showChangelogOnStartup = false;
-        telemetryEnabled = false;
-        enableLockScreenCountdown = true;
-        lockScreenCountdownDuration = 10000;
-        autoStartAuth = false;
-        allowPasswordWithFprintd = true;
-      };
-      ui = {
-        fontDefault = "";
-        fontFixed = "";
-        fontDefaultScale = 1;
-        fontFixedScale = 1;
-        tooltipsEnabled = true;
-        panelBackgroundOpacity = 0.93;
-        panelsAttachedToBar = true;
-        settingsPanelMode = "attached";
-        wifiDetailsViewMode = "grid";
-        bluetoothDetailsViewMode = "grid";
-        networkPanelView = "wifi";
-        bluetoothHideUnnamedDevices = false;
-        boxBorderEnabled = false;
-      };
-      location = {
-        name = "London";
-        weatherEnabled = true;
-        weatherShowEffects = true;
-        useFahrenheit = false;
-        use12hourFormat = false;
-        showWeekNumberInCalendar = false;
-        showCalendarEvents = true;
-        showCalendarWeather = true;
-        analogClockInCalendar = false;
-        firstDayOfWeek = -1;
-        hideWeatherTimezone = false;
-        hideWeatherCityName = true;
-      };
-      calendar = {
-        cards = [
-          {
-            enabled = true;
-            id = "calendar-header-card";
-          }
-          {
-            enabled = true;
-            id = "calendar-month-card";
-          }
-          {
-            enabled = true;
-            id = "weather-card";
-          }
-        ];
-      };
-      wallpaper = {
-        enabled = true;
-        overviewEnabled = true;
-        directory = "/home/grey/nixos/assets/wallpapers";
-        monitorDirectories = [ ];
-        enableMultiMonitorDirectories = false;
-        showHiddenFiles = true;
-        viewMode = "single";
-        setWallpaperOnAllMonitors = true;
-        fillMode = "crop";
-        fillColor = "#000000";
-        useSolidColor = true;
-        solidColor = "#1a1a2e";
-        automationEnabled = false;
-        wallpaperChangeMode = "random";
-        randomIntervalSec = 300;
-        transitionDuration = 1500;
-        transitionType = "random";
-        transitionEdgeSmoothness = 0.05;
-        panelPosition = "follow_bar";
-        hideWallpaperFilenames = false;
-        useWallhaven = false;
-        wallhavenQuery = "";
-        wallhavenSorting = "relevance";
-        wallhavenOrder = "desc";
-        wallhavenCategories = "111";
-        wallhavenPurity = "100";
-        wallhavenRatios = "";
-        wallhavenApiKey = "";
-        wallhavenResolutionMode = "atleast";
-        wallhavenResolutionWidth = "";
-        wallhavenResolutionHeight = "";
-        sortOrder = "name";
-      };
-      appLauncher = {
-        enableClipboardHistory = false;
-        autoPasteClipboard = false;
-        enableClipPreview = true;
-        clipboardWrapText = true;
-        clipboardWatchTextCommand = "wl-paste --type text --watch cliphist store";
-        clipboardWatchImageCommand = "wl-paste --type image --watch cliphist store";
-        position = "center";
-        pinnedApps = [ ];
-        useApp2Unit = false;
-        sortByMostUsed = true;
-        terminalCommand = "alacritty -e";
-        customLaunchPrefixEnabled = false;
-        customLaunchPrefix = "";
-        viewMode = "list";
-        showCategories = true;
-        iconMode = "tabler";
-        showIconBackground = false;
-        enableSettingsSearch = true;
-        enableWindowsSearch = true;
-        ignoreMouseInput = false;
-        screenshotAnnotationTool = "";
-      };
-      controlCenter = {
-        position = "close_to_bar_button";
-        diskPath = "/";
-        shortcuts = {
-          left = [
-            {
-              id = "Network";
-            }
-            {
-              id = "Bluetooth";
-            }
-            {
-              id = "WallpaperSelector";
-            }
-            {
-              id = "NoctaliaPerformance";
-            }
-          ];
-          right = [
-            {
-              id = "Notifications";
-            }
-            {
-              id = "PowerProfile";
-            }
-            {
-              id = "KeepAwake";
-            }
-            {
-              id = "NightLight";
-            }
-          ];
-        };
-        cards = [
-          {
-            enabled = true;
-            id = "profile-card";
-          }
-          {
-            enabled = true;
-            id = "shortcuts-card";
-          }
-          {
-            enabled = true;
-            id = "audio-card";
-          }
-          {
-            enabled = false;
-            id = "brightness-card";
-          }
-          {
-            enabled = true;
-            id = "weather-card";
-          }
-          {
-            enabled = true;
-            id = "media-sysmon-card";
-          }
-        ];
-      };
-      systemMonitor = {
-        cpuWarningThreshold = 80;
-        cpuCriticalThreshold = 90;
-        tempWarningThreshold = 80;
-        tempCriticalThreshold = 90;
-        gpuWarningThreshold = 80;
-        gpuCriticalThreshold = 90;
-        memWarningThreshold = 80;
-        memCriticalThreshold = 90;
-        swapWarningThreshold = 80;
-        swapCriticalThreshold = 90;
-        diskWarningThreshold = 80;
-        diskCriticalThreshold = 90;
-        diskAvailWarningThreshold = 20;
-        diskAvailCriticalThreshold = 10;
-        cpuPollingInterval = 1000;
-        gpuPollingInterval = 3000;
-        enableDgpuMonitoring = false;
-        memPollingInterval = 1000;
-        diskPollingInterval = 30000;
-        networkPollingInterval = 1000;
-        loadAvgPollingInterval = 3000;
-        useCustomColors = false;
-        warningColor = "";
-        criticalColor = "";
-        externalMonitor = "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor";
-      };
-      dock = {
-        enabled = false;
-        position = "bottom";
-        displayMode = "auto_hide";
-        backgroundOpacity = 1;
-        floatingRatio = 1;
-        size = 1;
-        onlySameOutput = true;
-        monitors = [ ];
-        pinnedApps = [ ];
-        colorizeIcons = false;
-        pinnedStatic = false;
-        inactiveIndicators = false;
-        deadOpacity = 0.6;
-        animationSpeed = 1;
-      };
-      network = {
-        wifiEnabled = true;
-        bluetoothRssiPollingEnabled = false;
-        bluetoothRssiPollIntervalMs = 10000;
-        wifiDetailsViewMode = "grid";
-        bluetoothDetailsViewMode = "grid";
-        bluetoothHideUnnamedDevices = false;
-      };
-      sessionMenu = {
-        enableCountdown = false;
-        countdownDuration = 10000;
-        position = "center";
-        showHeader = true;
-        largeButtonsStyle = true;
-        largeButtonsLayout = "single-row";
-        showNumberLabels = true;
-        powerOptions = [
-          {
-            action = "lock";
-            enabled = false;
-          }
-          {
-            action = "suspend";
-            enabled = true;
-          }
-          {
-            action = "hibernate";
-            enabled = false;
-          }
-          {
-            action = "reboot";
-            enabled = true;
-          }
-          {
-            action = "logout";
-            enabled = false;
-          }
-          {
-            action = "shutdown";
-            enabled = true;
-          }
-        ];
-      };
-      notifications = {
-        enabled = true;
-        monitors = [ ];
-        location = "top_right";
-        overlayLayer = true;
-        backgroundOpacity = 1;
-        respectExpireTimeout = false;
-        lowUrgencyDuration = 3;
-        normalUrgencyDuration = 8;
-        criticalUrgencyDuration = 15;
-        enableKeyboardLayoutToast = true;
-        saveToHistory = {
-          low = true;
-          normal = true;
-          critical = true;
-        };
-        sounds = {
-          enabled = false;
-          volume = 0.5;
-          separateSounds = false;
-          criticalSoundFile = "";
-          normalSoundFile = "";
-          lowSoundFile = "";
-          excludedApps = "discord,firefox,chrome,chromium,edge";
-        };
-        enableMediaToast = false;
-      };
-      osd = {
-        enabled = true;
-        location = "top_right";
-        autoHideMs = 2000;
-        overlayLayer = true;
-        backgroundOpacity = 1;
-        enabledTypes = [
-          0
-          1
-          2
-        ];
-        monitors = [ ];
-      };
-      audio = {
-        volumeStep = 5;
-        volumeOverdrive = false;
-        cavaFrameRate = 30;
-        visualizerType = "linear";
-        mprisBlacklist = [ ];
-        preferredPlayer = "";
-        volumeFeedback = false;
-      };
-      brightness = {
-        brightnessStep = 5;
-        enforceMinimum = true;
-        enableDdcSupport = false;
-      };
-      colorSchemes = {
-        useWallpaperColors = false;
-        predefinedScheme = "Nord";
-        darkMode = true;
-        monitorForColors = "";
-      };
-      nightLight = {
-        enabled = true;
-        forced = false;
-        autoSchedule = true;
-        nightTemp = "5000";
-        dayTemp = "6250";
-        manualSunrise = "06:30";
-        manualSunset = "18:30";
-      };
-      hooks = {
-        enabled = false;
-        wallpaperChange = "";
-        darkModeChange = "";
-        screenLock = "";
-        screenUnlock = "";
-        performanceModeEnabled = "";
-        performanceModeDisabled = "";
-        startup = "";
-        session = "";
-      };
-      desktopWidgets = {
-        enabled = false;
-        gridSnap = false;
-        monitorWidgets = [ ];
-      };
-    };
+      if [ -d /home/grey/.local/state/noctalia/plugins ]; then
+        rm -rf /home/grey/.local/state/noctalia/plugins
+      fi
+      ln -s /home/grey/nixos/assets/dotfiles/noctalia-state/plugins /home/grey/.local/state/noctalia/plugins
+    '';
   };
 }
\ No newline at end of file
diff --git a/global-configs/plasma.nix b/global-configs/plasma.nix
index 2cf88d6..87d26f8 100644
--- a/global-configs/plasma.nix
+++ b/global-configs/plasma.nix
@@ -1,8 +1,13 @@
 {
   pkgs,
   lib,
+  inputs,
   ...
 }: {
+  imports = [
+    inputs.plasma-manager.homeModules.plasma-manager
+  ];
+
   home.packages = [
     pkgs.papirus-icon-theme
     pkgs.kdePackages.oxygen
diff --git a/global-configs/spicetify.nix b/global-configs/spicetify.nix
new file mode 100644
index 0000000..a508815
--- /dev/null
+++ b/global-configs/spicetify.nix
@@ -0,0 +1,33 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.spicetify.homeManagerModules.default
+  ];
+
+  programs.spicetify =
+  let
+    spicePkgs = inputs.spicetify.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+  in {
+    enable = true;
+    enabledExtensions = with spicePkgs.extensions; [
+      adblock
+      hidePodcasts
+    ];
+    enabledSnippets = with spicePkgs.snippets; [
+      spinningCdCoverArt
+      fixLikedIcon
+      oneko
+      hideMiniPlayerButton
+      hideFullScreenButton
+      declutterNowPlayingBar
+      modernScrollbar
+    ];
+    enabledCustomApps = with spicePkgs.apps; [
+      # marketplace
+    ];
+  };
+}
\ No newline at end of file
diff --git a/global-configs/vscode.nix b/global-configs/vscode.nix
index dbc4ab5..feddd73 100644
--- a/global-configs/vscode.nix
+++ b/global-configs/vscode.nix
@@ -15,6 +15,12 @@
           version = "0.1.12";
           sha256 = "sha256-JtVtBFZPsSMDC9040UE8gTg4YmNLVFQJz0NGa0+QBqA=";
         }
+        {
+          name = "kdl";
+          publisher = "kdl-org";
+          version = "2.1.3";
+          sha256 = "sha256-Jssmb5owrgNWlmLFSKCgqMJKp3sPpOrlEUBwzZSSpbM=";
+        }
       ];
     };
     profiles.default = {
diff --git a/global-configs/zen-browser.nix b/global-configs/zen-browser.nix
index a6c606b..37377c8 100644
--- a/global-configs/zen-browser.nix
+++ b/global-configs/zen-browser.nix
@@ -5,6 +5,10 @@
 }: let
   firefox-addons = with pkgs; inputs.firefox-addons.packages.${system};
 in {
+  imports = [
+    inputs.zen-browser.homeModules.beta
+  ];
+
   programs.zen-browser = {
     enable = true;
     setAsDefaultBrowser = true;
diff --git a/global-configs/zsh.nix b/global-configs/zsh.nix
index 5ded758..c7e7373 100644
--- a/global-configs/zsh.nix
+++ b/global-configs/zsh.nix
@@ -7,6 +7,7 @@
   programs.kitty.shellIntegration.enableZshIntegration = true;
 
   programs.zsh = {
+    completionInit = "";
     enable = true;
     antidote = {
       enable = true;
diff --git a/global-default.nix b/global-default.nix
index 454318e..ccb0bc0 100644
--- a/global-default.nix
+++ b/global-default.nix
@@ -8,26 +8,20 @@
     ./hosts/${specialArgs.hostname}/hardware-configuration.nix
   ];
 
-  networking.hostName = specialArgs.hostname; # Define your hostname.
+  networking.hostName = specialArgs.hostname;
 
   nix.settings.experimental-features = [
     "nix-command"
     "flakes"
   ];
 
-  # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  # Enable networking
   networking.networkmanager.enable = true;
 
-  # Set your time zone.
   time.timeZone = "Europe/London";
-
-  # Select internationalisation properties.
   i18n.defaultLocale = "en_GB.UTF-8";
-
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "en_GB.UTF-8";
     LC_IDENTIFICATION = "en_GB.UTF-8";
@@ -40,16 +34,12 @@
     LC_TIME = "en_GB.UTF-8";
   };
 
-  # Configure keymap in X11
   services.xserver.xkb = {
     layout = "gb";
     variant = "";
   };
-
-  # Configure console keymap
   console.keyMap = "uk";
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users."grey" = {
     isNormalUser = true;
     description = "grey";
@@ -57,11 +47,8 @@
     packages = with pkgs; [];
   };
 
-  # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
     git
     fzf
@@ -69,11 +56,20 @@
     busybox
   ];
 
+  programs.nano = {
+    enable = true;
+    nanorc = ''
+      set nowrap
+      set tabstospaces
+      set tabsize 2
+    '';
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = specialArgs.stateVersion; # Did you read the comment?
+  system.stateVersion = specialArgs.stateVersion;
 }
\ No newline at end of file
diff --git a/global-home.nix b/global-home.nix
index eb2a863..cc64085 100644
--- a/global-home.nix
+++ b/global-home.nix
@@ -51,4 +51,4 @@
   };
 
   home.shell.enableBashIntegration = true;
-}
\ No newline at end of file
+}
diff --git a/hosts/kitagawa/default.nix b/hosts/kitagawa/default.nix
index 231ff5e..842558b 100644
--- a/hosts/kitagawa/default.nix
+++ b/hosts/kitagawa/default.nix
@@ -15,11 +15,15 @@ in {
     "${modules-dir}/nh.nix"
     "${modules-dir}/home-manager.nix"
     "${modules-dir}/zsh.nix"
-    "${modules-dir}/display-managers/gdm.nix"
-    "${modules-dir}/desktop-environments/gnome.nix"
+    "${modules-dir}/display-managers/lightdm.nix"
+    #"${modules-dir}/desktop-environments/gnome.nix"
     "${modules-dir}/window-managers/niri.nix"
   ];
 
+  stylix.enable = true;
+  stylix.image = ../../assets/wallpapers/kitagawa.jpg;
+  stylix.polarity = "dark";
+
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Configure network proxy if necessary
@@ -33,6 +37,11 @@ in {
     enable = true;
   };
 
+  services.fprintd.enable = true;
+  services.fprintd.tod.enable = true;
+  services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix-550a;
+  security.pam.services.grey.fprintAuth = true;
+
   programs.nautilus-open-any-terminal = {
     enable = true;
     terminal = "kitty";
diff --git a/hosts/kitagawa/home.nix b/hosts/kitagawa/home.nix
index b5ff0b1..6595869 100644
--- a/hosts/kitagawa/home.nix
+++ b/hosts/kitagawa/home.nix
@@ -14,23 +14,26 @@ in {
     "${global-configs}/kitty.nix"
     "${global-configs}/floorp.nix"
     "${global-configs}/vscode.nix"
-    "${global-configs}/niri.nix"
     "${global-configs}/gnome.nix"
     "${global-configs}/equibop.nix"
+    "${global-configs}/spicetify.nix"
+    "${global-configs}/niri.nix"
   ];
 
   home.packages = with pkgs; [
     obsidian
     github-desktop
     thunderbird
-    spotify
     jetbrains.clion
     jetbrains.idea
     proton-vpn
     ente-auth
     signal-desktop
+    hyperfine
   ];
 
+  stylix.targets.floorp.profileNames = [ "default" ];
+
   dconf.settings = {
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
@@ -39,11 +42,6 @@ in {
 
   gtk = {
     enable = true;
-    colorScheme = "dark";
-    theme = {
-      name = "Adwaita-dark";
-      package = pkgs.gnome-themes-extra;
-    };
     gtk3.bookmarks = [
       "file:///home/grey/nixos NixOS"
       "file:///home/grey/Downloads Downloads"
@@ -55,12 +53,6 @@ in {
     ];
   };
 
-  qt = {
-    enable = true;
-    platformTheme.name = "adwaita";
-    style.name = "adwaita-dark";
-  };
-
   xdg = {
     enable = true;
     mimeApps.defaultApplications = {
diff --git a/hosts/nixos-vm/configs/kitty.nix b/hosts/nixos-vm/configs/kitty.nix
new file mode 100644
index 0000000..8edadad
--- /dev/null
+++ b/hosts/nixos-vm/configs/kitty.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}: {
+  imports = [
+    ../../../global-configs/kitty.nix
+  ];
+
+  programs.kitty = {
+    themeFile = "Arthur";
+  };
+}
\ No newline at end of file
diff --git a/hosts/nixos-vm/home.nix b/hosts/nixos-vm/home.nix
index c61cdb1..c2cc739 100644
--- a/hosts/nixos-vm/home.nix
+++ b/hosts/nixos-vm/home.nix
@@ -13,7 +13,7 @@ in {
     "${global-configs}/fastfetch.nix"
     "${global-configs}/zen-browser.nix"
     "${global-configs}/zsh.nix"
-    "${global-configs}/kitty.nix"
+    ./configs/kitty.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index 6a24c0c..acf0454 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -7,12 +7,5 @@
     inputs.home-manager.packages.${system}.default
   ];
 
-  home-manager.backupFileExtension = ".bak";
-
-  home-manager.sharedModules = [
-    inputs.plasma-manager.homeModules.plasma-manager
-    inputs.zen-browser.homeModules.beta
-    inputs.niri.homeModules.niri
-    inputs.noctalia.homeModules.default
-  ];
+  home-manager.backupFileExtension = "bak";
 }
diff --git a/modules/window-managers/niri.nix b/modules/window-managers/niri.nix
index 6c485e3..fd3ddc8 100644
--- a/modules/window-managers/niri.nix
+++ b/modules/window-managers/niri.nix
@@ -2,23 +2,19 @@
   config,
   pkgs,
   inputs,
-  lib,
   ...
 }: {
-  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
-
-  programs.niri.enable = true;
-
   environment.systemPackages = with pkgs; [
     inputs.noctalia.packages.${system}.default
+    xdg-desktop-portal-gnome
     wl-clipboard
     wayland-utils
     libsecret
     cage
-    fuzzel
-    mako
-    gamescope
-    xwayland-satellite-unstable
-    brightnessctl
   ];
-}
\ No newline at end of file
+
+  programs.niri = {
+    enable = true;
+    useNautilus = true;
+  };
+}