diff --git a/src/plugins/modal/styles/_modal.scss b/src/plugins/modal/styles/_modal.scss
index 861f52a987..eb922a8677 100644
--- a/src/plugins/modal/styles/_modal.scss
+++ b/src/plugins/modal/styles/_modal.scss
@@ -44,8 +44,8 @@ $prefix: 'converse-';
                 }
                 &:hover {
                     .nav-link {
-                        color: var(--foreground);
-                        background-color: var(--primary-color-light);
+                        color: var(--focus-color);
+                        background-color: var(--background);
                         &.active {
                             color: var(--background);
                             background-color: var(--primary-color);
diff --git a/src/shared/styles/_core.scss b/src/shared/styles/_core.scss
index a5981374fb..5c41b6bbc0 100644
--- a/src/shared/styles/_core.scss
+++ b/src/shared/styles/_core.scss
@@ -5,7 +5,7 @@
     direction: ltr;
 
     .flyout {
-      position: absolute;
+        position: absolute;
     }
 
     .img-thumbnail {
@@ -22,17 +22,17 @@
     }
 
     .close {
-      color: var(--close-color);
-      text-shadow: none;
+        color: var(--close-color);
+        text-shadow: none;
 
-      &:hover {
-        color: var(--close-color-hover);
-      }
+        &:hover {
+            color: var(--close-color-hover);
+        }
     }
 
     .no-scrolling {
-      overflow-x: none;
-      overflow-y: none;
+        overflow-x: none;
+        overflow-y: none;
     }
 
     converse-brand-heading {
@@ -46,60 +46,60 @@
         font-family: var(--branding-font);
         color: var(--link-color);
 
-      .brand-name-wrapper {
-        display: flex;
-        white-space: nowrap;
-        margin: auto;
-      }
-
-      .brand-name {
-          color: var(--link-color);
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          margin-top: -0.25em;
-
-          .byline {
-              font-family: var(--heading-font);
-              font-size: 0.3em;
-              margin-bottom: 0.75em;
-              margin-left: -2.7em;
-              opacity: 0.55;
-              word-spacing: 5px;
-          }
-      }
-
-      .brand-subtitle {
-          color: var(--text-color);
-      }
-
-      .brand-name__text {
-          font-size: 120%;
-          vertical-align: text-bottom;
-      }
-
-      .converse-svg-logo {
-          color: var(--link-color);
-          height: 1.5em;
-          margin-right: 0.25em;
-          margin-bottom: -0.25em;
-          .cls-1 {
-              isolation: isolate;
-          }
-          .cls-2 {
-              opacity: 0.5;
-              mix-blend-mode: multiply;
-          }
-          .cls-3 {
-              fill: var(--link-color);
-          }
-          .cls-4 {
-              fill: var(--link-color);
-          }
-      }
-  }
-
-  .brand-heading--inverse {
+        .brand-name-wrapper {
+            display: flex;
+            white-space: nowrap;
+            margin: auto;
+        }
+
+        .brand-name {
+            color: var(--link-color);
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            margin-top: -0.25em;
+
+            .byline {
+                font-family: var(--heading-font);
+                font-size: 0.3em;
+                margin-bottom: 0.75em;
+                margin-left: -2.7em;
+                opacity: 0.55;
+                word-spacing: 5px;
+            }
+        }
+
+        .brand-subtitle {
+            color: var(--text-color);
+        }
+
+        .brand-name__text {
+            font-size: 120%;
+            vertical-align: text-bottom;
+        }
+
+        .converse-svg-logo {
+            color: var(--link-color);
+            height: 1.5em;
+            margin-right: 0.25em;
+            margin-bottom: -0.25em;
+            .cls-1 {
+                isolation: isolate;
+            }
+            .cls-2 {
+                opacity: 0.5;
+                mix-blend-mode: multiply;
+            }
+            .cls-3 {
+                fill: var(--link-color);
+            }
+            .cls-4 {
+                fill: var(--link-color);
+            }
+        }
+    }
+
+    .brand-heading--inverse {
         .converse-svg-logo {
             margin-bottom: 0em;
             margin-top: -0.2em;
@@ -114,28 +114,12 @@
         }
     }
 
-    ::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-        color: var(--subdued-color);
-    }
-    ::-moz-placeholder { /* Firefox 19+ */
-        color: var(--subdued-color);
-    }
-    :-ms-input-placeholder { /* IE 10+ */
-        color: var(--subdued-color);
-    }
-    :-moz-placeholder { /* Firefox 18- */
-        color: var(--subdued-color);
-    }
     ::placeholder {
         color: var(--subdued-color);
     }
-
     ::selection {
         background-color: var(--highlight-color);
     }
-    ::-moz-selection {
-        background-color: var(--highlight-color);
-    }
 
     @media screen and (max-width: $mobile-portrait-length) {
         margin: 0;
@@ -150,15 +134,24 @@
         bottom: 5px;
     }
 
-    h1, h2, h3, h4, h5, h6 {
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
         color: var(--header-color);
     }
 
-    ul li { height: auto; }
+    ul li {
+        height: auto;
+    }
 
     textarea,
-    input[type=submit], input[type=button],
-    input[type=text], input[type=password],
+    input[type='submit'],
+    input[type='button'],
+    input[type='text'],
+    input[type='password'],
     button {
         font-size: var(--font-size);
         min-height: 0;
@@ -172,20 +165,26 @@
         font-style: italic;
     }
 
-    ol, ul {
+    ol,
+    ul {
         list-style: none;
     }
 
-    ul, ol, dl {
+    ul,
+    ol,
+    dl {
         font: inherit;
         margin: 0;
     }
 
     a {
-      cursor: pointer;
+        cursor: pointer;
     }
 
-    a, a:visited, a:not([href]):not([tabindex]), .clickable {
+    a,
+    a:visited,
+    a:not([href]):not([tabindex]),
+    .clickable {
         text-decoration: none;
         color: var(--link-color);
         text-shadow: none;
@@ -196,7 +195,9 @@
             text-shadow: none;
         }
 
-        &.fa, &.far, &.fas {
+        &.fa,
+        &.far,
+        &.fas {
             color: var(--subdued-color);
             &:hover {
                 color: var(--icon-hover-color);
@@ -214,15 +215,17 @@
         border-radius: var(--chatbox-border-radius);
     }
 
-    .fa, .far, .fas {
+    .fa,
+    .far,
+    .fas {
         color: var(--subdued-color);
     }
 
     q {
-      quotes: "“" "”" "‘" "’";
-      &.reason {
-        display: inline;
-      }
+        quotes: '“' '”' '‘' '’';
+        &.reason {
+            display: inline;
+        }
     }
     q:before {
         content: open-quote;
@@ -249,49 +252,109 @@
     }
 
     @keyframes colorchange-chatmessage {
-        0%   {background-color: rgba(141, 216, 174, 1);}
-        25%  {background-color: rgba(141, 216, 174, 0.75);}
-        50%  {background-color: rgba(141, 216, 174, 0.5);}
-        75%  {background-color: rgba(141, 216, 174, 0.25);}
-        100% {background-color: transparent;}
+        0% {
+            background-color: rgba(141, 216, 174, 1);
+        }
+        25% {
+            background-color: rgba(141, 216, 174, 0.75);
+        }
+        50% {
+            background-color: rgba(141, 216, 174, 0.5);
+        }
+        75% {
+            background-color: rgba(141, 216, 174, 0.25);
+        }
+        100% {
+            background-color: transparent;
+        }
     }
     @-webkit-keyframes colorchange-chatmessage {
-        0%   {background-color: rgba(141, 216, 174, 1);}
-        25%  {background-color: rgba(141, 216, 174, 0.75);}
-        50%  {background-color: rgba(141, 216, 174, 0.5);}
-        75%  {background-color: rgba(141, 216, 174, 0.25);}
-        100% {background-color: transparent;}
+        0% {
+            background-color: rgba(141, 216, 174, 1);
+        }
+        25% {
+            background-color: rgba(141, 216, 174, 0.75);
+        }
+        50% {
+            background-color: rgba(141, 216, 174, 0.5);
+        }
+        75% {
+            background-color: rgba(141, 216, 174, 0.25);
+        }
+        100% {
+            background-color: transparent;
+        }
     }
 
     @keyframes colorchange-chatmessage-muc {
-        0%   {background-color: rgba(255, 181, 162, 1);}
-        25%  {background-color: rgba(255, 181, 162, 0.75);}
-        50%  {background-color: rgba(255, 181, 162, 0.5);}
-        75%  {background-color: rgba(255, 181, 162, 0.25);}
-        100% {background-color: transparent;}
+        0% {
+            background-color: rgba(255, 181, 162, 1);
+        }
+        25% {
+            background-color: rgba(255, 181, 162, 0.75);
+        }
+        50% {
+            background-color: rgba(255, 181, 162, 0.5);
+        }
+        75% {
+            background-color: rgba(255, 181, 162, 0.25);
+        }
+        100% {
+            background-color: transparent;
+        }
     }
     @-webkit-keyframes colorchange-chatmessage-muc {
-        0%   {background-color: rgba(255, 181, 162, 1);}
-        25%  {background-color: rgba(255, 181, 162, 0.75);}
-        50%  {background-color: rgba(255, 181, 162, 0.5);}
-        75%  {background-color: rgba(255, 181, 162, 0.25);}
-        100% {background-color: transparent;}
+        0% {
+            background-color: rgba(255, 181, 162, 1);
+        }
+        25% {
+            background-color: rgba(255, 181, 162, 0.75);
+        }
+        50% {
+            background-color: rgba(255, 181, 162, 0.5);
+        }
+        75% {
+            background-color: rgba(255, 181, 162, 0.25);
+        }
+        100% {
+            background-color: transparent;
+        }
     }
     @keyframes fadein {
-        0% { opacity: 0 }
-        100% { opacity: 1 }
+        0% {
+            opacity: 0;
+        }
+        100% {
+            opacity: 1;
+        }
     }
     @-webkit-keyframes fadein {
-        0% { opacity: 0 }
-        100% { opacity: 1 }
+        0% {
+            opacity: 0;
+        }
+        100% {
+            opacity: 1;
+        }
     }
     @-webkit-keyframes fadeOut {
-        0% { opacity: 1; visibility: visible; }
-        100% { opacity: 0; visibility: hidden;  }
+        0% {
+            opacity: 1;
+            visibility: visible;
+        }
+        100% {
+            opacity: 0;
+            visibility: hidden;
+        }
     }
     @keyframes fadeOut {
-        0% { opacity: 1; visibility: visible; }
-        100% { opacity: 0; visibility: hidden;  }
+        0% {
+            opacity: 1;
+            visibility: visible;
+        }
+        100% {
+            opacity: 0;
+            visibility: hidden;
+        }
     }
 
     .fade-in {
@@ -299,7 +362,7 @@
     }
 
     .visible {
-        opacity:0;  /* make things invisible upon start */
+        opacity: 0; /* make things invisible upon start */
         animation-name: fadein;
         animation-fill-mode: forwards;
         animation-duration: 500ms;
@@ -328,8 +391,7 @@
         padding-right: 22px;
     }
 
-
-    @keyframes spin  {
+    @keyframes spin {
         from {
             transform: rotate(0deg);
         }
@@ -388,6 +450,10 @@
         font-size: 90%;
     }
 
+	.nav {
+		--converse-nav-link-color: var(--primary-color);
+        --converse-nav-link-hover-color: var(--focus-color);
+	}
     .nav-pills .nav-link.active,
     .nav-pills .show > .nav-link {
         background-color: var(--primary-color);
@@ -396,12 +462,12 @@
 
 @media screen and (max-width: 575px) {
     body {
-      .converse-brand {
-        font-size: 3.75em;
-      }
+        .converse-brand {
+            font-size: 3.75em;
+        }
     }
-    .conversejs:not(.converse-embedded)  {
-        .chatbox  {
+    .conversejs:not(.converse-embedded) {
+        .chatbox {
             .chat-body {
                 border-radius: var(--chatbox-border-radius);
             }
@@ -412,7 +478,6 @@
     }
 }
 
-
 @media screen and (min-width: 576px) {
     .conversejs .offset-sm-2 {
         margin-left: 16.666667%;
@@ -440,7 +505,7 @@
     }
 }
 @media screen and (max-height: 450px) {
-  .conversejs {
-    left: 0;
-  }
+    .conversejs {
+        left: 0;
+    }
 }
diff --git a/src/shared/styles/themes/classic.scss b/src/shared/styles/themes/classic.scss
index 6379511568..203decfed8 100644
--- a/src/shared/styles/themes/classic.scss
+++ b/src/shared/styles/themes/classic.scss
@@ -85,7 +85,7 @@ converse-root.theme-classic {
 	--disabled-color-bg: lightgray;
 	--disabled-color: gray;
 	--error-color: var(--dark-red);
-	--focus-color: var(--background);
+	--focus-color: var(--dark-link-color);
 	--fullpage-chat-height: calc(var(--vh, 1vh) * 100);
 	--fullpage-chat-width: 100%;
 	--fullpage-chatbox-button-size: 16px;
diff --git a/src/shared/styles/themes/cyberpunk.scss b/src/shared/styles/themes/cyberpunk.scss
index f2407ba8b2..87615306bc 100644
--- a/src/shared/styles/themes/cyberpunk.scss
+++ b/src/shared/styles/themes/cyberpunk.scss
@@ -106,7 +106,7 @@ converse-root.theme-cyberpunk {
 	--headlines-head-fg-color: var(--headlines-color);
 	--headlines-head-text-color: var(--headlines-color);
 	--highlight-color-darker: var(--comment);
-	--highlight-color: var(--foreground);
+	--highlight-color: var(--background);
 	--icon-hover-color: var(--cyan);
 	--img-thumbnail-background-color: var(--comment);
 	--img-thumbnail-border-color: black;
@@ -155,9 +155,6 @@ converse-root.theme-cyberpunk {
 	.card {
 		--converse-card-border-color: var(--comment);
 	}
-	.nav {
-		--converse-nav-link-color: var(--primary-color);
-	}
 
 	#controlbox {
 		.flyout {
diff --git a/src/shared/styles/themes/dracula.scss b/src/shared/styles/themes/dracula.scss
index 42285d9087..254b3fd88b 100644
--- a/src/shared/styles/themes/dracula.scss
+++ b/src/shared/styles/themes/dracula.scss
@@ -86,7 +86,7 @@ converse-root.theme-dracula {
     --disabled-color: var(--comment);
     --error-color: var(--red);
     --error-color: var(--red);
-    --focus-color: var(--comment);
+    --focus-color: var(--pink);
     --global-background-color: var(--background);
     --gray-color: var(--current-line);
     --groupchats-header-color-dark: var(--muc-color);
@@ -101,7 +101,7 @@ converse-root.theme-dracula {
     --headlines-head-fg-color: var(--headlines-color);
     --headlines-head-text-color: var(--headlines-color);
     --highlight-color-darker: var(--comment);
-    --highlight-color: var(--foreground);
+    --highlight-color: var(--background);
     --icon-hover-color: var(--cyan);
     --img-thumbnail-background-color: var(--comment);
     --img-thumbnail-border-color: black;