diff --git a/modules/server/taf/default.nix b/modules/server/taf/default.nix
index 42bcea6..1e98e92 100644
--- a/modules/server/taf/default.nix
+++ b/modules/server/taf/default.nix
@@ -179,7 +179,7 @@
     #   "@lyes.eu" = "lyes@mail.lyes.eu";
     # };
 
-    certificateScheme = "acme-nginx";
+    # certificateScheme = "acme-nginx";
   };
 
   # services.dovecot2.extraConfig = ''
diff --git a/pkgs/amy-mono/default.nix b/pkgs/amy-mono/default.nix
index 3037ef7..f4c78b9 100644
--- a/pkgs/amy-mono/default.nix
+++ b/pkgs/amy-mono/default.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = {
-    description = "Amelia's Amy Mono font";
+    description = "Amélia's Amy Mono font";
     homepage = "https://www.ameliathe1st.gay/";
     license = lib.licenses.ofl; # As per our personal messages
     platforms = lib.platforms.all;
diff --git a/users/lyes/desktop/default.nix b/users/lyes/desktop/default.nix
index fe52074..debffc7 100644
--- a/users/lyes/desktop/default.nix
+++ b/users/lyes/desktop/default.nix
@@ -9,7 +9,7 @@
   home-manager.users.lyes = { ... }: {
     imports =
       [
-        ./home.nix
+        ./home
       ];
   };
 
diff --git a/users/lyes/desktop/home/apps/default.nix b/users/lyes/desktop/home/apps/default.nix
new file mode 100644
index 0000000..7582ca7
--- /dev/null
+++ b/users/lyes/desktop/home/apps/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./ghostty.nix
+    ./mpd.nix
+  ];
+}
diff --git a/users/lyes/desktop/home/apps/ghostty.nix b/users/lyes/desktop/home/apps/ghostty.nix
new file mode 100644
index 0000000..fa90f5b
--- /dev/null
+++ b/users/lyes/desktop/home/apps/ghostty.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  programs.ghostty = {
+    enable = true;
+    enableFishIntegration = true;
+    installBatSyntax = true;
+
+    systemd.enable = true;
+
+    settings = {
+      theme = "Rose Pine Moon";
+      font-family = "JetBrains Mono";
+    };
+  };
+}
diff --git a/users/lyes/desktop/home/apps/mpd.nix b/users/lyes/desktop/home/apps/mpd.nix
new file mode 100644
index 0000000..349217b
--- /dev/null
+++ b/users/lyes/desktop/home/apps/mpd.nix
@@ -0,0 +1,25 @@
+{ config, ... }:
+
+{
+  # MPD
+  services.mpd = {
+    enable = true;
+    musicDirectory = "${config.xdg.userDirs.music}/MPD";
+    extraConfig =
+      ''
+        audio_output {
+          type            "pipewire"
+          name            "PipeWire Sound Server"
+        }
+
+        audio_output {
+          type            "fifo"
+          name            "mpd"
+          path            "~/.local/share/mpd/.mpd_fifo"
+          format          "44100:16:2"
+        }
+      '';
+  };
+
+  services.mpd-mpris.enable = true;
+}
diff --git a/users/lyes/desktop/background b/users/lyes/desktop/home/background
similarity index 100%
rename from users/lyes/desktop/background
rename to users/lyes/desktop/home/background
diff --git a/users/lyes/desktop/home/default.nix b/users/lyes/desktop/home/default.nix
new file mode 100644
index 0000000..3fd87d9
--- /dev/null
+++ b/users/lyes/desktop/home/default.nix
@@ -0,0 +1,27 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./apps
+    ./desktops
+    ./xdg.nix
+  ];
+
+  # Cursor
+  home.pointerCursor = {
+    enable = true;
+    name = "Adwaita";
+    package = pkgs.adwaita-icon-theme;
+    size = 24;
+    x11 = {
+      enable = true;
+      defaultCursor = "Adwaita";
+    };
+    dotIcons.enable = true;
+    gtk.enable = true;
+    sway.enable = true;
+  };
+
+  # Background
+  xdg.configFile."background".source = ./background;
+}
diff --git a/users/lyes/desktop/home/desktops/default.nix b/users/lyes/desktop/home/desktops/default.nix
new file mode 100644
index 0000000..aa8fc96
--- /dev/null
+++ b/users/lyes/desktop/home/desktops/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./gnome.nix
+    ./sway.nix
+  ];
+}
diff --git a/users/lyes/desktop/dconf.nix b/users/lyes/desktop/home/desktops/gnome.nix
similarity index 85%
rename from users/lyes/desktop/dconf.nix
rename to users/lyes/desktop/home/desktops/gnome.nix
index 56e12a4..68fc154 100644
--- a/users/lyes/desktop/dconf.nix
+++ b/users/lyes/desktop/home/desktops/gnome.nix
@@ -1,8 +1,26 @@
-{ lib, ... }:
+{ pkgs, lib, ... }:
 
 with lib.hm.gvariant;
 
+let
+  extensions = with pkgs.gnomeExtensions; [
+        # appindicator
+        blur-my-shell
+        caffeine
+        dash-to-panel
+        gsconnect
+        just-perfection
+        vitals
+        weather-oclock
+        background-logo
+    ];
+in
 {
+  programs.gnome-shell = {
+    enable = true;
+    extensions = map (x: { id = x.extensionUuid; package = x; }) extensions;
+  };
+
   dconf.settings = {
     # Gnome Settings
 
@@ -90,32 +108,32 @@ with lib.hm.gvariant;
     };
 
     ## Extensions settings
-    "blur-my-shell" = {
+    "org/gnome/shell/extensions/blur-my-shell" = {
       settings-version = 2;
     };
 
-    "blur-my-shell/coverflow-alt-tab" = {
+    "org/gnome/shell/extensions/blur-my-shell/coverflow-alt-tab" = {
       pipeline = "pipeline_default";
     };
 
-    "blur-my-shell/dash-to-dock" = {
+    "org/gnome/shell/extensions/blur-my-shell/dash-to-dock" = {
       pipeline = "pipeline_default_rounded";
     };
 
-    "blur-my-shell/lockscreen" = {
+    "org/gnome/shell/extensions/blur-my-shell/lockscreen" = {
       pipeline = "pipeline_default";
     };
 
-    "blur-my-shell/overview" = {
+    "org/gnome/shell/extensions/blur-my-shell/overview" = {
       pipeline = "pipeline_default";
     };
 
-    "blur-my-shell/panel" = {
+    "org/gnome/shell/extensions/blur-my-shell/panel" = {
       pipeline = "pipeline_default";
       static-blur = false;
     };
 
-    "blur-my-shell/screenshot" = {
+    "org/gnome/shell/extensions/blur-my-shell/screenshot" = {
       pipeline = "pipeline_default";
     };
 
@@ -123,7 +141,7 @@ with lib.hm.gvariant;
       show-notifications = false;
     };
 
-    "dash-to-panel" = {
+    "org/gnome/shell/extensions/dash-to-panel" = {
       # animate-appicon-hover-animation-extent = {
       #   RIPPLE = 4;
       #   PLANK = 4;
@@ -177,7 +195,7 @@ with lib.hm.gvariant;
       window-preview-title-position = "TOP";
     };
 
-    "just-perfection" = {
+    "org/gnome/shell/extensions/just-perfection" = {
       notification-banner-position = 3;
       osd-position = 6;
       support-notifier-showed-version = 34;
@@ -190,7 +208,7 @@ with lib.hm.gvariant;
       show-gpu = true;
     };
 
-    "weather-oclock" = {
+    "org/gnome/shell/extensions/weather-oclock" = {
       weather-after-clock = true;
     };
 
diff --git a/users/lyes/desktop/sway.nix b/users/lyes/desktop/home/desktops/sway.nix
similarity index 100%
rename from users/lyes/desktop/sway.nix
rename to users/lyes/desktop/home/desktops/sway.nix
diff --git a/users/lyes/desktop/home.nix b/users/lyes/desktop/home/xdg.nix
similarity index 74%
rename from users/lyes/desktop/home.nix
rename to users/lyes/desktop/home/xdg.nix
index 9e86139..51662d4 100644
--- a/users/lyes/desktop/home.nix
+++ b/users/lyes/desktop/home/xdg.nix
@@ -1,24 +1,6 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
-let
-  extensions = with pkgs.gnomeExtensions; [
-        # appindicator
-        blur-my-shell
-        caffeine
-        dash-to-panel
-        gsconnect
-        just-perfection
-        vitals
-        weather-oclock
-        background-logo
-    ];
-in
 {
-  imports = [
-    ./dconf.nix
-    ./sway.nix
-  ];
-
   # Directories
   xdg = {
     userDirs = {
@@ -95,50 +77,4 @@ in
       "x-scheme-handler/chrome" = "firefox.desktop";
     };
   };
-
-  # Desktop
-  programs.gnome-shell = {
-    enable = true;
-    extensions = map (x: { id = x.extensionUuid; package = x; }) extensions;
-  };
-
-  # Cursor
-  home.pointerCursor = {
-    enable = true;
-    name = "Adwaita";
-    package = pkgs.adwaita-icon-theme;
-    size = 24;
-    x11 = {
-      enable = true;
-      defaultCursor = "Adwaita";
-    };
-    dotIcons.enable = true;
-    gtk.enable = true;
-    sway.enable = true;
-  };
-
-  # Background
-  xdg.configFile."background".source = ./background;
-
-  # MPD
-  services.mpd = {
-    enable = true;
-    musicDirectory = "${config.xdg.userDirs.music}/MPD";
-    extraConfig =
-      ''
-        audio_output {
-          type            "pipewire"
-          name            "PipeWire Sound Server"
-        }
-
-        audio_output {
-          type            "fifo"
-          name            "mpd"
-          path            "~/.local/share/mpd/.mpd_fifo"
-          format          "44100:16:2"
-        }
-      '';
-  };
-
-  services.mpd-mpris.enable = true;
 }