diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 6e8cad0..d6b0a54 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1,9 +1,21 @@
-decoration,
-decoration:backdrop {
+.window-frame, .window-frame:backdrop {
+	box-shadow: 0 0 0 black;
+	border-style: none;
+	margin: 0;
+	border-radius: 0;
+}
+
+.titlebar {
+	border-radius: 0;
+}
+
+.window-frame.csd.popup {
+       box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13);
+}
+
+.header-bar {
+	background-image: none;
+	background-color: #ededed;
 	box-shadow: none;
 }
 
-.titlebar,
-.titlebar .background {
-	border-radius: 0px;
-}
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 81eae32..0b37b15 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-solid-blue
-gtk-icon-theme-name=Tela-circle-pink-dark
+gtk-theme-name=WhiteSur-dark-blue
+gtk-icon-theme-name=Tela-circle-blue-dark
 gtk-font-name=Roboto 10
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=0
@@ -15,3 +15,4 @@ gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull
 gtk-xft-rgba=rgb
+gtk-decoration-layout=menu:
diff --git a/i3/config b/i3/config
index 0de69e6..f7e207f 100644
--- a/i3/config
+++ b/i3/config
@@ -28,10 +28,10 @@ exec_always --no-startup-id $HOME/.config/polybar/launch.sh
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
 exec --no-startup-id ~/.screenlayout/default.sh
-exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id ~/.fehbg
-exec --no-startup-id redshift-gtk
+exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id picom -b
+exec --no-startup-id redshift-gtk
 exec --no-startup-id dunst
 #exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock -c 000000 --nofork
 exec --no-startup-id nm-applet --indicator
@@ -194,9 +194,6 @@ gaps top 40
 default_border pixel 3
 default_floating_border normal
 hide_edge_borders none
-#titlebar_border_thickness 2
-#titlebar_padding 5 2
-
 
 # Colors
 set_from_resource $fg i3wm.foreground
@@ -215,22 +212,3 @@ set_from_resource $c7 i3wm.color7
     client.unfocused        $c2     $bg     $fg   $c2       $c2
     client.urgent           $fg     $bg     $c1   $fg       $fg
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-#bar {
-#        status_command i3status
-#	position top
-#	font pango:"Symbols Nerd Font" 8
-#	tray_padding 4
-#	separator_symbol "   "
-#
-#	colors {
-#		background #2e3440
-#		statusline #d8dee9
-#
-#		focused_workspace  #d8dee9 #5e81ac
-#		active_workspace   #d8dee9 #3b4252
-#		inactive_workspace #81a1c1 #2e3440
-#		urgent_workspace   #d8dee9 #b48ead
-#	}
-#}
diff --git a/sway/config b/sway/config
index f5b4e1d..7e7a0a1 100644
--- a/sway/config
+++ b/sway/config
@@ -267,14 +267,13 @@ font pango:FiraCodeMedium 9
 default_border pixel 3
 default_floating_border none
 hide_edge_borders none
-titlebar_border_thickness 3
+titlebar_border_thickness 0
 
 #
 # Colors & background
 #
 include ~/.cache/wal/colors-sway
 output "*" background $wallpaper fill
-#output "*" background /home/nick/Pictures/Wallpapers/febjao0fxvv61.jpg fill
 
 # class                     border      backgr.     text        indicator   child_border
     client.focused          $color5     $background $color5     $color5     $color5
diff --git a/wal/templates/colors-dunstrc b/wal/templates/colors-dunstrc
index 564aeae..dedcd97 100644
--- a/wal/templates/colors-dunstrc
+++ b/wal/templates/colors-dunstrc
@@ -295,6 +295,7 @@
     # Otherwise the "#" and following would be interpreted as a comment.
     background = "{background}"
     foreground = "{foreground}"
+    frame_color = "{color5}"
     timeout = 10
     # Icon for notifications with low urgency, uncomment to enable
     #icon = /path/to/icon
@@ -302,6 +303,7 @@
 [urgency_normal]
     background = "{background}"
     foreground = "{foreground}"
+    frame_color = "{color5}"
     timeout = 10
     # Icon for notifications with normal urgency, uncomment to enable
     #icon = /path/to/icon