diff --git a/src/pages/details/resources.mdx b/src/pages/details/resources.mdx
index cf0f6c3..abe63fe 100644
--- a/src/pages/details/resources.mdx
+++ b/src/pages/details/resources.mdx
@@ -25,9 +25,9 @@ The [DataPLANT Knowledge Base](https://knowledgebase.nfdi4plants.org/) explains
 
 Some highlighted articles:
 
-- [Research Data management](https://nfdi4plants.github.io/nfdi4plants.knowledgebase/docs/fundamentals/ResearchDataManagement.html)
-- [Ontology Service Landscape](https://nfdi4plants.github.io/nfdi4plants.knowledgebase/docs/implementation/OntologyServiceLandscape.html)
-- [Teaching materials](https://nfdi4plants.github.io/nfdi4plants.knowledgebase/docs/teaching-materials/index.html)
+- [Research Data management](https://nfdi4plants.github.io/nfdi4plants.knowledgebase/fundamentals/research-data-management/)
+- [Ontology Service Landscape](https://nfdi4plants.github.io/nfdi4plants.knowledgebase/fundamentals/ontology-service-landscape/)
+- [Getting started guide](https://nfdi4plants.github.io/nfdi4plants.knowledgebase/start-here/)
 
 ### ARC Dictionary
 
diff --git a/src/pages/details/tools-and-services/ARCCommander.md b/src/pages/details/tools-and-services/ARCCommander.md
index 27ce1a0..be1967e 100644
--- a/src/pages/details/tools-and-services/ARCCommander.md
+++ b/src/pages/details/tools-and-services/ARCCommander.md
@@ -10,10 +10,10 @@ tags:
 website:
 repo: https://github.com/nfdi4plants/ARCCommander
 readMore:
-  - text: ARCCommander intro
-    link: https://www.nfdi4plants.de/nfdi4plants.knowledgebase/docs/implementation/ArcCommander.html
+  # - text: ARCCommander intro
+  #   link: https://www.nfdi4plants.de/nfdi4plants.knowledgebase/docs/implementation/ArcCommander.html
   - text: ARCCommander manual
-    link: https://www.nfdi4plants.de/nfdi4plants.knowledgebase/docs/ArcCommanderManual/index.html
+    link: https://www.nfdi4plants.de/nfdi4plants.knowledgebase/arc-commander
   - text: "ARCCommander dev docs" 
     link: https://nfdi4plants.github.io/arcCommander-docs/
 ---
diff --git a/src/pages/details/tools-and-services/ARChive.md b/src/pages/details/tools-and-services/ARChive.md
index c8b147b..19d40f8 100644
--- a/src/pages/details/tools-and-services/ARChive.md
+++ b/src/pages/details/tools-and-services/ARChive.md
@@ -12,7 +12,7 @@ tags:
 website: https://archive.nfdi4plants.org
 repo: 
 readMore:
-  - { text: "DataPLANT publication manual", url: "https://nfdi4plants.org/nfdi4plants.knowledgebase/docs/DataHUB-Manual/datahub-data-publications.html" }
+  - { text: "DataPLANT publication manual", url: "https://nfdi4plants.github.io/nfdi4plants.knowledgebase/datahub/data-publications/" }
 ---
 
 A data publication repository for ARCs with integrated DOI minting.
diff --git a/src/pages/details/tools-and-services/ARCitect.md b/src/pages/details/tools-and-services/ARCitect.md
index 98d025f..5d6ad11 100644
--- a/src/pages/details/tools-and-services/ARCitect.md
+++ b/src/pages/details/tools-and-services/ARCitect.md
@@ -9,7 +9,7 @@ website:
 repo: https://github.com/nfdi4plants/ARCitect
 readMore: 
   - text: ARCitect manual
-    url: https://nfdi4plants.org/nfdi4plants.knowledgebase/docs/ARCitect-Manual/index.html
+    url: https://nfdi4plants.org/nfdi4plants.knowledgebase/arcitect
 ---
 
 **An end-to-end GUI application to manage ARCs.** The ARCitect bundles many of the individual tools from DataPLANT into a single GUI application.
diff --git a/src/pages/details/tools-and-services/PLANTdataHUB.md b/src/pages/details/tools-and-services/PLANTdataHUB.md
index 0360949..d3017c9 100644
--- a/src/pages/details/tools-and-services/PLANTdataHUB.md
+++ b/src/pages/details/tools-and-services/PLANTdataHUB.md
@@ -12,8 +12,7 @@ tags:
 website: git.nfdi4plants.org
 repo: https://github.com/nfdi4plants/DataHUB
 readMore: 
-  - { text: "DataHUB intro", url: "https://www.nfdi4plants.de/nfdi4plants.knowledgebase/docs/implementation/DataHub.html" }
-  - { text: "DataHUB manual", url: "https://nfdi4plants.org/nfdi4plants.knowledgebase/docs/DataHUB-Manual/index.html" }
+  - { text: "DataHUB manual", url: "https://www.nfdi4plants.org/nfdi4plants.knowledgebase/datahub" }
 ---
 
 Reference implementation of the [ARC Data Hub concept]({{INTERNAL_DEV_ARC_DATA_HUB}}) as a **collaborative cloud repository for ARCs** based on GitLab.Contains self-hosting and federation options.
diff --git a/src/pages/details/tools-and-services/SWATE.md b/src/pages/details/tools-and-services/SWATE.md
index 5e83565..763fe98 100644
--- a/src/pages/details/tools-and-services/SWATE.md
+++ b/src/pages/details/tools-and-services/SWATE.md
@@ -9,8 +9,7 @@ tags: []
 website: https://swate-alpha.nfdi4plants.org/
 repo: https://github.com/nfdi4plants/Swate
 readMore:
-  - { text: "Swate intro", url: "https://www.nfdi4plants.de/nfdi4plants.knowledgebase/docs/implementation/Swate.html" }
-  - { text: "Swate manual", url: "https://www.nfdi4plants.de/nfdi4plants.knowledgebase/docs/SwateManual/index.html" }
+  - { text: "Swate manual", url: "https://www.nfdi4plants.org/nfdi4plants.knowledgebase/swate" }
 ---
 
 Swate is a tool for **ontology-driven metadata annotation**.