diff --git a/fhem/contrib/commandref_join.pl b/fhem/contrib/commandref_join.pl
index 1a5d17260..d964b9675 100755
--- a/fhem/contrib/commandref_join.pl
+++ b/fhem/contrib/commandref_join.pl
@@ -74,6 +74,20 @@ printList($)
     last;
   }
 }
+my $var;
+sub
+chkAndGenLangLinks($$$)
+{
+  my ($l, $lang, $fh) = @_;
+  $var = $1 if($l =~ m/<a name="(.*?)"(.*?)><\/a>/);
+  if($l =~ m/(.*?)<\/h3>/ && $var) {
+    print $fh "<div class='langLinks'>[".join(" ", map { 
+        $_ eq $lang ? $_ : 
+        "<a href='commandref".($_ eq "EN" ? "":"_$_").".html#$var'>$_</a>"
+      } @lang) . "]</div>\n";
+    $var = undef;
+  }
+}
 
 foreach my $lang (@lang) {
   my $suffix = ($lang eq "EN" ? "" : "_$lang");
@@ -100,6 +114,8 @@ foreach my $lang (@lang) {
   while(my $l = <IN>) { # Header
     last if($l =~ m/name="perl"/);
     print OUT $l;
+    chkAndGenLangLinks($l, $lang, \*OUT);
+    
     printList($1) if($l =~ m/<!-- header:(.*) -->/);
   }
 
@@ -110,8 +126,11 @@ foreach my $lang (@lang) {
 
   # Copy the tail
   print OUT '<a name="perl"></a>',"\n";
+  $var = "perl"; 
+  
   while(my $l = <IN>) {
     print OUT $l;
+    chkAndGenLangLinks($l, $lang, \*OUT);
   }
   close(OUT);
 }
@@ -147,15 +166,11 @@ generateModuleCommandref($$;$$)
 
       } elsif($l =~ m/^=end html$suffix$/) {
         $skip = 1;
+        print $fh "<p>" if($fh);        
 
       } elsif(!$skip) {
         print $fh $l if($fh);
-        if($l =~ m,<h3>$mod</h3>,i && $fh) {
-          print $fh "<div class='langLinks'>".join(" ", map { 
-            $_ eq $lang ? $_ : 
-            "<a href='commandref".($_ eq "EN" ? "":"_$_").".html#$mod'>$_</a>"
-          } @lang) . "</div>\n";
-        }
+        chkAndGenLangLinks($l, $lang, $fh);
 
         $docCount++;
         $hasLink = ($l =~ m/<a name="$mod"/) if(!$hasLink);
diff --git a/fhem/docs/commandref_frame.html b/fhem/docs/commandref_frame.html
index 7e49d5306..ca3b5d078 100644
--- a/fhem/docs/commandref_frame.html
+++ b/fhem/docs/commandref_frame.html
@@ -18,7 +18,6 @@
     <div id="logo"></div>
     <div id="menu">
       <h3>fhem.pl reference</h3>
-      Version: <b>EN</b>&nbsp;<a href="commandref_DE.html">DE</a>
       <br><br>
       <a href="#doctop">Scroll to top</a>
       <br><br>
diff --git a/fhem/docs/commandref_frame_DE.html b/fhem/docs/commandref_frame_DE.html
index d8d00fdb3..ab8df97aa 100644
--- a/fhem/docs/commandref_frame_DE.html
+++ b/fhem/docs/commandref_frame_DE.html
@@ -18,7 +18,6 @@
     <div id="logo"></div>
     <div id="menu">
       <h3>fhem.pl Referenz</h3>
-      Version: <a href="commandref.html">EN</a>&nbsp;<b>DE</b>
       <br><br>
       <a href="#doctop">Zum Anfang</a>
       <br><br>
diff --git a/fhem/www/pgm2/defaultCommon.css b/fhem/www/pgm2/defaultCommon.css
index 1db7212c3..9e876cdd5 100644
--- a/fhem/www/pgm2/defaultCommon.css
+++ b/fhem/www/pgm2/defaultCommon.css
@@ -27,13 +27,16 @@ tr.column > td { padding:0; vertical-align:top;}
 .col2 { text-align:center; }
 
 /* Documentation */
-h2,h3,h4 { color:#52865D; line-height:1.3;
+h2,h4 { color:#52865D; line-height:1.3;
+           margin-top:1.5em; font-family:Arial,Sans-serif; }
+h3 { display: inline; color:#52865D; line-height:1.3;
            margin-top:1.5em; font-family:Arial,Sans-serif; }
 div.dist { padding-top:0.3em; }
 button.dist { margin:10px; background:transparent; border:0px; cursor:pointer; }
 div.block { border:1px solid gray; background: #F8F8E0; padding:0.7em; }
 #right { position:absolute; top:20px; left:180px; bottom:5px; right: 5px; }
 
+.langLinks { font-size: 0.6em; }
 
 /* Widgets */
 .makeTable  { display:inline; float:left; clear:left; /*detail-selector,slider*/