diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..28971c5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,py,html}]
+indent_style = space
+indent_size = 4
+charset = utf-8
+
+[Makefile]
+indent_style = tab
+
diff --git a/oml/__main__.py b/oml/__main__.py
index f888dd5..f5e2b5e 100644
--- a/oml/__main__.py
+++ b/oml/__main__.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import os
 import sys
diff --git a/oml/api.py b/oml/api.py
index 32b31bc..bf44566 100644
--- a/oml/api.py
+++ b/oml/api.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from os.path import normpath, dirname, abspath, join
diff --git a/oml/changelog.py b/oml/changelog.py
index 483a708..c16834c 100644
--- a/oml/changelog.py
+++ b/oml/changelog.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import os
 from datetime import datetime
diff --git a/oml/commands.py b/oml/commands.py
index 7e0a05d..d147b2e 100644
--- a/oml/commands.py
+++ b/oml/commands.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from os.path import join, exists, dirname
diff --git a/oml/downloads.py b/oml/downloads.py
index 8374f95..1835ec1 100644
--- a/oml/downloads.py
+++ b/oml/downloads.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import os
 from threading import Thread
diff --git a/oml/item/api.py b/oml/item/api.py
index c94d7cf..d0c04a5 100644
--- a/oml/item/api.py
+++ b/oml/item/api.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import json
 import hashlib
 import os
diff --git a/oml/item/handlers.py b/oml/item/handlers.py
index b13c9f4..2dd4dcf 100644
--- a/oml/item/handlers.py
+++ b/oml/item/handlers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from datetime import datetime
diff --git a/oml/item/icons.py b/oml/item/icons.py
index e87b724..dc670d5 100644
--- a/oml/item/icons.py
+++ b/oml/item/icons.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import os
 import sqlite3
diff --git a/oml/item/models.py b/oml/item/models.py
index b2d5c3a..cfc44e3 100644
--- a/oml/item/models.py
+++ b/oml/item/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from datetime import datetime
 import base64
 import hashlib
diff --git a/oml/item/person.py b/oml/item/person.py
index 4e68205..27ad8f7 100644
--- a/oml/item/person.py
+++ b/oml/item/person.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import unicodedata
diff --git a/oml/item/person_api.py b/oml/item/person_api.py
index e6cb8dc..1293f34 100644
--- a/oml/item/person_api.py
+++ b/oml/item/person_api.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import unicodedata
 
 from oxtornado import actions
diff --git a/oml/item/query.py b/oml/item/query.py
index b48fe29..9683dee 100644
--- a/oml/item/query.py
+++ b/oml/item/query.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 #does not work in sqlite
diff --git a/oml/item/scan.py b/oml/item/scan.py
index 04a58c9..4869ac9 100644
--- a/oml/item/scan.py
+++ b/oml/item/scan.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from datetime import datetime
diff --git a/oml/item/title_api.py b/oml/item/title_api.py
index b34a70c..22fb3b5 100644
--- a/oml/item/title_api.py
+++ b/oml/item/title_api.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import hashlib
 import json
 import unicodedata
diff --git a/oml/library.py b/oml/library.py
index 510e7d2..c80fc4d 100644
--- a/oml/library.py
+++ b/oml/library.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import json
 import os
 import time
diff --git a/oml/localnodes.py b/oml/localnodes.py
index 5e7129b..f3fa7ec 100644
--- a/oml/localnodes.py
+++ b/oml/localnodes.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import socket
 
diff --git a/oml/media/__init__.py b/oml/media/__init__.py
index 5cebfcf..dd9d32b 100644
--- a/oml/media/__init__.py
+++ b/oml/media/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import base64
diff --git a/oml/media/cbr.py b/oml/media/cbr.py
index 9f72a71..66e1324 100644
--- a/oml/media/cbr.py
+++ b/oml/media/cbr.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import os
diff --git a/oml/media/epub.py b/oml/media/epub.py
index 81ccb17..cd5a6f0 100644
--- a/oml/media/epub.py
+++ b/oml/media/epub.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import os
diff --git a/oml/media/opf.py b/oml/media/opf.py
index b8a20b8..8070c40 100644
--- a/oml/media/opf.py
+++ b/oml/media/opf.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import xml.etree.ElementTree as ET
diff --git a/oml/media/pdf.py b/oml/media/pdf.py
index c4e9719..bc342d0 100644
--- a/oml/media/pdf.py
+++ b/oml/media/pdf.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import sys
diff --git a/oml/media/txt.py b/oml/media/txt.py
index 193441c..ca76253 100644
--- a/oml/media/txt.py
+++ b/oml/media/txt.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import os
diff --git a/oml/meta/__init__.py b/oml/meta/__init__.py
index 45c3d3e..13209c0 100644
--- a/oml/meta/__init__.py
+++ b/oml/meta/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import stdnum.isbn
diff --git a/oml/meta/duckduckgo.py b/oml/meta/duckduckgo.py
index 105426b..b3c28e6 100644
--- a/oml/meta/duckduckgo.py
+++ b/oml/meta/duckduckgo.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import ox.web.duckduckgo
diff --git a/oml/meta/google.py b/oml/meta/google.py
index 4b628bf..713647d 100644
--- a/oml/meta/google.py
+++ b/oml/meta/google.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from time import time, sleep
 from urllib.parse import urlencode
diff --git a/oml/meta/utils.py b/oml/meta/utils.py
index 49f0703..741fce8 100644
--- a/oml/meta/utils.py
+++ b/oml/meta/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 import re
diff --git a/oml/node/cert.py b/oml/node/cert.py
index 64cb741..8b7e5d1 100644
--- a/oml/node/cert.py
+++ b/oml/node/cert.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import hashlib
 import os
diff --git a/oml/node/nodeapi.py b/oml/node/nodeapi.py
index a3f16d5..3992ddd 100644
--- a/oml/node/nodeapi.py
+++ b/oml/node/nodeapi.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from user.models import User
diff --git a/oml/node/server.py b/oml/node/server.py
index 4673441..0e5694e 100644
--- a/oml/node/server.py
+++ b/oml/node/server.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from socketserver import ThreadingMixIn
 from threading import Thread
 import base64
diff --git a/oml/nodes.py b/oml/nodes.py
index 70fae05..1933def 100644
--- a/oml/nodes.py
+++ b/oml/nodes.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from queue import Queue
diff --git a/oml/oxtornado.py b/oml/oxtornado.py
index 7215e9a..b34cdfe 100644
--- a/oml/oxtornado.py
+++ b/oml/oxtornado.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from contextlib import contextmanager
diff --git a/oml/pdict.py b/oml/pdict.py
index a648d24..cf1d37b 100644
--- a/oml/pdict.py
+++ b/oml/pdict.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import os
 import json
diff --git a/oml/queryparser.py b/oml/queryparser.py
index 5ccc68a..033e068 100644
--- a/oml/queryparser.py
+++ b/oml/queryparser.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from datetime import datetime
 import unicodedata
diff --git a/oml/server.py b/oml/server.py
index f98ed7b..b01d598 100644
--- a/oml/server.py
+++ b/oml/server.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import os
 import sys
diff --git a/oml/settings.py b/oml/settings.py
index 631b398..f70b930 100644
--- a/oml/settings.py
+++ b/oml/settings.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import json
 import os
diff --git a/oml/setup.py b/oml/setup.py
index 85c2bae..b243a00 100644
--- a/oml/setup.py
+++ b/oml/setup.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import os
 
diff --git a/oml/ssl_request.py b/oml/ssl_request.py
index 538ea75..43b4fb3 100644
--- a/oml/ssl_request.py
+++ b/oml/ssl_request.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import ssl
 import http.client
diff --git a/oml/tasks.py b/oml/tasks.py
index af02c3c..3f97379 100644
--- a/oml/tasks.py
+++ b/oml/tasks.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from queue import PriorityQueue
 from threading import Thread
 import json
diff --git a/oml/tor_request.py b/oml/tor_request.py
index 7b10063..0fd6455 100644
--- a/oml/tor_request.py
+++ b/oml/tor_request.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 import ssl
 import http.client
diff --git a/oml/ui.py b/oml/ui.py
index a15dfac..ba4630a 100644
--- a/oml/ui.py
+++ b/oml/ui.py
@@ -1,5 +1,4 @@
 # encoding: utf-8
-# vi:si:et:sw=4:sts=4:ts=4
 import sys
 import os
 try:
diff --git a/oml/ui_websocket.py b/oml/ui_websocket.py
index 7efdddd..3bd5204 100644
--- a/oml/ui_websocket.py
+++ b/oml/ui_websocket.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 import json
 
 
diff --git a/oml/update.py b/oml/update.py
index 8ab472c..83c490a 100644
--- a/oml/update.py
+++ b/oml/update.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 from contextlib import closing
 import base64
diff --git a/oml/user/api.py b/oml/user/api.py
index d8fecfa..6764050 100644
--- a/oml/user/api.py
+++ b/oml/user/api.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from copy import deepcopy
diff --git a/oml/user/models.py b/oml/user/models.py
index ad75f0d..bc2d072 100644
--- a/oml/user/models.py
+++ b/oml/user/models.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 from datetime import datetime
 import json
 import os
diff --git a/oml/utils.py b/oml/utils.py
index e5b9337..5130156 100644
--- a/oml/utils.py
+++ b/oml/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from datetime import datetime
diff --git a/oml/websocket.py b/oml/websocket.py
index 90821bb..27a3d4e 100644
--- a/oml/websocket.py
+++ b/oml/websocket.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 
 
 from tornado.websocket import WebSocketHandler