diff --git a/src/app.css b/src/app.css
index d331a2fa..c3d7d8a7 100644
--- a/src/app.css
+++ b/src/app.css
@@ -879,23 +879,56 @@ img.qr_code:focus {
 /* BEGIN: Overrides and fixes specific to Novi and IDAA */
 .iframe .novi_btn {
     border-radius: 60px;
-    border-color: hsla(0, 0%, 50%, .5);
+    /* border-color: hsla(0, 0%, 50%, .5); */
+    /* border-color: hsla(0, 0%, 0%, .15); */
 
 
 }
 
-.iframe .novi_label {
+.iframe .dark .novi_label {
     color: white;
 }
 
-.iframe .novi_black {
+.iframe .dark .novi_black {
     color: black;
 }
 
-.iframe .novi_white {
+.iframe .dark .novi_white {
     color: white;
 }
 
+.iframe .dark .novi_bg_black {
+    background-color: black;
+}
+
+.iframe .dark .novi_bg_white {
+    background-color: white;
+}
+
+.iframe .dark .novi_bg_gray {
+    background-color: hsla(0, 0%, 50%, 1);
+}
+
+.iframe .dark .novi_bg_light_gray {
+    background-color: hsla(0, 0%, 95%, 1);
+}
+.iframe .dark .novi_bg_dark_gray {
+    background-color: hsla(0, 0%, 20%, 1);
+}
+
+
+
+.iframe .novi_bg_light {
+    background-color: hsla(0, 0%, 0%, .15);
+    color: hsla(0, 0%, 20%, 1);
+}
+.iframe .novi_bg_dark {
+    background-color: hsla(0, 0%, 0%, .25);
+    color: hsla(0, 0%, 95%, 1);
+}
+
+
+
 .iframe .novi_margin_sm {
     /* margin: 0.5em; */
 }
diff --git a/src/lib/e_app_help_tech.svelte b/src/lib/e_app_help_tech.svelte
index 4fd2be3d..4802cc6d 100644
--- a/src/lib/e_app_help_tech.svelte
+++ b/src/lib/e_app_help_tech.svelte
@@ -280,6 +280,7 @@ function send_help_tech_email() {
                     >
                     <h4
                         class="
+                            novi_white
                             text-base font-semibold text-gray-800 dark:text-gray-200
                             flex flex-row gap-1 items-center justify-center
                             "
@@ -374,8 +375,7 @@ function send_help_tech_email() {
             onclick={() => ($ae_sess.show_help_tech = true)}
             class="
                 btn btn-sm
-                preset-tonal-surface
-                preset-outlined-warning-600-400
+                border border-blue-400 dark:border-blue-600
                 transition-all
                 {btn_class}
                 {show_btn_class}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index d38a7837..650c80b3 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -386,13 +386,13 @@ if ($ae_loc?.site_cfg_json?.theme_name) {
 if ($ae_loc?.site_cfg_json?.theme_mode) {
     $ae_loc.theme_mode = $ae_loc.site_cfg_json.theme_mode;
 
-    if (browser && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-        $ae_loc.theme_mode = 'dark';
-    } else {
-        $ae_loc.theme_mode = 'light';
-    }
+    // $ae_loc.theme_mode = 'dark';
+}
 
+if (browser && window.matchMedia('(prefers-color-scheme: dark)').matches) {
     $ae_loc.theme_mode = 'dark';
+} else {
+    $ae_loc.theme_mode = 'light';
 }
 
 
diff --git a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_view.svelte b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_view.svelte
index ab66f2c1..6265bee9 100644
--- a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_view.svelte
+++ b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_view.svelte
@@ -254,7 +254,11 @@ $effect(() => {
                     $idaa_sess.bb.show__inline_edit__post_comment_id = true;
                 }
             }}
-            class="novi_btn btn btn-md preset-tonal-secondary border border-secondary-500 hover:preset-filled-secondary-500 transition"
+            class="
+                novi_btn btn-primary
+                btn btn-md preset-tonal-secondary
+                border border-secondary-500 hover:preset-filled-secondary-500
+                transition-all"
             title={`New comment on: ${$lq__post_obj?.title}`}
             >
             <span class="fas fa-plus m-1"></span> New Comment
diff --git a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_options.svelte b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_options.svelte
index a5cb0fcd..f6dfad9f 100644
--- a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_options.svelte
+++ b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_options.svelte
@@ -30,14 +30,18 @@ if (log_lvl) console.log('** Component Loaded: ** Post Options');
 </script>
 
 
-
+<!-- preset-filled-surface-500 -->
+<!-- text-white -->
 <div
     class="
         ae_section ae_options filters_and_search
+        novi_bg_light
         flex flex-row flex-wrap gap-1
         items-center justify-center
         my-2 p-2 border rounded-md
-        bg-gray-200 border-gray-300 dark:bg-gray-800 dark:border-gray-700
+
+        preset-outlined-surface-800-200
+
         w-full max-w-4xl
         m-auto
         "
@@ -252,10 +256,8 @@ if (log_lvl) console.log('** Component Loaded: ** Post Options');
         e_class=""
         e_class_form_hidden="float-right"
         e_class_form_showing="inline-block"
-        btn_class="novi_btn novi_white"
-        show_btn_class=""
-
-
+        btn_class="novi_btn"
+        show_btn_class="btn-info"
         additional_kv={{
             'novi_uuid': $idaa_loc.novi_uuid,
             'novi_email': $idaa_loc.novi_email,
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
index 1186a781..f68abc4f 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
@@ -452,14 +452,15 @@ function add_activity_log(
 
     />
 
+<!-- preset-filled-surface-100-900  -->
 <Element_data_store
     ds_code="recovery_meetings_info"
     ds_type="html"
     class_li="
         rounded-lg
-        preset-filled-surface-100-900 preset-outlined-surface-200-800
+        preset-outlined-surface-200-800
         m-auto p-2 space-y-2
-        w-full max-w-(--breakpoint-lg)
+        w-full max-w-xl
         "
     show_edit_btn={true}
     />
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 642f23cd..037268e8 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
@@ -212,12 +212,13 @@ function preventDefault(fn) {
 </script>
 
 
+<!-- preset-filled-surface-200-800 -->
 <section
     class="
         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
+        preset-outlined-surface-300-700
         rounded-lg
         d-flex
         align-items-center justify-content-center