182 files changed, 58 insertions, 51 deletions

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 9dcd28c95..7cfed4ac9 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -677,7 +677,7 @@ $rcmail_config['addressbook_search_mode'] = 0;
 $rcmail_config['default_charset'] = 'ISO-8859-1';
 
 // skin name: folder from skins/
-$rcmail_config['skin'] = 'default';
+$rcmail_config['skin'] = 'larry';
 
 // show up to X items in messages list view
 $rcmail_config['mail_pagesize'] = 50;
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
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 46906dde1..3788f121a 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -77,7 +77,11 @@ class rcube_config
         if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
             $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
         else if (empty($this->prop['skin']))
-            $this->prop['skin'] = 'default';
+            $this->prop['skin'] = 'larry';
+
+        // larry is the new default skin :-)
+        if ($this->prop['skin'] == 'default')
+            $this->prop['skin'] = 'larry';
 
         // fix paths
         $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
@@ -236,10 +240,8 @@ class rcube_config
         // Honor the dont_override setting for any existing user preferences
         $dont_override = $this->get('dont_override');
         if (is_array($dont_override) && !empty($dont_override)) {
-            foreach ($prefs as $key => $pref) {
-                if (in_array($key, $dont_override)) {
-                    unset($prefs[$key]);
-                }
+            foreach ($dont_override as $key) {
+                unset($prefs[$key]);
             }
         }
 
@@ -248,6 +250,10 @@ class rcube_config
             $prefs['timezone'] = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0);
         }
 
+        // larry is the new default skin :-)
+        if ($prefs['skin'] == 'default')
+            $prefs['skin'] = 'larry';
+
         $this->userprefs = $prefs;
         $this->prop      = array_merge($this->prop, $prefs);
 
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 19510ce5b..24915f093 100644
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -77,7 +77,7 @@ class rcube_template extends rcube_html_page
         $this->set_env('x_frame_options', $this->app->config->get('x_frame_options', 'sameorigin'));
 
         // load the correct skin (in case user-defined)
-        $skin = $this->app->config->get('skin', 'default');
+        $skin = $this->app->config->get('skin');
         $this->set_skin($skin);
         $this->set_env('skin', $skin);
 
diff --git a/skins/default/README b/skins/classic/README
index ba690d733..ba690d733 100644
--- a/skins/default/README
+++ b/skins/classic/README
diff --git a/skins/default/addressbook.css b/skins/classic/addressbook.css
index ad7aeffd8..ad7aeffd8 100644
--- a/skins/default/addressbook.css
+++ b/skins/classic/addressbook.css
diff --git a/skins/default/common.css b/skins/classic/common.css
index 5c94b67f2..5c94b67f2 100644
--- a/skins/default/common.css
+++ b/skins/classic/common.css
diff --git a/skins/default/editor_content.css b/skins/classic/editor_content.css
index aabed07b5..aabed07b5 100644
--- a/skins/default/editor_content.css
+++ b/skins/classic/editor_content.css
diff --git a/skins/default/functions.js b/skins/classic/functions.js
index 48f9acd75..48f9acd75 100644
--- a/skins/default/functions.js
+++ b/skins/classic/functions.js
diff --git a/skins/default/googiespell.css b/skins/classic/googiespell.css
index 8adadc256..8adadc256 100644
--- a/skins/default/googiespell.css
+++ b/skins/classic/googiespell.css
diff --git a/skins/default/ie6hacks.css b/skins/classic/ie6hacks.css
index 53a2e5e1d..53a2e5e1d 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/classic/ie6hacks.css
diff --git a/skins/default/iehacks.css b/skins/classic/iehacks.css
index d09be3d80..d09be3d80 100644
--- a/skins/default/iehacks.css
+++ b/skins/classic/iehacks.css
diff --git a/skins/default/images/abook_toolbar.gif b/skins/classic/images/abook_toolbar.gif
index 2e8f4e259..2e8f4e259 100644
--- a/skins/default/images/abook_toolbar.gif
+++ b/skins/classic/images/abook_toolbar.gif
diff --git a/skins/default/images/abook_toolbar.png b/skins/classic/images/abook_toolbar.png
index feb95c026..feb95c026 100644
--- a/skins/default/images/abook_toolbar.png
+++ b/skins/classic/images/abook_toolbar.png
diff --git a/skins/default/images/blank.gif b/skins/classic/images/blank.gif
index 7dd464ea3..7dd464ea3 100644
--- a/skins/default/images/blank.gif
+++ b/skins/classic/images/blank.gif
diff --git a/skins/default/images/buttons/add_act.png b/skins/classic/images/buttons/add_act.png
index e94fcd6a0..e94fcd6a0 100644
--- a/skins/default/images/buttons/add_act.png
+++ b/skins/classic/images/buttons/add_act.png
diff --git a/skins/default/images/buttons/add_pas.png b/skins/classic/images/buttons/add_pas.png
index 9f67c5202..9f67c5202 100644
--- a/skins/default/images/buttons/add_pas.png
+++ b/skins/classic/images/buttons/add_pas.png
diff --git a/skins/default/images/buttons/add_sel.png b/skins/classic/images/buttons/add_sel.png
index 2a3719fba..2a3719fba 100644
--- a/skins/default/images/buttons/add_sel.png
+++ b/skins/classic/images/buttons/add_sel.png
diff --git a/skins/default/images/buttons/bg.gif b/skins/classic/images/buttons/bg.gif
index be39f4a35..be39f4a35 100644
--- a/skins/default/images/buttons/bg.gif
+++ b/skins/classic/images/buttons/bg.gif
diff --git a/skins/default/images/cleardot.png b/skins/classic/images/cleardot.png
index 98c3bfcca..98c3bfcca 100644
--- a/skins/default/images/cleardot.png
+++ b/skins/classic/images/cleardot.png
diff --git a/skins/default/images/contactpic.png b/skins/classic/images/contactpic.png
index bdb6cdcc0..bdb6cdcc0 100644
--- a/skins/default/images/contactpic.png
+++ b/skins/classic/images/contactpic.png
diff --git a/skins/default/images/dbutton.png b/skins/classic/images/dbutton.png
index 7a85e3c5d..7a85e3c5d 100644
--- a/skins/default/images/dbutton.png
+++ b/skins/classic/images/dbutton.png
diff --git a/skins/default/images/dimple.png b/skins/classic/images/dimple.png
index 4de496c87..4de496c87 100644
--- a/skins/default/images/dimple.png
+++ b/skins/classic/images/dimple.png
diff --git a/skins/default/images/display/icons.gif b/skins/classic/images/display/icons.gif
index e6dfb1bc6..e6dfb1bc6 100644
--- a/skins/default/images/display/icons.gif
+++ b/skins/classic/images/display/icons.gif
diff --git a/skins/default/images/display/icons.png b/skins/classic/images/display/icons.png
index 7bf4278bf..7bf4278bf 100644
--- a/skins/default/images/display/icons.png
+++ b/skins/classic/images/display/icons.png
diff --git a/skins/default/images/display/loading.gif b/skins/classic/images/display/loading.gif
index 747c65661..747c65661 100644
--- a/skins/default/images/display/loading.gif
+++ b/skins/classic/images/display/loading.gif
diff --git a/skins/default/images/display/loading_blue.gif b/skins/classic/images/display/loading_blue.gif
index 2ea6b19ae..2ea6b19ae 100644
--- a/skins/default/images/display/loading_blue.gif
+++ b/skins/classic/images/display/loading_blue.gif
diff --git a/skins/default/images/favicon.ico b/skins/classic/images/favicon.ico
index b3bd18c12..b3bd18c12 100644
--- a/skins/default/images/favicon.ico
+++ b/skins/classic/images/favicon.ico
diff --git a/skins/default/images/googiespell/change_lang.gif b/skins/classic/images/googiespell/change_lang.gif
index 81451832c..81451832c 100644
--- a/skins/default/images/googiespell/change_lang.gif
+++ b/skins/classic/images/googiespell/change_lang.gif
diff --git a/skins/default/images/googiespell/indicator.gif b/skins/classic/images/googiespell/indicator.gif
index b556bb00f..b556bb00f 100644
--- a/skins/default/images/googiespell/indicator.gif
+++ b/skins/classic/images/googiespell/indicator.gif
diff --git a/skins/default/images/googiespell/ok.gif b/skins/classic/images/googiespell/ok.gif
index 04727e28d..04727e28d 100644
--- a/skins/default/images/googiespell/ok.gif
+++ b/skins/classic/images/googiespell/ok.gif
diff --git a/skins/default/images/googiespell/spellc.gif b/skins/classic/images/googiespell/spellc.gif
index 6ed936090..6ed936090 100644
--- a/skins/default/images/googiespell/spellc.gif
+++ b/skins/classic/images/googiespell/spellc.gif
diff --git a/skins/default/images/icons/attachment.png b/skins/classic/images/icons/attachment.png
index 0fcf46499..0fcf46499 100644
--- a/skins/default/images/icons/attachment.png
+++ b/skins/classic/images/icons/attachment.png
diff --git a/skins/default/images/icons/blank.gif b/skins/classic/images/icons/blank.gif
index 7dd464ea3..7dd464ea3 100644
--- a/skins/default/images/icons/blank.gif
+++ b/skins/classic/images/icons/blank.gif
diff --git a/skins/default/images/icons/collapsed.png b/skins/classic/images/icons/collapsed.png
index 07cc1ec7d..07cc1ec7d 100644
--- a/skins/default/images/icons/collapsed.png
+++ b/skins/classic/images/icons/collapsed.png
diff --git a/skins/default/images/icons/columnpicker.gif b/skins/classic/images/icons/columnpicker.gif
index e776519b3..e776519b3 100644
--- a/skins/default/images/icons/columnpicker.gif
+++ b/skins/classic/images/icons/columnpicker.gif
diff --git a/skins/default/images/icons/delete.png b/skins/classic/images/icons/delete.png
index f1cf0aee7..f1cf0aee7 100644
--- a/skins/default/images/icons/delete.png
+++ b/skins/classic/images/icons/delete.png
diff --git a/skins/default/images/icons/deleted.png b/skins/classic/images/icons/deleted.png
index cffb7f507..cffb7f507 100644
--- a/skins/default/images/icons/deleted.png
+++ b/skins/classic/images/icons/deleted.png
diff --git a/skins/default/images/icons/dot.png b/skins/classic/images/icons/dot.png
index 99f736516..99f736516 100644
--- a/skins/default/images/icons/dot.png
+++ b/skins/classic/images/icons/dot.png
diff --git a/skins/default/images/icons/down_small.gif b/skins/classic/images/icons/down_small.gif
index f865893f4..f865893f4 100644
--- a/skins/default/images/icons/down_small.gif
+++ b/skins/classic/images/icons/down_small.gif
diff --git a/skins/default/images/icons/expanded.png b/skins/classic/images/icons/expanded.png
index 87e77a477..87e77a477 100644
--- a/skins/default/images/icons/expanded.png
+++ b/skins/classic/images/icons/expanded.png
diff --git a/skins/default/images/icons/extwin.png b/skins/classic/images/icons/extwin.png
index 1ab4d7703..1ab4d7703 100644
--- a/skins/default/images/icons/extwin.png
+++ b/skins/classic/images/icons/extwin.png
diff --git a/skins/default/images/icons/flagged.png b/skins/classic/images/icons/flagged.png
index 98215f68c..98215f68c 100644
--- a/skins/default/images/icons/flagged.png
+++ b/skins/classic/images/icons/flagged.png
diff --git a/skins/default/images/icons/folders.gif b/skins/classic/images/icons/folders.gif
index eb06bd8c1..eb06bd8c1 100644
--- a/skins/default/images/icons/folders.gif
+++ b/skins/classic/images/icons/folders.gif
diff --git a/skins/default/images/icons/folders.png b/skins/classic/images/icons/folders.png
index 2580fd1be..2580fd1be 100644
--- a/skins/default/images/icons/folders.png
+++ b/skins/classic/images/icons/folders.png
diff --git a/skins/default/images/icons/forwarded.png b/skins/classic/images/icons/forwarded.png
index 1ea246f8e..1ea246f8e 100644
--- a/skins/default/images/icons/forwarded.png
+++ b/skins/classic/images/icons/forwarded.png
diff --git a/skins/default/images/icons/forwarded_replied.png b/skins/classic/images/icons/forwarded_replied.png
index 4830ecf40..4830ecf40 100644
--- a/skins/default/images/icons/forwarded_replied.png
+++ b/skins/classic/images/icons/forwarded_replied.png
diff --git a/skins/default/images/icons/glass.gif b/skins/classic/images/icons/glass.gif
index 9a705b410..9a705b410 100644
--- a/skins/default/images/icons/glass.gif
+++ b/skins/classic/images/icons/glass.gif
diff --git a/skins/default/images/icons/glass.png b/skins/classic/images/icons/glass.png
index eb1b1dc74..eb1b1dc74 100644
--- a/skins/default/images/icons/glass.png
+++ b/skins/classic/images/icons/glass.png
diff --git a/skins/default/images/icons/glass_roll.png b/skins/classic/images/icons/glass_roll.png
index b11b59854..b11b59854 100644
--- a/skins/default/images/icons/glass_roll.png
+++ b/skins/classic/images/icons/glass_roll.png
diff --git a/skins/default/images/icons/groupactions.gif b/skins/classic/images/icons/groupactions.gif
index 913c83588..913c83588 100644
--- a/skins/default/images/icons/groupactions.gif
+++ b/skins/classic/images/icons/groupactions.gif
diff --git a/skins/default/images/icons/groupactions.png b/skins/classic/images/icons/groupactions.png
index 91f84bee9..91f84bee9 100644
--- a/skins/default/images/icons/groupactions.png
+++ b/skins/classic/images/icons/groupactions.png
diff --git a/skins/default/images/icons/minus.gif b/skins/classic/images/icons/minus.gif
index 4ec02c87a..4ec02c87a 100644
--- a/skins/default/images/icons/minus.gif
+++ b/skins/classic/images/icons/minus.gif
diff --git a/skins/default/images/icons/plus.gif b/skins/classic/images/icons/plus.gif
index 854b5eb34..854b5eb34 100644
--- a/skins/default/images/icons/plus.gif
+++ b/skins/classic/images/icons/plus.gif
diff --git a/skins/default/images/icons/rename.png b/skins/classic/images/icons/rename.png
index 7844b0081..7844b0081 100644
--- a/skins/default/images/icons/rename.png
+++ b/skins/classic/images/icons/rename.png
diff --git a/skins/default/images/icons/replied.png b/skins/classic/images/icons/replied.png
index 4a5213262..4a5213262 100644
--- a/skins/default/images/icons/replied.png
+++ b/skins/classic/images/icons/replied.png
diff --git a/skins/default/images/icons/reset.gif b/skins/classic/images/icons/reset.gif
index a9a53d569..a9a53d569 100644
--- a/skins/default/images/icons/reset.gif
+++ b/skins/classic/images/icons/reset.gif
diff --git a/skins/default/images/icons/silhouette.png b/skins/classic/images/icons/silhouette.png
index ac0773514..ac0773514 100644
--- a/skins/default/images/icons/silhouette.png
+++ b/skins/classic/images/icons/silhouette.png
diff --git a/skins/default/images/icons/sort.gif b/skins/classic/images/icons/sort.gif
index f8f275690..f8f275690 100644
--- a/skins/default/images/icons/sort.gif
+++ b/skins/classic/images/icons/sort.gif
diff --git a/skins/default/images/icons/unflagged.png b/skins/classic/images/icons/unflagged.png
index 12023f057..12023f057 100644
--- a/skins/default/images/icons/unflagged.png
+++ b/skins/classic/images/icons/unflagged.png
diff --git a/skins/default/images/icons/unread.png b/skins/classic/images/icons/unread.png
index 31f640632..31f640632 100644
--- a/skins/default/images/icons/unread.png
+++ b/skins/classic/images/icons/unread.png
diff --git a/skins/default/images/icons/unread_children.png b/skins/classic/images/icons/unread_children.png
index 45e671dcc..45e671dcc 100644
--- a/skins/default/images/icons/unread_children.png
+++ b/skins/classic/images/icons/unread_children.png
diff --git a/skins/default/images/icons/up_small.gif b/skins/classic/images/icons/up_small.gif
index 40deb891f..40deb891f 100644
--- a/skins/default/images/icons/up_small.gif
+++ b/skins/classic/images/icons/up_small.gif
diff --git a/skins/default/images/listheader.gif b/skins/classic/images/listheader.gif
index bf77a11c1..bf77a11c1 100644
--- a/skins/default/images/listheader.gif
+++ b/skins/classic/images/listheader.gif
diff --git a/skins/default/images/mail_footer.gif b/skins/classic/images/mail_footer.gif
index 302b55870..302b55870 100644
--- a/skins/default/images/mail_footer.gif
+++ b/skins/classic/images/mail_footer.gif
diff --git a/skins/default/images/mail_footer.png b/skins/classic/images/mail_footer.png
index e2f24b28c..e2f24b28c 100644
--- a/skins/default/images/mail_footer.png
+++ b/skins/classic/images/mail_footer.png
diff --git a/skins/default/images/mail_toolbar.gif b/skins/classic/images/mail_toolbar.gif
index 9856b4265..9856b4265 100644
--- a/skins/default/images/mail_toolbar.gif
+++ b/skins/classic/images/mail_toolbar.gif
diff --git a/skins/default/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png
index 6ccc9bd9e..6ccc9bd9e 100644
--- a/skins/default/images/mail_toolbar.png
+++ b/skins/classic/images/mail_toolbar.png
diff --git a/skins/default/images/messageactions.gif b/skins/classic/images/messageactions.gif
index b73fbb354..b73fbb354 100644
--- a/skins/default/images/messageactions.gif
+++ b/skins/classic/images/messageactions.gif
diff --git a/skins/default/images/messageactions.png b/skins/classic/images/messageactions.png
index c09f60fe6..c09f60fe6 100644
--- a/skins/default/images/messageactions.png
+++ b/skins/classic/images/messageactions.png
diff --git a/skins/default/images/messageicons.gif b/skins/classic/images/messageicons.gif
index a914a955a..a914a955a 100644
--- a/skins/default/images/messageicons.gif
+++ b/skins/classic/images/messageicons.gif
diff --git a/skins/default/images/messageicons.png b/skins/classic/images/messageicons.png
index ca7b23075..ca7b23075 100644
--- a/skins/default/images/messageicons.png
+++ b/skins/classic/images/messageicons.png
diff --git a/skins/default/images/pagenav.gif b/skins/classic/images/pagenav.gif
index a4644a4e4..a4644a4e4 100644
--- a/skins/default/images/pagenav.gif
+++ b/skins/classic/images/pagenav.gif
diff --git a/skins/default/images/quota-colors.png b/skins/classic/images/quota-colors.png
index 4c1f17edd..4c1f17edd 100644
--- a/skins/default/images/quota-colors.png
+++ b/skins/classic/images/quota-colors.png
diff --git a/skins/default/images/quota.gif b/skins/classic/images/quota.gif
index 9896d4cae..9896d4cae 100644
--- a/skins/default/images/quota.gif
+++ b/skins/classic/images/quota.gif
diff --git a/skins/default/images/quota.png b/skins/classic/images/quota.png
index e729d3248..e729d3248 100644
--- a/skins/default/images/quota.png
+++ b/skins/classic/images/quota.png
diff --git a/skins/default/images/roundcube_logo.png b/skins/classic/images/roundcube_logo.png
index 4323c6b5f..4323c6b5f 100644
--- a/skins/default/images/roundcube_logo.png
+++ b/skins/classic/images/roundcube_logo.png
diff --git a/skins/default/images/searchfield.gif b/skins/classic/images/searchfield.gif
index 969f277b3..969f277b3 100644
--- a/skins/default/images/searchfield.gif
+++ b/skins/classic/images/searchfield.gif
diff --git a/skins/default/images/tabs-left.gif b/skins/classic/images/tabs-left.gif
index c1bf45aa8..c1bf45aa8 100644
--- a/skins/default/images/tabs-left.gif
+++ b/skins/classic/images/tabs-left.gif
diff --git a/skins/default/images/tabs-right.gif b/skins/classic/images/tabs-right.gif
index 9eba9a342..9eba9a342 100644
--- a/skins/default/images/tabs-right.gif
+++ b/skins/classic/images/tabs-right.gif
diff --git a/skins/default/images/taskbar.gif b/skins/classic/images/taskbar.gif
index b6fc91ce4..b6fc91ce4 100644
--- a/skins/default/images/taskbar.gif
+++ b/skins/classic/images/taskbar.gif
diff --git a/skins/default/images/taskbar.png b/skins/classic/images/taskbar.png
index 5fa366023..5fa366023 100644
--- a/skins/default/images/taskbar.png
+++ b/skins/classic/images/taskbar.png
diff --git a/skins/default/images/taskicons.gif b/skins/classic/images/taskicons.gif
index feaa9a14e..feaa9a14e 100644
--- a/skins/default/images/taskicons.gif
+++ b/skins/classic/images/taskicons.gif
diff --git a/skins/default/images/taskicons.png b/skins/classic/images/taskicons.png
index feaa9a14e..feaa9a14e 100644
--- a/skins/default/images/taskicons.png
+++ b/skins/classic/images/taskicons.png
diff --git a/skins/default/images/tree.gif b/skins/classic/images/tree.gif
index c78f15ef5..c78f15ef5 100644
--- a/skins/default/images/tree.gif
+++ b/skins/classic/images/tree.gif
diff --git a/skins/default/images/watermark.gif b/skins/classic/images/watermark.gif
index d235d0306..d235d0306 100644
--- a/skins/default/images/watermark.gif
+++ b/skins/classic/images/watermark.gif
diff --git a/skins/default/includes/header.html b/skins/classic/includes/header.html
index 08d777af0..08d777af0 100644
--- a/skins/default/includes/header.html
+++ b/skins/classic/includes/header.html
diff --git a/skins/default/includes/links.html b/skins/classic/includes/links.html
index 82673220a..82673220a 100644
--- a/skins/default/includes/links.html
+++ b/skins/classic/includes/links.html
diff --git a/skins/default/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
index 3f4995b83..3f4995b83 100644
--- a/skins/default/includes/messagetoolbar.html
+++ b/skins/classic/includes/messagetoolbar.html
diff --git a/skins/default/includes/settingstabs.html b/skins/classic/includes/settingstabs.html
index 0aea80b67..0aea80b67 100644
--- a/skins/default/includes/settingstabs.html
+++ b/skins/classic/includes/settingstabs.html
diff --git a/skins/default/includes/taskbar.html b/skins/classic/includes/taskbar.html
index dfb547b88..dfb547b88 100644
--- a/skins/default/includes/taskbar.html
+++ b/skins/classic/includes/taskbar.html
diff --git a/skins/default/mail.css b/skins/classic/mail.css
index 71e2d5554..71e2d5554 100644
--- a/skins/default/mail.css
+++ b/skins/classic/mail.css
diff --git a/skins/default/pngbehavior.htc b/skins/classic/pngbehavior.htc
index fb5f1c8d4..fb5f1c8d4 100644
--- a/skins/default/pngbehavior.htc
+++ b/skins/classic/pngbehavior.htc
diff --git a/skins/default/print.css b/skins/classic/print.css
index 129770d25..129770d25 100644
--- a/skins/default/print.css
+++ b/skins/classic/print.css
diff --git a/skins/default/safari.css b/skins/classic/safari.css
index a1be85ab4..a1be85ab4 100644
--- a/skins/default/safari.css
+++ b/skins/classic/safari.css
diff --git a/skins/default/settings.css b/skins/classic/settings.css
index 24c4382b5..24c4382b5 100644
--- a/skins/default/settings.css
+++ b/skins/classic/settings.css
diff --git a/skins/default/splitter.js b/skins/classic/splitter.js
index 59ebb5151..59ebb5151 100644
--- a/skins/default/splitter.js
+++ b/skins/classic/splitter.js
diff --git a/skins/default/templates/about.html b/skins/classic/templates/about.html
index f51180699..f51180699 100644
--- a/skins/default/templates/about.html
+++ b/skins/classic/templates/about.html
diff --git a/skins/default/templates/addressbook.html b/skins/classic/templates/addressbook.html
index d77bb38d9..d77bb38d9 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/classic/templates/addressbook.html
diff --git a/skins/default/templates/compose.html b/skins/classic/templates/compose.html
index adb0949c1..adb0949c1 100644
--- a/skins/default/templates/compose.html
+++ b/skins/classic/templates/compose.html
diff --git a/skins/default/templates/contact.html b/skins/classic/templates/contact.html
index d74a78b27..d74a78b27 100644
--- a/skins/default/templates/contact.html
+++ b/skins/classic/templates/contact.html
diff --git a/skins/default/templates/contactadd.html b/skins/classic/templates/contactadd.html
index 67b7bcd6e..67b7bcd6e 100644
--- a/skins/default/templates/contactadd.html
+++ b/skins/classic/templates/contactadd.html
diff --git a/skins/default/templates/contactedit.html b/skins/classic/templates/contactedit.html
index 77e466141..77e466141 100644
--- a/skins/default/templates/contactedit.html
+++ b/skins/classic/templates/contactedit.html
diff --git a/skins/default/templates/contactsearch.html b/skins/classic/templates/contactsearch.html
index 23cbec4cb..23cbec4cb 100644
--- a/skins/default/templates/contactsearch.html
+++ b/skins/classic/templates/contactsearch.html
diff --git a/skins/default/templates/error.html b/skins/classic/templates/error.html
index fdd7c887b..fdd7c887b 100644
--- a/skins/default/templates/error.html
+++ b/skins/classic/templates/error.html
diff --git a/skins/default/templates/folderedit.html b/skins/classic/templates/folderedit.html
index 28b9a5507..28b9a5507 100644
--- a/skins/default/templates/folderedit.html
+++ b/skins/classic/templates/folderedit.html
diff --git a/skins/default/templates/folders.html b/skins/classic/templates/folders.html
index 1ae8809ec..1ae8809ec 100644
--- a/skins/default/templates/folders.html
+++ b/skins/classic/templates/folders.html
diff --git a/skins/default/templates/identities.html b/skins/classic/templates/identities.html
index 464afd545..464afd545 100644
--- a/skins/default/templates/identities.html
+++ b/skins/classic/templates/identities.html
diff --git a/skins/default/templates/identityedit.html b/skins/classic/templates/identityedit.html
index 3b33752ca..3b33752ca 100644
--- a/skins/default/templates/identityedit.html
+++ b/skins/classic/templates/identityedit.html
diff --git a/skins/default/templates/importcontacts.html b/skins/classic/templates/importcontacts.html
index 05c7eb7b7..05c7eb7b7 100644
--- a/skins/default/templates/importcontacts.html
+++ b/skins/classic/templates/importcontacts.html
diff --git a/skins/default/templates/login.html b/skins/classic/templates/login.html
index db5771fb1..db5771fb1 100644
--- a/skins/default/templates/login.html
+++ b/skins/classic/templates/login.html
diff --git a/skins/default/templates/mail.html b/skins/classic/templates/mail.html
index 74e984719..74e984719 100644
--- a/skins/default/templates/mail.html
+++ b/skins/classic/templates/mail.html
diff --git a/skins/default/templates/message.html b/skins/classic/templates/message.html
index 714540b78..714540b78 100644
--- a/skins/default/templates/message.html
+++ b/skins/classic/templates/message.html
diff --git a/skins/default/templates/messageerror.html b/skins/classic/templates/messageerror.html
index 9af45f432..9af45f432 100644
--- a/skins/default/templates/messageerror.html
+++ b/skins/classic/templates/messageerror.html
diff --git a/skins/default/templates/messagepart.html b/skins/classic/templates/messagepart.html
index ce7dbe2e1..ce7dbe2e1 100644
--- a/skins/default/templates/messagepart.html
+++ b/skins/classic/templates/messagepart.html
diff --git a/skins/default/templates/messagepreview.html b/skins/classic/templates/messagepreview.html
index a606311e1..a606311e1 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/classic/templates/messagepreview.html
diff --git a/skins/default/templates/messageprint.html b/skins/classic/templates/messageprint.html
index fa7822ad5..fa7822ad5 100644
--- a/skins/default/templates/messageprint.html
+++ b/skins/classic/templates/messageprint.html
diff --git a/skins/default/templates/plugin.html b/skins/classic/templates/plugin.html
index cec701301..cec701301 100644
--- a/skins/default/templates/plugin.html
+++ b/skins/classic/templates/plugin.html
diff --git a/skins/default/templates/settings.html b/skins/classic/templates/settings.html
index 0cd623f75..0cd623f75 100644
--- a/skins/default/templates/settings.html
+++ b/skins/classic/templates/settings.html
diff --git a/skins/default/templates/settingsedit.html b/skins/classic/templates/settingsedit.html
index 642eb094e..642eb094e 100644
--- a/skins/default/templates/settingsedit.html
+++ b/skins/classic/templates/settingsedit.html
diff --git a/skins/default/watermark.html b/skins/classic/watermark.html
index c16a50357..c16a50357 100644
--- a/skins/default/watermark.html
+++ b/skins/classic/watermark.html