diff --git a/packages/web/lib/fog/bootmenu.class.php b/packages/web/lib/fog/bootmenu.class.php
index 8af8a6e515..f4518e89a1 100644
--- a/packages/web/lib/fog/bootmenu.class.php
+++ b/packages/web/lib/fog/bootmenu.class.php
@@ -221,8 +221,6 @@ public function __construct($Host = null)
             'FOG_KEYMAP',
             'FOG_KEY_SEQUENCE',
             'FOG_MEMTEST_KERNEL',
-            'FOG_PLUGIN_CAPONE_DMI',
-            'FOG_PLUGIN_CAPONE_SHUTDOWN',
             'FOG_PXE_BOOT_IMAGE',
             'FOG_PXE_BOOT_IMAGE_32',
             'FOG_PXE_HIDDENMENU_TIMEOUT',
@@ -240,8 +238,6 @@ public function __construct($Host = null)
             $keymap,
             $keySequence,
             $memtest,
-            $caponeDMI,
-            $caponeShutdown,
             $imagefile,
             $init_32,
             $hiddenTimeout,
@@ -261,53 +257,6 @@ public function __construct($Host = null)
             false,
             ''
         );
-        if (!in_array('capone', (array)$_SESSION['PluginsInstalled'])) {
-            $serviceNames = array(
-                'FOG_EFI_BOOT_EXIT_TYPE',
-                'FOG_KERNEL_ARGS',
-                'FOG_KERNEL_DEBUG',
-                'FOG_KERNEL_LOGLEVEL',
-                'FOG_KERNEL_RAMDISK_SIZE',
-                'FOG_KEYMAP',
-                'FOG_KEY_SEQUENCE',
-                'FOG_MEMTEST_KERNEL',
-                'FOG_PXE_BOOT_IMAGE',
-                'FOG_PXE_BOOT_IMAGE_32',
-                'FOG_PXE_HIDDENMENU_TIMEOUT',
-                'FOG_PXE_MENU_HIDDEN',
-                'FOG_PXE_MENU_TIMEOUT',
-                'FOG_TFTP_PXE_KERNEL',
-                'FOG_TFTP_PXE_KERNEL_32',
-            );
-            list(
-                $exit,
-                $kernelArgs,
-                $kernelDebug,
-                $kernelLogLevel,
-                $kernelRamDisk,
-                $keymap,
-                $keySequence,
-                $memtest,
-                $imagefile,
-                $init_32,
-                $hiddenTimeout,
-                $hiddenmenu,
-                $menuTimeout,
-                $bzImage,
-                $bzImage32
-            ) = self::getSubObjectIDs(
-                'Service',
-                array(
-                    'name' => $serviceNames
-                ),
-                'value',
-                false,
-                'AND',
-                'name',
-                false,
-                ''
-            );
-        }
         $memdisk = 'memdisk';
         $loglevel = $kernelLogLevel;
         $ramsize = $kernelRamDisk;
@@ -394,15 +343,8 @@ public function __construct($Host = null)
             )
         );
         $this->_initrd = "imgfetch $imagefile";
-        self::_caponeMenu(
-            $this->_storage,
-            $this->_path,
-            $this->_shutdown,
-            $caponeDMI,
-            $caponeShutdown,
-            $StorageNode,
-            self::$FOGCore
-        );
+        self::$HookManager
+            ->processEvent('BOOT_MENU_ITEM');
         $PXEMenuID = @max(
             self::getSubObjectIDs(
                 'PXEMenuOptions',
@@ -448,73 +390,6 @@ public function __construct($Host = null)
             $this->getTasking();
         }
     }
-    /**
-     * If it doesn't exist, create the capone menu
-     *
-     * @param string      $storage     the storage
-     * @param string      $path        the path
-     * @param mixed       $shutdown    if shutdown is to be used
-     * @param string      $DMISet      Capone's dmi field
-     * @param mixed       $Shutdown    Capone's shutdown field
-     * @param StorageNode $StorageNode The Storage Node to use
-     * @param FOGCore     $FOGCore     FOGCore class
-     *
-     * @return void
-     */
-    private static function _caponeMenu(
-        &$storage,
-        &$path,
-        &$shutdown,
-        $DMISet,
-        $Shutdown,
-        &$StorageNode,
-        &$FOGCore
-    ) {
-        if (!in_array('capone', (array)$_SESSION['PluginsInstalled'])) {
-            return;
-        }
-        if (!$DMISet) {
-            return;
-        }
-        $storage = $StorageNode->get('ip');
-        $path = $StorageNode->get('path');
-        $shutdown = $Shutdown;
-        $dmi = $DMISet;
-        $args = trim("mode=capone shutdown=$shutdown");
-        $CaponeMenu = self::getClass('PXEMenuOptions')
-            ->set('name', 'fog.capone')
-            ->load('name');
-        if (!$CaponeMenu->isValid()) {
-            $CaponeMenu->set('name', 'fog.capone')
-                ->set('description', _('Capone Deploy'))
-                ->set('args', $args)
-                ->set('params', null)
-                ->set('default', 0)
-                ->set('regMenu', 2);
-        }
-        $setArgs = explode(' ', trim($CaponeMenu->get('args')));
-        $neededArgs = explode(' ', trim($args));
-        $sureArgs = array();
-        array_walk(
-            $setArgs,
-            function (&$arg, &$index) use (&$sureArgs) {
-                if (!preg_match('#^dmi=#', $arg)) {
-                    $sureArgs[] = $arg;
-                }
-            }
-        );
-        $setArgs = $sureArgs;
-        array_walk(
-            $neededArgs,
-            function (&$arg, &$index) use (&$setArgs) {
-                if (!in_array($arg, $setArgs)) {
-                    $setArgs[] = $arg;
-                }
-            }
-        );
-        $setArgs[] = sprintf('dmi=%s', $dmi);
-        $CaponeMenu->set('args', implode(' ', $setArgs))->save();
-    }
     /**
      * Sets the default menu item
      *
diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
index ca25a25bcf..174d30608b 100644
--- a/packages/web/lib/fog/system.class.php
+++ b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '33');
+        define('FOG_VERSION', '15');
         define('FOG_SCHEMA', 244);
         define('FOG_BCACHE_VER', 110);
         define('FOG_SVN_REVISION', 6052);
diff --git a/packages/web/lib/pages/pluginmanagementpage.class.php b/packages/web/lib/pages/pluginmanagementpage.class.php
index 000b42fe94..41e4101c62 100644
--- a/packages/web/lib/pages/pluginmanagementpage.class.php
+++ b/packages/web/lib/pages/pluginmanagementpage.class.php
@@ -594,7 +594,10 @@ public function installedPost()
                 throw new Exception(_('Settings Updated'));
             }
             if (isset($_REQUEST['addass'])) {
-                $Image = self::getClass('Image', $_REQUEST['image']);
+                $Image = new Image($_REQUEST['image']);
+                if (!$Image->isValid()) {
+                    throw new Exception(_('Must have an image associated'));
+                }
                 $OS = $Image->getOS();
                 $Capone = self::getClass('Capone')
                     ->set('imageID', $_REQUEST['image'])
diff --git a/packages/web/lib/plugins/capone/hooks/addbootmenuitem.hook.php b/packages/web/lib/plugins/capone/hooks/addbootmenuitem.hook.php
new file mode 100644
index 0000000000..f6d1f81b17
--- /dev/null
+++ b/packages/web/lib/plugins/capone/hooks/addbootmenuitem.hook.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Creates the capone menu item.
+ *
+ * PHP Version 5
+ *
+ * @category AddBootMenuItem
+ * @package  FOGProject
+ * @author   Tom Elliott <tommygunsster@gmail.com>
+ * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
+ * @link     https://fogproject.org
+ */
+/**
+ * Creates the capone menu item.
+ *
+ * @category AddBootMenuItem
+ * @package  FOGProject
+ * @author   Tom Elliott <tommygunsster@gmail.com>
+ * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
+ * @link     https://fogproject.org
+ */
+class AddBootMenuItem extends Hook
+{
+    /**
+     * The name of this hook.
+     *
+     * @var string
+     */
+    public $name = 'AddBootMenuItem';
+    /**
+     * The description of this hook.
+     *
+     * @var string
+     */
+    public $description = 'Add capone menu item';
+    /**
+     * The active flag.
+     *
+     * @var bool
+     */
+    public $active = true;
+    /**
+     * The node this hook enacts with.
+     *
+     * @var string
+     */
+    public $node = 'capone';
+    /**
+     * Creates the storage node.
+     *
+     * @return void
+     */
+    public function addBootMenuItem()
+    {
+        if (!in_array($this->node, (array)$_SESSION['PluginsInstalled'])) {
+            return;
+        }
+        $dmi = self::getSetting('FOG_PLUGIN_CAPONE_DMI');
+        $shutdown = self::getSetting('FOG_PLUGIN_CAPONE_SHUTDOWN');
+        if (!$dmi) {
+            return;
+        }
+        $exists = self::getClass('PXEMenuOptionsManager')
+            ->exists('fog.capone', '', 'name');
+        $args = trim("mode=capone shutdown=$shutdown");
+        $entry = self::getClass('PXEMenuOptions')
+            ->set('name', 'fog.capone')
+            ->load('name');
+        if (!$exists) {
+            $entry
+                ->set('name', 'fog.capone')
+                ->set('description', _('Capone Deploy'))
+                ->set('args', $args)
+                ->set('params', null)
+                ->set('default', 0)
+                ->set('regMenu', 2);
+        }
+        $setArgs = explode(' ', trim($entry->get('args')));
+        $neededArgs = explode(' ', trim($args));
+        $sureArgs = array();
+        foreach ((array)$setArgs as &$arg) {
+            if (!preg_match('#^dmi=#', $arg)) {
+                $sureArgs[] = $arg;
+            }
+            unset($arg);
+        }
+        $setArgs = $sureArgs;
+        foreach ((array)$neededArgs as &$arg) {
+            if (!in_array($arg, $setArgs)) {
+                $setArgs[] = $arg;
+            }
+            unset($arg);
+        }
+        $setArgs[] = sprintf('dmi=%s', $dmi);
+        $entry
+            ->set('args', implode(' ', $setArgs))
+            ->save();
+    }
+}
+$HookManager
+    ->register(
+        'BOOT_MENU_ITEM',
+        array(
+            new AddBootMenuItem(),
+            'addBootMenuItem'
+        )
+    );
diff --git a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
index 9cdacc57a4..5032694b19 100644
--- a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fog-project-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 19:33-0500\n"
+"POT-Creation-Date: 2016-12-29 20:31-0500\n"
 "PO-Revision-Date: 2016-05-23 07:36-0400\n"
 "Last-Translator: vspushbullet <vspushbullet@gmail.com>\n"
 "Language-Team: German\n"
@@ -939,11 +939,7 @@ msgstr "Registriert"
 msgid "Set Failed"
 msgstr "Fehler beim"
 
-#: /var/www/fog/lib/fog/bootmenu.class.php:489
-msgid "Capone Deploy"
-msgstr "Capone bereitstellen"
-
-#: /var/www/fog/lib/fog/bootmenu.class.php:1481
+#: /var/www/fog/lib/fog/bootmenu.class.php:1356
 #, fuzzy
 msgid "No valid storage nodes found"
 msgstr "Ungültige Speicherknoten"
@@ -5966,20 +5962,25 @@ msgstr "Plugin installiert!"
 msgid "Settings Updated"
 msgstr "Einstellungen aktualisiert"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:604
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:599
+#, fuzzy
+msgid "Must have an image associated"
+msgstr "Snap-in muss zu einer Gruppe verknüpft haben"
+
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:607
 msgid "Failed to save assignment"
 msgstr "Fehler beim Speichern der Zuordnung"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:606
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:609
 msgid "Assignment saved successfully"
 msgstr "Auftrag erfolgreich gespeichert"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:612
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:615
 #, fuzzy
 msgid "Destroyed assignments"
 msgstr "Zerstörte Zuordnung"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:614
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:617
 msgid "Destroyed assignment"
 msgstr "Zerstörte Zuordnung"
 
@@ -6725,6 +6726,10 @@ msgstr "Aktuelle Sendung"
 msgid "WOL Broadcast Management"
 msgstr "WOL Broadcast Management"
 
+#: /var/www/fog/lib/plugins/capone/hooks/addbootmenuitem.hook.php:72
+msgid "Capone Deploy"
+msgstr "Capone bereitstellen"
+
 #: /var/www/fog/lib/db/pdodb.class.php:90
 #: /var/www/fog/lib/db/mysql.class.php:16
 msgid "Failed to connect"
@@ -9149,9 +9154,6 @@ msgstr "Es gibt keine Orte auf diesem Server."
 #~ "Eine Datei für das Snap-in verwenden müssen entweder hochgeladen oder aus "
 #~ "der bereits vorhandenen Liste ausgewählt werden"
 
-#~ msgid "Must have snapin associated to a group"
-#~ msgstr "Snap-in muss zu einer Gruppe verknüpft haben"
-
 #~ msgid "Snapin added, Editing now!"
 #~ msgstr "Snap-in hinzugefügt, jetzt bearbeiten!"
 
diff --git a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
index b49db3519e..8176bd54bb 100644
--- a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 19:33-0500\n"
+"POT-Creation-Date: 2016-12-29 20:31-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -932,11 +932,7 @@ msgstr "Registered"
 msgid "Set Failed"
 msgstr "Failed"
 
-#: /var/www/fog/lib/fog/bootmenu.class.php:489
-msgid "Capone Deploy"
-msgstr "Capone Deploy"
-
-#: /var/www/fog/lib/fog/bootmenu.class.php:1481
+#: /var/www/fog/lib/fog/bootmenu.class.php:1356
 #, fuzzy
 msgid "No valid storage nodes found"
 msgstr "Invalid storage node"
@@ -5944,20 +5940,25 @@ msgstr "Plugin Installed!"
 msgid "Settings Updated"
 msgstr "Settings Updated"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:604
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:599
+#, fuzzy
+msgid "Must have an image associated"
+msgstr "Must have snapin associated to a group"
+
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:607
 msgid "Failed to save assignment"
 msgstr "Failed to save assignment"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:606
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:609
 msgid "Assignment saved successfully"
 msgstr "Assignment saved successfully"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:612
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:615
 #, fuzzy
 msgid "Destroyed assignments"
 msgstr "Destroyed assignment"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:614
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:617
 msgid "Destroyed assignment"
 msgstr "Destroyed assignment"
 
@@ -6701,6 +6702,10 @@ msgstr "Broadcast Updated"
 msgid "WOL Broadcast Management"
 msgstr "WOL Broadcast Management"
 
+#: /var/www/fog/lib/plugins/capone/hooks/addbootmenuitem.hook.php:72
+msgid "Capone Deploy"
+msgstr "Capone Deploy"
+
 #: /var/www/fog/lib/db/pdodb.class.php:90
 #: /var/www/fog/lib/db/mysql.class.php:16
 msgid "Failed to connect"
@@ -9097,9 +9102,6 @@ msgstr "There are no locations on this server."
 #~ "A file to use for the snapin must be either uploaded or chosen from the "
 #~ "already present list"
 
-#~ msgid "Must have snapin associated to a group"
-#~ msgstr "Must have snapin associated to a group"
-
 #~ msgid "Snapin added, Editing now!"
 #~ msgstr "Snapin added, Editing now!"
 
diff --git a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
index a73b29e0d4..8789649b24 100755
--- a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 19:33-0500\n"
+"POT-Creation-Date: 2016-12-29 20:31-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -935,11 +935,7 @@ msgstr "Registrado"
 msgid "Set Failed"
 msgstr "Ha fallado"
 
-#: /var/www/fog/lib/fog/bootmenu.class.php:489
-msgid "Capone Deploy"
-msgstr "Implementar Capone"
-
-#: /var/www/fog/lib/fog/bootmenu.class.php:1481
+#: /var/www/fog/lib/fog/bootmenu.class.php:1356
 #, fuzzy
 msgid "No valid storage nodes found"
 msgstr "nodo de almacenamiento no válido"
@@ -5961,20 +5957,25 @@ msgstr "Plugin Instalado!"
 msgid "Settings Updated"
 msgstr "Ajustes actualizan"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:604
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:599
+#, fuzzy
+msgid "Must have an image associated"
+msgstr "Debe haber SNAPin asociado a un grupo"
+
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:607
 msgid "Failed to save assignment"
 msgstr "No se pudo guardar la asignación"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:606
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:609
 msgid "Assignment saved successfully"
 msgstr "Asignación guardado correctamente"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:612
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:615
 #, fuzzy
 msgid "Destroyed assignments"
 msgstr "asignación destruida"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:614
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:617
 msgid "Destroyed assignment"
 msgstr "asignación destruida"
 
@@ -6719,6 +6720,10 @@ msgstr "Actualización de difusión"
 msgid "WOL Broadcast Management"
 msgstr "Gestión WOL Broadcast"
 
+#: /var/www/fog/lib/plugins/capone/hooks/addbootmenuitem.hook.php:72
+msgid "Capone Deploy"
+msgstr "Implementar Capone"
+
 #: /var/www/fog/lib/db/pdodb.class.php:90
 #: /var/www/fog/lib/db/mysql.class.php:16
 msgid "Failed to connect"
@@ -9144,9 +9149,6 @@ msgstr "No hay lugares en este servidor."
 #~ "Un archivo que se utilizará para la snapin se debe subir o elegido de la "
 #~ "lista ya está presente"
 
-#~ msgid "Must have snapin associated to a group"
-#~ msgstr "Debe haber SNAPin asociado a un grupo"
-
 #~ msgid "Snapin added, Editing now!"
 #~ msgstr "Snapin añadió, Edición de ahora!"
 
diff --git a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
index fb9b6e72f3..a930216440 100644
--- a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 19:33-0500\n"
+"POT-Creation-Date: 2016-12-29 20:31-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -939,11 +939,7 @@ msgstr "Inscrit"
 msgid "Set Failed"
 msgstr "Échoué"
 
-#: /var/www/fog/lib/fog/bootmenu.class.php:489
-msgid "Capone Deploy"
-msgstr "Capone Déployer"
-
-#: /var/www/fog/lib/fog/bootmenu.class.php:1481
+#: /var/www/fog/lib/fog/bootmenu.class.php:1356
 #, fuzzy
 msgid "No valid storage nodes found"
 msgstr "nœud de stockage non valide"
@@ -5968,20 +5964,25 @@ msgstr "Plugin installé!"
 msgid "Settings Updated"
 msgstr "Paramètres mis à jour"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:604
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:599
+#, fuzzy
+msgid "Must have an image associated"
+msgstr "Doit avoir SnapIn associé à un groupe"
+
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:607
 msgid "Failed to save assignment"
 msgstr "Impossible d'enregistrer la cession"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:606
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:609
 msgid "Assignment saved successfully"
 msgstr "Cession enregistré avec succès"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:612
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:615
 #, fuzzy
 msgid "Destroyed assignments"
 msgstr "cession Destroyed"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:614
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:617
 msgid "Destroyed assignment"
 msgstr "cession Destroyed"
 
@@ -6726,6 +6727,10 @@ msgstr "Diffusion Mise à jour"
 msgid "WOL Broadcast Management"
 msgstr "Gestion WOL Diffusion"
 
+#: /var/www/fog/lib/plugins/capone/hooks/addbootmenuitem.hook.php:72
+msgid "Capone Deploy"
+msgstr "Capone Déployer"
+
 #: /var/www/fog/lib/db/pdodb.class.php:90
 #: /var/www/fog/lib/db/mysql.class.php:16
 msgid "Failed to connect"
@@ -9151,9 +9156,6 @@ msgstr "Il n'y a aucun emplacement sur ce serveur."
 #~ "Un fichier à utiliser pour la snapin doit être soit téléchargé ou choisi "
 #~ "parmi la liste déjà présente"
 
-#~ msgid "Must have snapin associated to a group"
-#~ msgstr "Doit avoir SnapIn associé à un groupe"
-
 #~ msgid "Snapin added, Editing now!"
 #~ msgstr "Snapin ajouté, Edition maintenant!"
 
diff --git a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
index 708418a515..62988dc9f5 100644
--- a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 19:33-0500\n"
+"POT-Creation-Date: 2016-12-29 20:31-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -934,11 +934,7 @@ msgstr "Registrato"
 msgid "Set Failed"
 msgstr "fallito"
 
-#: /var/www/fog/lib/fog/bootmenu.class.php:489
-msgid "Capone Deploy"
-msgstr "Capone Deploy"
-
-#: /var/www/fog/lib/fog/bootmenu.class.php:1481
+#: /var/www/fog/lib/fog/bootmenu.class.php:1356
 #, fuzzy
 msgid "No valid storage nodes found"
 msgstr "nodo di archiviazione non valido"
@@ -5953,20 +5949,25 @@ msgstr "Plugin Installed!"
 msgid "Settings Updated"
 msgstr "Impostazioni aggiornate"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:604
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:599
+#, fuzzy
+msgid "Must have an image associated"
+msgstr "Deve aver snap-in associato ad un gruppo"
+
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:607
 msgid "Failed to save assignment"
 msgstr "Impossibile salvare l'assegnazione"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:606
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:609
 msgid "Assignment saved successfully"
 msgstr "Assegnazione salvata"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:612
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:615
 #, fuzzy
 msgid "Destroyed assignments"
 msgstr "assegnazione distrutto"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:614
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:617
 msgid "Destroyed assignment"
 msgstr "assegnazione distrutto"
 
@@ -6712,6 +6713,10 @@ msgstr "Broadcast aggiornato"
 msgid "WOL Broadcast Management"
 msgstr "Gestione WOL Broadcast"
 
+#: /var/www/fog/lib/plugins/capone/hooks/addbootmenuitem.hook.php:72
+msgid "Capone Deploy"
+msgstr "Capone Deploy"
+
 #: /var/www/fog/lib/db/pdodb.class.php:90
 #: /var/www/fog/lib/db/mysql.class.php:16
 msgid "Failed to connect"
@@ -9133,9 +9138,6 @@ msgstr "Non ci sono posizioni su questo server."
 #~ "Un file da utilizzare per lo snap-in deve essere sia caricato o scelto "
 #~ "dalla lista già presente"
 
-#~ msgid "Must have snapin associated to a group"
-#~ msgstr "Deve aver snap-in associato ad un gruppo"
-
 #~ msgid "Snapin added, Editing now!"
 #~ msgstr "Snapin aggiunto, Modifica ora!"
 
diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
index 6ae5aa7b7e..09d45b3a78 100644
--- a/packages/web/management/languages/messages.pot
+++ b/packages/web/management/languages/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-29 18:54-0500\n"
+"POT-Creation-Date: 2016-12-29 20:31-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -855,11 +855,7 @@ msgstr ""
 msgid "Set Failed"
 msgstr ""
 
-#: /var/www/fog/lib/fog/bootmenu.class.php:489
-msgid "Capone Deploy"
-msgstr ""
-
-#: /var/www/fog/lib/fog/bootmenu.class.php:1481
+#: /var/www/fog/lib/fog/bootmenu.class.php:1356
 msgid "No valid storage nodes found"
 msgstr ""
 
@@ -5686,19 +5682,23 @@ msgstr ""
 msgid "Settings Updated"
 msgstr ""
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:604
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:599
+msgid "Must have an image associated"
+msgstr ""
+
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:607
 msgid "Failed to save assignment"
 msgstr ""
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:606
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:609
 msgid "Assignment saved successfully"
 msgstr ""
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:612
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:615
 msgid "Destroyed assignments"
 msgstr ""
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:614
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:617
 msgid "Destroyed assignment"
 msgstr ""
 
@@ -6399,6 +6399,10 @@ msgstr ""
 msgid "WOL Broadcast Management"
 msgstr ""
 
+#: /var/www/fog/lib/plugins/capone/hooks/addbootmenuitem.hook.php:72
+msgid "Capone Deploy"
+msgstr ""
+
 #: /var/www/fog/lib/db/pdodb.class.php:90
 #: /var/www/fog/lib/db/mysql.class.php:16
 msgid "Failed to connect"
diff --git a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
index 7a5973d070..5b1249649d 100644
--- a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 19:33-0500\n"
+"POT-Creation-Date: 2016-12-29 20:31-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -935,11 +935,7 @@ msgstr "Registrado"
 msgid "Set Failed"
 msgstr "fracassado"
 
-#: /var/www/fog/lib/fog/bootmenu.class.php:489
-msgid "Capone Deploy"
-msgstr "Capone Deploy"
-
-#: /var/www/fog/lib/fog/bootmenu.class.php:1481
+#: /var/www/fog/lib/fog/bootmenu.class.php:1356
 #, fuzzy
 msgid "No valid storage nodes found"
 msgstr "nó de armazenamento inválido"
@@ -5949,20 +5945,25 @@ msgstr "Plugin instalado!"
 msgid "Settings Updated"
 msgstr "Configurações atualizadas"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:604
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:599
+#, fuzzy
+msgid "Must have an image associated"
+msgstr "Deve ter Snapin associado a um grupo"
+
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:607
 msgid "Failed to save assignment"
 msgstr "Falha ao salvar a atribuição"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:606
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:609
 msgid "Assignment saved successfully"
 msgstr "Atribuição salvas com sucesso"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:612
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:615
 #, fuzzy
 msgid "Destroyed assignments"
 msgstr "atribuição destruída"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:614
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:617
 msgid "Destroyed assignment"
 msgstr "atribuição destruída"
 
@@ -6706,6 +6707,10 @@ msgstr "transmitido Atualizado"
 msgid "WOL Broadcast Management"
 msgstr "Gestão WOL Transmissão"
 
+#: /var/www/fog/lib/plugins/capone/hooks/addbootmenuitem.hook.php:72
+msgid "Capone Deploy"
+msgstr "Capone Deploy"
+
 #: /var/www/fog/lib/db/pdodb.class.php:90
 #: /var/www/fog/lib/db/mysql.class.php:16
 msgid "Failed to connect"
@@ -9122,9 +9127,6 @@ msgstr "Não há locais neste servidor."
 #~ "Um arquivo a ser usado para o snap-in deve ser ou carregado ou escolhido "
 #~ "a partir do já presente lista"
 
-#~ msgid "Must have snapin associated to a group"
-#~ msgstr "Deve ter Snapin associado a um grupo"
-
 #~ msgid "Snapin added, Editing now!"
 #~ msgstr "Snapin acrescentou, edição agora!"
 
diff --git a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
index ff9ae12370..c3d03bd12a 100644
--- a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 19:33-0500\n"
+"POT-Creation-Date: 2016-12-29 20:31-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -928,11 +928,7 @@ msgstr "注册"
 msgid "Set Failed"
 msgstr "失败"
 
-#: /var/www/fog/lib/fog/bootmenu.class.php:489
-msgid "Capone Deploy"
-msgstr "卡波恩部署"
-
-#: /var/www/fog/lib/fog/bootmenu.class.php:1481
+#: /var/www/fog/lib/fog/bootmenu.class.php:1356
 #, fuzzy
 msgid "No valid storage nodes found"
 msgstr "无效的存储节点"
@@ -5926,20 +5922,25 @@ msgstr "插件安装好了！"
 msgid "Settings Updated"
 msgstr "设置更新"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:604
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:599
+#, fuzzy
+msgid "Must have an image associated"
+msgstr "必须有管理单元与组关联"
+
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:607
 msgid "Failed to save assignment"
 msgstr "无法保存分配"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:606
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:609
 msgid "Assignment saved successfully"
 msgstr "转让成功保存"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:612
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:615
 #, fuzzy
 msgid "Destroyed assignments"
 msgstr "销毁作业"
 
-#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:614
+#: /var/www/fog/lib/pages/pluginmanagementpage.class.php:617
 msgid "Destroyed assignment"
 msgstr "销毁作业"
 
@@ -6681,6 +6682,10 @@ msgstr "广播更新"
 msgid "WOL Broadcast Management"
 msgstr "WOL广播管理"
 
+#: /var/www/fog/lib/plugins/capone/hooks/addbootmenuitem.hook.php:72
+msgid "Capone Deploy"
+msgstr "卡波恩部署"
+
 #: /var/www/fog/lib/db/pdodb.class.php:90
 #: /var/www/fog/lib/db/mysql.class.php:16
 msgid "Failed to connect"
@@ -9035,9 +9040,6 @@ msgstr "有此服务器上没有的位置。"
 #~ "already present list"
 #~ msgstr "要使用的管理单元的文件必须要么上传或从已存在列表中选择"
 
-#~ msgid "Must have snapin associated to a group"
-#~ msgstr "必须有管理单元与组关联"
-
 #~ msgid "Snapin added, Editing now!"
 #~ msgstr "管理单元补充说，现在编辑！"