diff --git a/html/includes/graphs/device/cambium_generic_gpsStats.inc.php b/html/includes/graphs/device/cambium_generic_gpsStats.inc.php
index 6872522f0..177fb6700 100644
--- a/html/includes/graphs/device/cambium_generic_gpsStats.inc.php
+++ b/html/includes/graphs/device/cambium_generic_gpsStats.inc.php
@@ -19,7 +19,7 @@ if (file_exists($rrdfilename)) {
     $rrd_options .= ' GPRINT:visible:LAST:%0.2lf%s ';
     $rrd_options .= ' GPRINT:visible:MIN:%0.2lf%s ';
     $rrd_options .= ' GPRINT:visible:MAX:%0.2lf%s\\\l ';
-    $rrd_options .= " LINE2:tracked#cc9900:'Tracked       ' ";
+    $rrd_options .= " LINE2:tracked#00ff00:'Tracked       ' ";
     $rrd_options .= ' GPRINT:tracked:LAST:%0.2lf%s ';
     $rrd_options .= ' GPRINT:tracked:MIN:%0.2lf%s ';
     $rrd_options .= ' GPRINT:tracked:MAX:%0.2lf%s\\\l ';
diff --git a/html/includes/graphs/device/canopy_generic_gpsStats.inc.php b/html/includes/graphs/device/canopy_generic_gpsStats.inc.php
index 93c0cd41c..c49dcd581 100644
--- a/html/includes/graphs/device/canopy_generic_gpsStats.inc.php
+++ b/html/includes/graphs/device/canopy_generic_gpsStats.inc.php
@@ -19,7 +19,7 @@ if (file_exists($rrdfilename)) {
     $rrd_options .= ' GPRINT:visible:LAST:%0.2lf%s ';
     $rrd_options .= ' GPRINT:visible:MIN:%0.2lf%s ';
     $rrd_options .= ' GPRINT:visible:MAX:%0.2lf%s\\\l ';
-    $rrd_options .= " LINE2:tracked#cc9900:'Tracked       ' ";
+    $rrd_options .= " LINE2:tracked#00ff00:'Tracked       ' ";
     $rrd_options .= ' GPRINT:tracked:LAST:%0.2lf%s ';
     $rrd_options .= ' GPRINT:tracked:MIN:%0.2lf%s ';
     $rrd_options .= ' GPRINT:tracked:MAX:%0.2lf%s\\\l ';
diff --git a/includes/discovery/sensors/temperatures/canopy.inc.php b/includes/discovery/sensors/temperatures/canopy.inc.php
index 5a7a21233..a268c52da 100644
--- a/includes/discovery/sensors/temperatures/canopy.inc.php
+++ b/includes/discovery/sensors/temperatures/canopy.inc.php
@@ -6,11 +6,11 @@ if ($device['os'] == 'canopy') {
         d_echo($oids."\n");
 
         if (!empty($oids)) {
-            echo 'Cambium Temperature ';
+            echo 'Canopy Temperature ';
         }
 
         $divisor = 1;
-        $type    = 'cambium';
+        $type    = 'canopy';
         if (!empty($oids)) {
             list(,$current) = explode(' ', $oids);
             $index          = $oid;
diff --git a/includes/polling/wireless/canopy-generic.inc.php b/includes/polling/wireless/canopy-generic.inc.php
index bcedeb05f..db1f0d761 100644
--- a/includes/polling/wireless/canopy-generic.inc.php
+++ b/includes/polling/wireless/canopy-generic.inc.php
@@ -171,20 +171,6 @@ if (strstr($hardware, 'AP') || strstr($hardware, 'Master') || strstr($hardware,
         unset($rrd_filename,$visible,$tracked);
     }
 }
-//PTP Equipment
-    $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-powerlevel.rrd";
-    $lastLevel = str_replace('"',"",snmp_get($device, "lastPowerLevel.2", "-Ovqn", "WHISP-APS-MIB"));
-    if (is_numeric($lastLevel)) {
-        if (!is_file($rrd_filename)) {
-            rrdtool_create($rrd_filename, " --step 300 DS:last:GAUGE:600:-100:0".$config['rrd_rra']); 
-        }
-        $fields = array(
-            'last' => $lastLevel,
-        );
-        rrdtool_update($rrd_filename, $fields);
-        $graphs['canopy_generic_450_powerlevel'] = TRUE;
-        unset($lastLevel);
-    }
     
 if (strstr($version, 'AP') == false) {
     $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-linkRadioDbm.rrd";
@@ -203,6 +189,20 @@ if (strstr($version, 'AP') == false) {
         unset($rrd_filename,$horizontal,$horizontal);
     }
 
+    $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-powerlevel.rrd";
+    $lastLevel = str_replace('"',"",snmp_get($device, "lastPowerLevel.2", "-Ovqn", "WHISP-APS-MIB"));
+    if (is_numeric($lastLevel)) {
+        if (!is_file($rrd_filename)) {
+            rrdtool_create($rrd_filename, " --step 300 DS:last:GAUGE:600:-100:0".$config['rrd_rra']); 
+        }
+        $fields = array(
+            'last' => $lastLevel,
+        );
+        rrdtool_update($rrd_filename, $fields);
+        $graphs['canopy_generic_450_powerlevel'] = TRUE;
+        unset($lastLevel);
+    }
+    
     $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/canopy-generic-450-ptpSNR.rrd";
     $horizontal = str_replace('"',"",snmp_get($device, "signalToNoiseRatioHorizontal.2", "-Ovqn", "WHISP-APS-MIB"));
     $vertical = str_replace('"',"",snmp_get($device, "signalToNoiseRatioVertical.2", "-Ovqn", "WHISP-APS-MIB"));