diff --git a/src/App.js b/src/App.js
index 220f563f8..916b5b33a 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 (this.themeApplied) {
+    if (useInterfaceStore().themeApplied) {
       this.setThemeBodyClass()
       this.removeSplash()
     }
diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js
index 903ffe540..eb7d64a53 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -24,6 +24,9 @@ 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 fc1d4da4c..0e6c6c725 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -91,6 +91,9 @@ 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 c69e570f5..9accd1979 100644
--- a/src/components/settings_modal/tabs/layout_tab.js
+++ b/src/components/settings_modal/tabs/layout_tab.js
@@ -1,5 +1,3 @@
-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'
@@ -33,12 +31,12 @@ const GeneralTab = {
     ProfileSettingIndicator,
   },
   computed: {
-    ...mapState(useInstanceStore, {
-      postFormats: (store) => store.featureSet.postFormats || [],
-      instanceSpecificPanelPresent: (store) =>
-        store.instanceIdentity.instanceSpecificPanelPresent,
-      instanceShoutboxPresent: (store) => store.featureSet.shoutAvailable,
-    }),
+    postFormats() {
+      return useInstanceStore().featureSet.postFormats || []
+    },
+    instanceShoutboxPresent() {
+      return useInstanceStore().featureSet.shoutAvailable
+    },
     columns() {
       const mode = this.$store.getters.mergedConfig.thirdColumnMode