diff --git a/demo-shell-ng2/.editorconfig b/demo-shell-ng2/.editorconfig
index de6d5c49a7..c310eb95da 100644
--- a/demo-shell-ng2/.editorconfig
+++ b/demo-shell-ng2/.editorconfig
@@ -1,10 +1,19 @@
-
-root = true
-
-[{src,scripts}/**.{ts,json,js}]
-end_of_line = crlf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[package.json]
+indent_style = space
+indent_size = 2
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/ng2-components/ng2-alfresco-core/.editorconfig b/ng2-components/ng2-alfresco-core/.editorconfig
index 8786e6e298..c310eb95da 100644
--- a/ng2-components/ng2-alfresco-core/.editorconfig
+++ b/ng2-components/ng2-alfresco-core/.editorconfig
@@ -10,6 +10,10 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[package.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
diff --git a/ng2-components/ng2-alfresco-datatable/.editorconfig b/ng2-components/ng2-alfresco-datatable/.editorconfig
index 8786e6e298..c310eb95da 100644
--- a/ng2-components/ng2-alfresco-datatable/.editorconfig
+++ b/ng2-components/ng2-alfresco-datatable/.editorconfig
@@ -10,6 +10,10 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[package.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
diff --git a/ng2-components/ng2-alfresco-documentlist/.editorconfig b/ng2-components/ng2-alfresco-documentlist/.editorconfig
index 8786e6e298..c310eb95da 100644
--- a/ng2-components/ng2-alfresco-documentlist/.editorconfig
+++ b/ng2-components/ng2-alfresco-documentlist/.editorconfig
@@ -10,6 +10,10 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[package.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
diff --git a/ng2-components/ng2-alfresco-login/.editorconfig b/ng2-components/ng2-alfresco-login/.editorconfig
index 8786e6e298..c310eb95da 100644
--- a/ng2-components/ng2-alfresco-login/.editorconfig
+++ b/ng2-components/ng2-alfresco-login/.editorconfig
@@ -10,6 +10,10 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[package.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
diff --git a/ng2-components/ng2-alfresco-search/.editorconfig b/ng2-components/ng2-alfresco-search/.editorconfig
index 8786e6e298..c310eb95da 100644
--- a/ng2-components/ng2-alfresco-search/.editorconfig
+++ b/ng2-components/ng2-alfresco-search/.editorconfig
@@ -10,6 +10,10 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[package.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
diff --git a/ng2-components/ng2-alfresco-upload/.editorconfig b/ng2-components/ng2-alfresco-upload/.editorconfig
index 8786e6e298..c310eb95da 100644
--- a/ng2-components/ng2-alfresco-upload/.editorconfig
+++ b/ng2-components/ng2-alfresco-upload/.editorconfig
@@ -10,6 +10,10 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[package.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
diff --git a/ng2-components/ng2-alfresco-viewer/.editorconfig b/ng2-components/ng2-alfresco-viewer/.editorconfig
index 8786e6e298..c310eb95da 100644
--- a/ng2-components/ng2-alfresco-viewer/.editorconfig
+++ b/ng2-components/ng2-alfresco-viewer/.editorconfig
@@ -10,6 +10,10 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[package.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false