diff --git a/base/.config/compton.conf b/base/.config/compton.conf
deleted file mode 100644
index 51a14ca7..00000000
--- a/base/.config/compton.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-# Shadow
-shadow = true;
-shadow-radius = 7;
-shadow-offset-x = -7;
-shadow-offset-y = -7;
-shadow-opacity = 0.60;
-
-# Fade
-fading = false;
-fade-delta = 6.0;
-fade-in-step = 0.03;
-fade-out-step = 0.028;
-
-# Backend
-vsync = false;
-backend = "xrender";
-mark-wmwin-focused = true;
-unredir-if-possible = true;
-detect-rounded-corners = true;
-
-opacity-rule = [
-    "0:_NET_WM_STATE@:32a * = '_NET_WM_STATE_HIDDEN'"
-];
-
-shadow-exclude = [
-    "name *?= 'Notification'",
-    "class_g *?= 'jgmenu'",
-    "class_g *?= 'VirtualBox'",
-    "class_g *?= 'Conky'",
-    "class_g *?= 'Notify-osd'",
-    "class_g *?= 'cairo-dock'",
-    "class_g *?= 'trayer'",
-    "class_g *?= 'i3-frame'",
-    "class_g *?= 'firefox'",
-    "class_g *?= 'navigator'",
-    "class_g *?= 'Cairo-clock'",
-    "class_g *?= 'Cairo-dock'",
-    "class_g *?= 'plank'",
-    "class_g *?= 'Docky'",
-    "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
-    "_GTK_FRAME_EXTENTS@:c"
-];
-
-focus-exclude = [
-    "class_g *?= 'Cairo-clock'",
-    "class_g *?= 'Virtualbox'",
-    "class_g *?= 'trayer'",
-    "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
-    "name *?= 'Authy'"
-];
-
-wintypes:
-{
-    tooltip = { fade = true; shadow = true; focus = true; };
-};
diff --git a/base/.config/picom.conf b/base/.config/picom.conf
new file mode 100644
index 00000000..209c1515
--- /dev/null
+++ b/base/.config/picom.conf
@@ -0,0 +1,52 @@
+shadow = true;
+shadow-radius = 7;
+shadow-offset-x = -7;
+shadow-offset-y = -7;
+shadow-opacity = 0.60;
+
+fading = false;
+fade-delta = 5.0;
+fade-in-step = 0.03;
+fade-out-step = 0.03;
+
+vsync = false;
+backend = "xrender";
+mark-wmwin-focused = true;
+use-ewmh-active-win = true;
+unredir-if-possible = true;
+mark-ovredir-focused = true;
+detect-rounded-corners = true;
+
+opacity-rule = [
+	# hack for i3 tabbed mode with semi-opaque windows being visible below the current tab
+    "0:_NET_WM_STATE@:32a * = '_NET_WM_STATE_HIDDEN'"
+];
+
+shadow-exclude = [
+    "! name~=''",
+    "name = 'Notification'",
+    "name = 'Plank'",
+    "name = 'Docky'",
+    "name = 'Kupfer'",
+    "name = 'xfce4-notifyd'",
+    "name *= 'VLC'",
+    "name *= 'compton'",
+    "name *= 'picom'",
+    "name *= 'Chromium'",
+    "name *= 'Chrome'",
+    "class_g = 'Firefox' && argb",
+    "class_g = 'Conky'",
+    "class_g = 'Kupfer'",
+    "class_g = 'Synapse'",
+    "class_g ?= 'Notify-osd'",
+    "class_g ?= 'Cairo-dock'",
+    "class_g ?= 'Xfce4-notifyd'",
+    "class_g ?= 'Xfce4-power-manager'",
+    "_GTK_FRAME_EXTENTS@:c",
+    "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
+];
+
+wintypes:
+{
+    tooltip = { fade = true; shadow = true; focus = true; };
+};
diff --git a/base/.xprofile b/base/.xprofile
index 7889507c..774f517c 100644
--- a/base/.xprofile
+++ b/base/.xprofile
@@ -7,7 +7,7 @@ export XDG_CONFIG_HOME
 
 [ "$PATH" == *"$HOME/bin"* ] || PATH="$HOME/bin:$PATH"
 
-compton -b &
+picom -b &
 nitrogen --restore &
 volumeicon &
 nm-applet &