diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php
index f4d809b486..9540fe5302 100755
--- a/calendar/inc/functions.inc.php
+++ b/calendar/inc/functions.inc.php
@@ -105,8 +105,7 @@
   {
     global $phpgw, $phpgw_info, $friendly;
     if (! $friendly)
-       echo "<A HREF=\"".$phpgw->link($phpgw_info["server"]["app_root"]
-			."/view.php","id=$id")."\"><img src=\""
+       echo "<A HREF=\"".$phpgw->link("view.php","id=$id")."\"><img src=\""
 	   . $phpgw_info["server"]["app_images"]."/$pic\" "
 	   . "border=\"0\" alt=\"".htmlentities($description)."\"></a>";
   }
diff --git a/preferences/changetheme.php b/preferences/changetheme.php
index a4b824196d..7cbf0709e8 100755
--- a/preferences/changetheme.php
+++ b/preferences/changetheme.php
@@ -16,7 +16,13 @@
 
   $phpgw_flags["currentapp"] = "preferences";
   include("../header.inc.php");
-  $installed_themes = array('default','blue','mojo','heaven','yellows', 'rose');
+
+  $dh = opendir($phpgw_info["server"]["server_root"] . "/themes");
+  while ($file = readdir($dh)) {
+    if ($file != "." && $file != ".." && $file != "CVS") {
+       $installed_themes[] = substr($file,0,strpos($file,"."));
+    }
+  }
 
   if ($phpgw_info["user"]["permissions"]["anonymous"]) {
      Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/"));