diff --git a/index.html b/index.html
deleted file mode 100644
index a67f551..0000000
--- a/index.html
+++ /dev/null
@@ -1,96 +0,0 @@
-📖 SwissFEL Photon Diagnostics Wiki
-These pages act as a user guide and configuration record for photon diagnostic devices at SwissFEL.
-They are continuously updated. For comments, suggestions, or corrections, contact:
-📩 christopher.arrell@psi.ch
-
-
-
-🔹 Aramis – The Hard X-ray FEL
-Beamlines: Alvra, Bernina, Cristallina
-
-
-
-
- | Category |
- Overview |
- Synoptic icon |
-
-
-
-
- | Spatial |
- Diagnostics for spatial beam properties |
-  |
-
-
- | Intensity |
- Measuring beam intensity |
-  |
-
-
- | Spectral |
- Spectral measurements and analysis |
-  |
-
-
- | Temporal |
- Timing and synchronization diagnostics |
-  |
-
-
- | Contacts |
- List of contacts for Aramis diagnostics |
- 📞 |
-
-
-
-
-
-
-🔹 Athos – The Soft X-ray FEL
-Beamlines: Diavolezza, Maloja, Furka
-
-
-
-
- | Category |
- Overview |
- Synoptic icon |
-
-
-
-
- | Spatial |
- Diagnostics for spatial beam properties |
- |
-
-
- | Intensity |
- Measuring beam intensity |
-  |
-
-
- | Spectral |
- Spectral measurements and analysis |
- |
-
-
- | Contacts |
- List of contacts for Athos diagnostics |
- 📞 |
-
-
-
-
-
-
-General Resources
-
-
-
diff --git a/index.md b/index.md
new file mode 100644
index 0000000..b4b647a
--- /dev/null
+++ b/index.md
@@ -0,0 +1,41 @@
+# 📖 SwissFEL Photon Diagnostics Wiki
+These pages act as a **user guide and configuration record** for photon diagnostic devices at SwissFEL.
+They are continuously updated. For **comments, suggestions, or corrections**, contact:
+📩 [christopher.arrell@psi.ch](mailto:christopher.arrell@psi.ch)
+
+---
+
+## 🔹 **Aramis** – The Hard X-ray FEL
+### **Beamlines**: Alvra, Bernina, Cristallina
+
+| **Category** | **Overview** | **Synoptic icon** |
+|---------------|-------------|-------------|
+| **[Spatial](/photon-diagnostics/swissfel-photon-diagnostics-guide/-/wikis/Aramis-spatial-diagnostics/Overview)** | Diagnostics for spatial beam properties | |
+| **[Intensity](Aramis-Intensity-Diagnostics/Overview)** | Measuring beam intensity ||
+| **[Spectral](Aramis-spectral-diagnostics/Overview)** | Spectral measurements and analysis ||
+| **[Temporal](Aramis-temporal-diagnostics/Overview)** | Timing and synchronization diagnostics ||
+| **[Contacts](Aramis Contacts)** | List of contacts for Aramis diagnostics |:telephone_receiver:|
+
+---
+
+## 🔹 **Athos** – The Soft X-ray FEL
+### **Beamlines**: Diavolezza, Maloja, Furka
+
+| **Category** | **Overview** | **Synoptic icon** |
+|---------------|-------------|-------------|
+| **[Spatial](/photon-diagnostics/swissfel-photon-diagnostics-guide/-/wikis/Athos-spatial-diagnostics/Overview)** | Diagnostics for spatial beam properties | |
+| **[Intensity](Athos-Intensity-Diagnostics/Overview)** | Measuring beam intensity | |
+| **[Spectral](/photon-diagnostics/swissfel-photon-diagnostics-guide/-/wikis/Athos-spectral-diagnostics/Overview)** | Spectral measurements and analysis | |
+| **[Contacts](Athos Contacts)** | List of contacts for Athos diagnostics | :telephone_receiver:|
+
+---
+
+## **General Resources**
+- **[Web App General](Web app general)** – Overview of the web interface
+- **[Web App Startup](Web app startup)** – Initial setup guide
+- **[Beamline General](Beamline general)** – General information on beamline setups
+- **[Pipeline Server Guide](Pipeline server)** – Pipeline server configuration
+- **[A Chat About Saving Data](A chat about saving data)** – Data management discussions
+
+---
+