diff --git a/plugins/currentcost/currentcost b/plugins/currentcost/currentcost
index e86c3c09..956acfc8 100755
--- a/plugins/currentcost/currentcost
+++ b/plugins/currentcost/currentcost
@@ -571,7 +571,7 @@ multigraph currentcost
 graph_title CurrentCost Consumption
 graph_args --base 1000 -l 0
 graph_vlabel $unit
-graph_category currentcost
+graph_category sensors
 graph_info This graph shows the 'whole house' data.
 EOF
             if ( scalar( @{ $datum->{data} } ) > 1 ) {
@@ -608,7 +608,7 @@ multigraph currentcost_cumulative
 graph_title CurrentCost Total Usage
 graph_args --base 1000 -l 0
 graph_vlabel $unit * hours
-graph_category currentcost
+graph_category sensors
 EOF
             print "graph_order ";
             my $confstr = '';
@@ -639,7 +639,7 @@ multigraph currentcost_cost
 graph_title CurrentCost Estimated Cost
 graph_args --base 1000 -l 0
 graph_vlabel ${currency}
-graph_category currentcost
+graph_category sensors
 EOF
             if ( scalar( @{ $datum->{data} } ) > 1 ) {
                 print "graph_total Total\n";
@@ -663,7 +663,7 @@ multigraph currentcost.appliance$sensor
 graph_title CurrentCost Consumption (Appliance $sensor)
 graph_args --base 1000 -l 0
 graph_vlabel $unit
-graph_category currentcost
+graph_category sensors
 graph_info This graph shows the data for Appliance $sensor
 EOF
             if ( scalar( @{ $datum->{data} } ) > 1 ) {
@@ -691,7 +691,7 @@ multigraph currentcost_cumulative.appliance$sensor
 graph_title CurrentCost Total Usage (Appliance $sensor)
 graph_args --base 1000 -l 0
 graph_vlabel $unit * hours
-graph_category currentcost
+graph_category sensors
 EOF
             print "graph_order ";
             my $confstr = '';
@@ -713,7 +713,7 @@ multigraph currentcost_cost.appliance$sensor
 graph CurrentCost Estimated Cost (Appliance $sensor)
 graph_args --base 1000 -l 0
 graph_vlabel ${currency}
-graph_category currentcost
+graph_category sensors
 EOF
             if ( scalar( @{ $datum->{data} } ) > 1 ) {
                 print "graph_total Total\n";
diff --git a/plugins/dvb/2wcomdsr_ b/plugins/dvb/2wcomdsr_
index 92ec1b1f..5c73375a 100644
--- a/plugins/dvb/2wcomdsr_
+++ b/plugins/dvb/2wcomdsr_
@@ -62,7 +62,7 @@ echo "host_name $hostname"
 echo "graph_args --base 1000"
 echo "graph_title Carrier/Noise Ratio"
 echo "graph_vlabel dB"
-echo "graph_category status"
+echo "graph_category dvb"
 echo "graph_scale no"
 echo "graph_info Calculated carrier/noise ratio of the signal. To avoid data errors, the decoding of a received signal requires a minimum C/N ratio that depends on the FEC rate."
 echo "cpn.label C/N"
@@ -74,7 +74,7 @@ echo "host_name $hostname"
 echo "graph_args --base 1000"
 echo "graph_title Carrier Frequency Offset"
 echo "graph_vlabel MHz"
-echo "graph_category status"
+echo "graph_category dvb"
 echo "graph_scale no"
 echo "graph_info Incoming signals from the LNB are subject to frequency tolerances, thus check the 'CFO Error' under menu item 'Status>Tuner'. This value represents the margin by which the entered frequency deviates from the actual frequency. In order to maximize reception quality the CFO error should be minimized."
 echo "cfo.label CFO"
@@ -86,7 +86,7 @@ echo "host_name $hostname"
 echo "graph_args --base 1000"
 echo "graph_title RF Signal Level"
 echo "graph_vlabel dBm"
-echo "graph_category status"
+echo "graph_category dvb"
 echo "graph_scale no"
 echo "graph_info Input for the connection of the receiving LNB of the satellite antenna. Admissible RF signal input range is -82 to -10 dBm."
 echo "inp.label RF level"
@@ -98,7 +98,7 @@ echo "host_name $hostname"
 echo "graph_args --base 1000"
 echo "graph_title Tuner system Status"
 echo "graph_vlabel 1=OK, 0=BAD"
-echo "graph_category status"
+echo "graph_category dvb"
 echo "graph_scale no"
 echo "graph_info Tuner system status: 1 = 'OK' or 0 = 'BAD'. It is OK if all the following values are OK: AGC (Automatic Gain Control), CE (Carrier Frequency Offset Estimation), Symbol Timing, Carrier Locked, Viterbi error correction."
 echo "tnr.label Tuner status"
@@ -110,7 +110,7 @@ echo "host_name $hostname"
 echo "graph_args --base 1000"
 echo "graph_title Warning LED"
 echo "graph_vlabel 0=OFF; >0=ON"
-echo "graph_category status"
+echo "graph_category dvb"
 echo "graph_scale no"
 echo "graph_info Every monitoring function has a checkbox 'warning LED on' to select if the 'Warning' LED on the web interface and the front panel of the device is activated on alarms or not."
 echo "ld2.label Warning"
@@ -122,7 +122,7 @@ echo "host_name $hostname"
 echo "graph_args --base 1000 --logarithmic"
 echo "graph_title BER Viterbi/LDPC"
 echo "graph_vlabel Bit Error Rate"
-echo "graph_category status"
+echo "graph_category dvb"
 #echo "graph_scale no"
 echo "graph_info Detected bit error rate (BER) before the Viterbi error correction."
 echo "ber_vt.label Viterbi/LDPC BER"
@@ -134,7 +134,7 @@ echo "host_name $hostname"
 echo "graph_args --base 1000 --logarithmic"
 echo "graph_title BER Reed Solomon/BCH"
 echo "graph_vlabel Bit Error Rate"
-echo "graph_category status"
+echo "graph_category dvb"
 #echo "graph_scale no"
 echo "graph_info Detected bit error rate (BER) before the Reed Solomon error correction."
 echo "ber_rs.label RS/BCH BER"
diff --git a/plugins/games/game b/plugins/games/game
index db6f485f..6f8a1a20 100644
--- a/plugins/games/game
+++ b/plugins/games/game
@@ -42,7 +42,7 @@ function printMultigraph($ini_array, $machine_name, $title, $info, $max) {
     p("multigraph $machine_name");
     p("graph_title $title");
     p("graph_vlabel players");
-    p("graph_category gameserver");
+    p("graph_category games");
     p("graph_info $info");
     p("graph_printf %6.0lf");
     
diff --git a/plugins/gpu/nvidia_smi_ b/plugins/gpu/nvidia_smi_
index 20817eed..9a099922 100755
--- a/plugins/gpu/nvidia_smi_
+++ b/plugins/gpu/nvidia_smi_
@@ -75,7 +75,7 @@ for (my $i = 0; $i < $gpuCount; $i++)
             print "graph_title GPU\n";
             print "graph_args --upper-limit 120 -l 0\n";
             print "graph_vlabel Percent or Degrees C\n";
-            print "graph_category GPU Metrics\n";
+            print "graph_category GPU\n";
             print "graph_info Information for NVIDIA GPUs using driver version $driverVersion\n";
         }
         
diff --git a/plugins/java/jstat__gccount b/plugins/java/jstat__gccount
index 41f8c255..6c6a4292 100755
--- a/plugins/java/jstat__gccount
+++ b/plugins/java/jstat__gccount
@@ -86,7 +86,7 @@ config_common()
   echo 'graph_vlabel GC Count(times)'
   echo 'graph_total total'
   echo 'graph_info GC Count'
-  echo 'graph_category JVM'
+  echo 'graph_category java'
 }
 
 config_sun_jdk()
diff --git a/plugins/java/jstat__gctime b/plugins/java/jstat__gctime
index fb2ce7fa..1d2e4c6a 100755
--- a/plugins/java/jstat__gctime
+++ b/plugins/java/jstat__gctime
@@ -86,7 +86,7 @@ config_common()
         echo 'graph_vlabel GC Time(sec)'
         echo 'graph_total total'
         echo 'graph_info GC Time'
-        echo 'graph_category JVM'
+        echo 'graph_category java'
 }
 
 config_sun_jdk()
diff --git a/plugins/java/jstat__heap b/plugins/java/jstat__heap
index ab57bc2f..870e94fd 100755
--- a/plugins/java/jstat__heap
+++ b/plugins/java/jstat__heap
@@ -85,7 +85,7 @@ config_common()
   echo "graph_args --base 1024 -l 0"
   echo "graph_vlabel Heap Usage(Bytes)"
   echo "graph_info Heap Usage"
-  echo "graph_category JVM"
+  echo "graph_category java"
 }
 
 config_sun_jdk()
diff --git a/plugins/mod_jk/mod_jk b/plugins/mod_jk/mod_jk
index 6d2e1e06..7c607d36 100755
--- a/plugins/mod_jk/mod_jk
+++ b/plugins/mod_jk/mod_jk
@@ -26,7 +26,7 @@ then
 	# Status graph
 	echo "multigraph mod_jk_status"
 	echo "graph_title mod_jk Status"
-	echo "graph_category mod_jk"
+	echo "graph_category tomcat"
 	echo "graph_info This graph shows the status of the different mod_jk nodes."
 	echo "graph_vlabel Status"
 
@@ -43,7 +43,7 @@ then
         do
         	echo "multigraph mod_jk_requests_$i"
         	echo "graph_title mod_jk Requests $i"
-        	echo "graph_category mod_jk"
+        	echo "graph_category tomcat"
         	echo "graph_info This graph shows the status of requests to the mod_jk node: $i"
         	echo "graph_vlabel Request"
                 echo "busy.label Current"
@@ -59,7 +59,7 @@ then
         do
                 echo "multigraph mod_jk_traffic_$i"
                 echo "graph_title mod_jk Traffic $i"
-                echo "graph_category mod_jk"
+                echo "graph_category tomcat"
                 echo "graph_info This graph shows the traffic statistics to the mod_jk node: $i"
                 echo "graph_vlabel Bytes/min"
                 echo "transferred.label Write to node (bytes/min)"
diff --git a/plugins/network/netstat_bsd_m_/netstat_bsd_m_ b/plugins/network/netstat_bsd_m_/netstat_bsd_m_
index b7fffa04..082c4831 100755
--- a/plugins/network/netstat_bsd_m_/netstat_bsd_m_
+++ b/plugins/network/netstat_bsd_m_/netstat_bsd_m_
@@ -63,7 +63,7 @@ when 'config'
 		first = true
 		puts <<CONFIG
 graph_title Netstat: #{desc}
-graph_category netstat
+graph_category network
 graph_vlabel current
 graph_order #{values.map { |name, _| name.to_s.escape }.join ' '}
 CONFIG
diff --git a/plugins/network/netstat_s_/netstat_s_ b/plugins/network/netstat_s_/netstat_s_
index 3187d7dc..85f494af 100755
--- a/plugins/network/netstat_s_/netstat_s_
+++ b/plugins/network/netstat_s_/netstat_s_
@@ -66,7 +66,7 @@ class Graph
 			config_options.concat [
 				"multigraph #{name(unit)}",
 				"graph_title Netstat: #{@protocol}: #{@name}#{" (#{unit})" if multigraphs.size > 1}",
-				"graph_category netstat",
+				"graph_category network",
 				"graph_order #{labels_and_negatives.map { |label, _negative| label.escape }.join(' ')}"
 			]
 
diff --git a/plugins/network/transmission_ratios/tr_ratios b/plugins/network/transmission_ratios/tr_ratios
index 495ea16b..ec2daae9 100755
--- a/plugins/network/transmission_ratios/tr_ratios
+++ b/plugins/network/transmission_ratios/tr_ratios
@@ -6,7 +6,7 @@ pass=''
 if [ "$1" = "config" ]; then
         echo "graph_title Transmission seed ratios"
 	echo "graph_vlabel Seed ratio %"
-	echo "graph_category Transmission"
+	echo "graph_category torrent"
 	echo "graph_info This plugin shows your transmission ratios per torrent"
 	transmission-remote -n $user:$pass -l | gawk -f /usr/share/munin/plugins/tr_ratios_labels
         exit 0
diff --git a/plugins/noaaport/novra_s300 b/plugins/noaaport/novra_s300
index e3f15623..3d42f55d 100755
--- a/plugins/noaaport/novra_s300
+++ b/plugins/noaaport/novra_s300
@@ -43,7 +43,7 @@ my $command = "$CMCS -ip $IP -pw $PW -xmlstatus";
 if (defined($ARGV[0]) and ($ARGV[0] eq 'config')) {
 	print "graph_title Novra S300\n";
 	print "graph_vlabel Signal\n";
-	print "graph_category NOAAPort\n";
+	print "graph_category weather\n";
 	print "s300.signal Signal\n";
 	print "s300.ctn CtN\n";
 	exit(0);
diff --git a/plugins/php/eaccelerator-usage b/plugins/php/eaccelerator-usage
index b6c19652..a4f740a6 100755
--- a/plugins/php/eaccelerator-usage
+++ b/plugins/php/eaccelerator-usage
@@ -51,7 +51,7 @@ if ($#ARGV eq 0) {
 	if ($ARGV[0] eq 'config') {
 		print "eAccelerator\n";
 		print "graph_title eAccelerator\n";
-		print "graph_category php-cgi\n";
+		print "graph_category php\n";
 		print "memusage.label Memory Usage %\n";
 		print "memusage.warning 95\n";
 		print "memusage.critical 95\n";
diff --git a/plugins/php/php-fastcgi b/plugins/php/php-fastcgi
index 728417ec..e4cd41dd 100755
--- a/plugins/php/php-fastcgi
+++ b/plugins/php/php-fastcgi
@@ -90,7 +90,7 @@ if (exists $ARGV[0] and $ARGV[0] eq "config") {
 
   print "graph_title PHP CGI [MB]\n";
   print "graph_vlabel PHP CGI Memory usage\n";
-  print "graph_category php-cgi\n";
+  print "graph_category php\n";
   print "graph_args -l 0\n";
   print "php_cgi_ram.label PHP CGI Used RAM\n";
   print "php_cgi_ram.draw LINE2\n";
@@ -102,4 +102,4 @@ if (exists $ARGV[0] and $ARGV[0] eq "config") {
   my ($pp, $pm) = eval(`ps u -p \$(pidof $PROCESS_NAME) | awk 'NR > 1 {pm += \$5} END {print "("NR-1","pm/1024")"}'`);
   printf("php_cgi_ram.value %d\n", ceil($pm));
   print "php_cgi_processes.value $pp\n";
-}
\ No newline at end of file
+}
diff --git a/plugins/printer/hp2600_count_ b/plugins/printer/hp2600_count_
index c610d76a..00f10465 100755
--- a/plugins/printer/hp2600_count_
+++ b/plugins/printer/hp2600_count_
@@ -31,7 +31,7 @@ case $1 in
 host_name printers
 graph_title HP 2600 pages by cartridge statistics
 graph_vlabel Count (Pages)
-graph_category HP2600 Printer
+graph_category printer
 graph_info Pages count by color.
 graph_args  -l 0 
 graph_scale no
diff --git a/plugins/printer/hp2600_status_ b/plugins/printer/hp2600_status_
index 8d96c243..1d1ed15c 100755
--- a/plugins/printer/hp2600_status_
+++ b/plugins/printer/hp2600_status_
@@ -31,7 +31,7 @@ case $1 in
 host_name printers
 graph_title HP 2600 cartridge status 
 graph_vlabel Status (%)
-graph_category HP2600 Printer
+graph_category printer
 graph_info Toner status.
 graph_args --upper-limit 400 -l 0 
 line.label ---
diff --git a/plugins/rtorrent/rtom_allsessions_mem b/plugins/rtorrent/rtom_allsessions_mem
index 0187eadf..1885a62b 100755
--- a/plugins/rtorrent/rtom_allsessions_mem
+++ b/plugins/rtorrent/rtom_allsessions_mem
@@ -53,9 +53,9 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
         print "graph_title rTorrent memory usage\n";
         print "graph_args --base 1024 --lower-limit 0\n";
         print "graph_vlabel Bytes\n";
-        print "graph_category rTorrent ".${category}."\n";
+        print "graph_category torrent ".${category}."\n";
         print "mem.label Memory usage\n";
-        print "mem.info Memory osage of rTorrent\n";
+        print "mem.info Memory usage of rTorrent\n";
         print "mem.type GAUGE\n";
         print "mem.draw LINE2\n";
         exit 0;
diff --git a/plugins/rtorrent/rtom_allsessions_peers b/plugins/rtorrent/rtom_allsessions_peers
index a6d29144..ef32c539 100755
--- a/plugins/rtorrent/rtom_allsessions_peers
+++ b/plugins/rtorrent/rtom_allsessions_peers
@@ -51,7 +51,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
 	print "graph_title rTorrent peer statistics\n";
 	print "graph_args --base 1000 --lower-limit 0\n";
 	print "graph_vlabel peers\n";
-	print "graph_category rTorrent ".${category}."\n";
+	print "graph_category torrent ".${category}."\n";
 	print "outgoing.label outgoing\n";
 	print "outgoing.draw AREA\n";
 	print "outgoing.info number of outgoing connections\n";
diff --git a/plugins/rtorrent/rtom_allsessions_spdd b/plugins/rtorrent/rtom_allsessions_spdd
index 4fa9f5d2..c917bccc 100755
--- a/plugins/rtorrent/rtom_allsessions_spdd
+++ b/plugins/rtorrent/rtom_allsessions_spdd
@@ -65,7 +65,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
         print "graph_title rTorrent speeds\n";
         print "graph_args --base 1024\n";
         print "graph_vlabel Bytes per \${graph_period}\n";
-        print "graph_category rTorrent ".${category}."\n";
+        print "graph_category torrent ".${category}."\n";
         print "down.label Download B/s\n";
         print "down.info Download speed in Bytes per seconds\n";
         print "down.type DERIVE\n";
diff --git a/plugins/rtorrent/rtom_allsessions_vol b/plugins/rtorrent/rtom_allsessions_vol
index 6e6a5de7..3fafa7d3 100755
--- a/plugins/rtorrent/rtom_allsessions_vol
+++ b/plugins/rtorrent/rtom_allsessions_vol
@@ -52,7 +52,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
 	print "graph_args --base 1000 -r --lower-limit 0\n";
 	print "graph_title rTorrent volume\n";
 	print "graph_vlabel active torrents\n";
-	print "graph_category rTorrent ".${category}."\n";
+	print "graph_category torrent ".${category}."\n";
 	print "complete.label complete\n";
 	print "complete.draw AREA\n";
 	print "complete.info complete torrents\n";
diff --git a/plugins/rtorrent/rtom_mem b/plugins/rtorrent/rtom_mem
index 5a5a0f17..fb393c0b 100755
--- a/plugins/rtorrent/rtom_mem
+++ b/plugins/rtorrent/rtom_mem
@@ -53,7 +53,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
 	print "graph_title rTorrent memory usage\n";
 	print "graph_args --base 1024 --lower-limit 0\n";
 	print "graph_vlabel Bytes\n";
-	print "graph_category rTorrent ".${category}."\n";
+	print "graph_category torrent ".${category}."\n";
 	print "mem.label Memory usage\n";
 	print "mem.info Memory osage of rTorrent\n";
 	print "mem.type GAUGE\n";
diff --git a/plugins/rtorrent/rtom_peers b/plugins/rtorrent/rtom_peers
index 9720d693..ae71ea2e 100755
--- a/plugins/rtorrent/rtom_peers
+++ b/plugins/rtorrent/rtom_peers
@@ -53,7 +53,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
 	print "graph_title rTorrent peer statistics\n";
 	print "graph_args --base 1000 --lower-limit 0\n";
 	print "graph_vlabel peers\n";
-	print "graph_category rTorrent ".${category}."\n";
+	print "graph_category torrent ".${category}."\n";
 	print "outgoing.label outgoing\n";
 	print "outgoing.draw AREA\n";
 	print "outgoing.info number of outgoing connections\n";
diff --git a/plugins/rtorrent/rtom_spdd b/plugins/rtorrent/rtom_spdd
index 26f79c26..3c23ca7d 100755
--- a/plugins/rtorrent/rtom_spdd
+++ b/plugins/rtorrent/rtom_spdd
@@ -68,7 +68,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
 	print "graph_title rTorrent speeds\n";
 	print "graph_args --base 1024\n";
 	print "graph_vlabel Bytes per \${graph_period}\n";
-	print "graph_category rTorrent ".${category}."\n";
+	print "graph_category torrent ".${category}."\n";
 	print "down.label Download B/s\n";
 	print "down.info Download speed in Bytes per seconds\n";
 	print "down.type DERIVE\n";
diff --git a/plugins/rtorrent/rtom_vol b/plugins/rtorrent/rtom_vol
index 8e9d7cc2..c067231b 100755
--- a/plugins/rtorrent/rtom_vol
+++ b/plugins/rtorrent/rtom_vol
@@ -54,7 +54,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
 	print "graph_args --base 1000 -r --lower-limit 0\n";
 	print "graph_title rTorrent volume\n";
 	print "graph_vlabel active torrents\n";
-	print "graph_category rTorrent ".${category}."\n";
+	print "graph_category torrent ".${category}."\n";
 	print "complete.label complete\n";
 	print "complete.draw AREA\n";
 	print "complete.info complete torrents\n";
diff --git a/plugins/snmp/snmp__netapp_cifs2 b/plugins/snmp/snmp__netapp_cifs2
index 8c3a22bc..31686e53 100755
--- a/plugins/snmp/snmp__netapp_cifs2
+++ b/plugins/snmp/snmp__netapp_cifs2
@@ -84,7 +84,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host CIFS sessions\n";
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel CIFS\n";
-    print "graph_category CIFS\n";
+    print "graph_category netapp\n";
     print "graph_info This graph shows CIFS sessions status for the $host.\n";
     print "graph_order ";
     foreach (sort keys %oids)
diff --git a/plugins/snmp/snmp__netapp_cifscalls b/plugins/snmp/snmp__netapp_cifscalls
index c411461b..4ad9e97a 100755
--- a/plugins/snmp/snmp__netapp_cifscalls
+++ b/plugins/snmp/snmp__netapp_cifscalls
@@ -91,7 +91,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host CIFS calls\n";
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel calls / \${graph_period}\n";
-    print "graph_category cifs\n";
+    print "graph_category netapp\n";
     print "graph_info This graph shows cifs calls for the $host NetApp equipment.\n";
     print "graph_order ";
     foreach (sort keys %oids)
diff --git a/plugins/snmp/snmp__netapp_cpu2 b/plugins/snmp/snmp__netapp_cpu2
index 8b6e9a48..f7ab8c1d 100755
--- a/plugins/snmp/snmp__netapp_cpu2
+++ b/plugins/snmp/snmp__netapp_cpu2
@@ -93,7 +93,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host CPU \n";
     print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100\n";
     print "graph_vlabel CPU \n";
-    print "graph_category CPU\n";
+    print "graph_category netapp\n";
     print "graph_info This graph shows cpu busy value for the $host in percent.\n";
     print "graph_order ";
     foreach (sort keys %oids)
diff --git a/plugins/snmp/snmp__netapp_diskbusy b/plugins/snmp/snmp__netapp_diskbusy
index f7f3bcd3..9ecab19c 100755
--- a/plugins/snmp/snmp__netapp_diskbusy
+++ b/plugins/snmp/snmp__netapp_diskbusy
@@ -63,6 +63,8 @@ sub do_collect
 
 sub do_config_root
 {
+    # graph_category netapp # To show plugin in Gallery also in this category
+ 
     my ($host) = @_;
 
     print "multigraph diskbusy\n";
diff --git a/plugins/snmp/snmp__netapp_diskusage2_ b/plugins/snmp/snmp__netapp_diskusage2_
index 5b481779..4f23daa0 100755
--- a/plugins/snmp/snmp__netapp_diskusage2_
+++ b/plugins/snmp/snmp__netapp_diskusage2_
@@ -135,6 +135,7 @@ sub do_config_vol
     }
     print "graph_args --base 1024 --lower-limit 0\n";
     print "graph_vlabel bytes\n";
+    # graph_category netapp # To show plugin in Gallery also in this category
     print "graph_category disk\n";
     print "graph_order df64UsedKBytes df64SnapShotUsedKBytes df64SisSavedKBytes df64TotalKBytes df64SnapShotTotalKBytes df64TotalAndSnapTotalKBytes \n";
 
diff --git a/plugins/snmp/snmp__netapp_diskutil b/plugins/snmp/snmp__netapp_diskutil
index 13b32130..b05db9ef 100755
--- a/plugins/snmp/snmp__netapp_diskutil
+++ b/plugins/snmp/snmp__netapp_diskutil
@@ -82,6 +82,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host  Disk throughput\n";
     print "graph_args --base 1024\n";
     print "graph_vlabel Bytes/\${graph_period} write (-) / read (+)\n";
+    # graph_category netapp # To show plugin in Gallery also in this category
     print "graph_category disk\n";
     print "graph_info This graph shows DiskUtil calls for the $host NetApp equipment.\n";
     print "graph_order misc64DiskWriteBytes misc64DiskReadBytes\n";
diff --git a/plugins/snmp/snmp__netapp_ndmp b/plugins/snmp/snmp__netapp_ndmp
index f9de0f56..2219b9e9 100755
--- a/plugins/snmp/snmp__netapp_ndmp
+++ b/plugins/snmp/snmp__netapp_ndmp
@@ -84,7 +84,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host NDMP \n";
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel NDMP status\n";
-    print "graph_category NDMP\n";
+    print "graph_category netapp\n";
     print "graph_info This graph shows NDMP status for the $host NetApp equipment.\n";
     print "graph_order ";
     foreach (sort keys %oids)
diff --git a/plugins/snmp/snmp__netapp_net b/plugins/snmp/snmp__netapp_net
index c97e4fda..f380031c 100755
--- a/plugins/snmp/snmp__netapp_net
+++ b/plugins/snmp/snmp__netapp_net
@@ -82,6 +82,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host Network interface traffic\n";
     print "graph_args --base 1000\n";
     print "graph_vlabel Bytes in (-) / out (+) per \${graph_period}\n";
+    # graph_category netapp # To show plugin in Gallery also in this category
     print "graph_category network\n";
     print "graph_info This graph shows net stats for the $host NetApp equipment.\n";
     print "graph_order misc64NetRcvdBytes misc64NetSentBytes\n";
diff --git a/plugins/snmp/snmp__netapp_nfs3calls b/plugins/snmp/snmp__netapp_nfs3calls
index 2e0c2a42..cf7eb142 100755
--- a/plugins/snmp/snmp__netapp_nfs3calls
+++ b/plugins/snmp/snmp__netapp_nfs3calls
@@ -120,6 +120,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") {
     print "graph_title $host NFSv3 calls\n";
     print "graph_args --base 1000\n";
     print "graph_vlabel calls / \${graph_period}\n";
+    # graph_category netapp # To show plugin in Gallery also in this category
     print "graph_category nfs\n";
     print "graph_info This graph shows NFSv3 calls for the $host NetApp equipment.\n";
     print "graph_order ";
diff --git a/plugins/snmp/snmp__netapp_reallocate b/plugins/snmp/snmp__netapp_reallocate
index d9f0b4c4..0cbdd8c7 100755
--- a/plugins/snmp/snmp__netapp_reallocate
+++ b/plugins/snmp/snmp__netapp_reallocate
@@ -112,7 +112,7 @@ sub do_config_vol
     }
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel reallocate_status status\n";
-    print "graph_category reallocate\n";
+    print "graph_category netapp\n";
     foreach my $state ("reallocating", "redirecting", "quiesce", "debug")
     {
         print "$state.label $state\n";
diff --git a/plugins/snmp/snmp__netapp_sis b/plugins/snmp/snmp__netapp_sis
index e59c70fe..26110672 100755
--- a/plugins/snmp/snmp__netapp_sis
+++ b/plugins/snmp/snmp__netapp_sis
@@ -110,7 +110,7 @@ sub do_config_vol
     }
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel sis status\n";
-    print "graph_category sis\n";
+    print "graph_category netapp\n";
     print "graph_order sisInitialising sisRunning sisPending sisDebug\n";
     foreach my $state ("debug", "initialising", "running", "pending")
     {
diff --git a/plugins/time/chrony b/plugins/time/chrony
index 44a678a1..96e3ce0f 100755
--- a/plugins/time/chrony
+++ b/plugins/time/chrony
@@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title Chrony Tracking Stats'
         echo 'graph_args --base 1000 -l 0'
         echo 'units (seconds,ppm)'
-	echo 'graph_category NTP'    
+	echo 'graph_category time'    
 		i=0
 		for a in $fields ; do
 			i=$(expr $i + 1);
diff --git a/plugins/time/ntp_peers_ipv6 b/plugins/time/ntp_peers_ipv6
index 2488fb76..803a8fc6 100755
--- a/plugins/time/ntp_peers_ipv6
+++ b/plugins/time/ntp_peers_ipv6
@@ -85,7 +85,7 @@ if ($ARGV[0] and $ARGV[0] eq 'config') {
   print "graph_title NTP peer offsets\n";
   print "graph_args --base 1000\n";
   print "graph_vlabel ms\n";
-  print "graph_category ntp\n";
+  print "graph_category time\n";
   print "graph_info Offset (in ms) to the server's NTP peers\n";
   print "graph_order ";
   foreach my $key (sort keys %peers) {
diff --git a/plugins/time/ntp_queries b/plugins/time/ntp_queries
index 18002eba..18a25b22 100755
--- a/plugins/time/ntp_queries
+++ b/plugins/time/ntp_queries
@@ -110,7 +110,7 @@ if ($ARGV[0] and $ARGV[0] eq 'config') {
   print "graph_title NTP Queries\n";
   print "graph_args --base 1000\n";
   print "graph_vlabel qps\n";
-  print "graph_category ntp\n";
+  print "graph_category time\n";
   print "graph_info Queries to the NTP server\n";
   print "queries.label Queries per second\n";
   print "queries.type DERIVE\n";
@@ -147,4 +147,4 @@ All configuration parameters are optional
 =head1 Known issues
 
 
-=cut
\ No newline at end of file
+=cut
diff --git a/plugins/virtualization/kvm_cpu b/plugins/virtualization/kvm_cpu
index 1a641a77..eb47ee96 100755
--- a/plugins/virtualization/kvm_cpu
+++ b/plugins/virtualization/kvm_cpu
@@ -25,7 +25,7 @@ def config(vm_names):
 
     base_config = """graph_title KVM Virtual Machine CPU usage
 graph_vlabel %%
-graph_category KVM
+graph_category Virtualization
 graph_scale no
 graph_period second
 graph_info This graph shows the current CPU used by virtual machines
diff --git a/plugins/virtualization/kvm_io b/plugins/virtualization/kvm_io
index e687235d..5019fbdc 100755
--- a/plugins/virtualization/kvm_io
+++ b/plugins/virtualization/kvm_io
@@ -23,7 +23,7 @@ def config(vm_names):
     '''
     base_config = """graph_title KVM Virtual Machine IO usage
 graph_vlabel Bytes read(-)/written(+) per second
-graph_category KVM
+graph_category Virtualization
 graph_info This graph shows the block device I/O used of virtual machines
 graph_args --base 1024
     """
diff --git a/plugins/virtualization/kvm_mem b/plugins/virtualization/kvm_mem
index f1f93674..d1ce81c6 100755
--- a/plugins/virtualization/kvm_mem
+++ b/plugins/virtualization/kvm_mem
@@ -23,7 +23,7 @@ def config(vm_names):
     '''
     base_config = """graph_title KVM Virtual Machine Memory usage
 graph_vlabel Bytes
-graph_category KVM
+graph_category Virtualization
 graph_info This graph shows the current amount of memory used by virtual machines
 graph_args --base 1024
     """
diff --git a/plugins/virtualization/kvm_net b/plugins/virtualization/kvm_net
index 949dd2a9..5754a5ec 100755
--- a/plugins/virtualization/kvm_net
+++ b/plugins/virtualization/kvm_net
@@ -24,7 +24,7 @@ def config(vm_names):
     '''
     base_config = """graph_title KVM Network I/O
 graph_vlabel Bytes rx(-)/tx(+) per second
-graph_category KVM
+graph_category Virtualization
 graph_info This graph shows the network I/O of the virtual machines
 graph_args --base 1024
     """
diff --git a/plugins/virtualization/munin-libvirtpy b/plugins/virtualization/munin-libvirtpy
index 446c9a0d..34631725 100755
--- a/plugins/virtualization/munin-libvirtpy
+++ b/plugins/virtualization/munin-libvirtpy
@@ -37,7 +37,7 @@ if len(sys.argv) == 2:
         print "graph_title KVM Domain CPU Utilization"
         print "graph_vlabel CPU use in seconds"
         print "graph_args --base 1000"
-        print "graph_category kvm"
+        print "graph_category Virtualization"
 
         for id in ids:
             dom = conn.lookupByID(id)