diff --git a/bin/xss-lock b/bin/xss-lock
index c42a071..ca26a1d 100755
--- a/bin/xss-lock
+++ b/bin/xss-lock
@@ -40,9 +40,9 @@ case "$1" in
         xdotool key XF86AudioStop
         # Then, lock screen
         echo "lock: lock screen"
-        systemctl --user stop compton@${display}.service
+        systemctl --user stop picom@${display}.service
         i3lock -n -e -i $HOME/.cache/awesome/current-wallpaper-${display}.png -t -f
-        systemctl --user start compton@${display}.service
+        systemctl --user start picom@${display}.service
         echo "lock: unlock screen"
         ;;
 esac
diff --git a/requirements.txt b/requirements.txt
index a185211..4393e88 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ xss-lock
 libnotify-bin
 xfonts-terminus
 fonts-dejavu
-compton
+picom
 python3-xlib
 python3-pil
 fvwm
diff --git a/systemd/awesome@.service b/systemd/awesome@.service
index cd5363b..ea63bf9 100644
--- a/systemd/awesome@.service
+++ b/systemd/awesome@.service
@@ -2,7 +2,7 @@
 Description=Awesome window manager for %I
 PartOf=graphical-session@%i.target
 After=autorandr@%i.service
-After=compton@%i.service
+After=picom@%i.service
 After=xsettingsd@%i.service
 After=tmux.service
 After=ssh-agent.service
diff --git a/systemd/compton@.service b/systemd/compton@.service
deleted file mode 100644
index cd1a691..0000000
--- a/systemd/compton@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Compositor for X11 on %I
-PartOf=graphical-session@%i.target
-
-[Service]
-Environment=DISPLAY=%I
-ExecStart=/usr/bin/compton --backend glx \
-                           --xrender-sync \
-                           --xrender-sync-fence \
-                           --vsync opengl-swc \
-                           --paint-on-overlay
diff --git a/systemd/graphical-session@.target b/systemd/graphical-session@.target
index faf8ad6..ddc9bd1 100644
--- a/systemd/graphical-session@.target
+++ b/systemd/graphical-session@.target
@@ -3,7 +3,7 @@ Description=Graphical user session for %I
 StopWhenUnneeded=yes
 Wants=autorandr@%i.service
 Wants=awesome@%i.service
-Wants=compton@%i.service
+Wants=picom@%i.service
 Wants=inputplug@%i.service
 Wants=misc-x@%i.service
 Wants=nm-applet@%i.service
diff --git a/systemd/picom@.service b/systemd/picom@.service
new file mode 100644
index 0000000..4183998
--- /dev/null
+++ b/systemd/picom@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Compositor for X11 on %I
+PartOf=graphical-session@%i.target
+
+[Service]
+Environment=DISPLAY=%I
+ExecStart=/usr/bin/picom --backend glx \
+                         --glx-no-stencil \
+                         --glx-no-rebind-pixmap \
+                         --vsync