diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css
index c47c25b7f4698..11041c5c4c77f 100644
--- a/apps/theming/css/default.css
+++ b/apps/theming/css/default.css
@@ -80,7 +80,7 @@
   --sidebar-min-width: 300px;
   --sidebar-max-width: 500px;
   /* Border radius of the body container */
-  --body-container-radius: calc(var(--default-grid-baseline) * 3);
+  --body-container-radius: var(--border-radius-container-large);
   /* Margin of the body container */
   --body-container-margin: calc(var(--default-grid-baseline) * 2);
   /* Height of the body container to fully fill the view port */
diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php
index 3481dc9681c61..47a54eb0e1a89 100644
--- a/apps/theming/lib/Themes/DefaultTheme.php
+++ b/apps/theming/lib/Themes/DefaultTheme.php
@@ -176,14 +176,14 @@ public function getCSSVariables(): array {
 			// Border radii (new values)
 			'--border-radius-small' => '4px', // For smaller elements
 			'--border-radius-element' => '8px', // For interactive elements such as buttons, input, navigation and list items
-			'--border-radius-container' => '12px', // For smaller containers like action menus 
-			'--border-radius-container-large' => '16px', // For bigger containers like body or modals 
+			'--border-radius-container' => '12px', // For smaller containers like action menus
+			'--border-radius-container-large' => '16px', // For bigger containers like body or modals
 
 			// Border radii (deprecated)
 			'--border-radius' => 'var(--border-radius-small)',
 			'--border-radius-large' => 'var(--border-radius-element)',
 			'--border-radius-rounded' => '28px',
-			'--border-radius-pill' => '100px', 
+			'--border-radius-pill' => '100px',
 
 			'--default-clickable-area' => '34px',
 			'--clickable-area-large' => '48px',
@@ -199,7 +199,7 @@ public function getCSSVariables(): array {
 			'--sidebar-max-width' => '500px',
 
 			// Border radius of the body container
-			'--body-container-radius' => 'calc(var(--default-grid-baseline) * 3)',
+			'--body-container-radius' => 'var(--border-radius-container-large)',
 			// Margin of the body container
 			'--body-container-margin' => 'calc(var(--default-grid-baseline) * 2)',
 			// Height of the body container to fully fill the view port
diff --git a/apps/theming/tests/Themes/DefaultThemeTest.php b/apps/theming/tests/Themes/DefaultThemeTest.php
index 91b7d8887d7ad..d11237e774cb4 100644
--- a/apps/theming/tests/Themes/DefaultThemeTest.php
+++ b/apps/theming/tests/Themes/DefaultThemeTest.php
@@ -152,6 +152,8 @@ public function testThemindDisabledFallbackCss() {
 		$fallbackCss = file_get_contents(__DIR__ . '/../../css/default.css');
 		// Remove comments
 		$fallbackCss = preg_replace('/\s*\/\*[\s\S]*?\*\//m', '', $fallbackCss);
+		// Remove blank lines
+		$fallbackCss = preg_replace('/\s*\n\n/', "\n", $fallbackCss);
 
 		$this->assertEquals($css, $fallbackCss);
 	}