diff --git a/phpmyfaq/assets/templates/default/ask.twig b/phpmyfaq/assets/templates/default/ask.twig
index 0f9e32694d..15d631e7f1 100644
--- a/phpmyfaq/assets/templates/default/ask.twig
+++ b/phpmyfaq/assets/templates/default/ask.twig
@@ -31,7 +31,7 @@
     <input type="hidden" name="lang" id="lang" value="{{ lang }}">
 
     <div class="row mb-2">
-      <label class="col-sm-3 form-control-label" for="name">{{ id3_label }}:
+      <label class="col-sm-3 col-form-label" for="name">{{ id3_label }}:
         <span style="color: red"> *</span></label>
       <div class="col-sm-9">
         <input type="text" class="form-control" name="name" id="name" value="{{ defaultContentName }}" required>
@@ -39,7 +39,7 @@
     </div>
 
     <div class="row mb-2">
-      <label class="col-sm-3 form-control-label" for="email">{{ id4_label }}:
+      <label class="col-sm-3 col-form-label" for="email">{{ id4_label }}:
         <span style="color: red"> *</span></label>
       <div class="col-sm-9">
         <input type="email" class="form-control" name="email" id="email" value="{{ defaultContentMail }}" required>
@@ -48,7 +48,7 @@
 
     {% if id5_label is defined %}
     <div class="row mb-2">
-      <label class="col-sm-3 form-control-label" for="category">{{ id5_label }}:
+      <label class="col-sm-3 col-form-label" for="category">{{ id5_label }}:
       {% if id5_required == 'required' %}<span style="color: red"> *</span>{% endif %}
       </label>
       <div class="col-sm-9">
@@ -60,7 +60,7 @@
     {% endif %}
 
     <div class="row mb-2">
-      <label class="col-sm-3 form-control-label" for="question">{{ id6_label }}:
+      <label class="col-sm-3 col-form-label" for="question">{{ id6_label }}:
         <span style="color: red"> *</span></label>
       <div class="col-sm-9">
         <textarea class="form-control" cols="45" rows="5" name="question" id="question" required></textarea>
diff --git a/phpmyfaq/assets/templates/default/index.twig b/phpmyfaq/assets/templates/default/index.twig
index fb63e3158f..ff79ef4ae2 100644
--- a/phpmyfaq/assets/templates/default/index.twig
+++ b/phpmyfaq/assets/templates/default/index.twig
@@ -29,7 +29,7 @@
 </head>
 <body class="pmf-page-wrapper" dir="{{ dir }}">
 
-<nav class="p-3 bg-dark bg-gradient border-bottom">
+<nav class="p-3 text-bg-pmf-nav border-bottom">
   <div class="container">
     <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
       <a href="{{ faqHome }}" id="phpmyfaq-logo" title="{{ header }}"
@@ -115,7 +115,7 @@
   </div>
 </section>
 
-<footer class="pt-4 text-bg-dark bg-gradient">
+<footer class="pt-4 text-bg-pmf-nav">
   <div class="container">
     {% if not isMaintenanceMode %}
     <div class="row">
diff --git a/phpmyfaq/assets/templates/default/startpage.twig b/phpmyfaq/assets/templates/default/startpage.twig
index 5a259a711d..0ac3351f5d 100644
--- a/phpmyfaq/assets/templates/default/startpage.twig
+++ b/phpmyfaq/assets/templates/default/startpage.twig
@@ -11,10 +11,10 @@
 
 <!-- Start page -->
 {% if startPageCategories %}
-<div class="row row-cols-1 row-cols-lg-3 align-items-stretch g-4 py-4">
+<div class="row row-cols-1 row-cols-lg-3 align-items-stretch g-4 py-4 mb-4">
   {% for decks in startPageCategoryDecks %}
     <div class="col">
-      <div class="card card-cover h-100 overflow-hidden text-bg-dark bg-gradient rounded-3 shadow-lg p-1"
+      <div class="card card-cover h-100 overflow-hidden text-bg-light rounded-3 shadow-lg p-1"
       {% if decks['image'] != '' %}
         style="background-size: cover; background-repeat: no-repeat; background-position: center center; background-image: url('{{ decks['image'] }}')"
       {% endif %}
diff --git a/phpmyfaq/assets/themes/default/scss/_theme.scss b/phpmyfaq/assets/themes/default/scss/_theme.scss
index d58ac85971..651fbab78c 100644
--- a/phpmyfaq/assets/themes/default/scss/_theme.scss
+++ b/phpmyfaq/assets/themes/default/scss/_theme.scss
@@ -1,10 +1,13 @@
 $custom-colors: (
-  'light': #f8fafc,
-  'dark': #0f1727,
-  'primary': #ddf247,
-  'secondary': #f7b538,
-  'info': #dce0d9,
-  'success': #64b700,
-  'warning': #ffc67b,
-  'danger': #fb0067,
+  'light': #eceff9,
+  'dark': #060508,
+  'primary': #083c83,
+  'secondary': #1d646a,
+  'info': #40b0ae,
+  'success': #0aa05c,
+  'warning': #e1ca0a,
+  'danger': #f01704,
+  'pmf-nav': #2f3035,
+  'accent2': #3577b3,
+  'accent3': #9eb6c9,
 );
diff --git a/phpmyfaq/src/phpMyFAQ/Tags.php b/phpmyfaq/src/phpMyFAQ/Tags.php
index 42bdd6f3e7..81f1dd7e9e 100644
--- a/phpmyfaq/src/phpMyFAQ/Tags.php
+++ b/phpmyfaq/src/phpMyFAQ/Tags.php
@@ -371,7 +371,7 @@ public function renderTagCloud(): string
             $oLink->itemTitle = $tag['name'];
             $oLink->text = $tag['name'];
             $oLink->tooltip = $title;
-            $oLink->class = 'btn btn-primary mr-1 my-1';
+            $oLink->class = 'btn btn-secondary mr-1 my-1';
             $html .= $oLink->toHtmlAnchor();
             $html .= (count($tags) == $i ? '' : ' ');
         }
