diff --git a/apps/roam/src/components/DiscourseContextOverlay.tsx b/apps/roam/src/components/DiscourseContextOverlay.tsx
index f4e83691d..8ef2ede56 100644
--- a/apps/roam/src/components/DiscourseContextOverlay.tsx
+++ b/apps/roam/src/components/DiscourseContextOverlay.tsx
@@ -11,12 +11,10 @@ import ReactDOM from "react-dom";
 import { ContextContent } from "./DiscourseContext";
 import useInViewport from "react-in-viewport/dist/es/lib/useInViewport";
 import normalizePageTitle from "roamjs-components/queries/normalizePageTitle";
-import { USE_STORED_RELATIONS } from "~/data/userSettings";
-import { getSetting } from "~/utils/extensionSettings";
 import deriveDiscourseNodeAttribute from "~/utils/deriveDiscourseNodeAttribute";
-import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
-import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
-import getSubTree from "roamjs-components/util/getSubTree";
+import { getDiscourseNodeSetting } from "~/components/settings/utils/accessors";
+import { DISCOURSE_NODE_KEYS } from "~/components/settings/utils/settingKeys";
+import { getStoredRelationsEnabled } from "~/utils/storedRelations";
 import nanoid from "nanoid";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 import getDiscourseContextResults from "~/utils/getDiscourseContextResults";
@@ -190,11 +188,10 @@ const useDiscourseContext = (uid: string, tag: string) => {
                   ).length,
               )
               .reduce((acc, cur) => acc + cur, 0);
-            const attribute = getSettingValueFromTree({
-              tree: getBasicTreeByParentUid(discourseNode.type),
-              key: "Overlay",
-              defaultValue: "Overlay",
-            });
+            const attribute =
+              getDiscourseNodeSetting<string>(discourseNode.type, [
+                DISCOURSE_NODE_KEYS.overlay,
+              ]) || "Overlay";
             return deriveDiscourseNodeAttribute({
               uid: uid,
               attribute,
@@ -203,17 +200,11 @@ const useDiscourseContext = (uid: string, tag: string) => {
               setRefs(refs);
               setScore(score);
 
-              const nodeType = discourseNode.type;
-              const attributeNode = getSubTree({
-                tree: getBasicTreeByParentUid(nodeType || ""),
-                key: "Attributes",
-              });
-              const scoreFormula = attributeNode?.children
-                ? getSettingValueFromTree({
-                    tree: attributeNode.children,
-                    key: attribute,
-                  })
-                : "";
+              const scoreFormula =
+                getDiscourseNodeSetting<string>(discourseNode.type, [
+                  DISCOURSE_NODE_KEYS.attributes,
+                  attribute,
+                ]) ?? "";
               if (scoreFormula === "" && score !== numResults) {
                 internalError({
                   error: "DiscourseContext: Score does not match Num relations",
@@ -222,7 +213,7 @@ const useDiscourseContext = (uid: string, tag: string) => {
                     score,
                     numResults,
                     ignoreCache,
-                    reified: getSetting<boolean>(USE_STORED_RELATIONS),
+                    reified: getStoredRelationsEnabled(),
                   },
                 });
               }
diff --git a/apps/roam/src/components/DiscourseFloatingMenu.tsx b/apps/roam/src/components/DiscourseFloatingMenu.tsx
index 07f71b694..3a7e337b9 100644
--- a/apps/roam/src/components/DiscourseFloatingMenu.tsx
+++ b/apps/roam/src/components/DiscourseFloatingMenu.tsx
@@ -13,6 +13,8 @@ import {
 import { FeedbackWidget } from "./BirdEatsBugs";
 import { render as renderSettings } from "~/components/settings/Settings";
 import posthog from "posthog-js";
+import { getPersonalSetting } from "./settings/utils/accessors";
+import { PERSONAL_KEYS } from "./settings/utils/settingKeys";
 
 type DiscourseFloatingMenuProps = {
   // CSS placement class
@@ -128,7 +130,7 @@ export const installDiscourseFloatingMenu = (
     floatingMenuAnchor.id = ANCHOR_ID;
     document.getElementById("app")?.appendChild(floatingMenuAnchor);
   }
-  if (onLoadArgs.extensionAPI.settings.get("hide-feedback-button") as boolean) {
+  if (getPersonalSetting<boolean>([PERSONAL_KEYS.hideFeedbackButton])) {
     floatingMenuAnchor.classList.add("hidden");
   }
   ReactDOM.render(
diff --git a/apps/roam/src/components/DiscourseNodeMenu.tsx b/apps/roam/src/components/DiscourseNodeMenu.tsx
index f458e80a7..c7f2e2b96 100644
--- a/apps/roam/src/components/DiscourseNodeMenu.tsx
+++ b/apps/roam/src/components/DiscourseNodeMenu.tsx
@@ -27,7 +27,11 @@ import { getNewDiscourseNodeText } from "~/utils/formatUtils";
 import { OnloadArgs } from "roamjs-components/types";
 import { formatHexColor } from "./settings/DiscourseNodeCanvasSettings";
 import posthog from "posthog-js";
-import { setPersonalSetting } from "~/components/settings/utils/accessors";
+import {
+  getPersonalSetting,
+  setPersonalSetting,
+} from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 
 type Props = {
   textarea?: HTMLTextAreaElement;
@@ -423,9 +427,12 @@ export const NodeMenuTriggerComponent = ({
   const [isActive, setIsActive] = useState(false);
   const [comboKey, setComboKey] = useState<IKeyCombo>(
     () =>
-      (extensionAPI.settings.get(
-        "personal-node-menu-trigger",
-      ) as IKeyCombo) || { modifiers: 0, key: "" },
+      getPersonalSetting<IKeyCombo>([
+        PERSONAL_KEYS.personalNodeMenuTrigger,
+      ]) || {
+        modifiers: 0,
+        key: "",
+      },
   );
 
   const handleKeyDown = useCallback(
@@ -438,7 +445,7 @@ export const NodeMenuTriggerComponent = ({
       const combo = { key: comboObj.key, modifiers: comboObj.modifiers };
       setComboKey(combo);
       void extensionAPI.settings.set("personal-node-menu-trigger", combo);
-      setPersonalSetting(["Personal node menu trigger"], combo);
+      setPersonalSetting([PERSONAL_KEYS.personalNodeMenuTrigger], combo);
     },
     [extensionAPI],
   );
@@ -460,7 +467,7 @@ export const NodeMenuTriggerComponent = ({
           onClick={() => {
             setComboKey({ modifiers: 0, key: "" });
             void extensionAPI.settings.set("personal-node-menu-trigger", "");
-            setPersonalSetting(["Personal node menu trigger"], "");
+            setPersonalSetting([PERSONAL_KEYS.personalNodeMenuTrigger], "");
           }}
           minimal
         />
diff --git a/apps/roam/src/components/DiscourseNodeSearchMenu.tsx b/apps/roam/src/components/DiscourseNodeSearchMenu.tsx
index abef73705..03fdfc82d 100644
--- a/apps/roam/src/components/DiscourseNodeSearchMenu.tsx
+++ b/apps/roam/src/components/DiscourseNodeSearchMenu.tsx
@@ -24,9 +24,12 @@ import { OnloadArgs } from "roamjs-components/types";
 import getDiscourseNodes, { DiscourseNode } from "~/utils/getDiscourseNodes";
 import getDiscourseNodeFormatExpression from "~/utils/getDiscourseNodeFormatExpression";
 import { Result } from "~/utils/types";
-import { getSetting } from "~/utils/extensionSettings";
 import MiniSearch from "minisearch";
-import { setPersonalSetting } from "~/components/settings/utils/accessors";
+import {
+  getPersonalSetting,
+  setPersonalSetting,
+} from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 
 type Props = {
   textarea: HTMLTextAreaElement;
@@ -711,7 +714,7 @@ export const NodeSearchMenuTriggerSetting = ({
 }) => {
   const extensionAPI = onloadArgs.extensionAPI;
   const [nodeSearchTrigger, setNodeSearchTrigger] = useState<string>(
-    getSetting("node-search-trigger", "@"),
+    getPersonalSetting<string>([PERSONAL_KEYS.nodeSearchMenuTrigger]) ?? "@",
   );
 
   const handleNodeSearchTriggerChange = (
@@ -726,7 +729,7 @@ export const NodeSearchMenuTriggerSetting = ({
 
     setNodeSearchTrigger(trigger);
     void extensionAPI.settings.set("node-search-trigger", trigger);
-    setPersonalSetting(["Node search menu trigger"], trigger);
+    setPersonalSetting([PERSONAL_KEYS.nodeSearchMenuTrigger], trigger);
   };
   return (
     <InputGroup
diff --git a/apps/roam/src/components/LeftSidebarView.tsx b/apps/roam/src/components/LeftSidebarView.tsx
index 4647d3238..be9e2e528 100644
--- a/apps/roam/src/components/LeftSidebarView.tsx
+++ b/apps/roam/src/components/LeftSidebarView.tsx
@@ -22,14 +22,33 @@ import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTit
 import openBlockInSidebar from "roamjs-components/writes/openBlockInSidebar";
 import extractRef from "roamjs-components/util/extractRef";
 import {
-  getFormattedConfigTree,
-  notify,
-  subscribe,
-} from "~/utils/discourseConfigRef";
-import type {
-  LeftSidebarConfig,
-  LeftSidebarPersonalSectionConfig,
+  onSettingChange,
+  settingKeys,
+} from "~/components/settings/utils/settingsEmitter";
+import {
+  type LeftSidebarConfig,
+  type LeftSidebarPersonalSectionConfig,
+  mergeGlobalSectionWithAccessor,
+  mergePersonalSectionsWithAccessor,
 } from "~/utils/getLeftSidebarSettings";
+import discourseConfigRef, { notify } from "~/utils/discourseConfigRef";
+import { getLeftSidebarSettings } from "~/utils/getLeftSidebarSettings";
+import {
+  getGlobalSetting,
+  getPersonalSetting,
+  setGlobalSetting,
+  setPersonalSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  PERSONAL_KEYS,
+  GLOBAL_KEYS,
+  LEFT_SIDEBAR_KEYS,
+  LEFT_SIDEBAR_SETTINGS_KEYS,
+} from "~/components/settings/utils/settingKeys";
+import type {
+  LeftSidebarGlobalSettings,
+  PersonalSection,
+} from "~/components/settings/utils/zodSchema";
 import { createBlock } from "roamjs-components/writes";
 import deleteBlock from "roamjs-components/writes/deleteBlock";
 import getTextByBlockUid from "roamjs-components/queries/getTextByBlockUid";
@@ -39,11 +58,14 @@ import { SettingsDialog } from "./settings/Settings";
 import { OnloadArgs } from "roamjs-components/types";
 import renderOverlay from "roamjs-components/util/renderOverlay";
 import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 import getPageTitleByPageUid from "roamjs-components/queries/getPageTitleByPageUid";
 import { migrateLeftSidebarSettings } from "~/utils/migrateLeftSidebarSettings";
 import posthog from "posthog-js";
 
+const getCurrentLeftSidebarConfig = (): LeftSidebarConfig =>
+  getLeftSidebarSettings(discourseConfigRef.tree);
+
 const parseReference = (text: string) => {
   const extracted = extractRef(text);
   if (text.startsWith("((") && text.endsWith("))")) {
@@ -95,12 +117,18 @@ const toggleFoldedState = ({
   setIsOpen,
   folded,
   parentUid,
+  isGlobal,
+  sectionIndex,
 }: {
   isOpen: boolean;
   setIsOpen: Dispatch<SetStateAction<boolean>>;
   folded: { uid?: string; value: boolean };
   parentUid: string;
+  isGlobal?: boolean;
+  sectionIndex?: number;
 }) => {
+  const newFolded = !isOpen;
+
   if (isOpen) {
     setIsOpen(false);
     if (folded.uid) {
@@ -118,6 +146,24 @@ const toggleFoldedState = ({
     folded.uid = newUid;
     folded.value = true;
   }
+
+  if (isGlobal) {
+    setGlobalSetting(
+      [
+        GLOBAL_KEYS.leftSidebar,
+        LEFT_SIDEBAR_KEYS.settings,
+        LEFT_SIDEBAR_SETTINGS_KEYS.folded,
+      ],
+      newFolded,
+    );
+  } else if (sectionIndex !== undefined) {
+    const sections =
+      getPersonalSetting<PersonalSection[]>([PERSONAL_KEYS.leftSidebar]) || [];
+    if (sections[sectionIndex]) {
+      sections[sectionIndex].Settings.Folded = newFolded;
+      setPersonalSetting([PERSONAL_KEYS.leftSidebar], sections);
+    }
+  }
 };
 
 const SectionChildren = ({
@@ -160,8 +206,10 @@ const SectionChildren = ({
 
 const PersonalSectionItem = ({
   section,
+  sectionIndex,
 }: {
   section: LeftSidebarPersonalSectionConfig;
+  sectionIndex: number;
 }) => {
   const titleRef = parseReference(section.text);
   const blockText = useMemo(
@@ -182,6 +230,7 @@ const PersonalSectionItem = ({
       setIsOpen,
       folded: section.settings.folded,
       parentUid: section.settings.uid || "",
+      sectionIndex,
     });
   };
 
@@ -226,9 +275,9 @@ const PersonalSections = ({ config }: { config: LeftSidebarConfig }) => {
 
   return (
     <div className="personal-left-sidebar-sections">
-      {sections.map((section) => (
+      {sections.map((section, index) => (
         <div key={section.uid}>
-          <PersonalSectionItem section={section} />
+          <PersonalSectionItem section={section} sectionIndex={index} />
         </div>
       ))}
     </div>
@@ -253,6 +302,7 @@ const GlobalSection = ({ config }: { config: LeftSidebarConfig["global"] }) => {
             setIsOpen,
             folded: config.settings.folded,
             parentUid: config.settings.uid,
+            isGlobal: true,
           });
         }}
       >
@@ -276,22 +326,61 @@ const GlobalSection = ({ config }: { config: LeftSidebarConfig["global"] }) => {
   );
 };
 
+// TODO(ENG-1471): Remove old-system merge when migration complete — just use accessor values directly.
+// See mergeGlobalSectionWithAccessor/mergePersonalSectionsWithAccessor for why the merge exists.
+const buildConfig = (): LeftSidebarConfig => {
+  // Read VALUES from accessor (handles flag routing + mismatch detection)
+  const globalValues = getGlobalSetting<LeftSidebarGlobalSettings>([
+    GLOBAL_KEYS.leftSidebar,
+  ]);
+  const personalValues = getPersonalSetting<PersonalSection[]>([
+    PERSONAL_KEYS.leftSidebar,
+  ]);
+
+  // Read UIDs from old system (needed for fold CRUD during dual-write)
+  const oldConfig = getCurrentLeftSidebarConfig();
+
+  return {
+    uid: oldConfig.uid,
+    favoritesMigrated: oldConfig.favoritesMigrated,
+    sidebarMigrated: oldConfig.sidebarMigrated,
+    global: mergeGlobalSectionWithAccessor(oldConfig.global, globalValues),
+    personal: {
+      uid: oldConfig.personal.uid,
+      sections: mergePersonalSectionsWithAccessor(
+        oldConfig.personal.sections,
+        personalValues,
+      ),
+    },
+    allPersonalSections: oldConfig.allPersonalSections,
+  };
+};
+
 export const useConfig = () => {
-  const [config, setConfig] = useState(
-    () => getFormattedConfigTree().leftSidebar,
-  );
+  const [config, setConfig] = useState(() => buildConfig());
   useEffect(() => {
     const handleUpdate = () => {
-      setConfig(getFormattedConfigTree().leftSidebar);
+      setConfig(buildConfig());
     };
-    const unsubscribe = subscribe(handleUpdate);
+    const unsubGlobal = onSettingChange(
+      settingKeys.globalLeftSidebar,
+      handleUpdate,
+    );
+    const unsubPersonal = onSettingChange(
+      settingKeys.personalLeftSidebar,
+      handleUpdate,
+    );
     return () => {
-      unsubscribe();
+      unsubGlobal();
+      unsubPersonal();
     };
   }, []);
   return { config, setConfig };
 };
 
+// TODO(ENG-1471): refreshAndNotify still needed by settings panels
+// (LeftSidebarGlobalSettings, LeftSidebarPersonalSettings) for old-system CRUD.
+// Remove when settings panels also read via accessors + emitter.
 export const refreshAndNotify = () => {
   refreshConfigTree();
   notify();
@@ -420,7 +509,7 @@ const LeftSidebarView = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
 };
 
 const migrateFavorites = async () => {
-  const config = getFormattedConfigTree().leftSidebar;
+  const config = getCurrentLeftSidebarConfig();
 
   if (config.favoritesMigrated.value) return;
 
diff --git a/apps/roam/src/components/ModifyNodeDialog.tsx b/apps/roam/src/components/ModifyNodeDialog.tsx
index 3137e338f..ce2c6b834 100644
--- a/apps/roam/src/components/ModifyNodeDialog.tsx
+++ b/apps/roam/src/components/ModifyNodeDialog.tsx
@@ -280,10 +280,7 @@ const ModifyNodeDialog = ({
       }
 
       if (keyImageOption === "query-builder") {
-        const parentUid = resolveQueryBuilderRef({
-          queryRef: qbAlias,
-          extensionAPI,
-        });
+        const parentUid = resolveQueryBuilderRef({ queryRef: qbAlias });
         const results = await runQuery({
           extensionAPI,
           parentUid,
diff --git a/apps/roam/src/components/QueryEditor.tsx b/apps/roam/src/components/QueryEditor.tsx
index fbca18c49..fc7bc1d20 100644
--- a/apps/roam/src/components/QueryEditor.tsx
+++ b/apps/roam/src/components/QueryEditor.tsx
@@ -46,6 +46,10 @@ import { ALL_SELECTION_SUGGESTIONS } from "~/utils/predefinedSelections";
 import { getAlias } from "~/utils/parseResultSettings";
 import { setDiscourseNodeSetting } from "~/components/settings/utils/accessors";
 import { IndexSchema } from "~/components/settings/utils/zodSchema";
+import {
+  DISCOURSE_NODE_KEYS,
+  SPECIFICATION_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
 const getSourceCandidates = (cs: Condition[]): string[] =>
   cs.flatMap((c) =>
@@ -513,7 +517,9 @@ const QueryEditor: QueryEditorComponent = ({
     }
 
     const path =
-      settingKey === "index" ? ["index"] : ["specification", "query"];
+      settingKey === "index"
+        ? [DISCOURSE_NODE_KEYS.index]
+        : [DISCOURSE_NODE_KEYS.specification, SPECIFICATION_KEYS.query];
 
     window.clearTimeout(blockPropSyncTimeoutRef.current);
     blockPropSyncTimeoutRef.current = window.setTimeout(() => {
diff --git a/apps/roam/src/components/SuggestionsBody.tsx b/apps/roam/src/components/SuggestionsBody.tsx
index 794e60214..7f751e31f 100644
--- a/apps/roam/src/components/SuggestionsBody.tsx
+++ b/apps/roam/src/components/SuggestionsBody.tsx
@@ -24,8 +24,13 @@ import getDiscourseRelations from "~/utils/getDiscourseRelations";
 import getDiscourseNodes from "~/utils/getDiscourseNodes";
 import normalizePageTitle from "roamjs-components/queries/normalizePageTitle";
 import { type RelationDetails } from "~/utils/hyde";
-import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
 import { render as renderToast } from "roamjs-components/components/Toast";
+import { getGlobalSetting } from "~/components/settings/utils/accessors";
+import {
+  GLOBAL_KEYS,
+  SUGGESTIVE_MODE_KEYS,
+} from "~/components/settings/utils/settingKeys";
+import type { PageGroup } from "~/components/settings/utils/zodSchema";
 import { createReifiedRelation } from "~/utils/createReifiedBlock";
 import { getStoredRelationsEnabled } from "~/utils/storedRelations";
 import posthog from "posthog-js";
@@ -416,12 +421,15 @@ const SuggestionsBody = ({
   };
 
   useEffect(() => {
-    const config = getFormattedConfigTree();
-    const groups = config.suggestiveMode.pageGroups.groups;
+    const groups =
+      getGlobalSetting<PageGroup[]>([
+        GLOBAL_KEYS.suggestiveMode,
+        SUGGESTIVE_MODE_KEYS.pageGroups,
+      ]) ?? [];
 
     const groupsRecord = groups.reduce(
       (acc, group) => {
-        acc[group.name] = group.pages.map((p) => p.name);
+        acc[group.name] = group.pages;
         return acc;
       },
       {} as Record<string, string[]>,
diff --git a/apps/roam/src/components/canvas/DiscourseNodeUtil.tsx b/apps/roam/src/components/canvas/DiscourseNodeUtil.tsx
index fc2f1d742..1cba2a1c1 100644
--- a/apps/roam/src/components/canvas/DiscourseNodeUtil.tsx
+++ b/apps/roam/src/components/canvas/DiscourseNodeUtil.tsx
@@ -35,11 +35,8 @@ import calcCanvasNodeSizeAndImg from "~/utils/calcCanvasNodeSizeAndImg";
 import { createTextJsxFromSpans } from "./DiscourseRelationShape/helpers";
 import { loadImage } from "~/utils/loadImage";
 import { getRelationColor } from "./DiscourseRelationShape/DiscourseRelationUtil";
-import {
-  AUTO_CANVAS_RELATIONS_KEY,
-  DISCOURSE_CONTEXT_OVERLAY_IN_CANVAS_KEY,
-} from "~/data/userSettings";
-import { getSetting } from "~/utils/extensionSettings";
+import { getPersonalSetting } from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 import DiscourseContextOverlay from "~/components/DiscourseContextOverlay";
 import { getDiscourseNodeColors } from "~/utils/getDiscourseNodeColors";
 import { render as renderToast } from "roamjs-components/components/Toast";
@@ -435,7 +432,7 @@ export class BaseDiscourseNodeUtil extends BaseBoxShapeUtil<DiscourseNodeShape>
     } = discourseContext.nodes[shape.type] || {};
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const isOverlayEnabled = useMemo(
-      () => getSetting(DISCOURSE_CONTEXT_OVERLAY_IN_CANVAS_KEY, false),
+      () => getPersonalSetting<boolean>([PERSONAL_KEYS.overlayInCanvas]),
       [],
     );
 
@@ -516,10 +513,9 @@ export class BaseDiscourseNodeUtil extends BaseBoxShapeUtil<DiscourseNodeShape>
               uid,
             });
 
-            const autoCanvasRelations = getSetting<boolean>(
-              AUTO_CANVAS_RELATIONS_KEY,
-              false,
-            );
+            const autoCanvasRelations = getPersonalSetting<boolean>([
+              PERSONAL_KEYS.autoCanvasRelations,
+            ]);
             if (autoCanvasRelations) {
               try {
                 const relationIds = getRelationIds();
diff --git a/apps/roam/src/components/canvas/Tldraw.tsx b/apps/roam/src/components/canvas/Tldraw.tsx
index e77e91dcd..360b623ef 100644
--- a/apps/roam/src/components/canvas/Tldraw.tsx
+++ b/apps/roam/src/components/canvas/Tldraw.tsx
@@ -94,8 +94,6 @@ import { CanvasDrawerPanel } from "./CanvasDrawer";
 import { ClipboardPanel, ClipboardProvider } from "./Clipboard";
 import internalError from "~/utils/internalError";
 import { syncCanvasNodeTitlesOnLoad } from "~/utils/syncCanvasNodeTitlesOnLoad";
-import { AUTO_CANVAS_RELATIONS_KEY } from "~/data/userSettings";
-import { getSetting } from "~/utils/extensionSettings";
 import { isPluginTimerReady, waitForPluginTimer } from "~/utils/pluginTimer";
 import { HistoryEntry } from "@tldraw/store";
 import { TLRecord } from "@tldraw/tlschema";
@@ -116,6 +114,8 @@ import {
   useCanvasStoreAdapterArgs,
 } from "./useCanvasStoreAdapterArgs";
 import posthog from "posthog-js";
+import { getPersonalSetting } from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 import { json, normalizeProps } from "~/utils/getBlockProps";
 
 declare global {
@@ -1440,10 +1440,9 @@ const InsideEditorAndUiContext = ({
         editor.sideEffects.registerAfterCreateHandler("shape", (shape) => {
           const util = editor.getShapeUtil(shape);
           if (util instanceof BaseDiscourseNodeUtil) {
-            const autoCanvasRelations = getSetting<boolean>(
-              AUTO_CANVAS_RELATIONS_KEY,
-              false,
-            );
+            const autoCanvasRelations = getPersonalSetting<boolean>([
+              PERSONAL_KEYS.autoCanvasRelations,
+            ]);
             if (autoCanvasRelations) {
               void util.createExistingRelations({
                 shape: shape as DiscourseNodeShape,
diff --git a/apps/roam/src/components/canvas/uiOverrides.tsx b/apps/roam/src/components/canvas/uiOverrides.tsx
index 049c84edf..4c71b8c47 100644
--- a/apps/roam/src/components/canvas/uiOverrides.tsx
+++ b/apps/roam/src/components/canvas/uiOverrides.tsx
@@ -51,11 +51,11 @@ import calcCanvasNodeSizeAndImg from "~/utils/calcCanvasNodeSizeAndImg";
 import { AddReferencedNodeType } from "./DiscourseRelationShape/DiscourseRelationTool";
 import { getRelationColor } from "./DiscourseRelationShape/DiscourseRelationUtil";
 import DiscourseGraphPanel from "./DiscourseToolPanel";
-import { DISCOURSE_TOOL_SHORTCUT_KEY } from "~/data/userSettings";
-import { getSetting } from "~/utils/extensionSettings";
 import { CustomDefaultToolbar } from "./CustomDefaultToolbar";
 import { renderModifyNodeDialog } from "~/components/ModifyNodeDialog";
 import { CanvasSyncMode } from "./canvasSyncMode";
+import { getPersonalSetting } from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 import posthog from "posthog-js";
 
 const SyncModeMenuSwitchItem = ({
@@ -377,10 +377,12 @@ export const createUiOverrides = ({
 }): TLUiOverrides => ({
   tools: (editor, tools) => {
     // Get the custom keyboard shortcut for the discourse tool
-    const discourseToolCombo = getSetting(DISCOURSE_TOOL_SHORTCUT_KEY, {
+    const discourseToolCombo = getPersonalSetting<IKeyCombo>([
+      PERSONAL_KEYS.discourseToolShortcut,
+    ]) || {
       key: "",
       modifiers: 0,
-    }) as IKeyCombo;
+    };
 
     // For discourse tool, just use the key directly since we don't allow modifiers
     const discourseToolShortcut = discourseToolCombo?.key?.toUpperCase() || "";
diff --git a/apps/roam/src/components/settings/AdminPanel.tsx b/apps/roam/src/components/settings/AdminPanel.tsx
index 4baac12b4..5c4bd7317 100644
--- a/apps/roam/src/components/settings/AdminPanel.tsx
+++ b/apps/roam/src/components/settings/AdminPanel.tsx
@@ -14,6 +14,14 @@ import {
 } from "@blueprintjs/core";
 import Description from "roamjs-components/components/Description";
 import { Select } from "@blueprintjs/select";
+import {
+  getFeatureFlag,
+  setFeatureFlag,
+} from "~/components/settings/utils/accessors";
+import {
+  onSettingChange,
+  settingKeys,
+} from "~/components/settings/utils/settingsEmitter";
 import {
   getSupabaseContext,
   getLoggedInClient,
@@ -29,11 +37,14 @@ import {
 import type { DGSupabaseClient } from "@repo/database/lib/client";
 import internalError from "~/utils/internalError";
 import SuggestiveModeSettings from "./SuggestiveModeSettings";
-import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
+import discourseConfigRef from "~/utils/discourseConfigRef";
 import refreshConfigTree from "~/utils/refreshConfigTree";
 import createBlock from "roamjs-components/writes/createBlock";
 import deleteBlock from "roamjs-components/writes/deleteBlock";
-import { setFeatureFlag } from "~/components/settings/utils/accessors";
+import { FeatureFlagPanel } from "./components/BlockPropSettingPanels";
+import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
+import { getUidAndBooleanSetting } from "~/utils/getExportSettings";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 
 const NodeRow = ({ node }: { node: PConceptFull }) => {
   return (
@@ -254,16 +265,22 @@ const NodeListTab = (): React.ReactElement => {
 };
 
 const FeatureFlagsTab = (): React.ReactElement => {
-  const settings = useMemo(() => {
+  const legacySuggestiveModeMeta = useMemo(() => {
     refreshConfigTree();
-    return getFormattedConfigTree();
+    return {
+      settingsUid: getPageUidByPageTitle(DISCOURSE_CONFIG_PAGE_TITLE),
+      suggestiveModeEnabledUid: getUidAndBooleanSetting({
+        tree: discourseConfigRef.tree,
+        text: "(BETA) Suggestive Mode Enabled",
+      }).uid,
+    };
   }, []);
 
   const [suggestiveModeEnabled, setSuggestiveModeEnabled] = useState(
-    settings.suggestiveModeEnabled.value || false,
+    getFeatureFlag("Suggestive mode enabled"),
   );
   const [suggestiveModeUid, setSuggestiveModeUid] = useState(
-    settings.suggestiveModeEnabled.uid,
+    legacySuggestiveModeMeta.suggestiveModeEnabledUid,
   );
   const [isAlertOpen, setIsAlertOpen] = useState(false);
   const [isInstructionOpen, setIsInstructionOpen] = useState(false);
@@ -300,7 +317,7 @@ const FeatureFlagsTab = (): React.ReactElement => {
         isOpen={isAlertOpen}
         onConfirm={() => {
           void createBlock({
-            parentUid: settings.settingsUid,
+            parentUid: legacySuggestiveModeMeta.settingsUid,
             node: { text: "(BETA) Suggestive Mode Enabled" },
           }).then((uid) => {
             setSuggestiveModeUid(uid);
@@ -326,10 +343,8 @@ const FeatureFlagsTab = (): React.ReactElement => {
 
       <Alert
         isOpen={isInstructionOpen}
-        onConfirm={() => window.location.reload()}
-        onCancel={() => setIsInstructionOpen(false)}
-        confirmButtonText="Reload Graph"
-        cancelButtonText="Later"
+        onConfirm={() => setIsInstructionOpen(false)}
+        confirmButtonText="OK"
         intent={Intent.PRIMARY}
       >
         <p>
@@ -337,15 +352,17 @@ const FeatureFlagsTab = (): React.ReactElement => {
           upload all node embeddings to supabase.
         </p>
         <p>
-          Please reload the graph to see the new &apos;Suggestive Mode&apos;
-          tab.
-        </p>
-        <p>
-          Then go to Suggestive Mode{" "}
+          Go to Suggestive Mode{" "}
           {"-> Sync Config -> Click on 'Generate & Upload All Node Embeddings'"}
         </p>
       </Alert>
 
+      <FeatureFlagPanel
+        title="Use new settings store"
+        description="When enabled, accessor getters read from block props instead of the old system. Surfaces dual-write gaps during development."
+        featureKey="Use new settings store"
+      />
+
       <Button
         className="w-96"
         icon="send-message"
@@ -367,9 +384,14 @@ const FeatureFlagsTab = (): React.ReactElement => {
 
 const AdminPanel = (): React.ReactElement => {
   const [selectedTabId, setSelectedTabId] = useState<TabId>("admin");
-  const settings = useMemo(() => {
-    refreshConfigTree();
-    return getFormattedConfigTree();
+  const [showSuggestiveTab, setShowSuggestiveTab] = useState(
+    getFeatureFlag("Suggestive mode enabled"),
+  );
+
+  useEffect(() => {
+    return onSettingChange(settingKeys.suggestiveModeEnabled, (newValue) => {
+      setShowSuggestiveTab(Boolean(newValue));
+    });
   }, []);
 
   return (
@@ -396,7 +418,7 @@ const AdminPanel = (): React.ReactElement => {
           </div>
         }
       />
-      {settings.suggestiveModeEnabled.value && (
+      {showSuggestiveTab && (
         <Tab
           id="suggestive-mode-settings"
           title="Suggestive mode"
diff --git a/apps/roam/src/components/settings/DefaultFilters.tsx b/apps/roam/src/components/settings/DefaultFilters.tsx
index 693e98f74..3a1129949 100644
--- a/apps/roam/src/components/settings/DefaultFilters.tsx
+++ b/apps/roam/src/components/settings/DefaultFilters.tsx
@@ -3,7 +3,14 @@ import React, { useEffect, useState } from "react";
 import type { OnloadArgs } from "roamjs-components/types";
 import type { Filters } from "roamjs-components/components/Filter";
 import posthog from "posthog-js";
-import { setPersonalSetting } from "~/components/settings/utils/accessors";
+import {
+  getPersonalSetting,
+  setPersonalSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  PERSONAL_KEYS,
+  QUERY_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
 //
 // TODO - REWORK THIS COMPONENT
@@ -106,10 +113,10 @@ const DefaultFilters = ({
   const [filters, setFilters] = useState(() =>
     Object.fromEntries(
       Object.entries(
-        (extensionAPI.settings.get("default-filters") as Record<
-          string,
-          StoredFilters
-        >) || {},
+        getPersonalSetting<Record<string, StoredFilters>>([
+          PERSONAL_KEYS.query,
+          QUERY_KEYS.defaultFilters,
+        ]) ?? {},
       ).map(([k, v]) => [
         k,
         {
@@ -145,7 +152,10 @@ const DefaultFilters = ({
       ]),
     );
     void extensionAPI.settings.set("default-filters", serialized);
-    setPersonalSetting(["Query", "Default filters"], serialized);
+    setPersonalSetting(
+      [PERSONAL_KEYS.query, QUERY_KEYS.defaultFilters],
+      serialized,
+    );
   }, [filters]);
   return (
     <div
diff --git a/apps/roam/src/components/settings/DiscourseNodeAttributes.tsx b/apps/roam/src/components/settings/DiscourseNodeAttributes.tsx
index 39a420ae3..aa11d6161 100644
--- a/apps/roam/src/components/settings/DiscourseNodeAttributes.tsx
+++ b/apps/roam/src/components/settings/DiscourseNodeAttributes.tsx
@@ -6,6 +6,7 @@ import getFirstChildUidByBlockUid from "roamjs-components/queries/getFirstChildU
 import updateBlock from "roamjs-components/writes/updateBlock";
 import deleteBlock from "roamjs-components/writes/deleteBlock";
 import { setDiscourseNodeSetting } from "~/components/settings/utils/accessors";
+import { DISCOURSE_NODE_KEYS } from "~/components/settings/utils/settingKeys";
 
 type Attribute = {
   uid: string;
@@ -82,7 +83,7 @@ const NodeAttributes = ({
   const syncToBlockProps = () => {
     setDiscourseNodeSetting(
       nodeType,
-      ["attributes"],
+      [DISCOURSE_NODE_KEYS.attributes],
       toRecord(attributesRef.current),
     );
   };
@@ -107,7 +108,7 @@ const NodeAttributes = ({
                 setAttributes(updated);
                 setDiscourseNodeSetting(
                   nodeType,
-                  ["attributes"],
+                  [DISCOURSE_NODE_KEYS.attributes],
                   toRecord(updated),
                 );
               })
@@ -145,7 +146,7 @@ const NodeAttributes = ({
                 setNewAttribute("");
                 setDiscourseNodeSetting(
                   nodeType,
-                  ["attributes"],
+                  [DISCOURSE_NODE_KEYS.attributes],
                   toRecord(updated),
                 );
               });
diff --git a/apps/roam/src/components/settings/DiscourseNodeCanvasSettings.tsx b/apps/roam/src/components/settings/DiscourseNodeCanvasSettings.tsx
index 287f4194b..692458470 100644
--- a/apps/roam/src/components/settings/DiscourseNodeCanvasSettings.tsx
+++ b/apps/roam/src/components/settings/DiscourseNodeCanvasSettings.tsx
@@ -7,15 +7,20 @@ import {
   Icon,
   ControlGroup,
 } from "@blueprintjs/core";
-import React, { useState, useMemo } from "react";
-import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
-import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
+import React, { useState } from "react";
 import setInputSetting from "roamjs-components/util/setInputSetting";
 import {
   DiscourseNodeFlagPanel,
   DiscourseNodeTextPanel,
 } from "./components/BlockPropSettingPanels";
-import { setDiscourseNodeSetting } from "~/components/settings/utils/accessors";
+import {
+  getDiscourseNodeSetting,
+  setDiscourseNodeSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  DISCOURSE_NODE_KEYS,
+  CANVAS_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
 export const formatHexColor = (color: string) => {
   if (!color) return "";
@@ -36,20 +41,39 @@ const DiscourseNodeCanvasSettings = ({
   nodeType: string;
   uid: string;
 }) => {
-  const tree = useMemo(() => getBasicTreeByParentUid(uid), [uid]);
   const [color, setColor] = useState<string>(() => {
-    const color = getSettingValueFromTree({ tree, key: "color" });
+    const color =
+      getDiscourseNodeSetting<string>(nodeType, [
+        DISCOURSE_NODE_KEYS.canvasSettings,
+        CANVAS_KEYS.color,
+      ]) ?? "";
     return formatHexColor(color);
   });
-  const alias = getSettingValueFromTree({ tree, key: "alias" });
-  const [queryBuilderAlias, setQueryBuilderAlias] = useState<string>(() =>
-    getSettingValueFromTree({ tree, key: "query-builder-alias" }),
+  const alias =
+    getDiscourseNodeSetting<string>(nodeType, [
+      DISCOURSE_NODE_KEYS.canvasSettings,
+      CANVAS_KEYS.alias,
+    ]) ?? "";
+  const [queryBuilderAlias, setQueryBuilderAlias] = useState<string>(
+    () =>
+      getDiscourseNodeSetting<string>(nodeType, [
+        DISCOURSE_NODE_KEYS.canvasSettings,
+        CANVAS_KEYS.queryBuilderAlias,
+      ]) ?? "",
   );
   const [isKeyImage, setIsKeyImage] = useState(
-    () => getSettingValueFromTree({ tree, key: "key-image" }) === "true",
+    () =>
+      getDiscourseNodeSetting<boolean>(nodeType, [
+        DISCOURSE_NODE_KEYS.canvasSettings,
+        CANVAS_KEYS.keyImage,
+      ]) ?? false,
   );
-  const [keyImageOption, setKeyImageOption] = useState(() =>
-    getSettingValueFromTree({ tree, key: "key-image-option" }),
+  const [keyImageOption, setKeyImageOption] = useState(
+    () =>
+      getDiscourseNodeSetting<string>(nodeType, [
+        DISCOURSE_NODE_KEYS.canvasSettings,
+        CANVAS_KEYS.keyImageOption,
+      ]) ?? "",
   );
 
   return (
@@ -71,7 +95,7 @@ const DiscourseNodeCanvasSettings = ({
               });
               setDiscourseNodeSetting(
                 nodeType,
-                ["canvasSettings", "color"],
+                [DISCOURSE_NODE_KEYS.canvasSettings, CANVAS_KEYS.color],
                 colorValue,
               );
             }}
@@ -89,7 +113,7 @@ const DiscourseNodeCanvasSettings = ({
                 });
                 setDiscourseNodeSetting(
                   nodeType,
-                  ["canvasSettings", "color"],
+                  [DISCOURSE_NODE_KEYS.canvasSettings, CANVAS_KEYS.color],
                   "",
                 );
               }}
@@ -101,7 +125,7 @@ const DiscourseNodeCanvasSettings = ({
         nodeType={nodeType}
         title="Display alias"
         description=""
-        settingKeys={["canvasSettings", "alias"]}
+        settingKeys={[DISCOURSE_NODE_KEYS.canvasSettings, CANVAS_KEYS.alias]}
         initialValue={alias}
         onChange={(val) => {
           void setInputSetting({
@@ -115,7 +139,7 @@ const DiscourseNodeCanvasSettings = ({
         nodeType={nodeType}
         title="Key image"
         description="Add an image to the discourse node"
-        settingKeys={["canvasSettings", "key-image"]}
+        settingKeys={[DISCOURSE_NODE_KEYS.canvasSettings, CANVAS_KEYS.keyImage]}
         initialValue={isKeyImage}
         onChange={(checked) => {
           setIsKeyImage(checked);
@@ -141,7 +165,7 @@ const DiscourseNodeCanvasSettings = ({
           });
           setDiscourseNodeSetting(
             nodeType,
-            ["canvasSettings", "key-image-option"],
+            [DISCOURSE_NODE_KEYS.canvasSettings, CANVAS_KEYS.keyImageOption],
             value,
           );
         }}
@@ -172,7 +196,7 @@ const DiscourseNodeCanvasSettings = ({
           });
           setDiscourseNodeSetting(
             nodeType,
-            ["canvasSettings", "query-builder-alias"],
+            [DISCOURSE_NODE_KEYS.canvasSettings, CANVAS_KEYS.queryBuilderAlias],
             val,
           );
         }}
diff --git a/apps/roam/src/components/settings/DiscourseNodeConfigPanel.tsx b/apps/roam/src/components/settings/DiscourseNodeConfigPanel.tsx
index 8d388189e..1556b3042 100644
--- a/apps/roam/src/components/settings/DiscourseNodeConfigPanel.tsx
+++ b/apps/roam/src/components/settings/DiscourseNodeConfigPanel.tsx
@@ -21,6 +21,7 @@ import { formatHexColor } from "./DiscourseNodeCanvasSettings";
 import setBlockProps from "~/utils/setBlockProps";
 import { DiscourseNodeSchema } from "./utils/zodSchema";
 import { getGlobalSettings, setGlobalSetting } from "./utils/accessors";
+import { GLOBAL_KEYS } from "./utils/settingKeys";
 
 type DiscourseNodeConfigPanelProps = React.ComponentProps<
   CustomField["options"]["component"]
@@ -106,7 +107,6 @@ const DiscourseNodeConfigPanel: React.FC<DiscourseNodeConfigPanelProps> = ({
                   type: valueUid,
                   shortcut,
                   format,
-                  backedBy: "user",
                 }),
               );
               setNodes([
@@ -239,7 +239,7 @@ const DiscourseNodeConfigPanel: React.FC<DiscourseNodeConfigPanelProps> = ({
               }
               const relations = { ...getGlobalSettings().Relations };
               for (const rel of affectedRelations) delete relations[rel.id];
-              setGlobalSetting(["Relations"], relations);
+              setGlobalSetting([GLOBAL_KEYS.relations], relations);
               deleteNodeType(nodeTypeIdToDelete);
             } catch (error) {
               console.error(
diff --git a/apps/roam/src/components/settings/DiscourseNodeIndex.tsx b/apps/roam/src/components/settings/DiscourseNodeIndex.tsx
index 38717ade2..26217e3dc 100644
--- a/apps/roam/src/components/settings/DiscourseNodeIndex.tsx
+++ b/apps/roam/src/components/settings/DiscourseNodeIndex.tsx
@@ -7,6 +7,7 @@ import QueryBuilder from "~/components/QueryBuilder";
 import parseQuery, { DEFAULT_RETURN_NODE } from "~/utils/parseQuery";
 import createBlock from "roamjs-components/writes/createBlock";
 import { setDiscourseNodeSetting } from "~/components/settings/utils/accessors";
+import { DISCOURSE_NODE_KEYS } from "~/components/settings/utils/settingKeys";
 
 const NodeIndex = ({
   parentUid,
@@ -50,7 +51,7 @@ const NodeIndex = ({
           ],
         },
       }).then(() => {
-        setDiscourseNodeSetting(node.type, ["index"], {
+        setDiscourseNodeSetting(node.type, [DISCOURSE_NODE_KEYS.index], {
           conditions: [
             {
               type: "clause",
diff --git a/apps/roam/src/components/settings/DiscourseNodeSpecification.tsx b/apps/roam/src/components/settings/DiscourseNodeSpecification.tsx
index b23404556..2711ca43b 100644
--- a/apps/roam/src/components/settings/DiscourseNodeSpecification.tsx
+++ b/apps/roam/src/components/settings/DiscourseNodeSpecification.tsx
@@ -8,7 +8,14 @@ import getDiscourseNodes from "~/utils/getDiscourseNodes";
 import getDiscourseNodeFormatExpression from "~/utils/getDiscourseNodeFormatExpression";
 import QueryEditor from "~/components/QueryEditor";
 import internalError from "~/utils/internalError";
-import { setDiscourseNodeSetting } from "~/components/settings/utils/accessors";
+import {
+  getDiscourseNodeSetting,
+  setDiscourseNodeSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  DISCOURSE_NODE_KEYS,
+  SPECIFICATION_KEYS,
+} from "~/components/settings/utils/settingKeys";
 import { DiscourseNodeFlagPanel } from "~/components/settings/components/BlockPropSettingPanels";
 
 const NodeSpecification = ({
@@ -27,7 +34,13 @@ const NodeSpecification = ({
         ?.uid,
     [parentUid],
   );
-  const [enabled, setEnabled] = React.useState(!!enabledBlockUid);
+  const [enabled, setEnabled] = React.useState(
+    () =>
+      getDiscourseNodeSetting<boolean>(node.type, [
+        DISCOURSE_NODE_KEYS.specification,
+        SPECIFICATION_KEYS.enabled,
+      ]) ?? false,
+  );
 
   React.useEffect(() => {
     if (enabled) {
@@ -74,19 +87,23 @@ const NodeSpecification = ({
             }),
           )
           .then(() => {
-            setDiscourseNodeSetting(node.type, ["specification", "query"], {
-              conditions: [
-                {
-                  type: "clause" as const,
-                  source: node.text,
-                  relation: "has title",
-                  target: `/${getDiscourseNodeFormatExpression(node.format).source}/`,
-                },
-              ],
-              selections: [],
-              custom: "",
-              returnNode: node.text,
-            });
+            setDiscourseNodeSetting(
+              node.type,
+              [DISCOURSE_NODE_KEYS.specification, SPECIFICATION_KEYS.query],
+              {
+                conditions: [
+                  {
+                    type: "clause" as const,
+                    source: node.text,
+                    relation: "has title",
+                    target: `/${getDiscourseNodeFormatExpression(node.format).source}/`,
+                  },
+                ],
+                selections: [],
+                custom: "",
+                returnNode: node.text,
+              },
+            );
             setMigrated(true);
           })
           .catch((error) => {
@@ -98,12 +115,16 @@ const NodeSpecification = ({
       const scratchNode = getSubTree({ tree, key: "scratch" });
       Promise.all(scratchNode.children.map((c) => deleteBlock(c.uid)))
         .then(() => {
-          setDiscourseNodeSetting(node.type, ["specification", "query"], {
-            conditions: [],
-            selections: [],
-            custom: "",
-            returnNode: "",
-          });
+          setDiscourseNodeSetting(
+            node.type,
+            [DISCOURSE_NODE_KEYS.specification, SPECIFICATION_KEYS.query],
+            {
+              conditions: [],
+              selections: [],
+              custom: "",
+              returnNode: "",
+            },
+          );
         })
         .catch((error) => {
           internalError({ error });
@@ -124,7 +145,10 @@ const NodeSpecification = ({
         nodeType={node.type}
         title="enabled"
         description=""
-        settingKeys={["specification", "enabled"]}
+        settingKeys={[
+          DISCOURSE_NODE_KEYS.specification,
+          SPECIFICATION_KEYS.enabled,
+        ]}
         initialValue={enabled}
         parentUid={parentUid}
         uid={enabledBlockUid}
diff --git a/apps/roam/src/components/settings/DiscourseNodeSuggestiveRules.tsx b/apps/roam/src/components/settings/DiscourseNodeSuggestiveRules.tsx
index 23e158162..3f31cec06 100644
--- a/apps/roam/src/components/settings/DiscourseNodeSuggestiveRules.tsx
+++ b/apps/roam/src/components/settings/DiscourseNodeSuggestiveRules.tsx
@@ -11,10 +11,13 @@ import {
   DiscourseNodeFlagPanel,
   DiscourseNodeTextPanel,
 } from "./components/BlockPropSettingPanels";
+import {
+  DISCOURSE_NODE_KEYS,
+  SUGGESTIVE_RULES_KEYS,
+  TEMPLATE_SETTING_KEYS,
+} from "~/components/settings/utils/settingKeys";
 import { RenderRoamBlock } from "~/utils/roamReactComponents";
 
-const TEMPLATE_SETTING_KEYS = ["template"];
-
 const DiscourseNodeSuggestiveRules = ({
   node,
   parentUid,
@@ -78,7 +81,10 @@ const DiscourseNodeSuggestiveRules = ({
         nodeType={nodeUid}
         title="Embedding Block Ref"
         description="Copy block ref from template which you want to be embedded and ranked."
-        settingKeys={["suggestiveRules", "embeddingRef"]}
+        settingKeys={[
+          DISCOURSE_NODE_KEYS.suggestiveRules,
+          SUGGESTIVE_RULES_KEYS.embeddingRef,
+        ]}
         initialValue={node.embeddingRef || ""}
         placeholder="((block-uid))"
         onChange={setEmbeddingRef}
@@ -100,7 +106,10 @@ const DiscourseNodeSuggestiveRules = ({
         nodeType={nodeUid}
         title="First Child"
         description="If the block is the first child of the embedding block ref, it will be embedded and ranked."
-        settingKeys={["suggestiveRules", "isFirstChild"]}
+        settingKeys={[
+          DISCOURSE_NODE_KEYS.suggestiveRules,
+          SUGGESTIVE_RULES_KEYS.isFirstChild,
+        ]}
         initialValue={node.isFirstChild?.value || false}
         order={2}
         uid={node.isFirstChild?.uid || ""}
diff --git a/apps/roam/src/components/settings/DiscourseRelationConfigPanel.tsx b/apps/roam/src/components/settings/DiscourseRelationConfigPanel.tsx
index fe16f7ccb..b189093c0 100644
--- a/apps/roam/src/components/settings/DiscourseRelationConfigPanel.tsx
+++ b/apps/roam/src/components/settings/DiscourseRelationConfigPanel.tsx
@@ -32,7 +32,6 @@ import type {
   RoamBasicNode,
   TreeNode,
 } from "roamjs-components/types";
-import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
 import MenuItemSelect from "roamjs-components/components/MenuItemSelect";
 import setInputSetting from "roamjs-components/util/setInputSetting";
 import toFlexRegex from "roamjs-components/util/toFlexRegex";
@@ -52,9 +51,11 @@ import posthog from "posthog-js";
 import { getSetting, setSetting } from "~/utils/extensionSettings";
 import { getStoredRelationsEnabled } from "~/utils/storedRelations";
 import {
+  getGlobalSetting,
   setGlobalSetting,
   getGlobalSettings,
 } from "~/components/settings/utils/accessors";
+import { GLOBAL_KEYS } from "~/components/settings/utils/settingKeys";
 import { RenderRoamBlock } from "~/utils/roamReactComponents";
 
 const DEFAULT_SELECTED_RELATION = {
@@ -125,10 +126,11 @@ export const RelationEditPanel = ({
   const [tab, setTab] = useState(0);
   const initialSourceUid = useMemo(
     () =>
-      getSettingValueFromTree({
-        tree: editingRelationInfo.children,
-        key: "source",
-      }),
+      getGlobalSetting<string>([
+        GLOBAL_KEYS.relations,
+        editingRelationInfo.uid,
+        "source",
+      ]) ?? "",
     [],
   );
   const initialSource = useMemo(
@@ -138,10 +140,11 @@ export const RelationEditPanel = ({
   const [source, setSource] = useState(initialSourceUid);
   const initialDestinationUid = useMemo(
     () =>
-      getSettingValueFromTree({
-        tree: editingRelationInfo.children,
-        key: "destination",
-      }),
+      getGlobalSetting<string>([
+        GLOBAL_KEYS.relations,
+        editingRelationInfo.uid,
+        "destination",
+      ]) ?? "",
     [],
   );
   const initialDestination = useMemo(
@@ -151,10 +154,11 @@ export const RelationEditPanel = ({
   const [destination, setDestination] = useState(initialDestinationUid);
   const [label, setLabel] = useState(editingRelationInfo.text);
   const [complement, setComplement] = useState(
-    getSettingValueFromTree({
-      tree: editingRelationInfo.children,
-      key: "complement",
-    }),
+    getGlobalSetting<string>([
+      GLOBAL_KEYS.relations,
+      editingRelationInfo.uid,
+      "complement",
+    ]) ?? "",
   );
 
   const edgeCallback = useCallback(
@@ -687,7 +691,7 @@ export const RelationEditPanel = ({
                     );
                     return { triples, nodePositions };
                   });
-                  setGlobalSetting(["Relations", rootUid], {
+                  setGlobalSetting([GLOBAL_KEYS.relations, rootUid], {
                     label,
                     source,
                     destination,
@@ -1063,7 +1067,7 @@ const DiscourseRelationConfigPanel: CustomField["options"]["component"] = ({
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/naming-convention
     const { [rel.uid]: _, ...remaining } = getGlobalSettings().Relations;
-    setGlobalSetting(["Relations"], remaining);
+    setGlobalSetting([GLOBAL_KEYS.relations], remaining);
   };
   const handleDuplicate = (rel: Relation) => {
     const text = rel.text;
@@ -1083,7 +1087,7 @@ const DiscourseRelationConfigPanel: CustomField["options"]["component"] = ({
     }).then((newUid) => {
       const originalRelation = getGlobalSettings().Relations[rel.uid];
       if (originalRelation) {
-        setGlobalSetting(["Relations", newUid], {
+        setGlobalSetting([GLOBAL_KEYS.relations, newUid], {
           ...originalRelation,
           label: text,
         });
diff --git a/apps/roam/src/components/settings/ExportSettings.tsx b/apps/roam/src/components/settings/ExportSettings.tsx
index e6787af5c..0b4c06577 100644
--- a/apps/roam/src/components/settings/ExportSettings.tsx
+++ b/apps/roam/src/components/settings/ExportSettings.tsx
@@ -1,16 +1,19 @@
 import React from "react";
-import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
+import { getExportSettingsAndUids } from "~/utils/getExportSettings";
 import {
   GlobalFlagPanel,
   GlobalNumberPanel,
   GlobalMultiTextPanel,
   GlobalSelectPanel,
 } from "./components/BlockPropSettingPanels";
+import {
+  GLOBAL_KEYS,
+  EXPORT_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
 const DiscourseGraphExport = () => {
-  const settings = getFormattedConfigTree();
-  const exportSettings = settings.export;
-  const parentUid = settings.export.exportUid;
+  const exportSettings = getExportSettingsAndUids();
+  const parentUid = exportSettings.exportUid;
   return (
     <div className="flex flex-col gap-4 p-1">
       {/* TODO: Titles kept as lowercase to match legacy readers in getExportSettings.ts.
@@ -19,8 +22,10 @@ const DiscourseGraphExport = () => {
         <GlobalFlagPanel
           title="remove special characters"
           description="Whether or not to remove the special characters in a file name"
-          settingKeys={["Export", "Remove special characters"]}
-          initialValue={exportSettings.removeSpecialCharacters.value}
+          settingKeys={[
+            GLOBAL_KEYS.export,
+            EXPORT_KEYS.removeSpecialCharacters,
+          ]}
           order={1}
           uid={exportSettings.removeSpecialCharacters.uid}
           parentUid={parentUid}
@@ -29,8 +34,7 @@ const DiscourseGraphExport = () => {
         <GlobalFlagPanel
           title="resolve block references"
           description="Replaces block references in the markdown content with the block's content"
-          settingKeys={["Export", "Resolve block references"]}
-          initialValue={exportSettings.optsRefs.value}
+          settingKeys={[GLOBAL_KEYS.export, EXPORT_KEYS.resolveBlockReferences]}
           order={3}
           uid={exportSettings.optsRefs.uid}
           parentUid={parentUid}
@@ -38,8 +42,7 @@ const DiscourseGraphExport = () => {
         <GlobalFlagPanel
           title="resolve block embeds"
           description="Replaces block embeds in the markdown content with the block's content tree"
-          settingKeys={["Export", "Resolve block embeds"]}
-          initialValue={exportSettings.optsEmbeds.value}
+          settingKeys={[GLOBAL_KEYS.export, EXPORT_KEYS.resolveBlockEmbeds]}
           order={4}
           uid={exportSettings.optsEmbeds.uid}
           parentUid={parentUid}
@@ -48,8 +51,7 @@ const DiscourseGraphExport = () => {
         <GlobalFlagPanel
           title="append referenced node"
           description="If a referenced node is defined in a node's format, it will be appended to the discourse context"
-          settingKeys={["Export", "Append referenced node"]}
-          initialValue={exportSettings.appendRefNodeContext.value}
+          settingKeys={[GLOBAL_KEYS.export, EXPORT_KEYS.appendReferencedNode]}
           order={6}
           uid={exportSettings.appendRefNodeContext.uid}
           parentUid={parentUid}
@@ -59,8 +61,7 @@ const DiscourseGraphExport = () => {
         <GlobalSelectPanel
           title="link type"
           description="How to format links that appear in your export."
-          settingKeys={["Export", "Link type"]}
-          initialValue={exportSettings.linkType.value || "alias"}
+          settingKeys={[GLOBAL_KEYS.export, EXPORT_KEYS.linkType]}
           order={5}
           options={["alias", "wikilinks", "roam url"]}
           uid={exportSettings.linkType.uid}
@@ -70,8 +71,7 @@ const DiscourseGraphExport = () => {
       <GlobalNumberPanel
         title="max filename length"
         description="Set the maximum name length for markdown file exports"
-        settingKeys={["Export", "Max filename length"]}
-        initialValue={exportSettings.maxFilenameLength.value || 64}
+        settingKeys={[GLOBAL_KEYS.export, EXPORT_KEYS.maxFilenameLength]}
         order={0}
         uid={exportSettings.maxFilenameLength.uid}
         parentUid={parentUid}
@@ -79,8 +79,7 @@ const DiscourseGraphExport = () => {
       <GlobalMultiTextPanel
         title="frontmatter"
         description="Specify all the lines that should go to the Frontmatter of the markdown file"
-        settingKeys={["Export", "Frontmatter"]}
-        initialValue={exportSettings.frontmatter.values}
+        settingKeys={[GLOBAL_KEYS.export, EXPORT_KEYS.frontmatter]}
         order={2}
         uid={exportSettings.frontmatter.uid}
         parentUid={parentUid}
diff --git a/apps/roam/src/components/settings/GeneralSettings.tsx b/apps/roam/src/components/settings/GeneralSettings.tsx
index f28631ba8..a89d3847a 100644
--- a/apps/roam/src/components/settings/GeneralSettings.tsx
+++ b/apps/roam/src/components/settings/GeneralSettings.tsx
@@ -1,18 +1,37 @@
 import React, { useMemo, useState } from "react";
-import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
+import discourseConfigRef from "~/utils/discourseConfigRef";
 import refreshConfigTree from "~/utils/refreshConfigTree";
-import { DEFAULT_CANVAS_PAGE_FORMAT } from "~/index";
 import { Alert, Intent } from "@blueprintjs/core";
 import {
   GlobalTextPanel,
   FeatureFlagPanel,
 } from "./components/BlockPropSettingPanels";
+import { GLOBAL_KEYS } from "~/components/settings/utils/settingKeys";
+import { isNewSettingsStoreEnabled } from "./utils/accessors";
 import posthog from "posthog-js";
+import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
+import {
+  getUidAndBooleanSetting,
+  getUidAndStringSetting,
+} from "~/utils/getExportSettings";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 
 const DiscourseGraphHome = () => {
   const settings = useMemo(() => {
     refreshConfigTree();
-    return getFormattedConfigTree();
+    const tree = discourseConfigRef.tree;
+    return {
+      settingsUid: getPageUidByPageTitle(DISCOURSE_CONFIG_PAGE_TITLE),
+      triggerUid: getUidAndStringSetting({ tree, text: "trigger" }).uid,
+      canvasPageFormatUid: getUidAndStringSetting({
+        tree,
+        text: "Canvas Page Format",
+      }).uid,
+      leftSidebarEnabledUid: getUidAndBooleanSetting({
+        tree,
+        text: "(BETA) Left Sidebar",
+      }).uid,
+    };
   }, []);
 
   const [isAlertOpen, setIsAlertOpen] = useState(false);
@@ -23,33 +42,28 @@ const DiscourseGraphHome = () => {
       <GlobalTextPanel
         title="trigger"
         description="The trigger to create the node menu."
-        settingKeys={["Trigger"]}
-        initialValue={settings.trigger.value || "\\"}
+        settingKeys={[GLOBAL_KEYS.trigger]}
         order={0}
-        uid={settings.trigger.uid}
+        uid={settings.triggerUid}
         parentUid={settings.settingsUid}
       />
       <GlobalTextPanel
         title="Canvas Page Format"
         description="The page format for canvas pages"
-        settingKeys={["Canvas page format"]}
-        initialValue={
-          settings.canvasPageFormat.value || DEFAULT_CANVAS_PAGE_FORMAT
-        }
+        settingKeys={[GLOBAL_KEYS.canvasPageFormat]}
         order={1}
-        uid={settings.canvasPageFormat.uid}
+        uid={settings.canvasPageFormatUid}
         parentUid={settings.settingsUid}
       />
       <FeatureFlagPanel
         title="(BETA) Left Sidebar"
         description="Whether or not to enable the left sidebar."
-        initialValue={settings.leftSidebarEnabled.value}
         featureKey="Enable left sidebar"
         order={2}
-        uid={settings.leftSidebarEnabled.uid}
+        uid={settings.leftSidebarEnabledUid}
         parentUid={settings.settingsUid}
         onAfterChange={(checked: boolean) => {
-          if (checked) {
+          if (checked && !isNewSettingsStoreEnabled()) {
             setIsAlertOpen(true);
           }
           posthog.capture("General Settings: Left Sidebar Toggled", {
diff --git a/apps/roam/src/components/settings/HomePersonalSettings.tsx b/apps/roam/src/components/settings/HomePersonalSettings.tsx
index d1424295c..075ce7d3c 100644
--- a/apps/roam/src/components/settings/HomePersonalSettings.tsx
+++ b/apps/roam/src/components/settings/HomePersonalSettings.tsx
@@ -24,12 +24,13 @@ import {
   DISALLOW_DIAGNOSTICS,
   USE_STORED_RELATIONS,
 } from "~/data/userSettings";
-import { getSetting, setSetting } from "~/utils/extensionSettings";
+import { setSetting } from "~/utils/extensionSettings";
 import { enablePostHog, disablePostHog } from "~/utils/posthog";
 import KeyboardShortcutInput from "./KeyboardShortcutInput";
 import streamlineStyling from "~/styles/streamlineStyling";
-import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
+import { getFeatureFlag } from "~/components/settings/utils/accessors";
 import { PersonalFlagPanel } from "./components/BlockPropSettingPanels";
+import { PERSONAL_KEYS } from "./utils/settingKeys";
 import migrateRelations from "~/utils/migrateRelations";
 import { countReifiedRelations } from "~/utils/createReifiedBlock";
 import posthog from "posthog-js";
@@ -47,7 +48,6 @@ const enum RelationMigrationDialog {
 const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
   const extensionAPI = onloadArgs.extensionAPI;
   const overlayHandler = getOverlayHandler(onloadArgs);
-  const settings = useMemo(() => getFormattedConfigTree(), []);
   const [activeRelationMigration, setActiveRelationMigration] =
     useState<RelationMigrationDialog>(RelationMigrationDialog.none);
   const [numExistingRelations, setNumExistingRelations] = useState<number>(0);
@@ -115,26 +115,18 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
     <div className="flex flex-col gap-4 p-1">
       <Label>
         Personal node menu trigger
-        <Description
-          description={
-            "Override the global trigger for the discourse node menu. Must refresh after editing."
-          }
-        />
+        <Description description="Override the global trigger for the discourse node menu." />
         <NodeMenuTriggerComponent extensionAPI={extensionAPI} />
       </Label>
       <Label>
         Node search menu trigger
-        <Description
-          description={
-            "Set the trigger character for the node search menu. Must refresh after editing."
-          }
-        />
+        <Description description="Set the trigger character for the node search menu." />
         <NodeSearchMenuTriggerSetting onloadArgs={onloadArgs} />
       </Label>
       <KeyboardShortcutInput
         onloadArgs={onloadArgs}
         settingKey={DISCOURSE_TOOL_SHORTCUT_KEY}
-        blockPropKey="Discourse tool shortcut"
+        blockPropKey={PERSONAL_KEYS.discourseToolShortcut}
         label="Discourse tool keyboard shortcut"
         description="Set a single key to activate the discourse tool in tldraw. Only single keys (no modifiers) are supported. Leave empty for no shortcut."
         placeholder="Click to set single key"
@@ -142,8 +134,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="Overlay"
         description="Whether or not to overlay discourse context information over discourse node references."
-        settingKeys={["Discourse context overlay"]}
-        initialValue={getSetting<boolean>("discourse-context-overlay", false)}
+        settingKeys={[PERSONAL_KEYS.discourseContextOverlay]}
         onChange={(checked) => {
           void setSetting("discourse-context-overlay", checked);
           onPageRefObserverChange(overlayHandler)(checked);
@@ -152,12 +143,11 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
           });
         }}
       />
-      {settings.suggestiveModeEnabled?.value && (
+      {getFeatureFlag("Suggestive mode enabled") && (
         <PersonalFlagPanel
           title="Suggestive mode overlay"
           description="Whether or not to overlay suggestive mode button over discourse node references."
-          settingKeys={["Suggestive mode overlay"]}
-          initialValue={getSetting<boolean>("suggestive-mode-overlay", false)}
+          settingKeys={[PERSONAL_KEYS.suggestiveModeOverlay]}
           onChange={(checked) => {
             void setSetting("suggestive-mode-overlay", checked);
             onPageRefObserverChange(getSuggestiveOverlayHandler(onloadArgs))(
@@ -191,8 +181,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="Text selection popup"
         description="Whether or not to show the discourse node menu when selecting text."
-        settingKeys={["Text selection popup"]}
-        initialValue={getSetting("text-selection-popup", true)}
+        settingKeys={[PERSONAL_KEYS.textSelectionPopup]}
         onChange={(checked) => {
           void setSetting("text-selection-popup", checked);
         }}
@@ -200,8 +189,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="Disable sidebar open"
         description="Disable opening new nodes in the sidebar when created"
-        settingKeys={["Disable sidebar open"]}
-        initialValue={getSetting<boolean>("disable-sidebar-open", false)}
+        settingKeys={[PERSONAL_KEYS.disableSidebarOpen]}
         onChange={(checked) => {
           void setSetting("disable-sidebar-open", checked);
         }}
@@ -209,8 +197,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="Page preview"
         description="Whether or not to display page previews when hovering over page refs"
-        settingKeys={["Page preview"]}
-        initialValue={getSetting<boolean>("page-preview", false)}
+        settingKeys={[PERSONAL_KEYS.pagePreview]}
         onChange={(checked) => {
           void setSetting("page-preview", checked);
           onPageRefObserverChange(previewPageRefHandler)(checked);
@@ -219,8 +206,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="Hide feedback button"
         description="Hide the 'Send feedback' button at the bottom right of the screen."
-        settingKeys={["Hide feedback button"]}
-        initialValue={getSetting<boolean>("hide-feedback-button", false)}
+        settingKeys={[PERSONAL_KEYS.hideFeedbackButton]}
         onChange={(checked) => {
           void setSetting("hide-feedback-button", checked);
           if (checked) {
@@ -233,8 +219,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="Auto canvas relations"
         description="Automatically add discourse relations to canvas when a node is added"
-        settingKeys={["Auto canvas relations"]}
-        initialValue={getSetting<boolean>(AUTO_CANVAS_RELATIONS_KEY, false)}
+        settingKeys={[PERSONAL_KEYS.autoCanvasRelations]}
         onChange={(checked) => {
           void setSetting(AUTO_CANVAS_RELATIONS_KEY, checked);
         }}
@@ -243,11 +228,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="(BETA) Overlay in canvas"
         description="Whether or not to overlay discourse context information over canvas nodes."
-        settingKeys={["Overlay in canvas"]}
-        initialValue={getSetting<boolean>(
-          DISCOURSE_CONTEXT_OVERLAY_IN_CANVAS_KEY,
-          false,
-        )}
+        settingKeys={[PERSONAL_KEYS.overlayInCanvas]}
         onChange={(checked) => {
           void setSetting(DISCOURSE_CONTEXT_OVERLAY_IN_CANVAS_KEY, checked);
         }}
@@ -255,8 +236,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="Streamline styling"
         description="Apply streamlined styling to your personal graph for a cleaner appearance."
-        settingKeys={["Streamline styling"]}
-        initialValue={getSetting<boolean>(STREAMLINE_STYLING_KEY, false)}
+        settingKeys={[PERSONAL_KEYS.streamlineStyling]}
         onChange={(checked) => {
           void setSetting(STREAMLINE_STYLING_KEY, checked);
           const existingStyleElement =
@@ -273,8 +253,7 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
       <PersonalFlagPanel
         title="Disable product diagnostics"
         description="Disable sending usage signals and error reports that help us improve the product."
-        settingKeys={["Disable product diagnostics"]}
-        initialValue={getSetting<boolean>(DISALLOW_DIAGNOSTICS, false)}
+        settingKeys={[PERSONAL_KEYS.disableProductDiagnostics]}
         onChange={(checked) => {
           void setSetting(DISALLOW_DIAGNOSTICS, checked);
           if (checked) {
diff --git a/apps/roam/src/components/settings/KeyboardShortcutInput.tsx b/apps/roam/src/components/settings/KeyboardShortcutInput.tsx
index 32fa640bb..32caf2947 100644
--- a/apps/roam/src/components/settings/KeyboardShortcutInput.tsx
+++ b/apps/roam/src/components/settings/KeyboardShortcutInput.tsx
@@ -9,13 +9,17 @@ import {
 } from "@blueprintjs/core";
 import Description from "roamjs-components/components/Description";
 import { DISCOURSE_TOOL_SHORTCUT_KEY } from "~/data/userSettings";
-import { setPersonalSetting } from "~/components/settings/utils/accessors";
+import {
+  getPersonalSetting,
+  setPersonalSetting,
+} from "~/components/settings/utils/accessors";
 import { comboToString } from "~/components/DiscourseNodeMenu";
+import type { PersonalSettings } from "~/components/settings/utils/zodSchema";
 
 type KeyboardShortcutInputProps = {
   onloadArgs: OnloadArgs;
   settingKey: string;
-  blockPropKey: string;
+  blockPropKey: keyof PersonalSettings;
   label: string;
   description: string;
   placeholder?: string;
@@ -34,7 +38,7 @@ const KeyboardShortcutInput = ({
   const [isActive, setIsActive] = useState(false);
   const [comboKey, setComboKey] = useState<IKeyCombo>(
     () =>
-      (extensionAPI.settings.get(settingKey) as IKeyCombo) || {
+      getPersonalSetting<IKeyCombo>([blockPropKey]) || {
         modifiers: 0,
         key: "",
       },
diff --git a/apps/roam/src/components/settings/LeftSidebarGlobalSettings.tsx b/apps/roam/src/components/settings/LeftSidebarGlobalSettings.tsx
index 838346ab5..a6b68a964 100644
--- a/apps/roam/src/components/settings/LeftSidebarGlobalSettings.tsx
+++ b/apps/roam/src/components/settings/LeftSidebarGlobalSettings.tsx
@@ -1,7 +1,16 @@
 import React, { useCallback, useEffect, useMemo, useState, memo } from "react";
 import { Button, ButtonGroup, Collapse } from "@blueprintjs/core";
 import { GlobalFlagPanel } from "~/components/settings/components/BlockPropSettingPanels";
-import { setGlobalSetting } from "~/components/settings/utils/accessors";
+import {
+  setGlobalSetting,
+  getGlobalSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  GLOBAL_KEYS,
+  LEFT_SIDEBAR_KEYS,
+  LEFT_SIDEBAR_SETTINGS_KEYS,
+} from "~/components/settings/utils/settingKeys";
+import type { LeftSidebarGlobalSettings } from "~/components/settings/utils/zodSchema";
 import AutocompleteInput from "roamjs-components/components/AutocompleteInput";
 import getAllPageNames from "roamjs-components/queries/getAllPageNames";
 import createBlock from "roamjs-components/writes/createBlock";
@@ -10,9 +19,12 @@ import type { RoamBasicNode } from "roamjs-components/types";
 import { extractRef, getSubTree } from "roamjs-components/util";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 import discourseConfigRef from "~/utils/discourseConfigRef";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
-import { getLeftSidebarGlobalSectionConfig } from "~/utils/getLeftSidebarSettings";
-import { LeftSidebarGlobalSectionConfig } from "~/utils/getLeftSidebarSettings";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
+import {
+  getLeftSidebarGlobalSectionConfig,
+  mergeGlobalSectionWithAccessor,
+  type LeftSidebarGlobalSectionConfig,
+} from "~/utils/getLeftSidebarSettings";
 import { render as renderToast } from "roamjs-components/components/Toast";
 import refreshConfigTree from "~/utils/refreshConfigTree";
 import { refreshAndNotify } from "~/components/LeftSidebarView";
@@ -98,6 +110,9 @@ const LeftSidebarGlobalSectionsContent = ({
     const initialize = async () => {
       setIsInitializing(true);
       const globalSectionText = "Global-Section";
+      const globalValues = getGlobalSetting<LeftSidebarGlobalSettings>([
+        GLOBAL_KEYS.leftSidebar,
+      ]);
       const config = getLeftSidebarGlobalSectionConfig(leftSidebar.children);
 
       const existingGlobalSection = leftSidebar.children.find(
@@ -142,9 +157,10 @@ const LeftSidebarGlobalSectionsContent = ({
           });
         }
       } else {
-        setChildrenUid(config.childrenUid || null);
-        setPages(config.children || []);
-        setGlobalSection(config);
+        const merged = mergeGlobalSectionWithAccessor(config, globalValues);
+        setChildrenUid(merged.childrenUid || null);
+        setPages(merged.children || []);
+        setGlobalSection(merged);
       }
       setIsInitializing(false);
     };
@@ -163,7 +179,10 @@ const LeftSidebarGlobalSectionsContent = ({
       newPages.splice(newIndex, 0, removed);
 
       setPages(newPages);
-      setGlobalSetting(["Left sidebar", "Children"], pagesToUids(newPages));
+      setGlobalSetting(
+        [GLOBAL_KEYS.leftSidebar, LEFT_SIDEBAR_KEYS.children],
+        pagesToUids(newPages),
+      );
 
       if (childrenUid) {
         const order = direction === "down" ? newIndex + 1 : newIndex;
@@ -208,7 +227,7 @@ const LeftSidebarGlobalSectionsContent = ({
         const updatedPages = [...pages, newPage];
         setPages(updatedPages);
         setGlobalSetting(
-          ["Left sidebar", "Children"],
+          [GLOBAL_KEYS.leftSidebar, LEFT_SIDEBAR_KEYS.children],
           pagesToUids(updatedPages),
         );
 
@@ -236,7 +255,7 @@ const LeftSidebarGlobalSectionsContent = ({
         const updatedPages = pages.filter((p) => p.uid !== page.uid);
         setPages(updatedPages);
         setGlobalSetting(
-          ["Left sidebar", "Children"],
+          [GLOBAL_KEYS.leftSidebar, LEFT_SIDEBAR_KEYS.children],
           pagesToUids(updatedPages),
         );
 
@@ -285,7 +304,11 @@ const LeftSidebarGlobalSectionsContent = ({
         <GlobalFlagPanel
           title="Folded"
           description="If children are present, start with global section collapsed in left sidebar"
-          settingKeys={["Left sidebar", "Settings", "Folded"]}
+          settingKeys={[
+            GLOBAL_KEYS.leftSidebar,
+            LEFT_SIDEBAR_KEYS.settings,
+            LEFT_SIDEBAR_SETTINGS_KEYS.folded,
+          ]}
           initialValue={globalSection.settings?.folded?.value || false}
           order={0}
           uid={globalSection.settings?.folded?.uid || ""}
@@ -295,7 +318,11 @@ const LeftSidebarGlobalSectionsContent = ({
         <GlobalFlagPanel
           title="Collapsable"
           description="Make global section collapsable"
-          settingKeys={["Left sidebar", "Settings", "Collapsable"]}
+          settingKeys={[
+            GLOBAL_KEYS.leftSidebar,
+            LEFT_SIDEBAR_KEYS.settings,
+            LEFT_SIDEBAR_SETTINGS_KEYS.collapsable,
+          ]}
           initialValue={globalSection.settings?.collapsable?.value || false}
           order={1}
           uid={globalSection.settings?.collapsable?.uid || ""}
diff --git a/apps/roam/src/components/settings/LeftSidebarPersonalSettings.tsx b/apps/roam/src/components/settings/LeftSidebarPersonalSettings.tsx
index ab4eeb61a..ed3426063 100644
--- a/apps/roam/src/components/settings/LeftSidebarPersonalSettings.tsx
+++ b/apps/roam/src/components/settings/LeftSidebarPersonalSettings.tsx
@@ -19,7 +19,12 @@ import createBlock from "roamjs-components/writes/createBlock";
 import deleteBlock from "roamjs-components/writes/deleteBlock";
 import updateBlock from "roamjs-components/writes/updateBlock";
 import type { RoamBasicNode } from "roamjs-components/types";
-import { setPersonalSetting } from "~/components/settings/utils/accessors";
+import {
+  setPersonalSetting,
+  getPersonalSetting,
+} from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
+import type { PersonalSection } from "~/components/settings/utils/zodSchema";
 import {
   PersonalNumberPanel,
   PersonalTextPanel,
@@ -27,12 +32,13 @@ import {
 import {
   LeftSidebarPersonalSectionConfig,
   getLeftSidebarPersonalSectionConfig,
+  mergePersonalSectionsWithAccessor,
   PersonalSectionChild,
 } from "~/utils/getLeftSidebarSettings";
 import { extractRef, getSubTree } from "roamjs-components/util";
 import getTextByBlockUid from "roamjs-components/queries/getTextByBlockUid";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 import { render as renderToast } from "roamjs-components/components/Toast";
 import refreshConfigTree from "~/utils/refreshConfigTree";
 import { refreshAndNotify } from "~/components/LeftSidebarView";
@@ -58,7 +64,10 @@ const sectionsToBlockProps = (sections: LeftSidebarPersonalSectionConfig[]) =>
 const syncAllSectionsToBlockProps = (
   sections: LeftSidebarPersonalSectionConfig[],
 ) => {
-  setPersonalSetting(["Left sidebar"], sectionsToBlockProps(sections));
+  setPersonalSetting(
+    [PERSONAL_KEYS.leftSidebar],
+    sectionsToBlockProps(sections),
+  );
 };
 
 const SectionItem = memo(
@@ -507,7 +516,7 @@ const SectionItem = memo(
                             <PersonalTextPanel
                               title="Alias"
                               description="Display name for this item"
-                              settingKeys={["Left sidebar"]}
+                              settingKeys={[]}
                               initialValue={child.alias?.value ?? ""}
                               order={0}
                               uid={child.alias?.uid}
@@ -599,10 +608,16 @@ const LeftSidebarPersonalSectionsContent = ({
         setSections([]);
       } else {
         setPersonalSectionUid(personalSection.uid);
+
+        const personalValues = getPersonalSetting<PersonalSection[]>([
+          PERSONAL_KEYS.leftSidebar,
+        ]);
         const loadedSections = getLeftSidebarPersonalSectionConfig(
           leftSidebar.children,
         ).sections;
-        setSections(loadedSections);
+        setSections(
+          mergePersonalSectionsWithAccessor(loadedSections, personalValues),
+        );
       }
     };
 
@@ -786,7 +801,7 @@ const LeftSidebarPersonalSectionsContent = ({
               <PersonalNumberPanel
                 title="Truncate-result?"
                 description="Maximum characters to display"
-                settingKeys={["Left sidebar"]}
+                settingKeys={[]}
                 initialValue={
                   activeDialogSection.settings.truncateResult?.value ?? 75
                 }
diff --git a/apps/roam/src/components/settings/NodeConfig.tsx b/apps/roam/src/components/settings/NodeConfig.tsx
index 20447a426..39210864c 100644
--- a/apps/roam/src/components/settings/NodeConfig.tsx
+++ b/apps/roam/src/components/settings/NodeConfig.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useEffect, useMemo } from "react";
+import React, { useState, useCallback, useEffect } from "react";
 import { DiscourseNode } from "~/utils/getDiscourseNodes";
 import DualWriteBlocksPanel from "./components/EphemeralBlocksPanel";
 import { getSubTree } from "roamjs-components/util";
@@ -9,18 +9,20 @@ import DiscourseNodeAttributes from "./DiscourseNodeAttributes";
 import DiscourseNodeCanvasSettings from "./DiscourseNodeCanvasSettings";
 import DiscourseNodeIndex from "./DiscourseNodeIndex";
 import { OnloadArgs } from "roamjs-components/types";
-import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
+import { getDiscourseNodeSetting } from "~/components/settings/utils/accessors";
+import {
+  DISCOURSE_NODE_KEYS,
+  SPECIFICATION_KEYS,
+  TEMPLATE_SETTING_KEYS,
+} from "~/components/settings/utils/settingKeys";
 import DiscourseNodeSuggestiveRules from "./DiscourseNodeSuggestiveRules";
-import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
-import refreshConfigTree from "~/utils/refreshConfigTree";
+import { getFeatureFlag } from "~/components/settings/utils/accessors";
 import {
   DiscourseNodeTextPanel,
   DiscourseNodeFlagPanel,
   DiscourseNodeSelectPanel,
 } from "./components/BlockPropSettingPanels";
 
-const TEMPLATE_SETTING_KEYS = ["template"];
-
 export const getCleanTagText = (tag: string): string => {
   return tag.replace(/^#+/, "").trim().toUpperCase();
 };
@@ -45,10 +47,6 @@ const NodeConfig = ({
   node: DiscourseNode;
   onloadArgs: OnloadArgs;
 }) => {
-  const settings = useMemo(() => {
-    refreshConfigTree();
-    return getFormattedConfigTree();
-  }, []);
   const getUid = (key: string) =>
     getSubTree({
       parentUid: node.type,
@@ -87,10 +85,11 @@ const NodeConfig = ({
       isSpecificationEnabled?: boolean;
     }) => {
       if (isSpecificationEnabled === undefined)
-        isSpecificationEnabled = !!getSubTree({
-          tree: getBasicTreeByParentUid(specificationUid),
-          key: "enabled",
-        })?.uid?.length;
+        isSpecificationEnabled =
+          getDiscourseNodeSetting<boolean>(node.type, [
+            DISCOURSE_NODE_KEYS.specification,
+            SPECIFICATION_KEYS.enabled,
+          ]) ?? false;
       if (format.trim().length === 0 && !isSpecificationEnabled) {
         setTagError("");
         setFormatError("Error: you must set either a format or specification");
@@ -128,7 +127,7 @@ const NodeConfig = ({
         setFormatError("");
       }
     },
-    [specificationUid],
+    [node.type],
   );
 
   useEffect(() => {
@@ -151,7 +150,7 @@ const NodeConfig = ({
                 nodeType={node.type}
                 title="Description"
                 description={`Describing what the ${node.text} node represents in your graph.`}
-                settingKeys={["description"]}
+                settingKeys={[DISCOURSE_NODE_KEYS.description]}
                 initialValue={node.description}
                 multiline
                 order={1}
@@ -162,7 +161,7 @@ const NodeConfig = ({
                 nodeType={node.type}
                 title="Shortcut"
                 description={`The trigger to quickly create a ${node.text} page from the node menu.`}
-                settingKeys={["shortcut"]}
+                settingKeys={[DISCOURSE_NODE_KEYS.shortcut]}
                 initialValue={node.shortcut}
                 order={0}
                 parentUid={node.type}
@@ -172,7 +171,7 @@ const NodeConfig = ({
                 nodeType={node.type}
                 title="Tag"
                 description={`Designate a hashtag for marking potential ${node.text}.`}
-                settingKeys={["tag"]}
+                settingKeys={[DISCOURSE_NODE_KEYS.tag]}
                 initialValue={node.tag}
                 placeholder={generateTagPlaceholder(node)}
                 error={tagError}
@@ -206,7 +205,7 @@ const NodeConfig = ({
                 nodeType={node.type}
                 title="Format"
                 description={`DEPRECATED - Use specification instead. The format ${node.text} pages should have.`}
-                settingKeys={["format"]}
+                settingKeys={[DISCOURSE_NODE_KEYS.format]}
                 initialValue={node.format}
                 error={formatError}
                 onChange={setFormatValue}
@@ -264,9 +263,13 @@ const NodeConfig = ({
                 nodeType={node.type}
                 title="Overlay"
                 description="Select which attribute is used for the discourse overlay"
-                settingKeys={["overlay"]}
+                settingKeys={[DISCOURSE_NODE_KEYS.overlay]}
                 options={attributeNode.children.map((c) => c.text)}
-                initialValue={getBasicTreeByParentUid(overlayUid)[0]?.text}
+                initialValue={
+                  getDiscourseNodeSetting<string>(node.type, [
+                    DISCOURSE_NODE_KEYS.overlay,
+                  ]) ?? ""
+                }
                 order={0}
                 parentUid={node.type}
                 uid={overlayUid}
@@ -287,7 +290,7 @@ const NodeConfig = ({
                 nodeType={node.type}
                 title="Graph Overview"
                 description="Whether to color the node in the graph overview based on canvas color.  This is based on the node's plain title as described by a \`has title\` condition in its specification."
-                settingKeys={["graphOverview"]}
+                settingKeys={[DISCOURSE_NODE_KEYS.graphOverview]}
                 initialValue={node.graphOverview}
                 order={0}
                 parentUid={node.type}
@@ -296,7 +299,7 @@ const NodeConfig = ({
             </div>
           }
         />
-        {settings.suggestiveModeEnabled.value && (
+        {getFeatureFlag("Suggestive mode enabled") && (
           <Tab
             id="suggestive-mode"
             title="Suggestive mode"
diff --git a/apps/roam/src/components/settings/PageGroupPanel.tsx b/apps/roam/src/components/settings/PageGroupPanel.tsx
index e581a2d15..2a8656485 100644
--- a/apps/roam/src/components/settings/PageGroupPanel.tsx
+++ b/apps/roam/src/components/settings/PageGroupPanel.tsx
@@ -7,10 +7,14 @@ import deleteBlock from "roamjs-components/writes/deleteBlock";
 import getAllPageNames from "roamjs-components/queries/getAllPageNames";
 import { type PageGroup } from "~/utils/getSuggestiveModeConfigSettings";
 import { setGlobalSetting } from "~/components/settings/utils/accessors";
+import {
+  GLOBAL_KEYS,
+  SUGGESTIVE_MODE_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
 const syncPageGroupsToBlockProps = (groups: PageGroup[]) => {
   setGlobalSetting(
-    ["Suggestive mode", "Page groups"],
+    [GLOBAL_KEYS.suggestiveMode, SUGGESTIVE_MODE_KEYS.pageGroups],
     groups.map((g) => ({ name: g.name, pages: g.pages.map((p) => p.name) })),
   );
 };
diff --git a/apps/roam/src/components/settings/QueryPagesPanel.tsx b/apps/roam/src/components/settings/QueryPagesPanel.tsx
index f810b1918..49122bf5e 100644
--- a/apps/roam/src/components/settings/QueryPagesPanel.tsx
+++ b/apps/roam/src/components/settings/QueryPagesPanel.tsx
@@ -2,12 +2,22 @@ import { Button, InputGroup } from "@blueprintjs/core";
 import posthog from "posthog-js";
 import React, { useState } from "react";
 import type { OnloadArgs } from "roamjs-components/types";
+import {
+  getPersonalSetting,
+  setPersonalSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  PERSONAL_KEYS,
+  QUERY_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
-export const getQueryPages = (extensionAPI: OnloadArgs["extensionAPI"]) => {
-  const value = extensionAPI.settings.get("query-pages") as
-    | string[]
-    | string
-    | Record<string, string>;
+// Legacy extensionAPI stored query-pages as string | string[] | Record<string, string>.
+// Coerce to string[] for backward compatibility with old stored formats.
+export const getQueryPages = (): string[] => {
+  const value = getPersonalSetting<string[] | string | Record<string, string>>([
+    PERSONAL_KEYS.query,
+    QUERY_KEYS.queryPages,
+  ]);
   return typeof value === "string"
     ? [value]
     : Array.isArray(value)
@@ -22,8 +32,13 @@ const QueryPagesPanel = ({
 }: {
   extensionAPI: OnloadArgs["extensionAPI"];
 }) => {
-  const [texts, setTexts] = useState(() => getQueryPages(extensionAPI));
+  const [texts, setTexts] = useState(() => getQueryPages());
   const [value, setValue] = useState("");
+  const setQueryPages = (newTexts: string[]) => {
+    setPersonalSetting([PERSONAL_KEYS.query, QUERY_KEYS.queryPages], newTexts);
+    void extensionAPI.settings.set("query-pages", newTexts);
+  };
+
   return (
     <div
       className="flex flex-col"
@@ -45,7 +60,7 @@ const QueryPagesPanel = ({
           onClick={() => {
             const newTexts = [...texts, value];
             setTexts(newTexts);
-            extensionAPI.settings.set("query-pages", newTexts);
+            setQueryPages(newTexts);
             setValue("");
             posthog.capture("Query Page: Page Format Added", {
               newType: value,
@@ -70,7 +85,7 @@ const QueryPagesPanel = ({
             onClick={() => {
               const newTexts = texts.filter((_, jndex) => index !== jndex);
               setTexts(newTexts);
-              extensionAPI.settings.set("query-pages", newTexts);
+              setQueryPages(newTexts);
             }}
           />
         </div>
diff --git a/apps/roam/src/components/settings/QuerySettings.tsx b/apps/roam/src/components/settings/QuerySettings.tsx
index e40613c0c..f78abd0a2 100644
--- a/apps/roam/src/components/settings/QuerySettings.tsx
+++ b/apps/roam/src/components/settings/QuerySettings.tsx
@@ -4,12 +4,15 @@ import { Label } from "@blueprintjs/core";
 import Description from "roamjs-components/components/Description";
 import { DEFAULT_PAGE_SIZE_KEY, HIDE_METADATA_KEY } from "~/data/userSettings";
 import DefaultFilters from "./DefaultFilters";
-import { getQueryPages } from "./QueryPagesPanel";
 import {
   PersonalFlagPanel,
   PersonalNumberPanel,
   PersonalMultiTextPanel,
 } from "./components/BlockPropSettingPanels";
+import {
+  PERSONAL_KEYS,
+  QUERY_KEYS,
+} from "~/components/settings/utils/settingKeys";
 import posthog from "posthog-js";
 
 const QuerySettings = ({
@@ -22,10 +25,7 @@ const QuerySettings = ({
       <PersonalFlagPanel
         title="Hide query metadata"
         description="Hide the Roam blocks that are used to power each query"
-        settingKeys={["Query", "Hide query metadata"]}
-        initialValue={
-          (extensionAPI.settings.get(HIDE_METADATA_KEY) as boolean) ?? true
-        }
+        settingKeys={[PERSONAL_KEYS.query, QUERY_KEYS.hideQueryMetadata]}
         onChange={(checked) => {
           void extensionAPI.settings.set(HIDE_METADATA_KEY, checked);
           posthog.capture("Query Settings: Hide Metadata Toggled", {
@@ -36,10 +36,7 @@ const QuerySettings = ({
       <PersonalNumberPanel
         title="Default page size"
         description="The default page size used for query results"
-        settingKeys={["Query", "Default page size"]}
-        initialValue={
-          Number(extensionAPI.settings.get(DEFAULT_PAGE_SIZE_KEY)) || 10
-        }
+        settingKeys={[PERSONAL_KEYS.query, QUERY_KEYS.defaultPageSize]}
         onChange={(value) => {
           void extensionAPI.settings.set(DEFAULT_PAGE_SIZE_KEY, value);
           posthog.capture("Query Settings: Default Page Size Changed", {
@@ -50,8 +47,7 @@ const QuerySettings = ({
       <PersonalMultiTextPanel
         title="Query pages"
         description="The title formats of pages that you would like to serve as pages that generate queries"
-        settingKeys={["Query", "Query pages"]}
-        initialValue={getQueryPages(extensionAPI)}
+        settingKeys={[PERSONAL_KEYS.query, QUERY_KEYS.queryPages]}
         onChange={(values) => {
           void extensionAPI.settings.set("query-pages", values);
         }}
diff --git a/apps/roam/src/components/settings/Settings.tsx b/apps/roam/src/components/settings/Settings.tsx
index 5893f44c6..80c35bdcd 100644
--- a/apps/roam/src/components/settings/Settings.tsx
+++ b/apps/roam/src/components/settings/Settings.tsx
@@ -12,7 +12,7 @@ import {
 import renderOverlay from "roamjs-components/util/renderOverlay";
 import DiscourseRelationConfigPanel from "./DiscourseRelationConfigPanel";
 import DEFAULT_RELATION_VALUES from "~/data/defaultDiscourseRelations";
-import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
+import discourseConfigRef from "~/utils/discourseConfigRef";
 import DiscourseGraphHome from "./GeneralSettings";
 import DiscourseGraphExport from "./ExportSettings";
 import QuerySettings from "./QuerySettings";
@@ -73,7 +73,13 @@ export const SettingsDialog = ({
   selectedTabId?: TabId;
 }) => {
   const extensionAPI = onloadArgs.extensionAPI;
-  const settings = getFormattedConfigTree();
+  const grammarNode = discourseConfigRef.tree.find(
+    (node) => node.text === "grammar",
+  );
+  const relationsNode = grammarNode?.children.find(
+    (node) => node.text === "relations",
+  );
+  const nodesNode = grammarNode?.children.find((node) => node.text === "nodes");
   const nodes = getDiscourseNodes().filter(excludeDefaultNodes);
   const [activeTabId, setActiveTabId] = useState<TabId>(
     selectedTabId ?? "discourse-graph-home-personal",
@@ -204,8 +210,8 @@ export const SettingsDialog = ({
               <DiscourseRelationConfigPanel
                 defaultValue={DEFAULT_RELATION_VALUES}
                 title="Relations"
-                parentUid={settings.grammarUid}
-                uid={settings.relationsUid}
+                parentUid={grammarNode?.uid || ""}
+                uid={relationsNode?.uid || ""}
               />
             }
           />
@@ -216,8 +222,8 @@ export const SettingsDialog = ({
             panel={
               <DiscourseNodeConfigPanel
                 title="Nodes"
-                uid={settings.nodesUid}
-                parentUid={settings.grammarUid}
+                uid={nodesNode?.uid || ""}
+                parentUid={grammarNode?.uid || ""}
                 defaultValue={[]}
                 setSelectedTabId={setActiveTabId}
                 isPopup={true}
diff --git a/apps/roam/src/components/settings/SuggestiveModeSettings.tsx b/apps/roam/src/components/settings/SuggestiveModeSettings.tsx
index 2e0b7e069..fab4e513e 100644
--- a/apps/roam/src/components/settings/SuggestiveModeSettings.tsx
+++ b/apps/roam/src/components/settings/SuggestiveModeSettings.tsx
@@ -1,26 +1,37 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import React, { useEffect, useState } from "react";
 import { Button, Intent, Tabs, Tab, TabId } from "@blueprintjs/core";
-import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
+import discourseConfigRef from "~/utils/discourseConfigRef";
 import PageGroupsPanel from "./PageGroupPanel";
 import createBlock from "roamjs-components/writes/createBlock";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 import { createOrUpdateDiscourseEmbedding } from "~/utils/syncDgNodesToSupabase";
 import { render as renderToast } from "roamjs-components/components/Toast";
 import { GlobalFlagPanel } from "./components/BlockPropSettingPanels";
+import { getGlobalSetting } from "~/components/settings/utils/accessors";
+import {
+  GLOBAL_KEYS,
+  SUGGESTIVE_MODE_KEYS,
+} from "~/components/settings/utils/settingKeys";
 import posthog from "posthog-js";
+import { getSuggestiveModeConfigAndUids } from "~/utils/getSuggestiveModeConfigSettings";
 
 const SuggestiveModeSettings = () => {
-  const settings = getFormattedConfigTree();
+  const suggestiveMode = getSuggestiveModeConfigAndUids(
+    discourseConfigRef.tree,
+  );
 
   const [suggestiveModeUid, setSuggestiveModeUid] = useState(
-    settings.suggestiveMode.parentUid,
+    suggestiveMode.parentUid,
   );
-  const pageGroupsUid = settings.suggestiveMode.pageGroups.uid;
+  const pageGroupsUid = suggestiveMode.pageGroups.uid;
 
   const [includePageRelations, setIncludePageRelations] = useState(
-    settings.suggestiveMode.includePageRelations.value,
+    getGlobalSetting<boolean>([
+      GLOBAL_KEYS.suggestiveMode,
+      SUGGESTIVE_MODE_KEYS.includeCurrentPageRelations,
+    ]) ?? false,
   );
 
   useEffect(() => {
@@ -35,7 +46,7 @@ const SuggestiveModeSettings = () => {
   }, [suggestiveModeUid]);
 
   const effectiveSuggestiveModeUid =
-    suggestiveModeUid || settings.suggestiveMode.parentUid;
+    suggestiveModeUid || suggestiveMode.parentUid;
 
   const [selectedTabId, setSelectedTabId] = useState<TabId>("page-groups");
 
@@ -59,7 +70,7 @@ const SuggestiveModeSettings = () => {
               <PageGroupsPanel
                 key={pageGroupsUid}
                 uid={pageGroupsUid}
-                initialGroups={settings.suggestiveMode.pageGroups.groups}
+                initialGroups={suggestiveMode.pageGroups.groups}
               />
             </div>
           }
@@ -69,21 +80,19 @@ const SuggestiveModeSettings = () => {
           title="Sync config"
           panel={
             <div className="flex flex-col gap-4 p-1">
-              {/* TODO: Titles kept as Title Case to match legacy readers in getSuggestiveModeConfigSettings.ts.
-                  Update titles to Sentence case once read side is migrated to block props. */}
+              {/* TODO(ENG-1469): Titles kept as Title Case because getSuggestiveModeConfigSettings.ts
+                  still reads from the block tree expecting these strings. Update to Sentence case
+                  once the aggregator is refactored to read from block props. */}
               <div className="sync-config-settings">
                 <GlobalFlagPanel
                   title="Include Current Page Relations"
                   description="Include relations from pages referenced on the current page"
                   settingKeys={[
-                    "Suggestive mode",
-                    "Include current page relations",
+                    GLOBAL_KEYS.suggestiveMode,
+                    SUGGESTIVE_MODE_KEYS.includeCurrentPageRelations,
                   ]}
-                  initialValue={
-                    settings.suggestiveMode.includePageRelations.value
-                  }
                   order={0}
-                  uid={settings.suggestiveMode.includePageRelations.uid}
+                  uid={suggestiveMode.includePageRelations.uid}
                   parentUid={effectiveSuggestiveModeUid}
                   onChange={setIncludePageRelations}
                 />
@@ -96,15 +105,12 @@ const SuggestiveModeSettings = () => {
                       : "Include relations from parent and child blocks"
                   }
                   settingKeys={[
-                    "Suggestive mode",
-                    "Include parent and child blocks",
+                    GLOBAL_KEYS.suggestiveMode,
+                    SUGGESTIVE_MODE_KEYS.includeParentAndChildBlocks,
                   ]}
-                  initialValue={
-                    settings.suggestiveMode.includeParentAndChildren.value
-                  }
                   value={includePageRelations ? true : undefined}
                   order={1}
-                  uid={settings.suggestiveMode.includeParentAndChildren.uid}
+                  uid={suggestiveMode.includeParentAndChildren.uid}
                   parentUid={effectiveSuggestiveModeUid}
                   disabled={includePageRelations}
                 />
diff --git a/apps/roam/src/components/settings/components/BlockPropSettingPanels.tsx b/apps/roam/src/components/settings/components/BlockPropSettingPanels.tsx
index 65d5225f5..81f8fc62f 100644
--- a/apps/roam/src/components/settings/components/BlockPropSettingPanels.tsx
+++ b/apps/roam/src/components/settings/components/BlockPropSettingPanels.tsx
@@ -19,6 +19,10 @@ import Description from "roamjs-components/components/Description";
 import useSingleChildValue from "roamjs-components/components/ConfigPanels/useSingleChildValue";
 import getShallowTreeByParentUid from "roamjs-components/queries/getShallowTreeByParentUid";
 import {
+  getGlobalSetting,
+  getPersonalSetting,
+  getFeatureFlag,
+  getDiscourseNodeSetting,
   setGlobalSetting,
   setPersonalSetting,
   setFeatureFlag,
@@ -500,7 +504,6 @@ export const FeatureFlagPanel = ({
   title,
   description,
   featureKey,
-  initialValue,
   onBeforeEnable,
   onAfterChange,
   parentUid,
@@ -510,7 +513,6 @@ export const FeatureFlagPanel = ({
   title: string;
   description: string;
   featureKey: keyof FeatureFlags;
-  initialValue?: boolean;
   onBeforeEnable?: () => Promise<boolean>;
   onAfterChange?: (checked: boolean) => void;
 } & RoamBlockSyncProps) => {
@@ -531,7 +533,7 @@ export const FeatureFlagPanel = ({
       description={description}
       settingKeys={[featureKey as string]}
       setter={featureFlagSetter}
-      initialValue={initialValue}
+      initialValue={getFeatureFlag(featureKey)}
       onBeforeChange={handleBeforeChange}
       onChange={onAfterChange}
       parentUid={parentUid}
@@ -542,31 +544,73 @@ export const FeatureFlagPanel = ({
 };
 
 export const GlobalTextPanel = (props: TextWrapperProps) => (
-  <BaseTextPanel {...props} {...globalAccessors.text} />
+  <BaseTextPanel
+    {...props}
+    initialValue={
+      getGlobalSetting<string>(props.settingKeys) ?? props.initialValue
+    }
+    {...globalAccessors.text}
+  />
 );
 
 export const GlobalFlagPanel = (props: FlagWrapperProps) => (
-  <BaseFlagPanel {...props} {...globalAccessors.flag} />
+  <BaseFlagPanel
+    {...props}
+    initialValue={
+      getGlobalSetting<boolean>(props.settingKeys) ?? props.initialValue
+    }
+    {...globalAccessors.flag}
+  />
 );
 
 export const GlobalNumberPanel = (props: NumberWrapperProps) => (
-  <BaseNumberPanel {...props} {...globalAccessors.number} />
+  <BaseNumberPanel
+    {...props}
+    initialValue={
+      getGlobalSetting<number>(props.settingKeys) ?? props.initialValue
+    }
+    {...globalAccessors.number}
+  />
 );
 
 export const GlobalSelectPanel = (props: SelectWrapperProps) => (
-  <BaseSelectPanel {...props} {...globalAccessors.text} />
+  <BaseSelectPanel
+    {...props}
+    initialValue={
+      getGlobalSetting<string>(props.settingKeys) ?? props.initialValue
+    }
+    {...globalAccessors.text}
+  />
 );
 
 export const GlobalMultiTextPanel = (props: MultiTextWrapperProps) => (
-  <BaseMultiTextPanel {...props} {...globalAccessors.multiText} />
+  <BaseMultiTextPanel
+    {...props}
+    initialValue={
+      getGlobalSetting<string[]>(props.settingKeys) ?? props.initialValue
+    }
+    {...globalAccessors.multiText}
+  />
 );
 
 export const PersonalTextPanel = ({ setter, ...props }: TextWrapperProps) => (
-  <BaseTextPanel {...props} setter={setter ?? personalAccessors.text.setter} />
+  <BaseTextPanel
+    {...props}
+    initialValue={
+      getPersonalSetting<string>(props.settingKeys) ?? props.initialValue
+    }
+    setter={setter ?? personalAccessors.text.setter}
+  />
 );
 
 export const PersonalFlagPanel = (props: FlagWrapperProps) => (
-  <BaseFlagPanel {...props} {...personalAccessors.flag} />
+  <BaseFlagPanel
+    {...props}
+    initialValue={
+      getPersonalSetting<boolean>(props.settingKeys) ?? props.initialValue
+    }
+    {...personalAccessors.flag}
+  />
 );
 
 export const PersonalNumberPanel = ({
@@ -575,16 +619,31 @@ export const PersonalNumberPanel = ({
 }: NumberWrapperProps) => (
   <BaseNumberPanel
     {...props}
+    initialValue={
+      getPersonalSetting<number>(props.settingKeys) ?? props.initialValue
+    }
     setter={setter ?? personalAccessors.number.setter}
   />
 );
 
 export const PersonalSelectPanel = (props: SelectWrapperProps) => (
-  <BaseSelectPanel {...props} {...personalAccessors.text} />
+  <BaseSelectPanel
+    {...props}
+    initialValue={
+      getPersonalSetting<string>(props.settingKeys) ?? props.initialValue
+    }
+    {...personalAccessors.text}
+  />
 );
 
 export const PersonalMultiTextPanel = (props: MultiTextWrapperProps) => (
-  <BaseMultiTextPanel {...props} {...personalAccessors.multiText} />
+  <BaseMultiTextPanel
+    {...props}
+    initialValue={
+      getPersonalSetting<string[]>(props.settingKeys) ?? props.initialValue
+    }
+    {...personalAccessors.multiText}
+  />
 );
 
 const createDiscourseNodeSetter =
@@ -610,7 +669,14 @@ export const DiscourseNodeTextPanel = ({
     error?: string;
     onChange?: (value: string) => void;
   }) => (
-  <BaseTextPanel {...props} setter={createDiscourseNodeSetter(nodeType)} />
+  <BaseTextPanel
+    {...props}
+    initialValue={
+      getDiscourseNodeSetting<string>(nodeType, props.settingKeys) ??
+      props.initialValue
+    }
+    setter={createDiscourseNodeSetter(nodeType)}
+  />
 );
 
 export const DiscourseNodeFlagPanel = ({
@@ -623,7 +689,14 @@ export const DiscourseNodeFlagPanel = ({
     onBeforeChange?: (checked: boolean) => Promise<boolean>;
     onChange?: (checked: boolean) => void;
   }) => (
-  <BaseFlagPanel {...props} setter={createDiscourseNodeSetter(nodeType)} />
+  <BaseFlagPanel
+    {...props}
+    initialValue={
+      getDiscourseNodeSetting<boolean>(nodeType, props.settingKeys) ??
+      props.initialValue
+    }
+    setter={createDiscourseNodeSetter(nodeType)}
+  />
 );
 
 export const DiscourseNodeSelectPanel = ({
@@ -631,7 +704,14 @@ export const DiscourseNodeSelectPanel = ({
   ...props
 }: DiscourseNodeBaseProps &
   RoamBlockSyncProps & { options: string[]; initialValue?: string }) => (
-  <BaseSelectPanel {...props} setter={createDiscourseNodeSetter(nodeType)} />
+  <BaseSelectPanel
+    {...props}
+    initialValue={
+      getDiscourseNodeSetting<string>(nodeType, props.settingKeys) ??
+      props.initialValue
+    }
+    setter={createDiscourseNodeSetter(nodeType)}
+  />
 );
 
 export const DiscourseNodeNumberPanel = ({
@@ -643,5 +723,12 @@ export const DiscourseNodeNumberPanel = ({
     min?: number;
     max?: number;
   }) => (
-  <BaseNumberPanel {...props} setter={createDiscourseNodeSetter(nodeType)} />
+  <BaseNumberPanel
+    {...props}
+    initialValue={
+      getDiscourseNodeSetting<number>(nodeType, props.settingKeys) ??
+      props.initialValue
+    }
+    setter={createDiscourseNodeSetter(nodeType)}
+  />
 );
diff --git a/apps/roam/src/components/settings/utils/accessors.ts b/apps/roam/src/components/settings/utils/accessors.ts
index 940eb7dfd..ad53253e6 100644
--- a/apps/roam/src/components/settings/utils/accessors.ts
+++ b/apps/roam/src/components/settings/utils/accessors.ts
@@ -3,10 +3,27 @@ import getBlockProps, {
   type json,
 } from "~/utils/getBlockProps";
 import setBlockProps from "~/utils/setBlockProps";
+import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
 import getBlockUidByTextOnPage from "roamjs-components/queries/getBlockUidByTextOnPage";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
+import { getSubTree } from "roamjs-components/util";
+import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
 import internalError from "~/utils/internalError";
+import { getSetting } from "~/utils/extensionSettings";
+
+import discourseConfigRef from "~/utils/discourseConfigRef";
+import { roamNodeToCondition } from "~/utils/parseQuery";
+import type { DiscourseRelation } from "~/utils/getDiscourseRelations";
+import type { DiscourseNode } from "~/utils/getDiscourseNodes";
+import type { Condition } from "~/utils/types";
 import { z } from "zod";
+import {
+  getExportSettingsAndUids,
+  getUidAndBooleanSetting,
+  getUidAndStringSetting,
+} from "~/utils/getExportSettings";
+import { getSuggestiveModeConfigAndUids } from "~/utils/getSuggestiveModeConfigSettings";
+import { getLeftSidebarSettings } from "~/utils/getLeftSidebarSettings";
 
 import {
   DG_BLOCK_PROP_SETTINGS_PAGE_TITLE,
@@ -21,8 +38,9 @@ import {
   type GlobalSettings,
   type PersonalSettings,
   type DiscourseNodeSettings,
-  type DiscourseRelationSettings,
+  type Condition as SchemaCondition,
 } from "./zodSchema";
+import { PERSONAL_KEYS, QUERY_KEYS, GLOBAL_KEYS } from "./settingKeys";
 
 const isRecord = (value: unknown): value is Record<string, unknown> =>
   typeof value === "object" && value !== null && !Array.isArray(value);
@@ -106,6 +124,20 @@ const getSchemaAtPath = (
 const formatSettingPath = (keys: string[]): string =>
   keys.length === 0 ? "(root)" : keys.join(" > ");
 
+const readPathValue = (root: unknown, keys: string[]): unknown =>
+  keys.reduce<unknown>((current, key) => {
+    if (Array.isArray(current)) {
+      const index = Number(key);
+      return Number.isInteger(index) && index >= 0 && index < current.length
+        ? current[index]
+        : undefined;
+    }
+    if (!isRecord(current) || !(key in current)) return undefined;
+    return current[key];
+  }, root);
+
+const pathKey = (keys: string[]): string => keys.join("::");
+
 const validateSettingValue = ({
   schema,
   keys,
@@ -142,6 +174,385 @@ const validateSettingValue = ({
   return true;
 };
 
+const DEFAULT_PERSONAL_SETTINGS = PersonalSettingsSchema.parse({});
+const DEFAULT_GLOBAL_SETTINGS = GlobalSettingsSchema.parse({});
+const DEFAULT_LEGACY_QUERY = {
+  conditions: [],
+  selections: [],
+  custom: "",
+  returnNode: "node",
+};
+
+const PERSONAL_SCHEMA_PATH_TO_LEGACY_KEY = new Map<string, string>([
+  [
+    pathKey([PERSONAL_KEYS.discourseContextOverlay]),
+    "discourse-context-overlay",
+  ],
+  [pathKey([PERSONAL_KEYS.suggestiveModeOverlay]), "suggestive-mode-overlay"],
+  [pathKey([PERSONAL_KEYS.textSelectionPopup]), "text-selection-popup"],
+  [pathKey([PERSONAL_KEYS.disableSidebarOpen]), "disable-sidebar-open"],
+  [pathKey([PERSONAL_KEYS.pagePreview]), "page-preview"],
+  [pathKey([PERSONAL_KEYS.hideFeedbackButton]), "hide-feedback-button"],
+  [pathKey([PERSONAL_KEYS.autoCanvasRelations]), "auto-canvas-relations"],
+  [
+    pathKey([PERSONAL_KEYS.overlayInCanvas]),
+    "discourse-context-overlay-in-canvas",
+  ],
+  [pathKey([PERSONAL_KEYS.streamlineStyling]), "streamline-styling"],
+  [pathKey([PERSONAL_KEYS.disableProductDiagnostics]), "disallow-diagnostics"],
+  [pathKey([PERSONAL_KEYS.discourseToolShortcut]), "discourse-tool-shortcut"],
+  [
+    pathKey([PERSONAL_KEYS.personalNodeMenuTrigger]),
+    "personal-node-menu-trigger",
+  ],
+  [pathKey([PERSONAL_KEYS.nodeSearchMenuTrigger]), "node-search-trigger"],
+  [
+    pathKey([PERSONAL_KEYS.query, QUERY_KEYS.hideQueryMetadata]),
+    "hide-metadata",
+  ],
+  [
+    pathKey([PERSONAL_KEYS.query, QUERY_KEYS.defaultPageSize]),
+    "default-page-size",
+  ],
+  [pathKey([PERSONAL_KEYS.query, QUERY_KEYS.queryPages]), "query-pages"],
+  [
+    pathKey([PERSONAL_KEYS.query, QUERY_KEYS.defaultFilters]),
+    "default-filters",
+  ],
+]);
+
+const getLegacyPersonalLeftSidebarSetting = (): unknown[] => {
+  const settings = getLeftSidebarSettings(discourseConfigRef.tree);
+
+  /* eslint-disable @typescript-eslint/naming-convention */
+  return settings.personal.sections.map((section) => ({
+    name: section.text,
+    Children: (section.children || []).map((child) => ({
+      uid: child.text,
+      Alias: child.alias?.value || "",
+    })),
+    Settings: {
+      "Truncate-result?": section.settings?.truncateResult.value ?? 75,
+      Folded: section.settings?.folded.value ?? false,
+    },
+  }));
+  /* eslint-enable @typescript-eslint/naming-convention */
+};
+
+const getLegacyPersonalSetting = (keys: string[]): unknown => {
+  if (keys.length === 0) return undefined;
+
+  const mappedOldKey = PERSONAL_SCHEMA_PATH_TO_LEGACY_KEY.get(pathKey(keys));
+  if (mappedOldKey) {
+    return getSetting<unknown>(
+      mappedOldKey,
+      readPathValue(DEFAULT_PERSONAL_SETTINGS, keys),
+    );
+  }
+
+  if (keys.length === 1 && keys[0] === "Query") {
+    const querySettings: Record<string, unknown> = {};
+    querySettings["Hide query metadata"] = getLegacyPersonalSetting([
+      "Query",
+      "Hide query metadata",
+    ]);
+    querySettings["Default page size"] = getLegacyPersonalSetting([
+      "Query",
+      "Default page size",
+    ]);
+    querySettings["Query pages"] = getLegacyPersonalSetting([
+      "Query",
+      "Query pages",
+    ]);
+    querySettings["Default filters"] = getLegacyPersonalSetting([
+      "Query",
+      "Default filters",
+    ]);
+    return querySettings;
+  }
+
+  if (keys[0] === "Left sidebar") {
+    const leftSidebarSettings = getLegacyPersonalLeftSidebarSetting();
+    if (keys.length === 1) return leftSidebarSettings;
+    return readPathValue(leftSidebarSettings, keys.slice(1));
+  }
+
+  return undefined;
+};
+
+const getLegacyRelationsSetting = (): Record<string, unknown> => {
+  const settingsUid = getPageUidByPageTitle(DG_BLOCK_PROP_SETTINGS_PAGE_TITLE);
+  if (!settingsUid) return DEFAULT_GLOBAL_SETTINGS.Relations;
+
+  const configTree = getBasicTreeByParentUid(settingsUid);
+  const grammarChildren = getSubTree({
+    tree: configTree,
+    key: "grammar",
+  }).children;
+  const relationNodes = getSubTree({
+    tree: grammarChildren,
+    key: "relations",
+  }).children;
+  if (relationNodes.length === 0) return DEFAULT_GLOBAL_SETTINGS.Relations;
+
+  return Object.fromEntries(
+    relationNodes.map((relationNode) => {
+      const relationTree = relationNode.children;
+      const ifBlocks = getSubTree({ tree: relationTree, key: "If" }).children;
+      const ifConditions = ifBlocks.map((ifBlock) => {
+        const blockChildren = ifBlock.children;
+        const nodePositionsNode = blockChildren.find((c) =>
+          /node positions/i.test(c.text),
+        );
+        const triples = blockChildren
+          .filter((c) => !/node positions/i.test(c.text))
+          .map(
+            (c) =>
+              [
+                c.text,
+                c.children[0]?.text || "",
+                c.children[0]?.children[0]?.text || "",
+              ] as [string, string, string],
+          );
+        const nodePositions = Object.fromEntries(
+          (nodePositionsNode?.children || []).map((c) => [
+            c.text,
+            c.children[0]?.text || "",
+          ]),
+        );
+        return { triples, nodePositions };
+      });
+
+      return [
+        relationNode.uid || relationNode.text,
+        {
+          label: relationNode.text,
+          source: getSettingValueFromTree({
+            tree: relationTree,
+            key: "Source",
+          }),
+          destination: getSettingValueFromTree({
+            tree: relationTree,
+            key: "Destination",
+          }),
+          complement: getSettingValueFromTree({
+            tree: relationTree,
+            key: "Complement",
+          }),
+          ifConditions,
+        },
+      ];
+    }),
+  );
+};
+
+// Reconstructs global settings from legacy Roam tree to match block-props schema shape
+const getLegacyGlobalSetting = (keys: string[]): unknown => {
+  if (keys.length === 0) return undefined;
+
+  const tree = discourseConfigRef.tree;
+  const firstKey = keys[0];
+
+  if (firstKey === "Trigger") {
+    return (
+      getUidAndStringSetting({ tree, text: "trigger" }).value ||
+      DEFAULT_GLOBAL_SETTINGS.Trigger
+    );
+  }
+
+  if (firstKey === "Canvas page format") {
+    return (
+      getUidAndStringSetting({ tree, text: "Canvas Page Format" }).value ||
+      DEFAULT_GLOBAL_SETTINGS["Canvas page format"]
+    );
+  }
+
+  if (firstKey === "Left sidebar") {
+    const sidebar = getLeftSidebarSettings(tree);
+    const leftSidebarSettings: Record<string, unknown> = {};
+    leftSidebarSettings["Children"] = sidebar.global.children.map(
+      (c) => c.text,
+    );
+    const sidebarSettingValues: Record<string, unknown> = {};
+    sidebarSettingValues["Collapsable"] =
+      sidebar.global.settings?.collapsable.value ??
+      DEFAULT_GLOBAL_SETTINGS["Left sidebar"].Settings.Collapsable;
+    sidebarSettingValues["Folded"] =
+      sidebar.global.settings?.folded.value ??
+      DEFAULT_GLOBAL_SETTINGS["Left sidebar"].Settings.Folded;
+    leftSidebarSettings["Settings"] = sidebarSettingValues;
+    if (keys.length === 1) return leftSidebarSettings;
+    return readPathValue(leftSidebarSettings, keys.slice(1));
+  }
+
+  if (firstKey === "Export") {
+    const exp = getExportSettingsAndUids();
+    const exportSettings: Record<string, unknown> = {};
+    exportSettings["Remove special characters"] =
+      exp.removeSpecialCharacters.value ??
+      DEFAULT_GLOBAL_SETTINGS.Export["Remove special characters"];
+    exportSettings["Resolve block references"] =
+      exp.optsRefs.value ??
+      DEFAULT_GLOBAL_SETTINGS.Export["Resolve block references"];
+    exportSettings["Resolve block embeds"] =
+      exp.optsEmbeds.value ??
+      DEFAULT_GLOBAL_SETTINGS.Export["Resolve block embeds"];
+    exportSettings["Append referenced node"] =
+      exp.appendRefNodeContext.value ??
+      DEFAULT_GLOBAL_SETTINGS.Export["Append referenced node"];
+    exportSettings["Link type"] =
+      exp.linkType.value || DEFAULT_GLOBAL_SETTINGS.Export["Link type"];
+    exportSettings["Max filename length"] =
+      exp.maxFilenameLength.value ??
+      DEFAULT_GLOBAL_SETTINGS.Export["Max filename length"];
+    exportSettings["Frontmatter"] =
+      exp.frontmatter.values ?? DEFAULT_GLOBAL_SETTINGS.Export.Frontmatter;
+    if (keys.length === 1) return exportSettings;
+    return readPathValue(exportSettings, keys.slice(1));
+  }
+
+  if (firstKey === "Suggestive mode") {
+    const sm = getSuggestiveModeConfigAndUids(tree);
+    const suggestiveModeSettings: Record<string, unknown> = {};
+    suggestiveModeSettings["Include current page relations"] =
+      sm.includePageRelations.value ??
+      DEFAULT_GLOBAL_SETTINGS["Suggestive mode"][
+        "Include current page relations"
+      ];
+    suggestiveModeSettings["Include parent and child blocks"] =
+      sm.includeParentAndChildren.value ??
+      DEFAULT_GLOBAL_SETTINGS["Suggestive mode"][
+        "Include parent and child blocks"
+      ];
+    suggestiveModeSettings["Page groups"] = sm.pageGroups.groups.map(
+      (group) => ({
+        name: group.name,
+        pages: group.pages.map((page) => page.name),
+      }),
+    );
+    if (keys.length === 1) return suggestiveModeSettings;
+    return readPathValue(suggestiveModeSettings, keys.slice(1));
+  }
+
+  if (firstKey === "Relations") {
+    const relationsSettings = getLegacyRelationsSetting();
+    if (keys.length === 1) return relationsSettings;
+    return readPathValue(relationsSettings, keys.slice(1));
+  }
+
+  return undefined;
+};
+
+const getLegacyQuerySettingByParentUid = (parentUid: string) => {
+  const scratchNode = getSubTree({ parentUid, key: "scratch" });
+  const conditionsNode = getSubTree({
+    tree: scratchNode.children,
+    key: "conditions",
+  });
+  const selectionsNode = getSubTree({
+    tree: scratchNode.children,
+    key: "selections",
+  });
+  const customNode = getSubTree({ tree: scratchNode.children, key: "custom" });
+
+  return {
+    conditions: conditionsNode.children.map(roamNodeToCondition),
+    selections: selectionsNode.children.map((s) => ({
+      text: s.text,
+      label: s.children[0]?.text || "",
+    })),
+    custom: customNode.children[0]?.text || "",
+    returnNode: "node",
+  };
+};
+
+// Reconstructs per-node settings from Roam tree structure to match block-props schema shape
+const getLegacyDiscourseNodeSetting = (
+  nodeType: string,
+  keys: string[],
+): unknown => {
+  let nodeUid = nodeType;
+  let tree = getBasicTreeByParentUid(nodeUid);
+
+  if (tree.length === 0) {
+    const lookedUpUid = getPageUidByPageTitle(
+      `${DISCOURSE_NODE_PAGE_PREFIX}${nodeType}`,
+    );
+    if (lookedUpUid) {
+      nodeUid = lookedUpUid;
+      tree = getBasicTreeByParentUid(nodeUid);
+    }
+  }
+
+  if (tree.length === 0) return undefined;
+
+  const rawCanvas = Object.fromEntries(
+    getSubTree({ tree, key: "canvas" }).children.map((c) => [
+      c.text,
+      c.children[0]?.text || "",
+    ]),
+  );
+  /* eslint-disable @typescript-eslint/naming-convention */
+  const canvasSettings = {
+    color: rawCanvas["color"] || "",
+    alias: rawCanvas["alias"] || "",
+    "key-image": rawCanvas["key-image"] === "true",
+    "key-image-option": rawCanvas["key-image-option"] || "first-image",
+    "query-builder-alias": rawCanvas["query-builder-alias"] || "",
+  };
+  /* eslint-enable @typescript-eslint/naming-convention */
+  const attributes = Object.fromEntries(
+    getSubTree({ tree, key: "Attributes" }).children.map((c) => [
+      c.text,
+      c.children[0]?.text || "",
+    ]),
+  );
+  const overlayUid = getSubTree({ tree, key: "Overlay" }).uid;
+  const suggestiveRulesTree = getSubTree({
+    tree,
+    key: "Suggestive Rules",
+  }).children;
+  const indexUid = getSubTree({ tree, key: "Index" }).uid;
+  const specificationUid = getSubTree({ tree, key: "Specification" }).uid;
+
+  const legacySettings = {
+    type: nodeUid,
+    format: getSettingValueFromTree({ tree, key: "format" }),
+    shortcut: getSettingValueFromTree({ tree, key: "shortcut" }),
+    tag: getSettingValueFromTree({ tree, key: "tag" }),
+    graphOverview: tree.some((c) => c.text === "Graph Overview"),
+    description: getSettingValueFromTree({ tree, key: "description" }),
+    overlay: overlayUid
+      ? getBasicTreeByParentUid(overlayUid)[0]?.text || ""
+      : "",
+    attributes,
+    template: getSubTree({ tree, key: "template" }).children,
+    canvasSettings,
+    suggestiveRules: {
+      embeddingRef:
+        getSubTree({ tree: suggestiveRulesTree, key: "Embedding Block Ref" })
+          .children[0]?.text || "",
+      isFirstChild: !!getSubTree({
+        tree: suggestiveRulesTree,
+        key: "First Child",
+      }).uid,
+    },
+    index: indexUid
+      ? getLegacyQuerySettingByParentUid(indexUid)
+      : DEFAULT_LEGACY_QUERY,
+    specification: {
+      enabled: specificationUid
+        ? !!getSubTree({ parentUid: specificationUid, key: "enabled" }).uid
+        : false,
+      query: specificationUid
+        ? getLegacyQuerySettingByParentUid(specificationUid)
+        : DEFAULT_LEGACY_QUERY,
+    },
+  };
+
+  return readPathValue(legacySettings, keys);
+};
+
 const getBlockPropsByUid = (
   blockUid: string,
   keys: string[],
@@ -280,9 +691,84 @@ export const getFeatureFlags = (): FeatureFlags => {
   return FeatureFlagsSchema.parse(blockProps || {});
 };
 
+/* eslint-disable @typescript-eslint/naming-convention */
+const FEATURE_FLAG_LEGACY_MAP: Partial<
+  Record<keyof FeatureFlags, () => boolean>
+> = {
+  "Suggestive mode enabled": () =>
+    getUidAndBooleanSetting({
+      tree: discourseConfigRef.tree,
+      text: "(BETA) Suggestive Mode Enabled",
+    }).value,
+  "Enable left sidebar": () =>
+    getUidAndBooleanSetting({
+      tree: discourseConfigRef.tree,
+      text: "(BETA) Left Sidebar",
+    }).value,
+};
+/* eslint-enable @typescript-eslint/naming-convention */
+
 export const getFeatureFlag = (key: keyof FeatureFlags): boolean => {
+  const legacyReader = FEATURE_FLAG_LEGACY_MAP[key];
+
+  if (!legacyReader) {
+    // Block-props-only flag (no legacy equivalent)
+    const flags = getFeatureFlags();
+    return flags[key];
+  }
+
+  if (!isNewSettingsStoreEnabled()) {
+    return legacyReader();
+  }
+
   const flags = getFeatureFlags();
-  return flags[key];
+  const blockPropsValue = flags[key];
+  const legacyValue = legacyReader();
+  if (blockPropsValue !== legacyValue) {
+    console.warn(`[DG Dual-Read] Mismatch at Feature Flag > ${key}`, {
+      blockProps: blockPropsValue,
+      legacy: legacyValue,
+    });
+  }
+  return blockPropsValue;
+};
+
+export const isNewSettingsStoreEnabled = (): boolean => {
+  return getFeatureFlag("Use new settings store");
+};
+
+export const readAllLegacyFeatureFlags = (): Partial<FeatureFlags> => {
+  const flags: Partial<FeatureFlags> = {};
+  for (const [key, reader] of Object.entries(FEATURE_FLAG_LEGACY_MAP)) {
+    flags[key as keyof FeatureFlags] = reader();
+  }
+  flags["Use new settings store"] = false;
+  return flags;
+};
+
+export const readAllLegacyGlobalSettings = (): Record<string, unknown> => {
+  const result: Record<string, unknown> = {};
+  for (const key of Object.values(GLOBAL_KEYS)) {
+    result[key] = getLegacyGlobalSetting([key]);
+  }
+  return result;
+};
+
+export const readAllLegacyPersonalSettings = (): Record<string, unknown> => {
+  const result: Record<string, unknown> = {};
+  for (const key of Object.values(PERSONAL_KEYS)) {
+    result[key] = getLegacyPersonalSetting([key]);
+  }
+  return result;
+};
+
+export const readAllLegacyDiscourseNodeSettings = (
+  nodeType: string,
+  nodeTitle: string,
+): Record<string, unknown> | undefined => {
+  const raw = getLegacyDiscourseNodeSetting(nodeType, []);
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return undefined;
+  return { ...(raw as Record<string, unknown>), text: nodeTitle };
 };
 
 export const setFeatureFlag = (
@@ -308,12 +794,22 @@ export const getGlobalSettings = (): GlobalSettings => {
 export const getGlobalSetting = <T = unknown>(
   keys: string[],
 ): T | undefined => {
-  const settings = getGlobalSettings();
+  if (keys.length === 0) return undefined;
 
-  return keys.reduce<unknown>((current, key) => {
-    if (!isRecord(current) || !(key in current)) return undefined;
-    return current[key];
-  }, settings) as T | undefined;
+  if (!isNewSettingsStoreEnabled()) {
+    return getLegacyGlobalSetting(keys) as T | undefined;
+  }
+
+  const settings = getGlobalSettings();
+  const blockPropsValue = readPathValue(settings, keys);
+  const legacyValue = getLegacyGlobalSetting(keys);
+  if (JSON.stringify(blockPropsValue) !== JSON.stringify(legacyValue)) {
+    console.warn(
+      `[DG Dual-Read] Mismatch at Global > ${formatSettingPath(keys)}`,
+      { blockProps: blockPropsValue, legacy: legacyValue },
+    );
+  }
+  return blockPropsValue as T | undefined;
 };
 
 export const setGlobalSetting = (keys: string[], value: json): void => {
@@ -342,13 +838,19 @@ export const setGlobalSetting = (keys: string[], value: json): void => {
   });
 };
 
-export const getAllRelations = (): DiscourseRelationSettings[] => {
+export const getAllRelations = (): DiscourseRelation[] => {
   const settings = getGlobalSettings();
 
-  return Object.entries(settings.Relations).map(([id, relation]) => ({
-    ...relation,
-    id,
-  }));
+  return Object.entries(settings.Relations).flatMap(([id, relation]) =>
+    relation.ifConditions.map((ifCondition) => ({
+      id,
+      label: relation.label,
+      source: relation.source,
+      destination: relation.destination,
+      complement: relation.complement,
+      triples: ifCondition.triples,
+    })),
+  );
 };
 
 export const getPersonalSettings = (): PersonalSettings => {
@@ -364,12 +866,22 @@ export const getPersonalSettings = (): PersonalSettings => {
 export const getPersonalSetting = <T = unknown>(
   keys: string[],
 ): T | undefined => {
-  const settings = getPersonalSettings();
+  if (keys.length === 0) return undefined;
 
-  return keys.reduce<unknown>((current, key) => {
-    if (!isRecord(current) || !(key in current)) return undefined;
-    return current[key];
-  }, settings) as T | undefined;
+  if (!isNewSettingsStoreEnabled()) {
+    return getLegacyPersonalSetting(keys) as T | undefined;
+  }
+
+  const settings = getPersonalSettings();
+  const blockPropsValue = readPathValue(settings, keys);
+  const legacyValue = getLegacyPersonalSetting(keys);
+  if (JSON.stringify(blockPropsValue) !== JSON.stringify(legacyValue)) {
+    console.warn(
+      `[DG Dual-Read] Mismatch at Personal > ${formatSettingPath(keys)}`,
+      { blockProps: blockPropsValue, legacy: legacyValue },
+    );
+  }
+  return blockPropsValue as T | undefined;
 };
 
 export const setPersonalSetting = (keys: string[], value: json): void => {
@@ -400,9 +912,7 @@ export const setPersonalSetting = (keys: string[], value: json): void => {
   });
 };
 
-export const getDiscourseNodeSettings = (
-  nodeType: string,
-): DiscourseNodeSettings | undefined => {
+const getRawDiscourseNodeBlockProps = (nodeType: string): json | undefined => {
   let pageUid = nodeType;
   let blockProps = getBlockPropsByUid(pageUid, []);
 
@@ -416,6 +926,13 @@ export const getDiscourseNodeSettings = (
     }
   }
 
+  return blockProps;
+};
+
+export const getDiscourseNodeSettings = (
+  nodeType: string,
+): DiscourseNodeSettings | undefined => {
+  const blockProps = getRawDiscourseNodeBlockProps(nodeType);
   if (!blockProps) return undefined;
 
   const result = DiscourseNodeSchema.safeParse(blockProps);
@@ -435,14 +952,20 @@ export const getDiscourseNodeSetting = <T = unknown>(
   nodeType: string,
   keys: string[],
 ): T | undefined => {
-  const settings = getDiscourseNodeSettings(nodeType);
-
-  if (!settings) return undefined;
+  if (!isNewSettingsStoreEnabled()) {
+    return getLegacyDiscourseNodeSetting(nodeType, keys) as T | undefined;
+  }
 
-  return keys.reduce<unknown>((current, key) => {
-    if (!isRecord(current) || !(key in current)) return undefined;
-    return current[key];
-  }, settings) as T | undefined;
+  const settings = getDiscourseNodeSettings(nodeType);
+  const blockPropsValue = settings ? readPathValue(settings, keys) : undefined;
+  const legacyValue = getLegacyDiscourseNodeSetting(nodeType, keys);
+  if (JSON.stringify(blockPropsValue) !== JSON.stringify(legacyValue)) {
+    console.warn(
+      `[DG Dual-Read] Mismatch at Discourse Node (${nodeType}) > ${formatSettingPath(keys)}`,
+      { blockProps: blockPropsValue, legacy: legacyValue },
+    );
+  }
+  return blockPropsValue as T | undefined;
 };
 
 export const setDiscourseNodeSetting = (
@@ -493,6 +1016,51 @@ export const setDiscourseNodeSetting = (
   setBlockPropAtPath(pageUid, keys, value);
 };
 
+const addConditionUids = (conditions: SchemaCondition[]): Condition[] =>
+  conditions.map((c) => {
+    const uid = window.roamAlphaAPI.util.generateUID();
+    if (c.type === "or" || c.type === "not or") {
+      return {
+        uid,
+        type: c.type,
+        conditions: c.conditions.map(addConditionUids),
+      };
+    }
+    return {
+      uid,
+      type: c.type,
+      source: c.source,
+      relation: c.relation,
+      target: c.target,
+      not: c.not,
+    };
+  }) as Condition[];
+
+const toDiscourseNode = (settings: DiscourseNodeSettings): DiscourseNode => ({
+  text: settings.text,
+  type: settings.type,
+  shortcut: settings.shortcut,
+  tag: settings.tag || undefined,
+  format: settings.format,
+  description: settings.description || undefined,
+  graphOverview: settings.graphOverview || undefined,
+  backedBy: "user",
+  specification: addConditionUids(
+    settings.specification.query.conditions as SchemaCondition[],
+  ),
+  canvasSettings: Object.fromEntries(
+    Object.entries(settings.canvasSettings).map(([k, v]) => [
+      k,
+      typeof v === "boolean" ? (v ? "true" : "") : String(v),
+    ]),
+  ),
+  template: settings.template.length > 0 ? settings.template : undefined,
+  embeddingRef: settings.suggestiveRules.embeddingRef || undefined,
+  isFirstChild: settings.suggestiveRules.isFirstChild
+    ? { uid: "", value: true }
+    : undefined,
+});
+
 /**
  * Migrate known legacy block prop shapes to the current schema.
  *
@@ -554,7 +1122,7 @@ const migrateNodeBlockProps = (
   return migrated;
 };
 
-export const getAllDiscourseNodes = (): DiscourseNodeSettings[] => {
+export const getAllDiscourseNodes = (): DiscourseNode[] => {
   const results = window.roamAlphaAPI.data.fast.q(`
     [:find ?uid ?title (pull ?page [:block/props])
      :where
@@ -563,7 +1131,7 @@ export const getAllDiscourseNodes = (): DiscourseNodeSettings[] => {
      [(clojure.string/starts-with? ?title "${DISCOURSE_NODE_PAGE_PREFIX}")]]
   `) as [string, string, Record<string, json> | null][];
 
-  const nodes: DiscourseNodeSettings[] = [];
+  const nodes: DiscourseNode[] = [];
 
   for (const [pageUid, title, rawProps] of results) {
     if (typeof pageUid !== "string" || typeof title !== "string") continue;
@@ -581,7 +1149,13 @@ export const getAllDiscourseNodes = (): DiscourseNodeSettings[] => {
     const nodeText = title.replace(DISCOURSE_NODE_PAGE_PREFIX, "");
     const result = DiscourseNodeSchema.safeParse(blockProps);
     if (result.success) {
-      nodes.push({ ...result.data, type: pageUid, text: nodeText });
+      nodes.push(
+        toDiscourseNode({
+          ...result.data,
+          type: pageUid,
+          text: nodeText,
+        }),
+      );
     } else {
       // Try migrating legacy field shapes before dropping the node.
       const migrated = migrateNodeBlockProps(
@@ -590,7 +1164,13 @@ export const getAllDiscourseNodes = (): DiscourseNodeSettings[] => {
       const retryResult = DiscourseNodeSchema.safeParse(migrated);
       if (retryResult.success) {
         setBlockProps(pageUid, retryResult.data, false);
-        nodes.push({ ...retryResult.data, type: pageUid, text: nodeText });
+        nodes.push(
+          toDiscourseNode({
+            ...retryResult.data,
+            type: pageUid,
+            text: nodeText,
+          }),
+        );
       } else {
         internalError({
           error: retryResult.error,
diff --git a/apps/roam/src/components/settings/utils/init.ts b/apps/roam/src/components/settings/utils/init.ts
index 94c8b4180..86e19ed82 100644
--- a/apps/roam/src/components/settings/utils/init.ts
+++ b/apps/roam/src/components/settings/utils/init.ts
@@ -7,6 +7,10 @@ import type { json } from "~/utils/getBlockProps";
 import INITIAL_NODE_VALUES from "~/data/defaultDiscourseNodes";
 import DEFAULT_RELATIONS_BLOCK_PROPS from "~/components/settings/data/defaultRelationsBlockProps";
 import { getAllDiscourseNodes } from "./accessors";
+import {
+  migrateGraphLevel,
+  migratePersonalSettings,
+} from "./migrateLegacyToBlockProps";
 import {
   DiscourseNodeSchema,
   getTopLevelBlockPropsConfig,
@@ -147,7 +151,6 @@ const initSingleDiscourseNode = async (
       tag: node.tag || "",
       graphOverview: node.graphOverview ?? false,
       canvasSettings: node.canvasSettings || {},
-      backedBy: "default",
     });
 
     setBlockProps(pageUid, nodeData, false);
@@ -256,6 +259,8 @@ export type InitSchemaResult = {
 
 export const initSchema = async (): Promise<InitSchemaResult> => {
   const blockUids = await initSettingsPageBlocks();
+  await migrateGraphLevel(blockUids);
   const nodePageUids = await initDiscourseNodePages();
+  await migratePersonalSettings(blockUids);
   return { blockUids, nodePageUids };
 };
diff --git a/apps/roam/src/components/settings/utils/migrateLegacyToBlockProps.ts b/apps/roam/src/components/settings/utils/migrateLegacyToBlockProps.ts
new file mode 100644
index 000000000..8ca1fe496
--- /dev/null
+++ b/apps/roam/src/components/settings/utils/migrateLegacyToBlockProps.ts
@@ -0,0 +1,318 @@
+import getBlockProps from "~/utils/getBlockProps";
+import type { json } from "~/utils/getBlockProps";
+import setBlockProps from "~/utils/setBlockProps";
+import getBlockUidByTextOnPage from "roamjs-components/queries/getBlockUidByTextOnPage";
+import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
+import { createBlock } from "roamjs-components/writes";
+import { getSetting, setSetting } from "~/utils/extensionSettings";
+import internalError from "~/utils/internalError";
+import {
+  readAllLegacyFeatureFlags,
+  readAllLegacyGlobalSettings,
+  readAllLegacyPersonalSettings,
+  readAllLegacyDiscourseNodeSettings,
+} from "./accessors";
+import {
+  FeatureFlagsSchema,
+  GlobalSettingsSchema,
+  PersonalSettingsSchema,
+  DiscourseNodeSchema,
+  DG_BLOCK_PROP_SETTINGS_PAGE_TITLE,
+  DISCOURSE_NODE_PAGE_PREFIX,
+  TOP_LEVEL_BLOCK_PROP_KEYS,
+  getPersonalSettingsKey,
+} from "./zodSchema";
+import type { z } from "zod";
+
+const LOG_PREFIX = "[DG BlockProps Migration]";
+const GRAPH_MIGRATION_MARKER = "Block props migrated";
+const PERSONAL_MIGRATION_MARKER = "dg-personal-settings-migrated";
+const MAX_ERROR_CONTEXT_LENGTH = 5000;
+
+const hasGraphMigrationMarker = (): boolean =>
+  !!getBlockUidByTextOnPage({
+    text: GRAPH_MIGRATION_MARKER,
+    title: DG_BLOCK_PROP_SETTINGS_PAGE_TITLE,
+  });
+
+const isPropsValid = (
+  schema: z.ZodTypeAny,
+  props: Record<string, json> | null,
+): boolean =>
+  !!props && Object.keys(props).length > 0 && schema.safeParse(props).success;
+
+const serializeErrorContext = (value: unknown): string => {
+  try {
+    return JSON.stringify(value).slice(0, MAX_ERROR_CONTEXT_LENGTH);
+  } catch {
+    return String(value);
+  }
+};
+
+const shouldWrite = (
+  schema: z.ZodTypeAny,
+  currentProps: Record<string, json> | null,
+  parsedLegacy: Record<string, json>,
+): boolean => {
+  if (!isPropsValid(schema, currentProps)) {
+    return true;
+  }
+
+  return JSON.stringify(parsedLegacy) !== JSON.stringify(currentProps);
+};
+
+const migrateSection = ({
+  label,
+  blockUid,
+  schema,
+  legacyData,
+}: {
+  label: string;
+  blockUid: string;
+  schema: z.ZodTypeAny;
+  legacyData: Record<string, unknown>;
+}): boolean => {
+  const currentProps = getBlockProps(blockUid);
+
+  const parseResult = schema.safeParse(legacyData);
+  if (!parseResult.success) {
+    if (isPropsValid(schema, currentProps)) {
+      console.log(
+        `${LOG_PREFIX} ${label}: legacy malformed but props already valid, skipping`,
+      );
+      return true;
+    }
+    console.warn(`${LOG_PREFIX} ${label}: Zod validation failed, skipping`, {
+      error: parseResult.error.message,
+    });
+    internalError({
+      error: parseResult.error,
+      type: "DG Block Props Migration",
+      context: {
+        label,
+        blockUid,
+        legacyData: serializeErrorContext(legacyData),
+        currentProps: serializeErrorContext(currentProps),
+      },
+      sendEmail: false,
+    });
+    return false;
+  }
+
+  const parsedLegacy = parseResult.data as Record<string, json>;
+  if (!shouldWrite(schema, currentProps, parsedLegacy)) {
+    console.log(`${LOG_PREFIX} ${label}: props already non-default, skipping`);
+    return true;
+  }
+
+  setBlockProps(blockUid, parsedLegacy, false);
+  console.log(`${LOG_PREFIX} ${label}: migrated`);
+  return true;
+};
+
+const migrateDiscourseNodes = async (): Promise<boolean> => {
+  const nodePages = (await window.roamAlphaAPI.data.async.fast.q(`
+    [:find ?uid ?title
+     :where
+     [?page :node/title ?title]
+     [?page :block/uid ?uid]
+     [(clojure.string/starts-with? ?title "${DISCOURSE_NODE_PAGE_PREFIX}")]]
+  `)) as [string, string][];
+
+  let allOk = true;
+
+  for (const [nodePageUid, title] of nodePages) {
+    if (typeof nodePageUid !== "string" || typeof title !== "string") continue;
+
+    const nodeText = title.replace(DISCOURSE_NODE_PAGE_PREFIX, "");
+    const legacyData = readAllLegacyDiscourseNodeSettings(
+      nodePageUid,
+      nodeText,
+    );
+    if (!legacyData) {
+      if (isPropsValid(DiscourseNodeSchema, getBlockProps(nodePageUid))) {
+        console.log(
+          `${LOG_PREFIX} Discourse Node (${nodeText}): legacy unreadable but props already valid, skipping`,
+        );
+        continue;
+      }
+      console.warn(
+        `${LOG_PREFIX} Discourse Node (${nodeText}): legacy data unreadable`,
+      );
+      internalError({
+        error: `Legacy discourse node data unreadable: ${nodeText}`,
+        type: "DG Block Props Migration",
+        context: {
+          label: `Discourse Node (${nodeText})`,
+          blockUid: nodePageUid,
+          currentProps: serializeErrorContext(getBlockProps(nodePageUid)),
+        },
+        sendEmail: false,
+      });
+      allOk = false;
+      continue;
+    }
+
+    if (
+      !migrateSection({
+        label: `Discourse Node (${nodeText})`,
+        blockUid: nodePageUid,
+        schema: DiscourseNodeSchema,
+        legacyData,
+      })
+    ) {
+      allOk = false;
+    }
+  }
+
+  return allOk;
+};
+
+export const migrateGraphLevel = async (
+  blockUids: Record<string, string>,
+): Promise<void> => {
+  const pageUid = getPageUidByPageTitle(DG_BLOCK_PROP_SETTINGS_PAGE_TITLE);
+  if (!pageUid) {
+    internalError({
+      error: `Settings page not found: ${DG_BLOCK_PROP_SETTINGS_PAGE_TITLE}`,
+      type: "DG Block Props Migration",
+      context: { scope: "graph" },
+      sendEmail: false,
+    });
+    return;
+  }
+
+  if (hasGraphMigrationMarker()) {
+    console.log(`${LOG_PREFIX} graph-level: skipped (already migrated)`);
+    return;
+  }
+
+  let failures = 0;
+
+  const featureFlagUid = blockUids[TOP_LEVEL_BLOCK_PROP_KEYS.featureFlags];
+  if (!featureFlagUid) {
+    internalError({
+      error: `Missing block uid for ${TOP_LEVEL_BLOCK_PROP_KEYS.featureFlags}`,
+      type: "DG Block Props Migration",
+      context: {
+        scope: "graph",
+        blockUids: serializeErrorContext(blockUids),
+      },
+      sendEmail: false,
+    });
+    failures++;
+  } else {
+    const legacyFlags = readAllLegacyFeatureFlags();
+    if (
+      !migrateSection({
+        label: "Feature Flags",
+        blockUid: featureFlagUid,
+        schema: FeatureFlagsSchema,
+        legacyData: legacyFlags as Record<string, unknown>,
+      })
+    ) {
+      failures++;
+    }
+  }
+
+  const globalUid = blockUids[TOP_LEVEL_BLOCK_PROP_KEYS.global];
+  if (!globalUid) {
+    internalError({
+      error: `Missing block uid for ${TOP_LEVEL_BLOCK_PROP_KEYS.global}`,
+      type: "DG Block Props Migration",
+      context: {
+        scope: "graph",
+        blockUids: serializeErrorContext(blockUids),
+      },
+      sendEmail: false,
+    });
+    failures++;
+  } else {
+    const legacyGlobal = readAllLegacyGlobalSettings();
+    if (
+      !migrateSection({
+        label: "Global",
+        blockUid: globalUid,
+        schema: GlobalSettingsSchema,
+        legacyData: legacyGlobal,
+      })
+    ) {
+      failures++;
+    }
+  }
+
+  if (!(await migrateDiscourseNodes())) {
+    failures++;
+  }
+
+  if (failures === 0) {
+    try {
+      await createBlock({
+        parentUid: pageUid,
+        node: { text: GRAPH_MIGRATION_MARKER },
+      });
+      console.log(`${LOG_PREFIX} graph-level: completed`);
+    } catch (e) {
+      console.warn(
+        `${LOG_PREFIX} graph-level: data migrated but marker write failed (will retry next load)`,
+        e,
+      );
+    }
+  } else {
+    console.warn(
+      `${LOG_PREFIX} graph-level: ${failures} section(s) failed, marker not created (will retry next load)`,
+    );
+  }
+};
+
+export const migratePersonalSettings = async (
+  blockUids: Record<string, string>,
+): Promise<void> => {
+  if (getSetting<boolean>(PERSONAL_MIGRATION_MARKER, false)) {
+    console.log(`${LOG_PREFIX} personal: skipped (already migrated)`);
+    return;
+  }
+
+  const personalKey = getPersonalSettingsKey();
+  const personalUid = blockUids[personalKey];
+  if (!personalUid) {
+    console.warn(
+      `${LOG_PREFIX} personal: block not found for key "${personalKey}", skipping`,
+    );
+    internalError({
+      error: `Missing personal settings block for key "${personalKey}"`,
+      type: "DG Block Props Migration",
+      context: {
+        scope: "personal",
+        personalKey,
+        blockUids: serializeErrorContext(blockUids),
+      },
+      sendEmail: false,
+    });
+    return;
+  }
+
+  const legacyPersonal = readAllLegacyPersonalSettings();
+  const ok = migrateSection({
+    label: "Personal",
+    blockUid: personalUid,
+    schema: PersonalSettingsSchema,
+    legacyData: legacyPersonal,
+  });
+
+  if (ok) {
+    try {
+      await setSetting(PERSONAL_MIGRATION_MARKER, true);
+      console.log(`${LOG_PREFIX} personal: completed`);
+    } catch (e) {
+      console.warn(
+        `${LOG_PREFIX} personal: data migrated but marker write failed (will retry next load)`,
+        e,
+      );
+    }
+  } else {
+    console.warn(
+      `${LOG_PREFIX} personal: failed, marker not created (will retry next load)`,
+    );
+  }
+};
diff --git a/apps/roam/src/components/settings/utils/pullWatchers.ts b/apps/roam/src/components/settings/utils/pullWatchers.ts
index 81026957c..c9529e944 100644
--- a/apps/roam/src/components/settings/utils/pullWatchers.ts
+++ b/apps/roam/src/components/settings/utils/pullWatchers.ts
@@ -12,6 +12,7 @@ import {
   type PersonalSettings,
   type DiscourseNodeSettings,
 } from "./zodSchema";
+import { emitSettingChange, settingKeys } from "./settingsEmitter";
 
 type PullWatchCallback = Parameters<AddPullWatch>[2];
 
@@ -90,10 +91,14 @@ export const featureFlagHandlers: Partial<
     (newValue: boolean, oldValue: boolean, allFlags: FeatureFlags) => void
   >
 > = {
-  // Add handlers as needed:
-  // "Enable Left Sidebar": (newValue) => { ... },
-  // "Suggestive Mode Enabled": (newValue) => { ... },
-  // "Reified Relation Triples": (newValue) => { ... },
+  /* eslint-disable @typescript-eslint/naming-convention */
+  "Enable left sidebar": (newValue, oldValue) => {
+    emitSettingChange(settingKeys.leftSidebarFlag, newValue, oldValue);
+  },
+  "Suggestive mode enabled": (newValue, oldValue) => {
+    emitSettingChange(settingKeys.suggestiveModeEnabled, newValue, oldValue);
+  },
+  /* eslint-enable @typescript-eslint/naming-convention */
 };
 
 type GlobalSettingsHandlers = {
@@ -105,12 +110,14 @@ type GlobalSettingsHandlers = {
 };
 
 export const globalSettingsHandlers: GlobalSettingsHandlers = {
-  // Add handlers as needed:
-  // "Trigger": (newValue) => { ... },
-  // "Canvas Page Format": (newValue) => { ... },
-  // "Left Sidebar": (newValue) => { ... },
-  // "Export": (newValue) => { ... },
-  // "Suggestive Mode": (newValue) => { ... },
+  /* eslint-disable @typescript-eslint/naming-convention */
+  "Left sidebar": (newValue, oldValue) => {
+    emitSettingChange(settingKeys.globalLeftSidebar, newValue, oldValue);
+  },
+  Trigger: (newValue, oldValue) => {
+    emitSettingChange(settingKeys.globalTrigger, newValue, oldValue);
+  },
+  /* eslint-enable @typescript-eslint/naming-convention */
 };
 
 type PersonalSettingsHandlers = {
@@ -122,28 +129,22 @@ type PersonalSettingsHandlers = {
 };
 
 export const personalSettingsHandlers: PersonalSettingsHandlers = {
-  // "Left Sidebar" stub for testing with stubSetLeftSidebarPersonalSections() in accessors.ts
   /* eslint-disable @typescript-eslint/naming-convention */
   "Left sidebar": (newValue, oldValue) => {
-    const oldSections = Object.keys(oldValue || {});
-    const newSections = Object.keys(newValue || {});
-
-    if (newSections.length === 0 && oldSections.length === 0) return;
-
-    console.group("👤 [PullWatch] Personal Settings Changed: Left Sidebar");
-    console.log("Old value:", JSON.stringify(oldValue, null, 2));
-    console.log("New value:", JSON.stringify(newValue, null, 2));
-
-    const addedSections = newSections.filter((s) => !oldSections.includes(s));
-    const removedSections = oldSections.filter((s) => !newSections.includes(s));
-
-    if (addedSections.length > 0) {
-      console.log("  → Sections added:", addedSections);
-    }
-    if (removedSections.length > 0) {
-      console.log("  → Sections removed:", removedSections);
-    }
-    console.groupEnd();
+    emitSettingChange(settingKeys.personalLeftSidebar, newValue, oldValue);
+  },
+  "Personal node menu trigger": (newValue, oldValue) => {
+    emitSettingChange(settingKeys.personalNodeMenuTrigger, newValue, oldValue);
+  },
+  "Node search menu trigger": (newValue, oldValue) => {
+    emitSettingChange(settingKeys.nodeSearchMenuTrigger, newValue, oldValue);
+  },
+  "Suggestive mode overlay": (newValue, oldValue) => {
+    emitSettingChange(
+      settingKeys.personalSuggestiveModeOverlay,
+      newValue,
+      oldValue,
+    );
   },
   /* eslint-enable @typescript-eslint/naming-convention */
 };
diff --git a/apps/roam/src/components/settings/utils/settingKeys.ts b/apps/roam/src/components/settings/utils/settingKeys.ts
new file mode 100644
index 000000000..2f31ab191
--- /dev/null
+++ b/apps/roam/src/components/settings/utils/settingKeys.ts
@@ -0,0 +1,113 @@
+import type {
+  PersonalSettings,
+  QuerySettings,
+  GlobalSettings,
+  ExportSettings,
+  SuggestiveModeGlobalSettings,
+  LeftSidebarGlobalSettings,
+  DiscourseNodeSettings,
+  CanvasSettings,
+  SuggestiveRules,
+} from "./zodSchema";
+
+export const PERSONAL_KEYS = {
+  discourseContextOverlay: "Discourse context overlay",
+  suggestiveModeOverlay: "Suggestive mode overlay",
+  textSelectionPopup: "Text selection popup",
+  disableSidebarOpen: "Disable sidebar open",
+  pagePreview: "Page preview",
+  hideFeedbackButton: "Hide feedback button",
+  autoCanvasRelations: "Auto canvas relations",
+  overlayInCanvas: "Overlay in canvas",
+  streamlineStyling: "Streamline styling",
+  disableProductDiagnostics: "Disable product diagnostics",
+  discourseToolShortcut: "Discourse tool shortcut",
+  personalNodeMenuTrigger: "Personal node menu trigger",
+  nodeSearchMenuTrigger: "Node search menu trigger",
+  leftSidebar: "Left sidebar",
+  query: "Query",
+} as const satisfies Record<string, keyof PersonalSettings>;
+
+export const QUERY_KEYS = {
+  hideQueryMetadata: "Hide query metadata",
+  defaultPageSize: "Default page size",
+  queryPages: "Query pages",
+  defaultFilters: "Default filters",
+} as const satisfies Record<string, keyof QuerySettings>;
+
+export const GLOBAL_KEYS = {
+  trigger: "Trigger",
+  canvasPageFormat: "Canvas page format",
+  leftSidebar: "Left sidebar",
+  export: "Export",
+  suggestiveMode: "Suggestive mode",
+  relations: "Relations",
+} as const satisfies Record<string, keyof GlobalSettings>;
+
+export const SUGGESTIVE_MODE_KEYS = {
+  includeCurrentPageRelations: "Include current page relations",
+  includeParentAndChildBlocks: "Include parent and child blocks",
+  pageGroups: "Page groups",
+} as const satisfies Record<string, keyof SuggestiveModeGlobalSettings>;
+
+export const LEFT_SIDEBAR_KEYS = {
+  children: "Children",
+  settings: "Settings",
+} as const satisfies Record<string, keyof LeftSidebarGlobalSettings>;
+
+export const EXPORT_KEYS = {
+  removeSpecialCharacters: "Remove special characters",
+  resolveBlockReferences: "Resolve block references",
+  resolveBlockEmbeds: "Resolve block embeds",
+  appendReferencedNode: "Append referenced node",
+  linkType: "Link type",
+  maxFilenameLength: "Max filename length",
+  frontmatter: "Frontmatter",
+} as const satisfies Record<string, keyof ExportSettings>;
+
+export const LEFT_SIDEBAR_SETTINGS_KEYS = {
+  collapsable: "Collapsable",
+  folded: "Folded",
+} as const satisfies Record<
+  string,
+  keyof LeftSidebarGlobalSettings["Settings"]
+>;
+
+export const DISCOURSE_NODE_KEYS = {
+  canvasSettings: "canvasSettings",
+  overlay: "overlay",
+  attributes: "attributes",
+  specification: "specification",
+  index: "index",
+  description: "description",
+  shortcut: "shortcut",
+  tag: "tag",
+  format: "format",
+  graphOverview: "graphOverview",
+  suggestiveRules: "suggestiveRules",
+} as const satisfies Record<string, keyof DiscourseNodeSettings>;
+
+export const SUGGESTIVE_RULES_KEYS = {
+  embeddingRef: "embeddingRef",
+  isFirstChild: "isFirstChild",
+} as const satisfies Record<string, keyof SuggestiveRules>;
+
+export const CANVAS_KEYS = {
+  color: "color",
+  alias: "alias",
+  keyImage: "key-image",
+  keyImageOption: "key-image-option",
+  queryBuilderAlias: "query-builder-alias",
+} as const satisfies Record<string, keyof CanvasSettings>;
+
+export const SPECIFICATION_KEYS = {
+  enabled: "enabled",
+  query: "query",
+} as const satisfies Record<
+  string,
+  keyof DiscourseNodeSettings["specification"]
+>;
+
+export const TEMPLATE_SETTING_KEYS: (keyof DiscourseNodeSettings)[] = [
+  "template",
+];
diff --git a/apps/roam/src/components/settings/utils/settingsEmitter.ts b/apps/roam/src/components/settings/utils/settingsEmitter.ts
new file mode 100644
index 000000000..17556cc33
--- /dev/null
+++ b/apps/roam/src/components/settings/utils/settingsEmitter.ts
@@ -0,0 +1,35 @@
+type SettingChangeCallback = (newValue: unknown, oldValue: unknown) => void;
+
+export const settingKeys = {
+  leftSidebarFlag: "Enable left sidebar",
+  globalLeftSidebar: "global:Left sidebar",
+  personalLeftSidebar: "personal:Left sidebar",
+  globalTrigger: "global:Trigger",
+  personalNodeMenuTrigger: "personal:Personal node menu trigger",
+  nodeSearchMenuTrigger: "personal:Node search menu trigger",
+  personalSuggestiveModeOverlay: "personal:Suggestive mode overlay",
+  suggestiveModeEnabled: "flag:Suggestive mode enabled",
+} as const;
+
+const listeners = new Map<string, Set<SettingChangeCallback>>();
+
+export const onSettingChange = (
+  key: string,
+  callback: SettingChangeCallback,
+): (() => void) => {
+  if (!listeners.has(key)) {
+    listeners.set(key, new Set());
+  }
+  listeners.get(key)!.add(callback);
+  return () => {
+    listeners.get(key)?.delete(callback);
+  };
+};
+
+export const emitSettingChange = (
+  key: string,
+  newValue: unknown,
+  oldValue: unknown,
+): void => {
+  listeners.get(key)?.forEach((cb) => cb(newValue, oldValue));
+};
diff --git a/apps/roam/src/components/settings/utils/zodSchema.example.ts b/apps/roam/src/components/settings/utils/zodSchema.example.ts
index e71c73ef4..4cce41c24 100644
--- a/apps/roam/src/components/settings/utils/zodSchema.example.ts
+++ b/apps/roam/src/components/settings/utils/zodSchema.example.ts
@@ -83,17 +83,18 @@ const discourseNodeSettings: DiscourseNodeSettings = {
     returnNode: "node",
   },
   suggestiveRules,
-  backedBy: "user",
 };
 
 const featureFlags: FeatureFlags = {
   "Enable left sidebar": true,
   "Suggestive mode enabled": true,
+  "Use new settings store": false,
 };
 
 const defaultFeatureFlags: FeatureFlags = {
   "Enable left sidebar": false,
   "Suggestive mode enabled": false,
+  "Use new settings store": false,
 };
 
 const exportSettings: ExportSettings = {
@@ -402,9 +403,9 @@ const defaultPersonalSettings: PersonalSettings = {
   "Disable product diagnostics": false,
   "Reified relation triples": false,
   Query: {
-    "Hide query metadata": false,
+    "Hide query metadata": true,
     "Default page size": 10,
-    "Query pages": [],
+    "Query pages": ["discourse-graph/queries/*"],
     "Default filters": {},
   },
 };
diff --git a/apps/roam/src/components/settings/utils/zodSchema.ts b/apps/roam/src/components/settings/utils/zodSchema.ts
index 60ec5f331..314a5040a 100644
--- a/apps/roam/src/components/settings/utils/zodSchema.ts
+++ b/apps/roam/src/components/settings/utils/zodSchema.ts
@@ -22,7 +22,7 @@ const QBClauseDataSchema = z.object({
   not: z.boolean().optional(),
 });
 
-type Condition =
+export type Condition =
   | (z.infer<typeof QBClauseDataSchema> & { type: "clause" })
   | (z.infer<typeof QBClauseDataSchema> & { type: "not" })
   | { type: "or"; conditions: Condition[][] }
@@ -95,6 +95,19 @@ const booleanWithDefault = (defaultVal: boolean) =>
     .optional()
     .transform((val) => val ?? defaultVal);
 
+const defaultNodeIndex = () => ({
+  conditions: [] as {
+    type: string;
+    relation: string;
+    source: string;
+    uid: string;
+    not: boolean;
+  }[],
+  selections: [] as { text: string; label: string }[],
+  custom: "",
+  returnNode: "node",
+});
+
 export const DiscourseNodeSchema = z.object({
   text: z.string(),
   type: z.string(),
@@ -109,13 +122,7 @@ export const DiscourseNodeSchema = z.object({
     })
     .nullable()
     .optional()
-    .transform(
-      (val) =>
-        val ?? {
-          enabled: false,
-          query: { conditions: [], selections: [], custom: "", returnNode: "" },
-        },
-    ),
+    .transform((val) => val ?? { enabled: false, query: defaultNodeIndex() }),
   template: z
     .array(RoamNodeSchema)
     .nullable()
@@ -129,12 +136,10 @@ export const DiscourseNodeSchema = z.object({
     .optional()
     .transform((val) => val ?? {}),
   overlay: stringWithDefault(""),
-  index: IndexSchema.nullable().optional(),
+  index: IndexSchema.nullable()
+    .optional()
+    .transform((val) => val ?? defaultNodeIndex()),
   suggestiveRules: SuggestiveRulesSchema.default({}),
-  backedBy: z
-    .enum(["user", "default", "relation"])
-    .nullable()
-    .transform((val) => val ?? "user"),
 });
 
 export const TripleSchema = z.tuple([z.string(), z.string(), z.string()]);
@@ -156,6 +161,7 @@ export const DiscourseRelationSchema = z.object({
 export const FeatureFlagsSchema = z.object({
   "Enable left sidebar": z.boolean().default(false),
   "Suggestive mode enabled": z.boolean().default(false),
+  "Use new settings store": z.boolean().default(false),
 });
 
 export const ExportSettingsSchema = z.object({
@@ -228,9 +234,9 @@ export const StoredFiltersSchema = z.object({
 });
 
 export const QuerySettingsSchema = z.object({
-  "Hide query metadata": z.boolean().default(false),
+  "Hide query metadata": z.boolean().default(true),
   "Default page size": z.number().default(10),
-  "Query pages": z.array(z.string()).default([]),
+  "Query pages": z.array(z.string()).default(["discourse-graph/queries/*"]),
   "Default filters": z.record(z.string(), StoredFiltersSchema).default({}),
 });
 
diff --git a/apps/roam/src/data/constants.ts b/apps/roam/src/data/constants.ts
new file mode 100644
index 000000000..4397e7a38
--- /dev/null
+++ b/apps/roam/src/data/constants.ts
@@ -0,0 +1 @@
+export const DISCOURSE_CONFIG_PAGE_TITLE = "roam/js/discourse-graph";
diff --git a/apps/roam/src/index.ts b/apps/roam/src/index.ts
index acc26eb1d..ff8e95d9a 100644
--- a/apps/roam/src/index.ts
+++ b/apps/roam/src/index.ts
@@ -1,3 +1,4 @@
+import ReactDOM from "react-dom";
 import { addStyle } from "roamjs-components/dom";
 import { render as renderToast } from "roamjs-components/components/Toast";
 import { runExtension } from "roamjs-components/util";
@@ -13,7 +14,7 @@ import { listActiveQueries } from "./utils/listActiveQueries";
 import { registerSmartBlock } from "./utils/registerSmartBlock";
 import { initObservers } from "./utils/initializeObserversAndListeners";
 import { addGraphViewNodeStyling } from "./utils/graphViewNodeStyling";
-import { setQueryPages } from "./utils/setQueryPages";
+import { setInitialQueryPages } from "./utils/setQueryPages";
 import initializeDiscourseNodes from "./utils/initializeDiscourseNodes";
 import styles from "./styles/styles.css";
 import discourseFloatingMenuStyles from "./styles/discourseFloatingMenuStyles.css";
@@ -31,24 +32,28 @@ import {
   setSyncActivity,
 } from "./utils/syncDgNodesToSupabase";
 import { initPluginTimer } from "./utils/pluginTimer";
-import { getUidAndBooleanSetting } from "./utils/getExportSettings";
-import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
-import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "./utils/renderNodeConfigPage";
-import { getSetting } from "./utils/extensionSettings";
 import { initPostHog } from "./utils/posthog";
-import {
-  STREAMLINE_STYLING_KEY,
-  DISALLOW_DIAGNOSTICS,
-} from "./data/userSettings";
 import { initSchema } from "./components/settings/utils/init";
+import {
+  getFeatureFlag,
+  getPersonalSetting,
+} from "./components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "./components/settings/utils/settingKeys";
+import { setupPullWatchOnSettingsPage } from "./components/settings/utils/pullWatchers";
+import {
+  onSettingChange,
+  settingKeys,
+} from "./components/settings/utils/settingsEmitter";
+import { mountLeftSidebar } from "./components/LeftSidebarView";
 
 export const DEFAULT_CANVAS_PAGE_FORMAT = "Canvas/*";
 
 export default runExtension(async (onloadArgs) => {
   const isEncrypted = window.roamAlphaAPI.graph.isEncrypted;
   const isOffline = window.roamAlphaAPI.graph.type === "offline";
-  const disallowDiagnostics = getSetting(DISALLOW_DIAGNOSTICS, false);
+  const disallowDiagnostics = getPersonalSetting<boolean>([
+    PERSONAL_KEYS.disableProductDiagnostics,
+  ]);
   if (!isEncrypted && !isOffline && !disallowDiagnostics) {
     initPostHog();
   }
@@ -83,7 +88,7 @@ export default runExtension(async (onloadArgs) => {
   registerCommandPaletteCommands(onloadArgs);
   createSettingsPanel(onloadArgs);
   registerSmartBlock(onloadArgs);
-  setQueryPages(onloadArgs);
+  setInitialQueryPages(onloadArgs);
 
   const style = addStyle(styles);
   const discourseGraphStyle = addStyle(discourseGraphStyles);
@@ -91,14 +96,16 @@ export default runExtension(async (onloadArgs) => {
   const discourseFloatingMenuStyle = addStyle(discourseFloatingMenuStyles);
 
   // Add streamline styling only if enabled
-  const isStreamlineStylingEnabled = getSetting(STREAMLINE_STYLING_KEY, false);
+  const isStreamlineStylingEnabled = getPersonalSetting<boolean>([
+    PERSONAL_KEYS.streamlineStyling,
+  ]);
   let streamlineStyleElement: HTMLStyleElement | null = null;
   if (isStreamlineStylingEnabled) {
     streamlineStyleElement = addStyle(streamlineStyling);
     streamlineStyleElement.id = "streamline-styling";
   }
 
-  const { observers, listeners } = await initObservers({ onloadArgs });
+  const { observers, listeners, cleanups } = initObservers({ onloadArgs });
   const {
     pageActionListener,
     hashChangeListener,
@@ -112,17 +119,21 @@ export default runExtension(async (onloadArgs) => {
   document.addEventListener("input", discourseNodeSearchTriggerListener);
   document.addEventListener("selectionchange", nodeCreationPopoverListener);
 
-  const isSuggestiveModeEnabled = getUidAndBooleanSetting({
-    tree: getBasicTreeByParentUid(
-      getPageUidByPageTitle(DISCOURSE_CONFIG_PAGE_TITLE),
-    ),
-    text: "(BETA) Suggestive Mode Enabled",
-  }).value;
-
-  if (isSuggestiveModeEnabled) {
+  if (getFeatureFlag("Suggestive mode enabled")) {
     initializeSupabaseSync();
   }
 
+  const unsubSuggestiveMode = onSettingChange(
+    settingKeys.suggestiveModeEnabled,
+    (newValue) => {
+      if (newValue) {
+        initializeSupabaseSync();
+      } else {
+        setSyncActivity(false);
+      }
+    },
+  );
+
   const { extensionAPI } = onloadArgs;
   window.roamjs.extension.queryBuilder = {
     runQuery: (parentUid: string) =>
@@ -133,7 +144,7 @@ export default runExtension(async (onloadArgs) => {
       const queryArgs = parseQuery(parentUid);
       return fireQuerySync(queryArgs);
     },
-    listActiveQueries: () => listActiveQueries(extensionAPI),
+    listActiveQueries: () => listActiveQueries(),
     isDiscourseNode: isDiscourseNode,
     // @ts-expect-error - we are still using roamjs-components global definition
     getDiscourseNodes: getDiscourseNodes,
@@ -155,7 +166,32 @@ export default runExtension(async (onloadArgs) => {
     });
   }
 
-  await initSchema();
+  const unsubLeftSidebarFlag = onSettingChange(
+    settingKeys.leftSidebarFlag,
+    (newValue) => {
+      const enabled = Boolean(newValue);
+      const wrapper = document.querySelector<HTMLDivElement>(
+        ".starred-pages-wrapper",
+      );
+      if (!wrapper) return;
+      if (enabled) {
+        wrapper.style.padding = "0";
+        void mountLeftSidebar(wrapper, onloadArgs);
+      } else {
+        const root = wrapper.querySelector("#dg-left-sidebar-root");
+        if (root) {
+          // eslint-disable-next-line react/no-deprecated
+          ReactDOM.unmountComponentAtNode(root);
+          root.remove();
+        }
+        wrapper.style.padding = "";
+      }
+    },
+  );
+
+  const { blockUids } = await initSchema();
+  const cleanupPullWatchers = setupPullWatchOnSettingsPage(blockUids);
+
   return {
     elements: [
       style,
@@ -166,6 +202,10 @@ export default runExtension(async (onloadArgs) => {
     ],
     observers: observers,
     unload: () => {
+      unsubLeftSidebarFlag();
+      unsubSuggestiveMode();
+      cleanupPullWatchers();
+      cleanups.forEach((fn) => fn());
       setSyncActivity(false);
       window.roamjs.extension?.smartblocks?.unregisterCommand("QUERYBUILDER");
       // @ts-expect-error - tldraw throws a warning on multiple loads
diff --git a/apps/roam/src/utils/calcCanvasNodeSizeAndImg.ts b/apps/roam/src/utils/calcCanvasNodeSizeAndImg.ts
index fe37643e3..181e88b60 100644
--- a/apps/roam/src/utils/calcCanvasNodeSizeAndImg.ts
+++ b/apps/roam/src/utils/calcCanvasNodeSizeAndImg.ts
@@ -107,10 +107,7 @@ const calcCanvasNodeSizeAndImg = async ({
 
   let imageUrl;
   if (keyImageOption === "query-builder") {
-    const parentUid = resolveQueryBuilderRef({
-      queryRef: qbAlias,
-      extensionAPI,
-    });
+    const parentUid = resolveQueryBuilderRef({ queryRef: qbAlias });
     const results = await runQuery({
       extensionAPI,
       parentUid,
@@ -126,10 +123,15 @@ const calcCanvasNodeSizeAndImg = async ({
 
   try {
     const { width, height } = await loadImage(imageUrl);
-    if (!width || !height || !Number.isFinite(width) || !Number.isFinite(height)) {
+    if (
+      !width ||
+      !height ||
+      !Number.isFinite(width) ||
+      !Number.isFinite(height)
+    ) {
       return { w, h, imageUrl: "" };
     }
-    
+
     const aspectRatio = width / height;
     const nodeImageHeight = w / aspectRatio;
     const newHeight = h + nodeImageHeight;
diff --git a/apps/roam/src/utils/configPageTabs.ts b/apps/roam/src/utils/configPageTabs.ts
deleted file mode 100644
index 1d43df445..000000000
--- a/apps/roam/src/utils/configPageTabs.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { OnloadArgs } from "roamjs-components/types";
-import MultiTextPanel from "roamjs-components/components/ConfigPanels/MultiTextPanel";
-import NumberPanel from "roamjs-components/components/ConfigPanels/NumberPanel";
-import FlagPanel from "roamjs-components/components/ConfigPanels/FlagPanel";
-import CustomPanel from "roamjs-components/components/ConfigPanels/CustomPanel";
-import SelectPanel from "roamjs-components/components/ConfigPanels/SelectPanel";
-import TextPanel from "roamjs-components/components/ConfigPanels/TextPanel";
-import DiscourseNodeConfigPanel from "~/components/settings/DiscourseNodeConfigPanel";
-import DiscourseRelationConfigPanel from "~/components/settings/DiscourseRelationConfigPanel";
-import DEFAULT_RELATION_VALUES from "~/data/defaultDiscourseRelations";
-import { ConfigTab } from "roamjs-components/components/ConfigPage";
-import {
-  Field,
-  CustomField,
-  SelectField,
-} from "roamjs-components/components/ConfigPanels/types";
-import PageGroupsPanel from "~/components/settings/PageGroupPanel";
-
-export const configPageTabs = (args: OnloadArgs): ConfigTab[] => [
-  {
-    id: "home",
-    fields: [
-      {
-        title: "trigger",
-        description:
-          "The trigger to create the node menu. Must refresh after editing",
-        defaultValue: "\\",
-        // @ts-ignore
-        Panel: TextPanel,
-      },
-    ],
-  },
-  {
-    id: "grammar",
-    fields: [
-      // @ts-ignore
-      {
-        title: "nodes",
-        Panel: CustomPanel,
-        description: "The types of nodes in your discourse graph",
-        options: {
-          component: DiscourseNodeConfigPanel,
-        },
-      } as Field<CustomField>,
-      // @ts-ignore
-      {
-        title: "relations",
-        Panel: CustomPanel,
-        description: "The types of relations in your discourse graph",
-        defaultValue: DEFAULT_RELATION_VALUES,
-        options: {
-          component: DiscourseRelationConfigPanel,
-        },
-      } as Field<CustomField>,
-    ],
-  },
-  {
-    id: "export",
-    fields: [
-      {
-        title: "max filename length",
-        // @ts-ignore
-        Panel: NumberPanel,
-        description: "Set the maximum name length for markdown file exports",
-        defaultValue: 64,
-      },
-      {
-        title: "remove special characters",
-        // @ts-ignore
-        Panel: FlagPanel,
-        description:
-          "Whether or not to remove the special characters in a file name",
-      },
-      {
-        title: "simplified filename",
-        // @ts-ignore
-        Panel: FlagPanel,
-        description:
-          "For discourse nodes, extract out the {content} from the page name to become the file name",
-      },
-      {
-        title: "frontmatter",
-        // @ts-ignore
-        Panel: MultiTextPanel,
-        description:
-          "Specify all the lines that should go to the Frontmatter of the markdown file",
-      },
-      {
-        title: "resolve block references",
-        // @ts-ignore
-        Panel: FlagPanel,
-        description:
-          "Replaces block references in the markdown content with the block's content",
-      },
-      {
-        title: "resolve block embeds",
-        // @ts-ignore
-        Panel: FlagPanel,
-        description:
-          "Replaces block embeds in the markdown content with the block's content tree",
-      },
-      // @ts-ignore
-      {
-        title: "link type",
-        Panel: SelectPanel,
-        description: "How to format links that appear in your export.",
-        options: {
-          items: ["alias", "wikilinks", "roam url"],
-        },
-      } as Field<SelectField>,
-      {
-        title: "append referenced node",
-        // @ts-ignore
-        Panel: FlagPanel,
-        description:
-          "If a referenced node is defined in a node's format, it will be appended to the discourse context",
-      },
-    ],
-  },
-  {
-    id: "Suggestive Mode",
-    fields: [
-      {
-        title: "Include Current Page Relations",
-        // @ts-ignore
-        Panel: FlagPanel,
-        description:
-          "Include relations from pages referenced on the current page",
-      },
-      {
-        title: "Include Parent And Child Blocks",
-        // @ts-ignore
-        Panel: FlagPanel,
-        description: "Include relations from parent and child blocks",
-      },
-      // @ts-ignore
-      {
-        title: "Page Groups",
-        Panel: CustomPanel,
-        description: "Set page groups to use for discourse suggestions",
-        options: {
-          component: PageGroupsPanel,
-        },
-      } as Field<CustomField>,
-    ],
-  },
-];
diff --git a/apps/roam/src/utils/createDiscourseNode.ts b/apps/roam/src/utils/createDiscourseNode.ts
index 851cba630..f90e7ca3f 100644
--- a/apps/roam/src/utils/createDiscourseNode.ts
+++ b/apps/roam/src/utils/createDiscourseNode.ts
@@ -12,6 +12,8 @@ import { OnloadArgs, RoamBasicNode } from "roamjs-components/types";
 import runQuery from "./runQuery";
 import updateBlock from "roamjs-components/writes/updateBlock";
 import posthog from "posthog-js";
+import { getPersonalSetting } from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 
 type Props = {
   text: string;
@@ -32,8 +34,8 @@ const createDiscourseNode = async ({
     text: text,
   });
   const handleOpenInSidebar = (uid: string) => {
-    if (extensionAPI?.settings.get("disable-sidebar-open")) return;
-    openBlockInSidebar(uid);
+    if (getPersonalSetting<boolean>([PERSONAL_KEYS.disableSidebarOpen])) return;
+    void openBlockInSidebar(uid);
     setTimeout(() => {
       const sidebarTitle = document.querySelector(
         ".rm-sidebar-outline .rm-title-display",
@@ -80,10 +82,7 @@ const createDiscourseNode = async ({
       if (keyImageOption === "query-builder") {
         if (!extensionAPI) return;
 
-        const parentUid = resolveQueryBuilderRef({
-          queryRef: qbAlias,
-          extensionAPI,
-        });
+        const parentUid = resolveQueryBuilderRef({ queryRef: qbAlias });
         const results = await runQuery({
           extensionAPI,
           parentUid,
diff --git a/apps/roam/src/utils/deriveDiscourseNodeAttribute.ts b/apps/roam/src/utils/deriveDiscourseNodeAttribute.ts
index 84cf8985b..800f9f234 100644
--- a/apps/roam/src/utils/deriveDiscourseNodeAttribute.ts
+++ b/apps/roam/src/utils/deriveDiscourseNodeAttribute.ts
@@ -1,7 +1,6 @@
-import getSubTree from "roamjs-components/util/getSubTree";
-import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
-import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
 import getAttributeValueByBlockAndName from "roamjs-components/queries/getAttributeValueByBlockAndName";
+import { getDiscourseNodeSetting } from "~/components/settings/utils/accessors";
+import { DISCOURSE_NODE_KEYS } from "~/components/settings/utils/settingKeys";
 import getDiscourseContextResults from "./getDiscourseContextResults";
 import findDiscourseNode from "./findDiscourseNode";
 import getDiscourseNodes from "./getDiscourseNodes";
@@ -52,15 +51,16 @@ const deriveNodeAttribute = async ({
   const discourseNode = findDiscourseNode({ uid, nodes });
   if (!discourseNode) return 0;
   const nodeType = discourseNode.type;
-  const attributeNode = getSubTree({
-    tree: getBasicTreeByParentUid(nodeType || ""),
-    key: "Attributes",
-  });
-  const scoreFormula = getSettingValueFromTree({
-    tree: attributeNode.children,
-    key: attribute,
-    defaultValue: "{count:Has Any Relation To:any}",
-  });
+  const attributes =
+    getDiscourseNodeSetting<Record<string, string>>(nodeType || "", [
+      DISCOURSE_NODE_KEYS.attributes,
+    ]) ?? {};
+  const match = Object.keys(attributes).find(
+    (k) => k.toLowerCase() === attribute.toLowerCase(),
+  );
+  const scoreFormula =
+    (match ? attributes[match] : undefined) ||
+    "{count:Has Any Relation To:any}";
   let postProcess = scoreFormula;
   let totalOffset = 0;
   const matches = scoreFormula.matchAll(/{([^}]+)}/g);
diff --git a/apps/roam/src/utils/discourseConfigRef.ts b/apps/roam/src/utils/discourseConfigRef.ts
index 24f758269..b81495712 100644
--- a/apps/roam/src/utils/discourseConfigRef.ts
+++ b/apps/roam/src/utils/discourseConfigRef.ts
@@ -7,7 +7,7 @@ import {
   getUidAndBooleanSetting,
   BooleanSetting,
 } from "./getExportSettings";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 import {
   getSuggestiveModeConfigAndUids,
diff --git a/apps/roam/src/utils/getDiscourseNodes.ts b/apps/roam/src/utils/getDiscourseNodes.ts
index 3ee6befb5..cd83f940f 100644
--- a/apps/roam/src/utils/getDiscourseNodes.ts
+++ b/apps/roam/src/utils/getDiscourseNodes.ts
@@ -1,5 +1,9 @@
 import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
 import getSubTree from "roamjs-components/util/getSubTree";
+import {
+  isNewSettingsStoreEnabled,
+  getAllDiscourseNodes,
+} from "~/components/settings/utils/accessors";
 import discourseConfigRef from "./discourseConfigRef";
 import getDiscourseRelations from "./getDiscourseRelations";
 import { roamNodeToCondition } from "./parseQuery";
@@ -103,72 +107,83 @@ const getUidAndBooleanSetting = ({
 };
 
 const getDiscourseNodes = (relations = getDiscourseRelations()) => {
-  const configuredNodes = Object.entries(discourseConfigRef.nodes)
-    .map(([type, { text, children }]): DiscourseNode => {
-      const suggestiveRules = getSubTree({
-        tree: children,
-        key: "Suggestive Rules",
-      });
-      const embeddingBlockRef = getSubTree({
-        tree: suggestiveRules.children,
-        key: "Embedding Block Ref",
-      });
+  const configuredNodes = (
+    isNewSettingsStoreEnabled()
+      ? getAllDiscourseNodes()
+      : Object.entries(discourseConfigRef.nodes).map(
+          ([type, { text, children }]): DiscourseNode => {
+            const suggestiveRules = getSubTree({
+              tree: children,
+              key: "Suggestive Rules",
+            });
+            const embeddingBlockRef = getSubTree({
+              tree: suggestiveRules.children,
+              key: "Embedding Block Ref",
+            });
 
-      return {
-        format: getSettingValueFromTree({ tree: children, key: "format" }),
-        text,
-        shortcut: getSettingValueFromTree({ tree: children, key: "shortcut" }),
-        tag: getSettingValueFromTree({ tree: children, key: "tag" }),
-        type,
-        specification: getSpecification(children),
-        backedBy: "user",
-        canvasSettings: Object.fromEntries(
-          getSubTree({ tree: children, key: "canvas" }).children.map(
-            (c) => [c.text, c.children[0]?.text || ""] as const,
-          ),
-        ),
-        graphOverview:
-          children.filter((c) => c.text === "Graph Overview").length > 0,
-        description: getSettingValueFromTree({
-          tree: children,
-          key: "description",
-        }),
-        template: getSubTree({ tree: children, key: "template" }).children,
-        embeddingRef: embeddingBlockRef?.children?.[0]?.text,
-        embeddingRefUid: embeddingBlockRef?.uid,
-        isFirstChild: getUidAndBooleanSetting({
-          tree: suggestiveRules.children,
-          text: "First Child",
-        }),
-      };
-    })
-    .concat(
-      relations
-        .filter((r) => r.triples.some((t) => t.some((n) => /anchor/i.test(n))))
-        .map((r) => ({
-          format: "",
-          text: r.label,
-          type: r.id,
-          shortcut: r.label.slice(0, 1),
-          tag: "",
-          specification: r.triples.map(([source, relation, target]) => ({
-            type: "clause",
-            source: /anchor/i.test(source) ? r.label : source,
-            relation,
-            target:
-              target === "source"
-                ? r.source
-                : target === "destination"
-                  ? r.destination
-                  : /anchor/i.test(target)
-                    ? r.label
-                    : target,
-            uid: window.roamAlphaAPI.util.generateUID(),
-          })),
-          backedBy: "relation",
-          canvasSettings: {},
+            return {
+              format: getSettingValueFromTree({
+                tree: children,
+                key: "format",
+              }),
+              text,
+              shortcut: getSettingValueFromTree({
+                tree: children,
+                key: "shortcut",
+              }),
+              tag: getSettingValueFromTree({ tree: children, key: "tag" }),
+              type,
+              specification: getSpecification(children),
+              backedBy: "user",
+              canvasSettings: Object.fromEntries(
+                getSubTree({ tree: children, key: "canvas" }).children.map(
+                  (c) => [c.text, c.children[0]?.text || ""] as const,
+                ),
+              ),
+              graphOverview:
+                children.filter((c) => c.text === "Graph Overview").length > 0,
+              description: getSettingValueFromTree({
+                tree: children,
+                key: "description",
+              }),
+              template: getSubTree({ tree: children, key: "template" })
+                .children,
+              embeddingRef: embeddingBlockRef?.children?.[0]?.text,
+              embeddingRefUid: embeddingBlockRef?.uid,
+              isFirstChild: getUidAndBooleanSetting({
+                tree: suggestiveRules.children,
+                text: "First Child",
+              }),
+            };
+          },
+        )
+  ).concat(
+    relations
+      .filter((r) => r.triples.some((t) => t.some((n) => /anchor/i.test(n))))
+      .map((r) => ({
+        format: "",
+        text: r.label,
+        type: r.id,
+        shortcut: r.label.slice(0, 1),
+        tag: "",
+        specification: r.triples.map(([source, relation, target]) => ({
+          type: "clause",
+          source: /anchor/i.test(source) ? r.label : source,
+          relation,
+          target:
+            target === "source"
+              ? r.source
+              : target === "destination"
+                ? r.destination
+                : /anchor/i.test(target)
+                  ? r.label
+                  : target,
+          uid: window.roamAlphaAPI.util.generateUID(),
         })),
-    );
+        backedBy: "relation",
+        canvasSettings: {},
+      })),
+  );
   const configuredNodeTexts = new Set(configuredNodes.map((n) => n.text));
   const defaultNodes = DEFAULT_NODES.filter(
     (n) => !configuredNodeTexts.has(n.text),
diff --git a/apps/roam/src/utils/getDiscourseRelations.ts b/apps/roam/src/utils/getDiscourseRelations.ts
index b99b986bb..c9f24a911 100644
--- a/apps/roam/src/utils/getDiscourseRelations.ts
+++ b/apps/roam/src/utils/getDiscourseRelations.ts
@@ -6,6 +6,10 @@ import type {
 import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
 import toFlexRegex from "roamjs-components/util/toFlexRegex";
 import DEFAULT_RELATION_VALUES from "~/data/defaultDiscourseRelations";
+import {
+  isNewSettingsStoreEnabled,
+  getAllRelations,
+} from "~/components/settings/utils/accessors";
 import discourseConfigRef from "./discourseConfigRef";
 
 export type Triple = readonly [string, string, string];
@@ -32,6 +36,10 @@ export const getRelationsNode = (grammarNode = getGrammarNode()) => {
 };
 
 const getDiscourseRelations = () => {
+  if (isNewSettingsStoreEnabled()) {
+    return getAllRelations();
+  }
+
   const grammarNode = getGrammarNode();
   const relationsNode = getRelationsNode(grammarNode);
   const relationNodes = relationsNode?.children || DEFAULT_RELATION_VALUES;
diff --git a/apps/roam/src/utils/getExportSettings.ts b/apps/roam/src/utils/getExportSettings.ts
index 21cadbc5c..c0d4dc9f6 100644
--- a/apps/roam/src/utils/getExportSettings.ts
+++ b/apps/roam/src/utils/getExportSettings.ts
@@ -2,7 +2,7 @@ import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByPar
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 import { RoamBasicNode } from "roamjs-components/types";
 import { getSubTree } from "roamjs-components/util";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 
 type UidPair<T> = {
   uid?: string;
diff --git a/apps/roam/src/utils/getLeftSidebarSettings.ts b/apps/roam/src/utils/getLeftSidebarSettings.ts
index 94d018690..928f6a067 100644
--- a/apps/roam/src/utils/getLeftSidebarSettings.ts
+++ b/apps/roam/src/utils/getLeftSidebarSettings.ts
@@ -8,6 +8,10 @@ import {
   getUidAndStringSetting,
 } from "./getExportSettings";
 import { getSubTree } from "roamjs-components/util";
+import type {
+  LeftSidebarGlobalSettings,
+  PersonalSection,
+} from "~/components/settings/utils/zodSchema";
 
 type LeftSidebarPersonalSectionSettings = {
   uid: string;
@@ -199,6 +203,58 @@ export const getAllLeftSidebarPersonalSectionConfigs = (
 
   return result;
 };
+
+// TODO(ENG-1471): Remove when migration complete — just use accessor values directly.
+// During dual-read, we need old-system UIDs for block CRUD (fold toggle, reorder, delete)
+// but read setting VALUES from accessors (which route through the feature flag and log
+// mismatches). These helpers merge accessor values onto old-system config objects.
+export const mergeGlobalSectionWithAccessor = (
+  config: LeftSidebarGlobalSectionConfig,
+  globalValues: LeftSidebarGlobalSettings | undefined,
+): LeftSidebarGlobalSectionConfig => {
+  if (!config.settings) return config;
+  return {
+    ...config,
+    settings: {
+      uid: config.settings.uid,
+      collapsable: {
+        uid: config.settings.collapsable.uid,
+        value:
+          globalValues?.Settings.Collapsable ??
+          config.settings.collapsable.value,
+      },
+      folded: {
+        uid: config.settings.folded.uid,
+        value: globalValues?.Settings.Folded ?? config.settings.folded.value,
+      },
+    },
+  };
+};
+
+export const mergePersonalSectionsWithAccessor = (
+  sections: LeftSidebarPersonalSectionConfig[],
+  personalValues: PersonalSection[] | undefined,
+): LeftSidebarPersonalSectionConfig[] => {
+  return sections.map((section, i) => {
+    const newSection = personalValues?.[i];
+    if (!section.settings || !newSection) return section;
+    return {
+      ...section,
+      settings: {
+        ...section.settings,
+        truncateResult: {
+          ...section.settings.truncateResult,
+          value: newSection.Settings["Truncate-result?"],
+        },
+        folded: {
+          ...section.settings.folded,
+          value: newSection.Settings.Folded,
+        },
+      },
+    };
+  });
+};
+
 export const getLeftSidebarSettings = (
   globalTree: RoamBasicNode[],
 ): LeftSidebarConfig => {
diff --git a/apps/roam/src/utils/hyde.ts b/apps/roam/src/utils/hyde.ts
index 06c054e3a..9867dd2b0 100644
--- a/apps/roam/src/utils/hyde.ts
+++ b/apps/roam/src/utils/hyde.ts
@@ -5,9 +5,13 @@ import { render as renderToast } from "roamjs-components/components/Toast";
 import findDiscourseNode from "./findDiscourseNode";
 import { nextApiRoot } from "@repo/utils/execContext";
 import { DiscourseNode } from "./getDiscourseNodes";
-import getExtensionAPI from "roamjs-components/util/extensionApiContext";
 import { getNodesByType } from "@repo/database/lib/queries";
 import getAllReferencesOnPage from "./getAllReferencesOnPage";
+import { getGlobalSetting } from "~/components/settings/utils/accessors";
+import {
+  GLOBAL_KEYS,
+  SUGGESTIVE_MODE_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
 type ApiEmbeddingResponse = {
   data: Array<{
@@ -415,15 +419,16 @@ export const performHydeSearch = async ({
     return [];
   }
 
-  const extensionAPI = getExtensionAPI();
   const shouldGrabFromReferencedPages =
-    (extensionAPI.settings.get(
-      "context-grab-from-referenced-pages",
-    ) as boolean) ?? true;
+    getGlobalSetting<boolean>([
+      GLOBAL_KEYS.suggestiveMode,
+      SUGGESTIVE_MODE_KEYS.includeCurrentPageRelations,
+    ]) ?? false;
   const shouldGrabParentChildContext =
-    (extensionAPI.settings.get(
-      "context-grab-parent-child-context",
-    ) as boolean) ?? true;
+    getGlobalSetting<boolean>([
+      GLOBAL_KEYS.suggestiveMode,
+      SUGGESTIVE_MODE_KEYS.includeParentAndChildBlocks,
+    ]) ?? false;
 
   let candidateNodesForHyde: SuggestedNode[] = [];
 
diff --git a/apps/roam/src/utils/initializeObserversAndListeners.ts b/apps/roam/src/utils/initializeObserversAndListeners.ts
index 4f2a3fa68..c946134ce 100644
--- a/apps/roam/src/utils/initializeObserversAndListeners.ts
+++ b/apps/roam/src/utils/initializeObserversAndListeners.ts
@@ -8,18 +8,13 @@ import {
   renderCanvasReferences,
   renderDiscourseContext,
 } from "~/utils/renderLinkedReferenceAdditions";
-import { createConfigObserver } from "roamjs-components/components/ConfigPage";
 import {
   renderTldrawCanvas,
   renderTldrawCanvasInSidebar,
 } from "~/components/canvas/Tldraw";
 import { renderQueryPage, renderQueryBlock } from "~/components/QueryBuilder";
-import {
-  DISCOURSE_CONFIG_PAGE_TITLE,
-  renderNodeConfigPage,
-} from "~/utils/renderNodeConfigPage";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 import { isCurrentPageCanvas, isSidebarCanvas } from "~/utils/isCanvasPage";
-import { isDiscourseNodeConfigPage as isNodeConfigPage } from "~/utils/isDiscourseNodeConfigPage";
 import { isQueryPage } from "~/utils/isQueryPage";
 import {
   enablePageRefObserver,
@@ -34,14 +29,11 @@ import getDiscourseNodes from "~/utils/getDiscourseNodes";
 import { OnloadArgs } from "roamjs-components/types";
 import refreshConfigTree from "~/utils/refreshConfigTree";
 import { render as renderGraphOverviewExport } from "~/components/ExportDiscourseContext";
-import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
-import { getSettingValueFromTree } from "roamjs-components/util";
 import {
   getModifiersFromCombo,
   render as renderDiscourseNodeMenu,
 } from "~/components/DiscourseNodeMenu";
 import { IKeyCombo } from "@blueprintjs/core";
-import { configPageTabs } from "~/utils/configPageTabs";
 import { renderDiscourseNodeSearchMenu } from "~/components/DiscourseNodeSearchMenu";
 import {
   renderTextSelectionPopup,
@@ -51,9 +43,7 @@ import {
 import { renderNodeTagPopupButton } from "./renderNodeTagPopup";
 import { renderImageToolsMenu } from "./renderImageToolsMenu";
 import { formatHexColor } from "~/components/settings/DiscourseNodeCanvasSettings";
-import { getSetting } from "./extensionSettings";
 import { mountLeftSidebar } from "~/components/LeftSidebarView";
-import { getUidAndBooleanSetting } from "./getExportSettings";
 import { getCleanTagText } from "~/components/settings/NodeConfig";
 import getPleasingColors from "@repo/utils/getPleasingColors";
 import { colord } from "colord";
@@ -61,6 +51,19 @@ import { renderPossibleDuplicates } from "~/components/VectorDuplicateMatches";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 import getPageTitleByPageUid from "roamjs-components/queries/getPageTitleByPageUid";
 import findDiscourseNode from "./findDiscourseNode";
+import {
+  getPersonalSetting,
+  getFeatureFlag,
+  getGlobalSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  onSettingChange,
+  settingKeys,
+} from "~/components/settings/utils/settingsEmitter";
+import {
+  PERSONAL_KEYS,
+  GLOBAL_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
 const debounce = (fn: () => void, delay = 250) => {
   let timeout: number;
@@ -83,11 +86,11 @@ const getTitleAndUidFromHeader = (h1: HTMLHeadingElement) => {
   return { title, uid };
 };
 
-export const initObservers = async ({
+export const initObservers = ({
   onloadArgs,
 }: {
   onloadArgs: OnloadArgs;
-}): Promise<{
+}): {
   observers: MutationObserver[];
   listeners: {
     pageActionListener: EventListener;
@@ -96,7 +99,8 @@ export const initObservers = async ({
     discourseNodeSearchTriggerListener: EventListener;
     nodeCreationPopoverListener: EventListener;
   };
-}> => {
+  cleanups: Array<() => void>;
+} => {
   const pageTitleObserver = createHTMLObserver({
     tag: "H1",
     className: "rm-title-display",
@@ -105,12 +109,7 @@ export const initObservers = async ({
       const { title, uid } = getTitleAndUidFromHeader(h1);
       const props = { title, h1, onloadArgs };
 
-      const isSuggestiveModeEnabled = getUidAndBooleanSetting({
-        tree: getBasicTreeByParentUid(
-          getPageUidByPageTitle(DISCOURSE_CONFIG_PAGE_TITLE),
-        ),
-        text: "(BETA) Suggestive Mode Enabled",
-      }).value;
+      const isSuggestiveModeEnabled = getFeatureFlag("Suggestive mode enabled");
 
       const node = findDiscourseNode({ uid, title });
       const isDiscourseNode = node && node.backedBy !== "default";
@@ -127,8 +126,7 @@ export const initObservers = async ({
         }
       }
 
-      if (isNodeConfigPage(title)) renderNodeConfigPage(props);
-      else if (isQueryPage(props)) renderQueryPage(props);
+      if (isQueryPage({ title })) renderQueryPage(props);
       else if (isCurrentPageCanvas(props)) renderTldrawCanvas(props);
       else if (isSidebarCanvas(props)) renderTldrawCanvasInSidebar(props);
     },
@@ -191,11 +189,11 @@ export const initObservers = async ({
     }>,
   ) => {
     if (!/page/i.test(e.detail.action)) return;
-    window.roamAlphaAPI.ui.mainWindow
+    void window.roamAlphaAPI.ui.mainWindow
       .getOpenPageOrBlockUid()
       .then((u) => u || window.roamAlphaAPI.util.dateToPageUid(new Date()))
       .then((parentUid) => {
-        createBlock({
+        return createBlock({
           parentUid,
           order: Number.MAX_VALUE,
           node: { text: `[[${e.detail.val}]]` },
@@ -203,10 +201,19 @@ export const initObservers = async ({
       });
   }) as EventListener;
 
-  if (onloadArgs.extensionAPI.settings.get("suggestive-mode-overlay")) {
-    addPageRefObserver(getSuggestiveOverlayHandler(onloadArgs));
+  const suggestiveHandler = getSuggestiveOverlayHandler(onloadArgs);
+  const toggleSuggestiveOverlay = onPageRefObserverChange(suggestiveHandler);
+  if (getPersonalSetting<boolean>([PERSONAL_KEYS.suggestiveModeOverlay])) {
+    addPageRefObserver(suggestiveHandler);
   }
 
+  const unsubSuggestiveOverlay = onSettingChange(
+    settingKeys.personalSuggestiveModeOverlay,
+    (newValue) => {
+      toggleSuggestiveOverlay(Boolean(newValue));
+    },
+  );
+
   const graphOverviewExportObserver = createHTMLObserver({
     tag: "DIV",
     className: "rm-graph-view-control-panel__main-options",
@@ -226,48 +233,57 @@ export const initObservers = async ({
     },
   });
 
-  if (onloadArgs.extensionAPI.settings.get("page-preview"))
+  if (getPersonalSetting<boolean>([PERSONAL_KEYS.pagePreview]))
     addPageRefObserver(previewPageRefHandler);
-  if (onloadArgs.extensionAPI.settings.get("discourse-context-overlay")) {
+  if (getPersonalSetting<boolean>([PERSONAL_KEYS.discourseContextOverlay])) {
     const overlayHandler = getOverlayHandler(onloadArgs);
     onPageRefObserverChange(overlayHandler)(true);
   }
   if (getPageRefObserversSize()) enablePageRefObserver();
 
-  const { pageUid: configPageUid, observer: configPageObserver } =
-    await createConfigObserver({
-      title: DISCOURSE_CONFIG_PAGE_TITLE,
-      config: {
-        tabs: configPageTabs(onloadArgs),
-      },
-    });
-  // refresh config tree after config page is created
-  refreshConfigTree();
+  const configPageUid = getPageUidByPageTitle(DISCOURSE_CONFIG_PAGE_TITLE);
 
   const hashChangeListener = (e: Event) => {
     const evt = e as HashChangeEvent;
     // Attempt to refresh config navigating away from config page
     // doesn't work if they update via sidebar
     if (
-      evt.oldURL.endsWith(configPageUid) ||
+      (configPageUid && evt.oldURL.endsWith(configPageUid)) ||
       getDiscourseNodes().some(({ type }) => evt.oldURL.endsWith(type))
     ) {
       refreshConfigTree();
     }
   };
 
-  const configTree = getBasicTreeByParentUid(configPageUid);
-  const globalTrigger = getSettingValueFromTree({
-    tree: configTree,
-    key: "trigger",
-    defaultValue: "\\",
-  }).trim();
-  const personalTriggerCombo =
-    (onloadArgs.extensionAPI.settings.get(
-      "personal-node-menu-trigger",
-    ) as IKeyCombo) || undefined;
-  const personalTrigger = personalTriggerCombo?.key;
-  const personalModifiers = getModifiersFromCombo(personalTriggerCombo);
+  let globalTrigger = (
+    getGlobalSetting<string>([GLOBAL_KEYS.trigger]) ?? "\\"
+  ).trim();
+  const personalTriggerCombo = getPersonalSetting<IKeyCombo>([
+    PERSONAL_KEYS.personalNodeMenuTrigger,
+  ]);
+  let personalTrigger = personalTriggerCombo?.key;
+  let personalModifiers = personalTriggerCombo
+    ? getModifiersFromCombo(personalTriggerCombo)
+    : [];
+
+  const unsubGlobalTrigger = onSettingChange(
+    settingKeys.globalTrigger,
+    (newValue) => {
+      globalTrigger = (newValue as string).trim();
+    },
+  );
+
+  const unsubPersonalTrigger = onSettingChange(
+    settingKeys.personalNodeMenuTrigger,
+    (newValue) => {
+      const combo =
+        newValue && typeof newValue === "object"
+          ? (newValue as IKeyCombo)
+          : undefined;
+      personalTrigger = combo?.key;
+      personalModifiers = combo ? getModifiersFromCombo(combo) : [];
+    },
+  );
 
   const leftSidebarObserver = createHTMLObserver({
     tag: "DIV",
@@ -275,10 +291,7 @@ export const initObservers = async ({
     className: "starred-pages-wrapper",
     callback: (el) => {
       void (async () => {
-        const isLeftSidebarEnabled = getUidAndBooleanSetting({
-          tree: configTree,
-          text: "(BETA) Left Sidebar",
-        }).value;
+        const isLeftSidebarEnabled = getFeatureFlag("Enable left sidebar");
         const container = el as HTMLDivElement;
         if (isLeftSidebarEnabled) {
           container.style.padding = "0";
@@ -329,7 +342,15 @@ export const initObservers = async ({
     }
   };
 
-  const customTrigger = getSetting("node-search-trigger", "@");
+  let customTrigger =
+    getPersonalSetting<string>([PERSONAL_KEYS.nodeSearchMenuTrigger]) ?? "@";
+
+  const unsubSearchTrigger = onSettingChange(
+    settingKeys.nodeSearchMenuTrigger,
+    (newValue) => {
+      customTrigger = newValue as string;
+    },
+  );
 
   const discourseNodeSearchTriggerListener = (e: Event) => {
     const evt = e as KeyboardEvent;
@@ -383,7 +404,7 @@ export const initObservers = async ({
 
   const nodeCreationPopoverListener = debounce(() => {
     const isTextSelectionPopupEnabled =
-      onloadArgs.extensionAPI.settings.get("text-selection-popup") !== false;
+      getPersonalSetting<boolean>([PERSONAL_KEYS.textSelectionPopup]) !== false;
 
     if (!isTextSelectionPopupEnabled) return;
 
@@ -421,7 +442,6 @@ export const initObservers = async ({
     observers: [
       pageTitleObserver,
       queryBlockObserver,
-      configPageObserver,
       graphOverviewExportObserver,
       nodeTagPopupButtonObserver,
       leftSidebarObserver,
@@ -434,5 +454,11 @@ export const initObservers = async ({
       discourseNodeSearchTriggerListener,
       nodeCreationPopoverListener,
     },
+    cleanups: [
+      unsubGlobalTrigger,
+      unsubPersonalTrigger,
+      unsubSearchTrigger,
+      unsubSuggestiveOverlay,
+    ],
   };
 };
diff --git a/apps/roam/src/utils/internalError.ts b/apps/roam/src/utils/internalError.ts
index 6a1be6508..72393b058 100644
--- a/apps/roam/src/utils/internalError.ts
+++ b/apps/roam/src/utils/internalError.ts
@@ -2,8 +2,8 @@ import posthog from "posthog-js";
 import type { Properties } from "posthog-js";
 import renderToast from "roamjs-components/components/Toast";
 import sendErrorEmail from "~/utils/sendErrorEmail";
-import { getSetting } from "~/utils/extensionSettings";
-import { DISALLOW_DIAGNOSTICS } from "~/data/userSettings";
+import { getPersonalSetting } from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 
 const NON_WORD = /\W+/g;
 
@@ -23,7 +23,7 @@ const internalError = ({
   forceSendInDev?: boolean;
 }): void => {
   if (
-    getSetting(DISALLOW_DIAGNOSTICS, false) ||
+    getPersonalSetting<boolean>([PERSONAL_KEYS.disableProductDiagnostics]) ||
     (process.env.NODE_ENV === "development" && forceSendInDev !== true)
   ) {
     console.error(error, context);
diff --git a/apps/roam/src/utils/isCanvasPage.ts b/apps/roam/src/utils/isCanvasPage.ts
index 591ccea5c..a9a3b7a49 100644
--- a/apps/roam/src/utils/isCanvasPage.ts
+++ b/apps/roam/src/utils/isCanvasPage.ts
@@ -1,9 +1,11 @@
 import { DEFAULT_CANVAS_PAGE_FORMAT } from "..";
-import { getFormattedConfigTree } from "./discourseConfigRef";
+import { getGlobalSetting } from "~/components/settings/utils/accessors";
+import { GLOBAL_KEYS } from "~/components/settings/utils/settingKeys";
 
 export const isCanvasPage = ({ title }: { title: string }) => {
-  const { canvasPageFormat } = getFormattedConfigTree();
-  const format = canvasPageFormat.value || DEFAULT_CANVAS_PAGE_FORMAT;
+  const format =
+    getGlobalSetting<string>([GLOBAL_KEYS.canvasPageFormat]) ||
+    DEFAULT_CANVAS_PAGE_FORMAT;
   const canvasRegex = new RegExp(`^${format}$`.replace(/\*/g, ".+"));
   return canvasRegex.test(title);
 };
diff --git a/apps/roam/src/utils/isDiscourseNodeConfigPage.ts b/apps/roam/src/utils/isDiscourseNodeConfigPage.ts
deleted file mode 100644
index 8989f8eac..000000000
--- a/apps/roam/src/utils/isDiscourseNodeConfigPage.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { NODE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
-
-export const isDiscourseNodeConfigPage = (title: string) =>
-  title.startsWith(NODE_CONFIG_PAGE_TITLE);
diff --git a/apps/roam/src/utils/isQueryPage.ts b/apps/roam/src/utils/isQueryPage.ts
index cb321fa7f..aa3df2255 100644
--- a/apps/roam/src/utils/isQueryPage.ts
+++ b/apps/roam/src/utils/isQueryPage.ts
@@ -1,15 +1,7 @@
-import { OnloadArgs } from "roamjs-components/types";
 import { getQueryPages } from "~/components/settings/QueryPagesPanel";
 
-export const isQueryPage = ({
-  title,
-  onloadArgs,
-}: {
-  title: string;
-  onloadArgs: OnloadArgs;
-}): boolean => {
-  const { extensionAPI } = onloadArgs;
-  const queryPages = getQueryPages(extensionAPI);
+export const isQueryPage = ({ title }: { title: string }): boolean => {
+  const queryPages = getQueryPages();
 
   const matchesQueryPage = queryPages.some((queryPage) => {
     const escapedPattern = queryPage
diff --git a/apps/roam/src/utils/listActiveQueries.ts b/apps/roam/src/utils/listActiveQueries.ts
index 64578d8b7..293807583 100644
--- a/apps/roam/src/utils/listActiveQueries.ts
+++ b/apps/roam/src/utils/listActiveQueries.ts
@@ -1,19 +1,20 @@
 import { PullBlock } from "roamjs-components/types";
 import { getQueryPages } from "~/components/settings/QueryPagesPanel";
-import { OnloadArgs } from "roamjs-components/types";
 
-export const listActiveQueries = (extensionAPI: OnloadArgs["extensionAPI"]) =>
+export const listActiveQueries = () =>
   (
     window.roamAlphaAPI.data.fast.q(
       `[:find (pull ?b [:block/uid]) :where [or-join [?b] 
                [and [?b :block/string ?s] [[clojure.string/includes? ?s "{{query block}}"]] ]
-               ${getQueryPages(extensionAPI).map(
-                 (p) =>
-                   `[and [?b :node/title ?t] [[re-pattern "^${p.replace(
-                     /\*/,
-                     ".*",
-                   )}$"] ?regex] [[re-find ?regex ?t]]]`,
-               )}
+               ${getQueryPages()
+                 .map(
+                   (p) =>
+                     `[and [?b :node/title ?t] [[re-pattern "^${p.replace(
+                       /\*/,
+                       ".*",
+                     )}$"] ?regex] [[re-find ?regex ?t]]]`,
+                 )
+                 .join("\n")}
           ]]`,
     ) as [PullBlock][]
   ).map((b) => ({ uid: b[0][":block/uid"] || "" }));
diff --git a/apps/roam/src/utils/migrateLeftSidebarSettings.ts b/apps/roam/src/utils/migrateLeftSidebarSettings.ts
index 2604bb5b0..b88ab5192 100644
--- a/apps/roam/src/utils/migrateLeftSidebarSettings.ts
+++ b/apps/roam/src/utils/migrateLeftSidebarSettings.ts
@@ -2,8 +2,9 @@ import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTit
 import getPageTitleByPageUid from "roamjs-components/queries/getPageTitleByPageUid";
 import updateBlock from "roamjs-components/writes/updateBlock";
 import createBlock from "roamjs-components/writes/createBlock";
-import { getFormattedConfigTree } from "./discourseConfigRef";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "./renderNodeConfigPage";
+import discourseConfigRef from "./discourseConfigRef";
+import { getLeftSidebarSettings } from "./getLeftSidebarSettings";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 import refreshConfigTree from "./refreshConfigTree";
 
 const migrateSectionChildren = async (
@@ -37,7 +38,7 @@ const migrateSectionChildren = async (
 };
 
 export const migrateLeftSidebarSettings = async () => {
-  const leftSidebarSettings = getFormattedConfigTree().leftSidebar;
+  const leftSidebarSettings = getLeftSidebarSettings(discourseConfigRef.tree);
 
   if (!leftSidebarSettings.uid) return;
 
@@ -51,12 +52,9 @@ export const migrateLeftSidebarSettings = async () => {
     await migrateSectionChildren(globalChildren);
   }
 
-
   const allPersonalSections = leftSidebarSettings.allPersonalSections;
 
-  for (const [_, userPersonalSection] of Object.entries(
-    allPersonalSections,
-  )) {
+  for (const userPersonalSection of Object.values(allPersonalSections)) {
     for (const section of userPersonalSection.sections) {
       const children = section.children || [];
       if (children.length > 0) {
diff --git a/apps/roam/src/utils/pageRefObserverHandlers.ts b/apps/roam/src/utils/pageRefObserverHandlers.ts
index 2d1b544ac..a48f61da3 100644
--- a/apps/roam/src/utils/pageRefObserverHandlers.ts
+++ b/apps/roam/src/utils/pageRefObserverHandlers.ts
@@ -6,6 +6,12 @@ import { render as discourseOverlayRender } from "~/components/DiscourseContextO
 import { OnloadArgs } from "roamjs-components/types";
 import { renderSuggestive as renderSuggestiveOverlay } from "~/components/SuggestiveModeOverlay";
 
+const PAGE_REF_SELECTOR = "span.rm-page-ref";
+const DISCOURSE_OVERLAY_CLASS = "roamjs-discourse-context-overlay";
+const DISCOURSE_OVERLAY_ATTR = "data-roamjs-discourse-overlay";
+const SUGGESTIVE_OVERLAY_CLASS = "suggestive-mode-overlay";
+const SUGGESTIVE_OVERLAY_ATTR = "data-discourse-suggestive-overlay";
+
 const pageRefObservers = new Set<(s: HTMLSpanElement) => void>();
 const pageRefObserverRef: { current?: MutationObserver } = {
   current: undefined,
@@ -38,19 +44,19 @@ export const overlayPageRefHandler = (
     const tag =
       s.getAttribute("data-tag") ||
       s.parentElement.getAttribute("data-link-title");
-    const hasOverlayAttribute = s.getAttribute("data-roamjs-discourse-overlay");
+    const hasOverlayAttribute = s.getAttribute(DISCOURSE_OVERLAY_ATTR);
     const hasOverlayElement =
       (s.hasAttribute("data-tag") &&
         Array.from(s.children).some(
           (child) =>
             child instanceof HTMLSpanElement &&
-            child.querySelector(".roamjs-discourse-context-overlay"),
+            child.querySelector(`.${DISCOURSE_OVERLAY_CLASS}`),
         )) ||
       (s.parentElement &&
         Array.from(s.parentElement.children).some(
           (child) =>
             child instanceof HTMLSpanElement &&
-            child.querySelector(".roamjs-discourse-context-overlay"),
+            child.querySelector(`.${DISCOURSE_OVERLAY_CLASS}`),
         ));
     if (
       tag &&
@@ -58,7 +64,7 @@ export const overlayPageRefHandler = (
       !hasOverlayElement &&
       isDiscourseNode(getPageUidByPageTitle(tag))
     ) {
-      s.setAttribute("data-roamjs-discourse-overlay", "true");
+      s.setAttribute(DISCOURSE_OVERLAY_ATTR, "true");
       const parent = document.createElement("span");
       discourseOverlayRender({
         parent,
@@ -84,10 +90,10 @@ export const suggestiveOverlayPageRefHandler = (
       s.parentElement.getAttribute("data-link-title");
     if (
       tag &&
-      !s.getAttribute("data-discourse-suggestive-overlay") &&
+      !s.getAttribute(SUGGESTIVE_OVERLAY_ATTR) &&
       isDiscourseNode(getPageUidByPageTitle(tag))
     ) {
-      s.setAttribute("data-discourse-suggestive-overlay", "true");
+      s.setAttribute(SUGGESTIVE_OVERLAY_ATTR, "true");
       const parent = document.createElement("span");
       renderSuggestiveOverlay({
         parent,
@@ -141,47 +147,50 @@ const applyHandlersToExistingPageRefs = (
   handler: (s: HTMLSpanElement) => void,
 ) => {
   const existingPageRefs =
-    document.querySelectorAll<HTMLSpanElement>("span.rm-page-ref");
+    document.querySelectorAll<HTMLSpanElement>(PAGE_REF_SELECTOR);
   existingPageRefs.forEach((pageRef) => {
     handler(pageRef);
   });
 };
 
-const removeOverlaysFromExistingPageRefs = () => {
-  // Find all page refs that have the overlay attribute OR have overlay elements
-  // This ensures we catch all cases, even if attribute is missing
+const removeOverlayElements = (overlayClass: string, attributeName: string) => {
   const allPageRefs =
-    document.querySelectorAll<HTMLSpanElement>("span.rm-page-ref");
+    document.querySelectorAll<HTMLSpanElement>(PAGE_REF_SELECTOR);
   allPageRefs.forEach((pageRef) => {
-    // Check if overlay is a direct child of pageRef
     const directChildContainer = Array.from(pageRef.children).find(
       (child) =>
         child instanceof HTMLSpanElement &&
-        child.querySelector(".roamjs-discourse-context-overlay"),
+        child.querySelector(`.${overlayClass}`),
     ) as HTMLSpanElement | undefined;
     if (directChildContainer) {
       directChildContainer.remove();
-      pageRef.removeAttribute("data-roamjs-discourse-overlay");
+      pageRef.removeAttribute(attributeName);
       return;
     }
 
-    // Check if overlay is a direct child of pageRef's parent element
     if (pageRef.parentElement) {
       const parentDirectChildContainer = Array.from(
         pageRef.parentElement.children,
       ).find(
         (child) =>
           child instanceof HTMLSpanElement &&
-          child.querySelector(".roamjs-discourse-context-overlay"),
+          child.querySelector(`.${overlayClass}`),
       ) as HTMLSpanElement | undefined;
       if (parentDirectChildContainer) {
         parentDirectChildContainer.remove();
-        pageRef.removeAttribute("data-roamjs-discourse-overlay");
+        pageRef.removeAttribute(attributeName);
       }
     }
   });
 };
 
+// Queries all page refs (not just attributed ones) to catch cases where attribute is missing
+const removeOverlaysFromExistingPageRefs = () =>
+  removeOverlayElements(DISCOURSE_OVERLAY_CLASS, DISCOURSE_OVERLAY_ATTR);
+
+const removeSuggestiveOverlaysFromExistingPageRefs = () =>
+  removeOverlayElements(SUGGESTIVE_OVERLAY_CLASS, SUGGESTIVE_OVERLAY_ATTR);
+
 export const onPageRefObserverChange =
   (handler: (s: HTMLSpanElement) => void) => (b: boolean) => {
     if (b) {
@@ -195,6 +204,9 @@ export const onPageRefObserverChange =
       if (handler === cachedHandler) {
         removeOverlaysFromExistingPageRefs();
       }
+      if (handler === cachedSuggestiveHandler) {
+        removeSuggestiveOverlaysFromExistingPageRefs();
+      }
       if (!pageRefObservers.size) disablePageRefObserver();
     }
   };
diff --git a/apps/roam/src/utils/posthog.ts b/apps/roam/src/utils/posthog.ts
index 8ea8fa512..407c8676d 100644
--- a/apps/roam/src/utils/posthog.ts
+++ b/apps/roam/src/utils/posthog.ts
@@ -2,8 +2,8 @@ import getCurrentUserUid from "roamjs-components/queries/getCurrentUserUid";
 import { getVersionWithDate } from "./getVersion";
 import posthog from "posthog-js";
 import type { CaptureResult } from "posthog-js";
-import { getSetting } from "./extensionSettings";
-import { DISALLOW_DIAGNOSTICS } from "~/data/userSettings";
+import { getPersonalSetting } from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 
 let initialized = false;
 
@@ -67,7 +67,9 @@ export const disablePostHog = (): void => {
 };
 
 export const initPostHog = (): void => {
-  const disabled = getSetting(DISALLOW_DIAGNOSTICS, false);
+  const disabled = getPersonalSetting<boolean>([
+    PERSONAL_KEYS.disableProductDiagnostics,
+  ]);
   if (!disabled) {
     doInitPostHog();
   }
diff --git a/apps/roam/src/utils/refreshConfigTree.ts b/apps/roam/src/utils/refreshConfigTree.ts
index 25e2ffa3f..606d8097c 100644
--- a/apps/roam/src/utils/refreshConfigTree.ts
+++ b/apps/roam/src/utils/refreshConfigTree.ts
@@ -5,7 +5,7 @@ import discourseConfigRef from "./discourseConfigRef";
 import registerDiscourseDatalogTranslators from "./registerDiscourseDatalogTranslators";
 import { unregisterDatalogTranslator } from "./conditionToDatalog";
 import type { PullBlock } from "roamjs-components/types/native";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 
 const getPagesStartingWithPrefix = (prefix: string) =>
   (
diff --git a/apps/roam/src/utils/registerCommandPaletteCommands.ts b/apps/roam/src/utils/registerCommandPaletteCommands.ts
index cba115539..8d365dc01 100644
--- a/apps/roam/src/utils/registerCommandPaletteCommands.ts
+++ b/apps/roam/src/utils/registerCommandPaletteCommands.ts
@@ -21,6 +21,14 @@ import {
 } from "./pageRefObserverHandlers";
 import { HIDE_METADATA_KEY } from "~/data/userSettings";
 import posthog from "posthog-js";
+import {
+  getPersonalSetting,
+  setPersonalSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  PERSONAL_KEYS,
+  QUERY_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
 export const registerCommandPaletteCommands = (onloadArgs: OnloadArgs) => {
   const { extensionAPI } = onloadArgs;
@@ -227,12 +235,13 @@ export const registerCommandPaletteCommands = (onloadArgs: OnloadArgs) => {
   };
 
   const toggleDiscourseContextOverlay = async () => {
-    const currentValue =
-      (extensionAPI.settings.get("discourse-context-overlay") as boolean) ??
-      false;
+    const currentValue = getPersonalSetting<boolean>([
+      PERSONAL_KEYS.discourseContextOverlay,
+    ]);
     const newValue = !currentValue;
     try {
       await extensionAPI.settings.set("discourse-context-overlay", newValue);
+      setPersonalSetting([PERSONAL_KEYS.discourseContextOverlay], newValue);
     } catch (error) {
       const e = error as Error;
       renderToast({
@@ -253,11 +262,17 @@ export const registerCommandPaletteCommands = (onloadArgs: OnloadArgs) => {
   };
 
   const toggleQueryMetadata = async () => {
-    const currentValue =
-      (extensionAPI.settings.get(HIDE_METADATA_KEY) as boolean) ?? true;
+    const currentValue = getPersonalSetting<boolean>([
+      PERSONAL_KEYS.query,
+      QUERY_KEYS.hideQueryMetadata,
+    ]);
     const newValue = !currentValue;
     try {
       await extensionAPI.settings.set(HIDE_METADATA_KEY, newValue);
+      setPersonalSetting(
+        [PERSONAL_KEYS.query, QUERY_KEYS.hideQueryMetadata],
+        newValue,
+      );
     } catch (error) {
       const e = error as Error;
       renderToast({
diff --git a/apps/roam/src/utils/registerSmartBlock.ts b/apps/roam/src/utils/registerSmartBlock.ts
index 002e2bb52..4e38d6f74 100644
--- a/apps/roam/src/utils/registerSmartBlock.ts
+++ b/apps/roam/src/utils/registerSmartBlock.ts
@@ -34,7 +34,7 @@ export const registerSmartBlock = (onloadArgs: OnloadArgs) => {
             }
           : { text: formatArg || "{text}", children: [], uid: "" };
         const queryRef = variables[arg] || arg;
-        const parentUid = resolveQueryBuilderRef({ queryRef, extensionAPI });
+        const parentUid = resolveQueryBuilderRef({ queryRef });
         return runQuery({
           parentUid,
           extensionAPI,
diff --git a/apps/roam/src/utils/renderNodeConfigPage.ts b/apps/roam/src/utils/renderNodeConfigPage.ts
deleted file mode 100644
index 0e5d223dc..000000000
--- a/apps/roam/src/utils/renderNodeConfigPage.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import React from "react";
-import CustomPanel from "roamjs-components/components/ConfigPanels/CustomPanel";
-import FlagPanel from "roamjs-components/components/ConfigPanels/FlagPanel";
-import SelectPanel from "roamjs-components/components/ConfigPanels/SelectPanel";
-import TextPanel from "roamjs-components/components/ConfigPanels/TextPanel";
-import BlocksPanel from "roamjs-components/components/ConfigPanels/BlocksPanel";
-
-import {
-  Field,
-  CustomField,
-  TextField,
-  SelectField,
-  FieldPanel,
-  FlagField,
-} from "roamjs-components/components/ConfigPanels/types";
-import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
-import { OnloadArgs } from "roamjs-components/types";
-import { getSubTree } from "roamjs-components/util";
-import {
-  DiscourseNodeIndex,
-  DiscourseNodeSpecification,
-  DiscourseNodeAttributes,
-  DiscourseNodeCanvasSettings,
-} from "~/components";
-import getDiscourseNodes from "~/utils/getDiscourseNodes";
-import { render as configPageRender } from "roamjs-components/components/ConfigPage";
-import DiscourseNodeSuggestiveRules from "~/components/settings/DiscourseNodeSuggestiveRules";
-
-export const DISCOURSE_CONFIG_PAGE_TITLE = "roam/js/discourse-graph";
-export const NODE_CONFIG_PAGE_TITLE = "discourse-graph/nodes/";
-
-export const renderNodeConfigPage = ({
-  title,
-  h1,
-  onloadArgs,
-}: {
-  title: string;
-  h1: HTMLHeadingElement;
-  onloadArgs: OnloadArgs;
-}) => {
-  const nodeText = title.substring("discourse-graph/nodes/".length);
-  const allNodes = getDiscourseNodes();
-  const node = allNodes.find(({ text }) => text === nodeText);
-  if (node) {
-    const renderNode = () =>
-      configPageRender({
-        h: h1,
-        title,
-        config: [
-          // @ts-ignore
-          {
-            title: "Index",
-            description: "Index of all of the pages in your graph of this type",
-            Panel: CustomPanel,
-            options: {
-              component: ({ uid }) =>
-                React.createElement(DiscourseNodeIndex, {
-                  node,
-                  parentUid: uid,
-                  onloadArgs,
-                }),
-            },
-          } as Field<CustomField>,
-          // @ts-ignore
-          {
-            title: "Format",
-            description: `DEPRECATED - Use specification instead. The format ${nodeText} pages should have.`,
-            defaultValue: "\\",
-            Panel: TextPanel,
-            options: {
-              placeholder: `Include "{content}" in format`,
-            },
-          } as Field<TextField>,
-          // @ts-ignore
-          {
-            title: "Specification",
-            description: `The conditions specified to identify a ${nodeText} node.`,
-            Panel: CustomPanel,
-            options: {
-              component: ({ uid }) =>
-                React.createElement(DiscourseNodeSpecification, {
-                  node,
-                  parentUid: uid,
-                }),
-            },
-          } as Field<CustomField>,
-          {
-            title: "Shortcut",
-            description: `The trigger to quickly create a ${nodeText} page from the node menu.`,
-            defaultValue: "\\",
-            // @ts-ignore
-            Panel: TextPanel,
-          },
-          {
-            title: "Tag",
-            description: `Designate a hashtag for marking potential ${nodeText}.`,
-            defaultValue: "",
-            // @ts-ignore
-            Panel: TextPanel,
-          },
-          {
-            title: "Description",
-            description: `Describing what the ${nodeText} node represents in your graph.`,
-            // @ts-ignore
-            Panel: TextPanel,
-          },
-          {
-            title: "Template",
-            description: `The template that auto fills ${nodeText} page when generated.`,
-            // @ts-ignore
-            Panel: BlocksPanel,
-          },
-          // @ts-ignore
-          {
-            title: "Attributes",
-            description: `A set of derived properties about the node based on queryable data.`,
-            Panel: CustomPanel,
-            options: {
-              component: DiscourseNodeAttributes,
-            },
-          } as Field<CustomField>,
-          // @ts-ignore
-          {
-            title: "Overlay",
-            description: `Select which attribute is used for the Discourse Overlay`,
-            Panel: SelectPanel,
-            options: {
-              items: () =>
-                getSubTree({
-                  parentUid: getPageUidByPageTitle(title),
-                  key: "Attributes",
-                }).children.map((c) => c.text),
-            },
-          } as Field<SelectField>,
-          // @ts-ignore
-          {
-            title: "Canvas",
-            description: `Various options for this node in the Discourse Canvas`,
-            Panel: CustomPanel,
-            options: {
-              component: DiscourseNodeCanvasSettings,
-            },
-          } as Field<CustomField>,
-          // @ts-ignore
-          {
-            title: "Graph Overview",
-            Panel: FlagPanel,
-            description: `Whether to color the node in the graph overview based on canvas color.  This is based on the node's plain title as described by a \`has title\` condition in its specification.`,
-            defaultValue: true,
-          } as FieldPanel<FlagField>,
-          // @ts-ignore
-          {
-            title: "Suggestive Rules",
-            Panel: CustomPanel,
-            options: {
-              component: ({ uid }) =>
-                React.createElement(DiscourseNodeSuggestiveRules, {
-                  node,
-                  parentUid: uid,
-                }),
-            },
-          } as Field<CustomField>,
-        ],
-      });
-
-    renderNode();
-  }
-};
diff --git a/apps/roam/src/utils/resolveQueryBuilderRef.ts b/apps/roam/src/utils/resolveQueryBuilderRef.ts
index b90bdd3f4..0f84218b6 100644
--- a/apps/roam/src/utils/resolveQueryBuilderRef.ts
+++ b/apps/roam/src/utils/resolveQueryBuilderRef.ts
@@ -1,24 +1,19 @@
 import isLiveBlock from "roamjs-components/queries/isLiveBlock";
 import extractRef from "roamjs-components/util/extractRef";
 import { getQueryPages } from "~/components/settings/QueryPagesPanel";
-import { OnloadArgs } from "roamjs-components/types";
 
-const resolveQueryBuilderRef = ({
-  queryRef,
-  extensionAPI,
-}: {
-  queryRef: string;
-  extensionAPI: OnloadArgs["extensionAPI"];
-}) => {
+const resolveQueryBuilderRef = ({ queryRef }: { queryRef: string }) => {
   const parentUid = isLiveBlock(extractRef(queryRef))
     ? extractRef(queryRef)
     : window.roamAlphaAPI.data.fast
         .q(
           `[:find ?uid :where [?b :block/uid ?uid] [or-join [?b] 
              [and [?b :block/string ?s] [[clojure.string/includes? ?s "{{query block:${queryRef}}}"]] ]
-             ${getQueryPages(extensionAPI).map(
-               (p) => `[and [?b :node/title "${p.replace(/\*/, queryRef)}"]]`,
-             )}
+             ${getQueryPages()
+               .map(
+                 (p) => `[and [?b :node/title "${p.replace(/\*/, queryRef)}"]]`,
+               )
+               .join("\n")}
               [and [?b :node/title "${queryRef}"]]
         ]]`,
         )[0]
diff --git a/apps/roam/src/utils/setQueryPages.ts b/apps/roam/src/utils/setQueryPages.ts
index f851879e5..cf5a8be13 100644
--- a/apps/roam/src/utils/setQueryPages.ts
+++ b/apps/roam/src/utils/setQueryPages.ts
@@ -1,18 +1,28 @@
 import { OnloadArgs } from "roamjs-components/types";
+import {
+  getPersonalSetting,
+  setPersonalSetting,
+} from "~/components/settings/utils/accessors";
+import {
+  PERSONAL_KEYS,
+  QUERY_KEYS,
+} from "~/components/settings/utils/settingKeys";
 
-export const setQueryPages = (onloadArgs: OnloadArgs) => {
-  const queryPages = onloadArgs.extensionAPI.settings.get("query-pages");
-  const queryPageArray = Array.isArray(queryPages)
-    ? queryPages
-    : typeof queryPages === "object"
-      ? []
-      : typeof queryPages === "string" && queryPages
-        ? [queryPages]
-        : [];
+export const setInitialQueryPages = (onloadArgs: OnloadArgs) => {
+  // Legacy extensionAPI stored query-pages as string | string[] | Record<string, string>.
+  // Coerce to string[] for backward compatibility with old stored formats.
+  const raw = getPersonalSetting<string[] | string | Record<string, string>>([
+    PERSONAL_KEYS.query,
+    QUERY_KEYS.queryPages,
+  ]);
+  const queryPageArray = Array.isArray(raw)
+    ? raw
+    : typeof raw === "string" && raw
+      ? [raw]
+      : [];
   if (!queryPageArray.includes("discourse-graph/queries/*")) {
-    onloadArgs.extensionAPI.settings.set("query-pages", [
-      ...queryPageArray,
-      "discourse-graph/queries/*",
-    ]);
+    const updated = [...queryPageArray, "discourse-graph/queries/*"];
+    void onloadArgs.extensionAPI.settings.set("query-pages", updated);
+    setPersonalSetting([PERSONAL_KEYS.query, QUERY_KEYS.queryPages], updated);
   }
 };
diff --git a/apps/roam/src/utils/supabaseContext.ts b/apps/roam/src/utils/supabaseContext.ts
index d962d210c..5c9d8fef0 100644
--- a/apps/roam/src/utils/supabaseContext.ts
+++ b/apps/roam/src/utils/supabaseContext.ts
@@ -3,7 +3,7 @@ import getCurrentUserDisplayName from "roamjs-components/queries/getCurrentUserD
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 
 import canonicalRoamUrl from "./canonicalRoamUrl";
-import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
+import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/data/constants";
 import getBlockProps from "~/utils/getBlockProps";
 import setBlockProps from "~/utils/setBlockProps";
 import type { Enums } from "@repo/database/dbTypes";