diff --git a/modules/battery b/modules/battery
index ba61912..737290b 100755
--- a/modules/battery
+++ b/modules/battery
@@ -31,7 +31,7 @@ get_battery()
 			BAT_ICON=$BATTERY_FULL_ICON
 		elif [[ $capacity -le 25 ]]; then
 			BAT_ICON=$BATTERY_4_ICON
-		elif [[ $capacity -le 50 ]]; then
+		elif [[ $capacity -le 60 ]]; then
 			BAT_ICON=$BATTERY_3_ICON
 		elif [[ $capacity -le $FULL_AT ]]; then
 			BAT_ICON=$BATTERY_2_ICON
diff --git a/modules/cputemp b/modules/cputemp
index 7563835..da8f183 100755
--- a/modules/cputemp
+++ b/modules/cputemp
@@ -3,19 +3,23 @@
 # Gets temperature of the CPU
 # Dependencies: lm_sensors
 
+PREFIX=' '
+FIRE=' '
+
+WARNING_LEVEL=80
+
 get_cputemp()
 {
 	# CPU_T=$(cat /sys/devices/platform/coretemp.0/hwmon/hwmon?/temp2_input)
 	# CPU_TEMP=$(expr $CPU_T / 1000)
 
-	CPU_TEMP="$(sensors | grep temp1 | awk 'NR==1{gsub("+", " "); gsub("\\..", " "); print $2"°C"}')"
+	CPU_TEMP="$(sensors | grep temp1 | awk 'NR==1{gsub("+", " "); gsub("\\..", " "); print $2}')"
 
-	# elif [ "$CPU_TEMP" -le 10 ]; then
-	# 	echo "  $CPU_TEMP"
-	# else
-	# 	echo " $CPU_TEMP"
-	# fi
-	echo " $CPU_TEMP"
+	if [ "$CPU_TEMP" -ge $WARNING_LEVEL ]; then
+		PREFIX="$FIRE$PREFIX"
+	fi
+
+	echo "$PREFIX$CPU_TEMP°C"
 }
 
 get_cputemp