diff --git a/html/.htaccess b/html/.htaccess
index 4cc1bdaf9..fb36aec52 100644
--- a/html/.htaccess
+++ b/html/.htaccess
@@ -43,6 +43,8 @@ RewriteRule ^device/([0-9]+) ?page=device&id=$1
 
 RewriteRule ^([a-z|0-9\-]+)/$ ?page=$1
 
+RewriteRule ^([a-z|0-9]+)/(.+)/(.+)/(.+)/(.+)/(.+)/$ ?page=$1&opta=$2&optb=$3&optc=$4&optd=$5&opte=$6
+RewriteRule ^([a-z|0-9]+)/(.+)/(.+)/(.+)/(.+)/$ ?page=$1&opta=$2&optb=$3&optc=$4&optd=$5
 RewriteRule ^([a-z|0-9]+)/(.+)/(.+)/(.+)/$ ?page=$1&opta=$2&optb=$3&optc=$4
 RewriteRule ^([a-z|0-9]+)/(.+)/(.+)/$ ?page=$1&opta=$2&optb=$3
 RewriteRule ^([a-z|0-9]+)/(.+)/$ ?page=$1&opta=$2
diff --git a/html/graph.php b/html/graph.php
index d2e15ea0d..4f39e82e8 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -1,85 +1,5 @@
 <?php
 
-if($_GET['debug']) {
-  ini_set('display_errors', 1);
-  ini_set('display_startup_errors', 0);
-  ini_set('log_errors', 0);
-  ini_set('allow_url_fopen', 0);
-  ini_set('error_reporting', E_ALL);
-}
-
-  include("../includes/defaults.inc.php");
-  include("../config.php");
-  include("../includes/common.php");
-  include("../includes/rewrites.php");
-  include("includes/authenticate.inc.php");
-
-  if(!$config['allow_unauth_graphs']) {
-    if(!$_SESSION['authenticated']) { echo("not authenticated"); exit; }
-  }
-  
-  if($_GET['device']) {
-    $_GET['id'] = $_GET['device'];
-    $device_id = $_GET['device'];
-  } elseif($_GET['if']) {
-    $_GET['id'] = $_GET['if'];
-  } elseif($_GET['port']) {
-    $_GET['id'] = $_GET['port'];
-  } elseif($_GET['peer']) {
-    $_GET['id'] = $_GET['peer'];
-  }
-
-  $from     = mres($_GET['from']);
-  $to       = mres($_GET['to']);
-  $width    = mres($_GET['width']);
-  $height   = mres($_GET['height']);
-  $title    = mres($_GET['title']);
-  $vertical = mres($_GET['vertical']);
-  $type     = mres($_GET['type']);
-  $legend   = mres($_GET['legend']);
-  $id       = mres($_GET['id']);
-
-  $graphfile = $config['temp_dir'] . "/"  . strgen() . ".png";
-
-  $os = gethostosbyid($device_id);
-  if($config['os'][$os]['group']) {$os_group = $config['os'][$os]['group'];}
-
-  if(is_file($config['install_dir'] . "/html/includes/graphs/".$type."_".$os.".inc.php")) {
-    /// Type + OS Specific
-    include($config['install_dir'] . "/html/includes/graphs/".$type."_".$os.".inc.php");
-  }elseif($os_group && is_file($config['install_dir'] . "/html/includes/graphs/".$type."_".$os_group.".inc.php")) {
-    /// Type + OS Group Specific
-    include($config['install_dir'] . "/html/includes/graphs/".$type."_".$os_group.".inc.php");
-  } elseif(is_file($config['install_dir'] . "/html/includes/graphs/$type.inc.php")) {
-    /// Type Specific
-    include($config['install_dir'] . "/html/includes/graphs/$type.inc.php");
-  }
-
-  if($rrd_options) {
-    
-    if($config['rrdcached']) { $rrd_switches = " --daemon ".$config['rrdcached'] . " "; }
-    $rrd_cmd = $config['rrdtool'] . " graph $graphfile $rrd_options" . $rrd_switches;
-    $woo = shell_exec($rrd_cmd);
-    if($_GET['debug']) { echo("<pre>".$rrd_cmd."</pre>"); }    
-#    $thing = popen($config['rrdtool'] . " -",'w');
-#    fputs($thing, "graph $graphfile $rrd_options");
-#    pclose($thing);
-    if(is_file($graphfile)) {
-      header('Content-type: image/png');
-      $fd = fopen($graphfile,'r');fpassthru($fd);fclose($fd);
-      unlink($graphfile);
-    } else {
-      header('Content-type: image/png');
-      $string = "Graph Generation Error";
-      $im     = imagecreate($width, $height);
-      $orange = imagecolorallocate($im, 255, 255, 255);
-      $px     = (imagesx($im) - 7.5 * strlen($string)) / 2;
-      imagestring($im, 3, $px, $height / 2 - 8, $string, imagecolorallocate($im, 128, 0, 0));
-      imagepng($im);
-      imagedestroy($im);
-    }
-  }
-
-
+include("includes/graphs/graph.inc.php");
 
 ?>
diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index 7b88623f1..1578389d8 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -49,17 +49,20 @@ function generatedevicelink($device, $text=0, $start=0, $end=0)
   }
 
   $url  = $config['base_url']."/device/" . $device['device_id'] . "/";
-  $contents = "<div class=list-large>".$device['hostname'] . " - $descr</div>";
+  $contents = "<div class=list-large>".$device['hostname'];
+  if($device['hardware']) { $contents .= " - ".$device['hardware']; }
+  $contents .= "</div>";
+
 
   $contents .= "<div>";
   if($device['os']) { $contents .= $config['os'][$device['os']]['text']; }
   if($device['version']) { $contents .= " ".$device['version']; }
   if($device['features']) { $contents .= " (".$device['features'].")"; }
-  if($device['hardware']) { $contents .= " - ".$device['hardware']; }
+#  if($device['hardware']) { $contents .= " - ".$device['hardware']; }
   $contents .= "</div>";
 
 
-  if (isset($device['location'])) { $contents .= "" . htmlentities($device['location'])."<br />"; }
+#  if (isset($device['location'])) { $contents .= "" . htmlentities($device['location'])."<br />"; }
   foreach ($graphs as $entry)
   {
     $graph     = $entry['graph'];
@@ -204,6 +207,8 @@ function generate_if_link($args, $text = NULL)
   $args = ifNameDescr($args);
   if(!$text) { $text = fixIfName($args['label']); }
   if(!$args['graph_type']) { $args['graph_type'] = 'port_bits'; }
+
+  
   $class = ifclass($args['ifOperStatus'], $args['ifAdminStatus']);
   if(!isset($args['hostname'])) { $args = array_merge($args, device_by_id_cache($args['device_id'])); }
 
@@ -238,7 +243,7 @@ function generate_if_link($args, $text = NULL)
 function generate_port_thumbnail($args) 
 {
     if(!$args['bg']) { $args['bg'] = "FFFFF"; }
-    $args['content'] = "<img src='graph.php?type=".$args['graph_type']."&id=".$args['interface_id']."&from=".$args['from']."&to=".$args['to']."&width=".$args['width']."&height=".$args['height']."&legend=no&bg=".$args['bg']."'>";
+    $args['content'] = "<img src='graph.php?type=".$args['graph_type']."&subtype=".$args['graph_subtype']."&id=".$args['interface_id']."&from=".$args['from']."&to=".$args['to']."&width=".$args['width']."&height=".$args['height']."&legend=no&bg=".$args['bg']."'>";
     $output = generate_if_link($args, $args['content']);
     echo $output;
 }
diff --git a/html/includes/graphs/XXX_device_memory_windows.inc.php b/html/includes/graphs/XXX_device_memory_windows.inc.php
index 8895344de..d0650b585 100644
--- a/html/includes/graphs/XXX_device_memory_windows.inc.php
+++ b/html/includes/graphs/XXX_device_memory_windows.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/mem.rrd";
diff --git a/html/includes/graphs/altiga_ssl_sessions.inc.php b/html/includes/graphs/altiga_ssl_sessions.inc.php
new file mode 100644
index 000000000..d7f630943
--- /dev/null
+++ b/html/includes/graphs/altiga_ssl_sessions.inc.php
@@ -0,0 +1,33 @@
+<?php
+
+$scale_min = "0";
+
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
+
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/altiga-ssl.rrd.rrd";
+
+  $rrd_options .= " DEF:TotalSessions=$rrd_filename:TotalSessions:AVERAGE";
+  $rrd_options .= " DEF:ActiveSessions=$rrd_filename:ActiveSessions:AVERAGE";
+  $rrd_options .= " DEF:MaxSessions=$rrd_filename:MaxSessions:AVERAGE";
+  $rrd_options .= " CDEF:a=1min,100,/";
+  $rrd_options .= " CDEF:b=5min,100,/";
+  $rrd_options .= " CDEF:c=15min,100,/";
+  $rrd_options .= " CDEF:cdefd=a,b,c,+,+";
+  $rrd_options .= " COMMENT:Load\ Average\ \ Current\ \ \ \ Average\ \ \ \ Maximum\\\\n";
+  $rrd_options .= " AREA:a#ffeeaa:1\ Min:";
+  $rrd_options .= " LINE1:a#c5aa00:";
+  $rrd_options .= " GPRINT:a:LAST:\ \ \ \ %7.2lf";
+  $rrd_options .= " GPRINT:a:AVERAGE:\ \ %7.2lf";
+  $rrd_options .= " GPRINT:a:MAX:\ \ %7.2lf\\\\n";
+  $rrd_options .= " LINE1.25:b#ea8f00:5\ Min:";
+  $rrd_options .= " GPRINT:b:LAST:\ \ \ \ %7.2lf";
+  $rrd_options .= " GPRINT:b:AVERAGE:\ \ %7.2lf";
+  $rrd_options .= " GPRINT:b:MAX:\ \ %7.2lf\\\\n";
+  $rrd_options .= " LINE1.25:c#cc0000:15\ Min";
+  $rrd_options .= " GPRINT:c:LAST:\ \ \ %7.2lf";
+  $rrd_options .= " GPRINT:c:AVERAGE:\ \ %7.2lf";
+  $rrd_options .= " GPRINT:c:MAX:\ \ %7.2lf\\\\n";
+
+
+?>
diff --git a/html/includes/graphs/atmvp/bits.inc.php b/html/includes/graphs/atmvp/bits.inc.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/html/includes/graphs/atmvp_cells.inc.php b/html/includes/graphs/atmvp/cells.inc.php
similarity index 100%
rename from html/includes/graphs/atmvp_cells.inc.php
rename to html/includes/graphs/atmvp/cells.inc.php
diff --git a/html/includes/graphs/atmvp_errors.inc.php b/html/includes/graphs/atmvp/errors.inc.php
similarity index 100%
rename from html/includes/graphs/atmvp_errors.inc.php
rename to html/includes/graphs/atmvp/errors.inc.php
diff --git a/html/includes/graphs/atmvp_packets.inc.php b/html/includes/graphs/atmvp/packets.inc.php
similarity index 100%
rename from html/includes/graphs/atmvp_packets.inc.php
rename to html/includes/graphs/atmvp/packets.inc.php
diff --git a/html/includes/graphs/atmvp_bits.inc.php b/html/includes/graphs/atmvp_bits.inc.php
deleted file mode 100644
index 4000cccc4..000000000
--- a/html/includes/graphs/atmvp_bits.inc.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if($_GET['id']) { $atm_vp_id = $_GET['id']; }
-
-$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
-$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
-
-$query = mysql_query($sql);
-$vp = mysql_fetch_array($query);
-
-
-$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
-if(is_file($rrd_test)) {
-  $rrd_filename = $rrd_test;
-}
-
-$rra_in = "inpacketoctets";
-$rra_out = "outpacketoctets";
-
-include("generic_bits.inc.php");
-
-?>
diff --git a/html/includes/graphs/cbgp_prefixes.inc.php b/html/includes/graphs/bgp/cbgp_prefixes.inc.php
similarity index 100%
rename from html/includes/graphs/cbgp_prefixes.inc.php
rename to html/includes/graphs/bgp/cbgp_prefixes.inc.php
diff --git a/html/includes/graphs/bgp_updates.inc.php b/html/includes/graphs/bgp/updates.inc.php
similarity index 100%
rename from html/includes/graphs/bgp_updates.inc.php
rename to html/includes/graphs/bgp/updates.inc.php
diff --git a/html/includes/graphs/cempMemPool.inc.php b/html/includes/graphs/cempMemPool.inc.php
deleted file mode 100644
index a610125f0..000000000
--- a/html/includes/graphs/cempMemPool.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-include("common.inc.php");
-
-  $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
-
-  $iter = "1";
-  $sql = mysql_query("SELECT * FROM `cempMemPool` AS C, `devices` AS D where C.`cempMemPool_id` = '".mres($_GET['id'])."' AND C.device_id = D.device_id");
-  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Cur\ \ \ \ Max\\\\n";
-  while($mempool = mysql_fetch_array($sql)) {
-  $entPhysicalName = mysql_result(mysql_query("SELECT entPhysicalName from entPhysical WHERE device_id = '".$mempool['device_id']."'
-                                               AND entPhysicalIndex = '".$mempool['entPhysicalIndex']."'"),0);
-    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); }
-    $mempool['descr_fixed'] = $entPhysicalName . " " . $mempool['cempMemPoolName'];
-    $mempool['descr_fixed'] = str_replace("Routing Processor", "RP", $mempool['descr_fixed']);
-    $mempool['descr_fixed'] = str_replace("Switching Processor", "SP", $mempool['descr_fixed']);
-    $mempool['descr_fixed'] = str_replace("Processor", "Proc", $mempool['descr_fixed']);
-    $mempool['descr_fixed'] = str_pad($mempool['descr_fixed'], 28);
-    $mempool['descr_fixed'] = substr($mempool['descr_fixed'],0,28);
-    $oid = $mempool['entPhysicalIndex'] . "." . $mempool['Index'];
-    $rrd  = $config['rrd_dir'] . "/".$mempool['hostname']."/" . safename("cempMemPool-$oid.rrd");
-    $id = $mempool['entPhysicalIndex'] . "-" . $mempool['Index'];
-    $rrd_options .= " DEF:mempool" . $id . "free=$rrd:free:AVERAGE ";
-    $rrd_options .= " DEF:mempool" . $id . "used=$rrd:used:AVERAGE ";
-    $rrd_options .= " CDEF:mempool" . $id . "total=mempool" . $id . "used,mempool" . $id . "used,mempool" . $id . "free,+,/,100,* ";
-    $rrd_options .= " LINE1:mempool" . $id . "total#" . $colour . ":'" . $mempool['descr_fixed'] . "' ";
-    $rrd_options .= " GPRINT:mempool" . $id . "total:LAST:%3.0lf";
-    $rrd_options .= " GPRINT:mempool" . $id . "total:MAX:%3.0lf\\\l ";
-    $iter++;
-  }
-
-
-?>
diff --git a/html/includes/graphs/cisco_entity_sensor.inc.php b/html/includes/graphs/cisco_entity_sensor.inc.php
index 2dd83ba5d..b1be69963 100644
--- a/html/includes/graphs/cisco_entity_sensor.inc.php
+++ b/html/includes/graphs/cisco_entity_sensor.inc.php
@@ -11,7 +11,7 @@ case 'amperes':
   break;
 }
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $rrd_filename = $config['rrd_dir'] . "/" . $sensor['hostname'] . "/" . safename("ces-" . $sensor['entPhysicalIndex'] . ".rrd");
 
diff --git a/html/includes/graphs/cmpMemPool.inc.php b/html/includes/graphs/cmpMemPool.inc.php
deleted file mode 100755
index 07b9e4d90..000000000
--- a/html/includes/graphs/cmpMemPool.inc.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-include("common.inc.php");
-
-  $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
-
-  $iter = "1";
-  $sql = mysql_query("SELECT * FROM `cmpMemPool` AS C, `devices` AS D where C.`cmp_id` = '".mres($_GET['id'])."' AND C.device_id = D.device_id");
-  $rrd_options .= " COMMENT:'                                Cur    Max\\n'";
-  while($mempool = 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); }
-    $mempool['descr_fixed'] = $mempool['cmpName'];
-    $mempool['descr_fixed'] = str_pad($mempool['descr_fixed'], 28);
-    $mempool['descr_fixed'] = substr($mempool['descr_fixed'],0,28);
-    $oid = $mempool['Index'];
-    $rrd  = $config['rrd_dir'] . "/".$mempool['hostname']."/" . safename("cmp-$oid.rrd");
-    $rrd_options .= " DEF:mempool" . $oid . "free=$rrd:free:AVERAGE ";
-    $rrd_options .= " DEF:mempool" . $oid . "used=$rrd:used:AVERAGE ";
-    $rrd_options .= " CDEF:mempool" . $oid . "total=mempool" . $oid . "used,mempool" . $oid . "used,mempool" . $oid . "free,+,/,100,* ";
-    $rrd_options .= " LINE1:mempool" . $oid . "total#" . $colour . ":'" . $mempool['descr_fixed'] . "' ";
-    $rrd_options .= " GPRINT:mempool" . $oid . "total:LAST:%3.0lf";
-    $rrd_options .= " GPRINT:mempool" . $oid . "total:MAX:%3.0lf\\\l ";
-    $iter++;
-  }
-
-
-?>
diff --git a/html/includes/graphs/customer_bits.inc.php b/html/includes/graphs/customer/bits.inc.php
similarity index 92%
rename from html/includes/graphs/customer_bits.inc.php
rename to html/includes/graphs/customer/bits.inc.php
index 1e34b1718..344d4fd91 100644
--- a/html/includes/graphs/customer_bits.inc.php
+++ b/html/includes/graphs/customer/bits.inc.php
@@ -17,6 +17,6 @@ $colour_line_out = "000099";
 $colour_area_in = "CDEB8B";
 $colour_area_out = "C3D9FF";
 
-include ("generic_multi_bits.inc.php");
+include ("includes/graphs/generic_multi_bits.inc.php");
 
 ?>
diff --git a/html/includes/graphs/device_bits.inc.php b/html/includes/graphs/device/bits.inc.php
similarity index 95%
rename from html/includes/graphs/device_bits.inc.php
rename to html/includes/graphs/device/bits.inc.php
index befffad48..b47b73801 100644
--- a/html/includes/graphs/device_bits.inc.php
+++ b/html/includes/graphs/device/bits.inc.php
@@ -36,6 +36,6 @@ $colour_line_out = "000099";
 $colour_area_in = "CDEB8B";
 $colour_area_out = "C3D9FF";
 
-include ("generic_multi_bits.inc.php");
+include ("includes/graphs/generic_multi_bits.inc.php");
 
 ?>
diff --git a/html/includes/graphs/device_cpu.inc.php b/html/includes/graphs/device/cpu.inc.php
similarity index 92%
rename from html/includes/graphs/device_cpu.inc.php
rename to html/includes/graphs/device/cpu.inc.php
index b9fb212b1..021e55826 100644
--- a/html/includes/graphs/device_cpu.inc.php
+++ b/html/includes/graphs/device/cpu.inc.php
@@ -32,7 +32,7 @@ $scale_max = "100";
 $nototal = 1;
 
 if ($rrd_list) {
-  include ("generic_multi_line.inc.php");
+  include ("includes/graphs/generic_multi_line.inc.php");
 }
 
 ?>
diff --git a/html/includes/graphs/device_cpu_powerconnect.inc.php b/html/includes/graphs/device/cpu_powerconnect.inc.php
similarity index 94%
rename from html/includes/graphs/device_cpu_powerconnect.inc.php
rename to html/includes/graphs/device/cpu_powerconnect.inc.php
index 571a6a170..db1a3bf7c 100644
--- a/html/includes/graphs/device_cpu_powerconnect.inc.php
+++ b/html/includes/graphs/device/cpu_powerconnect.inc.php
@@ -13,7 +13,8 @@ $scale_max = "100";
 
 $nototal = 1;
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
+
 $database = $config['rrd_dir'] . "/" . $device['hostname'] . "/powerconnect-cpu.rrd";
 
 $rrd_options .= " DEF:load=$database:LOAD:AVERAGE";
diff --git a/html/includes/graphs/device_cpu_procurve.inc.php b/html/includes/graphs/device/cpu_procurve.inc.php
similarity index 94%
rename from html/includes/graphs/device_cpu_procurve.inc.php
rename to html/includes/graphs/device/cpu_procurve.inc.php
index cd95223a6..a30f82037 100644
--- a/html/includes/graphs/device_cpu_procurve.inc.php
+++ b/html/includes/graphs/device/cpu_procurve.inc.php
@@ -13,7 +13,8 @@ $scale_max = "100";
 
 $nototal = 1;
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
+
 $database = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-cpu.rrd";
 
 $rrd_options .= " DEF:load=$database:LOAD:AVERAGE";
diff --git a/html/includes/graphs/device_cpu_unix.inc.php b/html/includes/graphs/device/cpu_unix.inc.php
similarity index 96%
rename from html/includes/graphs/device_cpu_unix.inc.php
rename to html/includes/graphs/device/cpu_unix.inc.php
index 4ffc0fb01..e9bf31442 100644
--- a/html/includes/graphs/device_cpu_unix.inc.php
+++ b/html/includes/graphs/device/cpu_unix.inc.php
@@ -34,10 +34,10 @@ $nototal = 1;
 
 if ($rrd_list) {
 
-include ("generic_multi_line.inc.php");
+include ("includes/graphs/generic_multi_line.inc.php");
 
 } else {
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . "ucd_cpu.rrd";
   $rrd_options .= " DEF:user=$rrd_filename:user:AVERAGE";
   $rrd_options .= " DEF:nice=$rrd_filename:nice:AVERAGE";
diff --git a/html/includes/graphs/device_current.inc.php b/html/includes/graphs/device/current.inc.php
similarity index 100%
rename from html/includes/graphs/device_current.inc.php
rename to html/includes/graphs/device/current.inc.php
diff --git a/html/includes/graphs/device/diskio.inc.php b/html/includes/graphs/device/diskio.inc.php
new file mode 100644
index 000000000..8c195c124
--- /dev/null
+++ b/html/includes/graphs/device/diskio.inc.php
@@ -0,0 +1,5 @@
+<?php
+
+include("diskio_ops.inc.php");
+
+?>
diff --git a/html/includes/graphs/device_diskio_bits.inc.php b/html/includes/graphs/device/diskio_bits.inc.php
similarity index 92%
rename from html/includes/graphs/device_diskio_bits.inc.php
rename to html/includes/graphs/device/diskio_bits.inc.php
index 306938c59..05bdd2d5b 100755
--- a/html/includes/graphs/device_diskio_bits.inc.php
+++ b/html/includes/graphs/device/diskio_bits.inc.php
@@ -30,6 +30,6 @@ $nototal = 1;
 $rra_in  = "read";
 $rra_out = "written";
 
-include ("generic_multi_bits_separated.inc.php");
+include ("includes/graphs/generic_multi_bits_separated.inc.php");
 
 ?>
diff --git a/html/includes/graphs/device_diskio_ops.inc.php b/html/includes/graphs/device/diskio_ops.inc.php
similarity index 92%
rename from html/includes/graphs/device_diskio_ops.inc.php
rename to html/includes/graphs/device/diskio_ops.inc.php
index 7829189bc..59f91e6a5 100755
--- a/html/includes/graphs/device_diskio_ops.inc.php
+++ b/html/includes/graphs/device/diskio_ops.inc.php
@@ -30,6 +30,6 @@ $colours_out = 'blues';
 $nototal = 1;
 
 
-include ("generic_multi_seperated.inc.php");
+include ("includes/graphs/generic_multi_seperated.inc.php");
 
 ?>
diff --git a/html/includes/graphs/device_fanspeeds.inc.php b/html/includes/graphs/device/fanspeeds.inc.php
similarity index 100%
rename from html/includes/graphs/device_fanspeeds.inc.php
rename to html/includes/graphs/device/fanspeeds.inc.php
diff --git a/html/includes/graphs/device_frequencies.inc.php b/html/includes/graphs/device/frequencies.inc.php
similarity index 100%
rename from html/includes/graphs/device_frequencies.inc.php
rename to html/includes/graphs/device/frequencies.inc.php
diff --git a/html/includes/graphs/device_hrprocesses.inc.php b/html/includes/graphs/device/hrprocesses.inc.php
similarity index 100%
rename from html/includes/graphs/device_hrprocesses.inc.php
rename to html/includes/graphs/device/hrprocesses.inc.php
diff --git a/html/includes/graphs/device_hrusers.inc.php b/html/includes/graphs/device/hrusers.inc.php
similarity index 100%
rename from html/includes/graphs/device_hrusers.inc.php
rename to html/includes/graphs/device/hrusers.inc.php
diff --git a/html/includes/graphs/device_humidity.inc.php b/html/includes/graphs/device/humidity.inc.php
similarity index 100%
rename from html/includes/graphs/device_humidity.inc.php
rename to html/includes/graphs/device/humidity.inc.php
diff --git a/html/includes/graphs/device_icmp.inc.php b/html/includes/graphs/device/icmp.inc.php
similarity index 100%
rename from html/includes/graphs/device_icmp.inc.php
rename to html/includes/graphs/device/icmp.inc.php
diff --git a/html/includes/graphs/device_icmp_informational.inc.php b/html/includes/graphs/device/icmp_informational.inc.php
similarity index 98%
rename from html/includes/graphs/device_icmp_informational.inc.php
rename to html/includes/graphs/device/icmp_informational.inc.php
index 9322957d7..0d5a0b6d3 100644
--- a/html/includes/graphs/device_icmp_informational.inc.php
+++ b/html/includes/graphs/device/icmp_informational.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include('common.inc.php');
+include('includes/graphs/common.inc.php');
 
 $device = device_by_id_cache($id);
 
diff --git a/html/includes/graphs/device_ip.inc.php b/html/includes/graphs/device/ip.inc.php
similarity index 100%
rename from html/includes/graphs/device_ip.inc.php
rename to html/includes/graphs/device/ip.inc.php
diff --git a/html/includes/graphs/device_ipSystemStats.inc.php b/html/includes/graphs/device/ipSystemStats.inc.php
similarity index 100%
rename from html/includes/graphs/device_ipSystemStats.inc.php
rename to html/includes/graphs/device/ipSystemStats.inc.php
diff --git a/html/includes/graphs/device_ipSystemStats_v4.inc.php b/html/includes/graphs/device/ipSystemStats_v4.inc.php
similarity index 100%
rename from html/includes/graphs/device_ipSystemStats_v4.inc.php
rename to html/includes/graphs/device/ipSystemStats_v4.inc.php
diff --git a/html/includes/graphs/device_ipSystemStats_v6.inc.php b/html/includes/graphs/device/ipSystemStats_v6.inc.php
similarity index 100%
rename from html/includes/graphs/device_ipSystemStats_v6.inc.php
rename to html/includes/graphs/device/ipSystemStats_v6.inc.php
diff --git a/html/includes/graphs/device_ipSystemStats_v6_frag.inc.php b/html/includes/graphs/device/ipSystemStats_v6_frag.inc.php
similarity index 100%
rename from html/includes/graphs/device_ipSystemStats_v6_frag.inc.php
rename to html/includes/graphs/device/ipSystemStats_v6_frag.inc.php
diff --git a/html/includes/graphs/device_ip_fragmented.inc.php b/html/includes/graphs/device/ip_fragmented.inc.php
similarity index 100%
rename from html/includes/graphs/device_ip_fragmented.inc.php
rename to html/includes/graphs/device/ip_fragmented.inc.php
diff --git a/html/includes/graphs/device_laload.inc.php b/html/includes/graphs/device/laload.inc.php
similarity index 100%
rename from html/includes/graphs/device_laload.inc.php
rename to html/includes/graphs/device/laload.inc.php
diff --git a/html/includes/graphs/device_memory.inc.php b/html/includes/graphs/device/memory.inc.php
similarity index 100%
rename from html/includes/graphs/device_memory.inc.php
rename to html/includes/graphs/device/memory.inc.php
diff --git a/html/includes/graphs/device_memory_procurve.inc.php b/html/includes/graphs/device/memory_procurve.inc.php
similarity index 100%
rename from html/includes/graphs/device_memory_procurve.inc.php
rename to html/includes/graphs/device/memory_procurve.inc.php
diff --git a/html/includes/graphs/device_memory_unix.inc.php b/html/includes/graphs/device/memory_unix.inc.php
similarity index 100%
rename from html/includes/graphs/device_memory_unix.inc.php
rename to html/includes/graphs/device/memory_unix.inc.php
diff --git a/html/includes/graphs/device_processors.inc.php b/html/includes/graphs/device/processors.inc.php
similarity index 92%
rename from html/includes/graphs/device_processors.inc.php
rename to html/includes/graphs/device/processors.inc.php
index abff7c82a..4defb6135 100644
--- a/html/includes/graphs/device_processors.inc.php
+++ b/html/includes/graphs/device/processors.inc.php
@@ -31,7 +31,7 @@ $scale_max = "100";
 $nototal = 1;
 
 if ($rrd_list) {
-  include ("generic_multi_line.inc.php");
+  include ("includes/graphs/generic_multi_line.inc.php");
 }
 
 ?>
diff --git a/html/includes/graphs/device_snmp_packets.inc.php b/html/includes/graphs/device/snmp_packets.inc.php
similarity index 100%
rename from html/includes/graphs/device_snmp_packets.inc.php
rename to html/includes/graphs/device/snmp_packets.inc.php
diff --git a/html/includes/graphs/device_snmp_statistics.inc.php b/html/includes/graphs/device/snmp_statistics.inc.php
similarity index 100%
rename from html/includes/graphs/device_snmp_statistics.inc.php
rename to html/includes/graphs/device/snmp_statistics.inc.php
diff --git a/html/includes/graphs/device_storage.inc.php b/html/includes/graphs/device/storage.inc.php
similarity index 100%
rename from html/includes/graphs/device_storage.inc.php
rename to html/includes/graphs/device/storage.inc.php
diff --git a/html/includes/graphs/device_tcp.inc.php b/html/includes/graphs/device/tcp.inc.php
similarity index 100%
rename from html/includes/graphs/device_tcp.inc.php
rename to html/includes/graphs/device/tcp.inc.php
diff --git a/html/includes/graphs/device_temperatures.inc.php b/html/includes/graphs/device/temperatures.inc.php
similarity index 100%
rename from html/includes/graphs/device_temperatures.inc.php
rename to html/includes/graphs/device/temperatures.inc.php
diff --git a/html/includes/graphs/device_toner.inc.php b/html/includes/graphs/device/toner.inc.php
similarity index 100%
rename from html/includes/graphs/device_toner.inc.php
rename to html/includes/graphs/device/toner.inc.php
diff --git a/html/includes/graphs/device_udp.inc.php b/html/includes/graphs/device/udp.inc.php
similarity index 100%
rename from html/includes/graphs/device_udp.inc.php
rename to html/includes/graphs/device/udp.inc.php
diff --git a/html/includes/graphs/device_uptime.inc.php b/html/includes/graphs/device/uptime.inc.php
similarity index 100%
rename from html/includes/graphs/device_uptime.inc.php
rename to html/includes/graphs/device/uptime.inc.php
diff --git a/html/includes/graphs/device_voltages.inc.php b/html/includes/graphs/device/voltages.inc.php
similarity index 100%
rename from html/includes/graphs/device_voltages.inc.php
rename to html/includes/graphs/device/voltages.inc.php
diff --git a/html/includes/graphs/device_wificlients.inc.php b/html/includes/graphs/device/wificlients.inc.php
similarity index 100%
rename from html/includes/graphs/device_wificlients.inc.php
rename to html/includes/graphs/device/wificlients.inc.php
diff --git a/html/includes/graphs/device_diskio.inc.php b/html/includes/graphs/device_diskio.inc.php
deleted file mode 100644
index 7fdad9307..000000000
--- a/html/includes/graphs/device_diskio.inc.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-include("device_diskio_ops.inc.php");
-
-?>
diff --git a/html/includes/graphs/diskio_bits.inc.php b/html/includes/graphs/diskio/bits.inc.php
similarity index 100%
rename from html/includes/graphs/diskio_bits.inc.php
rename to html/includes/graphs/diskio/bits.inc.php
diff --git a/html/includes/graphs/diskio_ops.inc.php b/html/includes/graphs/diskio/ops.inc.php
similarity index 100%
rename from html/includes/graphs/diskio_ops.inc.php
rename to html/includes/graphs/diskio/ops.inc.php
diff --git a/html/includes/graphs/generic_bits.inc.php b/html/includes/graphs/generic_bits.inc.php
index 443e0b760..12e283c8b 100644
--- a/html/includes/graphs/generic_bits.inc.php
+++ b/html/includes/graphs/generic_bits.inc.php
@@ -3,7 +3,7 @@
 /// Draw generic bits graph
 /// args: rra_in, rra_out, rrd_filename, bg, legend, from, to, width, height, inverse
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 if($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
 
diff --git a/html/includes/graphs/generic_duplex.inc.php b/html/includes/graphs/generic_duplex.inc.php
index f7ccab7ae..9d5ba89a8 100644
--- a/html/includes/graphs/generic_duplex.inc.php
+++ b/html/includes/graphs/generic_duplex.inc.php
@@ -3,7 +3,7 @@
 /// Draw generic bits graph
 /// args: rra_in, rra_out, rrd_filename, bg, legend, from, to, width, height, inverse, $percentile
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $unit_text = str_pad(truncate($unit_text,10),10);
 
diff --git a/html/includes/graphs/generic_multi_bits.inc.php b/html/includes/graphs/generic_multi_bits.inc.php
index d19d58f9a..1b050111d 100644
--- a/html/includes/graphs/generic_multi_bits.inc.php
+++ b/html/includes/graphs/generic_multi_bits.inc.php
@@ -3,7 +3,7 @@
 /// Draws aggregate bits graph from multiple RRDs
 /// Variables : colour_[line|area]_[in|out], rrd_filenames
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $i=0;
 foreach($rrd_filenames as $rrd_filename) {
diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php
index 7ded1e2fc..a4718a389 100644
--- a/html/includes/graphs/generic_multi_bits_separated.inc.php
+++ b/html/includes/graphs/generic_multi_bits_separated.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
 
   $i = 0;
   $rrd_options .= " COMMENT:'                               In\: Current     Maximum      '";
diff --git a/html/includes/graphs/generic_multi_line.inc.php b/html/includes/graphs/generic_multi_line.inc.php
index 995b11ae1..a813dd766 100644
--- a/html/includes/graphs/generic_multi_line.inc.php
+++ b/html/includes/graphs/generic_multi_line.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
 
   $unit_text = str_pad($unit_text, 13);
   $unit_text = substr($unit_text,0,13);
diff --git a/html/includes/graphs/generic_multi_seperated.inc.php b/html/includes/graphs/generic_multi_seperated.inc.php
index 3ffef3a05..0e28fbabc 100644
--- a/html/includes/graphs/generic_multi_seperated.inc.php
+++ b/html/includes/graphs/generic_multi_seperated.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
 
   $units_descr = substr(str_pad($units_descr, 18),0,18);
 
diff --git a/html/includes/graphs/generic_multi_simplex_seperated.inc.php b/html/includes/graphs/generic_multi_simplex_seperated.inc.php
index 96026078e..29756e186 100644
--- a/html/includes/graphs/generic_multi_simplex_seperated.inc.php
+++ b/html/includes/graphs/generic_multi_simplex_seperated.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
 
   $unit_text = str_pad(truncate($unit_text,10),10);
   $rrd_options .= " COMMENT:'$unit_text              Cur      Max'";
diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php
index b72bdbc0c..15aee0625 100644
--- a/html/includes/graphs/generic_simplex.inc.php
+++ b/html/includes/graphs/generic_simplex.inc.php
@@ -3,7 +3,7 @@
 /// Draw generic bits graph
 /// args: rra_in, rra_out, rrd_filename, bg, legend, from, to, width, height, inverse, percentile
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $unit_text = str_pad(truncate($unit_text,10),10);
 
diff --git a/html/includes/graphs/graph.inc.php b/html/includes/graphs/graph.inc.php
new file mode 100644
index 000000000..3f5bcdfd9
--- /dev/null
+++ b/html/includes/graphs/graph.inc.php
@@ -0,0 +1,96 @@
+<?php
+
+if($_GET['debug']) {
+  ini_set('display_errors', 1);
+  ini_set('display_startup_errors', 0);
+  ini_set('log_errors', 0);
+  ini_set('allow_url_fopen', 0);
+  ini_set('error_reporting', E_ALL);
+}
+
+  include("../includes/defaults.inc.php");
+  include("../config.php");
+  include("../includes/common.php");
+  include("../includes/rewrites.php");
+  include("includes/authenticate.inc.php");
+
+  if(!$config['allow_unauth_graphs']) {
+    if(!$_SESSION['authenticated']) { echo("not authenticated"); exit; }
+  }
+  
+  if($_GET['device']) {
+    $_GET['id'] = $_GET['device'];
+    $device_id = $_GET['device'];
+  } elseif($_GET['if']) {
+    $_GET['id'] = $_GET['if'];
+  } elseif($_GET['port']) {
+    $_GET['id'] = $_GET['port'];
+  } elseif($_GET['peer']) {
+    $_GET['id'] = $_GET['peer'];
+  }
+
+  preg_match('/^(?P<type>[A-Za-z0-9]+)_(?P<subtype>.+)/', mres($_GET['type']), $graphtype);
+
+  $type = $graphtype['type'];
+  $subtype = $graphtype['subtype'];
+
+  if($debug) {print_r($graphtype);}
+
+  $from     = mres($_GET['from']);
+  $to       = mres($_GET['to']);
+  $width    = mres($_GET['width']);
+  $height   = mres($_GET['height']);
+  $title    = mres($_GET['title']);
+  $vertical = mres($_GET['vertical']);
+  $legend   = mres($_GET['legend']);
+  $id       = mres($_GET['id']);
+
+  $graphfile = $config['temp_dir'] . "/"  . strgen() . ".png";
+
+  $os = gethostosbyid($device_id);
+  if($config['os'][$os]['group']) {$os_group = $config['os'][$os]['group'];}
+
+#  if(is_file($config['install_dir'] . "/html/includes/graphs/".$type."_".$os.".inc.php")) {
+#    /// Type + OS Specific
+#    include($config['install_dir'] . "/html/includes/graphs/".$type."_".$os.".inc.php");
+#  }elseif($os_group && is_file($config['install_dir'] . "/html/includes/graphs/".$type."_".$os_group.".inc.php")) {
+#    /// Type + OS Group Specific
+#    include($config['install_dir'] . "/html/includes/graphs/".$type."_".$os_group.".inc.php");
+#  } elseif(is_file($config['install_dir'] . "/html/includes/graphs/$type.inc.php")) {
+#    /// Type Specific
+#    include($config['install_dir'] . "/html/includes/graphs/$type.inc.php");
+#  }
+
+if(is_file($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.php")) {
+  include($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.php");
+}
+
+
+  if($rrd_options) {
+    
+    if($config['rrdcached']) { $rrd_switches = " --daemon ".$config['rrdcached'] . " "; }
+    $rrd_cmd = $config['rrdtool'] . " graph $graphfile $rrd_options" . $rrd_switches;
+    $woo = shell_exec($rrd_cmd);
+    if($_GET['debug']) { echo("<pre>".$rrd_cmd."</pre>"); }    
+#    $thing = popen($config['rrdtool'] . " -",'w');
+#    fputs($thing, "graph $graphfile $rrd_options");
+#    pclose($thing);
+    if(is_file($graphfile)) {
+      header('Content-type: image/png');
+      $fd = fopen($graphfile,'r');fpassthru($fd);fclose($fd);
+      unlink($graphfile);
+    } else {
+      header('Content-type: image/png');
+      $string = "Graph Generation Error";
+      $im     = imagecreate($width, $height);
+      $orange = imagecolorallocate($im, 255, 255, 255);
+      $px     = (imagesx($im) - 7.5 * strlen($string)) / 2;
+      imagestring($im, 3, $px, $height / 2 - 8, $string, imagecolorallocate($im, 128, 0, 0));
+      imagepng($im);
+      imagedestroy($im);
+    }
+  }
+
+
+
+?>
diff --git a/html/includes/graphs/mempool.inc.php b/html/includes/graphs/mempool/usage.inc.php
similarity index 100%
rename from html/includes/graphs/mempool.inc.php
rename to html/includes/graphs/mempool/usage.inc.php
diff --git a/html/includes/graphs/multi_bits_separate.inc.php b/html/includes/graphs/multi_bits_separate.inc.php
index dece7ada2..49025e729 100644
--- a/html/includes/graphs/multi_bits_separate.inc.php
+++ b/html/includes/graphs/multi_bits_separate.inc.php
@@ -2,7 +2,7 @@
 
 function graph_multi_bits ($args) {
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $i = 1;
   $options .= " COMMENT:'                               In\: Current     Maximum      '";
   if(!$args['nototal']) {$options .= " COMMENT:'Total      '";}
diff --git a/html/includes/graphs/port_adsl_attainable.inc.php b/html/includes/graphs/port/adsl_attainable.inc.php
similarity index 94%
rename from html/includes/graphs/port_adsl_attainable.inc.php
rename to html/includes/graphs/port/adsl_attainable.inc.php
index 204590e95..370b4fe77 100644
--- a/html/includes/graphs/port_adsl_attainable.inc.php
+++ b/html/includes/graphs/port/adsl_attainable.inc.php
@@ -33,7 +33,7 @@ $scale_min = "0";
 $nototal = 1;
 
 if ($rrd_list) {
-  include ("generic_multi_line.inc.php");
+  include ("includes/graphs/generic_multi_line.inc.php");
 }
 
 ?>
diff --git a/html/includes/graphs/port_adsl_attenuation.inc.php b/html/includes/graphs/port/adsl_attenuation.inc.php
similarity index 94%
rename from html/includes/graphs/port_adsl_attenuation.inc.php
rename to html/includes/graphs/port/adsl_attenuation.inc.php
index 5fb91318d..359053442 100644
--- a/html/includes/graphs/port_adsl_attenuation.inc.php
+++ b/html/includes/graphs/port/adsl_attenuation.inc.php
@@ -32,7 +32,7 @@ $scale_min = "0";
 $nototal = 1;
 
 if ($rrd_list) {
-  include ("generic_multi_line.inc.php");
+  include ("includes/graphs/generic_multi_line.inc.php");
 }
 
 ?>
diff --git a/html/includes/graphs/port_adsl_power.inc.php b/html/includes/graphs/port/adsl_power.inc.php
similarity index 94%
rename from html/includes/graphs/port_adsl_power.inc.php
rename to html/includes/graphs/port/adsl_power.inc.php
index a81bc2285..a71466411 100644
--- a/html/includes/graphs/port_adsl_power.inc.php
+++ b/html/includes/graphs/port/adsl_power.inc.php
@@ -32,7 +32,7 @@ $scale_min = "0";
 $nototal = 1;
 
 if ($rrd_list) {
-  include ("generic_multi_line.inc.php");
+  include ("includes/graphs/generic_multi_line.inc.php");
 }
 
 ?>
diff --git a/html/includes/graphs/port_adsl_snr.inc.php b/html/includes/graphs/port/adsl_snr.inc.php
similarity index 94%
rename from html/includes/graphs/port_adsl_snr.inc.php
rename to html/includes/graphs/port/adsl_snr.inc.php
index 6d7d0bb41..981dbf7cc 100644
--- a/html/includes/graphs/port_adsl_snr.inc.php
+++ b/html/includes/graphs/port/adsl_snr.inc.php
@@ -32,7 +32,7 @@ $scale_min = "0";
 $nototal = 1;
 
 if ($rrd_list) {
-  include ("generic_multi_line.inc.php");
+  include ("includes/graphs/generic_multi_line.inc.php");
 }
 
 ?>
diff --git a/html/includes/graphs/port_adsl_speed.inc.php b/html/includes/graphs/port/adsl_speed.inc.php
similarity index 94%
rename from html/includes/graphs/port_adsl_speed.inc.php
rename to html/includes/graphs/port/adsl_speed.inc.php
index 2b18fa3d5..c0286fe69 100644
--- a/html/includes/graphs/port_adsl_speed.inc.php
+++ b/html/includes/graphs/port/adsl_speed.inc.php
@@ -33,7 +33,7 @@ $scale_min = "0";
 $nototal = 1;
 
 if ($rrd_list) {
-  include ("generic_multi_line.inc.php");
+  include ("includes/graphs/generic_multi_line.inc.php");
 }
 
 ?>
diff --git a/html/includes/graphs/port_bits.inc.php b/html/includes/graphs/port/bits.inc.php
similarity index 100%
rename from html/includes/graphs/port_bits.inc.php
rename to html/includes/graphs/port/bits.inc.php
diff --git a/html/includes/graphs/port_errors.inc.php b/html/includes/graphs/port/errors.inc.php
similarity index 100%
rename from html/includes/graphs/port_errors.inc.php
rename to html/includes/graphs/port/errors.inc.php
diff --git a/html/includes/graphs/port_etherlike.inc.php b/html/includes/graphs/port/etherlike.inc.php
similarity index 94%
rename from html/includes/graphs/port_etherlike.inc.php
rename to html/includes/graphs/port/etherlike.inc.php
index 3ac192101..5faed2325 100644
--- a/html/includes/graphs/port_etherlike.inc.php
+++ b/html/includes/graphs/port/etherlike.inc.php
@@ -29,7 +29,7 @@ $colours   = "mixed";
 $nototal   = 1;
 $unit_text = "Errors";
 
-include ("generic_multi_simplex_seperated.inc.php");
+include ("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
 
 
diff --git a/html/includes/graphs/fanspeed.inc.php b/html/includes/graphs/port/fanspeed.inc.php
similarity index 100%
rename from html/includes/graphs/fanspeed.inc.php
rename to html/includes/graphs/port/fanspeed.inc.php
diff --git a/html/includes/graphs/mac_acc_bits.inc.php b/html/includes/graphs/port/mac_acc_bits.inc.php
similarity index 100%
rename from html/includes/graphs/mac_acc_bits.inc.php
rename to html/includes/graphs/port/mac_acc_bits.inc.php
diff --git a/html/includes/graphs/mac_acc_pkts.inc.php b/html/includes/graphs/port/mac_acc_pkts.inc.php
similarity index 100%
rename from html/includes/graphs/mac_acc_pkts.inc.php
rename to html/includes/graphs/port/mac_acc_pkts.inc.php
diff --git a/html/includes/graphs/mac_acc_total.inc.php b/html/includes/graphs/port/mac_acc_total.inc.php
similarity index 100%
rename from html/includes/graphs/mac_acc_total.inc.php
rename to html/includes/graphs/port/mac_acc_total.inc.php
diff --git a/html/includes/graphs/port_nupkts.inc.php b/html/includes/graphs/port/nupkts.inc.php
similarity index 94%
rename from html/includes/graphs/port_nupkts.inc.php
rename to html/includes/graphs/port/nupkts.inc.php
index 0dbf41d78..06ac45612 100644
--- a/html/includes/graphs/port_nupkts.inc.php
+++ b/html/includes/graphs/port/nupkts.inc.php
@@ -38,7 +38,7 @@ if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/ifx-" . safename($po
 
   $nototal = 1;
 
-  include ("generic_multi_seperated.inc.php");
+  include ("includes/graphs/generic_multi_seperated.inc.php");
 
 }
 elseif(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) 
@@ -60,7 +60,7 @@ elseif(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($po
 
   $graph_max = 1;
 
-  include("generic_duplex.inc.php");
+  include("includes/graphs/generic_duplex.inc.php");
 
 }
 
diff --git a/html/includes/graphs/pagp_bits.inc.php b/html/includes/graphs/port/pagp_bits.inc.php
similarity index 92%
rename from html/includes/graphs/pagp_bits.inc.php
rename to html/includes/graphs/port/pagp_bits.inc.php
index 9ada1447f..1840a1da7 100644
--- a/html/includes/graphs/pagp_bits.inc.php
+++ b/html/includes/graphs/port/pagp_bits.inc.php
@@ -25,7 +25,7 @@ $nototal = 1;
 $rra_in  = "INOCTETS";
 $rra_out = "OUTOCTETS";
 
-include ("generic_multi_bits_separated.inc.php");
+include ("includes/graphs/generic_multi_bits_separated.inc.php");
 
 
 
diff --git a/html/includes/graphs/port_upkts.inc.php b/html/includes/graphs/port/upkts.inc.php
similarity index 100%
rename from html/includes/graphs/port_upkts.inc.php
rename to html/includes/graphs/port/upkts.inc.php
diff --git a/html/includes/graphs/processor.inc.php b/html/includes/graphs/processor/usage.inc.php
similarity index 100%
rename from html/includes/graphs/processor.inc.php
rename to html/includes/graphs/processor/usage.inc.php
diff --git a/html/includes/graphs/current.inc.php b/html/includes/graphs/sensor/current.inc.php
similarity index 100%
rename from html/includes/graphs/current.inc.php
rename to html/includes/graphs/sensor/current.inc.php
diff --git a/html/includes/graphs/frequency.inc.php b/html/includes/graphs/sensor/frequency.inc.php
similarity index 100%
rename from html/includes/graphs/frequency.inc.php
rename to html/includes/graphs/sensor/frequency.inc.php
diff --git a/html/includes/graphs/humidity.inc.php b/html/includes/graphs/sensor/humidity.inc.php
similarity index 100%
rename from html/includes/graphs/humidity.inc.php
rename to html/includes/graphs/sensor/humidity.inc.php
diff --git a/html/includes/graphs/temperature.inc.php b/html/includes/graphs/sensor/temperature.inc.php
similarity index 100%
rename from html/includes/graphs/temperature.inc.php
rename to html/includes/graphs/sensor/temperature.inc.php
diff --git a/html/includes/graphs/voltage.inc.php b/html/includes/graphs/sensor/voltage.inc.php
similarity index 100%
rename from html/includes/graphs/voltage.inc.php
rename to html/includes/graphs/sensor/voltage.inc.php
diff --git a/html/includes/graphs/service.inc.php b/html/includes/graphs/service.inc.php
index 1c0f86d3e..7be4f3747 100755
--- a/html/includes/graphs/service.inc.php
+++ b/html/includes/graphs/service.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "0";
 $scale_max = "1";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $iter = "1";
 
diff --git a/html/includes/graphs/storage.inc.php b/html/includes/graphs/storage/usage.inc.php
similarity index 100%
rename from html/includes/graphs/storage.inc.php
rename to html/includes/graphs/storage/usage.inc.php
diff --git a/html/includes/print-device-graph.php b/html/includes/print-device-graph.php
index 5a38d69cb..f0675b983 100644
--- a/html/includes/print-device-graph.php
+++ b/html/includes/print-device-graph.php
@@ -27,12 +27,17 @@
   $yearly_url      = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['year']."&to=".$config['now']."&width=400&height=150";
   $yearly_url     .= $args; 
 
-  echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
-        <img src='$daily_traffic' border=0></a> ");
+  $graph_args      = $device['device_id'] . "/" . $graph_type . "/";
+
+  echo("<a href='".$config['base_url']."/graphs/" . $graph_args . "' onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT".$config['overlib_defaults'].");\" 
+        onmouseout=\"return nd();\"> <img src='$daily_traffic' border=0></a> ");
+
   echo("<a onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
         <img src='$weekly_traffic' border=0></a> ");
+
   echo("<a onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
         <img src='$monthly_traffic' border=0></a> ");
+
   echo("<a onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
         <img src='$yearly_traffic' border=0></a>");
 
diff --git a/html/pages/device/health/current.inc.php b/html/pages/device/health/current.inc.php
index 8c71988b2..12e8d61c2 100644
--- a/html/pages/device/health/current.inc.php
+++ b/html/pages/device/health/current.inc.php
@@ -19,7 +19,7 @@ while($current = mysql_fetch_array($query)) {
         </tr>\n");
   echo("<tr  bgcolor=$row_colour><td colspan='4'>");
 
-  $graph_type = "current";
+  $graph_type = "sensor_current";
 
 // start current graphs
 
diff --git a/html/pages/device/health/diskio.inc.php b/html/pages/device/health/diskio.inc.php
index 43aeaed64..54588e6ba 100644
--- a/html/pages/device/health/diskio.inc.php
+++ b/html/pages/device/health/diskio.inc.php
@@ -29,7 +29,7 @@ while($drive = mysql_fetch_array($query)) {
     $fs_url   = "/device/".$device['device_id']."/health/diskio/";
 
     $fs_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['diskio_descr'];
-    $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['diskio_id'] . "&type=ucd_diskio&from=$month&to=$now&width=400&height=125\'>";
+    $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['diskio_id'] . "&type=diskio_ops&from=$month&to=$now&width=400&height=125\'>";
     $fs_popup .= "', RIGHT, FGCOLOR, '#e5e5e5');\" onmouseout=\"return nd();\"";
 
     if($perc > '90') { $left_background='c4323f'; $right_background='C96A73';
diff --git a/html/pages/device/health/fanspeeds.inc.php b/html/pages/device/health/fanspeeds.inc.php
index b12175729..916e8b368 100644
--- a/html/pages/device/health/fanspeeds.inc.php
+++ b/html/pages/device/health/fanspeeds.inc.php
@@ -19,7 +19,7 @@ while($fan = mysql_fetch_array($query)) {
         </tr>\n");
   echo("<tr  bgcolor=$row_colour><td colspan='4'>");
 
-  $graph_type = "fanspeed";
+  $graph_type = "sensor_fanspeed";
 
 // start fanspeed graphs
 
diff --git a/html/pages/device/health/frequencies.inc.php b/html/pages/device/health/frequencies.inc.php
index b69f8dfa1..eb44dbaee 100644
--- a/html/pages/device/health/frequencies.inc.php
+++ b/html/pages/device/health/frequencies.inc.php
@@ -19,7 +19,7 @@ while($freq = mysql_fetch_array($query)) {
         </tr>\n");
   echo("<tr  bgcolor=$row_colour><td colspan='4'>");
 
-  $graph_type = "frequency";
+  $graph_type = "sensor_frequency";
 
 // start frequency graphs
 
@@ -55,4 +55,4 @@ while($freq = mysql_fetch_array($query)) {
 echo("</table>");
 
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/device/health/humidity.inc.php b/html/pages/device/health/humidity.inc.php
index 9deb03249..dee94c931 100644
--- a/html/pages/device/health/humidity.inc.php
+++ b/html/pages/device/health/humidity.inc.php
@@ -19,7 +19,7 @@ while($humidity = mysql_fetch_array($query)) {
         </tr>\n");
   echo("<tr  bgcolor=$row_colour><td colspan='4'>");
 
-  $graph_type = "humidity";
+  $graph_type = "sensor_humidity";
 
 // start humidity graphs
 
diff --git a/html/pages/device/health/memory.inc.php b/html/pages/device/health/memory.inc.php
index 79f3ad6e6..a02cf06b7 100644
--- a/html/pages/device/health/memory.inc.php
+++ b/html/pages/device/health/memory.inc.php
@@ -1,4 +1,6 @@
 <?php
+
+$graph_type = "mempool_usage";
  
   echo("<div style='margin-top: 5px; padding: 0px;'>");
   echo("<table width=100% cellpadding=6 cellspacing=0>");
@@ -12,10 +14,10 @@
     $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
 
     $mempool_url   = "/device/".$device['device_id']."/health/memory/";
-    $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
     $mempool_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
-    $mempool_popup .= "</div><img src=\'graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$month&to=$now&width=400&height=125\'>";
+    $mempool_popup .= "</div><img src=\'graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
     $mempool_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
 
     $total = formatStorage($mempool['mempool_total']);
@@ -41,17 +43,17 @@
  
   echo("<tr bgcolor='$row_colour'><td colspan=5>");
  
-  $daily_graph   = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
  
-  $weekly_graph  = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
  
-  $monthly_graph = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
  
-  $yearly_graph  = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
  
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/device/health/processors.inc.php b/html/pages/device/health/processors.inc.php
index 70eba76b6..80c6c5fc3 100644
--- a/html/pages/device/health/processors.inc.php
+++ b/html/pages/device/health/processors.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "processor_usage";
+
   echo("<div style='margin-top: 5px; padding: 0px;'>");
   echo("<table width=100% cellpadding=6 cellspacing=0>");
   $i = '1';
@@ -8,14 +10,14 @@
 
     $proc_url   = $config['base_url']."/device/".$device['device_id']."/health/processors/";
 
-    $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=processor&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
     $text_descr = $proc['processor_descr'];
 
     $text_descr = rewrite_entity_descr($text_descr);
 
     $proc_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
-    $proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=125\'>";
+    $proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
     $proc_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
 
     $perc = round($proc['processor_usage']);
@@ -36,17 +38,17 @@
 
   echo("<tr bgcolor='$row_colour'><td colspan=5>");
 
-  $daily_graph   = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$day&to=$now&width=211&height=100";
-  $daily_url     = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url     = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$week&to=$now&width=211&height=100";
-  $weekly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=211&height=100";
-  $monthly_url   = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url   = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$year&to=$now&width=211&height=100";
-  $yearly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/device/health/storage.inc.php b/html/pages/device/health/storage.inc.php
index 6ecea3ac7..2159d4996 100644
--- a/html/pages/device/health/storage.inc.php
+++ b/html/pages/device/health/storage.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "storage_usage";
+
 $sql = "SELECT * FROM `storage` WHERE device_id = '" . ($_GET['id']) . "' ORDER BY storage_descr";
 $query = mysql_query($sql);
 
@@ -29,7 +31,7 @@ while($drive = mysql_fetch_array($query)) {
     $fs_url   = "?page=device&id=".$device['device_id']."&section=dev-storage";
 
     $fs_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['storage_descr'];
-    $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$month&to=$now&width=400&height=125\'>";
+    $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
     $fs_popup .= "', RIGHT, FGCOLOR, '#e5e5e5');\" onmouseout=\"return nd();\"";
 
     if($perc > '90') { $left_background='c4323f'; $right_background='C96A73';
@@ -43,8 +45,6 @@ while($drive = mysql_fetch_array($query)) {
           </td><td>" . $free . "</td><td></td></tr>");
 
 
-  $graph_type = "storage";
-
 // start temperature graphs
 
   $daily_temp   = "graph.php?id=" . $drive['storage_id'] . "&type=$graph_type&from=$day&to=$now&width=212&height=100";
diff --git a/html/pages/device/health/temperatures.inc.php b/html/pages/device/health/temperatures.inc.php
index 9b6daa535..f2473b1d4 100644
--- a/html/pages/device/health/temperatures.inc.php
+++ b/html/pages/device/health/temperatures.inc.php
@@ -19,7 +19,7 @@ while($temp = mysql_fetch_array($query)) {
         </tr>\n");
   echo("<tr  bgcolor=$row_colour><td colspan='4'>");
 
-  $graph_type = "temperature";
+  $graph_type = "sensor_temperature";
 
 // start temperature graphs
 
@@ -55,4 +55,4 @@ while($temp = mysql_fetch_array($query)) {
 echo("</table>");
 
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/device/health/voltages.inc.php b/html/pages/device/health/voltages.inc.php
index cc838684a..6739ad62f 100644
--- a/html/pages/device/health/voltages.inc.php
+++ b/html/pages/device/health/voltages.inc.php
@@ -19,7 +19,7 @@ while($volt = mysql_fetch_array($query)) {
         </tr>\n");
   echo("<tr  bgcolor=$row_colour><td colspan='4'>");
 
-  $graph_type = "voltage";
+  $graph_type = "sensor_voltage";
 
 // start voltage graphs
 
diff --git a/html/pages/device/overview/current.inc.php b/html/pages/device/overview/current.inc.php
index ecec1a4c6..1eb729f0a 100644
--- a/html/pages/device/overview/current.inc.php
+++ b/html/pages/device/overview/current.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "sensor_current";
+
 unset($current_seperator);
 if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE sensor_class='current' AND device_id = '" . $device['device_id'] . "'"),0)) {
   $rows = round($total / 2,0);
@@ -15,11 +17,11 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
 
     $graph_colour = str_replace("#", "", $row_colour);
 
-    $current_day    = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$day&to=$now&width=300&height=100";
-    $current_week   = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$week&to=$now&width=300&height=100";
-    $current_month  = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$month&to=$now&width=300&height=100";
-    $current_year  = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$year&to=$now&width=300&height=100";
-    $current_minigraph = "<img src='graph.php?id=" . $current['sensor_id'] . "&type=current&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
+    $current_day    = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=300&height=100";
+    $current_week   = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=300&height=100";
+    $current_month  = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=300&height=100";
+    $current_year  = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=300&height=100";
+    $current_minigraph = "<img src='graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
 
     $current_link  = "<a href='/device/".$device['device_id']."/health/current/' onmouseover=\"return ";
     $current_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$current['sensor_descr'];
diff --git a/html/pages/device/overview/fanspeeds.inc.php b/html/pages/device/overview/fanspeeds.inc.php
index b8fd96211..03c39a2cf 100644
--- a/html/pages/device/overview/fanspeeds.inc.php
+++ b/html/pages/device/overview/fanspeeds.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "sensor_fanspeed";
+
 unset($fan_seperator);
 if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE sensor_class='fanspeed' AND device_id = '" . $device['device_id'] . "'"),0)) {
   $rows = round($total / 2,0);
@@ -15,11 +17,11 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
 
     $graph_colour = str_replace("#", "", $row_colour);
 
-    $fan_day    = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$day&to=$now&width=300&height=100";
-    $fan_week   = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$week&to=$now&width=300&height=100";
-    $fan_month  = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$month&to=$now&width=300&height=100";
-    $fan_year  = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$year&to=$now&width=300&height=100";
-    $fan_minigraph = "<img src='graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
+    $fan_day    = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=300&height=100";
+    $fan_week   = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=300&height=100";
+    $fan_month  = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=300&height=100";
+    $fan_year  = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=300&height=100";
+    $fan_minigraph = "<img src='graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
 
     $fan_link  = "<a href='/device/".$device['device_id']."/health/fanspeeds/' onmouseover=\"return ";
     $fan_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$fan['sensor_descr'];
diff --git a/html/pages/device/overview/frequencies.inc.php b/html/pages/device/overview/frequencies.inc.php
index ea6c66527..77d94951a 100644
--- a/html/pages/device/overview/frequencies.inc.php
+++ b/html/pages/device/overview/frequencies.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "sensor_frequency";
+
 unset($freq_seperator);
 if(mysql_result(mysql_query("SELECT count(freq_id) from frequency WHERE device_id = '" . $device['device_id'] . "'"),0)) {
   $total = mysql_result(mysql_query("SELECT count(freq_id) from frequency WHERE device_id = '" . $device['device_id'] . "'"),0);
@@ -16,11 +18,11 @@ if(mysql_result(mysql_query("SELECT count(freq_id) from frequency WHERE device_i
 
     $graph_colour = str_replace("#", "", $row_colour);
 
-    $freq_day    = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$day&to=$now&width=300&height=100";
-    $freq_week   = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$week&to=$now&width=300&height=100";
-    $freq_month  = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$month&to=$now&width=300&height=100";
-    $freq_year  = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$year&to=$now&width=300&height=100";
-    $freq_minigraph = "<img src='graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
+    $freq_day    = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$day&to=$now&width=300&height=100";
+    $freq_week   = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$week&to=$now&width=300&height=100";
+    $freq_month  = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$month&to=$now&width=300&height=100";
+    $freq_year  = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$year&to=$now&width=300&height=100";
+    $freq_minigraph = "<img src='graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
 
     $freq_link  = "<a href='/device/".$device['device_id']."/health/frequencies/' onmouseover=\"return ";
     $freq_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$freq['freq_descr'];
diff --git a/html/pages/device/overview/humidity.inc.php b/html/pages/device/overview/humidity.inc.php
index 6f5ea67fc..342f8e057 100644
--- a/html/pages/device/overview/humidity.inc.php
+++ b/html/pages/device/overview/humidity.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "sensor_humidity";
+
 unset($humidity_seperator);
 if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE sensor_class='humidity' AND device_id = '" . $device['device_id'] . "'"),0)) {
   $rows = round($total / 2,0);
@@ -17,11 +19,11 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
 
     $humidity_perc = $humidity['sensor_current'] / $humidity['sensor_limit'] * 100;
     $humidity_colour = percent_colour($humidity_perc);
-    $humidity_day    = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$day&to=$now&width=300&height=100";
-    $humidity_week   = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$week&to=$now&width=300&height=100";
-    $humidity_month  = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$month&to=$now&width=300&height=100";
-    $humidity_year  = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$year&to=$now&width=300&height=100";
-    $humidity_minigraph = "<img src='graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
+    $humidity_day    = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=300&height=100";
+    $humidity_week   = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=300&height=100";
+    $humidity_month  = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=300&height=100";
+    $humidity_year  = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=300&height=100";
+    $humidity_minigraph = "<img src='graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
 
     $humidity_link  = "<a href='/device/".$device['device_id']."/health/humiditys/' onmouseover=\"return ";
     $humidity_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$humidity['sensor_descr'];
diff --git a/html/pages/device/overview/mempools.inc.php b/html/pages/device/overview/mempools.inc.php
index 4eefcd9b8..cd4a3909f 100644
--- a/html/pages/device/overview/mempools.inc.php
+++ b/html/pages/device/overview/mempools.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "mempool_usage";
+
 if(mysql_result(mysql_query("SELECT count(*) from mempools WHERE device_id = '" . $device['device_id'] . "'"),0)) {
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p style='padding: 0px 5px 5px;' class=sectionhead><img align='absmiddle' src='".$config['base_url']."/images/icons/memory.png'> Memory Pools</p>");
@@ -13,10 +15,10 @@ if(mysql_result(mysql_query("SELECT count(*) from mempools WHERE device_id = '"
     $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
 
     $mempool_url   = "/device/".$device['device_id']."/health/memory/";
-    $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
     $mempool_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
-    $mempool_popup .= "</div><img src=\'graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$month&to=$now&width=400&height=125\'>";
+    $mempool_popup .= "</div><img src=\'graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
     $mempool_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
 
     $total = formatStorage($mempool['mempool_total']);
diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php
index 1eeb30138..75c53d9e1 100644
--- a/html/pages/device/overview/processors.inc.php
+++ b/html/pages/device/overview/processors.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "processor_usage";
+
 if(mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id = '" . $device['device_id'] . "'"),0)) {
   $processor_rows = 0;
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
@@ -13,10 +15,10 @@ if(mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id = '
     $proc_url   = $config['base_url'] . "/device/".$device['device_id']."/health/processors/";
 
     $proc_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$proc['processor_descr'];
-    $proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=125\'>";
+    $proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
     $proc_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
 
-    $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=processor&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
     ## REPLACE THIS SHITTY CODE. IT IS ALSO ELSEWHERE.
 
diff --git a/html/pages/device/overview/storage.inc.php b/html/pages/device/overview/storage.inc.php
index 275ab8e75..ad05a02a0 100644
--- a/html/pages/device/overview/storage.inc.php
+++ b/html/pages/device/overview/storage.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "storage_usage";
+
 if(mysql_result(mysql_query("SELECT count(storage_id) from storage WHERE device_id = '" . $device['device_id'] . "'"),0)) {
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p style='padding: 0px 5px 5px;' class=sectionhead><img align='absmiddle' src='".$config['base_url']."/images/icons/storage.png'> Storage</p>");
@@ -38,10 +40,10 @@ if(mysql_result(mysql_query("SELECT count(storage_id) from storage WHERE device_
     $fs_url   = "/device/".$device['device_id']."/health/storage/";
 
     $fs_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['storage_descr'];
-    $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$month&to=$now&width=400&height=125\'>";
+    $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
     $fs_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
 
-    $mini_graph = $config['base_url'] . "/graph.php?id=".$drive['storage_id']."&type=storage&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mini_graph = $config['base_url'] . "/graph.php?id=".$drive['storage_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
 
 
diff --git a/html/pages/device/overview/temperatures.inc.php b/html/pages/device/overview/temperatures.inc.php
index 26a46f205..a0df73848 100644
--- a/html/pages/device/overview/temperatures.inc.php
+++ b/html/pages/device/overview/temperatures.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "sensor_temperature";
+
 unset($temp_seperator);
 if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE sensor_class='temperature' AND device_id = '" . $device['device_id'] . "'"),0)) {
   $rows = round($total / 2,0);
@@ -17,11 +19,11 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
 
     $temp_perc = $temp['sensor_current'] / $temp['sensor_limit'] * 100;
     $temp_colour = percent_colour($temp_perc);
-    $temp_day    = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$day&to=$now&width=300&height=100";
-    $temp_week   = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$week&to=$now&width=300&height=100";
-    $temp_month  = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$month&to=$now&width=300&height=100";
-    $temp_year  = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$year&to=$now&width=300&height=100";
-    $temp_minigraph = "<img src='graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
+    $temp_day    = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=300&height=100";
+    $temp_week   = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=300&height=100";
+    $temp_month  = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=300&height=100";
+    $temp_year  = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=300&height=100";
+    $temp_minigraph = "<img src='graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
 
     $temp_link  = "<a href='/device/".$device['device_id']."/health/temperatures/' onmouseover=\"return ";
     $temp_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$temp['sensor_descr'];
diff --git a/html/pages/device/overview/voltages.inc.php b/html/pages/device/overview/voltages.inc.php
index 122706230..1ab2a2a4f 100644
--- a/html/pages/device/overview/voltages.inc.php
+++ b/html/pages/device/overview/voltages.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "sensor_voltage";
+
 unset($volt_seperator);
 if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE sensor_class='voltage' AND device_id = '" . $device['device_id'] . "'"),0)) {
   $rows = round($total / 2,0);
@@ -15,11 +17,11 @@ if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE
 
     $graph_colour = str_replace("#", "", $row_colour);
 
-    $volt_day    = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$day&to=$now&width=300&height=100";
-    $volt_week   = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$week&to=$now&width=300&height=100";
-    $volt_month  = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$month&to=$now&width=300&height=100";
-    $volt_year  = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$year&to=$now&width=300&height=100";
-    $volt_minigraph = "<img src='graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
+    $volt_day    = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=300&height=100";
+    $volt_week   = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=300&height=100";
+    $volt_month  = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=300&height=100";
+    $volt_year  = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=300&height=100";
+    $volt_minigraph = "<img src='graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
 
     $volt_link  = "<a href='/device/".$device['device_id']."/health/voltages/' onmouseover=\"return ";
     $volt_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$volt['sensor_descr'];
diff --git a/html/pages/health/current.inc.php b/html/pages/health/current.inc.php
index d426ea0d8..368f08295 100644
--- a/html/pages/health/current.inc.php
+++ b/html/pages/health/current.inc.php
@@ -6,6 +6,8 @@ if($_SESSION['userlevel'] >= '5') {
   $sql = "SELECT * FROM `current` AS S, `devices` AS D, devices_perms as P WHERE S.sensor_class='current' AND S.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, S.sensor_descr";
 }
 
+$graph_type = "sensor_current";
+
 $query = mysql_query($sql);
 
 echo('<table cellspacing="0" cellpadding="6" width="100%">');
@@ -27,18 +29,18 @@ while($current = mysql_fetch_array($query))
 {
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-  $weekly_current  = "graph.php?id=" . $current['sensor_id'] . "&amp;type=current&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
+  $weekly_current  = "graph.php?id=" . $current['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $current_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_current\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $current['sensor_descr'] . "</a>";
 
   if($current['sensor_current'] >= $current['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
    
-  $current_day    = "graph.php?id=" . $current['sensor_id'] . "&amp;type=current&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
-  $current_week   = "graph.php?id=" . $current['sensor_id'] . "&amp;type=current&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
-  $current_month  = "graph.php?id=" . $current['sensor_id'] . "&amp;type=current&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
-  $current_year   = "graph.php?id=" . $current['sensor_id'] . "&amp;type=current&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
+  $current_day    = "graph.php?id=" . $current['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
+  $current_week   = "graph.php?id=" . $current['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
+  $current_month  = "graph.php?id=" . $current['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
+  $current_year   = "graph.php?id=" . $current['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
 
-  $current_minigraph = "<img src='graph.php?id=" . $current['sensor_id'] . "&amp;type=current&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
+  $current_minigraph = "<img src='graph.php?id=" . $current['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
   $current_minigraph .= " onmouseover=\"return overlib('<div class=list-large>".$current['hostname']." - ".$current['sensor_descr'];
   $current_minigraph .= "</div><div style=\'width: 750px\'><img src=\'$current_day\'><img src=\'$current_week\'><img src=\'$current_month\'><img src=\'$current_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
 
@@ -57,17 +59,17 @@ while($current = mysql_fetch_array($query))
 
   echo("<tr bgcolor='$row_colour'><td colspan=7>");
 
-  $daily_graph   = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $current['sensor_id'] . "&type=current&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/health/fanspeeds.inc.php b/html/pages/health/fanspeeds.inc.php
index 72a38e96c..df670d863 100644
--- a/html/pages/health/fanspeeds.inc.php
+++ b/html/pages/health/fanspeeds.inc.php
@@ -6,6 +6,8 @@ if($_SESSION['userlevel'] >= '5') {
   $sql = "SELECT * FROM `sensors` AS S, `devices` AS D, devices_perms as P WHERE S.sensor_class='fanspeed' AND S.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, S.sensor_descr";
 }
 
+$graph_type = "sensor_fanspeed";
+
 $query = mysql_query($sql);
 
 echo('<table cellspacing="0" cellpadding="2" width="100%">');
@@ -26,18 +28,18 @@ while($fan = mysql_fetch_array($query))
 {
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-  $weekly_fan  = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=fanspeed&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
+  $weekly_fan  = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $fan_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_fan\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $fan['sensor_descr'] . "</a>";
 
   if($fan['sensor_current'] <= $fan['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
    
-  $fan_day    = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=fanspeed&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
-  $fan_week   = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=fanspeed&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
-  $fan_month  = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=fanspeed&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
-  $fan_year   = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=fanspeed&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
+  $fan_day    = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
+  $fan_week   = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
+  $fan_month  = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
+  $fan_year   = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
 
-  $fan_minigraph = "<img src='graph.php?id=" . $fan['sensor_id'] . "&amp;type=fanspeed&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
+  $fan_minigraph = "<img src='graph.php?id=" . $fan['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
   $fan_minigraph .= " onmouseover=\"return overlib('<div class=list-large>".$fan['hostname']." - ".$fan['sensor_descr'];
   $fan_minigraph .= "</div><div style=\'width: 750px\'><img src=\'$fan_day\'><img src=\'$fan_week\'><img src=\'$fan_month\'><img src=\'$fan_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
 
@@ -55,17 +57,17 @@ while($fan = mysql_fetch_array($query))
 
   echo("<tr bgcolor='$row_colour'><td colspan=6>");
 
-  $daily_graph   = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $fan['sensor_id'] . "&type=fanspeed&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $fan['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/health/frequencies.inc.php b/html/pages/health/frequencies.inc.php
index 0bc8b02e5..1a35129fa 100644
--- a/html/pages/health/frequencies.inc.php
+++ b/html/pages/health/frequencies.inc.php
@@ -6,6 +6,8 @@ if($_SESSION['userlevel'] >= '5') {
   $sql = "SELECT * FROM `frequency` AS V, `devices` AS D, devices_perms as P WHERE V.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, V.freq_descr";
 }
 
+$graph_type = "sensor_frequency";
+
 $query = mysql_query($sql);
 
 echo('<table cellspacing="0" cellpadding="6" width="100%">');
@@ -26,18 +28,18 @@ while($freq = mysql_fetch_array($query))
 {
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-  $weekly_freq  = "graph.php?id=" . $freq['freq_id'] . "&amp;type=frequency&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
+  $weekly_freq  = "graph.php?id=" . $freq['freq_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $freq_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_freq\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $freq['freq_descr'] . "</a>";
 
   if($freq['freq_current'] >= $freq['freq_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
    
-  $freq_day    = "graph.php?id=" . $freq['freq_id'] . "&amp;type=frequency&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
-  $freq_week   = "graph.php?id=" . $freq['freq_id'] . "&amp;type=frequency&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
-  $freq_month  = "graph.php?id=" . $freq['freq_id'] . "&amp;type=frequency&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
-  $freq_year   = "graph.php?id=" . $freq['freq_id'] . "&amp;type=frequency&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
+  $freq_day    = "graph.php?id=" . $freq['freq_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
+  $freq_week   = "graph.php?id=" . $freq['freq_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
+  $freq_month  = "graph.php?id=" . $freq['freq_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
+  $freq_year   = "graph.php?id=" . $freq['freq_id'] . "&amp;type=".$graph_type."&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
 
-  $freq_minigraph = "<img src='graph.php?id=" . $freq['freq_id'] . "&amp;type=frequency&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
+  $freq_minigraph = "<img src='graph.php?id=" . $freq['freq_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
   $freq_minigraph .= " onmouseover=\"return overlib('<div class=list-large>".$freq['hostname']." - ".$freq['freq_descr'];
   $freq_minigraph .= "</div><div style=\'width: 750px\'><img src=\'$freq_day\'><img src=\'$freq_week\'><img src=\'$freq_month\'><img src=\'$freq_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
 
@@ -55,17 +57,17 @@ while($freq = mysql_fetch_array($query))
 
   echo("<tr bgcolor='$row_colour'><td colspan=6>");
 
-  $daily_graph   = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $freq['freq_id'] . "&type=frequency&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $freq['freq_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/health/humidity.inc.php b/html/pages/health/humidity.inc.php
index 1a40758d9..7f377266a 100644
--- a/html/pages/health/humidity.inc.php
+++ b/html/pages/health/humidity.inc.php
@@ -8,6 +8,8 @@ if($_SESSION['userlevel'] >= '5') {
 
 $query = mysql_query($sql);
 
+$graph_type = "humidity";
+
 echo('<table cellspacing="0" cellpadding="6" width="100%">');
 
 echo('<tr class=tablehead>
@@ -26,7 +28,7 @@ while($humidity = mysql_fetch_array($query))
 {
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-  $weekly_humidity  = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=humidity&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
+  $weekly_humidity  = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $humidity_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_humidity\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $humidity['sensor_descr'] . "</a>";
 
@@ -37,12 +39,12 @@ while($humidity = mysql_fetch_array($query))
 
   if($humidity['sensor_current'] >= $humidity['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
    
-  $humidity_day    = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=humidity&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
-  $humidity_week   = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=humidity&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
-  $humidity_month  = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=humidity&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
-  $humidity_year   = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=humidity&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
+  $humidity_day    = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
+  $humidity_week   = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
+  $humidity_month  = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
+  $humidity_year   = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
 
-  $humidity_minigraph = "<img src='graph.php?id=" . $humidity['sensor_id'] . "&amp;type=humidity&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
+  $humidity_minigraph = "<img src='graph.php?id=" . $humidity['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
   $humidity_minigraph .= " onmouseover=\"return overlib('<div class=list-large>".$humidity['hostname']." - ".$humidity['sensor_descr'];
   $humidity_minigraph .= "</div><div style=\'width: 750px\'><img src=\'$humidity_day\'><img src=\'$humidity_week\'><img src=\'$humidity_month\'><img src=\'$humidity_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
 
@@ -60,17 +62,17 @@ while($humidity = mysql_fetch_array($query))
 
   echo("<tr bgcolor='$row_colour'><td colspan=7>");
 
-  $daily_graph   = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $humidity['sensor_id'] . "&type=humidity&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $humidity['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/health/memory.inc.php b/html/pages/health/memory.inc.php
index 68ea228ae..dbe6a4726 100644
--- a/html/pages/health/memory.inc.php
+++ b/html/pages/health/memory.inc.php
@@ -1,4 +1,6 @@
 <?php
+
+$graph_type = "mempool_usage";
  
   echo("<div style='margin-top: 5px; padding: 0px;'>");
   echo("<table width=100% cellpadding=6 cellspacing=0>");
@@ -13,10 +15,10 @@
     $text_descr = $mempool['mempool_descr'];
 
     $mempool_url   = "/device/".$device['device_id']."/health/memory/";
-    $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
     $mempool_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
-    $mempool_popup .= "</div><img src=\'graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$month&to=$now&width=400&height=125\'>";
+    $mempool_popup .= "</div><img src=\'graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
     $mempool_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
 
     $total = formatStorage($mempool['mempool_total']);
@@ -44,17 +46,17 @@
  
   echo("<tr bgcolor='$row_colour'><td colspan=5>");
  
-  $daily_graph   = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
  
-  $weekly_graph  = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
  
-  $monthly_graph = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
  
-  $yearly_graph  = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $mempool['mempool_id'] . "&type=mempool&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
  
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/health/processors.inc.php b/html/pages/health/processors.inc.php
index b38243ccf..970e2c9b0 100644
--- a/html/pages/health/processors.inc.php
+++ b/html/pages/health/processors.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+$graph_type = "processor_usage";
+
   echo("<div style='margin-top: 5px; padding: 0px;'>");
   echo("  <table width=100% cellpadding=6 cellspacing=0>");
   $i = '1';
@@ -21,10 +23,10 @@
 
     $proc_url   = "?page=device/".$device['device_id']."/health/processors/";
 
-    $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=processor&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
     $proc_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
-    $proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=125\'>";
+    $proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
     $proc_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
 
     $perc = round($proc['processor_usage']);
@@ -47,17 +49,17 @@
 
   echo('    <tr bgcolor="'.$row_colour.'"><td colspan="5">');
 
-  $daily_graph   = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$day&to=$now&width=211&height=100";
-  $daily_url     = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url     = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$week&to=$now&width=211&height=100";
-  $weekly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=211&height=100";
-  $monthly_url   = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url   = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$year&to=$now&width=211&height=100";
-  $yearly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("      <a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src=\"$daily_graph\" border=\"0\"></a> ");
diff --git a/html/pages/health/storage.inc.php b/html/pages/health/storage.inc.php
index f2166d13a..06ca1dce6 100644
--- a/html/pages/health/storage.inc.php
+++ b/html/pages/health/storage.inc.php
@@ -1,5 +1,6 @@
 <?php
 
+$graph_type = "storage_usage";
 
 $sql  = "SELECT * FROM `storage` AS S, `devices` AS D WHERE S.device_id = D.device_id ORDER BY D.hostname, S.storage_descr";
 
@@ -49,10 +50,10 @@ while($drive = mysql_fetch_array($query)) {
     $free = formatStorage($drive['storage_free']);
     $used = formatStorage($drive['storage_used']);
 
-    $store_url    = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$month&to=$now&width=400&height=125";
+    $store_url    = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125";
     $store_popup = "onmouseover=\"return overlib('<img src=\'$store_url\'>', LEFT);\" onmouseout=\"return nd();\"";
 
-    $mini_graph = $config['base_url'] . "/graph.php?id=".$drive['storage_id']."&type=storage&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mini_graph = $config['base_url'] . "/graph.php?id=".$drive['storage_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
     if($perc > '90') { $left_background='c4323f'; $right_background='C96A73';
     } elseif($perc > '75') { $left_background='bf5d5b'; $right_background='d39392';
@@ -72,17 +73,17 @@ while($drive = mysql_fetch_array($query)) {
 
   echo("<tr bgcolor='$row_colour'><td colspan=5>");
 
-  $daily_graph   = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $drive['storage_id'] . "&type=storage&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/health/temperatures.inc.php b/html/pages/health/temperatures.inc.php
index 6b0c13ddb..809cb01d9 100644
--- a/html/pages/health/temperatures.inc.php
+++ b/html/pages/health/temperatures.inc.php
@@ -6,6 +6,8 @@ if($_SESSION['userlevel'] >= '5') {
   $sql = "SELECT * FROM `sensors` AS S, `devices` AS D, devices_perms as P WHERE S.sensor_class='temperature' AND S.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, S.sensor_index, S.sensor_descr";
 }
 
+$graph_type = "sensor_temperature";
+
 $query = mysql_query($sql);
 
 echo('<table cellspacing="0" cellpadding="6" width="100%">');
@@ -26,7 +28,7 @@ while($temp = mysql_fetch_array($query))
 {
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-  $weekly_temp  = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=temperature&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
+  $weekly_temp  = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $temp_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_temp\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $temp['sensor_descr'] . "</a>";
 
@@ -37,12 +39,12 @@ while($temp = mysql_fetch_array($query))
 
   if($temp['sensor_current'] >= $temp['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
    
-  $temp_day    = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=temperature&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
-  $temp_week   = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=temperature&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
-  $temp_month  = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=temperature&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
-  $temp_year   = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=temperature&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
+  $temp_day    = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
+  $temp_week   = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
+  $temp_month  = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
+  $temp_year   = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
 
-  $temp_minigraph = "<img src='graph.php?id=" . $temp['sensor_id'] . "&amp;type=temperature&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
+  $temp_minigraph = "<img src='graph.php?id=" . $temp['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
   $temp_minigraph .= " onmouseover=\"return overlib('<div class=list-large>".$temp['hostname']." - ".$temp['sensor_descr'];
   $temp_minigraph .= "</div><div style=\'width: 750px\'><img src=\'$temp_day\'><img src=\'$temp_week\'><img src=\'$temp_month\'><img src=\'$temp_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
 
@@ -60,17 +62,17 @@ while($temp = mysql_fetch_array($query))
 
   echo("<tr bgcolor='$row_colour'><td colspan=7>");
 
-  $daily_graph   = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $temp['sensor_id'] . "&type=temperature&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $temp['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/html/pages/health/voltages.inc.php b/html/pages/health/voltages.inc.php
index d58941c20..d0060c945 100644
--- a/html/pages/health/voltages.inc.php
+++ b/html/pages/health/voltages.inc.php
@@ -6,6 +6,8 @@ if($_SESSION['userlevel'] >= '5') {
   $sql = "SELECT * FROM `sensors` AS S, `devices` AS D, devices_perms as P WHERE S.sensor_class='voltage' AND S.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, S.sensor_descr";
 }
 
+$graph_type = "sensor_voltage";
+
 $query = mysql_query($sql);
 
 echo('<table cellspacing="0" cellpadding="6" width="100%">');
@@ -26,18 +28,18 @@ while($volt = mysql_fetch_array($query))
 {
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-  $weekly_volt  = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=voltage&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
+  $weekly_volt  = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $volt_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_volt\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $volt['sensor_descr'] . "</a>";
 
   if($volt['sensor_current'] >= $volt['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
    
-  $volt_day    = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=voltage&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
-  $volt_week   = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=voltage&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
-  $volt_month  = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=voltage&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
-  $volt_year   = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=voltage&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
+  $volt_day    = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
+  $volt_week   = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
+  $volt_month  = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
+  $volt_year   = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
 
-  $volt_minigraph = "<img src='graph.php?id=" . $volt['sensor_id'] . "&amp;type=voltage&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
+  $volt_minigraph = "<img src='graph.php?id=" . $volt['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
   $volt_minigraph .= " onmouseover=\"return overlib('<div class=list-large>".$volt['hostname']." - ".$volt['sensor_descr'];
   $volt_minigraph .= "</div><div style=\'width: 750px\'><img src=\'$volt_day\'><img src=\'$volt_week\'><img src=\'$volt_month\'><img src=\'$volt_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
 
@@ -55,17 +57,17 @@ while($volt = mysql_fetch_array($query))
 
   echo("<tr bgcolor='$row_colour'><td colspan=7>");
 
-  $daily_graph   = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$day&to=$now&width=211&height=100";
-  $daily_url       = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$day&to=$now&width=400&height=150";
+  $daily_graph   = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=211&height=100";
+  $daily_url       = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$day&to=$now&width=400&height=150";
 
-  $weekly_graph  = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$week&to=$now&width=211&height=100";
-  $weekly_url      = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$week&to=$now&width=400&height=150";
+  $weekly_graph  = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=211&height=100";
+  $weekly_url      = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=400&height=150";
 
-  $monthly_graph = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$month&to=$now&width=211&height=100";
-  $monthly_url     = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$month&to=$now&width=400&height=150";
+  $monthly_graph = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=211&height=100";
+  $monthly_url     = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=150";
 
-  $yearly_graph  = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$year&to=$now&width=211&height=100";
-  $yearly_url  = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$year&to=$now&width=400&height=150";
+  $yearly_graph  = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=211&height=100";
+  $yearly_url  = "graph.php?id=" . $volt['sensor_id'] . "&type=".$graph_type."&from=$year&to=$now&width=400&height=150";
 
   echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
         <img src='$daily_graph' border=0></a> ");
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 722edd0b8..7132aef59 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -180,12 +180,16 @@ $config['limit']['temp'] = "60";
 ### Filesystems
 
 $config['ignore_mount'] = array("/kern", "/mnt/cdrom", "/proc", "/dev");
+
 $config['ignore_mount_string'] = array("packages", "devfs", "procfs", "UMA", "MALLOC");
-$config['ignore_mount_regexp'] = array();
+
+$config['ignore_mount_regexp'] = array("/on: \/packages/", "/on: \/dev/", "/on: \/proc/", "/on: \/junos^/",           ## JunOS Drives
+                                       "/on: \/junos\/dev/", "/on: \/jail\/dev/", "/^(dev|proc)fs/", "/^\/dev\/md0/", ## JunOS Drives
+                                       "/^\/var\/dhcpd\/dev,/", "/UMA/"                                  	      ## BSD Drives
+                                       );
+
 $config['ignore_mount_removable'] = 1; # Ignore removable disk storage
 $config['ignore_mount_network']   = 1; # Ignore network mounted storage
-$config['ignore_junos_os_drives'] = array("/on: \/packages/", "/on: \/dev/", "/on: \/proc/", "/on: \/junos^/", "/on: \/junos\/dev/", "/on: \/jail\/dev/", "/^(dev|proc)fs/", "/^\/dev\/md0/"); # Ignore JunOS partitions who are always 100%
-$config['ignore_bsd_os_drives']   = array("/^\/dev,/", "/^\/var\/dhcpd\/dev,/", "/UMA/");  # Ignore BSD partitions who are always 100%
 
 ### Poller/Discovery
 
diff --git a/includes/discovery/storage-hrstorage.inc.php b/includes/discovery/storage-hrstorage.inc.php
index 6605f5502..b2ed9c334 100755
--- a/includes/discovery/storage-hrstorage.inc.php
+++ b/includes/discovery/storage-hrstorage.inc.php
@@ -7,8 +7,9 @@ if(is_array($storage_array)) {
   foreach($storage_array[$device[device_id]] as $index => $storage) 
   {
     foreach($config['ignore_mount'] as $bi) { if($bi == $descr) { $deny = 1; if ($debug) echo("$bi == $descr \n"); } }
-    foreach($config['ignore_mount_string'] as $bi) { if(strpos($descr, $bi) !== FALSE) { $deny = 1; if ($debug) echo("$descr, $bi \n"); } }
-    foreach($config['ignore_mount_regexp'] as $bi) { if(preg_match($bi, $descr)) { $deny = 1; if ($debug) echo("$bi, $descr \n"); } }
+    foreach($config['ignore_mount_string'] as $bi) { if(strpos($descr, $bi)) { $deny = 1; if ($debug) echo("$descr, $bi \n"); } }
+    foreach($config['ignore_mount_regexp'] as $bi) { if(preg_match($bi, $descr) !== FALSE) { $deny = 1; if ($debug) echo("$bi, $descr \n"); } }
+
     $fstype = $storage['hrStorageType'];
     $descr = $storage['hrStorageDescr'];
     $size = $storage['hrStorageSize'] * $storage['hrStorageAllocationUnits'];
diff --git a/includes/discovery/temperatures/cisco-entity-sensor.inc.php b/includes/discovery/temperatures/cisco-entity-sensor.inc.php
index 68fa6a0df..7197a2c85 100644
--- a/includes/discovery/temperatures/cisco-entity-sensor.inc.php
+++ b/includes/discovery/temperatures/cisco-entity-sensor.inc.php
@@ -1,6 +1,8 @@
 <?php
 
 global $valid_temp;
+
+unset($cisco_entity_temp);
   
 if ($device['os'] == "ios" || $device['os_group'] == "ios") 
 {
@@ -28,9 +30,10 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
         $current = $entry['entSensorValue'];
 
         if($entry['entSensorScale'] == "milli") { $divisor = "1000"; } else { $divisor = "1"; }        
-        
 	
         discover_temperature($valid_temp, $device, $oid, $index, "cisco-entity-sensor", $descr, $divisor, NULL, NULL, $current);
+
+        $cisco_entity_temp = 1;
       }
     }
   }
diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php
index 565b87c82..a3f072e9d 100644
--- a/includes/discovery/temperatures/cisco-envmon.inc.php
+++ b/includes/discovery/temperatures/cisco-envmon.inc.php
@@ -1,8 +1,8 @@
 <?php
 
 global $valid_temp;
-  
-if ($device['os'] == "ios" || $device['os_group'] == "ios") 
+
+if (!isset($cisco_entity_temp) && $device['os'] == "ios" || $device['os_group'] == "ios") 
 {
   echo("Cisco ");
   $oids = snmp_walk($device, ".1.3.6.1.4.1.9.9.13.1.3.1.2", "-Osqn", "CISCO-ENVMON-MIB");
diff --git a/includes/discovery/temperatures/entity-sensor.inc.php b/includes/discovery/temperatures/entity-sensor.inc.php
index 21764c3d7..9220d8aaf 100644
--- a/includes/discovery/temperatures/entity-sensor.inc.php
+++ b/includes/discovery/temperatures/entity-sensor.inc.php
@@ -29,8 +29,13 @@ if(is_array($oids[$device['device_id']]))
       $descr = str_replace("sensor", "", $descr);
         
       if($entry['entPhySensorScale'] == "milli") { $divisor = "1000"; } else { $divisor = "1"; }        
-      
-      discover_temperature($valid_temp, $device, $oid, $index, "entity-sensor", $descr, $divisor, NULL, NULL, $current);
+
+     
+      if(mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND `sensor_type` = 'cisco-entity-sensor' AND `sensor_index` = '".$index."'"),0) == "0") 
+      ## Check to make sure we've not already seen this sensor via cisco's entity sensor mib
+      {
+        discover_temperature($valid_temp, $device, $oid, $index, "entity-sensor", $descr, $divisor, NULL, NULL, $current);
+      }
     }
   }
 }
diff --git a/includes/polling/port-adsl.inc.php b/includes/polling/port-adsl.inc.php
index eac781644..27e553607 100755
--- a/includes/polling/port-adsl.inc.php
+++ b/includes/polling/port-adsl.inc.php
@@ -103,7 +103,7 @@
         $oid = "adsl".$oid;
         $data = str_replace("\"", "", $this_port[$oid]);
         ## Set data to be "unknown" if it's garbled, unexistant or zero
-        if(!is_numeric($data) || $data == "0") { $data = "-1"; }
+        if(!is_numeric($data)) { $data = "0"; }
         $rrdupdate .= ":$data";
       }