From fe87027848c26c92e92961cc588899a03e830680 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 3 Mar 2010 15:05:44 -0700
Subject: [PATCH] Move dimp stylesheet files to a separate subdirectory

---
 framework/Core/lib/Horde.php                       |   9 +-
 .../bluewhite/{screen-dimp.css => dimp/screen.css} |   0
 imp/themes/{ie7-dimp.css => dimp/ie7.css}          |   0
 imp/themes/{screen-dimp.css => dimp/screen.css}    | 144 ++++++++++-----------
 imp/themes/{webkit-dimp.css => dimp/webkit.css}    |   4 +
 .../silver/{screen-dimp.css => dimp/screen.css}    | 106 +++++++--------
 .../{screen-dimp.css => dimp/screen.css}           |   2 +-
 7 files changed, 135 insertions(+), 130 deletions(-)
 rename imp/themes/bluewhite/{screen-dimp.css => dimp/screen.css} (100%)
 rename imp/themes/{ie7-dimp.css => dimp/ie7.css} (100%)
 rename imp/themes/{screen-dimp.css => dimp/screen.css} (81%)
 rename imp/themes/{webkit-dimp.css => dimp/webkit.css} (82%)
 rename imp/themes/silver/{screen-dimp.css => dimp/screen.css} (52%)
 rename imp/themes/tango-blue/{screen-dimp.css => dimp/screen.css} (81%)

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index aa6b81706..820252358 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1760,8 +1760,9 @@ HTML;
      *                        false for no theme.
      * @param array $options  Additional options:
      * <pre>
-     * 'app' - (string)
-     * 'sub' - (string) TODO
+     * 'app' - (string) The current application.
+     * 'sub' - (string) A subdirectory containing additional CSS files to
+     *         load as an overlay to the base CSS files.
      * </pre>
      *
      * @return array  TODO
@@ -1821,13 +1822,13 @@ HTML;
             foreach ($css_list as $css_name) {
                 $css[$themes_fs . $css_name . '.css'] = $themes_uri . $css_name . '.css';
                 if ($sub && ($app == $curr_app)) {
-                    $css[$themes_fs . $css_name . '-' . $sub . '.css'] = $themes_uri . $css_name . '-' . $sub . '.css';
+                    $css[$themes_fs . $sub . '/' . $css_name . '.css'] = $themes_uri . $sub . '/' . $css_name . '.css';
                 }
 
                 if (!empty($theme)) {
                     $css[$themes_fs . $theme . '/' . $css_name . '.css'] = $themes_uri . $theme . '/' . $css_name . '.css';
                     if ($sub && ($app == $curr_app)) {
-                        $css[$themes_fs . $theme . '/' . $css_name . '-' . $sub . '.css'] = $themes_uri . $theme . '/' . $css_name . '-' . $sub . '.css';
+                        $css[$themes_fs . $theme . '/' . $sub . '/' . $css_name . '.css'] = $themes_uri . $theme . '/' . $sub . '/' . $css_name . '.css';
                     }
                 }
             }
diff --git a/imp/themes/bluewhite/screen-dimp.css b/imp/themes/bluewhite/dimp/screen.css
similarity index 100%
rename from imp/themes/bluewhite/screen-dimp.css
rename to imp/themes/bluewhite/dimp/screen.css
diff --git a/imp/themes/ie7-dimp.css b/imp/themes/dimp/ie7.css
similarity index 100%
rename from imp/themes/ie7-dimp.css
rename to imp/themes/dimp/ie7.css
diff --git a/imp/themes/screen-dimp.css b/imp/themes/dimp/screen.css
similarity index 81%
rename from imp/themes/screen-dimp.css
rename to imp/themes/dimp/screen.css
index a4843f6f4..f8385fabd 100644
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/dimp/screen.css
@@ -46,7 +46,7 @@ div#quota {
 #quota .used {
     float: left;
     width: 100px;
-    background: maroon url('graphics/quotaback.jpg') repeat-y;
+    background: maroon url("../graphics/quotaback.jpg") repeat-y;
     text-align: right;
     border: 1px #000 solid;
     margin-right: 2px;
@@ -98,7 +98,7 @@ div#quota {
     z-index: 10;
 }
 .splitBarHoriz {
-    background-image: url("graphics/dragHandle.png");
+    background-image: url("../graphics/dragHandle.png");
     background-position: center top;
     border-top: 1px solid silver;
     border-bottom: 1px solid silver;
@@ -106,7 +106,7 @@ div#quota {
     height: 5px;
 }
 .splitBarVert, .splitBarVertSidebar {
-    background-image: url("graphics/dragHandleVert.png");
+    background-image: url("../graphics/dragHandleVert.png");
     background-position: center;
     border-right: 1px solid silver;
     border-left: 1px solid silver;
@@ -162,7 +162,7 @@ div.msgSize {
     overflow: hidden;
     border: 1px solid silver;
     border-top: 0;
-    background: transparent url("graphics/backhead_orderby.png") repeat-x;
+    background: transparent url("../graphics/backhead_orderby.png") repeat-x;
 }
 #msglistHeader a {
     cursor: pointer;
@@ -227,13 +227,13 @@ div.flagDeleted {
 
 /* Checkbox images */
 div.msCheck {
-    background-image: url("graphics/checkbox_off.png");
+    background-image: url("../graphics/checkbox_off.png");
 }
 div.msCheck:hover {
-    background-image: url("graphics/checkbox_over.png");
+    background-image: url("../graphics/checkbox_over.png");
 }
 div.vpRowSelected div.msCheck {
-    background-image: url("graphics/checkbox_on.png");
+    background-image: url("../graphics/checkbox_on.png");
 }
 
 /* Rows (vertical mode) */
@@ -275,10 +275,10 @@ div.vpRowVert.flagUnseen {
 
 /* ViewPort - scroller */
 .vpScroll {
-    background: url("graphics/scroller_back.png") repeat-y;
+    background: url("../graphics/scroller_back.png") repeat-y;
 }
 .vpScrollCursor {
-    background: url("graphics/scroller.png") repeat-y;
+    background: url("../graphics/scroller.png") repeat-y;
     border-left: 1px solid silver;
     width: 13px;
 }
@@ -288,10 +288,10 @@ div.vpRowVert.flagUnseen {
     width: 13px;
 }
 .vpScrollUp {
-    background-image: url("graphics/sbcursor_top.png");
+    background-image: url("../graphics/sbcursor_top.png");
 }
 .vpScrollDown {
-    background-image: url("graphics/sbcursor_bottom.png");
+    background-image: url("../graphics/sbcursor_bottom.png");
 }
 
 /* IFRAMEs */
@@ -355,13 +355,13 @@ div.vpRowVert.flagUnseen {
     width: 20px;
 }
 #ctx_folder_sub span.contextImg, #ctx_folder_unsub span.contextImg, #ctx_folderopts_sub span.contextImg, #ctx_folderopts_unsub span.contextImg {
-    background-image: url("graphics/folders/folder.png");
+    background-image: url("../graphics/folders/folder.png");
 }
 #sidebar span.col, #ctx_folderopts_collapse span.contextImg, #ctx_container_collapse span.contextImg, #ctx_folder_collapse span.contextImg {
-    background-image: url("graphics/folders/minus.png");
+    background-image: url("../graphics/folders/minus.png");
 }
 #sidebar span.exp, #ctx_folderopts_expand span.contextImg, #ctx_container_expand span.contextImg, #ctx_folder_expand span.contextImg {
-    background-image: url("graphics/folders/plus.png");
+    background-image: url("../graphics/folders/plus.png");
 }
 #normalfolders li.unsubFolder {
     font-style: italic;
@@ -416,7 +416,7 @@ div.vpRowVert.flagUnseen {
     background: #efefef;
     padding: 4px 2px;
     border: 1px silver solid;
-    background: transparent url("graphics/backhead_s2.png") repeat-x;
+    background: transparent url("../graphics/backhead_s2.png") repeat-x;
     height: 16px;
 }
 .dimpActions div {
@@ -475,7 +475,7 @@ div.dimpActionsCompose, div.dimpActionsMsg {
     overflow: auto;
 }
 #previewInfo {
-    background: transparent url("graphics/ico_message_off.png") no-repeat scroll 10px 15px;
+    background: transparent url("../graphics/ico_message_off.png") no-repeat scroll 10px 15px;
     color: #a0a0a0;
     line-height: 18px;
     padding: 15px 80px 10px 35px;
@@ -483,7 +483,7 @@ div.dimpActionsCompose, div.dimpActionsMsg {
 
 /* Headers styles. */
 .msgHeaders {
-    background: transparent url("graphics/backhead_r.png") repeat-x;
+    background: transparent url("../graphics/backhead_r.png") repeat-x;
     border-bottom: 1px #b9b9b3 solid;
     padding: 2px 0 1px;
     font-size: 90%;
@@ -590,7 +590,7 @@ div.dimpActionsCompose, div.dimpActionsMsg {
 
 /* Message body formatting. */
 .messageBody {
-    background: #fff url("graphics/backhead_shadow.png") top repeat-x;
+    background: #fff url("../graphics/backhead_shadow.png") top repeat-x;
     border: 0;
     padding: 7px 5px 5px;
 }
@@ -609,7 +609,7 @@ div.dimpActionsCompose, div.dimpActionsMsg {
 }
 
 .msgwrite {
-    background: #e2e2e2 url("graphics/backhead_r.png") repeat-x;
+    background: #e2e2e2 url("../graphics/backhead_r.png") repeat-x;
     border: 1px #b9b9b3 solid;
     cursor: default;
     padding: 2px 0;
@@ -647,7 +647,7 @@ div.dimpActionsCompose, div.dimpActionsMsg {
 }
 
 #composeMessageParent {
-    background: #fff url("graphics/backhead_shadow.png") top repeat-x;
+    background: #fff url("../graphics/backhead_shadow.png") top repeat-x;
     border-left: 1px silver solid;
     border-right: 1px silver solid;
     border-bottom: 1px silver solid;
@@ -705,7 +705,7 @@ div.dimpActionsCompose, div.dimpActionsMsg {
 }
 
 span.attachmentImg {
-    background-image: url("graphics/attachment.png");
+    background-image: url("../graphics/attachment.png");
 }
 
 /* Context Menus */
@@ -772,7 +772,7 @@ a.address:hover img {
     padding: 2px 0 0;
 }
 #qsearch_icon {
-    background: #f3f3f3 url("graphics/search.png") center no-repeat;
+    background: #f3f3f3 url("../graphics/search.png") center no-repeat;
     padding-top: 2px;
 }
 #qsearch_input {
@@ -844,131 +844,131 @@ span.iconImg, span.contextImg, span.spellcheckPopdownImg {
 
 /* Sidebar images. */
 span.infoIcon {
-    background-image: url("graphics/info_icon.png");
+    background-image: url("../graphics/info_icon.png");
 }
 span.filtersIcon {
-    background-image: url("graphics/filters.png");
+    background-image: url("../graphics/filters.png");
 }
 span.hordeIcon {
-    background-image: url("graphics/horde.png");
+    background-image: url("../graphics/horde.png");
 }
 span.prefsIcon {
-    background-image: url("graphics/prefs.png");
+    background-image: url("../graphics/prefs.png");
 }
 span.logoutIcon {
-    background-image: url("graphics/logout.png");
+    background-image: url("../graphics/logout.png");
 }
 
 /* Dimp action images. */
 span.dimpactionReply {
-    background-image: url("graphics/reply.png");
+    background-image: url("../graphics/reply.png");
 }
 span.dimpactionForward {
-    background-image: url("graphics/forward.png");
+    background-image: url("../graphics/forward.png");
 }
 span.dimpactionSpam {
-    background-image: url("graphics/spam.png");
+    background-image: url("../graphics/spam.png");
 }
 span.dimpactionHam {
-    background-image: url("graphics/ham.png");
+    background-image: url("../graphics/ham.png");
 }
 span.dimpactionCompose {
-    background-image: url("graphics/compose.png");
+    background-image: url("../graphics/compose.png");
 }
 span.dimpactionCheckmail {
-    background-image: url("graphics/checkmail.png");
+    background-image: url("../graphics/checkmail.png");
 }
 span.dimpactionRefresh {
-    background-image: url("graphics/reload.png");
+    background-image: url("../graphics/reload.png");
 }
 span.dimpactionDelete {
-    background-image: url("graphics/delete.png");
+    background-image: url("../graphics/delete.png");
 }
 span.dimpactionOther {
-    background-image: url("graphics/plus.png");
+    background-image: url("../graphics/plus.png");
 }
 span.dimpactionSpellcheck {
-    background-image: url("graphics/spellcheck.png");
+    background-image: url("../graphics/spellcheck.png");
 }
 span.dimpactionDrafts {
-    background-image: url("graphics/drafts.png");
+    background-image: url("../graphics/drafts.png");
 }
 
 /* Context menu images */
 #ctx_message_reply span.contextImg {
-    background-image: url("graphics/reply.png");
+    background-image: url("../graphics/reply.png");
 }
 #ctx_reply_reply span.contextImg, #ctx_reply_reply_all span.contextImg, #ctx_reply_reply_list span.contextImg {
-    background-image: url("graphics/replyall.png");
+    background-image: url("../graphics/replyall.png");
 }
 #ctx_message_forward span.contextImg, #ctx_forward_attach span.contextImg, #ctx_forward_body span.contextImg, #ctx_forward_both span.contextImg {
-    background-image: url("graphics/forward.png");
+    background-image: url("../graphics/forward.png");
 }
 #ctx_folder_empty span.contextImg, #ctx_message_deleted span.contextImg, #ctx_draft_deleted span.contextImg, #oa_purge_deleted span.contextImg {
-    background-image: url("graphics/delete.png");
+    background-image: url("../graphics/delete.png");
 }
 #ctx_message_undeleted span.contextImg, #ctx_draft_undeleted span.contextImg, #oa_undeleted span.contextImg {
-    background-image: url("graphics/undelete.png");
+    background-image: url("../graphics/undelete.png");
 }
 #ctx_folder_seen span.contextImg {
-    background-image: url("graphics/mail_seen.png");
+    background-image: url("../graphics/mail_seen.png");
 }
 #ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
-    background-image: url("graphics/mail_unseen.png");
+    background-image: url("../graphics/mail_unseen.png");
 }
 #ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg, #ctx_folder_setflag span.contextImg {
-    background-image: url("graphics/mail_flagged.png");
+    background-image: url("../graphics/mail_flagged.png");
 }
 #ctx_message_unsetflag span.contextImg, #ctx_draft_unsetflag span.contextImg, #oa_unsetflag span.contextImg {
-    background-image: url("graphics/mail_clearflag.png");
+    background-image: url("../graphics/mail_clearflag.png");
 }
 #ctx_message_source span.contextImg, #msg_view_source span.iconImg {
-    background-image: url("graphics/message_source.png");
+    background-image: url("../graphics/message_source.png");
 }
 #ctx_draft_resume span.contextImg {
-    background-image: url("graphics/mail_draft.png");
+    background-image: url("../graphics/mail_draft.png");
 }
 #oa_preview_hide span.contextImg, #oa_preview_show span.contextImg {
-    background-image: url("graphics/preview.png");
+    background-image: url("../graphics/preview.png");
 }
 #oa_layout_horiz span.contextImg {
-    background-image: url("graphics/application_tile_vertical.png");
+    background-image: url("../graphics/application_tile_vertical.png");
 }
 #oa_layout_vert span.contextImg {
-    background-image: url("graphics/application_tile_horizontal.png");
+    background-image: url("../graphics/application_tile_horizontal.png");
 }
 #oa_selectall span.contextImg {
-    background-image: url("graphics/tick.png");
+    background-image: url("../graphics/tick.png");
 }
 #ctx_folder_create span.contextImg, #ctx_container_create span.contextImg, #ctx_folderopts_new span.contextImg {
-    background-image: url("graphics/folders/create.png");
+    background-image: url("../graphics/folders/create.png");
 }
 #ctx_folder_rename span.contextImg, #ctx_container_rename span.contextImg, #ctx_vfolder_edit span.contextImg {
-    background-image: url("graphics/folders/edit.png");
+    background-image: url("../graphics/folders/edit.png");
 }
 #ctx_folder_delete span.contextImg, #ctx_vfolder_delete span.contextImg {
-    background-image: url("graphics/folders/delete.png");
+    background-image: url("../graphics/folders/delete.png");
 }
 #ctx_message_spam span.contextImg {
-    background-image: url("graphics/spam.png");
+    background-image: url("../graphics/spam.png");
 }
 #ctx_message_ham span.contextImg {
-    background-image: url("graphics/ham.png");
+    background-image: url("../graphics/ham.png");
 }
 #ctx_message_blacklist span.contextImg, #oa_blacklist span.contextImg {
-    background-image: url("graphics/blacklist.png");
+    background-image: url("../graphics/blacklist.png");
 }
 #ctx_message_whitelist span.contextImg, #oa_whitelist span.contextImg {
-    background-image: url("graphics/whitelist.png");
+    background-image: url("../graphics/whitelist.png");
 }
 #ctx_contacts_new span.contextImg {
-    background-image: url("graphics/compose.png");
+    background-image: url("../graphics/compose.png");
 }
 #ctx_contacts_add span.contextImg {
-    background-image: url("graphics/add_contact.png");
+    background-image: url("../graphics/add_contact.png");
 }
 #ctx_folderopts_reload span.contextImg {
-    background-image: url("graphics/reload.png");
+    background-image: url("../graphics/reload.png");
 }
 #ctx_flag span.contextImg.flagUser {
     border: 1px black solid;
@@ -989,7 +989,7 @@ div.msgSubject span.treeImg {
 
 /* Other images */
 #msg_newwin span.iconImg, #msg_newwin_options span.iconImg {
-    background-image: url("graphics/newwin.png");
+    background-image: url("../graphics/newwin.png");
 }
 #msg_newwin span.iconImg {
     cursor: pointer;
@@ -998,36 +998,36 @@ div.msgSubject span.treeImg {
     margin-right: 0;
 }
 #th_expand span.iconImg, #partlist_col, #msgloglist_col {
-    background-image: url("graphics/arrow_collapsed.png");
+    background-image: url("../graphics/arrow_collapsed.png");
     cursor: pointer;
     margin-right: 0;
 }
 #th_collapse span.iconImg, #partlist_exp, #msgloglist_exp {
-    background-image: url("graphics/arrow_expanded.png");
+    background-image: url("../graphics/arrow_expanded.png");
     cursor: pointer;
     margin-right: 0;
 }
 
 span.popdownImg, span.spellcheckPopdownImg {
-    background-image: url("graphics/popdown.png");
+    background-image: url("../graphics/popdown.png");
     margin-right: 0;
     margin-left: 0;
 }
 span.keyupImg {
-    background-image: url("graphics/key_up.png");
+    background-image: url("../graphics/key_up.png");
 }
 span.keydownImg {
-    background-image: url("graphics/key_down.png");
+    background-image: url("../graphics/key_down.png");
 }
 span.readonlyImg {
-    background-image: url("graphics/locked.png");
+    background-image: url("../graphics/locked.png");
     vertical-align: sub;
 }
 
 /* Growler notification styles. */
 #Growler div.imp-reply, span.imp-reply {
-    background-image: url("graphics/mail_answered.png");
+    background-image: url("../graphics/mail_answered.png");
 }
 #Growler div.imp-forward, div.imp-redirect, span.imp-forward, span.imp-redirect {
-    background-image: url("graphics/mail_forwarded.png");
+    background-image: url("../graphics/mail_forwarded.png");
 }
diff --git a/imp/themes/webkit-dimp.css b/imp/themes/dimp/webkit.css
similarity index 82%
rename from imp/themes/webkit-dimp.css
rename to imp/themes/dimp/webkit.css
index ffb573c80..ce58f690f 100644
--- a/imp/themes/webkit-dimp.css
+++ b/imp/themes/dimp/webkit.css
@@ -1,3 +1,7 @@
+/**
+ * CSS corrections for WebKit.
+ */
+
 div.msgStatus div, #msgHeadersContent .subject span, span.iconImg, span.contextImg, span.spellcheckPopdownImg, span.popdownImg, #qsearch_icon, #qsearch_close {
     vertical-align: middle;
 }
diff --git a/imp/themes/silver/screen-dimp.css b/imp/themes/silver/dimp/screen.css
similarity index 52%
rename from imp/themes/silver/screen-dimp.css
rename to imp/themes/silver/dimp/screen.css
index 14514e3c0..76299881e 100644
--- a/imp/themes/silver/screen-dimp.css
+++ b/imp/themes/silver/dimp/screen.css
@@ -1,15 +1,15 @@
 #ctx_folder_sub span.contextImg, #ctx_folder_unsub span.contextImg, #ctx_folderopts_sub span.contextImg, #ctx_folderopts_unsub span.contextImg {
-    background-image: url("graphics/folders/explore.png");
+    background-image: url("../graphics/folders/explore.png");
 }
 #sidebar span.col, #ctx_folderopts_collapse span.contextImg, #ctx_container_collapse span.contextImg, #ctx_folder_collapse span.contextImg {
-    background-image: url("graphics/folders/minus.png");
+    background-image: url("../graphics/folders/minus.png");
 }
 #sidebar span.exp, #ctx_folderopts_expand span.contextImg, #ctx_container_expand span.contextImg, #ctx_folder_expand span.contextImg {
-    background-image: url("graphics/folders/plus.png");
+    background-image: url("../graphics/folders/plus.png");
 }
 
 #attach_list div, span.attachmentImg {
-    background-image: url("graphics/attachment.png");
+    background-image: url("../graphics/attachment.png");
 }
 
 .header {
@@ -26,158 +26,158 @@
 }
 
 span.infoIcon {
-    background-image: url("graphics/info_icon.png");
+    background-image: url("../graphics/info_icon.png");
 }
 span.filtersIcon {
-    background-image: url("graphics/filters.png");
+    background-image: url("../graphics/filters.png");
 }
 span.hordeIcon {
-    background-image: url("graphics/horde.png");
+    background-image: url("../graphics/horde.png");
 }
 span.prefsIcon {
-    background-image: url("graphics/prefs.png");
+    background-image: url("../graphics/prefs.png");
 }
 span.logoutIcon {
-    background-image: url("graphics/logout.png");
+    background-image: url("../graphics/logout.png");
 }
 
 span.dimpactionReply {
-    background-image: url("graphics/reply.png");
+    background-image: url("../graphics/reply.png");
 }
 span.dimpactionForward {
-    background-image: url("graphics/forward.png");
+    background-image: url("../graphics/forward.png");
 }
 span.dimpactionSpam {
-    background-image: url("graphics/spam.png");
+    background-image: url("../graphics/spam.png");
 }
 span.dimpactionHam {
-    background-image: url("graphics/ham.png");
+    background-image: url("../graphics/ham.png");
 }
 span.dimpactionCompose {
-    background-image: url("graphics/compose.png");
+    background-image: url("../graphics/compose.png");
 }
 span.dimpactionCheckmail {
-    background-image: url("graphics/checkmail.png");
+    background-image: url("../graphics/checkmail.png");
 }
 span.dimpactionRefresh {
-    background-image: url("graphics/reload.png");
+    background-image: url("../graphics/reload.png");
 }
 span.dimpactionDelete {
-    background-image: url("graphics/delete.png");
+    background-image: url("../graphics/delete.png");
 }
 span.dimpactionOther {
-    background-image: url("graphics/plus.png");
+    background-image: url("../graphics/plus.png");
 }
 span.dimpactionSpellcheck {
-    background-image: url("graphics/spellcheck.png");
+    background-image: url("../graphics/spellcheck.png");
 }
 span.dimpactionDrafts {
-    background-image: url("graphics/drafts.png");
+    background-image: url("../graphics/drafts.png");
 }
 
 /* Context menu images */
 #ctx_message_reply span.contextImg {
-    background-image: url("graphics/reply.png");
+    background-image: url("../graphics/reply.png");
 }
 #ctx_reply_reply span.contextImg, #ctx_reply_reply_all span.contextImg, #ctx_reply_reply_list span.contextImg {
-    background-image: url("graphics/replyall.png");
+    background-image: url("../graphics/replyall.png");
 }
 #ctx_message_forward span.contextImg, #ctx_forward_attach span.contextImg, #ctx_forward_body span.contextImg, #ctx_forward_both span.contextImg {
-    background-image: url("graphics/forward.png");
+    background-image: url("../graphics/forward.png");
 }
 #ctx_folder_empty span.contextImg, #ctx_message_deleted span.contextImg, #ctx_draft_deleted span.contextImg, #oa_purge_deleted span.contextImg {
-    background-image: url("graphics/delete.png");
+    background-image: url("../graphics/delete.png");
 }
 #ctx_message_undeleted span.contextImg, #ctx_draft_undeleted span.contextImg, #oa_undeleted span.contextImg {
-    background-image: url("graphics/undelete.png");
+    background-image: url("../graphics/undelete.png");
 }
 #ctx_folder_seen span.contextImg {
-    background-image: url("graphics/mail_seen.png");
+    background-image: url("../graphics/mail_seen.png");
 }
 #ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
-    background-image: url("graphics/mail_unseen.png");
+    background-image: url("../graphics/mail_unseen.png");
 }
 #ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg, #ctx_folder_setflag span.contextImg {
-    background-image: url("graphics/mail_flagged.png");
+    background-image: url("../graphics/mail_flagged.png");
 }
 #ctx_message_unsetflag span.contextImg, #ctx_draft_unsetflag span.contextImg, #oa_unsetflag span.contextImg {
-    background-image: url("graphics/mail_clearflag.png");
+    background-image: url("../graphics/mail_clearflag.png");
 }
 #ctx_draft_resume span.contextImg {
-    background-image: url("graphics/mail_draft.png");
+    background-image: url("../graphics/mail_draft.png");
 }
 #oa_preview_hide span.contextImg, #oa_preview_show span.contextImg {
-    background-image: url("graphics/preview.png");
+    background-image: url("../graphics/preview.png");
 }
 #oa_layout_horiz span.contextImg {
-    background-image: url("graphics/application_tile_vertical.png");
+    background-image: url("../graphics/application_tile_vertical.png");
 }
 #oa_layout_vert span.contextImg {
-    background-image: url("graphics/application_tile_horizontal.png");
+    background-image: url("../graphics/application_tile_horizontal.png");
 }
 #oa_selectall span.contextImg {
-    background-image: url("graphics/tick.png");
+    background-image: url("../graphics/tick.png");
 }
 #ctx_folder_create span.contextImg, #ctx_container_create span.contextImg, #ctx_folderopts_new span.contextImg {
-    background-image: url("graphics/folders/create.png");
+    background-image: url("../graphics/folders/create.png");
 }
 #ctx_folder_rename span.contextImg, #ctx_container_rename span.contextImg, #ctx_vfolder_edit span.contextImg {
-    background-image: url("graphics/folders/edit.png");
+    background-image: url("../graphics/folders/edit.png");
 }
 #ctx_folder_delete span.contextImg, #ctx_vfolder_delete span.contextImg {
-    background-image: url("graphics/folders/delete.png");
+    background-image: url("../graphics/folders/delete.png");
 }
 #ctx_message_spam span.contextImg {
-    background-image: url("graphics/spam.png");
+    background-image: url("../graphics/spam.png");
 }
 #ctx_message_ham span.contextImg {
-    background-image: url("graphics/ham.png");
+    background-image: url("../graphics/ham.png");
 }
 #ctx_message_blacklist span.contextImg, #oa_blacklist span.contextImg {
-    background-image: url("graphics/blacklist.png");
+    background-image: url("../graphics/blacklist.png");
 }
 #ctx_message_whitelist span.contextImg, #oa_whitelist span.contextImg {
-    background-image: url("graphics/whitelist.png");
+    background-image: url("../graphics/whitelist.png");
 }
 #ctx_message_source span.contextImg, #msg_view_source span.iconImg {
-    background-image: url("graphics/message_source.png");
+    background-image: url("../graphics/message_source.png");
 }
 #ctx_contacts_new span.contextImg {
-    background-image: url("graphics/compose.png");
+    background-image: url("../graphics/compose.png");
 }
 #ctx_contacts_add span.contextImg {
-    background-image: url("graphics/add_contact.png");
+    background-image: url("../graphics/add_contact.png");
 }
 #ctx_folderopts_reload span.contextImg {
-    background-image: url("graphics/reload.png");
+    background-image: url("../graphics/reload.png");
 }
 
 /* Other images */
 #msg_newwin span.iconImg, #msg_newwin_options span.iconImg {
-    background-image: url("graphics/newwin.png");
+    background-image: url("../graphics/newwin.png");
 }
 
 #qsearch_icon {
-    background-image: url("graphics/search.png");
+    background-image: url("../graphics/search.png");
 }
 
 #th_expand span.iconImg, #partlist_col, #msgloglist_col {
-    background-image: url("graphics/arrow_collapsed.png");
+    background-image: url("../graphics/arrow_collapsed.png");
 }
 #th_collapse span.iconImg, #partlist_exp, #msgloglist_exp {
-    background-image: url("graphics/arrow_expanded.png");
+    background-image: url("../graphics/arrow_expanded.png");
 }
 
 span.popdownImg, span.spellcheckPopdownImg {
-    background-image: url("graphics/popdown.png");
+    background-image: url("../graphics/popdown.png");
 }
 span.readonlyImg {
-    background-image: url("graphics/locked.png");
+    background-image: url("../graphics/locked.png");
 }
 
 #Growler div.imp-reply {
-    background-image: url("graphics/mail_answered.png");
+    background-image: url("../graphics/mail_answered.png");
 }
 #Growler div.imp-forward, #Growler div.imp-redirect {
-    background-image: url("graphics/mail_forwarded.png");
+    background-image: url("../graphics/mail_forwarded.png");
 }
diff --git a/imp/themes/tango-blue/screen-dimp.css b/imp/themes/tango-blue/dimp/screen.css
similarity index 81%
rename from imp/themes/tango-blue/screen-dimp.css
rename to imp/themes/tango-blue/dimp/screen.css
index fe91bb77e..7416ec14f 100644
--- a/imp/themes/tango-blue/screen-dimp.css
+++ b/imp/themes/tango-blue/dimp/screen.css
@@ -16,5 +16,5 @@
 }
 
 #ctx_folderopts_reload span.contextImg {
-    background-image: url("graphics/reload.png");
+    background-image: url("../graphics/reload.png");
 }
-- 
2.11.0