62 files changed, 45 insertions, 44 deletions

diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
index 9ef91d16d..e5d411e18 100644
--- a/plugins/acl/package.xml
+++ b/plugins/acl/package.xml
@@ -38,10 +38,10 @@
 			<file name="localization/de_DE.inc" role="data"></file>
 			<file name="localization/en_US.inc" role="data"></file>
 			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="skins/default/acl.css" role="data"></file>
-			<file name="skins/default/images/enabled.png" role="data"></file>
-			<file name="skins/default/images/partial.png" role="data"></file>
-			<file name="skins/default/templates/table.html" role="data"></file>
+			<file name="skins/classic/acl.css" role="data"></file>
+			<file name="skins/classic/images/enabled.png" role="data"></file>
+			<file name="skins/classic/images/partial.png" role="data"></file>
+			<file name="skins/classic/templates/table.html" role="data"></file>
 			<file name="skins/larry/acl.css" role="data"></file>
 			<file name="skins/larry/images/enabled.png" role="data"></file>
 			<file name="skins/larry/images/partial.png" role="data"></file>
diff --git a/plugins/acl/skins/default/acl.css b/plugins/acl/skins/classic/acl.css
index cf3391f49..cf3391f49 100644
--- a/plugins/acl/skins/default/acl.css
+++ b/plugins/acl/skins/classic/acl.css
diff --git a/plugins/acl/skins/default/images/enabled.png b/plugins/acl/skins/classic/images/enabled.png
index 98215f68c..98215f68c 100644
--- a/plugins/acl/skins/default/images/enabled.png
+++ b/plugins/acl/skins/classic/images/enabled.png
diff --git a/plugins/acl/skins/default/images/partial.png b/plugins/acl/skins/classic/images/partial.png
index 12023f057..12023f057 100644
--- a/plugins/acl/skins/default/images/partial.png
+++ b/plugins/acl/skins/classic/images/partial.png
diff --git a/plugins/acl/skins/default/templates/table.html b/plugins/acl/skins/classic/templates/table.html
index bca63d0b3..bca63d0b3 100644
--- a/plugins/acl/skins/default/templates/table.html
+++ b/plugins/acl/skins/classic/templates/table.html
diff --git a/plugins/archive/package.xml b/plugins/archive/package.xml
index 0d02b2d41..1aeffaf41 100644
--- a/plugins/archive/package.xml
+++ b/plugins/archive/package.xml
@@ -50,9 +50,9 @@
 			<file name="localization/ru_RU.inc" role="data"></file>
 			<file name="localization/sv_SE.inc" role="data"></file>
 			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/default/archive_act.png" role="data"></file>
-			<file name="skins/default/archive_pas.png" role="data"></file>
-			<file name="skins/default/foldericon.png" role="data"></file>
+			<file name="skins/classic/archive_act.png" role="data"></file>
+			<file name="skins/classic/archive_pas.png" role="data"></file>
+			<file name="skins/classic/foldericon.png" role="data"></file>
 		</dir>
 		<!-- / -->
 	</contents>
diff --git a/plugins/archive/skins/default/archive.css b/plugins/archive/skins/classic/archive.css
index 3880fe3da..3880fe3da 100644
--- a/plugins/archive/skins/default/archive.css
+++ b/plugins/archive/skins/classic/archive.css
diff --git a/plugins/archive/skins/default/archive_act.png b/plugins/archive/skins/classic/archive_act.png
index 2a1735868..2a1735868 100644
--- a/plugins/archive/skins/default/archive_act.png
+++ b/plugins/archive/skins/classic/archive_act.png
diff --git a/plugins/archive/skins/default/archive_pas.png b/plugins/archive/skins/classic/archive_pas.png
index 8de208583..8de208583 100644
--- a/plugins/archive/skins/default/archive_pas.png
+++ b/plugins/archive/skins/classic/archive_pas.png
diff --git a/plugins/archive/skins/default/foldericon.png b/plugins/archive/skins/classic/foldericon.png
index ec0853c44..ec0853c44 100644
--- a/plugins/archive/skins/default/foldericon.png
+++ b/plugins/archive/skins/classic/foldericon.png
diff --git a/plugins/enigma/skins/default/enigma.css b/plugins/enigma/skins/classic/enigma.css
index b1c656f82..b1c656f82 100644
--- a/plugins/enigma/skins/default/enigma.css
+++ b/plugins/enigma/skins/classic/enigma.css
diff --git a/plugins/enigma/skins/default/enigma.png b/plugins/enigma/skins/classic/enigma.png
index 3ef106e2a..3ef106e2a 100644
--- a/plugins/enigma/skins/default/enigma.png
+++ b/plugins/enigma/skins/classic/enigma.png
diff --git a/plugins/enigma/skins/default/enigma_error.png b/plugins/enigma/skins/classic/enigma_error.png
index 9bf100efd..9bf100efd 100644
--- a/plugins/enigma/skins/default/enigma_error.png
+++ b/plugins/enigma/skins/classic/enigma_error.png
diff --git a/plugins/enigma/skins/default/key.png b/plugins/enigma/skins/classic/key.png
index ea1cbd11c..ea1cbd11c 100644
--- a/plugins/enigma/skins/default/key.png
+++ b/plugins/enigma/skins/classic/key.png
diff --git a/plugins/enigma/skins/default/key_add.png b/plugins/enigma/skins/classic/key_add.png
index f22cc870a..f22cc870a 100644
--- a/plugins/enigma/skins/default/key_add.png
+++ b/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
index 7cc258cc8..7cc258cc8 100644
--- a/plugins/enigma/skins/default/keys_toolbar.png
+++ b/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
index 4e0b304a5..4e0b304a5 100644
--- a/plugins/enigma/skins/default/templates/keyimport.html
+++ b/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
index 2e8ed61db..2e8ed61db 100644
--- a/plugins/enigma/skins/default/templates/keyinfo.html
+++ b/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
index 810c4a211..810c4a211 100644
--- a/plugins/enigma/skins/default/templates/keys.html
+++ b/plugins/enigma/skins/classic/templates/keys.html
diff --git a/plugins/help/package.xml b/plugins/help/package.xml
index da90bb4fd..5df7e7460 100644
--- a/plugins/help/package.xml
+++ b/plugins/help/package.xml
@@ -33,9 +33,9 @@
 			<file name="content/about.html" role="data"></file>
 			<file name="content/license.html" role="data"></file>
 			<file name="config.inc.php.dist" role="data"></file>
-			<file name="skins/default/help.css" role="data"></file>
-			<file name="skins/default/help.gif" role="data"></file>
-			<file name="skins/default/templates/help.html" role="data"></file>
+			<file name="skins/classic/help.css" role="data"></file>
+			<file name="skins/classic/help.gif" role="data"></file>
+			<file name="skins/classic/templates/help.html" role="data"></file>
 			<file name="localization/cs_CZ.inc" role="data"></file>
 			<file name="localization/da_DK.inc" role="data"></file>
 			<file name="localization/de_DE.inc" role="data"></file>
diff --git a/plugins/help/skins/default/help.css b/plugins/help/skins/classic/help.css
index 8f67f111e..8f67f111e 100644
--- a/plugins/help/skins/default/help.css
+++ b/plugins/help/skins/classic/help.css
diff --git a/plugins/help/skins/default/help.gif b/plugins/help/skins/classic/help.gif
index fe41e43c0..fe41e43c0 100644
--- a/plugins/help/skins/default/help.gif
+++ b/plugins/help/skins/classic/help.gif
diff --git a/plugins/help/skins/default/templates/help.html b/plugins/help/skins/classic/templates/help.html
index 98beb6655..98beb6655 100644
--- a/plugins/help/skins/default/templates/help.html
+++ b/plugins/help/skins/classic/templates/help.html
diff --git a/plugins/hide_blockquote/package.xml b/plugins/hide_blockquote/package.xml
index 833691261..0d895c1d9 100644
--- a/plugins/hide_blockquote/package.xml
+++ b/plugins/hide_blockquote/package.xml
@@ -36,7 +36,7 @@
 			</file>
 			<file name="localization/en_US.inc" role="data"></file>
 			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="skins/default/style.css" role="data"></file>
+			<file name="skins/classic/style.css" role="data"></file>
 		</dir>
 		<!-- / -->
 	</contents>
diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist
index 65c01757a..a3c3f75a0 100644
--- a/plugins/jqueryui/config.inc.php.dist
+++ b/plugins/jqueryui/config.inc.php.dist
@@ -6,6 +6,7 @@ $rcmail_config['jquery_ui_i18n'] = array('datepicker');
 // map Roundcube skins with jquery-ui themes here
 $rcmail_config['jquery_ui_skin_map'] = array(
   'larry' => 'larry',
+  'default' => 'larry',
   'groupvice4' => 'redmond',
 );
 
diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
index 69b9ca1c0..f82a149b8 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -24,7 +24,7 @@ class jqueryui extends rcube_plugin
         $this->include_script("js/jquery-ui-$version.custom.min.js");
 
         // include UI stylesheet
-        $skin = $rcmail->config->get('skin', 'default');
+        $skin = $rcmail->config->get('skin');
         $ui_map = $rcmail->config->get('jquery_ui_skin_map', array());
         $ui_theme = $ui_map[$skin] ? $ui_map[$skin] : $skin;
 
@@ -32,7 +32,7 @@ class jqueryui extends rcube_plugin
             $this->include_stylesheet("themes/$ui_theme/jquery-ui-$version.custom.css");
         }
         else {
-            $this->include_stylesheet("themes/default/jquery-ui-$version.custom.css");
+            $this->include_stylesheet("themes/larry/jquery-ui-$version.custom.css");
         }
 
         // jquery UI localization
diff --git a/plugins/jqueryui/package.xml b/plugins/jqueryui/package.xml
index 18f241a2e..1d265169c 100644
--- a/plugins/jqueryui/package.xml
+++ b/plugins/jqueryui/package.xml
@@ -99,22 +99,22 @@
 			<file name="js/i18n/jquery.ui.datepicker-zh-HK.js" role="data"></file>
 			<file name="js/i18n/jquery.ui.datepicker-zh-TW.js" role="data"></file>
 
-			<file name="themes/default/jquery-ui-1.8.14.custom.css" role="data"></file>
-			<file name="themes/default/roundcube-custom.diff" role="data"></file>
-			<file name="themes/default/images/buttongradient.png" role="data"></file>
-			<file name="themes/default/images/ui-bg_flat_90_cc3333_40x100.png" role="data"></file>
-			<file name="themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png" role="data"></file>
-			<file name="themes/default/images/ui-icons_cc3333_256x240.png" role="data"></file>
-			<file name="themes/default/images/listheader.png" role="data"></file>
-			<file name="themes/default/images/ui-bg_glass_95_fef1ec_1x400.png" role="data"></file>
-			<file name="themes/default/images/ui-icons_000000_256x240.png" role="data"></file>
-			<file name="themes/default/images/ui-icons_dddddd_256x240.png" role="data"></file>
-			<file name="themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
-			<file name="themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png" role="data"></file>
-			<file name="themes/default/images/ui-icons_333333_256x240.png" role="data"></file>
-			<file name="themes/default/images/ui-bg_flat_75_ffffff_40x100.png" role="data"></file>
-			<file name="themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png" role="data"></file>
-			<file name="themes/default/images/ui-icons_666666_256x240.png" role="data"></file>
+			<file name="themes/classic/jquery-ui-1.8.14.custom.css" role="data"></file>
+			<file name="themes/classic/roundcube-custom.diff" role="data"></file>
+			<file name="themes/classic/images/buttongradient.png" role="data"></file>
+			<file name="themes/classic/images/ui-bg_flat_90_cc3333_40x100.png" role="data"></file>
+			<file name="themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png" role="data"></file>
+			<file name="themes/classic/images/ui-icons_cc3333_256x240.png" role="data"></file>
+			<file name="themes/classic/images/listheader.png" role="data"></file>
+			<file name="themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png" role="data"></file>
+			<file name="themes/classic/images/ui-icons_000000_256x240.png" role="data"></file>
+			<file name="themes/classic/images/ui-icons_dddddd_256x240.png" role="data"></file>
+			<file name="themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
+			<file name="themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png" role="data"></file>
+			<file name="themes/classic/images/ui-icons_333333_256x240.png" role="data"></file>
+			<file name="themes/classic/images/ui-bg_flat_75_ffffff_40x100.png" role="data"></file>
+			<file name="themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png" role="data"></file>
+			<file name="themes/classic/images/ui-icons_666666_256x240.png" role="data"></file>
 
 			<file name="themes/redmont/jquery-ui-1.8.14.custom.css" role="data"></file>
 			<file name="themes/redmont/images/ui-bg_flat_0_aaaaaa_40x100.png" role="data"></file>
diff --git a/plugins/jqueryui/themes/default/images/buttongradient.png b/plugins/jqueryui/themes/classic/images/buttongradient.png
index 0595474c7..0595474c7 100644
--- a/plugins/jqueryui/themes/default/images/buttongradient.png
+++ b/plugins/jqueryui/themes/classic/images/buttongradient.png
diff --git a/plugins/jqueryui/themes/default/images/listheader.png b/plugins/jqueryui/themes/classic/images/listheader.png
index 670df0c4a..670df0c4a 100644
--- a/plugins/jqueryui/themes/default/images/listheader.png
+++ b/plugins/jqueryui/themes/classic/images/listheader.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2ab..5b5dab2ab 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229af..ac8b229af 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png
index 6a5d37d65..6a5d37d65 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png b/plugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc1a..4443fdc1a 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
index b3533aafe..b3533aafe 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
index d0a127f4d..d0a127f4d 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
index ecc0ac16a..ecc0ac16a 100755
--- a/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
+++ b/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png
index 7c211aa08..7c211aa08 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png
index fe079a595..fe079a595 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png
index f87de1ca1..f87de1ca1 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png
index b2fe02927..b2fe02927 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png
diff --git a/plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png b/plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png
index 91aada0ab..91aada0ab 100755
--- a/plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png
+++ b/plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png
diff --git a/plugins/jqueryui/themes/default/jquery-ui-1.8.18.custom.css b/plugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css
index 288e624ed..288e624ed 100755
--- a/plugins/jqueryui/themes/default/jquery-ui-1.8.18.custom.css
+++ b/plugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css
diff --git a/plugins/jqueryui/themes/default/roundcube-custom.diff b/plugins/jqueryui/themes/classic/roundcube-custom.diff
index f5be87956..f5be87956 100644
--- a/plugins/jqueryui/themes/default/roundcube-custom.diff
+++ b/plugins/jqueryui/themes/classic/roundcube-custom.diff
diff --git a/plugins/managesieve/package.xml b/plugins/managesieve/package.xml
index 1c60a7cc9..cde78c9a3 100644
--- a/plugins/managesieve/package.xml
+++ b/plugins/managesieve/package.xml
@@ -85,16 +85,16 @@
 			<file name="localization/vi_VN.inc" role="data"></file>
 			<file name="localization/zh_CN.inc" role="data"></file>
 			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/default/managesieve.css" role="data"></file>
-			<file name="skins/default/managesieve_mail.css" role="data"></file>
-			<file name="skins/default/templates/filteredit.html" role="data"></file>
-			<file name="skins/default/templates/managesieve.html" role="data"></file>
-			<file name="skins/default/templates/setedit.html" role="data"></file>
-			<file name="skins/default/images/add.png" role="data"></file>
-			<file name="skins/default/images/del.png" role="data"></file>
-			<file name="skins/default/images/down_small.gif" role="data"></file>
-			<file name="skins/default/images/filter.png" role="data"></file>
-			<file name="skins/default/images/up_small.gif" role="data"></file>
+			<file name="skins/classic/managesieve.css" role="data"></file>
+			<file name="skins/classic/managesieve_mail.css" role="data"></file>
+			<file name="skins/classic/templates/filteredit.html" role="data"></file>
+			<file name="skins/classic/templates/managesieve.html" role="data"></file>
+			<file name="skins/classic/templates/setedit.html" role="data"></file>
+			<file name="skins/classic/images/add.png" role="data"></file>
+			<file name="skins/classic/images/del.png" role="data"></file>
+			<file name="skins/classic/images/down_small.gif" role="data"></file>
+			<file name="skins/classic/images/filter.png" role="data"></file>
+			<file name="skins/classic/images/up_small.gif" role="data"></file>
 			<file name="managesieve.php" role="php"></file>
 			<file name="lib/rcube_sieve.php" role="php"></file>
 			<file name="lib/rcube_sieve_script.php" role="php"></file>
diff --git a/plugins/managesieve/skins/default/images/add.png b/plugins/managesieve/skins/classic/images/add.png
index 97a6422fb..97a6422fb 100644
--- a/plugins/managesieve/skins/default/images/add.png
+++ b/plugins/managesieve/skins/classic/images/add.png
diff --git a/plugins/managesieve/skins/default/images/del.png b/plugins/managesieve/skins/classic/images/del.png
index 518905bc4..518905bc4 100644
--- a/plugins/managesieve/skins/default/images/del.png
+++ b/plugins/managesieve/skins/classic/images/del.png
diff --git a/plugins/managesieve/skins/default/images/down_small.gif b/plugins/managesieve/skins/classic/images/down_small.gif
index f865893f4..f865893f4 100644
--- a/plugins/managesieve/skins/default/images/down_small.gif
+++ b/plugins/managesieve/skins/classic/images/down_small.gif
diff --git a/plugins/managesieve/skins/default/images/filter.png b/plugins/managesieve/skins/classic/images/filter.png
index a79ba1083..a79ba1083 100644
--- a/plugins/managesieve/skins/default/images/filter.png
+++ b/plugins/managesieve/skins/classic/images/filter.png
diff --git a/plugins/managesieve/skins/default/images/up_small.gif b/plugins/managesieve/skins/classic/images/up_small.gif
index 40deb891f..40deb891f 100644
--- a/plugins/managesieve/skins/default/images/up_small.gif
+++ b/plugins/managesieve/skins/classic/images/up_small.gif
diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/classic/managesieve.css
index 9527b44e9..9527b44e9 100644
--- a/plugins/managesieve/skins/default/managesieve.css
+++ b/plugins/managesieve/skins/classic/managesieve.css
diff --git a/plugins/managesieve/skins/default/managesieve_mail.css b/plugins/managesieve/skins/classic/managesieve_mail.css
index 87a11cc92..87a11cc92 100644
--- a/plugins/managesieve/skins/default/managesieve_mail.css
+++ b/plugins/managesieve/skins/classic/managesieve_mail.css
diff --git a/plugins/managesieve/skins/default/templates/filteredit.html b/plugins/managesieve/skins/classic/templates/filteredit.html
index 6ecb03cae..6ecb03cae 100644
--- a/plugins/managesieve/skins/default/templates/filteredit.html
+++ b/plugins/managesieve/skins/classic/templates/filteredit.html
diff --git a/plugins/managesieve/skins/default/templates/managesieve.html b/plugins/managesieve/skins/classic/templates/managesieve.html
index 71eebe105..71eebe105 100644
--- a/plugins/managesieve/skins/default/templates/managesieve.html
+++ b/plugins/managesieve/skins/classic/templates/managesieve.html
diff --git a/plugins/managesieve/skins/default/templates/setedit.html b/plugins/managesieve/skins/classic/templates/setedit.html
index 26f7fece6..26f7fece6 100644
--- a/plugins/managesieve/skins/default/templates/setedit.html
+++ b/plugins/managesieve/skins/classic/templates/setedit.html
diff --git a/plugins/markasjunk/package.xml b/plugins/markasjunk/package.xml
index 95690eb9b..a5b4bf92c 100644
--- a/plugins/markasjunk/package.xml
+++ b/plugins/markasjunk/package.xml
@@ -50,8 +50,8 @@
 			<file name="localization/sk_SK.inc" role="data"></file>
 			<file name="localization/sv_SE.inc" role="data"></file>
 			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/default/junk_act.png" role="data"></file>
-			<file name="skins/default/junk_pas.png" role="data"></file>
+			<file name="skins/classic/junk_act.png" role="data"></file>
+			<file name="skins/classic/junk_pas.png" role="data"></file>
 		</dir>
 		<!-- / -->
 	</contents>
diff --git a/plugins/markasjunk/skins/default/junk_act.png b/plugins/markasjunk/skins/classic/junk_act.png
index b5a84f604..b5a84f604 100644
--- a/plugins/markasjunk/skins/default/junk_act.png
+++ b/plugins/markasjunk/skins/classic/junk_act.png
diff --git a/plugins/markasjunk/skins/default/junk_pas.png b/plugins/markasjunk/skins/classic/junk_pas.png
index b88a561a4..b88a561a4 100644
--- a/plugins/markasjunk/skins/default/junk_pas.png
+++ b/plugins/markasjunk/skins/classic/junk_pas.png
diff --git a/plugins/markasjunk/skins/default/markasjunk.css b/plugins/markasjunk/skins/classic/markasjunk.css
index 5b1d47b46..5b1d47b46 100644
--- a/plugins/markasjunk/skins/default/markasjunk.css
+++ b/plugins/markasjunk/skins/classic/markasjunk.css
diff --git a/plugins/vcard_attachments/package.xml b/plugins/vcard_attachments/package.xml
index cf94ef378..82b750ad5 100644
--- a/plugins/vcard_attachments/package.xml
+++ b/plugins/vcard_attachments/package.xml
@@ -61,9 +61,9 @@
 			<file name="localization/ru_RU.inc" role="data"></file>
 			<file name="localization/sv_SE.inc" role="data"></file>
 			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/default/style.css" role="data"></file>
-			<file name="skins/default/vcard_add_contact.png" role="data"></file>
-			<file name="skins/default/vcard.png" role="data"></file>
+			<file name="skins/classic/style.css" role="data"></file>
+			<file name="skins/classic/vcard_add_contact.png" role="data"></file>
+			<file name="skins/classic/vcard.png" role="data"></file>
 			<file name="skins/larry/style.css" role="data"></file>
 			<file name="skins/larry/vcard_add_contact.png" role="data"></file>
 			<file name="skins/larry/vcard.png" role="data"></file>
diff --git a/plugins/vcard_attachments/skins/default/style.css b/plugins/vcard_attachments/skins/classic/style.css
index 044d3983e..044d3983e 100644
--- a/plugins/vcard_attachments/skins/default/style.css
+++ b/plugins/vcard_attachments/skins/classic/style.css
diff --git a/plugins/vcard_attachments/skins/default/vcard.png b/plugins/vcard_attachments/skins/classic/vcard.png
index 8bf6b1b72..8bf6b1b72 100644
--- a/plugins/vcard_attachments/skins/default/vcard.png
+++ b/plugins/vcard_attachments/skins/classic/vcard.png
diff --git a/plugins/vcard_attachments/skins/default/vcard_add_contact.png b/plugins/vcard_attachments/skins/classic/vcard_add_contact.png
index 478c1f3f2..478c1f3f2 100644
--- a/plugins/vcard_attachments/skins/default/vcard_add_contact.png
+++ b/plugins/vcard_attachments/skins/classic/vcard_add_contact.png