diff --git a/.gitignore b/.gitignore
index 8f6b246..c002c05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@ procmailrc
 gitconfig
 ctags
 i3/config
+i3status.conf
 mbsyncrc
 authinfo
diff --git a/Makefile b/Makefile
index dad6577..64f027b 100644
--- a/Makefile
+++ b/Makefile
@@ -53,5 +53,5 @@ clean:
 ctags: ctags.in
 	grep '^-' $< >$@
 
-%: %.m4
+%: %.m4 base16.m4
 	m4 $< >$@
diff --git a/base16.m4 b/base16.m4
new file mode 100644
index 0000000..9abe78a
--- /dev/null
+++ b/base16.m4
@@ -0,0 +1,17 @@
+dnl base16 default
+defcolor(base00,181818)
+defcolor(base01,282828)
+defcolor(base02,383838)
+defcolor(base03,585858)
+defcolor(base04,b8b8b8)
+defcolor(base05,d8d8d8)
+defcolor(base06,e8e8e8)
+defcolor(base07,f8f8f8)
+defcolor(base08,ab4642)
+defcolor(base09,dc9656)
+defcolor(base0A,f7ca88)
+defcolor(base0B,a1b56c)
+defcolor(base0C,86c1b9)
+defcolor(base0D,7cafc2)
+defcolor(base0E,ba8baf)
+defcolor(base0F,a16946)
diff --git a/i3/config.m4 b/i3/config.m4
index c468f9b..17c5d02 100644
--- a/i3/config.m4
+++ b/i3/config.m4
@@ -1,6 +1,6 @@
 # vim:ft=conf:
 
-changequote(`[', `]')
+changequote([,])
 define([hostname], esyscmd([echo -n `hostname`]))
 
 define([forloop], [pushdef([$1], [$2])_forloop($@)popdef([$1])])
@@ -94,13 +94,32 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
+define([defcolor], [define($1, ["[#]$2"])])
+include([base16.m4])
+
+client.focused base0D base0D base00 base01
+client.focused_inactive base02 base02 base03 base01
+client.unfocused base01 base01 base03 base01
+client.urgent base02 base08 base07 base08
+
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-        status_command i3status
-        font pango:monospace 9
+    status_command i3status
+    font pango:monospace 9
+
+    colors {
+        separator base03
+        background base01
+        statusline base05
+        focused_workspace base0C base0D base00
+        active_workspace base02 base02 base07
+        inactive_workspace base01 base01 base03
+        urgent_workspace base08 base08 base07
+    }
 }
 
+
 exec --no-startup-id nm-applet
 exec --no-startup-id pa-applet
 
diff --git a/i3status.conf b/i3status.conf.m4
similarity index 84%
rename from i3status.conf
rename to i3status.conf.m4
index 7f70377..231dbfd 100644
--- a/i3status.conf
+++ b/i3status.conf.m4
@@ -6,9 +6,15 @@
 # ß
 # If the above line is not correctly displayed, fix your editor first!
 
+changequote([,])
+define([defcolor], [define($1, ["[#]$2"])])
+include([base16.m4])
+
 general {
-        colors = true
-        interval = 5
+    colors = true
+    interval = 5
+    color_good = base0B
+    color_bad = base08
 }
 
 order += "ipv6"