diff --git a/powerline/.config/powerline/colorschemes/shell/default.json b/powerline/.config/powerline/colorschemes/shell/default.json
deleted file mode 100644
index bf10c9f..0000000
--- a/powerline/.config/powerline/colorschemes/shell/default.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-	"groups": {
-		"information:additional":     { "fg": "white", "bg": "gray3", "attrs": [] },
-		"information:regular":        { "fg": "white", "bg": "gray3", "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_sent_gradient": "network_load_gradient",
-		"network_load_recv_gradient": "network_load_gradient",
-		"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": [] },
-		"stash":                      "branch_dirty",
-		"stash:divider":              "branch:divider",
-		"cwd":                        "information:additional",
-		"cwd:current_folder":         "information:regular",
-		"cwd:divider":                { "fg": "gray7", "bg": "gray3", "attrs": [] },
-		"virtualenv":                 { "fg": "white", "bg": "darkcyan", "attrs": [] },
-		"attached_clients":           { "fg": "gray8", "bg": "gray0", "attrs": [] },
-		"workspace":                  "information:regular",
-    "gitstatus":                 { "fg": "gray9",           "bg": "gray2", "attrs": [] },
-    "gitstatus_branch":          { "fg": "white",           "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_clean":    { "fg": "green",           "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_dirty":    { "fg": "gray9",           "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_detached": { "fg": "mediumpurple",    "bg": "gray2", "attrs": [] },
-    "gitstatus_tag":             { "fg": "darkcyan",        "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/.config/powerline/colorschemes/tmux/default.json b/powerline/.config/powerline/colorschemes/tmux/default.json
deleted file mode 100644
index 4f361ef..0000000
--- a/powerline/.config/powerline/colorschemes/tmux/default.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"groups": {
-		"active_window_status": {"fg": "gray8",  "bg": "gray0",    "attrs": []},
-		"window_status":        {"fg": "gray70", "bg": "gray0",    "attrs": []},
-		"activity_status":      {"fg": "yellow", "bg": "gray0",    "attrs": []},
-		"bell_status":          {"fg": "red",    "bg": "gray0",    "attrs": []},
-		"window":               {"fg": "gray6",  "bg": "gray0",    "attrs": []},
-		"window:divider":       {"fg": "gray4",  "bg": "gray0",    "attrs": []},
-		"window:current":       {"fg": "gray8",  "bg": "gray3",    "attrs": []},
-		"window_name":          {"fg": "white",  "bg": "gray3",    "attrs": ["bold"]},
-		"session":              {"fg": "black",  "bg": "gray90",   "attrs": ["bold"]},
-		"session:prefix":       {"fg": "gray90", "bg": "darkblue", "attrs": ["bold"]},
-    "gitstatus":                 { "fg": "gray9",           "bg": "gray2", "attrs": [] },
-    "gitstatus_branch":          { "fg": "white",           "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_clean":    { "fg": "green",           "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_dirty":    { "fg": "gray9",           "bg": "gray2", "attrs": [] },
-    "gitstatus_branch_detached": { "fg": "mediumpurple",    "bg": "gray2", "attrs": [] },
-    "gitstatus_tag":             { "fg": "darkcyan",        "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/.config/powerline/themes/shell/default_leftonly.json b/powerline/.config/powerline/themes/shell/default_leftonly.json
deleted file mode 100644
index 19e97bc..0000000
--- a/powerline/.config/powerline/themes/shell/default_leftonly.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "segments": {
-    "left": [
-      {
-        "function": "powerline.segments.common.net.hostname"
-      },
-      {
-        "function": "powerline.segments.common.env.virtualenv"
-      },
-      {
-        "function": "powerline.segments.shell.cwd"
-      },
-      {
-        "function": "powerline_gitstatus.gitstatus",
-        "args": { 
-          "formats": {
-            "branch": "\ue0a0 {}",
-            "tag": " ★ {} ",
-            "behind": " ↓ {}",
-            "ahead": " ↑ {}",
-            "staged": " ● {}",
-            "unmerged": " ✖ {} ",
-            "changed": " ✚ {} ",
-            "untracked": " … {}",
-            "stashed": " ⚑ {}"
-          }
-        }
-      }
-    ]
-  }
-}
diff --git a/powerline/.config/powerline/themes/tmux/default.json b/powerline/.config/powerline/themes/tmux/default.json
deleted file mode 100644
index 187d5a4..0000000
--- a/powerline/.config/powerline/themes/tmux/default.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "segments": {
-    "right": [
-      {
-        "function": "powerline.segments.common.net.network_load"
-      },
-      {
-        "function": "powerline.segments.common.net.internal_ip"
-      },
-      {
-        "function": "powerline_gitstatus.gitstatus",
-        "args": { 
-          "formats": {
-            "branch": "\ue0a0 {}",
-            "tag": " ★ {} ",
-            "behind": " ↓ {}",
-            "ahead": " ↑ {}",
-            "staged": " ● {}",
-            "unmerged": " ✖ {} ",
-            "changed": " ✚ {} ",
-            "untracked": " … {}",
-            "stashed": " ⚑ {}"
-          }
-        }
-      }
-    ],
-    "left": []
-  }
-}