diff --git a/environments/river/default.nix b/environments/river/default.nix
index 02e5a74..27f6807 100644
--- a/environments/river/default.nix
+++ b/environments/river/default.nix
@@ -12,7 +12,7 @@
       };
       initial_session = {
         # zsh -c is to give river access to profile variables
-        command = "zsh -c river";
+        command = "river";
         user = "zoriya";
       };
     };
diff --git a/environments/river/home.nix b/environments/river/home.nix
index 79400a5..0322abb 100644
--- a/environments/river/home.nix
+++ b/environments/river/home.nix
@@ -152,6 +152,13 @@ in {
       StopWhenUnneeded = true;
       Conflicts = ["graphical-session.target" "graphical-session-pre.target" "river-session.target"];
       After = ["graphical-session.target" "graphical-session-pre.target" "river-session.target"];
+      Before = ["shutdown.target"];
+    };
+    Service = {
+      ExecStart = "${pkgs.procps}/bin/pidof river && ${pkgs.river}/bin/riverctl exit";
+    };
+    Install = {
+      WantedBy = ["shutdown.target"];
     };
   };
 
diff --git a/modules/wm/ags/modules/darkmode.js b/modules/wm/ags/modules/darkmode.js
index 08ef2e2..7142641 100644
--- a/modules/wm/ags/modules/darkmode.js
+++ b/modules/wm/ags/modules/darkmode.js
@@ -44,7 +44,7 @@ function init() {
 
 		const conf = GLib.get_user_config_dir();
 		Utils.execAsync(
-			`bash -c 'ln -sf ${conf}/kitty/${theme.value}.conf ${conf}/kitty/theme.conf && pkill -USR1 kitty'`,
+			`/bin/sh -c 'ln -sf ${conf}/kitty/${theme.value}.conf ${conf}/kitty/theme.conf && pkill -USR1 kitty'`,
 		).catch(print);
 	});
 }
diff --git a/modules/wm/ags/services/brightness.js b/modules/wm/ags/services/brightness.js
index e5e554d..65dca83 100644
--- a/modules/wm/ags/services/brightness.js
+++ b/modules/wm/ags/services/brightness.js
@@ -1,5 +1,5 @@
 const screen = await Utils.execAsync(
-	"bash -c 'ls -w1 /sys/class/backlight | head -n 1'",
+	"/bin/sh -c 'ls -w1 /sys/class/backlight | head -n 1'",
 );
 const max = Number(await Utils.execAsync("brightnessctl m"));
 
diff --git a/modules/wm/home.nix b/modules/wm/home.nix
index feaca04..dd01e88 100644
--- a/modules/wm/home.nix
+++ b/modules/wm/home.nix
@@ -34,7 +34,6 @@ in {
         size = "250, 50";
         outline_thickness = 0;
         dots_size = 0.26;
-        inner_color = "rgb(255, 0, 0)";
         dots_spacing = 0.64;
         dots_center = true;
         fade_on_empty = true;
@@ -49,7 +48,6 @@ in {
         {
           monitor = "";
           text = ''cmd[update:1000] echo "<b><big> $(${pkgs.coreutils}/bin/date +"%H:%M") </big></b>"'';
-          color = "rgb(255, 0, 0)";
 
           font_size = 64;
           font_family = "monospace";
@@ -62,7 +60,6 @@ in {
         {
           monitor = "";
           text = ''cmd[update:18000000] echo "<b> "$(${pkgs.coreutils}/bin/date +'%A, %-d %B %Y')" </b>"'';
-          color = "rgb(255, 0, 0)";
 
           font_size = 24;
           font_family = "monospace";