diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index 150f8bb..2f68b20 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -2,7 +2,6 @@
   self,
   pkgs,
   lib,
-  config,
   ...
 }:
 let
@@ -18,43 +17,9 @@ let
   };
 in
 {
-  xdg = {
-    desktopEntries = builtins.listToAttrs [
-      (mkURLEntry "Paperless" "https://paperless.ccnlc.eu" "${self}/assets/favicon-paperless.png")
-      (mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png")
-      (mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
-    ];
-
-    userDirs =
-      let
-        home = config.home.homeDirectory;
-        disable =
-          a:
-          lib.listToAttrs (
-            lib.map (key: {
-              name = key;
-              value = null;
-            }) a
-          );
-      in
-      (lib.mapAttrs (_: folder: "${home}/${folder}") {
-        download = "downloads";
-        videos = "videos";
-        pictures = "pictures";
-      })
-      // (disable [
-        "music"
-        "documents"
-        "templates"
-        "publicShare"
-        "desktop"
-      ])
-      // {
-        enable = true;
-        createDirectories = true;
-        extraConfig = {
-          XDG_DEVEL_DIR = "${home}/devel";
-        };
-      };
-  };
+  xdg.desktopEntries = builtins.listToAttrs [
+    (mkURLEntry "Paperless" "https://paperless.ccnlc.eu" "${self}/assets/favicon-paperless.png")
+    (mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png")
+    (mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
+  ];
 }
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 85690ae..87f8769 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -156,8 +156,8 @@ lib.mkIf osConfig.programs.hyprland.enable {
           "$mod, X, fullscreen, 1"
           "$mod, F, fullscreen, 0"
           "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
-          "$mod, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m region"
-          "$mod SHIFT, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"
+          "$mod, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z -o $XDG_PICTURES_DIR/screenshots -m region"
+          "$mod SHIFT, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"
 
           #: Brightness and Media {{{
           ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +10%"
diff --git a/home/services/default.nix b/home/services/default.nix
index d6bb0ca..a17da37 100644
--- a/home/services/default.nix
+++ b/home/services/default.nix
@@ -1,3 +1,6 @@
 {
-  imports = [ ./kdeconnect.nix ];
+  imports = [
+    ./kdeconnect.nix
+    ./syncthing.nix
+  ];
 }
diff --git a/home/services/syncthing.nix b/home/services/syncthing.nix
new file mode 100644
index 0000000..62359cd
--- /dev/null
+++ b/home/services/syncthing.nix
@@ -0,0 +1,19 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+in
+{
+  config = mkIf config.services.syncthing.enable {
+    xdg.desktopEntries."Syncthing" = {
+      name = "Syncthing";
+      icon = "";
+      terminal = false;
+      exec = "${pkgs.syncthing}/bin/syncthing --browser-only";
+    };
+  };
+}
diff --git a/home/sway/default.nix b/home/sway/default.nix
index fbb38e5..b0f41b5 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -87,8 +87,7 @@ lib.mkIf osConfig.programs.sway.enable {
             "--locked XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
             "--locked XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
             "--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
-            "Print" = "exec ${pkgs.hyprshot}/bin/hyprshot -m region";
-            "${mod}+u" = "exec ${pkgs.hyprshot}/bin/hyprshot -m region";
+            "${mod}+u" = "exec ${pkgs.hyprshot}/bin/hyprshot -o $XDG_PICTURES_DIR/screenshots -m region";
             "${mod}+Shift+u" = "exec ${pkgs.hyprshot}/bin/hyprshot --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen";
 
             #: Workspace movement {{{
diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index f399884..3dc68f0 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -98,7 +98,7 @@
       enable = true;
       settings = {
         default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd \"sway --unsupported-gpu\"";
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time";
           user = "greeter";
         };
       };