diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index 6f6d48e9..0c05df68 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -192,9 +192,9 @@ var ConfigBase = Class("ConfigBase", {
         Enabled      color: blue;
         Disabled     color: red;
 
-        FontFixed           font-family: monospace !important;
-        FontCode            font-family: -mox-fixed, monospace !important;
-        FontProportional    font-family: "Droid Sans", "Helvetica LT Std", Helvetica, "DejaVu Sans", Verdana, sans-serif !important;
+        FontFixed                            font-family: monospace !important;
+        FontCode            font-size: 9pt;  font-family: -mox-fixed, monospace !important;
+        FontProportional    font-size: 10pt; font-family: "Droid Sans", "Helvetica LT Std", Helvetica, "DejaVu Sans", Verdana, sans-serif !important;
 
         // Hack to give these groups slightly higher precedence
         // than their unadorned variants.
@@ -329,7 +329,7 @@ var ConfigBase = Class("ConfigBase", {
 
     helpCSS: UTF8(<><![CDATA[
         // <css>
-        Help;;;FontProportional                     font-size: 8pt; line-height: 1.4em;
+        Help;;;FontProportional                     line-height: 1.4em;
 
         HelpArg;;;FontCode                          color: #6A97D4;
         HelpOptionalArg;;;FontCode                  color: #6A97D4;
@@ -339,13 +339,13 @@ var ConfigBase = Class("ConfigBase", {
         HelpCode;;;FontCode                         display: block; white-space: pre; margin-left: 2em;
         HelpTT;;;FontFixed
 
-        HelpDefault;;;FontCode                      display: inline-block; margin-right: 1ex; white-space: pre; vertical-align: text-top;
+        HelpDefault;;;FontCode                      display: inline-block; margin: -1px 1ex 0 0; white-space: pre; vertical-align: text-top;
 
         HelpDescription                             display: block; clear: right;
         HelpDescription[short]                      clear: none;
         HelpEm;html|em;dactyl://help/*              font-weight: bold; font-style: normal;
 
-        HelpEx;;;FontCode                           display: inline-block; color: #527BBD; font-weight: bold;
+        HelpEx;;;FontCode                           display: inline-block; color: #527BBD;
 
         HelpExample                                 display: block; margin: 1em 0;
         HelpExample::before                         content: "Example: "; font-weight: bold;
@@ -441,7 +441,7 @@ var ConfigBase = Class("ConfigBase", {
         HelpTabDescription>*;;dactyl://help/*       text-indent: 0;
         HelpTabRow;html|dl>html|tr;dactyl://help/*  display: table-row;
 
-        HelpTag;;;FontCode                          display: inline-block; color: #527BBD; margin-left: 1ex; font-size: 8pt; font-weight: bold;
+        HelpTag;;;FontCode                          display: inline-block; color: #527BBD; margin-left: 1ex; font-weight: normal;
         HelpTags                                    display: block; float: right; clear: right;
         HelpTopic;;;FontCode                        color: #102663;
         HelpType;;;FontCode                         margin-right: 2ex;
diff --git a/common/modules/highlight.jsm b/common/modules/highlight.jsm
index 4d908753..8561afd1 100644
--- a/common/modules/highlight.jsm
+++ b/common/modules/highlight.jsm
@@ -128,6 +128,7 @@ var Highlights = Module("Highlight", {
 
         let highlight = this.highlight[key] || this._create(false, [key]);
 
+        extend = extend || highlight.extend;
         if (append) {
             newStyle = Styles.append(highlight.value || "", newStyle);
             extend = highlight.extends.concat(extend);
@@ -309,8 +310,10 @@ var Highlights = Module("Highlight", {
                                 if (!key || h.class.indexOf(key) > -1))));
                 else if (!key && clear)
                     highlight.clear();
+                else if (key)
+                    highlight.set(key, css, clear, "-append" in args, args["-link"]);
                 else
-                    highlight.set(key, css, clear, "-append" in args, args["-link"] || []);
+                    util.assert(false, "Invalid arguments");
             },
             {
                 // TODO: add this as a standard highlight completion function?
diff --git a/common/skin/dactyl.css b/common/skin/dactyl.css
index 73945471..a3fbad7b 100644
--- a/common/skin/dactyl.css
+++ b/common/skin/dactyl.css
@@ -17,6 +17,15 @@
     position: absolute !important;
 }
 
+@-moz-document
+    url-prefix(dactyl:) {
+
+[dactyl|highlight~=HelpDefault] {
+    -moz-binding: url(chrome://dactyl/content/bindings.xml#compitem-td);
+}
+
+}
+
 /* Applied only to completion buffer and MOW */
 @-moz-document
     url-prefix(chrome://dactyl/) {