diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 01503a58d..65cc2d850 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -17,7 +17,19 @@
 RED.palette = (function() {
 
     var exclusion = ['config','unknown','deprecated'];
-    var coreCategories = ['subflows', 'input', 'output', 'function', 'social', 'mobile', 'storage', 'analysis', 'advanced'];
+    var coreCategories = [
+        'subflows',
+        'flow',
+        'input',
+        'output',
+        'function',
+        'parser',
+        'social',
+        'mobile',
+        'storage',
+        'analysis',
+        'advanced'
+    ];
 
     var categoryContainers = {};
     var sidebarControls;
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.html b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
index 69fd9c8d1..f0f8d2393 100644
--- a/packages/node_modules/@node-red/nodes/core/core/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
@@ -156,7 +156,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('inject',{
-        category: 'input',
+        category: 'flow',
         color:"#a6bbcf",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.html b/packages/node_modules/@node-red/nodes/core/core/21-debug.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/core/core/21-debug.html
index 23962620b..f051d6f2a 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/core/21-debug.html
@@ -37,7 +37,7 @@
 (function() {
     var subWindow = null;
     RED.nodes.registerType('debug',{
-        category: 'output',
+        category: 'flow',
         defaults: {
             name: {value:""},
             active: {value:true},
diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.js b/packages/node_modules/@node-red/nodes/core/core/21-debug.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/58-debug.js
rename to packages/node_modules/@node-red/nodes/core/core/21-debug.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.html b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
index 97bd627d5..983bae39f 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
@@ -25,7 +25,7 @@
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('catch',{
-        category: 'input',
+        category: 'flow',
         color:"#e49191",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.html b/packages/node_modules/@node-red/nodes/core/core/25-status.html
index 68eb127a7..fff3de618 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-status.html
@@ -21,7 +21,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('status',{
-        category: 'input',
+        category: 'flow',
         color:"#d9f4fd",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.html b/packages/node_modules/@node-red/nodes/core/core/60-link.html
index 9efec0a04..31412ab1a 100644
--- a/packages/node_modules/@node-red/nodes/core/core/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/core/60-link.html
@@ -162,7 +162,7 @@
     }
 
     RED.nodes.registerType('link in',{
-        category: 'input',
+        category: 'flow',
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
@@ -191,7 +191,7 @@
     });
 
     RED.nodes.registerType('link out',{
-        category: 'output',
+        category: 'flow',
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/90-comment.html b/packages/node_modules/@node-red/nodes/core/core/90-comment.html
index 0ec6dfdb5..6d0e69439 100644
--- a/packages/node_modules/@node-red/nodes/core/core/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/core/core/90-comment.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('comment',{
-        category: 'function',
+        category: 'flow',
         color:"#ffffff",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
index caf6fe753..d42e702ba 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
@@ -62,7 +62,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('csv',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
index 2ce298d4b..043d60e2b 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
@@ -37,7 +37,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('html',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
index 15bf9cf6c..67323b228 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
@@ -27,7 +27,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('json',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
index 4b8e83674..52db99ff2 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
@@ -22,7 +22,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('xml',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
index 86ae10a98..6a9e4fd2e 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('yaml',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             property: {value:"payload",required:true},
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/de/core/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/locales/de/core/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/en-US/core/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/core/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/ja/core/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/locales/ja/core/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/ko/core/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/locales/ko/core/21-debug.html
diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js
index 679d24065..960cb6d17 100644
--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -243,7 +243,7 @@ module.exports = {
     // palette. If a node's category is not in the list, the category will get
     // added to the end of the palette.
     // If not set, the following default order is used:
-    //paletteCategories: ['subflows', 'input', 'output', 'function', 'social', 'mobile', 'storage', 'analysis', 'advanced'],
+    //paletteCategories: ['subflows','flow','input','output','function','parser','social','mobile','storage','analysis','advanced'],
 
     // Configure the logging output
     logging: {