diff --git a/chrome/content/vimperator/completion.js b/chrome/content/vimperator/completion.js
index 122f63f0..21d6edc1 100644
--- a/chrome/content/vimperator/completion.js
+++ b/chrome/content/vimperator/completion.js
@@ -473,11 +473,11 @@ vimperator.completion = (function() // {{{
                 if (command && command.completer)
                 {
                     completions = command.completer.call(this, args);
-        //			if (command[0][0] == "open" ||
-        //					command[0][0] == "tabopen" ||
-        //					command[0][0] == "winopen")
-        //				start = str.search(/^:*\d*\w+(\s+|.*\|)/); // up to the last | or the first space
-        //			else
+        //          if (command[0][0] == "open" ||
+        //                  command[0][0] == "tabopen" ||
+        //                  command[0][0] == "winopen")
+        //              start = str.search(/^:*\d*\w+(\s+|.*\|)/); // up to the last | or the first space
+        //          else
                     matches = str.match(/^:*\d*\w+\s+/); // up to the first spaces only
                     start = matches[0].length;
                 }
diff --git a/chrome/content/vimperator/file.js b/chrome/content/vimperator/file.js
index 966ed7f4..5295be3e 100644
--- a/chrome/content/vimperator/file.js
+++ b/chrome/content/vimperator/file.js
@@ -12,7 +12,7 @@ for the specific language governing rights and limitations under the
 License.
 
 (c) 2006-2007: Martin Stubenschrott <stubenschrott@gmx.net>
-	Code based on venkman
+    Code based on venkman
 
 Alternatively, the contents of this file may be used under the terms of
 either the GNU General Public License Version 2 or later (the "GPL"), or
diff --git a/chrome/content/vimperator/find.js b/chrome/content/vimperator/find.js
index 28cba68d..f61d2ec7 100644
--- a/chrome/content/vimperator/find.js
+++ b/chrome/content/vimperator/find.js
@@ -92,93 +92,93 @@ function highlightFind(str, color, wrapped, dir, pt)
         alert('gWin does not exist here...');
         alert(vimperator.search.gWin);
     }
-	var doc = gWin.document;
-	var finder = Components.classes["@mozilla.org/embedcomp/rangefind;1"].createInstance()
-	    .QueryInterface(Components.interfaces.nsIFind);
-	var searchRange;
-	var startPt;
-	var endPt;
-	var body = doc.body;
+    var doc = gWin.document;
+    var finder = Components.classes["@mozilla.org/embedcomp/rangefind;1"].createInstance()
+        .QueryInterface(Components.interfaces.nsIFind);
+    var searchRange;
+    var startPt;
+    var endPt;
+    var body = doc.body;
 
-	finder.findBackwards = !dir;
+    finder.findBackwards = !dir;
 
-	searchRange = doc.createRange();
-	startPt = doc.createRange();
-	endPt = doc.createRange();
+    searchRange = doc.createRange();
+    startPt = doc.createRange();
+    endPt = doc.createRange();
 
-	var count = body.childNodes.length;
+    var count = body.childNodes.length;
 
-	// Search range in the doc
-	searchRange.setStart(body,0);
-	searchRange.setEnd(body, count);
+    // Search range in the doc
+    searchRange.setStart(body,0);
+    searchRange.setEnd(body, count);
 
-	if (!dir) {
-	    if (pt == null) {
-		startPt.setStart(body, count);
-		startPt.setEnd(body, count);
-	    } else {
-		startPt.setStart(pt.startContainer, pt.startOffset);
-		startPt.setEnd(pt.startContainer, pt.startOffset);
-	    }
-	    endPt.setStart(body, 0);
-	    endPt.setEnd(body, 0);
-	} else {
-	    if (pt == null) {
-		startPt.setStart(body, 0);
-		startPt.setEnd(body, 0);
-	    } else {
-		startPt.setStart(pt.endContainer, pt.endOffset);
-		startPt.setEnd(pt.endContainer, pt.endOffset);
-	    }
-	    endPt.setStart(body, count);
-	    endPt.setEnd(body, count);
-	}
-	// search the doc
-	var retRange = null;
-	var selectionRange = null;
+    if (!dir) {
+        if (pt == null) {
+        startPt.setStart(body, count);
+        startPt.setEnd(body, count);
+        } else {
+        startPt.setStart(pt.startContainer, pt.startOffset);
+        startPt.setEnd(pt.startContainer, pt.startOffset);
+        }
+        endPt.setStart(body, 0);
+        endPt.setEnd(body, 0);
+    } else {
+        if (pt == null) {
+        startPt.setStart(body, 0);
+        startPt.setEnd(body, 0);
+        } else {
+        startPt.setStart(pt.endContainer, pt.endOffset);
+        startPt.setEnd(pt.endContainer, pt.endOffset);
+        }
+        endPt.setStart(body, count);
+        endPt.setEnd(body, count);
+    }
+    // search the doc
+    var retRange = null;
+    var selectionRange = null;
 
-	if (!wrapped) {
-	    do {
-		retRange = finder.Find(str, searchRange, startPt, endPt);
-		var keepSearching = false;
-		if (retRange) {
-		    var sc = retRange.startContainer;
-		    var ec = retRange.endContainer;
-		    var scp = sc.parentNode;
-		    var ecp = ec.parentNode;
-		    var sy1 = abs_point(scp).y;
-		    var ey2 = abs_point(ecp).y + ecp.offsetHeight;
+    if (!wrapped) {
+        do {
+        retRange = finder.Find(str, searchRange, startPt, endPt);
+        var keepSearching = false;
+        if (retRange) {
+            var sc = retRange.startContainer;
+            var ec = retRange.endContainer;
+            var scp = sc.parentNode;
+            var ecp = ec.parentNode;
+            var sy1 = abs_point(scp).y;
+            var ey2 = abs_point(ecp).y + ecp.offsetHeight;
 
-		    startPt = retRange.startContainer.ownerDocument.createRange();
-		    if (!dir) {
-			startPt.setStart(retRange.startContainer, retRange.startOffset);
-			startPt.setEnd(retRange.startContainer, retRange.startOffset);
-		    } else {
-			startPt.setStart(retRange.endContainer, retRange.endOffset);
-			startPt.setEnd(retRange.endContainer, retRange.endOffset);
-		    }
-		    // We want to find a match that is completely
-		    // visible, otherwise the view will scroll just a
-		    // bit to fit the selection in completely.
-// 		    alert ("sy1: " + sy1 + " scry: " + gWin.scrollY);
-// 		    alert ("ey2: " + ey2 + " bot: " + (gWin.scrollY + gWin.innerHeight));
-		    keepSearching = (dir && sy1 < gWin.scrollY)
-			|| (!dir && ey2 >= gWin.scrollY + gWin.innerHeight);
-		}
-	    } while (retRange && keepSearching);
-	} else {
-	    retRange = finder.Find(str, searchRange, startPt, endPt);
-	}
+            startPt = retRange.startContainer.ownerDocument.createRange();
+            if (!dir) {
+            startPt.setStart(retRange.startContainer, retRange.startOffset);
+            startPt.setEnd(retRange.startContainer, retRange.startOffset);
+            } else {
+            startPt.setStart(retRange.endContainer, retRange.endOffset);
+            startPt.setEnd(retRange.endContainer, retRange.endOffset);
+            }
+            // We want to find a match that is completely
+            // visible, otherwise the view will scroll just a
+            // bit to fit the selection in completely.
+//          alert ("sy1: " + sy1 + " scry: " + gWin.scrollY);
+//          alert ("ey2: " + ey2 + " bot: " + (gWin.scrollY + gWin.innerHeight));
+            keepSearching = (dir && sy1 < gWin.scrollY)
+            || (!dir && ey2 >= gWin.scrollY + gWin.innerHeight);
+        }
+        } while (retRange && keepSearching);
+    } else {
+        retRange = finder.Find(str, searchRange, startPt, endPt);
+    }
 
-	if (retRange) {
-	    setSelection(retRange);
-	    selectionRange = retRange.cloneRange();
-	    // 	    highlightAllBut(str, retRange, color);
-	} else {
+    if (retRange) {
+        setSelection(retRange);
+        selectionRange = retRange.cloneRange();
+        //      highlightAllBut(str, retRange, color);
+    } else {
 
-	}
+    }
 
-	return selectionRange;
+    return selectionRange;
     } catch(e) { alert('highlightFind:'+e); }
 }
 
@@ -188,19 +188,19 @@ function clearHighlight()
     var win = window.content;
     var doc = win.document;
     if (!document)
-	return;
+    return;
 
     var elem = null;
     while ((elem = doc.getElementById("__vimperator-findbar-search-id"))) {
-	var child = null;
-	var docfrag = doc.createDocumentFragment();
-	var next = elem.nextSibling;
-	var parent = elem.parentNode;
-	while ((child = elem.firstChild)) {
-	    docfrag.appendChild(child);
-	}
-	parent.removeChild(elem);
-	parent.insertBefore(docfrag, next);
+    var child = null;
+    var docfrag = doc.createDocumentFragment();
+    var next = elem.nextSibling;
+    var parent = elem.parentNode;
+    while ((child = elem.firstChild)) {
+        docfrag.appendChild(child);
+    }
+    parent.removeChild(elem);
+    parent.insertBefore(docfrag, next);
     }
 }
 
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 1250709f..07248c01 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -28,9 +28,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 const vimperator = (function() //{{{
 {
-	////////////////////////////////////////////////////////////////////////////////
-	////////////////////// PRIVATE SECTION /////////////////////////////////////////
-	/////////////////////////////////////////////////////////////////////////////{{{
+    ////////////////////////////////////////////////////////////////////////////////
+    ////////////////////// PRIVATE SECTION /////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
 
     const RC_FILE = "~/.vimperatorrc";
     const PLUGIN_DIR = "~/.vimperator/plugin";
@@ -70,7 +70,7 @@ const vimperator = (function() //{{{
     var mode = modes.NORMAL;
     var extended_mode = modes.NONE;
 
-	var callbacks = [];
+    var callbacks = [];
 
     // our services
     var sound_service = Components.classes['@mozilla.org/sound;1']
@@ -145,9 +145,9 @@ const vimperator = (function() //{{{
         return path;
     }
 
-	/////////////////////////////////////////////////////////////////////////////}}}
-	////////////////////// PUBLIC SECTION //////////////////////////////////////////
-	/////////////////////////////////////////////////////////////////////////////{{{
+    /////////////////////////////////////////////////////////////////////////////}}}
+    ////////////////////// PUBLIC SECTION //////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////{{{
 
     return {