diff --git a/html/includes/graphs/application/mysql_command_counters.inc.php b/html/includes/graphs/application/mysql_command_counters.inc.php
index 8e484318a5..a8e17557c0 100644
--- a/html/includes/graphs/application/mysql_command_counters.inc.php
+++ b/html/includes/graphs/application/mysql_command_counters.inc.php
@@ -1,70 +1,37 @@
 <?php
 
-include("includes/graphs/common.inc.php");
+include('includes/graphs/common.inc.php');
 
-$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
+$rrd_filename = $config["rrd_dir"] . '/' . $device["hostname"] . '/app-mysql-'.$app["app_id"].'.rrd';
 
-if (is_file($mysql_rrd))
+$array = array('CDe'  => array('descr' => 'Delete', 'colour' => '22FF22'),
+               'CIt'  => array('descr' => 'Insert', 'colour' => '0022FF'),
+               'CISt' => array('descr' => 'Insert Select', 'colour' => 'FF0000'),
+               'CLd'  => array('descr' => 'Load Data', 'colour' => '00AAAA'),
+               'CRe'  => array('descr' => 'Replace', 'colour' => 'FF00FF'),
+               'CRSt' => array('descr' => 'Replace Select', 'colour' => 'FFA500'),
+               'CSt'  => array('descr' => 'Select', 'colour' => 'CC0000'),
+               'CUe'  => array('descr' => 'Update', 'colour' => '0000CC'),
+               'CUMi' => array('descr' => 'Update Multiple', 'colour' => '0080C0'),
+);
+
+$i = 0;
+if (is_file($rrd_filename))
 {
-    $rrd_filename = $mysql_rrd;
-}
+  foreach ($array as $ds => $vars)
+  {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $vars['descr'];
+    $rrd_list[$i]['ds'] = $ds;
+#    $rrd_list[$i]['colour'] = $vars['colour'];
+    $i++;
+  }
+} else { echo("file missing: $file");  }
 
-$rrd_options .= ' -b 1024 ';
-$rrd_options .= ' DEF:a='.$rrd_filename.':CDe:AVERAGE ';
-$rrd_options .= ' DEF:b='.$rrd_filename.':CIt:AVERAGE ';
-$rrd_options .= ' DEF:c='.$rrd_filename.':CISt:AVERAGE ';
-$rrd_options .= ' DEF:d='.$rrd_filename.':CLd:AVERAGE ';
-$rrd_options .= ' DEF:e='.$rrd_filename.':CRe:AVERAGE ';
-$rrd_options .= ' DEF:f='.$rrd_filename.':CRSt:AVERAGE ';
-$rrd_options .= ' DEF:g='.$rrd_filename.':CSt:AVERAGE ';
-$rrd_options .= ' DEF:h='.$rrd_filename.':CUe:AVERAGE ';
-$rrd_options .= ' DEF:i='.$rrd_filename.':CUMi:AVERAGE ';
+$colours   = "mixed";
+$nototal   = 1;
+$unit_text = "Commands";
 
-$rrd_options .= 'COMMENT:"    Current    Average   Maximum\n" ';
+include("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
-$rrd_options .= "AREA:a#22FF22:Delete\ \     ";
-$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:b#0022FF:"Insert ":STACK    ';
-$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:c#FF0000:"Insert Select":STACK    ';
-$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:d#00AAAA:"Load Data":STACK    ';
-$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:e#FF00FF:"Replace ":STACK    ';
-$rrd_options .= 'GPRINT:e:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:e:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:e:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:f#FFA500:"Replace Select":STACK    ';
-$rrd_options .= 'GPRINT:f:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:f:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:f:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:g#CC0000:"Select ":STACK   ';
-$rrd_options .= 'GPRINT:g:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:g:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:g:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:h#0000CC:"Update ":STACK   ';
-$rrd_options .= 'GPRINT:h:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:h:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:h:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:i#0080C0:"Update Multi":STACK    ';
-$rrd_options .= 'GPRINT:i:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:i:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:i:MAX:"%6.2lf %s\n"  ';
-
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/application/mysql_connections.inc.php b/html/includes/graphs/application/mysql_connections.inc.php
index ef03c046ee..ab0baff0b1 100644
--- a/html/includes/graphs/application/mysql_connections.inc.php
+++ b/html/includes/graphs/application/mysql_connections.inc.php
@@ -2,51 +2,35 @@
 
 include("includes/graphs/common.inc.php");
 
-$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
+include('includes/graphs/common.inc.php');
 
-if (is_file($mysql_rrd))
+$rrd_filename = $config["rrd_dir"] . '/' . $device["hostname"] . '/app-mysql-'.$app["app_id"].'.rrd';
+
+$array = array('MaCs'  => array('descr' => 'Max Connections', 'colour' => '22FF22'),
+               'MUCs'  => array('descr' => 'Max Used Connections', 'colour' => '0022FF'),
+               'ACs'   => array('descr' => 'Aborted Clients', 'colour' => 'FF0000'),
+               'AdCs'  => array('descr' => 'Aborted Connects', 'colour' => '0080C0'),
+               'TCd'   => array('descr' => 'Threads Connected', 'colour' => 'FF0000'),
+               'Cs'    => array('descr' => 'New Connections', 'colour' => '0080C0'),
+);
+
+$i = 0;
+if (is_file($rrd_filename))
 {
-    $rrd_filename = $mysql_rrd;
-}
+  foreach ($array as $ds => $vars)
+  {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $vars['descr'];
+    $rrd_list[$i]['ds'] = $ds;
+#    $rrd_list[$i]['colour'] = $vars['colour'];
+    $i++;
+  }
+} else { echo("file missing: $file");  }
 
-$rrd_options .= ' -b 1000 ';
-$rrd_options .= ' DEF:a='.$rrd_filename.':MaCs:AVERAGE ';
-$rrd_options .= ' DEF:b='.$rrd_filename.':MUCs:AVERAGE ';
-$rrd_options .= ' DEF:c='.$rrd_filename.':ACs:AVERAGE ';
-$rrd_options .= ' DEF:d='.$rrd_filename.':AdCs:AVERAGE ';
-$rrd_options .= ' DEF:e='.$rrd_filename.':TCd:AVERAGE ';
-$rrd_options .= ' DEF:f='.$rrd_filename.':Cs:AVERAGE ';
+$colours   = "mixed";
+$nototal   = 1;
+$unit_text = "Commands";
 
-$rrd_options .= 'COMMENT:"    Current    Average   Maximum\n" ';
+include("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
-$rrd_options .= 'AREA:a#cdcfc4:"Max Connections"\ \     ';
-$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:b#FFD660:"Max Used Connections"\ \   ';
-$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:c#22FF22:"Aborted Clients"\ \   ';
-$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:d#0022FF:"Aborted Connects"\ \    ';
-$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE:e#FF0000:"Threads Connected"\ \  ';
-$rrd_options .= 'GPRINT:e:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:e:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:e:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:f#00AAAA:"New Connections"\ \   ';
-$rrd_options .= 'GPRINT:f:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:f:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:f:MAX:"%6.2lf %s\n"  ';
-
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/application/mysql_files_tables.inc.php b/html/includes/graphs/application/mysql_files_tables.inc.php
index fe11654dcc..a02cdcca3e 100644
--- a/html/includes/graphs/application/mysql_files_tables.inc.php
+++ b/html/includes/graphs/application/mysql_files_tables.inc.php
@@ -1,40 +1,32 @@
 <?php
 
-include("includes/graphs/common.inc.php");
+include('includes/graphs/common.inc.php');
 
-$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
+$rrd_filename = $config["rrd_dir"] . '/' . $device["hostname"] . '/app-mysql-'.$app["app_id"].'.rrd';
 
-if (is_file($mysql_rrd))
+$array = array('TOC'  => array('descr' => 'Table Cache'),
+               'OFs'  => array('descr' => 'Open Files'),
+               'OTs'  => array('descr' => 'Open Tables'),
+               'OdTs' => array('descr' => 'Opened Tables'),
+);
+
+$i = 0;
+if (is_file($rrd_filename))
 {
-    $rrd_filename = $mysql_rrd;
-}
+  foreach ($array as $ds => $vars)
+  {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $vars['descr'];
+    $rrd_list[$i]['ds'] = $ds;
+#    $rrd_list[$i]['colour'] = $vars['colour'];
+    $i++;
+  }
+} else { echo("file missing: $file");  }
 
-$rrd_options .= ' -b 1000 ';
-$rrd_options .= ' DEF:a='.$rrd_filename.':TOC:AVERAGE ';
-$rrd_options .= ' DEF:b='.$rrd_filename.':OFs:AVERAGE ';
-$rrd_options .= ' DEF:c='.$rrd_filename.':OTs:AVERAGE ';
-$rrd_options .= ' DEF:d='.$rrd_filename.':OdTs:AVERAGE ';
+$colours   = "mixed";
+$nototal   = 1;
+$unit_text = "Commands";
 
-$rrd_options .= 'COMMENT:"    Current    Average   Maximum\n" ';
+include("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
-$rrd_options .= 'AREA:a#cdcfc4:"Table Cache"\ \     ';
-$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:b#FFD660:"Open Files"\ \   ';
-$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:c#22FF22:"Open Tables"\ \   ';
-$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:d#0022FF:"Opened Tables"\ \    ';
-$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n"  ';
-
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php b/html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php
index 2d40d3a4df..d6df9e7fb1 100644
--- a/html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_buffer_pool.inc.php
@@ -1,40 +1,36 @@
 <?php
 
-include("includes/graphs/common.inc.php");
+include('includes/graphs/common.inc.php');
 
-$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
+$rrd_filename = $config["rrd_dir"] . '/' . $device["hostname"] . '/app-mysql-'.$app["app_id"].'.rrd';
 
-if (is_file($mysql_rrd))
+$array = array('IBPse'   => 'Buffer Pool Size',
+               'IBPDBp'  => 'Database Pages',
+               'IBPFe'   => 'Free Pages',
+               'IBPMps'  => 'Modified Pages',
+);
+
+$i = 0;
+if (is_file($rrd_filename))
 {
-  $rrd_filename = $mysql_rrd;
-}
+  foreach ($array as $ds => $vars)
+  {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    if(is_array($vars))
+    {
+      $rrd_list[$i]['descr'] = $vars['descr'];
+    } else {
+      $rrd_list[$i]['descr'] = $vars;
+    }
+    $rrd_list[$i]['ds'] = $ds;
+    $i++;
+  }
+} else { echo("file missing: $file");  }
 
-$rrd_options .= ' -b 1024 ';
-$rrd_options .= ' DEF:a='.$rrd_filename.':IBPse:AVERAGE ';
-$rrd_options .= ' DEF:b='.$rrd_filename.':IBPDBp:AVERAGE ';
-$rrd_options .= ' DEF:c='.$rrd_filename.':IBPFe:AVERAGE ';
-$rrd_options .= ' DEF:d='.$rrd_filename.':IBPMps:AVERAGE ';
+$colours   = "mixed";
+$nototal   = 1;
+$unit_text = "Commands";
 
-$rrd_options .= 'COMMENT:"    Current    Average   Maximum\n" ';
+include("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
-$rrd_options .= 'AREA:a#FFD660:"Buffer Pool Size"\ \     ';
-$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'AREA:b#CDCFC4:"Database Pages"\ \   ';
-$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE2:c#22FF22:"Free Pages"\ \   ';
-$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE2:d#0022FF:"Modified Pages"\ \    ';
-$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n"  ';
-
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php b/html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php
index f60ff06987..9c277aae23 100644
--- a/html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_buffer_pool_activity.inc.php
@@ -1,40 +1,35 @@
 <?php
 
-include("includes/graphs/common.inc.php");
+include('includes/graphs/common.inc.php');
 
-$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
+$rrd_filename = $config["rrd_dir"] . '/' . $device["hostname"] . '/app-mysql-'.$app["app_id"].'.rrd';
 
-if (is_file($mysql_rrd))
+$array = array('IBRd'  => 'Pages Read',
+               'IBCd'  => 'Pages Created',
+               'IBWr'  => 'Pages Written',
+);
+
+$i = 0;
+if (is_file($rrd_filename))
 {
-  $rrd_filename = $mysql_rrd;
-}
+  foreach ($array as $ds => $vars)
+  {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    if(is_array($vars))
+    {
+      $rrd_list[$i]['descr'] = $vars['descr'];
+    } else {
+      $rrd_list[$i]['descr'] = $vars;
+    }
+    $rrd_list[$i]['ds'] = $ds;
+    $i++;
+  }
+} else { echo("file missing: $file");  }
 
-$rrd_options .= ' -b 1024 ';
-$rrd_options .= ' DEF:a='.$rrd_filename.':IBRd:AVERAGE ';
-$rrd_options .= ' DEF:b='.$rrd_filename.':IBCd:AVERAGE ';
-$rrd_options .= ' DEF:c='.$rrd_filename.':IBWr:AVERAGE ';
-$rrd_options .= ' CDEF:d=a,b,c,+,+ ';
+$colours   = "mixed";
+$nototal   = 1;
+$unit_text = "Commands";
 
-$rrd_options .= 'COMMENT:"    Current    Average   Maximum\n" ';
+include("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
-$rrd_options .= 'LINE2:a#22FF22:"Pages Read"\ \     ';
-$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE2:b#0022FF:"Pages Created"\ \   ';
-$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE2:c#FF0000:"Pages Written"\ \   ';
-$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE2:d#000000:"Total"\ \   ';
-$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n"  ';
-
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php b/html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php
index b219f3177c..1c910bda3f 100644
--- a/html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_insert_buffer.inc.php
@@ -1,34 +1,35 @@
 <?php
 
-include("includes/graphs/common.inc.php");
+include('includes/graphs/common.inc.php');
 
-$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
+$rrd_filename = $config["rrd_dir"] . '/' . $device["hostname"] . '/app-mysql-'.$app["app_id"].'.rrd';
 
-if (is_file($mysql_rrd))
+$array = array('IBIIs'  => 'Inserts',
+               'IBIMRd' => 'Merged Records',
+               'IBIMs'  => 'Merges',
+);
+
+$i = 0;
+if (is_file($rrd_filename))
 {
-  $rrd_filename = $mysql_rrd;
-}
+  foreach ($array as $ds => $vars)
+  {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    if(is_array($vars))
+    {
+      $rrd_list[$i]['descr'] = $vars['descr'];
+    } else {
+      $rrd_list[$i]['descr'] = $vars;
+    }
+    $rrd_list[$i]['ds'] = $ds;
+    $i++;
+  }
+} else { echo("file missing: $file");  }
 
-$rrd_options .= ' -b 1024 ';
-$rrd_options .= ' DEF:a='.$rrd_filename.':IBIIs:AVERAGE ';
-$rrd_options .= ' DEF:b='.$rrd_filename.':IBIMRd:AVERAGE ';
-$rrd_options .= ' DEF:c='.$rrd_filename.':IBIMs:AVERAGE ';
+$colours   = "mixed";
+$nototal   = 1;
+$unit_text = "Commands";
 
-$rrd_options .= 'COMMENT:"    Current    Average   Maximum\n" ';
+include("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
-$rrd_options .= 'LINE1:a#22FF22:"Inserts"\ \     ';
-$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:b#0022FF:"Merged Records"\ \   ';
-$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:c#FF0000:"Merges"\ \   ';
-$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n"  ';
-
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/application/mysql_innodb_io_pending.inc.php b/html/includes/graphs/application/mysql_innodb_io_pending.inc.php
index 6d9084dfea..b4116fce18 100644
--- a/html/includes/graphs/application/mysql_innodb_io_pending.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_io_pending.inc.php
@@ -1,57 +1,39 @@
 <?php
 
-include("includes/graphs/common.inc.php");
+include('includes/graphs/common.inc.php');
 
-$mysql_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-mysql-".$app['app_id'].".rrd";
+$rrd_filename = $config["rrd_dir"] . '/' . $device["hostname"] . '/app-mysql-'.$app["app_id"].'.rrd';
 
-if (is_file($mysql_rrd))
+$array = array('IBILog' => 'AIO Log',
+               'IBISc'  => 'AIO Sync',
+               'IBIFLg' => 'Buf Pool Flush',
+               'IBFBl'  => 'Log Flushes',
+               'IBIIAo' => 'Insert Buf AIO Read',
+               'IBIAd'  => 'Normal AIO Read',
+               'IBIAe'  => 'Normal AIO Writes',
+);
+
+$i = 0;
+if (is_file($rrd_filename))
 {
-  $rrd_filename = $mysql_rrd;
-}
+  foreach ($array as $ds => $vars)
+  {
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    if(is_array($vars))
+    {
+      $rrd_list[$i]['descr'] = $vars['descr'];
+    } else {
+      $rrd_list[$i]['descr'] = $vars;
+    }
+    $rrd_list[$i]['ds'] = $ds;
+    $i++;
+  }
+} else { echo("file missing: $file");  }
 
-$rrd_options .= ' DEF:a='.$rrd_filename.':IBILog:AVERAGE ';
-$rrd_options .= ' DEF:b='.$rrd_filename.':IBISc:AVERAGE ';
-$rrd_options .= ' DEF:c='.$rrd_filename.':IBIFLg:AVERAGE ';
-$rrd_options .= ' DEF:d='.$rrd_filename.':IBFBl:AVERAGE ';
-$rrd_options .= ' DEF:e='.$rrd_filename.':IBIIAo:AVERAGE ';
-$rrd_options .= ' DEF:f='.$rrd_filename.':IBIAd:AVERAGE ';
-$rrd_options .= ' DEF:g='.$rrd_filename.':IBIAe:AVERAGE ';
+$colours   = "mixed";
+$nototal   = 1;
+$unit_text = "Commands";
 
-$rrd_options .= 'COMMENT:"    Current    Average   Maximum\n" ';
+include("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
-$rrd_options .= 'LINE1:a#22FF22:"AIO Log"\ \     ';
-$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:b#0022FF:"AIO Sync"\ \   ';
-$rrd_options .= 'GPRINT:b:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:b:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:c#FF0000:"Buf Pool Flush"\ \   ';
-$rrd_options .= 'GPRINT:c:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:c:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:d#00AAAA:"Log Flushes"\ \   ';
-$rrd_options .= 'GPRINT:d:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:d:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:e#FF00FF:"Insert Buf AIO Read"\ \   ';
-$rrd_options .= 'GPRINT:e:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:e:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:e:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:f#FFA500:"Normal AIO Reads"\ \   ';
-$rrd_options .= 'GPRINT:f:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:f:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:f:MAX:"%6.2lf %s\n"  ';
-
-$rrd_options .= 'LINE1:d#CC0000:"Normal AIO Writes"\ \   ';
-$rrd_options .= 'GPRINT:g:LAST:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:g:AVERAGE:"%6.2lf %s"  ';
-$rrd_options .= 'GPRINT:g:MAX:"%6.2lf %s\n"  ';
-
-?>
\ No newline at end of file
+?>