diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 8f7a7f5..9c2f176 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,8 +1,8 @@
 [Settings]
 gtk-application-prefer-dark-theme=0
-gtk-theme-name=wal
-gtk-icon-theme-name=Zafiro
-gtk-font-name=Kanit 10
+gtk-theme-name=oomox-walmat
+gtk-icon-theme-name=oomox-walmat
+gtk-font-name=Roboto 10
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_ICONS
diff --git a/sway/config b/sway/config
index d926683..9500072 100644
--- a/sway/config
+++ b/sway/config
@@ -20,15 +20,15 @@ set $menu wofi -c ~/.config/wofi/config -s ~/.config/wofi/style.css -I
 ### Gnome settings
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
-    gsettings set $gnome-schema gtk-theme 'wal'
-    gsettings set $gnome-schema icon-theme 'Zafiro'
-    gsettings set $gnome-schema font-name 'Kanit Light 10'
+    gsettings set $gnome-schema gtk-theme 'oomox-walmat'
+    gsettings set $gnome-schema icon-theme 'oomox-walmat'
+    gsettings set $gnome-schema font-name 'Roboto 10'
     gsettings set $gnome-schema monospace-font-name 'JetBrains Mono 10'
-    gsettings set $gnome-schema document-font-name 'Kanit Light 10'
-    gsettings set org.gnome.desktop.wm.preferences titlebar-font 'Kanit Light 10'
+    gsettings set $gnome-schema document-font-name 'Roboto 10'
+    gsettings set org.gnome.desktop.wm.preferences titlebar-font 'Roboto 10'
     gsettings set org.gnome.desktop.wm.preferences button-layout ''
     gsettings set org.gnome.desktop.default-applications.terminal exec $term
-    gsettings set org.gnome.desktop.default-applications.terminal exec-arg '-e'
+    gsettings set org.gnome.desktop.default-applications.terminal exec-arg ''
 }
 
 
@@ -258,7 +258,7 @@ include ~/.cache/wal/colors-sway
 output "*" background $wallpaper fill
 
 # class                     border      backgr.     text        indicator   child_border
-    client.focused          $color1     $background $foreground $color1     $color1
+    client.focused          $color6     $background $foreground $color6     $color6
     client.focused_inactive $color3     $background $foreground $color3     $color3
     client.unfocused        $color2     $background $color1     $color2     $color2
     client.urgent           $foreground $background $color7     $foreground $foreground
diff --git a/swaylock/config b/swaylock/config
deleted file mode 100644
index 88da4e4..0000000
--- a/swaylock/config
+++ /dev/null
@@ -1,37 +0,0 @@
-image=/home/nick/build/nord-backgrounds/avogadr.io/1920x1080/caffeine.png
-font=Kanit Medium
-indicator-radius=100
-indicator-thickness=20
-#indicator-idle-visible
-#no-unlock-indicator
-
-inside-color=4c566aee
-inside-clear-color=b48eadee
-inside-ver-color=8fbcbbee
-inside-wrong-color=bf616aee
-line-uses-inside
-
-key-hl-color=88c0d0ee
-layout-border-color=434c5eee
-
-ring-color=8fbcbbee
-ring-clear-color=ebcb8bee
-ring-ver-color=8fbcbbee
-ring-wrong-color=bf616aee
-separator-color=5e81acee
-
-text-color=d8dee9ee
-text-clear-color=2e3440ee
-text-ver-color=2e3440ee
-text-wrong-color=2e3440ee
-
-# Swaylock Effects options
-timestr=%H:%M
-datestr=%a %d %b
-fade-in=1
-grace=5
-indicator
-clock
-screenshots
-#effect-pixelate=5
-effect-blur=5x10
diff --git a/swaylock/config b/swaylock/config
new file mode 120000
index 0000000..2ad8423
--- /dev/null
+++ b/swaylock/config
@@ -0,0 +1 @@
+/home/nick/.cache/wal/colors-swaylock
\ No newline at end of file
diff --git a/waybar/style.css b/waybar/style.css
index 7244d79..d8cebfa 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,15 +1,16 @@
 @import "/home/nick/.cache/wal/colors-waybar.css";
 
-/* Works well with the haishoku palette ripper */
-@define-color text    @color5;
-@define-color warn    @color6;
-@define-color crit    @color7;
+/* Usually works well with haishoku */
+@define-color text    @foreground;
+@define-color warn    @color4;
+@define-color crit    @color6;
 @define-color accent  @color1;
-@define-color hilight @color2;
+@define-color hilight @color3;
 
 * {
 	font-size: 12px;
 	font-family: "Kanit Medium", "Font Awesome 5 Free";
+	/*font-family: "Kanit Medium", "Siji";*/
 }
 
 window#waybar {
@@ -28,6 +29,15 @@ window#waybar.top {
 	border-bottom-left-radius: 0px;
 }
 
+.modules-left,
+.modules-center,
+.modules-right {
+	background: @background;
+	padding: 0px 10px 0px 10px;
+	margin: 5px;
+	border-radius: 6px;
+}
+
 /* Base styling for modules */
 #workspaces,
 #mode,
@@ -51,10 +61,7 @@ window#waybar.top {
 #custom-covid,
 #taskbar,
 #tray {
-	padding: 1px 10px 0px 10px;
-	margin: 5px 0px 5px 0px;
-	border-radius: 6px;
-	background: @background;
+	padding: 0 10px 0 10px;
 }
 
 #custom-separator {
@@ -63,13 +70,13 @@ window#waybar.top {
 }
 
 #workspaces {
-	margin-left: 5px;
 	padding: 0px;
+	margin-left: 0px;
 }
 #workspaces button {
 	color: @text;
 	margin: 0;
-	padding: 1px 5px 0px 5px;
+	padding: 0px 5px 0px 5px;
 	border-radius: 6px;
 }
 #workspaces button.focused {
@@ -99,10 +106,6 @@ window#waybar.top {
 	border-left: 0px;
 }
 
-#custom-shutdown {
-	margin-right: 5px;
-}
-
 #battery.warning,
 #custom-covid.UP,
 #cpu.warning,
@@ -131,7 +134,7 @@ window#waybar.top {
 }
 #custom-updates.updates,
 #custom-auroch.updates {
-	color: @accent;
+	color: @hilight;
 }
 
 
@@ -147,7 +150,7 @@ window#waybar.top {
 #taskbar button {
 	color: @accent;
 	border-radius: 6px;
-	padding: 5px 3px 1px 3px;
+	padding: 7px 3px 0px 3px;
 }
 #taskbar button.active {
 	background: @accent;
diff --git a/wofi/style.css b/wofi/style.css
index 7a6af78..6e7f339 100644
--- a/wofi/style.css
+++ b/wofi/style.css
@@ -2,12 +2,11 @@
 
 #window {
 	border-radius: 10px;
-	border: 2px solid @color1;
+	border: 2px solid @color6;
 }
 
 #text {
 	color: #8fbcbb;
-	font-family: "Kanit Regular";
 	text-shadow: 1px 1px 1px @background;
 }