diff --git a/app/src/main/java/io/xpipe/app/core/AppTheme.java b/app/src/main/java/io/xpipe/app/core/AppTheme.java
index 4eedead49..fcd8e80d0 100644
--- a/app/src/main/java/io/xpipe/app/core/AppTheme.java
+++ b/app/src/main/java/io/xpipe/app/core/AppTheme.java
@@ -97,9 +97,9 @@ public class AppTheme {
         }
 
         try {
-            var lastSystemDark = AppCache.getBoolean("lastTheme", false);
+            var lastSystemDark = AppCache.getBoolean("lastDarkTheme", false);
             var nowDark = Platform.getPreferences().getColorScheme() == ColorScheme.DARK;
-            AppCache.update("lastTheme", nowDark);
+            AppCache.update("lastDarkTheme", nowDark);
             if (AppPrefs.get().theme.getValue() == null || lastSystemDark != nowDark) {
                 setDefault();
             }
@@ -129,6 +129,7 @@ public class AppTheme {
         TrackEvent.debug("Set theme " + t.getId() + " for scene");
 
         AppPrefs.get().theme.addListener((c, o, n) -> {
+            AppCache.update("lastDarkTheme", n != null && n.isDark());
             changeTheme(n);
         });
 
diff --git a/dist/changelogs/13.0.md b/dist/changelogs/13.0.md
index d07bcfc25..b3ada7203 100644
--- a/dist/changelogs/13.0.md
+++ b/dist/changelogs/13.0.md
@@ -29,9 +29,7 @@ There's now a new mechanism in place for checking for security updates separatel
 ## Fixes
 
 - Fix VM SSH connections not being able to use the keys and identities from the local system
-- Fix vmware integration failing when files other than vmx were in the VM directories
+- Fix vmware integration failing when files other than .vmx were in the VM directories
 - Fix style issues with the mocha theme
 - Fix color contrast for some themes
 - Fix system dark mode changes not being applied if they were changed while XPipe was not running
-- Fix shell environment scan restarting shell connection multiple times
-- Fix zsh local shell freezing if a zsh extension had a pending update
diff --git a/version b/version
index 8f305e2b2..4d78ac4fe 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-13.0-7
+13.0-8