diff --git a/preferences/changetheme.php b/preferences/changetheme.php
index fe77dc2e1f..3bab8284f8 100755
--- a/preferences/changetheme.php
+++ b/preferences/changetheme.php
@@ -31,7 +31,8 @@
 
   $dh = opendir($phpgw_info["server"]["server_root"] . "/themes");
   while ($file = readdir($dh)) {
-    if ($file != "." && $file != ".." && $file != "CVS") {
+#    if ($file != "." && $file != ".." && $file != "CVS") {
+    if ( eregi( "\.theme$", $file ) ) {
        $installed_themes[] = substr($file,0,strpos($file,"."));
     }
   }
@@ -48,4 +49,6 @@
 	. $installed_themes[$i]) . "\">" . $installed_themes[$i] . "</a>\n";
   }
 
-  include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
\ No newline at end of file
+  include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
+
+?>