diff --git a/hm/desktop/frobar/frobar/__init__.py b/hm/desktop/frobar/frobar/__init__.py
index a54813e..e5bff24 100644
--- a/hm/desktop/frobar/frobar/__init__.py
+++ b/hm/desktop/frobar/frobar/__init__.py
@@ -8,9 +8,9 @@ def run():
     Bar.init()
     Updater.init()
 
-    WORKSPACE_THEME = 0
-    FOCUS_THEME = 3
-    URGENT_THEME = 1
+    WORKSPACE_THEME = 8
+    FOCUS_THEME = 2
+    URGENT_THEME = 0
     CUSTOM_SUFFIXES = "▲■"
 
     customNames = dict()
@@ -35,17 +35,17 @@ def run():
 
     # TODO Computer modes
 
-    SYSTEM_THEME = 2
-    DANGER_THEME = FOCUS_THEME
-    CRITICAL_THEME = URGENT_THEME
+    SYSTEM_THEME = 3
+    DANGER_THEME = 1
+    CRITICAL_THEME = 0
     Bar.addSectionAll(CpuProvider(), BarGroupType.RIGHT)
     Bar.addSectionAll(RamProvider(), BarGroupType.RIGHT)
     Bar.addSectionAll(TemperatureProvider(), BarGroupType.RIGHT)
     Bar.addSectionAll(BatteryProvider(), BarGroupType.RIGHT)
 
     # Peripherals
-    PERIPHERAL_THEME = 5
-    NETWORK_THEME = 4
+    PERIPHERAL_THEME = 6
+    NETWORK_THEME = 5
     # TODO Disk space provider
     # TODO Screen (connected, autorandr configuration, bbswitch) provider
     Bar.addSectionAll(PulseaudioProvider(theme=PERIPHERAL_THEME), BarGroupType.RIGHT)
@@ -53,12 +53,12 @@ def run():
     Bar.addSectionAll(NetworkProvider(theme=NETWORK_THEME), BarGroupType.RIGHT)
 
     # Personal
-    PERSONAL_THEME = 0
+    PERSONAL_THEME = 7
     # Bar.addSectionAll(KeystoreProvider(theme=PERSONAL_THEME), BarGroupType.RIGHT)
     # Bar.addSectionAll(NotmuchUnreadProvider(dir='~/.mail/', theme=PERSONAL_THEME), BarGroupType.RIGHT)
     # Bar.addSectionAll(TodoProvider(dir='~/.vdirsyncer/currentCalendars/', theme=PERSONAL_THEME), BarGroupType.RIGHT)
 
-    TIME_THEME = 6
+    TIME_THEME = 4
     Bar.addSectionAll(TimeProvider(theme=TIME_THEME), BarGroupType.RIGHT)
 
     # Bar.run()
diff --git a/hm/desktop/frobar/frobar/display.py b/hm/desktop/frobar/frobar/display.py
index d6113c3..4bc14a3 100644
--- a/hm/desktop/frobar/frobar/display.py
+++ b/hm/desktop/frobar/frobar/display.py
@@ -313,29 +313,26 @@ class SectionThread(threading.Thread):
 
 class Section:
     # TODO Update all of that to base16
-    # COLORS = ['#272822', '#383830', '#49483e', '#75715e', '#a59f85', '#f8f8f2',
-    #           '#f5f4f1', '#f9f8f5', '#f92672', '#fd971f', '#f4bf75', '#a6e22e',
-    #           '#a1efe4', '#66d9ef', '#ae81ff', '#cc6633']
     COLORS = [
-        "#181818",
-        "#AB4642",
-        "#A1B56C",
-        "#F7CA88",
-        "#7CAFC2",
-        "#BA8BAF",
-        "#86C1B9",
-        "#D8D8D8",
-        "#585858",
-        "#AB4642",
-        "#A1B56C",
-        "#F7CA88",
-        "#7CAFC2",
-        "#BA8BAF",
-        "#86C1B9",
-        "#F8F8F8",
+        "#092c0e",
+        "#143718",
+        "#5a7058",
+        "#677d64",
+        "#89947f",
+        "#99a08d",
+        "#fae2e3",
+        "#fff0f1",
+        "#e0332e",
+        "#cf4b15",
+        "#bb8801",
+        "#8d9800",
+        "#1fa198",
+        "#008dd1",
+        "#5c73c4",
+        "#d43982",
     ]
-    FGCOLOR = "#F8F8F2"
-    BGCOLOR = "#272822"
+    FGCOLOR = "#fff0f1"
+    BGCOLOR = "#092c0e"
 
     THEMES = list()
     EMPTY = (FGCOLOR, BGCOLOR)
@@ -353,6 +350,7 @@ class Section:
     def init():
         for t in range(8, 16):
             Section.THEMES.append((Section.COLORS[0], Section.COLORS[t]))
+        Section.THEMES.append((Section.COLORS[0], Section.COLORS[3]))
 
         Section.updateThread.start()
 
diff --git a/hm/desktop/frobar/frobar/providers.py b/hm/desktop/frobar/frobar/providers.py
index 219fd20..87d5f57 100644
--- a/hm/desktop/frobar/frobar/providers.py
+++ b/hm/desktop/frobar/frobar/providers.py
@@ -66,7 +66,7 @@ class AlertLevel(enum.Enum):
 
 class AlertingSection(StatefulSection):
     # TODO EASE Correct settings for themes
-    THEMES = {AlertLevel.NORMAL: 2, AlertLevel.WARNING: 3, AlertLevel.DANGER: 1}
+    THEMES = {AlertLevel.NORMAL: 3, AlertLevel.WARNING: 1, AlertLevel.DANGER: 0}
     PERSISTENT = True
 
     def getLevel(self, quantity):