diff --git a/src/common/Home.scss b/src/common/Home.scss
index 775de88f..c8a00d35 100644
--- a/src/common/Home.scss
+++ b/src/common/Home.scss
@@ -36,6 +36,6 @@
 
 .home__servers-container {
   @media (min-width: $mdMin) {
-    border-left: 1px solid rgba(0, 0, 0, .125);
+    border-left: 1px solid var(--border-color);
   }
 }
diff --git a/src/index.scss b/src/index.scss
index 8926936a..cbc87b15 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -34,6 +34,7 @@ body,
 .card {
   box-shadow: 0 .125rem .25rem rgba(0, 0, 0, .075);
   background-color: var(--primary-color);
+  border-color: var(--border-color);
 }
 
 .list-group {
@@ -57,7 +58,9 @@ body,
 .page-link,
 .page-link:hover,
 .page-item.disabled .page-link,
-.dropdown-divider {
+.dropdown-divider,
+.dropdown-menu,
+.list-group-item {
   border-color: var(--border-color);
 }
 
diff --git a/src/servers/ServersListGroup.scss b/src/servers/ServersListGroup.scss
index e51a58b6..9a0709f0 100644
--- a/src/servers/ServersListGroup.scss
+++ b/src/servers/ServersListGroup.scss
@@ -29,7 +29,7 @@
 
 .servers-list__list-group--embedded.servers-list__list-group--embedded {
   border-radius: 0;
-  border-top: 1px solid rgba(0, 0, 0, .125);
+  border-top: 1px solid var(--border-color);
 
   @media (min-width: $mdMin) {
     max-height: 220px;
@@ -40,6 +40,6 @@
 
   .servers-list__server-item {
     border: none;
-    border-bottom: 1px solid rgba(0, 0, 0, .125);
+    border-bottom: 1px solid var(--border-color);
   }
 }
diff --git a/src/theme/theme.scss b/src/theme/theme.scss
index 3b7b8d57..aadcaf27 100644
--- a/src/theme/theme.scss
+++ b/src/theme/theme.scss
@@ -19,8 +19,8 @@ $darkPrimaryColor: #161b22;
 $darkPrimaryColorAlfa: rgba($darkPrimaryColor, .7);
 $darkSecondaryColor: #0f131a;
 $darkTextColor: rgb(201, 209, 217);
-$darkBorderColor: rgba(0, 0, 0, .2);
-$darkTableBorderColor: #12161b;
+$darkBorderColor: rgba(255, 255, 255, .15);
+$darkTableBorderColor: #393d43;
 $darkActiveColor: $darkSecondaryColor;
 $darkBrandColor: #0b2d4e;
 $darkInputColor: darken($darkPrimaryColor, 2%);