diff --git a/i3blocks/config b/i3blocks/config
index 2803e37..11bd70c 100644
--- a/i3blocks/config
+++ b/i3blocks/config
@@ -2,8 +2,13 @@
 separator=false
 markup=pango
 
+[cpu_monitor]
+command=~/.config/i3blocks/cpu_monitor.sh
+interval=5
+markup=pango
+
 [cpu_gpu_monitor]
-command=~/.config/i3blocks/cpu_gpu_monitor.sh
+command=~/.config/i3blocks/gpu_monitor.sh
 interval=5
 markup=pango
 
diff --git a/i3blocks/cpu_gpu_monitor.sh b/i3blocks/cpu_gpu_monitor.sh
deleted file mode 100755
index 9cc1c5c..0000000
--- a/i3blocks/cpu_gpu_monitor.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# CPU Metrics
-cpu_metrics=$(bash /home/kuchy/i3-configuration/i3blocks/cpu_monitor.sh)
-cpu_temp=$(echo "$cpu_metrics" | awk -F', ' '{print $1}' | awk -F': ' '{print $2}')
-cpu_load=$(echo "$cpu_metrics" | awk -F', ' '{print $2}' | awk -F': ' '{print $2}')
-cpu_color=$(echo "$cpu_metrics" | awk -F', ' '{print $3}' | awk -F': ' '{print $2}')
-
-# GPU Metrics
-gpu_metrics=$(bash /home/kuchy/i3-configuration/i3blocks/gpu_monitor.sh)
-gpu_temp=$(echo "$gpu_metrics" | awk -F', ' '{print $1}' | awk -F': ' '{print $2}')
-gpu_load=$(echo "$gpu_metrics" | awk -F', ' '{print $2}' | awk -F': ' '{print $2}')
-
-# Colors for GPU Load
-gpu_color="#FFFFFF"  # Default color
-if [[ "$gpu_load" != "N/A" ]]; then
-    if (( $(echo "$gpu_load < 50.0" | bc -l) )); then
-        gpu_color="#50FA7B"  # Green
-    elif (( $(echo "$gpu_load < 75.0" | bc -l) )); then
-        gpu_color="#F1FA8C"  # Yellow
-    else
-        gpu_color="#FF5555"  # Red
-    fi
-fi
-
-# Output
-echo -e "<span color=\"$cpu_color\">  CPU: ${cpu_temp}, Load: ${cpu_load}</span> | <span color=\"$gpu_color\">  GPU: ${gpu_temp}, Load: ${gpu_load}</span>"
-echo
-echo "#FFFFFF"  # Default color for fallback (ignored if markup is enabled)
-
diff --git a/i3blocks/cpu_monitor.sh b/i3blocks/cpu_monitor.sh
index 0232dfa..0348649 100755
--- a/i3blocks/cpu_monitor.sh
+++ b/i3blocks/cpu_monitor.sh
@@ -22,4 +22,8 @@ if [[ "$cpu_load" != "N/A" ]]; then
     :
 fi
 
-echo "CPU Temp: $cpu_temp°C, CPU Load: $cpu_load, Color: $cpu_color"
\ No newline at end of file
+cpu_metrics=$(echo "CPU Temp: $cpu_temp°C, CPU Load: $cpu_load, Color: $cpu_color")
+cpu_temp=$(echo "$cpu_metrics" | awk -F', ' '{print $1}' | awk -F': ' '{print $2}')
+cpu_load=$(echo "$cpu_metrics" | awk -F', ' '{print $2}' | awk -F': ' '{print $2}')
+cpu_color=$(echo "$cpu_metrics" | awk -F', ' '{print $3}' | awk -F': ' '{print $2}')
+echo -e "<span color=\"$cpu_color\">  CPU: ${cpu_temp}, Load: ${cpu_load}</span>"
\ No newline at end of file
diff --git a/i3blocks/gpu_monitor.sh b/i3blocks/gpu_monitor.sh
index f72c936..eed104c 100755
--- a/i3blocks/gpu_monitor.sh
+++ b/i3blocks/gpu_monitor.sh
@@ -32,9 +32,34 @@ get_intel_metrics() {
 
 # Detect GPU type and get metrics
 if lspci | grep -i nvidia > /dev/null; then
-    get_nvidia_metrics
+    gpu_metrics=$(get_nvidia_metrics)
 elif lspci | grep -i vga | grep -i intel > /dev/null; then
-    get_intel_metrics
+    gpu_metrics=$(get_intel_metrics)
 else
     echo "No supported GPU found."
-fi
\ No newline at end of file
+fi
+
+#!/bin/bash
+# GPU Metrics
+gpu_temp=$(echo "$gpu_metrics" | awk -F', ' '{print $1}' | awk -F': ' '{print $2}')
+gpu_load=$(echo "$gpu_metrics" | awk -F', ' '{print $2}' | awk -F': ' '{print $2}')
+
+gpu_color="#FFFFFF"  
+# Colors for GPU Load
+if [[ "$gpu_load" != "N/A%" ]]; then
+    if (( $(echo "$gpu_load < 50.0" | bc -l) )); then
+        gpu_color="#50FA7B"  # Green
+    elif (( $(echo "$gpu_load < 75.0" | bc -l) )); then
+        gpu_color="#F1FA8C"  # Yellow
+    else
+        gpu_color="#FF5555"  # Red
+    fi
+else 
+    gpu_color="#FFFFFF"  # Default color
+fi
+
+# Output<
+echo -e "<span color=\"$gpu_color\">  GPU: ${gpu_temp}, Load: ${gpu_load}</span>"
+echo
+echo "#FFFFFF"  # Default color for fallback (ignored if markup is enabled)
+