diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 1ed66ff..116627a 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,6 +1,6 @@
 [Settings]
 gtk-application-prefer-dark-theme=0
-gtk-theme-name=oomox-Nord
+gtk-theme-name=oomox-wal
 gtk-icon-theme-name=DarK-lb
 gtk-font-name=Kanit 10
 gtk-cursor-theme-name=Adwaita
diff --git a/mako/config b/mako/config
index da8ccfa..0cdb579 100644
--- a/mako/config
+++ b/mako/config
@@ -11,9 +11,9 @@ border-size=3
 border-radius=10
 max-icon-size=32
 
-background-color=#2e3440ee
-text-color=#8fbcbb
-border-color=#8fbcbb
+background-color=#0f2222ee
+text-color=#a1cbd7
+border-color=#238F9E
 
 default-timeout=10000
 ignore-timeout=1
diff --git a/sway/config b/sway/config
index 4bd30e7..d98e5e1 100644
--- a/sway/config
+++ b/sway/config
@@ -21,7 +21,7 @@ set $menu wofi -c ~/.config/wofi/config -s ~/.config/wofi/style.css -I
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
     #gsettings set $gnome-schema gtk-theme 'NordSur-dark'
-    gsettings set $gnome-schema gtk-theme 'oomox-Nord'
+    gsettings set $gnome-schema gtk-theme 'oomox-wal'
     #gsettings set $gnome-schema icon-theme 'oomox-Nord'
     gsettings set $gnome-schema icon-theme 'DarK-lb'
     gsettings set $gnome-schema font-name 'Kanit Light 10'
@@ -253,13 +253,15 @@ default_floating_border normal
 hide_edge_borders none
 titlebar_border_thickness 2
 titlebar_padding 5 2
+
 #
-# Colors #93cee9
+# Colors
 #
-# class                     border  backgr. text  indicator child_border
-    client.focused          #8FBCBB #2e3440 #8fbcbb #8FBCBB #8FBCBB
-    client.focused_inactive #3b4252 #3b4252 #5e81ac #4c566a #4c566a
-    client.unfocused        #434c5e #434c5e #5e81ac #4c566a #4c566a
-    client.urgent           #bf616a #bf616a #bf616a #d08770 #d08770
+include ~/.cache/wal/colors-sway
+# class                     border      backgr.     text        indicator child_border
+    client.focused          $color6     $background $foreground $color8   $color6
+    client.focused_inactive $color6     $background $foreground $color8   $color6
+    client.unfocused        $color3     $background $color5     $color5   $color3
+    client.urgent           $foreground $background $color6     $color5   $foreground
 
 include /etc/sway/config.d/*
diff --git a/wal/templates/colors-mako b/wal/templates/colors-mako
new file mode 100644
index 0000000..1e77a57
--- /dev/null
+++ b/wal/templates/colors-mako
@@ -0,0 +1,19 @@
+layer=top
+font=Kanit Regular 11
+max-visible=5
+anchor=top-right
+icon-path=~/.icons/DarK-svg
+
+width=400
+height=150
+margin=20
+border-size=3
+border-radius=10
+max-icon-size=32
+
+background-color={background}ee
+text-color={foreground}
+border-color={color6}
+
+default-timeout=10000
+ignore-timeout=1
diff --git a/waybar/style.css b/waybar/style.css
index a035aeb..5951446 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,38 +1,4 @@
-/* Polar Night */
-@define-color nord0 #2e3440;
-@define-color nord1 #3b4252;
-@define-color nord2 #434c5e;
-@define-color nord3 #4c566a;
-
-/* Snow Storm */
-@define-color nord4 #d8dee9;
-@define-color nord5 #e5e9f0;
-@define-color nord6 #eceff4;
-
-/* Frost */
-@define-color nord7 #8fbcbb;
-@define-color nord8 #88c0d0;
-@define-color nord9 #81a1c1;
-@define-color nord10 #5e81ac;
-
-/* Aurora */
-@define-color nord11 #bf616a;
-@define-color nord12 #d08770;
-@define-color nord13 #ebcb8b;
-@define-color nord14 #a3be8c;
-@define-color nord15 #b48ead;
-
-/* Simple color names */
-@define-color bgkdark   @nord0;
-@define-color bgkgrey   @nord2;
-@define-color text      @nord4;
-@define-color lightblue @nord7;
-@define-color darkblue  @nord10;
-@define-color red       @nord11;
-@define-color orange    @nord12;
-@define-color yellow    @nord13;
-@define-color green     @nord14;
-@define-color purple    @nord15;
+@import "/home/nick/.cache/wal/colors-waybar.css";
 
 * {
 	font-size: 12px;
@@ -40,11 +6,9 @@
 }
 
 window#waybar {
-	color: @lightblue;
-	/*background: @bgkdark;*/
+	color: @color8;
 	background: none;
 	border-radius: 10px;
-	/*border: 2px solid @darkblue;*/
 }
 
 window#waybar.left {
@@ -57,16 +21,6 @@ window#waybar.top {
 	border-bottom-left-radius: 0px;
 }
 
-/*
-.modules-left,
-.modules-center,
-.modules-right {
-	background: @bgkgrey;
-	border-radius: 10px;
-	border: 2px solid @darkblue;
-}
-*/
-
 /* Base styling for modules */
 #workspaces,
 #mode,
@@ -93,8 +47,7 @@ window#waybar.top {
 	padding: 1px 10px 0px 10px;
 	margin: 5px 0px 5px 0px;
 	border-radius: 6px;
-	background: @bgkgrey;
-	/*border: 2px solid @darkblue;*/
+	background: @background;
 }
 
 #custom-separator {
@@ -107,17 +60,17 @@ window#waybar.top {
 	padding: 0px;
 }
 #workspaces button {
-	color: @lightblue;
+	color: @color8;
 	margin: 0;
 	padding: 1px 5px 0px 5px;
 	border-radius: 6px;
 }
 #workspaces button.focused {
-	color: @purple;
+	color: @color14;
 }
 
 #mode {
-	color: @red;
+	color: @color14;
 }
 
 #disk.1,
@@ -144,34 +97,34 @@ window#waybar.top {
 }
 
 #battery.warning,
+#custom-covid.UP,
 #cpu.warning,
 #custom-updates.checking,
 #custom-auroch.checking,
 #disk.1.warning,
 #disk.2.warning,
 #memory.warning {
-	color: @yellow;
+	color: @color5;
 }
 
 #battery.critical,
 #cpu.critical,
 #custom-auroch.error,
-#custom-covid.UP,
 #custom-updates.error,
 #disk.1.critical,
 #disk.2.critical,
 #memory.critical {
-	color: @orange;
+	color: @color6;
 }
 
 #custom-auroch.no-updates,
 #custom-covid.DOWN,
 #custom-updates.no-updates {
-	color: @green;
+	color: @color14;
 }
 #custom-updates.updates,
 #custom-auroch.updates {
-	color: @purple;
+	color: @color5;
 }
 
 
@@ -185,12 +138,12 @@ window#waybar.top {
 	margin-top: 3px;
 }
 #taskbar button {
-	color: @lightblue;
+	color: @color8;
 	border-radius: 6px;
 	padding: 5px 3px 1px 3px;
 }
 #taskbar button.active {
-	background: @nord3;
+	background: @color2;
 }
 
 #tray {
diff --git a/wofi/style.css b/wofi/style.css
index 3604e9e..e1851e1 100644
--- a/wofi/style.css
+++ b/wofi/style.css
@@ -1,12 +1,14 @@
+@import "/home/nick/.cache/wal/colors-waybar.css";
+
 #window {
 	border-radius: 10px;
-	border: 2px solid #8fbcbb;
+	border: 2px solid @color6;
 }
 
 #text {
 	color: #8fbcbb;
 	font-family: "Kanit Regular";
-	text-shadow: 1px 1px 1px #2e3440;
+	text-shadow: 1px 1px 1px @background;
 }
 
 #outer-box {