diff --git a/bin/cli-plugins b/bin/cli-plugins
index aa2d8f234..e5c3dd657 100755
--- a/bin/cli-plugins
+++ b/bin/cli-plugins
@@ -20,6 +20,7 @@ const path = require('path');
 const spawn = require('cross-spawn');
 const semver = require('semver');
 const resolve = require('resolve');
+const stringify = require("json-stringify-pretty-compact");
 const {plugins, itteratePlugins, isInternal} = require('../plugins');
 
 function existsInNodeModules(name) {
@@ -312,7 +313,7 @@ async function createSeedPlugin() {
     },
     {
       type: 'confirm',
-      name: 'client',
+      name: 'addPluginsJson',
       message: 'Should we add it to the plugins.json?'
     }
   ]);
@@ -321,28 +322,69 @@ async function createSeedPlugin() {
   // Creating plugin seed
   //==============================================================================
 
-  const seedTemplatePlugin = path.join(dir, 'scripts/templates/plugin');
+  const seedPlugin = path.join(dir, 'scripts/templates/plugin');
   const newPluginPath = path.join(pluginsDir, answers.pluginName);
-  
-  try {
-    fs.copySync(seedTemplatePlugin, newPluginPath, {
-      filter: (p) => {
-        if (!answers.server) {
-          return /templates\/plugin\/server/.test(p);
-        } 
 
-        if (!answers.client) {
-          return /templates\/plugin\/client/.test(p);
+  if (fs.existsSync(seedPlugin)) {
+
+    if (answers.server && answers.client) {
+
+      // This is a server-side and client-side plugin!, let's copy the template
+      fs.copySync(seedPlugin, newPluginPath);
+    } else  {
+
+      fs.copySync(seedPlugin, newPluginPath, {filter: (p) => {
+
+        // Allowing plugin folder and files with no subfolders
+        const rootRx = /plugin$|plugin\/[^/]*(\.).{2,3}/igm;
+        if (rootRx.test(p) && (fs.lstatSync(p).isDirectory() || fs.lstatSync(p).isFile())) {
+          return true;
         }
 
-        return true;
-      }
-    });
+        // If it's a client-side plugin, copying client folder
+        if (answers.client) {
+          return /client/.test(p);
+        }
+
+        // If it's a server-side plugin, copying server folder
+        if (answers.server) {
+          return /server/.test(p);
+        }
+
+      }});
+    }
+
+    // Let's add this to the plugins.json
+    if (answers.addPluginsJson) {
+      const pluginsJson = path.join(dir, 'plugins.json');
+
+      fs.readJson(pluginsJson)
+        .then(j => {
+
+          // This is a client-side plugin, let's push this.
+          if (answers.client) {
+            j.client.push(answers.pluginName);
+            
+            const output = stringify(j);
+            fs.writeFileSync(pluginsJson, output);
+          }
+
+          // This is a server-side plugin, let's push this.
+          if (answers.server) {
+            j.server.push(answers.pluginName);
+
+            const output = stringify(j);
+            fs.writeFileSync(pluginsJson, output);
+          }
+        })
+        .catch(err => {
+          console.error(err);
+        });
+    }
+
+    console.log(`✨ Yay! Plugin created! Find your plugin: ${answers.pluginName} in the /plugins folder`);
+  } 
 
-    console.log(`✨ Yay! Talk Plugin Seed created! Find your plugin in the /plugins folder`);
-  } catch (err) {
-    console.error(err);
-  }
 }
 
 //==============================================================================
diff --git a/package.json b/package.json
index 218381896..7c99b46a2 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
     "immutability-helper": "^2.2.0",
     "inquirer": "^3.0.6",
     "joi": "^10.4.1",
+    "json-stringify-pretty-compact": "^1.0.4",
     "jsonwebtoken": "^7.3.0",
     "jwt-decode": "^2.2.0",
     "kue": "^0.11.5",
diff --git a/yarn.lock b/yarn.lock
index 9de2c35fa..c536e2901 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3290,6 +3290,14 @@ fs-extra@^0.26.4:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
+fs-extra@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
+
 fs-promise@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.3.1.tgz#bf34050368f24d6dc9dfc6688ab5cead8f86842a"
@@ -4614,6 +4622,10 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
+json-stringify-pretty-compact@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.0.4.tgz#d5161131be27fd9748391360597fcca250c6c5ce"
+
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -4632,6 +4644,12 @@ jsonfile@^2.1.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -8263,6 +8281,10 @@ uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
+universalify@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"