diff --git a/core/css/server.css b/core/css/server.css
index fd37cc16fe208fadd31d7223493bc254497119fe..c5ccde911e2b12008eb86f3c32eae88a088db9c0 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License, version 3,
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-@font-face {
+ @font-face {
     font-family: 'Roboto';
     src: url('../webfonts/Roboto-Regular.woff2') format('woff2'), url('../webfonts/Roboto-Regular.woff') format('woff');
     /* font-weight: 600; */
@@ -35,9 +35,6 @@
     --color-error: #fb3845;
     --color-delete: #e9322d;
     --color-success: #3ad975;
-    --color-main-background: #ffffff;
-    --color-main-background-header: #ffffff;
-    --color-main-background-translucent: #f2f2f2;
     --color-main-text: black;
     --color-background-hover: white;
     --color-text-maxcontrast: black;
@@ -53,10 +50,18 @@
     --color-sharing-icon-background: #767676;
     --logo: url("../img/logo@2x.svg");
     --notification-icon-invert: invert(0%);
+    --border-radius: 3px;
+    --border-radius-large: 10px;
+    --border-radius-pill: 100px;
+    --color-background-hover: whitesmoke;
+    --color-background-dark: #ededed;
+    --color-background-darker: #dbdbdb;
+    --color-placeholder-light: #e6e6e6;
+    --color-placeholder-dark: #ccc;
 }
 
 /* Force a few variables to right values for dark theme */
-body.theme--dark {
+body[data-themes="dark"] {
     --color-main-background-header: #272727;
     --input-background-color: #181818;
     --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000");
@@ -69,6 +74,14 @@ body.theme--dark {
 body.theme--highcontrast {
     --icon-inactive-color: black;
 }
+body {
+    background-color: var(--color-main-background);
+    font-weight: normal;
+    font-size: var(--default-font-size);
+    line-height: var(--default-line-height);
+    font-family: var(--font-face);
+    color: var(--color-main-text);
+}
 
 #body-user #header,
 #body-settings #header,
@@ -147,13 +160,12 @@ a.primary:not(:disabled):focus {
 button.primary + button:not(.primary),
 button.primary + button:not(.primary):active,
 .entity-picker__navigation button:not(.primary),
-.event-popover__buttons button:not(.primary),
-.event-popover__buttons button:not(.primary):active,
 .oc-dialog-buttonrow.twobuttons button:not(.primary),
 .oc-dialog-buttonrow.twobuttons button:not(.primary):active,
 .status-buttons .status-buttons__select {
     background-color: var(--color-secondary-element);
     color: var(--color-primary);
+    border: 1px solid;
     border-color: var(--border-color-secondary-element);
 }
 
@@ -161,6 +173,7 @@ input[type="checkbox"].checkbox + label::before,
 input[type="radio"].checkbox + label::before {
     border-color: var(--icon-inactive-color);
     background-color: white;
+    border: 1px solid #878787;
 }
 
 textarea:not(:disabled),
@@ -1123,7 +1136,6 @@ li.active .icon-share {
 }
 
 #app-navigation-vue #app-settings #app-settings-header .settings-button,
-#app-navigation #app-settings #app-settings-header .settings-button,
 .icon-category-tools {
     background-image: var(--icon-settings-808080);
 }
@@ -1755,3 +1767,41 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a {
 #content.app-files #filestable {
     padding-top: 20px;
 }
+
+div.select2-drop .select2-search input,
+select,
+button:not(.button-vue),
+.button,
+input:not([type='range']),
+textarea,
+div[contenteditable=true],
+.pager li a {
+    margin: 3px 3px 3px 0;
+    padding: 7px 6px;
+    font-size: 13px;
+    background-color: var(--color-main-background);
+    color: var(--color-main-text);
+    border: 1px solid var(--color-border-dark);
+    outline: none;
+    border-radius: var(--border-radius);
+    cursor: text;
+}
+
+button:not(.button-vue),
+.button,
+input[type='button'],
+input[type='submit'],
+input[type='reset'] {
+    font-weight: bold;
+    border-radius: var(--border-radius-pill);
+}
+.content.app-contacts .multiselect .multiselect__tags {
+    border: 1px solid var(--color-border-dark) !important;
+    border-radius: var(--border-radius) !important;
+}
+.content.app-contacts .property__row .property__label:not(.multiselect) {
+   padding-right:10px;
+}
+
+
+