diff --git a/powerline b/powerline
deleted file mode 160000
index 2c20cc2..0000000
--- a/powerline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2c20cc20dd15b1a4d28163f89b9c115b129c5469
diff --git a/powerline.old/1 b/powerline.old/1
new file mode 100644
index 0000000..b695c2e
--- /dev/null
+++ b/powerline.old/1
@@ -0,0 +1,65 @@
+{
+	"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": "bg", "attrs": [] },
+		"background:divider":        { "fg": "fg", "bg": "cc", "attrs": [] },
+		"date":                      { "fg": "gray8", "bg": "gray2", "attrs": [] },
+		"time":                      { "fg": "gray10", "bg": "gray3", "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_tag":             { "fg": "solarized:base2", "bg": "solarized:base02", "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.old/colors.json b/powerline.old/colors.json
new file mode 100644
index 0000000..eb65be7
--- /dev/null
+++ b/powerline.old/colors.json
@@ -0,0 +1,24 @@
+{
+	"colors": {
+		"bg": [0, "262626"],
+		"fg": [255, "efefef"],
+		"accent": [255, "00e7e3"],
+		"#000000": [0, "000000"],
+		"ccc": [255, "cccccc"],
+		"affffe": [255, "affffe"],
+		"pink:1": [255, "ff5283"],
+		"lavender:1": [255, "ad55ff"],
+		"pink:2": [255, "ff55a2"],
+		"pink:3": [255, "ff83a8"],
+		"pink:4": [255, "ffc582"],
+		"modgray": [255, "333333"],
+		"purple:1": [255, "9318ff"],
+		"peach": [255, "ffa882"],
+		"blue:1": [255, "1289ff"],
+		"accent:light": [255, "8cfbff"],
+		"lightgreen": [255, "a1ffac"],
+		"lightpink": [255, "ffc4d6"],
+		"pink:5": [255, "ff4574"]
+	},
+	"gradients": {}
+}
diff --git a/powerline.old/colorschemes/shell/default.json b/powerline.old/colorschemes/shell/default.json
new file mode 100644
index 0000000..76d2073
--- /dev/null
+++ b/powerline.old/colorschemes/shell/default.json
@@ -0,0 +1,77 @@
+{
+	"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": "bg", "bg": "bg", "attrs": [] },
+		"background:divider":        { "fg": "ccc", "bg": "bg", "attrs": [] },
+		"date":                      { "fg": "lavender:1", "bg": "bg", "attrs": [] },
+		"time":                      { "fg": "pink:2", "bg": "bg", "attrs": [] },
+		"time:divider":              { "fg": "lavender:1", "bg": "bg", "attrs": [] },
+		"email_alert":               "warning:regular",
+		"email_alert_gradient":      { "fg": "white", "bg": "yellow_orange_red", "attrs": ["bold"] },
+		"hostname":                  { "fg": "fg", "bg": "purple:1", "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": "#000000", "bg": "pink:5", "attrs": [] },
+		"network_load":              { "fg": "peach", "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": "bg", "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":                       {"fg": "black", "bg": "blue:1", "attrs": []},
+		"cwd:current_folder":        {"fg": "black", "bg": "blue:1", "attrs": []},	
+		"cwd:divider":               { "fg": "bg", "bg": "blue:1", "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_tag":             { "fg": "solarized:base2", "bg": "solarized:base02", "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": [] },
+		"mode": {"fg": "ccc", "bg": "bg", "attrs": []},
+		"active_window_status": {"fg": "lightgreen",   "bg": "bg",    "attrs": ["bold"]},
+		"window_status":        {"fg": "ccc",     "bg": "bg",    "attrs": []},
+		"activity_status":      {"fg": "pink:1",     "bg": "bg",    "attrs": []},
+		"bell_status":          {"fg": "pink:1",        "bg": "bg",    "attrs": []},
+		"window":               {"fg": "pink:1",      "bg": "bg",    "attrs": []},
+		"window:divider":       {"fg": "lightpink",      "bg": "bg",    "attrs": []},
+		"window:current":       {"fg": "bg", "bg": "accent:light", "attrs": []},
+		"window_name":          {"fg": "bg",      "bg": "accent:light", "attrs": ["bold"]},
+		"session":              {"fg": "accent:light",      "bg": "bg",   "attrs": ["bold"]},
+		"session:prefix":       {"fg": "bg",     "bg": "accent", "attrs": ["bold"]}
+
+	}
+}
diff --git a/powerline.old/colorschemes/tmux/default.json b/powerline.old/colorschemes/tmux/default.json
new file mode 100644
index 0000000..3e2ae14
--- /dev/null
+++ b/powerline.old/colorschemes/tmux/default.json
@@ -0,0 +1,15 @@
+{
+	"name": "Default",
+	"groups": {
+		"active_window_status": {"fg": "accent",   "bg": "bg",    "attrs": ["bold"]},
+		"window_status":        {"fg": "ccc",     "bg": "bg",    "attrs": []},
+		"activity_status":      {"fg": "pinky",     "bg": "bg",    "attrs": []},
+		"bell_status":          {"fg": "pinky",        "bg": "bg",    "attrs": []},
+		"window":               {"fg": "pinky",      "bg": "bg",    "attrs": []},
+		"window:divider":       {"fg": "affffe",      "bg": "bg",    "attrs": []},
+		"window:current":       {"fg": "bg", "bg": "accent", "attrs": []},
+		"window_name":          {"fg": "bg",      "bg": "accent", "attrs": ["bold"]},
+		"session":              {"fg": "affffe",      "bg": "bg",   "attrs": ["bold"]},
+		"session:prefix":       {"fg": "bg",     "bg": "accent", "attrs": ["bold"]}
+	}
+}
diff --git a/powerline.old/config.json b/powerline.old/config.json
new file mode 100644
index 0000000..4a363ba
--- /dev/null
+++ b/powerline.old/config.json
@@ -0,0 +1,55 @@
+{
+	"common": {
+		"term_truecolor": true,
+		"additional_escapes": "tmux",
+		"paths": ["~/.dotfiles/powerline-bin/powerline/powerline", "~/.dotfiles/powerline-bin/powerline/powerline/segments"],
+		"default_top_theme": "powerline"
+	},
+	"ext": {
+		"ipython": {
+			"colorscheme": "default",
+			"theme": "in",
+			"local_themes": {
+				"rewrite": "rewrite",
+				"out": "out",
+				"in2": "in2"
+			}
+		},
+		"pdb": {
+			"colorscheme": "default",
+			"theme": "default"
+		},
+		"shell": {
+			"colorscheme": "default",
+			"theme": "default",
+			"local_themes": {
+				"continuation": "continuation",
+				"select": "select"
+			}
+		},
+		"tmux": {
+			"colorscheme": "../shell/default",
+			"theme": "tablet"
+		},
+		"vim": {
+			"colorscheme": "default",
+			"theme": "default",
+			"local_themes": {
+				"__tabline__": "tabline",
+
+				"cmdwin": "cmdwin",
+				"help": "help",
+				"quickfix": "quickfix",
+
+				"powerline.matchers.vim.plugin.nerdtree.nerdtree": "plugin_nerdtree",
+				"powerline.matchers.vim.plugin.commandt.commandt": "plugin_commandt",
+				"powerline.matchers.vim.plugin.gundo.gundo": "plugin_gundo",
+				"powerline.matchers.vim.plugin.gundo.gundo_preview": "plugin_gundo-preview"
+			}
+		},
+		"wm": {
+			"colorscheme": "default",
+			"theme": "default"
+		}
+	}
+}
diff --git a/powerline.old/themes/tmux/.tablet.json.swp b/powerline.old/themes/tmux/.tablet.json.swp
new file mode 100644
index 0000000..06e9e29
Binary files /dev/null and b/powerline.old/themes/tmux/.tablet.json.swp differ
diff --git a/powerline.old/themes/tmux/tablet.json b/powerline.old/themes/tmux/tablet.json
new file mode 100644
index 0000000..37e2f7a
--- /dev/null
+++ b/powerline.old/themes/tmux/tablet.json
@@ -0,0 +1,85 @@
+{
+	"name": "tablet",
+	"segments": {
+		"left": [
+			{
+				"name": "iip",
+				"function": "powerline.segments.common.net.internal_ip",
+				"args": {
+					"interface": "eth8"	
+				}
+			},
+			{
+				"name": "hostname",
+				"function": "powerline.segments.common.net.hostname"
+			},
+			{
+				"name": "cwd",
+				"function": "powerline.segments.shell.cwd",
+				"args": {
+					"dir_limit_depth": 1,
+					"shorten_home": true
+				}
+			}
+		],
+		"right": [
+			{
+				"name": "date-time",
+				"type": "segment_list",
+				"function": "powerline.segments.common.time.date",
+				"segments": [
+					{
+						"type": "segment_list",
+						"highlight_group": "cust:weekday",
+						"segments": [
+							{
+								"name": "wday",
+								"args": {
+									"format": "%a",
+									"istime": false
+								},
+								"function": "powerline.segments.common.time.date"
+							}	
+						]
+					}
+
+				]	
+			},
+			{
+				"name": "time",
+				"args": {
+					"format": "%I:%M:%S",
+					"istime": true
+				},
+				"function": "powerline.segments.common.time.date"
+			},
+			{
+				"name": "date",
+				"args": {
+					"format": "%Y-%m-%d",
+					"istime": false
+				},
+				"function": "powerline.segments.common.time.date"
+			}	
+		]
+	},
+	"segment_data": {
+		"uptime": {
+			"before": "⇑  "
+		},
+		"external_ip": {
+			"before": "ⓦ  "
+		},
+		"time": {
+			"before": " ",
+			"draw_soft_divider": true
+		},
+		"email_imap_alert": {
+			"before": "✉ ",
+			"args": {
+				"username": "",
+				"password": ""
+			}
+		}
+	}
+}