diff --git a/plugins/apache/apache_vhosts/apache_vhosts b/plugins/apache/apache_vhosts/apache_vhosts
index d446f9e7..9e249a3a 100644
--- a/plugins/apache/apache_vhosts/apache_vhosts
+++ b/plugins/apache/apache_vhosts/apache_vhosts
@@ -117,7 +117,7 @@ multigraph apache_vhosts_$check
 graph_title average $check on all active vhosts
 graph_args --base 1000
 graph_vlabel average $check per response
-graph_category apache_vhosts
+graph_category apache
 graph_period minute
 graph_order $order
 END
@@ -139,7 +139,7 @@ multigraph apache_vhosts_$check.$site
 graph_title average $check on $data{$site}{'label'}
 graph_args --base 1000
 graph_vlabel average response in $check
-graph_category apache_vhosts
+graph_category apache
 graph_period minute
 END
 
@@ -168,7 +168,7 @@ multigraph apache_vhosts_requests
 graph_title requests by vhost
 graph_args --base 1000
 graph_vlabel requests / \${graph_period}
-graph_category apache_vhosts
+graph_category apache
 graph_period minute
 graph_order $order
 END
@@ -193,7 +193,7 @@ multigraph apache_vhosts_requests.$site
 graph_title status codes on $data{$site}{'label'}
 graph_args --base 1000
 graph_vlabel status codes / \${graph_period}
-graph_category apache_vhosts
+graph_category apache
 graph_period minute
 END
       my $draw='AREA';
diff --git a/plugins/apache/example-graphs/apache_activity-week.png b/plugins/apache/example-graphs/apache_activity-week.png
new file mode 100644
index 00000000..38ee0764
Binary files /dev/null and b/plugins/apache/example-graphs/apache_activity-week.png differ
diff --git a/plugins/audit/portaudit b/plugins/audit/portaudit
index 7c15b95f..f067e1eb 100755
--- a/plugins/audit/portaudit
+++ b/plugins/audit/portaudit
@@ -29,7 +29,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title Number of Vulnerabilities'
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel number of vulnerabilities'
-	echo 'graph_category audit'
+	echo 'graph_category security'
 	echo 'graph_info This graph shows the number of vulnerabilities in the system.'
 	echo 'vulnerabilities.label vulnerabilities'
 	echo 'vulnerabilities.info The current number of vulnerabilities.'
diff --git a/plugins/chassis/dell_fans b/plugins/chassis/dell_fans
index 1fb50507..e8406896 100755
--- a/plugins/chassis/dell_fans
+++ b/plugins/chassis/dell_fans
@@ -85,7 +85,7 @@ class FanSpeed(Statistics):
         print "graph_title Dell Fan Speeds"
         print "graph_args --base 1000 -l 0"
         print "graph_vlabel speed (RPM)"
-        print "graph_category Chassis"
+        print "graph_category sensors"
         print "graph_info This graph shows the speed in RPM of all fans."
         print "graph_period second"
         # Print remaining non-static values.
@@ -102,7 +102,7 @@ class ChassisTemps(Statistics):
         print "graph_title Dell Temperature Readings"
         print "graph_args --base 1000 -l 0"
         print "graph_vlabel Temp in Degrees Celsius"
-        print "graph_category Chassis"
+        print "graph_category sensors"
         print "graph_info This graph shows the temperature for all sensors."
         print "graph_period second"
         # Print remaining non-static values.
diff --git a/plugins/djabberd/djabberd_ b/plugins/djabberd/djabberd_
index 247af90c..46e7227f 100644
--- a/plugins/djabberd/djabberd_
+++ b/plugins/djabberd/djabberd_
@@ -206,7 +206,7 @@ elsif ( $ARGV[0] and $ARGV[0] eq "config" ) {
     print "graph_title " . $mode->{'title'} . "\n";
     print "graph_vlabel " . $mode->{'vlabel'} . "\n";
     print "graph_args -l 0\n";
-    print "graph_category DJabberd\n";
+    print "graph_category jabber\n";
     foreach my $field_name ( keys %{ $mode->{'fields'} } ) {
         my $label = $mode->{'fields'}->{$field_name}->{'label'}       || $field_name;
         my $desc  = $mode->{'fields'}->{$field_name}->{'description'} || $mode->{'fields'}->{$field_name}->{'key'};
diff --git a/plugins/dovecot/dovecot b/plugins/dovecot/dovecot
index b23b73e1..c288a44b 100644
--- a/plugins/dovecot/dovecot
+++ b/plugins/dovecot/dovecot
@@ -62,7 +62,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
   print "graph_title Dovecot connections\n";
   print "graph_args --base 1000 -l 0 --no-gridfit --slope-mode\n";
   print "graph_vlabel connections\n";
-  print "graph_category dovecot\n";
+  print "graph_category mail\n";
   print "connections.label Connections open\n";
   print "connections.type GAUGE\n";
   print "connections.draw LINE1\n";
@@ -80,7 +80,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
   print "graph_title Dovecot connected users\n";
   print "graph_args --base 1000 -l 0 --no-gridfit --slope-mode\n";
   print "graph_vlabel connections\n";
-  print "graph_category dovecot\n";
+  print "graph_category mail\n";
   print "connected.label Connected users\n";
   print "connected.type GAUGE\n";
   print "connected.draw LINE1\n";
@@ -98,7 +98,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
   print "graph_title Dovecot logins\n";
   print "graph_args --base 1000 -l 0 --no-gridfit --slope-mode\n";
   print "graph_vlabel logins/5 minute\n";
-  print "graph_category dovecot\n";
+  print "graph_category mail\n";
   print "login.label Logins\n";
   print "login.type GAUGE\n";
   print "login.draw LINE1\n";
diff --git a/plugins/ejabberd/ejabberd_resources_/ejabberd_resources_ b/plugins/ejabberd/ejabberd_resources_/ejabberd_resources_
index f725183d..ae16d4a5 100755
--- a/plugins/ejabberd/ejabberd_resources_/ejabberd_resources_
+++ b/plugins/ejabberd/ejabberd_resources_/ejabberd_resources_
@@ -252,7 +252,7 @@ SUGGESTIONS
 		cat <<CONFIG
 graph_title ejabberd resources - ${RESOURCE_TYPE//_/ }
 graph_args --base $RESOURCE_BASE --lower-limit 0
-graph_category ejabberd
+graph_category jabber
 CONFIG
 		;;
 esac
diff --git a/plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog b/plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog
index d196188e..381d799a 100755
--- a/plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog
+++ b/plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog
@@ -144,7 +144,7 @@ if ARGV.first == 'config'
 	puts <<CONFIG
 graph_title Ejabberd Log
 graph_vlabel total
-graph_category ejabberd
+graph_category jabber
 graph_args -l 0
 CONFIG
 end
diff --git a/plugins/ejabberd/ejabberd_stats_/ejabberd_stats_ b/plugins/ejabberd/ejabberd_stats_/ejabberd_stats_
index 48a98831..d2bfb584 100755
--- a/plugins/ejabberd/ejabberd_stats_/ejabberd_stats_
+++ b/plugins/ejabberd/ejabberd_stats_/ejabberd_stats_
@@ -33,7 +33,7 @@ graph_title ejabberd stats - connected users
 graph_args --base 1000 --lower-limit 0
 graph_vlabel users
 graph_info The number of currently connected users, as of ejabberd report
-graph_category ejabberd
+graph_category jabber
 graph_order active
 connected.label Connected users
 connected.draw AREA
@@ -52,7 +52,7 @@ function ejabberd_stats_s2s() {
 graph_title ejabberd stats - s2s connections
 graph_args --lower-limit 0
 graph_vlabel active connections
-graph_category ejabberd
+graph_category jabber
 graph_order incoming outgoing
 incoming.label incoming s2s
 incoming.info ejabberdctl $ejabberdctl_cmd_in
diff --git a/plugins/forums/punbb_users b/plugins/forums/punbb_users
index fec3cd2c..e826400a 100755
--- a/plugins/forums/punbb_users
+++ b/plugins/forums/punbb_users
@@ -55,7 +55,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
         print "graph_title Users\n";
         print "graph_args --base 1000\n";
         print "graph_vlabel current users\n";
-        print "graph_category Forums\n";
+        print "graph_category Forum\n";
         print "graph_total Total\n";
 
         print "members.label Members\n";
diff --git a/plugins/logins/logins b/plugins/logins/logins
index fde9fd3f..a50ca568 100755
--- a/plugins/logins/logins
+++ b/plugins/logins/logins
@@ -10,7 +10,7 @@ graph=(          2            # number of graphs.
 cat << EOF
 graph_title Users Online
 graph_vlabel Number of users and logins
-graph_category logins
+graph_category system
 graph_args --base 1000 -l 0
 graph_scale no
 EOF
diff --git a/plugins/network/ddclient b/plugins/network/ddclient
old mode 100755
new mode 100644
index f5494942..2d5ad862
--- a/plugins/network/ddclient
+++ b/plugins/network/ddclient
@@ -34,8 +34,8 @@ if [ "$1" = "config" ]; then
 
         echo 'graph_title IP Wechsel'
         echo 'graph_args --base 1000 -l 0'
-        echo 'graph_vlabel täglicher IP Wechsel'
-	echo 'graph_category IP'
+        echo 'graph_vlabel täglicher IP Wechsel'
+	echo 'graph_category network'
         echo 'ip_change.label IP Wechsel'
 	echo 'graph_info Jeder IP-Wechsel der von DDCLIENT festgestellt wird erzeugt einen Wert von 1'
         exit 0
@@ -68,7 +68,7 @@ fi
   Last_update=${Last_update##*\(}
   Last_update=${Last_update%%\)}
 
-# Ausgabe für Munin                         - output for munin
+# Ausgabe für Munin                         - output for munin
   if [ "$Last_update" -gt "$Ref_Timestamp" ]; then
    echo  "ip_change.value 1"
   else
diff --git a/plugins/network/nsr_device_writing b/plugins/network/nsr_device_writing
index 9a70cf7d..3759accb 100755
--- a/plugins/network/nsr_device_writing
+++ b/plugins/network/nsr_device_writing
@@ -33,7 +33,7 @@ if ($ARGV[0] eq "config") {
 graph_title NSR Device write speed (bytes/s)
 graph_args -l 0 --base 1000
 graph_vlabel bytes/s
-graph_category Networker
+graph_category Network
 graph_info Shows how much writing each device is doing.
 _EOM
   foreach my $d (sort keys %hash) {
diff --git a/plugins/reddit_karma/reddit_karma_ b/plugins/reddit_karma/reddit_karma_
index 36285d73..5e195f1d 100755
--- a/plugins/reddit_karma/reddit_karma_
+++ b/plugins/reddit_karma/reddit_karma_
@@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_args --base 1000'
     echo 'graph_scale no'
     echo 'graph_vlabel Link Karma'
-    echo 'graph_category misc'
+    echo 'graph_category Reddit'
     echo 'comment_karma.label Comment Karma'
     echo 'comment_karma.draw LINE'
     echo 'link_karma.label Link Karma'
diff --git a/plugins/sensors/alertme_keyfobsathome b/plugins/sensors/alertme_keyfobsathome
index b1ff6a02..1fbe3a1b 100755
--- a/plugins/sensors/alertme_keyfobsathome
+++ b/plugins/sensors/alertme_keyfobsathome
@@ -14,7 +14,7 @@
 
 if [ "$1" = "config" ] ; then
 	echo "graph_title AlertMe Keyfobs At Home"
-	echo "graph_category environmental"
+	echo "graph_category sensors"
 	echo "graph_info this graph shows AlertMe Keyfob present count"
 	echo "graph_vlabel number"
 	echo "KeyfobsAtHome.label number of keyfobs present"
diff --git a/plugins/sensors/alertme_power b/plugins/sensors/alertme_power
index 2816a93c..d64aec40 100755
--- a/plugins/sensors/alertme_power
+++ b/plugins/sensors/alertme_power
@@ -22,7 +22,7 @@ if [ "$1" = "config" ] ; then
 	fi
 
 	echo "graph_title AlertMe Power"
-	echo "graph_category environmental"
+	echo "graph_category sensors"
 	echo -n "graph_info this graph shows AlertMe power measurements for "
 	head -1 $TMPFILE
 	echo "graph_vlabel power (W)"
diff --git a/plugins/sensors/power/acpi_batt_ b/plugins/sensors/power/acpi_batt_
index c7af78bc..a03e4b1c 100755
--- a/plugins/sensors/power/acpi_batt_
+++ b/plugins/sensors/power/acpi_batt_
@@ -122,7 +122,7 @@ if ($ARGV[0] and $ARGV[0] eq "config")
 	print  ("graph_args --base 1000\n");
 	printf ("graph_title Battery %s (%s) %s\n" , $batt_num, $batt_name, $graph_type);
 	printf ("graph_info This graph shows battery %s (%s) %s\n" , $batt_num, $batt_name, $graph_type);
-	print  ("graph_category power\n");
+	print  ("graph_category sensors\n");
 	if ($graph_type eq "capacity")
 	{
 		print  ("graph_vlabel Capacity, mAh\n");
diff --git a/plugins/sensors/power/acpi_sys_batt_ b/plugins/sensors/power/acpi_sys_batt_
index adc05640..e8937610 100755
--- a/plugins/sensors/power/acpi_sys_batt_
+++ b/plugins/sensors/power/acpi_sys_batt_
@@ -99,7 +99,7 @@ if ($ARGV[0] and $ARGV[0] eq "config")
 	print  ("graph_args --base 1000\n");
 	printf ("graph_title Battery %s (%s) %s\n" , $batt_num, $batt_name, $graph_type);
 	printf ("graph_info This graph shows battery %s (%s) %s\n" , $batt_num, $batt_name, $graph_type);
-	print  ("graph_category power\n");
+	print  ("graph_category sensors\n");
 	if ($graph_type eq "capacity")
 	{
 		print  ("graph_vlabel Charge\n");
diff --git a/plugins/sensors/sequoia_websens b/plugins/sensors/sequoia_websens
index 4bab4c43..301c45b9 100755
--- a/plugins/sensors/sequoia_websens
+++ b/plugins/sensors/sequoia_websens
@@ -36,7 +36,7 @@ port=${port:-80}
 if [ "$1" = "config" ]; then
 	echo "graph_title Sequoia Websensor"
 	echo "graph_info This graph shows the temperature and humidity"
-	echo "graph_category sensor"
+	echo "graph_category sensors"
 	echo "graph_args -l 0 -u 100 -r"
 	echo "graph.scale no"
 	echo "graph_vlabel % and C°"
diff --git a/plugins/snmp/snmp__poseidon-sensors b/plugins/snmp/snmp__poseidon-sensors
index d4be1b48..e23639c1 100755
--- a/plugins/snmp/snmp__poseidon-sensors
+++ b/plugins/snmp/snmp__poseidon-sensors
@@ -102,7 +102,7 @@ multigraph $sensorType
 graph_title $sensorLocation - $sensorType [$sensorUnit]
 graph_args --base 1000 -l 0 
 graph_vlabel $sensorUnit
-graph_category environment
+graph_category sensors
 graph_info This graph shows $sensorType history.
 EOT
                         fi
diff --git a/plugins/snmp/snmp__sentry b/plugins/snmp/snmp__sentry
index b19331f9..05456754 100755
--- a/plugins/snmp/snmp__sentry
+++ b/plugins/snmp/snmp__sentry
@@ -143,7 +143,7 @@ multigraph power_amps_drawn
 graph_title Power Draw in Amps
 graph_args --lower-limit 0
 graph_vlabel Amps
-graph_category power
+graph_category pdu
 graph_scale no
 graph_info This shows the amperage drawn on your PDU. Per NEC, a PDU should not sustain 80% of its maximum circuit capacity for more than three hours.
 
@@ -167,7 +167,7 @@ multigraph power_power_factor
 graph_title Power Factor
 graph_args --lower-limit 0
 graph_vlabel Power Factor
-graph_category power
+graph_category pdu
 graph_scale no
 graph_info Power factor represents the efficiency of the components connected to the circuit. Power factor declines as components age, increasing the overall load on the circuit.
 
@@ -186,7 +186,7 @@ multigraph power_crest_factor
 graph_title Crest Factor
 graph_args --lower-limit 0
 graph_vlabel Crest Factor
-graph_category power
+graph_category pdu
 graph_scale no
 graph_info Crest factor relates the peak value of a signal to its root mean square value. For three-phase AC, a crest factor of 1.732 is expected. Low crest factor may indicate UPS overclipping and crest factors over 5 degrade monitoring accuracy.
 
diff --git a/plugins/streaming/icecast2 b/plugins/streaming/icecast2
index 034fb711..07de2966 100755
--- a/plugins/streaming/icecast2
+++ b/plugins/streaming/icecast2
@@ -36,7 +36,7 @@ case $1 in
 graph_title Icecast2 Stream Listeners
 graph_args --base 1000 -l 0
 graph_vlabel Listeners for Streams
-graph_category stream
+graph_category streaming
 cool_ogg.label cool_ogg
 cool_ogg.draw AREA
 cool_ogg.type GAUGE
diff --git a/plugins/streaming/icecast2_ b/plugins/streaming/icecast2_
old mode 100755
new mode 100644
index eeda0f99..4b0eac8e
--- a/plugins/streaming/icecast2_
+++ b/plugins/streaming/icecast2_
@@ -49,7 +49,7 @@ def hent_XML():
     total_lyttere = xmldoc.getElementsByTagName("clients")[0].firstChild.nodeValue
     #Totalt antall kilder
     total_kilder = xmldoc.getElementsByTagName("sources")[0].firstChild.nodeValue
-    #Status for enkelt strøm
+    #Status for enkelt strøm
     sources = xmldoc.getElementsByTagName("source")
     sourcelist = {}
     for source in sources:
@@ -68,7 +68,7 @@ def hent_XML():
 	if sourcename == "total":
 	    print "graph_title Totalt antall lyttere"
             print "graph_vlabel lyttere"
-	    print "graph_category Icecast"
+	    print "graph_category streaming"
 	    print "totallyttere.label Totalt antall lyttere"
 	    print "totalkilder.label Totalt antall kilder"
 	    chanlist = {}
@@ -101,7 +101,7 @@ def hent_XML():
 		graphtitle = sourcename
 	    print "graph_title %s" % graphtitle
 	    print "graph_vlabel lyttere"
-	    print "graph_category Icecast"
+	    print "graph_category streaming"
 	    for bitrate in mp3bitrates:
 		print "%s_%s.label %s-%s" % (sourcename, bitrate, "/" + sourcename.replace("_", "-"), bitrate)
 		sumstring += "%s_%s " % (sourcename, bitrate)
diff --git a/plugins/streaming/icecast2_all b/plugins/streaming/icecast2_all
old mode 100755
new mode 100644
index d0945ebc..793403e8
--- a/plugins/streaming/icecast2_all
+++ b/plugins/streaming/icecast2_all
@@ -33,7 +33,7 @@ def hent_XML():
     total_lyttere = xmldoc.getElementsByTagName("clients")[0].firstChild.nodeValue
     #Totalt antall kilder
     total_kilder = xmldoc.getElementsByTagName("sources")[0].firstChild.nodeValue
-    #Status for enkelt strøm
+    #Status for enkelt strøm
     sources = xmldoc.getElementsByTagName("source")
     sourcelist = {}
     for source in sources:
@@ -56,7 +56,7 @@ def hent_XML():
     elif sys.argv[1] == "config":
         print "graph_title Total number of listeners"
         print "graph_vlabel listeners"
-	print "graph_category Icecast"
+	print "graph_category streaming"
         print "totallyttere.label Total number of listeners"
         print "totalkilder.label Totalt number of sources"
 	sourcesort = sourcelist.keys()
diff --git a/plugins/streaming/icecast2_simple b/plugins/streaming/icecast2_simple
index 32f6b5c0..c69ee2a2 100755
--- a/plugins/streaming/icecast2_simple
+++ b/plugins/streaming/icecast2_simple
@@ -61,7 +61,7 @@ if ARGV[0] == 'autoconf'
 elsif ARGV[0] == 'config'
   puts "graph_title Total sources and clients for Icecast"
   puts "graph_vlabel listeners"
-  puts "graph_category Icecast"
+  puts "graph_category streaming"
   puts "sources.label Total number of sources"
   puts "clients.label Total number of clients"
 else
diff --git a/plugins/streaming/icecast_ b/plugins/streaming/icecast_
index 29af17f8..e081b430 100755
--- a/plugins/streaming/icecast_
+++ b/plugins/streaming/icecast_
@@ -89,7 +89,7 @@ try:
 			print "graph_title Icecast client listening duration"
 			print "graph_args --base 1000 -l 0"
 			print "graph_scale no"
-			print "graph_category Icecast"
+			print "graph_category streaming"
 			print "graph_vlabel minutes"
 			print "avg.label average listening duration"
 			print "mdn.label median listening duration"
@@ -97,14 +97,14 @@ try:
 			print "graph_title Icecast source uptime"
 			print "graph_args --base 1000 -l 0"
 			print "graph_scale no"
-			print "graph_category Icecast"
+			print "graph_category streaming"
 			print "graph_vlabel hours"
 			for s in sources:
 				print "%s.label source %s" % (s["mount"].strip("/").replace(".","_").replace("-","_"), s["mount"])
 		elif plugin_name == "icecast_traffic":
 			print "graph_title Icecast outgoing traffic"
 			print "graph_args --base 1024 -l 0"
-			print "graph_category Icecast"
+			print "graph_category streaming"
 			print "graph_vlabel bytes / second"
 			is_first = True
 			for s in sources:
@@ -121,7 +121,7 @@ try:
 			print "graph_title Icecast listeners count"
 			print "graph_args --base 1000 -l 0"
 			print "graph_scale no"
-			print "graph_category Icecast"
+			print "graph_category streaming"
 			print "graph_vlabel listeners"
 			is_first = True
 			for s in sources:
diff --git a/plugins/ubuntu/apt_ubuntu b/plugins/ubuntu/apt_ubuntu
index ae3f414a..a54e1008 100755
--- a/plugins/ubuntu/apt_ubuntu
+++ b/plugins/ubuntu/apt_ubuntu
@@ -25,7 +25,7 @@
 #%# family=contrib
 
 ###########################################################
-category = 'system' # 'upgrades'
+category = 'security' # 'upgrades'
 title = 'Upgradable packages' # 'Upgradeable packages'
 vlabel = 'Total packages'
 other = 'other'
@@ -73,7 +73,7 @@ def autoconf():
     sys.exit(1)
 
 def config():
-    print 'graph_category %s' % (category)
+    print 'graph_category security'
     print 'graph_title %s' % (title)
     #print 'graph_total %s' % (total)
     print 'graph_vlabel %s' % (vlabel)
diff --git a/plugins/ups/apc_status b/plugins/ups/apc_status
index dc1898b9..586803ac 100755
--- a/plugins/ups/apc_status
+++ b/plugins/ups/apc_status
@@ -18,7 +18,7 @@ if [ "$1" = "config" ]; then
         echo "graph_title APC Status - $title"
         echo 'graph_args --base 1000 -l 0 '
         echo "graph_vlabel $unit"
-        echo 'graph_category Hardware'
+        echo 'graph_category sensors'
         title=`/sbin/apcaccess | egrep "^MODEL" | awk '{print $3" "$4" "$5" "$6" "$7" "$8" "$9;}'`
         echo "graph_info $title"
         for key in $keys; do
diff --git a/plugins/virtualization/virtualbox_cpu_kernel b/plugins/virtualization/virtualbox_cpu_kernel
index 29479536..5f4db938 100644
--- a/plugins/virtualization/virtualbox_cpu_kernel
+++ b/plugins/virtualization/virtualbox_cpu_kernel
@@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_vlabel %'
         echo 'graph_scale no'
         echo 'graph_info This graph shows the percentage of processor time spent in kernel mode by the every single VM process.'
-        echo 'graph_category virtualbox'
+        echo 'graph_category Virtualization'
         echo 'graph_period second'
         vboxmanage list vms | sed -r 's/^\"(.*)\" \{.*\}$/\1/' | while read VM_NAME; do
                 VM_NAME_PRINT=`echo -e "${VM_NAME}" | sed 's/[^A-Za-z0-9_]/_/g'`
diff --git a/plugins/virtualization/virtualbox_cpu_user b/plugins/virtualization/virtualbox_cpu_user
index 0730fa7a..8bd77674 100644
--- a/plugins/virtualization/virtualbox_cpu_user
+++ b/plugins/virtualization/virtualbox_cpu_user
@@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_vlabel %'
         echo 'graph_scale no'
         echo 'graph_info This graph shows the percentage of processor time spent in user mode by the every single VM process.'
-        echo 'graph_category virtualbox'
+        echo 'graph_category Virtualization'
         echo 'graph_period second'
         vboxmanage list vms | sed -r 's/^\"(.*)\" \{.*\}$/\1/' | while read VM_NAME; do
                 VM_NAME_PRINT=`echo -e "${VM_NAME}" | sed 's/[^A-Za-z0-9_]/_/g'`
diff --git a/plugins/virtualization/virtualbox_ram_usage b/plugins/virtualization/virtualbox_ram_usage
index 2538e75f..e81db92c 100644
--- a/plugins/virtualization/virtualbox_ram_usage
+++ b/plugins/virtualization/virtualbox_ram_usage
@@ -39,7 +39,7 @@ RAMTOT=`free -b | grep Mem | awk '{print $2}'`
         echo "graph_args --base 1024 -r --lower-limit 0 --upper-limit $RAMTOT --units-exponent 9"
         echo 'graph_vlabel GB'
         echo 'graph_info This graph shows the ram usage of every single VM process.'
-        echo 'graph_category virtualbox'
+        echo 'graph_category Virtualization'
         echo 'graph_period second'
         I=0
         vboxmanage list vms | sed -r 's/^\"(.*)\" \{.*\}$/\1/' | while read VM_NAME; do
diff --git a/plugins/virtualization/vmware/fusion_ b/plugins/virtualization/vmware/fusion_
index 1b441a56..ec71d8d6 100755
--- a/plugins/virtualization/vmware/fusion_
+++ b/plugins/virtualization/vmware/fusion_
@@ -62,7 +62,7 @@ my @lines=split(/\n/,$output);
 
 if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
 	my $lcount = 0;
-	my $base_config = "graph_category VMware Fusion\n";
+	my $base_config = "graph_category Virtualization\n";
 	
 	if( $type eq "pcpu" ) {
 		print $base_config;
diff --git a/plugins/virtualization/vmware/vm_cpu_load b/plugins/virtualization/vmware/vm_cpu_load
index 883593a8..d8ecbaae 100755
--- a/plugins/virtualization/vmware/vm_cpu_load
+++ b/plugins/virtualization/vmware/vm_cpu_load
@@ -16,7 +16,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title VMware CPU-Load'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel Load of VMware VMs'
-              echo 'graph_category VMware'
+              echo 'graph_category Virtualization'
         
 	while [ $i -lt ${#VMX[*]} ]
 	do
diff --git a/plugins/virtualization/vserver/vserver_jiffies b/plugins/virtualization/vserver/vserver_jiffies
index 90832407..2e139a63 100755
--- a/plugins/virtualization/vserver/vserver_jiffies
+++ b/plugins/virtualization/vserver/vserver_jiffies
@@ -43,7 +43,7 @@ else
 fi
 
 if [ "$1" = "config" ]; then
-	echo 'graph_category vserver'
+	echo 'graph_category Virtualization'
 	echo 'graph_args --base 1000'
 	echo 'graph_title Vserver cpu usage'
 	echo 'graph_vlabel jiffies used per ${graph_period}'
diff --git a/plugins/virtualization/vserver/vserver_limit_hits b/plugins/virtualization/vserver/vserver_limit_hits
index b2a98669..8fcc7b7d 100755
--- a/plugins/virtualization/vserver/vserver_limit_hits
+++ b/plugins/virtualization/vserver/vserver_limit_hits
@@ -89,7 +89,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Vserver $resource limit hits"
 	# echo 'graph_args --base 1024k -l 0'
 	echo "graph_vlabel $resource limit hits"
-	echo 'graph_category vserver'
+	echo 'graph_category Virtualization'
 	echo "graph_info Shows number of hits on $resource limits by each vserver.'"
 	    
 	for vserver_xid in $vservers ; do
diff --git a/plugins/virtualization/vserver/vserver_limits b/plugins/virtualization/vserver/vserver_limits
index 920d031a..3e6ab1b2 100755
--- a/plugins/virtualization/vserver/vserver_limits
+++ b/plugins/virtualization/vserver/vserver_limits
@@ -66,7 +66,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Vserver $resource limits"
 	# echo 'graph_args --base 1024k -l 0'
 	echo "graph_vlabel $resource limits"
-	echo 'graph_category vserver'
+	echo 'graph_category Virtualization'
 	echo "graph_info Shows current $resource limits for each vserver.'"
 	    
 	for vserver_xid in $vservers ; do
diff --git a/plugins/virtualization/xen b/plugins/virtualization/xen
index bcb92d7f..32d702c1 100755
--- a/plugins/virtualization/xen
+++ b/plugins/virtualization/xen
@@ -36,7 +36,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_args --base 1000 -l 0 --upper-limit 100 --rigid'
         echo 'graph_scale no'
         echo 'graph_vlabel %'
-        echo 'graph_category xen'
+        echo 'graph_category Virtualization'
         echo 'graph_info This graph shows how many percent of the CPU time was used by each domain'
 
 	xm list | grep -v "^Name .* Time(s)$" | \
diff --git a/plugins/virtualization/xen-cpu b/plugins/virtualization/xen-cpu
index 8540d109..c883c06c 100755
--- a/plugins/virtualization/xen-cpu
+++ b/plugins/virtualization/xen-cpu
@@ -53,7 +53,7 @@ if (defined($ARGV[0])) {
 			'graph_title' => 'Xen Domain CPU Usage',
 			'graph_args' => '--base 1000 -l 0 --upper-limit 100 --rigid',
 			'graph_vlabel' => 'Percent (%)',
-			'graph_category' => 'xen',
+			'graph_category' => 'Virtualization',
 			'graph_info' => 'Display the % of CPU Usage for each domain',
 		);	
 
diff --git a/plugins/virtualization/xen-multi b/plugins/virtualization/xen-multi
index 4b61d876..233dfb5c 100755
--- a/plugins/virtualization/xen-multi
+++ b/plugins/virtualization/xen-multi
@@ -169,7 +169,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_args --base 1000 -l 0\n";
 		print "graph_vlabel cpu seconds\n";
 		print "graph_scale no\n";
-		print "graph_category xen\n";
+		print "graph_category Virtualization\n";
 		print "graph_info This graph shows CPU time for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_cpu_time.label ".trim_label('pos',$domain)."\n";
@@ -186,7 +186,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_args --base 1000 -l 0 --upper-limit 100\n";
 		print "graph_vlabel %\n";
 		print "graph_scale no\n";
-		print "graph_category xen\n";
+		print "graph_category Virtualization\n";
 		print "graph_info This graph shows CPU utilization for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_cpu.label ".trim_label('pos',$domain)."\n";
@@ -199,7 +199,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_title Xen domains memory usage\n";
 		print "graph_args --base 1024 -l 0\n";
 		print "graph_vlabel bytes\n";
-		print "graph_category xen\n";
+		print "graph_category Virtualization\n";
 		print "graph_info This graph shows memory usage for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_mem.label ".trim_label('pos',$domain)."\n";
@@ -213,7 +213,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_title Xen domains network traffic\n";
 		print "graph_args --base 1000\n";
 		print "graph_vlabel bits per \${graph_period} in (-) / out (+)\n";
-		print "graph_category xen\n";
+		print "graph_category Virtualization\n";
 		print "graph_info This graph shows network traffic for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_netrx.label none\n";
@@ -233,7 +233,7 @@ if ($ARGV[0] eq "config") {
 		print "graph_title Xen domains disk IOs\n";
 		print "graph_args --base 1000\n";
 		print "graph_vlabel IOs per \${graph_period} read (-) / write (+)\n";
-		print "graph_category xen\n";
+		print "graph_category Virtualization\n";
 		print "graph_info This graph shows disk IOs for each Xen domain.\n";
 		for $domain (@domainlist) {
 			print "$domains{$domain}{'munindomain'}_vbdrd.label none\n";
diff --git a/plugins/virtualization/xen_cpu_v2 b/plugins/virtualization/xen_cpu_v2
index 6042c857..75c9a951 100755
--- a/plugins/virtualization/xen_cpu_v2
+++ b/plugins/virtualization/xen_cpu_v2
@@ -72,7 +72,7 @@ if ( defined($ARGV[0]) )
 			'graph_title' => 'Xen Domain CPU Usage v2',
 			'graph_args' => '--base 1000 -l 0 --upper-limit 100 --rigid',
 			'graph_vlabel' => 'Percent (%)',
-			'graph_category' => 'xen',
+			'graph_category' => 'Virtualization',
 			'graph_info' => 'Display the % of CPU Usage for each domain',
 		);
 
@@ -186,4 +186,4 @@ open(FH, ">", $TEMPFILE) or die $!;
 print FH $curtime."\n";
 print FH @xmlist;
 close FH;
-	
\ No newline at end of file
+	
diff --git a/plugins/virtualization/xen_memory b/plugins/virtualization/xen_memory
index f80631f0..ef2532e4 100755
--- a/plugins/virtualization/xen_memory
+++ b/plugins/virtualization/xen_memory
@@ -29,7 +29,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_scale no'
         echo 'graph_vlabel MB'
-        echo 'graph_category xen'
+        echo 'graph_category Virtualization'
         echo 'graph_info This graph shows of many mS wall time where used by a domain'
                 # xm info | while read name bla value; do echo "$name $value"; done
          $XM info | while read name bla value; do
diff --git a/plugins/virtualization/xen_traffic_ b/plugins/virtualization/xen_traffic_
index 6774d12a..f0b9eb85 100755
--- a/plugins/virtualization/xen_traffic_
+++ b/plugins/virtualization/xen_traffic_
@@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then
     echo "graph_title Xen Traffic for $NAME"
     echo 'graph_vlabel bits in (-) / out (+) per ${graph_period}'
     echo 'graph_args --base 1024 -l 0'
-    echo 'graph_category xen'
+    echo 'graph_category Virtualization'
     echo 'out.label sent'
     echo 'out.type DERIVE'
     echo 'out.min 0'
diff --git a/plugins/virtualization/xen_traffic_all b/plugins/virtualization/xen_traffic_all
index 1cb1e830..c090ee09 100755
--- a/plugins/virtualization/xen_traffic_all
+++ b/plugins/virtualization/xen_traffic_all
@@ -29,7 +29,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title Xen Traffic'
     echo 'graph_vlabel bits received (-) / sent (+) per ${graph_period}'
     echo 'graph_args --base 1024 -l 0'
-    echo 'graph_category xen'
+    echo 'graph_category Virtualization'
     DOMAINS=$(xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)")
     for dom in $DOMAINS; do
         name=$( echo $dom | tr .- __ )
diff --git a/plugins/virtualization/xen_vbd b/plugins/virtualization/xen_vbd
index 69d9e4b8..da34765a 100755
--- a/plugins/virtualization/xen_vbd
+++ b/plugins/virtualization/xen_vbd
@@ -42,7 +42,7 @@ if ( defined($ARGV[0]))
                         'graph_title' => 'Xen Domain I/O usage',
                         'graph_args' => '--base 1024 -l 0',
                         'graph_vlabel' => 'read (-), write (+)',
-                        'graph_category' => 'xen',
+                        'graph_category' => 'Virtualization',
                         'graph_info' => 'Display the I/O operations for each domain',
                 );