diff --git a/README.md b/README.md
index 0a4f8f22..91ac8179 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
 To setup this project, clone the repo and run `npm i` to install the dependencies.
 
 ## Documentation
+
 You can find the documentation for all of our packages on our [Documentation Website](https://open-source.studiohyperdrive.be/).
 
 ### NPM
diff --git a/libs/angular/authentication/package.json b/libs/angular/authentication/package.json
index 21ba1f4e..72ca2fa5 100644
--- a/libs/angular/authentication/package.json
+++ b/libs/angular/authentication/package.json
@@ -1,39 +1,39 @@
 {
 	"name": "@studiohyperdrive/ngx-auth",
-  "version": "19.0.0",
-  "description": "A library of core authentication functionality used with @studiohyperdrive/types-auth.",
-  "keywords": [
-    "angular",
-    "authentication",
-    "auth",
-    "feature",
-    "feature flag",
-    "a-b-testing",
-    "permission",
-    "permissions",
-    "guard",
-    "interceptor",
-    "directive",
-    "user",
-    "session"
-  ],
-  "homepage": "https://open-source.studiohyperdrive.be/docs/angular/authentication/installation",
-  "license": "MIT",
-  "author": {
-    "name": "Studio Hyperdrive",
-    "url": "https://studiohyperdrive.be/"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/studiohyperdrive/hyperdrive-opensource",
-    "directory": "libs/angular/authentication/src"
-  },
+	"version": "19.0.0",
+	"description": "A library of core authentication functionality used with @studiohyperdrive/types-auth.",
+	"keywords": [
+		"angular",
+		"authentication",
+		"auth",
+		"feature",
+		"feature flag",
+		"a-b-testing",
+		"permission",
+		"permissions",
+		"guard",
+		"interceptor",
+		"directive",
+		"user",
+		"session"
+	],
+	"homepage": "https://open-source.studiohyperdrive.be/docs/angular/authentication/installation",
+	"license": "MIT",
+	"author": {
+		"name": "Studio Hyperdrive",
+		"url": "https://studiohyperdrive.be/"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/studiohyperdrive/hyperdrive-opensource",
+		"directory": "libs/angular/authentication/src"
+	},
 	"peerDependencies": {
 		"@angular/core": "^19.0.0",
 		"rxjs": "7.8.1",
 		"@angular/common": "19.0.3",
 		"obj-clean": "3.0.1",
-    "@studiohyperdrive/types-auth": "^2.0.0"
+		"@angular/router": "19.0.3"
 	},
 	"sideEffects": false
 }
diff --git a/libs/angular/i18n/src/lib/resolvers/i18n/i18n.resolver.ts b/libs/angular/i18n/src/lib/resolvers/i18n/i18n.resolver.ts
index 82709a84..1b75fd09 100644
--- a/libs/angular/i18n/src/lib/resolvers/i18n/i18n.resolver.ts
+++ b/libs/angular/i18n/src/lib/resolvers/i18n/i18n.resolver.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { UUID } from 'angular2-uuid';
+import { v4 as uuid } from 'uuid';
 import { finalize, map, Observable } from 'rxjs';
 
 import { NgxI18nLoadingService, NgxI18nService } from '../../services';
@@ -17,7 +17,7 @@ export class NgxI18nTranslationLoaderResolver {
 
 	public resolve(): Observable<boolean> {
 		// Iben: Generate an id for the translations we're about to load
-		const id = UUID.UUID();
+		const id = uuid();
 
 		// Iben: Dispatch to the loader service that we're about to load a set of translations
 		this.i18nLoadingService.dispatchTranslationLoaderAction({ id, state: 'LOADING' });
diff --git a/libs/angular/inform/src/lib/directives/tooltip/tooltip.directive.ts b/libs/angular/inform/src/lib/directives/tooltip/tooltip.directive.ts
index 7b314662..a60dd631 100644
--- a/libs/angular/inform/src/lib/directives/tooltip/tooltip.directive.ts
+++ b/libs/angular/inform/src/lib/directives/tooltip/tooltip.directive.ts
@@ -1,5 +1,5 @@
 import { Directive, ElementRef, HostBinding, HostListener, Input, Type } from '@angular/core';
-import { UUID } from 'angular2-uuid';
+import { v4 as uuid } from 'uuid';
 
 import { NgxTooltipAbstractComponent } from '../../abstracts';
 import { NgxTooltipPosition } from '../../types';
@@ -59,7 +59,7 @@ export class NgxTooltipDirective {
 	/**
 	 * The id of the tooltip, unique in the DOM, required for accessibility. By default, this is an autogenerated UUID.
 	 */
-	@HostBinding('attr.aria-describedby') @Input() public ngxTooltipId: string = UUID.UUID();
+	@HostBinding('attr.aria-describedby') @Input() public ngxTooltipId: string = uuid();
 
 	/**
 	 * The text of the tooltip
diff --git a/libs/angular/layout/src/lib/abstracts/drag-and-drop/drag-and-drop.service.ts b/libs/angular/layout/src/lib/abstracts/drag-and-drop/drag-and-drop.service.ts
index 8452e6d7..ffa6b242 100644
--- a/libs/angular/layout/src/lib/abstracts/drag-and-drop/drag-and-drop.service.ts
+++ b/libs/angular/layout/src/lib/abstracts/drag-and-drop/drag-and-drop.service.ts
@@ -1,7 +1,7 @@
 import { filter, map, Observable, of, take, tap } from 'rxjs';
 import { inject } from '@angular/core';
 
-import { UUID } from 'angular2-uuid';
+import { v4 as uuid } from 'uuid';
 
 import { LiveAnnouncer } from '@angular/cdk/a11y';
 import {
@@ -120,7 +120,7 @@ export abstract class NgxAccessibleDragAndDropAbstractService {
 	public setDragAndDropDescription(parent: HTMLElement, description?: string): Observable<void> {
 		// Iben: Create the description element and its id
 		const element: HTMLParagraphElement = document.createElement('p');
-		const id: string = UUID.UUID();
+		const id: string = uuid();
 
 		// Iben: Take the current language to fetch the message
 		return (
diff --git a/libs/angular/layout/src/lib/components/accordion/item/accordion-item.component.ts b/libs/angular/layout/src/lib/components/accordion/item/accordion-item.component.ts
index 2be0d2c4..2f9a018f 100644
--- a/libs/angular/layout/src/lib/components/accordion/item/accordion-item.component.ts
+++ b/libs/angular/layout/src/lib/components/accordion/item/accordion-item.component.ts
@@ -13,7 +13,7 @@ import {
 	TemplateRef,
 	ViewChild,
 } from '@angular/core';
-import { UUID } from 'angular2-uuid';
+import { v4 as uuid } from 'uuid';
 
 import { NgTemplateOutlet } from '@angular/common';
 import { NgxAccordionComponent } from '../accordion.component';
@@ -102,7 +102,7 @@ export class NgxAccordionItemComponent implements OnInit, AfterViewInit, OnDestr
 	/**
 	 * The id of the accordion item
 	 */
-	public readonly id: string = UUID.UUID();
+	public readonly id: string = uuid();
 
 	/**
 	 * Whether the accordion item is open
diff --git a/libs/angular/layout/src/lib/services/image-marker/image-marker.service.ts b/libs/angular/layout/src/lib/services/image-marker/image-marker.service.ts
index ca92b51e..b5b8de4e 100644
--- a/libs/angular/layout/src/lib/services/image-marker/image-marker.service.ts
+++ b/libs/angular/layout/src/lib/services/image-marker/image-marker.service.ts
@@ -4,7 +4,7 @@ import { MarkerView } from 'markerjs-live';
 import { NgxWindowService } from '@studiohyperdrive/ngx-core';
 
 import { Observable, Subject } from 'rxjs';
-import { UUID } from 'angular2-uuid';
+import { v4 as uuid } from 'uuid';
 import {
 	NgxImageMarker,
 	NgxImageMarkerConfiguration,
@@ -48,7 +48,7 @@ export class NgxImageMarkerService implements OnDestroy {
 		}
 
 		// Iben: Create an id for the marker
-		const id = UUID.UUID();
+		const id = uuid();
 
 		// Iben: Depending on the provided mode, we create a edit view or a non editable view
 		return configuration.mode === 'edit'
diff --git a/libs/angular/tour/src/lib/abstracts/tour-step/tour-step.component.ts b/libs/angular/tour/src/lib/abstracts/tour-step/tour-step.component.ts
index a0261a77..47860de8 100644
--- a/libs/angular/tour/src/lib/abstracts/tour-step/tour-step.component.ts
+++ b/libs/angular/tour/src/lib/abstracts/tour-step/tour-step.component.ts
@@ -12,7 +12,7 @@ import {
 	ViewChild,
 	WritableSignal,
 } from '@angular/core';
-import { UUID } from 'angular2-uuid';
+import { v4 as uuid } from 'uuid';
 
 import { NgxTourInteraction, NgxTourStepPosition } from '../../types';
 import { NgxTourService } from '../../services';
@@ -121,7 +121,7 @@ export abstract class NgxTourStepComponent<DataType = any> implements OnInit, Af
 
 		// Iben: If the title element does not have an id, we generate one
 		if (!id) {
-			id = UUID.UUID();
+			id = uuid();
 			this.titleElement.nativeElement.setAttribute('id', id);
 		}
 
diff --git a/libs/angular/tour/src/lib/directives/tour-item/tour-item.directive.ts b/libs/angular/tour/src/lib/directives/tour-item/tour-item.directive.ts
index 5f975219..5ced73ae 100644
--- a/libs/angular/tour/src/lib/directives/tour-item/tour-item.directive.ts
+++ b/libs/angular/tour/src/lib/directives/tour-item/tour-item.directive.ts
@@ -7,7 +7,7 @@ import {
 	Input,
 	OnDestroy,
 } from '@angular/core';
-import { UUID } from 'angular2-uuid';
+import { v4 as uuid } from 'uuid';
 
 import { NgxTourService } from '../../services';
 
@@ -61,7 +61,7 @@ export class NgxTourItemDirective implements AfterViewInit, OnDestroy {
 
 		// Iben: Check if the element has an id, if not, give it a new id for accessibility
 		if (!this.elementRef.nativeElement.getAttribute('id')) {
-			this.elementRef.nativeElement.setAttribute('id', UUID.UUID());
+			this.elementRef.nativeElement.setAttribute('id', uuid());
 		}
 	}
 
diff --git a/package-lock.json b/package-lock.json
index 4e3d9c09..67c423a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,6 @@
 				"@studiohyperdrive/types-auth": "^2.0.0",
 				"@studiohyperdrive/utils": "2.0.1",
 				"@types/lodash": "4.17.12",
-				"angular2-uuid": "1.1.1",
 				"date-fns": "3.6.0",
 				"deepmerge-ts": "7.1.3",
 				"dot-prop": "9.0.0",
@@ -52,6 +51,7 @@
 				"swagger-express-ts": "1.1.0",
 				"tsconfig-paths": "4.2.0",
 				"tslib": "^2.8.0",
+				"uuid": "11.1.0",
 				"vanilla-cookieconsent": "3.0.1",
 				"zone.js": "0.15.0"
 			},
@@ -10808,10 +10808,6 @@
 				"ajv": "^8.8.2"
 			}
 		},
-		"node_modules/angular2-uuid": {
-			"version": "1.1.1",
-			"license": "MIT"
-		},
 		"node_modules/ansi-colors": {
 			"version": "4.1.3",
 			"license": "MIT",
@@ -21685,6 +21681,18 @@
 				"web-worker": "^1.2.0"
 			}
 		},
+		"node_modules/mermaid/node_modules/uuid": {
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+			"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+			"funding": [
+				"https://github.com/sponsors/broofa",
+				"https://github.com/sponsors/ctavan"
+			],
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
 		"node_modules/methods": {
 			"version": "1.1.2",
 			"license": "MIT",
@@ -32242,14 +32250,15 @@
 			}
 		},
 		"node_modules/uuid": {
-			"version": "9.0.1",
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+			"integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
 			"funding": [
 				"https://github.com/sponsors/broofa",
 				"https://github.com/sponsors/ctavan"
 			],
-			"license": "MIT",
 			"bin": {
-				"uuid": "dist/bin/uuid"
+				"uuid": "dist/esm/bin/uuid"
 			}
 		},
 		"node_modules/uvu": {
diff --git a/package.json b/package.json
index 1fd55776..25f499b3 100644
--- a/package.json
+++ b/package.json
@@ -48,10 +48,9 @@
 		"@nx/eslint-plugin": "20.2.1",
 		"@studiohyperdrive/env": "1.0.4",
 		"@studiohyperdrive/ngx-core": "19.1.0",
-		"@studiohyperdrive/utils": "2.0.1",
 		"@studiohyperdrive/types-auth": "^2.0.0",
+		"@studiohyperdrive/utils": "2.0.1",
 		"@types/lodash": "4.17.12",
-		"angular2-uuid": "1.1.1",
 		"date-fns": "3.6.0",
 		"deepmerge-ts": "7.1.3",
 		"dot-prop": "9.0.0",
@@ -68,6 +67,7 @@
 		"swagger-express-ts": "1.1.0",
 		"tsconfig-paths": "4.2.0",
 		"tslib": "^2.8.0",
+		"uuid": "11.1.0",
 		"vanilla-cookieconsent": "3.0.1",
 		"zone.js": "0.15.0"
 	},