diff --git a/README.md b/README.md
index 74b259df..abb812bd 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ Repo for nix configuration files
 * [ ] btrfs snapshots
 * [ ] regreet config / theming - Icons still broken for some reason
     * Possibly switch to tuigreet and gruv it
-* [ ] mako config / theming
-* [ ] waybar config / theming
+* [x] mako config / theming
+* [x] waybar config / theming
 * [x] hyprland config / theming
   * [x] Try `libinput-gestures` for gesture control of Hyprland - [Link](https://github.com/bulletmark/libinput-gestures)
 * [x] powerline config / theming
@@ -27,7 +27,7 @@ Repo for nix configuration files
 * [x] Possibly move away from powerline-go - I want something simpler
     * Staying with powerline-go, just editing the config in `home-manager/bash.nix`
 * [ ] Set up the fingerprint reader - [Link](https://www.makeuseof.com/set-up-fingerprint-scanner-with-pam-on-linux/)
-* [ ] sublime music config / theming / integration - [Link](https://docs.sublimemusic.app/)
+* [x] sublime music config / theming / integration - [Link](https://docs.sublimemusic.app/)
 * [ ] hyprland
   * [x] Try hyprctl
   * [ ] hyprbars - [Link](https://github.com/hyprwm/hyprland-plugins/tree/main/hyprbars)
diff --git a/desktops/hyprland.nix b/desktops/hyprland.nix
index 7f734afc..50fd3728 100644
--- a/desktops/hyprland.nix
+++ b/desktops/hyprland.nix
@@ -2,51 +2,51 @@
   services.xserver.videoDrivers = ["nvidia"];
 
   # Greeter, for when you start the computer
-  programs.regreet = {
+  # programs.regreet = {
+  #  enable = true;
+  #  # https://github.com/rharish101/ReGreet/blob/main/regreet.sample.toml
+  #  settings = { 
+  #    background = {
+  #      path = "/etc/nixos/git/desktops/wallpapers/gruvbox/wallpaper3.jpg";
+  #      fit = "Cover";
+  #    };
+  #    GTK = {
+  #      application_prefer_dark_theme = true;
+  #      cursor_theme_name = "Adwaita";
+  #      font_name = "Cantarell 16";
+  #      icon_theme_name = "Papirus-Dark";
+  #      theme_name = "Gruvbox-Dark-BL";
+  #    };
+  #    commands = {
+  #      reboot = [ "systemctl" "reboot" ];
+  #      poweroff = [ "systemctl" "poweroff" ];
+  #    };
+  #  };
+  #  extraCss = ''
+  #    #background {
+  #      filter: blur(20px);
+  #      blur: 20px;
+  #    }
+  #    #user_toggle {
+  #      visibility: none;
+  #    }
+  #    #sess_toggle {
+  #      visibility: none;
+  #    }
+  #  '';
+  # };
+
+  tuigreet
+  services.greetd = {
     enable = true;
-    # https://github.com/rharish101/ReGreet/blob/main/regreet.sample.toml
-    settings = { 
-      background = {
-        path = "/etc/nixos/git/desktops/wallpapers/gruvbox/wallpaper3.jpg";
-        fit = "Cover";
-      };
-      GTK = {
-        application_prefer_dark_theme = true;
-        cursor_theme_name = "Adwaita";
-        font_name = "Cantarell 16";
-        icon_theme_name = "Papirus-Dark";
-        theme_name = "Gruvbox-Dark-BL";
-      };
-      commands = {
-        reboot = [ "systemctl" "reboot" ];
-        poweroff = [ "systemctl" "poweroff" ];
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time";
+        user = "greeter";
       };
     };
-    extraCss = ''
-      #background {
-        filter: blur(20px);
-        blur: 20px;
-      }
-      #user_toggle {
-        visibility: none;
-      }
-      #sess_toggle {
-        visibility: none;
-      }
-    '';
   };
 
-  # tuigreet
-  # services.greetd = {
-  #   enable = true;
-  #   settings = {
-  #     default_session = {
-  #       command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
-  #       user = "greeter";
-  #     };
-  #   };
-  # };
-
   # Brightness and volume control
   # https://haikarainen.github.io/light/
   programs.light.enable = true;
diff --git a/hosts/nixos-laptop/home-manager/hyprland-conf.nix b/hosts/nixos-laptop/home-manager/hyprland-conf.nix
index 5f21fbd7..670a7b7e 100644
--- a/hosts/nixos-laptop/home-manager/hyprland-conf.nix
+++ b/hosts/nixos-laptop/home-manager/hyprland-conf.nix
@@ -155,6 +155,17 @@
       bind = $mainMod SHIFT, right, movetoworkspace, e+1
       bind = $mainMod SHIFT, left, movetoworkspace, e-1
 
+      # Lock the screen, send to swaylock
+      bind = $mainMod, L, swaylock-fancy
+
+      # Lid closure:
+      # trigger when the switch is toggled
+      # bindl=,switch:[switch name],exec,swaylock
+      # trigger when the switch is turning on
+      #bindl=,switch:on:[switch name],exec,hyprctl keyword monitor "eDP-1, 2560x1600, 0x0, 1"
+      # trigger when the switch is turning off
+      # bindl=,switch:off:[switch name],exec,hyprctl keyword monitor "eDP-1, disable"
+
       # Laptop specific config
       # Set up the FN keys:
       # F1 - Mute