diff --git a/Fedora-Workstation-39.sh b/Fedora-Workstation-39.sh
index 2c1b691..08d1fe4 100644
--- a/Fedora-Workstation-39.sh
+++ b/Fedora-Workstation-39.sh
@@ -83,6 +83,8 @@ sudo systemctl restart NetworkManager
 unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/automount-disable | sudo tee /etc/dconf/db/local.d/automount-disable
 unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/locks/automount-disable | sudo tee /etc/dconf/db/local.d/locks/automount-disable
 unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/prefer-dark | sudo tee /etc/dconf/db/local.d/prefer-dark
+unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/button-layout | sudo tee /etc/dconf/db/local.d/button-layout
+sudo chmod 644 /etc/dconf/db/local.d/*
 sudo dconf update
 
 # Setup ZRAM
@@ -208,7 +210,4 @@ if [ "$virt_type" = '' ] || [ "${MACHINE_TYPE}" == 'x86_64' ]; then
     fi
 fi
 
-output 'The script is done. You can also remove gnome-terminal since gnome-console will replace it.'
-
-#Enable Titlebar buttons
-gsettings set org.gnome.desktop.wm.preferences button-layout 'appmenu:minimize,maximize,close'
\ No newline at end of file
+output 'The script is done. You can also remove gnome-terminal since gnome-console will replace it.'
\ No newline at end of file
diff --git a/Ubuntu-22.04-Desktop.sh b/Ubuntu-22.04-Desktop.sh
index ad14bc6..ef32db9 100644
--- a/Ubuntu-22.04-Desktop.sh
+++ b/Ubuntu-22.04-Desktop.sh
@@ -92,6 +92,8 @@ unpriv curl https://gitlab.com/divested/brace/-/raw/master/brace/usr/lib/systemd
 unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/dconf/db/local.d/automount-disable | sudo tee /etc/dconf/db/local.d/automount-disable
 unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/dconf/db/local.d/locks/automount-disable | sudo tee /etc/dconf/db/local.d/locks/automount-disable
 unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/prefer-dark | sudo tee /etc/dconf/db/local.d/prefer-dark
+unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dconf/db/local.d/button-layout | sudo tee /etc/dconf/db/local.d/button-layout
+sudo chmod 644 /etc/dconf/db/local.d/*
 sudo dconf update
 
 # Disable crash reports
@@ -136,7 +138,4 @@ sudo hostnamectl --transient hostname ''
 
 # Enable fstrim.timer
 sudo apt install tuned -y
-sudo systemctl enable --now fstrim.timer
-
-#Enable Titlebar buttons
-gsettings set org.gnome.desktop.wm.preferences button-layout 'appmenu:minimize,maximize,close'
\ No newline at end of file
+sudo systemctl enable --now fstrim.timer
\ No newline at end of file
diff --git a/etc/dconf/db/local.d/button-layout b/etc/dconf/db/local.d/button-layout
new file mode 100644
index 0000000..15afe7c
--- /dev/null
+++ b/etc/dconf/db/local.d/button-layout
@@ -0,0 +1,2 @@
+[org/gnome/desktop/wm/preferences]
+color-scheme='appmenu:minimize,maximize,close'
\ No newline at end of file