Fix startup when restoring preferences. Closes issue #291.

common/modules/highlight.jsm

@@ -116,6 +116,9 @@ var Highlights = Module("Highlight", {
 
         if (/^[[>+: ]/.test(args[1]))
             obj.selector = this.selector(obj.class) + args[1];
+        else if (args[1])
+            obj.selector = this.selector(args[1]);
+
         if (old && old.value != old.defaultValue)
             obj.value = old.value;
 

common/modules/prefs.jsm

@@ -27,11 +27,11 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         if (this.branch instanceof Ci.nsIPrefBranch2)
             this.branch.QueryInterface(Ci.nsIPrefBranch2);
 
+        this.defaults = defaults ? this : this.constructor(branch, true);
+
         if (!defaults)
             this.restore();
 
-        this.defaults = defaults ? this : this.constructor(branch, true);
-
         this._observers = {};
     },