diff --git a/appinfo/info.xml b/appinfo/info.xml
index ba7c0ba..5378d67 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -8,7 +8,7 @@
 # Unrounded Corners
 A Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.
     ]]></description>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <licence>agpl</licence>
     <author mail="me@oliverparoczai.org" homepage="https://oliverparoczai.dev">Oliver Paroczai</author>
     <namespace>UnroundedCorners</namespace>
@@ -17,6 +17,6 @@ A Nextcloud app that restores the corners of buttons and widgets to their origin
     <bugs>https://github.com/OliverParoczai/nextcloud-unroundedcorners/issues</bugs>
     <screenshot>https://raw.githubusercontent.com/OliverParoczai/nextcloud-unroundedcorners/master/differences.png</screenshot>
     <dependencies>
-        <nextcloud min-version="27" max-version="37"/>
+        <nextcloud min-version="30" max-version="40"/>
     </dependencies>
 </info>
diff --git a/css/unround.css b/css/unround.css
index 7d5a4a2..7531ec3 100644
--- a/css/unround.css
+++ b/css/unround.css
@@ -1,15 +1,11 @@
-:root { /* Body container settings, mostly for removing the side margins, and for applying the styles to guest pages */
+:root, [data-theme-default], [data-theme-light], [data-theme-dark], [data-theme-light-highcontrast], [data-theme-dark-highcontrast] { /* Body container settings, mostly for removing the side margins, and for applying the styles to guest pages */
 --body-container-margin: 0px !important;
 --body-container-radius: 0px !important;
 --border-radius-large: 4px !important;
+--border-radius-container-large: 4px !important;
 --border-radius-rounded: 4px !important; 
 --border-radius-pill: 4px !important;
-}
-
-[data-theme-default], [data-theme-light], [data-theme-dark], [data-theme-light-highcontrast], [data-theme-dark-highcontrast]{ /* For sitewide buttons, both themes */
-    --border-radius-large: 4px !important; /* Used on the dashboard */
-    --border-radius-rounded: 4px !important; /* Used on the dashboard */
-    --border-radius-pill: 4px !important; /* Used everywhere else */
+--border-radius-element: 4px !important;
 }
 
 #app-navigation:not(.vue) {
@@ -88,3 +84,15 @@ select {
 #onlyofficeFrame {
   height: calc(100vh + 8px);
 }
+
+/* Used for mail settings, upper button */
+.checkbox-radio-switch--button-variant-v-grouped:first-of-type {
+  border-top-left-radius: 4px !important;
+  border-top-right-radius: 4px !important;
+}
+
+/* Used for mail settings, lower button */
+.checkbox-radio-switch--button-variant-v-grouped:last-of-type {
+  border-bottom-left-radius: 4px !important; 
+  border-bottom-right-radius: 4px !important;
+}