diff --git a/src/calendar-view/CalendarView.vue b/src/calendar-view/CalendarView.vue
index f0dd8f6..0ab5718 100644
--- a/src/calendar-view/CalendarView.vue
+++ b/src/calendar-view/CalendarView.vue
@@ -12,8 +12,12 @@ import CalendarMonthButton from "@/components/calendar/CalendarMonthButton.vue";
 import CalendarYearButton from "@/components/calendar/CalendarYearButton.vue";
 import CalendarQuarterButton from "@/components/calendar/CalendarQuarterButton.vue";
 import { ShelfSuggestModal } from "@/components/suggests/shelf-suggest";
-import { app$, plugin$ } from "@/stores/obsidian.store";
 import { useShelfProvider } from "@/composables/use-shelf";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
+
+const app = useApp();
+const plugin = usePlugin();
 
 const refDateMoment = ref(today());
 const refDate = computed(() => refDateMoment.value.format("YYYY-MM-DD"));
@@ -43,7 +47,7 @@ const weeksClickable = computed(() => {
 });
 
 function selectShelf() {
-  new ShelfSuggestModal(app$.value, Object.keys(pluginSettings$.value.shelves), (shelf: string | null) => {
+  new ShelfSuggestModal(app, Object.keys(pluginSettings$.value.shelves), (shelf: string | null) => {
     selectedShelf.value = shelf;
   }).open();
 }
@@ -58,19 +62,21 @@ function goToday(event: MouseEvent) {
   } else if (calendarViewSettings$.value.todayMode === "navigate") {
     const journals: string[] = [];
     for (const journalSetttings of journalsList$.value) {
-      const journal = plugin$.value.getJournal(journalSetttings.name);
+      const journal = plugin.getJournal(journalSetttings.name);
       if (!journal) continue;
       const anchorDate = journal.resolveAnchorDate(refDate.value);
       if (!anchorDate) continue;
-      const index = plugin$.value.index.getJournalIndex(journal.name);
+      const index = plugin.index.getJournalIndex(journal.name);
       if (!index) continue;
       if (index.get(anchorDate)) journals.push(journal.name);
     }
-    openDate(refDate.value, journals, event).catch(console.error);
+    openDate(app, plugin, refDate.value, journals, event).catch(console.error);
   }
 }
 function pickDate() {
   new VueModal(
+    app,
+    plugin,
     "Pick a date",
     DatePickerModal,
     {
@@ -85,6 +91,8 @@ function pickDate() {
 
 function openDay(date: string, event: MouseEvent) {
   openDate(
+    app,
+    plugin,
     date,
     journals.day.value.map((journal) => journal.name),
     event,
@@ -92,6 +100,8 @@ function openDay(date: string, event: MouseEvent) {
 }
 function openWeek(date: string, event: MouseEvent) {
   openDate(
+    app,
+    plugin,
     date,
     journals.week.value.map((journal) => journal.name),
     event,
@@ -99,6 +109,8 @@ function openWeek(date: string, event: MouseEvent) {
 }
 function openMonth(event: MouseEvent) {
   openDate(
+    app,
+    plugin,
     refDate.value,
     journals.month.value.map((journal) => journal.name),
     event,
@@ -106,6 +118,8 @@ function openMonth(event: MouseEvent) {
 }
 function openQuarter(event: MouseEvent) {
   openDate(
+    app,
+    plugin,
     refDate.value,
     journals.quarter.value.map((journal) => journal.name),
     event,
@@ -113,6 +127,8 @@ function openQuarter(event: MouseEvent) {
 }
 function openYear(event: MouseEvent) {
   openDate(
+    app,
+    plugin,
     refDate.value,
     journals.year.value.map((journal) => journal.name),
     event,
diff --git a/src/calendar-view/calendar-view.ts b/src/calendar-view/calendar-view.ts
index 1bc356b..e0729b8 100644
--- a/src/calendar-view/calendar-view.ts
+++ b/src/calendar-view/calendar-view.ts
@@ -1,12 +1,20 @@
-import { ItemView } from "obsidian";
+import { ItemView, type WorkspaceLeaf } from "obsidian";
 import { createApp, type App as VueApp } from "vue";
-import { CALENDAR_VIEW_TYPE } from "../constants";
+import { APP_KEY, CALENDAR_VIEW_TYPE, PLUGIN_KEY } from "../constants";
 import CalendarViewComponent from "./CalendarView.vue";
+import type { JournalPlugin } from "@/types/plugin.types";
 
 export class CalendarView extends ItemView {
   navigation = false;
   #vueApp: VueApp | null = null;
 
+  constructor(
+    leaf: WorkspaceLeaf,
+    private plugin: JournalPlugin,
+  ) {
+    super(leaf);
+  }
+
   getViewType(): string {
     return CALENDAR_VIEW_TYPE;
   }
@@ -20,6 +28,8 @@ export class CalendarView extends ItemView {
 
   protected onOpen(): Promise<void> {
     this.#vueApp = createApp(CalendarViewComponent);
+    this.#vueApp.provide(APP_KEY, this.app);
+    this.#vueApp.provide(PLUGIN_KEY, this.plugin);
     this.#vueApp.mount(this.contentEl);
     return Promise.resolve();
   }
diff --git a/src/code-blocks/navigation/NavigationBlock.vue b/src/code-blocks/navigation/NavigationBlock.vue
index a061aee..54fa87e 100644
--- a/src/code-blocks/navigation/NavigationBlock.vue
+++ b/src/code-blocks/navigation/NavigationBlock.vue
@@ -2,10 +2,11 @@
 import { computed } from "vue";
 import { journals$ } from "@/stores/settings.store";
 import NavigationBlockRow from "./NavigationBlockRow.vue";
-import { plugin$ } from "@/stores/obsidian.store";
 import { openDate, openDateInJournal } from "@/journals/open-date";
 import { useShelfProvider } from "@/composables/use-shelf";
-import { NavBlockRow } from "@/types/settings.types";
+import type { NavBlockRow } from "@/types/settings.types";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const props = defineProps<{
   refDate: string;
@@ -14,8 +15,11 @@ const props = defineProps<{
 
 defineEmits<(event: "move-up" | "move-down" | "edit" | "remove", index: number) => void>();
 
+const app = useApp();
+const plugin = usePlugin();
+
 const journalSettings = computed(() => journals$.value[props.journalName]);
-const journal = computed(() => plugin$.value.getJournal(props.journalName));
+const journal = computed(() => plugin.getJournal(props.journalName));
 const shelfName = computed(() => journalSettings.value?.shelves[0] ?? null);
 
 const { journals } = useShelfProvider(shelfName);
@@ -27,10 +31,10 @@ async function navigate(type: NavBlockRow["link"], date: string, journalName?: s
     if (metadata) await journal.value?.open(metadata);
   } else if (type === "journal") {
     if (!journalName) return;
-    await openDateInJournal(date, journalName);
+    await openDateInJournal(plugin, date, journalName);
   } else {
     const journalsToUse = journals[type].value.map((journal) => journal.name);
-    await openDate(date, journalsToUse);
+    await openDate(app, plugin, date, journalsToUse);
   }
 }
 </script>
diff --git a/src/code-blocks/navigation/NavigationBlockEditPreview.vue b/src/code-blocks/navigation/NavigationBlockEditPreview.vue
index f88e071..fad4e1b 100644
--- a/src/code-blocks/navigation/NavigationBlockEditPreview.vue
+++ b/src/code-blocks/navigation/NavigationBlockEditPreview.vue
@@ -3,7 +3,8 @@ import { computed } from "vue";
 import { journals$ } from "@/stores/settings.store";
 import NavigationBlockRow from "./NavigationBlockRow.vue";
 import ObsidianIconButton from "@/components/obsidian/ObsidianIconButton.vue";
-import { plugin$ } from "@/stores/obsidian.store";
+import { usePlugin } from "@/composables/use-plugin";
+import { useShelfProvider } from "@/composables/use-shelf";
 
 const props = defineProps<{
   refDate: string;
@@ -12,8 +13,12 @@ const props = defineProps<{
 
 defineEmits<(event: "move-up" | "move-down" | "edit" | "remove", index: number) => void>();
 
+const plugin = usePlugin();
+
 const journalSettings = computed(() => journals$.value[props.journalName]);
-const journal = computed(() => plugin$.value.getJournal(props.journalName));
+const journal = computed(() => plugin.getJournal(props.journalName));
+
+useShelfProvider(journalSettings.value?.shelves[0]);
 </script>
 
 <template>
diff --git a/src/code-blocks/navigation/NavigationCodeBlock.vue b/src/code-blocks/navigation/NavigationCodeBlock.vue
index 85bb6c8..116cf34 100644
--- a/src/code-blocks/navigation/NavigationCodeBlock.vue
+++ b/src/code-blocks/navigation/NavigationCodeBlock.vue
@@ -3,14 +3,15 @@ import { usePathData } from "@/composables/use-path-data";
 import { pluginSettings$ } from "@/stores/settings.store";
 import { computed } from "vue";
 import NavigationBlock from "./NavigationBlock.vue";
-import { plugin$ } from "@/stores/obsidian.store";
 import type { JournalMetadata } from "@/types/journal.types";
 import ObsidianIconButton from "@/components/obsidian/ObsidianIconButton.vue";
+import { usePlugin } from "@/composables/use-plugin";
 
 const props = defineProps<{
   path: string;
 }>();
 
+const plugin = usePlugin();
 const noteData = usePathData(props.path);
 
 const journalSettings = computed(() => {
@@ -24,7 +25,7 @@ const shouldNavigateExisting = computed(() => {
 
 const journal = computed(() => {
   if (!noteData.value) return null;
-  return plugin$.value.getJournal(noteData.value.journal);
+  return plugin.getJournal(noteData.value.journal);
 });
 const nextMetadata = computed<JournalMetadata | null>(() => {
   if (!noteData.value || !journal.value) return null;
diff --git a/src/code-blocks/navigation/nav-processor.ts b/src/code-blocks/navigation/nav-processor.ts
index adf81fe..1aa30e5 100644
--- a/src/code-blocks/navigation/nav-processor.ts
+++ b/src/code-blocks/navigation/nav-processor.ts
@@ -1,24 +1,29 @@
-import { MarkdownRenderChild } from "obsidian";
+import { type App, MarkdownRenderChild } from "obsidian";
 import { createApp, type App as VueApp } from "vue";
 import NavigationCodeBlock from "./NavigationCodeBlock.vue";
+import type { JournalPlugin } from "@/types/plugin.types";
+import { APP_KEY, PLUGIN_KEY } from "@/constants";
 
 export class NavCodeBlockProcessor extends MarkdownRenderChild {
   private _vueApp: VueApp | undefined;
-  private mode: string | undefined;
 
   constructor(
+    app: App,
+    plugin: JournalPlugin,
     containerElement: HTMLElement,
     private source: string,
     private path: string,
   ) {
     super(containerElement);
-    this.init();
+    this.init(app, plugin);
   }
 
-  init(): void {
+  init(app: App, plugin: JournalPlugin): void {
     this._vueApp = createApp(NavigationCodeBlock, {
       path: this.path,
     });
+    this._vueApp.provide(APP_KEY, app);
+    this._vueApp.provide(PLUGIN_KEY, plugin);
     this._vueApp.mount(this.containerEl);
   }
 
diff --git a/src/code-blocks/timeline/timeline-processor.ts b/src/code-blocks/timeline/timeline-processor.ts
index 04b99b3..8e89286 100644
--- a/src/code-blocks/timeline/timeline-processor.ts
+++ b/src/code-blocks/timeline/timeline-processor.ts
@@ -1,21 +1,25 @@
-import { MarkdownRenderChild } from "obsidian";
+import { type App, MarkdownRenderChild } from "obsidian";
 import { createApp, type App as VueApp } from "vue";
 import TimelineCodeBlock from "./TimelineCodeBlock.vue";
+import type { JournalPlugin } from "@/types/plugin.types";
+import { APP_KEY, PLUGIN_KEY } from "@/constants";
 
 export class TimelineCodeBlockProcessor extends MarkdownRenderChild {
   private _vueApp: VueApp | undefined;
   private mode: string | undefined;
 
   constructor(
+    app: App,
+    plugin: JournalPlugin,
     containerElement: HTMLElement,
     private source: string,
     private path: string,
   ) {
     super(containerElement);
-    this.init();
+    this.init(app, plugin);
   }
 
-  init(): void {
+  init(app: App, plugin: JournalPlugin): void {
     const lines = this.source.split("\n");
     for (const line of lines) {
       const [key, value] = line.split(":");
@@ -27,6 +31,8 @@ export class TimelineCodeBlockProcessor extends MarkdownRenderChild {
       mode: this.mode,
       path: this.path,
     });
+    this._vueApp.provide(APP_KEY, app);
+    this._vueApp.provide(PLUGIN_KEY, plugin);
     this._vueApp.mount(this.containerEl);
   }
 
diff --git a/src/components/DatePicker.vue b/src/components/DatePicker.vue
index dd4a8c7..921aa15 100644
--- a/src/components/DatePicker.vue
+++ b/src/components/DatePicker.vue
@@ -5,6 +5,8 @@ import { VueModal } from "./modals/vue-modal";
 import ObsidianButton from "./obsidian/ObsidianButton.vue";
 import ObsidianIcon from "./obsidian/ObsidianIcon.vue";
 import DatePickerModal from "./modals/DatePicker.modal.vue";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const props = withDefaults(
   defineProps<{
@@ -22,6 +24,9 @@ const props = withDefaults(
   },
 );
 
+const app = useApp();
+const plugin = usePlugin();
+
 const model = defineModel<string>();
 const momentDate = computed(() => {
   if (model.value) {
@@ -38,6 +43,8 @@ const formattedDate = computed(() => {
 
 function openPickerModal() {
   new VueModal(
+    app,
+    plugin,
     "Pick a date",
     DatePickerModal,
     {
diff --git a/src/components/FolderInput.vue b/src/components/FolderInput.vue
index de43195..9f0785a 100644
--- a/src/components/FolderInput.vue
+++ b/src/components/FolderInput.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { onBeforeUnmount, onMounted, ref } from "vue";
 import { FolderSuggest } from "./suggests/folder-suggest";
+import { useApp } from "@/composables/use-app";
 
 defineProps<{
   placeholder?: string;
@@ -8,11 +9,12 @@ defineProps<{
 }>();
 const model = defineModel<string>();
 const element = ref<HTMLInputElement>();
+const app = useApp();
 
 let suggest: FolderSuggest;
 onMounted(() => {
   if (element.value) {
-    suggest = new FolderSuggest(element.value);
+    suggest = new FolderSuggest(app, element.value);
   }
 });
 onBeforeUnmount(() => {
diff --git a/src/components/IconSelector.vue b/src/components/IconSelector.vue
index 890d02f..d23af4e 100644
--- a/src/components/IconSelector.vue
+++ b/src/components/IconSelector.vue
@@ -3,6 +3,7 @@ import { onMounted, ref } from "vue";
 import { IconSuggest } from "./suggests/icon-suggest";
 import ObsidianIcon from "./obsidian/ObsidianIcon.vue";
 import ObsidianTextInput from "./obsidian/ObsidianTextInput.vue";
+import { useApp } from "@/composables/use-app";
 
 defineProps<{
   placeholder?: string;
@@ -14,9 +15,11 @@ defineEmits<{
 const model = defineModel<string>();
 const inputCmp = ref<InstanceType<typeof ObsidianTextInput>>();
 
+const app = useApp();
+
 onMounted(() => {
   if (inputCmp.value) {
-    new IconSuggest(inputCmp.value.$el);
+    new IconSuggest(app, inputCmp.value.$el);
   }
 });
 </script>
diff --git a/src/components/VariableReferenceHint.vue b/src/components/VariableReferenceHint.vue
index 80fa497..099c481 100644
--- a/src/components/VariableReferenceHint.vue
+++ b/src/components/VariableReferenceHint.vue
@@ -2,14 +2,19 @@
 import { VueModal } from "./modals/vue-modal";
 import VariableReference from "./modals/VariableReference.modal.vue";
 import type { JournalSettings } from "../types/settings.types";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const props = defineProps<{
   type: JournalSettings["write"]["type"];
   dateFormat: string;
 }>();
 
+const app = useApp();
+const plugin = usePlugin();
+
 function show() {
-  new VueModal("Variable reference", VariableReference, {
+  new VueModal(app, plugin, "Variable reference", VariableReference, {
     type: props.type,
     dateFormat: props.dateFormat,
   }).open();
diff --git a/src/components/modals/ConnectNote.modal.vue b/src/components/modals/ConnectNote.modal.vue
index ba54839..6fefd80 100644
--- a/src/components/modals/ConnectNote.modal.vue
+++ b/src/components/modals/ConnectNote.modal.vue
@@ -4,7 +4,6 @@ import { usePathData } from "@/composables/use-path-data";
 import ObsidianSetting from "../obsidian/ObsidianSetting.vue";
 import ObsidianButton from "../obsidian/ObsidianButton.vue";
 import ObsidianDropdown from "../obsidian/ObsidianDropdown.vue";
-import { plugin$ } from "@/stores/obsidian.store";
 import { journalsList$ } from "@/stores/settings.store";
 import { useForm } from "vee-validate";
 import * as v from "valibot";
@@ -15,12 +14,16 @@ import ObsidianToggle from "../obsidian/ObsidianToggle.vue";
 import { computed, watch } from "vue";
 import type { JournalMetadata } from "@/types/journal.types";
 import { disconnectNote } from "@/utils/journals";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const props = defineProps<{
   file: TFile;
 }>();
 const emit = defineEmits(["close"]);
 
+const app = useApp();
+const plugin = usePlugin();
 const noteData = usePathData(props.file.path);
 
 const { defineField, errorBag, handleSubmit } = useForm({
@@ -56,7 +59,7 @@ watch(refDate, () => {
 
 const journal = computed(() => {
   if (!journalName.value) return null;
-  return plugin$.value.getJournal(journalName.value);
+  return plugin.getJournal(journalName.value);
 });
 const anchorDate = computed(() => {
   if (!journal.value) return null;
@@ -73,7 +76,7 @@ const existingNote = computed(() => {
   if (!journal.value) return null;
   if (!refDate.value) return null;
   if (!anchorDate.value) return null;
-  return plugin$.value.index.get(journal.value.name, anchorDate.value);
+  return plugin.index.get(journal.value.name, anchorDate.value);
 });
 
 const notePath = computed(() => {
@@ -102,7 +105,7 @@ const canSubmit = computed(() => {
 });
 
 function disconnect() {
-  disconnectNote(props.file.path).catch(console.error);
+  disconnectNote(app, props.file.path).catch(console.error);
 }
 const onSubmit = handleSubmit(() => {
   if (!canSubmit.value) return;
diff --git a/src/components/modals/bulk-add-notes/ConfigureBulkAddNotes.vue b/src/components/modals/bulk-add-notes/ConfigureBulkAddNotes.vue
index 1e9cda0..c1aecf7 100644
--- a/src/components/modals/bulk-add-notes/ConfigureBulkAddNotes.vue
+++ b/src/components/modals/bulk-add-notes/ConfigureBulkAddNotes.vue
@@ -160,7 +160,7 @@ const onSubmit = handleSubmit(() => {
     />
 
     <ObsidianSetting name="If other note with same date existits in journal">
-      <ObsidianDropdown v-model="existingNote" v-binf="existingNoteAttrs">
+      <ObsidianDropdown v-model="existingNote" v-bind="existingNoteAttrs">
         <option value="skip">Skip note</option>
         <option value="override">Override date connection</option>
         <option value="merge">Merge note content into existing one</option>
diff --git a/src/components/modals/bulk-add-notes/bulk-add-note-utils.ts b/src/components/modals/bulk-add-notes/bulk-add-note-utils.ts
index dcbe879..85d9873 100644
--- a/src/components/modals/bulk-add-notes/bulk-add-note-utils.ts
+++ b/src/components/modals/bulk-add-notes/bulk-add-note-utils.ts
@@ -1,6 +1,5 @@
 import { TFile, TFolder } from "obsidian";
 import type { BulkAddPrams, NoteDataForProcessing } from "./bulk-add-notes.types";
-import { app$, plugin$ } from "@/stores/obsidian.store";
 import type { Journal } from "@/journals/journal";
 import { formatToRegexp } from "@/utils/moment";
 import { date_from_string } from "@/calendar";
@@ -11,9 +10,14 @@ import type {
   JournalDecorationTitleCondition,
 } from "@/types/settings.types";
 import { checkExhaustive } from "@/utils/types";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
+
+const app = useApp();
+const plugin = usePlugin();
 
 export function buildNotesList(folderPath: string): TFile[] {
-  const folder = app$.value.vault.getFolderByPath(folderPath ?? "/");
+  const folder = app.vault.getFolderByPath(folderPath ?? "/");
   if (!folder) {
     throw new Error(`Folder ${folderPath} not found`);
   }
@@ -42,7 +46,7 @@ export function preprocessNotes(journal: Journal, notes: TFile[], parameters: Bu
       operations: [],
     };
     data.push(noteData);
-    const existing = plugin$.value.index.getForPath(note.path);
+    const existing = plugin.index.getForPath(note.path);
     if (existing) {
       noteData.operations.push({
         type: "skiping",
@@ -61,7 +65,7 @@ export function preprocessNotes(journal: Journal, notes: TFile[], parameters: Bu
     const dateString: string | undefined =
       parameters.date_place === "title"
         ? note.basename
-        : app$.value.metadataCache.getFileCache(note)?.frontmatter?.[parameters.property_name];
+        : app.metadataCache.getFileCache(note)?.frontmatter?.[parameters.property_name];
     if (dateString === undefined) {
       noteData.operations.push({
         type: "skiping",
@@ -96,7 +100,7 @@ export function preprocessNotes(journal: Journal, notes: TFile[], parameters: Bu
     if ("path" in metadata && metadata.path) {
       noteData.operations.push({
         type: "existing_note",
-        other_file: app$.value.vault.getAbstractFileByPath(metadata.path) as TFile,
+        other_file: app.vault.getAbstractFileByPath(metadata.path) as TFile,
         desision: parameters.existing_note,
       });
     }
@@ -127,7 +131,7 @@ function checkFilters(note: TFile, combinator: BulkAddPrams["filter_combinator"]
 }
 
 function checkFilter(note: TFile, filter: GenericConditions) {
-  const metadata = app$.value.metadataCache.getFileCache(note);
+  const metadata = app.metadataCache.getFileCache(note);
   if (!metadata) return false;
   switch (filter.type) {
     case "title": {
@@ -161,7 +165,7 @@ function checkNameFilter(note: TFile, filter: JournalDecorationTitleCondition) {
 }
 
 function checkTagFilter(note: TFile, filter: JournalDecorationTagCondition) {
-  const metadata = app$.value.metadataCache.getFileCache(note);
+  const metadata = app.metadataCache.getFileCache(note);
   if (!metadata) return false;
   if (!metadata.tags) return false;
   switch (filter.condition) {
@@ -181,7 +185,7 @@ function checkTagFilter(note: TFile, filter: JournalDecorationTagCondition) {
 }
 
 function checkPropertyFilter(note: TFile, filter: JournalDecorationPropertyCondition) {
-  const metadata = app$.value.metadataCache.getFileCache(note);
+  const metadata = app.metadataCache.getFileCache(note);
   if (!metadata) return false;
   const propertyValue = metadata.frontmatter?.[filter.name];
   switch (filter.condition) {
diff --git a/src/components/modals/vue-modal.ts b/src/components/modals/vue-modal.ts
index 54e6e5d..0e03b37 100644
--- a/src/components/modals/vue-modal.ts
+++ b/src/components/modals/vue-modal.ts
@@ -1,17 +1,20 @@
-import { Modal } from "obsidian";
+import { type App, Modal } from "obsidian";
 import { type Component, createApp, type App as VueApp } from "vue";
-import { app$, plugin$ } from "../../stores/obsidian.store";
+import type { JournalPlugin } from "@/types/plugin.types";
+import { APP_KEY, PLUGIN_KEY } from "@/constants";
 
 export class VueModal extends Modal {
   private _vueApp: VueApp | undefined;
   constructor(
+    app: App,
+    private plugin: JournalPlugin,
     private title: string,
     private component: Component,
     private componentProps: Record<string, unknown> = {},
     private customWidth?: number,
   ) {
-    super(app$.value);
-    plugin$.value.register(() => {
+    super(app);
+    plugin.register(() => {
       this.close();
     });
   }
@@ -29,6 +32,8 @@ export class VueModal extends Modal {
       },
       ...this.componentProps,
     });
+    this._vueApp.provide(APP_KEY, this.app);
+    this._vueApp.provide(PLUGIN_KEY, this.plugin);
     this._vueApp.mount(this.contentEl);
   }
 
diff --git a/src/components/suggests/folder-suggest.ts b/src/components/suggests/folder-suggest.ts
index b62ba2f..b1a8bc1 100644
--- a/src/components/suggests/folder-suggest.ts
+++ b/src/components/suggests/folder-suggest.ts
@@ -1,9 +1,11 @@
-import { AbstractInputSuggest, TFolder } from "obsidian";
-import { app$ } from "../../stores/obsidian.store";
+import { AbstractInputSuggest, type App, TFolder } from "obsidian";
 
 export class FolderSuggest extends AbstractInputSuggest<TFolder> {
-  constructor(protected textInputElement: HTMLInputElement) {
-    super(app$.value, textInputElement);
+  constructor(
+    app: App,
+    protected textInputElement: HTMLInputElement,
+  ) {
+    super(app, textInputElement);
   }
 
   getSuggestions(input: string): TFolder[] {
diff --git a/src/components/suggests/icon-suggest.ts b/src/components/suggests/icon-suggest.ts
index 9e6c35b..5d80fcf 100644
--- a/src/components/suggests/icon-suggest.ts
+++ b/src/components/suggests/icon-suggest.ts
@@ -1,9 +1,11 @@
-import { AbstractInputSuggest, getIcon, getIconIds } from "obsidian";
-import { app$ } from "../../stores/obsidian.store";
+import { AbstractInputSuggest, type App, getIcon, getIconIds } from "obsidian";
 
 export class IconSuggest extends AbstractInputSuggest<string> {
-  constructor(protected textInputElement: HTMLInputElement) {
-    super(app$.value, textInputElement);
+  constructor(
+    app: App,
+    protected textInputElement: HTMLInputElement,
+  ) {
+    super(app, textInputElement);
   }
 
   getSuggestions(input: string): string[] {
diff --git a/src/composables/use-app.ts b/src/composables/use-app.ts
new file mode 100644
index 0000000..f1c14e2
--- /dev/null
+++ b/src/composables/use-app.ts
@@ -0,0 +1,9 @@
+import { APP_KEY } from "@/constants";
+import type { App } from "obsidian";
+import { inject } from "vue";
+
+export function useApp(): App {
+  const app = inject(APP_KEY);
+  if (!app) throw new Error("App not provided or composable used outside of vue context");
+  return app;
+}
diff --git a/src/composables/use-journal-date.ts b/src/composables/use-journal-date.ts
index 3ee3c9d..1b27c5b 100644
--- a/src/composables/use-journal-date.ts
+++ b/src/composables/use-journal-date.ts
@@ -1,12 +1,13 @@
 import type { MomentDate } from "@/types/date.types";
 import { computed, toRef, type MaybeRefOrGetter } from "vue";
 import { useJournal } from "./use-journal";
-import { plugin$ } from "@/stores/obsidian.store";
 import type { JournalNoteData } from "@/types/journal.types";
+import { usePlugin } from "./use-plugin";
 
 export function useJournalDate(date: MaybeRefOrGetter<MomentDate>, journalName: MaybeRefOrGetter<string>) {
   const _date = toRef(date);
   const _journalName = toRef(journalName);
+  const plugin = usePlugin();
   const journal = useJournal(_journalName);
   const anchorDate = computed(() => {
     if (journal.value) {
@@ -19,7 +20,7 @@ export function useJournalDate(date: MaybeRefOrGetter<MomentDate>, journalName:
     noteData: computed<JournalNoteData | null>(() => {
       if (!journal.value) return null;
       if (!anchorDate.value) return null;
-      return plugin$.value.index.get(journal.value.name, anchorDate.value);
+      return plugin.index.get(journal.value.name, anchorDate.value);
     }),
   };
 }
diff --git a/src/composables/use-journal-index.ts b/src/composables/use-journal-index.ts
index 2b91233..97c21c8 100644
--- a/src/composables/use-journal-index.ts
+++ b/src/composables/use-journal-index.ts
@@ -1,6 +1,6 @@
 import type { JournalIndex } from "@/journals/journal-index";
-import { plugin$ } from "@/stores/obsidian.store";
+import { usePlugin } from "./use-plugin";
 
 export function useJournalIndex(journalName: string): JournalIndex {
-  return plugin$.value.index.getJournalIndex(journalName);
+  return usePlugin().index.getJournalIndex(journalName);
 }
diff --git a/src/composables/use-journal.ts b/src/composables/use-journal.ts
index 9b0d89c..44cf782 100644
--- a/src/composables/use-journal.ts
+++ b/src/composables/use-journal.ts
@@ -1,10 +1,11 @@
 import type { Journal } from "@/journals/journal";
-import { plugin$ } from "@/stores/obsidian.store";
 import { computed, toRef, type ComputedRef, type MaybeRefOrGetter } from "vue";
+import { usePlugin } from "./use-plugin";
 
 export function useJournal(journalName: MaybeRefOrGetter<string>): ComputedRef<Journal | undefined> {
+  const plugin = usePlugin();
   const _journalName = toRef(journalName);
   return computed(() => {
-    return plugin$.value.getJournal(_journalName.value);
+    return plugin.getJournal(_journalName.value);
   });
 }
diff --git a/src/composables/use-path-data.ts b/src/composables/use-path-data.ts
index 2c357b4..c2e1c4d 100644
--- a/src/composables/use-path-data.ts
+++ b/src/composables/use-path-data.ts
@@ -1,13 +1,14 @@
-import { plugin$ } from "@/stores/obsidian.store";
 import type { JournalNoteData } from "@/types/journal.types";
 import { computed, toRef, type ComputedRef, type MaybeRefOrGetter } from "vue";
+import { usePlugin } from "./use-plugin";
 
 export function usePathData(path: MaybeRefOrGetter<string>): ComputedRef<JournalNoteData | null> {
   const _path = toRef(path);
+  const plugin = usePlugin();
 
   return computed(() => {
     const path = _path.value;
     if (!path) return null;
-    return plugin$.value.index.getForPathComputed(path).value;
+    return plugin.index.getForPathComputed(path).value;
   });
 }
diff --git a/src/composables/use-plugin.ts b/src/composables/use-plugin.ts
new file mode 100644
index 0000000..0fd76f7
--- /dev/null
+++ b/src/composables/use-plugin.ts
@@ -0,0 +1,9 @@
+import { PLUGIN_KEY } from "@/constants";
+import type { JournalPlugin } from "@/types/plugin.types";
+import { inject } from "vue";
+
+export function usePlugin(): JournalPlugin {
+  const plugin = inject(PLUGIN_KEY);
+  if (!plugin) throw new Error("Plugin not provided or composable used outside of vue context");
+  return plugin;
+}
diff --git a/src/constants.ts b/src/constants.ts
index 4121ce0..43eb7e0 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,5 +1,7 @@
+import type { App } from "obsidian";
 import { type InjectionKey } from "vue";
 import type { ProvidedShelfData } from "./types/provided-data.types";
+import type { JournalPlugin } from "./types/plugin.types";
 
 export const CALENDAR_VIEW_TYPE = "journal-calendar";
 
@@ -9,4 +11,6 @@ export const FRONTMATTER_DATE_KEY = "journal-date";
 export const FRONTMATTER_END_DATE_KEY = "journal-end-date";
 export const FRONTMATTER_INDEX_KEY = "journal-index";
 
+export const APP_KEY = Symbol() as InjectionKey<App>;
+export const PLUGIN_KEY = Symbol() as InjectionKey<JournalPlugin>;
 export const SHELF_DATA_KEY = Symbol() as InjectionKey<ProvidedShelfData>;
diff --git a/src/journals/custom-interval.ts b/src/journals/custom-interval.ts
index 5cfa192..4e512be 100644
--- a/src/journals/custom-interval.ts
+++ b/src/journals/custom-interval.ts
@@ -4,13 +4,14 @@ import { JournalAnchorDate, type AnchorDateResolver } from "../types/journal.typ
 import type { ComputedRef } from "vue";
 import { useJournalIndex } from "@/composables/use-journal-index";
 import { date_from_string, today } from "@/calendar";
-import { plugin$ } from "@/stores/obsidian.store";
 import { FRONTMATTER_DATE_FORMAT } from "@/constants";
+import type { JournalPlugin } from "@/types/plugin.types";
 
 export class CustomIntervalResolver implements AnchorDateResolver {
   #settings: ComputedRef<WriteCustom>;
 
   constructor(
+    private plugin: JournalPlugin,
     private journalName: string,
     settings: ComputedRef<WriteCustom>,
   ) {
@@ -44,7 +45,7 @@ export class CustomIntervalResolver implements AnchorDateResolver {
     return anchorDate;
   }
   resolveEndDate(anchorDate: JournalAnchorDate): string {
-    const existing = plugin$.value.index.get(this.journalName, anchorDate);
+    const existing = this.plugin.index.get(this.journalName, anchorDate);
     if (existing?.end_date) {
       return existing.end_date;
     }
@@ -124,7 +125,7 @@ export class CustomIntervalResolver implements AnchorDateResolver {
   #resolveDateAfterKnown(date: JournalAnchorDate): JournalAnchorDate | null {
     let current = date_from_string(date);
     while (current.isBefore(date, "day")) {
-      const existing = plugin$.value.index.get(this.journalName, JournalAnchorDate(current.format("YYYY-MM-DD")));
+      const existing = this.plugin.index.get(this.journalName, JournalAnchorDate(current.format("YYYY-MM-DD")));
       if (existing?.end_date) {
         current = date_from_string(existing.end_date).add(1, "day");
       } else {
diff --git a/src/journals/journal.ts b/src/journals/journal.ts
index 28b4022..4a6baa1 100644
--- a/src/journals/journal.ts
+++ b/src/journals/journal.ts
@@ -2,8 +2,8 @@ import { computed, type ComputedRef } from "vue";
 import { journals$ } from "../stores/settings.store";
 import type { JournalCommand, JournalSettings, WriteCustom } from "../types/settings.types";
 import type { AnchorDateResolver, JournalAnchorDate, JournalMetadata, JournalNoteData } from "../types/journal.types";
-import { activeNote$, app$, plugin$ } from "../stores/obsidian.store";
-import { normalizePath, TFile, type LeftRibbon } from "obsidian";
+import { activeNote$ } from "../stores/obsidian.store";
+import { type App, normalizePath, TFile, type LeftRibbon } from "obsidian";
 import { ensureFolderExists } from "../utils/io";
 import { replaceTemplateVariables, tryApplyingTemplater } from "../utils/template";
 import type { TemplateContext } from "../types/template.types";
@@ -21,18 +21,24 @@ import ConfirmNoteCreationModal from "@/components/modals/ConfirmNoteCreation.mo
 import type { MomentDate } from "@/types/date.types";
 import { disconnectNote } from "@/utils/journals";
 import { CustomIntervalResolver } from "./custom-interval";
+import type { JournalPlugin } from "@/types/plugin.types";
 
 export class Journal {
   readonly name$: ComputedRef<string>;
   #config: ComputedRef<JournalSettings>;
   #anchorDateResolver: AnchorDateResolver;
 
-  constructor(public readonly name: string) {
+  constructor(
+    public readonly name: string,
+    private plugin: JournalPlugin,
+    private app: App,
+  ) {
     this.#config = computed(() => journals$.value[name]);
     this.name$ = computed(() => this.#config.value.name);
     this.#anchorDateResolver =
       this.#config.value.write.type === "custom"
         ? new CustomIntervalResolver(
+            this.plugin,
             this.name$.value,
             computed(() => this.#config.value.write) as ComputedRef<WriteCustom>,
           )
@@ -49,7 +55,7 @@ export class Journal {
 
   registerCommands(): void {
     for (const command of this.#config.value.commands) {
-      plugin$.value.addCommand({
+      this.plugin.addCommand({
         id: this.name + ":" + command.name,
         name: `${this.#config.value.name}: ${command.name}`,
         icon: command.icon,
@@ -64,7 +70,7 @@ export class Journal {
       });
       if (command.showInRibbon) {
         const ribbonId = "journals:" + this.name + ":" + command.name;
-        const item = (app$.value.workspace.leftRibbon as LeftRibbon).addRibbonItemButton(
+        const item = (this.app.workspace.leftRibbon as LeftRibbon).addRibbonItemButton(
           ribbonId,
           command.icon,
           command.name,
@@ -73,8 +79,8 @@ export class Journal {
             this.#execCommand(command).catch(console.error);
           },
         );
-        plugin$.value.register(() => {
-          (app$.value.workspace.leftRibbon as LeftRibbon).removeRibbonAction(ribbonId);
+        this.plugin.register(() => {
+          (this.app.workspace.leftRibbon as LeftRibbon).removeRibbonAction(ribbonId);
           // eslint-disable-next-line @typescript-eslint/no-unsafe-call
           item.detach();
         });
@@ -85,7 +91,7 @@ export class Journal {
   get(date: string): JournalNoteData | JournalMetadata | null {
     const anchorDate = this.#anchorDateResolver.resolveForDate(date);
     if (!anchorDate) return null;
-    const metadata = plugin$.value.index.get(this.name, anchorDate);
+    const metadata = this.plugin.index.get(this.name, anchorDate);
     if (metadata) return metadata;
     if (!this.#checkBounds(anchorDate)) return null;
     return this.#buildMetadata(anchorDate);
@@ -95,12 +101,12 @@ export class Journal {
     const anchorDate = this.#anchorDateResolver.resolveForDate(date);
     if (!anchorDate) return null;
     if (existing) {
-      const nextExstingMetadata = plugin$.value.index.findNext(this.name, anchorDate);
+      const nextExstingMetadata = this.plugin.index.findNext(this.name, anchorDate);
       if (nextExstingMetadata) return nextExstingMetadata;
     }
     const nextAnchorDate = this.#anchorDateResolver.resolveNext(anchorDate);
     if (!nextAnchorDate) return null;
-    const nextMetadata = plugin$.value.index.get(this.name, nextAnchorDate);
+    const nextMetadata = this.plugin.index.get(this.name, nextAnchorDate);
     if (nextMetadata) return nextMetadata;
     if (!this.#checkBounds(nextAnchorDate)) return null;
     return this.#buildMetadata(nextAnchorDate);
@@ -110,12 +116,12 @@ export class Journal {
     const anchorDate = this.#anchorDateResolver.resolveForDate(date);
     if (!anchorDate) return null;
     if (existing) {
-      const previousExstingMetadata = plugin$.value.index.findPrevious(this.name, anchorDate);
+      const previousExstingMetadata = this.plugin.index.findPrevious(this.name, anchorDate);
       if (previousExstingMetadata) return previousExstingMetadata;
     }
     const previousAnchorDate = this.#anchorDateResolver.resolvePrevious(anchorDate);
     if (!previousAnchorDate) return null;
-    const previousMetadata = plugin$.value.index.get(this.name, previousAnchorDate);
+    const previousMetadata = this.plugin.index.get(this.name, previousAnchorDate);
     if (previousMetadata) return previousMetadata;
     if (!this.#checkBounds(previousAnchorDate)) return null;
     return this.#buildMetadata(previousAnchorDate);
@@ -143,26 +149,26 @@ export class Journal {
 
   async #openFile(file: TFile): Promise<void> {
     const mode = this.#config.value.openMode === "active" ? undefined : this.#config.value.openMode;
-    const leaf = app$.value.workspace.getLeaf(mode);
+    const leaf = this.app.workspace.getLeaf(mode);
     await leaf.openFile(file, { active: true });
   }
 
   async #ensureNote(metadata: JournalMetadata): Promise<TFile | null> {
     const filePath = this.getNotePath(metadata);
-    let file = app$.value.vault.getAbstractFileByPath(filePath);
+    let file = this.app.vault.getAbstractFileByPath(filePath);
     if (!file) {
       const templateContext = this.#getTemplateContext(metadata);
       const noteName = replaceTemplateVariables(this.#config.value.nameTemplate, templateContext);
       if (this.#config.value.confirmCreation && !(await this.#confirmNoteCreation(noteName))) {
         return null;
       }
-      await ensureFolderExists(app$.value, filePath);
-      file = await app$.value.vault.create(filePath, "");
+      await ensureFolderExists(this.app, filePath);
+      file = await this.app.vault.create(filePath, "");
       if (!(file instanceof TFile)) throw new Error("File is not a TFile");
 
       templateContext.note_name = { type: "string", value: noteName };
       const content = await this.#getNoteContent(file, templateContext);
-      if (content) await app$.value.vault.modify(file, content);
+      if (content) await this.app.vault.modify(file, content);
     }
     if (!(file instanceof TFile)) throw new Error("File is not a TFile");
     await this.#ensureFrontMatter(file, metadata);
@@ -172,6 +178,8 @@ export class Journal {
   #confirmNoteCreation(noteName: string): Promise<boolean> {
     return new Promise((resolve) => {
       const modal = new VueModal(
+        this.app,
+        this.plugin,
         "Confirm note creation",
         ConfirmNoteCreationModal,
         {
@@ -220,7 +228,7 @@ export class Journal {
     if (!metadata) return false;
     if ("path" in metadata) {
       if (!options.override) return false;
-      await disconnectNote(metadata.path);
+      await disconnectNote(this.app, metadata.path);
     }
     let path = file.path;
     if (options.rename || options.move) {
@@ -228,9 +236,9 @@ export class Journal {
       const folderPath = options.move ? configuredFolder : file.parent?.path;
       const filename = options.rename ? configuredFilename : file.name;
       path = normalizePath(folderPath ? `${folderPath}/${filename}` : filename);
-      await ensureFolderExists(app$.value, path);
-      await app$.value.vault.rename(file, path);
-      file = app$.value.vault.getAbstractFileByPath(path) as TFile;
+      await ensureFolderExists(this.app, path);
+      await this.app.vault.rename(file, path);
+      file = this.app.vault.getAbstractFileByPath(path) as TFile;
     }
 
     await this.#ensureFrontMatter(file, metadata);
@@ -269,22 +277,17 @@ export class Journal {
     if (this.#config.value.templates.length > 0) {
       for (const template of this.#config.value.templates) {
         const path = replaceTemplateVariables(template.endsWith(".md") ? template : template + ".md", context);
-        const templateFile = app$.value.vault.getAbstractFileByPath(path);
+        const templateFile = this.app.vault.getAbstractFileByPath(path);
         if (templateFile instanceof TFile) {
-          const templateContent = await app$.value.vault.cachedRead(templateFile);
-          return tryApplyingTemplater(
-            app$.value,
-            templateFile,
-            note,
-            replaceTemplateVariables(templateContent, context),
-          );
+          const templateContent = await this.app.vault.cachedRead(templateFile);
+          return tryApplyingTemplater(this.app, templateFile, note, replaceTemplateVariables(templateContent, context));
         }
       }
     }
     return "";
   }
   async #ensureFrontMatter(note: TFile, metadata: JournalMetadata): Promise<void> {
-    await app$.value.fileManager.processFrontMatter(note, (frontmatter: Record<string, string | number>) => {
+    await this.app.fileManager.processFrontMatter(note, (frontmatter: Record<string, string | number>) => {
       frontmatter[FRONTMATTER_NAME_KEY] = this.name;
       frontmatter[FRONTMATTER_DATE_KEY] = date_from_string(metadata.date).format(FRONTMATTER_DATE_FORMAT);
       if (metadata.end_date) {
@@ -313,7 +316,7 @@ export class Journal {
     if (command.context === "only_open_note") {
       const activeNode = activeNote$.value;
       if (!activeNode) return false;
-      const metadata = plugin$.value.index.getForPath(activeNode.path);
+      const metadata = this.plugin.index.getForPath(activeNode.path);
       if (!metadata) return false;
       if (metadata.journal !== this.name) return false;
     }
@@ -332,7 +335,7 @@ export class Journal {
 
   #getCommandRefDate(command: JournalCommand): string | null {
     const activeNode = activeNote$.value;
-    const metadata = activeNode ? plugin$.value.index.getForPath(activeNode.path) : null;
+    const metadata = activeNode ? this.plugin.index.getForPath(activeNode.path) : null;
     if (metadata && command.context !== "today") {
       return metadata.date;
     }
diff --git a/src/journals/journals-index.ts b/src/journals/journals-index.ts
index e7be621..211be6d 100644
--- a/src/journals/journals-index.ts
+++ b/src/journals/journals-index.ts
@@ -1,5 +1,4 @@
-import { Component, type TAbstractFile, TFile, type CachedMetadata } from "obsidian";
-import { app$ } from "../stores/obsidian.store";
+import { Component, type TAbstractFile, TFile, type CachedMetadata, type App } from "obsidian";
 import { computed, ref, shallowRef, type ComputedRef } from "vue";
 import type { JournalAnchorDate, JournalNoteData } from "../types/journal.types";
 import {
@@ -16,7 +15,7 @@ export class JournalsIndex extends Component {
   #pathComputeds = new Map<string, ComputedRef<JournalNoteData | null>>();
   #journalIndecies = shallowRef(new Map<string, JournalIndex>());
 
-  constructor() {
+  constructor(private app: App) {
     super();
     this.#setupListeners();
   }
@@ -55,17 +54,17 @@ export class JournalsIndex extends Component {
     const index = this.getJournalIndex(oldName);
     if (!index) return;
     for (const [, path] of index) {
-      const file = app$.value.vault.getAbstractFileByPath(path);
+      const file = this.app.vault.getAbstractFileByPath(path);
       if (!file) continue;
       if (!(file instanceof TFile)) continue;
-      await app$.value.fileManager.processFrontMatter(file, (frontmatter) => {
+      await this.app.fileManager.processFrontMatter(file, (frontmatter) => {
         frontmatter[FRONTMATTER_NAME_KEY] = name;
       });
     }
   }
 
   reindex(): void {
-    const files = app$.value.vault.getMarkdownFiles();
+    const files = this.app.vault.getMarkdownFiles();
     for (const file of files) {
       this.#onMetadataChanged(file);
     }
@@ -81,9 +80,9 @@ export class JournalsIndex extends Component {
   }
 
   #setupListeners() {
-    this.registerEvent(app$.value.vault.on("rename", this.#onRenamed, this));
-    this.registerEvent(app$.value.vault.on("delete", this.#onDeleted, this));
-    this.registerEvent(app$.value.metadataCache.on("changed", this.#onMetadataChanged, this));
+    this.registerEvent(this.app.vault.on("rename", this.#onRenamed, this));
+    this.registerEvent(this.app.vault.on("delete", this.#onDeleted, this));
+    this.registerEvent(this.app.metadataCache.on("changed", this.#onMetadataChanged, this));
   }
 
   #onRenamed = (file: TAbstractFile, oldPath: string) => {
@@ -112,7 +111,7 @@ export class JournalsIndex extends Component {
   };
 
   #onMetadataChanged = (file: TFile) => {
-    const metadata = app$.value.metadataCache.getFileCache(file);
+    const metadata = this.app.metadataCache.getFileCache(file);
     if (!metadata) return;
     this.#processMetadata(file.basename, file.path, metadata);
   };
diff --git a/src/journals/open-date.ts b/src/journals/open-date.ts
index 9b5788d..0d26b1b 100644
--- a/src/journals/open-date.ts
+++ b/src/journals/open-date.ts
@@ -1,12 +1,18 @@
-import { Menu } from "obsidian";
-import { app$, plugin$ } from "@/stores/obsidian.store";
+import { type App, Menu } from "obsidian";
 import { JournalSuggestModal } from "@/components/suggests/journal-suggest";
+import type { JournalPlugin } from "@/types/plugin.types";
 
-export async function openDate(date: string, journals: string[], event?: MouseEvent): Promise<void> {
+export async function openDate(
+  app: App,
+  plugin: JournalPlugin,
+  date: string,
+  journals: string[],
+  event?: MouseEvent,
+): Promise<void> {
   if (journals.length === 0) return;
   if (journals.length === 1) {
     const [name] = journals;
-    await openDateInJournal(date, name);
+    await openDateInJournal(plugin, date, name);
     return;
   }
 
@@ -15,20 +21,20 @@ export async function openDate(date: string, journals: string[], event?: MouseEv
     for (const journal of journals) {
       menu.addItem((item) => {
         item.setTitle(journal).onClick(() => {
-          openDateInJournal(date, journal).catch(console.error);
+          openDateInJournal(plugin, date, journal).catch(console.error);
         });
       });
     }
     menu.showAtMouseEvent(event);
   } else {
-    new JournalSuggestModal(app$.value, journals, (journalId) => {
-      openDateInJournal(date, journalId).catch(console.error);
+    new JournalSuggestModal(app, journals, (journalId) => {
+      openDateInJournal(plugin, date, journalId).catch(console.error);
     }).open();
   }
 }
 
-export async function openDateInJournal(date: string, journalName: string): Promise<void> {
-  const journal = plugin$.value.getJournal(journalName);
+export async function openDateInJournal(plugin: JournalPlugin, date: string, journalName: string): Promise<void> {
+  const journal = plugin.getJournal(journalName);
   if (!journal) return;
   const metadata = journal.get(date);
   if (!metadata) return;
diff --git a/src/main.ts b/src/main.ts
index 19cc467..aa98da6 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,10 +1,10 @@
-import { type App, Notice, Plugin } from "obsidian";
+import { Notice, Plugin } from "obsidian";
 import { calendarViewSettings$, journals$, pluginSettings$ } from "./stores/settings.store";
 import { watch, type WatchStopHandle } from "vue";
 import { debounce } from "perfect-debounce";
 import { initCalendarCustomization, updateLocale } from "./calendar";
 import { JournalSettingTab } from "./settings/journal-settings-tab";
-import { activeNote$, app$, plugin$ } from "./stores/obsidian.store";
+import { activeNote$ } from "./stores/obsidian.store";
 import { Journal } from "./journals/journal";
 import type { JournalSettings } from "./types/settings.types";
 import { defaultJournalSettings } from "./defaults";
@@ -40,7 +40,7 @@ export default class JournalPlugin extends Plugin {
       write,
     });
     pluginSettings$.value.journals[name] = settings;
-    this.#journals.set(name, new Journal(name));
+    this.#journals.set(name, new Journal(name, this, this.app));
     return pluginSettings$.value.journals[name];
   }
 
@@ -57,7 +57,7 @@ export default class JournalPlugin extends Plugin {
       );
     }
     this.#journals.delete(name);
-    this.#journals.set(newName, new Journal(newName));
+    this.#journals.set(newName, new Journal(newName, this, this.app));
   }
 
   removeJournal(name: string): void {
@@ -111,9 +111,6 @@ export default class JournalPlugin extends Plugin {
   }
 
   async onload(): Promise<void> {
-    app$.value = this.app;
-    plugin$.value = this;
-
     await this.#loadSettings();
     initCalendarCustomization();
     if (pluginSettings$.value.calendar.firstDayOfWeek !== -1) {
@@ -126,7 +123,7 @@ export default class JournalPlugin extends Plugin {
       pluginSettings$.value.showReloadHint = false;
     }
 
-    this.#index = new JournalsIndex();
+    this.#index = new JournalsIndex(this.app);
     this.addChild(this.#index);
     this.index.reindex();
 
@@ -134,23 +131,23 @@ export default class JournalPlugin extends Plugin {
 
     this.addSettingTab(new JournalSettingTab(this.app, this));
     this.registerMarkdownCodeBlockProcessor("calendar-timeline", (source, element, context) => {
-      const processor = new TimelineCodeBlockProcessor(element, source, context.sourcePath);
+      const processor = new TimelineCodeBlockProcessor(this.app, this, element, source, context.sourcePath);
       context.addChild(processor);
     });
     this.registerMarkdownCodeBlockProcessor("calendar-nav", (source, element, context) => {
-      const processor = new NavCodeBlockProcessor(element, source, context.sourcePath);
+      const processor = new NavCodeBlockProcessor(this.app, this, element, source, context.sourcePath);
       context.addChild(processor);
     });
     this.registerMarkdownCodeBlockProcessor("interval-nav", (source, element, context) => {
-      const processor = new NavCodeBlockProcessor(element, source, context.sourcePath);
+      const processor = new NavCodeBlockProcessor(this.app, this, element, source, context.sourcePath);
       context.addChild(processor);
     });
     this.registerMarkdownCodeBlockProcessor("journal-nav", (source, element, context) => {
-      const processor = new NavCodeBlockProcessor(element, source, context.sourcePath);
+      const processor = new NavCodeBlockProcessor(this.app, this, element, source, context.sourcePath);
       context.addChild(processor);
     });
 
-    this.registerView(CALENDAR_VIEW_TYPE, (leaf) => new CalendarView(leaf));
+    this.registerView(CALENDAR_VIEW_TYPE, (leaf) => new CalendarView(leaf, this));
 
     this.app.workspace.onLayoutReady(() => {
       this.placeCalendarView(true);
@@ -160,7 +157,6 @@ export default class JournalPlugin extends Plugin {
     for (const handle of this.#stopHandles) {
       handle();
     }
-    app$.value = {} as App;
   }
 
   async #loadSettings(): Promise<void> {
@@ -172,7 +168,7 @@ export default class JournalPlugin extends Plugin {
 
   #fillJournals(): void {
     for (const name of Object.keys(journals$.value)) {
-      this.#journals.set(name, new Journal(name));
+      this.#journals.set(name, new Journal(name, this, this.app));
     }
   }
 
@@ -256,7 +252,7 @@ export default class JournalPlugin extends Plugin {
       editorCallback: (editor, context) => {
         const file = context.file;
         if (file) {
-          new VueModal("Connect note to a journal", ConnectNoteModal, {
+          new VueModal(this.app, this, "Connect note to a journal", ConnectNoteModal, {
             file,
           }).open();
         }
diff --git a/src/settings/JournalSettingsEdit.vue b/src/settings/JournalSettingsEdit.vue
index 8439704..f4482e5 100644
--- a/src/settings/JournalSettingsEdit.vue
+++ b/src/settings/JournalSettingsEdit.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed, watch } from "vue";
 import { journals$, pluginSettings$ } from "../stores/settings.store";
-import { app$, plugin$ } from "../stores/obsidian.store";
 import { canApplyTemplater } from "../utils/template";
 import type { JournalCommand, JournalDecoration, NavBlockRow } from "../types/settings.types";
 import ObsidianSetting from "../components/obsidian/ObsidianSetting.vue";
@@ -24,6 +23,8 @@ import { today } from "@/calendar";
 import NavigationBlockEditPreview from "@/code-blocks/navigation/NavigationBlockEditPreview.vue";
 import EditNavBlockRowModal from "@/components/modals/EditNavBlockRow.modal.vue";
 import JournalShelfModal from "@/components/modals/JournalShelf.modal.vue";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const props = defineProps<{
   journalName: string;
@@ -33,24 +34,27 @@ const emit = defineEmits<{
   (event: "edit", journalName: string): void;
 }>();
 
+const app = useApp();
+const plugin = usePlugin();
+
 const day = today().day();
 const refDate = today().format("YYYY-MM-DD");
 
 const journal = computed(() => journals$.value[props.journalName]);
-const supportsTemplater = canApplyTemplater(app$.value, "<% $>");
+const supportsTemplater = canApplyTemplater(app, "<% $>");
 
 function showRenameModal(): void {
-  new VueModal("Rename journal", RenameJournalModal, {
+  new VueModal(app, plugin, "Rename journal", RenameJournalModal, {
     name: journal.value.name,
     onSave(name: string) {
-      plugin$.value.renameJournal(props.journalName, name);
+      plugin.renameJournal(props.journalName, name);
       emit("edit", name);
     },
   }).open();
 }
 
 function place(): void {
-  new VueModal("Place journal", JournalShelfModal, {
+  new VueModal(app, plugin, "Place journal", JournalShelfModal, {
     currentShelf: journal.value.shelves[0] ?? "",
     onSave(shelfName: string) {
       const currentShelf = journal.value.shelves[0];
@@ -70,7 +74,7 @@ function place(): void {
 }
 
 function addCommand(): void {
-  new VueModal("Add command", EditCommandModal, {
+  new VueModal(app, plugin, "Add command", EditCommandModal, {
     index: journal.value.commands.length,
     writeType: journal.value.write,
     commands: journal.value.commands,
@@ -81,7 +85,7 @@ function addCommand(): void {
   }).open();
 }
 function editCommand(command: JournalCommand, index: number): void {
-  new VueModal("Edit command", EditCommandModal, {
+  new VueModal(app, plugin, "Edit command", EditCommandModal, {
     index,
     writeType: journal.value.write,
     command,
@@ -98,7 +102,7 @@ function deleteCommand(index: number): void {
 }
 
 function addCalendarDecoration() {
-  new VueModal("Add calendar decoration", EditDecorationModal, {
+  new VueModal(app, plugin, "Add calendar decoration", EditDecorationModal, {
     index: journal.value.decorations.length,
     writeType: journal.value.write,
     onSubmit: (decoration: JournalDecoration) => {
@@ -107,7 +111,7 @@ function addCalendarDecoration() {
   }).open();
 }
 function editCalendarDecoration(decoration: JournalDecoration, index: number) {
-  new VueModal("Add calendar decoration", EditDecorationModal, {
+  new VueModal(app, plugin, "Add calendar decoration", EditDecorationModal, {
     index: journal.value.decorations.length,
     writeType: journal.value.write,
     decoration,
@@ -121,7 +125,7 @@ function deleteHighlight(index: number) {
 }
 
 function addNavRow() {
-  new VueModal("Add row to nav block", EditNavBlockRowModal, {
+  new VueModal(app, plugin, "Add row to nav block", EditNavBlockRowModal, {
     currentJournal: props.journalName,
     onSubmit: (row: NavBlockRow) => {
       journal.value.navBlock.rows.push(row);
@@ -129,7 +133,7 @@ function addNavRow() {
   }).open();
 }
 function editNavRow(index: number) {
-  new VueModal("Edit nav block row", EditNavBlockRowModal, {
+  new VueModal(app, plugin, "Edit nav block row", EditNavBlockRowModal, {
     currentJournal: props.journalName,
     row: journal.value.navBlock.rows[index],
     onSubmit: (row: NavBlockRow) => {
diff --git a/src/settings/JournalSettingsList.vue b/src/settings/JournalSettingsList.vue
index 246759a..22ec468 100644
--- a/src/settings/JournalSettingsList.vue
+++ b/src/settings/JournalSettingsList.vue
@@ -5,8 +5,9 @@ import ObsidianIconButton from "../components/obsidian/ObsidianIconButton.vue";
 import type { JournalSettings, NotesProcessing } from "@/types/settings.types";
 import { VueModal } from "@/components/modals/vue-modal";
 import RemoveJournal from "@/components/modals/RemoveJournal.modal.vue";
-import { plugin$ } from "@/stores/obsidian.store";
 import { journals$ } from "@/stores/settings.store";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const { journals } = defineProps<{
   journals: JournalSettings[];
@@ -14,15 +15,18 @@ const { journals } = defineProps<{
 
 defineEmits<(event: "edit" | "bulk-add", name: string) => void>();
 
+const app = useApp();
+const plugin = usePlugin();
+
 const journalsList = computed(() => Object.values(journals).toSorted((a, b) => a.name.localeCompare(b.name)));
 
 function remove(name: string): void {
   const journal = journals$.value[name];
   if (!journal) return;
-  new VueModal(`Remove ${journal.name} journal`, RemoveJournal, {
+  new VueModal(app, plugin, `Remove ${journal.name} journal`, RemoveJournal, {
     onRemove(_noteProcessing: NotesProcessing) {
       // TODO Process notes on remove
-      plugin$.value.removeJournal(name);
+      plugin.removeJournal(name);
     },
   }).open();
 }
diff --git a/src/settings/JournalSettingsRoot.vue b/src/settings/JournalSettingsRoot.vue
index e744c7a..25f3f77 100644
--- a/src/settings/JournalSettingsRoot.vue
+++ b/src/settings/JournalSettingsRoot.vue
@@ -5,12 +5,17 @@ import JournalSettingsEdit from "./JournalSettingsEdit.vue";
 import JournalSettingsShelfDetails from "./JournalSettingsShelfDetails.vue";
 import BulkAddNotesModal from "@/components/modals/BulkAddNotes.modal.vue";
 import { VueModal } from "@/components/modals/vue-modal";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const selectedJournalName = ref<string | null>(null);
 const selectedShelfName = ref<string | null>(null);
 
+const app = useApp();
+const plugin = usePlugin();
+
 function bulkAdd(journalName: string) {
-  new VueModal(`Add notes to ${journalName}`, BulkAddNotesModal, { journalName }, 700).open();
+  new VueModal(app, plugin, `Add notes to ${journalName}`, BulkAddNotesModal, { journalName }, 700).open();
 }
 </script>
 
diff --git a/src/settings/JournalSettingsShelfDetails.vue b/src/settings/JournalSettingsShelfDetails.vue
index 43f7d68..d40933a 100644
--- a/src/settings/JournalSettingsShelfDetails.vue
+++ b/src/settings/JournalSettingsShelfDetails.vue
@@ -4,11 +4,12 @@ import { computed } from "vue";
 import ObsidianSetting from "@/components/obsidian/ObsidianSetting.vue";
 import ObsidianIconButton from "@/components/obsidian/ObsidianIconButton.vue";
 import { VueModal } from "@/components/modals/vue-modal";
-import { plugin$ } from "@/stores/obsidian.store";
 import RenameShelfModal from "@/components/modals/RenameShelf.modal.vue";
 import CreateJournal from "@/components/modals/CreateJournal.modal.vue";
 import type { JournalSettings } from "@/types/settings.types";
 import JournalSettingsList from "./JournalSettingsList.vue";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const { shelfName } = defineProps<{
   shelfName: string;
@@ -18,6 +19,9 @@ const emit = defineEmits<{
   (event: "edit" | "organize" | "bulk-add", name: string): void;
 }>();
 
+const app = useApp();
+const plugin = usePlugin();
+
 const shelf = computed(() => pluginSettings$.value.shelves[shelfName]);
 const shelfJournals = computed(() => {
   if (!shelf.value) return [];
@@ -25,19 +29,19 @@ const shelfJournals = computed(() => {
 });
 
 function showRenameModal(): void {
-  new VueModal("Rename shelf", RenameShelfModal, {
+  new VueModal(app, plugin, "Rename shelf", RenameShelfModal, {
     name: shelf.value.name,
     onSave(name: string) {
-      plugin$.value.renameShelf(shelfName, name);
+      plugin.renameShelf(shelfName, name);
       emit("organize", name);
     },
   }).open();
 }
 
 function create(): void {
-  new VueModal("Add Journal", CreateJournal, {
+  new VueModal(app, plugin, "Add Journal", CreateJournal, {
     onCreate(name: string, writing: JournalSettings["write"]) {
-      const journal = plugin$.value.createJournal(name, writing);
+      const journal = plugin.createJournal(name, writing);
       shelf.value.journals.push(name);
       journal.shelves.push(shelfName);
 
diff --git a/src/settings/JournalSettingsWithShelves.vue b/src/settings/JournalSettingsWithShelves.vue
index 5cf679d..d8bff8c 100644
--- a/src/settings/JournalSettingsWithShelves.vue
+++ b/src/settings/JournalSettingsWithShelves.vue
@@ -4,12 +4,13 @@ import ObsidianIconButton from "@/components/obsidian/ObsidianIconButton.vue";
 import { VueModal } from "@/components/modals/vue-modal";
 import CreateShelf from "@/components/modals/CreateShelf.modal.vue";
 import RemoveShelf from "@/components/modals/RemoveShelf.modal.vue";
-import { plugin$ } from "@/stores/obsidian.store";
 import { pluginSettings$ } from "@/stores/settings.store";
 import { computed } from "vue";
 import JournalSettingsList from "./JournalSettingsList.vue";
 import CreateJournalModal from "@/components/modals/CreateJournal.modal.vue";
 import type { JournalSettings } from "@/types/settings.types";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 const emit = defineEmits<{
   (event: "organize", shelfName: string): void;
@@ -17,6 +18,9 @@ const emit = defineEmits<{
   (event: "edit" | "bulk-add", journalName: string): void;
 }>();
 
+const app = useApp();
+const plugin = usePlugin();
+
 const shelvesList = computed(() =>
   Object.values(pluginSettings$.value.shelves).toSorted((a, b) => a.name.localeCompare(b.name)),
 );
@@ -26,9 +30,9 @@ const journalsWithoutShelf = computed(() => {
 });
 
 function createShelf(): void {
-  new VueModal("Add Journal Shelf", CreateShelf, {
+  new VueModal(app, plugin, "Add Journal Shelf", CreateShelf, {
     onCreate(name: string) {
-      plugin$.value.createShelf(name);
+      plugin.createShelf(name);
     },
   }).open();
 }
@@ -36,18 +40,18 @@ function createShelf(): void {
 function removeShelf(shelfName: string): void {
   const shelf = pluginSettings$.value.shelves[shelfName];
   if (!shelf) return;
-  new VueModal(`Remove ${shelf.name} shelf`, RemoveShelf, {
+  new VueModal(app, plugin, `Remove ${shelf.name} shelf`, RemoveShelf, {
     shelfName,
     onRemove(destinationShelf: string) {
-      plugin$.value.removeShelf(shelfName, destinationShelf);
+      plugin.removeShelf(shelfName, destinationShelf);
     },
   }).open();
 }
 
 function create(): void {
-  new VueModal("Add Journal", CreateJournalModal, {
+  new VueModal(app, plugin, "Add Journal", CreateJournalModal, {
     onCreate(name: string, writing: JournalSettings["write"]) {
-      plugin$.value.createJournal(name, writing);
+      plugin.createJournal(name, writing);
       emit("edit", name);
     },
   }).open();
diff --git a/src/settings/JournalSettingsWithoutShelves.vue b/src/settings/JournalSettingsWithoutShelves.vue
index 51d60e8..1b4e8d4 100644
--- a/src/settings/JournalSettingsWithoutShelves.vue
+++ b/src/settings/JournalSettingsWithoutShelves.vue
@@ -4,16 +4,20 @@ import JournalSettingsList from "./JournalSettingsList.vue";
 import ObsidianIconButton from "@/components/obsidian/ObsidianIconButton.vue";
 import { VueModal } from "@/components/modals/vue-modal";
 import CreateJournal from "@/components/modals/CreateJournal.modal.vue";
-import { plugin$ } from "@/stores/obsidian.store";
 import type { JournalSettings } from "@/types/settings.types";
 import { journalsList$ } from "@/stores/settings.store";
+import { useApp } from "@/composables/use-app";
+import { usePlugin } from "@/composables/use-plugin";
 
 defineEmits<(event: "edit" | "bulk-add", name: string) => void>();
 
+const app = useApp();
+const plugin = usePlugin();
+
 function create(): void {
-  new VueModal("Add Journal", CreateJournal, {
+  new VueModal(app, plugin, "Add Journal", CreateJournal, {
     onCreate(name: string, writing: JournalSettings["write"]) {
-      plugin$.value.createJournal(name, writing);
+      plugin.createJournal(name, writing);
     },
   }).open();
 }
diff --git a/src/settings/journal-settings-tab.ts b/src/settings/journal-settings-tab.ts
index b6838cb..0ac0145 100644
--- a/src/settings/journal-settings-tab.ts
+++ b/src/settings/journal-settings-tab.ts
@@ -1,11 +1,22 @@
-import { PluginSettingTab } from "obsidian";
+import { type App, PluginSettingTab } from "obsidian";
 import { createApp, type App as VueApp } from "vue";
 import JournalSettingsRoot from "./JournalSettingsRoot.vue";
+import { APP_KEY, PLUGIN_KEY } from "@/constants";
+import type { JournalPlugin } from "@/types/plugin.types";
 
 export class JournalSettingTab extends PluginSettingTab {
   #vueApp: VueApp | null = null;
+  #plugin: JournalPlugin;
+
+  constructor(app: App, plugin: JournalPlugin) {
+    super(app, plugin);
+    this.#plugin = plugin;
+  }
+
   display() {
     this.#vueApp = createApp(JournalSettingsRoot);
+    this.#vueApp.provide(APP_KEY, this.app);
+    this.#vueApp.provide(PLUGIN_KEY, this.#plugin);
     this.#vueApp.mount(this.containerEl);
   }
 
diff --git a/src/stores/obsidian.store.ts b/src/stores/obsidian.store.ts
index 12a8d4d..11347e7 100644
--- a/src/stores/obsidian.store.ts
+++ b/src/stores/obsidian.store.ts
@@ -1,7 +1,4 @@
-import type { App, TFile } from "obsidian";
+import type { TFile } from "obsidian";
 import { shallowRef } from "vue";
-import type { JournalPlugin } from "../types/plugin.types";
 
-export const app$ = shallowRef<App>({} as App);
-export const plugin$ = shallowRef<JournalPlugin>({} as JournalPlugin);
 export const activeNote$ = shallowRef<TFile | null>(null);
diff --git a/src/utils/journals.ts b/src/utils/journals.ts
index 60e8e17..dbdbe73 100644
--- a/src/utils/journals.ts
+++ b/src/utils/journals.ts
@@ -4,14 +4,13 @@ import {
   FRONTMATTER_END_DATE_KEY,
   FRONTMATTER_INDEX_KEY,
 } from "@/constants";
-import { app$ } from "@/stores/obsidian.store";
-import { TFile } from "obsidian";
+import { type App, TFile } from "obsidian";
 
-export async function disconnectNote(path: string): Promise<void> {
-  const file = app$.value.vault.getAbstractFileByPath(path);
+export async function disconnectNote(app: App, path: string): Promise<void> {
+  const file = app.vault.getAbstractFileByPath(path);
   if (!file) return;
   if (!(file instanceof TFile)) return;
-  await app$.value.fileManager.processFrontMatter(file, (frontmatter) => {
+  await app.fileManager.processFrontMatter(file, (frontmatter) => {
     delete frontmatter[FRONTMATTER_NAME_KEY];
     delete frontmatter[FRONTMATTER_DATE_KEY];
     delete frontmatter[FRONTMATTER_END_DATE_KEY];