diff --git a/war/src/main/js/api/plugins.js b/war/src/main/js/api/plugins.js
index 4f3bcb967ed0ea4b53faefa6e5bac88da03fe5a5..9d7286af5b4314ef2a830043f155a2a474af515f 100644
--- a/war/src/main/js/api/plugins.js
+++ b/war/src/main/js/api/plugins.js
@@ -8,17 +8,27 @@
 // away from these.
 //
 exports.recommendedPlugins = [
+    "ant",
     "antisamy-markup-formatter",
-    "credentials",
+    "build-monitor-plugin",
+    "build-timeout",
+    "cloudbees-folder",
+    "credentials-binding",
+    "email-ext",
+    "git",
     "github-branch-source",
-    "junit",
+    "gradle",
+    "ldap",
     "mailer",
-    "matrix-auth",
-    "script-security",
+    // "matrix-auth",
+    "pam-auth",
+    "pipeline-stage-view",
+    "ssh-slaves",
     "subversion",
-    "translation",
+    "timestamper",
     "workflow-aggregator",
-    "workflow-multibranch"
+    "workflow-multibranch",
+    "ws-cleanup"
 ];
 
 //
@@ -27,50 +37,84 @@ exports.recommendedPlugins = [
 //
 exports.availablePlugins = [
     {
-        "category": "General",
-        "description": "(a collection of things I cannot think of a better name for)",
+        "category":"Organization and Administration",
         "plugins": [
-            { "name": "external-monitor-job" },
-            { "name": "translation" }
+            // { "name": "dashboard-view" },
+            { "name": "build-monitor-plugin" },
+            { "name": "cloudbees-folder" },
+            { "name": "antisamy-markup-formatter" }
         ]
     },
     {
-        "category":"Organization and Administration",
+        "category":"Build Features",
+        "description":"Add general purpose features to your jobs",
         "plugins": [
-            { "name": "antisamy-markup-formatter" }
+            { "name": "ansicolor" },
+            // { "name": "build-name-setter" },
+            { "name": "build-timeout" },
+            { "name": "config-file-provider" },
+            { "name": "credentials-binding" },
+            { "name": "rebuild" },
+            { "name": "ssh-agent" },
+            // { "name": "throttle-concurrents" },
+            { "name": "timestamper" }
+            // { "name": "ws-cleanup" }
         ]
     },
     {
         "category":"Build Tools",
         "plugins": [
             { "name": "ant" },
-            { "name": "maven-plugin" }
+            { "name": "gradle" },
+            { "name": "msbuild" },
+            { "name": "nodejs" }
         ]
     },
     {
         "category":"Build Analysis and Reporting",
         "plugins": [
-            { "name": "javadoc" },
-            { "name": "junit" }
+            // { "name": "checkstyle" },
+            // { "name": "cobertura" },
+            { "name": "htmlpublisher" },
+            { "name": "junit" },
+            // { "name": "sonar" },
+            // { "name": "warnings" },
+            { "name": "xunit" }
         ]
     },
     {
         "category":"Pipelines and Continuous Delivery",
         "plugins": [
             { "name": "workflow-aggregator" },
+            { "name": "workflow-multibranch" },
             { "name": "github-branch-source" },
-            { "name": "workflow-multibranch" }
+            { "name": "pipeline-stage-view" },
+            { "name": "build-pipeline-plugin" },
+            // { "name": "conditional-buildstep" },
+            // { "name": "jenkins-multijob-plugin" },
+            { "name": "parameterized-trigger" },
+            { "name": "copyartifact" }
         ]
     },
     {
-        "category":"SCM",
+        "category":"Source Code Management",
         "plugins": [
+            { "name": "bitbucket" },
+            { "name": "clearcase" },
             { "name": "cvs" },
-            { "name": "subversion" }
+            { "name": "git" },
+            { "name": "git-parameter" },
+            { "name": "github" },
+            { "name": "gitlab-plugin" },
+            { "name": "p4" },
+            { "name": "repo" },
+            { "name": "subversion" },
+            { "name": "teamconcert" },
+            { "name": "tfs" }
         ]
     },
     {
-        "category":"Distributed Builds and Containers",
+        "category":"Distributed Builds",
         "plugins": [
             { "name": "matrix-project" },
             { "name": "ssh-slaves" },
@@ -80,18 +124,22 @@ exports.availablePlugins = [
     {
         "category":"User Management and Security",
         "plugins": [            
-            { "name": "credentials" },
-            { "name": "ldap" },
-            { "name": "matrix-auth" },
+            // { "name": "matrix-auth" },
             { "name": "pam-auth" },
-            { "name": "script-security" },
-            { "name": "ssh-credentials" }
+            { "name": "ldap" },
+            // { "name": "role-strategy" },
+            { "name": "active-directory" }
         ]
     },
     {
         "category":"Notifications and Publishing",
         "plugins": [
-            { "name": "mailer" }
+            { "name": "email-ext" },
+            { "name": "emailext-template" },
+            { "name": "mailer" },
+            { "name": "publish-over-ssh" },
+            { "name": "slack" },
+            { "name": "ssh" }
         ]
     }
 ];
\ No newline at end of file