diff --git a/powerline/config_files/themes/ascii.json b/powerline/config_files/themes/ascii.json
index fa1927ba..7875f219 100644
--- a/powerline/config_files/themes/ascii.json
+++ b/powerline/config_files/themes/ascii.json
@@ -25,6 +25,10 @@
 			"contents": "LN "
 		},
 
+		"time": {
+			"before": ""
+		},
+
 		"powerline.segments.common.network_load": {
 			"args": {
 				"recv_format": "DL {value:>8}",
@@ -50,9 +54,6 @@
 		"powerline.segments.common.uptime": {
 			"before": "UP  "
 		},
-		"powerline.segments.common.date": {
-			"before": ""
-		},
 		"powerline.segments.common.email_imap_alert": {
 			"before": "MAIL "
 		},
diff --git a/powerline/config_files/themes/powerline.json b/powerline/config_files/themes/powerline.json
index 7f83ec3b..859d8341 100644
--- a/powerline/config_files/themes/powerline.json
+++ b/powerline/config_files/themes/powerline.json
@@ -24,6 +24,10 @@
 			"contents": " "
 		},
 
+		"time": {
+			"before": "⌚ "
+		},
+
 		"powerline.segments.common.network_load": {
 			"args": {
 				"recv_format": "⬇ {value:>8}",
@@ -49,9 +53,6 @@
 		"powerline.segments.common.uptime": {
 			"before": "⇑  "
 		},
-		"powerline.segments.common.date": {
-			"before": "⌚ "
-		},
 		"powerline.segments.common.email_imap_alert": {
 			"before": "✉ "
 		},
diff --git a/powerline/config_files/themes/tmux/default.json b/powerline/config_files/themes/tmux/default.json
index 336093b1..780f34f2 100644
--- a/powerline/config_files/themes/tmux/default.json
+++ b/powerline/config_files/themes/tmux/default.json
@@ -11,11 +11,11 @@
 				"priority": 50
 			},
 			{
-				"function": "date",
-				"before": ""
+				"function": "date"
 			},
 			{
 				"function": "date",
+				"name": "time",
 				"args": {
 					"format": "%H:%M",
 					"istime": true
diff --git a/powerline/config_files/themes/unicode.json b/powerline/config_files/themes/unicode.json
index 78f84e0b..a3b5a365 100644
--- a/powerline/config_files/themes/unicode.json
+++ b/powerline/config_files/themes/unicode.json
@@ -24,6 +24,10 @@
 			"contents": "␤ "
 		},
 
+		"time": {
+			"before": "⌚ "
+		},
+
 		"powerline.segments.common.network_load": {
 			"args": {
 				"recv_format": "⬇ {value:>8}",
@@ -49,9 +53,6 @@
 		"powerline.segments.common.uptime": {
 			"before": "⇑  "
 		},
-		"powerline.segments.common.date": {
-			"before": "⌚ "
-		},
 		"powerline.segments.common.email_imap_alert": {
 			"before": "✉ "
 		},
diff --git a/powerline/config_files/themes/unicode_terminus.json b/powerline/config_files/themes/unicode_terminus.json
index e1077d2e..e435ea93 100644
--- a/powerline/config_files/themes/unicode_terminus.json
+++ b/powerline/config_files/themes/unicode_terminus.json
@@ -24,6 +24,10 @@
 			"contents": "␤ "
 		},
 
+		"time": {
+			"before": ""
+		},
+
 		"powerline.segments.common.network_load": {
 			"args": {
 				"recv_format": "⇓ {value:>8}",
@@ -49,9 +53,6 @@
 		"powerline.segments.common.uptime": {
 			"before": "↑  "
 		},
-		"powerline.segments.common.date": {
-			"before": ""
-		},
 		"powerline.segments.common.email_imap_alert": {
 			"before": "MAIL "
 		},
diff --git a/powerline/config_files/themes/unicode_terminus_condensed.json b/powerline/config_files/themes/unicode_terminus_condensed.json
index 4b32d0ca..c4266ee6 100644
--- a/powerline/config_files/themes/unicode_terminus_condensed.json
+++ b/powerline/config_files/themes/unicode_terminus_condensed.json
@@ -25,6 +25,10 @@
 			"contents": "␤"
 		},
 
+		"time": {
+			"before": ""
+		},
+
 		"powerline.segments.common.network_load": {
 			"args": {
 				"recv_format": "⇓{value:>8}",
@@ -50,9 +54,6 @@
 		"powerline.segments.common.uptime": {
 			"before": "↑"
 		},
-		"powerline.segments.common.date": {
-			"before": ""
-		},
 		"powerline.segments.common.email_imap_alert": {
 			"before": "M "
 		},
diff --git a/powerline/config_files/themes/wm/default.json b/powerline/config_files/themes/wm/default.json
index 0d3cb4e3..009c4924 100644
--- a/powerline/config_files/themes/wm/default.json
+++ b/powerline/config_files/themes/wm/default.json
@@ -7,11 +7,11 @@
 				"priority": 50
 			},
 			{
-				"function": "date",
-				"before": ""
+				"function": "date"
 			},
 			{
 				"function": "date",
+				"name": "time",
 				"args": {
 					"format": "%H:%M",
 					"istime": true