diff --git a/flake.lock b/flake.lock
index cbd2fd3..82e21c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -352,11 +352,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1718395253,
-        "narHash": "sha256-kbXUz5Pg0ph9HD9wRO0w+kyCyX9n1YuED0WZGIH8GH4=",
+        "lastModified": 1718461895,
+        "narHash": "sha256-qlNHD6ScCIQ6lzTyy9cDj5h+jZOC55FM3JHp8p3qMQ0=",
         "ref": "refs/heads/main",
-        "rev": "cb63398f079b4b4324c04e2e41ba17983d66487c",
-        "revCount": 4829,
+        "rev": "fb82f6bcd7d829a3ab2d2cb7d9a27f3837abfb80",
+        "revCount": 4832,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -541,11 +541,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1718429294,
-        "narHash": "sha256-uhKuPVN8IZJCWwFhNupTxES7LMo8ot2KC6+VmVWwzyU=",
+        "lastModified": 1718459188,
+        "narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "239c3864fef6292262d23cff58ce81674f309142",
+        "rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29",
         "type": "github"
       },
       "original": {
diff --git a/home/alacritty/default.nix b/home/applications/alacritty.nix
similarity index 100%
rename from home/alacritty/default.nix
rename to home/applications/alacritty.nix
diff --git a/home/applications/default.nix b/home/applications/default.nix
new file mode 100644
index 0000000..d58b78f
--- /dev/null
+++ b/home/applications/default.nix
@@ -0,0 +1,8 @@
+{...}: {
+  imports = [
+    ./alacritty.nix
+    ./firefox.nix
+    ./thunderbird.nix
+    ./vscode.nix
+  ];
+}
diff --git a/home/firefox/default.nix b/home/applications/firefox.nix
similarity index 100%
rename from home/firefox/default.nix
rename to home/applications/firefox.nix
diff --git a/home/thunderbird/default.nix b/home/applications/thunderbird.nix
similarity index 100%
rename from home/thunderbird/default.nix
rename to home/applications/thunderbird.nix
diff --git a/home/vscode/default.nix b/home/applications/vscode.nix
similarity index 100%
rename from home/vscode/default.nix
rename to home/applications/vscode.nix
diff --git a/home/default.nix b/home/default.nix
index 4f8dd41..3278b67 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -5,16 +5,22 @@
     inputs.hyprland.homeManagerModules.default
     inputs.catppuccin.homeManagerModules.catppuccin
 
-    ./packages.nix
-    ./catppuccin
-
-    ./alacritty
-    ./firefox
-    ./gtk
+    ./applications
+    ./desktop
     ./shell
-    ./thunderbird
-    ./vscode
-    ./wayland
-    ./xdg
+
+    ./packages.nix
   ];
+
+  config.catppuccin = {
+    enable = true;
+    flavor = "mocha";
+    accent = "blue";
+  };
+
+  # catppuccin = {
+  #   enable = true;
+  #   flavor = "mocha";
+  #   accent = "blue";
+  # };
 }
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
new file mode 100644
index 0000000..c7e5580
--- /dev/null
+++ b/home/desktop/default.nix
@@ -0,0 +1,13 @@
+{...}: {
+  imports = [
+    ./eww
+    ./hyprland
+    ./fuzzel.nix
+    ./gtk.nix
+    ./kanshi.nix
+    ./mako.nix
+    ./swayidle.nix
+    ./swaylock.nix
+    ./xdg.nix
+  ];
+}
diff --git a/home/wayland/eww/config/eww.scss b/home/desktop/eww/config/eww.scss
similarity index 100%
rename from home/wayland/eww/config/eww.scss
rename to home/desktop/eww/config/eww.scss
diff --git a/home/wayland/eww/config/eww.yuck b/home/desktop/eww/config/eww.yuck
similarity index 100%
rename from home/wayland/eww/config/eww.yuck
rename to home/desktop/eww/config/eww.yuck
diff --git a/home/wayland/eww/config/mocha.scss b/home/desktop/eww/config/mocha.scss
similarity index 100%
rename from home/wayland/eww/config/mocha.scss
rename to home/desktop/eww/config/mocha.scss
diff --git a/home/wayland/eww/config/scripts/get-active-workspace b/home/desktop/eww/config/scripts/get-active-workspace
similarity index 100%
rename from home/wayland/eww/config/scripts/get-active-workspace
rename to home/desktop/eww/config/scripts/get-active-workspace
diff --git a/home/wayland/eww/config/scripts/get-workspaces b/home/desktop/eww/config/scripts/get-workspaces
similarity index 100%
rename from home/wayland/eww/config/scripts/get-workspaces
rename to home/desktop/eww/config/scripts/get-workspaces
diff --git a/home/wayland/eww/default.nix b/home/desktop/eww/default.nix
similarity index 100%
rename from home/wayland/eww/default.nix
rename to home/desktop/eww/default.nix
diff --git a/home/wayland/fuzzel/default.nix b/home/desktop/fuzzel.nix
similarity index 100%
rename from home/wayland/fuzzel/default.nix
rename to home/desktop/fuzzel.nix
diff --git a/home/gtk/default.nix b/home/desktop/gtk.nix
similarity index 100%
rename from home/gtk/default.nix
rename to home/desktop/gtk.nix
diff --git a/home/wayland/hyprland/default.nix b/home/desktop/hyprland/default.nix
similarity index 100%
rename from home/wayland/hyprland/default.nix
rename to home/desktop/hyprland/default.nix
diff --git a/home/wayland/hyprland/hyprland.conf b/home/desktop/hyprland/hyprland.conf
similarity index 98%
rename from home/wayland/hyprland/hyprland.conf
rename to home/desktop/hyprland/hyprland.conf
index b1aa7e2..5a93c16 100644
--- a/home/wayland/hyprland/hyprland.conf
+++ b/home/desktop/hyprland/hyprland.conf
@@ -100,7 +100,7 @@ bind = $mainMod, S, togglefloating,
 bind = $mainMod, L, exec, swaylock -f
 bind = $mainMod, space, exec, fuzzel
 bind = $mainMod, C, exec, cliphist list | fuzzel -d --tabs 2 --width 100 | cliphist decode | wl-copy
-bind = $mainMod, E, exec, BEMOJI_PICKER_CMD="fuzzel -d" bemoji
+bind = $mainMod, E, exec, BEMOJI_PICKER_CMD="fuzzel -d" bemoji -n
 
 # Screenshot
 bind = , Print, exec, grim `date +'%Y-%m-%dT%H:%M:%S'`.png
diff --git a/home/wayland/kanshi/default.nix b/home/desktop/kanshi.nix
similarity index 100%
rename from home/wayland/kanshi/default.nix
rename to home/desktop/kanshi.nix
diff --git a/home/wayland/mako/default.nix b/home/desktop/mako.nix
similarity index 100%
rename from home/wayland/mako/default.nix
rename to home/desktop/mako.nix
diff --git a/home/wayland/swayidle/default.nix b/home/desktop/swayidle.nix
similarity index 100%
rename from home/wayland/swayidle/default.nix
rename to home/desktop/swayidle.nix
diff --git a/home/wayland/swaylock/default.nix b/home/desktop/swaylock.nix
similarity index 100%
rename from home/wayland/swaylock/default.nix
rename to home/desktop/swaylock.nix
diff --git a/home/xdg/default.nix b/home/desktop/xdg.nix
similarity index 100%
rename from home/xdg/default.nix
rename to home/desktop/xdg.nix
diff --git a/home/packages.nix b/home/packages.nix
index 42ee9ff..fadce58 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -2,14 +2,7 @@
   services.mpris-proxy.enable = true; # media keys
 
   home.packages = with pkgs; [
-    (bemoji.overrideAttrs (_: {
-      src = pkgs.fetchFromGitHub {
-        owner = "marty-oehme";
-        repo = "bemoji";
-        rev = "74af60c3f7d5be24dd584214dcec7ed4b71a926c";
-        hash = "sha256-Yw5TAC/j1njctamXN4OrD+sl4tVOuWu1qL7d0B5gBWw=";
-      };
-    }))
+    bemoji
     alejandra # nix formatter
     borgbackup # backup
     cliphist # clipboard manager
diff --git a/home/wayland/default.nix b/home/wayland/default.nix
deleted file mode 100644
index 05e9677..0000000
--- a/home/wayland/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{...}: {
-  imports = [
-    ./eww
-    ./fuzzel
-    ./hyprland
-    ./kanshi
-    ./mako
-    ./swayidle
-    ./swaylock
-  ];
-}