diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
index 531fd454..74ee7304 100644
--- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
@@ -348,7 +348,12 @@ $effect(() => {
 
 
 <section
-    class="svelte_component ae_edit archive_content_obj"
+    class="
+        svelte_component ae_section ae_edit archive_content_obj edit__archive_content_obj
+        space-y-2 p-2
+        rounded-md
+        preset-filled-surface-50-950 preset-outlined-warning-400-600
+        "
     class:ae_create={!$idaa_slct.archive_content_id}
     >
     <!-- bind:clientHeight={ae_iframe_height} -->
@@ -719,9 +724,8 @@ $effect(() => {
         class="
             ae_section archive_content__admin_options
             space-y-1 p-2
-            border rounded
-            preset-filled-warning-100-900
-            preset-outlined-warning-400-600
+            rounded
+            preset-filled-surface-100-900 preset-outlined-error-400-600
             transition
             "
         class:hidden={!$idaa_loc.archives.show__admin_options}
@@ -873,9 +877,8 @@ $effect(() => {
             type="submit"
             disabled={disable_submit_btn}
             class="
-                novi_btn btn-warning
-                btn
-                preset-tonal-success hover:preset-filled-success-200-800
+                novi_btn
+                btn btn-md preset-tonal-primary preset-outlined-primary-800-200 hover:preset-filled-primary-200-800
                 transition
                 "
             >
diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte
index 42de73eb..7eea5544 100644
--- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte
@@ -280,7 +280,12 @@ async function handle_delete_archive_obj(
 
 
 <section
-    class="svelte_component ae_edit archive_obj"
+    class="
+        svelte_component ae_section ae_edit archive_obj edit__archive_obj
+        space-y-2 p-2
+        rounded-md
+        preset-filled-surface-50-950 preset-outlined-warning-400-600
+        "
     class:ae_create={!$idaa_slct.archive_id}
     bind:clientHeight={$ae_loc.iframe_height_modal_body}
     >
@@ -486,9 +491,8 @@ async function handle_delete_archive_obj(
         class="
             ae_section archive__admin_options
             space-y-1 p-2
-            border rounded
-            preset-filled-warning-100-900
-            preset-outlined-warning-400-600
+            rounded
+            preset-filled-surface-100-900 preset-outlined-error-400-600
             transition
             "
         class:hidden={!$idaa_loc.archives.show__admin_options}
@@ -632,7 +636,11 @@ async function handle_delete_archive_obj(
     <div class="ae_section ae_options flex flex-row gap-1 items-center justify-center">
         <button
             type="submit"
-            class="novi_btn btn btn-md preset-tonal-primary border border-primary-500 hover:preset-filled-primary-500 transition"
+            class="
+                novi_btn
+                btn btn-md preset-tonal-primary preset-outlined-primary-800-200 hover:preset-filled-primary-200-800
+                transition
+                "
             >
             <span class="fas fa-check m-1"></span>
             Save Archive
diff --git a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte
index 14dbe9b7..6ffea1c3 100644
--- a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte
@@ -320,8 +320,9 @@ function send_poster_notification_email() {
 <section
     class="
         svelte_component ae_section ae_edit post_comment_obj edit__post_comment_obj
-        space-y-2 p-2 border rounded
-        preset-outlined-warning-200-800 preset-tonal-warning
+        space-y-2 p-2
+        rounded-md
+        preset-filled-surface-100-900 preset-outlined-warning-400-600
         "
     class:ae_create={!$idaa_slct.post_id}
     bind:clientHeight={$ae_loc.iframe_height_modal_body}
@@ -523,9 +524,8 @@ function send_poster_notification_email() {
         class="
             ae_section post_comment__admin_options
             space-y-1 p-2
-            border rounded
-            preset-filled-warning-100-900
-            preset-outlined-warning-400-600
+            rounded
+            preset-filled-surface-100-900 preset-outlined-error-400-600
             transition
             "
         class:hidden={!$idaa_loc.bb.show__admin_options}
@@ -669,9 +669,9 @@ function send_poster_notification_email() {
                 type="submit"
                 disabled={(disable_submit_btn)}
                 class="
-                    novi_btn btn-warning
-                    btn preset-tonal-success
-                    hover:preset-filled-success-200-800 transition
+                    novi_btn
+                    btn btn-md preset-tonal-primary preset-outlined-primary-800-200 hover:preset-filled-primary-200-800
+                    transition
                 "
                 >
                 {#await prom_api__post_comment_obj}
@@ -689,9 +689,9 @@ function send_poster_notification_email() {
                     // handle_save_post_comment_obj({post_id: $idaa_slct.post_id, method: 'create'});
                 }}
                 class="
-                    novi_btn btn-warning
-                    btn preset-tonal-warning
-                    hover:preset-filled-warning-200-800 transition
+                    novi_btn
+                    btn btn-md preset-tonal-warning preset-outlined-warning-800-200 hover:preset-filled-warning-200-800
+                    transition
                 "
                 >
                 {#await prom_api__post_comment_obj}
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 2e779549..c656211d 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
@@ -382,8 +382,9 @@ $effect(() => {
 <section
     class="
         svelte_component ae_section ae_edit post_obj edit__post_obj
-        space-y-2 p-2 border rounded
-        preset-outlined-warning-200-800 preset-tonal-warning
+        space-y-2 p-2
+        rounded-md
+        preset-filled-surface-50-950 preset-outlined-warning-400-600
         "
     class:ae_create={!$idaa_slct.post_id}
     bind:clientHeight={$ae_loc.iframe_height_modal_body}
@@ -881,9 +882,8 @@ $effect(() => {
         class="
             ae_section post__admin_options
             space-y-1 p-2
-            border rounded
-            preset-filled-warning-100-900
-            preset-outlined-warning-400-600
+            rounded
+            preset-filled-surface-100-900 preset-outlined-error-400-600
             transition
             "
         class:hidden={!$idaa_loc.bb.show__admin_options}
@@ -1035,9 +1035,8 @@ $effect(() => {
                 type="submit"
                 disabled={(disable_submit_btn || !obj_changed)}
                 class="
-                    novi_btn btn-warning
-                    btn
-                    preset-tonal-success hover:preset-filled-success-200-800
+                    novi_btn
+                    btn btn-md preset-tonal-primary preset-outlined-primary-800-200 hover:preset-filled-primary-200-800
                     transition
                     "
                 >
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
index 28e9c8c1..f52f9cab 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
@@ -170,7 +170,7 @@ onDestroy(() => {
             transition
             "
         >
-        <span class="fas fa-arrow-left m-1"></span> Back to Meeting List
+        <span class="fas fa-arrow-left m-1 text-neutral-800/80"></span> Back to Meeting List
         <!-- <span class="fas fa-times m-1"></span> View Other Meetings -->
     </a>
 
@@ -193,7 +193,7 @@ onDestroy(() => {
             title="View this Recovery Meeting"
             >
             <!-- <span class="far fa-window-close m-1"></span> -->
-            <span class="fas fa-times m-1"></span>
+            <span class="fas fa-times m-1 text-neutral-800/80"></span>
             Cancel Edit
         </button>
     {:else}
@@ -201,8 +201,11 @@ onDestroy(() => {
         {#if ($ae_loc.trusted_access && $ae_loc.edit_mode) || $lq__event_obj?.external_person_id === $idaa_loc.novi_uuid || $lq__event_obj?.contact_li_json[0].email === $idaa_loc.novi_email}
             <button
                 type="button"
-                class="novi_btn btn btn-warning btn-sm preset-tonal-warning border border-warning-500
-                hover:preset-filled-warning-500 transition"
+                class="
+                    novi_btn
+                    btn btn-sm preset-tonal-warning
+                    hover:preset-filled-warning-500 transition
+                    "
                 onclick={() => {
                     $idaa_sess.recovery_meetings.edit__event_obj = $idaa_slct.event_id;
                     if (log_lvl) {
@@ -211,7 +214,7 @@ onDestroy(() => {
                 }}
                 title="Edit this Recovery Meeting"
                 >
-                <span class="fas fa-edit m-1"></span>
+                <span class="fas fa-edit m-1 text-neutral-800/80"></span>
                 Edit Meeting
             </button>
         {/if}
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 78361824..9a7caa78 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
@@ -668,8 +668,9 @@ $effect(() => {
 <section
     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
+        space-y-2 p-2
+        rounded-md
+        preset-filled-surface-50-950 preset-outlined-warning-400-600
         "
     class:ae_create={!$idaa_slct.event_id}
     bind:clientHeight={$ae_loc.iframe_height_modal_body}
@@ -1506,9 +1507,8 @@ $effect(() => {
         class="
             ae_section event__admin_options
             space-y-1 p-2
-            border rounded
-            preset-filled-warning-100-900
-            preset-outlined-warning-400-600
+            rounded
+            preset-filled-surface-100-900 preset-outlined-error-400-600
             transition
             "
         class:hidden={!$idaa_loc.recovery_meetings.show__admin_options}
@@ -1676,9 +1676,8 @@ $effect(() => {
                 type="submit"
                 disabled={(disable_submit_btn)}
                 class="
-                    novi_btn btn_primary btn-warning
-                    btn
-                    preset-tonal-success hover:preset-filled-success-200-800
+                    novi_btn
+                    btn btn-md preset-tonal-primary preset-outlined-primary-800-200 hover:preset-filled-primary-200-800
                     transition
                     "
                 >
@@ -1722,7 +1721,8 @@ $effect(() => {
             class="
                 novi_btn
                 btn btn-sm
-                preset-filled-warning-400-600 hover:preset-filled-error-200-800
+                preset-tonal-warning preset-outlined-error-800-200 hover:preset-filled-error-200-800
+                transition
                 "
             title="Delete record permanently"
             >
@@ -1738,7 +1738,7 @@ $effect(() => {
             class="
                 novi_btn
                 btn btn-sm
-                preset-filled-warning-200-800 hover:preset-filled-error-200-800
+                preset-tonal-warning preset-outlined-warning-800-200 hover:preset-filled-warning-200-800
                 transition
                 "
             title="Disable record to delete"
@@ -1755,7 +1755,7 @@ $effect(() => {
             class="
                 novi_btn
                 btn btn-sm
-                preset-filled-warning-200-800 hover:preset-filled-error-200-800
+                preset-tonal-warning preset-outlined-warning-800-200 hover:preset-filled-warning-200-800
                 transition
                 "
             title="Hide record to delete"