diff --git a/wal/templates/theme.rasi b/wal/templates/theme.rasi
index 8680cbe..f499381 100644
--- a/wal/templates/theme.rasi
+++ b/wal/templates/theme.rasi
@@ -1,15 +1,10 @@
 * {{
   font:   "IBM Plex Mono 10";
 
-  bg      : {color0};
+  bg      : {background};
   scroll  : {color8};
 
   fg      : {foreground};
-  red     : #f7768e;
-  green   : #9ece6a;
-  blue    : #7aa2f7;
-  magenta : #9a7ecc;
-  cyan    : #4abaaf;
 
   urgent: {color9};
 
@@ -27,17 +22,19 @@ element-icon, element-text, scrollbar {{
 }}
 
 window {{
-  location : northwest;
+  location : center;
   width    : 280px;
   x-offset : 0px;
   y-offset : 38px;
 
   background-color: @bg;
+  border-color: @fg;
+  border: 2px;
 }}
 
 inputbar {{
   spacing  : 8px;
-  padding  : 4px 8px;
+  padding  : 14px 8px;
   children : [ icon-search, entry ];
 
   background-color: @bg;
diff --git a/wal/templates/waybar-template.css b/wal/templates/waybar-template.css
new file mode 100644
index 0000000..5968316
--- /dev/null
+++ b/wal/templates/waybar-template.css
@@ -0,0 +1,329 @@
+* {
+    /* `otf-font-awesome` is required to be installed for icons */
+    font-family: smoothansi;
+    font-size: 14px;
+}
+
+window#waybar {
+    background-color: {background};
+    border-bottom: 3px solid {color1};
+    color: {foreground};
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+
+window#waybar.termite {
+    background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
+}
+*/
+
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -3px {color1};
+    /* Avoid rounded borders under each button name */
+    border: none;
+    border-radius: 0;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+    background: inherit;
+    box-shadow: inset 0 -3px {foreground};
+}
+
+/* you can set a style on hover for any module like this */
+#pulseaudio:hover {
+    background-color: {color2};
+}
+
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: {foreground};
+}
+
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#workspaces button.focused, #workspaces button.active {
+    background-color: {color1};
+    box-shadow: inset 0 -3px {color1};
+}
+
+#workspaces button.urgent {
+    background-color: {color13};
+}
+
+#mode {
+    background-color: {background};
+    box-shadow: inset 0 -3px {color1};
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#wireplumber,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#scratchpad,
+#power-profiles-daemon,
+#mpd {
+    padding: 0 10px;
+    color: {foreground};
+
+    box-shadow: inset 0 -3px {color1};
+}
+
+#window,
+#workspaces {
+    margin: 0 4px;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+#clock {
+    background-color: {background};
+}
+
+#battery {
+    background-color: {background};
+    color: {foreground};
+}
+
+#battery.charging, #battery.plugged {
+    color: {foreground};
+    background-color: {background};
+}
+
+@keyframes blink {
+    to {
+        background-color: {foreground};
+        color: {background};
+    }
+}
+
+/* Using steps() instead of linear as a timing function to limit cpu usage */
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: steps(12);
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#power-profiles-daemon {
+    padding-right: 15px;
+}
+
+#power-profiles-daemon.performance {
+    background-color: #f53c3c;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.balanced {
+    background-color: #2980b9;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.power-saver {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
+label:focus {
+    background-color: {foreground};
+}
+
+#cpu {
+    background-color: {background};
+    color: {foreground};
+}
+
+#memory {
+    background-color: {background};
+}
+
+#disk {
+    background-color: {background};
+}
+
+#backlight {
+    background-color: {background};
+}
+
+#network {
+    background-color: {background};
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#pulseaudio {
+    background-color: {background};
+    color: {foreground};
+}
+
+#pulseaudio.muted {
+    background-color: {color11};
+    color: {foreground};
+}
+
+#wireplumber {
+    background-color: {background};
+    color: {foreground};
+}
+
+#wireplumber.muted {
+    background-color: {color11};
+}
+
+#custom-media {
+    background-color: #66cc99;
+    color: #2a5c45;
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+    background-color: #ffa000;
+}
+
+#temperature {
+    background-color: #f0932b;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    background-color: {background};
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: {color11};
+}
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#mpd {
+    background-color: #66cc99;
+    color: #2a5c45;
+}
+
+#mpd.disconnected {
+    background-color: #f53c3c;
+}
+
+#mpd.stopped {
+    background-color: #90b1b1;
+}
+
+#mpd.paused {
+    background-color: #51a37a;
+}
+
+#language {
+    background: #00b093;
+    color: #740864;
+    padding: 0 5px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state {
+    background: #97e1ad;
+    color: #000000;
+    padding: 0 0px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state > label {
+    padding: 0 5px;
+}
+
+#keyboard-state > label.locked {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad.empty {
+	background-color: transparent;
+}
+
+#privacy {
+    padding: 0;
+}
+
+#privacy-item {
+    padding: 0 5px;
+    color: white;
+}
+
+#privacy-item.screenshare {
+    background-color: #cf5700;
+}
+
+#privacy-item.audio-in {
+    background-color: #1ca000;
+}
+
+#privacy-item.audio-out {
+    background-color: #0069d4;
+}