From e27bbbdcec2d7f5d77f518445217e0a9b1c90a66 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 14 May 2015 17:34:43 +1000
Subject: [PATCH] Consistency is key

---
 modules/backend/assets/less/controls/popup.less |  2 +-
 modules/system/console/PluginRemove.php         |  2 +-
 modules/system/console/ThemeRemove.php          | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/backend/assets/less/controls/popup.less b/modules/backend/assets/less/controls/popup.less
index dcbb1a79c..6a47a4d18 100644
--- a/modules/backend/assets/less/controls/popup.less
+++ b/modules/backend/assets/less/controls/popup.less
@@ -72,7 +72,7 @@
         &.size-giant { width: @popup-size-giant; }
     }
     @media (max-width: @screen-sm) {
-        &.size-adaptive { 
+        &.size-adaptive {
             width: auto;
             padding: 5px 0;
             margin: 0;
diff --git a/modules/system/console/PluginRemove.php b/modules/system/console/PluginRemove.php
index fbf95307f..283a9d2b7 100644
--- a/modules/system/console/PluginRemove.php
+++ b/modules/system/console/PluginRemove.php
@@ -47,7 +47,7 @@ class PluginRemove extends Command
             return $this->error(sprintf('Unable to find a registered plugin called "%s"', $pluginName));
         }
 
-        if (!$this->confirmToProceed(sprintf('This will DELETE "%s" from the filesystem and database.', $pluginName))) {
+        if (!$this->confirmToProceed(sprintf('This will DELETE plugin "%s" from the filesystem and database.', $pluginName))) {
             return;
         }
 
diff --git a/modules/system/console/ThemeRemove.php b/modules/system/console/ThemeRemove.php
index 9ebd777a9..19d27225d 100644
--- a/modules/system/console/ThemeRemove.php
+++ b/modules/system/console/ThemeRemove.php
@@ -2,12 +2,16 @@
 
 use Cms\Classes\Theme;
 use Cms\Classes\ThemeManager;
-use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
+use Illuminate\Console\Command;
 use Exception;
 
 class ThemeRemove extends Command
 {
+
+    use \Illuminate\Console\ConfirmableTrait;
+
     /**
      * The console command name.
      * @var string
@@ -48,7 +52,7 @@ class ThemeRemove extends Command
             return $this->error(sprintf('The theme %s does not exist.', $themeName));
         }
 
-        if (!$this->confirm(sprintf('Do you really wish to delete the theme %s? YOU CAN NOT UNDO THIS! [y|N]', $themeName), false)) {
+        if (!$this->confirmToProceed(sprintf('This will DELETE theme "%s" from the filesystem and database.', $themeName))) {
             return;
         }
 
@@ -79,6 +83,8 @@ class ThemeRemove extends Command
      */
     protected function getOptions()
     {
-        return [];
+        return [
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run.'],
+        ];
     }
 }