diff --git a/cd-template/doku/cryptocd.css b/cd-template/doku/cryptocd.css
index a999993..8076b36 100644
--- a/cd-template/doku/cryptocd.css
+++ b/cd-template/doku/cryptocd.css
@@ -264,7 +264,15 @@ caption {
   letter-spacing: 0.1em;
 }
 
-.
+.kbd {
+  background-color: #e1e1f0;
+  margin: 0.1em;
+  padding: 0 0.3em 0;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #f0f0ff #cdcddc #cdcddc #f0f0ff;
+}
+
 #footnotes {
 	font-size: small;
 	margin-top: 3em;
diff --git a/documents/linux/thunderbird_einrichtung/thunderbird_einrichtung.lyx b/documents/linux/thunderbird_einrichtung/thunderbird_einrichtung.lyx
index f802b47..aa971ff 100644
--- a/documents/linux/thunderbird_einrichtung/thunderbird_einrichtung.lyx
+++ b/documents/linux/thunderbird_einrichtung/thunderbird_einrichtung.lyx
@@ -139,7 +139,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="textit">
+<div class="kbd">
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/progress/progress_chat_anwendung.inc b/documents/progress/progress_chat_anwendung.inc
index 4692d28..e496ebb 100644
--- a/documents/progress/progress_chat_anwendung.inc
+++ b/documents/progress/progress_chat_anwendung.inc
@@ -2,8 +2,8 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
         <li class="done"><a href="../gaim_installation/gaim_installation.html" title="Gaim installieren">Gaim installieren</a></li>
         <li class="done"><a href="../gaim_einrichtung_konto/gaim_einrichtung_konto.html" title="Ein Konto einrichten">Ein Konto einrichten</a></li>
diff --git a/documents/progress/progress_chat_programme.inc b/documents/progress/progress_chat_programme.inc
index 1e7b613..0435355 100644
--- a/documents/progress/progress_chat_programme.inc
+++ b/documents/progress/progress_chat_programme.inc
@@ -2,8 +2,8 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
         <li class="next"><a href="../gaim_installation/gaim_installation.html" title="Gaim installieren">Gaim installieren</a></li>
         <li class="nextnext"><a href="../gaim_einrichtung_konto/gaim_einrichtung_konto.html" title="Ein Konto einrichten">Ein Konto einrichten</a></li>
diff --git a/documents/progress/progress_email_programme.inc b/documents/progress/progress_email_programme.inc
index 83ed459..8f1b09f 100644
--- a/documents/progress/progress_email_programme.inc
+++ b/documents/progress/progress_email_programme.inc
@@ -2,10 +2,10 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
-        <li class="done">Thunderbird:
+        <li><span class="done">Thunderbird:</span>
           <ul>
             <li class="next"><a href="../thunderbird_installation/thunderbird_installation.html" title="Installation">Installation</a></li>
             <li class="nextnext"><a href="../thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.html" title="Ein Konto einrichten">Ein
@@ -14,12 +14,12 @@
             Einstellungen</a></li>
           </ul>
         </li>
-        <li class="done">GnuPG:
+        <li><span class="done">GnuPG:</span>
           <ul>
             <li class="nextnext"><a href="../gpg_installation/gpg_installation.html" title="Installation">Installation</a></li>
           </ul>
         </li>
-        <li class="done">Enigmail:
+        <li><span class="done">Enigmail:</span>
           <ul>
             <li class="nextnext"><a href="../enigmail_installation/enigmail_installation.html" title="Installation">Installation</a></li>
             <li class="nextnext"><a href="../enigmail_einrichtung/enigmail_einrichtung.html" title="Enigmail einrichten">Einrichtung</a></li>
diff --git a/documents/progress/progress_enigmail_einrichtung.inc b/documents/progress/progress_enigmail_einrichtung.inc
index aae134f..66a42dd 100644
--- a/documents/progress/progress_enigmail_einrichtung.inc
+++ b/documents/progress/progress_enigmail_einrichtung.inc
@@ -2,10 +2,10 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
-        <li class="done">Thunderbird:
+        <li><span class="done">Thunderbird:</span>
           <ul>
             <li class="done"><a href="../thunderbird_installation/thunderbird_installation.html" title="Installation">Installation</a></li>
             <li class="done"><a href="../thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.html" title="Ein Konto einrichten">Ein
@@ -14,12 +14,12 @@
             Einstellungen</a></li>
           </ul>
         </li>
-        <li class="done">GnuPG:
+        <li><span class="done">GnuPG:</span>
           <ul>
             <li class="done"><a href="../gpg_installation/gpg_installation.html" title="Installation">Installation</a></li>
           </ul>
         </li>
-        <li class="done">Enigmail:
+        <li><span class="done">Enigmail:</span>
           <ul>
             <li class="done"><a href="../enigmail_installation/enigmail_installation.html" title="Installation">Installation</a></li>
             <li class="done"><a href="../enigmail_einrichtung/enigmail_einrichtung.html" title="Enigmail einrichten">Einrichtung</a></li>
diff --git a/documents/progress/progress_enigmail_installation.inc b/documents/progress/progress_enigmail_installation.inc
index 9d87e41..8921675 100644
--- a/documents/progress/progress_enigmail_installation.inc
+++ b/documents/progress/progress_enigmail_installation.inc
@@ -2,10 +2,10 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
-        <li class="done">Thunderbird:
+        <li><span class="done">Thunderbird:</span>
           <ul>
             <li class="done"><a href="../thunderbird_installation/thunderbird_installation.html" title="Installation">Installation</a></li>
             <li class="done"><a href="../thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.html" title="Ein Konto einrichten">Ein
@@ -14,12 +14,12 @@
             Einstellungen</a></li>
           </ul>
         </li>
-        <li class="done">GnuPG:
+        <li><span class="done">GnuPG:</span>
           <ul>
             <li class="done"><a href="../gpg_installation/gpg_installation.html" title="Installation">Installation</a></li>
           </ul>
         </li>
-        <li class="done">Enigmail:
+        <li><span class="done">Enigmail:</span>
           <ul>
             <li class="done"><a href="../enigmail_installation/enigmail_installation.html" title="Installation">Installation</a></li>
             <li class="next"><a href="../enigmail_einrichtung/enigmail_einrichtung.html" title="Enigmail einrichten">Einrichtung</a></li>
diff --git a/documents/progress/progress_gaim_einrichtung_konto.inc b/documents/progress/progress_gaim_einrichtung_konto.inc
index fc42c43..6df313e 100644
--- a/documents/progress/progress_gaim_einrichtung_konto.inc
+++ b/documents/progress/progress_gaim_einrichtung_konto.inc
@@ -2,8 +2,8 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
         <li class="done"><a href="../gaim_installation/gaim_installation.html" title="Gaim installieren">Gaim installieren</a></li>
         <li class="done"><a href="../gaim_einrichtung_konto/gaim_einrichtung_konto.html" title="Ein Konto einrichten">Ein Konto einrichten</a></li>
diff --git a/documents/progress/progress_gaim_encryption_einrichtung.inc b/documents/progress/progress_gaim_encryption_einrichtung.inc
index 76d73da..cc83c15 100644
--- a/documents/progress/progress_gaim_encryption_einrichtung.inc
+++ b/documents/progress/progress_gaim_encryption_einrichtung.inc
@@ -2,8 +2,8 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
         <li class="done"><a href="../gaim_installation/gaim_installation.html" title="Gaim installieren">Gaim installieren</a></li>
         <li class="done"><a href="../gaim_einrichtung_konto/gaim_einrichtung_konto.html" title="Ein Konto einrichten">Ein Konto einrichten</a></li>
diff --git a/documents/progress/progress_gaim_encryption_installation.inc b/documents/progress/progress_gaim_encryption_installation.inc
index 7b5bc7e..d50f7ba 100644
--- a/documents/progress/progress_gaim_encryption_installation.inc
+++ b/documents/progress/progress_gaim_encryption_installation.inc
@@ -2,8 +2,8 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
         <li class="done"><a href="../gaim_installation/gaim_installation.html" title="Gaim installieren">Gaim installieren</a></li>
         <li class="done"><a href="../gaim_einrichtung_konto/gaim_einrichtung_konto.html" title="Ein Konto einrichten">Ein Konto einrichten</a></li>
diff --git a/documents/progress/progress_gaim_installation.inc b/documents/progress/progress_gaim_installation.inc
index 0ab2567..c09dead 100644
--- a/documents/progress/progress_gaim_installation.inc
+++ b/documents/progress/progress_gaim_installation.inc
@@ -2,8 +2,8 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../chat_programme/chat_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
         <li class="done"><a href="../gaim_installation/gaim_installation.html" title="Gaim installieren">Gaim installieren</a></li>
         <li class="next"><a href="../gaim_einrichtung_konto/gaim_einrichtung_konto.html" title="Ein Konto einrichten">Ein Konto einrichten</a></li>
diff --git a/documents/progress/progress_gpg_installation.inc b/documents/progress/progress_gpg_installation.inc
index d179739..867abff 100644
--- a/documents/progress/progress_gpg_installation.inc
+++ b/documents/progress/progress_gpg_installation.inc
@@ -2,10 +2,10 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
-        <li class="done">Thunderbird:
+        <li><span class="done">Thunderbird:</span>
           <ul>
             <li class="done"><a href="../thunderbird_installation/thunderbird_installation.html" title="Installation">Installation</a></li>
             <li class="done"><a href="../thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.html" title="Ein Konto einrichten">Ein
@@ -14,12 +14,12 @@
             Einstellungen</a></li>
           </ul>
         </li>
-        <li class="done">GnuPG:
+        <li><span class="done">GnuPG:</span>
           <ul>
             <li class="done"><a href="../gpg_installation/gpg_installation.html" title="Installation">Installation</a></li>
           </ul>
         </li>
-        <li class="nextnext">Enigmail:
+        <li><span class="nextnext">Enigmail:</span>
           <ul>
             <li class="next"><a href="../enigmail_installation/enigmail_installation.html" title="Installation">Installation</a></li>
             <li class="nextnext"><a href="../enigmail_einrichtung/enigmail_einrichtung.html" title="Enigmail einrichten">Einrichtung</a></li>
diff --git a/documents/progress/progress_schluessel_erstellen.inc b/documents/progress/progress_schluessel_erstellen.inc
index ec720dc..e27e829 100644
--- a/documents/progress/progress_schluessel_erstellen.inc
+++ b/documents/progress/progress_schluessel_erstellen.inc
@@ -4,8 +4,8 @@
   <ol>
     <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
     Programme</a></li>
-    <li class="done"><a href="../schluesselbund/schluesselbund.html" title="Das Schl&uuml;sselbung verwalten">Das
-    Schl&uuml;sselbund verwalten</a>
+    <li><span class="done"><a href="../schluesselbund/schluesselbund.html" title="Das Schl&uuml;sselbung verwalten">Das
+    Schl&uuml;sselbund verwalten</a></span>
       <ol>
         <li class="done"><a href="../schluessel_erstellen/schluessel_erstellen.html" title="Einen Schl&uuml;ssel erstellen">Ein
         eigenes Schl&uuml;sselpaar erstellen</a></li>
diff --git a/documents/progress/progress_schluessel_exportieren.inc b/documents/progress/progress_schluessel_exportieren.inc
index ef6774a..a900c37 100644
--- a/documents/progress/progress_schluessel_exportieren.inc
+++ b/documents/progress/progress_schluessel_exportieren.inc
@@ -4,8 +4,8 @@
   <ol>
     <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
     Programme</a></li>
-    <li class="done"><a href="../schluesselbund/schluesselbund.html" title="Das Schl&uuml;sselbung verwalten">Das
-    Schl&uuml;sselbund verwalten</a>
+    <li><span class="done"><a href="../schluesselbund/schluesselbund.html" title="Das Schl&uuml;sselbung verwalten">Das
+    Schl&uuml;sselbund verwalten</a></span>
       <ol>
         <li class="done"><a href="../schluessel_erstellen/schluessel_erstellen.html" title="Einen Schl&uuml;ssel erstellen">Ein
         eigenes Schl&uuml;sselpaar erstellen</a></li>
diff --git a/documents/progress/progress_schluessel_importieren.inc b/documents/progress/progress_schluessel_importieren.inc
index 7ce8642..2a74c0d 100644
--- a/documents/progress/progress_schluessel_importieren.inc
+++ b/documents/progress/progress_schluessel_importieren.inc
@@ -4,8 +4,8 @@
   <ol>
     <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
     Programme</a></li>
-    <li class="done"><a href="../schluesselbund/schluesselbund.html" title="Das Schl&uuml;sselbung verwalten">Das
-    Schl&uuml;sselbund verwalten</a>
+    <li><span class="done"><a href="../schluesselbund/schluesselbund.html" title="Das Schl&uuml;sselbung verwalten">Das
+    Schl&uuml;sselbund verwalten</a></span>
       <ol>
         <li class="done"><a href="../schluessel_erstellen/schluessel_erstellen.html" title="Einen Schl&uuml;ssel erstellen">Ein
         eigenes Schl&uuml;sselpaar erstellen</a></li>
diff --git a/documents/progress/progress_schluesselbund.inc b/documents/progress/progress_schluesselbund.inc
index 8a37a9b..b0da179 100644
--- a/documents/progress/progress_schluesselbund.inc
+++ b/documents/progress/progress_schluesselbund.inc
@@ -4,8 +4,8 @@
   <ol>
     <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
     Programme</a></li>
-    <li class="done"><a href="../schluesselbund/schluesselbund.html" title="Das Schl&uuml;sselbung verwalten">Das
-    Schl&uuml;sselbund verwalten</a>
+    <li><span class="done"><a href="../schluesselbund/schluesselbund.html" title="Das Schl&uuml;sselbung verwalten">Das
+    Schl&uuml;sselbund verwalten</a></span>
       <ol>
         <li class="next"><a href="../schluessel_erstellen/schluessel_erstellen.html" title="Einen Schl&uuml;ssel erstellen">Ein
         eigenes Schl&uuml;sselpaar erstellen</a></li>
diff --git a/documents/progress/progress_thunderbird_einrichtung.inc b/documents/progress/progress_thunderbird_einrichtung.inc
index 0332545..115c006 100644
--- a/documents/progress/progress_thunderbird_einrichtung.inc
+++ b/documents/progress/progress_thunderbird_einrichtung.inc
@@ -2,10 +2,10 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
-        <li class="done">Thunderbird:
+        <li><span class="done">Thunderbird:</span>
           <ul>
             <li class="done"><a href="../thunderbird_installation/thunderbird_installation.html" title="Installation">Installation</a></li>
             <li class="done"><a href="../thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.html" title="Ein Konto einrichten">Ein
@@ -14,12 +14,12 @@
             Einstellungen</a></li>
           </ul>
         </li>
-        <li class="done">GnuPG:
+        <li><span class="done">GnuPG:</span>
           <ul>
             <li class="next"><a href="../gpg_installation/gpg_installation.html" title="Installation">Installation</a></li>
           </ul>
         </li>
-        <li class="done">Enigmail:
+        <li><span class="done">Enigmail:</span>
           <ul>
             <li class="nextnext"><a href="../enigmail_installation/enigmail_installation.html" title="Installation">Installation</a></li>
             <li class="nextnext"><a href="../enigmail_einrichtung/enigmail_einrichtung.html" title="Enigmail einrichten">Einrichtung</a></li>
diff --git a/documents/progress/progress_thunderbird_einrichtung_konto.inc b/documents/progress/progress_thunderbird_einrichtung_konto.inc
index 8a2c18c..046fa0d 100644
--- a/documents/progress/progress_thunderbird_einrichtung_konto.inc
+++ b/documents/progress/progress_thunderbird_einrichtung_konto.inc
@@ -2,10 +2,10 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
-        <li class="done">Thunderbird:
+        <li><span class="done">Thunderbird:</span>
           <ul>
             <li class="done"><a href="../thunderbird_installation/thunderbird_installation.html" title="Installation">Installation</a></li>
             <li class="done"><a href="../thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.html" title="Ein Konto einrichten">Ein
@@ -14,12 +14,12 @@
             Einstellungen</a></li>
           </ul>
         </li>
-        <li class="nextnext">GnuPG:
+        <li><span class="nextnext">GnuPG:</span>
           <ul>
             <li class="nextnext"><a href="../gpg_installation/gpg_installation.html" title="Installation">Installation</a></li>
           </ul>
         </li>
-        <li class="nextnext">Enigmail:
+        <li><span class="nextnext">Enigmail:</span>
           <ul>
             <li class="nextnext"><a href="../enigmail_installation/enigmail_installation.html" title="Installation">Installation</a></li>
             <li class="nextnext"><a href="../enigmail_einrichtung/enigmail_einrichtung.html" title="Enigmail einrichten">Einrichtung</a></li>
diff --git a/documents/progress/progress_thunderbird_installation.inc b/documents/progress/progress_thunderbird_installation.inc
index 019c122..15ae89a 100644
--- a/documents/progress/progress_thunderbird_installation.inc
+++ b/documents/progress/progress_thunderbird_installation.inc
@@ -2,10 +2,10 @@
 <div id="progress">
   <div id="progresstitle">So geht's weiter:</div>
   <ol>
-    <li class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
-    Programme</a>
+    <li><span class="done"><a href="../email_programme/email_programme.html" title="Ben&ouml;tigte Programme">Ben&ouml;tigte
+    Programme</a></span>
       <ol>
-        <li class="done">Thunderbird:
+        <li><span class="done">Thunderbird:</span>
           <ul>
             <li class="done"><a href="../thunderbird_installation/thunderbird_installation.html" title="Installation">Installation</a></li>
             <li class="next"><a href="../thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.html" title="Ein Konto einrichten">Ein
@@ -14,12 +14,12 @@
             Einstellungen</a></li>
           </ul>
         </li>
-        <li class="nextnext">GnuPG:
+        <li><span class="nextnext">GnuPG:</span>
           <ul>
             <li class="nextnext"><a href="../gpg_installation/gpg_installation.html" title="Installation">Installation</a></li>
           </ul>
         </li>
-        <li class="nextnext">Enigmail:
+        <li><span class="nextnext">Enigmail:</span>
           <ul>
             <li class="nextnext"><a href="../enigmail_installation/enigmail_installation.html" title="Installation">Installation</a></li>
             <li class="nextnext"><a href="../enigmail_einrichtung/enigmail_einrichtung.html" title="Enigmail einrichten">Einrichtung</a></li>