diff --git a/.editorconfig b/.editorconfig
index 37cfad78c270b..1a9acd92fc0fc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,9 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{yml,yaml,json}]
+indent_size = 2
+
+[{composer, auth}.json]
+indent_size = 4
diff --git a/dev/tests/acceptance/staticRuleset.json b/dev/tests/acceptance/staticRuleset.json
index 82cc9dfe74152..91521d5f16bcc 100644
--- a/dev/tests/acceptance/staticRuleset.json
+++ b/dev/tests/acceptance/staticRuleset.json
@@ -1,8 +1,8 @@
 {
-    "tests": [
-        "actionGroupArguments",
-        "deprecatedEntityUsage",
-        "annotations",
-        "pauseActionUsage"
-    ]
+  "tests": [
+    "actionGroupArguments",
+    "deprecatedEntityUsage",
+    "annotations",
+    "pauseActionUsage"
+  ]
 }
diff --git a/dev/tools/grunt/configs/autoprefixer.json b/dev/tools/grunt/configs/autoprefixer.json
index 28cd9c8a1255f..ea6301c2fd7ae 100644
--- a/dev/tools/grunt/configs/autoprefixer.json
+++ b/dev/tools/grunt/configs/autoprefixer.json
@@ -1,14 +1,11 @@
 {
-    "options": {
-        "browsers": [
-            "last 2 versions",
-            "ie 11"
-        ]
-    },
-    "setup": {
-        "src": "<%= path.css.setup %>/setup.css"
-    },
-    "updater": {
-        "src": "<%= path.css.updater %>/updater.css"
-    }
-}
\ No newline at end of file
+  "options": {
+    "browsers": ["last 2 versions", "ie 11"]
+  },
+  "setup": {
+    "src": "<%= path.css.setup %>/setup.css"
+  },
+  "updater": {
+    "src": "<%= path.css.updater %>/updater.css"
+  }
+}
diff --git a/dev/tools/grunt/configs/concat.json b/dev/tools/grunt/configs/concat.json
index b02024c38559f..de3e5a73cc266 100644
--- a/dev/tools/grunt/configs/concat.json
+++ b/dev/tools/grunt/configs/concat.json
@@ -1,10 +1,10 @@
 {
-    "options": {
-        "stripBanners": true,
-        "banner": "/**\n * Copyright © <%= grunt.template.today(\"yyyy\") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n"
-    },
-    "setup": {
-        "src": "<%= path.css.setup %>/setup.css",
-        "dest": "<%= path.css.setup %>/setup.css"
-    }
-}
\ No newline at end of file
+  "options": {
+    "stripBanners": true,
+    "banner": "/**\n * Copyright © <%= grunt.template.today(\"yyyy\") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n"
+  },
+  "setup": {
+    "src": "<%= path.css.setup %>/setup.css",
+    "dest": "<%= path.css.setup %>/setup.css"
+  }
+}
diff --git a/dev/tools/grunt/configs/cssmin.json b/dev/tools/grunt/configs/cssmin.json
index 032657cc3ed81..7b56ec43eccdd 100644
--- a/dev/tools/grunt/configs/cssmin.json
+++ b/dev/tools/grunt/configs/cssmin.json
@@ -1,16 +1,16 @@
 {
-    "options": {
-        "report": "gzip",
-        "keepSpecialComments": 0
-    },
-    "setup": {
-        "files": {
-            "<%= path.css.setup %>/setup.css": "<%= path.css.setup %>/setup.css"
-        }
-    },
-    "updater": {
-        "files": {
-            "<%= path.css.updater %>/updater.css": "<%= path.css.updater %>/updater.css"
-        }
+  "options": {
+    "report": "gzip",
+    "keepSpecialComments": 0
+  },
+  "setup": {
+    "files": {
+      "<%= path.css.setup %>/setup.css": "<%= path.css.setup %>/setup.css"
     }
-}
\ No newline at end of file
+  },
+  "updater": {
+    "files": {
+      "<%= path.css.updater %>/updater.css": "<%= path.css.updater %>/updater.css"
+    }
+  }
+}
diff --git a/dev/tools/grunt/configs/eslint.json b/dev/tools/grunt/configs/eslint.json
index 78719ce9548f6..ec0d821a1c0d8 100644
--- a/dev/tools/grunt/configs/eslint.json
+++ b/dev/tools/grunt/configs/eslint.json
@@ -1,18 +1,18 @@
 {
-    "file": {
-        "options": {
-            "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
-            "reset": true,
-            "useEslintrc": false
-        }
-    },
-    "test": {
-        "options": {
-            "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
-            "reset": true,
-            "outputFile": "dev/tests/static/eslint-error-report.xml",
-            "format": "junit",
-            "quiet": true
-        }
+  "file": {
+    "options": {
+      "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
+      "reset": true,
+      "useEslintrc": false
     }
+  },
+  "test": {
+    "options": {
+      "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
+      "reset": true,
+      "outputFile": "dev/tests/static/eslint-error-report.xml",
+      "format": "junit",
+      "quiet": true
+    }
+  }
 }
diff --git a/dev/tools/grunt/configs/jscs.json b/dev/tools/grunt/configs/jscs.json
index dd9254abbdc68..e4002f035f824 100644
--- a/dev/tools/grunt/configs/jscs.json
+++ b/dev/tools/grunt/configs/jscs.json
@@ -1,16 +1,16 @@
 {
-    "file": {
-        "options": {
-            "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc"
-        },
-        "src": ""
+  "file": {
+    "options": {
+      "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc"
     },
-    "test": {
-        "options": {
-            "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc",
-            "reporterOutput": "dev/tests/static/jscs-error-report.xml",
-            "reporter": "junit"
-        },
-        "src": ""
-    }
+    "src": ""
+  },
+  "test": {
+    "options": {
+      "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc",
+      "reporterOutput": "dev/tests/static/jscs-error-report.xml",
+      "reporter": "junit"
+    },
+    "src": ""
+  }
 }
diff --git a/dev/tools/grunt/configs/mage-minify.json b/dev/tools/grunt/configs/mage-minify.json
index 1ddfa3910a3a8..c6ecfc5579701 100644
--- a/dev/tools/grunt/configs/mage-minify.json
+++ b/dev/tools/grunt/configs/mage-minify.json
@@ -1,21 +1,21 @@
 {
-    "legacy": {
-        "options": {
-            "compressor": "yui-js"
-        },
-        "files": {
-            "<%= path.uglify.legacy %>": [
-                "lib/web/prototype/prototype.js",
-                "lib/web/prototype/window.js",
-                "lib/web/scriptaculous/builder.js",
-                "lib/web/scriptaculous/effects.js",
-                "lib/web/lib/ccard.js",
-                "lib/web/prototype/validation.js",
-                "lib/web/varien/js.js",
-                "lib/web/mage/adminhtml/varienLoader.js",
-                "lib/web/mage/adminhtml/tools.js",
-                "dev/tools/grunt/assets/legacy-build/shim.js"
-            ]
-        }
+  "legacy": {
+    "options": {
+      "compressor": "yui-js"
+    },
+    "files": {
+      "<%= path.uglify.legacy %>": [
+        "lib/web/prototype/prototype.js",
+        "lib/web/prototype/window.js",
+        "lib/web/scriptaculous/builder.js",
+        "lib/web/scriptaculous/effects.js",
+        "lib/web/lib/ccard.js",
+        "lib/web/prototype/validation.js",
+        "lib/web/varien/js.js",
+        "lib/web/mage/adminhtml/varienLoader.js",
+        "lib/web/mage/adminhtml/tools.js",
+        "dev/tools/grunt/assets/legacy-build/shim.js"
+      ]
     }
+  }
 }
diff --git a/dev/tools/grunt/configs/styledocco.json b/dev/tools/grunt/configs/styledocco.json
index 8a75d43ac35e4..1527b26114b97 100644
--- a/dev/tools/grunt/configs/styledocco.json
+++ b/dev/tools/grunt/configs/styledocco.json
@@ -1,14 +1,12 @@
 {
-    "documentation": {
-        "options": {
-            "name": "Magento UI Library",
-            "verbose": true,
-            "include": [
-                "<%= path.doc %>/docs.css"
-            ]
-        },
-        "files": {
-            "<%= path.doc %>": "<%= path.doc %>/source"
-        }
+  "documentation": {
+    "options": {
+      "name": "Magento UI Library",
+      "verbose": true,
+      "include": ["<%= path.doc %>/docs.css"]
+    },
+    "files": {
+      "<%= path.doc %>": "<%= path.doc %>/source"
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/grunt-config.json.sample b/grunt-config.json.sample
index 7ef28a856f925..5704e5f012e17 100644
--- a/grunt-config.json.sample
+++ b/grunt-config.json.sample
@@ -1,3 +1,3 @@
 {
-    "themes": "dev/tools/grunt/configs/local-themes"
+  "themes": "dev/tools/grunt/configs/local-themes"
 }
diff --git a/package.json.sample b/package.json.sample
index 93fe72afbd24a..1d07bcff26d8d 100644
--- a/package.json.sample
+++ b/package.json.sample
@@ -1,42 +1,42 @@
 {
-    "name": "magento2",
-    "author": "Magento Commerce Inc.",
-    "description": "Magento2 node modules dependencies for local development",
-    "license": "(OSL-3.0 OR AFL-3.0)",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/magento/magento2.git"
-    },
-    "homepage": "http://magento.com/",
-    "devDependencies": {
-        "glob": "~7.1.1",
-        "grunt": "~1.0.1",
-        "grunt-autoprefixer": "~3.0.4",
-        "grunt-banner": "~0.6.0",
-        "grunt-continue": "~0.1.0",
-        "grunt-contrib-clean": "~1.1.0",
-        "grunt-contrib-connect": "~1.0.2",
-        "grunt-contrib-cssmin": "~2.2.1",
-        "grunt-contrib-imagemin": "~2.0.1",
-        "grunt-contrib-jasmine": "~1.2.0",
-        "grunt-contrib-less": "~1.4.1",
-        "grunt-contrib-watch": "~1.0.0",
-        "grunt-eslint": "~20.1.0",
-        "grunt-exec": "~3.0.0",
-        "grunt-jscs": "~3.0.1",
-        "grunt-replace": "~1.0.1",
-        "grunt-styledocco": "~0.3.0",
-        "grunt-template-jasmine-requirejs": "~0.2.3",
-        "grunt-text-replace": "~0.4.0",
-        "imagemin-svgo": "~5.2.1",
-        "load-grunt-config": "~0.19.2",
-        "morgan": "~1.9.0",
-        "node-minify": "~2.3.1",
-        "path": "~0.12.7",
-        "serve-static": "~1.13.1",
-        "squirejs": "~0.2.1",
-        "strip-json-comments": "~2.0.1",
-        "time-grunt": "~1.4.0",
-        "underscore": "~1.8.0"
-    }
+  "name": "magento2",
+  "author": "Magento Commerce Inc.",
+  "description": "Magento2 node modules dependencies for local development",
+  "license": "(OSL-3.0 OR AFL-3.0)",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/magento/magento2.git"
+  },
+  "homepage": "http://magento.com/",
+  "devDependencies": {
+    "glob": "~7.1.1",
+    "grunt": "~1.0.1",
+    "grunt-autoprefixer": "~3.0.4",
+    "grunt-banner": "~0.6.0",
+    "grunt-continue": "~0.1.0",
+    "grunt-contrib-clean": "~1.1.0",
+    "grunt-contrib-connect": "~1.0.2",
+    "grunt-contrib-cssmin": "~2.2.1",
+    "grunt-contrib-imagemin": "~2.0.1",
+    "grunt-contrib-jasmine": "~1.2.0",
+    "grunt-contrib-less": "~1.4.1",
+    "grunt-contrib-watch": "~1.0.0",
+    "grunt-eslint": "~20.1.0",
+    "grunt-exec": "~3.0.0",
+    "grunt-jscs": "~3.0.1",
+    "grunt-replace": "~1.0.1",
+    "grunt-styledocco": "~0.3.0",
+    "grunt-template-jasmine-requirejs": "~0.2.3",
+    "grunt-text-replace": "~0.4.0",
+    "imagemin-svgo": "~5.2.1",
+    "load-grunt-config": "~0.19.2",
+    "morgan": "~1.9.0",
+    "node-minify": "~2.3.1",
+    "path": "~0.12.7",
+    "serve-static": "~1.13.1",
+    "squirejs": "~0.2.1",
+    "strip-json-comments": "~2.0.1",
+    "time-grunt": "~1.4.0",
+    "underscore": "~1.8.0"
+  }
 }