diff --git a/common/content/events.js b/common/content/events.js
index 31563e40..a90e31bd 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -850,7 +850,8 @@ var Events = Module("events", {
                 return;
 
             if (isinstance(elem, [HTMLEmbedElement, HTMLEmbedElement])) {
-                modes.push(modes.EMBED);
+                if (!modes.main.passthrough && modes.main != modes.EMBED)
+                    modes.push(modes.EMBED);
                 return;
             }
 
diff --git a/common/content/modes.js b/common/content/modes.js
index d097f108..e681835e 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -141,6 +141,7 @@ var Modes = Module("modes", {
 
         this.addMode("EMBED", {
             description: "Active when an <embed> or <object> element is focused",
+            bases: [modes.MAIN],
             insert: true,
             ownsFocus: true,
             passthrough: true
@@ -308,6 +309,7 @@ var Modes = Module("modes", {
     },
 
     removeMode: function removeMode(mode) {
+        this.remove(mode);
         if (this[mode.name] == mode)
             delete this[mode.name];
         if (this._modeMap[mode.name] == mode)
diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index c053f448..df607445 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -113,7 +113,7 @@ var ConfigBase = Class("ConfigBase", {
         if (!this.haveGecko("2b"))
             highlight.loadCSS(<![CDATA[
                 !TabNumber               font-weight: bold; margin: 0px; padding-right: .8ex;
-                !TabIconNumber {
+                !TabIconNumber  {
                     font-weight: bold;
                     color: white;
                     text-align: center;
diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index e525a008..8f76eead 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -177,8 +177,9 @@ var DOM = Class("DOM", {
             val = this.matcher(val);
 
         this.constructor(Array.filter(this, val, self || this));
+        let obj = self || this.Empty();
         for (let i = 0; i < this.length; i++)
-            if (val.call(self, this[i], i))
+            if (val.call(self || update(obj, [this[i]]), this[i], i))
                 res[res.length++] = this[i];
 
         return res;
@@ -292,25 +293,28 @@ var DOM = Class("DOM", {
     get highlight() let (self = this) ({
         toString: function () self.attrNS(NS, "highlight") || "",
 
-        get list() this.toString().trim().split(/\s+/),
-        set list(val) self.attrNS(NS, "highlight", val.join(" ")),
+        get list() let (s = this.toString().trim()) s ? s.split(/\s+/) : [],
+        set list(val) {
+            let str = array.uniq(val).join(" ").trim();
+            self.attrNS(NS, "highlight", str || null);
+        },
 
         has: function has(hl) ~this.list.indexOf(hl),
 
         add: function add(hl) self.each(function () {
             highlight.loaded[hl] = true;
-            this.attrNS(NS, "highlight",
-                        array.uniq(this.highlight.list.concat(hl)).join(" "));
+            this.highlight.list = this.highlight.list.concat(hl);
         }),
 
         remove: function remove(hl) self.each(function () {
-            this.attrNS(NS, "highlight",
-                        this.highlight.list.filter(function (h) h != hl));
+            this.highlight.list = this.highlight.list.filter(function (h) h != hl);
         }),
 
-        toggle: function toggle(hl, val) self.each(function () {
+        toggle: function toggle(hl, val, thisObj) self.each(function (elem, i) {
             let { highlight } = this;
-            highlight[val == null ? highlight.has(hl) : val ? "remove" : "add"](hl)
+            let v = callable(val) ? val.call(thisObj || this, elem, i) : val;
+
+            highlight[(v == null ? highlight.has(hl) : !v) ? "remove" : "add"](hl)
         }),
     }),