diff --git a/Themes/agnoster.json b/Themes/agnoster.json
index 5dc605e7..3b444d5c 100644
--- a/Themes/agnoster.json
+++ b/Themes/agnoster.json
@@ -77,5 +77,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/agnosterplus.json b/Themes/agnosterplus.json
index 3b7ea0e3..c51c69a5 100644
--- a/Themes/agnosterplus.json
+++ b/Themes/agnosterplus.json
@@ -66,5 +66,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/aliens.json b/Themes/aliens.json
index 9ba734c6..62b4659a 100644
--- a/Themes/aliens.json
+++ b/Themes/aliens.json
@@ -58,5 +58,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/avit.json b/Themes/avit.json
index 3e8e2a1b..04a295a6 100644
--- a/Themes/avit.json
+++ b/Themes/avit.json
@@ -65,5 +65,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/darkblood.json b/Themes/darkblood.json
index 78cd1fd7..43657570 100644
--- a/Themes/darkblood.json
+++ b/Themes/darkblood.json
@@ -74,5 +74,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/emodipt.json b/Themes/emodipt.json
index 9c0b50f6..45e543df 100644
--- a/Themes/emodipt.json
+++ b/Themes/emodipt.json
@@ -67,5 +67,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/honukai.json b/Themes/honukai.json
index 14256c7a..5c85de8a 100644
--- a/Themes/honukai.json
+++ b/Themes/honukai.json
@@ -105,5 +105,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/jandedobbeleer.json b/Themes/jandedobbeleer.json
index 33293213..7d445eaa 100644
--- a/Themes/jandedobbeleer.json
+++ b/Themes/jandedobbeleer.json
@@ -102,5 +102,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/lambda.json b/Themes/lambda.json
index f82a13d5..600c17df 100644
--- a/Themes/lambda.json
+++ b/Themes/lambda.json
@@ -39,5 +39,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/material.json b/Themes/material.json
index 37d790be..cea8a9db 100644
--- a/Themes/material.json
+++ b/Themes/material.json
@@ -51,5 +51,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/paradox.json b/Themes/paradox.json
index 46399888..3406ed43 100644
--- a/Themes/paradox.json
+++ b/Themes/paradox.json
@@ -95,5 +95,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/pararussel.json b/Themes/pararussel.json
index 37c62ec3..6eb8345a 100644
--- a/Themes/pararussel.json
+++ b/Themes/pararussel.json
@@ -77,5 +77,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/powerline.json b/Themes/powerline.json
index 7a93b3a9..86e4eaee 100644
--- a/Themes/powerline.json
+++ b/Themes/powerline.json
@@ -70,5 +70,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/robbyrussel.json b/Themes/robbyrussel.json
index 53f01072..698f6bad 100644
--- a/Themes/robbyrussel.json
+++ b/Themes/robbyrussel.json
@@ -44,5 +44,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/Themes/zash.json b/Themes/zash.json
index bc18599d..3980ffa4 100644
--- a/Themes/zash.json
+++ b/Themes/zash.json
@@ -57,5 +57,5 @@
       ]
     }
   ],
-  "end_space_enabled": true
+  "final_space": true
 }
diff --git a/engine.go b/engine.go
index f025d94d..c78851a3 100644
--- a/engine.go
+++ b/engine.go
@@ -105,7 +105,6 @@ func (e *engine) renderBlockSegments(block *Block) string {
 	if e.previousActiveSegment != nil && e.previousActiveSegment.Style == Powerline {
 		e.writePowerLineSeparator(Transparent, e.previousActiveSegment.Background, true)
 	}
-	// e.endPowerline()
 	return e.renderer.string()
 }
 
@@ -130,7 +129,7 @@ func (e *engine) render() {
 			fmt.Print(e.renderBlockSegments(block))
 		}
 	}
-	if e.settings.EndSpaceEnabled {
+	if e.settings.FinalSpace {
 		fmt.Print(" ")
 	}
 }
diff --git a/settings.go b/settings.go
index 959cb0e6..3a32fd8a 100755
--- a/settings.go
+++ b/settings.go
@@ -8,8 +8,8 @@ import (
 
 //Settings holds all the theme for rendering the prompt
 type Settings struct {
-	EndSpaceEnabled bool     `json:"end_space_enabled"`
-	Blocks          []*Block `json:"blocks"`
+	FinalSpace bool     `json:"final_space"`
+	Blocks     []*Block `json:"blocks"`
 }
 
 //BlockType type of block
@@ -67,7 +67,7 @@ func loadUserConfiguration(env environmentInfo) (*Settings, error) {
 
 func getDefaultSettings() *Settings {
 	settings := &Settings{
-		EndSpaceEnabled: true,
+		FinalSpace: true,
 		Blocks: []*Block{
 			{
 				Type:      Prompt,