diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php
index fb7c98635..22afc901d 100644
--- a/plugins/enigma/enigma.php
+++ b/plugins/enigma/enigma.php
@@ -435,7 +435,7 @@ class enigma extends rcube_plugin
                     'href' => "#",
                     'onclick' => "return ".JS_OBJECT_NAME.".enigma_import_attachment('".JQ($part)."')",
                     'title' => $this->gettext('keyattimport')),
-                    html::img(array('src' => $this->url('skins/default/key_add.png'), 'style' => "vertical-align:middle")))
+                    html::img(array('src' => $this->url('skins/classic/key_add.png'), 'style' => "vertical-align:middle")))
                 . ' ' . html::span(null, $this->gettext('keyattfound')));
 
             $attach_script = true;
diff --git a/plugins/enigma/skins/default/enigma.css b/plugins/enigma/skins/classic/enigma.css
similarity index 100%
rename from plugins/enigma/skins/default/enigma.css
rename to plugins/enigma/skins/classic/enigma.css
diff --git a/plugins/enigma/skins/default/enigma.png b/plugins/enigma/skins/classic/enigma.png
similarity index 100%
rename from plugins/enigma/skins/default/enigma.png
rename to plugins/enigma/skins/classic/enigma.png
diff --git a/plugins/enigma/skins/default/enigma_error.png b/plugins/enigma/skins/classic/enigma_error.png
similarity index 100%
rename from plugins/enigma/skins/default/enigma_error.png
rename to plugins/enigma/skins/classic/enigma_error.png
diff --git a/plugins/enigma/skins/default/key.png b/plugins/enigma/skins/classic/key.png
similarity index 100%
rename from plugins/enigma/skins/default/key.png
rename to plugins/enigma/skins/classic/key.png
diff --git a/plugins/enigma/skins/default/key_add.png b/plugins/enigma/skins/classic/key_add.png
similarity index 100%
rename from plugins/enigma/skins/default/key_add.png
rename to plugins/enigma/skins/classic/key_add.png
diff --git a/plugins/enigma/skins/default/keys_toolbar.png b/plugins/enigma/skins/classic/keys_toolbar.png
similarity index 100%
rename from plugins/enigma/skins/default/keys_toolbar.png
rename to plugins/enigma/skins/classic/keys_toolbar.png
diff --git a/plugins/enigma/skins/default/templates/keyimport.html b/plugins/enigma/skins/classic/templates/keyimport.html
similarity index 100%
rename from plugins/enigma/skins/default/templates/keyimport.html
rename to plugins/enigma/skins/classic/templates/keyimport.html
diff --git a/plugins/enigma/skins/default/templates/keyinfo.html b/plugins/enigma/skins/classic/templates/keyinfo.html
similarity index 100%
rename from plugins/enigma/skins/default/templates/keyinfo.html
rename to plugins/enigma/skins/classic/templates/keyinfo.html
diff --git a/plugins/enigma/skins/default/templates/keys.html b/plugins/enigma/skins/classic/templates/keys.html
similarity index 100%
rename from plugins/enigma/skins/default/templates/keys.html
rename to plugins/enigma/skins/classic/templates/keys.html
diff --git a/plugins/help/help.php b/plugins/help/help.php
index ad7dbf0ba..1a76cbbda 100644
--- a/plugins/help/help.php
+++ b/plugins/help/help.php
@@ -42,12 +42,11 @@ class help extends rcube_plugin
             'label'      => 'help.help',
         ), 'taskbar');
 
-        $skin = $rcmail->config->get('skin');
-        if (!file_exists($this->home."/skins/$skin/help.css"))
-            $skin = 'default';
-
-        // add style for taskbar button (must be here) and Help UI    
-        $this->include_stylesheet("skins/$skin/help.css");
+        // add style for taskbar button (must be here) and Help UI
+        $skin_path = $this->local_skin_path();
+        if (is_file($this->home . "/$skin_path/help.css")) {
+            $this->include_stylesheet("$skin_path/help.css");
+        }
     }
 
     function action()
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 3fb63cd5b..e7828f1da 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -109,16 +109,16 @@ class managesieve extends rcube_plugin
     function mail_task_handler()
     {
         // use jQuery for popup window
-        $this->require_plugin('jqueryui'); 
+        $this->require_plugin('jqueryui');
 
         // include js script and localization
         $this->init_ui();
 
         // include styles
-        $skin = $this->rc->config->get('skin');
-        if (!file_exists($this->home."/skins/$skin/managesieve_mail.css"))
-            $skin = 'default';
-        $this->include_stylesheet("skins/$skin/managesieve_mail.css");
+        $skin_path = $this->local_skin_path();
+        if (is_file($this->home . "/$skin_path/managesieve_mail.css")) {
+            $this->include_stylesheet("$skin_path/managesieve_mail.css");
+        }
 
         // add 'Create filter' item to message menu
         $this->api->add_content(html::tag('li', null,