diff --git a/progs/desktop.nix b/progs/desktop.nix
index 84e5314..e5b1ab8 100644
--- a/progs/desktop.nix
+++ b/progs/desktop.nix
@@ -15,8 +15,8 @@
     branch = "latest";
     imports = [
       "plasma"
-      "klassy"
       "rofi"
+      "dolphin"
     ];
     extras = {
     };
@@ -25,8 +25,8 @@
     };
     settings = {
       plasma.enable = true;
-      klassy.enable = true;
       rofi.enable = true;
+      dolphin.enable = true;
     };
   };
 in (tools.fullModule {
diff --git a/progs/desktop/dolphin.nix b/progs/desktop/dolphin.nix
new file mode 100644
index 0000000..3a42336
--- /dev/null
+++ b/progs/desktop/dolphin.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs-list,
+  parentPathAsList,
+  tools,
+  ...
+}: let
+  moduleParams = tools.moduleParams rec {
+    inherit config lib pkgs-list parentPathAsList tools;
+    name = "dolphin";
+    subfolder = "dolphin";
+    main-repo = "nix";
+    branch = "latest";
+    options = {
+      enable = lib.mkEnableOption "Enables ${name} program and related settings.";
+    };
+  };
+in (tools.fullModule rec {
+  inherit (moduleParams) config lib pkgs-list parentPathAsList tools;
+  inherit (moduleParams) name togglable subfolder main-repo branch extras imports specialImports options settings;
+  inherit (moduleParams) packages currentPathAsList currentDirPath cfg inheritedSettings Common;
+  Home = {
+    home.packages = with packages.kdePackages; [
+      dolphin
+      dolphin-plugins
+    ];
+  };
+})
diff --git a/progs/desktop/plasma.nix b/progs/desktop/plasma.nix
index 7b43ece..ccc5d20 100644
--- a/progs/desktop/plasma.nix
+++ b/progs/desktop/plasma.nix
@@ -10,11 +10,18 @@
   moduleParams = tools.moduleParams rec {
     inherit config lib pkgs-list parentPathAsList tools;
     name = "plasma";
+    subfolder = "plasma";
     main-repo = "nix";
     branch = "latest";
+    imports = [
+      "klassy"
+    ];
     options = {
       enable = lib.mkEnableOption "Enables ${name} program and related settings.";
     };
+    settings = {
+      klassy.enable = true;
+    };
   };
 in (tools.fullModule rec {
   inherit (moduleParams) config lib pkgs-list parentPathAsList tools;
@@ -249,7 +256,6 @@ in (tools.fullModule rec {
       qtvirtualkeyboard
       breeze
       filelight
-      dolphin-plugins
     ];
   };
   System = {
@@ -272,6 +278,7 @@ in (tools.fullModule rec {
       elisa
       konsole
       discover
+      okular
     ];
   };
 })
diff --git a/progs/desktop/klassy.nix b/progs/desktop/plasma/klassy.nix
similarity index 100%
rename from progs/desktop/klassy.nix
rename to progs/desktop/plasma/klassy.nix
diff --git a/progs/desktop/klassy/.dev/allFields.txt b/progs/desktop/plasma/klassy/.dev/allFields.txt
similarity index 100%
rename from progs/desktop/klassy/.dev/allFields.txt
rename to progs/desktop/plasma/klassy/.dev/allFields.txt
diff --git a/progs/desktop/klassy/.dev/klassyrc.bak b/progs/desktop/plasma/klassy/.dev/klassyrc.bak
similarity index 100%
rename from progs/desktop/klassy/.dev/klassyrc.bak
rename to progs/desktop/plasma/klassy/.dev/klassyrc.bak
diff --git a/progs/desktop/klassy/defaults/params.json b/progs/desktop/plasma/klassy/defaults/params.json
similarity index 100%
rename from progs/desktop/klassy/defaults/params.json
rename to progs/desktop/plasma/klassy/defaults/params.json
diff --git a/progs/desktop/klassy/defaults/presets.klpw b/progs/desktop/plasma/klassy/defaults/presets.klpw
similarity index 100%
rename from progs/desktop/klassy/defaults/presets.klpw
rename to progs/desktop/plasma/klassy/defaults/presets.klpw
diff --git a/progs/desktop/klassy/presets/Clean.klpw b/progs/desktop/plasma/klassy/presets/Clean.klpw
similarity index 100%
rename from progs/desktop/klassy/presets/Clean.klpw
rename to progs/desktop/plasma/klassy/presets/Clean.klpw
diff --git a/progs/desktop/klassy/presets/CleanTranslucid.klpw b/progs/desktop/plasma/klassy/presets/CleanTranslucid.klpw
similarity index 100%
rename from progs/desktop/klassy/presets/CleanTranslucid.klpw
rename to progs/desktop/plasma/klassy/presets/CleanTranslucid.klpw