diff --git a/phpgwapi/inc/phpgw_common.inc.php b/phpgwapi/inc/phpgw_common.inc.php
index a28c1685ee..8b3d8df6f5 100644
--- a/phpgwapi/inc/phpgw_common.inc.php
+++ b/phpgwapi/inc/phpgw_common.inc.php
@@ -334,6 +334,19 @@
       }      
     }
 
+    function list_themes(){
+      global $phpgw_info;
+      $dh = opendir($phpgw_info["server"]["server_root"] . "/phpgwapi/themes");
+      while ($file = readdir($dh)) {
+        if (eregi("\.theme$", $file)) {
+           $list[] = substr($file,0,strpos($file,"."));
+        }
+      }
+      //$dh->close();
+      reset ($list);
+      return $list;
+    }
+
     function list_templates(){
       global $phpgw_info;
       $d = dir($phpgw_info["server"]["server_root"]."/phpgwapi/templates");
diff --git a/preferences/changetheme.php b/preferences/changetheme.php
deleted file mode 100755
index 01187cfdfc..0000000000
--- a/preferences/changetheme.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-  /**************************************************************************\
-  * phpGroupWare - preferences                                               *
-  * http://www.phpgroupware.org                                              *
-  * Written by Joseph Engo <jengo@phpgroupware.org>                          *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-  $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "preferences");
-
-  include("../header.inc.php");
-  
-  if ($theme) {
-     $phpgw->preferences->change("common","theme");
-     $phpgw->preferences->commit();
-     if ($phpgw_info["server"]["useframes"] != "never") {
-        Header("Location: " . $phpgw->link("/preferences/index.php","cd=yes"));
-        Header("Window-Target: _top");
-     } else {
-        Header("Location: " . $phpgw->link("changetheme.php"));
-     }
-     $phpgw->common->phpgw_exit();
-  }
-
-  $dh = opendir($phpgw_info["server"]["server_root"] . "/phpgwapi/themes");
-  while ($file = readdir($dh)) {
-    if (eregi("\.theme$", $file)) {
-       $installed_themes[] = substr($file,0,strpos($file,"."));
-    }
-  }
-
-  $phpgw->common->phpgw_header();
-  echo parse_navbar();
-
-  echo "<br>" . lang("your current theme is: x",$phpgw_info["user"]["preferences"]["theme"]);
-  echo "<br>" . lang("please, select a new theme") . ":";
-  echo "<br>";
-
-  for ($i=0; $i<count($installed_themes); $i++) {
-     echo '<br><a href="' . $phpgw->link("changetheme.php","theme="
-     	. $installed_themes[$i]) . '">' . $installed_themes[$i] . '</a>';
-  
-     if ($phpgw_info["server"]["useframes"] != "never") {     
-//        echo '<br><a href="' . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/index.php","ntheme="
-//        	. $installed_themes[$i] . "&forward=" . urlencode("preferences/index.php")) . '" target="_new">' . $installed_themes[$i] . '</a>';
-     }
-  }
-
-  $phpgw->common->phpgw_footer();
-?>
diff --git a/preferences/inc/hook_preferences.inc.php b/preferences/inc/hook_preferences.inc.php
index e4b059a32f..d15b74a48b 100644
--- a/preferences/inc/hook_preferences.inc.php
+++ b/preferences/inc/hook_preferences.inc.php
@@ -29,8 +29,6 @@
   // Actual content
   echo "<a href=\"" . $phpgw->link("changepassword.php") . "\">"
      . lang("change your password") . "</a>";
-  echo "<br><a href=\"" . $phpgw->link("changetheme.php") . "\">"
-     . lang("select different theme") . "</a>";
   echo "<br><a href=\"" . $phpgw->link("settings.php") . "\">"
      . lang("change your settings") . "</a>";
 //  echo "<br><a href=\"" . $phpgw->link("changeprofile.php") . "\">"
diff --git a/preferences/settings.php b/preferences/settings.php
index 316fc8b585..cc686d043d 100755
--- a/preferences/settings.php
+++ b/preferences/settings.php
@@ -50,6 +50,21 @@
         </td>
        </tr>
       <?php } ?>
+
+       <tr>
+         <?php $selected[$phpgw_info["user"]["preferences"]["common"]["theme"]] = " selected"; ?>
+        <td>Theme (colors/fonts) Selection:<br></td>
+        <td>
+         <select name="settings[theme]">
+        <?php
+          $themes = $phpgw->common->list_themes();
+          while (list ($key, $value) = each ($themes)){
+            echo '<option value="'.$value.'" '.$selected[$value].'>'.$value.'</option>';
+          }
+        ?>
+         </select>
+        </td>
+       </tr>
        <tr>
         <td><?php echo lang("Show navigation bar as"); ?>: </td>
         <td>