diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 73c8e25..409f255 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1,5 +1,9 @@
 decoration {
     box-shadow: none;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
 }
 
 decoration:backdrop {
@@ -10,7 +14,11 @@ decoration:backdrop {
 .titlebar .background,
 .window-frame,
 .window-frame:backdrop {
-    border-radius: 0;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    box-shadow: none;
 }
 
 /*
@@ -21,12 +29,6 @@ decoration:backdrop {
 	border-radius: 0px;
 }
 
-.titlebar,
-.titlebar .background {
-	border-radius: 0px;
-	box-shadow: none;
-}
-
 .window-frame.csd.popup {
        box-shadow: none;
 }
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 89491f8..1927aec 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,7 +1,7 @@
 [Settings]
 gtk-application-prefer-dark-theme=0
-gtk-theme-name=WhiteSur-dark-orange
-gtk-icon-theme-name=Tela-circle-orange-dark
+gtk-theme-name=Gruvbox-Material-Dark
+gtk-icon-theme-name=Tela-circle-grey-dark
 gtk-font-name=Roboto 10
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=0
@@ -13,6 +13,6 @@ gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
+gtk-xft-hintstyle=hintmedium
 gtk-xft-rgba=rgb
 gtk-decoration-layout=menu:
diff --git a/i3/config b/i3/config
index 65f1610..3b492fc 100644
--- a/i3/config
+++ b/i3/config
@@ -217,10 +217,11 @@ set_from_resource $c4 i3wm.color4
 set_from_resource $c5 i3wm.color5
 set_from_resource $c6 i3wm.color6
 set_from_resource $c7 i3wm.color7
+set_from_resource $c8 i3wm.color8
 
 # class                     border  backgr. text  indicator child_border
-    client.focused          $c5     $bg     $c5   $c5       $c5
-    client.focused_inactive $c2     $bg     $fg   $c2       $c2
-    client.unfocused        $c2     $bg     $fg   $c2       $c2
+    client.focused          $fg     $bg     $c4   $fg       $fg
+    client.focused_inactive $c8     $bg     $fg   $c8       $c8
+    client.unfocused        $c8     $bg     $fg   $c8       $c8
     client.urgent           $fg     $bg     $c1   $fg       $fg
 
diff --git a/polybar/config b/polybar/config
index 00c4def..33f9a16 100644
--- a/polybar/config
+++ b/polybar/config
@@ -3,9 +3,9 @@ background = ${xrdb:background:#222}
 background-alt = ${xrdb:color0:#222}
 foreground = ${xrdb:foreground:#222}
 foreground-alt = ${xrdb:foreground:#222}
-primary = ${xrdb:color5:#222}
-secondary = ${xrdb:color2:#222}
-alert = ${xrdb:color6:#222}
+primary = ${xrdb:color4:#222}
+secondary = ${xrdb:color5:#222}
+alert = ${xrdb:color1:#222}
 
 [module/updates]
 type = custom/script
diff --git a/sway/config b/sway/config
index 3d41767..568663c 100644
--- a/sway/config
+++ b/sway/config
@@ -18,13 +18,11 @@ set $term kitty
 set $menu wofi -c ~/.config/wofi/config -s ~/.config/wofi/style.css -I
 #set $menu nwggrid -f
 
-xwayland enable
-
 ### Gnome settings
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
-    gsettings set $gnome-schema gtk-theme 'WhiteSur-dark-orange'
-    gsettings set $gnome-schema icon-theme 'Tela-circle-orange-dark'
+    gsettings set $gnome-schema gtk-theme 'Gruvbox-Material-Dark'
+    gsettings set $gnome-schema icon-theme 'Tela-circle-grey-dark'
     gsettings set $gnome-schema font-name 'Roboto Regular 10'
     gsettings set $gnome-schema monospace-font-name 'Fira Code 10'
     gsettings set $gnome-schema document-font-name 'Roboto Regular 10'
@@ -40,8 +38,6 @@ exec swayidle -w \
           timeout 300 'swaylock -f' \
           timeout 305 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
           before-sleep 'swaylock -f'
-
-#
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
@@ -53,6 +49,7 @@ exec persway -a -o 1
 exec nm-applet --indicator
 exec gammastep-indicator
 exec insync start
+xwayland enable
 
 ### Window config
 # custom
@@ -259,7 +256,9 @@ bar {
 # gaps
 #
 gaps inner 10
+gaps top -10
 smart_gaps off
+smart_borders on
 
 #
 # Titlebars
@@ -274,13 +273,13 @@ titlebar_border_thickness 0
 # Colors & background
 #
 include ~/.cache/wal/colors-sway
-#output "*" background /home/nick/Pictures/Wallpapers/eWiOKET.jpg fill
-output "*" background $wallpaper fill
+output "*" background /home/nick/Pictures/Wallpapers/gruvbox_photo-1517999179346-a7078f1e40a6.jpeg fill
+#output "*" background $wallpaper fill
 
 # class                     border      backgr.     text        indicator   child_border
-    client.focused          $color5     $background $color5     $color5     $color5
-    client.focused_inactive $color2     $background $foreground $color2     $color2
-    client.unfocused        $color2     $background $foreground $color2     $color2
+    client.focused          $foreground $background $color4     $foreground $foreground
+    client.focused_inactive $color8     $background $foreground $color8     $color8
+    client.unfocused        $color8     $background $foreground $color8     $color8
     client.urgent           $foreground $background $color1     $foreground $foreground
 
 include /etc/sway/config.d/*
diff --git a/wal/colorschemes/dark/riverbed.json b/wal/colorschemes/dark/riverbed.json
new file mode 100644
index 0000000..057c8ed
--- /dev/null
+++ b/wal/colorschemes/dark/riverbed.json
@@ -0,0 +1,26 @@
+{
+	"alpha": "100",
+	"special": {
+		"background": "#28292b",
+		"foreground": "#888d8b",
+		"cursor": "#adb0a5"
+	},
+	"colors": {
+		"color0": "#28292b",
+		"color1": "#65433a",
+		"color2": "#9b643a",
+		"color3": "#b4af79",
+		"color4": "#415e7b",
+		"color5": "#466377",
+		"color6": "#798388",
+		"color7": "#adb0a5",
+		"color8": "#888d8b",
+		"color9": "#65433a",
+		"color10": "#9b643a",
+		"color11": "#b4af79",
+		"color12": "#415e7b",
+		"color13": "#466377",
+		"color14": "#798388",
+		"color15": "#adb0a5"
+	}
+}
diff --git a/wal/templates/colors-cava b/wal/templates/colors-cava
index 652936b..ac9ddd5 100644
--- a/wal/templates/colors-cava
+++ b/wal/templates/colors-cava
@@ -123,9 +123,9 @@
 # You can define as many as 8 different colors. They range from bottom to top of screen
 gradient = 1
 gradient_count = 3
-gradient_color_1 = '{color1}'
-gradient_color_2 = '{color4}'
-gradient_color_3 = '{color6}'
+gradient_color_1 = '{color2}'
+gradient_color_2 = '{color3}'
+gradient_color_3 = '{color1}'
 
 
 
diff --git a/wal/templates/colors-dunstrc b/wal/templates/colors-dunstrc
index f3379a2..1bdd71d 100644
--- a/wal/templates/colors-dunstrc
+++ b/wal/templates/colors-dunstrc
@@ -65,7 +65,7 @@
     frame_width = 2
 
     # Defines color of the frame around the notification window.
-    frame_color = {color5}
+    frame_color = {foreground}
 
     # Define a color for the separator.
     # possible values are:
diff --git a/wal/templates/colors-mako b/wal/templates/colors-mako
index bfb39e6..21b2e40 100644
--- a/wal/templates/colors-mako
+++ b/wal/templates/colors-mako
@@ -1,18 +1,19 @@
-layer=top
+layer=overlay
 font=Kanit Medium 10
 max-visible=5
-anchor=top-right
+anchor=top-center
 
 width=350
 height=1000
-margin=20
-border-size=3
+margin=15
+padding=10
+border-size=1
 border-radius=4
 max-icon-size=32
 
 background-color={background}ee
 text-color={foreground}
-border-color={color5}
+border-color={foreground}
 
 icon-location=left
 text-alignment=left
diff --git a/waybar/style.css b/waybar/style.css
index 832c250..3208aee 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,11 +1,20 @@
 @import "/home/nick/.cache/wal/colors-waybar.css";
 
-/* Colorz/haishoku generally work well */
+/* Colorz/haishoku generally work well
 @define-color text    @foreground;
 @define-color warn    @color5;
 @define-color crit    @color4;
 @define-color accent  @color6;
 @define-color hilight @color6;
+*/
+
+/* Tempus
+@define-color text    @foreground;
+@define-color warn    @color3;
+@define-color crit    @color1;
+@define-color accent  @color4;
+@define-color hilight @color5;
+*/
 
 /* Nord
 @define-color text    @foreground;
@@ -15,11 +24,18 @@
 @define-color hilight @color1;
 */
 
-/* Gruvbox
+/* Gruvbox */
 @define-color text    @foreground;
 @define-color warn    @color3;
 @define-color crit    @color1;
-@define-color accent  @color2;
+@define-color accent  @color4;
+@define-color hilight @color4;
+
+/* Sexy
+@define-color text    @foreground;
+@define-color warn    @color2;
+@define-color crit    @color1;
+@define-color accent  @color4;
 @define-color hilight @color6;
 */
 
@@ -31,7 +47,7 @@
 
 window#waybar {
 	color: @text;
-	text-shadow: 1px 1px 1px @background;
+	text-shadow: 1px 1px 1px black;
 	background: @background;
 	border-radius: 4px;
 }
@@ -69,7 +85,7 @@ window#waybar {
 #workspaces button {
 	color: @text;
 	margin: 0;
-	padding: 2px 15px 0px 15px;
+	padding: 3px 5px 0px 5px;
 	border-radius: 0px;
 }
 #workspaces button.focused {
@@ -122,7 +138,7 @@ window#waybar {
 }
 
 #custom-powermenu {
-	color: @color2;
+	color: @crit;
 	padding-top: 1px;
 	margin-right: 3px;
 }
diff --git a/wofi/style.css b/wofi/style.css
index 037d9d7..049fcca 100644
--- a/wofi/style.css
+++ b/wofi/style.css
@@ -2,7 +2,7 @@
 
 #window {
 	border-radius: 4px;
-	border: 2px solid @color6;
+	border: 3px solid @foreground;
 }
 
 #text {