diff --git a/content/addressbook.js b/content/addressbook.js
index e8495587..9985f9cf 100644
--- a/content/addressbook.js
+++ b/content/addressbook.js
@@ -219,7 +219,7 @@ liberator.Addressbook = function () //{{{
             return true;
         }
     };
-
+    //}}}
 }; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/content/bookmarks.js b/content/bookmarks.js
index 7d814f8b..3a791436 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -147,10 +147,10 @@ liberator.Bookmarks = function () //{{{
                 list += "<tr><td>" + indicator + "<td>" + Math.abs(num) + "</td><td style=\"width: 250px; max-width: 500px; overflow: hidden;\">" + title +
                         "</td><td><a href=\"#\" class=\"hl-URL jump-list\">" + uri + "</a></td></tr>";
                 num++;
-            } 
+            }
 
             list += "</table>";
-            
+
             liberator.commandline.echo(list, liberator.commandline.HL_NORMAL, liberator.commandline.FORCE_MULTILINE);
         },
         {}
diff --git a/content/commands.js b/content/commands.js
index f71e9e76..c75b8ab9 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -286,7 +286,7 @@ liberator.Commands = function () //{{{
         // @param allowUnknownOptions: -foo won't result in an error, if -foo isn't
         //                             specified in "options"
         // TODO: should it handle comments?
-        parseArgs: function(str, options, argCount, allowUnknownOptions)
+        parseArgs: function (str, options, argCount, allowUnknownOptions)
         {
             // returns [count, parsed_argument]
             function getNextArg(str)
diff --git a/content/hints.js b/content/hints.js
index 298600de..66c6fb95 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -592,8 +592,8 @@ liberator.Hints = function () //{{{
             validator: function (value) { return /^(?:contains|wordstartswith|firstletters|custom)$/.test(value); },
             completer: function (filter)
             {
-                return ["contains","wordstartswith","firstletters","custom"]
-                  .map(function(m){ return [m,""] });
+                return ["contains", "wordstartswith", "firstletters", "custom"]
+                  .map(function (m){ return [m, ""] });
             },
         });
 
diff --git a/content/liberator.js b/content/liberator.js
index ece55ec4..07a4a5ed 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -90,7 +90,7 @@ const liberator = (function () //{{{
                     {
                         liberator.log("Couldn't set titlestring", 3);
                     }
-                },
+                }
             });
 
         liberator.options.add(["verbose", "vbs"],
@@ -104,7 +104,7 @@ const liberator = (function () //{{{
             "Use visual bell instead of beeping on errors",
             "boolean", false,
             {
-                setter: function (value) { liberator.options.setPref("accessibility.typeaheadfind.enablesound", !value); },
+                setter: function (value) { liberator.options.setPref("accessibility.typeaheadfind.enablesound", !value); }
             });
 
         liberator.options.add(["visualbellstyle", "t_vb"],
@@ -360,7 +360,7 @@ const liberator = (function () //{{{
             {
                 completer: function (filter)
                 {
-                    if (/^:/.test(filter)) 
+                    if (/^:/.test(filter))
                         return liberator.completion.ex(filter);
                     else
                         return liberator.completion.javascript(filter);
@@ -1034,7 +1034,8 @@ const liberator = (function () //{{{
 			thread.dispatch(new CallbackEvent(func, args), thread.DISPATCH_SYNC);
         }
 
-    }; //}}}
+    };
+    //}}}
 })(); //}}}
 
 // called when the chrome is fully loaded and before the main window is shown
diff --git a/content/mail.js b/content/mail.js
index ce7dfe3b..70471a09 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -1045,7 +1045,7 @@ liberator.Mail = function () //{{{
         {
             var values = [[true,  1, gDisallow_classes_no_html],  // plaintext
                           [false, 0, 0],                          // HTML
-                          [false, 3, gDisallow_classes_no_html]]; // sanitized/simple HTML 
+                          [false, 3, gDisallow_classes_no_html]]; // sanitized/simple HTML
 
             if (typeof(value) != "number" || value < 0 || value > 2)
                 value = 1;
@@ -1056,7 +1056,6 @@ liberator.Mail = function () //{{{
             MsgReload();
         }
     };
-
     //}}}
 }; //}}}
 
diff --git a/content/muttator.js b/content/muttator.js
index 96d12b55..93dc03f7 100644
--- a/content/muttator.js
+++ b/content/muttator.js
@@ -47,7 +47,7 @@ liberator.config = {
     isComposeWindow: false,
 
     autocommands: [["FolderLoaded", "Triggered after switching folders in Thunderbird"],
-                   ["PageLoadPre",    "Triggered after a page load is initiated"],
+                   ["PageLoadPre",  "Triggered after a page load is initiated"],
                    ["PageLoad",     "Triggered when a page gets (re)loaded/opened"],
                    ["Quit",         "Triggered before exiting Thunderbird"],
                    ["Startup",      "Triggered after Thunderbird starts"]],
diff --git a/content/ui.js b/content/ui.js
index d576d99a..bcd4a5f9 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1301,7 +1301,7 @@ liberator.StatusLine = function () //{{{
                 else
                     document.getElementById("status-bar").collapsed = false;
             },
-            validator: function (value) { return (value in [0,1,2]); },
+            validator: function (value) { return (value in [0, 1, 2]); },
             completer: function (filter)
             {
                 return [