diff --git a/home/modules/hyprland/hyprland.nix b/home/modules/hyprland/hyprland.nix
index 7398969..2b97b6b 100644
--- a/home/modules/hyprland/hyprland.nix
+++ b/home/modules/hyprland/hyprland.nix
@@ -127,9 +127,9 @@
 
           "$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
 
-	  # Scroll through existing workspaces with mod + scroll
-	  "$mod, mouse_down, workspace, e+1"
-	  "$mod, mouse_up, workspace, e-1"
+          # Scroll through existing workspaces with mod + scroll
+          "$mod, mouse_down, workspace, e+1"
+          "$mod, mouse_up, workspace, e-1"
         ]
         ++ (
           # workspaces
@@ -148,8 +148,6 @@
       bindm = [
         "$mod, mouse:272, movewindow"
         "$mod, mouse:273, resizewindow"
-
-	
       ];
 
       bindel = [
@@ -162,9 +160,9 @@
 
       bindl = [
         ", XF86AudioNext, exec, playerctl next"
-	", XF86AudioPause, exec, playerctl play-pause"
-	", XF86AudioPlay, exec, playerctl play-pause"
-	", XF86AudioPrev, exec, playerctl previous"
+        ", XF86AudioPause, exec, playerctl play-pause"
+        ", XF86AudioPlay, exec, playerctl play-pause"
+        ", XF86AudioPrev, exec, playerctl previous"
       ];
 
       input = {
@@ -184,23 +182,23 @@
         border_size = 2;
 
         "col.active_border" = "rgba($mauveAlphaee)";
-	"col.inactive_border" = "rgba($overlay1Alphaee)";
+        "col.inactive_border" = "rgba($overlay1Alphaee)";
       };
 
       decoration = {
         rounding = 5;
-	
-	blur = {
-	    enabled = true;
-	    size = 3;
-	    passes = 1;
-	    vibrancy = 0.1696;
-	};
+
+        blur = {
+          enabled = true;
+          size = 3;
+          passes = 1;
+          vibrancy = 0.1696;
+        };
       };
 
       gestures = {
         workspace_swipe = true;
-	workspace_swipe_fingers = 3;
+        workspace_swipe_fingers = 3;
       };
     };
 
diff --git a/home/modules/hyprland/hyprpaper.nix b/home/modules/hyprland/hyprpaper.nix
index f86be0e..2030adb 100644
--- a/home/modules/hyprland/hyprpaper.nix
+++ b/home/modules/hyprland/hyprpaper.nix
@@ -1,9 +1,9 @@
 {
-    services.hyprpaper = {
-        enable = true;
-	settings = {
-	    preload = [ "/home/uzair/Pictures/nix-mocha.png" ];
-	    wallpaper = [ ", /home/uzair/Pictures/nix-mocha.png" ];
-	};
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      preload = ["/home/uzair/Pictures/nix-mocha.png"];
+      wallpaper = [", /home/uzair/Pictures/nix-mocha.png"];
     };
+  };
 }
diff --git a/home/modules/hyprland/kitty.nix b/home/modules/hyprland/kitty.nix
index 554d8b4..9579d21 100644
--- a/home/modules/hyprland/kitty.nix
+++ b/home/modules/hyprland/kitty.nix
@@ -1,13 +1,13 @@
 {
-    programs.kitty = {
-        enable = true;
-	themeFile = "Catppuccin-Mocha";
-	shellIntegration = {
-		enableFishIntegration = true;
-	};
-	font = {
-	    name = "CaskaydiaCove Nerd Font";
-	    size = 12;
-	};
+  programs.kitty = {
+    enable = true;
+    themeFile = "Catppuccin-Mocha";
+    shellIntegration = {
+      enableFishIntegration = true;
     };
+    font = {
+      name = "CaskaydiaCove Nerd Font";
+      size = 12;
+    };
+  };
 }
diff --git a/home/modules/hyprland/rofi.nix b/home/modules/hyprland/rofi.nix
index 6bdac34..8b0d897 100644
--- a/home/modules/hyprland/rofi.nix
+++ b/home/modules/hyprland/rofi.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-    home.packages = [
-        pkgs.rofi-wayland	
-    ];
+  home.packages = [
+    pkgs.rofi-wayland
+  ];
 }
diff --git a/home/modules/hyprland/waybar.nix b/home/modules/hyprland/waybar.nix
index c0284b4..427790e 100644
--- a/home/modules/hyprland/waybar.nix
+++ b/home/modules/hyprland/waybar.nix
@@ -12,7 +12,7 @@
         ];
         modules-left = ["hyprland/workspaces" "hyprland/window"];
         modules-center = ["tray"];
-        modules-right = ["pulseaudio" "backlight" "bluetooth" "network" "battery" "clock"];
+        modules-right = ["pulseaudio" "backlight" "bluetooth" "network" "battery" "clock" "custom/power"];
 
         "hyprland/workspaces" = {
           on-scroll-up = "hyprctl dispatch workspace e+1";
@@ -22,7 +22,46 @@
         "hyrland/window" = {
           separate-outputs = true;
         };
+
+	"custom/power" = {
+	  tooltip = false;
+	  on-click = "wlogout &";
+	  format = "󰈆";
+	};
       };
     };
+
+    style = ''
+      @define-color base   #1e1e2e;
+      @define-color mantle #181825;
+      @define-color crust  #11111b;
+
+      @define-color text     #cdd6f4;
+      @define-color subtext0 #a6adc8;
+      @define-color subtext1 #bac2de;
+
+      @define-color surface0 #313244;
+      @define-color surface1 #45475a;
+      @define-color surface2 #585b70;
+
+      @define-color overlay0 #6c7086;
+      @define-color overlay1 #7f849c;
+      @define-color overlay2 #9399b2;
+
+      @define-color blue      #89b4fa;
+      @define-color lavender  #b4befe;
+      @define-color sapphire  #74c7ec;
+      @define-color sky       #89dceb;
+      @define-color teal      #94e2d5;
+      @define-color green     #a6e3a1;
+      @define-color yellow    #f9e2af;
+      @define-color peach     #fab387;
+      @define-color maroon    #eba0ac;
+      @define-color red       #f38ba8;
+      @define-color mauve     #cba6f7;
+      @define-color pink      #f5c2e7;
+      @define-color flamingo  #f2cdcd;
+      @define-color rosewater #f5e0dc;
+    '';
   };
 }
diff --git a/home/modules/hyprland/wlsunset.nix b/home/modules/hyprland/wlsunset.nix
index cea1f68..85e6de1 100644
--- a/home/modules/hyprland/wlsunset.nix
+++ b/home/modules/hyprland/wlsunset.nix
@@ -1,12 +1,12 @@
 {
-    services.wlsunset = {
-        enable = true;
-	latitude = 39;
-	longitude = -121.2;
+  services.wlsunset = {
+    enable = true;
+    latitude = 39;
+    longitude = -121.2;
 
-	temperature = {
-	    day = 6500;
-	    night = 5000;
-	};
+    temperature = {
+      day = 6500;
+      night = 5000;
     };
+  };
 }