diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
index 86def99f..345e295a 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
@@ -158,10 +158,11 @@ async function handle_update__event_presenter({
     {#if !$lq__event_presenter_obj?.agree}
         <div class="text-center text-error-700-300">
             <div class="">
-                <X size="1.3em" class="text-error-700-300" />
+                <X size="1.3em" class="m-1 text-error-700-300" />
                 Not Yet Agreed
             </div>
-            <div class="rounded-md border border-error-300-700 preset-tonal-error p-4">
+            <div class="rounded-md border border-error-300-700
+                preset-tonal-error p-4">
                 Waiting for agreement to the Guest Speaker Consent and Release
                 and Terms and Conditions before you can move on. Please review
                 and mark as agreed below.
@@ -181,7 +182,7 @@ async function handle_update__event_presenter({
         class="space-y-2 rounded-lg border-2 text-lg p-2"
         class:border-warning-300-700={!$lq__event_presenter_obj?.agree}
         class:preset-filled-surface-400-600={!$lq__event_presenter_obj?.agree}
-        class:border-success-300={$lq__event_presenter_obj?.agree}
+        class:border-success-300-700={$lq__event_presenter_obj?.agree}
         class:preset-tonal-success={$lq__event_presenter_obj?.agree}>
         <!-- Highlight the persons name, email, and that whole line. -->
         <p class="rounded-md p-2 text-lg"
@@ -374,7 +375,8 @@ async function handle_update__event_presenter({
                                         'saved';
                                 });
                     }}
-                    class="btn btn-lg preset-filled-primary-100-900
+                    class="btn btn-lg
+                    preset-filled-primary-100-900
                     preset-outlined-primary-400-600
                     hover:preset-filled-success-400-600 m-2">
                     <Check size="1em" class="m-1 text-orange-500" />
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
index 99e1edf4..84c517c9 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
@@ -128,12 +128,13 @@ async function handle_submit_form(event: SubmitEvent) {
 
 {#if lq__event_session_obj}
     {#if !lq__event_session_obj?.poc_agree}
-        <div class="text-center text-error-500">
-            <div class="text-error-500">
-                <X size="1em" class="m-1 text-error-500" />
+        <div class="text-center text-error-700-300">
+            <div class="">
+                <X size="1.3em" class="m-1 text-error-700-300" />
                 Not Yet Agreed
             </div>
-            <div class="rounded-md border border-error-300 bg-error-100 p-4">
+            <div class="rounded-md border border-error-300-700
+                preset-tonal-error p-4">
                 Waiting for agreement to the {pres_mgmt_loc.current.label__session_poc_name} Consent and Release and Terms and Conditions
                 before you can move on. Please review and mark as agreed below.
             </div>
@@ -149,13 +150,13 @@ async function handle_submit_form(event: SubmitEvent) {
     </div>
 
     <section
-        class="space-y-2 rounded-md border text-lg"
-        class:border-error-300={!lq__event_session_obj?.poc_agree}
-        class:bg-error-100={!lq__event_session_obj?.poc_agree}
-        class:border-success-300={lq__event_session_obj?.poc_agree}
-        class:bg-success-100={lq__event_session_obj?.poc_agree}>
+        class="space-y-2 rounded-lg border-2 text-lg p-2"
+        class:border-warning-300-700={!lq__event_session_obj?.poc_agree}
+        class:preset-filled-surface-400-600={!lq__event_session_obj?.poc_agree}
+        class:border-success-300-700={lq__event_session_obj?.poc_agree}
+        class:preset-tonal-success={lq__event_session_obj?.poc_agree}>
         <!-- Highlight the persons name, email, and that whole line. -->
-        <p class="rounded-t-md p-2 text-lg"
+        <p class="rounded-md p-2 text-lg"
            class:preset-tonal-warning={!lq__event_session_obj?.poc_agree}
            class:preset-tonal-success={lq__event_session_obj?.poc_agree}>
             {#if lq__event_session_obj?.poc_agree}
@@ -246,8 +247,10 @@ async function handle_submit_form(event: SubmitEvent) {
                         onclick={() => {
                             console.log('*** Save button clicked ***');
                         }}
-                        class="btn btn-md preset-tonal-warning border-warning-500 hover:preset-filled-secondary-500 m-2 border">
-                        <Check size="1em" class="m-1 text-orange-500" />
+                        class="btn btn-md
+                        preset-filled-secondary-50-950 preset-outlined-secondary-300-700
+                        hover:preset-filled-secondary-400-600 m-2">
+                        <Check size="1em" class="m-1 text-orange-700-300" />
                         Save Opt-Out?
 
                         {#await ae_promises.update__event_session_obj__opt_out}
@@ -337,7 +340,10 @@ async function handle_submit_form(event: SubmitEvent) {
                                         'saved';
                                 });
                     }}
-                    class="btn btn-lg preset-tonal-primary border-primary-500 hover:preset-filled-success-500 m-2 border">
+                    class="btn btn-lg
+                    preset-filled-primary-100-900
+                    preset-outlined-primary-400-600
+                    hover:preset-filled-success-400-600 m-2">
                     <Check size="1em" class="m-1 text-orange-500" />
                     Mark as agreed?