diff --git a/.gitignore b/.gitignore
index 0f45309..ac639cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,5 @@ qt5ct/
 rofi.old/
 torbrowser/
 vlc/
+qt6ct/
+sqlitebrowser/
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 1652f1f..81eae32 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=oomox-walmat
-gtk-icon-theme-name=oomox-walmat
-gtk-font-name=Fira Code Medium 9
+gtk-theme-name=WhiteSur-dark-solid-blue
+gtk-icon-theme-name=Tela-circle-pink-dark
+gtk-font-name=Roboto 10
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_ICONS
diff --git a/i3/config b/i3/config
index d91c17b..0de69e6 100644
--- a/i3/config
+++ b/i3/config
@@ -14,7 +14,7 @@ set $term alacritty
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:FiraCodeMedium 9
+font pango:KanitMedium 9
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@@ -52,6 +52,7 @@ for_window [class="kitty"] floating enable
 for_window [class="URxvt"] floating enable
 for_window [class="zenity"] floating enable
 for_window [class="apostrophe" title="Export"] floating enable
+for_window [title="Catfish"] floating enable
 for_window [class=".*"] border pixel 3
 
 # Use pactl to adjust volume in PulseAudio.
@@ -72,6 +73,8 @@ bindsym $mod+q kill
 
 # start dmenu (a program launcher)
 bindsym $mod+d exec --no-startup-id rofi -show drun
+bindsym $mod+Shift+f exec --no-startup-id catfish
+
 # A more modern dmenu replacement is rofi:
 #bindsym $mod+d exec --no-startup-id "~/.config/rofi/bin/launcher_colorful"
 # There also is i3-dmenu-desktop which only displays applications shipping a
@@ -201,13 +204,15 @@ set_from_resource $bg i3wm.background
 set_from_resource $c1 i3wm.color1
 set_from_resource $c2 i3wm.color2
 set_from_resource $c3 i3wm.color3
+set_from_resource $c4 i3wm.color4
+set_from_resource $c5 i3wm.color5
 set_from_resource $c6 i3wm.color6
 set_from_resource $c7 i3wm.color7
 
 # class                     border  backgr. text  indicator child_border
-    client.focused          #504945 $bg     $c6   #504945   #504945
-    client.focused_inactive $bg     $bg     $fg   $bg       $bg
-    client.unfocused        #3c3836 $bg     $fg   #3c3836   #3c3836
+    client.focused          $c5     $bg     $c5   $c5       $c5
+    client.focused_inactive $c2     $bg     $fg   $c2       $c2
+    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
diff --git a/polybar/config b/polybar/config
index 03922fd..6928362 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:color6:#222}
-secondary = ${xrdb:color3:#222}
-alert = ${xrdb:color1:#222}
+primary = ${xrdb:color5:#222}
+secondary = ${xrdb:color2:#222}
+alert = ${xrdb:color6:#222}
 
 [module/updates]
 type = custom/script
@@ -64,17 +64,17 @@ wrapping-scroll = false
 ; Only show workspaces on the same output as the bar
 ;pin-workspaces = true
 
-label-mode-padding = 2
+label-mode-padding = 4
 label-mode-foreground = ${colors.foreground}
 
 ; focused = Active workspace on focused monitor
 label-focused = %index% %icon%
 label-focused-foreground = ${colors.primary}
-label-focused-padding = 2
+label-focused-padding = 4
 
 ; unfocused = Inactive workspace on any monitor
 label-unfocused = %index% %icon%
-label-unfocused-padding = 2
+label-unfocused-padding = 4
 
 ; visible = Active workspace on unfocused monitor
 label-visible = %index% %icon%
@@ -84,7 +84,7 @@ label-visible-padding = ${self.label-focused-padding}
 ; urgent = Workspace with urgency hint set
 label-urgent = %index% %icon%
 label-urgent-foreground = ${colors.alert}
-label-urgent-padding = 2
+label-urgent-padding = 4
 
 ; Separator in between workspaces
 ; label-separator = |
@@ -227,17 +227,17 @@ line-color = ${colors.foreground}
 border-size = 0
 border-color = ${colors.primary}
 
-padding-left = 2
-padding-right = 2
+padding-left = 3
+padding-right = 3
 
-module-margin-left = 2
-module-margin-right = 2
+module-margin-left = 4
+module-margin-right = 4
 
 font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;2
 font-2 = Font Awesome 5 Free:style=Regular:pixelsize=8;2
 font-3 = Font Awesome 5 Brands:pixelsize=8;2
 font-4 = Font Awesome 5 Regular:pixelsize=8;2
-font-0 = Fira Code:style=Medium:size=8;2
+font-0 = Kanit Medium:size=8;2
 
 modules-left = date battery root_storage home_storage memory swap cpu
 modules-center = i3
diff --git a/sway/config b/sway/config
index 184fc06..f5b4e1d 100644
--- a/sway/config
+++ b/sway/config
@@ -23,12 +23,12 @@ xwayland enable
 ### Gnome settings
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
-    gsettings set $gnome-schema gtk-theme 'oomox-walmat'
-    gsettings set $gnome-schema icon-theme 'oomox-walmat'
-    gsettings set $gnome-schema font-name 'Fira Code Medium 9'
-    gsettings set $gnome-schema monospace-font-name 'Fira Code Medium 9'
-    gsettings set $gnome-schema document-font-name 'Fira Code Medium 9'
-    gsettings set org.gnome.desktop.wm.preferences titlebar-font 'Fira Code Medium 9'
+    gsettings set $gnome-schema gtk-theme 'WhiteSur-dark-blue'
+    gsettings set $gnome-schema icon-theme 'Tela-circle-blue-dark'
+    gsettings set $gnome-schema font-name 'Roboto Regular 10'
+    gsettings set $gnome-schema monospace-font-name 'Roboto Regular 10'
+    gsettings set $gnome-schema document-font-name 'Roboto Regular 10'
+    gsettings set org.gnome.desktop.wm.preferences titlebar-font 'Roboto Regular 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'
@@ -59,9 +59,9 @@ exec insync start
 for_window [app_id=aptus-upgrade] floating enable
 
 # filemanagers
-for_window [app_id=pcmanfm] floating enable
-for_window [app_id=thunar] floating enable
+for_window [app_id=Thunar] floating enable
 for_window [app_id=ranger] floating enable
+for_window [title="Catfish"] floating enable
 
 # terminals
 for_window [app_id=Alacritty] floating enable
@@ -83,9 +83,10 @@ for_window [app_id=eog] floating enable
 for_window [app_id=transmission-gtk] floating enable
 for_window [app_id=file-roller] floating enable
 for_window [app_id=gedit] floating enable
+for_window [title="Customise Look and Feel"] floating enable
 
 # Everything else
-for_window [app_id=".*"] border none
+for_window [app_id=".*"] border pixel 3
 
 ### Key bindings
 #
@@ -100,6 +101,9 @@ for_window [app_id=".*"] border none
     # Start your launcher
     bindsym $mod+d exec $menu
 
+    # Filesearch
+    bindsym $mod+Shift+f exec GDK_BACKEND=x11 catfish
+
     # lock screen
     bindsym $mod+l exec swaylock -f
 
@@ -253,14 +257,14 @@ bar {
 #
 # gaps
 #
-gaps inner 14
+gaps inner 10
 smart_gaps off
 
 #
 # Titlebars
 #
 font pango:FiraCodeMedium 9
-default_border none
+default_border pixel 3
 default_floating_border none
 hide_edge_borders none
 titlebar_border_thickness 3
@@ -269,18 +273,18 @@ titlebar_border_thickness 3
 # Colors & background
 #
 include ~/.cache/wal/colors-sway
-#output "*" background $wallpaper fill
-output "*" background /home/nick/Pictures/Wallpapers/febjao0fxvv61.jpg fill
+output "*" background $wallpaper fill
+#output "*" background /home/nick/Pictures/Wallpapers/febjao0fxvv61.jpg fill
 
 # class                     border      backgr.     text        indicator   child_border
-    client.focused          $background $background $color6     $background $background
-    client.focused_inactive $background $background $foreground $background $background
-    client.unfocused        $background $background $foreground $background $background
+    client.focused          $color5     $background $color5     $color5     $color5
+    client.focused_inactive $color2     $background $foreground $color2     $color2
+    client.unfocused        $color2     $background $foreground $color2     $color2
     client.urgent           $foreground $background $color1     $foreground $foreground
 
-border_images.focused /home/nick/.config/sway/rounded_and_shadows_focused.png
-border_images.focused_inactive /home/nick/.config/sway/rounded_and_shadows.png
-border_images.unfocused /home/nick/.config/sway/rounded_and_shadows.png
-border_images.urgent /home/nick/.config/sway/rounded_and_shadows.png
+#border_images.focused /home/nick/.config/sway/rounded_and_shadows_focused.png
+#border_images.focused_inactive /home/nick/.config/sway/rounded_and_shadows.png
+#border_images.unfocused /home/nick/.config/sway/rounded_and_shadows.png
+#border_images.urgent /home/nick/.config/sway/rounded_and_shadows.png
 
 include /etc/sway/config.d/*
diff --git a/wal/templates/colors-cava b/wal/templates/colors-cava
index 12ff4d9..652936b 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 = '{color6}'
-gradient_color_2 = '{color2}'
-gradient_color_3 = '{color1}'
+gradient_color_1 = '{color1}'
+gradient_color_2 = '{color4}'
+gradient_color_3 = '{color6}'
 
 
 
diff --git a/wal/templates/colors-dunstrc b/wal/templates/colors-dunstrc
index 2d8a7b4..564aeae 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 = "#504945"
+    frame_color = {color5}
 
     # Define a color for the separator.
     # possible values are:
@@ -87,7 +87,7 @@
 
     ### Text ###
 
-    font = Fira Code Medium 9
+    font = Kanit Medium 9
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
diff --git a/wal/templates/colors-mako b/wal/templates/colors-mako
index 9b80dcf..bc6a506 100644
--- a/wal/templates/colors-mako
+++ b/wal/templates/colors-mako
@@ -1,5 +1,5 @@
 layer=top
-font=Fira Code 9
+font=Kanit Medium 10
 max-visible=5
 anchor=top-right
 
@@ -12,7 +12,7 @@ max-icon-size=32
 
 background-color={background}ee
 text-color={foreground}
-border-color=#504945
+border-color={color5}
 
 default-timeout=10000
 ignore-timeout=1
diff --git a/wal/templates/colors-swaylock b/wal/templates/colors-swaylock
index 0e2278a..4c2d88a 100644
--- a/wal/templates/colors-swaylock
+++ b/wal/templates/colors-swaylock
@@ -1,4 +1,3 @@
-image=/home/nick/build/nord-backgrounds/avogadr.io/1920x1080/caffeine.png
 font=Kanit Medium
 indicator-radius=100
 indicator-thickness=20
diff --git a/waybar/config b/waybar/config
index bc80627..52264e6 100644
--- a/waybar/config
+++ b/waybar/config
@@ -169,7 +169,7 @@
 		"rotate": 90
 	},
 	"tray": {
-		"icon-size": 14,
+		"icon-size": 12,
 		"spacing": 10
 	},
 	"custom/updates": {
diff --git a/waybar/style.css b/waybar/style.css
index 5b15768..b52dafd 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,31 +1,33 @@
 @import "/home/nick/.cache/wal/colors-waybar.css";
 
-/* Colorz/haishoku generally work well
+/* Colorz/haishoku generally work well */
 @define-color text    @color3;
 @define-color warn    @color5;
 @define-color crit    @color6;
 @define-color accent  @color4;
 @define-color hilight @color5;
-*/
 
-/* Gruvbox */
+
+/* Gruvbox
 @define-color text    @foreground;
 @define-color warn    @color3;
 @define-color crit    @color1;
 @define-color accent  @color2;
 @define-color hilight @color6;
+*/
 
 * {
-	font-size: 10px;
-	font-family: "Fira Code", "Font Awesome 5 Free";
-	font-weight: bold;
-	border-radius: 4px;
+	font-size: 11px;
+	font-family: "Kanit Medium", "Font Awesome 5 Free";
+	/*font-weight: bold;*/
+	border-radius: 10px;
 }
 
 window#waybar {
 	color: @text;
 	background: @background;
 	margin: 0;
+	/*border: 2px solid @color5;*/
 }
 
 .modules-left,
@@ -54,7 +56,7 @@ window#waybar {
 #custom-powermenu,
 #custom-covid,
 #tray {
-	padding: 2px 10px 0 10px;
+	padding: 4px 10px 4px 10px;
 }
 
 #custom-separator {
@@ -68,7 +70,7 @@ window#waybar {
 #workspaces button {
 	color: @text;
 	margin: 0;
-	padding: 2px 5px 0px 5px;
+	padding: 0px 10px 0px 10px;
 	border-radius: 0px;
 }
 #workspaces button.focused {
diff --git a/wofi/style.css b/wofi/style.css
index 191db37..037d9d7 100644
--- a/wofi/style.css
+++ b/wofi/style.css
@@ -2,7 +2,7 @@
 
 #window {
 	border-radius: 4px;
-	border: 2px solid #504945;
+	border: 2px solid @color6;
 }
 
 #text {