diff --git a/cd-template/doku/cryptocd.css b/cd-template/doku/cryptocd.css
index 8076b36..f5e4b40 100644
--- a/cd-template/doku/cryptocd.css
+++ b/cd-template/doku/cryptocd.css
@@ -265,6 +265,8 @@ caption {
 }
 
 .kbd {
+  font-family: monospace;
+  font-size: 90%;
   background-color: #e1e1f0;
   margin: 0.1em;
   padding: 0 0.3em 0;
diff --git a/documents/common/gaim_encryption_einrichtung/gaim_encryption_einrichtung.lyx b/documents/common/gaim_encryption_einrichtung/gaim_encryption_einrichtung.lyx
index 57fde43..1507e3d 100644
--- a/documents/common/gaim_encryption_einrichtung/gaim_encryption_einrichtung.lyx
+++ b/documents/common/gaim_encryption_einrichtung/gaim_encryption_einrichtung.lyx
@@ -116,14 +116,77 @@ Die Aktivierung des Plugins
 \end_layout
 
 \begin_layout Standard
-Um das Plugin zu aktivieren, öffne die Kontakliste und klicke im Menü 
+Um das Plugin zu aktivieren, öffne die Kontakliste und klicke wähle aus
+ dem Menü: 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+Werkzeuge ->
 \emph on
-Werkzeuge 
+ 
 \emph default
-auf den 
-\emph on
 Einstellungen
-\emph default
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
 :
 \end_layout
 
diff --git a/documents/common/schluessel_erstellen/schluessel_erstellen.lyx b/documents/common/schluessel_erstellen/schluessel_erstellen.lyx
index d8742eb..cf27f9e 100644
--- a/documents/common/schluessel_erstellen/schluessel_erstellen.lyx
+++ b/documents/common/schluessel_erstellen/schluessel_erstellen.lyx
@@ -148,7 +148,7 @@ Ein Schl
 \end_layout
 
 \begin_layout Standard
-Öffne Thunderbird und starte die Schlüsselverwaltung über das Menü: 
+Öffne Thunderbird und starte die Schlüsselverwaltung über das Menü 
 \begin_inset ERT
 status collapsed
 
@@ -165,7 +165,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<span class="textit">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -214,7 +214,7 @@ end{rawhtml}
 
 \end_inset
 
-
+:
 \end_layout
 
 \begin_layout Standard
@@ -245,8 +245,72 @@ Die Schl
 \begin_layout Standard
 Dein Schlüsselring ist derzeit noch leer.
  Um ein neues Schlüsselpaar zu erstellen klicke auf 
-\emph on
-Erzeugen -> Neues Schlüsselpaar...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+ Erzeugen -> Neues Schlüsselpaar...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+:
 \end_layout
 
 \begin_layout Standard
@@ -345,71 +409,9 @@ nicht
 \end_deeper
 \begin_layout Standard
 Nachdem du alle Angaben überprüft hast, klicke auf das Register 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-<span class="textit">
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph on
 Erweitert
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-</span>
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph default
  und erhöhe die Schlüsselstärke auf 4096 Bits - somit bleiben deine E-Mails
  ein paar Jahrhunderte länger geheim :)
 \end_layout
@@ -440,73 +442,11 @@ Erweiterte Einstellungen
 \end_layout
 
 \begin_layout Standard
-Nun kannst du den Schlüssel anlegen: 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-<span class="textit">
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+Durch einen Klick auf die Schalfläche 
+\emph on
 Schlüsselpaar erzeugen
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-</span>
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
-.
+\emph default
+ beginnt die automatische Erzeugung deines Schlüsselpaares.
 \end_layout
 
 \begin_layout Standard
@@ -530,7 +470,7 @@ status open
 \end_layout
 
 \begin_layout Caption
-Bestätige die Schlüsselerstellung
+Bestätige die Schlüsselerzeugung
 \end_layout
 
 \end_inset
@@ -539,7 +479,7 @@ Best
 \end_layout
 
 \begin_layout Standard
-Nach der Erstellung des Schlüssels solltest du ein Wiederrufszertifikat
+Nach der Erzeugung des Schlüsselpaares solltest du ein Wiederrufszertifikat
  erzeugen:
 \end_layout
 
diff --git a/documents/common/schluessel_export/schluessel_export.lyx b/documents/common/schluessel_export/schluessel_export.lyx
index 147bfef..b84a397 100644
--- a/documents/common/schluessel_export/schluessel_export.lyx
+++ b/documents/common/schluessel_export/schluessel_export.lyx
@@ -123,9 +123,71 @@ Auch bei der Weitergabe von 
  sie per E-Mail zu versenden.
  Verfasse also eine neue E-Mail und wähle aus dem Menü der Nachricht folgenden
  Punkt aus: 
-\emph on
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
 OpenPGP -> Meinen öffentlichen Schlüssel anhängen
-\emph default
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
 :
 \end_layout
 
@@ -155,10 +217,71 @@ Deinen 
 
 \begin_layout Standard
 Mit dem Menüpunkt 
-\emph on
-Öffentliche Schlüssel anhängen...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+Öffentliche Schlüssel anhängen...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
 
-\emph default
  hast du die Möglichkeit weitere öffentliche Schlüssel zu verschicken.
 \end_layout
 
@@ -170,11 +293,72 @@ Per Datentr
 Um einen öffentlichen Schlüssel per Datenträger, bspw.
  einem USB-Stick, weiterzugeben, starte die Schlüsselverwaltung über das
  Thunderbird-Menü 
-\emph on
-OpenPGP -> Schlüssel verwalten...
+\begin_inset ERT
+status collapsed
 
-\emph default
- :
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+OpenPGP -> Schlüssel verwalten...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+:
 \end_layout
 
 \begin_layout Standard
@@ -221,7 +405,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<span class="textit">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/common/schluessel_import/schluessel_import.lyx b/documents/common/schluessel_import/schluessel_import.lyx
index deb525b..d856175 100644
--- a/documents/common/schluessel_import/schluessel_import.lyx
+++ b/documents/common/schluessel_import/schluessel_import.lyx
@@ -124,10 +124,72 @@ spartnerin bittest den Schl
  Wie in der folgenden Abbildung zu sehen, brauchst du lediglich mit der
  rechten Maustaste auf den entsprechenden Anhang klicken und aus dem Menü
  den Punkt 
-\emph on
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
 OpenPGP-Schlüssel importieren
-\emph default
- auswählen.
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+ auswählen:
 \end_layout
 
 \begin_layout Standard
@@ -240,7 +302,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<span class="textit">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -320,71 +382,9 @@ Schl
 Es öffnet sich ein neues Fenster mit der Verzeichnis-Ansicht deiner Festplatte.
  Klicke dich bis zu dem Verzeichnis durch, in dem der zu importierende Schlüssel
  liegt, markiere diesen und klicke auf 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-<span class="textit">
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph on
 Öffnen
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-</span>
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph default
 .
 \end_layout
 
diff --git a/documents/common/thunderbird_einrichtung/thunderbird_einrichtung.lyx b/documents/common/thunderbird_einrichtung/thunderbird_einrichtung.lyx
index b383ca8..4bdbaf6 100644
--- a/documents/common/thunderbird_einrichtung/thunderbird_einrichtung.lyx
+++ b/documents/common/thunderbird_einrichtung/thunderbird_einrichtung.lyx
@@ -141,7 +141,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="textit">
+<div class="kbd">
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/common/thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.lyx b/documents/common/thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.lyx
index 1cfbcb6..fb9703b 100644
--- a/documents/common/thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.lyx
+++ b/documents/common/thunderbird_einrichtung_konto/thunderbird_einrichtung_konto.lyx
@@ -129,7 +129,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="textit">
+<div class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -433,14 +433,74 @@ Ob du alles korrekt eingestellt hast, kannst du 
  Kannst du diese problemlos verschicken und empfangen, ist alles korrekt.
  Andernfalls solltest du deine Angaben erneut überprüfen.
  Öffne dazu im Thunderbird Menü 
-\emph on
-Bearbeiten
-\emph default
- den Punkt 
-\emph on
-Konten...
-\emph default
+\begin_inset ERT
+status collapsed
 
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+Bearbeiten -> Konten...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+
+\emph on
+ 
 \begin_inset Note Note
 status open
 
diff --git a/documents/linux/enigmail_einrichtung/enigmail_einrichtung.lyx b/documents/linux/enigmail_einrichtung/enigmail_einrichtung.lyx
index 2dcef80..06ae78e 100644
--- a/documents/linux/enigmail_einrichtung/enigmail_einrichtung.lyx
+++ b/documents/linux/enigmail_einrichtung/enigmail_einrichtung.lyx
@@ -132,7 +132,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="program">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -165,7 +165,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-</div>
+</span>
 \end_layout
 
 \begin_layout Standard
@@ -184,71 +184,9 @@ end{rawhtml}
  aus.
  Es öffnet sich ein neues Fenster.
  In der linken Spalte kannst du unter 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-<div class="program">
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph on
 OpenPGP-Sicherheit
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-</div>
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph default
  (1) die Option 
 \emph on
 OpenPGP-Sicherheit für diese Identität aktivieren
@@ -304,7 +242,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="program">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -337,7 +275,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-</div>
+</span>
 \end_layout
 
 \begin_layout Standard
@@ -353,7 +291,7 @@ end{rawhtml}
 
 \end_inset
 
-
+.
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/linux/enigmail_installation/enigmail_installation.lyx b/documents/linux/enigmail_installation/enigmail_installation.lyx
index 4843e89..4f1ab57 100644
--- a/documents/linux/enigmail_installation/enigmail_installation.lyx
+++ b/documents/linux/enigmail_installation/enigmail_installation.lyx
@@ -273,15 +273,73 @@ inux.xpi}
 \end_layout
 
 \begin_layout Standard
-Öffne anschliessend Thunderbird und wähle den Punkt 
-\emph on
-Erweiterungen
-\emph default
- aus dem 
-\emph on
-Extras
-\emph default
--Menü aus:
+Öffne anschliessend Thunderbird und wähle aus dem Menü 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+Extras -> Erweiterungen...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+:
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/linux/thunderbird_einrichtung/thunderbird_einrichtung.lyx b/documents/linux/thunderbird_einrichtung/thunderbird_einrichtung.lyx
index aa971ff..a99d3d3 100644
--- a/documents/linux/thunderbird_einrichtung/thunderbird_einrichtung.lyx
+++ b/documents/linux/thunderbird_einrichtung/thunderbird_einrichtung.lyx
@@ -124,7 +124,7 @@ Thunderbird bietet vielf
  Um die Einstellungen vorzunehmen, wähle im Menü den folgenden Punkt aus:
  
 \begin_inset ERT
-status collapsed
+status open
 
 \begin_layout Standard
 
@@ -139,7 +139,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="kbd">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -157,7 +157,7 @@ end{rawhtml}
 
 Bearbeiten -> Konten...
 \begin_inset ERT
-status collapsed
+status open
 
 \begin_layout Standard
 
@@ -172,7 +172,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-</div>
+</span>
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/macos/enigmail_einrichtung/enigmail_einrichtung.lyx b/documents/macos/enigmail_einrichtung/enigmail_einrichtung.lyx
index 7f8eff2..5bf7d9c 100644
--- a/documents/macos/enigmail_einrichtung/enigmail_einrichtung.lyx
+++ b/documents/macos/enigmail_einrichtung/enigmail_einrichtung.lyx
@@ -132,7 +132,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="program">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -165,7 +165,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-</div>
+</span>
 \end_layout
 
 \begin_layout Standard
@@ -184,71 +184,9 @@ end{rawhtml}
  aus.
  Es öffnet sich ein neues Fenster.
  In der linken Spalte kannst du unter 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-<div class="program">
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph on
 OpenPGP-Sicherheit
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-</div>
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph default
  (1) die Option 
 \emph on
 OpenPGP-Sicherheit für diese Identität aktivieren
@@ -304,7 +242,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="program">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -337,7 +275,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-</div>
+</span>
 \end_layout
 
 \begin_layout Standard
@@ -353,7 +291,7 @@ end{rawhtml}
 
 \end_inset
 
-
+.
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/macos/enigmail_installation/enigmail_installation.lyx b/documents/macos/enigmail_installation/enigmail_installation.lyx
index 2c0812e..5ff78df 100644
--- a/documents/macos/enigmail_installation/enigmail_installation.lyx
+++ b/documents/macos/enigmail_installation/enigmail_installation.lyx
@@ -164,15 +164,73 @@ tb15-darwin-i386.xpi}
 \end_layout
 
 \begin_layout Standard
-Öffne anschliessend Thunderbird und wähle den Punkt 
-\emph on
-Erweiterungen
-\emph default
- aus dem 
-\emph on
-Extras
-\emph default
--Menü aus:
+Öffne anschliessend Thunderbird und wähle aus dem Menü 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+Extras -> Erweiterungen...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+ aus:
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/windows/enigmail_einrichtung/enigmail_einrichtung.lyx b/documents/windows/enigmail_einrichtung/enigmail_einrichtung.lyx
index 7be43f0..9975386 100644
--- a/documents/windows/enigmail_einrichtung/enigmail_einrichtung.lyx
+++ b/documents/windows/enigmail_einrichtung/enigmail_einrichtung.lyx
@@ -132,7 +132,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="program">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -165,7 +165,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-</div>
+</span>
 \end_layout
 
 \begin_layout Standard
@@ -184,71 +184,9 @@ end{rawhtml}
  aus.
  Es öffnet sich ein neues Fenster.
  In der linken Spalte kannst du unter 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-<div class="program">
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph on
 OpenPGP-Sicherheit
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{rawhtml}
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-</div>
-\end_layout
-
-\begin_layout Standard
-
-\end_layout
-
-\begin_layout Standard
-
-
-\backslash
-end{rawhtml}
-\end_layout
-
-\end_inset
-
+\emph default
  (1) die Option 
 \emph on
 OpenPGP-Sicherheit für diese Identität aktivieren
@@ -304,7 +242,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-<div class="program">
+<span class="kbd">
 \end_layout
 
 \begin_layout Standard
@@ -337,7 +275,7 @@ begin{rawhtml}
 
 \begin_layout Standard
 
-</div>
+</span>
 \end_layout
 
 \begin_layout Standard
@@ -353,7 +291,7 @@ end{rawhtml}
 
 \end_inset
 
-
+.
 \end_layout
 
 \begin_layout Standard
diff --git a/documents/windows/enigmail_installation/enigmail_installation.lyx b/documents/windows/enigmail_installation/enigmail_installation.lyx
index c495ac3..e360d0d 100644
--- a/documents/windows/enigmail_installation/enigmail_installation.lyx
+++ b/documents/windows/enigmail_installation/enigmail_installation.lyx
@@ -142,15 +142,73 @@ in32.xpi}
 \end_layout
 
 \begin_layout Standard
-Öffne anschliessend Thunderbird und wähle den Punkt 
-\emph on
-Erweiterungen
-\emph default
- aus dem 
-\emph on
-Extras
-\emph default
--Menü aus:
+Öffne anschliessend Thunderbird und wähle aus dem Menü 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+<span class="kbd">
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+Extras -> Erweiterungen...
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+</span>
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+:
 \end_layout
 
 \begin_layout Standard