diff --git a/kdb-web/src/styles/themes/default-dark-theme.scss b/kdb-web/src/styles/themes/default-dark-theme.scss
index 1a3bd5d178..8a5b60fae4 100644
--- a/kdb-web/src/styles/themes/default-dark-theme.scss
+++ b/kdb-web/src/styles/themes/default-dark-theme.scss
@@ -15,16 +15,9 @@
     $primaryErrorColor: #b00020;
     $secondaryErrorColor: #e94948;
 
-    $default-border: 1px solid $secondaryBackgroundColor3;
+    $default-border: 2px solid $secondaryBackgroundColor3;
 
-    background-color: $primaryBackgroundColor !important;
-
-    html,
-    body {
-        margin: 0;
-
-        font-size: 16px;
-    }
+    background-color: $primaryBackgroundColor;
 
     h1,
     h2 {
@@ -122,6 +115,35 @@
                         .content-divider {
                             border-bottom: $default-border;
                         }
+
+                        .server-list-wrapper {
+                            .server-filter {
+                            }
+
+                            .server-count {
+                            }
+
+                            .server-list {
+                                .server {
+                                    border: $default-border;
+                                    border-radius: 15px;
+
+                                    .logo {
+                                        img {
+                                            border-radius: 100%;
+                                        }
+                                    }
+
+                                    .name {
+                                        color: $primaryHeaderColor;
+                                    }
+
+                                    &:hover {
+                                        border-color: $primaryHeaderColor !important;
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             }
@@ -228,28 +250,43 @@
         stroke: $primaryHeaderColor !important;
     }
 
-    .p-menu {
+    .p-menu,
+    .p-panelmenu {
         color: $primaryTextColor !important;
 
         .p-menuitem-link .p-menuitem-text,
-        .p-menuitem-link .p-menuitem-icon {
+        .p-menuitem-link .p-menuitem-icon,
+        .p-panelmenu-header > a {
             color: $primaryTextColor !important;
+            background: transparent !important;
+            font-size: 1rem !important;
+            font-weight: normal !important;
         }
 
-        .p-menuitem-link:focus {
+        .p-menuitem-link:focus,
+        .p-panelmenu-header > a:focus,
+        .p-panelmenu-content .p-menuitem .p-menuitem-link:focus {
             box-shadow: none !important;
         }
 
-        .p-menuitem-link:hover {
+        .p-menuitem-link:hover,
+        .p-panelmenu-header > a:hover,
+        .p-panelmenu-content .p-menuitem .p-menuitem-link:hover {
             background-color: $secondaryBackgroundColor !important;
             $border-radius: 20px;
             border-radius: $border-radius 0px 0px $border-radius;
 
             .p-menuitem-text,
-            .p-menuitem-icon {
+            .p-menuitem-icon,
+            .p-menuitem-text,
+            .p-panelmenu-icon {
                 color: $primaryHeaderColor !important;
             }
         }
+
+        .p-panelmenu-content {
+            margin: 5px 0px 5px 10px;
+        }
     }
 
     .p-menu-overlay {
@@ -388,6 +425,9 @@
 
     input,
     .p-password {
+        border-radius: 10px;
+        border: $default-border;
+
         &:focus {
             box-shadow: none !important;
         }
diff --git a/kdb-web/src/styles/themes/default-light-theme.scss b/kdb-web/src/styles/themes/default-light-theme.scss
index 5993a05808..bc58a6f7a0 100644
--- a/kdb-web/src/styles/themes/default-light-theme.scss
+++ b/kdb-web/src/styles/themes/default-light-theme.scss
@@ -15,14 +15,9 @@
     $primaryErrorColor: #b00020;
     $secondaryErrorColor: #e94948;
 
-    $default-border: 1px solid $secondaryBackgroundColor;
+    $default-border: 2px solid $secondaryBackgroundColor;
 
-    html,
-    body {
-        margin: 0;
-
-        font-size: 16px;
-    }
+    background-color: $primaryBackgroundColor;
 
     h1,
     h2 {
@@ -120,6 +115,35 @@
                         .content-divider {
                             border-bottom: $default-border;
                         }
+
+                        .server-list-wrapper {
+                            .server-filter {
+                            }
+
+                            .server-count {
+                            }
+
+                            .server-list {
+                                .server {
+                                    border: $default-border;
+                                    border-radius: 15px;
+
+                                    .logo {
+                                        img {
+                                            border-radius: 100%;
+                                        }
+                                    }
+
+                                    .name {
+                                        color: $primaryHeaderColor;
+                                    }
+
+                                    &:hover {
+                                        border-color: $primaryHeaderColor !important;
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             }
@@ -226,28 +250,43 @@
         stroke: $primaryHeaderColor !important;
     }
 
-    .p-menu {
+    .p-menu,
+    .p-panelmenu {
         color: $primaryTextColor !important;
 
         .p-menuitem-link .p-menuitem-text,
-        .p-menuitem-link .p-menuitem-icon {
+        .p-menuitem-link .p-menuitem-icon,
+        .p-panelmenu-header > a {
             color: $primaryTextColor !important;
+            background: transparent !important;
+            font-size: 1rem !important;
+            font-weight: normal !important;
         }
 
-        .p-menuitem-link:focus {
+        .p-menuitem-link:focus,
+        .p-panelmenu-header > a:focus,
+        .p-panelmenu-content .p-menuitem .p-menuitem-link:focus {
             box-shadow: none !important;
         }
 
-        .p-menuitem-link:hover {
+        .p-menuitem-link:hover,
+        .p-panelmenu-header > a:hover,
+        .p-panelmenu-content .p-menuitem .p-menuitem-link:hover {
             background-color: $secondaryBackgroundColor !important;
             $border-radius: 20px;
             border-radius: $border-radius 0px 0px $border-radius;
-            
+
             .p-menuitem-text,
-            .p-menuitem-icon {
+            .p-menuitem-icon,
+            .p-menuitem-text,
+            .p-panelmenu-icon {
                 color: $primaryHeaderColor !important;
             }
         }
+
+        .p-panelmenu-content {
+            margin: 5px 0px 5px 10px;
+        }
     }
 
     .p-menu-overlay {
@@ -386,6 +425,9 @@
 
     input,
     .p-password {
+        border-radius: 10px;
+        border: $default-border;
+
         &:focus {
             box-shadow: none !important;
         }
@@ -430,7 +472,7 @@
         color: $primaryTextColor !important;
         border: 0 !important;
         padding: 0px !important;
-        
+
         &:hover {
             background-color: transparent !important;
             color: $primaryHeaderColor !important;
diff --git a/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss b/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
index 6e0d8eb0d6..9e45019f04 100644
--- a/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
+++ b/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
@@ -17,7 +17,7 @@
 
     $default-border: 2px solid $secondaryBackgroundColor3;
 
-    background-color: $primaryBackgroundColor !important;
+    background-color: $primaryBackgroundColor;
 
     h1,
     h2 {
diff --git a/kdb-web/src/styles/themes/sh-edraft-light-theme.scss b/kdb-web/src/styles/themes/sh-edraft-light-theme.scss
index fdd809491c..26c70cd5d0 100644
--- a/kdb-web/src/styles/themes/sh-edraft-light-theme.scss
+++ b/kdb-web/src/styles/themes/sh-edraft-light-theme.scss
@@ -15,14 +15,9 @@
     $primaryErrorColor: #b00020;
     $secondaryErrorColor: #e94948;
 
-    $default-border: 1px solid $secondaryBackgroundColor;
+    $default-border: 2px solid $secondaryBackgroundColor;
 
-    html,
-    body {
-        margin: 0;
-
-        font-size: 16px;
-    }
+    background-color: $primaryBackgroundColor;
 
     h1,
     h2 {
@@ -121,6 +116,35 @@
                             border-bottom: $default-border;
                         }
                     }
+
+                    .server-list-wrapper {
+                        .server-filter {
+                        }
+
+                        .server-count {
+                        }
+
+                        .server-list {
+                            .server {
+                                border: $default-border;
+                                border-radius: 15px;
+
+                                .logo {
+                                    img {
+                                        border-radius: 100%;
+                                    }
+                                }
+
+                                .name {
+                                    color: $primaryHeaderColor;
+                                }
+
+                                &:hover {
+                                    border-color: $primaryHeaderColor !important;
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -226,28 +250,43 @@
         stroke: $primaryHeaderColor !important;
     }
 
-    .p-menu {
+    .p-menu,
+    .p-panelmenu {
         color: $primaryTextColor !important;
 
         .p-menuitem-link .p-menuitem-text,
-        .p-menuitem-link .p-menuitem-icon {
+        .p-menuitem-link .p-menuitem-icon,
+        .p-panelmenu-header > a {
             color: $primaryTextColor !important;
+            background: transparent !important;
+            font-size: 1rem !important;
+            font-weight: normal !important;
         }
 
-        .p-menuitem-link:focus {
+        .p-menuitem-link:focus,
+        .p-panelmenu-header > a:focus,
+        .p-panelmenu-content .p-menuitem .p-menuitem-link:focus {
             box-shadow: none !important;
         }
 
-        .p-menuitem-link:hover {
+        .p-menuitem-link:hover,
+        .p-panelmenu-header > a:hover,
+        .p-panelmenu-content .p-menuitem .p-menuitem-link:hover {
             background-color: $secondaryBackgroundColor !important;
             $border-radius: 20px;
             border-radius: $border-radius 0px 0px $border-radius;
 
             .p-menuitem-text,
-            .p-menuitem-icon {
+            .p-menuitem-icon,
+            .p-menuitem-text,
+            .p-panelmenu-icon {
                 color: $primaryHeaderColor !important;
             }
         }
+
+        .p-panelmenu-content {
+            margin: 5px 0px 5px 10px;
+        }
     }
 
     .p-menu-overlay {
@@ -386,6 +425,9 @@
 
     input,
     .p-password {
+        border-radius: 10px;
+        border: $default-border;
+
         &:focus {
             box-shadow: none !important;
         }
@@ -430,7 +472,7 @@
         color: $primaryTextColor !important;
         border: 0 !important;
         padding: 0px !important;
-        
+
         &:hover {
             background-color: transparent !important;
             color: $primaryHeaderColor !important;