diff --git a/debian/files b/debian/files
deleted file mode 100644
index f1b49bd..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-tileos-settings-river_0.1~tileos_source.buildinfo x11 optional
diff --git a/etc/profile.d/river.sh b/etc/profile.d/river.sh
deleted file mode 100755
index da20367..0000000
--- a/etc/profile.d/river.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-# Set XDG_CURRENT_DESKTOP to River (for screencasting and screensharing capabilities)
-export XDG_CURRENT_DESKTOP=river
-
-# TileOS specific config dir
-export XDG_CONFIG_DIRS=/etc/xdg/xdg-tileos:/etc/xdg
-
-# Force Wayland for Mozilla Firefox
-export MOZ_ENABLE_WAYLAND=1
-export MOZ_DBUS_REMOTE=1
-
-# Force Wayland for Qt apps
-export QT_QPA_PLATFORM="wayland;xcb"
-export QT_QPA_PLATFORMTHEME=qt5ct
-
-# Force Wayland for EFL (Enlightenment) apps
-export ECORE_EVAS_ENGINE="wayland-egl"
-export ELM_ACCEL="gl"
-
-# Java XWayland blank screens fix
-export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/etc/skel/.config/river/environment b/etc/skel/.config/river/environment
new file mode 100644
index 0000000..6b53f94
--- /dev/null
+++ b/etc/skel/.config/river/environment
@@ -0,0 +1,3 @@
+# This file is a part of TileOS configuration for River and will be sourced
+# from /usr/bin/start-river script for all users of the system.
+# User-specific variables should be placed in $XDG_CONFIG_HOME/river/environment
diff --git a/etc/skel/.config/river/environment.sh b/etc/skel/.config/river/environment.sh
deleted file mode 100755
index 1d7df43..0000000
--- a/etc/skel/.config/river/environment.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Force Wayland for Mozilla Firefox
-export MOZ_ENABLE_WAYLAND=1
-export MOZ_DBUS_REMOTE=1
-
-# Force Wayland for Qt apps
-export QT_QPA_PLATFORM="wayland;xcb"
-export QT_QPA_PLATFORMTHEME=qt5ct
-
-# Force Wayland for EFL (Enlightenment) apps
-export ECORE_EVAS_ENGINE="wayland-egl"
-export ELM_ACCEL="gl"
-
-# Java XWayland blank screens fix
-export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/etc/skel/.config/river/init b/etc/skel/.config/river/init
index a8e120f..b83cc0a 100755
--- a/etc/skel/.config/river/init
+++ b/etc/skel/.config/river/init
@@ -1,14 +1,4 @@
-#!/bin/sh
-
-# This is the example configuration file for river.
-#
-# If you wish to edit this, you will probably want to copy it to
-# $XDG_CONFIG_HOME/river/init or $HOME/.config/river/init first.
-#
-# See the river(1), riverctl(1), and rivertile(1) man pages for complete
-# documentation.
-
-# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
+#!/usr/bin/env bash
 
 # Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
 riverctl map normal Super+Shift Return spawn foot
diff --git a/usr/bin/start-river b/usr/bin/start-river
new file mode 100755
index 0000000..6537699
--- /dev/null
+++ b/usr/bin/start-river
@@ -0,0 +1,53 @@
+#!/usr/bin/env sh
+
+## General exports
+export XDG_CURRENT_DESKTOP=river
+export XDG_SESSION_DESKTOP=river
+export XDG_SESSION_TYPE=wayland
+
+# Force Wayland for Mozilla Firefox
+export MOZ_ENABLE_WAYLAND=1
+export MOZ_DBUS_REMOTE=1
+
+# Force Wayland for Qt apps
+export QT_QPA_PLATFORM="wayland;xcb"
+export QT_QPA_PLATFORMTHEME=qt5ct
+
+# Force Wayland for EFL (Enlightenment) apps
+export ECORE_EVAS_ENGINE="wayland-egl"
+export ELM_ACCEL="gl"
+
+# Java XWayland blank screens fix
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+# Check if system is running in virtual machine
+case "$(systemd-detect-virt)" in
+qemu)
+  export WLR_RENDERER=pixman
+  export WLR_NO_HARDWARE_CURSORS=1
+  ;;
+kvm)
+  export WLR_NO_HARDWARE_CURSORS=1
+  ;;
+oracle)
+  export WLR_NO_HARDWARE_CURSORS=1
+  ;;
+esac
+
+# Apply Nvidia-specific variables
+if [ -d /sys/module/nvidia ]; then
+    export WLR_NO_HARDWARE_CURSORS=1
+    export GBM_BACKEND=nvidia-drm
+    export __GLX_VENDOR_LIBRARY_NAME=nvidia
+    export LIBVA_DRIVER_NAME=nvidia
+fi
+
+## Load user environment customizations
+if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/river/environment" ]; then
+    set -o allexport
+    # shellcheck source=/dev/null
+    . "${XDG_CONFIG_HOME:-$HOME/.config}/river/environment"
+    set +o allexport
+fi
+
+exec systemd-cat -- /usr/bin/river $@
diff --git a/usr/bin/start-river.sh b/usr/bin/start-river.sh
deleted file mode 100755
index f21c9e4..0000000
--- a/usr/bin/start-river.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env sh
-
-# Check if system is running in virtual machine
-case "$(systemd-detect-virt)" in
-qemu)
-  export WLR_RENDERER=pixman
-  export WLR_NO_HARDWARE_CURSORS=1
-  ;;
-kvm)
-  export WLR_NO_HARDWARE_CURSORS=1
-  ;;
-oracle)
-  export WLR_NO_HARDWARE_CURSORS=1
-  ;;
-esac
-
-exec systemd-cat -- /usr/bin/river