diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme
index 653fcfd5638..5df9772a949 100644
--- a/themes/goofy/goofy.theme
+++ b/themes/goofy/goofy.theme
@@ -120,7 +120,7 @@ function c(subject,mod,author,date,body) {document.writeln("<table border=\"0\"
         if ($terms = taxonomy_node_get_terms($node->nid)) {
           $taxlinks = array();
           foreach ($terms as $term) {
-            $taxlinks[] = "<a href=\"index.php?or=$term->tid\">". check_output($term->name) ."</a>";
+            $taxlinks[] = l($term->name, array("or" => $term->tid), "index");
           }
           $subright = $this->links($taxlinks);
         }
diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme
index df613357684..45d7c5196d3 100644
--- a/themes/unconed/unconed.theme
+++ b/themes/unconed/unconed.theme
@@ -105,7 +105,7 @@
               if ($terms = taxonomy_node_get_terms($node->nid)) {
                 $taxlinks = array();
                 foreach ($terms as $term) {
-                  $taxlinks[] = "<a href=\"index.php?or=$term->tid\">". check_output($term->name) ."</a>";
+                  $taxlinks[] = l($term->name, array("or" => $term->tid), "index");
                 }
                 $taxo = $this->links($taxlinks);
               }