This was a lot... things are mostly working again. The changing of id_random properties caused some problems. The hosted_file_hash_sha256 is not working? There are other issues as well... This will take some time.

src/routes/events/[event_id]/(badges)/badges/+layout.svelte

@@ -16,13 +16,13 @@ let {
 // *** Import Svelte specific
 import { liveQuery } from "dexie";
 
-import type { key_val } from '$lib/ae_stores';
+import type { key_val } from '$lib/stores/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 
 // import { core_func } from '$lib/ae_core_functions';
 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 } from '$lib/ae_events_stores';
+import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores';
+import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
 
 let lq__event_obj = $derived(liveQuery(async () => {

src/routes/events/[event_id]/(badges)/badges/+page.svelte

@@ -21,15 +21,14 @@ import { liveQuery } from "dexie";
 // import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { core_func } from '$lib/ae_core_functions';
-import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
-
+import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores';
 // import Element_ae_crud from '$lib/element_ae_crud
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 // import MyClipboard from '$lib/e_app_clipboard.svelte';
 
 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 } from '$lib/ae_events_stores';
+import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores';
 // import { events_func } from '$lib/ae_events_functions';
 
 import Comp_badge_search from './ae_comp__badge_search.svelte';

src/routes/events/[event_id]/(badges)/badges/[badge_id]/+page.svelte

@@ -29,7 +29,7 @@ import { ae_util } from '$lib/ae_utils/ae_utils';
 
 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 } from '$lib/ae_events_stores';
+import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores';
 // import { events_func } from '$lib/ae_events_functions';
 
 import Comp_badge_obj_view from './ae_comp__badge_obj_view.svelte';

src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_obj_view.svelte

@@ -43,12 +43,12 @@ import { liveQuery } from "dexie";
 //     } from '@lucide/svelte';
 
 
-import type { key_val } from '$lib/ae_stores';
+import type { key_val } from '$lib/stores/ae_stores';
 // import { ae_util } from '$lib/ae_utils/ae_utils';
 import { core_func } from '$lib/ae_core/ae_core_functions';
-import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
+import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/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_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
 
 // *** Variables
@@ -288,10 +288,10 @@ let lq__event_badge_template_obj = $derived(liveQuery(async () => {
 }));
 
 // *** Functions and Logic
-function preventDefault(fn) {
-    return function (event) {
+function preventDefault<T extends Event>(fn: (event: T) => void) {
+    return function (event: T) {
         event.preventDefault();
-        fn.call(this, event);
+        fn(event);
     };
 }
 

src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte

@@ -44,9 +44,9 @@ let {
 import { liveQuery } from "dexie";
 
 // *** Import Aether specific variables and functions
-import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
+import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores';
 
-import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
+import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores';
 import { db_events } from "$lib/ae_events/db_events";
 
 if (log_lvl) {

src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte

@@ -46,10 +46,10 @@ import {
     } from '@lucide/svelte';
 
 
-import type { key_val } from '$lib/ae_stores';
+import type { key_val } from '$lib/stores/ae_stores';
 // import { ae_util } from '$lib/ae_utils/ae_utils';
-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 } from '$lib/ae_events_stores';
+import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores';
+import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
 
 
@@ -62,10 +62,10 @@ let ae_triggers: key_val = $state({});
 let badge_type_code_li = [{"code":"current_member","name":"Member"},{"code":"inactive_member","name":"Non-Member"},{"code":"current_member_trainee","name":"Trainee Member"},{"code":"inactive_member_trainee","name":"Trainee Non-Member"},{"code":"ex_all","name":"Exhibitor All Access"},{"code":"ex_booth","name":"Exhibitor Booth Staff"},{"code":"hftx","name":"HFTX Master Academy"},{"code":"mcs","name":"MCS Master Academy"},{"code":"pediatric","name":"Pediatric"},{"code":"guest","name":"Guest"},{"code":"staff","name":"Staff"},{"code":"volunteer","name":"Volunteer"},{"code":"test","name":"Test"}];
 
 // *** Functions and Logic
-function preventDefault(fn) {
-    return function (event) {
+function preventDefault<T extends Event>(fn: (event: T) => void) {
+    return function (event: T) {
         event.preventDefault();
-        fn.call(this, event);
+        fn(event);
     };
 }