diff --git a/powerline/colorschemes/default.json b/powerline/colorschemes/default.json
deleted file mode 100644
index 2a6b5af..0000000
--- a/powerline/colorschemes/default.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "name": "Default",
-    "groups": {
-	"information:additional":    { "fg": "gray9", "bg": "gray4", "attrs": [] },
-	"information:regular":       { "fg": "gray10", "bg": "gray4", "attrs": ["bold"] },
-	"information:highlighted":   { "fg": "white", "bg": "gray4", "attrs": [] },
-	"information:priority":      { "fg": "brightyellow", "bg": "mediumorange", "attrs": [] },
-	"warning:regular":           { "fg": "white", "bg": "brightred", "attrs": ["bold"] },
-	"critical:failure":          { "fg": "white", "bg": "darkestred", "attrs": [] },
-	"critical:success":          { "fg": "white", "bg": "darkestgreen", "attrs": [] },
-	"background":                { "fg": "white", "bg": "gray0", "attrs": [] },
-	"background:divider":        { "fg": "gray5", "bg": "gray0", "attrs": [] },
-	"session":                   { "fg": "black", "bg": "gray10", "attrs": ["bold"] },
-	"date":                      { "fg": "gray8", "bg": "gray2", "attrs": [] },
-	"time":                      { "fg": "gray10", "bg": "gray2", "attrs": ["bold"] },
-	"time:divider":              { "fg": "gray5", "bg": "gray2", "attrs": [] },
-	"email_alert":               "warning:regular",
-	"email_alert_gradient":      { "fg": "white", "bg": "yellow_orange_red", "attrs": ["bold"] },
-	"hostname":                  { "fg": "black", "bg": "gray10", "attrs": ["bold"] },
-	"weather":                   { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"weather_temp_gradient":     { "fg": "blue_red", "bg": "gray0", "attrs": [] },
-	"weather_condition_hot":     { "fg": "khaki1", "bg": "gray0", "attrs": [] },
-	"weather_condition_snowy":   { "fg": "skyblue1", "bg": "gray0", "attrs": [] },
-	"weather_condition_rainy":   { "fg": "skyblue1", "bg": "gray0", "attrs": [] },
-	"uptime":                    { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"external_ip":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"internal_ip":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"network_load":              { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"network_load_gradient":     { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-	"network_load:divider":      "background:divider",
-	"system_load":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"system_load_gradient":      { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-	"environment":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"cpu_load_percent":          { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"cpu_load_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
-	"battery":                   { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"battery_gradient":          { "fg": "white_red", "bg": "gray0", "attrs": [] },
-	"battery_full":              { "fg": "red", "bg": "gray0", "attrs": [] },
-	"battery_empty":             { "fg": "white", "bg": "gray0", "attrs": [] },
-	"player":                    { "fg": "gray10", "bg": "black", "attrs": [] },
-	"user":                      { "fg": "white", "bg": "darkblue", "attrs": ["bold"] },
-	"branch":                    { "fg": "gray9", "bg": "gray2", "attrs": [] },
-	"branch_dirty":              { "fg": "brightyellow", "bg": "gray2", "attrs": [] },
-	"branch_clean":              { "fg": "gray9", "bg": "gray2", "attrs": [] },
-	"branch:divider":            { "fg": "gray7", "bg": "gray2", "attrs": [] },
-	"cwd":                       "information:additional",
-	"cwd:current_folder":        "information:regular",
-	"cwd:divider":               { "fg": "gray7", "bg": "gray4", "attrs": [] },
-	"virtualenv":                { "fg": "white", "bg": "darkcyan", "attrs": [] },
-	"attached_clients":          { "fg": "gray8", "bg": "gray0", "attrs": [] },
-	"gitstatus":                 { "fg": "gray8", "bg": "gray2", "attrs": [] },
-    "gitstatus_branch":          { "fg": "gray8", "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_clean":    { "fg": "green", "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_dirty":    { "fg": "gray8", "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_detached": { "fg": "mediumpurple", "bg": "gray2", "attrs": [] },
-    "gitstatus_behind":          { "fg": "gray10", "bg": "gray2", "attrs": [] },
-    "gitstatus_ahead":           { "fg": "gray10", "bg": "gray2", "attrs": [] },
-    "gitstatus_staged":          { "fg": "green", "bg": "gray2", "attrs": [] },
-    "gitstatus_unmerged":        { "fg": "brightred", "bg": "gray2", "attrs": [] },
-    "gitstatus_changed":         { "fg": "mediumorange", "bg": "gray2", "attrs": [] },
-    "gitstatus_untracked":       { "fg": "brightestorange", "bg": "gray2", "attrs": [] },
-    "gitstatus_stashed":         { "fg": "darkblue", "bg": "gray2", "attrs": [] },
-    "gitstatus:divider":         { "fg": "gray8", "bg": "gray2", "attrs": [] }
-    }
-}
\ No newline at end of file
diff --git a/powerline/colorschemes/shell/default.json b/powerline/colorschemes/shell/default.json
new file mode 100644
index 0000000..7378708
--- /dev/null
+++ b/powerline/colorschemes/shell/default.json
@@ -0,0 +1,18 @@
+{
+	"name": "Default color scheme for powerline-gitstatus shell prompt",
+	"groups": {
+		"gitstatus":                 { "fg": "gray8", "bg": "gray2", "attrs": [] },
+		"gitstatus_branch":          { "fg": "gray8", "bg": "gray2", "attrs": [] },
+		"gitstatus_branch_clean":    { "fg": "green", "bg": "gray2", "attrs": [] },
+		"gitstatus_branch_dirty":    { "fg": "gray8", "bg": "gray2", "attrs": [] },
+		"gitstatus_branch_detached": { "fg": "mediumpurple", "bg": "gray2", "attrs": [] },
+		"gitstatus_behind":          { "fg": "gray10", "bg": "gray2", "attrs": [] },
+		"gitstatus_ahead":           { "fg": "gray10", "bg": "gray2", "attrs": [] },
+		"gitstatus_staged":          { "fg": "green", "bg": "gray2", "attrs": [] },
+		"gitstatus_unmerged":        { "fg": "brightred", "bg": "gray2", "attrs": [] },
+		"gitstatus_changed":         { "fg": "mediumorange", "bg": "gray2", "attrs": [] },
+		"gitstatus_untracked":       { "fg": "brightestorange", "bg": "gray2", "attrs": [] },
+		"gitstatus_stashed":         { "fg": "darkblue", "bg": "gray2", "attrs": [] },
+		"gitstatus:divider":         { "fg": "gray8", "bg": "gray2", "attrs": [] }
+	}
+}
diff --git a/powerline/colorschemes/shell/solarized.json b/powerline/colorschemes/shell/solarized.json
new file mode 100644
index 0000000..dd97a19
--- /dev/null
+++ b/powerline/colorschemes/shell/solarized.json
@@ -0,0 +1,18 @@
+{
+	"name": "Solarized dark color scheme for powerline-gitstatus shell prompt",
+	"groups": {
+		"gitstatus":               { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_branch":        { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_branch_clean":  { "fg": "solarized:green", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_branch_dirty":  { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_branch_detached": { "fg": "solarized:magenta", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_behind":        { "fg": "solarized:base2", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_ahead":         { "fg": "solarized:base2", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_staged":        { "fg": "solarized:green", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_unmerged":      { "fg": "solarized:red", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_changed":       { "fg": "solarized:orange", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_untracked":     { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus_stashed":       { "fg": "solarized:blue", "bg": "solarized:base02", "attrs": [] },
+		"gitstatus:divider":       { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] }
+	}
+}
diff --git a/powerline/colorschemes/solarized.json b/powerline/colorschemes/solarized.json
deleted file mode 100644
index b80871a..0000000
--- a/powerline/colorschemes/solarized.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "name": "Solarized dark",
-    "groups": {
-	"information:additional":  { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
-	"information:regular":     { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"] },
-	"information:highlighted": { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"]},
-	"information:priority":    { "fg": "solarized:base3", "bg": "solarized:yellow", "attrs": [] },
-	"warning:regular":         { "fg": "solarized:base3", "bg": "solarized:red", "attrs": [] },
-	"critical:failure":        { "fg": "solarized:base3", "bg": "solarized:red", "attrs": [] },
-	"critical:success":        { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
-	"background":              { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": [] },
-	"background:divider":      { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-	"user":                    { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] },
-	"virtualenv":              { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
-	"branch":                  { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-	"branch_dirty":            { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": [] },
-	"branch_clean":            { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-	"email_alert_gradient":    { "fg": "solarized:base3", "bg": "yellow_orange_red", "attrs": [] },
-	"email_alert":             "warning:regular",
-	"cwd":                     "information:additional",
-	"cwd:current_folder":      "information:regular",
-	"cwd:divider":             { "fg": "solarized:base1", "bg": "solarized:base01", "attrs": [] },
-	"network_load":            { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
-	"network_load:divider":    { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
-	"hostname":                { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
-	"environment":             { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
-	"attached_clients":        { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
-	"date":                    { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-	"time":                    { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": ["bold"] },
-	"time:divider":            { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-	"system_load":             { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
-	"weather_temp_gradient":   { "fg": "blue_red", "bg": "solarized:base03", "attrs": [] },
-	"weather":                 { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
-	"uptime":                  { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
-	"gitstatus":               { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_branch":        { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_branch_clean":  { "fg": "solarized:green", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_branch_dirty":  { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_branch_detached": { "fg": "solarized:magenta", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_behind":        { "fg": "solarized:base2", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_ahead":         { "fg": "solarized:base2", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_staged":        { "fg": "solarized:green", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_unmerged":      { "fg": "solarized:red", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_changed":       { "fg": "solarized:orange", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_untracked":     { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus_stashed":       { "fg": "solarized:blue", "bg": "solarized:base02", "attrs": [] },
-	"gitstatus:divider":       { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] }
-    }
-}
\ No newline at end of file
diff --git a/powerline/config.json b/powerline/config.json
new file mode 100644
index 0000000..58c5dbf
--- /dev/null
+++ b/powerline/config.json
@@ -0,0 +1,8 @@
+{
+	"ext": {
+		"shell": {
+			"colorscheme": "default",
+			"theme": "jkubrynski"
+		}
+	}
+}
diff --git a/powerline/themes/shell/default.json b/powerline/themes/shell/jkubrynski.json
similarity index 100%
rename from powerline/themes/shell/default.json
rename to powerline/themes/shell/jkubrynski.json