diff --git a/hosts/dragyx/common/configuration.nix b/hosts/dragyx/common/configuration.nix
index f632a09..15dce96 100644
--- a/hosts/dragyx/common/configuration.nix
+++ b/hosts/dragyx/common/configuration.nix
@@ -1,6 +1,19 @@
 { config, pkgs, ... }:
 
 {
+  imports = [
+    ../../../options/common/pin-registry.nix
+    ../../../options/common/preserve-system.nix
+    ../../../options/desktop/fonts.nix
+  ];
+
+
+  services.locate = {
+    enable = true;
+    interval = "hourly";
+    package = pkgs.plocate;
+    localuser = null;
+  };
 
 
 }
diff --git a/hosts/dragyx/common/theming/default.nix b/hosts/dragyx/common/theming/default.nix
index c26ca3d..b181b98 100644
--- a/hosts/dragyx/common/theming/default.nix
+++ b/hosts/dragyx/common/theming/default.nix
@@ -23,6 +23,34 @@ let
       cp -r $src/basic/.local/share/rofi/themes/* $out/share/
     '';
   };
+  grub-theme = pkgs.stdenv.mkDerivation {
+    pname = "catppuccin-grub";
+    version = "0";
+    src = pkgs.fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "grub";
+      rev = "803c5df0e83aba61668777bb96d90ab8f6847106"; 
+      sha256 = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=";
+    };
+    installPhase = ''
+      # runHook preInstall
+
+
+      mkdir -p $out/
+
+      cp -r $src/src/catppuccin-mocha-grub-theme/* $out/
+
+
+
+      # runHook postInstall
+    '';
+  };
+  catppuccin-sddm-corners-patched = pkgs.catppuccin-sddm-corners.overrideAttrs (prevAttrs: {
+    postInstall = (prevAttrs.postInstall or "") + ''
+      sed -i -E "s/passwordMaskDelay: [0-9]+/passwordMaskDelay: 0/" $out/share/sddm/themes/catppuccin-sddm-corners/components/PasswordPanel.qml
+    '';
+  });
+
 in
 {
   home-manager.users.${username} = {
@@ -44,5 +72,9 @@ in
       '';
     };
   };
+  environment.systemPackages = [ catppuccin-sddm-corners-patched ];
+  services.displayManager.sddm.theme = "catppuccin-sddm-corners";
+
+  boot.loader.grub.theme = grub-theme;
 
 }
diff --git a/hosts/dragyx/common/waybar.nix b/hosts/dragyx/common/waybar.nix
index b2e7369..458914f 100644
--- a/hosts/dragyx/common/waybar.nix
+++ b/hosts/dragyx/common/waybar.nix
@@ -29,7 +29,7 @@ in
             ];
             #  Modules
             "custom/os-icon" = {
-              format = "\uf313"; #NixOS logo
+              format = "\\uf313"; #NixOS logo
             };
             battery =  {
               interval = 10;
@@ -73,15 +73,15 @@ in
             network = {
               interval = 5;
               format-wifi = "{icon} {essid}";
-              format-ethernet = "\udb80\ude01 {ifname}";
-              format-disconnected = "\uf0202 Offline";
-              format-alt = "\udb80\uddda {bandwidthDownBytes} \udb81\udd52 {bandwidthUpBytes} \udb82\ude5f {ipaddr}/{cidr}";
+              format-ethernet = "\\udb80\\ude01 {ifname}";
+              format-disconnected = "\\uf0202 Offline";
+              format-alt = "\\udb80\\uddda {bandwidthDownBytes} \\udb81\\udd52 {bandwidthUpBytes} \\udb82\\ude5f {ipaddr}/{cidr}";
               format-icons = [
-                "\udb82\udd28 "
-                "\udb82\udd25 "
-                "\udb82\udd22 "
-                "\udb82\udd1f "
-                "\udb82\udd2f "
+                "\\udb82\\udd28 "
+                "\\udb82\\udd25 "
+                "\\udb82\\udd22 "
+                "\\udb82\\udd1f "
+                "\\udb82\\udd2f "
               ];
               tooltip = false;
             };
@@ -94,9 +94,9 @@ in
               max-length = 30;
               tooltip = false;
               rewrite = {
-                "([Aa]lacritty|kitty)" = "\ue795 $1";
-                "(.*) .{15} Mozilla Firefox" = "\ue745 $1";
-                "(^Spotify.*)" = "\uf1bc $1";
+                "([Aa]lacritty|kitty)" = "\\ue795 $1";
+                "(.*) .{15} Mozilla Firefox" = "\\ue745 $1";
+                "(^Spotify.*)" = "\\uf1bc $1";
               };
             };
             "hyprland/workspaces" = {
@@ -161,26 +161,26 @@ in
             backlight = {
               format = "{percent}% {icon} ";
               format-icons = [
-                "\udb80\udf36"
-                "\udb86\ude4e"
-                "\udb86\ude4f"
-                "\udb86\ude50"
-                "\udb86\ude51"
-                "\udb86\ude52"
-                "\udb86\ude53"
-                "\udb86\ude54"
-                "\udb86\ude55"
-                "\udb86\ude56"
-                "\udb81\udee8"
+                "\\udb80\\udf36"
+                "\\udb86\\ude4e"
+                "\\udb86\\ude4f"
+                "\\udb86\\ude50"
+                "\\udb86\\ude51"
+                "\\udb86\\ude52"
+                "\\udb86\\ude53"
+                "\\udb86\\ude54"
+                "\\udb86\\ude55"
+                "\\udb86\\ude56"
+                "\\udb81\\udee8"
               ];
             };
             wireplumber = {
               format = "{icon} {volume}%";
-              format-muted = "\udb81\udd81";
+              format-muted = "\\udb81\\udd81";
               format-icons = [
-                "\uf026"
-                "\uf027"
-                "\udb81\udd7e"
+                "\\uf026"
+                "\\uf027"
+                "\\udb81\\udd7e"
               ];
             };
             tray = {
diff --git a/hosts/dragyx/flocke/configuration.nix b/hosts/dragyx/flocke/configuration.nix
index d7981ec..dfdb727 100644
--- a/hosts/dragyx/flocke/configuration.nix
+++ b/hosts/dragyx/flocke/configuration.nix
@@ -3,9 +3,6 @@
 {
   imports = [
     ../common/default.nix
-    ../../../options/common/pin-registry.nix
-    ../../../options/common/preserve-system.nix
-    ../../../options/desktop/fonts.nix
     ./packages.nix
   ];
 
@@ -51,6 +48,15 @@
           device = "nodev";
           efiSupport = true;
           enableCryptodisk = true;
+          useOSProber = true;
+          extraEntries = ''
+            menuentry "Reboot" {
+              reboot
+            }
+            menuentry "Poweroff" {
+              halt
+            }
+          '';
         };
     };
     initrd.luks.devices = {
@@ -160,6 +166,7 @@
         pipewire.enable = true;
     };
     WM.hyprland.enable = true;
+    WM.hyprland.gnome-keyring = true;
   };
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions