diff --git a/flake.lock b/flake.lock
index 3897e8c..d2439b6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,37 +1,18 @@
 {
   "nodes": {
-    "aerothemeplasma-nix": {
+    "apple-silicon": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1771215876,
-        "narHash": "sha256-aei7McII5+y4tROXfmOVyLbPO62sWttNkOKUlCSEIcg=",
-        "owner": "nyakase",
-        "repo": "aerothemeplasma-nix",
-        "rev": "b922785202501754c4503232aa5f172aeaef8b00",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nyakase",
-        "repo": "aerothemeplasma-nix",
-        "type": "github"
-      }
-    },
-    "apple-silicon": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1771054135,
-        "narHash": "sha256-0RYmnOk40U4ZGbW/+3rHlNndrsuHCz9h+xequKWgwHQ=",
+        "lastModified": 1770630652,
+        "narHash": "sha256-/fhL3g+Rp16vvsNPijhLgBuZeYCv7VJr6OTJpA0ZRnw=",
         "owner": "nix-community",
         "repo": "nixos-apple-silicon",
-        "rev": "357186cca0f4c7801ff16970e4b6a05e74fd88e0",
+        "rev": "f2936008b132717d7cc4616bbac56f7478bb0a58",
         "type": "github"
       },
       "original": {
@@ -172,24 +153,6 @@
       }
     },
     "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
-      "locked": {
-        "lastModified": 1768135262,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -210,7 +173,7 @@
         "type": "github"
       }
     },
-    "flake-parts_4": {
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "nur",
@@ -332,7 +295,7 @@
         "cachyos-kernel": "cachyos-kernel",
         "cachyos-kernel-patches": "cachyos-kernel-patches",
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -351,22 +314,6 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1768305791,
-        "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1765674936,
@@ -382,21 +329,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib_2": {
-      "locked": {
-        "lastModified": 1765674936,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1769598131,
@@ -431,7 +363,7 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -473,7 +405,7 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -533,7 +465,6 @@
     },
     "root": {
       "inputs": {
-        "aerothemeplasma-nix": "aerothemeplasma-nix",
         "apple-silicon": "apple-silicon",
         "base16": "base16",
         "base16-discord": "base16-discord",
@@ -542,8 +473,7 @@
         "niri": "niri",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nixpkgs": [
-          "apple-silicon",
-          "nixpkgs"
+          "nixpkgs-unstable"
         ],
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index 4aba175..1137c1f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     # edit this to switch between stable and unstable
-    nixpkgs.follows = "apple-silicon/nixpkgs";
+    nixpkgs.follows = "nixpkgs-unstable";
 
     nix-cachyos-kernel = {
       url = "github:xddxdd/nix-cachyos-kernel";
@@ -38,11 +38,6 @@
       inputs.home-manager.follows = "home-manager";
     };
 
-    aerothemeplasma-nix = {
-      url = "github:nyakase/aerothemeplasma-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     niri = {
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -78,7 +73,7 @@
 
     apple-silicon = {
       url = "github:nix-community/nixos-apple-silicon";
-      # inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     openmw = {
@@ -102,7 +97,6 @@
       base16-discord,
       home-manager,
       plasma-manager,
-      aerothemeplasma-nix,
       niri,
       noctalia,
       spicetify-nix,
@@ -220,7 +214,6 @@
             ./system/tailscale
             ./system/hosts/${hostname}
             ./hardware/${hostname}
-            aerothemeplasma-nix.nixosModules.aerothemeplasma-nix
             niri.nixosModules.niri
             home-manager.nixosModules.home-manager
             noctalia.nixosModules.default
@@ -249,7 +242,6 @@
                       scheme = "${tt-schemes}/base24/${config.colors.scheme}.yaml";
                     }
                   )
-                  aerothemeplasma-nix.homeModules.aerothemeplasma-nix
                   plasma-manager.homeModules.plasma-manager
                   noctalia.homeModules.default
                   spicetify-nix.homeManagerModules.default
diff --git a/home/apps/firefox_css/theme/theme-new.css b/home/apps/firefox_css/theme/theme-new.css
deleted file mode 100644
index 204e3df..0000000
--- a/home/apps/firefox_css/theme/theme-new.css
+++ /dev/null
@@ -1,459 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* DO NOT EDIT this file directly, instead modify design-tokens.json
- * and run `npm run build` to see your changes. */
-
-@import "../colors.css";
-
-@layer tokens-foundation, tokens-prefers-contrast, tokens-forced-colors;
-
-@layer tokens-foundation {
-  :root,
-  :host(.anonymous-content-host) {
-    /** Background Color **/
-    --background-color-box: var(--base) !important;
-    --background-color-critical: var(--maroon) !important;
-    --background-color-information: var(--sapphire) !important;
-    --background-color-success: var(--teal) !important;
-    --background-color-warning: var(--peach) !important;
-    --promo-background-color: var(--background-color-information) !important;
-    --table-row-background-color: var(--mantle) !important;
-
-    /** Border **/
-    --border-color-card: color-mix(
-      in srgb,
-      currentColor 10%,
-      transparent
-    ) !important;
-    --border-color-interactive-hover: var(
-      --border-color-interactive
-    ) !important;
-    --border-color-interactive-active: var(
-      --border-color-interactive
-    ) !important;
-    --border-color-interactive-disabled: var(
-      --border-color-interactive
-    ) !important;
-    --border-color-selected: var(--accent) !important;
-    --border-color-transparent: transparent !important;
-    --border-radius-circle: 9999px !important;
-    --border-radius-xsmall: 2px !important;
-    --border-radius-small: 4px !important;
-    --border-radius-medium: 8px !important;
-    --border-radius-large: 16px !important;
-    --border-width: 0px !important;
-
-    /** Box Shadow **/
-    --box-shadow-card: var(--box-shadow-level-2) !important;
-    --box-shadow-card-hover: var(--box-shadow-level-4) !important;
-    --box-shadow-color-darker-layer-1: rgba(0, 0, 0, 0.15) !important;
-    --box-shadow-color-darker-layer-2: rgba(0, 0, 0, 0.2) !important;
-    --box-shadow-color-lighter-layer-1: rgba(0, 0, 0, 0.05) !important;
-    --box-shadow-color-lighter-layer-2: rgba(0, 0, 0, 0.1) !important;
-    --box-shadow-level-1:
-      0 0 1px var(--box-shadow-color-darker-layer-1),
-      0 1px 2px var(--box-shadow-color-darker-layer-2) !important;
-    --box-shadow-level-2:
-      0 0.25px 0.75px var(--box-shadow-color-lighter-layer-1),
-      0 2px 6px var(--box-shadow-color-lighter-layer-2) !important;
-    --box-shadow-level-3:
-      0 0.375px 1.5px var(--box-shadow-color-lighter-layer-1),
-      0 3px 12px var(--box-shadow-color-lighter-layer-2) !important;
-    --box-shadow-level-4:
-      0 0.5px 2px var(--box-shadow-color-lighter-layer-1),
-      0 4px 16px var(--box-shadow-color-lighter-layer-2) !important;
-    --box-shadow-popup: var(--box-shadow-level-3) !important;
-    --box-shadow-tab: var(--box-shadow-level-1) !important;
-
-    /** Button **/
-    --button-background-color-disabled: var(
-      --button-background-color
-    ) !important;
-    --button-background-color-destructive: var(--red) !important;
-    --button-background-color-destructive-hover: color-mix(
-      in srgb,
-      var(--red),
-      var(--text) 10%
-    ) !important;
-    --button-background-color-destructive-active: color-mix(
-      in srgb,
-      var(--red),
-      var(--text) 20%
-    ) !important;
-    --button-background-color-destructive-disabled: var(
-      --button-background-color-destructive
-    ) !important;
-    --button-background-color-destructive-selected: var(
-      --button-background-color-destructive-active
-    ) !important;
-    --button-background-color-ghost: transparent !important;
-    --button-background-color-ghost-hover: var(
-      --button-background-color-hover
-    ) !important;
-    --button-background-color-ghost-active: var(
-      --button-background-color-active
-    ) !important;
-    --button-background-color-ghost-disabled: var(
-      --button-background-color-ghost
-    ) !important;
-    --button-background-color-ghost-selected: var(
-      --button-background-color-ghost-active
-    ) !important;
-    --button-background-color-primary: var(--accent) !important;
-    --button-background-color-primary-hover: color-mix(
-      in srgb,
-      var(--accent),
-      var(--text) 10%
-    ) !important;
-    --button-background-color-primary-active: color-mix(
-      in srgb,
-      var(--accent),
-      var(--text) 20%
-    ) !important;
-    --button-background-color-primary-disabled: var(
-      --button-background-color-primary
-    ) !important;
-    --button-background-color-primary-selected: var(
-      --button-background-color-primary-active
-    ) !important;
-    --button-background-color-selected: var(
-      --button-background-color-active
-    ) !important;
-    --button-border: var(--border-width) solid var(--button-border-color) !important;
-    --button-border-color: transparent !important;
-    --button-border-color-hover: var(--button-border-color) !important;
-    --button-border-color-active: var(--button-border-color) !important;
-    --button-border-color-disabled: var(--button-border-color) !important;
-    --button-border-color-destructive: transparent !important;
-    --button-border-color-destructive-hover: var(
-      --button-border-color-destructive
-    ) !important;
-    --button-border-color-destructive-active: var(
-      --button-border-color-destructive
-    ) !important;
-    --button-border-color-destructive-disabled: var(
-      --button-border-color-destructive
-    ) !important;
-    --button-border-color-destructive-selected: var(
-      --button-border-color-destructive-active
-    ) !important;
-    --button-border-color-ghost: var(--button-border-color) !important;
-    --button-border-color-ghost-hover: var(
-      --button-border-color-hover
-    ) !important;
-    --button-border-color-ghost-active: var(
-      --button-border-color-active
-    ) !important;
-    --button-border-color-ghost-disabled: var(
-      --button-border-color-disabled
-    ) !important;
-    --button-border-color-ghost-selected: var(
-      --button-border-color-ghost-active
-    ) !important;
-    --button-border-color-primary: transparent !important;
-    --button-border-color-primary-hover: var(
-      --button-border-color-primary
-    ) !important;
-    --button-border-color-primary-active: var(
-      --button-border-color-primary
-    ) !important;
-    --button-border-color-primary-disabled: var(
-      --button-border-color-primary
-    ) !important;
-    --button-border-color-primary-selected: var(
-      --button-border-color-primary-active
-    ) !important;
-    --button-border-color-selected: var(
-      --button-border-color-active
-    ) !important;
-    --button-border-radius: var(--border-radius-medium) !important;
-    --button-font-size: var(--font-size-root) !important;
-    --button-font-size-small: var(--font-size-small) !important;
-    --button-font-weight: var(--font-weight-semibold) !important;
-    --button-icon-fill: currentColor !important;
-    --button-icon-stroke: var(--button-icon-fill) !important;
-    --button-min-height: var(--size-item-large) !important;
-    --button-min-height-small: var(--size-item-medium) !important;
-    --button-opacity-disabled: 0.5 !important;
-    --button-padding: var(--space-xsmall) var(--space-large) !important;
-    --button-padding-icon: 0 !important;
-    --button-size-icon: var(--button-min-height) !important;
-    --button-size-icon-small: var(--button-min-height-small) !important;
-    --button-text-color-hover: var(--button-text-color) !important;
-    --button-text-color-active: var(--button-text-color) !important;
-    --button-text-color-disabled: var(--button-text-color) !important;
-    --button-text-color-destructive: var(--crust) !important;
-    --button-text-color-destructive-hover: var(
-      --button-text-color-destructive
-    ) !important;
-    --button-text-color-destructive-active: var(
-      --button-text-color-destructive
-    ) !important;
-    --button-text-color-destructive-disabled: var(
-      --button-text-color-destructive
-    ) !important;
-    --button-text-color-destructive-selected: var(
-      --button-text-color-destructive-active
-    ) !important;
-    --button-text-color-ghost: inherit !important;
-    --button-text-color-ghost-hover: inherit !important;
-    --button-text-color-ghost-active: inherit !important;
-    --button-text-color-ghost-disabled: inherit !important;
-    --button-text-color-ghost-selected: var(
-      --button-text-color-ghost-active
-    ) !important;
-    --button-text-color-primary-hover: var(
-      --button-text-color-primary
-    ) !important;
-    --button-text-color-primary-active: var(
-      --button-text-color-primary-hover
-    ) !important;
-    --button-text-color-primary-disabled: var(
-      --button-text-color-primary
-    ) !important;
-    --button-text-color-primary-selected: var(
-      --button-text-color-primary-active
-    ) !important;
-    --button-text-color-selected: var(--button-text-color-active) !important;
-
-    /** Checkbox **/
-    --checkbox-margin-inline: var(--space-small) !important;
-    --checkbox-size: var(--size-item-small) !important;
-
-    /** Focus Outline **/
-    --focus-outline: var(--focus-outline-width) solid var(--focus-outline-color) !important;
-    --focus-outline-color: var(--accent) !important;
-    --focus-outline-inset: calc(-1 * var(--focus-outline-width)) !important;
-    --focus-outline-offset: 2px !important;
-    --focus-outline-width: 2px !important;
-
-    /** Font Weight **/
-    --font-weight: normal !important;
-    --font-weight-bold: 700 !important;
-    --font-weight-semibold: 600 !important;
-
-    /** Heading **/
-    --heading-font-size-medium: var(--font-size-large) !important;
-    --heading-font-size-large: var(--font-size-xlarge) !important;
-    --heading-font-size-xlarge: var(--font-size-xxlarge) !important;
-    --heading-font-weight: var(--font-weight-semibold) !important;
-
-    /** Icon **/
-    --icon-color: var(--subtext1) !important;
-    --icon-color-critical: var(--red) !important;
-    --icon-color-information: var(--sky) !important;
-    --icon-color-success: var(--green) !important;
-    --icon-color-warning: var(--yellow) !important;
-    --icon-size: var(--icon-size-small) !important;
-    --icon-size-xsmall: var(--size-item-xsmall) !important;
-    --icon-size-small: var(--size-item-small) !important;
-    --icon-size-medium: 20px !important;
-    --icon-size-large: var(--size-item-medium) !important;
-    --icon-size-xlarge: var(--size-item-large) !important;
-
-    /** Input - Text **/
-    --input-text-min-height: var(--button-min-height) !important;
-
-    /** Link **/
-    --link-focus-outline-offset: 1px !important;
-
-    /** Outline Color **/
-    --outline-color-error: var(--red) !important;
-
-    /** Size **/
-    --size-item-xsmall: 12px !important;
-    --size-item-small: 16px !important;
-    --size-item-medium: 24px !important;
-    --size-item-large: 32px !important;
-    --size-item-xlarge: 48px !important;
-
-    /** Space **/
-    --space-xxsmall: calc(0.5 * var(--space-xsmall)) !important;
-    --space-xsmall: 0.267rem !important;
-    --space-small: calc(2 * var(--space-xsmall)) !important;
-    --space-medium: calc(3 * var(--space-xsmall)) !important;
-    --space-large: calc(4 * var(--space-xsmall)) !important;
-    --space-xlarge: calc(6 * var(--space-xsmall)) !important;
-    --space-xxlarge: calc(8 * var(--space-xsmall)) !important;
-
-    /** Text **/
-    --text-color-disabled: color-mix(
-      in srgb,
-      currentColor 40%,
-      transparent
-    ) !important;
-    --text-color-deemphasized: color-mix(
-      in srgb,
-      currentColor 69%,
-      transparent
-    ) !important;
-    --text-color-error: var(--red) !important;
-  }
-}
-
-@layer tokens-prefers-contrast {
-  @media (prefers-contrast) {
-    :root,
-    :host(.anonymous-content-host) {
-      /** Attention Dot **/
-      --attention-dot-color: var(--accent) !important;
-
-      /** Background Color **/
-      --background-color-box: var(--base) !important;
-      --background-color-box-info: var(--base) !important;
-      --background-color-canvas: var(--base) !important;
-      --background-color-critical: var(--base) !important;
-      --background-color-information: var(--base) !important;
-      --background-color-success: var(--base) !important;
-      --background-color-warning: var(--base) !important;
-
-      /** Border **/
-      --border-color: var(--text) !important;
-      --border-color-card: color-mix(
-        in srgb,
-        currentColor 41%,
-        transparent
-      ) !important;
-      --border-color-deemphasized: currentColor !important;
-      --border-color-interactive: var(--text) !important;
-      --border-color-transparent: var(--text) !important;
-
-      /** Button **/
-      --button-border-color: var(--button-text-color) !important;
-      --button-text-color-ghost-hover: var(
-        --button-text-color-hover
-      ) !important;
-      --button-text-color-ghost-active: var(
-        --button-text-color-active
-      ) !important;
-
-      /** Icon **/
-      --icon-color: var(--text) !important;
-      --icon-color-critical: var(--icon-color) !important;
-      --icon-color-information: var(--icon-color) !important;
-      --icon-color-success: var(--icon-color) !important;
-      --icon-color-warning: var(--icon-color) !important;
-
-      /** Outline Color **/
-      --outline-color-error: var(--border-color) !important;
-
-      /** Text **/
-      --text-color: var(--text) !important;
-      --text-color-deemphasized: inherit !important;
-      --text-color-error: inherit !important;
-    }
-  }
-}
-
-@layer tokens-forced-colors {
-  @media (forced-colors) {
-    :root,
-    :host(.anonymous-content-host) {
-      /** Background Color **/
-      --table-row-background-color-alternate: var(--base) !important;
-
-      /** Border **/
-      --border-color-card: var(--text) !important;
-      --border-color-deemphasized: var(--text) !important;
-      --border-color-interactive: var(--text) !important;
-      --border-color-interactive-hover: var(--accent) !important;
-      --border-color-interactive-active: var(--text) !important;
-      --border-color-interactive-disabled: var(--subtext0) !important;
-      --border-color-selected: var(--accent) !important;
-
-      /** Button **/
-      --button-background-color: var(--surface0) !important;
-      --button-background-color-hover: var(--crust) !important;
-      --button-background-color-active: var(--crust) !important;
-      --button-background-color-disabled: var(--surface0) !important;
-      --button-background-color-destructive: var(
-        --button-background-color-primary
-      ) !important;
-      --button-background-color-destructive-hover: var(
-        --button-background-color-primary-hover
-      ) !important;
-      --button-background-color-destructive-active: var(
-        --button-background-color-primary-active
-      ) !important;
-      --button-background-color-destructive-disabled: var(
-        --button-background-color-primary-disabled
-      ) !important;
-      --button-background-color-primary-disabled: var(
-        --button-text-color-disabled
-      ) !important;
-      --button-border-color: var(--border-color-interactive) !important;
-      --button-border-color-hover: var(
-        --border-color-interactive-hover
-      ) !important;
-      --button-border-color-active: var(
-        --border-color-interactive-active
-      ) !important;
-      --button-border-color-disabled: var(
-        --border-color-interactive-disabled
-      ) !important;
-      --button-border-color-destructive: var(
-        --button-border-color-primary
-      ) !important;
-      --button-border-color-destructive-hover: var(
-        --button-border-color-primary-hover
-      ) !important;
-      --button-border-color-destructive-active: var(
-        --button-border-color-primary-active
-      ) !important;
-      --button-border-color-destructive-disabled: var(
-        --button-border-color-primary-disabled
-      ) !important;
-      --button-border-color-primary: var(--surface0) !important;
-      --button-border-color-primary-hover: var(--crust) !important;
-      --button-border-color-primary-active: var(--text) !important;
-      --button-opacity-disabled: 1 !important;
-      --button-text-color: var(--text) !important;
-      --button-text-color-hover: var(--accent) !important;
-      --button-text-color-active: var(--accent) !important;
-      --button-text-color-disabled: var(--subtext0) !important;
-      --button-text-color-destructive: var(
-        --button-text-color-primary
-      ) !important;
-      --button-text-color-destructive-hover: var(
-        --button-text-color-primary-hover
-      ) !important;
-      --button-text-color-destructive-active: var(
-        --button-text-color-primary-active
-      ) !important;
-      --button-text-color-destructive-disabled: var(
-        --button-text-color-primary-disabled
-      ) !important;
-      --button-text-color-ghost-hover: var(
-        --button-text-color-hover
-      ) !important;
-      --button-text-color-ghost-active: var(
-        --button-text-color-active
-      ) !important;
-      --button-text-color-primary: var(--surface0) !important;
-      --button-text-color-primary-hover: var(--crust) !important;
-
-      /** Color **/
-      --color-accent-primary: var(--text) !important;
-      --color-accent-primary-hover: var(--accent) !important;
-      --color-accent-primary-active: var(
-        --color-accent-primary-hover
-      ) !important;
-      --color-accent-primary-selected: var(--accent) !important;
-
-      /** Focus Outline **/
-      --focus-outline-color: var(--text) !important;
-
-      /** Link **/
-      --link-color: var(--blue) !important;
-      --link-color-hover: var(--blue) !important;
-      --link-color-active: var(--red) !important;
-      --link-color-visited: var(--link-color) !important;
-
-      /** Text **/
-      --text-color-disabled: var(--subtext0) !important;
-      --text-color-accent-primary-selected: var(--crust) !important;
-    }
-  }
-}
diff --git a/home/default.nix b/home/default.nix
index 7bc7bd8..d49376d 100755
--- a/home/default.nix
+++ b/home/default.nix
@@ -89,6 +89,21 @@
       };
     };
 
+    # programs.plasma = {
+    #   workspace = {
+    #     colorScheme = "Catppuccin${config.catppuccinUpper.flavor}${config.catppuccinUpper.accent}";
+    #     cursor.theme = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}-cursors";
+    #     splashScreen.theme = "Catpppuccin-${config.catppuccinUpper.flavor}-${config.catppuccinUpper.accent}";
+    #   };
+
+    #   configFile = {
+    #     kdeglobals.KDE = {
+    #       DefaultDarkLookAndFeel = "Catpppuccin-${config.catppuccinUpper.flavor}-${config.catppuccinUpper.accent}";
+    #       DefaultLightLookAndFeel = "Catpppuccin-Latte-${config.catppuccinUpper.accent}";
+    #     };
+    #   };
+    # };
+
     # This value determines the Home Manager release that your
     # configuration is compatible with. This helps avoid breakage
     # when a new Home Manager release introduces backwards
diff --git a/home/hosts/alien/default.nix b/home/hosts/alien/default.nix
index 513501e..ca2572a 100644
--- a/home/hosts/alien/default.nix
+++ b/home/hosts/alien/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   pkgs-unstable,
   spicetify-nix,
   ...
@@ -52,4 +51,72 @@
       theme = spicePkgs.themes.catppuccin;
       colorScheme = "mocha";
     };
+
+  programs.plasma = {
+    panels = [
+      # Alternative global menu to fit the modified taskbar
+      {
+        location = "bottom";
+        height = 40;
+        hiding = "dodgewindows";
+        lengthMode = "fit";
+        floating = true;
+        alignment = "right";
+        widgets = [
+          "org.kde.plasma.appmenu"
+          {
+            plasmusicToolbar = {
+              panelIcon = {
+                albumCover = {
+                  useAsIcon = false;
+                  radius = 8;
+                };
+                icon = "view-media-track";
+              };
+              playbackSource = "auto";
+              musicControls.showPlaybackControls = true;
+              songText = {
+                displayInSeparateLines = true;
+                maximumWidth = 640;
+                scrolling = {
+                  behavior = "alwaysScroll";
+                  speed = 3;
+                };
+              };
+            };
+          }
+          "org.kde.plasma.marginsseparator"
+          {
+            systemTray.items = {
+              shown = [
+                "org.kde.plasma.battery"
+                "org.kde.plasma.bluetooth"
+                "org.kde.plasma.networkmanagement"
+                "org.kde.plasma.brightness"
+                "org.kde.plasma.volume"
+              ];
+              hidden = [
+                "org.kde.plasma.clipboard"
+                "org.kde.plasma.manage-inputmethod"
+                "org.kde.plasma.cameraindicator"
+                "org.kde.plasma.keyboardlayout"
+                "org.kde.plasma.devicenotifier"
+                "org.kde.plasma.notifications"
+                "org.kde.plasma.weather"
+                "org.kde.plasma.printmanager"
+                "org.kde.plasma.keyboardindicator"
+                "org.kde.plasma.mediacontroller"
+              ];
+            };
+          }
+          {
+            digitalClock = {
+              calendar.firstDayOfWeek = "sunday";
+              time.format = "12h";
+            };
+          }
+        ];
+      }
+    ];
+  };
 }
diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix
index 1415982..029415a 100644
--- a/home/hosts/peach/default.nix
+++ b/home/hosts/peach/default.nix
@@ -1,12 +1,7 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
+{ pkgs, config, ... }:
 {
   colors = {
-    scheme = "catppuccin-latte";
+    scheme = "catppuccin-mocha";
     accent = "base09";
   };
 
@@ -29,7 +24,7 @@
     density = "spacious";
   };
 
-  programs.plasma = lib.mkDefault {
+  programs.plasma = {
     input.touchpads = [
       {
         name = "Apple MTP multi-touch";
@@ -47,5 +42,97 @@
       # this is really annoying on apple laptops
       org_kde_powerdevil.Sleep = [ ];
     };
+
+    panels = [
+      # Application name, Global menu and Song information and playback controls at the top
+      {
+        location = "top";
+        height = 42; # 37 for 200%, 42 for 175%
+        floating = false;
+        widgets = [
+          {
+            applicationTitleBar = {
+              behavior = {
+                activeTaskSource = "activeTask";
+              };
+              layout = {
+                elements = [ "windowTitle" ];
+                horizontalAlignment = "right";
+                showDisabledElements = "deactivated";
+                verticalAlignment = "center";
+              };
+              overrideForMaximized.enable = false;
+              windowTitle = {
+                font = {
+                  bold = false;
+                  fit = "fixedSize";
+                  size = 10;
+                };
+                hideEmptyTitle = true;
+                margins = {
+                  bottom = 5;
+                  left = 10;
+                  right = 0;
+                  top = 5;
+                };
+                source = "appName";
+              };
+            };
+          }
+          "org.kde.plasma.appmenu"
+          "org.kde.plasma.panelspacer"
+          {
+            plasmusicToolbar = {
+              panelIcon = {
+                albumCover = {
+                  useAsIcon = true;
+                  radius = 2;
+                };
+              };
+              playbackSource = "auto";
+              musicControls.showPlaybackControls = false;
+              songText = {
+                displayInSeparateLines = true;
+                maximumWidth = 250;
+                scrolling = {
+                  behavior = "alwaysScroll";
+                  speed = 3;
+                };
+              };
+            };
+          }
+          "org.kde.plasma.marginsseparator"
+          {
+            systemTray.items = {
+              shown = [
+                "org.kde.plasma.battery"
+                "org.kde.plasma.bluetooth"
+                "org.kde.plasma.networkmanagement"
+                "org.kde.plasma.brightness"
+                "org.kde.plasma.volume"
+              ];
+              hidden = [
+                "org.kde.plasma.clipboard"
+                "org.kde.plasma.manage-inputmethod"
+                "org.kde.plasma.cameraindicator"
+                "org.kde.plasma.keyboardlayout"
+                "org.kde.plasma.devicenotifier"
+                "org.kde.plasma.notifications"
+                "org.kde.plasma.weather"
+                "org.kde.plasma.printmanager"
+                "org.kde.plasma.keyboardindicator"
+                "org.kde.plasma.mediacontroller"
+              ];
+            };
+          }
+          {
+            digitalClock = {
+              calendar.firstDayOfWeek = "sunday";
+              time.format = "12h";
+            };
+          }
+        ];
+      }
+    ];
   };
 }
diff --git a/home/kde/default.nix b/home/kde/default.nix
index e383cf5..ce1437e 100644
--- a/home/kde/default.nix
+++ b/home/kde/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }:
 {
@@ -23,19 +22,21 @@
     };
   };
 
-  aerothemeplasma = {
+  programs.plasma = {
     enable = true;
-    plasma.enable = true;
-    fonts.enable = true;
-  };
+    overrideConfig = true;
 
-  programs.plasma = lib.mkDefault {
-    enable = true;
     session = {
       sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
     };
 
     workspace = {
+      iconTheme = config.gtk.iconTheme.name;
+      windowDecorations = {
+        library = "org.kde.breeze";
+        theme = "Breeze";
+      };
+      cursor.size = 24;
       wallpaperPictureOfTheDay.provider = "bing";
       wallpaperFillMode = "preserveAspectCrop";
     };
@@ -163,6 +164,19 @@
     ];
 
     kwin = {
+      titlebarButtons = {
+        left = [
+          "on-all-desktops"
+          "keep-below-windows"
+          "keep-above-windows"
+        ];
+        right = [
+          "minimize"
+          "maximize"
+          "close"
+        ];
+      };
+
       nightLight = {
         enable = true;
         mode = "location";
@@ -183,16 +197,25 @@
         rows = 1;
       };
       effects = {
-        # desktopSwitching = {
-        #   animation = "slide";
-        #   navigationWrapping = true;
-        # };
+        desktopSwitching = {
+          animation = "slide";
+          navigationWrapping = true;
+        };
+        dimAdminMode.enable = true;
+        # dimInactive.enable = true;
         minimization = {
           animation = "magiclamp";
           duration = 500;
         };
         shakeCursor.enable = true;
         snapHelper.enable = true;
+        # translucency.enable = true;
+        # windowOpenClose.animation = "fade";
+        blur = {
+          enable = true;
+          noiseStrength = 8;
+          strength = 5;
+        };
       };
     };
 
@@ -227,5 +250,38 @@
       kwinrc.Effect-blurplus.RefractionStrength = 10;
       ksplashrc.KSplash.Engine = "KSplashQML";
     };
+
+    panels = [
+      # Small dock at the bottom right
+      {
+        location = "bottom";
+        height = 40;
+        hiding = "dodgewindows";
+        lengthMode = "fit";
+        floating = true;
+        alignment = "left";
+        widgets = [
+          {
+            kickoff = {
+              sortAlphabetically = true;
+              # icon = "nix-snowflake-white";
+            };
+          }
+          {
+            iconTasks = {
+              launchers = [
+                "applications:firefox.desktop"
+                "applications:org.kde.dolphin.desktop"
+                "applications:vesktop.desktop"
+                "applications:kitty.desktop"
+                "applications:org.strawberrymusicplayer.strawberry.desktop"
+                "applications:writer.desktop"
+              ];
+            };
+          }
+          "org.kde.plasma.pager"
+        ];
+      }
+    ];
   };
 }
diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix
index 470b1a2..431ba5a 100644
--- a/home/tiling/niri.nix
+++ b/home/tiling/niri.nix
@@ -512,18 +512,10 @@
 
         "Mod+W".action.toggle-column-tabbed-display = { };
 
-        "Print".action.screenshot = {
-          show-pointer = false;
-        };
-        "Mod+Shift+S".action.screenshot = {
-          show-pointer = false;
-        };
-        "Ctrl+Print".action.screenshot-screen = {
-          show-pointer = false;
-        };
-        "Alt+Print".action.screenshot-window = {
-          show-pointer = false;
-        };
+        "Print".action.screenshot = { };
+        "Mod+Shift+S".action.screenshot = { };
+        "Ctrl+Print".action.screenshot-screen = { };
+        "Alt+Print".action.screenshot-window = { };
 
         "Mod+Escape" = {
           action.toggle-keyboard-shortcuts-inhibit = { };
diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix
index 719dda0..5997504 100644
--- a/home/tiling/noctalia.nix
+++ b/home/tiling/noctalia.nix
@@ -206,7 +206,7 @@
               deviceNativePath = "__default__";
               displayMode = "icon-hover";
               hideIfIdle = false;
-              hideIfNotDetected = false;
+              hideIfNotDetected = true;
               id = "Battery";
               showNoctaliaPerformance = false;
               showPowerProfiles = true;
diff --git a/packages/overlay.nix b/packages/overlay.nix
index 9d542aa..213edab 100644
--- a/packages/overlay.nix
+++ b/packages/overlay.nix
@@ -21,19 +21,19 @@ final: prev: {
 
   riff = final.callPackage ./riff { };
 
-  # linuxPackages_asahi = prev.linuxPackages_asahi.override {
-  #   _kernelPatches = [
-  #     {
-  #       name = "Mailbox and RTKIT support";
-  #       patch = null;
-  #       structuredExtraConfig = with prev.lib.kernel; {
-  #         APPLE_MAILBOX = yes;
-  #         APPLE_RTKIT = yes;
-  #         APPLE_RTKIT_HELPER = yes;
-  #         RUST_APPLE_RTKIT = yes;
-  #         RUST_FW_LOADER_ABSTRACTIONS = yes;
-  #       };
-  #     }
-  #   ];
-  # };
+  linuxPackages_asahi = prev.linuxPackages_asahi.override {
+    _kernelPatches = [
+      {
+        name = "Mailbox and RTKIT support";
+        patch = null;
+        structuredExtraConfig = with prev.lib.kernel; {
+          APPLE_MAILBOX = yes;
+          APPLE_RTKIT = yes;
+          APPLE_RTKIT_HELPER = yes;
+          RUST_APPLE_RTKIT = yes;
+          RUST_FW_LOADER_ABSTRACTIONS = yes;
+        };
+      }
+    ];
+  };
 }
diff --git a/system/default.nix b/system/default.nix
index 5f86afb..66c9a43 100755
--- a/system/default.nix
+++ b/system/default.nix
@@ -118,23 +118,10 @@
     ];
   };
 
-  aerothemeplasma = {
-    enable = true;
-    plasma.enable = true;
-    fonts.enable = false;
-    plymouth.enable = false;
-    sddm.enable = true;
-  };
-
   services = {
-    # displayManager = {
-    #   gdm.enable = true;
-    #   defaultSession = "niri";
-    # };
-    desktopManager.plasma6.enable = true;
     displayManager = {
-      sddm.enable = true;
-      defaultSession = "aerothemeplasma";
+      gdm.enable = true;
+      defaultSession = "niri";
     };
 
     libinput.enable = true;