diff --git a/hmModules/qutebrowser/default.nix b/hmModules/qutebrowser/default.nix
index 9653d9f..c0f273c 100644
--- a/hmModules/qutebrowser/default.nix
+++ b/hmModules/qutebrowser/default.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   programs.qutebrowser = {
     enable = true;
     searchEngines = {
@@ -21,6 +25,7 @@
       };
     };
     settings = {
+      auto_save.session = true;
       url.start_pages = ["https://searx.be"];
       editor.command = [
         "emacsclient"
@@ -29,12 +34,40 @@
         "-c"
       ];
       content.pdfjs = true;
-      tabs.tabs_are_windows = true;
+      fonts = {
+        default_size = "11pt";
+        tabs = {
+          selected = "13pt";
+          unselected = "13pt";
+        };
+      };
+      colors = {
+        tabs = {
+          even = {
+            bg = "silver";
+            fg = "#666666";
+          };
+          odd = {
+            bg = "gainsboro";
+            fg = config.programs.qutebrowser.settings.colors.tabs.even.fg;
+          };
+        };
+      };
     };
+    # `c.tabs.padding` must be set here since it's a python dict
+    extraConfig = ''
+      c.tabs.padding = {
+        'bottom': 4,
+        'left': 4,
+        'right': 4,
+        'top': 4
+      }
+    '';
   };
-  home.packages = [
+  home.packages = with pkgs; [
+    fuzzel
     (
-      pkgs.makeDesktopItem {
+      makeDesktopItem {
         name = "qutebrowser";
         exec = "qutebrowser %u";
         comment = "Qutebrowser";
diff --git a/hmModules/sway/default.nix b/hmModules/sway/default.nix
index e63734a..f213c90 100644
--- a/hmModules/sway/default.nix
+++ b/hmModules/sway/default.nix
@@ -5,6 +5,8 @@
 }: {
   imports = [
     ./waybar.nix
+    ./idle.nix
+    ./mako.nix
     ./gammastep.nix
     ../foot
   ];
diff --git a/hmModules/sway/idle.nix b/hmModules/sway/idle.nix
new file mode 100644
index 0000000..d4b3428
--- /dev/null
+++ b/hmModules/sway/idle.nix
@@ -0,0 +1,41 @@
+{pkgs, ...}: {
+  services.swayidle = let
+    swaylockWithArgs = pkgs.writeScriptBin "swaylockWithArgs" ''
+      ${pkgs.swaylock-effects}/bin/swaylock \
+        --daemonize \
+        --screenshots \
+        --clock \
+        --indicator \
+        --indicator-radius 100 \
+        --indicator-thickness 7 \
+        --effect-blur 7x5 \
+        --effect-vignette 0.5:0.5 \
+        --ring-color bb00cc \
+        --key-hl-color 880033 \
+        --line-color 00000000 \
+        --inside-color 00000088 \
+        --separator-color 00000000 \
+        --grace 2 \
+        --fade-in 0.2
+    '';
+    swaylockCommand = "${swaylockWithArgs}/bin/swaylockWithArgs";
+  in {
+    enable = true;
+    events = [
+      {
+        event = "before-sleep";
+        command = swaylockCommand;
+      }
+      {
+        event = "lock";
+        command = swaylockCommand;
+      }
+    ];
+    timeouts = [
+      {
+        timeout = 600;
+        command = swaylockCommand;
+      }
+    ];
+  };
+}
diff --git a/hmModules/sway/mako.nix b/hmModules/sway/mako.nix
new file mode 100644
index 0000000..4878ab4
--- /dev/null
+++ b/hmModules/sway/mako.nix
@@ -0,0 +1,6 @@
+{
+  programs.mako = {
+    enable = true;
+    defaultTimeout = 5000;
+  };
+}