diff --git a/.sops.yaml b/.sops.yaml
index 85171fe2..8500a847 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,112 +1,114 @@
 keys:
-  - &user_albert           D98BBC6C9A27324654C2D8C464F6C4EB46C4543A
-  - &host_nixos-framework  aaec681e4fb9dcdd15d0d367a86615d17653d819
-  - &host_steamdeck        d01f806e6f0909dc470a676b6fe398ca0043ab53
-  - &host_framework-server dfd3a496aba156fa521e82ada77d68dc727cf52b
-  - &host_osaka-linode-01  5f548d87ab2b8a4d48d80da3f2ff8352998da7fa
-  - &host_milan-linode-01  264f9137377eda3b95c82c86cebd6d17984b8d4e
-  - &host_piaware-rpi4     4216b645667670a6130bb95a72a56f8269cd0818
-  - &host_backups-rpi4     8b37122bb46dc98c208002d65e94778ecd94bd4e
-  - &host_quitman-rpi4     
-  - &host_bakersfield-rpi4 c93d5c2da5efe4ba4103c8f571faa392f202eed4
-  - &host_nixos-desktop    
-  - &host_nuc-server
+  - &users:
+    - &albert           D98BBC6C9A27324654C2D8C464F6C4EB46C4543A
+  - &hosts:
+    - &nixos-framework  aaec681e4fb9dcdd15d0d367a86615d17653d819
+    - &steamdeck        d01f806e6f0909dc470a676b6fe398ca0043ab53
+    - &framework-server dfd3a496aba156fa521e82ada77d68dc727cf52b
+    - &osaka-linode-01  5f548d87ab2b8a4d48d80da3f2ff8352998da7fa
+    - &milan-linode-01  264f9137377eda3b95c82c86cebd6d17984b8d4e
+    - &piaware-rpi4     4216b645667670a6130bb95a72a56f8269cd0818
+    - &backups-rpi4     8b37122bb46dc98c208002d65e94778ecd94bd4e
+    - &quitman-rpi4     
+    - &bakersfield-rpi4 c93d5c2da5efe4ba4103c8f571faa392f202eed4
+    - &nixos-desktop    
+    - &nuc-server
 
 creation_rules:
 
   - path_regex: secrets\/yubikey\.yaml$
     key_groups:
       - pgp:
-        - *user_albert
-        - *host_nixos-framework
+        - *albert
+        - *nixos-framework
 
   - path_regex: secrets\/secrets\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
-      - *host_osaka-linode-01
-      - *host_milan-linode-01
-      - *host_nixos-framework
-      - *host_framework-server
-      - *host_piaware-rpi4
-      - *host_backups-rpi4
-      - *host_bakersfield-rpi4
-      - *host_steamdeck
+      - *albert
+      - *osaka-linode-01
+      - *milan-linode-01
+      - *nixos-framework
+      - *framework-server
+      - *piaware-rpi4
+      - *backups-rpi4
+      - *bakersfield-rpi4
+      - *steamdeck
 
   - path_regex: secrets\/wireguard\.yaml$
     key_groups:
     - pgp: 
-      - *user_albert
-      - *host_osaka-linode-01
-      - *host_framework-server
-      - *host_backups-rpi4
+      - *albert
+      - *osaka-linode-01
+      - *framework-server
+      - *backups-rpi4
 
   - path_regex: secrets\/containers\/rdesktop\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
-      - *host_framework-server
+      - *albert
+      - *framework-server
 
   - path_regex: secrets\/hosts\/milan-linode-01\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
-      - *host_milan-linode-01
+      - *albert
+      - *milan-linode-01
 
   - path_regex: secrets\/hosts\/osaka-linode-01\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
-      - *host_osaka-linode-01
+      - *albert
+      - *osaka-linode-01
 
   - path_regex: secrets\/hosts\/nixos-framework\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
-      - *host_nixos-framework
+      - *albert
+      - *nixos-framework
 
   - path_regex: secrets\/hosts\/framework-server\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
-      - *host_framework-server
+      - *albert
+      - *framework-server
 
   - path_regex: secrets\/hosts\/piaware-rpi4\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
-      - *host_piaware-rpi4
+      - *albert
+      - *piaware-rpi4
 
   - path_regex: secrets\/hosts\/backups-rpi4\.yaml$
     key_groups:
     - pgp: 
-      - *user_albert
-      - *host_backups-rpi4
+      - *albert
+      - *backups-rpi4
  
   - path_regex: secrets\/hosts\/steamdeck\.yaml$
     key_groups:
     - pgp: 
-      - *user_albert
-      - *host_steamdeck
+      - *albert
+      - *steamdeck
 
   - path_regex: secrets\/hosts\/bakersfield-rpi4\.yaml$
     key_groups:
     - pgp: 
-      - *user_albert
-      - *host_bakersfield-rpi4
+      - *albert
+      - *bakersfield-rpi4
   
   - path_regex: secrets\/hosts\/quitman-rpi4\.yaml$
     key_groups:
     - pgp: 
-      - *user_albert
+      - *albert
 
   - path_regex: secrets\/hosts\/nixos-desktop\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
+      - *albert
 
   - path_regex: secrets\/hosts\/nuc-server\.yaml$
     key_groups:
     - pgp:
-      - *user_albert
+      - *albert
 
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index 525de4d0..19b511e8 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -45,12 +45,23 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --issue --cmd Hyprland";
         user = "greeter";
       };
     };
   };
 
+  systemd.services.greetd.serviceConfig = {
+    Type = "idle";
+    StandardInput = "tty";
+    StandardOutput = "tty";
+    StandardError = "journal"; # Without this errors will spam on screen
+    # Without these bootlogs will spam on screen
+    TTYReset = true;
+    TTYVHangup = true;
+    TTYVTDisallocate = true;
+  };
+
   # Brightness and volume control
   # https://haikarainen.github.io/light/
   programs.light.enable = true;
@@ -128,15 +139,11 @@
     pkgs.pyradio              # Internet radio TUI
 
     # Themes
-    pkgs.gruvbox-gtk-theme    # Gruvbox Theme
-    pkgs.papirus-icon-theme   # Papirus Icons
+    # pkgs.gruvbox-gtk-theme    # Gruvbox Theme
+    # pkgs.papirus-icon-theme   # Papirus Icons
 
     pkgs.rofi-wayland         # App Launcher
     pkgs.rofi-rbw-wayland     # Front-end for Bitwarden with Rofi
-
-    # wayland-packages
-
-    # inputs.nixpkgs-wayland.packages.${system}.wayprompt  # from nixpkgs-wayland exclusively - pinentry UI
   ];
 
   # Enable sound with pipewire.