diff --git a/home-manager/wayland/default.nix b/home-manager/wayland/default.nix
index d2521b1..ba603ce 100644
--- a/home-manager/wayland/default.nix
+++ b/home-manager/wayland/default.nix
@@ -7,11 +7,7 @@
 
   imports = [
     ./sway.nix
-    ./swaylock.nix
-    ./swaynag.nix
-    ./mako.nix
-    ./rofi.nix
+    ./swaytools.nix
     ./waybar.nix
-    ./wob.nix
   ];
 }
diff --git a/home-manager/wayland/mako.nix b/home-manager/wayland/mako.nix
deleted file mode 100644
index 725dcdb..0000000
--- a/home-manager/wayland/mako.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ pkgs, ... }:
-{
-  services.mako = {
-    enable = true;
-
-    font = "JetBrainsMono Nerd Font 10";
-    format = ''<i>%a</i>\n<b>%s</b>\n\n%b'';
-    layer = "overlay";
-    backgroundColor = "#111320d0";
-    width = 300;
-    margin = "5";
-    padding = "5,10";
-    borderSize = 2;
-    borderColor = "#7bc5e4";
-    borderRadius = 5;
-    defaultTimeout = 10000;
-    
-    extraConfig =
-      ''
-        [urgency=low]
-        format=<i>%s</i>\n%b
-        background-color=#111111c0
-        border-color=#787c99
-        border-size=1
-
-        [urgency=high]
-        background-color=#1e0909d0
-        border-color=#ce7284
-        border-size=3
-        default-timeout=0
-        ignore-timeout=1
-
-        [app-name=discord]
-        format=<b>%s</b>\n\n%b
-        border-color=#7da6ff
-
-        [app-name=discordcanary]
-        format=<b>%s</b>\n\n%b
-        border-color=#7da6ff
-      '';
-  };
-}
diff --git a/home-manager/wayland/rofi.nix b/home-manager/wayland/rofi.nix
deleted file mode 100644
index 0defb6e..0000000
--- a/home-manager/wayland/rofi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-{
-  programs.rofi.enable = true;
-  programs.rofi.package = pkgs.rofi-wayland;
-
-  xdg.configFile.rofi.source = ./rofi;
-}
diff --git a/home-manager/wayland/swaylock.nix b/home-manager/wayland/swaylock.nix
deleted file mode 100644
index b08d12b..0000000
--- a/home-manager/wayland/swaylock.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.swaylock-effects ];
-
-  xdg.configFile."swaylock/config".text =
-    ''
-      ignore-empty-password
-      fade-in=0.3
-
-      indicator
-      screenshots
-
-      font=JetBrainsMono
-      text-color=ffffff
-      color=00000000
-      ring-color=7da6ff
-      key-hl-color=7bc5e4
-
-      line-uses-inside
-      indicator-radius=120
-      indicator-thickness=7
-
-      clock
-      datestr=%a, %Y-%m-%d
-
-      effect-scale=0.4
-      effect-vignette=0.3:0.7
-      effect-blur=2x2
-    '';
-}
diff --git a/home-manager/wayland/swaynag.nix b/home-manager/wayland/swaynag.nix
deleted file mode 100644
index 7827686..0000000
--- a/home-manager/wayland/swaynag.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-{
-  xdg.configFile."swaynag/config".text =
-    ''
-      font=JetBrainsMono 10
-      layer=top
-      edge=bottom
-
-      [exit]
-      background=111320D0
-      text=a9b1d6
-      border-bottom=7BC5E4
-      border-bottom-size=1
-      button-background=282E49F0
-      button-border-size=2
-    '';
-}
diff --git a/home-manager/wayland/swaytools.nix b/home-manager/wayland/swaytools.nix
new file mode 100644
index 0000000..cdf5da9
--- /dev/null
+++ b/home-manager/wayland/swaytools.nix
@@ -0,0 +1,100 @@
+{ pkgs, config, ... }:
+{
+  home.packages = with pkgs; [ swaylock-effects wob ];
+
+  xdg.configFile = {
+    "wob/volume.ini".text = "";
+    "wob/brightness.ini".text = ''
+      border_color = FFFF00FF
+      bar_color = FFFF00FF
+    '';
+
+    "swaylock/config".text = ''
+      ignore-empty-password
+      fade-in=0.3
+
+      indicator
+      screenshots
+
+      font=JetBrainsMono
+      text-color=ffffff
+      color=00000000
+      ring-color=7da6ff
+      key-hl-color=7bc5e4
+
+      line-uses-inside
+      indicator-radius=120
+      indicator-thickness=7
+
+      clock
+      datestr=%a, %Y-%m-%d
+
+      effect-scale=0.4
+      effect-vignette=0.3:0.7
+      effect-blur=2x2
+    '';
+
+    "swaynag/config".text = ''
+      font=JetBrainsMono 10
+      layer=top
+      edge=bottom
+
+      [exit]
+      background=111320D0
+      text=a9b1d6
+      border-bottom=7BC5E4
+      border-bottom-size=1
+      button-background=282E49F0
+      button-border-size=2
+    '';
+  };
+
+  # Rofi
+
+  programs.rofi.enable = true;
+  programs.rofi.package = pkgs.rofi-wayland;
+
+  xdg.configFile.rofi.source = ./rofi;
+
+  # Mako
+
+  services.mako = {
+    enable = true;
+
+    font = "JetBrainsMono Nerd Font 10";
+    format = ''<i>%a</i>\n<b>%s</b>\n\n%b'';
+    layer = "overlay";
+    backgroundColor = "#111320d0";
+    width = 300;
+    margin = "5";
+    padding = "5,10";
+    borderSize = 2;
+    borderColor = "#7bc5e4";
+    borderRadius = 5;
+    defaultTimeout = 10000;
+
+    extraConfig =
+      ''
+        [urgency=low]
+        format=<i>%s</i>\n%b
+        background-color=#111111c0
+        border-color=#787c99
+        border-size=1
+
+        [urgency=high]
+        background-color=#1e0909d0
+        border-color=#ce7284
+        border-size=3
+        default-timeout=0
+        ignore-timeout=1
+
+        [app-name=discord]
+        format=<b>%s</b>\n\n%b
+        border-color=#7da6ff
+
+        [app-name=discordcanary]
+        format=<b>%s</b>\n\n%b
+        border-color=#7da6ff
+      '';
+  };
+}
diff --git a/home-manager/wayland/wob.nix b/home-manager/wayland/wob.nix
deleted file mode 100644
index 1af7714..0000000
--- a/home-manager/wayland/wob.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = [ pkgs.wob ];
-
-  xdg.configFile = {
-    "wob/volume.ini".text = "";
-
-    "wob/brightness.ini".text = config.xdg.configFile."wob/volume.ini".text + ''
-      border_color = FFFF00FF
-      bar_color = FFFF00FF
-    '';
-  };
-}