diff --git a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_edit.svelte b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_edit.svelte
index 531abec2..92123436 100644
--- a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_edit.svelte
@@ -438,7 +438,14 @@ $effect(() => {
                 Title of BB post:
             </span>
         <input
-            type="text" id="title" name="title" required max="200" bind:value={$idaa_slct.post_obj.title} placeholder="Title of Post" autocomplete="off"
+            type="text"
+            id="title"
+            name="title"
+            required
+            max="200"
+            bind:value={$idaa_slct.post_obj.title}
+            placeholder="Title of Post"
+            autocomplete="off"
             class="
                 input w-full
                 preset-tonal-surface hover:preset-filled-surface-100-900
@@ -656,7 +663,12 @@ $effect(() => {
                                 });
 
                             }}
-                            class="novi_btn btn btn-sm preset-tonal-warning hover:preset-tonal-warning border border-warning-500"
+                            class="
+                                novi_btn
+                                btn btn-sm
+                                preset-tonal-warning preset-outlined-warning-100-900 hover:preset-filled-warning-400-600
+                                transition
+                                "
                             title="Delete this file"
                             >
                             <span class="fas fa-trash-alt mx-1"></span>
@@ -943,11 +955,11 @@ $effect(() => {
                     grow
                     flex flex-row flex-wrap gap-1 items-center justify-evenly
                     col-sm-1
-                "
+                    "
                 >
-                <label class="legend text-sm font-semibold input-group">Sort <input type="number" name="sort" bind:value={$idaa_slct.post_obj.sort} class="input w-24 form-control" /></label>
+                <label class="legend text-sm font-semibold input-group">Sort <input type="number" name="sort" bind:value={$idaa_slct.post_obj.sort} class="input w-24 preset-tonal-surface form-control" /></label>
 
-                <label class="legend text-sm font-semibold input-group">Group <input type="text" name="group" bind:value={$idaa_slct.post_obj.group} max="100" class="input w-40 form-control" /></label>
+                <label class="legend text-sm font-semibold input-group">Group <input type="text" name="group" bind:value={$idaa_slct.post_obj.group} max="100" class="input w-40 preset-tonal-surface form-control" /></label>
             </span>
 
             {#if $ae_loc.administrator_access}
@@ -997,7 +1009,7 @@ $effect(() => {
                 }}
                 bind:new_html={notes_new_html}
                 bind:changed={notes_changed}
-                classes="bg-gray-100 dark:bg-gray-800"
+                classes="preset-tonal-surface hover:preset-filled-surface-100-900"
                 placeholder="Internal notes for staff only. Not shown to the public."
                 />
         </label>
@@ -1025,7 +1037,7 @@ $effect(() => {
                     btn
                     preset-tonal-success hover:preset-filled-success-200-800
                     transition
-                "
+                    "
                 >
                 {#await prom_api__post_obj}
                     <span class="fas fa-spinner fa-spin m-1"></span> Saving
@@ -1046,7 +1058,7 @@ $effect(() => {
                     btn
                     preset-tonal-warning hover:preset-filled-warning-200-800
                     transition
-                "
+                    "
                 >
                 {#await prom_api__post_obj}
                     <span class="fas fa-spinner fa-spin m-1"></span> Saving
@@ -1068,7 +1080,7 @@ $effect(() => {
                 novi_btn
                 btn btn-sm
                 preset-filled-warning-400-600 hover:preset-filled-error-200-800
-            "
+                "
             title="Delete record permanently"
             >
             <span class="fas fa-minus m-1"></span> Delete
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
index 98b05f88..53f3315c 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
@@ -461,7 +461,12 @@ function add_activity_log(
 <Element_data_store
     ds_code="recovery_meetings_info"
     ds_type="html"
-    class_li="border border-red rounded-lg bg-gray-100 p-2 max-w-(--breakpoint-lg) space-y-2"
+    class_li="
+        rounded-lg
+        preset-filled-surface-100-900 preset-outlined-surface-200-800
+        m-auto p-2 space-y-2
+        w-full max-w-(--breakpoint-lg)
+        "
     show_edit_btn={true}
     />
 
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte
index 97f912b0..f0b9721b 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte
@@ -599,7 +599,11 @@ function send_staff_notification_email() {
 
 
 <section
-    class="svelte_component ae_section ae_edit event_obj edit__event_obj"
+    class="
+        svelte_component ae_section ae_edit event_obj edit__event_obj
+        space-y-2 p-2 border rounded
+        preset-outlined-warning-200-800 preset-tonal-warning
+        "
     class:ae_create={!$idaa_slct.event_id}
     bind:clientHeight={$ae_loc.iframe_height_modal_body}
     >
@@ -636,9 +640,13 @@ function send_staff_notification_email() {
 
     <input type="hidden" value={$idaa_slct.event_id} />
 
-    <section class="ae_section event__general_information border border-gray-200 rounded p-2 space-y-2"> <!-- BEGIN: section event__general_information -->
+    <div class="ae_section event__general_information border border-gray-200 rounded p-2 space-y-2"> <!-- BEGIN: section event__general_information -->
 
-        <label for="name">Name of Recovery Meeting
+        <div>
+        <label for="name" class="w-full">
+            <span class="text-sm font-semibold text-surface-600-400">
+                Name of Recovery Meeting:
+            </span>
         <input
             type="text"
             id="name"
@@ -648,9 +656,14 @@ function send_staff_notification_email() {
             value={$lq__event_obj?.name ?? ''}
             placeholder="Name of Recovery Meeting"
             autocomplete="off"
-            class="input w-96"
+            class="
+                input w-full
+                preset-tonal-surface hover:preset-filled-surface-100-900
+                form-control
+                "
             />
         </label>
+        </div>
 
         <label for="description" class="ae_label event__description w-full">Short description
             <!-- <textarea name="description" id="description" class="ae_value event__description tinymce_editor editor_basic textarea" rows="5" cols="70" bind:value={$idaa_slct.event_obj.description} ></textarea> -->
@@ -660,6 +673,7 @@ function send_staff_notification_email() {
                 bind:html_text={$idaa_slct.event_obj.description}
                 show_button_kv={{'heading__h1': false, 'heading__h2': false, 'heading__h3': false}}
                 bind:new_html={$idaa_slct.event_obj.description_new_html}
+                classes="preset-tonal-surface hover:preset-filled-surface-100-900"
                 placeholder="A short description or overview of this recovery meeting"
                 />
 
@@ -691,9 +705,17 @@ function send_staff_notification_email() {
             ></Editor> -->
 
         <div>
-            <label class="">
+            <label class="form-group w-100">
                 Type of Recovery Meeting
-                <select name="type" class="select w-48" value={$lq__event_obj?.type}>
+                <select
+                    name="type"
+                    class="
+                        select w-48 px-1
+                        preset-tonal-surface hover:preset-filled-surface-100-900
+                        form-control col-sm-12
+                        "
+                    value={$lq__event_obj?.type}
+                     >
                     <option value="IDAA">IDAA</option>
                     <option value="Caduceus">Caduceus</option>
                     <option value="Family Recovery">Family Recovery</option>
@@ -707,10 +729,10 @@ function send_staff_notification_email() {
             </ul>
         </div>
 
-    </section> <!-- END: section event__general_information -->
+    </div> <!-- END: section event__general_information -->
 
 
-    <section class="ae_section event__how_to_attend border border-gray-200 rounded p-2 space-y-2"> <!-- BEGIN: section event__how_to_attend -->
+    <div class="ae_section event__how_to_attend border border-gray-200 rounded p-2 space-y-2"> <!-- BEGIN: section event__how_to_attend -->
         <h3 class="h2">How to Attended</h3>
 
         <fieldset class="event__physical_virtual">
@@ -779,7 +801,7 @@ function send_staff_notification_email() {
                     id="address_country_subdivision_code"
                     name="address_country_subdivision_code"
                     value="{($lq__event_obj?.location_address_json && $lq__event_obj?.location_address_json.country_subdivision_code ? $lq__event_obj?.location_address_json.country_subdivision_code : $lq__event_obj?.address_country_subdivision_code ?? '')}"
-                    class="select w-56"
+                    class="select w-56 preset-tonal-surface hover:preset-filled-surface-100-900 p-1"
                     title="Select the state or province for the meeting">
                     <option value="">-- None --</option>
                     {#each lu_country_subdivision_list as lu_country_subdivision}
@@ -803,7 +825,7 @@ function send_staff_notification_email() {
                     id="address_country_alpha_2_code"
                     name="address_country_alpha_2_code"
                     value="{($lq__event_obj?.location_address_json && $lq__event_obj?.location_address_json.country_alpha_2_code ? $lq__event_obj?.location_address_json.country_alpha_2_code : $lq__event_obj?.address_country_alpha_2_code ?? '')}"
-                    class="select w-64"
+                    class="select w-64 preset-tonal-surface hover:preset-filled-surface-100-900 p-1"
                     title="Select the country for the meeting">
                     <option value="">-- None --</option>
                     {#each lu_country_list as lu_country}
@@ -826,6 +848,8 @@ function send_staff_notification_email() {
                 bind:html_text={$idaa_slct.event_obj.location_text}
                 show_button_kv={{'heading__h1': false, 'heading__h2': false, 'heading__h3': false}}
                 bind:new_html={$idaa_slct.event_obj.location_text_new_html}
+                classes="preset-tonal-surface hover:preset-filled-surface-100-900"
+                placeholder="Additional information about the meeting location"
             />
 
             <!-- If changed then show Save button -->
@@ -875,6 +899,8 @@ function send_staff_notification_email() {
                 bind:html_text={$idaa_slct.event_obj.attend_text}
                 show_button_kv={{'heading__h1': false, 'heading__h2': false, 'heading__h3': false}}
                 bind:new_html={$idaa_slct.event_obj.attend_text_new_html}
+                classes="preset-tonal-surface hover:preset-filled-surface-100-900"
+                placeholder="Additional information on how to attend or join the meeting"
                 />
 
             <!-- If changed then show Save button -->
@@ -893,10 +919,10 @@ function send_staff_notification_email() {
             {/if} -->
         </label>
 
-    </section> <!-- END: section event__how_to_attend -->
+    </div> <!-- END: section event__how_to_attend -->
 
 
-    <section class="ae_section event__timing border border-gray-200 rounded p-2 space-y-2"> <!-- BEGIN: section event__timing -->
+    <div class="ae_section event__timing border border-gray-200 rounded p-2 space-y-2"> <!-- BEGIN: section event__timing -->
 
         <h3 class="h3">Recurring and When</h3>
 
@@ -935,9 +961,14 @@ function send_staff_notification_email() {
             >
 
             <!-- <legend class="legend">Recurring</legend> -->
-            <label for="recurring_pattern">Recurring Repeats
+            <label for="recurring_pattern" class="form-group w-100">
+                Recurring Repeats
                 <select
-                    class="select w-48"
+                    class="
+                        select w-48 px-1
+                        preset-tonal-surface hover:preset-filled-surface-100-900
+                        form-control col-sm-12
+                        "
                     name="recurring_pattern"
                     id="recurring_pattern"
                     value={$lq__event_obj?.recurring_pattern}
@@ -981,14 +1012,18 @@ function send_staff_notification_email() {
             </label>
         </fieldset>
 
-        <fieldset class="flex_row flex_gap_md flex_justify_around space-y-1">
-            <label>Timezone
+        <fieldset class="flex flex-row flex-wrap gap-1 items-center justify-start flex_row flex_gap_md flex_justify_around space-y-1">
+            <label class="form-group w-56">Timezone
                 {#if $ae_loc?.lu_time_zone_list && $ae_loc?.lu_time_zone_list.length > 0}
                     <select
                         name="timezone"
                         required
                         value={$lq__event_obj?.timezone ?? $ae_loc?.current_timezone}
-                        class="select w-56"
+                        class="
+                            select w-56 max-w-fit px-1
+                            preset-tonal-surface hover:preset-filled-surface-100-900
+                            form-control col-6
+                            "
                         >
                         <option value=""
                             class:hidden={!$ae_loc.trusted_access}
@@ -1002,8 +1037,33 @@ function send_staff_notification_email() {
                 {/if}
                 <!-- client TZ: {$ae_loc?.current_timezone} -->
             </label>
-            <label>Start Time <input name="recurring_start_time" type="time" value={$lq__event_obj?.recurring_start_time} max="8" class="input w-40" /></label>
-            <label>End Time <input name="recurring_end_time" type="time" value={$lq__event_obj?.recurring_end_time} max="8" class="input w-40" /></label>
+            <label class="form-group">
+                Start Time
+                <input name="recurring_start_time"
+                type="time"
+                value={$lq__event_obj?.recurring_start_time}
+                max="8"
+                class="
+                    input w-40
+                    preset-tonal-surface hover:preset-filled-surface-100-900
+                    form-control
+                    "
+                />
+            </label>
+            <label class="form-group">
+                End Time
+                <input
+                    name="recurring_end_time"
+                    type="time"
+                    value={$lq__event_obj?.recurring_end_time}
+                    max="8"
+                    class="
+                        input w-40
+                        preset-tonal-surface hover:preset-filled-surface-100-900
+                        form-control
+                        "
+                    />
+            </label>
         </fieldset>
 
         {#if ( $ae_loc.administrator_access || $lq__event_obj && ($idaa_slct.event_obj?.show_recurring_text || ($lq__event_obj?.recurring_text && !$lq__event_obj?.recurring_text.includes('*gen*'))) )}
@@ -1021,6 +1081,8 @@ function send_staff_notification_email() {
                         // unset_link: true
                     }}
                     bind:new_html={$idaa_slct.event_obj.recurring_text_new_html}
+                    classes="preset-tonal-surface hover:preset-filled-surface-100-900"
+                    placeholder="Additional information on when and how often"
                     />
 
                 <!-- If changed then show Save button -->
@@ -1042,8 +1104,12 @@ function send_staff_notification_email() {
         {#if ( $ae_loc.administrator_access || $lq__event_obj && ($idaa_slct.event_obj?.show_recurring_text || ($lq__event_obj?.recurring_text && !$lq__event_obj?.recurring_text.includes('*gen*'))) )}
             <button
                 type="button"
-                class="novi_btn novi_smaller btn btn-info btn-sm ae_width_md preset-tonal-warning border border-warning-500 hover:preset-filled-warning-500 transition"
-                style=""
+
+                class="
+                    novi_btn
+                    btn btn-sm
+                    preset-filled-tertiary-200-800
+                    "
                 on:click={() => {
                     if (confirm('Are you sure you want to remove the text for the additional details?')) {
                         $idaa_slct.event_obj.recurring_text = '';
@@ -1060,8 +1126,11 @@ function send_staff_notification_email() {
         {:else}
             <button
                 type="button"
-                class="novi_btn novi_smaller btn btn-info btn-sm ae_width_md preset-tonal-success border border-success-500 hover:preset-filled-success-500 transition"
-                style=""
+                class="
+                    novi_btn
+                    btn btn-sm
+                    preset-filled-success-200-800
+                    "
                 on:click|preventDefault={() => {
                     // Remove *gen* prefix from recurring_text
                     if ($lq__event_obj.recurring_text && $lq__event_obj.recurring_text.includes('*gen*')) {
@@ -1079,10 +1148,10 @@ function send_staff_notification_email() {
             <textarea class="ae_value event__recurring_text tinymce_editor editor_less_100" id="recurring_text" name="recurring_text" placeholder="Additional information on when and how often" value={$lq__event_obj.recurring_text}></textarea>
         </label>
         {/if} -->
-    </section> <!-- END: section event__timing -->
+    </div> <!-- END: section event__timing -->
 
 
-    <section class="ae_section event__contacts border border-gray-200 rounded p-2 space-y-2">
+    <div class="ae_section event__contacts border border-gray-200 rounded p-2 space-y-2">
 
         <h3 class="h3">Contacts</h3>
 
@@ -1228,7 +1297,7 @@ function send_staff_notification_email() {
 
         </div>
 
-    </section> <!-- END: section event__contacts -->
+    </div> <!-- END: section event__contacts -->
 
 
     {#if $ae_loc.trusted_access}
@@ -1237,15 +1306,31 @@ function send_staff_notification_email() {
         on:click={() => {
             $idaa_loc.recovery_meetings.show__admin_options = !$idaa_loc.recovery_meetings.show__admin_options;
         }}
-        class="novi_btn btn btn-sm preset-tonal-warning float-right"
+        class="
+            novi_btn
+            btn btn-sm float-right
+            "
+        class:preset-filled-success-200-800={$idaa_loc.recovery_meetings.show__admin_options}
+        class:preset-filled-tertiary-200-800={!$idaa_loc.recovery_meetings.show__admin_options}
         >
+        {#if $idaa_loc.recovery_meetings.show__admin_options}
+        <span class="fas fa-eye-slash m-1"></span>
+        {:else}
         <span class="fas fa-eye m-1"></span>
+        {/if}
         {$idaa_loc.recovery_meetings.show__admin_options ? 'Hide' : 'Show'} Admin
     </button>
 
     <!-- BEGIN: section event__admin_options -->
-    <section
-        class="ae_section event__admin_options border border-gray-200 rounded p-2 space-y-2 bg-red-100"
+    <div
+        class="
+            ae_section event__admin_options
+            space-y-1 p-2
+            border rounded
+            preset-filled-warning-100-900
+            preset-outlined-warning-400-600
+            transition
+            "
         class:hidden={!$idaa_loc.recovery_meetings.show__admin_options}
         >
 
@@ -1254,100 +1339,106 @@ function send_staff_notification_email() {
         </h3>
 
         <span
-            class="flex flex-row flex-wrap items-center justify-between"
+            class="flex flex-col md:flex-row flex-wrap gap-2 items-center justify-center md:justify-stretch w-full"
             >
             <span
                 class="flex flex-row flex-wrap gap-2 items-center justify-evenly grow"
                 >
-                <fieldset class="flex flex-col flex-wrap gap-1 items-start justify-center">
-                    <legend class="legend text-sm font-semibold">Confirmed</legend>
-                    <div class="flex flex-row gap-1 items-start justify-center">
+                <fieldset class="flex flex-row gap-1 items-center justify-center form-check">
+                    <legend class="legend text-sm font-semibold form-check-label">Confirmed</legend>
+                    <div>
                         <input
                             type="radio"
                             id="status_yes"
                             name="status"
                             value={'unknown'}
                             bind:group={$idaa_slct.event_obj.status}
-                            class="radio"
+                            class="radio form-check-input"
                         >
                         <label for="status_yes">Not Confirmed</label>
                     </div>
-                    <div class="flex flex-row gap-1 items-start justify-center">
+                    <div>
                         <input
                             type="radio"
                             id="status_no"
                             name="status"
                             value={null}
                             bind:group={$idaa_slct.event_obj.status}
-                            class="radio"
+                            class="radio form-check-input"
                         >
                         <label for="status_no">Yes</label>
                     </div>
                 </fieldset>
 
-                <fieldset class="flex flex-col flex-wrap gap-1 items-start justify-center">
-                    <legend class="legend text-sm font-semibold">Hide</legend>
-                    <div class="flex flex-row gap-1 items-start justify-center">
+                <fieldset class="flex flex-row gap-1 items-center justify-center form-check">
+                    <legend class="legend text-sm font-semibold form-check-label">Hide</legend>
+                    <div>
                         <input
                             type="radio"
                             id="hide_yes"
                             name="hide"
                             value={true}
                             bind:group={$idaa_slct.event_obj.hide}
-                            class="radio"
+                            class="radio form-check-input"
                         >
                         <label for="hide_yes">Yes</label>
                     </div>
-                    <div class="flex flex-row gap-1 items-start justify-center">
+                    <div>
                         <input
                             type="radio"
                             id="hide_no"
                             name="hide"
                             value={false}
                             bind:group={$idaa_slct.event_obj.hide}
-                            class="radio"
+                            class="radio form-check-input"
                         >
                         <label for="hide_no">No</label>
                     </div>
                 </fieldset>
 
-                <fieldset class="flex flex-col flex-wrap gap-1 items-start justify-center">
-                    <legend class="legend text-sm font-semibold">Priority</legend>
-                    <div class="flex flex-row gap-1 items-start justify-center">
+                <fieldset class="flex flex-row gap-1 items-center justify-center form-check">
+                    <legend class="legend text-sm font-semibold form-check-label">Priority</legend>
+                    <div>
                         <input
                             type="radio"
                             id="priority_yes"
                             name="priority"
                             value={true}
                             bind:group={$idaa_slct.event_obj.priority}
-                            class="radio"
+                            class="radio form-check-input"
                         >
                         <label for="priority_yes">Yes</label>
                     </div>
-                    <div class="flex flex-row gap-1 items-start justify-center">
+                    <div>
                         <input
                             type="radio"
                             id="priority_no"
                             name="priority"
                             value={false}
                             bind:group={$idaa_slct.event_obj.priority}
-                            class="radio"
+                            class="radio form-check-input"
                         >
                         <label for="priority_no">No</label>
                     </div>
                 </fieldset>
             </span>
 
-            <span class="flex flex-row flex-wrap gap-1 items-center justify-evenly grow">
-                <label class="legend text-sm font-semibold">Sort <input type="number" name="sort" value={$idaa_slct.event_obj.sort} class="input w-24" /></label>
+            <span
+                class="
+                    grow
+                    flex flex-row flex-wrap gap-1 items-center justify-evenly
+                    col-sm-1
+                    "
+                >
+                <label class="legend text-sm font-semibold input-group">Sort <input type="number" name="sort" value={$idaa_slct.event_obj.sort} class="input w-24 preset-tonal-surface form-control" /></label>
 
-                <label class="legend text-sm font-semibold">Group <input type="text" name="group" value={$idaa_slct.event_obj.group ?? ''} max="100" class="input w-40" /></label>
+                <label class="legend text-sm font-semibold input-group">Group <input type="text" name="group" value={$idaa_slct.event_obj.group ?? ''} max="100" class="input w-40 preset-tonal-surface form-control" /></label>
             </span>
 
             {#if $ae_loc.administrator_access}
             <span class="flex flex-row flex-wrap gap-1 items-center justify-evenly grow">
-                <fieldset class="flex flex-col flex-wrap gap-1 items-start justify-center">
-                    <legend class="legend text-sm font-semibold">Enable</legend>
+                <fieldset class="flex flex-row gap-2 form-check">
+                    <legend class="legend text-sm font-semibold form-check-label">Enable</legend>
                     <div class="flex flex-row gap-1 items-start justify-center">
                         <input
                             type="radio"
@@ -1355,7 +1446,7 @@ function send_staff_notification_email() {
                             name="enable"
                             value={true}
                             bind:group={$idaa_slct.event_obj.enable}
-                            class="radio"
+                            class="radio form-check-input"
                         >
                         <label for="enable_yes">Yes</label>
                     </div>
@@ -1366,7 +1457,7 @@ function send_staff_notification_email() {
                             name="enable"
                             value={false}
                             bind:group={$idaa_slct.event_obj.enable}
-                            class="radio"
+                            class="radio form-check-input"
                         >
                         <label for="enable_no">No</label>
                     </div>
@@ -1388,25 +1479,32 @@ function send_staff_notification_email() {
                 bind:html_text={$idaa_slct.event_obj.notes}
                 show_button_kv={{'heading__h1': false, 'heading__h2': false, 'heading__h3': false}}
                 bind:new_html={$idaa_slct.event_obj.notes_new_html}
+                classes="preset-tonal-surface hover:preset-filled-surface-100-900"
+                placeholder="Internal notes for staff only. Not shown to the public."
                 />
         </label>
         {/if}
 
-    </section> <!-- END: section event__admin_options -->
+    </div> <!-- END: section event__admin_options -->
     {/if}
 
 
-    <section class="ae_section ae_options ae_row ae_actions event__options event__actions"> <!-- BEGIN: section event__options -->
+    <div class="ae_section ae_options ae_row ae_actions event__options event__actions"> <!-- BEGIN: section event__options -->
         {#if $idaa_slct.event_id}
             <button
                 type="submit"
                 disabled={(disable_submit_btn)}
-                class="novi_btn btn_primary btn btn-primary preset-tonal-primary border border-primary-500 hover:preset-filled-primary-500 transition"
+                class="
+                    novi_btn btn_primary btn-warning
+                    btn
+                    preset-tonal-success hover:preset-filled-success-200-800
+                    transition
+                    "
                 >
                 {#await prom_api__event_obj}
                     <span class="fas fa-spinner fa-spin m-1"></span> Saving
                 {:then}
-                    <span class="fas fa-save m-1"></span> Save
+                    <span class="fas fa-save m-1"></span> Save Changes
                 {/await}
             </button>
         {:else}
@@ -1417,7 +1515,12 @@ function send_staff_notification_email() {
                     if (!confirm('Are you sure you want to create this event?')) {return false;}
                     // handle_save_event_obj({event_id: $idaa_slct.event_id, method: 'create'});
                 }}
-                class="novi_btn btn btn-md preset-tonal-primary border border-primary-500 hover:preset-filled-primary-500 transition"
+                class="
+                    novi_btn btn-warning
+                    btn
+                    preset-tonal-warning hover:preset-filled-warning-200-800
+                    transition
+                    "
                 >
                 {#await prom_api__event_obj}
                     <span class="fas fa-spinner fa-spin m-1"></span> Saving
@@ -1435,7 +1538,11 @@ function send_staff_notification_email() {
                 if (!confirm('Are you sure you want to delete this event?')) {return false;}
                 handle_delete_event_obj({event_id: $idaa_slct.event_id, method: 'delete'});
             }}
-            class="novi_btn btn btn-sm preset-tonal-warning"
+            class="
+                novi_btn
+                btn btn-sm
+                preset-filled-warning-400-600 hover:preset-filled-error-200-800
+                "
             title="Delete record permanently"
             >
             <span class="fas fa-minus m-1"></span> Delete
@@ -1447,7 +1554,12 @@ function send_staff_notification_email() {
                 if (!confirm('Are you sure you want to disable this event?')) {return false;}
                 handle_delete_event_obj({event_id: $idaa_slct.event_id, method: 'disable'});
             }}
-            class="novi_btn btn btn-sm preset-tonal-warning"
+            class="
+                novi_btn
+                btn btn-sm
+                preset-filled-warning-200-800 hover:preset-filled-error-200-800
+                transition
+                "
             title="Disable record to delete"
             >
             <span class="fas fa-minus m-1"></span> Delete
@@ -1459,14 +1571,19 @@ function send_staff_notification_email() {
                 if (!confirm('Are you sure you want to hide this event?')) {return false;}
                 handle_delete_event_obj({event_id: $idaa_slct.event_id, method: 'hide'});
             }}
-            class="novi_btn btn btn-sm preset-tonal-warning"
+            class="
+                novi_btn
+                btn btn-sm
+                preset-filled-warning-200-800 hover:preset-filled-error-200-800
+                transition
+                "
             title="Hide record to delete"
             >
             <span class="fas fa-comment-slash m-1"></span> Delete
         </button>
         {/if}
         {/if}
-    </section>
+    </div>
 
 </form>
 
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte
index 39592e04..c3698dfe 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte
@@ -89,8 +89,7 @@ function add_activity_log(
 </script>
 
 
-<section class="svelte_component ae_section ae_list event_obj_li list__event_obj recovery_meeting_list">
-<!-- <h1>Recovery Meetings {$lq__event_obj_li?.length}</h1> -->
+<section class="svelte_component ae_section ae_list event_obj_li list__event_obj recovery_meeting_list flex flex-col gap-2 items-center justify-center w-full">
 
 {#if $lq__event_obj_li && $lq__event_obj_li.length}
 <div class="overflow-auto space-y-2">
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte
index 8f874c9f..3f2e292a 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte
@@ -192,7 +192,13 @@ if ($idaa_loc.recovery_meetings.qry__fulltext_str && $idaa_loc.recovery_meetings
 
 <section
     class="
-        ae_section ae_options filters_and_search flex flex-col flex-wrap gap-1 my-2 p-2 border rounded-md items-center justify-center bg-gray-200 border-gray-300 dark:bg-gray-800 dark:border-gray-700 d-flex align-items-center justify-content-center
+        ae_section ae_options filters_and_search
+        flex flex-col flex-wrap gap-1 items-center justify-center
+        my-2 p-2
+        preset-filled-surface-200-800 preset-outlined-surface-300-700
+        rounded-lg
+        d-flex
+        align-items-center justify-content-center
         "
         >
 
@@ -263,7 +269,7 @@ if ($idaa_loc.recovery_meetings.qry__fulltext_str && $idaa_loc.recovery_meetings
                 class="
                     novi_btn
                     btn btn-lg
-                    preset-tonal-success border border-success-500 hover:preset-filled-success-500
+                    preset-tonal-success preset-outlined-success-200-800 hover:preset-filled-success-200-800
                     text-2xl font-bold w-48
                     transition-all
                     "