diff --git a/hosts/nixos/common/global/default.nix b/hosts/nixos/common/global/default.nix
index de6452b..2822aac 100644
--- a/hosts/nixos/common/global/default.nix
+++ b/hosts/nixos/common/global/default.nix
@@ -16,7 +16,7 @@ let
     ./fish.nix
     ./locale.nix
     ./wireless
-    ./tailscale.nix
+    # ./tailscale.nix
     ../../../../common
   ];
 in
diff --git a/hosts/nixos/common/optional/greetd.nix b/hosts/nixos/common/optional/greetd.nix
index 42cd1e9..9049813 100644
--- a/hosts/nixos/common/optional/greetd.nix
+++ b/hosts/nixos/common/optional/greetd.nix
@@ -1,28 +1,14 @@
 { config, lib, pkgs, ... }:
-let
-  # [Gtkgreet](https://git.sr.ht/~kennylevinsen/gtkgreet) — greetd greeter of choice
-  gtkgreet = lib.getExe pkgs.greetd.gtkgreet;
-
-  # [Cage](https://github.com/cage-kiosk/cage) — wayland kiosk
-  cage = lib.getExe pkgs.cage;
-
-  dbus-run-session = "${pkgs.dbus}/bin/dbus-run-session";
-
-  kiosk = command:
-    "${dbus-run-session} ${cage} -s -- ${command}";
-
-  background = ../../../../common/themes/wallpapers/eye.png;
-in
 {
   services.greetd = {
     enable = true;
+    vt = 1;
     settings = {
       default_session = {
-        # command = kiosk "${gtkgreet} -b ${background}";
         command = ''
           ${lib.getExe pkgs.greetd.tuigreet} \
             -c ${lib.getExe config.programs.hyprland.package} \
-            -g "(｡◕‿◕｡) Welcome to tethys!" \
+            -g " (.>_>.) Welcome to tethys! (.<_<.)" \
             --remember
             --asterisks
         '';
diff --git a/hosts/nixos/common/optional/quietboot.nix b/hosts/nixos/common/optional/quietboot.nix
index 09194a6..ad1fb14 100644
--- a/hosts/nixos/common/optional/quietboot.nix
+++ b/hosts/nixos/common/optional/quietboot.nix
@@ -6,19 +6,20 @@
     theme = "cuts_alt";
   };
 
+  console = {
+    useXkbConfig = true;
+    earlySetup = false;
+  };
+
   boot = {
     # See https://search.nixos.org/options?show=boot.initrd.verbose&query=boot.initrd.verbose
     kernelParams = [
       "quiet"
-      "splash"
-      "boot.shell_on_fail"
-      "i915.fastboot=1"
       "loglevel=3"
-      "rd.systemd.show_status=false"
-      "rd.udev.log_level=3"
-      "udev.log_priority=3"
-      "vt.global_cursor_default=0"
+      "systemd.show_status=auto"
       "udev.log_level=3"
+      "rd.udev.log_level=3"
+      "vt.global_cursor_default=0"
     ];
     consoleLogLevel = 0;
     initrd.verbose = false;
diff --git a/hosts/nixos/tethys/boot.nix b/hosts/nixos/tethys/boot.nix
index d7f2cc5..fc36caa 100644
--- a/hosts/nixos/tethys/boot.nix
+++ b/hosts/nixos/tethys/boot.nix
@@ -1,6 +1,8 @@
 { inputs, ... }: {
   imports = [ inputs.grub2-themes.nixosModules.default ];
 
+  boot.initrd.systemd.enable = true;
+
   # Defined [here](https://github.com/vinceliuice/grub2-themes/blob/master/flake.nix#L11)
   boot.loader.grub2-theme = {
     enable = true;
diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix
index 61cf689..b9ebab1 100644
--- a/hosts/nixos/tethys/default.nix
+++ b/hosts/nixos/tethys/default.nix
@@ -11,6 +11,7 @@
     ../common/optional/slambda.nix
     ../common/optional/xdg-portal.nix
     ../common/optional/hyprland.nix
+    ../common/optional/quietboot.nix
 
     ./services/syncthing.nix
     ./hardware-configuration.nix