diff --git a/.editorconfig b/.editorconfig
index 669640db..10b44416 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,3 @@
-root = true
-
 [*]
 indent_style = space
 indent_size = 4
@@ -8,3 +6,6 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.vader]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 04c4a030..c965af39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 test/$VADER_OUTPUT_FILE
+node_modules/
diff --git a/autoload/neoformat/formatters/jinja.vim b/autoload/neoformat/formatters/jinja.vim
new file mode 100644
index 00000000..a98fa50c
--- /dev/null
+++ b/autoload/neoformat/formatters/jinja.vim
@@ -0,0 +1,11 @@
+function! neoformat#formatters#jinja#enabled()
+    return ['prettydiff', 'htmlbeautify']
+endfunction
+
+function! neoformat#formatters#jinja#htmlbeautify()
+    return neoformat#formatters#html#htmlbeautify()
+endfunction
+
+function! neoformat#formatters#jinja#prettydiff()
+    return neoformat#formatters#html#prettydiff()
+endfunction
diff --git a/autoload/neoformat/formatters/pug.vim b/autoload/neoformat/formatters/pug.vim
index 176b2b20..3ee7bbeb 100644
--- a/autoload/neoformat/formatters/pug.vim
+++ b/autoload/neoformat/formatters/pug.vim
@@ -4,6 +4,7 @@ endfunction
 
 function! neoformat#formatters#pug#pugbeautifier()
     return {
-        \ 'exe': 'pug-beautifier'
+        \ 'exe': 'pug-beautifier',
+        \ 'args': ['-s 2']
         \ }
 endfunction