diff --git a/resources/assets/themes/theme16.scss b/resources/assets/themes/theme16.scss
index 2986f032..92408c04 100644
--- a/resources/assets/themes/theme16.scss
+++ b/resources/assets/themes/theme16.scss
@@ -7,10 +7,10 @@
 
 //== changed Colors
 $gray-dark: #231f20;
-$gray-darker: darken($gray-dark, 15%);
-$gray: lighten($gray-dark, 15%);
-$gray-light: lighten($gray, 15%);
-$gray-lighter: lighten($gray-light, 15%);
+$gray-darker: darken($gray-dark, 20%);
+$gray: lighten($gray-dark, 20%);
+$gray-light: lighten($gray, 20%);
+$gray-lighter: lighten($gray-light, 20%);
 $dark: $gray-dark;
 
 $primary: #fb48c4;
@@ -18,7 +18,7 @@ $secondary: #231f20;
 $success: #3fff21;
 $info: #3dbddf;
 $warning: #f6b345;
-$danger: #e93a44;
+$danger: #991a24;
 
 $text-muted: $gray-light;
 
@@ -117,15 +117,36 @@ $pagination-disabled-border-color: $gray-dark;
 
 // Specials ===================================================================
 
+.bg-success a,
+.bg-primary a,
+.bg-warning a,
+.bg-info a,
+.bg-light a {
+  color: $gray-darker !important;
+}
+
+.bg-body a,
+.bg-danger a,
+.bg-secondary a,
+.bg-dark a {
+  color: $state-danger-text !important;
+}
+
 .bg-primary,
 .bg-success,
-.bg-danger,
 .bg-warning,
 .bg-info,
 .bg-light {
   color: $gray-darker;
 }
 
+.bg-body,
+.bg-danger,
+.bg-secondary,
+.bg-dark {
+  color: $state-danger-text;
+}
+
 .navbar {
   background: rgba(0, 0, 0, 0.7);
   backdrop-filter: blur(6px);
diff --git a/resources/views/pages/questions/overview.twig b/resources/views/pages/questions/overview.twig
index 0b0350fb..0ba1f710 100644
--- a/resources/views/pages/questions/overview.twig
+++ b/resources/views/pages/questions/overview.twig
@@ -71,10 +71,10 @@
                                 {% if question.answer %}
                                     <div class="col-md-11 offset-md-1 mt-3">
                                         <div class="card bg-info">
-                                            <div class="card-body bg-body">
+                                            <div class="card-body bg-body {{ m.type_text_class() }}">
                                                 {{ question.answer|markdown }}
                                             </div>
-                                            <div class="card-footer {% if theme.type =='light' %}bg-light{% else %}bg-dark{% endif %} d-flex align-items-center">
+                                            <div class="card-footer bg-dark d-flex align-items-center {{ m.type_text_class() }}">
                                                 <div class="me-3">
                                                     {{ m.icon('clock') }} {{ question.updated_at.format(__('Y-m-d H:i')) }}
                                                 </div>