diff --git a/.github/workflows/CI-workflows.yaml b/.github/workflows/CI-workflows.yaml
index fb0ea421..696b38c8 100644
--- a/.github/workflows/CI-workflows.yaml
+++ b/.github/workflows/CI-workflows.yaml
@@ -23,13 +23,13 @@ jobs:
         run: phpcbf .
         continue-on-error: ${{ github.ref != 'refs/heads/main' }}
 
-      - name: Commit code formatting changes
-        if: success() && github.ref != 'refs/heads/main'
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git add src
-          git diff --cached --quiet || (git commit -m "Update src from PHP Codesniffer" && git pull origin $(git rev-parse --abbrev-ref HEAD) --rebase --autostash && git push)
+      #- name: Commit code formatting changes
+      #  if: success() && github.ref != 'refs/heads/main'
+      #  run: |
+      #    git config user.name "GitHub Actions"
+      #    git config user.email "actions@github.com"
+      #    git add src
+      #    git diff --cached --quiet || (git commit -m "Update src from PHP Codesniffer" && git pull origin $(git rev-parse --abbrev-ref HEAD) --rebase --autostash && git push)
 
       - name: Run phpcs
         run: phpcs -q --report=checkstyle src | cs2pr
diff --git a/docs/beheerders/directory.md b/docs/beheerders/directory.md
index 1f3d9d28..23467fb3 100644
--- a/docs/beheerders/directory.md
+++ b/docs/beheerders/directory.md
@@ -1 +1,11 @@
 # Directory
+
+De directory vormt het overzicht van alle andere (externe) catalogi die bij jouw installatie bekend zijn. Een Catalogus die bij jouw installatie bekend is noemen een listing (als in is gelist op jouw directory).
+
+## Opzetten federatief netwerk
+
+Directories worden tussen installaties onderling uitgewisseld en geupdate. Je hoeft dus nooit handmatig catalogi van andere toe te voegen aan jouw catalogus.
+
+## Listing
+
+Bij een listing kan je de volgende zaken aanpassen.
diff --git a/lib/Controller/PublicationsController.php b/lib/Controller/PublicationsController.php
index 05f9dd67..2e4e0446 100644
--- a/lib/Controller/PublicationsController.php
+++ b/lib/Controller/PublicationsController.php
@@ -18,18 +18,6 @@
 
 class PublicationsController extends Controller
 {
-    const TEST_ARRAY = [
-        "354980e5-c967-4ba5-989b-65c2b0cd2ff4" => [
-            "id" => "354980e5-c967-4ba5-989b-65c2b0cd2ff4",
-            "name" => "Input voor OpenCatalogi",
-            "summary" => "Dit is een selectie van high-value datasets in DCAT-AP 2.0 standaard x"
-        ],
-        "2ab0011e-9b4c-4c50-a50d-a16fc0be0178" => [
-            "id" => "2ab0011e-9b4c-4c50-a50d-a16fc0be0178",
-            "title" => "Publication two",
-            "description" => "summary for two"
-        ]
-    ];
 
     public function __construct
 	(
diff --git a/src/modals/Modals.vue b/src/modals/Modals.vue
index 2159f0b8..1e1eb9e7 100644
--- a/src/modals/Modals.vue
+++ b/src/modals/Modals.vue
@@ -11,7 +11,7 @@
 		<EditMetaDataPropertyModal />
 		<AddCatalogModal />
 		<EditCatalogModal />
-		<AddListingModal />
+		<AddDirectoryModal />
 		<EditListingModal />
 		<AddPublicationDataModal />
 		<EditPublicationDataModal />
@@ -37,7 +37,7 @@ import EditMetaDataPropertyModal from './metaData/EditMetaDataPropertyModal.vue'
 
 import AddCatalogModal from './catalog/AddCatalogModal.vue'
 import EditCatalogModal from './catalog/EditCatalogModal.vue'
-import AddListingModal from './directory/AddListingModal.vue'
+import AddDirectoryModal from './directory/AddDirectoryModal.vue'
 import EditListingModal from './directory/EditListingModal.vue'
 import AddOrganisationModal from './organisation/AddOrganisationModal.vue'
 import EditOrganisatioModal from './organisation/EditOrganisationModal.vue'
@@ -59,7 +59,7 @@ export default {
 		EditMetaDataPropertyModal,
 		AddCatalogModal,
 		EditCatalogModal,
-		AddListingModal,
+		AddDirectoryModal,
 		EditListingModal,
 		AddPublicationDataModal,
 		EditPublicationDataModal,
diff --git a/src/modals/catalog/AddCatalogModal.vue b/src/modals/catalog/AddCatalogModal.vue
index 80d822c2..79a18012 100644
--- a/src/modals/catalog/AddCatalogModal.vue
+++ b/src/modals/catalog/AddCatalogModal.vue
@@ -41,7 +41,7 @@ import { catalogiStore, navigationStore } from '../../store/store.js'
 				@click="addCatalog">
 				<template #icon>
 					<NcLoadingIcon v-if="loading" :size="20" />
-					<ContentSaveOutline v-if="!loading" :size="20" />
+					<Plus v-if="!loading" :size="20" />
 				</template>
 				Toevoegen
 			</NcButton>
@@ -51,7 +51,7 @@ import { catalogiStore, navigationStore } from '../../store/store.js'
 
 <script>
 import { NcButton, NcModal, NcTextField, NcLoadingIcon, NcNoteCard } from '@nextcloud/vue'
-import ContentSaveOutline from 'vue-material-design-icons/ContentSaveOutline.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
 
 export default {
 	name: 'AddCatalogModal',
@@ -62,7 +62,7 @@ export default {
 		NcLoadingIcon,
 		NcNoteCard,
 		// Icons
-		ContentSaveOutline,
+		Plus,
 	},
 	data() {
 		return {
diff --git a/src/modals/directory/AddListingModal.vue b/src/modals/directory/AddDirectoryModal.vue
similarity index 64%
rename from src/modals/directory/AddListingModal.vue
rename to src/modals/directory/AddDirectoryModal.vue
index 8489bd76..38271305 100644
--- a/src/modals/directory/AddListingModal.vue
+++ b/src/modals/directory/AddDirectoryModal.vue
@@ -4,12 +4,13 @@ import { navigationStore, directoryStore } from '../../store/store.js'
 
 <template>
 	<NcModal
-		v-if="navigationStore.modal === 'addListing'"
+		v-if="navigationStore.modal === 'addDirectory'"
 		ref="modalRef"
 		label-id="addListingModal"
 		@close="navigationStore.setModal(false)">
 		<div class="modal__content">
 			<h2>Directory toevoegen</h2>
+			Je directory bevat alle bij jouw installatie bekende catalogi. Om nieuwe catalogi te ontdekken heb je de directory van een andere (externe) installatie nodig. Nadat deze is opgegeven zullen de twee installaties een federatief netwerk vormen en catalogi blijven uitwisselen.
 			<div v-if="success !== null || error">
 				<NcNoteCard v-if="success" type="success">
 					<p>Listing succesvol toegevoegd</p>
@@ -25,18 +26,24 @@ import { navigationStore, directoryStore } from '../../store/store.js'
 				<NcNoteCard v-if="validateUrlError" type="error">
 					<p>Er is geen valide URL ingevoerd.</p>
 				</NcNoteCard>
-				<NcTextField v-model="directory.url" label="Url" @input="validateUrl" />
+				<NcTextField v-model="directory.directory" label="Url" @input="validateUrl" />
 			</div>
 			<NcButton
 				v-if="success === null"
-				:disabled="!isUrlValid || loading || !directory.url"
+				:disabled="!isUrlValid || loading || !directory.directory"
 				type="primary"
 				@click="addDirectory">
 				<template #icon>
 					<NcLoadingIcon v-if="loading" :size="20" />
-					<ContentSaveOutline v-if="!loading" :size="20" />
+					<Plus v-if="!loading" :size="20" />
 				</template>
-				Submit
+				Toevoegen
+			</NcButton>
+			<NcButton @click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/directory', '_blank')">
+				<template #icon>
+					<HelpCircleOutline :size="20" />
+				</template>
+				Meer informatie over de directory
 			</NcButton>
 		</div>
 	</NcModal>
@@ -44,33 +51,37 @@ import { navigationStore, directoryStore } from '../../store/store.js'
 
 <script>
 import { NcButton, NcModal, NcTextField, NcLoadingIcon, NcNoteCard } from '@nextcloud/vue'
-import ContentSaveOutline from 'vue-material-design-icons/ContentSaveOutline.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
 
 export default {
-	name: 'AddListingModal',
+	name: 'AddDirectoryModal',
 	components: {
 		NcModal,
 		NcTextField,
 		NcButton,
 		NcLoadingIcon,
 		NcNoteCard,
-		ContentSaveOutline,
+		// Icons
+		Plus,
+		HelpCircleOutline,
 	},
 	data() {
 		return {
 			directory: {
-				url: '',
+				directory: '',
 			},
 			loading: false,
 			success: null,
 			error: false,
 			validateUrlError: null,
-			urlPattern: /^(https?:\/\/)?(([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}$/i,
+			// eslint-disable-next-line no-useless-escape
+			urlPattern: /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$/,
 		}
 	},
 	computed: {
 		isUrlValid() {
-			return this.urlPattern.test(this.directory.url)
+			return this.urlPattern.test(this.directory.directory)
 		},
 	},
 	methods: {
@@ -82,16 +93,7 @@ export default {
 				headers: {
 					'Content-Type': 'application/json',
 				},
-				body: JSON.stringify({
-					title: this.title,
-					summary: this.summary,
-					description: this.description,
-					search: this.search,
-					metadata: this.metadata,
-					status: this.status,
-					lastSync: this.lastSync,
-					default: this.defaultValue,
-				}),
+				body: JSON.stringify(this.directory),
 			})
 				.then((response) => {
 					this.loading = false
@@ -105,6 +107,10 @@ export default {
 						this.success = null
 						this.closeModal()
 					}, 2500)
+
+					this.directory = {
+						directory: '',
+					}
 				})
 				.catch((err) => {
 					this.error = err
@@ -115,13 +121,16 @@ export default {
 			navigationStore.setModal(false)
 		},
 		validateUrl(event) {
-			this.directory.url = event.target.value
+			this.directory.directory = event.target.value
 			if (!this.isUrlValid) {
 				this.validateUrlError = 'Er is geen valide URL ingevoerd.'
 			} else {
 				this.validateUrlError = null
 			}
 		},
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
 	},
 }
 </script>
diff --git a/src/modals/metaData/AddMetaDataModal.vue b/src/modals/metaData/AddMetaDataModal.vue
index 09e93574..d18a8cfd 100644
--- a/src/modals/metaData/AddMetaDataModal.vue
+++ b/src/modals/metaData/AddMetaDataModal.vue
@@ -31,7 +31,7 @@ import { navigationStore, metadataStore } from '../../store/store.js'
 				@click="addMetaData">
 				<template #icon>
 					<NcLoadingIcon v-if="loading" :size="20" />
-					<ContentSaveOutline v-if="!loading" :size="20" />
+					<Plus v-if="!loading" :size="20" />
 				</template>
 				Toevoegen
 			</NcButton>
@@ -41,7 +41,7 @@ import { navigationStore, metadataStore } from '../../store/store.js'
 
 <script>
 import { NcButton, NcModal, NcTextField, NcTextArea, NcLoadingIcon, NcNoteCard } from '@nextcloud/vue'
-import ContentSaveOutline from 'vue-material-design-icons/ContentSaveOutline.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
 
 export default {
 	name: 'AddMetaDataModal',
@@ -53,7 +53,7 @@ export default {
 		NcLoadingIcon,
 		NcNoteCard,
 		// Icons
-		ContentSaveOutline,
+		Plus,
 	},
 	data() {
 		return {
diff --git a/src/modals/organisation/AddOrganisationModal.vue b/src/modals/organisation/AddOrganisationModal.vue
index 45251bb3..099710c1 100644
--- a/src/modals/organisation/AddOrganisationModal.vue
+++ b/src/modals/organisation/AddOrganisationModal.vue
@@ -59,9 +59,9 @@ import { navigationStore, organisationStore } from '../../store/store.js'
 				@click="addOrganisation()">
 				<template #icon>
 					<NcLoadingIcon v-if="loading" :size="20" />
-					<ContentSaveOutline v-if="!loading" :size="20" />
+					<Plus v-if="!loading" :size="20" />
 				</template>
-				Opslaan
+				Toevoegen
 			</NcButton>
 		</div>
 	</NcModal>
@@ -76,7 +76,7 @@ import {
 	NcTextArea,
 	NcTextField,
 } from '@nextcloud/vue'
-import ContentSaveOutline from 'vue-material-design-icons/ContentSaveOutline.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
 
 export default {
 	name: 'AddOrganisationModal',
@@ -88,7 +88,7 @@ export default {
 		NcLoadingIcon,
 		NcNoteCard,
 		// Icons
-		ContentSaveOutline,
+		Plus,
 	},
 	data() {
 		return {
diff --git a/src/modals/publication/AddPublicationModal.vue b/src/modals/publication/AddPublicationModal.vue
index 6b53cef5..099246f6 100644
--- a/src/modals/publication/AddPublicationModal.vue
+++ b/src/modals/publication/AddPublicationModal.vue
@@ -89,9 +89,9 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 				@click="addPublication()">
 				<template #icon>
 					<NcLoadingIcon v-if="loading" :size="20" />
-					<ContentSaveOutline v-if="!loading" :size="20" />
+					<Plus v-if="!loading" :size="20" />
 				</template>
-				Opslaan
+				Toevoegen
 			</NcButton>
 		</div>
 	</NcModal>
@@ -109,7 +109,7 @@ import {
 	NcNoteCard,
 	NcDateTimePicker,
 } from '@nextcloud/vue'
-import ContentSaveOutline from 'vue-material-design-icons/ContentSaveOutline.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
 
 export default {
 	name: 'AddPublicationModal',
@@ -124,7 +124,7 @@ export default {
 		NcNoteCard,
 		NcDateTimePicker,
 		// Icons
-		ContentSaveOutline,
+		Plus,
 	},
 	data() {
 		return {
diff --git a/src/modals/theme/AddThemeModal.vue b/src/modals/theme/AddThemeModal.vue
index ee1024ae..6e7343fb 100644
--- a/src/modals/theme/AddThemeModal.vue
+++ b/src/modals/theme/AddThemeModal.vue
@@ -43,9 +43,9 @@ import { navigationStore, themeStore } from '../../store/store.js'
 				@click="addTheme()">
 				<template #icon>
 					<NcLoadingIcon v-if="loading" :size="20" />
-					<ContentSaveOutline v-if="!loading" :size="20" />
+					<Plus v-if="!loading" :size="20" />
 				</template>
-				Opslaan
+				Toevoegen
 			</NcButton>
 		</div>
 	</NcModal>
@@ -60,7 +60,7 @@ import {
 	NcTextArea,
 	NcTextField,
 } from '@nextcloud/vue'
-import ContentSaveOutline from 'vue-material-design-icons/ContentSaveOutline.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
 
 export default {
 	name: 'AddThemeModal',
@@ -72,7 +72,7 @@ export default {
 		NcLoadingIcon,
 		NcNoteCard,
 		// Icons
-		ContentSaveOutline,
+		Plus,
 	},
 	data() {
 		return {
diff --git a/src/navigation/Configuration.vue b/src/navigation/Configuration.vue
index dd1b8b6b..59734691 100644
--- a/src/navigation/Configuration.vue
+++ b/src/navigation/Configuration.vue
@@ -6,7 +6,22 @@
 			</template>
 		</NcAppNavigationItem>
 		<NcAppSettingsDialog :open.sync="settingsOpen" :show-navigation="true" name="Applicatie instellingen">
-			<NcAppSettingsSection id="sharing" name="Opslag" doc-url="zaakafhandel.app">
+			<NcAppSettingsSection id="federation" name="Federatief stelsel" doc-url="https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/directory">
+				<template #icon>
+					<LanConnect :size="20" />
+				</template>
+				<NcCheckboxRadioSwitch :checked.sync="configuration.federationActive" type="switch">
+					{{ t('forms', 'Maak automatisch verbinding met federatief stelsel.') }}
+				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch :checked.sync="configuration.federationListed" type="switch">
+					{{ t('forms', 'Maak deze installatie vindbaar binnen het federatief stelsel.') }}
+				</NcCheckboxRadioSwitch>
+				<NcTextField id="federationLocation"
+					label="Internet locatie (url) van deze installatie"
+					:value.sync="configuration.federationLocation"
+					placeholder="https://" />
+			</NcAppSettingsSection>
+			<NcAppSettingsSection id="storadge" name="Opslag" doc-url="zaakafhandel.app">
 				<template #icon>
 					<Database :size="20" />
 				</template>
@@ -27,14 +42,14 @@
 								<td class="row-name">
 									DRC
 								</td>
-								<td>Location</td>
+								<td>Locatie</td>
 								<td>
 									<NcTextField id="drcLocation"
 										:value.sync="configuration.drcLocation"
 										:label-outside="true"
 										placeholder="https://" />
 								</td>
-								<td>Key</td>
+								<td>Sleutel</td>
 								<td>
 									<NcTextField id="drcKey"
 										:value.sync="configuration.drcKey"
@@ -46,14 +61,14 @@
 								<td class="row-name">
 									ORC
 								</td>
-								<td>Location</td>
+								<td>Locatie</td>
 								<td>
 									<NcTextField id="orcLocation"
 										:value.sync="configuration.orcLocation"
 										:label-outside="true"
 										placeholder="https://" />
 								</td>
-								<td>Key</td>
+								<td>Sleutel</td>
 								<td>
 									<NcTextField id="orcKey"
 										:value.sync="configuration.orcKey"
@@ -65,14 +80,14 @@
 								<td class="row-name">
 									Elastic
 								</td>
-								<td>Location</td>
+								<td>Locatie</td>
 								<td>
 									<NcTextField id="elasticLocation"
 										:value.sync="configuration.elasticLocation"
 										:label-outside="true"
 										placeholder="https://" />
 								</td>
-								<td>Key</td>
+								<td>Sleutel</td>
 								<td>
 									<NcTextField id="elasticKey"
 										:value.sync="configuration.elasticKey"
@@ -91,21 +106,21 @@
 								<td class="row-name">
 									Mongo DB
 								</td>
-								<td>Location</td>
+								<td>Locatie</td>
 								<td>
 									<NcTextField id="mongodbLocation"
 										:value.sync="configuration.mongodbLocation"
 										:label-outside="true"
 										placeholder="https://" />
 								</td>
-								<td>Key</td>
+								<td>Sleutel</td>
 								<td>
 									<NcTextField id="mongodbKey"
 										:value.sync="configuration.mongodbKey"
 										:label-outside="true"
 										placeholder="***" />
 								</td>
-								<td>Cluster name</td>
+								<td>Cluster naam</td>
 								<td>
 									<NcTextField id="mongodbCluster"
 										:value.sync="configuration.mongodbCluster"
@@ -117,14 +132,14 @@
 								<td class="row-name">
 									Nextcloud Admin User
 								</td>
-								<td>Username</td>
+								<td>Gebruikersnaam</td>
 								<td>
 									<NcTextField id="mongodbLocation"
 										:value.sync="configuration.adminUsername"
 										:label-outside="true"
 										placeholder="admin" />
 								</td>
-								<td>Password</td>
+								<td>Wachwoord</td>
 								<td>
 									<NcTextField id="mongodbKey"
 										:value.sync="configuration.adminPassword"
@@ -197,6 +212,7 @@ import {
 	NcAppSettingsDialog,
 	NcAppSettingsSection,
 	NcAppNavigationItem,
+	NcCheckboxRadioSwitch,
 	NcTextField,
 	NcTextArea,
 	NcButton,
@@ -206,6 +222,7 @@ import Database from 'vue-material-design-icons/Database.vue'
 import CogOutline from 'vue-material-design-icons/CogOutline.vue'
 import AccountLockOpenOutline from 'vue-material-design-icons/AccountLockOpenOutline.vue'
 import ContentSave from 'vue-material-design-icons/ContentSave.vue'
+import LanConnect from 'vue-material-design-icons/LanConnect.vue'
 
 export default {
 	name: 'Configuration',
@@ -213,6 +230,7 @@ export default {
 		NcAppSettingsDialog,
 		NcAppSettingsSection,
 		NcAppNavigationItem,
+		NcCheckboxRadioSwitch,
 		NcTextField,
 		NcTextArea,
 		NcButton,
@@ -221,6 +239,7 @@ export default {
 		Database,
 		ContentSave,
 		AccountLockOpenOutline,
+		LanConnect,
 	},
 	data() {
 		return {
@@ -238,6 +257,9 @@ export default {
 			organisation_oin: '',
 			organisation_pki: '',
 			configuration: {
+				federationActive: true,
+				federationListed: false,
+				federationLocation: '',
 				external: false,
 				drcLocation: '',
 				drcKey: '',
diff --git a/src/sidebars/SideBars.vue b/src/sidebars/SideBars.vue
index 266fc760..953ac2bd 100644
--- a/src/sidebars/SideBars.vue
+++ b/src/sidebars/SideBars.vue
@@ -7,18 +7,21 @@ import { navigationStore } from '../store/store.js'
 		<!-- Placeholder div for all of the sidebars-->
 		<SearchSideBar v-if="navigationStore.selected === 'search'" />
 		<DashboardSideBar v-if="navigationStore.selected === 'dashboard'" />
+		<DirectorySideBar v-if="navigationStore.selected === 'directory'" />
 	</div>
 </template>
 
 <script>
 import SearchSideBar from './search/SearchSideBar.vue'
 import DashboardSideBar from './dashboard/DashboardSideBar.vue'
+import DirectorySideBar from './directory/DirectorySideBar.vue'
 
 export default {
 	name: 'SideBars',
 	components: {
 		SearchSideBar,
 		DashboardSideBar,
+		DirectorySideBar,
 	},
 	data() {
 		return {
diff --git a/src/sidebars/directory/DirectorySideBar.vue b/src/sidebars/directory/DirectorySideBar.vue
index 7863f244..088d9a10 100644
--- a/src/sidebars/directory/DirectorySideBar.vue
+++ b/src/sidebars/directory/DirectorySideBar.vue
@@ -1,124 +1,46 @@
 <script setup>
-import { navigationStore, searchStore, publicationStore } from '../../store/store.js'
+import { navigationStore, directoryStore } from '../../store/store.js'
 </script>
 
 <template>
 	<NcAppSidebar
-		name="Snelle start"
-		subname="Schakel snel naar waar u nodig bent">
-		<NcAppSidebarTab id="search-tab" name="Zoeken" :order="1">
+		name="Listing"
+		subname="Listing Summery">
+		<NcEmptyContent v-if="!directoryStore.listingItem.id || navigationStore.selected != 'directory'"
+			class="detailContainer"
+			name="Geen listing"
+			description="Nog geen listing geselecteerd, listings kan je ontdekken via (externe) directories.">
 			<template #icon>
-				<Magnify :size="20" />
+				<LayersOutline />
 			</template>
-			Zoek snel in het voor uw beschikbare federatieve netwerk
-			<NcTextField class="searchField"
-				:value.sync="searchStore.search"
-				label="Zoeken" />
-		</NcAppSidebarTab>
-		<NcAppSidebarTab id="settings-tab" name="Publicaties" :order="2">
-			<template #icon>
-				<ListBoxOutline :size="20" />
-			</template>
-			Welke publicaties vereisen uw aandacht?
-			<NcListItem v-for="(publication, i) in publicationStore.conceptPublications.results"
-				:key="`${publication}${i}`"
-				:name="publication.name ?? publication.title"
-				:bold="false"
-				:force-display-actions="true"
-				:active="publicationStore.publicationItem.id === publication.id"
-				:details="publication?.status">
-				<template #icon>
-					<ListBoxOutline :class="publicationStore.publicationItem.id === publication.id && 'selectedZaakIcon'"
-						disable-menu
-						:size="44" />
-				</template>
-				<template #subname>
-					{{ publication?.description }}
-				</template>
-				<template #actions>
-					<NcActionButton @click="publicationStore.setPublicationItem(publication); navigationStore.setSelected('publication');">
-						<template #icon>
-							<ListBoxOutline :size="20" />
-						</template>
-						Bekijken
-					</NcActionButton>
-					<NcActionButton @click="publicationStore.setPublicationItem(publication); navigationStore.setModal('editPublication')">
-						<template #icon>
-							<Pencil :size="20" />
-						</template>
-						Bewerken
-					</NcActionButton>
-					<NcActionButton @click="publicationStore.setPublicationItem(publication); navigationStore.setDialog('publishPublication')">
-						<template #icon>
-							<Publish :size="20" />
-						</template>
-						Publiceren
-					</NcActionButton>
-					<NcActionButton @click="publicationStore.setPublicationItem(publication); navigationStore.setDialog('deletePublication')">
-						<template #icon>
-							<Delete :size="20" />
-						</template>
-						Verwijderen
-					</NcActionButton>
-				</template>
-			</NcListItem>
-		</NcAppSidebarTab>
-		<NcAppSidebarTab id="share-tab" name="Bijlagen" :order="3">
-			<template #icon>
-				<FileOutline :size="20" />
+			<template #action>
+				<NcButton type="primary" @click="navigationStore.setModal('addDirectory')">
+					<template #icon>
+						<Plus :size="20" />
+					</template>
+					Directory inlezen
+				</NcButton>
+				<NcButton @click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/directory', '_blank')">
+					<template #icon>
+						<HelpCircleOutline :size="20" />
+					</template>
+					Meer informatie over de directory
+				</NcButton>
 			</template>
-			Welke bijlagen vereisen uw aandacht?
-			<NcListItem v-for="(attachment, i) in publicationStore.conceptAttachments.results"
-				:key="`${attachment}${i}`"
-				:name="attachment.name ?? attachment.title"
-				:bold="false"
-				:force-display-actions="true"
-				:active="publicationStore.attachmentItem.id === attachment.id"
-				:details="attachment?.status">
-				<template #icon>
-					<ListBoxOutline :class="publicationStore.publicationItem.id === attachment.id && 'selectedZaakIcon'"
-						disable-menu
-						:size="44" />
-				</template>
-				<template #subname>
-					{{ attachment?.description }}
-				</template>
-				<template #actions>
-					<NcActionButton @click="publicationStore.setAttachmentItem(attachment); navigationStore.setModal('editAttachment')">
-						<template #icon>
-							<Pencil :size="20" />
-						</template>
-						Bewerken
-					</NcActionButton>
-					<NcActionButton @click="publicationStore.setAttachmentItem(attachment); navigationStore.setDialog('publishAttachment')">
-						<template #icon>
-							<Publish :size="20" />
-						</template>
-						Publiceren
-					</NcActionButton>
-					<NcActionButton @click="publicationStore.setAttachmentItem(attachment); navigationStore.setDialog('deleteAttachment')">
-						<template #icon>
-							<Delete :size="20" />
-						</template>
-						Verwijderen
-					</NcActionButton>
-				</template>
-			</NcListItem>
-			<NcNoteCard type="success">
-				<p>Er zijn op dit moment geen bijlagen die uw aandacht vereisen</p>
-			</NcNoteCard>
-		</NcAppSidebarTab>
+		</NcEmptyContent>
 	</NcAppSidebar>
 </template>
 <script>
 
-import { NcAppSidebar, NcAppSidebarTab, NcTextField, NcNoteCard, NcListItem, NcActionButton } from '@nextcloud/vue'
+import { NcAppSidebar, NcAppSidebarTab, NcTextField, NcNoteCard, NcListItem, NcActionButton, NcEmptyContent, NcButton } from '@nextcloud/vue'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
-import ListBoxOutline from 'vue-material-design-icons/ListBoxOutline.vue'
+import LayersOutline from 'vue-material-design-icons/LayersOutline.vue'
 import FileOutline from 'vue-material-design-icons/FileOutline.vue'
 import Pencil from 'vue-material-design-icons/Pencil.vue'
 import Publish from 'vue-material-design-icons/Publish.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
 
 export default {
 	name: 'DirectorySideBar',
@@ -129,24 +51,26 @@ export default {
 		NcNoteCard,
 		NcListItem,
 		NcActionButton,
+		NcEmptyContent,
+		NcButton,
 		// Icons
 		Magnify,
-		ListBoxOutline,
+		LayersOutline,
 		FileOutline,
 		Pencil,
 		Publish,
 		Delete,
+		Plus,
+		HelpCircleOutline,
 	},
 	data() {
 		return {
-
-			publications: false,
-			attachments: false,
 		}
 	},
-	mounted() {
-		publicationStore.getConceptPublications()
-		publicationStore.getConceptAttachments()
+	methods: {
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
 	},
 }
 </script>
diff --git a/src/views/catalogi/CatalogiList.vue b/src/views/catalogi/CatalogiList.vue
index 4134db7f..41cf4074 100644
--- a/src/views/catalogi/CatalogiList.vue
+++ b/src/views/catalogi/CatalogiList.vue
@@ -15,6 +15,14 @@ import { catalogiStore, navigationStore } from '../../store/store.js'
 					<Magnify :size="20" />
 				</NcTextField>
 				<NcActions>
+					<NcActionButton
+						title="Bekijk de documentatie over catalogi"
+						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/catalogi', '_blank')">
+						<template #icon>
+							<HelpCircleOutline :size="20" />
+						</template>
+						Help
+					</NcActionButton>
 					<NcActionButton :disabled="loading" @click="fetchData">
 						<template #icon>
 							<Refresh :size="20" />
@@ -64,7 +72,7 @@ import { catalogiStore, navigationStore } from '../../store/store.js'
 							<template #icon>
 								<Delete :size="20" />
 							</template>
-							Delete
+							Verwijder
 						</NcActionButton>
 					</template>
 				</NcListItem>
@@ -90,6 +98,7 @@ import Pencil from 'vue-material-design-icons/Pencil.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import Refresh from 'vue-material-design-icons/Refresh.vue'
 import OpenInApp from 'vue-material-design-icons/OpenInApp.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
 import { debounce } from 'lodash'
 
 export default {
@@ -100,9 +109,11 @@ export default {
 		NcActionButton,
 		NcAppContentList,
 		NcTextField,
+		NcLoadingIcon,
+		// Icons
+		HelpCircleOutline,
 		DatabaseOutline,
 		Magnify,
-		NcLoadingIcon,
 		Refresh,
 		Plus,
 		Pencil,
@@ -145,6 +156,9 @@ export default {
 		debouncedFetchData: debounce(function(search) {
 			this.fetchData(search)
 		}, 500),
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
 	},
 }
 </script>
diff --git a/src/views/directory/DirectoryIndex.vue b/src/views/directory/DirectoryIndex.vue
index 80101273..9113240f 100644
--- a/src/views/directory/DirectoryIndex.vue
+++ b/src/views/directory/DirectoryIndex.vue
@@ -4,25 +4,10 @@ import { navigationStore, searchStore, directoryStore } from '../../store/store.
 
 <template>
 	<NcAppContent>
-		<template #list>
-			<DirectoryList :search="searchStore.search" />
-		</template>
-		<template #default>
-			<NcEmptyContent v-if="!directoryStore.listingItem || navigationStore.selected != 'directory' "
-				class="detailContainer"
-				name="Geen directory"
-				description="Nog geen directory geselecteerd">
-				<template #icon>
-					<LayersOutline />
-				</template>
-				<template #action>
-					<NcButton type="primary" @click="navigationStore.setModal('addListing')">
-						Directory toevoegen
-					</NcButton>
-				</template>
-			</NcEmptyContent>
-			<ListingDetails v-if="directoryStore.listingItem && navigationStore.selected === 'directory'" :listing-item="directoryStore.listingItem" />
-		</template>
+		<h2 class="pageHeader">
+			Directory
+		</h2>
+		<DirectoryList :search="searchStore.search" />
 	</NcAppContent>
 </template>
 
@@ -31,7 +16,9 @@ import { NcAppContent, NcEmptyContent, NcButton } from '@nextcloud/vue'
 import DirectoryList from './DirectoryList.vue'
 import ListingDetails from './ListingDetails.vue'
 // eslint-disable-next-line n/no-missing-import
-import LayersOutline from 'vue-material-design-icons/LayersOutline'
+import LayersOutline from 'vue-material-design-icons/LayersOutline.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
 
 export default {
 	name: 'DirectoryIndex',
@@ -41,12 +28,20 @@ export default {
 		NcButton,
 		DirectoryList,
 		ListingDetails,
+		// Icons
 		LayersOutline,
+		Plus,
+		HelpCircleOutline,
 	},
 	data() {
 		return {
 
 		}
 	},
+	methods: {
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
+	},
 }
 </script>
diff --git a/src/views/directory/DirectoryList.vue b/src/views/directory/DirectoryList.vue
index 4583962f..e735afcb 100644
--- a/src/views/directory/DirectoryList.vue
+++ b/src/views/directory/DirectoryList.vue
@@ -3,76 +3,106 @@ import { navigationStore, directoryStore } from '../../store/store.js'
 </script>
 
 <template>
-	<NcAppContentList>
-		<ul>
-			<div class="listHeader">
-				<NcTextField class="searchField"
-					:value.sync="search"
-					label="Zoeken"
-					trailing-button-icon="close"
-					:show-trailing-button="search !== ''"
-					@trailing-button-click="search = ''">
-					<Magnify :size="20" />
-				</NcTextField>
-				<NcActions>
-					<NcActionButton :disabled="loading" @click="fetchData">
+	<ul>
+		<div class="listHeader">
+			<NcTextField class="searchField"
+				:value.sync="search"
+				label="Zoeken"
+				trailing-button-icon="close"
+				:show-trailing-button="search !== ''"
+				@trailing-button-click="search = ''">
+				<Magnify :size="20" />
+			</NcTextField>
+			<NcActions>
+				<NcActionButton
+					title="Bekijk de documentatie over catalogi"
+					@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/directory', '_blank')">
+					<template #icon>
+						<HelpCircleOutline :size="20" />
+					</template>
+					Help
+				</NcActionButton>
+				<NcActionButton :disabled="loading" @click="fetchData">
+					<template #icon>
+						<Refresh :size="20" />
+					</template>
+					Ververs
+				</NcActionButton>
+				<NcActionButton @click="navigationStore.setModal('addDirectory')">
+					<template #icon>
+						<Plus :size="20" />
+					</template>
+					Directory inlezen
+				</NcActionButton>
+			</NcActions>
+		</div>
+
+		<div v-if="!loading">
+			<NcListItem v-for="(listing, i) in directoryStore.listingList"
+				:key="`${listing}${i}`"
+				:name="listing.name ?? listing.title"
+				:active="directoryStore.listingItem?.id === listing?.id"
+				:details="'1h'"
+				:counter-number="45"
+				@click="directoryStore.setListingItem(listing)">
+				<template #icon>
+					<LayersOutline :class="directoryStore.listingItem?.id === listing?.id && 'selectedIcon'"
+						disable-menu
+						:size="44" />
+				</template>
+				<template #subname>
+					{{ listing?.title }}
+				</template>
+				<template #actions>
+					<NcActionButton @click="directoryStore.setListingItem(listing); navigationStore.setModal('editListing')">
 						<template #icon>
-							<Refresh :size="20" />
+							<Pencil :size="20" />
 						</template>
-						Ververs
+						Bewerken
 					</NcActionButton>
-					<NcActionButton @click="navigationStore.setModal('addListing')">
+					<NcActionButton @click="directoryStore.setListingItem(listing); navigationStore.setDialog('deleteListing')">
 						<template #icon>
-							<Plus :size="20" />
+							<Delete :size="20" />
 						</template>
-						Listing toevoegen aan directory
+						Verwijderen
 					</NcActionButton>
-				</NcActions>
-			</div>
+				</template>
+			</NcListItem>
+		</div>
 
-			<div v-if="!loading">
-				<NcListItem v-for="(listing, i) in directoryStore.listingList"
-					:key="`${listing}${i}`"
-					:name="listing.name ?? listing.title"
-					:active="directoryStore.listingItem?.id === listing?.id"
-					:details="'1h'"
-					:counter-number="45"
-					@click="directoryStore.setListingItem(listing)">
+		<NcLoadingIcon v-if="loading"
+			class="loadingIcon"
+			:size="64"
+			appearance="dark"
+			name="Listings aan het laden" />
+
+		<NcEmptyContent
+			v-if="!directoryStore.listingList?.length > 0"
+			class="detailContainer"
+			name="Geen Listings"
+			description="Je directory of zoek opdracht bevat nog geen listings, wil je een externe directory toevoegen?">
+			<template #icon>
+				<LayersOutline />
+			</template>
+			<template #action>
+				<NcButton type="primary" @click="navigationStore.setModal('addDirectory')">
 					<template #icon>
-						<LayersOutline :class="directoryStore.listingItem?.id === listing?.id && 'selectedIcon'"
-							disable-menu
-							:size="44" />
-					</template>
-					<template #subname>
-						{{ listing?.title }}
+						<Plus :size="20" />
 					</template>
-					<template #actions>
-						<NcActionButton @click="directoryStore.setListingItem(listing); navigationStore.setModal('editListing')">
-							<template #icon>
-								<Pencil :size="20" />
-							</template>
-							Bewerken
-						</NcActionButton>
-						<NcActionButton @click="directoryStore.setListingItem(listing); navigationStore.setDialog('deleteListing')">
-							<template #icon>
-								<Delete :size="20" />
-							</template>
-							Verwijderen
-						</NcActionButton>
+					Directory inlezen
+				</NcButton>
+				<NcButton @click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/directory', '_blank')">
+					<template #icon>
+						<HelpCircleOutline :size="20" />
 					</template>
-				</NcListItem>
-			</div>
-
-			<NcLoadingIcon v-if="loading"
-				class="loadingIcon"
-				:size="64"
-				appearance="dark"
-				name="Listings aan het laden" />
-		</ul>
-	</NcAppContentList>
+					Meer informatie over de directory
+				</NcButton>
+			</template>
+		</NcEmptyContent>
+	</ul>
 </template>
 <script>
-import { NcListItem, NcActionButton, NcAppContentList, NcTextField, NcLoadingIcon, NcActions } from '@nextcloud/vue'
+import { NcListItem, NcActionButton, NcTextField, NcLoadingIcon, NcActions, NcEmptyContent, NcButton } from '@nextcloud/vue'
 // eslint-disable-next-line n/no-missing-import
 import Magnify from 'vue-material-design-icons/Magnify'
 // eslint-disable-next-line n/no-missing-import
@@ -81,6 +111,7 @@ import Plus from 'vue-material-design-icons/Plus.vue'
 import Pencil from 'vue-material-design-icons/Pencil.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import Refresh from 'vue-material-design-icons/Refresh.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
 import { debounce } from 'lodash'
 
 export default {
@@ -89,11 +120,14 @@ export default {
 		NcListItem,
 		NcActions,
 		NcActionButton,
-		NcAppContentList,
 		NcTextField,
+		NcLoadingIcon,
+		NcEmptyContent,
+		NcButton,
+		// Icons
 		LayersOutline,
 		Magnify,
-		NcLoadingIcon,
+		HelpCircleOutline,
 		Refresh,
 		Plus,
 		Pencil,
@@ -135,6 +169,9 @@ export default {
 		debouncedFetchData: debounce(function(search) {
 			this.fetchData(search)
 		}, 500),
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
 	},
 }
 </script>
diff --git a/src/views/metaData/MetaDataList.vue b/src/views/metaData/MetaDataList.vue
index 386f3333..a435cb49 100644
--- a/src/views/metaData/MetaDataList.vue
+++ b/src/views/metaData/MetaDataList.vue
@@ -15,6 +15,14 @@ import { navigationStore, metadataStore } from '../../store/store.js'
 					<Magnify :size="20" />
 				</NcTextField>
 				<NcActions>
+					<NcActionButton
+						title="Bekijk de documentatie over catalogi"
+						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/metadata', '_blank')">
+						<template #icon>
+							<HelpCircleOutline :size="20" />
+						</template>
+						Help
+					</NcActionButton>
 					<NcActionButton :disabled="loading" @click="fetchData">
 						<template #icon>
 							<Refresh :size="20" />
@@ -89,6 +97,7 @@ import Pencil from 'vue-material-design-icons/Pencil.vue'
 import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import Refresh from 'vue-material-design-icons/Refresh.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
 import { debounce } from 'lodash'
 
 export default {
@@ -109,6 +118,7 @@ export default {
 		Pencil,
 		ContentCopy,
 		Delete,
+		HelpCircleOutline,
 	},
 	beforeRouteLeave(to, from, next) {
 		search = ''
@@ -146,6 +156,9 @@ export default {
 		debouncedFetchData: debounce(function(search) {
 			this.fetchData(search)
 		}, 500),
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
 	},
 }
 </script>
diff --git a/src/views/organisations/OrganisationDetail.vue b/src/views/organisations/OrganisationDetail.vue
index db62d116..a3553c37 100644
--- a/src/views/organisations/OrganisationDetail.vue
+++ b/src/views/organisations/OrganisationDetail.vue
@@ -25,7 +25,7 @@ import { navigationStore, organisationStore } from '../../store/store.js'
 				</template>
 				<NcActionButton
 					title="Bekijk de documentatie over organisaties"
-					@click="linkToOtherWindow('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/organisaties')">
+					@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/organisaties')">
 					<template #icon>
 						<HelpCircleOutline :size="20" />
 					</template>
@@ -196,8 +196,8 @@ export default {
 					console.error(err)
 				})
 		},
-		linkToOtherWindow(url) {
-			window.open(url, '_blank')
+		openLink(url, type = '') {
+			window.open(url, type)
 		},
 	},
 }
diff --git a/src/views/organisations/OrganisationList.vue b/src/views/organisations/OrganisationList.vue
index cef7616c..f4e457cc 100644
--- a/src/views/organisations/OrganisationList.vue
+++ b/src/views/organisations/OrganisationList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { navigationStore, organisationStore } from '../../store/store.js';
+import { navigationStore, organisationStore } from '../../store/store.js'
 </script>
 
 <template>
@@ -17,7 +17,7 @@ import { navigationStore, organisationStore } from '../../store/store.js';
 				<NcActions>
 					<NcActionButton
 						title="Bekijk de documentatie over organisaties"
-						@click="linkToOtherWindow('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/organisaties')">
+						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/organisaties')">
 						<template #icon>
 							<HelpCircleOutline :size="20" />
 						</template>
@@ -84,18 +84,18 @@ import { navigationStore, organisationStore } from '../../store/store.js';
 	</NcAppContentList>
 </template>
 <script>
-import { NcActionButton, NcActions, NcAppContentList, NcListItem, NcLoadingIcon, NcTextField } from '@nextcloud/vue';
-import { debounce } from 'lodash';
+import { NcActionButton, NcActions, NcAppContentList, NcListItem, NcLoadingIcon, NcTextField } from '@nextcloud/vue'
+import { debounce } from 'lodash'
 
 // Icons
-import ContentCopy from 'vue-material-design-icons/ContentCopy.vue';
-import Delete from 'vue-material-design-icons/Delete.vue';
-import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue';
-import Magnify from 'vue-material-design-icons/Magnify.vue';
-import OfficeBuildingOutline from 'vue-material-design-icons/OfficeBuildingOutline.vue';
-import Pencil from 'vue-material-design-icons/Pencil.vue';
-import Plus from 'vue-material-design-icons/Plus.vue';
-import Refresh from 'vue-material-design-icons/Refresh.vue';
+import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
+import Delete from 'vue-material-design-icons/Delete.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
+import Magnify from 'vue-material-design-icons/Magnify.vue'
+import OfficeBuildingOutline from 'vue-material-design-icons/OfficeBuildingOutline.vue'
+import Pencil from 'vue-material-design-icons/Pencil.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import Refresh from 'vue-material-design-icons/Refresh.vue'
 
 export default {
 	name: 'OrganisationList',
@@ -159,6 +159,9 @@ export default {
 		debouncedFetchData: debounce(function(search) {
 			this.fetchData(search)
 		}, 500),
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
 	},
 }
 </script>
diff --git a/src/views/publications/PublicationDetail.vue b/src/views/publications/PublicationDetail.vue
index c8fadde2..c63aed89 100644
--- a/src/views/publications/PublicationDetail.vue
+++ b/src/views/publications/PublicationDetail.vue
@@ -125,11 +125,11 @@ import { catalogiStore, metadataStore, navigationStore, publicationStore } from
 				</div>
 				<div>
 					<b>Gepubliceerd:</b>
-					<span>{{ publicationStore.publicationItem.published?.toLocaleDateString('en-nl') }}</span>
+					<span>{{ publicationStore.publicationItem.published }}</span>
 				</div>
 				<div>
 					<b>Gewijzigd:</b>
-					<span>{{ publicationStore.publicationItem.modified?.toLocaleDateString('en-nl') }}</span>
+					<span>{{ publicationStore.publicationItem.modified }}</span>
 				</div>
 				<div>
 					<b>Catalogi:</b>
diff --git a/src/views/publications/PublicationList.vue b/src/views/publications/PublicationList.vue
index ffe23ff7..9394a73a 100644
--- a/src/views/publications/PublicationList.vue
+++ b/src/views/publications/PublicationList.vue
@@ -43,7 +43,7 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					<NcActionCaption name="Acties" />
 					<NcActionButton
 						title="Bekijk de documentatie over publicaties"
-						@click="linkToOtherWindow('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/publicaties')">
+						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/publicaties')">
 						<template #icon>
 							<HelpCircleOutline :size="20" />
 						</template>
@@ -237,6 +237,9 @@ export default {
 		debouncedFetchData: debounce(function(search) {
 			this.fetchData(search)
 		}, 500),
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
 	},
 }
 </script>
diff --git a/src/views/themes/ThemeDetail.vue b/src/views/themes/ThemeDetail.vue
index c56f20e7..cc425b27 100644
--- a/src/views/themes/ThemeDetail.vue
+++ b/src/views/themes/ThemeDetail.vue
@@ -25,7 +25,7 @@ import { navigationStore, themeStore } from '../../store/store.js'
 				</template>
 				<NcActionButton
 					title="Bekijk de documentatie over themas"
-					@click="linkToOtherWindow('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/themas')">
+					@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/themas')">
 					<template #icon>
 						<HelpCircleOutline :size="20" />
 					</template>
@@ -196,8 +196,8 @@ export default {
 					console.error(err)
 				})
 		},
-		linkToOtherWindow(url) {
-			window.open(url, '_blank')
+		openLink(url, type = '') {
+			window.open(url, type)
 		},
 	},
 }
diff --git a/src/views/themes/ThemeList.vue b/src/views/themes/ThemeList.vue
index 5871fbe7..07903d57 100644
--- a/src/views/themes/ThemeList.vue
+++ b/src/views/themes/ThemeList.vue
@@ -17,7 +17,7 @@ import { navigationStore, themeStore } from '../../store/store.js'
 				<NcActions>
 					<NcActionButton
 						title="Bekijk de documentatie over themas"
-						@click="linkToOtherWindow('https://conduction.gitbook.io/opencatalogi-nextcloud/gebruikers/themas')">
+						@click="openLink('https://conduction.gitbook.io/opencatalogi-nextcloud/beheerders/themas')">
 						<template #icon>
 							<HelpCircleOutline :size="20" />
 						</template>
@@ -159,6 +159,9 @@ export default {
 		debouncedFetchData: debounce(function(search) {
 			this.fetchData(search)
 		}, 500),
+		openLink(url, type = '') {
+			window.open(url, type)
+		},
 	},
 }
 </script>