diff --git a/bin/omarchy-theme-set-gnome b/bin/omarchy-theme-set-gnome
index a19b59f1..61a9d8d3 100755
--- a/bin/omarchy-theme-set-gnome
+++ b/bin/omarchy-theme-set-gnome
@@ -3,6 +3,13 @@
 # omarchy:summary=Apply the current theme to GNOME color mode and icon settings
 # omarchy:hidden=true
 
+# gsettings needs a user DBus session. During ISO installs this command can be
+# reached from arch-chroot while applying the initial Omarchy theme; defer until
+# the user has a real session instead of emitting dconf warnings.
+if [[ -z ${DBUS_SESSION_BUS_ADDRESS:-} ]]; then
+  exit 0
+fi
+
 THEME_DIR=~/.config/omarchy/current/theme
 COLORS_FILE="$THEME_DIR/colors.toml"
 
diff --git a/install/login/hibernation.sh b/install/login/hibernation.sh
index 5983020d..f6e94129 100644
--- a/install/login/hibernation.sh
+++ b/install/login/hibernation.sh
@@ -1,6 +1,4 @@
 # Run before limine-snapper.sh so the resume hook + cmdline drop-ins are in
-# place when `pacman -S limine-mkinitcpio-hook` triggers its single full UKI
-# rebuild. The --no-rebuild flag tells the script to skip its own rebuild —
-# limine-snapper's pacman install will produce a UKI that already includes
-# hibernation.
+# place before limine-snapper performs the final Limine UKI build. The
+# --no-rebuild flag tells hibernation setup to only write config here.
 omarchy-hibernation-setup --force --no-rebuild