diff --git a/content/mappings.js b/content/mappings.js
index 145902ef..2927e3a2 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -305,7 +305,7 @@ function Mappings() //{{{
             for (let [,name] in Iterator(map.names))
             {
                 for (let [,mode] in Iterator(map.modes))
-                    removeMap(mode, map.name);
+                    removeMap(mode, name);
             }
 
             addMap(map, true);
diff --git a/content/vimperator/bindings.xml b/content/vimperator/bindings.xml
index 64adb44b..c75544aa 100644
--- a/content/vimperator/bindings.xml
+++ b/content/vimperator/bindings.xml
@@ -11,7 +11,7 @@
 	  xmlns:xbl="http://www.mozilla.org/xbl"
 	  xmlns:html="http://www.w3.org/1999/xhtml">
     <binding id="tab" display="xul:hbox"
-             extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
+             extends="chrome://global/content/bindings/tabbox.xml#tab">
         <content chromedir="ltr" closetabtext="Close Tab">
             <xul:stack class="liberator-tab-stack">
                 <xul:image xbl:inherits="validate,src=image" class="tab-icon-image" liberator:highlight="TabIcon"/>
@@ -21,7 +21,7 @@
                     <xul:spring flex="1"/>
                 </xul:vbox>
             </xul:stack>
-            <xul:label xbl:inherits="value=ordinal" class="hl-TabNumber"/>
+            <xul:label xbl:inherits="value=ordinal" liberator:highlight="TabNumber"/>
             <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" class="tab-text" liberator:highlight="TabText"/>
             <xul:toolbarbutton anonid="close-button" tabindex="-1" class="tab-close-button" liberator:highlight="TabClose"/>
         </content>