diff --git a/ChangeLog b/ChangeLog
index 56c460727..8fcc1c164 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ $Id$
 $Source$
 
 2006-04-12 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * css\phpmyadmin.css.php, scripts\setup.php, test\theme.php
+      themes\darkblue_orange\css\theme_right.css.php,
+      themes\original\css\theme_right.css.php:
+      fixed bug #1444466 theme directory not being processed correctly
     * libraries\common.lib.php, libraries\Theme_Manager.class.php:
       fixed bug #1469174 configuration changes not accepted in theme manager
     * libraries\Theme_Manager.class.php:
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 5ec225904..d233db30e 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -354,12 +354,13 @@ a.tab:hover, .tabactive {
 
 /* disabled drop/empty tabs */
 span.tab, span.tabcaution {
-    cursor: url(themes/original/img/error.ico), url(../themes/original/img/error.ico), default;
+    cursor: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/error.ico), url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/error.ico), default;
 }
 <?php } ?>
 /* end topmenu */
 
 
+
 /* data tables */
 table caption,
 table th,
@@ -494,7 +495,7 @@ form.login label {
 
 /* main page */
 #maincontainer {
-    background-image: url(../themes/original/img/logo_right.png);
+    background-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/logo_right.png);
     background-position: <?php echo $right; ?> bottom;
     background-repeat: no-repeat;
     border-bottom: 1px solid silver;
@@ -507,7 +508,7 @@ form.login label {
 }
 
 #maincontainer ul {
-    list-style-image: url(../themes/original/img/item_<?php echo $GLOBALS['text_dir']; ?>.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/item_<?php echo $GLOBALS['text_dir']; ?>.png);
     vertical-align: middle;
 }
 
@@ -520,96 +521,96 @@ form.login label {
 <?php if ( $GLOBALS['cfg']['MainPageIconic'] ) { ?>
 /* iconic view for ul items */
 li#li_create_database {
-    list-style-image: url(../themes/original/img/b_newdb.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_newdb.png);
 }
 
 li#li_select_lang {
-    list-style-image: url(../themes/original/img/s_lang.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_lang.png);
 }
 
 li#li_select_mysql_collation,
 li#li_select_mysql_charset {
-    list-style-image: url(../themes/original/img/s_asci.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_asci.png);
 }
 
 li#li_select_theme{
-    list-style-image: url(../themes/original/img/s_theme.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_theme.png);
 }
 
 li#li_server_info{
-    list-style-image: url(../themes/original/img/s_host.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
 }
 
 li#li_user_info{
-    /* list-style-image: url(../themes/original/img/s_rights.png); */
+    /* list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_rights.png); */
 }
 
 li#li_mysql_status{
-    list-style-image: url(../themes/original/img/s_status.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_status.png);
 }
 
 li#li_mysql_variables{
-    list-style-image: url(../themes/original/img/s_vars.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_vars.png);
 }
 
 li#li_mysql_processes{
-    list-style-image: url(../themes/original/img/s_process.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_process.png);
 }
 
 li#li_mysql_collations{
-    list-style-image: url(../themes/original/img/s_asci.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_asci.png);
 }
 
 li#li_mysql_engines{
-    list-style-image: url(../themes/original/img/b_engine.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_engine.png);
 }
 
 li#li_mysql_binlogs {
-    list-style-image: url(../themes/original/img/s_tbl.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_tbl.png);
 }
 
 li#li_mysql_databases {
-    list-style-image: url(../themes/original/img/s_db.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_db.png);
 }
 
 li#li_export {
-    list-style-image: url(../themes/original/img/b_export.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_export.png);
 }
 
 li#li_import {
-    list-style-image: url(../themes/original/img/b_import.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_import.png);
 }
 
 li#li_change_password {
-    list-style-image: url(../themes/original/img/s_passwd.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_passwd.png);
 }
 
 li#li_log_out {
-    list-style-image: url(../themes/original/img/s_loggoff.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_loggoff.png);
 }
 
 li#li_pma_docs {
-    list-style-image: url(../themes/original/img/b_docs.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_docs.png);
 }
 
 li#li_phpinfo {
-    list-style-image: url(../themes/original/img/php_sym.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/php_sym.png);
 }
 
 li#li_pma_homepage {
-    list-style-image: url(../themes/original/img/b_home.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_home.png);
 }
 
 li#li_mysql_privilegs{
-    list-style-image: url(../themes/original/img/s_rights.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_rights.png);
 }
 
 li#li_switch_dbstats {
-    list-style-image: url(../themes/original/img/b_dbstatistics.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_dbstatistics.png);
 }
 
 li#li_flush_privileges {
-    list-style-image: url(../themes/original/img/s_reload.png);
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_reload.png);
 }
 /* END iconic view for ul items */
 <?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
diff --git a/scripts/setup.php b/scripts/setup.php
index 3a21942e3..b0b1f6d61 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -81,7 +81,7 @@ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     div.notice {
         margin: 0.5em 0 0.5em 0;
         border: 0.1em solid #FFD700;
-        background-image: url(../themes/original/img/s_notice.png);
+        background-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_notice.png);
         background-repeat: no-repeat;
         background-position: 10px 50%;
         padding: 10px 10px 10px 36px;
@@ -102,7 +102,7 @@ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     div.warning {
         margin: 0.5em 0 0.5em 0;
         border: 0.1em solid #CC0000;
-        background-image: url(../themes/original/img/s_warn.png);
+        background-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_warn.png);
         background-repeat: no-repeat;
         background-position: 10px 50%;
         padding: 10px 10px 10px 36px;
@@ -123,7 +123,7 @@ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     div.error {
         margin: 0.5em 0 0.5em 0;
         border: 0.1em solid #ff0000;
-        background-image: url(../themes/original/img/s_error.png);
+        background-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_error.png);
         background-repeat: no-repeat;
         background-position: 10px 50%;
         padding: 10px 10px 10px 36px;
@@ -268,7 +268,7 @@ function version_to_int($version) {
  * @return  string  HTML link to documentation
  */
 function get_cfg_doc($anchor) {
-    return '<a href="../Documentation.html#cfg_' . $anchor . '" target="pma_doc" class="doc"><img class="icon" src="../themes/original/img/b_help.png" width="11" height="11" alt="Documentation" title="Documentation" /></a>';
+    return '<a href="../Documentation.html#cfg_' . $anchor . '" target="pma_doc" class="doc"><img class="icon" src="../' . $GLOBALS['cfg']['ThemePath'] . '/original/img/b_help.png" width="11" height="11" alt="Documentation" title="Documentation" /></a>';
 }
 
 /**
diff --git a/test/theme.php b/test/theme.php
index 0f3b045b2..887d3813a 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -233,11 +233,11 @@ echo sprintf( $strWelcome,
                     value="1" /></td>
             <th><label for="checkbox_1">th label</label</th>
             <td class="value">td.value</td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
             <td>table.data tbody tr.odd td</td>
         </tr>
@@ -246,11 +246,11 @@ echo sprintf( $strWelcome,
                     value="1" /></td>
             <th><label for="checkbox_2">th label</label</th>
             <td class="value">td.value</td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
             <td>table.data tbody tr.even td</td>
         </tr>
@@ -259,11 +259,11 @@ echo sprintf( $strWelcome,
                     value="1" /></td>
             <th><label for="checkbox_3">th label</label</th>
             <td class="value">td.value</td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
             <td>table.data tbody tr.odd td</td>
         </tr>
@@ -272,11 +272,11 @@ echo sprintf( $strWelcome,
                     value="1" /></td>
             <th><label for="checkbox_4">th label</label</th>
             <td class="value">td.value</td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../themes/original/img/bd_drop.png"
+            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
                     width="16" height="16" alt="drop" /></td>
             <td>table.data tbody tr.even td</td>
         </tr>
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 7691ab268..38a8f7557 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -65,7 +65,7 @@ th {
     font-weight:        bold;
     color:              #000000;
     background-color:   #ff9900;
-    background-image:   url(../themes/darkblue_orange/img/tbl_th.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_th.png);
     background-repeat:  repeat-x;
     background-position: top;
     height:             18px;
@@ -341,7 +341,7 @@ div.notice {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #FFD700;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../themes/darkblue_orange/img/s_notice.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/s_notice.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -373,7 +373,7 @@ div.warning {
     width:              90%;
 
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../themes/darkblue_orange/img/s_warn.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/s_warn.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -404,7 +404,7 @@ div.error {
     border:             0.1em solid #ff0000;
     width:              90%;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../themes/darkblue_orange/img/s_error.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/s_error.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -435,7 +435,7 @@ fieldset.confirmation legend {
     border-right:       0.1em solid #FF0000;
     font-weight:        bold;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../themes/darkblue_orange/img/s_really.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/s_really.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 5px 50%;
@@ -458,7 +458,7 @@ fieldset.confirmation legend {
     font-weight:        bold;
     color:              #ffffff;
     background-color:   #666699;
-    background-image:   url(../themes/darkblue_orange/img/tbl_header.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_header.png);
     background-repeat:  repeat-x;
     background-position: top;
     height:             18px;
@@ -468,7 +468,7 @@ fieldset.confirmation legend {
     font-weight:        normal;
     color:              #ffffff;
     background-color:   #666699;
-    background-image:   url(../themes/darkblue_orange/img/tbl_header.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_header.png);
     background-repeat:  repeat-x;
     background-position: top;
 }
@@ -608,7 +608,7 @@ a.tab:hover,
 /* disabled drop/empty tabs */
 span.tab,
 span.tabcaution {
-    cursor:             url(../themes/darkblue_orange/img/error.ico), default;
+    cursor:             url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/error.ico), default;
 }
 <?php } ?>
 /* end topmenu */
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 52fa89c6e..2df63b884 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -11,7 +11,7 @@ body {
     padding:            0;
     font-family:        <?php echo $GLOBALS['right_font_family']; ?>;
     color:              #000000;
-    background-image:   url(../themes/original/img/vertical_line.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/vertical_line.png);
     background-repeat:  repeat-y;
     background-color:   #F5F5F5;
 }
@@ -318,7 +318,7 @@ div.notice {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #FFD700;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../themes/original/img/s_notice.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_notice.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -348,7 +348,7 @@ div.warning {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #CC0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../themes/original/img/s_warn.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_warn.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -378,7 +378,7 @@ div.error {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #ff0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../themes/original/img/s_error.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_error.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -409,7 +409,7 @@ fieldset.confirmation legend {
     border-right:       0.1em solid #FF0000;
     font-weight:        bold;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../themes/original/img/s_really.png);
+    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_really.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 5px 50%;
@@ -573,7 +573,7 @@ a.tab:hover,
 /* disabled drop/empty tabs */
 span.tab,
 span.tabcaution {
-    cursor:             url(../themes/original/img/error.ico), default;
+    cursor:             url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/error.ico), default;
 }
 <?php } ?>
 /* end topmenu */