diff --git a/config/wayland.toml b/config/wayland.toml
index 475527110..15dce7d01 100644
--- a/config/wayland.toml
+++ b/config/wayland.toml
@@ -7,23 +7,28 @@ include = ["desktop.toml"]
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 4096
+filesystem_size = 2048
 
 # Package settings
 [packages]
+adwaita-icon-theme = {}
+gtk3 = {}
+libxcursor = {}
 mesa = {}
 smallvil = {}
 softbuffer-wayland = {}
 wayland-rs = {}
+webkitgtk3 = {}
 winit-wayland = {}
 xkeyboard-config = {}
 
 [[files]]
 path = "/usr/lib/init.d/10_wayland_env"
 data = """
-export XDG_RUNTIME_DIR /run/user/0
+export XDG_RUNTIME_DIR /tmp/run/user/0
 mkdir -p $XDG_RUNTIME_DIR
 export WAYLAND_DISPLAY wayland-1
+glib-compile-schemas /usr/share/glib-2.0/schemas/
 """
 
 [[files]]
@@ -42,7 +47,16 @@ export LD_DEBUG=all
 export RUST_LOG=debug
 smallvil_smallvil &
 sleep 2
-softbuffer-wayland_animation &
+env G_MAIN_POLL_DEBUG=1 G_MESSAGES_DEBUG=all LD_DEBUG=all WEBKIT_DEBUG=all MiniBrowser&
+#softbuffer-wayland_animation &
 #wayland-rs_simple_window &
 #winit-wayland_window &
 """
+
+[[files]]
+path = "/etc/gtk-3.0/settings.ini"
+data = """
+[Settings]
+gtk-cursor-theme-name = "Adwaita"
+gtk-icon-theme-name = "Adwaita"
+"""
diff --git a/config/x11.toml b/config/x11.toml
index af174cd7f..03e64523c 100644
--- a/config/x11.toml
+++ b/config/x11.toml
@@ -11,19 +11,23 @@ filesystem_size = 2048
 
 # Package settings
 [packages]
-feh = {}
+adwaita-icon-theme = {}
+caja = {}
+dbus = {}
 gtk3 = {}
-htop = {}
-libnettle = {}
-llvm18 = {}
-mesa-x11 = {}
+marco = {}
+mate-control-center = {}
+mate-icon-theme = {}
+mate-panel = {}
+mate-session-manager = {}
+mate-settings-daemon = {}
+mate-terminal = {}
 mesa-demos-x11 = {}
-#servo = {}
-sqlite3 = {}
-twm = {}
-#webkitgtk3 = {}
+webkitgtk3 = {}
 xev = {}
 xeyes = {}
+#xfce4-panel = {}
+#xfwm4 = {}
 xinit = {}
 xkbcomp = {}
 xkbutils = {}
@@ -31,14 +35,24 @@ xkeyboard-config = {}
 xserver-xorg = {}
 xserver-xorg-video-orbital = {}
 xterm = {}
+zenity = {}
+
+[[files]]
+path = "/usr/lib/init.d/10_dbus"
+data = """
+export DBUS_DEBUG_OUTPUT=1
+#export DBUS_VERBOSE=1
+#export G_DBUS_DEBUG=all
+mkdir -p /var/lib/dbus
+dbus-uuidgen --ensure
+mkdir -p /run/dbus
+dbus-daemon --system
+"""
 
 [[files]]
 path = "/usr/lib/init.d/10_xenv"
 data = """
 export DISPLAY :0
-export G_MESSAGES_DEBUG all
-export LD_DEBUG all
-export WEBKIT_DEBUG all
 glib-compile-schemas /usr/share/glib-2.0/schemas/
 """
 
@@ -92,11 +106,47 @@ Section "Screen"
 EndSection
 EOF
 
-# Launch X11, twm, and xterm on display 0
+# Launch X11 and session on display 0
 export DISPLAY=":0"
-X "${DISPLAY}" -verbose 6 &
+X "${DISPLAY}" &
 sleep 1
-feh --bg-max --no-fehbg --randomize /ui/background.jpg &
-twm &
-xterm &
+exec dbus-launch --exit-with-x11 orbital-x11-session
 """
+
+[[files]]
+path = "/usr/bin/orbital-x11-session"
+mode = 0o755
+data = """
+#!/usr/bin/env bash
+
+set -ex
+
+xterm&
+sleep 1
+mate-session&
+"""
+
+[[files]]
+path = "/usr/bin/browser"
+mode = 0o755
+data = """
+#!/usr/bin/env bash
+
+set -ex
+
+#export G_MAIN_POLL_DEBUG=1
+export G_MESSAGES_DEBUG=all
+#export GDK_DEBUG=all
+#export GTK_DEBUG=all
+export LD_DEBUG=all
+#export WEBKIT_DEBUG=all
+exec MiniBrowser --dark-mode --ignore-tls-errors "about:blank"
+"""
+
+[users.messagebus]
+uid = 100
+gid = 100
+name = "messagebus"
+home = "/nonexistent"
+shell = "/usr/bin/false"
+