diff --git a/html/includes/graphs/device_temperatures.inc.php b/html/includes/graphs/device_temperatures.inc.php
index 10587e8ac..804532fb1 100644
--- a/html/includes/graphs/device_temperatures.inc.php
+++ b/html/includes/graphs/device_temperatures.inc.php
@@ -7,17 +7,39 @@ $rrd_options .= " -l 0 -E ";
 $iter = "1";
 $sql = mysql_query("SELECT * FROM temperature where temp_host = '$device_id'");
 $rrd_options .= " COMMENT:'                           Cur   Min   Max\\n'";
-while($temperature = mysql_fetch_array($sql)) {
-  if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
-  } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
-  } elseif($iter=="7") {$colour="FF0084"; unset($iter); }
-  $temperature['temp_descr_fixed'] = str_pad($temperature['temp_descr'], 22);
-  $temperature['temp_descr_fixed'] = substr($temperature['temp_descr_fixed'],0,22);
+while($temperature = mysql_fetch_array($sql)) 
+{
+  switch ($iter)
+  {
+    case "1":
+      $colour= "CC0000"; 
+      break; 
+    case "2":
+      $colour= "008C00"; 
+      break; 
+    case "3":
+      $colour= "4096EE"; 
+      break; 
+    case "4":
+      $colour= "73880A"; 
+      break;
+    case "5":
+      $colour= "D01F3C"; 
+      break;
+    case "6":
+      $colour= "36393D"; 
+      break; 
+    case "7": 
+    default:
+      $colour= "FF0084"; 
+      unset($iter);
+      break;
+  }
+  
+  $temperature['temp_descr_fixed'] = substr(str_pad($temperature['temp_descr'], 22),0,22);
   $temprrd  = $config['rrd_dir'] . "/$hostname/".safename("temp-" . $temperature['temp_descr'] . ".rrd");
-  $temprrd  = str_replace(")", "_", $temprrd);
-  $temprrd  = str_replace("(", "_", $temprrd);
   $rrd_options .= " DEF:temp" . $temperature[temp_id] . "=$temprrd:temp:AVERAGE ";
-  $rrd_options .= " LINE1:temp" . $temperature[temp_id] . "#" . $colour . ":'" . $temperature[temp_descr_fixed] . "' ";
+  $rrd_options .= " LINE1:temp" . $temperature[temp_id] . "#" . $colour . ":'" . str_replace(':','\:',str_replace('\*','*',quotemeta($temperature['temp_descr_fixed']))) . "' ";
   $rrd_options .= " GPRINT:temp" . $temperature[temp_id] . ":LAST:%3.0lfC ";
   $rrd_options .= " GPRINT:temp" . $temperature[temp_id] . ":MIN:%3.0lfC ";
   $rrd_options .= " GPRINT:temp" . $temperature[temp_id] . ":MAX:%3.0lfC\\\l ";
diff --git a/html/includes/graphs/temperature.inc.php b/html/includes/graphs/temperature.inc.php
index 7ef033822..079a90de5 100644
--- a/html/includes/graphs/temperature.inc.php
+++ b/html/includes/graphs/temperature.inc.php
@@ -22,7 +22,7 @@ include("common.inc.php");
   $rrd_options .= " AREA:temp#FFFF99";
   $rrd_options .= " AREA:tempwarm#FF9999";
   $rrd_options .= " AREA:tempcold#CCCCFF";
-  $rrd_options .= " LINE1.5:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($temperature['temp_descr_fixed']))."'"); # Ugly hack :(
+  $rrd_options .= " LINE1.5:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($temperature['temp_descr_fixed'])))."'"; # Ugly hack :(
   $rrd_options .= " LINE1.5:tempwarm#660000";
   $rrd_options .= " GPRINT:temp:LAST:%3.0lfC";
   $rrd_options .= " GPRINT:temp:MAX:%3.0lfC\\\\l";