From 74d83a996cf3beb7fc364895004a81090f34945f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 29 Jan 2026 21:06:42 +0200
Subject: [PATCH 1/2] ISP fixes

---
 src/components/settings_modal/tabs/clutter_tab.js  |  3 ---
 .../settings_modal/tabs/filtering_tab.js           |  3 ---
 src/components/settings_modal/tabs/layout_tab.js   | 14 ++++++++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js
index eb7d64a53..903ffe540 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -24,9 +24,6 @@ const ClutterTab = {
     HelpIndicator,
   },
   computed: {
-    instanceSpecificPanelPresent() {
-      return useInstanceStore().showInstanceSpecificPanel
-    },
     ...SharedComputedObject(),
     ...mapState(useServerSideStorageStore, {
       muteFilters: (store) =>
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 0e6c6c725..fc1d4da4c 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -91,9 +91,6 @@ const FilteringTab = {
     HelpIndicator,
   },
   computed: {
-    instanceSpecificPanelPresent() {
-      return useInstanceStore().instanceIdentity.showInstanceSpecificPanel
-    },
     ...SharedComputedObject(),
     ...mapState(useServerSideStorageStore, {
       muteFilters: (store) =>
diff --git a/src/components/settings_modal/tabs/layout_tab.js b/src/components/settings_modal/tabs/layout_tab.js
index 9accd1979..c69e570f5 100644
--- a/src/components/settings_modal/tabs/layout_tab.js
+++ b/src/components/settings_modal/tabs/layout_tab.js
@@ -1,3 +1,5 @@
+import { mapState } from 'pinia'
+
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
@@ -31,12 +33,12 @@ const GeneralTab = {
     ProfileSettingIndicator,
   },
   computed: {
-    postFormats() {
-      return useInstanceStore().featureSet.postFormats || []
-    },
-    instanceShoutboxPresent() {
-      return useInstanceStore().featureSet.shoutAvailable
-    },
+    ...mapState(useInstanceStore, {
+      postFormats: (store) => store.featureSet.postFormats || [],
+      instanceSpecificPanelPresent: (store) =>
+        store.instanceIdentity.instanceSpecificPanelPresent,
+      instanceShoutboxPresent: (store) => store.featureSet.shoutAvailable,
+    }),
     columns() {
       const mode = this.$store.getters.mergedConfig.thirdColumnMode
 

From 3cdcfe19f4974645e0e88b40550cb8d96d33f2f7 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 29 Jan 2026 21:15:17 +0200
Subject: [PATCH 2/2] minor change for consistency sake

---
 src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.js b/src/App.js
index 916b5b33a..220f563f8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -83,7 +83,7 @@ export default {
     window.addEventListener('resize', this.updateMobileState)
     this.scrollParent.addEventListener('scroll', this.updateScrollState)
 
-    if (useInterfaceStore().themeApplied) {
+    if (this.themeApplied) {
       this.setThemeBodyClass()
       this.removeSplash()
     }