diff --git a/package.json b/package.json
index 2dbe25d..d1a8374 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "sass-embedded": "1.85.1",
     "uuid": "11.1.0",
     "vue": "3.5.13",
-    "wrdu-keyboard": "github:0PandaDEV/keyboard"
+    "@waradu/keyboard": "4.2.0"
   },
   "overrides": {
     "chokidar": "^3.6.0"
diff --git a/pages/index.vue b/pages/index.vue
index 774b0a0..ddce6ca 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,41 +1,68 @@
 <template>
   <main>
-    <TopBar ref="topBar" @search="searchHistory" @searchStarted="searchStarted" />
+    <TopBar
+      ref="topBar"
+      @search="searchHistory"
+      @searchStarted="searchStarted" />
     <div class="container">
-      <OverlayScrollbarsComponent class="results" ref="resultsContainer"
+      <OverlayScrollbarsComponent
+        class="results"
+        ref="resultsContainer"
         :options="{ scrollbars: { autoHide: 'scroll' } }">
-        <div v-for="(group, groupIndex) in groupedHistory" :key="groupIndex" class="group">
+        <div
+          v-for="(group, groupIndex) in groupedHistory"
+          :key="groupIndex"
+          class="group">
           <div class="time-separator">{{ group.label }}</div>
           <div class="results-group">
-            <Result v-for="(item, index) in group.items" :key="item.id" :item="item"
-              :selected="isSelected(groupIndex, index)" :image-url="imageUrls[item.id]"
-              :dimensions="imageDimensions[item.id]" @select="selectItem(groupIndex, index)" @image-error="onImageError"
+            <Result
+              v-for="(item, index) in group.items"
+              :key="item.id"
+              :item="item"
+              :selected="isSelected(groupIndex, index)"
+              :image-url="imageUrls[item.id]"
+              :dimensions="imageDimensions[item.id]"
+              @select="selectItem(groupIndex, index)"
+              @image-error="onImageError"
               @setRef="(el: HTMLElement | null) => (selectedElement = el)" />
           </div>
         </div>
       </OverlayScrollbarsComponent>
       <div class="right">
-        <div class="content" v-if="selectedItem?.content_type === ContentType.Image">
+        <div
+          class="content"
+          v-if="selectedItem?.content_type === ContentType.Image">
           <img :src="imageUrls[selectedItem.id]" alt="Image" class="image" />
         </div>
-        <div v-else-if="selectedItem && isYoutubeWatchUrl(selectedItem.content)" class="content">
-          <img class="image" :src="getYoutubeThumbnail(selectedItem.content)" alt="YouTube Thumbnail" />
+        <div
+          v-else-if="selectedItem && isYoutubeWatchUrl(selectedItem.content)"
+          class="content">
+          <img
+            class="image"
+            :src="getYoutubeThumbnail(selectedItem.content)"
+            alt="YouTube Thumbnail" />
         </div>
-        <div class="content" v-else-if="
-          selectedItem?.content_type === ContentType.Link && pageOgImage
-        ">
+        <div
+          class="content"
+          v-else-if="
+            selectedItem?.content_type === ContentType.Link && pageOgImage
+          ">
           <img :src="pageOgImage" alt="Image" class="image" />
         </div>
         <OverlayScrollbarsComponent v-else class="content">
           <span class="content-text">{{ selectedItem?.content || "" }}</span>
         </OverlayScrollbarsComponent>
-        <OverlayScrollbarsComponent class="information" :options="{ scrollbars: { autoHide: 'scroll' } }">
+        <OverlayScrollbarsComponent
+          class="information"
+          :options="{ scrollbars: { autoHide: 'scroll' } }">
           <div class="title">Information</div>
           <div class="info-content" v-if="selectedItem && getInfo">
             <div class="info-row" v-for="(row, index) in infoRows" :key="index">
               <p class="label">{{ row.label }}</p>
-              <span :class="{ 'url-truncate': row.isUrl }" :data-text="row.value">
-                <img v-if="row.icon" :src="row.icon" :alt="String(row.value)">
+              <span
+                :class="{ 'url-truncate': row.isUrl }"
+                :data-text="row.value">
+                <img v-if="row.icon" :src="row.icon" :alt="String(row.value)" />
                 {{ row.value }}
               </span>
             </div>
@@ -43,26 +70,39 @@
         </OverlayScrollbarsComponent>
       </div>
     </div>
-    <BottomBar :primary-action="{
-      text: 'Paste',
-      icon: IconsEnter,
-      onClick: pasteSelectedItem,
-    }" :secondary-action="{
-      text: 'Actions',
-      icon: IconsKey,
-      input: 'K',
-      showModifier: true,
-      onClick: toggleActionsMenu,
-    }" />
-    <ActionsMenu :selected-item="selectedItem" :is-visible="isActionsMenuVisible" @close="closeActionsMenu" @toggle="toggleActionsMenu" />
+    <BottomBar
+      :primary-action="{
+        text: 'Paste',
+        icon: IconsEnter,
+        onClick: pasteSelectedItem,
+      }"
+      :secondary-action="{
+        text: 'Actions',
+        icon: IconsKey,
+        input: 'K',
+        showModifier: true,
+        onClick: toggleActionsMenu,
+      }" />
+    <ActionsMenu
+      :selected-item="selectedItem"
+      :is-visible="isActionsMenuVisible"
+      @close="closeActionsMenu"
+      @toggle="toggleActionsMenu" />
   </main>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, watch, nextTick, shallowRef } from "vue";
+import {
+  ref,
+  computed,
+  onMounted,
+  onUnmounted,
+  watch,
+  nextTick,
+  shallowRef,
+} from "vue";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-vue";
 import "overlayscrollbars/overlayscrollbars.css";
-import { platform } from "@tauri-apps/plugin-os";
 import { listen } from "@tauri-apps/api/event";
 import { useNuxtApp } from "#app";
 import { invoke } from "@tauri-apps/api/core";
@@ -86,7 +126,14 @@ interface GroupedHistory {
 }
 
 const { $history, $keyboard, $selectedResult } = useNuxtApp();
-const { selectedGroupIndex, selectedItemIndex, selectedElement, useSelectedResult } = $selectedResult;
+const {
+  selectedGroupIndex,
+  selectedItemIndex,
+  selectedElement,
+  useSelectedResult,
+} = $selectedResult;
+
+const listeners: Array<() => void> = [];
 
 const CHUNK_SIZE = 50;
 const SCROLL_THRESHOLD = 100;
@@ -102,7 +149,6 @@ const resultsContainer = shallowRef<InstanceType<
 > | null>(null);
 const searchQuery = ref("");
 const searchInput = ref<HTMLInputElement | null>(null);
-const os = ref<string>("");
 const imageUrls = shallowRef<Record<string, string>>({});
 const imageDimensions = shallowRef<Record<string, string>>({});
 const imageSizes = shallowRef<Record<string, string>>({});
@@ -117,18 +163,9 @@ const topBar = ref<{ searchInput: HTMLInputElement | null } | null>(null);
 
 const toggleActionsMenu = () => {
   isActionsMenuVisible.value = !isActionsMenuVisible.value;
-  
-  if (isActionsMenuVisible.value) {
-    $keyboard.disableContext('main');
-    $keyboard.enableContext('actionsMenu');
-  } else {
-    $keyboard.disableContext('actionsMenu');
-    $keyboard.enableContext('main');
-  }
-  
   nextTick(() => {
     if (isActionsMenuVisible.value) {
-      document.getElementById('actions-menu')?.focus();
+      document.getElementById("actions-menu")?.focus();
     } else {
       focusSearchInput();
     }
@@ -137,8 +174,7 @@ const toggleActionsMenu = () => {
 
 const closeActionsMenu = () => {
   isActionsMenuVisible.value = false;
-  $keyboard.disableContext('actionsMenu');
-  $keyboard.enableContext('main');
+  focusSearchInput();
 };
 
 const isSameDay = (date1: Date, date2: Date): boolean => {
@@ -155,7 +191,7 @@ const getWeekNumber = (date: Date): number => {
     ((date.getTime() - firstDayOfYear.getTime()) / 86400000 +
       firstDayOfYear.getDay() +
       1) /
-    7
+      7
   );
 };
 
@@ -176,8 +212,8 @@ const groupedHistory = computed<GroupedHistory[]>(() => {
 
   const filteredItems = searchQuery.value
     ? history.value.filter((item) =>
-      item.content.toLowerCase().includes(searchQuery.value.toLowerCase())
-    )
+        item.content.toLowerCase().includes(searchQuery.value.toLowerCase())
+      )
     : history.value;
 
   const yesterday = new Date(today.getTime() - 86400000);
@@ -243,16 +279,16 @@ const loadHistoryChunk = async (): Promise<void> => {
             img.src = `data:image/png;base64,${base64}`;
             imageUrls.value[historyItem.id] = img.src;
 
-            await new Promise<void>((resolve) => {
+            await new Promise<void>((resolveProm) => {
               img.onload = () => {
                 imageDimensions.value[
                   historyItem.id
                 ] = `${img.width}x${img.height}`;
-                resolve();
+                resolveProm();
               };
               img.onerror = () => {
                 imageDimensions.value[historyItem.id] = "Error";
-                resolve();
+                resolveProm();
               };
             });
           } catch (error) {
@@ -366,7 +402,11 @@ const processSearchQueue = async () => {
         { id: item.id, timestamp: new Date(item.timestamp) }
       )
     );
-  
+    if (groupedHistory.value.length > 0) {
+      handleSelection(0, 0, true);
+    } else {
+      selectItem(-1, -1);
+    }
   } catch (error) {
     console.error("Search error:", error);
   } finally {
@@ -379,13 +419,13 @@ const processSearchQueue = async () => {
 
 const searchHistory = async (query: string): Promise<void> => {
   searchQuery.value = query;
-  
+
   if (searchController) {
     searchController.abort();
   }
-  
+
   searchController = new AbortController();
-  
+
   searchQueue.push(query);
   if (!isProcessingSearch) {
     processSearchQueue();
@@ -394,10 +434,14 @@ const searchHistory = async (query: string): Promise<void> => {
 
 watch(
   () => groupedHistory.value,
-  (newGroupedHistory) => {
-    if (newGroupedHistory.length > 0) {
+  (newGroupedHistory, oldGroupedHistory) => {
+    if (
+      newGroupedHistory.length > 0 &&
+      oldGroupedHistory &&
+      oldGroupedHistory.length === 0
+    ) {
       handleSelection(0, 0, true);
-    } else {
+    } else if (newGroupedHistory.length === 0) {
       selectItem(-1, -1);
     }
   },
@@ -444,7 +488,7 @@ const getYoutubeThumbnail = (url: string): string => {
 const updateHistory = async (resetScroll: boolean = false): Promise<void> => {
   offset = 0;
   history.value = [];
-  
+
   const results = await $history.loadHistoryChunk(offset, CHUNK_SIZE);
   if (results.length > 0) {
     const processedItems = await Promise.all(
@@ -474,16 +518,16 @@ const updateHistory = async (resetScroll: boolean = false): Promise<void> => {
             img.src = `data:image/png;base64,${base64}`;
             imageUrls.value[historyItem.id] = img.src;
 
-            await new Promise<void>((resolve) => {
+            await new Promise<void>((resolveProm) => {
               img.onload = () => {
                 imageDimensions.value[
                   historyItem.id
                 ] = `${img.width}x${img.height}`;
-                resolve();
+                resolveProm();
               };
               img.onerror = () => {
                 imageDimensions.value[historyItem.id] = "Error";
-                resolve();
+                resolveProm();
               };
             });
           } catch (error) {
@@ -520,72 +564,6 @@ const handleSelection = (
   if (shouldScroll) scrollToSelectedItem();
 };
 
-const setupEventListeners = async (): Promise<void> => {
-  await listen("clipboard-content-updated", async () => {
-    lastUpdateTime.value = Date.now();
-    await updateHistory(true);
-    if (groupedHistory.value[0]?.items.length > 0) {
-      handleSelection(0, 0, false);
-    }
-  });
-
-  await listen("tauri://focus", async () => {
-    const currentTime = Date.now();
-    if (currentTime - lastUpdateTime.value > 0) {
-      const previousState = {
-        groupIndex: selectedGroupIndex.value,
-        itemIndex: selectedItemIndex.value,
-        scroll:
-          resultsContainer.value?.osInstance()?.elements().viewport
-            ?.scrollTop || 0,
-      };
-
-      await updateHistory();
-      lastUpdateTime.value = currentTime;
-      handleSelection(previousState.groupIndex, previousState.itemIndex, false);
-
-      if (resultsContainer.value?.osInstance()?.elements().viewport?.scrollTo) {
-        resultsContainer.value.osInstance()?.elements().viewport?.scrollTo({
-          top: previousState.scroll,
-          behavior: "instant",
-        });
-      }
-    }
-    focusSearchInput();
-
-    $keyboard.disableContext('actionsMenu');
-    $keyboard.disableContext('settings');
-    $keyboard.enableContext('main');
-    if (isActionsMenuVisible.value) {
-      $keyboard.enableContext('actionsMenu');
-    }
-  });
-
-  await listen("tauri://blur", () => {
-    searchInput.value?.blur();
-    $keyboard.disableContext('main');
-    $keyboard.disableContext('actionsMenu');
-  });
-
-  $keyboard.setupAppShortcuts({
-    onNavigateDown: selectNext,
-    onNavigateUp: selectPrevious,
-    onSelect: pasteSelectedItem,
-    onEscape: () => {
-      if (isActionsMenuVisible.value) {
-        closeActionsMenu();
-      } else {
-        hideApp();
-      }
-    },
-    onToggleActions: toggleActionsMenu,
-    contextName: 'main',
-    priority: $keyboard.PRIORITY.HIGH
-  });
-  $keyboard.disableContext('settings');
-  $keyboard.enableContext('main');
-};
-
 const { hideApp } = useAppControl();
 
 const focusSearchInput = (): void => {
@@ -609,38 +587,147 @@ watch(
 
 onMounted(async () => {
   try {
-    os.value = platform();
     await loadHistoryChunk();
+    if (groupedHistory.value.length > 0 && !selectedItem.value) {
+      handleSelection(0, 0, true);
+    }
 
     resultsContainer.value
       ?.osInstance()
       ?.elements()
       ?.viewport?.addEventListener("scroll", handleScroll);
 
-    await setupEventListeners();
-
-    $keyboard.setupAppShortcuts({
-      onNavigateDown: selectNext,
-      onNavigateUp: selectPrevious,
-      onSelect: pasteSelectedItem,
-      onEscape: () => {
-        if (isActionsMenuVisible.value) {
-          closeActionsMenu();
-        } else {
-          hideApp();
+    listeners.push(
+      await listen("clipboard-content-updated", async () => {
+        lastUpdateTime.value = Date.now();
+        await updateHistory(true);
+        if (groupedHistory.value[0]?.items.length > 0) {
+          handleSelection(0, 0, false);
         }
-      },
-      onToggleActions: toggleActionsMenu,
-      contextName: 'main',
-      priority: $keyboard.PRIORITY.HIGH
-    });
-    $keyboard.disableContext('settings');
-    $keyboard.enableContext('main');
+      })
+    );
+
+    listeners.push(
+      await listen("tauri://focus", async () => {
+        console.log("Tauri window focused");
+        // Attempt to re-initialize keyboard listeners
+        if ($keyboard && typeof $keyboard.init === "function") {
+          console.log("Re-initializing keyboard via $keyboard.init()");
+          $keyboard.init();
+        } else {
+          console.warn("$keyboard.init is not available");
+        }
+
+        const currentTime = Date.now();
+        if (currentTime - lastUpdateTime.value > 0) {
+          const previousState = {
+            groupIndex: selectedGroupIndex.value,
+            itemIndex: selectedItemIndex.value,
+            scroll:
+              resultsContainer.value?.osInstance()?.elements().viewport
+                ?.scrollTop || 0,
+          };
+
+          await updateHistory();
+          lastUpdateTime.value = currentTime;
+          handleSelection(
+            previousState.groupIndex,
+            previousState.itemIndex,
+            false
+          );
+
+          if (
+            resultsContainer.value?.osInstance()?.elements().viewport?.scrollTo
+          ) {
+            resultsContainer.value.osInstance()?.elements().viewport?.scrollTo({
+              top: previousState.scroll,
+              behavior: "instant",
+            });
+          }
+        }
+        focusSearchInput();
+      })
+    );
+
+    listeners.push(
+      await listen("tauri://blur", () => {
+        searchInput.value?.blur();
+      })
+    );
+
+    listeners.push(
+      $keyboard.listen(
+        [$keyboard.Key.DownArrow],
+        () => {
+          console.log(
+            "Down Arrow pressed. Active element:",
+            document.activeElement
+          );
+          selectNext();
+        },
+        { prevent: true }
+      )
+    );
+    listeners.push(
+      $keyboard.listen(
+        [$keyboard.Key.UpArrow],
+        () => {
+          console.log(
+            "Up Arrow pressed. Active element:",
+            document.activeElement
+          );
+          selectPrevious();
+        },
+        { prevent: true }
+      )
+    );
+    listeners.push(
+      $keyboard.listen([$keyboard.Key.Enter], pasteSelectedItem, {
+        prevent: true,
+      })
+    );
+    listeners.push(
+      $keyboard.listen(
+        [$keyboard.Key.Escape],
+        () => {
+          if (isActionsMenuVisible.value) {
+            closeActionsMenu();
+          } else {
+            hideApp();
+          }
+        },
+        { prevent: true }
+      )
+    );
+
+    const metaOrCtrlKey =
+      $keyboard.currentOS === "macos"
+        ? $keyboard.Key.Meta
+        : $keyboard.Key.Control;
+    listeners.push(
+      $keyboard.listen([metaOrCtrlKey, $keyboard.Key.K], toggleActionsMenu, {
+        prevent: true,
+        ignoreIfEditable: true,
+      })
+    );
   } catch (error) {
     console.error("Error during onMounted:", error);
   }
 });
 
+onUnmounted(() => {
+  listeners.forEach((unlisten) => {
+    if (typeof unlisten === "function") {
+      unlisten();
+    }
+  });
+  listeners.length = 0;
+  const viewport = resultsContainer.value?.osInstance()?.elements()?.viewport;
+  if (viewport) {
+    viewport.removeEventListener("scroll", handleScroll);
+  }
+});
+
 const getFormattedDate = computed(() => {
   if (!selectedItem.value?.timestamp) return "";
   return new Intl.DateTimeFormat("en-US", {
@@ -787,7 +874,9 @@ const infoRows = computed(() => {
       label: "Source",
       value: getInfo.value.source,
       isUrl: false,
-      icon: selectedItem.value?.source_icon ? `data:image/png;base64,${selectedItem.value.source_icon}` : undefined
+      icon: selectedItem.value?.source_icon
+        ? `data:image/png;base64,${selectedItem.value.source_icon}`
+        : undefined,
     },
     {
       label: "Content Type",
@@ -800,7 +889,12 @@ const infoRows = computed(() => {
 
   const typeSpecificRows: Record<
     ContentType,
-    Array<{ label: string; value: string | number; isUrl?: boolean; icon?: string }>
+    Array<{
+      label: string;
+      value: string | number;
+      isUrl?: boolean;
+      icon?: string;
+    }>
   > = {
     [ContentType.Text]: [
       { label: "Characters", value: (getInfo.value as InfoText).characters },
@@ -818,7 +912,7 @@ const infoRows = computed(() => {
     ],
     [ContentType.Link]: [
       ...((getInfo.value as InfoLink).title &&
-        (getInfo.value as InfoLink).title !== "Loading..."
+      (getInfo.value as InfoLink).title !== "Loading..."
         ? [{ label: "Title", value: (getInfo.value as InfoLink).title || "" }]
         : []),
       { label: "URL", value: (getInfo.value as InfoLink).url, isUrl: true },
diff --git a/pages/settings.vue b/pages/settings.vue
index 4bbf980..c4286d3 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -45,7 +45,6 @@
           <div
             @blur="onBlur"
             @focus="onFocus"
-            @keydown="onKeyDown"
             class="keybind-input"
             ref="keybindInput"
             tabindex="0"
@@ -75,7 +74,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, reactive, ref } from "vue";
+import { onMounted, onUnmounted, reactive, ref, watch } from "vue";
 import { platform } from "@tauri-apps/plugin-os";
 import { useRouter } from "vue-router";
 import { KeyValues, KeyLabels } from "../types/keys";
@@ -88,14 +87,14 @@ const activeModifiers = reactive<Set<KeyValues>>(new Set());
 const isKeybindInputFocused = ref(false);
 const keybind = ref<KeyValues[]>([]);
 const keybindInput = ref<HTMLElement | null>(null);
-const lastBlurTime = ref(0);
 const blurredByEscape = ref(false);
-const os = ref("");
 const router = useRouter();
 const showEmptyKeybindError = ref(false);
 const autostart = ref(false);
 const { $settings, $keyboard } = useNuxtApp();
 
+const listeners: Array<() => void> = [];
+
 const modifierKeySet = new Set([
   KeyValues.AltLeft,
   KeyValues.AltRight,
@@ -115,15 +114,15 @@ const keyToLabel = (key: KeyValues): string => {
   return KeyLabels[key] || key;
 };
 
-const updateKeybind = () => {
+const updateKeybindDisplay = () => {
   const modifiers = Array.from(activeModifiers);
   const nonModifiers = keybind.value.filter((key) => !isModifier(key));
-  keybind.value = [...modifiers, ...nonModifiers];
+  const sortedModifiers = modifiers.sort();
+  keybind.value = [...sortedModifiers, ...nonModifiers];
 };
 
 const onBlur = () => {
   isKeybindInputFocused.value = false;
-  lastBlurTime.value = Date.now();
   showEmptyKeybindError.value = false;
 };
 
@@ -133,35 +132,39 @@ const onFocus = () => {
   activeModifiers.clear();
   keybind.value = [];
   showEmptyKeybindError.value = false;
-};
 
-const onKeyDown = (event: KeyboardEvent) => {
-  const key = event.code as KeyValues;
+  const unlistenAll = $keyboard.listen([$keyboard.Key.All], (event: KeyboardEvent) => {
+    event.preventDefault();
+    event.stopPropagation();
+    const key = event.code as KeyValues;
 
-  if (key === KeyValues.Escape) {
-    if (keybindInput.value) {
+    if (key === KeyValues.Escape) {
       blurredByEscape.value = true;
-      keybindInput.value.blur();
-      event.preventDefault();
-      event.stopPropagation();
+      keybindInput.value?.blur();
+      return;
     }
-    return;
-  }
 
-  if (isModifier(key)) {
-    activeModifiers.add(key);
-  } else if (!keybind.value.includes(key)) {
-    keybind.value = keybind.value.filter((k) => isModifier(k));
-    keybind.value.push(key);
-  }
-
-  updateKeybind();
-  showEmptyKeybindError.value = false;
+    if (isModifier(key)) {
+      activeModifiers.add(key);
+    } else {
+      const nonModifierKey = keybind.value.find(k => !isModifier(k));
+      if (!nonModifierKey || nonModifierKey === key) {
+         keybind.value = Array.from(activeModifiers);
+         if (nonModifierKey !== key) keybind.value.push(key);
+      } else {
+        keybind.value = [ ...Array.from(activeModifiers), key];
+      }
+    }
+    updateKeybindDisplay();
+    showEmptyKeybindError.value = false;
+  }, { prevent: true });
+  listeners.push(unlistenAll);
 };
 
 const saveKeybind = async () => {
-  if (keybind.value.length > 0) {
-    await $settings.saveSetting("keybind", JSON.stringify(keybind.value));
+  const finalKeybind = keybind.value.filter(k => k);
+  if (finalKeybind.length > 0) {
+    await $settings.saveSetting("keybind", JSON.stringify(finalKeybind));
     router.push("/");
   } else {
     showEmptyKeybindError.value = true;
@@ -177,67 +180,27 @@ const toggleAutostart = async () => {
   await $settings.saveSetting("autostart", autostart.value ? "true" : "false");
 };
 
-os.value = platform();
-
 onMounted(async () => {
-  $keyboard.setupKeybindCapture({
-    onCapture: (key: string) => {
-      if (isKeybindInputFocused.value) {
-        const keyValue = key as KeyValues;
-        
-        if (isModifier(keyValue)) {
-          activeModifiers.add(keyValue);
-        } else if (!keybind.value.includes(keyValue)) {
-          keybind.value = keybind.value.filter((k) => isModifier(k));
-          keybind.value.push(keyValue);
-        }
-        
-        updateKeybind();
-        showEmptyKeybindError.value = false;
-      }
-    },
-    onComplete: () => {
-      if (isKeybindInputFocused.value) {
-        keybindInput.value?.blur();
-      } else {
+  autostart.value = (await $settings.getSetting("autostart")) === "true";
+
+  const metaOrCtrlKey = $keyboard.currentOS === "macos" ? $keyboard.Key.Meta : $keyboard.Key.Control;
+  listeners.push(
+    $keyboard.listen([metaOrCtrlKey, $keyboard.Key.Enter], saveKeybind, { prevent: true, ignoreIfEditable: true })
+  );
+
+  listeners.push(
+    $keyboard.listen([$keyboard.Key.Escape], () => {
+      if (!isKeybindInputFocused.value && !blurredByEscape.value) {
         router.push("/");
       }
-    }
-  });
-
-  if (os.value === "macos") {
-    $keyboard.on("settings", [$keyboard.Key.LeftMeta, $keyboard.Key.Enter], () => {
-      saveKeybind();
-    }, { priority: $keyboard.PRIORITY.HIGH });
-    
-    $keyboard.on("settings", [$keyboard.Key.RightMeta, $keyboard.Key.Enter], () => {
-      saveKeybind();
-    }, { priority: $keyboard.PRIORITY.HIGH });
-  } else {
-    $keyboard.on("settings", [$keyboard.Key.LeftControl, $keyboard.Key.Enter], () => {
-      saveKeybind();
-    }, { priority: $keyboard.PRIORITY.HIGH });
-    
-    $keyboard.on("settings", [$keyboard.Key.RightControl, $keyboard.Key.Enter], () => {
-      saveKeybind();
-    }, { priority: $keyboard.PRIORITY.HIGH });
-  }
-
-  $keyboard.on("settings", [$keyboard.Key.Escape], () => {
-    if (!isKeybindInputFocused.value && !blurredByEscape.value) {
-      router.push("/");
-    }
-    blurredByEscape.value = false;
-  }, { priority: $keyboard.PRIORITY.HIGH });
-
-  $keyboard.disableContext("main");
-  $keyboard.enableContext("settings");
-  
-  autostart.value = (await $settings.getSetting("autostart")) === "true";
+      if(blurredByEscape.value) blurredByEscape.value = false; 
+    }, { prevent: true })
+  );
 });
 
 onUnmounted(() => {
-  $keyboard.disableContext("settings");
+  listeners.forEach(unlisten => unlisten());
+  listeners.length = 0;
 });
 </script>
 
diff --git a/plugins/keyboard.ts b/plugins/keyboard.ts
index 17e8d63..dfc7d44 100644
--- a/plugins/keyboard.ts
+++ b/plugins/keyboard.ts
@@ -1,281 +1,27 @@
-import { Key, keyboard } from "wrdu-keyboard";
 import { platform } from "@tauri-apps/plugin-os";
-
-type KeyboardHandler = (event: KeyboardEvent) => void;
-
-const activeContexts = new Set<string>();
-const handlersByContext: Record<
-  string,
-  Array<{
-    keys: Key[];
-    callback: KeyboardHandler;
-    prevent: boolean;
-    priority?: number;
-  }>
-> = {};
-
-const PRIORITY = {
-  HIGH: 100,
-  MEDIUM: 50,
-  LOW: 0,
-};
-
-let currentOS = "windows";
-
-const useKeyboard = {
-  PRIORITY,
-
-  registerContext: (contextName: string) => {
-    if (!handlersByContext[contextName]) {
-      handlersByContext[contextName] = [];
-    }
-  },
-
-  enableContext: (contextName: string) => {
-    if (!handlersByContext[contextName]) {
-      useKeyboard.registerContext(contextName);
-    }
-    activeContexts.add(contextName);
-
-    initKeyboardHandlers();
-  },
-
-  disableContext: (contextName: string) => {
-    activeContexts.delete(contextName);
-
-    initKeyboardHandlers();
-  },
-
-  on: (
-    contextName: string,
-    keys: Key[],
-    callback: KeyboardHandler,
-    options: { prevent?: boolean; priority?: number } = {}
-  ) => {
-    if (!handlersByContext[contextName]) {
-      useKeyboard.registerContext(contextName);
-    }
-
-    const existingHandlerIndex = handlersByContext[contextName].findIndex(
-      (handler) =>
-        handler.keys.length === keys.length &&
-        handler.keys.every((key, i) => key === keys[i]) &&
-        handler.callback.toString() === callback.toString()
-    );
-
-    if (existingHandlerIndex !== -1) {
-      handlersByContext[contextName][existingHandlerIndex] = {
-        keys,
-        callback,
-        prevent: options.prevent ?? true,
-        priority: options.priority ?? PRIORITY.LOW,
-      };
-    } else {
-      handlersByContext[contextName].push({
-        keys,
-        callback,
-        prevent: options.prevent ?? true,
-        priority: options.priority ?? PRIORITY.LOW,
-      });
-    }
-
-    if (activeContexts.has(contextName)) {
-      initKeyboardHandlers();
-    }
-  },
-
-  clearAll: () => {
-    keyboard.clear();
-  },
-
-  setupAppShortcuts: (options: {
-    onNavigateUp?: () => void;
-    onNavigateDown?: () => void;
-    onSelect?: () => void;
-    onEscape?: () => void;
-    onToggleActions?: () => void;
-    contextName?: string;
-    priority?: number;
-  }) => {
-    const {
-      onNavigateUp,
-      onNavigateDown,
-      onSelect,
-      onEscape,
-      onToggleActions,
-      contextName = "app",
-      priority = PRIORITY.LOW,
-    } = options;
-
-    if (!handlersByContext[contextName]) {
-      useKeyboard.registerContext(contextName);
-    }
-
-    if (onNavigateUp) {
-      useKeyboard.on(contextName, [Key.UpArrow], () => onNavigateUp(), {
-        priority,
-      });
-    }
-
-    if (onNavigateDown) {
-      useKeyboard.on(contextName, [Key.DownArrow], () => onNavigateDown(), {
-        priority,
-      });
-    }
-
-    if (onSelect) {
-      useKeyboard.on(contextName, [Key.Enter], () => onSelect(), { priority });
-    }
-
-    if (onEscape) {
-      useKeyboard.on(contextName, [Key.Escape], () => onEscape(), { priority });
-    }
-
-    if (onToggleActions) {
-      const togglePriority = Math.max(priority, PRIORITY.HIGH);
-
-      if (currentOS === "macos") {
-        useKeyboard.on(
-          contextName,
-          [Key.LeftMeta, Key.K],
-          () => onToggleActions(),
-          { priority: togglePriority }
-        );
-        useKeyboard.on(
-          contextName,
-          [Key.RightMeta, Key.K],
-          () => onToggleActions(),
-          { priority: togglePriority }
-        );
-      } else {
-        useKeyboard.on(
-          contextName,
-          [Key.LeftControl, Key.K],
-          () => onToggleActions(),
-          { priority: togglePriority }
-        );
-        useKeyboard.on(
-          contextName,
-          [Key.RightControl, Key.K],
-          () => onToggleActions(),
-          { priority: togglePriority }
-        );
-      }
-    }
-  },
-
-  setupKeybindCapture: (options: {
-    onCapture: (key: string) => void;
-    onComplete: () => void;
-  }) => {
-    const { onCapture, onComplete } = options;
-
-    keyboard.prevent.down([Key.All], (event: KeyboardEvent) => {
-      if (event.code === "Escape") {
-        onComplete();
-        return;
-      }
-      onCapture(event.code);
-    });
-  },
-};
-
-const initKeyboardHandlers = () => {
-  keyboard.clear();
-
-  let allHandlers: Array<{
-    keys: Key[];
-    callback: KeyboardHandler;
-    prevent: boolean;
-    priority: number;
-    contextName: string;
-  }> = [];
-
-  for (const contextName of activeContexts) {
-    const handlers = handlersByContext[contextName] || [];
-    allHandlers = [
-      ...allHandlers,
-      ...handlers.map((handler) => ({
-        ...handler,
-        priority: handler.priority ?? PRIORITY.LOW,
-        contextName,
-      })),
-    ];
-  }
-
-  allHandlers.sort((a, b) => b.priority - a.priority);
-
-  const handlersByKeyCombination: Record<
-    string,
-    Array<(typeof allHandlers)[0]>
-  > = {};
-
-  allHandlers.forEach((handler) => {
-    const keyCombo = handler.keys.sort().join("+");
-    if (!handlersByKeyCombination[keyCombo]) {
-      handlersByKeyCombination[keyCombo] = [];
-    }
-    handlersByKeyCombination[keyCombo].push(handler);
-  });
-
-  Object.entries(handlersByKeyCombination).forEach(([_keyCombo, handlers]) => {
-    handlers.sort((a, b) => b.priority - a.priority);
-    const handler = handlers[0];
-
-    const wrappedCallback: KeyboardHandler = (event) => {
-      const isMetaCombo =
-        handler.keys.length > 1 &&
-        (handler.keys.includes(Key.LeftMeta) ||
-          handler.keys.includes(Key.RightMeta) ||
-          handler.keys.includes(Key.LeftControl) ||
-          handler.keys.includes(Key.RightControl));
-
-      const isNavigationKey =
-        event.key === "ArrowUp" ||
-        event.key === "ArrowDown" ||
-        event.key === "Enter" ||
-        event.key === "Escape";
-
-      const isInInput =
-        event.target instanceof HTMLInputElement ||
-        event.target instanceof HTMLTextAreaElement;
-
-      if (
-        (isMetaCombo || isNavigationKey || !isInInput) &&
-        activeContexts.has(handler.contextName)
-      ) {
-        handler.callback(event);
-      }
-    };
-
-    if (handler.prevent) {
-      keyboard.prevent.down(handler.keys, wrappedCallback);
-    } else {
-      keyboard.down(handler.keys, wrappedCallback);
-    }
-  });
-};
+import { useKeyboard, Key } from "@waradu/keyboard";
 
 export default defineNuxtPlugin(async (nuxtApp) => {
+  const keyboardInstance = useKeyboard();
+  let currentOS = "windows";
   try {
-    const osName = platform();
+    const osName = await Promise.resolve(platform());
     currentOS = osName.toLowerCase().includes("mac") ? "macos" : "windows";
   } catch (error) {
     console.error("Error detecting platform:", error);
   }
 
-  initKeyboardHandlers();
-
-  nuxtApp.hook("page:finish", () => {
-    initKeyboardHandlers();
+  // Defer initialization until the app is mounted
+  nuxtApp.hook('app:mounted', () => {
+    keyboardInstance.init();
   });
 
-  return {
-    provide: {
-      keyboard: {
-        ...useKeyboard,
-        Key,
-      },
-    },
-  };
+  nuxtApp.provide('keyboard', {
+    listen: keyboardInstance.listen.bind(keyboardInstance),
+    init: keyboardInstance.init.bind(keyboardInstance),
+    Key,
+    currentOS,
+    // Provide a clear method if users need to manually clear all listeners from the instance
+    clearAll: keyboardInstance.clear ? keyboardInstance.clear.bind(keyboardInstance) : () => { console.warn('@waradu/keyboard instance does not have a clear method'); }
+  });
 });
diff --git a/types/keyboard.d.ts b/types/keyboard.d.ts
new file mode 100644
index 0000000..62d26e4
--- /dev/null
+++ b/types/keyboard.d.ts
@@ -0,0 +1,27 @@
+import type { Key as WaraduKey, useKeyboard } from '@waradu/keyboard';
+
+declare module '#app' {
+  interface NuxtApp {
+    $keyboard: {
+      listen: ReturnType<typeof useKeyboard>['listen'];
+      init: ReturnType<typeof useKeyboard>['init'];
+      Key: typeof WaraduKey;
+      currentOS: string;
+      clearAll: () => void;
+    };
+  }
+}
+
+declare module 'vue' {
+  interface ComponentCustomProperties {
+    $keyboard: {
+      listen: ReturnType<typeof useKeyboard>['listen'];
+      init: ReturnType<typeof useKeyboard>['init'];
+      Key: typeof WaraduKey;
+      currentOS: string;
+      clearAll: () => void;
+    };
+  }
+}
+
+export {};
\ No newline at end of file