diff --git a/system/src/Grav/Console/Cli/DevTools/DevToolsCommand.php b/system/src/Grav/Console/Cli/DevTools/DevToolsCommand.php
index f2667520d..d64fcc5dc 100644
--- a/system/src/Grav/Console/Cli/DevTools/DevToolsCommand.php
+++ b/system/src/Grav/Console/Cli/DevTools/DevToolsCommand.php
@@ -103,6 +103,10 @@ class DevToolsCommand extends ConsoleCommand
                 $file = File::instance($componentFolder . DS . str_replace('.twig', '', $templateFile));
                 $file->content($content);
                 $file->save();
+
+                //Delete twig template
+                $file = File::instance($componentFolder . DS . $templateFile);
+                $file->delete();
             }
         }
     }
@@ -130,10 +134,10 @@ class DevToolsCommand extends ConsoleCommand
             case 'name':
                 //Check If name
                 if ($value == null || trim($value) == '') {
-                    throw new \RuntimeException('Plugin Name cannot be empty');
+                    throw new \RuntimeException('Name cannot be empty');
                 }
-                if (false != $this->gpm->findPackage($value) || false != $this->gpm->isPluginInstalled($value) || false != $this->gpm->isThemeInstalled($value)) {
-                    throw new \RuntimeException('Package exists (either as theme or plugin)');
+                if (false != $this->gpm->findPackage($value)) {
+                    throw new \RuntimeException('Package name exists in GPM');
                 }
 
                 break;
diff --git a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/README.md b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/README.md
deleted file mode 100644
index 32a2e69c2..000000000
--- a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# @@NAME@@
-
-The **@@NAME@@** Theme is for [Grav](http://github.com/getgrav/grav)
-
-@@DESCRIPTION@@
diff --git a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/README.md.twig b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/README.md.twig
new file mode 100644
index 000000000..5b80e3210
--- /dev/null
+++ b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/README.md.twig
@@ -0,0 +1,5 @@
+# {{ component.name|titleize }}
+
+The **{{ component.name|titleize }}** Plugin is for [Grav](http://github.com/getgrav/grav)
+
+{{ component.description }}
diff --git a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.php b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.php
deleted file mode 100644
index 1ff924068..000000000
--- a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
- namespace Grav\Theme;
-
- class Mytheme extends Antimatter
- {
-     // Some new methods, properties etc.
- }
-?>
diff --git a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.php.twig b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.php.twig
new file mode 100644
index 000000000..745ae476b
--- /dev/null
+++ b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.php.twig
@@ -0,0 +1,8 @@
+<?php
+ namespace Grav\Theme;
+
+ class {{ component.name|variableize }} extends {{ component.extends|variableize }}
+ {
+     // Some new methods, properties etc.
+ }
+?>
diff --git a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.yaml b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.yaml
deleted file mode 100644
index 6c8428e89..000000000
--- a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-streams:
- schemes:
-   theme:
-     type: ReadOnlyStream
-     prefixes:
-       '':
-         - user/themes/mytheme
-         - user/themes/antimatter
diff --git a/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.yaml.twig b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.yaml.twig
new file mode 100644
index 000000000..abcd204af
--- /dev/null
+++ b/system/src/Grav/Console/Cli/DevTools/components/theme/inheritence/theme.yaml.twig
@@ -0,0 +1,8 @@
+streams:
+ schemes:
+   theme:
+     type: ReadOnlyStream
+     prefixes:
+       '':
+         - user/themes/{{ component.name|hyphenize }}
+         - user/themes/{{ component.extends }}