diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index fbc1b9fc..17cd543e 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -73,7 +73,7 @@ Extension-specific configuration
 Colorschemes
 ------------
 
-:Location: :file:`powerline/colorschemes/{name}.json`
+:Location: :file:`powerline/colorschemes/{extension}/{name}.json`
 
 ``name``
     Name of the colorscheme.
diff --git a/powerline/colorschemes/terminal_default.json b/powerline/colorschemes/terminal/default.json
similarity index 100%
rename from powerline/colorschemes/terminal_default.json
rename to powerline/colorschemes/terminal/default.json
diff --git a/powerline/colorschemes/tmux_default.json b/powerline/colorschemes/tmux/default.json
similarity index 100%
rename from powerline/colorschemes/tmux_default.json
rename to powerline/colorschemes/tmux/default.json
diff --git a/powerline/colorschemes/vim_default.json b/powerline/colorschemes/vim/default.json
similarity index 100%
rename from powerline/colorschemes/vim_default.json
rename to powerline/colorschemes/vim/default.json
diff --git a/powerline/config.json b/powerline/config.json
index 306139bf..70c85d46 100644
--- a/powerline/config.json
+++ b/powerline/config.json
@@ -13,15 +13,15 @@
 	},
 	"ext": {
 		"terminal": {
-			"colorscheme": "terminal_default",
+			"colorscheme": "default",
 			"theme": "default"
 		},
 		"tmux": {
-			"colorscheme": "tmux_default",
+			"colorscheme": "default",
 			"theme": "default"
 		},
 		"vim": {
-			"colorscheme": "vim_default",
+			"colorscheme": "default",
 			"theme": "default",
 			"local_themes": {
 				"help": "help"
diff --git a/powerline/core.py b/powerline/core.py
index f7835f3f..755a62fe 100644
--- a/powerline/core.py
+++ b/powerline/core.py
@@ -24,7 +24,7 @@ class Powerline(object):
 		self.config_ext = config['ext'][ext]
 
 		# Load and initialize colorscheme
-		colorscheme_config = self._load_json_config(os.path.join('colorschemes', self.config_ext['colorscheme']))
+		colorscheme_config = self._load_json_config(os.path.join('colorschemes', ext, self.config_ext['colorscheme']))
 		colorscheme = Colorscheme(colorscheme_config)
 
 		# Load and initialize extension theme