diff --git a/Game/data/sprites/blockattack.sprite b/Game/data/sprites/blockattack.sprite
index 0e43732..73dcbe3 100644
--- a/Game/data/sprites/blockattack.sprite
+++ b/Game/data/sprites/blockattack.sprite
@@ -1,10 +1,7 @@
-//This file contains the difinition of all sprites
-//The file is in json-format but with support for C++-style comments
-
 {
-
-//This is the fallback sprite that are used if the game request a sprite not in any file
+"_comment" : "This file contains the difinition of all sprites",
 "fallback" : {
+	"_comment" : "This is the fallback sprite that are used if the game request a sprite not in any file",
 	"texture" : "fallback",
 	"topx" : 0,
 	"topy" : 0,
@@ -164,7 +161,8 @@
 	"width" : 108,
 	"number_of_frames" : 2,
 	"frame_time" : 400,
-	"originx" : 4, //This tells the game that the top left corner is placed a little different
+	"originx" : 4,
+	"originx_comment" : "This tells the game that the top left corner is placed a little different",
 	"originy" : 4
 },
 
diff --git a/Game/data/sprites/blockattack1.sprite b/Game/data/sprites/blockattack1.sprite
index a1511bb..301f353 100644
--- a/Game/data/sprites/blockattack1.sprite
+++ b/Game/data/sprites/blockattack1.sprite
@@ -1,6 +1,5 @@
-//This file simply contains all the images for now.
-
 {
+"_comment": "This file simply contains all the images for now.",
 "back_board" : {
 	"texture" : "back_board",
  	"topx" : 0,
diff --git a/source/code/DialogBox.cpp b/source/code/DialogBox.cpp
index 755f7d4..b7c6057 100644
--- a/source/code/DialogBox.cpp
+++ b/source/code/DialogBox.cpp
@@ -148,4 +148,4 @@ std::string DialogBox::GetName() const {
 
 bool DialogBox::IsUpdated() const {
 	return updated;
-}
\ No newline at end of file
+}
diff --git a/source/code/Libs/.editorconfig b/source/code/Libs/.editorconfig
index 8c0ff4b..aed8500 100644
--- a/source/code/Libs/.editorconfig
+++ b/source/code/Libs/.editorconfig
@@ -1,2 +1,11 @@
-#Because this folder contains external libraries we ignore the global code standard completly.
-root = true
\ No newline at end of file
+#See http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines
+[*]
+end_of_line = lf
+
+[*.cpp,*.hpp,*.h]
+indent_style = spaces