diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix
index 835470d..6ebf5cc 100644
--- a/nixcfgs/hosts/zephyrus/default.nix
+++ b/nixcfgs/hosts/zephyrus/default.nix
@@ -24,7 +24,7 @@
     ../../modules/nixos/desktop/xremap.nix
 
     # desktop environment and display manager
-    ../../modules/nixos/desktop/dm/tuigreet.nix
+    ../../modules/nixos/desktop/dm/sddm.nix
     ../../modules/nixos/desktop/de/niri.nix
     ../../modules/nixos/desktop/de/kde.nix
 
diff --git a/nixcfgs/modules/nixos/desktop/dm/sddm.nix b/nixcfgs/modules/nixos/desktop/dm/sddm.nix
index b6b17c5..c8caf57 100644
--- a/nixcfgs/modules/nixos/desktop/dm/sddm.nix
+++ b/nixcfgs/modules/nixos/desktop/dm/sddm.nix
@@ -2,7 +2,7 @@
 # See https://www.reddit.com/r/NixOS/comments/1kcj34p/how_to_apply_this_sddm_theme_on_nixos/
 let
   custom-sddm-astronaut = pkgs.sddm-astronaut.override {
-    embeddedTheme = "astronaut";
+    embeddedTheme = "black_hole";
     #themeConfig = {
     #  Background = "path/to/background.jpg";
     #  Font = "M+1 Nerd Font";
diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix
index 41ae714..722e857 100644
--- a/nixcfgs/users/js0ny/packages/gui.nix
+++ b/nixcfgs/users/js0ny/packages/gui.nix
@@ -127,6 +127,7 @@ in {
       file-roller
       steamtinkerlaunch
       scanmem
+      dex
     ]
     ++ (mkFcitxIM [
       pkgs.neovim-qt
@@ -168,5 +169,5 @@ in {
   programs.alacritty.enable = true;
 
   services.protonmail-bridge.enable = true;
-  services.remmina.enable = true;
+  services.remmina.enable = false; # Don't auto start the service
 }
diff --git a/nixcfgs/users/js0ny/programs/desktop/plasma/calendar.nix b/nixcfgs/users/js0ny/programs/desktop/plasma/calendar.nix
new file mode 100644
index 0000000..f097a4d
--- /dev/null
+++ b/nixcfgs/users/js0ny/programs/desktop/plasma/calendar.nix
@@ -0,0 +1,15 @@
+{lib, ...}: {
+  xdg.configFile = {
+    "plasma_calendar_alternatecalendar".text = lib.generators.toINI {} {
+      General = {
+        calendarSystem = "Chinese";
+        dateOffset = 0;
+      };
+    };
+    "plasma_calendar_holiday_regions".text = lib.generators.toINI {} {
+      General = {
+        selectedRegions = "cn_zh-cn,gb-sct_en-gb,hk_zh-cn,gb-eaw_en-gb";
+      };
+    };
+  };
+}
diff --git a/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix b/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix
index 03fa30d..891eadf 100644
--- a/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix
@@ -1,23 +1,46 @@
 {
   pkgs,
   config,
+  lib,
   ...
-}: {
+}: let
+  iconFixRule = entryName: wmclass: {
+    description = "Fix icon for ${entryName}";
+    match = {
+      # TODO: Add regex matching
+      window-class = {
+        value = wmclass;
+        type = "exact";
+      };
+    };
+    apply = {
+      desktopfile = entryName;
+    };
+  };
+  iconFixList = {
+    "virt-manager" = "python3.13 .virt-manager-wrapped";
+    "proton.vpn.app.gtk" = "python3.13 .protonvpn-app-wrapped";
+  };
+in {
   imports = [
     ../../gwenview.nix
     ../../dolphin.nix
+    ./keymaps.nix
+    ./calendar.nix
   ];
   home.packages = with pkgs; [
     # kdePackages.yakuake
     krunner-vscodeprojects
     jetbrains-runner
     plasmusic-toolbar
+    kdePackages.wallpaper-engine-plugin
+    plasma-plugin-blurredwallpaper
+    kdePackages.krohnkite
   ];
-  home.sessionVariables = {
-    QT_STYLE_OVERRIDE = "Breeze";
-  };
   programs.plasma = {
     enable = true;
+    # Apply the icon fix rules
+    window-rules = lib.mkForce (lib.mapAttrsToList iconFixRule iconFixList);
     session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
     fonts = {
       fixedWidth.family = "Maple Mono NF CN";
@@ -43,10 +66,6 @@
       };
     };
     shortcuts = {
-      # Use Ghostty Instead
-      # yakuake = {
-      #   "toggle-window-state" = "Meta+`";
-      # };
     };
     input.touchpads = [
       {
@@ -87,7 +106,7 @@
                 launchers = [
                   # "applications:org.kde.dolphin.desktop"
                   "applications:firefox.desktop"
-                  "applications:com.mitchellh.ghostty.desktop"
+                  "applications:kitty.desktop"
                 ];
               };
             };
@@ -131,7 +150,7 @@
     accessibility.changeColors.mode = "InvertLightness";
     general.mouseMode = "TextSelect";
   };
-  programs.kate.enable = true;
+  programs.kate.enable = false;
   programs.kate.editor = {
     font = {
       family = "Maple Mono NF CN";
diff --git a/nixcfgs/users/js0ny/programs/desktop/plasma/keymaps.nix b/nixcfgs/users/js0ny/programs/desktop/plasma/keymaps.nix
new file mode 100644
index 0000000..275925e
--- /dev/null
+++ b/nixcfgs/users/js0ny/programs/desktop/plasma/keymaps.nix
@@ -0,0 +1,14 @@
+{...}: {
+  programs.plasma.hotkeys.commands = {
+    "launch-obsidian" = {
+      name = "Launch Obsidian";
+      key = "Meta+O";
+      command = "obsidian";
+    };
+    "launch-terminal" = {
+      name = "Launch Terminal";
+      key = "Meta+Return";
+      command = "kitty";
+    };
+  };
+}