diff --git a/bumblebee/themes/default.json b/bumblebee/themes/default.json
index cb05338..2b607da 100644
--- a/bumblebee/themes/default.json
+++ b/bumblebee/themes/default.json
@@ -1,30 +1,93 @@
 {
 	"defaults": {
-		"urgent": true,
 		"prefix": " ",
 		"suffix" : " ",
-		"cycle": [
-			{
-				"fg": "red"
-			},
-			{
-				"fg": "lime"
-			}
-		]
+		"urgent": true
 	},
-	"battery": {
-		"prefix": "bat ",
+	"date": {
+		"prefix": " "
+	},
+	"time": {
+		"prefix": " "
+	},
+	"memory": {
+		"prefix": " ram "
+	},
+	"cpu": {
+		"prefix": " cpu "
+	},
+	"disk": {
+		"prefix": " hdd "
+	},
+	"dnf": {
+		"prefix": " dnf "
+	},
+	"pasink": {
 		"states": {
-			"charging": {
-				"suffix": "+ ",
-				"fg": "#00ff00"
+			"muted": {
+				"prefix": " audio(mute) "
 			},
-			"discharging": {
-				"suffix": "- ",
-				"fg": "#ff0000"
+			"unmuted": {
+				"prefix": " audio "
 			}
 		}
 	},
-	"time": {
+	"pasource": {
+		"states": {
+			"muted": {
+				"prefix": " mic(mute) "
+			},
+			"unmuted": {
+				"prefix": " mic "
+			}
+		}
+	},
+	"nic": {
+		"states": {
+			"wireless-up": {
+				"prefix": " wifi "
+			},
+			"wireless-down": {
+				"prefix": " wifi "
+			},
+			"wired-up": {
+				"prefix": " lan "
+			},
+			"wired-down": {
+				"prefix": " lan "
+			},
+			"tunnel-up": {
+				"prefix": " tun "
+			},
+			"tunnel-down": {
+				"prefix": " tun "
+			}
+		}
+	},
+	"battery": {
+		"states": {
+			"charged": {
+				"suffix": " full "
+			},
+			"charging": {
+				"suffix": " chr "
+			},
+			"discharging_critical": {
+				"prefix": " ! ",
+				"suffix": " dis "
+			},
+			"discharging_low": {
+				"suffix": " dis "
+			},
+			"discharging_medium": {
+				"suffix": " dis "
+			},
+			"discharging_high": {
+				"suffix": " dis "
+			},
+			"discharging_full": {
+				"suffix": " dis "
+			}
+		}
 	}
 }
diff --git a/bumblebee/themes/powerline.json b/bumblebee/themes/powerline.json
new file mode 100644
index 0000000..29190b3
--- /dev/null
+++ b/bumblebee/themes/powerline.json
@@ -0,0 +1,123 @@
+{
+	"defaults": {
+		"prefix": " ",
+		"suffix" : " ",
+		"cycle": [
+			{
+				"fg": "#ffd700",
+				"bg": "#d75f00"
+			},
+			{
+				"fg": "#ffffff",
+				"bg": "#0087af"
+			}
+		],
+		"fg-critical": "#ffffff",
+		"bg-critical": "#ff0000",
+		"fg-warning": "#d75f00",
+		"bg-warning": "#ffd700",
+
+		"default_separators": false,
+		"separator": ""
+	},
+	"date": {
+		"prefix": "  "
+	},
+	"time": {
+		"prefix": "  "
+	},
+	"memory": {
+		"prefix": "  "
+	},
+	"cpu": {
+		"prefix": "  "
+	},
+	"disk": {
+		"prefix": "  "
+	},
+	"dnf": {
+		"prefix": "  ",
+		"states": {
+			"good": {
+				"fg": "#494949",
+				"bg": "#41db00"
+			}
+		}
+	},
+	"pasink": {
+		"states": {
+			"muted": {
+				"prefix": "  "
+			},
+			"unmuted": {
+				"prefix": "  "
+			}
+		}
+	},
+	"pasource": {
+		"states": {
+			"muted": {
+				"prefix": "  "
+			},
+			"unmuted": {
+				"prefix": "  "
+			}
+		}
+	},
+	"nic": {
+		"states": {
+			"wireless-up": {
+				"prefix": "  "
+			},
+			"wireless-down": {
+				"prefix": "  "
+			},
+			"wired-up": {
+				"prefix": "  "
+			},
+			"wired-down": {
+				"prefix": "  "
+			},
+			"tunnel-up": {
+				"prefix": "  "
+			},
+			"tunnel-down": {
+				"prefix": "  "
+			}
+		}
+	},
+	"battery": {
+		"states": {
+			"charged": {
+				"prefix": "  ",
+				"suffix": "  ",
+				"fg": "#494949",
+				"bg": "#41db00"
+			},
+			"charging": {
+				"prefix": [ "  ", "  ", "  ", "  ", "  " ],
+				"suffix": "  "
+			},
+			"discharging_critical": {
+				"prefix": "  ",
+				"suffix": "  "
+			},
+			"discharging_low": {
+				"prefix": "  ",
+				"suffix": "  "
+			},
+			"discharging_medium": {
+				"prefix": "  ",
+				"suffix": "  "
+			},
+			"discharging_high": {
+				"prefix": "  ",
+				"suffix": "  "
+			},
+			"discharging_full": {
+				"prefix": "  ",
+				"suffix": "  "
+			}
+		}
+	}
+}
diff --git a/bumblebee/themes/solarized.json b/bumblebee/themes/solarized.json
new file mode 100644
index 0000000..6a6db43
--- /dev/null
+++ b/bumblebee/themes/solarized.json
@@ -0,0 +1,117 @@
+{
+	"defaults": {
+		"prefix": " ",
+		"suffix" : " ",
+		"cycle": [
+			{
+				"fg": "#93a1a1",
+				"bg": "#002b36"
+			},
+			{
+				"fg": "#eee8d5",
+				"bg": "#586e75"
+			}
+		],
+		"fg-critical": "#002b36",
+		"bg-critical": "#dc322f",
+		"fg-warning": "#002b36",
+		"bg-warning": "#b58900",
+
+		"default_separators": false,
+		"separator": "|"
+	},
+	"date": {
+		"prefix": " "
+	},
+	"time": {
+		"prefix": " "
+	},
+	"memory": {
+		"prefix": " ram "
+	},
+	"cpu": {
+		"prefix": " cpu "
+	},
+	"disk": {
+		"prefix": " hdd "
+	},
+	"dnf": {
+		"prefix": " dnf ",
+		"states": {
+			"good": {
+				"fg": "#002b36",
+				"bg": "#859900"
+			}
+		}
+	},
+	"pasink": {
+		"states": {
+			"muted": {
+				"prefix": " audio(mute) "
+			},
+			"unmuted": {
+				"prefix": " audio "
+			}
+		}
+	},
+	"pasource": {
+		"states": {
+			"muted": {
+				"prefix": " mic(mute) "
+			},
+			"unmuted": {
+				"prefix": " mic "
+			}
+		}
+	},
+	"nic": {
+		"states": {
+			"wireless-up": {
+				"prefix": " wifi "
+			},
+			"wireless-down": {
+				"prefix": " wifi "
+			},
+			"wired-up": {
+				"prefix": " lan "
+			},
+			"wired-down": {
+				"prefix": " lan "
+			},
+			"tunnel-up": {
+				"prefix": " tun "
+			},
+			"tunnel-down": {
+				"prefix": " tun "
+			}
+		}
+	},
+	"battery": {
+		"states": {
+			"charged": {
+				"suffix": " full ",
+				"fg": "#002b36",
+				"bg": "#859900"
+			},
+			"charging": {
+				"suffix": " chr "
+			},
+			"discharging_critical": {
+				"prefix": " ! ",
+				"suffix": " dis "
+			},
+			"discharging_low": {
+				"suffix": " dis "
+			},
+			"discharging_medium": {
+				"suffix": " dis "
+			},
+			"discharging_high": {
+				"suffix": " dis "
+			},
+			"discharging_full": {
+				"suffix": " dis "
+			}
+		}
+	}
+}
diff --git a/screenshots/default.png b/screenshots/default.png
new file mode 100644
index 0000000..38e5cf8
Binary files /dev/null and b/screenshots/default.png differ
diff --git a/screenshots/powerline-solarized.png b/screenshots/powerline-solarized.png
new file mode 100644
index 0000000..23af653
Binary files /dev/null and b/screenshots/powerline-solarized.png differ
diff --git a/screenshots/powerline.png b/screenshots/powerline.png
new file mode 100644
index 0000000..97cef5f
Binary files /dev/null and b/screenshots/powerline.png differ
diff --git a/screenshots/solarized.png b/screenshots/solarized.png
new file mode 100644
index 0000000..93e01f2
Binary files /dev/null and b/screenshots/solarized.png differ