diff --git a/plugins/apt/apt-proxy b/plugins/apt/apt-proxy
index d8d204fb..48260f6d 100755
--- a/plugins/apt/apt-proxy
+++ b/plugins/apt/apt-proxy
@@ -36,7 +36,7 @@ if ($ARGV[0] and $ARGV[0] eq "config")
 {
     print "graph_title Files in apt-proxy cache\n";
     print "graph_args --base 1000 -l 0\n";
-    print "graph_category apt-proxy\n";
+    print "graph_category security\n";
     print "graph_vlabel files\n";
     print "main.label main\n";
     print "main.info Packages in main\n";
diff --git a/plugins/arangodb/arangodb_ b/plugins/arangodb/arangodb_
index 6d34c031..a90863af 100755
--- a/plugins/arangodb/arangodb_
+++ b/plugins/arangodb/arangodb_
@@ -91,14 +91,14 @@ def doConfig(plugin_name):
         print "graph_title ArangoDB current connections"
         print "graph_args --base 1000 -l 0"
         print "graph_vlabel connections"
-        print "graph_category ArangoDB"
+        print "graph_category db"
         print "connections.label connections"
 
     elif plugin_name == 'arangodb_time_total':
         print "graph_title ArangoDB total time"
         print "graph_args --base 1000 -l 0"
         print "graph_vlabel seconds"
-        print "graph_category ArangoDB"
+        print "graph_category db"
         print "total.label total"
         print "connection.label connection"
         print "request.label request"
@@ -108,7 +108,7 @@ def doConfig(plugin_name):
         print "graph_title ArangoDB total bytes"
         print "graph_args --base 1024"
         print "graph_vlabel total bytes received (-) / sent (+)"
-        print "graph_category ArangoDB"
+        print "graph_category db"
         print "graph_order received sent"
         print "received.graph no"
         print "received.draw LINE2"
diff --git a/plugins/bitcoin/btcguild_hashrate_ b/plugins/bitcoin/btcguild_hashrate_
index 9446fff0..25e9f2a0 100644
--- a/plugins/bitcoin/btcguild_hashrate_
+++ b/plugins/bitcoin/btcguild_hashrate_
@@ -28,7 +28,7 @@ if command == 'config':
     print "graph_title BTCGuild Hashrate"
     print "graph_args --upper-limit 3000 -l 0"
     print "graph_vlabel MHash/s"
-    print "graph_category Bitcoin"
+    print "graph_category htc"
     for worker in workers:
         label = workers[worker]['worker_name']
         print label + ".label " + label
diff --git a/plugins/bitcoin/slush_hashrate_ b/plugins/bitcoin/slush_hashrate_
index 9201c917..b07493fc 100644
--- a/plugins/bitcoin/slush_hashrate_
+++ b/plugins/bitcoin/slush_hashrate_
@@ -25,7 +25,7 @@ if command == 'config':
     print "graph_title Slush Hashrate"
     print "graph_args --upper-limit 3000 -l 0"
     print "graph_vlabel MHash/s"
-    print "graph_category Bitcoin"
+    print "graph_category htc"
     for worker in workers:
         label = worker.replace(".","_")
         print label + ".label " +label
diff --git a/plugins/bitcoin/slush_reward_ b/plugins/bitcoin/slush_reward_
index 36c22cdd..2986ea00 100644
--- a/plugins/bitcoin/slush_reward_
+++ b/plugins/bitcoin/slush_reward_
@@ -24,7 +24,7 @@ if command == 'config':
     print "graph_title Slush Rewards"
     print "graph_args -l 0"
     print "graph_vlabel BTC"
-    print "graph_category Bitcoin"
+    print "graph_category htc"
     print "unconfirmed_reward.label Unconfirmed Reward"
     print "estimated_reward.label Estimeated Reward"
     print "confirmed_reward.label Confirmed Reward"
diff --git a/plugins/boinc/boinc_credit b/plugins/boinc/boinc_credit
index b21472bb..96cab8dd 100755
--- a/plugins/boinc/boinc_credit
+++ b/plugins/boinc/boinc_credit
@@ -205,7 +205,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
     print <<EOF;
 graph_args --base 1000 --logarithmic
 graph_vlabel Cobblestones
-graph_category boinc
+graph_category htc
 graph_title BOINC Total Credit
 EOF
     foreach ( sort { $a->{id} <=> $b->{id} } @projdata ) {
diff --git a/plugins/boinc/boinc_estwk b/plugins/boinc/boinc_estwk
index f2634d00..0042f19e 100755
--- a/plugins/boinc/boinc_estwk
+++ b/plugins/boinc/boinc_estwk
@@ -101,7 +101,7 @@ if ( (defined $ARGV[0]) && ($ARGV[0] eq "config") ) {
   }
 
   print "graph_title BOINC work cache estimation\n";
-  print "graph_category BOINC\n";
+  print "graph_category htc\n";
   print "graph_args --base 1000 -l 0 --alt-autoscale-max\n";
   print "graph_vlabel Hours\n";
   print "graph_scale no\n";
diff --git a/plugins/boinc/boinc_processes b/plugins/boinc/boinc_processes
index 61854b57..adf6f584 100755
--- a/plugins/boinc/boinc_processes
+++ b/plugins/boinc/boinc_processes
@@ -98,7 +98,7 @@ sub config {
   while (chomp($reply = <$client>) && ($reply ne "</boinc_gui_rpc_reply>")) {
     if ($reply =~ /<domain_name>(.*)<\/domain_name>/) {
       print "graph_title BOINC task progress [$1]\n";
-      print "graph_category boinc\n";
+      print "graph_category htc\n";
       print "graph_args -l 0\n";
       print "graph_vlabel %\n";
     }  
diff --git a/plugins/boinc/boinc_projs b/plugins/boinc/boinc_projs
index f471c117..25ee64b6 100755
--- a/plugins/boinc/boinc_projs
+++ b/plugins/boinc/boinc_projs
@@ -228,7 +228,7 @@ if ( (defined $ARGV[0]) && ($ARGV[0] eq "config") ) {
   }
 
   print "graph_title Running BOINC processes\n";
-  print "graph_category BOINC\n";
+  print "graph_category htc\n";
   print "graph_args --base 1000 -l 0\n";
   print "graph_vlabel BOINC applications\n";
   print "graph_total Total\n";
diff --git a/plugins/boinc/boinc_wus b/plugins/boinc/boinc_wus
index 910690f8..3c9515cc 100755
--- a/plugins/boinc/boinc_wus
+++ b/plugins/boinc/boinc_wus
@@ -238,7 +238,7 @@ if ( (defined $ARGV[0]) && ($ARGV[0] eq "config") ) {
   }
 
   print "graph_title BOINC work status\n";
-  print "graph_category BOINC\n";
+  print "graph_category htc\n";
   print "graph_args --base 1000 -l 0\n";
   print "graph_vlabel Workunits\n";
   print "graph_total total\n";
diff --git a/plugins/condor/condor_activity_ b/plugins/condor/condor_activity_
index 3f779b74..2ba11cb8 100755
--- a/plugins/condor/condor_activity_
+++ b/plugins/condor/condor_activity_
@@ -68,7 +68,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_vlabel VMs"
 	echo "graph_scale no"
 	echo "graph_info Shows slot activity from condor_status."
-	echo "graph_category Condor"
+	echo "graph_category htc"
 	echo "graph_period second"
 	echo "idl.label Idle"
 	echo "idl.draw AREA"
diff --git a/plugins/condor/condor_ops_ b/plugins/condor/condor_ops_
index 7df8ffae..6f663a81 100755
--- a/plugins/condor/condor_ops_
+++ b/plugins/condor/condor_ops_
@@ -68,7 +68,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_vlabel MIPS, MFLOPS'
 	echo 'graph_scale no'
 	echo 'graph_info Shows MIPS and MFLOPS from condor_status.'
-	echo 'graph_category Condor'
+	echo 'graph_category htc'
 	echo 'graph_period second'
 	echo 'mips_cur.label MIPS claimed'
 	echo 'mips_cur.draw LINE2'
@@ -108,4 +108,3 @@ eval $CS $CONS -totals -server | awk 'BEGIN { mipsc=0; mflopsc=0 } /Total/ {mips
 #       Machines         MIPS       KFLOPS   AvgLoadAvg
 # Total       28       104576     29093286   0.960
 eval $CS $CONS -totals -server -claimed | awk 'BEGIN { mipsc=0; mflopsc=0 } /Total/ { mipsc = $3; kflopsc = $4; mflopsc = int(kflopsc/1000) } END {print "mips_cur.value " mipsc "\nmflops_cur.value " mflopsc}'
-															    
\ No newline at end of file
diff --git a/plugins/condor/condor_queue_ b/plugins/condor/condor_queue_
index c84ae4bf..ab9eabc5 100755
--- a/plugins/condor/condor_queue_
+++ b/plugins/condor/condor_queue_
@@ -70,7 +70,7 @@ if [ "$1" = "config" ]; then
     echo "graph_vlabel Jobs"
     echo "graph_scale no"
     echo "graph_info Shows global Condor queue from condor_q -g."
-    echo "graph_category Condor"
+    echo "graph_category htc"
     echo "graph_period second"
     echo "held.label Held"
     echo "held.draw AREA"
@@ -93,4 +93,3 @@ fi
 
 # example: 3076 jobs; 3052 idle, 24 running, 0 held
 $CQ -g $OPTIONS | tail -n1 | awk '{print "queue.value " $1 "\nheld.value " $7 "\nrunning.value " $5 "\nidle.value " $3}'
-				  
\ No newline at end of file
diff --git a/plugins/condor/condor_states_ b/plugins/condor/condor_states_
index e3910257..bfb27125 100755
--- a/plugins/condor/condor_states_
+++ b/plugins/condor/condor_states_
@@ -67,7 +67,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_vlabel VMs'
 	echo 'graph_scale no'
 	echo 'graph_info Shows Condor slot states from condor_status.'
-	echo 'graph_category Condor'
+	echo 'graph_category htc'
 	echo 'graph_period second'
 	echo 'Preempting.label Preempting'
 	echo 'Preempting.draw AREA'
@@ -98,4 +98,3 @@ fi
 #   x86_64/LINUX     8     0       8         0       0          0        0
 #          Total    30     1      26         3       0          0        0
 eval $CS $CONS -total | awk '/Total   / {print "Preempting.value " $7 "\nClaimed.value " $4 "\nMatched.value " $6 "\nUnclaimed.value " $5 "\nOwner.value " $3 }'
-				    
\ No newline at end of file
diff --git a/plugins/heimdal/heimdal_kdc_bandwidth b/plugins/heimdal/heimdal_kdc_bandwidth
index 5a6e9b02..2c3303f6 100755
--- a/plugins/heimdal/heimdal_kdc_bandwidth
+++ b/plugins/heimdal/heimdal_kdc_bandwidth
@@ -47,7 +47,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
     print "graph_args --base 1024\n";
     print "graph_vlabel bytes / \${graph_period}\n";
     print "graph_scale yes\n";
-    print "graph_category Heimdal\n";
+    print "graph_category auth\n";
     print "bw.label Bytes sent\n";
     print "bw.type ABSOLUTE\n";
     print "bw.min 0\n";
diff --git a/plugins/heimdal/heimdal_kdc_requests b/plugins/heimdal/heimdal_kdc_requests
index 712855c5..ff2d97e8 100755
--- a/plugins/heimdal/heimdal_kdc_requests
+++ b/plugins/heimdal/heimdal_kdc_requests
@@ -94,7 +94,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
     print "graph_args --base 1000\n";
     print "graph_vlabel requests / \${graph_period}\n";
     print "graph_scale yes\n";
-    print "graph_category Heimdal\n";
+    print "graph_category auth\n";
     print "ipv4.label IPv4 requests\n";
     print "ipv4.type ABSOLUTE\n";
     print "ipv4.min 0\n";
diff --git a/plugins/other/wordpress b/plugins/wordpress/wordpress
similarity index 98%
rename from plugins/other/wordpress
rename to plugins/wordpress/wordpress
index 76cbafe8..f2f08a27 100755
--- a/plugins/other/wordpress
+++ b/plugins/wordpress/wordpress
@@ -56,6 +56,7 @@ Andre Darafarin, happypork.com
 
 if [ "$1" = "config" ]; then
 	echo 'graph_title Wordpress average'
+  echo 'graph_category cms'
 	echo 'graph_order posts comments pingbacks users'
 	echo 'graph_vlabel Wordpress'
 	echo 'graph_info Some Statistics of Wordpress'
diff --git a/plugins/other/wordpress-mu-or-network b/plugins/wordpress/wordpress-mu-or-network
similarity index 98%
rename from plugins/other/wordpress-mu-or-network
rename to plugins/wordpress/wordpress-mu-or-network
index f62a75dd..a23074fe 100755
--- a/plugins/other/wordpress-mu-or-network
+++ b/plugins/wordpress/wordpress-mu-or-network
@@ -59,6 +59,7 @@ Andre Darafarin, happypork.com
 if [ "$1" = "config" ]; then
         echo 'graph_title Wordpress average'
         echo 'graph_order posts comments pingbacks users'
+        echo 'graph_category cms'
         echo 'graph_vlabel Wordpress'
         echo 'graph_info Some Statistics of Wordpress'
         echo 'posts.label Posts'
diff --git a/plugins/other/wordpress-multisite b/plugins/wordpress/wordpress-multisite
similarity index 99%
rename from plugins/other/wordpress-multisite
rename to plugins/wordpress/wordpress-multisite
index 2a0c4d2e..17794010 100755
--- a/plugins/other/wordpress-multisite
+++ b/plugins/wordpress/wordpress-multisite
@@ -78,7 +78,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Wordpress Mulitsite"
 	echo "graph_order instances users posts comments pingbacks"
 	echo "graph_vlabel Wordpress"
-	echo "graph_category Wordpress"
+	echo "graph_category cms"
 	echo "graph_info Some Statistics of Wordpress"
 	echo "instances.label Instances"
 	echo "users.label Users"
diff --git a/plugins/other/wordpress2 b/plugins/wordpress/wordpress2
similarity index 97%
rename from plugins/other/wordpress2
rename to plugins/wordpress/wordpress2
index 81484fa8..c075b21a 100644
--- a/plugins/other/wordpress2
+++ b/plugins/wordpress/wordpress2
@@ -72,15 +72,12 @@ if(!empty($d["conf"]) && !empty($d["name"])) {
 	$d["tbpf"] = $table_prefix;
 }
 
-// In which category it should be displayed
-$category = "other";
-
 if($argv[1] == "config") {
 	echo 'graph_title wordpress statistic of '.$d["name"]."\n";
 	echo 'graph_order users posts comments pingbacks'."\n";
 	echo 'graph_vlabel Wordpress'."\n";
 	echo 'graph_info some wordpress statistics of '.$d["name"]."\n";
-	echo 'graph_category '.$category."\n";
+	echo 'graph_category cms'."\n";
 	echo 'users.label Users'."\n";
 	echo 'posts.label Posts'."\n";
 	echo 'posts.draw LINE3'."\n";