diff --git a/bumblebee/modules/twmn.py b/bumblebee/modules/twmn.py
new file mode 100644
index 0000000..1ebb61c
--- /dev/null
+++ b/bumblebee/modules/twmn.py
@@ -0,0 +1,39 @@
+#pylint: disable=C0111,R0903
+
+"""Toggle twmn notifications."""
+
+import bumblebee.input
+import bumblebee.output
+import bumblebee.engine
+
+
+class Module(bumblebee.engine.Module):
+    def __init__(self, engine, config):
+        super(Module, self).__init__(engine, config,
+                bumblebee.output.Widget(full_text="")
+        )
+        self._paused = False
+        # Make sure that twmn is currently not paused
+        try:
+            bumblebee.util.execute("killall -SIGUSR2 twmnd")
+        except:
+            pass
+        engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE,
+                cmd=self.toggle_status
+        )
+
+    def toggle_status(self, event):
+        self._paused = not self._paused
+
+        try:
+            if self._paused:
+                bumblebee.util.execute("systemctl --user start twmnd")
+            else:
+                bumblebee.util.execute("systemctl --user stop twmnd")
+        except:
+            self._paused = not self._paused # toggling failed
+
+    def state(self, widget):
+        if self._paused:
+            return ["muted"]
+        return ["unmuted"]
diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json
index 9f345b5..b950bbf 100644
--- a/themes/icons/ascii.json
+++ b/themes/icons/ascii.json
@@ -1,137 +1,303 @@
 {
-	"defaults": {
-		"padding": " "
-	},
-	"memory": { "prefix": "ram" },
-	"cpu": { "prefix": "cpu" },
-	"disk": { "prefix": "hdd" },
-	"dnf": { "prefix": "dnf" },
-	"apt": { "prefix": "apt" },
-	"brightness": { "prefix": "o" },
-	"cmus": {
-		"playing": { "prefix": ">" },
-		"paused": { "prefix": "||" },
-		"stopped": { "prefix": "[]" },
-		"prev": { "prefix": "|<" },
-		"next": { "prefix": ">|" },
-		"shuffle-on": { "prefix": "S" },
-		"shuffle-off": { "prefix": "[s]" },
-		"repeat-on": { "prefix": "R" },
-		"repeat-off": { "prefix": "[r]" }
-	},
-	"pasink": {
-		"muted": { "prefix": "audio(mute)" },
-		"unmuted": { "prefix": "audio" }
-	},
-	"amixer": {
-		"muted": { "prefix": "audio(mute)" },
-		"unmuted": { "prefix": "audio" }
-	},
-	"pasource": {
-		"muted": { "prefix": "mic(mute)" },
-		"unmuted": { "prefix": "mic" }
-	},
-	"nic": {
-		"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": {
-		"charged": { "suffix": "full" },
-		"charging": { "suffix": "chr" },
-		"AC": { "suffix": "ac" },
-		"discharging-10": {
-			"prefix": "!",
-			"suffix": "dis"
-		},
-		"discharging-25": { "suffix": "dis" },
-		"discharging-50": { "suffix": "dis" },
-		"discharging-80": { "suffix": "dis" },
-		"discharging-100": { "suffix": "dis" },
-		"unknown-25": { "suffix": "?" },
-		"unknown-50": { "suffix": "?" },
-		"unknown-80": { "suffix": "?" },
-		"unknown-100": { "suffix": "?" }
-	},
-	"battery_all": {
-		"charged": { "suffix": "full" },
-		"charging": { "suffix": "chr" },
-		"AC": { "suffix": "ac" },
-		"discharging-10": {
-			"prefix": "!",
-			"suffix": "dis"
-		},
-		"discharging-25": { "suffix": "dis" },
-		"discharging-50": { "suffix": "dis" },
-		"discharging-80": { "suffix": "dis" },
-		"discharging-100": { "suffix": "dis" },
-		"unknown-25": { "suffix": "?" },
-		"unknown-50": { "suffix": "?" },
-		"unknown-80": { "suffix": "?" },
-		"unknown-100": { "suffix": "?" }
-	},
-	"caffeine": {
-		"activated": {"prefix": "caf-on" }, "deactivated": { "prefix": "caf-off " }
-	},
-	"xrandr": {
-		"on": { "prefix": " off "}, "off": { "prefix": " on "}, "refresh": { "prefix": " refresh "}
-	},
-	"redshift": {
-		"day": { "prefix": "day" }, "night": { "prefix": "night" }, "transition": { "prefix": "trans" }
-	},
-	"docker_ps": {
-		"prefix": "containers"
-	},
-	"sensors": {
-		"prefix": "sensors"
-	},
-	"traffic": {
-		"rx": { "prefix": "down"},
-		"tx": { "prefix": "up"}
-	},
-	"network_traffic": {
-		"rx": { "prefix": "down" },
-		"tx": { "prefix": "up" }
-	},
-    "mpd": {
-		"playing": { "prefix": ">" },
-		"paused": { "prefix": "||" },
-		"stopped": { "prefix": "[]" },
-		"prev": { "prefix": "|<" },
-		"next": { "prefix": ">|" },
-		"shuffle-on": { "prefix": "S" },
-		"shuffle-off": { "prefix": "[s]" },
-		"repeat-on": { "prefix": "R" },
-		"repeat-off": { "prefix": "[r]" }
-	},
-	"github": {
-		"prefix": "github"
-	},
-	"spotify": {
-		"prefix": ""
-	},
-	"uptime": {
-        "prefix": "uptime"
-	},
-	"zpool": {
-		"poolread": {"prefix": "pool read "},
-		"poolwrite": {"prefix": "pool write "},
-		"ONLINE": {"prefix": "pool"},
-		"FAULTED": {"prefix": "pool (!)"},
-		"DEGRADED": {"prefix": "pool (!)"}
-	},
-	"git": {
-		"main": { "prefix": "" },
-		"new": { "prefix": "[n]" },
-		"modified": { "prefix": "[m]" },
-		"deleted": { "prefix": "[d]" }
-	},
-    "dunst": {
-        "muted": { "prefix": "dunst(muted)"},
-        "unmuted": { "prefix": "dunst" }
+  "defaults": {
+    "padding": " "
+  },
+  "memory": {
+    "prefix": "ram"
+  },
+  "cpu": {
+    "prefix": "cpu"
+  },
+  "disk": {
+    "prefix": "hdd"
+  },
+  "dnf": {
+    "prefix": "dnf"
+  },
+  "apt": {
+    "prefix": "apt"
+  },
+  "brightness": {
+    "prefix": "o"
+  },
+  "cmus": {
+    "playing": {
+      "prefix": ">"
+    },
+    "paused": {
+      "prefix": "||"
+    },
+    "stopped": {
+      "prefix": "[]"
+    },
+    "prev": {
+      "prefix": "|<"
+    },
+    "next": {
+      "prefix": ">|"
+    },
+    "shuffle-on": {
+      "prefix": "S"
+    },
+    "shuffle-off": {
+      "prefix": "[s]"
+    },
+    "repeat-on": {
+      "prefix": "R"
+    },
+    "repeat-off": {
+      "prefix": "[r]"
     }
-
+  },
+  "pasink": {
+    "muted": {
+      "prefix": "audio(mute)"
+    },
+    "unmuted": {
+      "prefix": "audio"
+    }
+  },
+  "amixer": {
+    "muted": {
+      "prefix": "audio(mute)"
+    },
+    "unmuted": {
+      "prefix": "audio"
+    }
+  },
+  "pasource": {
+    "muted": {
+      "prefix": "mic(mute)"
+    },
+    "unmuted": {
+      "prefix": "mic"
+    }
+  },
+  "nic": {
+    "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": {
+    "charged": {
+      "suffix": "full"
+    },
+    "charging": {
+      "suffix": "chr"
+    },
+    "AC": {
+      "suffix": "ac"
+    },
+    "discharging-10": {
+      "prefix": "!",
+      "suffix": "dis"
+    },
+    "discharging-25": {
+      "suffix": "dis"
+    },
+    "discharging-50": {
+      "suffix": "dis"
+    },
+    "discharging-80": {
+      "suffix": "dis"
+    },
+    "discharging-100": {
+      "suffix": "dis"
+    },
+    "unknown-25": {
+      "suffix": "?"
+    },
+    "unknown-50": {
+      "suffix": "?"
+    },
+    "unknown-80": {
+      "suffix": "?"
+    },
+    "unknown-100": {
+      "suffix": "?"
+    }
+  },
+  "battery_all": {
+    "charged": {
+      "suffix": "full"
+    },
+    "charging": {
+      "suffix": "chr"
+    },
+    "AC": {
+      "suffix": "ac"
+    },
+    "discharging-10": {
+      "prefix": "!",
+      "suffix": "dis"
+    },
+    "discharging-25": {
+      "suffix": "dis"
+    },
+    "discharging-50": {
+      "suffix": "dis"
+    },
+    "discharging-80": {
+      "suffix": "dis"
+    },
+    "discharging-100": {
+      "suffix": "dis"
+    },
+    "unknown-25": {
+      "suffix": "?"
+    },
+    "unknown-50": {
+      "suffix": "?"
+    },
+    "unknown-80": {
+      "suffix": "?"
+    },
+    "unknown-100": {
+      "suffix": "?"
+    }
+  },
+  "caffeine": {
+    "activated": {
+      "prefix": "caf-on"
+    },
+    "deactivated": {
+      "prefix": "caf-off "
+    }
+  },
+  "xrandr": {
+    "on": {
+      "prefix": " off "
+    },
+    "off": {
+      "prefix": " on "
+    },
+    "refresh": {
+      "prefix": " refresh "
+    }
+  },
+  "redshift": {
+    "day": {
+      "prefix": "day"
+    },
+    "night": {
+      "prefix": "night"
+    },
+    "transition": {
+      "prefix": "trans"
+    }
+  },
+  "docker_ps": {
+    "prefix": "containers"
+  },
+  "sensors": {
+    "prefix": "sensors"
+  },
+  "traffic": {
+    "rx": {
+      "prefix": "down"
+    },
+    "tx": {
+      "prefix": "up"
+    }
+  },
+  "mpd": {
+    "playing": {
+      "prefix": ">"
+    },
+    "paused": {
+      "prefix": "||"
+    },
+    "stopped": {
+      "prefix": "[]"
+    },
+    "prev": {
+      "prefix": "|<"
+    },
+    "next": {
+      "prefix": ">|"
+    },
+    "shuffle-on": {
+      "prefix": "S"
+    },
+    "shuffle-off": {
+      "prefix": "[s]"
+    },
+    "repeat-on": {
+      "prefix": "R"
+    },
+    "repeat-off": {
+      "prefix": "[r]"
+    }
+  },
+  "github": {
+    "prefix": "github"
+  },
+  "spotify": {
+    "prefix": ""
+  },
+  "uptime": {
+    "prefix": "uptime"
+  },
+  "zpool": {
+    "poolread": {
+      "prefix": "pool read "
+    },
+    "poolwrite": {
+      "prefix": "pool write "
+    },
+    "ONLINE": {
+      "prefix": "pool"
+    },
+    "FAULTED": {
+      "prefix": "pool (!)"
+    },
+    "DEGRADED": {
+      "prefix": "pool (!)"
+    }
+  },
+  "git": {
+    "main": {
+      "prefix": ""
+    },
+    "new": {
+      "prefix": "[n]"
+    },
+    "modified": {
+      "prefix": "[m]"
+    },
+    "deleted": {
+      "prefix": "[d]"
+    }
+  },
+  "dunst": {
+    "muted": {
+      "prefix": "dunst(muted)"
+    },
+    "unmuted": {
+      "prefix": "dunst"
+    }
+  },
+  "twmn": {
+    "muted": {
+      "prefix": "twmn"
+    },
+    "unmuted": {
+      "prefix": "twmn(muted)"
+    }
+  }
 }
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 933c0fa..44efa50 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -1,210 +1,217 @@
 {
-	"defaults": {
-		"separator": "", "padding": " ",
-		"unknown": { "prefix": "" }
-	},
-	"date": { "prefix": ""	},
-	"time": { "prefix": "" },
-	"datetime": { "prefix": "" },
-	"datetz": { "prefix": ""	},
-	"timetz": { "prefix": "" },
-	"datetimetz": { "prefix": "" },
-	"memory": { "prefix": "" },
-	"cpu": { "prefix": "" },
-	"disk": { "prefix": "" },
-	"dnf": { "prefix": "" },
-	"apt": { "prefix": "" },
-	"pacman": { "prefix": "" },
-	"brightness": { "prefix": "" },
-	"load": { "prefix": "" },
-	"layout": { "prefix": "" },
-	"layout-xkb": { "prefix": "" },
-	"notmuch_count": { "empty": {"prefix": "\uf0e0" },
-	"items": {"prefix": "\uf0e0" }
-	},
-	"todo": { "empty": {"prefix": "" },
-	"items": {"prefix": "" },
-	"uptime": {"prefix": "" }
-	},
-	"zpool": {
-		"poolread": {"prefix": "→ "},
-		"poolwrite": {"prefix": "← "},
-		"ONLINE": {"prefix": ""},
-		"FAULTED": {"prefix": "!"},
-		"DEGRADED": {"prefix": "!"}
-	},
-	"cmus": {
-		"playing": { "prefix": "" },
-		"paused": { "prefix": "" },
-		"stopped": { "prefix": "" },
-		"prev": { "prefix": "" },
-		"next": { "prefix": "" },
-		"shuffle-on": { "prefix": "" },
-		"shuffle-off": { "prefix": "" },
-		"repeat-on": { "prefix": "" },
-		"repeat-off": { "prefix": "" }
-	},
-	"gpmdp": {
-		"playing": { "prefix": "" },
-		"paused": { "prefix": "" },
-		"stopped": { "prefix": "" },
-		"prev": { "prefix": "" },
-		"next": { "prefix": "" }
-	},
-	"pasink": {
-		"muted": { "prefix": "" },
-		"unmuted": { "prefix": "" }
-	},
-	"amixer": {
-		"muted": { "prefix": "" },
-		"unmuted": { "prefix": "" }
-	},
-	"pasource": {
-		"muted": { "prefix": "" },
-		"unmuted": { "prefix": "" }
-	},
-   "kernel": {
-       "prefix": "\uf17c"
+  "defaults": {
+    "separator": "",
+    "padding": " ",
+    "unknown": { "prefix": "" }
+  },
+  "date": { "prefix": "" },
+  "time": { "prefix": "" },
+  "datetime": { "prefix": "" },
+  "datetz": { "prefix": "" },
+  "timetz": { "prefix": "" },
+  "datetimetz": { "prefix": "" },
+  "memory": { "prefix": "" },
+  "cpu": { "prefix": "" },
+  "disk": { "prefix": "" },
+  "dnf": { "prefix": "" },
+  "apt": { "prefix": "" },
+  "pacman": { "prefix": "" },
+  "brightness": { "prefix": "" },
+  "load": { "prefix": "" },
+  "layout": { "prefix": "" },
+  "layout-xkb": { "prefix": "" },
+  "notmuch_count": {
+    "empty": { "prefix": "\uf0e0" },
+    "items": { "prefix": "\uf0e0" }
+  },
+  "todo": {
+    "empty": { "prefix": "" },
+    "items": { "prefix": "" },
+    "uptime": { "prefix": "" }
+  },
+  "zpool": {
+    "poolread": { "prefix": "→ " },
+    "poolwrite": { "prefix": "← " },
+    "ONLINE": { "prefix": "" },
+    "FAULTED": { "prefix": "!" },
+    "DEGRADED": { "prefix": "!" }
+  },
+  "cmus": {
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
+    "stopped": { "prefix": "" },
+    "prev": { "prefix": "" },
+    "next": { "prefix": "" },
+    "shuffle-on": { "prefix": "" },
+    "shuffle-off": { "prefix": "" },
+    "repeat-on": { "prefix": "" },
+    "repeat-off": { "prefix": "" }
+  },
+  "gpmdp": {
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
+    "stopped": { "prefix": "" },
+    "prev": { "prefix": "" },
+    "next": { "prefix": "" }
+  },
+  "pasink": {
+    "muted": { "prefix": "" },
+    "unmuted": { "prefix": "" }
+  },
+  "amixer": {
+    "muted": { "prefix": "" },
+    "unmuted": { "prefix": "" }
+  },
+  "pasource": {
+    "muted": { "prefix": "" },
+    "unmuted": { "prefix": "" }
+  },
+  "kernel": {
+    "prefix": "\uf17c"
+  },
+  "nic": {
+    "wireless-up": { "prefix": "" },
+    "wireless-down": { "prefix": "" },
+    "wired-up": { "prefix": "" },
+    "wired-down": { "prefix": "" },
+    "tunnel-up": { "prefix": "" },
+    "tunnel-down": { "prefix": "" }
+  },
+  "bluetooth": {
+    "ON": { "prefix": "" },
+    "OFF": { "prefix": "" },
+    "?": { "prefix": "" }
+  },
+  "battery": {
+    "charged": { "prefix": "", "suffix": "" },
+    "AC": { "suffix": "" },
+    "charging": {
+      "prefix": ["", "", "", "", ""],
+      "suffix": ""
     },
-	"nic": {
-		"wireless-up": { "prefix": "" },
-		"wireless-down": { "prefix": "" },
-		"wired-up": { "prefix": "" },
-		"wired-down": { "prefix": "" },
-		"tunnel-up": { "prefix": "" },
-		"tunnel-down": { "prefix": "" }
-	},
-    "bluetooth": {
-        "ON": { "prefix": "" },
-        "OFF": { "prefix": "" },
-        "?": { "prefix": "" }
+    "discharging-10": { "prefix": "", "suffix": "" },
+    "discharging-25": { "prefix": "", "suffix": "" },
+    "discharging-50": { "prefix": "", "suffix": "" },
+    "discharging-80": { "prefix": "", "suffix": "" },
+    "discharging-100": { "prefix": "", "suffix": "" },
+    "unlimited": { "prefix": "", "suffix": "" },
+    "estimate": { "prefix": "" },
+    "unknown-10": { "prefix": "", "suffix": "" },
+    "unknown-25": { "prefix": "", "suffix": "" },
+    "unknown-50": { "prefix": "", "suffix": "" },
+    "unknown-80": { "prefix": "", "suffix": "" },
+    "unknown-100": { "prefix": "", "suffix": "" }
+  },
+  "battery_all": {
+    "charged": { "prefix": "", "suffix": "" },
+    "AC": { "suffix": "" },
+    "charging": {
+      "prefix": ["", "", "", "", ""],
+      "suffix": ""
     },
-	"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": "" },
-		"unlimited": { "prefix": "", "suffix": "" },
-		"estimate": {	"prefix": ""  },
-		"unknown-10": { "prefix": "", "suffix": "" },
-		"unknown-25": { "prefix": "", "suffix": "" },
-		"unknown-50": { "prefix": "", "suffix": "" },
-		"unknown-80": { "prefix": "", "suffix": "" },
-		"unknown-100": { "prefix": "", "suffix": "" }
-	},
-	"battery_all": {
-		"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": "" },
-		"unlimited": { "prefix": "", "suffix": "" },
-		"estimate": {	"prefix": ""  },
-		"unknown-10": { "prefix": "", "suffix": "" },
-		"unknown-25": { "prefix": "", "suffix": "" },
-		"unknown-50": { "prefix": "", "suffix": "" },
-		"unknown-80": { "prefix": "", "suffix": "" },
-		"unknown-100": { "prefix": "", "suffix": "" }
-	},
-	"caffeine": {
-		"activated": {"prefix": " " },
-		"deactivated": { "prefix": " " }
-	},
-	"xrandr": {
-		"on": { "prefix": " "},
-		"off": { "prefix": " " },
-		"refresh": { "prefix": "" }
-	},
-	"redshift": {
-		"day": { "prefix": "" },
-		"night": { "prefix": "" },
-		"transition": { "prefix": "" }
-	},
-	"docker_ps": {
-		"prefix": ""
-	},
-    "sensors": {
-        "prefix": ""
-    },
-    "sensors2": {
-		"temp": { "prefix": "" },
-		"fan": { "prefix": "" },
-		"cpu": { "prefix": "" }
-    },
-    "traffic":{
-	    "rx": { "prefix": "" },
-	    "tx": { "prefix": "" }
-    },
-    "network_traffic": {
-	    "rx": { "prefix": "" },
-            "tx": { "prefix": "" }
-    },
-    "mpd": {
-		"playing": { "prefix": "" },
-		"paused": { "prefix": "" },
-		"stopped": { "prefix": "" },
-		"prev": { "prefix": "" },
-		"next": { "prefix": "" },
-		"shuffle-on": { "prefix": "" },
-		"shuffle-off": { "prefix": "" },
-		"repeat-on": { "prefix": "" },
-		"repeat-off": { "prefix": "" }
-	},
-	"arch-update": {
-		"prefix": " "
-	},
-	"github": {
-		"prefix": "  "
-	},
-    "spotify": {
-	    "prefix": "  "
-    },
-    "publicip": {
-	    "prefix": "  "
-    },
-    "weather": {
-       "clouds": { "prefix": "" },
-       "rain": { "prefix": "" },
-       "snow": { "prefix": "" },
-       "clear": { "prefix": "" },
-       "thunder": { "prefix": "" }
-    },
-    "taskwarrior": {
-       "prefix": "  "
-    },
-    "progress": {
-       "copying": {
-		   "prefix": ""
-		}
-    },
-	"git": {
-		"main": { "prefix": "" },
-		"new": { "prefix": "" },
-		"modified": { "prefix": "" },
-		"deleted": { "prefix": "" }
-	},
-    "dunst": {
-        "muted": { "prefix": ""},
-        "unmuted": { "prefix": "" }
-    },
-    "pihole": { 
-      "enabled": { "prefix": "" },
-      "disabled": { "prefix": "" }
-    },
-    "vpn": {
-        "prefix": ""
+    "discharging-10": { "prefix": "", "suffix": "" },
+    "discharging-25": { "prefix": "", "suffix": "" },
+    "discharging-50": { "prefix": "", "suffix": "" },
+    "discharging-80": { "prefix": "", "suffix": "" },
+    "discharging-100": { "prefix": "", "suffix": "" },
+    "unlimited": { "prefix": "", "suffix": "" },
+    "estimate": { "prefix": "" },
+    "unknown-10": { "prefix": "", "suffix": "" },
+    "unknown-25": { "prefix": "", "suffix": "" },
+    "unknown-50": { "prefix": "", "suffix": "" },
+    "unknown-80": { "prefix": "", "suffix": "" },
+    "unknown-100": { "prefix": "", "suffix": "" }
+  },
+  "caffeine": {
+    "activated": { "prefix": " " },
+    "deactivated": { "prefix": " " }
+  },
+  "xrandr": {
+    "on": { "prefix": " " },
+    "off": { "prefix": " " },
+    "refresh": { "prefix": "" }
+  },
+  "redshift": {
+    "day": { "prefix": "" },
+    "night": { "prefix": "" },
+    "transition": { "prefix": "" }
+  },
+  "docker_ps": {
+    "prefix": ""
+  },
+  "sensors": {
+    "prefix": ""
+  },
+  "sensors2": {
+    "temp": { "prefix": "" },
+    "fan": { "prefix": "" },
+    "cpu": { "prefix": "" }
+  },
+  "traffic": {
+    "rx": { "prefix": "" },
+    "tx": { "prefix": "" }
+  },
+  "network_traffic": {
+    "rx": { "prefix": "" },
+    "tx": { "prefix": "" }
+  },
+  "mpd": {
+    "playing": { "prefix": "" },
+    "paused": { "prefix": "" },
+    "stopped": { "prefix": "" },
+    "prev": { "prefix": "" },
+    "next": { "prefix": "" },
+    "shuffle-on": { "prefix": "" },
+    "shuffle-off": { "prefix": "" },
+    "repeat-on": { "prefix": "" },
+    "repeat-off": { "prefix": "" }
+  },
+  "arch-update": {
+    "prefix": " "
+  },
+  "github": {
+    "prefix": "  "
+  },
+  "spotify": {
+    "prefix": "  "
+  },
+  "publicip": {
+    "prefix": "  "
+  },
+  "weather": {
+    "clouds": { "prefix": "" },
+    "rain": { "prefix": "" },
+    "snow": { "prefix": "" },
+    "clear": { "prefix": "" },
+    "thunder": { "prefix": "" }
+  },
+  "taskwarrior": {
+    "prefix": "  "
+  },
+  "progress": {
+    "copying": {
+      "prefix": ""
     }
+  },
+  "git": {
+    "main": { "prefix": "" },
+    "new": { "prefix": "" },
+    "modified": { "prefix": "" },
+    "deleted": { "prefix": "" }
+  },
+  "dunst": {
+    "muted": { "prefix": "" },
+    "unmuted": { "prefix": "" }
+  },
+  "twmn": {
+    "muted": { "prefix": "" },
+    "unmuted": { "prefix": "" }
+  },
+  "pihole": {
+    "enabled": { "prefix": "" },
+    "disabled": { "prefix": "" }
+  },
+  "vpn": {
+    "prefix": ""
+  }
 }
diff --git a/themes/icons/ionicons.json b/themes/icons/ionicons.json
index bd9ee4b..9512fb4 100644
--- a/themes/icons/ionicons.json
+++ b/themes/icons/ionicons.json
@@ -1,157 +1,163 @@
 {
-	"defaults": {
-		"separator": "\ue0b2", "padding": "\u2800",
-		"unknown": { "prefix": "\uf100" }
-	},
-	"date": { "prefix": "\uf2d1" },
-	"time": { "prefix": "\uf3b3" },
-	"datetime": { "prefix": "\uf3b3" },
-	"memory": { "prefix": "\uf389" },
-	"cpu": { "prefix": "\uf4b0" },
-	"disk": { "prefix": "\u26c1" },
-	"dnf": { "prefix": "\uf2be" },
-	"apt": { "prefix": "\uf2be" },
-	"pacman": { "prefix": "\uf2be" },
-	"brightness": { "prefix": "\u263c" },
-	"load": { "prefix": "\uf13d" },
-	"layout": { "prefix": "\uf38c" },
-	"layout-xkb": { "prefix": "\uf38c" },
-	"todo": { "empty": {"prefix": "\uf453" },
-	"items": {"prefix": "\uf454" },
-	"uptime": {"prefix": "\uf4c1" }
-	},
-	"zpool": {
-		"poolread": {"prefix": "\u26c1\uf3d6"},
-		"poolwrite": {"prefix": "\u26c1\uf3d5"},
-		"ONLINE": {"prefix": "\u26c1"},
-		"FAULTED": {"prefix": "\u26c1\uf3bc"},
-		"DEGRADED": {"prefix": "\u26c1\uf3bc"}
-	},
-	"cmus": {
-		"playing": { "prefix": "\uf488" },
-		"paused": { "prefix": "\uf210" },
-		"stopped": { "prefix": "\uf24f" },
-		"prev": { "prefix": "\uf4ab" },
-		"next": { "prefix": "\uf4ad" },
-		"shuffle-on": { "prefix": "\uf4a8" },
-		"shuffle-off": { "prefix": "\uf453" },
-		"repeat-on": { "prefix": "\uf459" },
-		"repeat-off": { "prefix": "\uf30f" }
-	},
-	"gpmdp": {
-		"playing": { "prefix": "\uf488" },
-		"paused": { "prefix": "\uf210" },
-		"stopped": { "prefix": "\uf24f" },
-		"prev": { "prefix": "\uf4ab" },
-		"next": { "prefix": "\uf4ad" }
-	},
-	"pasink": {
-		"muted": { "prefix": "\uf3b9" },
-		"unmuted": { "prefix": "\uf3ba" }
-	},
-	"amixer": {
-		"muted": { "prefix": "\uf3b9" },
-		"unmuted": { "prefix": "\uf3ba" }
-	},
-	"pasource": {
-		"muted": { "prefix": "\uf395" },
-		"unmuted": { "prefix": "\uf2ec" }
-	},
+  "defaults": {
+    "separator": "\ue0b2",
+    "padding": "\u2800",
+    "unknown": { "prefix": "\uf100" }
+  },
+  "date": { "prefix": "\uf2d1" },
+  "time": { "prefix": "\uf3b3" },
+  "datetime": { "prefix": "\uf3b3" },
+  "memory": { "prefix": "\uf389" },
+  "cpu": { "prefix": "\uf4b0" },
+  "disk": { "prefix": "\u26c1" },
+  "dnf": { "prefix": "\uf2be" },
+  "apt": { "prefix": "\uf2be" },
+  "pacman": { "prefix": "\uf2be" },
+  "brightness": { "prefix": "\u263c" },
+  "load": { "prefix": "\uf13d" },
+  "layout": { "prefix": "\uf38c" },
+  "layout-xkb": { "prefix": "\uf38c" },
+  "todo": {
+    "empty": { "prefix": "\uf453" },
+    "items": { "prefix": "\uf454" },
+    "uptime": { "prefix": "\uf4c1" }
+  },
+  "zpool": {
+    "poolread": { "prefix": "\u26c1\uf3d6" },
+    "poolwrite": { "prefix": "\u26c1\uf3d5" },
+    "ONLINE": { "prefix": "\u26c1" },
+    "FAULTED": { "prefix": "\u26c1\uf3bc" },
+    "DEGRADED": { "prefix": "\u26c1\uf3bc" }
+  },
+  "cmus": {
+    "playing": { "prefix": "\uf488" },
+    "paused": { "prefix": "\uf210" },
+    "stopped": { "prefix": "\uf24f" },
+    "prev": { "prefix": "\uf4ab" },
+    "next": { "prefix": "\uf4ad" },
+    "shuffle-on": { "prefix": "\uf4a8" },
+    "shuffle-off": { "prefix": "\uf453" },
+    "repeat-on": { "prefix": "\uf459" },
+    "repeat-off": { "prefix": "\uf30f" }
+  },
+  "gpmdp": {
+    "playing": { "prefix": "\uf488" },
+    "paused": { "prefix": "\uf210" },
+    "stopped": { "prefix": "\uf24f" },
+    "prev": { "prefix": "\uf4ab" },
+    "next": { "prefix": "\uf4ad" }
+  },
+  "pasink": {
+    "muted": { "prefix": "\uf3b9" },
+    "unmuted": { "prefix": "\uf3ba" }
+  },
+  "amixer": {
+    "muted": { "prefix": "\uf3b9" },
+    "unmuted": { "prefix": "\uf3ba" }
+  },
+  "pasource": {
+    "muted": { "prefix": "\uf395" },
+    "unmuted": { "prefix": "\uf2ec" }
+  },
   "kernel": {
     "prefix": "\uf17c"
   },
-	"nic": {
-		"wireless-up": { "prefix": "\uf25c" },
-		"wireless-down": { "prefix": "\uf3d0" },
-		"wired-up": { "prefix": "\uf270" },
-		"wired-down": { "prefix": "\uf271" },
-		"tunnel-up": { "prefix": "\uf133" },
-		"tunnel-down": { "prefix": "\uf306" }
-	},
-    "bluetooth": {
-        "ON": { "prefix": "\uf116" },
-        "OFF": { "prefix": "\uf116" },
-        "?": { "prefix": "\uf116" }
+  "nic": {
+    "wireless-up": { "prefix": "\uf25c" },
+    "wireless-down": { "prefix": "\uf3d0" },
+    "wired-up": { "prefix": "\uf270" },
+    "wired-down": { "prefix": "\uf271" },
+    "tunnel-up": { "prefix": "\uf133" },
+    "tunnel-down": { "prefix": "\uf306" }
+  },
+  "bluetooth": {
+    "ON": { "prefix": "\uf116" },
+    "OFF": { "prefix": "\uf116" },
+    "?": { "prefix": "\uf116" }
+  },
+  "battery": {
+    "charged": { "prefix": "\uf113", "suffix": "\uf493" },
+    "AC": { "suffix": "\uf493" },
+    "charging": {
+      "prefix": ["\uf112", "\uf115", "\uf114", "", "\uf111"],
+      "suffix": "\uf493"
     },
-	"battery": {
-		"charged": { "prefix": "\uf113", "suffix": "\uf493" },
-		"AC": { "suffix": "\uf493" },
-		"charging": {
-			"prefix": [ "\uf112", "\uf115", "\uf114", "", "\uf111" ],
-			"suffix": "\uf493"
-		},
-		"discharging-10": { "prefix": "\uf112", "suffix": "\uf3bc" },
-		"discharging-25": { "prefix": "\uf115", "suffix": "\uf3e6" },
-		"discharging-50": { "prefix": "\uf115", "suffix": "\uf3e6" },
-		"discharging-80": { "prefix": "\uf114", "suffix": "\uf3e6" },
-		"discharging-100": { "prefix": "\uf113", "suffix": "\uf3e6" },
-		"unknown-10": { "prefix": "\uf112", "suffix": "\uf3bc" },
-		"unknown-25": { "prefix": "\uf115", "suffix": "\uf142" },
-		"unknown-50": { "prefix": "\uf115", "suffix": "\uf142" },
-		"unknown-80": { "prefix": "\uf114", "suffix": "\uf142" },
-		"unknown-100": { "prefix": "\uf113", "suffix": "\uf142" },
-		"unlimited": { "prefix": "\uf402", "suffix": "\uf493" },
-		"estimate": {	"prefix": "\uf402"  }
-	},
-	"battery_all": {
-		"charged": { "prefix": "\uf113", "suffix": "\uf493" },
-		"AC": { "suffix": "\uf493" },
-		"charging": {
-			"prefix": [ "\uf112", "\uf115", "\uf114", "", "\uf111" ],
-			"suffix": "\uf493"
-		},
-		"discharging-10": { "prefix": "\uf112", "suffix": "\uf3bc" },
-		"discharging-25": { "prefix": "\uf115", "suffix": "\uf3e6" },
-		"discharging-50": { "prefix": "\uf115", "suffix": "\uf3e6" },
-		"discharging-80": { "prefix": "\uf114", "suffix": "\uf3e6" },
-		"discharging-100": { "prefix": "\uf113", "suffix": "\uf3e6" },
-		"unknown-10": { "prefix": "\uf112", "suffix": "\uf3bc" },
-		"unknown-25": { "prefix": "\uf115", "suffix": "\uf142" },
-		"unknown-50": { "prefix": "\uf115", "suffix": "\uf142" },
-		"unknown-80": { "prefix": "\uf114", "suffix": "\uf142" },
-		"unknown-100": { "prefix": "\uf113", "suffix": "\uf142" },
-		"unlimited": { "prefix": "\uf402", "suffix": "\uf493" },
-		"estimate": {	"prefix": "\uf402"  }
-	},
-	"caffeine": {
-		"activated": {"prefix": "\uf272\u3000\uf354" }, "deactivated": { "prefix": "\uf272\u3000\uf355" }
-	},
-	"xrandr": {
-		"on": { "prefix": "\uf465\u3000\uf354"}, "off": { "prefix": "\uf465\u3000\uf355" }
-	},
-	"redshift": {
-		"day": { "prefix": "\uf4b6" }, "night": { "prefix": "\uf467" }, "transition": { "prefix": "\uf475" }
-	},
+    "discharging-10": { "prefix": "\uf112", "suffix": "\uf3bc" },
+    "discharging-25": { "prefix": "\uf115", "suffix": "\uf3e6" },
+    "discharging-50": { "prefix": "\uf115", "suffix": "\uf3e6" },
+    "discharging-80": { "prefix": "\uf114", "suffix": "\uf3e6" },
+    "discharging-100": { "prefix": "\uf113", "suffix": "\uf3e6" },
+    "unknown-10": { "prefix": "\uf112", "suffix": "\uf3bc" },
+    "unknown-25": { "prefix": "\uf115", "suffix": "\uf142" },
+    "unknown-50": { "prefix": "\uf115", "suffix": "\uf142" },
+    "unknown-80": { "prefix": "\uf114", "suffix": "\uf142" },
+    "unknown-100": { "prefix": "\uf113", "suffix": "\uf142" },
+    "unlimited": { "prefix": "\uf402", "suffix": "\uf493" },
+    "estimate": { "prefix": "\uf402" }
+  },
+  "battery_all": {
+    "charged": { "prefix": "\uf113", "suffix": "\uf493" },
+    "AC": { "suffix": "\uf493" },
+    "charging": {
+      "prefix": ["\uf112", "\uf115", "\uf114", "", "\uf111"],
+      "suffix": "\uf493"
+    },
+    "discharging-10": { "prefix": "\uf112", "suffix": "\uf3bc" },
+    "discharging-25": { "prefix": "\uf115", "suffix": "\uf3e6" },
+    "discharging-50": { "prefix": "\uf115", "suffix": "\uf3e6" },
+    "discharging-80": { "prefix": "\uf114", "suffix": "\uf3e6" },
+    "discharging-100": { "prefix": "\uf113", "suffix": "\uf3e6" },
+    "unknown-10": { "prefix": "\uf112", "suffix": "\uf3bc" },
+    "unknown-25": { "prefix": "\uf115", "suffix": "\uf142" },
+    "unknown-50": { "prefix": "\uf115", "suffix": "\uf142" },
+    "unknown-80": { "prefix": "\uf114", "suffix": "\uf142" },
+    "unknown-100": { "prefix": "\uf113", "suffix": "\uf142" },
+    "unlimited": { "prefix": "\uf402", "suffix": "\uf493" },
+    "estimate": { "prefix": "\uf402" }
+  },
+  "caffeine": {
+    "activated": { "prefix": "\uf272\u3000\uf354" },
+    "deactivated": { "prefix": "\uf272\u3000\uf355" }
+  },
+  "xrandr": {
+    "on": { "prefix": "\uf465\u3000\uf354" },
+    "off": { "prefix": "\uf465\u3000\uf355" }
+  },
+  "redshift": {
+    "day": { "prefix": "\uf4b6" },
+    "night": { "prefix": "\uf467" },
+    "transition": { "prefix": "\uf475" }
+  },
   "sensors": {
     "prefix": "\uf3b6"
   },
-  "traffic":{
-	  "rx": { "prefix": "\uf365" },
-	  "tx": { "prefix": "\uf35f" }
+  "traffic": {
+    "rx": { "prefix": "\uf365" },
+    "tx": { "prefix": "\uf35f" }
   },
   "network_traffic": {
-	  "rx": { "prefix": "\uf365" },
-	  "tx": { "prefix": "\uf35f" }
+    "rx": { "prefix": "\uf365" },
+    "tx": { "prefix": "\uf35f" }
   },
   "mpd": {
-		"playing": { "prefix": "\uf488" },
-		"paused": { "prefix": "\uf210" },
-		"stopped": { "prefix": "\uf24f" },
-		"prev": { "prefix": "\uf4ab" },
-		"next": { "prefix": "\uf4ad" },
-		"shuffle-on": { "prefix": "\uf4a8" },
-		"shuffle-off": { "prefix": "\uf453" },
-		"repeat-on": { "prefix": "\uf459" },
-		"repeat-off": { "prefix": "\uf30f" }
-	},
+    "playing": { "prefix": "\uf488" },
+    "paused": { "prefix": "\uf210" },
+    "stopped": { "prefix": "\uf24f" },
+    "prev": { "prefix": "\uf4ab" },
+    "next": { "prefix": "\uf4ad" },
+    "shuffle-on": { "prefix": "\uf4a8" },
+    "shuffle-off": { "prefix": "\uf453" },
+    "repeat-on": { "prefix": "\uf459" },
+    "repeat-off": { "prefix": "\uf30f" }
+  },
   "github": {
-	  "prefix": "\uf233"
+    "prefix": "\uf233"
   },
   "spotify": {
-	  "prefix": "\uf305"
+    "prefix": "\uf305"
   },
   "publicip": {
-	  "prefix": "\uf268"
+    "prefix": "\uf268"
   },
   "weather": {
     "clouds": { "prefix": "\uf12b" },
@@ -161,11 +167,14 @@
     "thunder": { "prefix": "\uf4bd" }
   },
   "taskwarrior": {
-      "prefix": "\uf454"
+    "prefix": "\uf454"
   },
   "dunst": {
-        "muted": { "prefix": "\uf39a"},
-        "unmuted": { "prefix": "\uf39b" }
-    }
-
+    "muted": { "prefix": "\uf39a" },
+    "unmuted": { "prefix": "\uf39b" }
+  },
+  "twmn": {
+    "muted": { "prefix": "\uf1f6" },
+    "unmuted": { "prefix": "\uf0f3" }
+  }
 }