diff --git a/capella/autostart b/capella/autostart
index fc41979e..5e3993f9 100755
--- a/capella/autostart
+++ b/capella/autostart
@@ -8,7 +8,9 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 # Load environment variables from /etc/environment
 source /etc/environment
 
-nitrogen --restore &
+if command -v nitrogen > /dev/null; then
+  nitrogen --restore &
+fi
 
 if [ "$AUTOSTART_CAPELLA" = "1" ];
 then
diff --git a/capella/setup/provisioning.py b/capella/setup/provisioning.py
index 7d2c12e5..1ea6bd8b 100644
--- a/capella/setup/provisioning.py
+++ b/capella/setup/provisioning.py
@@ -165,9 +165,8 @@ def provide_project_dirs_to_capella_plugin(
     projects: list[_ProjectDict],
 ) -> None:
     locations = ":".join([str(project["location"]) for project in projects])
-    pathlib.Path("/etc/environment").write_text(
-        f"export MODEL_INBOX_DIRECTORIES={locations}\n", encoding="utf-8"
-    )
+    with open("/etc/environment", "a", encoding="utf-8") as f:
+        f.write(f"export MODEL_INBOX_DIRECTORIES={locations}\n")
     log.info(
         "Set environment variable MODEL_INBOX_DIRECTORIES to '%s'", locations
     )
diff --git a/remote/Dockerfile b/remote/Dockerfile
index 57727c53..de7ea4d0 100644
--- a/remote/Dockerfile
+++ b/remote/Dockerfile
@@ -27,7 +27,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
     obconf \
     gettext-base \
     xprintidle \
-    nitrogen && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* && \
+    printf '%s\n' >> /usr/share/themes/Natura/openbox-3/themerc "border.width: 3" "window.handle.width: 0"
 
 ARG XPRA_REGISTRY=https://xpra.org
 
@@ -45,13 +46,10 @@ RUN wget -qO /usr/share/keyrings/xpra.asc ${XPRA_REGISTRY}/xpra.asc && \
         nginx && \
     rm -rf /var/lib/apt/lists/*
 
+COPY openbox-launcher.sh /usr/local/bin/openbox-launcher.sh
 COPY rc.xml /etc/xdg/openbox/rc.xml
 COPY menu.xml /etc/xdg/openbox/menu.xml
 
-# Setup Nitrogen (Desktop background)
-COPY wallpaper.png /tmp/wallpaper.png
-COPY bg-saved.cfg /home/techuser/.config/nitrogen/bg-saved.cfg
-
 # Copy Supervisor Configuration
 RUN pip install --no-cache-dir supervisor==4.2.5
 COPY supervisord.conf /etc/supervisord.conf
@@ -73,7 +71,7 @@ RUN mkdir -p /run/xrdp/sockdir && \
     chown techuser /var/log && \
     chown techuser /etc/supervisord.conf /var/log/nginx /var/log/nginx/* && \
     chown techuser /etc/nginx && \
-    touch /etc/environment && chown techuser /etc/environment
+    chown techuser /etc/environment
 
 WORKDIR /home/techuser
 
diff --git a/remote/bg-saved.cfg b/remote/openbox-launcher.sh
old mode 100644
new mode 100755
similarity index 60%
rename from remote/bg-saved.cfg
rename to remote/openbox-launcher.sh
index 72f2f872..30e900c1
--- a/remote/bg-saved.cfg
+++ b/remote/openbox-launcher.sh
@@ -1,7 +1,10 @@
+#!/bin/sh
+
 # SPDX-FileCopyrightText: Copyright DB InfraGO AG and contributors
 # SPDX-License-Identifier: Apache-2.0
 
-[xin_-1]
-file=/tmp/wallpaper.png
-mode=4
-bgcolor=#000000
+xrdb -merge <<\EOF
+Xft.dpi: 96
+EOF
+
+exec openbox-session
diff --git a/remote/rc.xml b/remote/rc.xml
index 8fa1c637..13981468 100644
--- a/remote/rc.xml
+++ b/remote/rc.xml
@@ -51,8 +51,8 @@
 </placement>
 
 <theme>
-  <name>Clearlooks</name>
-  <titleLayout>NLC</titleLayout>
+  <name>Natura</name>
+  <titleLayout>NLMC</titleLayout>
   <!--
       available characters are NDSLIMC, each can occur at most once.
       N: window icon
@@ -750,7 +750,10 @@
 
   # end of the example
 -->
-  <application name="Capella">
+  <application type="splash">
+    <position force="yes"><x>50</x><y>50</y></position>
+  </application>
+  <application type="normal" title="workspace *- Capella*">
     <fullscreen>yes</fullscreen>
   </application>
 </applications>
diff --git a/remote/supervisord.xpra.conf b/remote/supervisord.xpra.conf
index e43d4a4a..29bb8f37 100644
--- a/remote/supervisord.xpra.conf
+++ b/remote/supervisord.xpra.conf
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 [program:xpra]
-command=xpra start :10 --start=/home/techuser/.config/openbox/autostart --start-env=GTK_IM_MODULE=ibus --attach=yes --daemon=no --bind-tcp=0.0.0.0:10001 --min-quality=70
+command=xpra start-desktop :10 --start=/usr/local/bin/openbox-launcher.sh --attach=yes --daemon=no --bind-tcp=0.0.0.0:10001 --min-quality=70 --input-method=keep
 user=techuser
 autorestart=true
 environment=DISPLAY=":10",XPRA_DEFAULT_CONTENT_TYPE="text",XPRA_DEFAULT_VFB_RESOLUTION="1920x1080"
diff --git a/remote/wallpaper.png b/remote/wallpaper.png
deleted file mode 100644
index e69de29b..00000000