diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 954a6221..c704cf40 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -31,7 +31,6 @@
     import 'highlight.js/styles/github-dark.css';
 
     import { browser } from '$app/environment';
-    // import { storeHighlightJs } from '@skeletonlabs/skeleton';
     import xml from 'highlight.js/lib/languages/xml'; // for HTML
     import css from 'highlight.js/lib/languages/css';
     import javascript from 'highlight.js/lib/languages/javascript';
diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte
index 5664df0d..862f92e5 100644
--- a/src/routes/events/+layout.svelte
+++ b/src/routes/events/+layout.svelte
@@ -121,13 +121,7 @@
     </title>
 </svelte:head>
 
-<!--
-<Modal
-    open={$events_loc?.ver !== $events_sess?.ver ? true : false}
-    autoclose={false}
-    placement="top-center"
 
-    > -->
 {#if $events_loc?.ver && $events_loc?.ver !== $events_sess?.ver}
     <div class="fixed inset-0 bg-pink-100/80 z-40">
         <button
@@ -177,7 +171,6 @@
         </button>
     </div>
 {/if}
-<!-- </Modal> -->
 
 <!-- WARNING: Add these when ready to better enabled dark mode! -->
 <!-- bg-gray-50 dark:bg-gray-900 -->
diff --git a/src/routes/events/[event_id]/(badges)/templates/hold+page.svelte b/src/routes/events/[event_id]/(badges)/templates/hold+page.svelte
index f1d2820f..f2bf2812 100644
--- a/src/routes/events/[event_id]/(badges)/templates/hold+page.svelte
+++ b/src/routes/events/[event_id]/(badges)/templates/hold+page.svelte
@@ -3,7 +3,7 @@
     import { events_func } from '$lib/ae_events_functions';
     import { ae_api } from '$lib/stores/ae_stores';
     import { events_slct } from '$lib/stores/ae_events_stores';
-    import { Modal } from '@skeletonlabs/skeleton';
+    import { Modal } from 'flowbite-svelte';
     import Comp_badge_template_form from './ae_comp__badge_template_form.svelte';
 
     interface Props {
diff --git a/src/routes/idaa/+layout.svelte b/src/routes/idaa/+layout.svelte
index 9b2f164c..5d8a8b8f 100644
--- a/src/routes/idaa/+layout.svelte
+++ b/src/routes/idaa/+layout.svelte
@@ -7,10 +7,6 @@
     // *** Import other supporting libraries
     // import * as icons from '@lucide/svelte';
     import { Brain, House, Library, RefreshCw, Satellite } from '@lucide/svelte';
-    // import { AppBar } from '@skeletonlabs/skeleton-svelte';
-    // import type {
-    //     ModalComponent
-    //     } from '@skeletonlabs/skeleton-svelte';
 
     // *** Import Aether specific variables and functions
     import {