diff --git a/.config/gtk-3.0/gtk.css.cgt b/.config/gtk-3.0/gtk.css.cgt
new file mode 100644
index 0000000..82b3b3d
--- /dev/null
+++ b/.config/gtk-3.0/gtk.css.cgt
@@ -0,0 +1,18 @@
+<! if opt.wayland_compositor == "river" then !>
+/* GTK is to retarded to realize that some compositors that don't implement deprecated
+* protocols do not want client-side decoration. We completely disable titlebars here to compensate. */
+headerbar.titlebar.default-decoration {
+    background: transparent;
+    padding: 0;
+    margin: 0 0 -17px 0;
+    border: 0;
+    min-height: 0;
+    font-size: 0;
+    box-shadow: none;
+}
+
+window.csd,
+window.csd decoration {
+    box-shadow: none;
+}
+<! end !>
diff --git a/.config/gtk-4.0/gtk.css.cgt b/.config/gtk-4.0/gtk.css.cgt
new file mode 100644
index 0000000..82b3b3d
--- /dev/null
+++ b/.config/gtk-4.0/gtk.css.cgt
@@ -0,0 +1,18 @@
+<! if opt.wayland_compositor == "river" then !>
+/* GTK is to retarded to realize that some compositors that don't implement deprecated
+* protocols do not want client-side decoration. We completely disable titlebars here to compensate. */
+headerbar.titlebar.default-decoration {
+    background: transparent;
+    padding: 0;
+    margin: 0 0 -17px 0;
+    border: 0;
+    min-height: 0;
+    font-size: 0;
+    box-shadow: none;
+}
+
+window.csd,
+window.csd decoration {
+    box-shadow: none;
+}
+<! end !>
diff --git a/confgen.lua b/confgen.lua
index 606249d..658df8f 100644
--- a/confgen.lua
+++ b/confgen.lua
@@ -19,6 +19,11 @@ cg.onDone(function(errors)
         cg.opt.system("gsettings set org.gnome.desktop.interface cursor-theme " .. cg.opt.cursor.theme)
         cg.opt.system("gsettings set org.gnome.desktop.interface cursor-size " .. cg.opt.cursor.size)
         cg.opt.system('gsettings set org.gnome.desktop.interface font-name "' .. cg.opt.font .. ' 11"')
+        if cg.opt.wayland_compositor == "river" then
+            cg.opt.system 'gsettings set org.gnome.desktop.wm.preferences button-layout ""'
+        else
+            cg.opt.system "gsettings reset org.gnome.desktop.wm.preferences button-layout"
+        end
     end
 end)