diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index ee9b81d74c..f69f30b02e 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -675,7 +675,7 @@ function generate_bill_url($bill, $vars = array())
function generate_port_image($args)
{
if (!$args['bg']) {
- $args['bg'] = 'FFFFFF';
+ $args['bg'] = 'FFFFFF00';
}
return "
";
diff --git a/html/includes/graphs/application/ntp-server_freq.inc.php b/html/includes/graphs/application/ntp-server_freq.inc.php
index 3ab35406ac..16aad6ca89 100644
--- a/html/includes/graphs/application/ntp-server_freq.inc.php
+++ b/html/includes/graphs/application/ntp-server_freq.inc.php
@@ -4,8 +4,8 @@ require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'frequency';
-$colour_area = 'F6F6F6';
-$colour_line = 'B3D0DB';
+$colour_area = $config['graph_colours']['pinks'][0].'33';
+$colour_line = $config['graph_colours']['pinks'][0];
$colour_area_max = 'FFEE99';
$graph_max = 100;
$unit_text = 'Frequency';
diff --git a/html/includes/graphs/application/ntp-server_uptime.inc.php b/html/includes/graphs/application/ntp-server_uptime.inc.php
index aeae053c10..684cee5641 100644
--- a/html/includes/graphs/application/ntp-server_uptime.inc.php
+++ b/html/includes/graphs/application/ntp-server_uptime.inc.php
@@ -4,8 +4,8 @@ require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'uptime';
-$colour_area = 'EEEEEE';
-$colour_line = '36393D';
+$colour_area = $config['graph_colours']['purples'][0].'33';
+$colour_line = $config['graph_colours']['purples'][0];
$colour_area_max = 'FFEE99';
$graph_max = 0;
$unit_text = 'Seconds';
diff --git a/html/includes/graphs/application/ups-apcups_charge.inc.php b/html/includes/graphs/application/ups-apcups_charge.inc.php
index 2272b2cda6..7df0fea64b 100644
--- a/html/includes/graphs/application/ups-apcups_charge.inc.php
+++ b/html/includes/graphs/application/ups-apcups_charge.inc.php
@@ -21,7 +21,7 @@
require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'charge';
-$colour_area = 'EEEEEE';
+$colour_area = 'FF330011';
$colour_line = 'FF3300';
$colour_area_max = 'FFEE99';
$graph_max = 0;
diff --git a/html/includes/graphs/application/ups-apcups_load.inc.php b/html/includes/graphs/application/ups-apcups_load.inc.php
index 016e872c17..9b6833f01c 100644
--- a/html/includes/graphs/application/ups-apcups_load.inc.php
+++ b/html/includes/graphs/application/ups-apcups_load.inc.php
@@ -21,7 +21,7 @@
require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'load';
-$colour_area = 'EEEEEE';
+$colour_area = 'FF330011';
$colour_line = 'FF3300';
$colour_area_max = 'FFEE99';
$graph_max = 0;
diff --git a/html/includes/graphs/application/ups-apcups_remaining.inc.php b/html/includes/graphs/application/ups-apcups_remaining.inc.php
index 6b79e9a8e7..95e9bae6ce 100644
--- a/html/includes/graphs/application/ups-apcups_remaining.inc.php
+++ b/html/includes/graphs/application/ups-apcups_remaining.inc.php
@@ -21,8 +21,8 @@
require 'includes/graphs/common.inc.php';
$scale_min = 0;
$ds = 'time_remaining';
-$colour_area = 'EEEEEE';
-$colour_line = '36393D';
+$colour_area = 'FF000011';
+$colour_line = 'FF0000';
$colour_area_max = 'FFEE99';
$graph_max = 0;
$unit_text = 'Minutes';
diff --git a/html/includes/graphs/device/ucd_cpu.inc.php b/html/includes/graphs/device/ucd_cpu.inc.php
index 39ddbd0d7f..b5daba1c88 100644
--- a/html/includes/graphs/device/ucd_cpu.inc.php
+++ b/html/includes/graphs/device/ucd_cpu.inc.php
@@ -25,7 +25,7 @@ $rrd_options .= ' AREA:system_perc#ea8f00:system:STACK';
$rrd_options .= " GPRINT:system_perc:LAST:' %5.2lf%%'";
$rrd_options .= " GPRINT:system_perc:AVERAGE:' %5.2lf%%'";
$rrd_options .= " GPRINT:system_perc:MAX:' %5.2lf%%\\n'";
-$rrd_options .= ' AREA:idle_perc#f8f8f3:idle:STACK';
+$rrd_options .= ' AREA:idle_perc#00007776:idle:STACK';
$rrd_options .= " GPRINT:idle_perc:LAST:' %5.2lf%%'";
$rrd_options .= " GPRINT:idle_perc:AVERAGE:' %5.2lf%%'";
$rrd_options .= " GPRINT:idle_perc:MAX:' %5.2lf%%\\n'";
diff --git a/html/includes/graphs/device/uptime.inc.php b/html/includes/graphs/device/uptime.inc.php
index 3b2f10ef37..960c1a3239 100644
--- a/html/includes/graphs/device/uptime.inc.php
+++ b/html/includes/graphs/device/uptime.inc.php
@@ -9,7 +9,7 @@ $rrd_filename = rrd_name($device['hostname'], 'uptime');
$rrd_options .= ' DEF:uptime='.$rrd_filename.':uptime:AVERAGE';
$rrd_options .= ' CDEF:cuptime=uptime,86400,/';
$rrd_options .= " 'COMMENT:Days Current Minimum Maximum Average\\n'";
-$rrd_options .= ' AREA:cuptime#EEEEEE:Uptime';
+$rrd_options .= ' AREA:cuptime#00FF0022:Uptime';
$rrd_options .= ' LINE1.25:cuptime#36393D:';
$rrd_options .= ' GPRINT:cuptime:LAST:%6.2lf GPRINT:cuptime:AVERAGE:%6.2lf';
$rrd_options .= " GPRINT:cuptime:MAX:%6.2lf 'GPRINT:cuptime:AVERAGE:%6.2lf\\n'";
diff --git a/html/includes/graphs/sensor/voltage.inc.php b/html/includes/graphs/sensor/voltage.inc.php
index c11ff27d02..968bf5d742 100644
--- a/html/includes/graphs/sensor/voltage.inc.php
+++ b/html/includes/graphs/sensor/voltage.inc.php
@@ -11,10 +11,6 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " DEF:sensor_max=$rrd_filename:sensor:MAX";
$rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
-$rrd_options .= ' AREA:sensor_max#c5c5c5';
-$rrd_options .= ' AREA:sensor_min#ffffffff';
-
-// $rrd_options .= " AREA:sensor#FFFF99";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 22)."'";
$rrd_options .= ' GPRINT:sensor:LAST:%6.2lfV';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfV\l';