diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 04f51cf..7f59826 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -52,9 +52,9 @@ exec-once = swaync & disown
 exec-once = hypridle & disown
 exec-once = seventeenlands & disown
 exec-once = ~/.config/hypr/scripts/monitor_setup.sh
-exec-once = hyprctl dispatch exec "[workspace 3 silent] signal-desktop"
-exec-once = hyprctl dispatch exec "[workspace 3 silent] discord"
-exec-once = hyprctl dispatch exec "[workspace 3 silent] thunderbird"
+exec-once = hyprctl dispatch exec [workspace 3 silent] signal-desktop
+exec-once = hyprctl dispatch exec [workspace 3 silent] discord
+exec-once = hyprctl dispatch exec [workspace 3 silent] thunderbird
 #exec-once = hyprctl dispatch exec "[workspace 5 silent] steam"
 
 #############################
@@ -65,6 +65,9 @@ exec-once = hyprctl dispatch exec "[workspace 3 silent] thunderbird"
 
 env = XCURSOR_SIZE,20
 env = HYPRCURSOR_SIZE,20
+env = LANG,en_US.UTF-8
+env = LC_ALL,en_US.UTF-8
+env = LANGUAGE,en_US.UTF-8
 
 #####################
 ### LOOK AND FEEL ###
@@ -223,6 +226,7 @@ bind = $mainMod, F, togglefloating,
 bind = $mainMod, space, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, B, exec, killall waybar && waybar &
 bind = $mainMod SHIFT, S, exec, hyprshot -m region --clipboard-only,
 bind = $mainMod, L, exec, hyprlock
 bind = $mainMod, backslash, exec, ~/.config/hypr/scripts/monitor_setup.sh
diff --git a/waybar/modules/temperature.jsonc b/waybar/modules/temperature.jsonc
index 78b3707..9c7b0d1 100644
--- a/waybar/modules/temperature.jsonc
+++ b/waybar/modules/temperature.jsonc
@@ -1,6 +1,6 @@
 {
 	"temperature": {
-		"thermal-zone": 1,
+		"thermal-zone": 0,
 		// "hwmon-path":
 		// "hwmon-path-abs":
 		// "input-filename":
diff --git a/waybar/theme.css b/waybar/theme.css
index 68f2927..7e5a575 100644
--- a/waybar/theme.css
+++ b/waybar/theme.css
@@ -1,63 +1,76 @@
-/* catppuccin-mocha */
+/* Gruvbox Dark */
 
-@define-color rosewater     #f5e0dc;
-@define-color flamingo      #f2cdcd;
-@define-color pink          #f5c2e7;
-@define-color mauve         #cba6f7;
-@define-color red           #f38ba8;
-@define-color maroon        #eba0ac;
-@define-color peach         #fab387;
-@define-color yellow        #f9e2af;
-@define-color green         #a6e3a1;
-@define-color teal          #94e2d5;
-@define-color sky           #89dceb;
-@define-color sapphire      #74c7ec;
-@define-color blue          #89b4fa;
-@define-color lavender      #b4befe;
-@define-color text          #cdd6f4;
-@define-color subtext1      #bac2de;
-@define-color subtext0      #a6adc8;
-@define-color overlay2      #9399b2;
-@define-color overlay1      #7f849c;
-@define-color overlay0      #6c7086;
-@define-color surface2      #585b70;
-@define-color surface1      #45475a;
-@define-color surface0      #313244;
-@define-color base          #1e1e2e;
-@define-color mantle        #181825;
-@define-color crust         #11111b;
+@define-color bg0_h           #1d2021;
+@define-color bg0             #282828;
+@define-color bg1             #3c3836;
+@define-color bg2             #504945;
+@define-color bg3             #665c54;
+@define-color bg4             #7c6f64;
+@define-color gray            #928374;
+@define-color fg4             #a89984;
+@define-color fg3             #bdae93;
+@define-color fg2             #d5c4a1;
+@define-color fg1             #ebdbb2;
+@define-color fg0             #fbf1c7;
+@define-color red             #cc241d;
+@define-color bright_red      #fb4934;
+@define-color green           #98971a;
+@define-color bright_green    #b8bb26;
+@define-color yellow          #d79921;
+@define-color bright_yellow   #fabd2f;
+@define-color blue            #458588;
+@define-color bright_blue     #83a598;
+@define-color purple          #b16286;
+@define-color bright_purple   #d3869b;
+@define-color aqua            #689d6a;
+@define-color bright_aqua     #8ec07c;
+@define-color orange          #d65d0e;
+@define-color bright_orange   #fe8019;
 
-/*
-	br - border
-	bg - background
-	fg - foreground
+@define-color white           #ffffff;
+@define-color black           #000000;
+
+/* 
+  bg - background
+  fg - foreground
+  br - border
 */
 
-/* main colors */
+/* Main Colors */
 
-@define-color accent        @lavender;
-@define-color main-br       @subtext0;
-@define-color main-bg       @crust;
-@define-color main-fg       @text;
-@define-color hover-bg      @base;
-@define-color hover-fg      alpha(@main-fg, 0.75);
-@define-color outline       shade(@main-bg, 0.5);
+@define-color outline         shade(@bg0_h, 0.5);
+@define-color accent          @orange;
+@define-color main-fg         @fg0;
+@define-color main-bg         @bg0_h;
+@define-color main-br         @fg0;
 
-/* module colors */
+@define-color active-bg       @yellow;
+@define-color active-fg       @bg0_h;
 
-@define-color workspaces    @mantle;
-@define-color temperature   @mantle;
-@define-color memory        @base;
-@define-color cpu           @surface0;
-@define-color time          @surface0;
-@define-color date          @base;
-@define-color tray          @mantle;
-@define-color volume        @mantle;
-@define-color backlight     @base;
-@define-color battery       @surface0;
+@define-color hover-bg        @bg2;
+@define-color hover-fg        alpha(@fg0, 0.75);
 
-/* state colors */
+/* Module Colors */
 
-@define-color warning       @yellow;
-@define-color critical      @red;
-@define-color charging      @green;
+@define-color module-fg       @fg0;
+@define-color workspaces      @bg0;
+
+@define-color temperature     @bg0;
+@define-color memory          @bg1;
+@define-color cpu             @bg2;
+@define-color distro-fg       @black;
+@define-color distro-bg       @yellow;
+@define-color time            @bg2;
+@define-color date            @bg1;
+@define-color tray            @bg0;
+
+@define-color pulseaudio      @bg0;
+@define-color backlight       @bg1;
+@define-color battery         @bg2;
+@define-color power           @yellow;
+
+/* State Colors */
+
+@define-color warning         @bright_orange;
+@define-color critical        @bright_red;
+@define-color charging        @fg0;
diff --git a/waybar/themes/gruvbox-dark.css b/waybar/themes/gruvbox-dark.css
new file mode 100644
index 0000000..7e5a575
--- /dev/null
+++ b/waybar/themes/gruvbox-dark.css
@@ -0,0 +1,76 @@
+/* Gruvbox Dark */
+
+@define-color bg0_h           #1d2021;
+@define-color bg0             #282828;
+@define-color bg1             #3c3836;
+@define-color bg2             #504945;
+@define-color bg3             #665c54;
+@define-color bg4             #7c6f64;
+@define-color gray            #928374;
+@define-color fg4             #a89984;
+@define-color fg3             #bdae93;
+@define-color fg2             #d5c4a1;
+@define-color fg1             #ebdbb2;
+@define-color fg0             #fbf1c7;
+@define-color red             #cc241d;
+@define-color bright_red      #fb4934;
+@define-color green           #98971a;
+@define-color bright_green    #b8bb26;
+@define-color yellow          #d79921;
+@define-color bright_yellow   #fabd2f;
+@define-color blue            #458588;
+@define-color bright_blue     #83a598;
+@define-color purple          #b16286;
+@define-color bright_purple   #d3869b;
+@define-color aqua            #689d6a;
+@define-color bright_aqua     #8ec07c;
+@define-color orange          #d65d0e;
+@define-color bright_orange   #fe8019;
+
+@define-color white           #ffffff;
+@define-color black           #000000;
+
+/* 
+  bg - background
+  fg - foreground
+  br - border
+*/
+
+/* Main Colors */
+
+@define-color outline         shade(@bg0_h, 0.5);
+@define-color accent          @orange;
+@define-color main-fg         @fg0;
+@define-color main-bg         @bg0_h;
+@define-color main-br         @fg0;
+
+@define-color active-bg       @yellow;
+@define-color active-fg       @bg0_h;
+
+@define-color hover-bg        @bg2;
+@define-color hover-fg        alpha(@fg0, 0.75);
+
+/* Module Colors */
+
+@define-color module-fg       @fg0;
+@define-color workspaces      @bg0;
+
+@define-color temperature     @bg0;
+@define-color memory          @bg1;
+@define-color cpu             @bg2;
+@define-color distro-fg       @black;
+@define-color distro-bg       @yellow;
+@define-color time            @bg2;
+@define-color date            @bg1;
+@define-color tray            @bg0;
+
+@define-color pulseaudio      @bg0;
+@define-color backlight       @bg1;
+@define-color battery         @bg2;
+@define-color power           @yellow;
+
+/* State Colors */
+
+@define-color warning         @bright_orange;
+@define-color critical        @bright_red;
+@define-color charging        @fg0;