diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index b967ae83..cd42adaf 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -9,14 +9,14 @@ The Aether project is a Svelte and SvelteKit based application, utilizing Tailwi
 * **Frontend Framework:** Svelte 5 and SvelteKit v2
   * **Routing:** SvelteKit's file-system based routing.
 * **Styling:** Tailwind CSS 3.x (with plans to upgrade to 4.x when ShadCN is ready)
-* **UI Component Libraries:**
-  * ShadCN (Tailwind Components)
-  * Skeleton (Design System, Tailwind Components, Functional Components - with plans to upgrade to v3)
-  * Flowbite (Tailwind Components)
-* **Text/Code Editors:**
-  * CodeMirror 6.x (for text and code editing)
-  * Edra (TipTap based Rich Text Editor)
-  * **Note:** ShadEditor TipTap is present but marked for removal, with CodeMirror being the preferred solution.
+*   **UI Component Libraries:**
+    *   Skeleton (Design System, Tailwind Components, Functional Components - with plans to upgrade to v3)
+    *   Flowbite (Tailwind Components)
+    *   **Note:** ShadCN is currently used but is planned for removal.
+*   **Text/Code Editors:**
+    *   CodeMirror 6.x (primary text and code editor, planned for rich text editing)
+    *   Edra (TipTap based Rich Text Editor)
+    *   **Note:** ShadEditor TipTap is present but marked for removal, with CodeMirror being the preferred solution for all text editing needs.
 * **Icons:** Lucide Icons (SVG Icons)
 * **Markdown Parsing:** `marked` library
 * **State Management:** Svelte stores, potentially with `liveQuery` from Dexie for reactive IndexedDB interactions.
diff --git a/COMPONENTS.md b/COMPONENTS.md
index 6ed41aad..232aa4f8 100644
--- a/COMPONENTS.md
+++ b/COMPONENTS.md
@@ -36,9 +36,9 @@ These are reusable components that provide common functionalities across differe
 * **`copy_btn`**: A button to copy content to the clipboard.
   * Properties: `clipboard`, `bind:value`, `btn_text`, `btn_html`.
 * **`txt_editor`**: A basic text area editor.
-* **`md_editor`**: Markdown editor.
-  * Uses CodeMirror.
-  * **Note:** ShadEditor TipTap is present but marked for removal.
+*   **`md_editor`**: Markdown editor.
+    *   Uses CodeMirror (planned for rich text editing).
+    *   **Note:** ShadEditor TipTap is present but marked for removal. ShadCN components are also being phased out in favor of CodeMirror for text editing.
 * **`html_editor`**: HTML editor.
 * **`media_player`**: Component for playing media files.
   * Properties: `hosted_file`, `archive_content`, `media_player`.