diff --git a/Dockerfile.m4 b/Dockerfile.m4
index f6a340d..113dddd 100644
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -195,6 +195,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 	&& apt-get install -y --no-install-recommends \
 		adwaita-qt \
 		apt-utils \
+		at-spi2-core \
 		atril \
 		bash \
 		bash-completion \
@@ -206,6 +207,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 		dialog \
 		engrampa \
 		exo-utils \
+		ffmpegthumbnailer \
 		file \
 		firefox \
 		fonts-dejavu \
@@ -213,6 +215,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 		fonts-noto \
 		fonts-noto-color-emoji \
 		fuse \
+		gnome-keyring \
 		gstreamer1.0-plugins-base \
 		gstreamer1.0-plugins-good \
 		gstreamer1.0-plugins-ugly \
@@ -220,6 +223,12 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 		gtk2-engines-xfce \
 		gtk3-engines-xfce \
 		htop \
+		indicator-application \
+		indicator-datetime \
+		indicator-keyboard \
+		indicator-messages \
+		indicator-session \
+		indicator-sound \
 		iproute2 \
 		less \
 		libavcodec-extra \
@@ -258,6 +267,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 		openssh-server \
 		openssl \
 		pavucontrol \
+		policykit-1 \
 		procps \
 		psmisc \
 		pulseaudio \
@@ -265,8 +275,10 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 		ristretto \
 		runit \
 		sudo \
+		systemd \
 		thunar-archive-plugin \
 		thunar-volman \
+		tumbler \
 		tzdata \
 		unzip \
 		vlc \
@@ -276,6 +288,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 		xfce4 \
 		xfce4-indicator-plugin \
 		xfce4-notifyd \
+		xfce4-power-manager-plugins \
 		xfce4-pulseaudio-plugin \
 		xfce4-statusnotifier-plugin \
 		xfce4-taskmanager \
@@ -358,8 +371,7 @@ RUN ln -sf /dev/stdout /var/log/xrdp.log
 RUN ln -sf /dev/stdout /var/log/xrdp-sesman.log
 
 # Create /etc/skel/.xsession file
-RUN printf '%s\n' 'xfce4-session' \
-		>> /etc/skel/.xsession
+RUN printf '%s\n' 'exec xfce4-session' > /etc/skel/.xsession
 
 # Create /etc/skel/.xsessionrc file
 RUN printf '%s\n' \
@@ -372,7 +384,7 @@ RUN printf '%s\n' \
 		'export XDG_MENU_PREFIX=xfce-' \
 		'export XDG_RUNTIME_DIR=/run/user/$(id -u)' \
 		'export XDG_SESSION_DESKTOP=xubuntu' \
-		>> /etc/skel/.xsessionrc
+		> /etc/skel/.xsessionrc
 
 # Create /etc/skel/.Xauthority file
 RUN touch /etc/skel/.Xauthority
diff --git a/scripts/service/dbus-daemon/run b/scripts/service/dbus-daemon/run
index 30d10d7..b0bad27 100755
--- a/scripts/service/dbus-daemon/run
+++ b/scripts/service/dbus-daemon/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-exec /usr/bin/sudo -u messagebus /usr/bin/dbus-daemon --system --nofork
+exec 2>&1
+exec /usr/bin/chpst -u messagebus /usr/bin/dbus-daemon --system --nofork
diff --git a/scripts/service/sshd/run b/scripts/service/sshd/run
index bb20d03..83cf4c3 100755
--- a/scripts/service/sshd/run
+++ b/scripts/service/sshd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+exec 2>&1
 exec /usr/sbin/sshd -D
diff --git a/scripts/service/xdummy/run b/scripts/service/xdummy/run
index f8560e4..ea96872 100755
--- a/scripts/service/xdummy/run
+++ b/scripts/service/xdummy/run
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+exec 2>&1
 exec /usr/bin/Xorg \
 		-noreset -nolisten tcp \
 		+extension GLX +extension RANDR +extension RENDER \
diff --git a/scripts/service/xrdp-sesman/run b/scripts/service/xrdp-sesman/run
index 47707e1..58d8df9 100755
--- a/scripts/service/xrdp-sesman/run
+++ b/scripts/service/xrdp-sesman/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+exec 2>&1
 exec /usr/sbin/xrdp-sesman --nodaemon
diff --git a/scripts/service/xrdp/run b/scripts/service/xrdp/run
index 3a5c9a2..6267fe5 100755
--- a/scripts/service/xrdp/run
+++ b/scripts/service/xrdp/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+exec 2>&1
 exec /usr/sbin/xrdp --nodaemon