From 4861ae04992641ad11fae9f327d1ab18b6641fb9 Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Wed, 23 Jul 2025 16:21:27 -0400
Subject: [PATCH] Lot of updates to Svelte 5 syntax

---
 .../ae_sponsorships_functions.ts              |   4 -
 src/lib/element_manage_event_file_li.svelte   |  70 ++--
 .../element_manage_event_file_li_all.svelte   |  38 ++-
 ...element_manage_event_file_li_direct.svelte |  33 +-
 src/routes/core/person_view.svelte            |  83 +++--
 src/routes/events/+layout.svelte              |   2 +-
 .../launcher/[event_location_id]/+page.svelte |  21 +-
 .../[event_id]/(launcher)/launcher_cfg.svelte |  32 +-
 .../(launcher)/launcher_presenter_view.svelte |  22 +-
 .../launcher_presenter_view_posters.svelte    |  22 +-
 .../(launcher)/launcher_session_view.svelte   |  40 +--
 .../ae_comp__event_device_obj_li.svelte       |  48 +--
 ...e_comp__event_device_obj_li_wrapper.svelte |  34 +-
 .../location/[event_location_id]/+page.svelte | 114 +++----
 .../location_page_menu.svelte                 |  50 +--
 .../[event_location_id]/location_view.svelte  |  96 +++---
 .../events/[event_id]/locations/+page.svelte  |  18 +-
 .../ae_comp__event_location_obj_li.svelte     |  47 +--
 .../locations/locations_page_menu.svelte      |  33 +-
 .../presenter/[presenter_id]/+page.svelte     |  13 +-
 ...ae_comp__event_presenter_form_agree.svelte |  49 ++-
 .../[presenter_id]/presenter_page_menu.svelte |  59 ++--
 .../[presenter_id]/presenter_view.svelte      | 307 ++++--------------
 .../ae_comp__event_presenter_obj_li.svelte    |  63 ++--
 ...omp__event_presenter_obj_li_wrapper.svelte |  31 +-
 .../ae_comp__event_presenter_obj_tbl.svelte   |  37 ++-
 ...mp__event_presenter_obj_tbl_wrapper.svelte |  45 ++-
 .../events/[event_id]/reports/+page.svelte    |  72 ++--
 .../reports/event_reports_page_menu.svelte    |  33 +-
 .../session/[session_id]/+page.svelte         | 118 ++++---
 ..._comp__event_session_poc_form_agree.svelte |  29 +-
 .../ae_comp__event_session_poc_profile.svelte |  41 +--
 .../[session_id]/session_page_menu.svelte     |  44 ++-
 .../session/[session_id]/session_view.svelte  |  79 ++---
 .../events/ae_comp__event_file_obj_tbl.svelte |  36 +-
 .../events/ae_comp__event_files_upload.svelte |  73 +++--
 .../ae_comp__event_presentation_obj_li.svelte |  36 +-
 .../ae_comp__event_session_obj_li.svelte      |  14 +-
 ..._comp__event_session_obj_li_wrapper.svelte |  38 ++-
 .../ae_comp__event_session_obj_tbl.svelte     |  28 +-
 .../10_edit_modal__event_presenter_obj.svelte |  25 --
 41 files changed, 998 insertions(+), 1079 deletions(-)

diff --git a/src/lib/ae_sponsorships/ae_sponsorships_functions.ts b/src/lib/ae_sponsorships/ae_sponsorships_functions.ts
index 9cd6fc91..014d5a2f 100644
--- a/src/lib/ae_sponsorships/ae_sponsorships_functions.ts
+++ b/src/lib/ae_sponsorships/ae_sponsorships_functions.ts
@@ -6,10 +6,6 @@ import { db_sponsorships } from "$lib/ae_sponsorships/db_sponsorships";
 // import { liveQuery } from "dexie";
 // import { db_core } from "$lib/db_core";
 
-// let example_li = liveQuery(
-//     () => db_core.sponsorships.toArray()
-// );
-
 let ae_promises: key_val = {}; // Promise<any>;
 
 
diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte
index 3e117d30..7a539abf 100644
--- a/src/lib/element_manage_event_file_li.svelte
+++ b/src/lib/element_manage_event_file_li.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { onMount } from 'svelte';
 // import { liveQuery } from "dexie";
-import { Clipboard } from "flowbite-svelte";
+import MyClipboard from '$lib/e_app_clipboard.svelte';
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
@@ -233,25 +233,21 @@ let clipboard_success = $state(false);
                     Download
                     </span>
                 </a>
-                <!-- <button
-                    type="button"
-                    use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${ae_util.clean_filename(event_file_obj?.filename)}&x_no_account_id_token=direct-download`)}
-                    class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs"
-                    title="Copy the direct download file link: {ae_util.clean_filename(event_file_obj?.filename ?? 'unknown')}"
-                    >
-                    <span class="fas fa-copy mx-1"></span>
-                    <span class="hidden">
-                    Copy Link
-                    </span>
-                </button> -->
-
-                <Clipboard
+                <!-- {#if clipboard_success}Copied!{:else}Copy Access Link{/if} -->
+                <!-- <span class="fas fa-copy mx-1"></span> -->
+                <!-- <Clipboard
                     value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${ae_util.clean_filename(event_file_obj?.filename)}&x_no_account_id_token=direct-download`)}
                     bind:success={clipboard_success}
                     class="w-24"
                     >
                     {#if clipboard_success}Copied!{:else}Copy Link{/if}
-                </Clipboard>
+                </Clipboard> -->
+                <MyClipboard
+                    value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${ae_util.clean_filename(event_file_obj?.filename)}&x_no_account_id_token=direct-download`)}
+                    btn_text="Copy Link"
+                    btn_title="Copy the direct download link to the clipboard."
+                    btn_class="btn btn-sm preset-tonal-warning hover:preset-filled-warning-500 float-right m-1"
+                    ></MyClipboard>
             </div>
 
             <div class="flex flex-row gap-0.5">
@@ -268,24 +264,19 @@ let clipboard_success = $state(false);
                     Renamed
                     </span>
                 </a>
-                <!-- <button
-                    type="button"
-                    use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_session_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
-                    class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs"
-                    title="Copy the renamed file link"
-                    >
-                    <span class="fas fa-copy mx-1"></span>
-                    <span class="hidden">
-                    Copy Renamed
-                    </span>
-                </button> -->
-                <Clipboard
+                <!-- <Clipboard
                     value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_session_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
                     bind:success={clipboard_success}
                     class="w-24"
                     >
                     {#if clipboard_success}Copied!{:else}Copy Renamed{/if}
-                </Clipboard>
+                </Clipboard> -->
+                <MyClipboard
+                    value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_session_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
+                    btn_text="Copy Renamed"
+                    btn_title="Copy the renamed download link to the clipboard."
+                    btn_class="btn btn-sm preset-tonal-warning hover:preset-filled-warning-500 float-right m-1"
+                    ></MyClipboard>
             </div>
 
             <div class="flex flex-row gap-0.5">
@@ -302,24 +293,21 @@ let clipboard_success = $state(false);
                     Renamed
                     </span>
                 </a>
-                <!-- <button
-                    type="button"
-                    use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_presentation_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
-                    class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs"
-                    title="Copy the renamed file link"
-                    >
-                    <span class="fas fa-copy mx-1"></span>
-                    <span class="hidden">
-                    Copy Renamed
-                    </span>
-                </button> -->
-                <Clipboard
+                <!-- {#if clipboard_success}Copied!{:else}Copy Access Link{/if} -->
+                <!-- <span class="fas fa-copy mx-1"></span> -->
+                <!-- <Clipboard
                     value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_presentation_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
                     bind:success={clipboard_success}
                     class="w-24"
                     >
                     {#if clipboard_success}Copied!{:else}Copy Renamed{/if}
-                </Clipboard>
+                </Clipboard> -->
+                <MyClipboard
+                    value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_presentation_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
+                    btn_text="Copy Renamed"
+                    btn_title="Copy the renamed download link to the clipboard."
+                    btn_class="btn btn-sm preset-tonal-warning hover:preset-filled-warning-500 float-right m-1"
+                    ></MyClipboard>
             </div>
         </span>
 
diff --git a/src/lib/element_manage_event_file_li_all.svelte b/src/lib/element_manage_event_file_li_all.svelte
index f831073a..8434d135 100644
--- a/src/lib/element_manage_event_file_li_all.svelte
+++ b/src/lib/element_manage_event_file_li_all.svelte
@@ -1,4 +1,23 @@
 <script lang="ts">
+interface Props {
+    // import { events_func } from '$lib/ae_events_functions';
+    container_class_li?: string|Array<string>;
+    link_to_type: string;
+    link_to_id: string;
+    allow_basic?: boolean;
+    allow_moderator?: boolean;
+    display_mode?: string; // 'default', 'compact', 'minimal', 'launcher'
+}
+
+let {
+    container_class_li = [],
+    link_to_type,
+    link_to_id,
+    allow_basic = false,
+    allow_moderator = false,
+    display_mode = 'default'
+}: Props = $props();
+
 import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
@@ -9,17 +28,9 @@ import type { key_val } from '$lib/ae_stores';
 import Element_manage_event_file_li from '$lib/element_manage_event_file_li.svelte';
 
 // import { core_func } from '$lib/ae_core_functions';
-import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
+// import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { db_events } from "$lib/ae_events/db_events";
 // import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
-// import { events_func } from '$lib/ae_events_functions';
-
-export let container_class_li: string|Array<string> = [];
-export let link_to_type: string;
-export let link_to_id: string;
-export let allow_basic: boolean = false;
-export let allow_moderator: boolean = false;
-export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
 
 // export let show_convert_btn: null|boolean = null;
 
@@ -35,14 +46,17 @@ let dq__where_eq_val: string = link_to_id;
 
 // This should include all files that are associated with an object (event, location, session, presenter, etc.)
 // I am not sure why, but doing reverse() and then sortBy() seems to sort in descending order.
-let lq__event_file_obj_li = liveQuery(
-    async () => await db_events.files
+let lq__event_file_obj_li = $derived(liveQuery(async () => {
+    let results = await db_events.files
     .where(dq__where_val)
     .equals(dq__where_eq_val)
     .reverse()
     .sortBy('created_on')
     // .toArray()
-);
+    ;
+
+    return results;
+}));
 </script>
 
 
diff --git a/src/lib/element_manage_event_file_li_direct.svelte b/src/lib/element_manage_event_file_li_direct.svelte
index e243b5b5..a9110ace 100644
--- a/src/lib/element_manage_event_file_li_direct.svelte
+++ b/src/lib/element_manage_event_file_li_direct.svelte
@@ -1,5 +1,25 @@
 <script lang="ts">
-export let log_lvl: number = 0;
+interface Props {
+    log_lvl?: number;
+    // import { events_func } from '$lib/ae_events_functions';
+    container_class_li?: string|Array<string>;
+    link_to_type: string;
+    link_to_id: string;
+    allow_basic?: boolean;
+    allow_moderator?: boolean;
+    display_mode?: string; // 'default', 'compact', 'minimal', 'launcher'
+}
+
+let {
+    log_lvl = 0,
+    container_class_li = [],
+    link_to_type,
+    link_to_id,
+    allow_basic = false,
+    allow_moderator = false,
+    display_mode = 'default'
+}: Props = $props();
+
 import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
@@ -13,14 +33,7 @@ import Element_manage_event_file_li from '$lib/element_manage_event_file_li.svel
 // import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { db_events } from "$lib/ae_events/db_events";
 // import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
-// import { events_func } from '$lib/ae_events_functions';
 
-export let container_class_li: string|Array<string> = [];
-export let link_to_type: string;
-export let link_to_id: string;
-export let allow_basic: boolean = false;
-export let allow_moderator: boolean = false;
-export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
 // export let show_convert_btn: null|boolean = null;
 
 // let ae_promises: key_val = {};
@@ -35,7 +48,7 @@ let dq__where_for_id_eq_val: string = link_to_id;
 
 // This should only include files that are directly linked to an object (event, location, session, presenter, etc.).
 // I am not sure why, but doing reverse() and then sortBy() seems to sort in descending order.
-$: lq__event_file_obj_li = liveQuery(async () => {
+let lq__event_file_obj_li = $derived(liveQuery(async () => {
     let results = await db_events.files
         .where(dq__where_val)
         .equals(dq__where_eq_val)
@@ -45,7 +58,7 @@ $: lq__event_file_obj_li = liveQuery(async () => {
         // .toArray()
         ;
     return results;
-});
+}));
 </script>
 
 
diff --git a/src/routes/core/person_view.svelte b/src/routes/core/person_view.svelte
index 679c279d..63845c12 100644
--- a/src/routes/core/person_view.svelte
+++ b/src/routes/core/person_view.svelte
@@ -1,14 +1,18 @@
 <script lang="ts">
+interface Props {
+    person_id: string;
+    display_mode?: string; // 'default', 'compact', 'minimal', 'launcher'
+}
+
+let { person_id, display_mode = 'default' }: Props = $props();
+
 console.log(`ae_core person_view.svelte`);
 
-import { createEventDispatcher, onMount } from 'svelte';
 import { liveQuery } from "dexie";
 
-const dispatch = createEventDispatcher();
-
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
-import { api } from '$lib/api';
+// import { api } from '$lib/api';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
@@ -19,46 +23,45 @@ import { db_core } from "$lib/ae_core/db_core";
 // import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
 // import { events_func } from '$lib/ae_events_functions';
 
-// Exports
-export let person_id: string;
-export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
+
+
 
 let ae_placeholder_li: key_val = {};
-let ae_promises: key_val = {}; // Promise<any>;
-let ae_tmp: key_val = {};
+let ae_promises: key_val = $state({}); // Promise<any>;
+let ae_tmp: key_val = $state({});
 ae_tmp.value__hide = null;
 
-let ae_triggers: key_val = {};
+let ae_triggers: key_val = $state({});
 
 console.log(`person_id:`, person_id);
-let lq__person_obj = liveQuery(
-    async () => await db_core.person.get(person_id)
-);
+let lq__person_obj = $derived(liveQuery(async () => {
+    let results = await db_core.person.get(person_id);
+    return results;
+}));
 
 ae_tmp.value__data_json = null;
-$: if ($lq__person_obj?.data_json && ae_tmp.value__data_json === null) {
-    ae_tmp.value__data_json = JSON.stringify($lq__person_obj.data_json, null, 4);
-    // ae_tmp.value__data_json = JSON.parse(JSON.stringify($lq__person_obj.data_json));
-    // JSON.stringify(jsObj, null, 4);
-}
+$effect(() => {
+    if ($lq__person_obj?.data_json && ae_tmp.value__data_json === null) {
+        ae_tmp.value__data_json = JSON.stringify($lq__person_obj.data_json, null, 4);
+        // ae_tmp.value__data_json = JSON.parse(JSON.stringify($lq__person_obj.data_json));
+        // JSON.stringify(jsObj, null, 4);
+    }
+});
 
 ae_tmp.valid__data_json = null;
-$: if (ae_tmp.value__data_json && ae_tmp.value__data_json.length) {
-    console.log(`ae_tmp.value__data_json.length:`, ae_tmp.value__data_json.length);
+$effect(() => {
+    if (ae_tmp.value__data_json && ae_tmp.value__data_json.length) {
+        console.log(`ae_tmp.value__data_json.length:`, ae_tmp.value__data_json.length);
 
-    try {
-        JSON.parse(ae_tmp.value__data_json);
-        ae_tmp.valid__data_json = true;
-    } catch (e) {
-        ae_tmp.valid__data_json = false;
-        console.error(`JSON.parse error:`, e);
+        try {
+            JSON.parse(ae_tmp.value__data_json);
+            ae_tmp.valid__data_json = true;
+        } catch (e) {
+            ae_tmp.valid__data_json = false;
+            console.error(`JSON.parse error:`, e);
+        }
     }
-}
-
-
-// $events_slct.person_obj = $lq__person_obj;
-
-// $events_sess.pres_mgmt.disable_submit__opt_out = false;
+});
 
 // let tmp_agree = false;
 // let tmp_opt_out: key_val = {
@@ -67,12 +70,6 @@ $: if (ae_tmp.value__data_json && ae_tmp.value__data_json.length) {
 //     transcription_and_publication: false,
 //     publication_in_app: false
 // };
-
-onMount(() => {
-    console.log('ae_core: person_view.svelte');
-    console.log(`person_id:`, person_id);
-});
-
 </script>
 
 
@@ -382,7 +379,7 @@ onMount(() => {
             {($lq__person_obj?.hide ? 'Hidden' : 'Not Hidden')}
             {/if}
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__hide = !$lq__person_obj?.hide;
 
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__person_obj?.hide;
@@ -429,7 +426,7 @@ onMount(() => {
             {($lq__person_obj?.enable ? 'Enabled' : 'Disabled')}
             {/if}
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__enable = !$lq__person_obj?.enable;
 
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__person_obj?.hide;
@@ -476,7 +473,7 @@ onMount(() => {
             {($lq__person_obj?.priority ? 'Priority' : 'Not Priority')}
             {/if}
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__priority = !$lq__person_obj?.priority;
 
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__person_obj?.hide;
@@ -523,7 +520,7 @@ onMount(() => {
             {($lq__person_obj?.allow_auth_key ? 'Allow Auth Key' : 'Not Allow Auth Key')}
             {/if}
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__allow_auth_key = !$lq__person_obj?.allow_auth_key;
 
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__person_obj?.hide;
@@ -581,7 +578,7 @@ onMount(() => {
             type="button"
             class="btn btn-md preset-tonal-primary hover:preset-filled-primary-500"
             disabled={(!$ae_loc.trusted_access || ae_tmp.value__data_json == $lq__person_obj.data_json)}
-            on:click={() => {
+            onclick={() => {
                 console.log('*** Save button clicked ***');
 
                 // We need to parse the JSON string into an object. In the future this should be dynamic and allow for basic key_val object.
diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte
index e57081c0..b7625e94 100644
--- a/src/routes/events/+layout.svelte
+++ b/src/routes/events/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 /** @type {import('./$types').LayoutProps} */
-let log_lvl: number = 0;
+let log_lvl: number = $state(0);
 
 // *** Import Svelte specific
 import { browser } from '$app/environment';
diff --git a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte
index 8e532c17..6292d47c 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte
@@ -1,27 +1,32 @@
 <script lang="ts">
-/** @type {import('./$types').PageData} */
-export let data: any;
+interface Props {
+    /** @type {import('./$types').PageData} */
+    data: any;
+}
+
+let { data }: Props = $props();
 
 // Imports
-import { browser } from '$app/environment';
-import { onMount } from 'svelte';
+// import { browser } from '$app/environment';
+// import { onMount } from 'svelte';
 
 // import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
-import { liveQuery } from "dexie";
+// import { liveQuery } from "dexie";
 // import { core_func } from '$lib/ae_core_functions';
 // import { db_core } from "$lib/db_core";
-import { db_events } from "$lib/ae_events/db_events";
+// import { db_events } from "$lib/ae_events/db_events";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig } from '$lib/ae_events_stores';
-import { events_func } from '$lib/ae_events_functions';
+// import { events_func } from '$lib/ae_events_functions';
 
 
 import { kill_processes, open_local_file_v2, run_cmd, run_cmd_sync, run_osascript, get_device_info } from '$lib/electron_relay.js';
+
 // import Event_launcher_menu from '../../launcher_menu.svelte';
 // import Event_launcher_session_view from '../../launcher_session_view.svelte';
 
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_cfg.svelte b/src/routes/events/[event_id]/(launcher)/launcher_cfg.svelte
index ec46981a..14ec73f4 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_cfg.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_cfg.svelte
@@ -1,5 +1,10 @@
 <script lang="ts">
-export let log_lvl: number = 0;
+interface Props {
+    log_lvl?: number;
+}
+
+let { log_lvl = 0 }: Props = $props();
+
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger, time } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig } from '$lib/ae_events_stores';
 
@@ -15,10 +20,11 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
     </h2>
 
     <button
-        on:click={() => ($events_loc.launcher.hide_drawer__cfg = true)}
+        onclick={() => ($events_loc.launcher.hide_drawer__cfg = true)}
         class="pb-4 pl-4 dark:text-white"
         >
         <span class="fas fa-times"></span>
+        <span class="sr-only">Close Config</span>
     </button>
 </div>
 
@@ -30,7 +36,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
         class="text-center mb-4 text-sm font-semibold"
         >
         <button
-            on:click={() => {
+            onclick={() => {
                 $events_loc.launcher.show_section__controller = !$events_loc.launcher.show_section__controller;
             }}
             class="ae_btn btn_sm btn_seamless"
@@ -70,7 +76,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
                 bind:value={$events_loc.launcher.controller_group_code}
                 placeholder="Controller group code"
                 class="input"
-                on:dblclick={() => {
+                ondblclick={() => {
                     $events_sess.launcher.controller_unlock_group_code = !$events_sess.launcher.controller_unlock_group_code;
 
                     $events_loc.launcher.ws_connect = false;
@@ -79,7 +85,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
                 >
 
             <button
-                on:click={() => {
+                onclick={() => {
                     $events_loc.launcher.ws_connect = !$events_loc.launcher.ws_connect;
                     $events_sess.launcher.controller_unlock_group_code = false;
                     $events_sess.launcher.controller_cmd = null,
@@ -100,7 +106,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
 
             {#if $events_loc.launcher.ws_connect}
                 <button
-                    on:click={() => {
+                    onclick={() => {
                         $events_sess.launcher.controller_unlock_group_code = false;
                         $events_sess.launcher.controller_cmd = 'ae_refresh:now';
                         $events_sess.launcher.controller_trigger_send = 'trigger';
@@ -146,7 +152,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
         class="text-center mb-4 text-sm font-semibold"
         >
         <button
-            on:click={() => {
+            onclick={() => {
                 $events_loc.launcher.show_section__app_modes = !$events_loc.launcher.show_section__app_modes;
             }}
             class="ae_btn btn_sm btn_seamless"
@@ -169,7 +175,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
         {#if !$events_loc.launcher.app_mode || $events_loc.launcher.app_mode != 'default'}
             <button
                 class="btn btn-sm preset-tonal-primary hover:preset-filled-primary-500"
-                on:click={() => {
+                onclick={() => {
                     $events_loc.launcher.app_mode='default';
                     // ae_event_launcher.set($events_loc.launcher);
                     console.log($events_loc.launcher);
@@ -182,7 +188,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
         {#if $events_loc.launcher.app_mode != 'native'}
             <button
                 class="btn btn-sm preset-tonal-primary hover:preset-filled-primary-500"
-                on:click={() => {
+                onclick={() => {
                     $events_loc.launcher.app_mode='native';
                     // ae_event_launcher.set($ae_event_launcher);
                     console.log($events_loc.launcher);
@@ -195,7 +201,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
         {#if $events_loc.launcher.app_mode != 'onsite'}
             <button
                 class="btn btn-sm preset-tonal-primary hover:preset-filled-primary-500"
-                on:click={() => {
+                onclick={() => {
                     $events_loc.launcher.app_mode='onsite';
                     // ae_event_launcher.set($ae_event_launcher);
                     console.log($events_loc.launcher);
@@ -210,7 +216,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
         {#if $events_loc.launcher.hide__launcher_menu}
             <button
                 class="btn btn-sm preset-tonal-primary hover:preset-filled-primary-500"
-                on:click={() => {
+                onclick={() => {
                     $events_loc.launcher.hide__launcher_menu = false;
                     // ae_event_launcher.set($ae_event_launcher);
                     // console.log($events_loc.launcher);
@@ -223,7 +229,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
         {#if !$events_loc.launcher.hide__launcher_menu}
             <button
                 class="btn btn-sm preset-tonal-primary hover:preset-filled-primary-500"
-                on:click={() => {
+                onclick={() => {
                     $events_loc.launcher.hide__launcher_menu = true;
                     // ae_event_launcher.set($ae_event_launcher);
                     // console.log($events_loc.launcher);
@@ -253,7 +259,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
 <div class="text-center">
     <button
         type="button"
-        on:click={() => ($events_loc.launcher.hide_drawer__debug = false)}
+        onclick={() => ($events_loc.launcher.hide_drawer__debug = false)}
         class="btn btn-sm p-1 preset-tonal-error hover:preset-filled-error-500"
         >
         <span class="fas fa-bug"></span>
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte
index 38275dcb..6e5c9792 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte
@@ -1,28 +1,32 @@
 <script lang="ts">
+interface Props {
+    // export let slct_event_presenter_id: string;
+    lq__event_presenter_obj: any; // This is not actually the LiveQuery object. This was pulled from the list of presenters for a presentation. With Svelte 5 this should not matter.
+}
+
+let { lq__event_presenter_obj }: Props = $props();
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils/ae_utils';
-import { api } from '$lib/api';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
+// import { api } from '$lib/api';
 
 import { liveQuery } from "dexie";
 
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { db_events } from "$lib/ae_events/db_events";
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
-import { events_func } from '$lib/ae_events_functions';
+// import { events_func } from '$lib/ae_events_functions';
 
 import Event_launcher_file_cont from './launcher_file_cont.svelte';
 
 // export let slct_event_presentation_id: string;
-// export let slct_event_presenter_id: string;
-export let lq__event_presenter_obj: any; // This is not actually the LiveQuery object. This was pulled from the list of presenters for a presentation. With Svelte 5 this should not matter.
 
 let ae_promises: key_val = {
     get_li__event_file: null,
 };
 
 // Event File
-$: lq__event_file_obj_li = liveQuery(async () => {
+let lq__event_file_obj_li = $derived(liveQuery(async () => {
     let results = await db_events.files
         // .where('event_session_id_random')
         .where('for_id_random')
@@ -30,13 +34,13 @@ $: lq__event_file_obj_li = liveQuery(async () => {
         .reverse()
         .sortBy('created_on')
     return results;
-});
+}));
 
 </script>
 
 
 <strong>
-    {#if lq__event_presenter_obj?.given_name && lq__event_presenter_obj?.given_name != 'Group' }
+    {#if lq__event_presenter_obj?.given_name && lq__event_presenter_obj?.given_name != 'Group'}
         <span class="fas fa-user"></span>
         {lq__event_presenter_obj?.full_name}
     {:else if lq__event_presenter_obj?.given_name == 'Group'}
@@ -55,7 +59,7 @@ $: lq__event_file_obj_li = liveQuery(async () => {
     </p>
 {/if}
 
-{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length }
+{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length}
 <section class="event_session_file_list">
     <div>
         <div class="text-xs"><strong>
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte
index b6374147..0b53f7f5 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte
@@ -1,28 +1,32 @@
 <script lang="ts">
+interface Props {
+    // export let slct_event_presenter_id: string;
+    lq__event_presenter_obj: any; // This is not actually the LiveQuery object. This was pulled from the list of presenters for a presentation. With Svelte 5 this should not matter.
+}
+
+let { lq__event_presenter_obj }: Props = $props();
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils/ae_utils';
-import { api } from '$lib/api';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
+// import { api } from '$lib/api';
 
 import { liveQuery } from "dexie";
 
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { db_events } from "$lib/ae_events/db_events";
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
-import { events_func } from '$lib/ae_events_functions';
+// import { events_func } from '$lib/ae_events_functions';
 
 import Event_launcher_file_cont from './launcher_file_cont.svelte';
 
 // export let slct_event_presentation_id: string;
-// export let slct_event_presenter_id: string;
-export let lq__event_presenter_obj: any; // This is not actually the LiveQuery object. This was pulled from the list of presenters for a presentation. With Svelte 5 this should not matter.
 
 let ae_promises: key_val = {
     get_li__event_file: null,
 };
 
 // Event File
-$: lq__event_file_obj_li = liveQuery(async () => {
+let lq__event_file_obj_li = $derived(liveQuery(async () => {
     let results = await db_events.files
         // .where('event_session_id_random')
         .where('for_id_random')
@@ -30,13 +34,13 @@ $: lq__event_file_obj_li = liveQuery(async () => {
         .reverse()
         .sortBy('created_on')
     return results;
-});
+}));
 
 </script>
 
 
 <strong>
-    {#if lq__event_presenter_obj?.given_name && lq__event_presenter_obj?.given_name != 'Group' }
+    {#if lq__event_presenter_obj?.given_name && lq__event_presenter_obj?.given_name != 'Group'}
         <span class="fas fa-user"></span>
         {lq__event_presenter_obj?.full_name}
     {:else if lq__event_presenter_obj?.given_name == 'Group'}
@@ -55,7 +59,7 @@ $: lq__event_file_obj_li = liveQuery(async () => {
     </p>
 {/if}
 
-{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length }
+{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length}
 <section class="event_session_file_list">
     <!-- <div>
         <div class="text-xs"><strong>
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
index e8514f2c..036eb924 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
@@ -1,4 +1,10 @@
 <script lang="ts">
+interface Props {
+    // export let lq_get__event_presenter_obj_li: any;
+    lq__event_session_obj: any;
+}
+
+let { lq__event_session_obj }: Props = $props();
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
@@ -16,16 +22,6 @@ import { db_events } from "$lib/ae_events/db_events";
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
 
-// export let slct_event_session_id: string;
-
-// export let lq__event_file_obj: any;
-// export let lq_get__event_file_obj_li: any;
-// export let lq__event_location_obj: any;
-// export let lq__event_presentation_obj: any;
-// export let lq_get__event_presentation_obj_li: any;
-// export let lq__event_presenter_obj: any;
-// export let lq_get__event_presenter_obj_li: any;
-export let lq__event_session_obj: any;
 
 // let load_event_session_obj = events_func.load_ae_obj_id__event_session({
 //     api_cfg: $ae_api,
@@ -51,15 +47,15 @@ export let lq__event_session_obj: any;
 // export let show_email: boolean = false;
 
 // Event File
-let lq__event_file_obj_li = liveQuery(
-    () => db_events.files
+let lq__event_file_obj_li = $derived(liveQuery(async () => {
+    let results = await db_events.files
         // .where('event_session_id_random')
         .where('for_id_random')
         .equals($events_slct.event_session_id)
         .reverse() // Need reverse for created_on newest first.
         .sortBy('created_on') // or filename
-
-);
+    return results;
+}));
 
 // Does not refresh when the event_file_id_li_json changes.
 // let lq_get__event_file_obj_li = liveQuery(
@@ -74,7 +70,7 @@ let lq__event_file_obj_li = liveQuery(
 //         .get($events_slct.event_presentation_id)
 // );
 
-$: lq__event_presentation_obj_li = liveQuery(async () => {
+let lq__event_presentation_obj_li = $derived(liveQuery(async () => {
     let sort_by = 'start_datetime';
     if ($lq__event_session_obj.type_code == 'poster') {
         sort_by = 'name';
@@ -86,7 +82,7 @@ $: lq__event_presentation_obj_li = liveQuery(async () => {
         // .sortBy('name')
 
     return results;
-});
+}));
 
 // FIX! This id list needs to be updated. It is currently commented out in the menu_session_list.svelte file.
 // let lq_get__event_presentation_obj_li = liveQuery(
@@ -95,21 +91,21 @@ $: lq__event_presentation_obj_li = liveQuery(async () => {
 // );
 
 
-$: lq__event_presenter_obj_li = liveQuery(async () => {
+let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
     let results = await db_events.presenters
         .where('event_session_id_random')
         .equals($events_slct.event_session_id)
         .sortBy('full_name');
 
     return results;
-});
+}));
 
 // let show_modal_upload_files: boolean = false;
 // let link_to_type: null|string = null;
 // let link_to_id: null|string = null;
 
 
-let ae_promises: key_val = {};
+let ae_promises: key_val = $state({});
 $events_slct.id_li__event_presenter = [];
 // await tick();
 ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_presenter({
@@ -162,7 +158,7 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p
                 >
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         if ($events_loc.launcher.time_format == 'time_12_short') {
                             // $events_loc.launcher.datetime_format = 'datetime_long';
                             $events_loc.launcher.time_format = 'time_short';
@@ -216,7 +212,7 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p
         {/if}
 
 
-        {#if $lq__event_file_obj_li && $lq__event_file_obj_li.length }
+        {#if $lq__event_file_obj_li && $lq__event_file_obj_li.length}
         <section class="event_session_file_list">
             <div>
                 <div class="text-xs"><strong>
@@ -246,7 +242,7 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p
                     >
                     <button
                         disabled={!$ae_loc.trusted_access}
-                        on:click={() => {
+                        onclick={() => {
                             // ae_promises[event_file_obj.event_file_id_random]
                             ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
                                 api_cfg: $ae_api,
diff --git a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte
index 9c55c29a..bff5ee54 100644
--- a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte
+++ b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte
@@ -1,4 +1,23 @@
 <script lang="ts">
+interface Props {
+    log_lvl?: number;
+    container_class_li?: string|Array<string>;
+    // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
+    link_to_type: string;
+    link_to_id: string;
+    lq__event_device_obj_li: any;
+    auto_refresh?: number;
+}
+
+let {
+    log_lvl = 0,
+    container_class_li = [],
+    link_to_type,
+    link_to_id,
+    lq__event_device_obj_li,
+    auto_refresh = 90000
+}: Props = $props();
+
 // Imports
 import { onDestroy } from 'svelte';
 import type { key_val } from '$lib/ae_stores';
@@ -9,25 +28,15 @@ import { events_func } from '$lib/ae_events_functions';
 
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 
-// Exports
-export let log_lvl: number = 0;
-export let container_class_li: string|Array<string> = [];
-// export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-
-export let link_to_type: string;
-export let link_to_id: string;
-export let lq__event_device_obj_li: any;
-
-export let auto_refresh: number = 90000;
 
 if (log_lvl) {
     console.log(`Event Device List: link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
 }
 
 // Variables
-let ae_promises: key_val = {
+let ae_promises: key_val = $state({
     load_ae_obj_id__event_device: {}
-};
+});
 // let ae_tmp: key_val = {};
 // let ae_triggers: key_val = {};
 
@@ -74,7 +83,7 @@ if (auto_refresh) {
         class:hidden={!$lq__event_device_obj_li?.length}
         title="Devices: {$lq__event_device_obj_li?.length ?? 'None'}"
         >
-        <span class="fas fa-laptop m-1"></span>
+        <span class="fas fa-laptop m-1 text-neutral-800/80"></span>
         {@html ($lq__event_device_obj_li?.length ? `${$lq__event_device_obj_li?.length}&times;` : '')}
     </span>
 
@@ -93,7 +102,7 @@ if (auto_refresh) {
         class="space-y-4 p-4 m-2 bg-gray-100 rounded-md"
         >
     {#each $lq__event_device_obj_li as event_device_obj}
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
+        <!-- svelte-ignore a11y_click_events_have_key_events -->
         <li
             class="space-y-2 border border-gray-400 p-2 rounded-md"
             class:dim={event_device_obj?.hide}
@@ -178,7 +187,7 @@ if (auto_refresh) {
 
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         console.log('Refresh device info:', event_device_obj);
                         ae_promises.load_ae_obj_id__event_device[event_device_obj.event_device_id] =
                             events_func.load_ae_obj_id__event_device({
@@ -202,7 +211,7 @@ if (auto_refresh) {
 
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         console.log('Show/Hide Device');
                         if (!$events_loc.pres_mgmt.device_kv) {
                             $events_loc.pres_mgmt.device_kv = {
@@ -388,7 +397,7 @@ if (auto_refresh) {
                 {#if event_device_obj?.description}
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         console.log('Show/Hide Description');
                         if ($events_sess.pres_mgmt.show_content__device_description == event_device_obj.event_device_id) {
                             $events_sess.pres_mgmt.show_content__device_description = null;
@@ -445,8 +454,3 @@ if (auto_refresh) {
 
 
 </section>
-
-
-<style>
-
-</style>
diff --git a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li_wrapper.svelte b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li_wrapper.svelte
index 8821476f..184665bc 100644
--- a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li_wrapper.svelte
+++ b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li_wrapper.svelte
@@ -1,21 +1,29 @@
 <script lang="ts">
+interface Props {
+    log_lvl?: number;
+    container_class_li?: string|Array<string>;
+    // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
+    event_device_id_random_li?: Array<string>;
+    link_to_type: string;
+    link_to_id: string;
+    auto_refresh?: number;
+}
+
+let {
+    log_lvl = 1,
+    container_class_li = [],
+    event_device_id_random_li = [],
+    link_to_type,
+    link_to_id,
+    auto_refresh = 90000
+}: Props = $props();
+
 // Imports
 import Comp_event_device_obj_li from '././ae_comp__event_device_obj_li.svelte';
 
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/ae_events/db_events";
 
-// Exports
-export let log_lvl: number = 2;
-export let container_class_li: string|Array<string> = [];
-// export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-
-export let event_device_id_random_li: Array<string> = [];
-export let link_to_type: string;
-export let link_to_id: string;
-
-export let auto_refresh: boolean|number = false;
-
 if (log_lvl) {
     console.log(`Event Device List Wrapper: link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
 }
@@ -29,7 +37,7 @@ let dq__where_type_id_val: string = `${link_to_type}_id`;
 let dq__where_eq_id_val: string = link_to_id;
 
 // *** Functions and Logic
-$: lq__event_device_obj_li = liveQuery(async () => {
+let lq__event_device_obj_li = $derived(liveQuery(async () => {
     if (link_to_type && link_to_id) {
         let results = await db_events.devices
             .where(dq__where_type_id_val)
@@ -45,7 +53,7 @@ $: lq__event_device_obj_li = liveQuery(async () => {
     } else {
         return null;
     }
-});
+}));
 </script>
 
 
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
index f98b692c..7878c69f 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
@@ -1,12 +1,15 @@
 <script lang="ts">
-/** @type {import('./$types').PageData} */
-export let data: any;
-let log_lvl: number = 0;
+interface Props {
+    /** @type {import('./$types').PageData} */
+    data: any;
+}
+
+let { data }: Props = $props();
+
+let log_lvl: number = $state(0);
 // console.log(`ae_events_pres_mgmt location [slug] +page.svelte data:`, data);
 
 // Imports
-import { onMount } from 'svelte';
-
 // import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
@@ -65,26 +68,26 @@ if (!$events_sess.pres_mgmt) {
 // $events_sess.pres_mgmt.show_content__agree_text = false;
 // $events_sess.pres_mgmt.show_content__presenter_start = false;
 
-$: lq__event_obj = liveQuery(async () => {
+let lq__event_obj = $derived(liveQuery(async () => {
     let results = await db_events.events
         .get(ae_acct.slct.event_id);
     return results;
-});
+}));
 
-$: lq__event_location_obj = liveQuery(async () => {
+let lq__event_location_obj = $derived(liveQuery(async () => {
     let results = await db_events.locations
         .get(ae_acct.slct.event_location_id);
     return results;
-});
+}));
 
-$: lq__event_session_obj_li = liveQuery(async () => {
+let lq__event_session_obj_li = $derived(liveQuery(async () => {
     let results = await db_events.sessions
         .where('event_location_id')
         .equals(ae_acct.slct.event_location_id)
         .sortBy('start_datetime')
         ;
     return results;
-});
+}));
 
 $slct.person_obj_kv = {}; // This is intended for the POC lookup list when generated.
 
@@ -92,40 +95,39 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__locatio
     $events_loc.pres_mgmt.show_content__location_view = null;
 }
 
-let event_session_id_random_li: Array<string>;
-$: if ($lq__event_session_obj_li) {
-    if (log_lvl) {
-        console.log('Session list updated? Pulling out the event_session_id_random values.');
-    }
-
-    event_session_id_random_li = [];
-
-    // We need to loop through the array of objects and get the event_session_id_random from each object a new list of event_session_id_randoms. Then we can use this list to get the full objects from the database.
-    let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
+let event_session_id_random_li: Array<string> = $state([]);
+$effect(() => {
     if ($lq__event_session_obj_li) {
-        for (let i = 0; i < $lq__event_session_obj_li.length; i++) {
-            tmp_li.push($lq__event_session_obj_li[i].event_session_id);
+        if (log_lvl) {
+            console.log('Session list updated? Pulling out the event_session_id_random values.');
         }
+
+        event_session_id_random_li = [];
+
+        // We need to loop through the array of objects and get the event_session_id_random from each object a new list of event_session_id_randoms. Then we can use this list to get the full objects from the database.
+        let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
+        if ($lq__event_session_obj_li) {
+            for (let i = 0; i < $lq__event_session_obj_li.length; i++) {
+                tmp_li.push($lq__event_session_obj_li[i].event_session_id);
+            }
+        }
+        event_session_id_random_li = tmp_li;
+
+        // event_session_id_random_li = $events_slct.event_session_obj_li.map(session_obj => session_obj.event_session_id_random);
+
+        // Finally done with the search.
+        $events_sess.pres_mgmt.status_qry__search = 'done';
+        // $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'done';
+
+        if (log_lvl > 1) {
+            console.log(`TEST SEARCH - event_session_id_random_li:`, event_session_id_random_li);
+            // console.log(`TEST SEARCH - search live query: ${$lq_kv__event_session_obj_li}`);
+        }
+
     }
-    event_session_id_random_li = tmp_li;
-
-    // event_session_id_random_li = $events_slct.event_session_obj_li.map(session_obj => session_obj.event_session_id_random);
-
-    // Finally done with the search.
-    $events_sess.pres_mgmt.status_qry__search = 'done';
-    // $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'done';
-
-    if (log_lvl > 1) {
-        console.log(`TEST SEARCH - event_session_id_random_li:`, event_session_id_random_li);
-        // console.log(`TEST SEARCH - search live query: ${$lq_kv__event_session_obj_li}`);
-    }
-
-}
+});
 
 // *** Functions and Logic
-onMount(() => {
-    console.log('Events Location [slug]: +page.svelte');
-});
 </script>
 
 
@@ -173,7 +175,7 @@ onMount(() => {
         <!-- Button to toggle between the regular location view and managing location files -->
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_content__location_view == 'manage_files') {
                     $events_loc.pres_mgmt.show_content__location_view = null;
                 } else {
@@ -266,18 +268,20 @@ onMount(() => {
             link_to_type="event_location"
             link_to_id={$lq__event_location_obj.event_location_id}
             >
-            <span slot="label">
-                <div class="text-lg">
-                    <span class="fas fa-upload"></span>
-                    <strong class="">Upload location (room) specific files only!</strong>
-                </div>
-                <div class="text-sm text-gray-600 dark:text-gray-400 italic">
-                    <strong>Location (room) files only</strong><br>
-                    Recommended: PowerPoint (pptx) or Keynote (key)<br>
-                    Media: Audio and videos files should be directly embedded in PowerPoint (PPTX) files<br>
-                    Supplemental files: mp4, PDF, Word Doc, Excel, txt, etc
-                </div>
-            </span>
+            {#snippet label()}
+                                                        <span >
+                    <div class="text-lg">
+                        <span class="fas fa-upload"></span>
+                        <strong class="">Upload location (room) specific files only!</strong>
+                    </div>
+                    <div class="text-sm text-gray-600 dark:text-gray-400 italic">
+                        <strong>Location (room) files only</strong><br>
+                        Recommended: PowerPoint (pptx) or Keynote (key)<br>
+                        Media: Audio and videos files should be directly embedded in PowerPoint (PPTX) files<br>
+                        Supplemental files: mp4, PDF, Word Doc, Excel, txt, etc
+                    </div>
+                </span>
+                                                    {/snippet}
         </Comp_event_files_upload>
 
         <div class="overflow-x-auto w-max max-w-full">
@@ -307,7 +311,3 @@ onMount(() => {
 {/if}
 
 </section>
-
-
-<style lang="postcss">
-</style>
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
index aa81b7cc..274b2836 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
@@ -1,6 +1,13 @@
 <script lang="ts">
-// export let data: any;
-export let log_lvl: number = 0;
+interface Props {
+    // export let data: any;
+    log_lvl?: number;
+    // export let event_location_id: string;
+    lq__event_obj: any;
+    lq__event_location_obj: any;
+}
+
+let { log_lvl = 0, lq__event_obj, lq__event_location_obj }: Props = $props();
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
@@ -11,13 +18,8 @@ import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp__events_menu_nav from '../../../ae_comp__events_menu_nav.svelte';
 
-// export let event_location_id: string;
-export let lq__event_obj: any;
-export let lq__event_location_obj: any;
-// export let lq__auth__event_presenter_obj: any;
-
-let ae_tmp: key_val = {};
-let ae_triggers: key_val = {};
+let ae_tmp: key_val = $state({});
+let ae_triggers: key_val = $state({});
 
 </script>
 
@@ -45,7 +47,7 @@ let ae_triggers: key_val = {};
         <!-- Button to toggle between the regular location view and managing location files -->
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_content__location_view == 'manage_files') {
                     $events_loc.pres_mgmt.show_content__location_view = null;
                 } else {
@@ -76,7 +78,7 @@ let ae_triggers: key_val = {};
 
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__location == 'options') {
                     $events_loc.pres_mgmt.show_menu__location = null;
                 } else {
@@ -100,7 +102,7 @@ let ae_triggers: key_val = {};
 
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__location == 'help') {
                     $events_loc.pres_mgmt.show_menu__location = null;
                 } else {
@@ -164,7 +166,7 @@ let ae_triggers: key_val = {};
             >
             <!-- {@html $lq__event_location_obj?.priority ? '<span class="fas fa-star m-1"></span> High Priority' : '<span class="far fa-star m-1"></span> Priority not set'} -->
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__priority = !$lq__event_location_obj?.priority;
 
                     // $events_slct.exhibit_tracking_obj.priority = !$lq__event_location_obj?.priority;
@@ -218,7 +220,7 @@ let ae_triggers: key_val = {};
             >
             <!-- {($lq__event_location_obj?.hide ? 'Hidden' : 'Not Hidden')} -->
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__hide = !$lq__event_location_obj?.hide;
 
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__event_location_obj?.hide;
@@ -275,7 +277,7 @@ let ae_triggers: key_val = {};
             >
             <!-- {($lq__event_location_obj?.enable ? 'Enabled' : 'Disabled')} -->
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__enable = !$lq__event_location_obj?.enable;
 
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__event_location_obj?.hide;
@@ -335,7 +337,7 @@ let ae_triggers: key_val = {};
             {#if $events_loc.pres_mgmt.show__launcher_link || $events_loc.pres_mgmt.show__location_link}
                 <button
                     disabled={!$ae_loc.administrator_access}
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show__launcher_link = false;
                         $events_loc.pres_mgmt.show__launcher_link_legacy = false;
                         $events_loc.pres_mgmt.show__location_link = false;
@@ -348,7 +350,7 @@ let ae_triggers: key_val = {};
             {:else}
                 <button
                     disabled={!$ae_loc.administrator_access}
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show__launcher_link = true;
                         $events_loc.pres_mgmt.show__launcher_link_legacy = true;
                         $events_loc.pres_mgmt.show__location_link = true;
@@ -363,7 +365,7 @@ let ae_triggers: key_val = {};
             {#if $events_loc.pres_mgmt.show_content__session_files}
                 <button
                     disabled={!$ae_loc.manager_access}
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show_content__session_files = false;
                     }}
                     class="btn btn-sm ae_btn_surface"
@@ -374,7 +376,7 @@ let ae_triggers: key_val = {};
             {:else}
                 <button
                     disabled={!$ae_loc.manager_access}
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show_content__session_files = true;
                     }}
                     class="btn btn-sm ae_btn_surface_outlined"
@@ -387,7 +389,7 @@ let ae_triggers: key_val = {};
             {#if $events_loc.pres_mgmt.show_content__session_presentations}
                 <button
                     disabled={!$ae_loc.manager_access}
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show_content__session_presentations = false;
                     }}
                     class="btn btn-sm ae_btn_surface"
@@ -398,7 +400,7 @@ let ae_triggers: key_val = {};
             {:else}
                 <button
                     disabled={!$ae_loc.manager_access}
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show_content__session_presentations = true;
                     }}
                     class="btn btn-sm ae_btn_surface_outlined"
@@ -413,7 +415,7 @@ let ae_triggers: key_val = {};
         {#if $ae_loc.trusted_access}
             {#if $ae_loc.edit_mode}
                 <button
-                    on:click={() => {
+                    onclick={() => {
                         $ae_loc.edit_mode = false;
                     }}
                     class="btn btn-sm ae_btn_warning"
@@ -424,7 +426,7 @@ let ae_triggers: key_val = {};
                 </button>
             {:else}
                 <button
-                    on:click={() => {
+                    onclick={() => {
                         $ae_loc.edit_mode = true;
                     }}
                     class="btn btn-sm ae_btn_warning_outlined"
@@ -454,7 +456,7 @@ let ae_triggers: key_val = {};
     <div>
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 $events_loc.pres_mgmt.show_menu__location = !$events_loc.pres_mgmt.show_menu__location;
             }}
             class="btn btn-sm mx-1 ae_btn_info_filled"
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte
index f110ce66..9041704f 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte
@@ -1,6 +1,19 @@
 <script lang="ts">
+interface Props {
+    log_lvl?: number;
+    show__launcher_link?: boolean;
+    show__launcher_link_legacy?: boolean;
+    lq__event_location_obj: any;
+}
+
+let {
+    log_lvl = 0,
+    show__launcher_link = false,
+    show__launcher_link_legacy = true,
+    lq__event_location_obj
+}: Props = $props();
+
 console.log(`ae_events_pres_mgmt location_view.svelte`);
-export let log_lvl: number = 0;
 
 import { liveQuery } from "dexie";
 
@@ -11,7 +24,7 @@ import { ae_util } from '$lib/ae_utils/ae_utils';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 
-let ae_promises: key_val = {};
+let ae_promises: key_val = $state({});
 // let ae_tmp: key_val = {};
 // let ae_triggers: key_val = {};
 
@@ -30,55 +43,54 @@ if (!$events_sess.pres_mgmt) {
     $events_sess.pres_mgmt = {};
 }
 
-export let show__launcher_link: boolean = false;
-export let show__launcher_link_legacy: boolean = true;
-
-export let lq__event_location_obj: any;
-
-let lq__event_presentation_obj = liveQuery(
-    () => db_events.presentations.get($events_slct.event_presentation_id)
-);
+let lq__event_presentation_obj = $derived(liveQuery(async () => {
+    let results = await db_events.presentations
+        .get($events_slct.event_presentation_id);
+    return results;
+}));
 
 
 $events_sess.pres_mgmt.location__updated_on = null;
-$: if ($lq__event_location_obj) {
-    if (log_lvl > 1) {
-        console.log(`$lq__event_location_obj:`, $lq__event_location_obj);
-    }
+$effect(() => {
+    if ($lq__event_location_obj) {
+        if (log_lvl > 1) {
+            console.log(`$lq__event_location_obj:`, $lq__event_location_obj);
+        }
 
-    if ($events_loc.pres_mgmt.show_content__location_qr) {
+        if ($events_loc.pres_mgmt.show_content__location_qr) {
 
-        if ($lq__event_location_obj.updated_on == $events_sess.pres_mgmt.location__updated_on) {
-            if (log_lvl > 1) {
-                console.log('Updated on is the same.');
+            if ($lq__event_location_obj.updated_on == $events_sess.pres_mgmt.location__updated_on) {
+                if (log_lvl > 1) {
+                    console.log('Updated on is the same.');
+                }
+            } else {
+                if (log_lvl) {
+                    console.log('Updated on is different.');
+                }
+                // FUTURE USE: Generate a QR code for the object ID.
+                // ae_promises.generate_qr_code_obj_id = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'obj', qr_id: $lq__event_location_obj?.event_location_id, obj_type: 'event_location', obj_id: $lq__event_location_obj?.event_location_id});
+
+                // Generate a QR code for the URL.
+                let qr_id_url = `${$lq__event_location_obj?.event_location_id}_url`;
+
+                // URL for this page (be sure to URL encode it):
+                let url_str = `${$ae_loc.url_origin}/events/${$lq__event_location_obj?.event_id}/location/${$lq__event_location_obj?.event_location_id}`;
+                url_str = encodeURI(url_str);
+
+                ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
+
+                $events_sess.pres_mgmt.location__updated_on = $lq__event_location_obj?.updated_on;
             }
         } else {
             if (log_lvl) {
-                console.log('Updated on is different.');
+                console.log('Clearing the URL.');
             }
-            // FUTURE USE: Generate a QR code for the object ID.
-            // ae_promises.generate_qr_code_obj_id = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'obj', qr_id: $lq__event_location_obj?.event_location_id, obj_type: 'event_location', obj_id: $lq__event_location_obj?.event_location_id});
-
-            // Generate a QR code for the URL.
-            let qr_id_url = `${$lq__event_location_obj?.event_location_id}_url`;
-
-            // URL for this page (be sure to URL encode it):
-            let url_str = `${$ae_loc.url_origin}/events/${$lq__event_location_obj?.event_id}/location/${$lq__event_location_obj?.event_location_id}`;
-            url_str = encodeURI(url_str);
-
-            ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
-
-            $events_sess.pres_mgmt.location__updated_on = $lq__event_location_obj?.updated_on;
+            ae_promises.generate_qr_code_url = null;
+            // Resetting the updated_on value helps with the QR code come back when switched back on.
+            $events_sess.pres_mgmt.location__updated_on = null;
         }
-    } else {
-        if (log_lvl) {
-            console.log('Clearing the URL.');
-        }
-        ae_promises.generate_qr_code_url = null;
-        // Resetting the updated_on value helps with the QR code come back when switched back on.
-        $events_sess.pres_mgmt.location__updated_on = null;
     }
-}
+});
 </script>
 
 
@@ -342,7 +354,7 @@ $: if ($lq__event_location_obj) {
         {#if $lq__event_location_obj.description}
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 console.log('Show/Hide Description');
                 $events_loc.pres_mgmt.show_content__location_description = !$events_loc.pres_mgmt.show_content__location_description;
             }}
@@ -372,7 +384,7 @@ $: if ($lq__event_location_obj) {
 </ul>
 
 <div class="m-1 flex flex-col flex-wrap gap-1 items-center">
-{#if $ae_loc.trusted_access }
+{#if $ae_loc.trusted_access}
     <!-- Message if they have agreed -->
     <Element_data_store
         ds_code="events__pres_mgmt__location_page_authorized_info"
diff --git a/src/routes/events/[event_id]/locations/+page.svelte b/src/routes/events/[event_id]/locations/+page.svelte
index 9da18778..6c0c1b36 100644
--- a/src/routes/events/[event_id]/locations/+page.svelte
+++ b/src/routes/events/[event_id]/locations/+page.svelte
@@ -1,11 +1,15 @@
 <script lang="ts">
-/** @type {import('./$types').PageData} */
-export let data: any;
+interface Props {
+    /** @type {import('./$types').PageData} */
+    data: any;
+}
+
+let { data }: Props = $props();
+
 let log_lvl: number = 0;
 // console.log(`ae_events_pres_mgmt event [slug] +page.svelte data:`, data);
 
 // Imports
-import { Modal } from 'flowbite-svelte';
 import { onMount } from 'svelte';
 
 import type { key_val } from '$lib/ae_stores';
@@ -44,19 +48,19 @@ $ae_loc.url_origin = data.url.origin;
 
 $events_slct.event_id = ae_acct.slct.event_id;
 
-$: lq__event_obj = liveQuery(async () => {
+let lq__event_obj = $derived(liveQuery(async () => {
     let results = await db_events.events.get($events_slct.event_id);
     return results;
-});
+}));
 
-$: lq__event_location_obj_li = liveQuery(async () => {
+let lq__event_location_obj_li = $derived(liveQuery(async () => {
     let results = await db_events.locations
         .where('event_id')
         .equals(ae_acct.slct.event_id)
         .sortBy('name')
         ;
     return results;
-});
+}));
 
 // *** Functions and Logic
 onMount(() => {
diff --git a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
index c7fee8b3..6939a57a 100644
--- a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
+++ b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
@@ -1,4 +1,21 @@
 <script lang="ts">
+interface Props {
+    log_lvl?: number;
+    container_class_li?: string|Array<string>;
+    // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
+    // link_to_type: string;
+    link_to_id: string;
+    lq__event_location_obj_li: any;
+}
+
+let {
+    log_lvl = 0,
+    container_class_li = [],
+    // link_to_type,
+    link_to_id,
+    lq__event_location_obj_li
+}: Props = $props();
+
 // Imports
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
@@ -8,18 +25,9 @@ import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li_wrapp
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Comp_event_device_obj_li from './../device/ae_comp__event_device_obj_li_wrapper.svelte';
 
-// Exports
-export let log_lvl: number = 0;
-export let container_class_li: string|Array<string> = [];
-// export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-
-export let link_to_type: string;
-export let link_to_id: string;
-export let lq__event_location_obj_li: any;
-
-if (log_lvl) {
-    console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
-}
+// if (log_lvl) {
+//     console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
+// }
 
 // Variables
 // let ae_promises: key_val = {};
@@ -52,7 +60,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
     {#if $ae_loc.administrator_access && $ae_loc.edit_mode}
     <button
         type="button"
-        on:click={() => {
+        onclick={() => {
             console.log('Add Location');
             if (!confirm('Add a new location to the event? You will be able to edit the details after the location is created.')) {
                 return;
@@ -86,7 +94,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
         class:hidden={!$lq__event_location_obj_li?.length}
         title="Locations: {$lq__event_location_obj_li?.length ?? 'None'}"
         >
-        <span class="fas fa-map-marked m-1"></span>
+        <span class="fas fa-map-marked m-1 text-neutral-800/80"></span>
         {@html ($lq__event_location_obj_li?.length ? `${$lq__event_location_obj_li?.length}&times;` : '')}
     </span>
 
@@ -142,7 +150,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
                 }}
                 >
                 <!-- <strong class="text-sm">Name/Title:</strong> -->
-                 <span class="fas fa-map-marker-alt m-1"></span>
+                 <span class="fas fa-map-marker-alt m-1 text-neutral-800/80"></span>
                 "{event_location_obj?.name ?? '-- not set --'}"
             </Element_ae_crud>
             <!-- "{event_location_obj.name}" -->
@@ -188,7 +196,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
 
             <button
                 type="button"
-                on:click={() => {
+                onclick={() => {
                     console.log('Show/Hide Location');
                     if (!$events_loc.pres_mgmt.location_kv) {
                         $events_loc.pres_mgmt.location_kv = {
@@ -254,7 +262,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
                 {#if event_location_obj?.description}
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         console.log('Show/Hide Description');
                         if ($events_sess.pres_mgmt.show_content__location_description == event_location_obj.event_location_id_random) {
                             $events_sess.pres_mgmt.show_content__location_description = null;
@@ -346,8 +354,3 @@ if (!$events_loc.pres_mgmt?.location_kv) {
 
 
 </section>
-
-
-<style>
-
-</style>
diff --git a/src/routes/events/[event_id]/locations/locations_page_menu.svelte b/src/routes/events/[event_id]/locations/locations_page_menu.svelte
index 391c95a6..29d1bead 100644
--- a/src/routes/events/[event_id]/locations/locations_page_menu.svelte
+++ b/src/routes/events/[event_id]/locations/locations_page_menu.svelte
@@ -1,23 +1,24 @@
 <script lang="ts">
+interface Props {
     // export let data: any;
-export let log_lvl: number = 0;
+    log_lvl?: number;
+    // export let event_location_id: string;
+    lq__event_obj: any; // export let lq__auth__event_presenter_obj: any;
+}
 
-import type { key_val } from '$lib/ae_stores';
+let { log_lvl = 0, lq__event_obj }: Props = $props();
+
+// import type { key_val } from '$lib/ae_stores';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
-import { events_func } from '$lib/ae_events_functions';
+// import { events_func } from '$lib/ae_events_functions';
 
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+// import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp__events_menu_nav from './../../ae_comp__events_menu_nav.svelte';
 
-// export let event_location_id: string;
-export let lq__event_obj: any;
-// export let lq__auth__event_presenter_obj: any;
-
 // let ae_tmp: key_val = {};
 // let ae_triggers: key_val = {};
-
 </script>
 
 
@@ -44,7 +45,7 @@ export let lq__event_obj: any;
         <!-- Button to toggle between showing and not showing the extended options menu -->
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__location == 'options') {
                     $events_loc.pres_mgmt.show_menu__location = null;
                 } else {
@@ -68,7 +69,7 @@ export let lq__event_obj: any;
 
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__location == 'help') {
                     $events_loc.pres_mgmt.show_menu__location = null;
                 } else {
@@ -104,7 +105,7 @@ export let lq__event_obj: any;
             <!-- Show the session list or device list -->
             <button
                 type="button"
-                on:click={() => {
+                onclick={() => {
                     if ($events_loc.pres_mgmt.show_content__location_devices_sessions == 'sessions') {
                         $events_loc.pres_mgmt.show_content__location_devices_sessions = 'devices';
                     } else {
@@ -128,7 +129,7 @@ export let lq__event_obj: any;
             <!-- Show or hide the device code -->
             <button
                 type="button"
-                on:click={() => {
+                onclick={() => {
                     $events_loc.pres_mgmt.hide__device_code = !$events_loc.pres_mgmt.hide__device_code;
                 }}
                 class="btn btn-sm"
@@ -148,7 +149,7 @@ export let lq__event_obj: any;
             <!-- Show or hide the location code -->
             <button
                 type="button"
-                on:click={() => {
+                onclick={() => {
                     $events_loc.pres_mgmt.hide__location_code = !$events_loc.pres_mgmt.hide__location_code;
                 }}
                 class="btn btn-sm"
@@ -168,7 +169,7 @@ export let lq__event_obj: any;
             <!-- Show or hide the session code -->
             <button
                 type="button"
-                on:click={() => {
+                onclick={() => {
                     $events_loc.pres_mgmt.hide__session_code = !$events_loc.pres_mgmt.hide__session_code;
                 }}
                 class="btn btn-sm"
@@ -204,7 +205,7 @@ export let lq__event_obj: any;
     <div>
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 $events_loc.pres_mgmt.show_menu__location = !$events_loc.pres_mgmt.show_menu__location;
             }}
             class="btn btn-sm mx-1 preset-tonal-error border border-error-500 hover:preset-filled-error-500"
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
index 30cfd847..edc29692 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
@@ -1,5 +1,11 @@
 <script lang="ts">
+interface Props {
+    /** @type {import('./$types').PageData} */
+    data: any;
+    log_lvl?: number;
+}
 
+let { data, log_lvl = 0 }: Props = $props();
 
 // Imports (external and then internal)
 import { browser } from '$app/environment';
@@ -22,13 +28,6 @@ import Presenter_view from './presenter_view.svelte';
 import Presenter_page_menu from './presenter_page_menu.svelte';
 import MyClipboard from '$lib/e_app_clipboard.svelte';
 
-interface Props {
-    /** @type {import('./$types').PageData} */
-    data: any;
-    log_lvl?: number;
-}
-
-let { data, log_lvl = 0 }: Props = $props();
 
 // Exports
 // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
index 59ed538c..5a56ebd4 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
@@ -1,4 +1,13 @@
 <script lang="ts">
+interface Props {
+    // export let event_presenter_id: string;
+    lq__event_presenter_obj: any;
+    // export let lq__event_session_obj: any;
+    log_lvl?: number;
+}
+
+let { lq__event_presenter_obj, log_lvl = 0 }: Props = $props();
+
 console.log(`ae_events_pres_mgmt session [slug] form_agree.svelte`);
 
 // Imports (external and then internal)
@@ -16,34 +25,11 @@ import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_st
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
 
-// export let event_presenter_id: string;
-export let lq__event_presenter_obj: any;
-// export let event_presentation_id: string;
-// export let lq__event_presentation_obj: any;
-// export let lq__event_session_obj: any;
-export let log_lvl: number = 0;
 
-let ae_promises: key_val = {};
+let ae_promises: key_val = $state({});
 // let ae_tmp: key_val = {};
 // let ae_triggers: key_val = {};
 
-// let lq__event_session_obj = liveQuery(
-//     () => db_events.sessions.get($events_slct.event_session_id)
-// );
-
-// let lq__event_presentation_obj = liveQuery(
-//     async () => await db_events.presentations.get($events_slct.event_presentation_id)
-// );
-
-// console.log(`$events_slct.event_presenter_id:`, $events_slct.event_presenter_id);
-// let lq__event_presenter_obj = liveQuery(
-//     () => db_events.presenters.get($events_slct.event_presenter_id)
-// );
-
-// let lq__event_presentation_obj = liveQuery(
-//     () => db_events.presentations.get($events_slct.event_presentation_id)
-// );
-
 $events_sess.pres_mgmt.disable_submit__opt_out = false;
 
 let tmp_agree = false;
@@ -55,6 +41,13 @@ let tmp_opt_out: key_val = {
 };
 
 // *** Functions and Logic
+function preventDefault(fn) {
+    return function (event) {
+        event.preventDefault();
+        fn.call(this, event);
+    };
+}
+
 async function handle_submit_form(event) {
     console.log('*** handle_submit_form() ***');
 
@@ -185,7 +178,7 @@ async function handle_update__event_presenter({
     <h3 class="h4 text-center">Opt-Out?</h3>
     <form
         class="modal-form {$ae_loc.hub.classes__form}"
-        on:submit|preventDefault={handle_submit_form}
+        onsubmit={preventDefault(handle_submit_form)}
         >
         <p>Speaker does not permit the use of presentation materials as described in section(s), above for: (please check for all that apply)</p>
 
@@ -249,7 +242,7 @@ async function handle_update__event_presenter({
         <button
             type="submit"
             disabled={($events_sess.pres_mgmt?.disable_submit__opt_out)}
-            on:click={() => {
+            onclick={() => {
                 console.log('*** Save button clicked ***');
             }}
             class="btn btn-md preset-tonal-warning border border-warning-500 hover:preset-filled-secondary-500 m-2"
@@ -309,7 +302,7 @@ async function handle_update__event_presenter({
         <button
             disabled={!$ae_loc.administrator_access
             && !$events_loc.auth__kv.presentation[$lq__event_presenter_obj?.event_presentation_id_random]}
-            on:click={() => {
+            onclick={() => {
                 console.log('Agree to the terms and conditions.');
 
                 $events_sess.pres_mgmt.status__presenter_agree = 'saving';
@@ -367,7 +360,7 @@ async function handle_update__event_presenter({
         <button
             disabled={!$ae_loc.administrator_access
             && !$events_loc.auth__kv.presentation[$lq__event_presenter_obj?.event_presentation_id_random]}
-            on:click={() => {
+            onclick={() => {
                 console.log('Revoke agreement to the terms and conditions.');
 
                 $events_sess.pres_mgmt.status__presenter_agree = 'saving';
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
index a60091da..83b5bbbb 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
@@ -1,6 +1,13 @@
 <script lang="ts">
-// export let data: any;
-export let log_lvl: number = 0;
+interface Props {
+    // export let data: any;
+    log_lvl?: number;
+    // import Sign_in_out from './sign_in_out.svelte'; // Should this be used here later???
+    lq__event_obj: any;
+    lq__event_presenter_obj: any;
+}
+
+let { log_lvl = 0, lq__event_obj, lq__event_presenter_obj }: Props = $props();
 
 import { goto } from '$app/navigation';
 
@@ -12,15 +19,9 @@ import { events_func } from '$lib/ae_events_functions';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp__events_menu_nav from './../../../ae_comp__events_menu_nav.svelte';
-// import Sign_in_out from './sign_in_out.svelte'; // Should this be used here later???
-
-
-export let lq__event_obj: any;
-export let lq__event_presenter_obj: any;
-
-let ae_tmp: key_val = {};
-let ae_triggers: key_val = {};
 
+let ae_tmp: key_val = $state({});
+let ae_triggers: key_val = $state({});
 </script>
 
 
@@ -47,7 +48,7 @@ let ae_triggers: key_val = {};
         <!-- Button to toggle between the regular presenter view and managing presenter files -->
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_content__presenter_view == 'manage_files') {
                     $events_loc.pres_mgmt.show_content__presenter_view = null;
                 } else {
@@ -79,7 +80,7 @@ let ae_triggers: key_val = {};
         <!-- Button to toggle between showing and not showing the extended options menu -->
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__presenter == 'options') {
                     $events_loc.pres_mgmt.show_menu__presenter = null;
                 } else {
@@ -105,7 +106,7 @@ let ae_triggers: key_val = {};
 
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__presenter == 'help') {
                     $events_loc.pres_mgmt.show_menu__presenter = null;
                 } else {
@@ -135,8 +136,7 @@ let ae_triggers: key_val = {};
             <button
                 type="button"
                 disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[$lq__event_presenter_obj?.event_presenter_id_random]}
-                on:click={
-                    () => {
+                onclick={() => {
                         $events_slct.event_presentation_id = $lq__event_presenter_obj?.event_presentation_id_random;
                         // $events_slct.event_presentation_obj = $events_slct.event_presentation_obj;
 
@@ -144,8 +144,7 @@ let ae_triggers: key_val = {};
                         // $lq__event_presenter_obj = $lq__event_presenter_obj;
 
                         $events_sess.pres_mgmt.show_modal__presenter_agree = $lq__event_presenter_obj?.event_presenter_id_random;
-                    }
-                }
+                    }}
                 class="btn btn-sm mx-1 font-bold ae_btn_success_filled"
                 title="Agreed to terms and conditions"
                 >
@@ -158,8 +157,7 @@ let ae_triggers: key_val = {};
             <button
                 type="button"
                 disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[$lq__event_presenter_obj?.event_presenter_id_random]}
-                on:click={
-                    () => {
+                onclick={() => {
                         $events_slct.event_presentation_id = $lq__event_presenter_obj?.event_presentation_id_random;
                         // $events_slct.event_presentation_obj = $events_slct.event_presentation_obj;
 
@@ -167,8 +165,7 @@ let ae_triggers: key_val = {};
                         // $lq__event_presenter_obj = $lq__event_presenter_obj;
 
                         $events_sess.pres_mgmt.show_modal__presenter_agree = $lq__event_presenter_obj?.event_presenter_id_random;
-                    }
-                }
+                    }}
                 class="btn btn-sm mx-1 font-bold ae_btn_warning_filled"
                 title="View terms and conditions"
                 >
@@ -216,7 +213,7 @@ let ae_triggers: key_val = {};
             >
             <!-- {@html $lq__event_presenter_obj?.priority ? '<span class="fas fa-star m-1"></span> High Priority' : '<span class="far fa-star m-1"></span> Priority not set'} -->
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__priority = !$lq__event_presenter_obj?.priority;
 
                     ae_triggers.priority = true;
@@ -269,7 +266,7 @@ let ae_triggers: key_val = {};
             >
             <!-- {($lq__event_presenter_obj?.hide ? 'Hidden' : 'Not Hidden')} -->
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__hide = !$lq__event_presenter_obj?.hide;
 
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__event_presenter_obj?.hide;
@@ -326,7 +323,7 @@ let ae_triggers: key_val = {};
             >
             <!-- {($lq__event_presenter_obj?.enable ? 'Enabled' : 'Disabled')} -->
             <button
-                on:click={() => {
+                onclick={() => {
                     ae_tmp.value__enable = !$lq__event_presenter_obj?.enable;
 
                     ae_triggers.enable = true;
@@ -356,7 +353,7 @@ let ae_triggers: key_val = {};
 
         {#if $ae_loc.manager_access}
         <button
-            on:click={() => {
+            onclick={() => {
                 if (!confirm('Are you sure you want to delete this presenter?')) {return false;}
 
                 events_func.delete_ae_obj_id__event_presenter({
@@ -379,7 +376,7 @@ let ae_triggers: key_val = {};
         </button>
         {:else if $ae_loc.trusted_access}
         <button
-            on:click={() => {
+            onclick={() => {
                 if (!confirm('Are you sure you want to remove (disable) this presenter?')) {return false;}
                 events_func.delete_ae_obj_id__event_presenter({
                     api_cfg: $ae_api,
@@ -404,7 +401,7 @@ let ae_triggers: key_val = {};
         {#if $ae_loc.administrator_access}
             {#if $events_loc.pres_mgmt.show_content__presenter_qr}
                 <button
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show_content__presenter_qr = false;
                     }}
                     class="btn btn-sm ae_btn_surface"
@@ -414,7 +411,7 @@ let ae_triggers: key_val = {};
                 </button>
             {:else}
                 <button
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show_content__presenter_qr = true;
                     }}
                     class="btn btn-sm ae_btn_surface_outlined"
@@ -428,7 +425,7 @@ let ae_triggers: key_val = {};
         {#if $ae_loc.trusted_access}
             {#if $ae_loc.edit_mode}
                 <button
-                    on:click={() => {
+                    onclick={() => {
                         $ae_loc.edit_mode = false;
                     }}
                     class="btn btn-sm ae_btn_warning"
@@ -439,7 +436,7 @@ let ae_triggers: key_val = {};
                 </button>
             {:else}
                 <button
-                    on:click={() => {
+                    onclick={() => {
                         $ae_loc.edit_mode = true;
                     }}
                     class="btn btn-sm ae_btn_warning_outlined"
@@ -469,7 +466,7 @@ let ae_triggers: key_val = {};
     <div>
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 $events_loc.pres_mgmt.show_menu__presenter = !$events_loc.pres_mgmt.show_menu__presenter;
             }}
             class="btn btn-sm mx-1 ae_btn_info_filled"
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
index d54487a2..6a17cf79 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
@@ -1,6 +1,15 @@
 <script lang="ts">
+interface Props {
+    log_lvl?: number;
+    // export let event_presenter_id: string;
+    lq__event_presenter_obj: any;
+    // export let event_presentation_id: string;
+    lq__event_presentation_obj: any;
+}
+
+let { log_lvl = 0, lq__event_presenter_obj, lq__event_presentation_obj }: Props = $props();
+
 console.log(`ae_events_pres_mgmt presenter_view.svelte`);
-export let log_lvl: number = 0;
 
 import { onMount } from 'svelte';
 // import { liveQuery } from "dexie";
@@ -20,28 +29,21 @@ import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_ev
 import { events_func } from '$lib/ae_events_functions';
 
 // Exports
-// export let event_presenter_id: string;
-export let lq__event_presenter_obj: any;
-// export let event_presentation_id: string;
-export let lq__event_presentation_obj: any;
+
 // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
 
 // let ae_placeholder_li: key_val = {};
-let ae_promises: key_val = {}; // Promise<any>;
+let ae_promises: key_val = $state({}); // Promise<any>;
 // let ae_promises_2: key_val = {}; // Promise<any>;
-let ae_tmp: key_val = {};
+let ae_tmp: key_val = $state({});
 ae_tmp.show__file_li = true;
 
-let ae_triggers: key_val = {};
+let ae_triggers: key_val = $state({});
 
 console.log(`event_presenter_id:`, $lq__event_presenter_obj?.event_presenter_id);
 
 console.log(`event_presentation_id:`, $lq__event_presentation_obj?.event_presentation_id);
 
-// let lq__event_file_obj_li = liveQuery(
-//     async () => await db_events.files.where('event_presenter_id').equals($lq__event_presenter_obj?.event_presenter_id).toArray()
-// );
-
 // ae_tmp.biography = '';
 ae_tmp.biography = null;
 // ae_tmp.biography = $lq__event_presenter_obj?.biography ?? '';
@@ -53,14 +55,15 @@ ae_tmp.biography = null;
 //     console.log(`ae_tmp.biography:`, ae_tmp.biography);
 // }
 
-$: if (browser && ae_tmp.biography === null && $lq__event_presenter_obj?.biography) {
-    ae_tmp.biography = $lq__event_presenter_obj?.biography ?? '';
-    console.log(`ae_tmp.biography:`, ae_tmp.biography);
-}
+$effect(() => {
+    if (browser && ae_tmp.biography === null && $lq__event_presenter_obj?.biography) {
+        ae_tmp.biography = $lq__event_presenter_obj?.biography ?? '';
+        console.log(`ae_tmp.biography:`, ae_tmp.biography);
+    }
+});
 
 $slct.person_obj_kv = {}; // This is intended for the person presenter lookup list when generated.
 
-
 onMount(() => {
     console.log('Events Pres Mgmt: presenter_view.svelte');
     console.log(`event_presenter_id:`, $lq__event_presenter_obj?.event_presenter_id);
@@ -69,215 +72,52 @@ onMount(() => {
     // ae_tmp.biography = $lq__event_presenter_obj?.biography;
 });
 
-
-// async function handle_submit_form_files(event) {
-//     console.log('*** handle_submit_form() ***');
-
-//     $events_sess.pres_mgmt.disable_submit__event_file_obj = true;
-//     $events_sess.pres_mgmt.submit_status = 'saving';
-
-//     let hosted_file_results;
-
-//     if (event.target.presenter_event_file.files.length > 0) {
-
-//         hosted_file_results = await handle_input_upload_files(event.target.presenter_event_file.files);
-
-
-//         if (hosted_file_results) {
-//             console.log(`hosted_file_results:`, hosted_file_results);
-//         } else {
-//             console.log(`hosted_file_results:`, hosted_file_results);
-//         }
-//     }
-
-//     $events_sess.pres_mgmt.disable_submit__event_file_obj = false;
-// }
-
-
-// async function handle_input_upload_files(input_upload_files: FileList) {
-//     console.log('*** handle_input_upload_files() ***');
-
-//     let link_to_type = 'event_presenter';
-//     let link_to_id = $lq__event_presenter_obj?.event_presenter_id;
-
-//     const form_data = new FormData();
-
-//     form_data.append('account_id', $ae_loc.account_id);
-//     form_data.append('link_to_type', link_to_type);
-//     form_data.append('link_to_id', link_to_id);
-
-//     for (let i = 0; i < input_upload_files.length; i++) {
-//         form_data.append(`file_list`, input_upload_files[i]);
-//     }
-
-//     let params = null;
-
-//     let endpoint = '/hosted_file/upload_files';
-
-//     console.log(form_data);
-
-//     params = null;
-
-//     // Uncomment and the post_promise is not seen by the "await" below
-//     // post_promise = await api.post_object({api_cfg: $cfg.api, endpoint: endpoint, params: params, data:form_data});
-//     // Uncomment so that the post_promise is not seen by the "await" below
-//     ae_promises.upload__hosted_file_obj = api.post_object({
-//         api_cfg: $ae_api,
-//         endpoint: endpoint,
-//         params: params,
-//         form_data: form_data,
-//         task_id: link_to_id,
-//         log_lvl: 0
-//     })
-//     .then(async function (result) {
-//         // NOTE: The /hosted_file/upload_files endpoint will always return a list of successful files uploaded. In this case we are only uploading one file and expecting a list of one item.
-//         let x = 0;
-//         console.log(result[x]);
-//         let hosted_file_obj = result[x];
-
-//         let hosted_file_id = hosted_file_obj.hosted_file_id_random;
-
-//         let event_file_data: key_val = {};
-//         event_file_data['hosted_file_id_random'] = hosted_file_id;
-//         event_file_data['for_type'] = link_to_type;
-//         event_file_data['for_id_random'] = link_to_id;
-//         event_file_data['filename'] = hosted_file_obj.filename;
-//         event_file_data['extension'] = hosted_file_obj.extension;
-//         event_file_data['enable'] = true;
-//         console.log(event_file_data);
-
-//         // $events_sess.pres_mgmt.new_upload_list[i].uploaded_bytes = 10; // fake 10 bytes at least...
-
-//         let event_file_id = await events_func.create_event_file_obj_from_hosted_file_async({
-//             api_cfg: $ae_api,
-//             hosted_file_id: hosted_file_id,
-//             data: event_file_data,
-//             log_lvl: 1
-//             })
-//         .then(function (create_result) {
-//             console.log(create_result); // NOTE: This should be the event_file_id string
-//             // let event_file_id = create_result;
-//             return create_result;
-//         });
-
-//         return event_file_id;
-//     })
-//     .then(function (event_file_id) {
-//         // NOTE: Need to make sure the event file records are created first. The update won't see the changes if too fast.
-//         // dispatch(
-//         //     'event_file_obj_li_updated',
-//         //     {
-//         //         link_to_type: link_to_type,
-//         //         link_to_id: link_to_id,
-//         //     }
-//         // );
-
-//         // $ae_events.pres_mgmt.new_upload_list[i].uploaded = true;
-//         // $ae_events.pres_mgmt.new_upload_list[i].uploaded_bytes = event.target.event_file_upload_file_list.files[i].size;
-
-//         return event_file_id;
-//     })
-//     .catch(function (error) {
-//         console.log('Something went wrong.');
-//         console.log(error);
-//         return false;
-//     })
-//     .finally(function (event_file_id) {
-//         // $events_sess.pres_mgmt.files_uploading_count--;
-//         $slct_trigger = 'load__event_file_obj_li';
-
-//         return event_file_id;
-//     });
-
-//     console.log(ae_promises.upload__hosted_file_obj);
-//     let hosted_file_result = ae_promises.upload__hosted_file_obj;
-
-//     return hosted_file_result;
-// }
-
-// async function handle_delete__event_file({event_file_id} : {event_file_id: string}) {
-//     console.log(`*** handle_delete__event_file() *** event_file_id:`, event_file_id);
-
-//     let link_to_type = 'event_presenter';
-//     let link_to_id = $lq__event_presenter_obj?.event_presenter_id;
-
-//     ae_promises.delete__event_file_obj = await events_func.delete_ae_obj_id__event_file({
-//         api_cfg: $ae_api,
-//         event_file_id: event_file_id,
-//         log_lvl: 2
-//     })
-//     .then(function (event_file_obj_result) {
-//         console.log(event_file_obj_result);
-//         if (!event_file_obj_result) {
-//             console.log('The result was null or false.');
-//             return false;
-//         } else {
-//             console.log(`event_file_obj_result = `, event_file_obj_result);
-//         }
-
-//         dispatch(
-//             'event_file_obj_deleted',
-//             {
-//                 event_file_id: event_file_id,
-//                 link_to_type: link_to_type,
-//                 link_to_id: link_to_id,
-//             }
-
-//         );
-//         return event_file_obj_result;
-//     }).catch(function (error) {
-//         console.log('Something went wrong deleting the event file.');
-//         console.log(error);
-//         return false;
-//     });
-
-//     return ae_promises.delete__event_file_obj;
-// }
-
 ae_promises.generate_qr_code_url = null;
 $events_sess.pres_mgmt.presenter__updated_on = null;
-$: if ($lq__event_presenter_obj) {
-    if (log_lvl > 1) {
-        console.log(`$lq__event_presenter_obj:`, $lq__event_presenter_obj);
-    }
+$effect(() => {
+        if ($lq__event_presenter_obj) {
+        if (log_lvl > 1) {
+            console.log(`$lq__event_presenter_obj:`, $lq__event_presenter_obj);
+        }
 
-    if ($events_loc.pres_mgmt.show_content__presenter_qr) {
+        if ($events_loc.pres_mgmt.show_content__presenter_qr) {
 
-        if ($lq__event_presenter_obj.updated_on == $events_sess.pres_mgmt.presenter__updated_on) {
-            if (log_lvl > 1) {
-                console.log('Updated on is the same.');
+            if ($lq__event_presenter_obj.updated_on == $events_sess.pres_mgmt.presenter__updated_on) {
+                if (log_lvl > 1) {
+                    console.log('Updated on is the same.');
+                }
+            } else {
+                if (log_lvl) {
+                    console.log('Updated on is different.');
+                }
+                // FUTURE USE: Generate a QR code for the object ID.
+                // ae_promises.generate_qr_code_obj_id = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'obj', qr_id: $lq__event_presenter_obj?.event_presenter_id, obj_type: 'event_presenter', obj_id: $lq__event_presenter_obj?.event_presenter_id});
+
+                // Generate a QR code for the URL.
+                let qr_id_url = `${$lq__event_presenter_obj?.event_presenter_id}_url`;
+
+                // URL for this page (be sure to URL encode it):
+                let url_str = `${$ae_loc.url_origin}/events/${$lq__event_presenter_obj?.event_id}/presenter/${$lq__event_presenter_obj?.event_presenter_id}`;
+                url_str = encodeURI(url_str);
+
+
+                ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
+
+                // $events_sess.pres_mgmt.presenter__url_str = url_str;
+                $events_sess.pres_mgmt.presenter__updated_on = $lq__event_presenter_obj?.updated_on;
             }
+
         } else {
             if (log_lvl) {
-                console.log('Updated on is different.');
+                console.log('Clearing the URL.');
             }
-            // FUTURE USE: Generate a QR code for the object ID.
-            // ae_promises.generate_qr_code_obj_id = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'obj', qr_id: $lq__event_presenter_obj?.event_presenter_id, obj_type: 'event_presenter', obj_id: $lq__event_presenter_obj?.event_presenter_id});
-
-            // Generate a QR code for the URL.
-            let qr_id_url = `${$lq__event_presenter_obj?.event_presenter_id}_url`;
-
-            // URL for this page (be sure to URL encode it):
-            let url_str = `${$ae_loc.url_origin}/events/${$lq__event_presenter_obj?.event_id}/presenter/${$lq__event_presenter_obj?.event_presenter_id}`;
-            url_str = encodeURI(url_str);
-
-
-            ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
-
-            // $events_sess.pres_mgmt.presenter__url_str = url_str;
-            $events_sess.pres_mgmt.presenter__updated_on = $lq__event_presenter_obj?.updated_on;
+            ae_promises.generate_qr_code_url = null;
+            // Resetting the updated_on value helps with the QR code come back when switched back on.
+            $events_sess.pres_mgmt.presenter__updated_on = null;
         }
 
-    } else {
-        if (log_lvl) {
-            console.log('Clearing the URL.');
-        }
-        ae_promises.generate_qr_code_url = null;
-        // Resetting the updated_on value helps with the QR code come back when switched back on.
-        $events_sess.pres_mgmt.presenter__updated_on = null;
     }
-
-}
+    });
 </script>
 
 
@@ -471,7 +311,7 @@ $: if ($lq__event_presenter_obj) {
                 >
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         console.log('*** Sync external ID button clicked ***');
                         if (!confirm('Are you sure you want to sync the external IDs?')) {return false;}
 
@@ -612,7 +452,7 @@ $: if ($lq__event_presenter_obj) {
                     >
                     <button
                         type="button"
-                        on:click={() => {
+                        onclick={() => {
                             console.log('*** Sync name button clicked ***');
                             if (!confirm('Are you sure you want to sync the names?')) {return false;}
 
@@ -694,7 +534,7 @@ $: if ($lq__event_presenter_obj) {
                     >
                     <button
                         type="button"
-                        on:click={() => {
+                        onclick={() => {
                             console.log('*** Sync name button clicked ***');
                             if (!confirm('Are you sure you want to sync the names?')) {return false;}
 
@@ -840,7 +680,7 @@ $: if ($lq__event_presenter_obj) {
                     >
                     <button
                         type="button"
-                        on:click={() => {
+                        onclick={() => {
                             console.log('*** Sync email button clicked ***');
                             if (!confirm('Are you sure you want to sync the email addresses?')) {return false;}
 
@@ -956,7 +796,7 @@ $: if ($lq__event_presenter_obj) {
                 >
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         console.log('*** Sync affiliations button clicked ***');
                         if (!confirm('Are you sure you want to sync the affiliations?')) {return false;}
 
@@ -1072,7 +912,7 @@ $: if ($lq__event_presenter_obj) {
                 >
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         console.log('*** Sync professional title button clicked ***');
                         if (!confirm('Are you sure you want to sync the professional title?')) {return false;}
 
@@ -1158,7 +998,7 @@ $: if ($lq__event_presenter_obj) {
                 <!-- {#if ae_tmp.show__edit_person} -->
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         console.log('Cancel the person for the presenter.');
 
                         ae_tmp.person_id = null;
@@ -1174,7 +1014,7 @@ $: if ($lq__event_presenter_obj) {
 
                 <button
                     type="button"
-                    on:click={async () => {
+                    onclick={async () => {
                         console.log('Edit the person for the presenter.');
 
                         // let params = {
@@ -1229,7 +1069,7 @@ $: if ($lq__event_presenter_obj) {
         {#if $ae_loc.administrator_access && $lq__event_presenter_obj?.person_id}
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 console.log('*** Sync person button clicked ***');
                 if (!confirm('Are you sure you want to sync from the person record?')) {return false;}
 
@@ -1268,7 +1108,7 @@ $: if ($lq__event_presenter_obj) {
         {#if $ae_loc.trusted_access && !$lq__event_presenter_obj?.person_id}
             <button
                 type="button"
-                on:click={async () => {
+                onclick={async () => {
                     console.log('Add Person');
                     if ($ae_loc.administrator_access) {
                         if (!confirm(`Add a new person (${$lq__event_presenter_obj.person_given_name}) to the account? You will be able to edit their details after the person record is created.\n\n${$ae_loc.account_name}\nID: ${$slct.account_id}`)) {
@@ -1358,7 +1198,7 @@ $: if ($lq__event_presenter_obj) {
             <span
                 class="font-bold"
                 >
-            {@html $lq__event_presenter_obj.person_passcode ?? ae_snip.html__not_set }
+            {@html $lq__event_presenter_obj.person_passcode ?? ae_snip.html__not_set}
             </span>
         </Element_ae_crud>
 
@@ -1420,17 +1260,8 @@ $: if ($lq__event_presenter_obj) {
         class:hidden={$events_loc.pres_mgmt?.hide__presenter_biography || (!$ae_loc.authenticated_access && !$lq__event_presenter_obj.biography)}
         >
         <div class="label event_presenter__biography required space-y-4">
-            <!-- <button
-                type="button"
-                use:clipboard={ae_tmp.biography?.trim()}
-                class="btn btn-sm preset-tonal-warning border border-warning-500 float-right m-1"
-                class:hidden={!ae_tmp?.biography || ae_tmp.biography.length < 100}
-                title="Copy the presenter biography text to the clipboard."
-                >
-                <span class="fas fa-copy mx-1"></span>
-                Copy Biography Text
-            </button> -->
-
+            <!-- {#if clipboard_success}Copied!{:else}Copy Access Link{/if} -->
+            <!-- <span class="fas fa-copy mx-1"></span> -->
             <MyClipboard
                 value={ae_tmp.biography?.trim()}
                 btn_text="Copy Biography Text"
@@ -1473,7 +1304,7 @@ $: if ($lq__event_presenter_obj) {
             type="button"
             class="btn btn-md preset-tonal-primary hover:preset-filled-primary-500"
             disabled={(ae_tmp.biography == $lq__event_presenter_obj.biography)}
-            on:click={() => {
+            onclick={() => {
                 console.log('*** Save button clicked ***');
 
                 let event_presenter_data = {
diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte
index 1851649b..d18c9ca1 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte
@@ -1,4 +1,22 @@
 <script lang="ts">
+interface Props {
+    log_lvl?: number;
+    container_class_li?: string|Array<string>;
+    display_mode?: string; // 'default', 'compact', 'minimal', 'launcher'
+    link_to_type: string;
+    link_to_id: string;
+    lq__event_presenter_obj_li: any;
+}
+
+let {
+    log_lvl = 0,
+    container_class_li = [],
+    display_mode = 'default',
+    link_to_type,
+    link_to_id,
+    lq__event_presenter_obj_li
+}: Props = $props();
+
 // Imports
 import type { key_val } from '$lib/ae_stores';
 // import { ae_util } from '$lib/ae_utils/ae_utils';
@@ -6,36 +24,24 @@ import type { key_val } from '$lib/ae_stores';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
-import { liveQuery } from "dexie";
+// import { liveQuery } from "dexie";
 import { core_func } from '$lib/ae_core/ae_core_functions';
-import { db_events } from "$lib/ae_events/db_events";
+// import { db_events } from "$lib/ae_events/db_events";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 
-// Exports
-export let log_lvl: number = 0;
-export let container_class_li: string|Array<string> = [];
-export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-
-export let link_to_type: string;
-export let link_to_id: string;
-export let lq__event_presenter_obj_li: any;
-
 if (log_lvl) {
     console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
 }
 
 // Variables
 // let ae_promises: key_val = {};
-let ae_tmp: key_val = {};
+let ae_tmp: key_val = $state({});
 // let ae_triggers: key_val = {};
 
 // *** Functions and Logic
-let lq__event_presentation_obj = liveQuery(
-    () => db_events.presentations.get($events_slct.event_presentation_id)
-);
 </script>
 
 
@@ -44,7 +50,7 @@ let lq__event_presentation_obj = liveQuery(
     >
     <button
         type="button"
-        on:click={() => {
+        onclick={() => {
             console.log('*** Refresh button clicked ***');
             ae_tmp.show__file_li = false;
             console.log(`$lq__event_presenter_obj_li:`, $lq__event_presenter_obj_li);
@@ -123,7 +129,7 @@ let lq__event_presentation_obj = liveQuery(
                     "
                 title="Person ID: {event_presenter_obj.person_id_random}; Email: {event_presenter_obj.person_primary_email}"
                 >
-                {#if event_presenter_obj?.given_name && event_presenter_obj?.given_name != 'Group' }
+                {#if event_presenter_obj?.given_name && event_presenter_obj?.given_name != 'Group'}
                     <span class="fas fa-user m-0.5 text-xs text-surface-800-200"></span>
                 {:else if event_presenter_obj?.given_name == 'Group'}
                     <span class="fas fa-users m-0.5 text-xs text-surface-800-200"></span>
@@ -135,7 +141,7 @@ let lq__event_presentation_obj = liveQuery(
                 {/if}
                 <span class="text-center grow">
 
-                    {#if event_presenter_obj?.given_name && event_presenter_obj?.given_name != 'Group' }
+                    {#if event_presenter_obj?.given_name && event_presenter_obj?.given_name != 'Group'}
                         {event_presenter_obj?.full_name}
                     {:else if event_presenter_obj?.given_name == 'Group'}
                         {ae_util.shorten_string({string: event_presenter_obj?.affiliations, max_length: 25})}
@@ -157,7 +163,7 @@ let lq__event_presentation_obj = liveQuery(
             {#if ($events_loc?.pres_mgmt?.show__email_access_link && event_presenter_obj?.person_primary_email && ($ae_loc.administrator_access || !$events_loc.auth__person?.id))}
             <button
                 type="button"
-                on:click={() => {
+                onclick={() => {
                     console.log('Email the access link');
                     if (!event_presenter_obj.person_primary_email) {
                         alert('No email address found for this presenter.');
@@ -202,8 +208,7 @@ let lq__event_presentation_obj = liveQuery(
                     <button
                         type="button"
                         disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
-                        on:click={
-                            () => {
+                        onclick={() => {
                                 console.log('View terms and conditions');
                                 $events_slct.event_presentation_id = event_presenter_obj.event_presentation_id_random;
                                 // $events_slct.event_presentation_obj = $lq__event_presentation_obj;
@@ -212,8 +217,7 @@ let lq__event_presentation_obj = liveQuery(
                                 // $events_slct.event_presenter_obj = event_presenter_obj;
 
                                 $events_sess.pres_mgmt.show_modal__presenter_agree = event_presenter_obj.event_presenter_id_random;
-                            }
-                        }
+                            }}
                         class="btn preset-tonal-success hover:preset-filled-success-500 my-0.5"
                         class:btn-sm={display_mode != 'default'}
                         title="Agreed to terms and conditions"
@@ -225,8 +229,7 @@ let lq__event_presentation_obj = liveQuery(
                     <button
                         type="button"
                         disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
-                        on:click={
-                            () => {
+                        onclick={() => {
                                 console.log('View terms and conditions');
 
                                 $events_slct.event_presentation_id = event_presenter_obj.event_presentation_id_random;
@@ -236,8 +239,7 @@ let lq__event_presentation_obj = liveQuery(
                                 // $events_slct.event_presenter_obj = event_presenter_obj;
 
                                 $events_sess.pres_mgmt.show_modal__presenter_agree = event_presenter_obj.event_presenter_id_random;
-                            }
-                        }
+                            }}
                         class="btn preset-tonal-warning border border-warning-500 hover:preset-filled-warning-500 my-0.5"
                         class:btn-sm={display_mode != 'default'}
                         title="View terms and conditions"
@@ -252,7 +254,7 @@ let lq__event_presentation_obj = liveQuery(
                 {#if $ae_loc.administrator_access && !event_presenter_obj.person_id_random}
                 <button
                     type="button"
-                    on:click={async () => {
+                    onclick={async () => {
                         console.log('Add Person');
                         if (!confirm(`Add a new person to the account? You will be able to edit their details after the person record is created.\n\n${$ae_loc.account_name}\nID: ${$slct.account_id}`)) {
                             return;
@@ -308,8 +310,3 @@ let lq__event_presentation_obj = liveQuery(
 
 
 </section>
-
-
-<style>
-
-</style>
diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte
index 48dae71a..ef754959 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte
@@ -1,18 +1,29 @@
 <script lang="ts">
+interface Props {
+    container_class_li?: string|Array<string>;
+    display_mode?: string; // 'default', 'compact', 'minimal', 'launcher'
+    event_presenter_id_random_li?: Array<string>;
+    link_to_type: string;
+    link_to_id: string;
+    // export let lq__event_presentation_obj
+    log_lvl?: number;
+}
+
+let {
+    container_class_li = [],
+    display_mode = 'default',
+    event_presenter_id_random_li = [],
+    link_to_type,
+    link_to_id,
+    log_lvl = 0
+}: Props = $props();
+
 // Imports
 import Comp_event_presenter_obj_li from './ae_comp__event_presenter_obj_li.svelte';
 
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/ae_events/db_events";
 
-// Exports
-export let container_class_li: string|Array<string> = [];
-export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-export let event_presenter_id_random_li: Array<string> = [];
-export let link_to_type: string;
-export let link_to_id: string;
-// export let lq__event_presentation_obj
-export let log_lvl: number = 0;
 
 if (log_lvl) {
     console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
@@ -27,7 +38,7 @@ let dq__where_type_id_val: string = `${link_to_type}_id_random`;
 let dq__where_eq_id_val: string = link_to_id;
 
 // *** Functions and Logic
-$: lq__event_presenter_obj_li = liveQuery(async () => {
+let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
     if (link_to_type && link_to_id) {
         let results = await db_events.presenters
             .where(dq__where_type_id_val)
@@ -43,7 +54,7 @@ $: lq__event_presenter_obj_li = liveQuery(async () => {
     } else {
         return null;
     }
-});
+}));
 </script>
 
 
diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
index e2d1c67a..52018c73 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
@@ -1,27 +1,32 @@
 <script lang="ts">
+interface Props {
+    // Exports
+    container_class_li?: string|Array<string>;
+    // export let event_presenter_id_random_li: Array<string>;
+    lq__event_presenter_obj_li: any;
+    log_lvl?: number;
+    // export let allow_moderator: boolean = false;
+    show_presentation_fields?: boolean;
+    show_session_fields?: boolean;
+}
+
+let {
+    container_class_li = [],
+    lq__event_presenter_obj_li,
+    log_lvl = 0,
+    show_presentation_fields = false,
+    show_session_fields = false
+}: Props = $props();
+
 // Imports
-// import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 
-// import { liveQuery } from "dexie";
-// import { db_events } from "$lib/db_events";
-// import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
-// import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
-// import { events_func } from '$lib/ae_events_functions';
-
-// Exports
-export let container_class_li: string|Array<string> = [];
 // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
 // export let link_to_type: string;
 // export let link_to_id: string;
-// export let event_presenter_id_random_li: Array<string>;
-export let lq__event_presenter_obj_li: any;
-export let log_lvl: number = 0;
 
 // export let allow_basic: boolean = false;
-// export let allow_moderator: boolean = false;
-export let show_presentation_fields: boolean = false;
-export let show_session_fields: boolean = false;
+
 
 if (log_lvl) {
     console.log(`container_class_li: ${container_class_li}; show_presentation_fields: ${show_presentation_fields}; show_session_fields: ${show_session_fields}`);
@@ -60,7 +65,7 @@ if (log_lvl) {
             title="Count {$lq__event_presenter_obj_li.length ?? 'None'}"
             >
         <span class="fas fa-list-ol mx-4"></span>
-        {$lq__event_presenter_obj_li.length ?? 'None'}×
+        {$lq__event_presenter_obj_li.length ?? 'None'}&times;
     </span>
     {/if}
 </h2>
diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte
index 371f24d5..c114eca2 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte
@@ -1,22 +1,34 @@
 <script lang="ts">
+interface Props {
+    // Exports
+    container_class_li?: string|Array<string>;
+    display_mode?: string; // 'default', 'compact', 'minimal', 'launcher'
+    event_presenter_id_random_li: Array<string>;
+    link_to_type: string;
+    link_to_id: string;
+    // export let lq__event_presentation_obj
+    log_lvl?: number;
+    show_presentation_fields?: boolean;
+    show_session_fields?: boolean;
+}
+
+let {
+    container_class_li = [],
+    display_mode = 'default',
+    event_presenter_id_random_li = [],
+    link_to_type,
+    link_to_id,
+    log_lvl = 0,
+    show_presentation_fields = false,
+    show_session_fields = false
+}: Props = $props();
+
 // Imports
 import Comp_event_presenter_obj_tbl from './ae_comp__event_presenter_obj_tbl.svelte';
 
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/ae_events/db_events";
 
-// Exports
-export let container_class_li: string|Array<string> = [];
-export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-export let event_presenter_id_random_li: Array<string>;
-export let link_to_type: string;
-export let link_to_id: string;
-// export let lq__event_presentation_obj
-export let log_lvl: number = 0;
-
-export let show_presentation_fields: boolean = false;
-export let show_session_fields: boolean = false;
-
 if (log_lvl) {
     console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
 }
@@ -30,7 +42,7 @@ let dq__where_type_id_val: string = `${link_to_type}_id_random`;
 let dq__where_eq_id_val: string = link_to_id;
 
 // *** Functions and Logic
-$: lq__event_presenter_obj_li = liveQuery(async () => {
+let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
     if (link_to_type && link_to_id) {
         let results = await db_events.presenters
             .where(dq__where_type_id_val)
@@ -46,16 +58,13 @@ $: lq__event_presenter_obj_li = liveQuery(async () => {
     } else {
         return null;
     }
-});
+}));
 </script>
 
 
+<!-- display_mode={display_mode} -->
 <Comp_event_presenter_obj_tbl
     container_class_li={container_class_li}
-    display_mode={display_mode}
-    link_to_type={link_to_type}
-    link_to_id={link_to_id}
-    event_presenter_id_random_li={event_presenter_id_random_li}
     lq__event_presenter_obj_li={lq__event_presenter_obj_li}
     show_presentation_fields={show_presentation_fields}
     show_session_fields={show_session_fields}
diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte
index cc14003f..866f7f66 100644
--- a/src/routes/events/[event_id]/reports/+page.svelte
+++ b/src/routes/events/[event_id]/reports/+page.svelte
@@ -1,10 +1,15 @@
 <script lang="ts">
-/** @type {import('./$types').PageData} */
-export let data: any;
-let log_lvl: number = 0;
+interface Props {
+    /** @type {import('./$types').PageData} */
+    data: any;
+}
+
+let { data }: Props = $props();
+
+let log_lvl: number = $state(0);
 // console.log(`ae_events_pres_mgmt event [slug] +page.svelte data:`, data);
 
-import { onMount } from 'svelte';
+// import { onMount } from 'svelte';
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
@@ -22,6 +27,7 @@ import { events_func } from '$lib/ae_events_functions';
 
 import Event_reports_page_menu from './event_reports_page_menu.svelte';
 
+
 // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
 $slct.account_id = data.account_id;
 console.log(`$slct.account_id = `, $slct.account_id);
@@ -32,20 +38,22 @@ $events_slct.event_id = ae_acct.slct.event_id;
 $events_slct.event_obj = ae_acct.slct.event_obj;
 $events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li;
 
-let lq__event_obj = liveQuery(
-    () => db_events.events.get($events_slct.event_id)
-);
+let lq__event_obj = $derived(liveQuery(async () => {
+    let results = await db_events.events
+        .get(ae_acct.slct.event_id);
+    return results;
+}));
 
 // It is important that these not be set to a value! It messes with the Dexie LiveQuery.
-let event_file_id_random_li: Array<string>;
-let event_session_id_random_li: Array<string>;
+let event_file_id_random_li: Array<string> = $state();
+let event_session_id_random_li: Array<string> = $state();
 // let event_presentation_id_random_li: Array<string>;
-let event_presenter_id_random_li: Array<string>;
+let event_presenter_id_random_li: Array<string> = $state();
 
-let load_obj_li_results: Promise<any>|key_val;
-let search_submit_results: Promise<any>|key_val;
+// let load_obj_li_results: Promise<any>|key_val;
+// let search_submit_results: Promise<any>|key_val;
 
-let ae_promises: key_val = {};
+let ae_promises: key_val = $state({});
 let ae_tmp: key_val = {};
 let ae_triggers: key_val = {};
 
@@ -563,7 +571,7 @@ async function handle_qry__event_session(
         <button
             type="button"
             disabled={!$ae_loc.trusted_access}
-            on:click={() => {
+            onclick={() => {
                 // ae_promises.handle_search__event_session = handle_search__event_session({
                 //     poc_agree: true,
                 //     ft_search_str: '',
@@ -599,7 +607,7 @@ async function handle_qry__event_session(
         <button
             type="button"
             disabled={!$ae_loc.trusted_access}
-            on:click={() => {
+            onclick={() => {
                 handle_qry__event_session({
                     qry_poc_kv_json: true,
                     qry_poc_bios: true,
@@ -621,7 +629,7 @@ async function handle_qry__event_session(
         <button
             type="button"
             disabled={!$ae_loc.trusted_access}
-            on:click={() => {
+            onclick={() => {
                 handle_qry__event_session({
                     qry_files: false,
                 });
@@ -644,7 +652,7 @@ async function handle_qry__event_session(
         <button
             type="button"
             disabled={!$ae_loc.trusted_access}
-            on:click={() => {
+            onclick={() => {
                 ae_promises.handle_search__event_presenter = handle_search__event_presenter({
                     agree: $events_loc.pres_mgmt.rpt__presenter_agree ?? false,
                     ft_search_str: '',
@@ -678,7 +686,7 @@ async function handle_qry__event_session(
         <button
             type="button"
             disabled={!$ae_loc.trusted_access}
-            on:click={() => {
+            onclick={() => {
                 handle_search__event_presenter({
                     biography: true,
                     ft_search_str: '',
@@ -701,7 +709,7 @@ async function handle_qry__event_session(
         <button
             type="button"
             disabled={!$ae_loc.trusted_access}
-            on:click={() => {
+            onclick={() => {
                 handle_search__event_presenter({
                     biography: true,
                     ft_search_str: '',
@@ -728,7 +736,7 @@ async function handle_qry__event_session(
         <button
             type="button"
             disabled={!$ae_loc.trusted_access}
-            on:click={() => {
+            onclick={() => {
                 handle_qry__event_file({
                     created_on_offset: $events_loc.pres_mgmt.qry__files_offset_seconds ?? 0,
                     log_lvl: 0,
@@ -749,7 +757,7 @@ async function handle_qry__event_session(
         <button
             type="button"
             disabled={!$ae_loc.trusted_access}
-            on:click={() => {
+            onclick={() => {
                 handle_qry__event_file({
                     min_file_size: $events_loc.pres_mgmt.qry__files_min_size ?? 100000000, // in bytes
                     log_lvl: log_lvl,
@@ -779,7 +787,7 @@ async function handle_qry__event_session(
     Sessions POC {#if $events_loc.pres_mgmt.rpt__session_poc_agree}Agreed{:else}Not Agreed{/if}
     <button
         type="button"
-        on:click={() => {
+        onclick={() => {
             $events_loc.pres_mgmt.rpt__session_poc_agree = !$events_loc.pres_mgmt.rpt__session_poc_agree;
 
             ae_promises.handle_qry__event_session = handle_qry__event_session({
@@ -844,7 +852,7 @@ async function handle_qry__event_session(
     Presenters {#if $events_loc.pres_mgmt.rpt__presenter_agree}Agreed{:else}Not Agreed{/if}
     <button
         type="button"
-        on:click={() => {
+        onclick={() => {
             $events_loc.pres_mgmt.rpt__presenter_agree = !$events_loc.pres_mgmt.rpt__presenter_agree;
 
             ae_promises.handle_search__event_presenter = handle_search__event_presenter({
@@ -905,8 +913,7 @@ async function handle_qry__event_session(
     <select
         class="inline-block select text-sm w-36 m-1 ae_btn_info"
         bind:value={$events_loc.pres_mgmt.qry__presenter_sort}
-        on:change={
-            (event) => {
+        onchange={(event) => {
                 if (event.target.value) {
                     $events_loc.pres_mgmt.qry__presenter_sort = event.target.value;
                 } else {
@@ -981,8 +988,7 @@ async function handle_qry__event_session(
                     log_lvl: log_lvl,
                 });
                 $events_loc.pres_mgmt.show_report = 'presenters_overview';
-            }
-        }
+            }}
         >
         <option value="updated_on">Updated On</option>
         <option value="given_name">Given Name</option>
@@ -1013,8 +1019,7 @@ async function handle_qry__event_session(
     <select
         class="inline-block select text-sm w-28 m-1 ae_btn_info"
         bind:value={$events_loc.pres_mgmt.qry__files_offset_seconds}
-        on:change={
-            () => {
+        onchange={() => {
                 if ($events_loc.pres_mgmt?.qry__files_offset_seconds) {
                     // Calculate the datetime to pass based on the selected offset.
                     // let offset = $events_loc.pres_mgmt.qry__files_offset_seconds ?? 0;
@@ -1033,8 +1038,7 @@ async function handle_qry__event_session(
                 }
 
                 $events_loc.pres_mgmt.show_report = 'recent_files';
-            }
-        }
+            }}
         >
         <option value="">-- not set --</option>
         <option value="600">10 minutes</option>
@@ -1074,15 +1078,13 @@ async function handle_qry__event_session(
     <select
         class="inline-block select text-sm w-28 m-1 ae_btn_info"
         bind:value={$events_loc.pres_mgmt.qry__files_min_size}
-        on:change={
-            () => {
+        onchange={() => {
                 handle_qry__event_file({
                     min_file_size: $events_loc.pres_mgmt.qry__files_min_size ?? 100000000, // in bytes
                     log_lvl: log_lvl,
                 });
                 $events_loc.pres_mgmt.show_report = 'large_files';
-            }
-        }
+            }}
         >
         <option value="10000000">10 MB</option>
         <option value="25000000">25 MB</option>
diff --git a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte
index 04c6f079..800bfbfd 100644
--- a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte
+++ b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte
@@ -1,5 +1,10 @@
 <script lang="ts">
-export let data: any;
+interface Props {
+    data: any;
+    lq__event_obj: any;
+}
+
+let { data, lq__event_obj }: Props = $props();
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
@@ -10,11 +15,9 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp__events_menu_nav from './../../ae_comp__events_menu_nav.svelte';
 
-export let lq__event_obj: any;
 
 let ae_tmp: key_val = {};
 let ae_triggers: key_val = {};
-
 </script>
 
 
@@ -42,7 +45,7 @@ let ae_triggers: key_val = {};
         <!-- Button to toggle between showing and not showing the extended options menu -->
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__event_reports == 'options') {
                     $events_loc.pres_mgmt.show_menu__event_reports = null;
                 } else {
@@ -68,7 +71,7 @@ let ae_triggers: key_val = {};
 
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__event_reports == 'help') {
                     $events_loc.pres_mgmt.show_menu__event_reports = null;
                 } else {
@@ -115,7 +118,7 @@ let ae_triggers: key_val = {};
                 <select
                     id="qry_limit__presenters"
                     bind:value={$events_loc.pres_mgmt.qry_limit__presenters}
-                    on:change={() => {
+                    onchange={() => {
                         // search__event_presenter({
                         //     api_cfg: $ae_api,
                         //     event_id: $events_slct.event_id,
@@ -156,7 +159,7 @@ let ae_triggers: key_val = {};
                 <select
                     id="qry_limit__sessions"
                     bind:value={$events_loc.pres_mgmt.qry_limit__sessions}
-                    on:change={() => {
+                    onchange={() => {
                         // search__event_presenter({
                         //     api_cfg: $ae_api,
                         //     event_id: $events_slct.event_id,
@@ -195,7 +198,7 @@ let ae_triggers: key_val = {};
                 <select
                     id="qry_limit__files"
                     bind:value={$events_loc.pres_mgmt.qry_limit__files}
-                    on:change={() => {
+                    onchange={() => {
                         // search__event_presenter({
                         //     api_cfg: $ae_api,
                         //     event_id: $events_slct.event_id,
@@ -230,7 +233,7 @@ let ae_triggers: key_val = {};
             {#if $events_loc.pres_mgmt.show__direct_download}
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show__direct_download = !$events_loc.pres_mgmt.show__direct_download;
                     }}
                     class="btn btn-sm preset-tonal-success border border-success-500"
@@ -242,7 +245,7 @@ let ae_triggers: key_val = {};
             {:else}
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         $events_loc.pres_mgmt.show__direct_download = !$events_loc.pres_mgmt.show__direct_download;
                     }}
                     class="btn btn-sm preset-tonal-warning border border-warning-500"
@@ -257,7 +260,7 @@ let ae_triggers: key_val = {};
             {#if $events_loc.pres_mgmt.qry_hidden == 'all'}
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         if ($events_loc.pres_mgmt.qry_hidden == 'all') {
                             $events_loc.pres_mgmt.qry_hidden = 'not_hidden';
                         } else {
@@ -273,7 +276,7 @@ let ae_triggers: key_val = {};
             {:else}
                 <button
                     type="button"
-                    on:click={() => {
+                    onclick={() => {
                         if ($events_loc.pres_mgmt.qry_hidden == 'all') {
                             $events_loc.pres_mgmt.qry_hidden = 'not_hidden';
                         } else {
@@ -292,7 +295,7 @@ let ae_triggers: key_val = {};
                 {#if $events_loc.pres_mgmt.qry_enabled == 'all'}
                     <button
                         type="button"
-                        on:click={() => {
+                        onclick={() => {
                             if ($events_loc.pres_mgmt.qry_enabled == 'all') {
                                 $events_loc.pres_mgmt.qry_enabled = 'enabled';
                             } else {
@@ -308,7 +311,7 @@ let ae_triggers: key_val = {};
                 {:else}
                     <button
                         type="button"
-                        on:click={() => {
+                        onclick={() => {
                             if ($events_loc.pres_mgmt.qry_enabled == 'all') {
                                 $events_loc.pres_mgmt.qry_enabled = 'enabled';
                             } else {
@@ -344,7 +347,7 @@ let ae_triggers: key_val = {};
     <div>
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 $events_loc.pres_mgmt.show_menu__event_reports = !$events_loc.pres_mgmt.show_menu__event_reports;
             }}
             class="btn btn-sm mx-1 preset-tonal-error border border-error-500 hover:preset-filled-error-500"
diff --git a/src/routes/events/[event_id]/session/[session_id]/+page.svelte b/src/routes/events/[event_id]/session/[session_id]/+page.svelte
index de8ecea2..9430bd4b 100644
--- a/src/routes/events/[event_id]/session/[session_id]/+page.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/+page.svelte
@@ -1,12 +1,16 @@
 <script lang="ts">
-/** @type {import('./$types').PageData} */
-export let data: any;
-let log_lvl: number = 0;
+interface Props {
+    /** @type {import('./$types').PageData} */
+    data: any;
+}
+
+let { data }: Props = $props();
+
+let log_lvl: number = $state(0);
 // console.log(`ae_events_pres_mgmt event [session_id] +page.svelte data:`, data);
 
 // Imports
 import { Modal } from 'flowbite-svelte';
-import { onMount } from 'svelte';
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
@@ -32,6 +36,7 @@ import Session_page_menu from './session_page_menu.svelte';
 
 import { browser } from '$app/environment';
 
+
 // Variables
 if (browser) {
     console.log('Browser environment detected.');
@@ -86,46 +91,57 @@ if (!$events_sess.pres_mgmt) {
 $events_sess.pres_mgmt.show_content__agree_text = false;
 $events_sess.pres_mgmt.show_content__presenter_start = false;
 
-let lq__event_obj = liveQuery(
-    () => db_events.events.get($events_slct.event_id)
-);
+let lq__event_obj = $derived(liveQuery(async () => {
+    let results = await db_events.events
+        .get($events_slct.event_id);
+    return results;
+}));
 
-let lq__event_session_obj = liveQuery(
-    () => db_events.sessions.get(ae_acct.slct.event_session_id)
-);
+let lq__event_session_obj = $derived(liveQuery(async () => {
+    let results = await db_events.sessions.get(ae_acct.slct.event_session_id)
+    return results;
+}));
 
-let lq__event_presentation_obj_li = liveQuery(
-    () => db_events.presentations
+let lq__event_presentation_obj_li = $derived(liveQuery(async () => {
+    let results = await db_events.presentations
         .where('event_session_id')
         .equals(ae_acct.slct.event_session_id)
         .sortBy('name')
-);
+        ;
+    return results;
+}));
 
-let lq__event_presenter_obj = liveQuery(
-    () => db_events.presenters.get($events_slct.event_presenter_id)
-);
+let lq__event_presenter_obj = $derived(liveQuery(async () => {
+    let results = await db_events.presenters
+        .get($events_slct.event_presenter_id);
+    return results;
+}));
 
-let lq__auth__event_presenter_obj = liveQuery(
-    () => db_events.presenters.get($events_loc.auth__person?.presenter_id ?? null)
-);
+let lq__auth__event_presenter_obj = $derived(liveQuery(async () => {
+    let results = await db_events.presenters
+        .get($events_loc.auth__person?.presenter_id ?? null);
+    return results;
+}));
 
 $slct.person_obj_kv = {}; // This is intended for the POC lookup list when generated.
 
 // JSON formatted configuration options for an event, and specifically for the presentation management module.
-$: if ($lq__event_obj?.mod_pres_mgmt_json) {
-    // if (log_lvl) {
-    //     console.log(`*** Event Pres Mgmt JSON *** pres_mgmt_cfg_local`, $events_loc.pres_mgmt);
-    // }
-    // $events_loc.pres_mgmt =
-    events_func.sync_config__event_pres_mgmt({
-        pres_mgmt_cfg_remote: $lq__event_obj?.mod_pres_mgmt_json,
-        pres_mgmt_cfg_local: $events_loc?.pres_mgmt,
-        log_lvl: log_lvl,
+$effect(() => {
+        if ($lq__event_obj?.mod_pres_mgmt_json) {
+        // if (log_lvl) {
+        //     console.log(`*** Event Pres Mgmt JSON *** pres_mgmt_cfg_local`, $events_loc.pres_mgmt);
+        // }
+        // $events_loc.pres_mgmt =
+        events_func.sync_config__event_pres_mgmt({
+            pres_mgmt_cfg_remote: $lq__event_obj?.mod_pres_mgmt_json,
+            pres_mgmt_cfg_local: $events_loc?.pres_mgmt,
+            log_lvl: log_lvl,
+        });
+        // if (log_lvl) {
+        //     console.log(`*** Event Pres Mgmt JSON *** pres_mgmt_cfg_local`, $events_loc.pres_mgmt);
+        // }
+    }
     });
-    // if (log_lvl) {
-    //     console.log(`*** Event Pres Mgmt JSON *** pres_mgmt_cfg_local`, $events_loc.pres_mgmt);
-    // }
-}
 
 
 if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__session_view) {
@@ -133,9 +149,6 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__session
 }
 
 // *** Functions and Logic
-onMount(() => {
-    console.log('Events Session [session_id]: +page.svelte');
-});
 </script>
 
 
@@ -185,7 +198,7 @@ onMount(() => {
         <!-- Button to toggle between the regular session view and managing session files -->
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_content__session_view == 'manage_files') {
                     $events_loc.pres_mgmt.show_content__session_view = null;
                 } else {
@@ -249,7 +262,7 @@ onMount(() => {
     />
 
 <div class="m-1 flex flex-col flex-wrap gap-1 items-center">
-{#if $ae_loc.trusted_access || ($events_loc.auth__person?.id && $events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id]) }
+{#if $ae_loc.trusted_access || ($events_loc.auth__person?.id && $events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id])}
 
     {#if $events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id] === true}
         <h3 class="h3">Welcome {$lq__event_session_obj?.poc_person_full_name ?? 'Session POC'}</h3>
@@ -261,8 +274,7 @@ onMount(() => {
     {#if
         $ae_loc.trusted_access ||
         $events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id] === true ||
-        ($events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id] == 'read' && $lq__auth__event_presenter_obj?.agree)
-        }
+        ($events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id] == 'read' && $lq__auth__event_presenter_obj?.agree)}
         <!-- Message if they have agreed -->
         <Element_data_store
             ds_code="events__pres_mgmt__session_page_authorized_info"
@@ -337,18 +349,20 @@ onMount(() => {
             link_to_type="event_session"
             link_to_id={$lq__event_session_obj.event_session_id}
             >
-            <span slot="label">
-                <div class="text-lg">
-                    <span class="fas fa-upload"></span>
-                    <strong class="">Upload session (breakout) specific files only!</strong>
-                </div>
-                <div class="text-sm text-gray-600 dark:text-gray-400 italic">
-                    <strong>Session (breakout) files only</strong><br>
-                    Recommended: PowerPoint (pptx) or Keynote (key)<br>
-                    Media: Audio and videos files should be directly embedded in PowerPoint (PPTX) files<br>
-                    Supplemental files: mp4, PDF, Word Doc, Excel, txt, etc
-                </div>
-            </span>
+            {#snippet label()}
+                                                        <span >
+                    <div class="text-lg">
+                        <span class="fas fa-upload"></span>
+                        <strong class="">Upload session (breakout) specific files only!</strong>
+                    </div>
+                    <div class="text-sm text-gray-600 dark:text-gray-400 italic">
+                        <strong>Session (breakout) files only</strong><br>
+                        Recommended: PowerPoint (pptx) or Keynote (key)<br>
+                        Media: Audio and videos files should be directly embedded in PowerPoint (PPTX) files<br>
+                        Supplemental files: mp4, PDF, Word Doc, Excel, txt, etc
+                    </div>
+                </span>
+                                                    {/snippet}
         </Comp_event_files_upload>
 
         <div class="overflow-x-auto w-max max-w-full">
@@ -399,7 +413,7 @@ onMount(() => {
         <div class="text-center w-full">
 
             <button
-                on:click={() => {
+                onclick={() => {
                     $events_sess.pres_mgmt.show_modal__presenter_agree = false;
                 }}
                 class="btn btn-sm preset-tonal-warning hover:preset-tonal-warning border border-warning-500"
diff --git a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
index d312bf33..7e616fb8 100644
--- a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
@@ -1,6 +1,13 @@
 <script lang="ts">
+interface Props {
+    log_lvl?: number;
+    // Exports
+    lq__event_session_obj: any;
+}
+
+let { log_lvl = 0, lq__event_session_obj }: Props = $props();
+
 console.log(`ae_events_pres_mgmt session [slug] form_agree.svelte`);
-export let log_lvl: number = 0;
 
 // Imports (external and then internal)
 import type { key_val } from '$lib/ae_stores';
@@ -12,11 +19,8 @@ import { events_func } from '$lib/ae_events_functions';
 // Import components and elements
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 
-// Exports
-export let lq__event_session_obj: any;
-
 // Local Variables
-let ae_promises: key_val = {};
+let ae_promises: key_val = $state({});
 // let ae_tmp: key_val = {};
 // let ae_triggers: key_val = {};
 
@@ -35,6 +39,13 @@ let tmp_opt_out: key_val = {
 };
 
 // *** Functions and Logic
+function preventDefault(fn) {
+    return function (event) {
+        event.preventDefault();
+        fn.call(this, event);
+    };
+}
+
 async function handle_submit_form(event) {
     console.log('*** handle_submit_form() ***');
 
@@ -172,7 +183,7 @@ async function handle_submit_form(event) {
     <h3 class="h4 text-center">Opt-Out?</h3>
     <form
         class="modal-form {$ae_loc.hub.classes__form}"
-        on:submit|preventDefault={handle_submit_form}
+        onsubmit={preventDefault(handle_submit_form)}
         >
         <p>Speaker does not permit the use of presentation materials as described in section(s), above for: (please check for all that apply)</p>
 
@@ -236,7 +247,7 @@ async function handle_submit_form(event) {
         <button
             type="submit"
             disabled={($events_sess.pres_mgmt?.disable__session_submit_opt_out)}
-            on:click={() => {
+            onclick={() => {
                 console.log('*** Save button clicked ***');
             }}
             class="btn btn-md preset-tonal-warning border border-warning-500 hover:preset-filled-secondary-500 m-2"
@@ -296,7 +307,7 @@ async function handle_submit_form(event) {
         <button
             disabled={!$ae_loc.administrator_access &&
             !$events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id] === true}
-            on:click={() => {
+            onclick={() => {
                 console.log('Agree to the terms and conditions.');
 
                 $events_sess.pres_mgmt.status__session_agree = 'saving';
@@ -353,7 +364,7 @@ async function handle_submit_form(event) {
         </button>
     {:else}
         <button
-            on:click={() => {
+            onclick={() => {
                 console.log('Change to not agreed.');
 
                 let event_session_data = {
diff --git a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte
index 649d4b3d..a6e0497e 100644
--- a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte
@@ -71,25 +71,8 @@ let clipboard_success = $state(false);
     <span class="float-right">
     <!-- A button to copy the access link to the clipboard. -->
     <!-- Example: /events/CHs3F44Xq76/session/Wh8UnJlbIA0?person_id=fV1dl_IJ0yY&person_pass=abc123 -->
-    <!-- <button
-        type="button"
-        use:clipboard={encodeURI(`${$ae_loc.url_origin}/events/${$events_slct.event_id}/session/${$events_slct.event_session_id}?person_id=${$lq__event_session_obj.poc_person_id_random}&person_pass=${$lq__event_session_obj.poc_person_passcode}&session_id=${$lq__event_session_obj.event_session_id_random}`)}
-        class="btn btn-sm preset-tonal-warning border border-warning-500 m-1"
-        title="Copy the POC (moderator/champion) access link to the clipboard."
-        >
-        <span class="fas fa-copy mx-1"></span>
-        Copy Access Link
-    </button> -->
-
-    <!-- <Clipboard
-        value={encodeURI(`${$ae_loc.url_origin}/events/${$lq__event_session_obj.event_id}/session/${$events_slct.event_session_id}?person_id=${$lq__event_session_obj.poc_person_id}&person_pass=${$lq__event_session_obj.poc_person_passcode}&session_id=${$lq__event_session_obj.event_session_id}`)}
-        bind:success={clipboard_success}
-        class="btn btn-sm preset-tonal-warning text-warning-500 m-1"
-        title="Copy the POC (moderator/champion) access link to the clipboard."
-        >
-        {#if clipboard_success}Copied!{:else}Copy Access Link{/if}
-    </Clipboard> -->
-
+    <!-- {#if clipboard_success}Copied!{:else}Copy Access Link{/if} -->
+    <!-- <span class="fas fa-copy mx-1"></span> -->
     <MyClipboard
         value={encodeURI(`${$ae_loc.url_origin}/events/${$lq__event_session_obj.event_id}/session/${$events_slct.event_session_id}?person_id=${$lq__event_session_obj.poc_person_id}&person_pass=${$lq__event_session_obj.poc_person_passcode}&session_id=${$lq__event_session_obj.event_session_id}`)}
         btn_text="Copy Access Link"
@@ -116,26 +99,6 @@ let clipboard_success = $state(false);
     >
 
 <div class="label event_session__biography required space-y-4">
-    <!-- <button
-        type="button"
-        use:clipboard={ae_tmp.biography?.trim()}
-        class="btn btn-sm preset-tonal-warning border border-warning-500 float-right m-1"
-        class:hidden={!ae_tmp?.biography || ae_tmp.biography.length < 100}
-        title="Copy the session POC biography text to the clipboard."
-        >
-        <span class="fas fa-copy mx-1"></span>
-        Copy Biography Text
-    </button> -->
-
-    <!-- <Clipboard
-        value={ae_tmp.biography?.trim()}
-        bind:success={clipboard_success}
-        class="btn btn-sm preset-tonal-warning text-warning-500 float-right m-1"
-        title="Copy the session POC biography text to the clipboard."
-        >
-        {#if clipboard_success}Copied!{:else}Copy Biography Text{/if}
-    </Clipboard> -->
-
     <MyClipboard
         value={ae_tmp.biography?.trim()}
         btn_text="Copy Biography Text"
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
index 44121124..789d5bb6 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
@@ -1,6 +1,18 @@
 <script lang="ts">
-export let data: any;
-export let log_lvl: number = 0;
+interface Props {
+    data: any;
+    log_lvl?: number;
+    // export let event_session_id: string;
+    lq__event_session_obj: any;
+    lq__auth__event_presenter_obj: any;
+}
+
+let {
+    data,
+    log_lvl = 0,
+    lq__event_session_obj,
+    lq__auth__event_presenter_obj
+}: Props = $props();
 
 import { goto } from '$app/navigation';
 
@@ -16,12 +28,8 @@ import Comp__events_menu_nav from '../../../ae_comp__events_menu_nav.svelte';
 // import Comp__global_menu_opts from '$lib/ae_comp__global_menu_opts.svelte';
 import Comp__pres_mgmt_menu_opts from '../../../ae_comp__events_menu_opts.svelte';
 
-// export let event_session_id: string;
-export let lq__event_session_obj: any;
-export let lq__auth__event_presenter_obj: any;
-
-let ae_tmp: key_val = {};
-let ae_triggers: key_val = {};
+let ae_tmp: key_val = $state({});
+let ae_triggers: key_val = $state({});
 
 </script>
 
@@ -53,7 +61,7 @@ let ae_triggers: key_val = {};
         <!-- Button to toggle between the regular session view and managing session files -->
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_content__session_view == 'manage_files') {
                     $events_loc.pres_mgmt.show_content__session_view = null;
                 } else {
@@ -84,7 +92,7 @@ let ae_triggers: key_val = {};
 
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__session == 'options') {
                     $events_loc.pres_mgmt.show_menu__session = null;
                 } else {
@@ -108,7 +116,7 @@ let ae_triggers: key_val = {};
 
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 if ($events_loc.pres_mgmt.show_menu__session == 'help') {
                     $events_loc.pres_mgmt.show_menu__session = null;
                 } else {
@@ -190,7 +198,7 @@ let ae_triggers: key_val = {};
                         >
                         <!-- {($lq__event_session_obj?.hide_event_launcher ? 'Hidden' : 'Not Hidden')} -->
                         <button
-                            on:click={() => {
+                            onclick={() => {
                                 ae_tmp.value__hide_event_launcher = !$lq__event_session_obj?.hide_event_launcher;
 
                                 // $events_slct.exhibit_tracking_obj.hide_event_launcher = !$lq__event_session_obj?.hide_event_launcher;
@@ -244,7 +252,7 @@ let ae_triggers: key_val = {};
                         >
                         <!-- {@html $lq__event_session_obj?.priority ? '<span class="fas fa-star m-1"></span> High Priority' : '<span class="far fa-star m-1"></span> Priority not set'} -->
                         <button
-                            on:click={() => {
+                            onclick={() => {
                                 ae_tmp.value__priority = !$lq__event_session_obj?.priority;
 
                                 // $events_slct.exhibit_tracking_obj.priority = !$lq__event_session_obj?.priority;
@@ -298,7 +306,7 @@ let ae_triggers: key_val = {};
                         >
                         <!-- {($lq__event_session_obj?.hide ? 'Hidden' : 'Not Hidden')} -->
                         <button
-                            on:click={() => {
+                            onclick={() => {
                                 ae_tmp.value__hide = !$lq__event_session_obj?.hide;
 
                                 // $events_slct.exhibit_tracking_obj.hide = !$lq__event_session_obj?.hide;
@@ -355,7 +363,7 @@ let ae_triggers: key_val = {};
                         >
                         <!-- {($lq__event_session_obj?.enable ? 'Enabled' : 'Disabled')} -->
                         <button
-                            on:click={() => {
+                            onclick={() => {
                                 ae_tmp.value__enable = !$lq__event_session_obj?.enable;
 
                                 // $events_slct.exhibit_tracking_obj.hide = !$lq__event_session_obj?.hide;
@@ -386,7 +394,7 @@ let ae_triggers: key_val = {};
 
                     {#if $ae_loc.manager_access}
                     <button
-                        on:click={() => {
+                        onclick={() => {
                             if (!confirm('Are you sure you want to delete this session?')) {return false;}
 
                             events_func.delete_ae_obj_id__event_session({
@@ -409,7 +417,7 @@ let ae_triggers: key_val = {};
                     </button>
                     {:else if $ae_loc.administrator_access}
                     <button
-                        on:click={() => {
+                        onclick={() => {
                             if (!confirm('Are you sure you want to remove (disable) this session? This is not common.')) {return false;}
                             events_func.delete_ae_obj_id__event_session({
                                 api_cfg: $ae_api,
@@ -463,7 +471,7 @@ let ae_triggers: key_val = {};
     <div>
         <button
             type="button"
-            on:click={() => {
+            onclick={() => {
                 $events_loc.pres_mgmt.show_menu__session = !$events_loc.pres_mgmt.show_menu__session;
             }}
             class="btn btn-sm mx-1 ae_btn_info_filled"
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
index d92310c0..64e43782 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-import { run } from 'svelte/legacy';
-
 interface Props {
     log_lvl?: number;
     // export let lq__event_obj: any;
@@ -24,7 +22,7 @@ if (log_lvl) {
 }
 
 // Imports (external and then internal)
-import { liveQuery } from "dexie";
+// import { liveQuery } from "dexie";
 import { Modal } from 'flowbite-svelte';
 // import { Clipboard } from "flowbite-svelte";
 
@@ -71,13 +69,10 @@ $events_sess.pres_mgmt.show_content__presenter_start = false;
 
 
 
+// Local Variables
 // let lq__event_session_obj = liveQuery(
 //     () => db_events.sessions.get(event_session_id)
 
-
-
-
-
 // let lq__event_presentation_obj_li = liveQuery(
 //     () => db_events.presentations
 //         .where('event_session_id')
@@ -85,11 +80,9 @@ $events_sess.pres_mgmt.show_content__presenter_start = false;
 //         .sortBy('name')
 // );
 
-
-// Local Variables
-let lq__event_presentation_obj = liveQuery(
-    () => db_events.presentations.get($events_slct.event_presentation_id)
-);
+// let lq__event_presentation_obj = liveQuery(
+//     () => db_events.presentations.get($events_slct.event_presentation_id)
+// );
 
 // let lq__auth__event_presenter_obj = liveQuery(
 //     () => db_events.presenters.get($events_slct.auth__event_presenter_id)
@@ -104,45 +97,45 @@ $slct.person_obj_kv = {}; // This is intended for the person POC lookup list whe
 
 // *** Functions and Logic
 $events_sess.pres_mgmt.session__updated_on = null;
-run(() => {
-if ($lq__event_session_obj) {
-    if (log_lvl > 1) {
-        console.log(`$lq__event_session_obj:`, $lq__event_session_obj);
-    }
+$effect(() => {
+    if ($lq__event_session_obj) {
+        if (log_lvl > 1) {
+            console.log(`$lq__event_session_obj:`, $lq__event_session_obj);
+        }
 
-    if ($events_loc.pres_mgmt.show_content__session_qr) {
+        if ($events_loc.pres_mgmt.show_content__session_qr) {
 
-        if ($lq__event_session_obj.updated_on == $events_sess.pres_mgmt.session__updated_on) {
-            if (log_lvl > 1) {
-                console.log('Updated on is the same.');
+            if ($lq__event_session_obj.updated_on == $events_sess.pres_mgmt.session__updated_on) {
+                if (log_lvl > 1) {
+                    console.log('Updated on is the same.');
+                }
+            } else {
+                if (log_lvl) {
+                    console.log('Updated on is different.');
+                }
+                // FUTURE USE: Generate a QR code for the object ID.
+                // ae_promises.generate_qr_code_obj_id = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'obj', qr_id: $lq__event_session_obj?.event_session_id, obj_type: 'event_session', obj_id: $lq__event_session_obj?.event_session_id});
+
+                // Generate a QR code for the URL.
+                let qr_id_url = `${$lq__event_session_obj?.event_session_id}_url`;
+
+                // URL for this page (be sure to URL encode it):
+                let url_str = `${$ae_loc.url_origin}/events/${$lq__event_session_obj?.event_id}/session/${$lq__event_session_obj?.event_session_id}`;
+                url_str = encodeURI(url_str);
+
+                ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
+
+                $events_sess.pres_mgmt.session__updated_on = $lq__event_session_obj?.updated_on;
             }
         } else {
             if (log_lvl) {
-                console.log('Updated on is different.');
+                console.log('Clearing the URL.');
             }
-            // FUTURE USE: Generate a QR code for the object ID.
-            // ae_promises.generate_qr_code_obj_id = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'obj', qr_id: $lq__event_session_obj?.event_session_id, obj_type: 'event_session', obj_id: $lq__event_session_obj?.event_session_id});
-
-            // Generate a QR code for the URL.
-            let qr_id_url = `${$lq__event_session_obj?.event_session_id}_url`;
-
-            // URL for this page (be sure to URL encode it):
-            let url_str = `${$ae_loc.url_origin}/events/${$lq__event_session_obj?.event_id}/session/${$lq__event_session_obj?.event_session_id}`;
-            url_str = encodeURI(url_str);
-
-            ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
-
-            $events_sess.pres_mgmt.session__updated_on = $lq__event_session_obj?.updated_on;
+            ae_promises.generate_qr_code_url = null;
+            // Resetting the updated_on value helps with the QR code come back when switched back on.
+            $events_sess.pres_mgmt.session__updated_on = null;
         }
-    } else {
-        if (log_lvl) {
-            console.log('Clearing the URL.');
-        }
-        ae_promises.generate_qr_code_url = null;
-        // Resetting the updated_on value helps with the QR code come back when switched back on.
-        $events_sess.pres_mgmt.session__updated_on = null;
     }
-}
 });
 
 let clipboard_success = $state(false);
diff --git a/src/routes/events/ae_comp__event_file_obj_tbl.svelte b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
index b51a4f08..b48c226d 100644
--- a/src/routes/events/ae_comp__event_file_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
@@ -1,13 +1,16 @@
 <script lang="ts">
 // Imports
+import { liveQuery } from "dexie";
+
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
-import { liveQuery } from "dexie";
+
 import { db_events } from "$lib/ae_events/db_events";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 // import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 // import { events_func } from '$lib/ae_events_functions';
+import MyClipboard from '$lib/e_app_clipboard.svelte';
 
 // Exports
 export let container_class_li: string|Array<string> = [];
@@ -178,7 +181,7 @@ let lq_kv__event_file_obj_li = liveQuery(
                         Download
                         </span>
                     </a>
-                    <button
+                    <!-- <button
                         type="button"
                         use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${ae_util.clean_filename(event_file_obj?.filename)}&x_no_account_id_token=direct-download`)}
                         class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs"
@@ -188,7 +191,14 @@ let lq_kv__event_file_obj_li = liveQuery(
                         <span class="hidden">
                         Copy Link
                         </span>
-                    </button>
+                    </button> -->
+
+                    <MyClipboard
+                        value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${ae_util.clean_filename(event_file_obj?.filename)}&x_no_account_id_token=direct-download`)}
+                        btn_text="Copy Link"
+                        btn_title="Copy the direct download file link: {ae_util.clean_filename(event_file_obj?.filename ?? 'unknown')}"
+                        btn_class="btn btn-sm p-1 preset-tonal-secondary lg:text-xs"
+                        ></MyClipboard>
                 </div>
 
                 <div
@@ -208,7 +218,7 @@ let lq_kv__event_file_obj_li = liveQuery(
                         Renamed
                         </span>
                     </a>
-                    <button
+                    <!-- <button
                         type="button"
                         use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_session_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
                         class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs"
@@ -218,7 +228,13 @@ let lq_kv__event_file_obj_li = liveQuery(
                         <span class="hidden">
                         Copy Renamed
                         </span>
-                    </button>
+                    </button> -->
+                    <MyClipboard
+                        value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_session_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
+                        btn_text="Copy Renamed"
+                        btn_title="Copy the renamed file link"
+                        btn_class="btn btn-sm p-1 preset-tonal-secondary lg:text-xs"
+                        ></MyClipboard>
                 </div>
 
                 <div
@@ -238,7 +254,7 @@ let lq_kv__event_file_obj_li = liveQuery(
                         Renamed
                         </span>
                     </a>
-                    <button
+                    <!-- <button
                         type="button"
                         use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_presentation_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
                         class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs"
@@ -248,7 +264,13 @@ let lq_kv__event_file_obj_li = liveQuery(
                         <span class="hidden">
                         Copy Renamed
                         </span>
-                    </button>
+                    </button> -->
+                    <MyClipboard
+                        value={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj?.event_file_id_random}/download?filename=${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_presentation_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}&x_no_account_id_token=direct-download`)}
+                        btn_text="Copy Renamed"
+                        btn_title="Copy the renamed file link"
+                        btn_class="btn btn-sm p-1 preset-tonal-secondary lg:text-xs"
+                        ></MyClipboard>
                 </div>
 
             </td>
diff --git a/src/routes/events/ae_comp__event_files_upload.svelte b/src/routes/events/ae_comp__event_files_upload.svelte
index e4982904..d789491b 100644
--- a/src/routes/events/ae_comp__event_files_upload.svelte
+++ b/src/routes/events/ae_comp__event_files_upload.svelte
@@ -1,5 +1,38 @@
 <script lang="ts">
-export let log_lvl: number = 0;
+interface Props {
+    log_lvl?: number;
+    // Expecting these for link_to_type: 'event', 'event_location', 'event_presentation', 'event_presenter', 'event_session'
+    link_to_type: string;
+    link_to_id: string;
+    input_name?: string;
+    multiple?: boolean;
+    required?: boolean;
+    accept?: string;
+    class_li_default?: string;
+    class_li?: string;
+    input_class_li?: string[];
+    table_class_li?: string[];
+    upload_complete?: boolean;
+    submit_status?: null|string;
+    label?: import('svelte').Snippet;
+}
+
+let {
+    log_lvl = $bindable(0),
+    link_to_type,
+    link_to_id,
+    input_name = 'file_list',
+    multiple = true,
+    required = true,
+    accept = 'audio/*, image/*, video/*, .bak, .cfg, .css, .csv, .doc, .docx, .gz, .htm, .html, .ini, .iso, .j2, .json, .key, .keynote, .md, .pdf, .ppt, .pptx, .rar, .rtf, .sql, .svelte, ttf, .txt, .xls, .xlsx, .xz, .zip, .bin, .dmg, .exe, .js, .msi, .php, .py, .sh',
+    class_li_default = 'flex flex-col gap-1 items-center justify-center w-full max-w-2xl mx-auto my-1',
+    class_li = '',
+    input_class_li = ['file_drop_area'],
+    table_class_li = ['table', 'table-sm', 'table-striped', '' , 'text-sm'],
+    upload_complete = $bindable(false),
+    submit_status = $bindable(null),
+    label
+}: Props = $props();
 
 // Imports
 // Import components and elements
@@ -14,35 +47,25 @@ import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_ev
 import { events_func } from '$lib/ae_events_functions';
 import { db_events } from "$lib/ae_events/db_events";
 
-
 // Exports
-// Expecting these for link_to_type: 'event', 'event_location', 'event_presentation', 'event_presenter', 'event_session'
-export let link_to_type: string;
-export let link_to_id: string;
-
-export let input_name = 'file_list';
-export let multiple: boolean = true;
-export let required: boolean = true;
-export let accept: string = 'audio/*, image/*, video/*, .bak, .cfg, .css, .csv, .doc, .docx, .gz, .htm, .html, .ini, .iso, .j2, .json, .key, .keynote, .md, .pdf, .ppt, .pptx, .rar, .rtf, .sql, .svelte, ttf, .txt, .xls, .xlsx, .xz, .zip, .bin, .dmg, .exe, .js, .msi, .php, .py, .sh';
-
-export let class_li_default: string = 'flex flex-col gap-1 items-center justify-center w-full max-w-2xl mx-auto my-1';
-export let class_li: string = '';
-export let input_class_li: string[] = ['file_drop_area'];
-export let table_class_li: string[] = ['table', 'table-sm', 'table-striped', '' , 'text-sm'];
-
-export let upload_complete: boolean = false;
-export let submit_status: null|string = null;
-
 
 // Local Variables
-let task_id = link_to_id;
-let input_file_list: any = null;
-let ae_promises: key_val = {}; // Promise<any>;
+let task_id = $state(link_to_id);
+let input_file_list: any = $state(null);
+let ae_promises: key_val = $state({}); // Promise<any>;
 let ae_triggers: key_val = {};
 
 let input_element_id = 'ae_comp__event_files_upload__input';
 
+
 // *** Functions and Logic
+function preventDefault(fn) {
+    return function (event) {
+        event.preventDefault();
+        fn.call(this, event);
+    };
+}
+
 async function handle_submit_form_files(event) {
     console.log('*** handle_submit_form() ***');
 
@@ -219,7 +242,7 @@ async function handle_input_upload_files(input_upload_files, task_id) {
 
 <!-- class:hidden={!$ae_loc.trusted_access} -->
 <form
-    on:submit|preventDefault={handle_submit_form_files}
+    onsubmit={preventDefault(handle_submit_form_files)}
     class="{class_li_default} {class_li}"
     >
 
@@ -252,7 +275,7 @@ async function handle_input_upload_files(input_upload_files, task_id) {
             "
         class:hidden={$events_sess.files.disable_submit__event_file_obj}
         >
-        <slot name="label">
+        {#if label}{@render label()}{:else}
         <div class="text-lg">
             <span class="fas fa-upload"></span>
             <!-- Select files to upload -->
@@ -264,7 +287,7 @@ async function handle_input_upload_files(input_upload_files, task_id) {
             <strong>Presentation related files only</strong><br>
             (PowerPoint, Keynote, PDF, mp4, Word Doc, Excel, txt, etc)
         </div>
-        </slot>
+        {/if}
     </label>
 
     <input
diff --git a/src/routes/events/ae_comp__event_presentation_obj_li.svelte b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
index 3f795950..99431cc5 100644
--- a/src/routes/events/ae_comp__event_presentation_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
@@ -1,4 +1,20 @@
 <script lang="ts">
+interface Props {
+    // Exports
+    container_class_li?: string|Array<string>;
+    display_mode?: string; // 'default', 'compact', 'minimal', 'launcher'
+    // export let link_to_id: string;
+    lq__event_presentation_obj_li: any;
+    log_lvl?: number; // Variables
+}
+
+let {
+    container_class_li = [],
+    display_mode = 'default',
+    lq__event_presentation_obj_li,
+    log_lvl = 0
+}: Props = $props();
+
 // Imports
 // import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
@@ -17,21 +33,6 @@ import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li
 
 // export let link_to_type: string;
 
-interface Props {
-    // Exports
-    container_class_li?: string|Array<string>;
-    display_mode?: string; // 'default', 'compact', 'minimal', 'launcher'
-    // export let link_to_id: string;
-    lq__event_presentation_obj_li: any;
-    log_lvl?: number; // Variables
-}
-
-let {
-    container_class_li = [],
-    display_mode = 'default',
-    lq__event_presentation_obj_li,
-    log_lvl = 0
-}: Props = $props();
 
 
 // let ae_promises: key_val = {};
@@ -451,8 +452,3 @@ let {
 
 
 </section>
-
-
-<style>
-
-</style>
diff --git a/src/routes/events/ae_comp__event_session_obj_li.svelte b/src/routes/events/ae_comp__event_session_obj_li.svelte
index 50192608..ad30a1ff 100644
--- a/src/routes/events/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_li.svelte
@@ -4,8 +4,8 @@ interface Props {
     log_lvl?: number;
     container_class_li?: string|Array<string>;
     // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-    link_to_type: null|string;
-    link_to_id: null|string;
+    // link_to_type?: null|string;
+    // link_to_id?: null|string;
     lq__event_session_obj_li: any;
     hide__session_location?: boolean;
     hide__session_poc?: boolean;
@@ -19,8 +19,8 @@ interface Props {
 let {
     log_lvl = 0,
     container_class_li = [],
-    link_to_type,
-    link_to_id,
+    // link_to_type,
+    // link_to_id,
     lq__event_session_obj_li,
     hide__session_location = false,
     hide__session_poc = false,
@@ -51,9 +51,9 @@ import { events_func } from '$lib/ae_events_functions';
 // export let allow_basic: boolean = false;
 // export let allow_moderator: boolean = false;
 
-if (log_lvl) {
-    console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
-}
+// if (log_lvl) {
+//     console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
+// }
 
 // Variables
 // let ae_promises: key_val = {};
diff --git a/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte b/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte
index b6a68265..3e11e8b9 100644
--- a/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte
@@ -1,23 +1,31 @@
 <script lang="ts">
+interface Props {
+    // Exports
+    container_class_li?: string|Array<string>;
+    // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
+    event_session_id_random_li?: Array<string>;
+    link_to_type: string;
+    link_to_id: string;
+    log_lvl?: number;
+}
+
+let {
+    container_class_li = [],
+    event_session_id_random_li = [],
+    link_to_type,
+    link_to_id,
+    log_lvl = 0
+}: Props = $props();
+
 // Imports
 import Comp_event_session_obj_li from './ae_comp__event_session_obj_li.svelte';
 
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/ae_events/db_events";
 
-// Exports
-export let container_class_li: string|Array<string> = [];
-// export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-export let event_session_id_random_li: Array<string> = [];
-export let link_to_type: string;
-export let link_to_id: string;
-export let log_lvl: number = 0;
-
-if (log_lvl) {
-    console.log(`TEST event_session: link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
-}
 if (log_lvl > 1) {
-    console.log(`TEST event_session: event_session_id_random_li: ${event_session_id_random_li}`);
+    console.log(`event_session list: link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
+    console.log(`event_session list: event_session_id_random_li: ${event_session_id_random_li}`);
 }
 
 // Variables
@@ -29,7 +37,7 @@ let dq__where_type_id_val: string = `${link_to_type}_id_random`;
 let dq__where_eq_id_val: string = link_to_id;
 
 // *** Functions and Logic
-$: lq__event_session_obj_li = liveQuery(async () => {
+let lq__event_session_obj_li = $derived(liveQuery(async () => {
     if (link_to_type && link_to_id) {
         let results = await db_events.sessions
             .where(dq__where_type_id_val)
@@ -47,14 +55,12 @@ $: lq__event_session_obj_li = liveQuery(async () => {
     } else {
         return null;
     }
-});
+}));
 </script>
 
 
 <Comp_event_session_obj_li
     container_class_li={container_class_li}
-    link_to_type={link_to_type}
-    link_to_id={link_to_id}
     lq__event_session_obj_li={lq__event_session_obj_li}
     log_lvl={log_lvl}
     >
diff --git a/src/routes/events/ae_comp__event_session_obj_tbl.svelte b/src/routes/events/ae_comp__event_session_obj_tbl.svelte
index 66c4b139..301b5ac7 100644
--- a/src/routes/events/ae_comp__event_session_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_tbl.svelte
@@ -1,4 +1,19 @@
 <script lang="ts">
+interface Props {
+    container_class_li?: string|Array<string>;
+    // export let event_session_id_random_li: Array<string>;
+    lq__event_session_obj_li: any;
+    log_lvl?: number;
+    show_location_fields?: boolean;
+}
+
+let {
+    container_class_li = [],
+    lq__event_session_obj_li,
+    log_lvl = 0,
+    show_location_fields = true
+}: Props = $props();
+
 // Imports
 // import type { key_val } from '$lib/ae_stores';
 
@@ -8,27 +23,16 @@ import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 // import { db_events } from "$lib/db_events";
 
-// Exports
-export let container_class_li: string|Array<string> = [];
+
 // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher';
 // export let link_to_type: string;
 // export let link_to_id: string;
-// export let event_session_id_random_li: Array<string>;
-export let lq__event_session_obj_li: any;
-export let log_lvl: number = 0;
-
-export let show_location_fields: boolean = true;
 
 // *** Functions and Logic
 if (log_lvl) {
     console.log(`container_class_li: ${container_class_li}; show_location_fields: ${show_location_fields}`);
     // console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
 }
-
-// let lq_kv__event_session_obj_li = liveQuery(
-//     () => db_events.sessions
-//     .bulkGet(event_session_id_random_li)
-// );
 </script>
 
 
diff --git a/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte b/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
index b7e1ba73..ad96bdf1 100644
--- a/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
+++ b/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
@@ -667,31 +667,6 @@ async function handle_delete_event_presenter_obj({event_presenter_id, hosted_fil
         </button>
     </header>
 
-
-    <!-- {#if $slct.event_presenter_id && $ae_loc.mod.events.presenter_link}
-    <div class="flex justify-center">
-        <button
-            class="btn variant-soft-secondary"
-            use:clipboard={$ae_loc.mod.events.presenter_link}
-            >
-            <span class="fas fa-copy mx-1"></span>
-            Copy link for {$slct.event_presenter_id}
-        </button>
-
-        <button
-            class="btn variant-soft-secondary mx-1"
-            on:click={() => {
-                if (!confirm(`Are you sure you want to send this email to ${$slct.event_presenter_obj.email}?`)) {return false;}
-
-                }}
-            >
-            <span class="fas fa-paper-plane mx-1"></span>
-            Send Email
-        </button>
-    </div>
-    {/if} -->
-
-
     <Tabs
         justify="justify-center"
         active="preset-tonal-primary border border-primary-500"