diff --git a/config/common_modules/systemd.yml b/config/common_modules/systemd.yml
index 89d510c..5e3a110 100644
--- a/config/common_modules/systemd.yml
+++ b/config/common_modules/systemd.yml
@@ -6,6 +6,7 @@ system:
     - com.system76.PowerDaemon.service
     - system76-power-wake.service
     - com.system76.Scheduler.service
+    - dconf-update.service
     - dx-groups.service
   masked:
     - power-profiles-daemon.service
diff --git a/config/files/usr/etc/dconf/db/gdm.d/01-gidro b/config/files/usr/etc/dconf/db/gdm.d/01-cabos
similarity index 100%
rename from config/files/usr/etc/dconf/db/gdm.d/01-gidro
rename to config/files/usr/etc/dconf/db/gdm.d/01-cabos
diff --git a/config/files/usr/etc/dconf/db/local.d/00-gnome-settings b/config/files/usr/etc/dconf/db/local.d/01-cabos
similarity index 88%
rename from config/files/usr/etc/dconf/db/local.d/00-gnome-settings
rename to config/files/usr/etc/dconf/db/local.d/01-cabos
index 8e72d59..252053f 100644
--- a/config/files/usr/etc/dconf/db/local.d/00-gnome-settings
+++ b/config/files/usr/etc/dconf/db/local.d/01-cabos
@@ -10,6 +10,7 @@ dynamic-workspaces = false
 current-workspace-only = false
 
 [org/gnome/desktop/wm/preferences]
+button-layout=":minimize,maximize,close"
 num-workspaces = 4
 
 [org/gnome/desktop/wm/keybindings]
@@ -39,6 +40,18 @@ night-light-enabled = true
 [org/gnome/desktop/interface]
 text-scaling-factor = 1.25
 
+[org/gnome/software]
+allow-updates=false
+download-updates=false
+download-updates-notify=false
+packaging-format-preference=['flatpak:flathub-user']
+
+[org/gtk/gtk4/settings/file-chooser]
+sort-directories-first=true
+
+[org/gtk/settings/file-chooser]
+sort-directories-first=true
+
 [org/gnome/mutter]
 experimental-features=['scale-monitor-framebuffer']
 
diff --git a/config/files/usr/etc/dconf/profile/gdm b/config/files/usr/etc/dconf/profile/gdm
index a924a4a..817afc5 100644
--- a/config/files/usr/etc/dconf/profile/gdm
+++ b/config/files/usr/etc/dconf/profile/gdm
@@ -1,3 +1,3 @@
 user-db:user
-system-db:local
+system-db:gdm
 file-db:/usr/share/gdm/greeter-dconf-defaults
diff --git a/config/files/usr/etc/dconf/profile/user b/config/files/usr/etc/dconf/profile/user
index aca0641..ca120ee 100644
--- a/config/files/usr/etc/dconf/profile/user
+++ b/config/files/usr/etc/dconf/profile/user
@@ -1,2 +1,2 @@
 user-db:user
-system-db:local
+system-db:local
\ No newline at end of file
diff --git a/config/files/usr/etc/sysctl.d/10-kernel-gidro.conf b/config/files/usr/etc/sysctl.d/10-kernel-cabos.conf
similarity index 100%
rename from config/files/usr/etc/sysctl.d/10-kernel-gidro.conf
rename to config/files/usr/etc/sysctl.d/10-kernel-cabos.conf
diff --git a/config/files/usr/etc/sysctl.d/20-memory-gidro.conf b/config/files/usr/etc/sysctl.d/20-memory-cabos.conf
similarity index 100%
rename from config/files/usr/etc/sysctl.d/20-memory-gidro.conf
rename to config/files/usr/etc/sysctl.d/20-memory-cabos.conf
diff --git a/config/files/usr/etc/sysctl.d/30-networking-gidro.conf b/config/files/usr/etc/sysctl.d/30-networking-cabos.conf
similarity index 100%
rename from config/files/usr/etc/sysctl.d/30-networking-gidro.conf
rename to config/files/usr/etc/sysctl.d/30-networking-cabos.conf
diff --git a/config/files/usr/etc/sysctl.d/40-inotify-gidro.conf b/config/files/usr/etc/sysctl.d/40-inotify-cabos.conf
similarity index 100%
rename from config/files/usr/etc/sysctl.d/40-inotify-gidro.conf
rename to config/files/usr/etc/sysctl.d/40-inotify-cabos.conf
diff --git a/config/files/usr/etc/ublue-update/ublue-update.toml b/config/files/usr/etc/ublue-update/ublue-update.toml
new file mode 100644
index 0000000..efcc93c
--- /dev/null
+++ b/config/files/usr/etc/ublue-update/ublue-update.toml
@@ -0,0 +1,6 @@
+[checks]
+    min_battery_percent = 0.0
+    max_cpu_load_percent = 50.0
+    max_mem_percent = 90.0
+[notify]
+    dbus_notify = false
diff --git a/config/files/usr/lib/systemd/system/dconf-update.service b/config/files/usr/lib/systemd/system/dconf-update.service
new file mode 100644
index 0000000..7c642d0
--- /dev/null
+++ b/config/files/usr/lib/systemd/system/dconf-update.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Update the dconf database onboot
+Documentation=https://github.com/coreos/rpm-ostree/issues/1944
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/dconf update
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/config/scripts/extensions.sh b/config/scripts/extensions.sh
index 5b2e77a..0bcb9be 100755
--- a/config/scripts/extensions.sh
+++ b/config/scripts/extensions.sh
@@ -11,6 +11,7 @@ echo 'Installing extensions'
 cd /tmp
 
 git clone https://github.com/theychx/WorkspaceSwitcherWrapAround.git /usr/share/gnome-shell/extensions/workspace-switch-wraparound@theychx.org
+mv /usr/share/gnome-shell/extensions/workspace-switch-wraparound@theychx.org/src/* /usr/share/gnome-shell/extensions/workspace-switch-wraparound@theychx.org
 
 git clone https://github.com/akiirui/hide-universal-access.git /usr/share/gnome-shell/extensions/hide-universal-access@akiirui.github.io
 
@@ -22,6 +23,4 @@ cp -r gnome-disable-workspace-switcher/disable-workspace-switcher-overlay@cleard
 
 git clone https://gitlab.com/arcmenu/ArcMenu.git
 cd ArcMenu
-make DESTDIR=/ install
-
-dconf update
\ No newline at end of file
+make DESTDIR=/ install
\ No newline at end of file