diff --git a/plugins/acl/skins/default/acl.css b/plugins/acl/skins/classic/acl.css
similarity index 100%
rename from plugins/acl/skins/default/acl.css
rename to plugins/acl/skins/classic/acl.css
diff --git a/plugins/acl/skins/default/images/enabled.png b/plugins/acl/skins/classic/images/enabled.png
similarity index 100%
rename from plugins/acl/skins/default/images/enabled.png
rename to 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
similarity index 100%
rename from plugins/acl/skins/default/images/partial.png
rename to 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
similarity index 100%
rename from plugins/acl/skins/default/templates/table.html
rename to plugins/acl/skins/classic/templates/table.html
diff --git a/plugins/archive/skins/default/archive.css b/plugins/archive/skins/classic/archive.css
similarity index 100%
rename from plugins/archive/skins/default/archive.css
rename to plugins/archive/skins/classic/archive.css
diff --git a/plugins/archive/skins/default/archive_act.png b/plugins/archive/skins/classic/archive_act.png
similarity index 100%
rename from plugins/archive/skins/default/archive_act.png
rename to 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
similarity index 100%
rename from plugins/archive/skins/default/archive_pas.png
rename to plugins/archive/skins/classic/archive_pas.png
diff --git a/plugins/archive/skins/default/foldericon.png b/plugins/archive/skins/classic/foldericon.png
similarity index 100%
rename from plugins/archive/skins/default/foldericon.png
rename to plugins/archive/skins/classic/foldericon.png
diff --git a/plugins/help/skins/default/help.css b/plugins/help/skins/classic/help.css
similarity index 100%
rename from plugins/help/skins/default/help.css
rename to plugins/help/skins/classic/help.css
diff --git a/plugins/help/skins/default/help.gif b/plugins/help/skins/classic/help.gif
similarity index 100%
rename from plugins/help/skins/default/help.gif
rename to plugins/help/skins/classic/help.gif
diff --git a/plugins/help/skins/default/templates/help.html b/plugins/help/skins/classic/templates/help.html
similarity index 100%
rename from plugins/help/skins/default/templates/help.html
rename to plugins/help/skins/classic/templates/help.html
diff --git a/plugins/jqueryui/themes/default/images/buttongradient.png b/plugins/jqueryui/themes/classic/images/buttongradient.png
similarity index 100%
rename from plugins/jqueryui/themes/default/images/buttongradient.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/listheader.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/jquery-ui-1.8.18.custom.css
rename to 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
similarity index 100%
rename from plugins/jqueryui/themes/default/roundcube-custom.diff
rename to plugins/jqueryui/themes/classic/roundcube-custom.diff
diff --git a/plugins/managesieve/skins/default/images/add.png b/plugins/managesieve/skins/classic/images/add.png
similarity index 100%
rename from plugins/managesieve/skins/default/images/add.png
rename to 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
similarity index 100%
rename from plugins/managesieve/skins/default/images/del.png
rename to 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
similarity index 100%
rename from plugins/managesieve/skins/default/images/down_small.gif
rename to 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
similarity index 100%
rename from plugins/managesieve/skins/default/images/filter.png
rename to 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
similarity index 100%
rename from plugins/managesieve/skins/default/images/up_small.gif
rename to plugins/managesieve/skins/classic/images/up_small.gif
diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/classic/managesieve.css
similarity index 100%
rename from plugins/managesieve/skins/default/managesieve.css
rename to plugins/managesieve/skins/classic/managesieve.css
diff --git a/plugins/managesieve/skins/default/managesieve_mail.css b/plugins/managesieve/skins/classic/managesieve_mail.css
similarity index 100%
rename from plugins/managesieve/skins/default/managesieve_mail.css
rename to 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
similarity index 100%
rename from plugins/managesieve/skins/default/templates/filteredit.html
rename to 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
similarity index 100%
rename from plugins/managesieve/skins/default/templates/managesieve.html
rename to 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
similarity index 100%
rename from plugins/managesieve/skins/default/templates/setedit.html
rename to plugins/managesieve/skins/classic/templates/setedit.html
diff --git a/plugins/markasjunk/skins/default/junk_act.png b/plugins/markasjunk/skins/classic/junk_act.png
similarity index 100%
rename from plugins/markasjunk/skins/default/junk_act.png
rename to 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
similarity index 100%
rename from plugins/markasjunk/skins/default/junk_pas.png
rename to plugins/markasjunk/skins/classic/junk_pas.png
diff --git a/plugins/markasjunk/skins/default/markasjunk.css b/plugins/markasjunk/skins/classic/markasjunk.css
similarity index 100%
rename from plugins/markasjunk/skins/default/markasjunk.css
rename to plugins/markasjunk/skins/classic/markasjunk.css
diff --git a/plugins/vcard_attachments/skins/default/style.css b/plugins/vcard_attachments/skins/classic/style.css
similarity index 100%
rename from plugins/vcard_attachments/skins/default/style.css
rename to 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
similarity index 100%
rename from plugins/vcard_attachments/skins/default/vcard.png
rename to 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
similarity index 100%
rename from plugins/vcard_attachments/skins/default/vcard_add_contact.png
rename to plugins/vcard_attachments/skins/classic/vcard_add_contact.png
diff --git a/skins/default/README b/skins/classic/README
similarity index 100%
rename from skins/default/README
rename to skins/classic/README
diff --git a/skins/default/addressbook.css b/skins/classic/addressbook.css
similarity index 100%
rename from skins/default/addressbook.css
rename to skins/classic/addressbook.css
diff --git a/skins/default/common.css b/skins/classic/common.css
similarity index 100%
rename from skins/default/common.css
rename to skins/classic/common.css
diff --git a/skins/default/editor_content.css b/skins/classic/editor_content.css
similarity index 100%
rename from skins/default/editor_content.css
rename to skins/classic/editor_content.css
diff --git a/skins/default/functions.js b/skins/classic/functions.js
similarity index 100%
rename from skins/default/functions.js
rename to skins/classic/functions.js
diff --git a/skins/default/googiespell.css b/skins/classic/googiespell.css
similarity index 100%
rename from skins/default/googiespell.css
rename to skins/classic/googiespell.css
diff --git a/skins/default/ie6hacks.css b/skins/classic/ie6hacks.css
similarity index 100%
rename from skins/default/ie6hacks.css
rename to skins/classic/ie6hacks.css
diff --git a/skins/default/iehacks.css b/skins/classic/iehacks.css
similarity index 100%
rename from skins/default/iehacks.css
rename to skins/classic/iehacks.css
diff --git a/skins/default/images/abook_toolbar.gif b/skins/classic/images/abook_toolbar.gif
similarity index 100%
rename from skins/default/images/abook_toolbar.gif
rename to skins/classic/images/abook_toolbar.gif
diff --git a/skins/default/images/abook_toolbar.png b/skins/classic/images/abook_toolbar.png
similarity index 100%
rename from skins/default/images/abook_toolbar.png
rename to skins/classic/images/abook_toolbar.png
diff --git a/skins/default/images/blank.gif b/skins/classic/images/blank.gif
similarity index 100%
rename from skins/default/images/blank.gif
rename to skins/classic/images/blank.gif
diff --git a/skins/default/images/buttons/add_act.png b/skins/classic/images/buttons/add_act.png
similarity index 100%
rename from skins/default/images/buttons/add_act.png
rename to 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
similarity index 100%
rename from skins/default/images/buttons/add_pas.png
rename to 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
similarity index 100%
rename from skins/default/images/buttons/add_sel.png
rename to skins/classic/images/buttons/add_sel.png
diff --git a/skins/default/images/buttons/bg.gif b/skins/classic/images/buttons/bg.gif
similarity index 100%
rename from skins/default/images/buttons/bg.gif
rename to skins/classic/images/buttons/bg.gif
diff --git a/skins/default/images/cleardot.png b/skins/classic/images/cleardot.png
similarity index 100%
rename from skins/default/images/cleardot.png
rename to skins/classic/images/cleardot.png
diff --git a/skins/default/images/contactpic.png b/skins/classic/images/contactpic.png
similarity index 100%
rename from skins/default/images/contactpic.png
rename to skins/classic/images/contactpic.png
diff --git a/skins/default/images/dbutton.png b/skins/classic/images/dbutton.png
similarity index 100%
rename from skins/default/images/dbutton.png
rename to skins/classic/images/dbutton.png
diff --git a/skins/default/images/dimple.png b/skins/classic/images/dimple.png
similarity index 100%
rename from skins/default/images/dimple.png
rename to skins/classic/images/dimple.png
diff --git a/skins/default/images/display/icons.gif b/skins/classic/images/display/icons.gif
similarity index 100%
rename from skins/default/images/display/icons.gif
rename to skins/classic/images/display/icons.gif
diff --git a/skins/default/images/display/icons.png b/skins/classic/images/display/icons.png
similarity index 100%
rename from skins/default/images/display/icons.png
rename to skins/classic/images/display/icons.png
diff --git a/skins/default/images/display/loading.gif b/skins/classic/images/display/loading.gif
similarity index 100%
rename from skins/default/images/display/loading.gif
rename to skins/classic/images/display/loading.gif
diff --git a/skins/default/images/display/loading_blue.gif b/skins/classic/images/display/loading_blue.gif
similarity index 100%
rename from skins/default/images/display/loading_blue.gif
rename to skins/classic/images/display/loading_blue.gif
diff --git a/skins/default/images/favicon.ico b/skins/classic/images/favicon.ico
similarity index 100%
rename from skins/default/images/favicon.ico
rename to skins/classic/images/favicon.ico
diff --git a/skins/default/images/googiespell/change_lang.gif b/skins/classic/images/googiespell/change_lang.gif
similarity index 100%
rename from skins/default/images/googiespell/change_lang.gif
rename to skins/classic/images/googiespell/change_lang.gif
diff --git a/skins/default/images/googiespell/indicator.gif b/skins/classic/images/googiespell/indicator.gif
similarity index 100%
rename from skins/default/images/googiespell/indicator.gif
rename to skins/classic/images/googiespell/indicator.gif
diff --git a/skins/default/images/googiespell/ok.gif b/skins/classic/images/googiespell/ok.gif
similarity index 100%
rename from skins/default/images/googiespell/ok.gif
rename to skins/classic/images/googiespell/ok.gif
diff --git a/skins/default/images/googiespell/spellc.gif b/skins/classic/images/googiespell/spellc.gif
similarity index 100%
rename from skins/default/images/googiespell/spellc.gif
rename to skins/classic/images/googiespell/spellc.gif
diff --git a/skins/default/images/icons/attachment.png b/skins/classic/images/icons/attachment.png
similarity index 100%
rename from skins/default/images/icons/attachment.png
rename to skins/classic/images/icons/attachment.png
diff --git a/skins/default/images/icons/blank.gif b/skins/classic/images/icons/blank.gif
similarity index 100%
rename from skins/default/images/icons/blank.gif
rename to skins/classic/images/icons/blank.gif
diff --git a/skins/default/images/icons/collapsed.png b/skins/classic/images/icons/collapsed.png
similarity index 100%
rename from skins/default/images/icons/collapsed.png
rename to skins/classic/images/icons/collapsed.png
diff --git a/skins/default/images/icons/columnpicker.gif b/skins/classic/images/icons/columnpicker.gif
similarity index 100%
rename from skins/default/images/icons/columnpicker.gif
rename to skins/classic/images/icons/columnpicker.gif
diff --git a/skins/default/images/icons/delete.png b/skins/classic/images/icons/delete.png
similarity index 100%
rename from skins/default/images/icons/delete.png
rename to skins/classic/images/icons/delete.png
diff --git a/skins/default/images/icons/deleted.png b/skins/classic/images/icons/deleted.png
similarity index 100%
rename from skins/default/images/icons/deleted.png
rename to skins/classic/images/icons/deleted.png
diff --git a/skins/default/images/icons/dot.png b/skins/classic/images/icons/dot.png
similarity index 100%
rename from skins/default/images/icons/dot.png
rename to skins/classic/images/icons/dot.png
diff --git a/skins/default/images/icons/down_small.gif b/skins/classic/images/icons/down_small.gif
similarity index 100%
rename from skins/default/images/icons/down_small.gif
rename to skins/classic/images/icons/down_small.gif
diff --git a/skins/default/images/icons/expanded.png b/skins/classic/images/icons/expanded.png
similarity index 100%
rename from skins/default/images/icons/expanded.png
rename to skins/classic/images/icons/expanded.png
diff --git a/skins/default/images/icons/extwin.png b/skins/classic/images/icons/extwin.png
similarity index 100%
rename from skins/default/images/icons/extwin.png
rename to skins/classic/images/icons/extwin.png
diff --git a/skins/default/images/icons/flagged.png b/skins/classic/images/icons/flagged.png
similarity index 100%
rename from skins/default/images/icons/flagged.png
rename to skins/classic/images/icons/flagged.png
diff --git a/skins/default/images/icons/folders.gif b/skins/classic/images/icons/folders.gif
similarity index 100%
rename from skins/default/images/icons/folders.gif
rename to skins/classic/images/icons/folders.gif
diff --git a/skins/default/images/icons/folders.png b/skins/classic/images/icons/folders.png
similarity index 100%
rename from skins/default/images/icons/folders.png
rename to skins/classic/images/icons/folders.png
diff --git a/skins/default/images/icons/forwarded.png b/skins/classic/images/icons/forwarded.png
similarity index 100%
rename from skins/default/images/icons/forwarded.png
rename to skins/classic/images/icons/forwarded.png
diff --git a/skins/default/images/icons/forwarded_replied.png b/skins/classic/images/icons/forwarded_replied.png
similarity index 100%
rename from skins/default/images/icons/forwarded_replied.png
rename to skins/classic/images/icons/forwarded_replied.png
diff --git a/skins/default/images/icons/glass.gif b/skins/classic/images/icons/glass.gif
similarity index 100%
rename from skins/default/images/icons/glass.gif
rename to skins/classic/images/icons/glass.gif
diff --git a/skins/default/images/icons/glass.png b/skins/classic/images/icons/glass.png
similarity index 100%
rename from skins/default/images/icons/glass.png
rename to skins/classic/images/icons/glass.png
diff --git a/skins/default/images/icons/glass_roll.png b/skins/classic/images/icons/glass_roll.png
similarity index 100%
rename from skins/default/images/icons/glass_roll.png
rename to skins/classic/images/icons/glass_roll.png
diff --git a/skins/default/images/icons/groupactions.gif b/skins/classic/images/icons/groupactions.gif
similarity index 100%
rename from skins/default/images/icons/groupactions.gif
rename to skins/classic/images/icons/groupactions.gif
diff --git a/skins/default/images/icons/groupactions.png b/skins/classic/images/icons/groupactions.png
similarity index 100%
rename from skins/default/images/icons/groupactions.png
rename to skins/classic/images/icons/groupactions.png
diff --git a/skins/default/images/icons/minus.gif b/skins/classic/images/icons/minus.gif
similarity index 100%
rename from skins/default/images/icons/minus.gif
rename to skins/classic/images/icons/minus.gif
diff --git a/skins/default/images/icons/plus.gif b/skins/classic/images/icons/plus.gif
similarity index 100%
rename from skins/default/images/icons/plus.gif
rename to skins/classic/images/icons/plus.gif
diff --git a/skins/default/images/icons/rename.png b/skins/classic/images/icons/rename.png
similarity index 100%
rename from skins/default/images/icons/rename.png
rename to skins/classic/images/icons/rename.png
diff --git a/skins/default/images/icons/replied.png b/skins/classic/images/icons/replied.png
similarity index 100%
rename from skins/default/images/icons/replied.png
rename to skins/classic/images/icons/replied.png
diff --git a/skins/default/images/icons/reset.gif b/skins/classic/images/icons/reset.gif
similarity index 100%
rename from skins/default/images/icons/reset.gif
rename to skins/classic/images/icons/reset.gif
diff --git a/skins/default/images/icons/silhouette.png b/skins/classic/images/icons/silhouette.png
similarity index 100%
rename from skins/default/images/icons/silhouette.png
rename to skins/classic/images/icons/silhouette.png
diff --git a/skins/default/images/icons/sort.gif b/skins/classic/images/icons/sort.gif
similarity index 100%
rename from skins/default/images/icons/sort.gif
rename to skins/classic/images/icons/sort.gif
diff --git a/skins/default/images/icons/unflagged.png b/skins/classic/images/icons/unflagged.png
similarity index 100%
rename from skins/default/images/icons/unflagged.png
rename to skins/classic/images/icons/unflagged.png
diff --git a/skins/default/images/icons/unread.png b/skins/classic/images/icons/unread.png
similarity index 100%
rename from skins/default/images/icons/unread.png
rename to skins/classic/images/icons/unread.png
diff --git a/skins/default/images/icons/unread_children.png b/skins/classic/images/icons/unread_children.png
similarity index 100%
rename from skins/default/images/icons/unread_children.png
rename to 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
similarity index 100%
rename from skins/default/images/icons/up_small.gif
rename to skins/classic/images/icons/up_small.gif
diff --git a/skins/default/images/listheader.gif b/skins/classic/images/listheader.gif
similarity index 100%
rename from skins/default/images/listheader.gif
rename to skins/classic/images/listheader.gif
diff --git a/skins/default/images/mail_footer.gif b/skins/classic/images/mail_footer.gif
similarity index 100%
rename from skins/default/images/mail_footer.gif
rename to skins/classic/images/mail_footer.gif
diff --git a/skins/default/images/mail_footer.png b/skins/classic/images/mail_footer.png
similarity index 100%
rename from skins/default/images/mail_footer.png
rename to skins/classic/images/mail_footer.png
diff --git a/skins/default/images/mail_toolbar.gif b/skins/classic/images/mail_toolbar.gif
similarity index 100%
rename from skins/default/images/mail_toolbar.gif
rename to skins/classic/images/mail_toolbar.gif
diff --git a/skins/default/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png
similarity index 100%
rename from skins/default/images/mail_toolbar.png
rename to skins/classic/images/mail_toolbar.png
diff --git a/skins/default/images/messageactions.gif b/skins/classic/images/messageactions.gif
similarity index 100%
rename from skins/default/images/messageactions.gif
rename to skins/classic/images/messageactions.gif
diff --git a/skins/default/images/messageactions.png b/skins/classic/images/messageactions.png
similarity index 100%
rename from skins/default/images/messageactions.png
rename to skins/classic/images/messageactions.png
diff --git a/skins/default/images/messageicons.gif b/skins/classic/images/messageicons.gif
similarity index 100%
rename from skins/default/images/messageicons.gif
rename to skins/classic/images/messageicons.gif
diff --git a/skins/default/images/messageicons.png b/skins/classic/images/messageicons.png
similarity index 100%
rename from skins/default/images/messageicons.png
rename to skins/classic/images/messageicons.png
diff --git a/skins/default/images/pagenav.gif b/skins/classic/images/pagenav.gif
similarity index 100%
rename from skins/default/images/pagenav.gif
rename to skins/classic/images/pagenav.gif
diff --git a/skins/default/images/quota-colors.png b/skins/classic/images/quota-colors.png
similarity index 100%
rename from skins/default/images/quota-colors.png
rename to skins/classic/images/quota-colors.png
diff --git a/skins/default/images/quota.gif b/skins/classic/images/quota.gif
similarity index 100%
rename from skins/default/images/quota.gif
rename to skins/classic/images/quota.gif
diff --git a/skins/default/images/quota.png b/skins/classic/images/quota.png
similarity index 100%
rename from skins/default/images/quota.png
rename to skins/classic/images/quota.png
diff --git a/skins/default/images/roundcube_logo.png b/skins/classic/images/roundcube_logo.png
similarity index 100%
rename from skins/default/images/roundcube_logo.png
rename to skins/classic/images/roundcube_logo.png
diff --git a/skins/default/images/searchfield.gif b/skins/classic/images/searchfield.gif
similarity index 100%
rename from skins/default/images/searchfield.gif
rename to skins/classic/images/searchfield.gif
diff --git a/skins/default/images/tabs-left.gif b/skins/classic/images/tabs-left.gif
similarity index 100%
rename from skins/default/images/tabs-left.gif
rename to skins/classic/images/tabs-left.gif
diff --git a/skins/default/images/tabs-right.gif b/skins/classic/images/tabs-right.gif
similarity index 100%
rename from skins/default/images/tabs-right.gif
rename to skins/classic/images/tabs-right.gif
diff --git a/skins/default/images/taskbar.gif b/skins/classic/images/taskbar.gif
similarity index 100%
rename from skins/default/images/taskbar.gif
rename to skins/classic/images/taskbar.gif
diff --git a/skins/default/images/taskbar.png b/skins/classic/images/taskbar.png
similarity index 100%
rename from skins/default/images/taskbar.png
rename to skins/classic/images/taskbar.png
diff --git a/skins/default/images/taskicons.gif b/skins/classic/images/taskicons.gif
similarity index 100%
rename from skins/default/images/taskicons.gif
rename to skins/classic/images/taskicons.gif
diff --git a/skins/default/images/taskicons.png b/skins/classic/images/taskicons.png
similarity index 100%
rename from skins/default/images/taskicons.png
rename to skins/classic/images/taskicons.png
diff --git a/skins/default/images/tree.gif b/skins/classic/images/tree.gif
similarity index 100%
rename from skins/default/images/tree.gif
rename to skins/classic/images/tree.gif
diff --git a/skins/default/images/watermark.gif b/skins/classic/images/watermark.gif
similarity index 100%
rename from skins/default/images/watermark.gif
rename to skins/classic/images/watermark.gif
diff --git a/skins/default/includes/header.html b/skins/classic/includes/header.html
similarity index 100%
rename from skins/default/includes/header.html
rename to skins/classic/includes/header.html
diff --git a/skins/default/includes/links.html b/skins/classic/includes/links.html
similarity index 100%
rename from skins/default/includes/links.html
rename to skins/classic/includes/links.html
diff --git a/skins/default/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
similarity index 100%
rename from skins/default/includes/messagetoolbar.html
rename to skins/classic/includes/messagetoolbar.html
diff --git a/skins/default/includes/settingstabs.html b/skins/classic/includes/settingstabs.html
similarity index 100%
rename from skins/default/includes/settingstabs.html
rename to skins/classic/includes/settingstabs.html
diff --git a/skins/default/includes/taskbar.html b/skins/classic/includes/taskbar.html
similarity index 100%
rename from skins/default/includes/taskbar.html
rename to skins/classic/includes/taskbar.html
diff --git a/skins/default/mail.css b/skins/classic/mail.css
similarity index 100%
rename from skins/default/mail.css
rename to skins/classic/mail.css
diff --git a/skins/default/pngbehavior.htc b/skins/classic/pngbehavior.htc
similarity index 100%
rename from skins/default/pngbehavior.htc
rename to skins/classic/pngbehavior.htc
diff --git a/skins/default/print.css b/skins/classic/print.css
similarity index 100%
rename from skins/default/print.css
rename to skins/classic/print.css
diff --git a/skins/default/safari.css b/skins/classic/safari.css
similarity index 100%
rename from skins/default/safari.css
rename to skins/classic/safari.css
diff --git a/skins/default/settings.css b/skins/classic/settings.css
similarity index 100%
rename from skins/default/settings.css
rename to skins/classic/settings.css
diff --git a/skins/default/splitter.js b/skins/classic/splitter.js
similarity index 100%
rename from skins/default/splitter.js
rename to skins/classic/splitter.js
diff --git a/skins/default/templates/about.html b/skins/classic/templates/about.html
similarity index 100%
rename from skins/default/templates/about.html
rename to skins/classic/templates/about.html
diff --git a/skins/default/templates/addressbook.html b/skins/classic/templates/addressbook.html
similarity index 100%
rename from skins/default/templates/addressbook.html
rename to skins/classic/templates/addressbook.html
diff --git a/skins/default/templates/compose.html b/skins/classic/templates/compose.html
similarity index 100%
rename from skins/default/templates/compose.html
rename to skins/classic/templates/compose.html
diff --git a/skins/default/templates/contact.html b/skins/classic/templates/contact.html
similarity index 100%
rename from skins/default/templates/contact.html
rename to skins/classic/templates/contact.html
diff --git a/skins/default/templates/contactadd.html b/skins/classic/templates/contactadd.html
similarity index 100%
rename from skins/default/templates/contactadd.html
rename to skins/classic/templates/contactadd.html
diff --git a/skins/default/templates/contactedit.html b/skins/classic/templates/contactedit.html
similarity index 100%
rename from skins/default/templates/contactedit.html
rename to skins/classic/templates/contactedit.html
diff --git a/skins/default/templates/contactsearch.html b/skins/classic/templates/contactsearch.html
similarity index 100%
rename from skins/default/templates/contactsearch.html
rename to skins/classic/templates/contactsearch.html
diff --git a/skins/default/templates/error.html b/skins/classic/templates/error.html
similarity index 100%
rename from skins/default/templates/error.html
rename to skins/classic/templates/error.html
diff --git a/skins/default/templates/folderedit.html b/skins/classic/templates/folderedit.html
similarity index 100%
rename from skins/default/templates/folderedit.html
rename to skins/classic/templates/folderedit.html
diff --git a/skins/default/templates/folders.html b/skins/classic/templates/folders.html
similarity index 100%
rename from skins/default/templates/folders.html
rename to skins/classic/templates/folders.html
diff --git a/skins/default/templates/identities.html b/skins/classic/templates/identities.html
similarity index 100%
rename from skins/default/templates/identities.html
rename to skins/classic/templates/identities.html
diff --git a/skins/default/templates/identityedit.html b/skins/classic/templates/identityedit.html
similarity index 100%
rename from skins/default/templates/identityedit.html
rename to skins/classic/templates/identityedit.html
diff --git a/skins/default/templates/importcontacts.html b/skins/classic/templates/importcontacts.html
similarity index 100%
rename from skins/default/templates/importcontacts.html
rename to skins/classic/templates/importcontacts.html
diff --git a/skins/default/templates/login.html b/skins/classic/templates/login.html
similarity index 100%
rename from skins/default/templates/login.html
rename to skins/classic/templates/login.html
diff --git a/skins/default/templates/mail.html b/skins/classic/templates/mail.html
similarity index 100%
rename from skins/default/templates/mail.html
rename to skins/classic/templates/mail.html
diff --git a/skins/default/templates/message.html b/skins/classic/templates/message.html
similarity index 100%
rename from skins/default/templates/message.html
rename to skins/classic/templates/message.html
diff --git a/skins/default/templates/messageerror.html b/skins/classic/templates/messageerror.html
similarity index 100%
rename from skins/default/templates/messageerror.html
rename to skins/classic/templates/messageerror.html
diff --git a/skins/default/templates/messagepart.html b/skins/classic/templates/messagepart.html
similarity index 100%
rename from skins/default/templates/messagepart.html
rename to skins/classic/templates/messagepart.html
diff --git a/skins/default/templates/messagepreview.html b/skins/classic/templates/messagepreview.html
similarity index 100%
rename from skins/default/templates/messagepreview.html
rename to skins/classic/templates/messagepreview.html
diff --git a/skins/default/templates/messageprint.html b/skins/classic/templates/messageprint.html
similarity index 100%
rename from skins/default/templates/messageprint.html
rename to skins/classic/templates/messageprint.html
diff --git a/skins/default/templates/plugin.html b/skins/classic/templates/plugin.html
similarity index 100%
rename from skins/default/templates/plugin.html
rename to skins/classic/templates/plugin.html
diff --git a/skins/default/templates/settings.html b/skins/classic/templates/settings.html
similarity index 100%
rename from skins/default/templates/settings.html
rename to skins/classic/templates/settings.html
diff --git a/skins/default/templates/settingsedit.html b/skins/classic/templates/settingsedit.html
similarity index 100%
rename from skins/default/templates/settingsedit.html
rename to skins/classic/templates/settingsedit.html
diff --git a/skins/default/watermark.html b/skins/classic/watermark.html
similarity index 100%
rename from skins/default/watermark.html
rename to skins/classic/watermark.html