diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..d047718
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+indent_size = 4
+
+[*.js,*.json]
+indent_style = tab
+insert_final_newline = true
+
+[*.html]
+indent_style = space
+insert_final_newline = false
\ No newline at end of file
diff --git a/src/js/background.js b/src/js/background.js
index 1a80a50..952c6d7 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -34,8 +34,8 @@ chrome.runtime.onInstalled.addListener(function(details) {
 		}
 		if (url) {
 			chrome.tabs.create({
-	            url: url
-	        });
+							url: url
+					});
 		}
 	}
 });
\ No newline at end of file
diff --git a/src/js/keypress.js b/src/js/keypress.js
index 071673c..e75b69b 100644
--- a/src/js/keypress.js
+++ b/src/js/keypress.js
@@ -8,13 +8,13 @@
 	 * The selectors used to find the URL
 	 * @type {array}
 	 */
-    var selectors = [
+	var selectors = [
 		'div.selectedEntry a.title',			// title bar for active entry, collapsed or expanded
 		'.selectedEntry a.visitWebsiteButton',	// the button square button on list view
 		'.list-entries .selected a.visitWebsiteButton',	// the button square button on list view
 		'a.visitWebsiteButton',					// the floating one for card view
 		'.entry.selected a.title'				// title bar for active entry in React-based collapsed list view
-    ];
+	];
 	
 	/**
 	 * Main feedlybackgroundtab constructor
@@ -49,19 +49,19 @@
 			var tag = e.target.tagName.toLowerCase();
 			if (tag != 'input' && tag != 'textarea') {
 				if ((!e.altKey && !e.ctrlKey) && e.keyCode == _triggerKeyCode) {
-                    var url;
-                    for (var x in selectors) {
-                        url = document.querySelector(selectors[x]);
-                        if (url) {
-                            break;
-                        }
-                    }
+					var url;
+					for (var x in selectors) {
+						url = document.querySelector(selectors[x]);
+						if (url) {
+							break;
+						}
+					}
 					if (url) {
 						chrome.extension.sendMessage({url: url.href});
 					}
-                    else {
-                        console.log("Could not find any selectors from: " + selectors.join());
-                    }
+					else {
+						console.log("Could not find any selectors from: " + selectors.join());
+					}
 				}
 			}
 		}
diff --git a/src/manifest.json b/src/manifest.json
index 4b146b5..9365e36 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -15,7 +15,7 @@
 		"http://www.feedly.com/*",
 		"http://cloud.feedly.com/*",
 		"https://cloud.feedly.com/*",
-	    "storage"
+		"storage"
 	],
 	"minimum_chrome_version": "21",
 	"icons": { "128": "images/icon_128.png" }