diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
index cb83ea49c..d250c2ca2 100644
--- a/doc/asciidoc.conf
+++ b/doc/asciidoc.conf
@@ -7,7 +7,7 @@ key\[(ctrl|alt|shift)\]=<span class="key \1">\1</span>
 key\[(ctrl|alt|shift)-\]=<span class="key \1">\1</span><span class="keyplus">+</span>
 key\[(ctrl|alt|shift)-([^\]]+)\]=<span class="key \1">\1</span><span class="keyplus">+</span>key[\2]
 key\[l\]=<span class="key">l</span><span class="keyplus"> (L)</span>
-key\[([A-Za-z0-9/_&\=!])\]=<span class="key">\1</span>
-key\[([a-z0-9/_&\=!][^\]]*)\]=<span class="key">\1</span>
+key\[([A-Za-z0-9/_&\=!-])\]=<span class="key">\1</span>
+key\[([a-z0-9/_&\=!-][^\]]*)\]=<span class="key">\1</span>
 key\[([^\]]+)\]=<span class="key other">\1</span>
 hex\[([0-9a-fA-F]+)\]=<span class="hexa">\1</span>
diff --git a/doc/asciidoc.css b/doc/asciidoc.css
index c6abe4be3..6b23b90ae 100644
--- a/doc/asciidoc.css
+++ b/doc/asciidoc.css
@@ -122,48 +122,57 @@ dt.hdlist1 {
   word-wrap: break-word;
 }
 .key {
-  padding: 0 .3em;
+  padding: .1em .4em;
   border-top: solid 1px #d5d5e5;
   border-left: solid 1px #d5d5e5;
   border-bottom: solid 1px #a5a5b5;
   border-right: solid 1px #a5a5b5;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #d5d5e5;
   margin: 0 2px;
   background: #eef;
-  font-family: serif, Helvetica, arial;
+  font-family: monospace;
   font-size: 1.1em;
-  line-height: 1.5em;
+  line-height: 1.6em;
 }
 .key.ctrl {
   border-top: solid 1px #dfd0d0;
   border-left: solid 1px #dfd0d0;
   border-bottom: solid 1px #afa0a0;
   border-right: solid 1px #afa0a0;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #dfd0d0;
   background: #fff0f0;
-  font-variant: small-caps;
+  text-transform: capitalize;
 }
 .key.alt {
-  border-top: solid 1px #dfbbab;
-  border-left: solid 1px #dfbbab;
-  border-bottom: solid 1px #af8b7b;
-  border-right: solid 1px #af8b7b;
-  background: #ffdbcb;
-  font-variant: small-caps;
+  border-top: solid 1px #dfc5b4;
+  border-left: solid 1px #dfc5b4;
+  border-bottom: solid 1px #af9484;
+  border-right: solid 1px #af9484;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #dfc5b4;
+  background: #ffe4d4;
+  text-transform: capitalize;
 }
 .key.shift {
   border-top: solid 1px #d5d5d5;
   border-left: solid 1px #d5d5d5;
   border-bottom: solid 1px #a5a5a5;
   border-right: solid 1px #a5a5a5;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #d5d5d5;
   background: #f5f5f5;
-  font-variant: small-caps;
+  text-transform: capitalize;
 }
 .key.other {
   border-top: solid 1px #d0e0d0;
   border-left: solid 1px #d0e0d0;
   border-bottom: solid 1px #a0b0a0;
   border-right: solid 1px #a0b0a0;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #d0e0d0;
   background: #eafaea;
-  font-variant: small-caps;
 }
 .keyplus {
   font-size: .8em;
@@ -175,7 +184,6 @@ dt.hdlist1 {
   color: #007;
   font-family: monospace;
   font-size: .85em;
-  font-variant: small-caps;
 }
 #footer {
   border-top: 1px solid silver;