diff --git a/docs/documentation/aircraft-design.md b/docs/documentation/aircraft-design.md
new file mode 100644
index 0000000000000000000000000000000000000000..bb2e5ad25230202a84d405679eb14cf1895530fa
--- /dev/null
+++ b/docs/documentation/aircraft-design.md
@@ -0,0 +1,13 @@
+# Sizing and analysizing!
+Yoho $M = \frac{2}{5}$
+
+!!! tip
+
+
+!!! danger
+
+
+```mermaid
+  graph LR;
+  A-->B
+```
diff --git a/docs/documentation/sizing.md b/docs/documentation/sizing.md
index bdb7997ad06b7a4019eeb87b4c745bde6a4ae0c4..c8fe9a4c9b4ec0454b1ce1020f7e4438f80c7cf3 100644
--- a/docs/documentation/sizing.md
+++ b/docs/documentation/sizing.md
@@ -95,12 +95,12 @@ The engine will be scaled by the module to match the specific thrust requirement
 Moreover, an engine bucket curve and several engine deck plots can be created.
 Additionally, the propulsion is integrated in relation to the user settings (e.g. integration of the propulsion on the wing or fuselage, ...).
 Depending on the location of the integration, the tool calculates the nacelle and pylon geometry.
-Also the mass properties are analyzed. 
+Also the mass properties are analyzed.
 {.overview-item}
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|3.0.0|:simple-cplusplus: |GPLv3|[Link](propulsion_design/index.html)|
+|3.0.0|:simple-cplusplus: |GPLv3|[Link](propulsion_design/content/index.md)|
 
 ---
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 5c71d87d484abbddbee5e089d1e1a5832d952217..aa4395f722fca68809677d11566c619f3e7d9b8a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -36,7 +36,11 @@ markdown_extensions:
       line_spans: __span                  # Adds spans around lines for custom styling.
       pygments_lang_class: true           # Adds language class to highlighted code for styling consistency.
   - pymdownx.details                      # Enables collapsible details/summary blocks for content hiding/showing.
-  - pymdownx.superfences                  # Adds advanced fence syntax for blocks like code or tabs.
+  - pymdownx.superfences:                 # Adds advanced fence syntax for blocks like code or tabs.
+      custom_fences:
+        - name: mermaid
+          class: mermaid
+          format: !!python/name:pymdownx.superfences.fence_code_format
   - pymdownx.inlinehilite                 # Allows inline code highlighting within text.
   - pymdownx.snippets                     # Enables code snippets for reusing code blocks across pages.
   - pymdownx.critic                       # Adds Critic Markup support for collaborative editing.
@@ -58,8 +62,20 @@ extra_css:
 
 # === Plugins ===
 plugins:
+  - search
+  - mkdoxy:
+      projects:
+        propulsion_design:
+          src-dirs: ../aircraft-design/propulsion_design/
+          full-doc: True
+          output: docs/propulsion_design
+          doxy-cfg:
+            FILE_PATTERNS: "*cpp *.h"
+            RECURSIVE: True
+            EXTRACT_ALL: YES
   - glightbox                             # Plugin for lightbox-style image and content viewing.
 
+
 # === Theme configuration ===
 theme:
   name: material                          # Specifies the theme name (alternatives: material, mkdocs, readthedocs).
@@ -68,9 +84,18 @@ theme:
   custom_dir: overrides                      # Directory for custom files (like footer).
   # Theme colors configuration
   palette:
-    scheme: slate                         # Sets a dark theme style.
-    primary: blue grey                    # Main color of the theme (used for buttons, links, etc.).
-    accent: red                          # Accent color for highlights.
+   - scheme: default
+     toggle:
+       icon: material/brightness-7
+       name: Switch to dark mode
+     primary: blue grey
+     accent: red
+   - scheme: slate
+     toggle:
+       icon: material/brightness-3
+       name: Switch to light mode
+     primary: green
+     accent: red
 
   # Feature configurations for navigation and ToC behavior
   features:
@@ -98,9 +123,27 @@ nav:                                      # Customizes the main navigation struc
       - Seperate Tool Execution: 'tutorials/seperate-tool-execution.md'  # Link to the separate tool execution tutorial page.
   - Documentation:                        # Top-level item for documentation.
       - Overview: 'documentation/overview.md'   # Overview of modules.
-      - Aircraft Design:                  # Subsection for Aircraft Design.
-          - 'documentation/sizing.md'           # Link to sizing module page.
-          - 'documentation/analysis.md'         # Link to analysis module page.
+      - Aircraft Design:
+          - Introduction: documentation/aircraft-design.md                   # Subsection for Aircraft Design.
+          - Sizing:
+            - Modules: documentation/sizing.md
+            - Propulsion Design:
+              - documentation/propulsion_design/content/index.md
+              - documentation/propulsion_design/content/engineeringprinciples.md
+              - documentation/propulsion_design/content/getting-started.md
+              - documentation/propulsion_design/content/softwarearchitecture.md
+              - Tutorial:
+                - documentation/propulsion_design/content/tutorial.md
+                - documentation/propulsion_design/content/tutorial_engine_extension.md
+                - documentation/propulsion_design/content/tutorial_fidelity_extension.md
+              - Additional: documentation/propulsion_design/content/additional.md
+              - API Reference:
+                - propulsion_design/classes.md
+                - propulsion_design/namespaces.md
+                - propulsion_design/files.md
+                - propulsion_design/pages.md
+          - Analsysis:
+            - Modules: 'documentation/analysis.md'         # Link to analysis module page.
       - Libraries: 'documentation/libraries.md' # Link to libraries overview.
       - Utilities: 'documentation/additional-software.md'  # Link to additional software page.
       - Workflow: 'workflow.md'           # Link to the workflow page.