diff --git a/.config/hypr/conf/keybinds.lua b/.config/hypr/conf/keybinds.lua
index 9b2f106..fab16c6 100644
--- a/.config/hypr/conf/keybinds.lua
+++ b/.config/hypr/conf/keybinds.lua
@@ -88,8 +88,8 @@ hl.bind(mainMod .. " + SHIFT + S", hl.dsp.window.move({ workspace = "special:mag
 hl.bind(mainMod .. " + T", hl.dsp.workspace.toggle_special("term"))
 
 -- Capture
-hl.bind(mainMod .. " + F9", hl.dsp.exec_cmd("hyprshot -m region"))
-hl.bind(mainMod .. " + SHIFT + F9", hl.dsp.exec_cmd("hyprshot -m window"))
+hl.bind(mainMod .. " + F9", hl.dsp.exec_cmd("hyprshot -m region -o $HOME/Picturs/hyprshot"))
+hl.bind(mainMod .. " + SHIFT + F9", hl.dsp.exec_cmd("hyprshot -m window -o $HOME/Pictures/hyprshot"))
 -- Media Keys
 hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd(SCRIPT_DIR .. "/volume up"), { locked = true, repeating = true }) -- Volume Up
 hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd(SCRIPT_DIR .. "/volume down"), { locked = true, repeating = true }) -- Volume Down
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index e123aaa..f119ecc 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -43,17 +43,21 @@
       "./modules/clock.jsonc",
       "./modules/system.jsonc",
       "./modules/groups.jsonc",
-      "./modules/storage.jsonc"
+      "./modules/storage.jsonc",
+      "./modules/audio.jsonc"
     ],
     "modules-left": [
       "clock#time",
       "clock"
     ],
     "modules-right": [
+      "cava",
       "privacy",
       "group/storage",
+      "custom/nvidia",
       "memory",
-      "cpu#bars",
+      "temperature",
+      "group/cpu-group",
       "group/user-group"
     ]
   }
diff --git a/.config/waybar/modules/audio.jsonc b/.config/waybar/modules/audio.jsonc
index fe14c55..b794e16 100644
--- a/.config/waybar/modules/audio.jsonc
+++ b/.config/waybar/modules/audio.jsonc
@@ -26,16 +26,29 @@
     "orientation": "horizontal"
   },
   "mpris": {
-    "format": "{player_icon} {dynamic}",
-    "format-paused": "{status_icon} <i>{dynamic}</i>",
+    "format": "{player_icon} {status_icon} {dynamic}",
+    "format-paused": "{player_icon} {status_icon} <i>{dynamic}</i>",
+    "dynamic-order": ["artist", "title", "position", "length"],
     "player-icons": {
-      "default": "▶",
-      "mpv": "🎵"
+      "default": " ",
+      "mpv": " ",
+      "deezer": "󰎆 ",
+      "kdeconnect": ""
     },
     "status-icons": {
-      "paused": "⏸"
+      "playing": "",
+      "paused": "⏸",
+      "stopped": ""
     },
+    
     "on-click-middle": "",
     "on-click-right": "hyprctl dispatch 'hl.dsp.focus({window = \"class:deezer-desktop\"})'"
+  },
+  "cava": {
+    "cava_config": "$XDG_CONFIG_HOME/cava/waybar_cava#3.conf",
+    "input_delay": 2,
+    "actions": {
+      "on-click-right": "mode"
+    }
   }
 }
diff --git a/.config/waybar/modules/groups.jsonc b/.config/waybar/modules/groups.jsonc
index e8f329c..9e99f8c 100644
--- a/.config/waybar/modules/groups.jsonc
+++ b/.config/waybar/modules/groups.jsonc
@@ -1,4 +1,11 @@
 {
+  "group/cpu-group": {
+    "orientation": "inherit",
+    "modules": [
+      "cpu#bars",
+      "cpu"
+    ]
+  },
   "group/now-playing": {
     "orientation": "inherit",
     "modules": [
@@ -75,4 +82,4 @@
       "tray"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/.config/waybar/modules/storage.jsonc b/.config/waybar/modules/storage.jsonc
index a69f3a0..8265318 100644
--- a/.config/waybar/modules/storage.jsonc
+++ b/.config/waybar/modules/storage.jsonc
@@ -50,10 +50,10 @@
   "memory": {
     "tooltip": true,
     "interval": 15,
-    "format": "{used:0.1f}G/{total:0.1f}G",
+    "format": "{used:0.1f}G/{total:0.1f}G  ",
     "states": {
       "warning": 75,
       "critical": 85
     }
   }
-}
\ No newline at end of file
+}
diff --git a/.config/waybar/modules/system.jsonc b/.config/waybar/modules/system.jsonc
index 79019c3..8a89e95 100644
--- a/.config/waybar/modules/system.jsonc
+++ b/.config/waybar/modules/system.jsonc
@@ -2,8 +2,7 @@
   "cpu": {
     "tooltip": false,
     "interval": 10,
-    "format": "󰻠",
-    "format-alt": "󰻠 <span size='11pt'>{usage}%</span>",
+    "format": "<span size='11pt'>{usage}%</span> 󰻠",
     "states": {
       "warning": 75,
       "critical": 90
@@ -29,11 +28,10 @@
   "temperature": {
     "tooltip": false,
     "interval": 10,
-    "thermal-zone": 8,
+    "thermal-zone": 0,
     "critical-threshold": 80,
-    "format": "{icon}",
-    "format-alt": "{icon} <span size='11pt'>{temperatureC}°C</span>",
-    "format-critical": "<span size='12pt'>󱗗 </span><span size='11pt'>{temperatureC}°C</span>",
+    "format": "<span size='11pt'>{temperatureC}°C</span> {icon}",
+    "format-critical": "<span size='11pt'>{temperatureC}°C</span><span size='12pt'>󱗗 </span>",
     "format-icons": [
       "",
       "",
@@ -85,5 +83,10 @@
         "name": "obs"
       }
     ]
+  },
+  "custom/nvidia": {
+    "exec": "nvidia-smi --query-gpu=utilization.gpu,temperature.gpu --format=csv,nounits,noheader | sed 's/\\([0-9]\\+\\), \\([0-9]\\+\\)/\\1%  \\2°C/g'",
+    "format": "{} 󰍹 ",
+    "interval": 2
   }
-}
\ No newline at end of file
+}
diff --git a/.config/waybar/tokens/workspace.css b/.config/waybar/tokens/workspace.css
index bbd3ddd..030d99d 100644
--- a/.config/waybar/tokens/workspace.css
+++ b/.config/waybar/tokens/workspace.css
@@ -1,12 +1,15 @@
 @import "colors.css";
 
 #window,
-#cpu,
+#cpu-group,
 #privacy,
 #workspaces,
 #user-group,
+#temperature,
 #memory,
 #custom-exit,
+#custom-nvidia,
+#cava,
 #clock {
     margin: 4px 5px;
     padding: 6px 6px;
@@ -25,10 +28,6 @@ tooltip {
 
 }
 
-#cpu.bars {
-    min-height: 100px;
-}
-
 .calendar-today,
 .calendar-days,
 .calendar-weeks,
@@ -84,4 +83,4 @@ tooltip {
 
 #workspaces button label:last-child {
     margin-left: 2px;
-}
\ No newline at end of file
+}