diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json
index d559cf0..c2c4497 100644
--- a/files/.config/configstore/update-notifier-npm.json
+++ b/files/.config/configstore/update-notifier-npm.json
@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1589203310918
+	"lastUpdateCheck": 1589407237422
 }
\ No newline at end of file
diff --git a/files/.config/polybar/config.ini b/files/.config/polybar/config.ini
index fbb3eba..310d119 100644
--- a/files/.config/polybar/config.ini
+++ b/files/.config/polybar/config.ini
@@ -136,8 +136,9 @@ label-mounted = %percentage_used%%
 [module/cpu]
 type = internal/cpu
 interval = 2
-format-prefix = "%{F#fe8019}%{F-} "
+format-prefix = "%{A1:~/.config/polybar/polybar-scripts/toggle_gpuinfo_window.sh 'top':}%{F#fe8019}%{F-} %{A}"
 label = %percentage:2%%
+click-left = ""
 
 [module/memory]
 type = internal/memory
@@ -203,6 +204,7 @@ interval = 600
 type = custom/script
 exec = "sudo ~/scripts/gpuinfo.sh"
 format = "%{F#d3869b}%{T3}%{T-}%{F-} <label>"
+click-left = "~/.config/polybar/polybar-scripts/toggle_gpuinfo_window.sh 'sudo /home/leon/scripts/gpuinfo.sh --watch'"
 interval = 2
 
 [module/pulseaudio-control]
diff --git a/files/.config/polybar/polybar-scripts/toggle_gpuinfo_window.sh b/files/.config/polybar/polybar-scripts/toggle_gpuinfo_window.sh
new file mode 100755
index 0000000..8279fb6
--- /dev/null
+++ b/files/.config/polybar/polybar-scripts/toggle_gpuinfo_window.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ -n $(xdotool search --class bar_system_status_indicator) ]]; then
+  xdotool search --class bar_system_status_indicator windowkill &
+else
+  termite --class bar_system_status_indicator -e "$1" &
+fi
diff --git a/files/.xmonad/.stack-work/stack.sqlite3 b/files/.xmonad/.stack-work/stack.sqlite3
index b0cc5d9..be9b6b5 100644
Binary files a/files/.xmonad/.stack-work/stack.sqlite3 and b/files/.xmonad/.stack-work/stack.sqlite3 differ
diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs
index a0aef5b..e74ae47 100644
--- a/files/.xmonad/lib/Config.hs
+++ b/files/.xmonad/lib/Config.hs
@@ -378,6 +378,7 @@ myManageHook = composeAll
   , className =? "mpv" --> ManageHelpers.doRectFloat (W.RationalRect 0.9 0.9 0.1 0.1)
   , title =? "Something" --> doFloat
   , className =? "termite_floating" --> ManageHelpers.doRectFloat(W.RationalRect 0.2 0.2 0.6 0.6)
+  , className =? "bar_system_status_indicator" --> ManageHelpers.doRectFloat (W.RationalRect 0.7 0.05 0.29 0.26)
   -- , isFullscreen --> doF W.focusDown <+> doFullFloat
   , manageDocks
   , namedScratchpadManageHook scratchpads
diff --git a/files/scripts/gpuinfo.sh b/files/scripts/gpuinfo.sh
index c32706b..8abb1b1 100755
--- a/files/scripts/gpuinfo.sh
+++ b/files/scripts/gpuinfo.sh
@@ -1,5 +1,10 @@
 #!/bin/dash
 #sudo cat /sys/kernel/debug/dri/0/amdgpu_pm_info
 
-sudo cat /sys/kernel/debug/dri/0/amdgpu_pm_info \
-  | sed -n 's/^GPU Load: \(.*\)$/\1/gp'
+
+if [ "$1" = "--watch" ]; then
+  sudo watch --no-title -n 0.5 "cat /sys/kernel/debug/dri/0/amdgpu_pm_info | grep -A 10 'GFX Clocks and Power'"
+else
+  sudo cat /sys/kernel/debug/dri/0/amdgpu_pm_info \
+    | sed -n 's/^GPU Load: \(.*\)$/\1/gp'
+fi