diff --git a/data.php b/data.php
index 88c26a86..29a49a6a 100644
--- a/data.php
+++ b/data.php
@@ -1,6 +1,6 @@
 <?php
     $log = array();
-    $divide =  parse_ini_file("/etc/pihole/setupVars.conf")['IPv6_address'] != "" && parse_ini_file("/etc/pihole/setupVars.conf")['IPv4_address'] != "";
+    $divide =  parse_ini_file("/etc/pihole/setupVars.conf")['IPV6_ADDRESS'] != "" && parse_ini_file("/etc/pihole/setupVars.conf")['IPV4_ADDRESS'] != "";
     $hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
     $log = new \SplFileObject('/var/log/pihole.log');
 
diff --git a/header.php b/header.php
index 68440c89..e8335823 100644
--- a/header.php
+++ b/header.php
@@ -37,8 +37,14 @@
 
     $cmd = "echo $((`cat /sys/class/thermal/thermal_zone0/temp | cut -c1-2`))";
     $output = shell_exec($cmd);
+<<<<<<< HEAD
     $output = str_replace(array("\r\n","\r","\n"),"", $output);
 
+=======
+    $celsius = str_replace(array("\r\n","\r","\n"),"", $output);
+    $fahrenheit = round(str_replace(["\r\n","\r","\n"],"", $output*9./5)+32);
+    $temperatureunit =  parse_ini_file("/etc/pihole/setupVars.conf")['TEMPERATUREUNIT'];
+>>>>>>> devel
 ?>
 
 <!DOCTYPE html>
@@ -176,11 +182,20 @@
                         }
 
                         // CPU Temp
-                        if ($output > "45") {
-                            echo '<a href="#"><i class="fa fa-fire" style="color:#FF0000"></i> Temp: ' . $output . '</a>';
-                        } else {
-                            echo '<a href="#"><i class="fa fa-fire" style="color:#3366FF"></i> Temp: ' . $output . '</a>';
+                        echo '<a href="#" id="temperature"><i class="fa fa-fire" style="color:';
+                        if ($celsius > "45") {
+                            echo '#FF0000';
                         }
+                        else
+                        {
+                            echo '#3366FF';
+                        }
+                        echo '"></i> Temp:&nbsp;';
+                        if($temperatureunit != "F")
+                            echo $celsius . '&deg;C';
+                        else
+                            echo $fahrenheit . '&deg;F';
+                        echo '</a>';
                     ?>
                 </div>
             </div>
