diff --git a/dev/Styles/Admin/Domain.less b/dev/Styles/Admin/Domain.less
index 540b3ceeb..4ade87eb6 100644
--- a/dev/Styles/Admin/Domain.less
+++ b/dev/Styles/Admin/Domain.less
@@ -12,7 +12,7 @@
 		background-color: #f9f9f9;
 		padding: 8px;
 		border: 1px solid #eee;
-		border-radius: 3px;
+		border-radius: var(--input-border-radius, 3px);
 		margin: -5px 0;
 		i {
 			font-style: normal;
diff --git a/dev/Styles/Admin/Layout.less b/dev/Styles/Admin/Layout.less
index 9a34dbdbd..7ca56e2ee 100644
--- a/dev/Styles/Admin/Layout.less
+++ b/dev/Styles/Admin/Layout.less
@@ -70,8 +70,8 @@
 
 #rl-settings-subscreen {
 	background-color: var(--settings-bg-clr, #fff);
-	border: 1px solid @rlMainDarkColor;
-	border-radius: @rlMainBorderRadius;
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
 	box-shadow: @rlMainShadow;
 	box-sizing: border-box;
 	height: calc(100% - 50px - @rlLowMargin - @rlLowMargin);
diff --git a/dev/Styles/Admin/Plugin.less b/dev/Styles/Admin/Plugin.less
index cb6c50b81..370883f50 100644
--- a/dev/Styles/Admin/Plugin.less
+++ b/dev/Styles/Admin/Plugin.less
@@ -30,7 +30,7 @@
 	.help-block span {
 		background-color: #fff;
 		border: 1px solid #000;
-		border-radius: 3px;
+		border-radius: var(--input-border-radius, 3px);
 		color: #000;
 		display: none;
 		left: 2px;
diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less
index 8111bec7e..c13fcb37b 100644
--- a/dev/Styles/Languages.less
+++ b/dev/Styles/Languages.less
@@ -9,7 +9,7 @@
 		width: 180px;
 		background-color: rgba(128, 128, 128, 0.1);
 		border: 1px solid transparent;
-		border-radius: 3px;
+		border-radius: var(--input-border-radius, 3px);
 		position: relative;
 		cursor: pointer;
 
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index 5f500f4a3..f8e6c1bcb 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -117,7 +117,7 @@ dialog > footer {
 	margin-bottom: 0;
 	text-align: right; // right align buttons
 	border-top: 1px solid var(--border-color, #ddd);
-	border-radius: 0 0 6px 6px;
+	border-radius: 0 0 var(--dialog-border-radius, 6px) var(--dialog-border-radius, 6px);
 
 	// Properly space out buttons
 	.btn + .btn {
diff --git a/dev/Styles/User/Attachments.less b/dev/Styles/User/Attachments.less
index 3b853b30e..6f8108397 100644
--- a/dev/Styles/User/Attachments.less
+++ b/dev/Styles/User/Attachments.less
@@ -2,7 +2,7 @@
 
 	background-color: rgba(128, 128, 128, 0.1);
 	border: 0;
-	border-radius: 3px;
+	border-radius: var(--input-border-radius, 3px);
 	box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.04), 0 1px 5px rgba(0, 0, 0, 0.1);
 	display: inline-block;
 	list-style: none;
diff --git a/dev/Styles/User/EmailAddresses.less b/dev/Styles/User/EmailAddresses.less
index 96a6ed5a2..145ba47d2 100644
--- a/dev/Styles/User/EmailAddresses.less
+++ b/dev/Styles/User/EmailAddresses.less
@@ -26,7 +26,7 @@
 .emailaddresses li[draggable] {
 	background-color: #eee;
 	border: 1px solid #aaa;
-	border-radius: 2px;
+	border-radius: calc(var(--input-border-radius, 3px) - 1px);
 	box-shadow: 0 1px 0 rgba(255,255,255,0.75) inset;
 	color: #555;
 	cursor: default;
diff --git a/dev/Styles/User/Identity.less b/dev/Styles/User/Identity.less
index bc8d1210e..bc3ce5c58 100644
--- a/dev/Styles/User/Identity.less
+++ b/dev/Styles/User/Identity.less
@@ -4,7 +4,7 @@
 
 	.e-signature-place {
 		border: 1px solid #ccc;
-		border-radius: 3px;
+		border-radius: var(--input-border-radius, 3px);
 	}
 
 	.textEmail {
diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less
index 30d112110..8c0625a42 100644
--- a/dev/Styles/User/Layout.less
+++ b/dev/Styles/User/Layout.less
@@ -128,7 +128,7 @@ html:not(.rl-left-panel-disabled) #rl-left > .resizer,
 			line-height: 30px;
 			background: rgba(0, 0, 0, .6);
 			padding: 15px;
-			border-radius: 5px;
+			border-radius: var(--border-radius, 5px);
 			text-shadow: 0 1px 1px #000;
 			transform: translateY(-50%);
 			top: 50%;
@@ -176,7 +176,7 @@ html.rl-side-preview-pane {
 }
 
 .btn-group > .btn.single {
-	border-radius: 3px !important;
+	border-radius: var(--input-border-radius, 3px) !important;
 }
 
 /* desktop */
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index 5d38e3289..0dbd35510 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -25,8 +25,8 @@ html.rl-no-preview-pane {
 .messageList {
 	height: calc(100% - 50px);
 	background-color: #fff;
-	border: 1px solid @rlMainDarkColor;
-	border-radius: @rlMainBorderRadius;
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
 	display: flex;
 	flex-direction: column;
 
@@ -38,8 +38,8 @@ html.rl-no-preview-pane {
 		background-color: var(--message-list-toolbar-bg-color, #eee);
 //		#gradient > .vertical(#f4f4f4, #dfdfdf);
 
-		border-bottom-right-radius: @rlMainBorderRadius;
-		border-bottom-left-radius: @rlMainBorderRadius;
+		border-bottom-right-radius: var(--border-radius, 5px);
+		border-bottom-left-radius: var(--border-radius, 5px);
 		border-top: 1px solid var(--border-color, #bbb);
 
 		.e-quota {
@@ -72,8 +72,8 @@ html.rl-no-preview-pane {
 		background-color: var(--message-list-toolbar-bg-color, #eee);
 //		#gradient > .vertical(#f4f4f4, #dfdfdf);
 
-		border-top-right-radius: @rlMainBorderRadius;
-		border-top-left-radius: @rlMainBorderRadius;
+		border-top-right-radius: var(--border-radius, 5px);
+		border-top-left-radius: var(--border-radius, 5px);
 		border-bottom: 1px solid var(--border-color, #bbb);
 	}
 
@@ -267,7 +267,7 @@ html:not(rl-mobile) {
 		padding: 1px 5px;
 		margin-right: 5px;
 		border: 1px solid #ccc;
-		border-radius: 5px;
+		border-radius: var(--border-radius, 5px);
 	}
 
 	.threadsCountParent.lastSelected {
@@ -281,7 +281,7 @@ html:not(rl-mobile) {
 	}
 
 	.threads-len {
-		border-radius: 6px;
+		border-radius: var(--border-radius, 5px);
 		border: 1px solid #ccc;
 		font-size: 11px;
 		padding: 0 2px;
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index e10588103..073633866 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -7,13 +7,12 @@ html.rl-no-preview-pane {
 
 #V-MailMessageView.focused .messageView {
 	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-	border-color: darken(@rlMainDarkColor, 5%);
 }
 
 .messageView {
 	background-color: #fff;
-	border: 1px solid @rlMainDarkColor;
-	border-radius: @rlMainBorderRadius;
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
 	height: 100%;
 
 	.toolbar {
@@ -117,7 +116,7 @@ html.rl-no-preview-pane {
 
 		background-color: #f8f8f8;
 		border-bottom: 1px solid var(--border-color, #bbb);
-		border-radius: @rlMainBorderRadius @rlMainBorderRadius 0 0;
+		border-radius: var(--border-radius, 5px) var(--border-radius, 5px) 0 0;
 		padding: 10px;
 		flex-shrink: 0;
 
@@ -270,7 +269,7 @@ html.rl-no-preview-pane {
 		color: #333;
 		z-index: 2;
 		cursor: pointer;
-		border-radius: 5px;
+		border-radius: var(--border-radius, 5px);
 		opacity: 0.5;
 
 		&:hover {
@@ -435,7 +434,7 @@ html.rl-no-preview-pane {
 			}
 
 			pre {
-				border-radius: 5px;
+				border-radius: var(--border-radius, 5px);
 				display: block;
 				padding: 5px 10px;
 			}
@@ -488,7 +487,7 @@ html.rl-no-preview-pane .messageView {
 		left: 0;
 		bottom: @rlBottomMargin;
 		right: @rlBottomMargin;
-		border: 1px solid @rlMainDarkColor;
+		border: 1px solid var(--border-color, #aaa);
 		box-shadow: @rlMainShadow;
 	}
 }
diff --git a/dev/Styles/User/Settings.less b/dev/Styles/User/Settings.less
index ff84ce277..517ca7012 100644
--- a/dev/Styles/User/Settings.less
+++ b/dev/Styles/User/Settings.less
@@ -75,9 +75,9 @@
 	height: calc(100% - 50px - @rlLowMargin - @rlLowMargin);
 
 	background-color: var(--settings-bg-clr, #fff);
-	border: 1px solid @rlMainDarkColor;
+	border: 1px solid var(--border-color, #aaa);
 	box-shadow: @rlMainShadow;
-	border-radius: @rlMainBorderRadius;
+	border-radius: var(--border-radius, 5px);
 }
 
 .firefox-drag #rl-settings-subscreen,
diff --git a/dev/Styles/User/SquireUI.less b/dev/Styles/User/SquireUI.less
index bafb805a3..69450373f 100644
--- a/dev/Styles/User/SquireUI.less
+++ b/dev/Styles/User/SquireUI.less
@@ -80,7 +80,7 @@
 	}
 
 	pre {
-		border-radius: 5px;
+		border-radius: var(--border-radius, 5px);
 		padding: 5px 10px;
 	}
 
diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less
index 91f0b998e..00d0219b0 100644
--- a/dev/Styles/_End.less
+++ b/dev/Styles/_End.less
@@ -4,7 +4,7 @@
 }
 [data-rainloopErrorTip]::before {
 	background: #fff;
-	border-radius: 3px;
+	border-radius: var(--input-border-radius, 3px);
 	border: 1px solid #999;
 	color: red;
 	content: attr(data-rainloopErrorTip);
diff --git a/dev/Styles/_Values.less b/dev/Styles/_Values.less
index 75f0faf08..916b00b93 100644
--- a/dev/Styles/_Values.less
+++ b/dev/Styles/_Values.less
@@ -1,11 +1,7 @@
 
 @rlLeftWidth: 200px;
 
-@rlMainBorderRadius: 5px;
-
 @rlMainShadow: 0 2px 8px rgba(0, 0, 0, 0.2);
 
 @rlLowMargin: 8px;
 @rlBottomMargin: 5px;
-
-@rlMainDarkColor: #aaa;
diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
index 685cd4dfc..76cbaee97 100644
--- a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
+++ b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
@@ -84,6 +84,7 @@
 	--main-font-size: 14px;
 	--link-color: #369;
 	--border-color: var(--color-border);
+	--border-radius: var(--border-radius);
 	--hr-color: var(--color-border);
 
 	--warning-clr: var(--color-warning);
diff --git a/snappymail/v/0.0.0/themes/example.css b/snappymail/v/0.0.0/themes/example.css
index 5af57a7a5..32d392527 100644
--- a/snappymail/v/0.0.0/themes/example.css
+++ b/snappymail/v/0.0.0/themes/example.css
@@ -9,6 +9,7 @@
 	--main-font-size: 14px;
 	--link-color: #369;
 	--border-color: #ddd;
+	--border-radius: 5px;
 	--hr-color: #eee;
 
 	--warning-clr: #c09853;