diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index c3300e0d9..6e124ba3a 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-// Observium Includes
 require_once $config['install_dir'].'/includes/dbFacile.php';
 require_once $config['install_dir'].'/includes/mergecnf.inc.php';
 
@@ -164,10 +163,16 @@ $config['os'][$os]['over'][2]['graph'] = 'device_storage';
 $config['os'][$os]['over'][2]['text']  = 'Storage Usage';
 
 $os = 'qnap';
-$config['os'][$os]['type']    = 'storage';
-$config['os'][$os]['group']   = 'unix';
-$config['os'][$os]['text']    = 'QNAP TurboNAS';
-$config['os'][$os]['ifXmcbc'] = 1;
+$config['os'][$os]['type']             = 'storage';
+$config['os'][$os]['group']            = 'unix';
+$config['os'][$os]['text']             = 'QNAP TurboNAS';
+$config['os'][$os]['ifXmcbc']          = 1;
+$config['os'][$os]['over'][0]['graph'] = 'device_processor';
+$config['os'][$os]['over'][0]['text']  = 'Processor Usage';
+$config['os'][$os]['over'][1]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][1]['text']  = 'Memory Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_storage';
+$config['os'][$os]['over'][2]['text']  = 'Storage Usage';
 
 $os = 'netapp';
 $config['os'][$os]['type']             = 'storage';
@@ -223,7 +228,6 @@ $config['os'][$os]['over'][1]['text']  = 'Processor Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
-
 // Other Unix-based OSes here please.
 $os = 'freebsd';
 $config['os'][$os]['type']  = 'server';
@@ -512,6 +516,14 @@ $config['os'][$os]['icon']             = 'saf';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// Sub10
+$os = 'sub10';
+$config['os'][$os]['text']             = 'Sub10 Systems';
+$config['os'][$os]['type']             = 'wireless';
+$config['os'][$os]['icon']             = 'sub10';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 // Supermicro Switch
 $os = 'supermicro-switch';
 $config['os'][$os]['group']  = 'supermicro';
@@ -765,11 +777,11 @@ $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 $config['os'][$os]['over'][1]['graph'] = 'device_processor';
 $config['os'][$os]['over'][1]['text']  = 'CPU Usage';
-// $config['os'][$os]['over'][2]['graph']  = "device_mempool";
-// $config['os'][$os]['over'][2]['text']   = "Memory Usage";
+
 $os = 'powervault';
-$config['os'][$os]['text'] = 'Dell PowerVault';
-$config['os'][$os]['icon'] = 'dell';
+$config['os'][$os]['text']             = 'Dell PowerVault';
+$config['os'][$os]['icon']             = 'dell';
+$config['os'][$os]['type']             = 'storage';
 
 $os = 'equallogic';
 $config['os'][$os]['text']             = 'Dell EqualLogic';
@@ -940,7 +952,7 @@ $config['os'][$os]['text'] = 'ZyXEL Prestige';
 $config['os'][$os]['type'] = 'network';
 $config['os'][$os]['icon'] = 'zyxel';
 
-$os = 'zyxeles';
+$os = 'zynos';
 $config['os'][$os]['text'] = 'ZyXEL Ethernet Switch';
 $config['os'][$os]['type'] = 'network';
 $config['os'][$os]['icon'] = 'zyxel';
@@ -1408,6 +1420,14 @@ $config['os'][$os]['icon']             = 'ligowave';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// HWGroup Poseidon
+$os = 'poseidon';
+$config['os'][$os]['text']             = 'Poseidon';
+$config['os'][$os]['type']             = 'environment';
+$config['os'][$os]['icon']             = 'generic';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 // Appliances
 $os = 'fortios';
 $config['os'][$os]['text']             = 'FortiOS';
@@ -1553,6 +1573,31 @@ $config['graph_types']['device']['siklu_rfinterfaceOtherOctets']['section'] = 'w
 $config['graph_types']['device']['siklu_rfinterfaceOtherOctets']['order'] = '6';
 $config['graph_types']['device']['siklu_rfinterfaceOtherOctets']['descr'] = 'Other Octets';
 
+// Sub10 support
+$config['graph_types']['device']['sub10_sub10RadioLclTxPower']['section'] = 'wireless';
+$config['graph_types']['device']['sub10_sub10RadioLclTxPower']['order'] = '0';
+$config['graph_types']['device']['sub10_sub10RadioLclTxPower']['descr'] = 'Radio Transmit Power';
+
+$config['graph_types']['device']['sub10_sub10RadioLclRxPower']['section'] = 'wireless';
+$config['graph_types']['device']['sub10_sub10RadioLclRxPower']['order'] = '1';
+$config['graph_types']['device']['sub10_sub10RadioLclRxPower']['descr'] = 'Radio Receive Power';
+
+$config['graph_types']['device']['sub10_sub10RadioLclVectErr']['section'] = 'wireless';
+$config['graph_types']['device']['sub10_sub10RadioLclVectErr']['order'] = '3';
+$config['graph_types']['device']['sub10_sub10RadioLclVectErr']['descr'] = 'Radio Vector Error';
+
+$config['graph_types']['device']['sub10_sub10RadioLclLnkLoss']['section'] = 'wireless';
+$config['graph_types']['device']['sub10_sub10RadioLclLnkLoss']['order'] = '3';
+$config['graph_types']['device']['sub10_sub10RadioLclLnkLoss']['descr'] = 'Radio Link Loss';
+
+$config['graph_types']['device']['sub10_sub10RadioLclAFER']['section'] = 'wireless';
+$config['graph_types']['device']['sub10_sub10RadioLclAFER']['order'] = '4';
+$config['graph_types']['device']['sub10_sub10RadioLclAFER']['descr'] = 'Radio Air Frame Error Rate';
+
+$config['graph_types']['device']['sub10_sub10RadioLclDataRate']['section'] = 'wireless';
+$config['graph_types']['device']['sub10_sub10RadioLclDataRate']['order'] = '4';
+$config['graph_types']['device']['sub10_sub10RadioLclDataRate']['descr'] = 'Data Rate on the Airside interface';
+
 $config['graph_types']['device']['wifi_clients']['section'] = 'wireless';
 $config['graph_types']['device']['wifi_clients']['order']   = '0';
 $config['graph_types']['device']['wifi_clients']['descr']   = 'Wireless Clients';