diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index b677d970510b4604502db9cd511f7b9184a9d09c..c8ea9323c3c7e5df678a6357575d21184595058e 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -426,9 +426,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['suf']    = '';
         // highlight link to current page
         if ($id == $ID) {
-	  $link['pre']    = '<strong>';
-	  $link['suf']    = '</strong>';
-	}
+            $link['pre']    = '<span class="curid">';
+            $link['suf']    = '</span>';
+        }
         $link['more']   = 'onclick="return svchk()" onkeypress="return svchk()"';
         $link['class']  = $class;
         $link['url']    = wl($id);
@@ -916,9 +916,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         return htmlspecialchars($string);
     }
     
-    /**
-    * @TODO Tuning needed - e.g. utf8 strtolower ? 
-    */
     function _headerToLink($title) {
         return str_replace(':','',cleanID($title));
     }
@@ -936,13 +933,13 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $isImage = FALSE;
         
         if ( is_null($title) ) {
-	  if ($conf['useheading'] && $id) {
-	    $heading = p_get_first_heading($id);
-	    if ($heading) {
-	      return $this->_xmlEntities($heading);
-	    }
-	  }
-	  return $this->_xmlEntities($default);
+            if ($conf['useheading'] && $id) {
+                $heading = p_get_first_heading($id);
+                if ($heading) {
+                    return $this->_xmlEntities($heading);
+                }
+            }
+            return $this->_xmlEntities($default);
             
         } else if ( is_string($title) ) {
             
diff --git a/inc/template.php b/inc/template.php
index 787730173c28820985bf60c772a77da1f92d2c42..c879ecff8a9cdbe50e70290d34db86a6a749b099 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -358,9 +358,9 @@ function tpl_breadcrumbs(){
   foreach ($crumbs as $id => $name){
     $i++;
     print ' &raquo; ';
-    if ($i == $last) print '<strong>';
+    if ($i == $last) print '<span class="curid">';
     tpl_link(wl($id),$name,'class="breadcrumbs" title="'.$id.'"');
-    if ($i == $last) print '</strong>';
+    if ($i == $last) print '</span>';
   }
 }