diff --git a/base/.config/fontconfig/fonts.conf b/base/.config/fontconfig/fonts.conf
index 95e164d9..8f513cb7 100644
--- a/base/.config/fontconfig/fonts.conf
+++ b/base/.config/fontconfig/fonts.conf
@@ -25,6 +25,12 @@
 			<family>DejaVu Sans Mono</family>
 		</prefer>
 	</alias>
+	<alias>
+		<family>Monospace</family>
+		<prefer>
+			<family>DejaVu Sans Mono</family>
+		</prefer>
+	</alias>
 	<alias>
 		<family>mono</family>
 		<prefer>
diff --git a/base/.config/gtk-3.0/settings.ini b/base/.config/gtk-3.0/settings.ini
index 7b968fd4..b81da020 100644
--- a/base/.config/gtk-3.0/settings.ini
+++ b/base/.config/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=ArchLabs-Dark
+gtk-theme-name=Adwaita-dark
 gtk-icon-theme-name=ArchLabs-Dark
 gtk-font-name=monospace 10
 gtk-cursor-theme-name=ArchLabs-Dark
diff --git a/base/.config/picom.conf b/base/.config/picom.conf
index 209c1515..7650b21a 100644
--- a/base/.config/picom.conf
+++ b/base/.config/picom.conf
@@ -16,6 +16,7 @@ use-ewmh-active-win = true;
 unredir-if-possible = true;
 mark-ovredir-focused = true;
 detect-rounded-corners = true;
+detect-client-opacity = true;
 
 opacity-rule = [
 	# hack for i3 tabbed mode with semi-opaque windows being visible below the current tab
@@ -49,4 +50,8 @@ shadow-exclude = [
 wintypes:
 {
     tooltip = { fade = true; shadow = true; focus = true; };
+	dock = { shadow = false; }
+	dnd = { shadow = false; }
+	popup_menu = { opacity = 0.8; }
+	dropdown_menu = { opacity = 0.8; }
 };
diff --git a/base/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/base/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index 9c41ee2d..6d8bfd67 100644
--- a/base/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/base/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -2,7 +2,7 @@
 
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="ArchLabs-Dark"/>
+    <property name="ThemeName" type="string" value="Adwaita-dark"/>
     <property name="IconThemeName" type="string" value="ArchLabs-Dark"/>
     <property name="DoubleClickTime" type="empty"/>
     <property name="DoubleClickDistance" type="empty"/>
diff --git a/base/.gtkrc-2.0 b/base/.gtkrc-2.0
index 423b576c..b7349305 100644
--- a/base/.gtkrc-2.0
+++ b/base/.gtkrc-2.0
@@ -1,7 +1,7 @@
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-gtk-theme-name="ArchLabs-Dark"
+gtk-theme-name="Adwaita-dark"
 gtk-icon-theme-name="ArchLabs-Dark"
 gtk-font-name="monospace 11"
 gtk-cursor-theme-name="ArchLabs-Dark"