diff --git a/chrome/content/options.js b/chrome/content/options.js
index 59f5d3483..aad2c2d68 100644
--- a/chrome/content/options.js
+++ b/chrome/content/options.js
@@ -9,10 +9,7 @@
   END LICENSE BLOCK 
 */
 
-if (typeof ChromeUtils.import == "undefined") 
-	Components.utils.import('resource://gre/modules/Services.jsm');
-else
-	var {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm');
+var {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm');
 
 var QuickFolders_TabURIregexp = {
 	get _thunderbirdRegExp() {
diff --git a/chrome/content/quickfolders-interface.js b/chrome/content/quickfolders-interface.js
index abcf080ad..6f50375af 100644
--- a/chrome/content/quickfolders-interface.js
+++ b/chrome/content/quickfolders-interface.js
@@ -3291,8 +3291,9 @@ QuickFolders.Interface = {
 							}, false);
 					}
 					if (QI.isOncommandAttributes || forceOnCommand)
-						this.setEventAttribute(menuitem, "oncommand","QuickFolders.Interface.setTabColorFromMenu(this, '" + jCol + "')");
  */
+          if(forceOnCommand)
+            this.setEventAttribute(menuitem, "oncommand","QuickFolders.Interface.setTabColorFromMenu(this, '" + jCol + "')");
           menuColorPopup.appendChild(menuitem);
 				}
 			}
@@ -5958,7 +5959,7 @@ QuickFolders.Interface = {
       let btn = element.folder ? element : targetElement, // menu item
           entry = QuickFolders.Model.getButtonEntry(btn);
       if (entry && entry.customPalette) {
-        paletteToken = this.getPaletteClassToken(entry.customPalette);
+        paletteToken = this.getPaletteClassToken(entry.customPalette).trim();
       }
     }
 
@@ -5971,10 +5972,10 @@ QuickFolders.Interface = {
 
 		// remove palette name(s)
 		element.className = this.stripPaletteClasses(element.className, paletteToken);
-		let hasClass = (paletteToken && element.classList.contains(paletteToken));
+		let hasClass = (paletteToken && element.classList.contains(paletteToken.trim()));
 		if (!hasClass) {
 		  if (paletteToken)
-				element.className += paletteToken;
+        element.classList.add(paletteToken.trim());
 		}
 	} ,
 
diff --git a/manifest.json b/manifest.json
index 9733bcfb8..12cf0f7ac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "manifest_version" : 2,
   "name" : "QuickFolders",
   "description" : "Bookmark your favorite mail folders in Thunderbird.",
-  "version" : "5.0pre88",
+  "version" : "5.0pre90",
   "developer" : { 
       "name" : "Axel Grude",
       "url" : "http://quickfolders.org/index.html"
diff --git a/popup/popup.css b/popup/popup.css
index 6625c6a79..a8b6e64e6 100644
--- a/popup/popup.css
+++ b/popup/popup.css
@@ -8,7 +8,7 @@
 .testversion p {
   background-color: rgb(0,0,90); /* dark blue */
   color: yellow !important;
-  font-weight: 500;
+  font-weight: bold;
 }
 
 #innerwrapper {
@@ -55,17 +55,18 @@ ul.actions {
 
 
 body, body * {
-  background-color: rgb(20,15,05);
-  color: white;
+  background-color: white;
+  color: rgb(20,15,05);
 }
 
-body > p {
-  background-color: rgb(20,15,05);
-  color: white;
+body p, body li {
+  background-color: white;
+  color: rgb(20,15,05);
+  font-size: 12pt;
 }
 
 .versionnumber {
-  color: lightblue;
+  color: darkblue;
 }
 
 
@@ -101,14 +102,14 @@ h1, h2, h3, h4 {
 }
 
 h1 {
-  font-size: 30pt;
+  font-size: 25pt;
 }
 
 h2 {
-  font-size: 26pt;
+  font-size: 20pt;
   font-weight: normal;
 }
 
 h3 {
-  font-size: 18pt;
+  font-size: 16pt;
 }
\ No newline at end of file
diff --git a/revision.txt b/revision.txt
index 41101cdf3..6e7f0eec4 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-88 
+90