diff --git a/bumblebee/theme.py b/bumblebee/theme.py
new file mode 100644
index 0000000..e83ea10
--- /dev/null
+++ b/bumblebee/theme.py
@@ -0,0 +1,6 @@
+"""Theme support"""
+
+class Theme(object):
+    pass
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/testjson.sh b/testjson.sh
new file mode 100755
index 0000000..ce473ea
--- /dev/null
+++ b/testjson.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+find themes/ -name "*.json"|xargs cat|json_verify -s
diff --git a/tests/test_engine.py b/tests/test_engine.py
index 03f8334..113e7ce 100644
--- a/tests/test_engine.py
+++ b/tests/test_engine.py
@@ -1,4 +1,4 @@
-# pylint: disable=C0103,C0111
+# pylint: disable=C0103,C0111,W0703
 
 import unittest
 
diff --git a/tests/test_theme.py b/tests/test_theme.py
new file mode 100644
index 0000000..65014f9
--- /dev/null
+++ b/tests/test_theme.py
@@ -0,0 +1,3 @@
+# pylint: disable=C0103,C0111
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tests/util.py b/tests/util.py
index 542b220..00001d5 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -1,4 +1,4 @@
-# pylint: disable=C0103,C0111
+# pylint: disable=C0103,C0111,W0613
 
 from bumblebee.output import Widget
 
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
new file mode 100644
index 0000000..34abf24
--- /dev/null
+++ b/themes/icons/awesome-fonts.json
@@ -0,0 +1,54 @@
+{
+	"defaults": { "separator": "" },
+	"date": { "prefix": ""	},
+	"time": { "prefix": "" },
+	"memory": { "prefix": "" },
+	"cpu": { "prefix": "" },
+	"disk": { "prefix": "" },
+	"dnf": { "prefix": "" },
+	"brightness": { "prefix": "" },
+	"cmus": {
+		"playing": { "prefix": "" },
+		"paused": { "prefix": "" },
+		"stopped": { "prefix": "" },
+		"prev": { "prefix": "" },
+		"next": { "prefix": "" },
+		"shuffle": { "on": { "prefix": "" }, "off": { "prefix": "" } },
+		"repeat": { "on": { "prefix": "" }, "off": { "prefix": "" } }
+	},
+	"pasink": {
+		"muted": { "prefix": "" },
+		"unmuted": { "prefix": "" }
+	},
+	"pasource": {
+		"muted": { "prefix": "" },
+		"unmuted": { "prefix": "" }
+	},
+	"nic": {
+		"wireless-up": { "prefix": "" },
+		"wireless-down": { "prefix": "" },
+		"wired-up": { "prefix": "" },
+		"wired-down": { "prefix": "" },
+		"tunnel-up": { "prefix": "" },
+		"tunnel-down": { "prefix": "" }
+	},
+	"battery": {
+		"charged": { "prefix": "", "suffix": "" },
+		"AC": { "suffix": "" },
+		"charging": {
+			"prefix": [ "", "", "", "", "" ],
+			"suffix": ""
+		},
+		"discharging-10": { "prefix": "", "suffix": "" },
+		"discharging-25": { "prefix": "", "suffix": "" },
+		"discharging-50": { "prefix": "", "suffix": "" },
+		"discharging-80": { "prefix": "", "suffix": "" },
+		"discharging-100": { "prefix": "", "suffix": "" }
+	},
+	"caffeine": {
+		"activated": {"prefix": " " }, "deactivated": { "prefix": " " }
+	},
+	"xrandr": {
+		"on": { "prefix": " "}, "off": { "prefix": " "}
+	}
+}
diff --git a/themes/solarized-powerline.json b/themes/solarized-powerline.json
new file mode 100644
index 0000000..1326777
--- /dev/null
+++ b/themes/solarized-powerline.json
@@ -0,0 +1,35 @@
+{
+	"icons": [ "awesome-fonts" ],
+	"defaults": {
+		"default-separators": false,
+		"separator-block-width": 0,
+		"cycle": [
+			{ "fg": "#93a1a1", "bg": "#002b36" },
+			{ "fg": "#eee8d5", "bg": "#586e75" }
+		],
+		"warning": {
+			"fg": "#002b36",
+			"bg": "#b58900"
+		},
+		"critical": {
+			"fg": "#002b36",
+			"bg": "#dc322f"
+		}
+	},
+	"dnf": {
+		"good": {
+			"fg": "#002b36",
+			"bg": "#859900"
+		}
+	},
+	"battery": {
+		"charged": {
+			"fg": "#002b36",
+			"bg": "#859900"
+		},
+		"AC": {
+			"fg": "#002b36",
+			"bg": "#859900"
+		}
+	}
+}