diff --git a/home/default.nix b/home/default.nix
index dbdc5a7..795639d 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,9 +3,11 @@
   imports = [
     ./hypridle
     ./hyprland
+    ./hyprlock
     ./foot.nix
     ./graphical
     ./terminal
     ./rofi
+    ./sway
   ];
 }
diff --git a/home/hypridle/default.nix b/home/hypridle/default.nix
index 772676c..d026e7f 100644
--- a/home/hypridle/default.nix
+++ b/home/hypridle/default.nix
@@ -4,7 +4,7 @@
   osConfig,
   ...
 }:
-lib.mkIf osConfig.programs.hyprland.enable {
+lib.mkIf (osConfig.programs.hyprland.enable || osConfig.programs.sway.enable) {
   services.hypridle = {
     enable = true;
     settings = {
diff --git a/home/hyprlock/default.nix b/home/hyprlock/default.nix
index f045a51..bfeed39 100644
--- a/home/hyprlock/default.nix
+++ b/home/hyprlock/default.nix
@@ -1,4 +1,5 @@
-{
+{ lib, osConfig, ... }:
+lib.mkIf (osConfig.programs.hyprland.enable || osConfig.programs.sway.enable) {
   programs.hyprlock = {
     enable = true;
     settings = {
diff --git a/home/sway/default.nix b/home/sway/default.nix
index 2d4dc2a..6927138 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -3,16 +3,10 @@
   pkgs,
   config,
   lib,
+  osConfig,
   ...
 }:
-{
-  imports = [
-    ./swayidle.nix
-    ./swaylock.nix
-    ./../swaync
-    ./../waybar
-  ];
-
+lib.mkIf osConfig.programs.sway.enable {
   wayland.windowManager.sway =
     let
       homeDirectory = config.home.homeDirectory;
@@ -60,7 +54,7 @@
             mod = config.wayland.windowManager.sway.config.modifier;
           in
           lib.mkOptionDefault {
-            "${mod}+p" = "exec ${pkgs.cliphist}/bin/cliphist wipe & ${pkgs.swaylock}/bin/swaylock";
+            "${mod}+p" = "${pkgs.hyprlock}/bin/hyprlock";
 
             "${mod}+Shift+p" = "exec rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
             # Reload the config file
@@ -92,8 +86,8 @@
             "--locked XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
             "--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
             "Print" = "exec ${pkgs.scripts.screenshot}/bin/screenshot";
-            "${mod}+u" = "exec ${pkgs.scripts.screenshot}/bin/screenshot";
-            "${mod}+Shift+u" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.satty}/bin/satty -f - --fullscreen";
+            "${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";
 
             #: Workspace movement {{{
             "--input-device=${inputs.kb.builtin} ${mod}+ampersand" = "workspace number 1";
@@ -135,10 +129,6 @@
             command = "${pkgs.swaynotificationcenter}/bin/swaync-client --reload-config --reload-css";
             always = true;
           }
-          {
-            # Copy all copied values into the cliphist store
-            command = "${pkgs.wl-clipboard}/bin/wl-paste --watch ${pkgs.cliphist}/bin/cliphist store -max-items 10";
-          }
         ];
         #: }}}
         assigns = {
diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index 28baa5a..774945c 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -41,7 +41,7 @@
     fish.enable = true;
     firefox.enable = true;
     thunderbird.enable = true;
-    hyprland.enable = true;
+    sway.enable = true;
   };
 
   security.polkit.enable = true;
@@ -83,6 +83,7 @@
     eza
     bat
     swaynotificationcenter
+    pop-icon-theme
   ];
 
   system.stateVersion = "24.05";
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index 68623b1..e119cda 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -10,7 +10,6 @@
       ../../home/rofi
       ../../home/swaync
       ../../home/waybar
-      ../../home/hyprlock
       ../../home/hyprpaper
       ../../home/themes/catppuccin.nix
       ../../home
@@ -35,7 +34,6 @@
         keepassxc
         kdeconnect
         nextcloud-client
-        cliphist
         digikam
         fragments
         element-desktop