diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..98bc1c5a3a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# EditorConfig is awesome: http://EditorConfig.org
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.less]
+indent_style = space
+indent_size = 4
+
+[{*.json,*.yml}]
+indent_style = space
+indent_size = 2
diff --git a/Makefile b/Makefile
index ed4e402577..4c01bc1616 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@ $(shell mkdir -p $(DIRS))
 
 all: styleguidist
 
+bootstrap:
+	npm run lerna:bootstrap
+
 css: fonts
 	npm run build:css
 fonts:
diff --git a/package.json b/package.json
index 19787fe528..10f8bfa578 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "lerna:bootstrap": "lerna bootstrap",
     "lerna:publish": "lerna publish --yes",
     "lerna:clean": "lerna clean --yes",
-    "styleguidist": "styleguidist start",
+    "styleguidist": "styleguidist server",
     "styleguidist:build": "styleguidist build",
     "build:css": "lessc packages/ffe-all.less dist/ffe.css",
     "lint": "lerna run lint",