diff --git a/src/plugins/holynotes/components/modals/HelpModal.tsx b/src/plugins/holynotes/components/modals/HelpModal.tsx
index 9899a333d..508273171 100644
--- a/src/plugins/holynotes/components/modals/HelpModal.tsx
+++ b/src/plugins/holynotes/components/modals/HelpModal.tsx
@@ -8,7 +8,7 @@ import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, M
 import { findByProps } from "@webpack";
 import { Button, Forms, Text } from "@webpack/common";
 
-import noteHandler from "../../noteHandler";
+import noteHandler from "../../NoteHandler";
 import { downloadNotes, uploadNotes } from "../../utils";
 
 export default ({ onClose, ...modalProps }: ModalProps & { onClose: () => void; }) => {
@@ -62,7 +62,6 @@ export default ({ onClose, ...modalProps }: ModalProps & { onClose: () => void;
                         onClick={() => {
                             noteHandler.refreshAvatars();
                         }}>Refresh Avatars</Button>
-
                     <Button
                         look={Button.Looks.FILLED}
                         color={Button.Colors.GREEN}
diff --git a/src/plugins/holynotes/components/modals/NoteBookTab.tsx b/src/plugins/holynotes/components/modals/NoteBookTab.tsx
index c6561c635..672c04c09 100644
--- a/src/plugins/holynotes/components/modals/NoteBookTab.tsx
+++ b/src/plugins/holynotes/components/modals/NoteBookTab.tsx
@@ -5,7 +5,7 @@
  */
 
 import { classes } from "@utils/misc";
-import { findByProps } from "@webpack";
+import { findByCode } from "@webpack";
 import { Button, Clickable, Menu, Popout, React } from "@webpack/common";
 
 import { SvgOverFlowIcon } from "../icons/overFlowIcon";
@@ -20,8 +20,11 @@ export function NoteBookTabs({ tabs, selectedTabId, onSelectTab }: { tabs: strin
     const resizeObserverRef = React.useRef<ResizeObserver | null>(null);
     const [show, setShow] = React.useState(false);
 
-    const { isNotNullish } = findByProps("isNotNullish");
-    const { overflowIcon } = findByProps("overflowIcon");
+    function isNotNullish(value) {
+        return value !== null && value !== undefined;
+    }
+
+    const { overflowIcon } = findByCode("overflowIcon");
 
     const handleResize = React.useCallback(() => {
         if (!tabBarRef.current) return;
diff --git a/src/plugins/holynotes/components/modals/Notebook.tsx b/src/plugins/holynotes/components/modals/Notebook.tsx
index 412063443..bf62280eb 100644
--- a/src/plugins/holynotes/components/modals/Notebook.tsx
+++ b/src/plugins/holynotes/components/modals/Notebook.tsx
@@ -10,7 +10,7 @@ import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, M
 import { findByProps } from "@webpack";
 import { ContextMenuApi, Flex, FluxDispatcher, Menu, React, Text, TextInput } from "@webpack/common";
 
-import noteHandler from "../../noteHandler";
+import noteHandler from "../../NoteHandler";
 import { HolyNotes } from "../../types";
 import HelpIcon from "../icons/HelpIcon";
 import Errors from "./Error";
diff --git a/src/plugins/holynotes/components/modals/NotebookCreateModal.tsx b/src/plugins/holynotes/components/modals/NotebookCreateModal.tsx
index fc1269b91..41ddf13b7 100644
--- a/src/plugins/holynotes/components/modals/NotebookCreateModal.tsx
+++ b/src/plugins/holynotes/components/modals/NotebookCreateModal.tsx
@@ -7,9 +7,9 @@
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
 import { Button, React, Text, TextInput } from "@webpack/common";
 
-import noteHandler from "../../noteHandler";
+import noteHandler from "../../NoteHandler";
 
-export default (props: ModalProps & { onClose: () => void }) => {
+export default (props: ModalProps & { onClose: () => void; }) => {
     const [notebookName, setNotebookName] = React.useState("");
 
     const handleCreateNotebook = React.useCallback(() => {
diff --git a/src/plugins/holynotes/components/modals/NotebookDeleteModal.tsx b/src/plugins/holynotes/components/modals/NotebookDeleteModal.tsx
index 2813aca7e..c4df05d54 100644
--- a/src/plugins/holynotes/components/modals/NotebookDeleteModal.tsx
+++ b/src/plugins/holynotes/components/modals/NotebookDeleteModal.tsx
@@ -8,7 +8,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
 import { Button, React, Text } from "@webpack/common";
 
-import noteHandler from "../../noteHandler";
+import noteHandler from "../../NoteHandler";
 import Error from "./Error";
 import { RenderMessage } from "./RenderMessage";
 
diff --git a/src/plugins/holynotes/components/modals/RenderMessage.tsx b/src/plugins/holynotes/components/modals/RenderMessage.tsx
index 49a08c574..513164010 100644
--- a/src/plugins/holynotes/components/modals/RenderMessage.tsx
+++ b/src/plugins/holynotes/components/modals/RenderMessage.tsx
@@ -6,10 +6,10 @@
 
 import { classes } from "@utils/misc";
 import { ModalProps } from "@utils/modal";
-import { findByCode, findByProps } from "@webpack";
+import { findByCode, findByCodeLazy, findByProps, findComponentByCodeLazy } from "@webpack";
 import { Clipboard, ContextMenuApi, FluxDispatcher, Menu, NavigationRouter, React } from "@webpack/common";
 
-import noteHandler from "../../noteHandler";
+import noteHandler from "../../NoteHandler";
 import { HolyNotes } from "../../types";
 
 
@@ -26,11 +26,14 @@ export const RenderMessage = ({
     fromDeleteModal: boolean;
     closeModal?: () => void;
 }) => {
-    const ChannelMessage = findByProps("ThreadStarterChatMessage").default;
+    // Bad
+    const ChannelMessage = findComponentByCodeLazy("Message must not be a thread");
     const { message, groupStart, cozyMessage } = findByProps("cozyMessage");
     const User = findByCode("isClyde(){");
     const Message = findByCode("isEdited(){");
-    const Channel = findByProps("ChannelRecordBase").ChannelRecordBase;
+
+    // Bad
+    const Channel = findByCodeLazy("computeLurkerPermissionsAllowList");
 
     const [isHoldingDelete, setHoldingDelete] = React.useState(false);
 
diff --git a/src/plugins/holynotes/index.tsx b/src/plugins/holynotes/index.tsx
index f1a5406e2..6897d0f09 100644
--- a/src/plugins/holynotes/index.tsx
+++ b/src/plugins/holynotes/index.tsx
@@ -32,7 +32,7 @@ import { Message } from "discord-types/general";
 
 import { Popover as NoteButtonPopover, Popover } from "./components/icons/NoteButton";
 import { NoteModal } from "./components/modals/Notebook";
-import noteHandler, { noteHandlerCache } from "./noteHandler";
+import noteHandler, { noteHandlerCache } from "./NoteHandler";
 import { DataStoreToCache, HolyNoteStore } from "./utils";
 
 const HeaderBarIcon = findExportedComponentLazy("Icon", "Divider");
@@ -129,4 +129,3 @@ export default definePlugin({
         removeButton("HolyNotes");
     }
 });
-
diff --git a/src/plugins/holynotes/noteHandler.ts b/src/plugins/holynotes/noteHandler.ts
index 68eac8769..d80f42827 100644
--- a/src/plugins/holynotes/noteHandler.ts
+++ b/src/plugins/holynotes/noteHandler.ts
@@ -144,8 +144,6 @@ export default new (class NoteHandler {
 
         const User = findByCode("tag", "isClyde");
 
-
-
         for (const notebook in notebooks)
             for (const noteId in notebooks[notebook]) {
                 const note = notebooks[notebook][noteId];
@@ -211,4 +209,3 @@ export default new (class NoteHandler {
 
     };
 });
-
diff --git a/src/plugins/holynotes/utils.ts b/src/plugins/holynotes/utils.ts
index e7dffc7ea..0ca66f309 100644
--- a/src/plugins/holynotes/utils.ts
+++ b/src/plugins/holynotes/utils.ts
@@ -8,7 +8,7 @@ import { createStore } from "@api/DataStore";
 import { DataStore } from "@api/index";
 import { Toasts } from "@webpack/common";
 
-import noteHandler, { noteHandlerCache } from "./noteHandler";
+import noteHandler, { noteHandlerCache } from "./NoteHandler";
 import { HolyNotes } from "./types";
 
 export const HolyNoteStore = createStore("HolyNoteData", "HolyNoteStore");
@@ -28,6 +28,7 @@ export async function getFormatedEntries() {
     data.forEach(function (note) {
         notebooks[note[0].toString()] = note[1];
     });
+
     return notebooks;
 }