diff --git a/epicyon-follow.css b/epicyon-follow.css
index 3c8933fbf..f2db73252 100644
--- a/epicyon-follow.css
+++ b/epicyon-follow.css
@@ -2,6 +2,7 @@
 
 :root {
     --main-bg-color: #282c37;
+    --link-bg-color: #282c37;
     --main-fg-color: #dddddd;
     --main-link-color: #999;
     --main-visited-color: #888;
@@ -46,11 +47,13 @@ a, u {
 
 a:visited{
     color: var(--main-visited-color);
+    background: var(--link-bg-color);
     font-weight: bold;
 }
 
 a:link {
     color: var(--main-link-color);
+    background: var(--link-bg-color);
     font-weight: bold;
 }
 
@@ -83,12 +86,14 @@ a:link {
     font-size: var(--font-size4);
     font-family: Arial, Helvetica, sans-serif;
     color: var(--main-link-color);
+    background: var(--link-bg-color);
 }
 
 .pgp {
     font-size: var(--font-size5);
     font-family: Arial, Helvetica, sans-serif;
     color: var(--main-link-color);
+    background: var(--link-bg-color);
     font-family: 'monospace';
 }
 
diff --git a/epicyon-login.css b/epicyon-login.css
index bee789ae3..c0279dc8b 100644
--- a/epicyon-login.css
+++ b/epicyon-login.css
@@ -7,6 +7,7 @@
     --main-link-color: #999;
     --main-visited-color: #888;
     --border-color: #505050;
+    --border-width: 2px;
     --font-size-header: 18px;
     --font-color-header: #ccc;
     --font-size: 22px;
@@ -58,7 +59,7 @@ a:link {
 }
 
 form {
-    border: 3px solid var(--border-color);
+    border: var(--border-width) solid var(--border-color);
     border-radius: var(--form-border-radius);
 }
 
diff --git a/epicyon-profile.css b/epicyon-profile.css
index ef5d7e2cf..b79ef5712 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -13,6 +13,7 @@
     --main-link-color: #999;
     --main-visited-color: #888;
     --border-color: #505050;
+    --border-width: 2px;
     --font-size-header: 18px;
     --font-color-header: #ccc;
     --font-size-button-mobile: 34px;
@@ -274,7 +275,7 @@ a:link {
 }
 
 .container {
-    border: 2px solid var(--border-color);
+    border: var(--border-width) solid var(--border-color);
     background-color: var(--main-bg-color);
     border-radius: var(--timeline-border-radius);
     padding: 20px;
diff --git a/epicyon-suspended.css b/epicyon-suspended.css
index 361d0b6df..550fa7c87 100644
--- a/epicyon-suspended.css
+++ b/epicyon-suspended.css
@@ -2,6 +2,7 @@
 
 :root {
     --main-bg-color: #282c37;
+    --link-bg-color: #282c37;
     --main-bg-color-darker: #232c37;
     --main-bg-color-report: #221c27;
     --main-header-color-roles: #282237;
@@ -46,11 +47,13 @@ a, u {
 
 a:visited{
     color: var(--main-visited-color);
+    background: var(--link-bg-color);
     font-weight: bold;
 }
 
 a:link {
     color: var(--main-link-color);
+    background: var(--link-bg-color);
     font-weight: bold;
 }
 
diff --git a/theme.py b/theme.py
index dbf2ae3b8..9a77503a3 100644
--- a/theme.py
+++ b/theme.py
@@ -171,11 +171,12 @@ def setThemeLCD(baseDir: str):
     themeParams = {
         "main-bg-color": "#9fb42b",
         "link-bg-color": "#33390d",
-        "main-bg-color-reply": "#1a142d",
+        "main-bg-color-reply": "#9fb42b",
         "main-bg-color-report": "#12152d",
         "main-header-color-roles": "#1f192d",
         "main-fg-color": "#33390d",
         "border-color": "#33390d",
+        "border-width": "5px",
         "main-link-color": "#9fb42b",
         "main-visited-color": "#9fb42b",
         "button-selected": "#01b82b",