diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 81a028f7..363cc3fa 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -649,7 +649,7 @@ SENDTEMP(){
 	echo
 	echo -en "Sensor Temperature(s)"
 	[ "${1}" != "" ] && echo "              Now / 1DayAVG / 7DayAVG" || echo
-	DIVIDER . . 60
+	DIVIDER . . 40
 	for SENSORa in ${PW_SENSOR_ORD[@]}; do
 		if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ]; then
 		# 	vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
@@ -662,6 +662,13 @@ SENDTEMP(){
 		# fi
 		
 		for SENSOR in "${SENSORS_CHECK[@]}"; do
+			if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "cpu" ]; then
+				GAUGESH="'%"
+			elif [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
+				GAUGESH="'R"
+			else
+				GAUGESH="'F"
+			fi
 			[ "${last_sensor}" != "" ] && [ "${last_sensor}" != "${SENSOR%%-*}" ] && echo
 			if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "mqtt" ]; then
 				mqtt_message=`${mqtt_conn} -t tele/${SENSORa}/SENSOR -C 1`
@@ -716,8 +723,19 @@ SENDTEMP(){
 			# c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
 			([[ "${SENSOR}" = *"-Probe"* ]] || [[ "${SENSOR}" = *"-Usage"* ]]) && spc="	" || spc="		"
 			if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then
-				temp_f=`echo "scale=2; ${temp_c}*1.8 + 32" | bc`
-				[ "${1}" != "" ] && echo -e "${SENSOR}${spc}${temp_f}'F / ${average1}'F / ${average7}'F" || echo -e "${SENSOR}${spc}${temp_f}'F"
+				if [ "${SENSOR}" == "ServerRoomTH" ]; then
+					temp_f=`echo "scale=2; ${temp_c}*1.8+32+${PW_ServerRoomTH_Dev}" | bc`
+				else
+					if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "cpu" ]; then
+						temp_f=$(echo "scale=2; $temp_c/1" | bc -l)
+					elif [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
+						temp_f=${temp_c}
+					else
+						temp_f=$(bc <<< "scale=2; ${temp_c}*1.8+32")
+					fi
+					(( $(bc <<<"${temp_f} < 1") )) && [[ "${temp_f}" = *"."* ]] && temp_f="0${temp_f}"
+				fi
+				[ "${1}" != "" ] && echo -e "${SENSOR}${spc}${temp_f}${GUAGESH} / ${average1}${GUAGESH} / ${average7}${GUAGESH}" || echo -e "${SENSOR}${spc}${temp_f}${GUAGESH}"
 				
 			else
 				echo -e "${SENSOR}${spc}No Data"