From b4bbf5054c22d1909eb982a1ac70b8576dae155a Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <andi@unlegacy-android.org>
Date: Mon, 20 Jun 2022 21:21:04 +0200
Subject: [PATCH] WIP: Make classic rounded a own theme

Change-Id: I6a12c936f2fdea4d0571778fa5e9fb7a0fbc3587
---
 admin/diskusage.php                           |  5 +-
 admin/index.php                               |  6 +-
 chromakeying.php                              |  3 -
 dependencies.php                              |  5 +-
 gallery.php                                   |  3 -
 index.php                                     |  3 -
 lib/configsetup.inc.php                       |  8 +-
 livechroma.php                                |  3 -
 login/index.php                               | 31 +++----
 manual/index.php                              | 11 +--
 resources/lang/.i18n-editor-metadata          |  6 +-
 resources/lang/de.json                        |  2 -
 resources/lang/en.json                        |  2 -
 resources/lang/es.json                        |  2 -
 resources/lang/fr.json                        |  2 -
 resources/lang/it.json                        |  2 -
 resources/lang/pl.json                        |  1 -
 src/sass/classic_admin.scss                   | 22 +++++
 src/sass/classic_chromakeying.scss            |  1 +
 src/sass/classic_live_chromakeying.scss       |  1 +
 src/sass/classic_rounded_admin.scss           |  1 +
 src/sass/classic_rounded_chromakeying.scss    |  1 +
 .../classic_rounded_live_chromakeying.scss    |  1 +
 src/sass/classic_rounded_style.scss           |  1 +
 src/sass/classic_style.scss                   | 37 +++++++-
 src/sass/login.scss                           |  4 +
 src/sass/manual.scss                          | 46 +++++++++-
 src/sass/modern_style.scss                    |  4 +-
 src/sass/partials/_button.scss                | 41 ++++++---
 src/sass/partials/_gallery.scss               |  7 ++
 src/sass/partials/_shape.scss                 | 22 +++++
 src/sass/partials/_sidenav.scss               |  4 +
 src/sass/rounded.scss                         | 85 -------------------
 src/sass/update.scss                          |  1 +
 template/classic.template.php                 |  4 +-
 template/classic_rounded.template.php         | 83 ++++++++++++++++++
 template/modern.template.php                  |  4 +-
 template/modern_squared.template.php          |  4 +-
 update.php                                    |  5 +-
 39 files changed, 296 insertions(+), 178 deletions(-)
 create mode 100644 src/sass/classic_rounded_admin.scss
 create mode 100644 src/sass/classic_rounded_chromakeying.scss
 create mode 100644 src/sass/classic_rounded_live_chromakeying.scss
 create mode 100644 src/sass/classic_rounded_style.scss
 create mode 100644 src/sass/partials/_shape.scss
 delete mode 100644 src/sass/rounded.scss
 create mode 100644 template/classic_rounded.template.php
diff --git a/admin/diskusage.php b/admin/diskusage.php
index bd10f7d59..d2991a059 100644
--- a/admin/diskusage.php
+++ b/admin/diskusage.php
@@ -43,16 +43,13 @@
 	<link rel="stylesheet" href="../node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" href="../resources/css/login.css" />
-	<?php if ($config['ui']['rounded_corners']): ?>
-	<link rel="stylesheet" href="../resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("../private/overrides.css")): ?>
 	<link rel="stylesheet" href="../private/overrides.css" />
 	<?php endif; ?>
 </head>
 
 <body class="loginbody">
-	<div class="login-panel">
+	<div class="login-panel shape--<?php echo $config['ui']['style']; ?>">
 		<h2><?=$config['ui']['branding']?> <span data-i18n="disk_usage"></span></h2>
 		<a class="btn btn--tiny btn--flex back-to-admin" href="./"><i class="fa fa-arrow-left"></i></a>
 		<button class="download-zip-btn btn btn--tiny btn--flex">
diff --git a/admin/index.php b/admin/index.php
index 47285378a..208334d0d 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -34,9 +34,9 @@
         <link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css">
         <link rel="stylesheet" type="text/css" href="../node_modules/selectize/dist/css/selectize.css">
         <link rel="stylesheet" type="text/css" href="../resources/css/<?php echo $config['ui']['style']; ?>_admin.css">
-	<?php if (is_file("../private/overrides.css")): ?>
-	<link rel="stylesheet" href="../private/overrides.css" />
-	<?php endif; ?>
+        <?php if (is_file("../private/overrides.css")): ?>
+        <link rel="stylesheet" href="../private/overrides.css" />
+        <?php endif; ?>
 </head>
 <body>
 <!-- NavBar content -->
diff --git a/chromakeying.php b/chromakeying.php
index 16e2f894b..61df3fd00 100644
--- a/chromakeying.php
+++ b/chromakeying.php
@@ -47,9 +47,6 @@
 		<link rel="stylesheet" href="node_modules/normalize.css/normalize.css" />
 		<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
 		<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_chromakeying.css" />
-		<?php if ($config['ui']['rounded_corners']): ?>
-		<link rel="stylesheet" href="resources/css/rounded.css" />
-		<?php endif; ?>
 		<?php if (is_file("private/overrides.css")): ?>
 		<link rel="stylesheet" href="private/overrides.css" />
 		<?php endif; ?>
diff --git a/dependencies.php b/dependencies.php
index 75ff5cc1e..d41b84906 100644
--- a/dependencies.php
+++ b/dependencies.php
@@ -43,9 +43,6 @@
 	<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_style.css" />
 	<link rel="stylesheet" href="resources/css/update.css" />
-	<?php if ($config['ui']['rounded_corners'] && $config['ui']['style'] === 'classic'): ?>
-	<link rel="stylesheet" href="resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("private/overrides.css")): ?>
 	<link rel="stylesheet" href="private/overrides.css" />
 	<?php endif; ?>
@@ -53,7 +50,7 @@
 
 <body class="updatewrapper">
 
-	<div class="white-box" id="white-box">
+	<div class="white-box shape--<?php echo $config['ui']['style']; ?>" id="white-box">
 		<h2><?=$config['ui']['branding']?> dependencies check</h2>
 		<p><span data-i18n="os_check"></span></p>
 	</div>
diff --git a/gallery.php b/gallery.php
index 56d4a015e..3965f9d35 100644
--- a/gallery.php
+++ b/gallery.php
@@ -52,9 +52,6 @@
 	<?php if ($config['gallery']['bottom_bar']): ?>
 	<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
 	<?php endif; ?>
-	<?php if ($config['ui']['rounded_corners']): ?>
-	<link rel="stylesheet" href="resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("private/overrides.css")): ?>
 	<link rel="stylesheet" href="private/overrides.css" />
 	<?php endif; ?>
diff --git a/index.php b/index.php
index 51fc39e1f..eb8601ca7 100644
--- a/index.php
+++ b/index.php
@@ -73,9 +73,6 @@
 	<?php if ($config['gallery']['bottom_bar']): ?>
 	<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
 	<?php endif; ?>
-	<?php if ($config['ui']['rounded_corners'] && $config['ui']['style'] === 'classic'): ?>
-	<link rel="stylesheet" href="resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("private/overrides.css")): ?>
 	<link rel="stylesheet" href="private/overrides.css" />
 	<?php endif; ?>
diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
index fe5b2fc03..a16d5ff66 100644
--- a/lib/configsetup.inc.php
+++ b/lib/configsetup.inc.php
@@ -1840,6 +1840,7 @@
             'placeholder' => $defaultConfig['ui']['style'],
             'options' => [
                 'classic' => 'classic',
+                'classic_rounded' => 'classic_rounded',
                 'modern' => 'modern',
                 'modern_squared' => 'squared',
                 'custom' => 'custom',
@@ -1853,6 +1854,7 @@
             'placeholder' => $defaultConfig['ui']['button'],
             'options' => [
                 'classic' => 'classic',
+                'classic_rounded' => 'classic_rounded',
                 'modern' => 'modern',
                 'modern_squared' => 'squared',
                 'custom' => 'custom',
@@ -1938,12 +1940,6 @@
             'name' => 'ui[decore_lines]',
             'value' => $config['ui']['decore_lines'],
         ],
-        'ui_rounded_corners' => [
-            'view' => 'expert',
-            'type' => 'checkbox',
-            'name' => 'ui[rounded_corners]',
-            'value' => $config['ui']['rounded_corners'],
-        ],
         'colors_primary' => [
             'view' => 'expert',
             'type' => 'color',
diff --git a/livechroma.php b/livechroma.php
index 573173108..e784aad38 100644
--- a/livechroma.php
+++ b/livechroma.php
@@ -52,9 +52,6 @@
 		<?php if ($config['gallery']['bottom_bar']): ?>
 		<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
 		<?php endif; ?>
-		<?php if ($config['ui']['rounded_corners']): ?>
-		<link rel="stylesheet" href="resources/css/rounded.css" />
-		<?php endif; ?>
 		<?php if (is_file("private/overrides.css")): ?>
 		<link rel="stylesheet" href="private/overrides.css" />
 		<?php endif; ?>
diff --git a/login/index.php b/login/index.php
index 41626b4a7..c4e2ccf3e 100644
--- a/login/index.php
+++ b/login/index.php
@@ -19,7 +19,7 @@
 }
 // END LOGIN
 
-
+$btnClass = 'btn btn--login shape--' . $config['ui']['button'];
 ?>
 <!DOCTYPE html>
 <html>
@@ -46,16 +46,13 @@
 	<link rel="stylesheet" href="../node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" href="../resources/css/login.css" />
-	<?php if ($config['ui']['rounded_corners']): ?>
-	<link rel="stylesheet" href="../resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("../private/overrides.css")): ?>
 	<link rel="stylesheet" href="../private/overrides.css" />
 	<?php endif; ?>
 </head>
 
 <body class="loginbody">
-	<div class="login-panel">
+	<div class="login-panel shape--<?php echo $config['ui']['style']; ?>">
 		<h2><?=$config['ui']['branding']?> Login</h2>
 		<hr>
 		<?php if($config['login']['enabled'] && !(isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
@@ -74,28 +71,28 @@
 		<hr>
 		<?php endif; ?>
 		<?php if(!$config['protect']['admin'] || (!$config['protect']['localhost_admin'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../admin" class="btn btn--login"><i class="fa fa-cog"></i> <span data-i18n="admin_panel"></span></a></p>
-		<p><a href="../dependencies.php" class="btn btn--login"><i class="fa fa-list-ul"></i> <span data-i18n="dependencies_check"></span></a></p>
+		<p><a href="../admin" class="<?php echo $btnClass; ?>"><i class="fa fa-cog"></i> <span data-i18n="admin_panel"></span></a></p>
+		<p><a href="../dependencies.php" class="<?php echo $btnClass; ?>"><i class="fa fa-list-ul"></i> <span data-i18n="dependencies_check"></span></a></p>
 		<?php endif; ?>
 		<?php if(!$config['protect']['update'] || (!$config['protect']['localhost_update'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../update.php" class="btn btn--login"><i class="fa fa-tasks"></i> <span data-i18n="updater"></span></a></p>
+		<p><a href="../update.php" class="<?php echo $btnClass; ?>"><i class="fa fa-tasks"></i> <span data-i18n="updater"></span></a></p>
 		<?php endif; ?>
-		<p><a href="../gallery.php" class="btn btn--login"><i class="fa fa-th"></i> <span data-i18n="gallery"></span></a></p>
-		<p><a href="../slideshow" class="btn btn--login"><i class="fa fa-play"></i> <span data-i18n="slideshow"></span></a></p>
+		<p><a href="../gallery.php" class="<?php echo $btnClass; ?>"><i class="fa fa-th"></i> <span data-i18n="gallery"></span></a></p>
+		<p><a href="../slideshow" class="<?php echo $btnClass; ?>"><i class="fa fa-play"></i> <span data-i18n="slideshow"></span></a></p>
 		<?php if(!$config['protect']['index'] || (!$config['protect']['localhost_index'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../livechroma.php" class="btn btn--login"><i class="fa fa-paint-brush"></i> <span data-i18n="livechroma"></span></a></p>
+		<p><a href="../livechroma.php" class="<?php echo $btnClass; ?>"><i class="fa fa-paint-brush"></i> <span data-i18n="livechroma"></span></a></p>
 		<?php endif; ?>
 		<?php if(!$config['protect']['manual'] || (!$config['protect']['localhost_manual'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../manual/faq.php" class="btn btn--login" title="FAQ" target="newwin"><i class="fa fa-question-circle" aria-hidden="true"></i> <span data-i18n="show_faq"></span></a></p>
-		<p><a href="../manual" class="btn btn--login" title="Manual" target="newwin"><i class="fa fa-info-circle" aria-hidden="true"></i> <span data-i18n="show_manual"></span></a></p>
-		<p><a href="https://t.me/PhotoboothGroup" class="btn btn--login" title="Telegram" target="newwin"><i class="fa fa-telegram" aria-hidden="true"></i> <span data-i18n="telegram"></span></a></p>
+		<p><a href="../manual/faq.php" class="<?php echo $btnClass; ?>" title="FAQ" target="newwin"><i class="fa fa-question-circle" aria-hidden="true"></i> <span data-i18n="show_faq"></span></a></p>
+		<p><a href="../manual" class="<?php echo $btnClass; ?>" title="Manual" target="newwin"><i class="fa fa-info-circle" aria-hidden="true"></i> <span data-i18n="show_manual"></span></a></p>
+		<p><a href="https://t.me/PhotoboothGroup" class="<?php echo $btnClass; ?>" title="Telegram" target="newwin"><i class="fa fa-telegram" aria-hidden="true"></i> <span data-i18n="telegram"></span></a></p>
 		<?php endif; ?>
-		<p><a href="./" class="btn btn--login"><i class="fa fa-refresh"></i> <span data-i18n="reload"></span></a></p>
+		<p><a href="./" class="<?php echo $btnClass; ?>"><i class="fa fa-refresh"></i> <span data-i18n="reload"></span></a></p>
 		<?php if(!$config['protect']['index'] || (!$config['protect']['localhost_index'] && $_SERVER['REMOTE_ADDR'] === $_SERVER['SERVER_ADDR']) || !$config['login']['enabled'] || (isset($_SESSION['auth']) && $_SESSION['auth'] === true)): ?>
-		<p><a href="../" class="btn btn--login" ><i class="fa fa-times"></i> <span data-i18n="close"></span></a></p>
+		<p><a href="../" class="<?php echo $btnClass; ?>" ><i class="fa fa-times"></i> <span data-i18n="close"></span></a></p>
 		<?php endif; ?>
 		<?php if(isset($_SESSION['auth']) && $_SESSION['auth'] === true): ?>
-		<p><a href="logout.php" class="btn btn--login"><i class="fa fa-sign-out"></i> <span data-i18n="logout"></span></a></p>
+		<p><a href="logout.php" class="<?php echo $btnClass; ?>"><i class="fa fa-sign-out"></i> <span data-i18n="logout"></span></a></p>
 		<?php endif; ?>
 	</div>
 
diff --git a/manual/index.php b/manual/index.php
index 82f5e63a2..4d759bf93 100644
--- a/manual/index.php
+++ b/manual/index.php
@@ -36,15 +36,12 @@
 	<link rel="stylesheet" type="text/css" href="../node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" type="text/css" href="../resources/css/manual.css" />
-	<?php if ($config['ui']['rounded_corners']): ?>
-	<link rel="stylesheet" type="text/css" href="../resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("../private/overrides.css")): ?>
 	<link rel="stylesheet" href="../private/overrides.css" />
 	<?php endif; ?>
 </head>
 <body class="manualwrapper">
-	<div class="manual-panel">
+	<div class="manual-panel shape--<?php echo $config['ui']['style']; ?>">
 		<h2><?=$config['ui']['branding']?> Manual</h2>
 		<h3><a class="back-to-pb" href="../">Photobooth</a></h3>
 
@@ -61,7 +58,7 @@
 						if($i == 0){
 							$open = ' open init';
 						}
-						echo '<div class="panel'.$open.'"';
+						echo '<div class="panel'.$open. ' shape--'.$config['ui']['style'].'"';
 						switch ($fields['view'])
 						{
 							case 'expert':
@@ -76,10 +73,10 @@
 							     break;
 						};
 						echo '>';
-								echo '<div class="panel-heading">';
+								echo '<div class="panel-heading shape--'.$config['ui']['style'].'">';
 									echo '<h3><span class="minus">-</span><span class="plus">+</span><span data-i18n="'.$panel.'">'.$panel.'</span></h3>';
 								echo '</div>';
-								echo '<div class="panel-body">';
+								echo '<div class="panel-body shape--'.$config['ui']['style'].'">';
 
 								foreach($fields as $key => $field) {
 									if ($key == 'platform' || $key == 'view') {
diff --git a/resources/lang/.i18n-editor-metadata b/resources/lang/.i18n-editor-metadata
index 5b26cda8f..0401d6317 100644
--- a/resources/lang/.i18n-editor-metadata
+++ b/resources/lang/.i18n-editor-metadata
@@ -1,7 +1,7 @@
-flatten_json=0
-minify_resources=0
 preserve_comments=0
+minify_resources=0
 resource_definition={LOCALE}
 resource_structure=Flat
-resource_type=JSON
 use_single_quotes=0
+resource_type=JSON
+flatten_json=0
diff --git a/resources/lang/de.json b/resources/lang/de.json
index 4fc60f427..df94f1288 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -449,7 +449,6 @@
   "manual:userinterface:ui_decore_lines": "Wenn aktiviert, werden Linien auf der Startseite angezeigt.",
   "manual:userinterface:ui_font_size": "Geben Sie die Standardschriftgröße für die Photobooth-Oberfläche ein.",
   "manual:userinterface:ui_result_buttons": "Wenn aktiviert, werden die Nachbearbeitungs-Schaltflächen auf dem Ergebnisbildschirm sichtbar. Wenn deaktiviert, wird die gesamte Schaltflächenleiste ausgeblendet.",
-  "manual:userinterface:ui_rounded_corners": "Wenn diese Option aktiviert ist, verwendet die Photobooth-Benutzeroberfläche abgerundete Kanten.",
   "manual:userinterface:ui_shutter_animation": "Wenn aktiviert, wird während der Aufnahme eines Fotos eine Verschlussanimation angezeigt.",
   "manual:userinterface:ui_style": "Wählen Sie einen Startseitenstil. Um einen eigenen Startseitenstil zu verwenden, erstellen und verwenden Sie \"/template/custom.template.php\" und \"/resources/css/custom_style.css\", falls eine dieser Dateien nicht lesbar ist, wird auf den Standard-Startseitenstil zurückgegriffen.",
   "manual:version:check_version": "Dies prüft online über das Github Projektarchiv auf die neueste Photobooth-Version.",
@@ -638,7 +637,6 @@
   "userinterface:ui_decore_lines": "Dekorationslinien anzeigen",
   "userinterface:ui_font_size": "Standardschriftgröße",
   "userinterface:ui_result_buttons": "Schaltflächenleiste auf Ergebnisbildschirm anzeigen",
-  "userinterface:ui_rounded_corners": "Abgerundete Ecken",
   "userinterface:ui_shutter_animation": "Verschlussanimation",
   "userinterface:ui_style": "Stil",
   "using_latest_version": "Photobooth ist auf dem aktuellen Stand.",
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 175157e99..17bdc8dde 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -465,7 +465,6 @@
   "manual:userinterface:ui_decore_lines": "If enabled, decorate lines will be visible on start page.",
   "manual:userinterface:ui_font_size": "Enter the default font size used for the Photobooth interface.",
   "manual:userinterface:ui_result_buttons": "If enabled, post-processing buttons will be visible on the on result screen. If disabled the whole button bar will be hidden.",
-  "manual:userinterface:ui_rounded_corners": "If enabled, the Photobooth UI uses smooth rounded edges.",
   "manual:userinterface:ui_shutter_animation": "If enabled, a shutter animation will be visible while taking a picture.",
   "manual:userinterface:ui_style": "Choose a start page styling. To use custom styling please create and use \"/template/custom.template.php\" and \"/resources/css/custom_style.css\", if one of these files is not readable we will fallback to default theme.",
   "manual:version:check_version": "This will check online against the Github repository for the latest Photobooth version.",
@@ -661,7 +660,6 @@
   "userinterface:ui_decore_lines": "Show decorate lines",
   "userinterface:ui_font_size": "Default font size",
   "userinterface:ui_result_buttons": "Show button bar on result screen",
-  "userinterface:ui_rounded_corners": "Rounded corners",
   "userinterface:ui_shutter_animation": "Shutter animation",
   "userinterface:ui_style": "Styling",
   "using_latest_version": "You are using the latest version of photobooth.",
diff --git a/resources/lang/es.json b/resources/lang/es.json
index b7a32aee6..f53cbd6b6 100644
--- a/resources/lang/es.json
+++ b/resources/lang/es.json
@@ -270,7 +270,6 @@
   "manual:userinterface:background_defaults": "Estilo CSS para fondo en páginas de inicio, inicio de sesión y presentación de diapositivas.",
   "manual:userinterface:button_show_fs": "Si está activado, se agregará un botón para alternar el modo de pantalla completa a la pantalla de inicio.",
   "manual:userinterface:ui_font_size": "Introduzca el tamaño de fuente predeterminado utilizado para la interfaz Photobooth.",
-  "manual:userinterface:ui_rounded_corners": "Si está habilitada, la interfaz de usuario de Photobooth utiliza bordes redondeados suaves.",
   "milliseconds": "milisegundos",
   "newCollage": "Un collage más",
   "newPhoto": "Una foto más",
@@ -380,6 +379,5 @@
   "userinterface:colors_secondary": "Color secundario",
   "userinterface:colors_start_font": "Color de fuente de la pantalla de inicio",
   "userinterface:ui_font_size": "Tamaño de fuente predeterminado",
-  "userinterface:ui_rounded_corners": "Esquinas redondeadas",
   "using_latest_version": "Estás utilizando la última versión de photobooth"
 }
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 676d248f4..a0e17fa03 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -451,7 +451,6 @@
   "manual:userinterface:ui_decore_lines": "Si activé, les lignes de décoration seront visibles sur la page de démarrage.",
   "manual:userinterface:ui_font_size": "Entrez la taille de police par défaut utilisée pour l'interface Photobooth.",
   "manual:userinterface:ui_result_buttons": "Si activé, les boutons de post-traitement seront visibles sur l'écran de résultat. Si désactivé, la barre de boutons entière sera masquée.",
-  "manual:userinterface:ui_rounded_corners": "Si activé, l'interface utilisateur du Photobooth utilise des bords arrondis lisses.",
   "manual:userinterface:ui_shutter_animation": "Si activé, une animation d'obturateur sera visible lors de la prise d'une photo.",
   "manual:userinterface:ui_style": "Choisissez un style de page de démarrage. Pour utiliser un style personnalisé, veuillez créer et utiliser \"/template/custom.template. hp\" et \"/resources/css/custom_style.css\", si l'un de ces fichiers n'est pas lisible, nous utiliserons le thème par défaut.",
   "manual:version:check_version": "Ceci vérifiera en ligne le répertoire GitHub pour la dernière version de Photobooth.",
@@ -642,7 +641,6 @@
   "userinterface:ui_decore_lines": "Afficher les lignes décoratives",
   "userinterface:ui_font_size": "Taille de police par défaut",
   "userinterface:ui_result_buttons": "Afficher la barre de boutons sur l'écran de résultat",
-  "userinterface:ui_rounded_corners": "Angles arrondis",
   "userinterface:ui_shutter_animation": "Animation d'obturation",
   "userinterface:ui_style": "Stylisation",
   "using_latest_version": "Vous utilisez la dernière version du Photobooth.",
diff --git a/resources/lang/it.json b/resources/lang/it.json
index bb1c89805..3c2104105 100644
--- a/resources/lang/it.json
+++ b/resources/lang/it.json
@@ -392,7 +392,6 @@
   "manual:userinterface:button_show_fs": "Se abilitata, verrà aggiunto alla schermata iniziale un pulsante per attivare o disattivare la modalità schermo intero.",
   "manual:userinterface:ui_decore_lines": "Se abilitata, le linee decorate saranno visibili alla pagina iniziale.",
   "manual:userinterface:ui_font_size": "Inserisci la dimensione predefinita del carattere usata per l'interfaccia Photobooth.",
-  "manual:userinterface:ui_rounded_corners": "Se abilitata, l'interfaccia utente di Photobooth utilizza bordi arrotondati lisci.",
   "manual:userinterface:ui_style": "Scegli uno stile di pagina iniziale. Per usare lo stile personalizzato, crea e usa \"/template/custom.template.php\" e \"/resources/css/custom_style.css\", se uno di questi file non è leggibile, sarà utilizzato il tema predefinito.",
   "milliseconds": "millisecondi",
   "newCollage": "Nuovo Collage",
@@ -518,7 +517,6 @@
   "userinterface:colors_start_font": "Colore carattere schermata iniziale",
   "userinterface:ui_decore_lines": "Mostra linee decorative",
   "userinterface:ui_font_size": "Grandezza carattere di default",
-  "userinterface:ui_rounded_corners": "Spigoli arrotondati",
   "userinterface:ui_style": "Stile",
   "using_latest_version": "Stai usando l'ultima versione di photobooth."
 }
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
index cbcf8cd04..d0b3ab4dc 100644
--- a/resources/lang/pl.json
+++ b/resources/lang/pl.json
@@ -282,6 +282,5 @@
   "userinterface:colors_secondary": "Kolor Dodatkowy",
   "userinterface:colors_start_font": "Kolor czcionki ekranu startowego",
   "userinterface:ui_font_size": "Domyślny rozmiar czcionki",
-  "userinterface:ui_rounded_corners": "Zaokrąglone narożniki",
   "using_latest_version": "Używasz najnowszej dostępnej wersji Fotobudki."
 }
diff --git a/src/sass/classic_admin.scss b/src/sass/classic_admin.scss
index f9e33ddde..4812b4e22 100644
--- a/src/sass/classic_admin.scss
+++ b/src/sass/classic_admin.scss
@@ -1,6 +1,7 @@
 @import 'modules/theme';
 @import 'partials/basic';
 @import 'partials/button_animated';
+@import 'partials/shape';
 
 body {
   display: block;
@@ -320,6 +321,27 @@ div.setting_element {
   left: 4.5em;
 }
 
+.shape--classic_rounded {
+  &.slider {
+    height: 15px;
+    border-radius: 5px;
+  }
+
+  &.slider::-webkit-slider-thumb,
+  &.slider::-moz-range-thumb {
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+  }
+
+  &.toggle {
+    border-radius: 0.5em;
+  }
+
+  &.toggle:before {
+    border-radius: 50%;
+  }
+}
 /********************************************
 * Adjust style of selectize lib for our needs - multiselects only
 ********************************************/
diff --git a/src/sass/classic_chromakeying.scss b/src/sass/classic_chromakeying.scss
index 634ba7622..d13a3dc37 100644
--- a/src/sass/classic_chromakeying.scss
+++ b/src/sass/classic_chromakeying.scss
@@ -3,6 +3,7 @@
 @import 'partials/button';
 @import 'partials/fonts';
 @import 'partials/modal';
+@import 'partials/shape';
 
 .chromawrapper {
   display: block;
diff --git a/src/sass/classic_live_chromakeying.scss b/src/sass/classic_live_chromakeying.scss
index ddfb24be3..6b3b02c8f 100644
--- a/src/sass/classic_live_chromakeying.scss
+++ b/src/sass/classic_live_chromakeying.scss
@@ -7,6 +7,7 @@
 @import 'partials/scrollbar';
 @import 'partials/shutter_animation';
 @import 'vendor/photoswipe';
+@import 'partials/shape';
 
 .top-bar {
   display: inline-block;
diff --git a/src/sass/classic_rounded_admin.scss b/src/sass/classic_rounded_admin.scss
new file mode 100644
index 000000000..a0e3c9a95
--- /dev/null
+++ b/src/sass/classic_rounded_admin.scss
@@ -0,0 +1 @@
+@import 'classic_admin';
diff --git a/src/sass/classic_rounded_chromakeying.scss b/src/sass/classic_rounded_chromakeying.scss
new file mode 100644
index 000000000..447f1e2b3
--- /dev/null
+++ b/src/sass/classic_rounded_chromakeying.scss
@@ -0,0 +1 @@
+@import 'classic_chromakeying';
diff --git a/src/sass/classic_rounded_live_chromakeying.scss b/src/sass/classic_rounded_live_chromakeying.scss
new file mode 100644
index 000000000..67a7f2438
--- /dev/null
+++ b/src/sass/classic_rounded_live_chromakeying.scss
@@ -0,0 +1 @@
+@import 'classic_live_chromakeying';
diff --git a/src/sass/classic_rounded_style.scss b/src/sass/classic_rounded_style.scss
new file mode 100644
index 000000000..a988e5803
--- /dev/null
+++ b/src/sass/classic_rounded_style.scss
@@ -0,0 +1 @@
+@import 'classic_style';
diff --git a/src/sass/classic_style.scss b/src/sass/classic_style.scss
index 189bce31b..e38083c2c 100644
--- a/src/sass/classic_style.scss
+++ b/src/sass/classic_style.scss
@@ -12,6 +12,7 @@
 @import 'partials/ribbon';
 @import 'partials/video_preview';
 @import 'vendor/photoswipe';
+@import 'partials/shape';
 
 #wrapper {
   display: none;
@@ -117,6 +118,11 @@
     text-align: center;
     padding: 3rem;
 
+    &.shape--classic_rounded {
+      border: 0 none;
+      border-radius: 10px;
+    }
+
     .names {
       margin-top: 2rem;
       margin-bottom: 5rem;
@@ -162,10 +168,15 @@
       }
     }
   }
+
   .fs-button {
     position: fixed;
     top: 5.5rem;
     left: 5px;
+    &.btn--classic_rounded {
+      margin-top: auto;
+      margin-left: auto;
+    }
   }
 
   .cups-button {
@@ -179,6 +190,10 @@
   position: fixed;
   top: 5px;
   left: 5px;
+  &.btn--classic_rounded {
+    margin-top: auto;
+    margin-left: auto;
+  }
 }
 
 .homebtn {
@@ -187,14 +202,27 @@
   right: 5px;
 }
 
+.btn,
+.gal-action-btn {
+  &.btn--classic_rounded {
+    border-radius: 10px;
+  }
+}
+
 .resultInner {
   .homebtn,
   .gallery-button {
-    &.btn--classic {
+    &.btn--classic,
+    &.btn--classic_rounded {
       font-size: 0.875em;
       width: 130px;
     }
   }
+  .btn {
+    &.btn--classic_rounded {
+      margin-left: 2px;
+    }
+  }
 }
 
 .sliderImages {
@@ -261,3 +289,10 @@
 .pswp-rotary-focus {
   background: $mainColor !important;
 }
+
+button {
+  &.btn--classic_rounded {
+    border: 2px solid $borderColor;
+    border-radius: 10px;
+  }
+}
diff --git a/src/sass/login.scss b/src/sass/login.scss
index 7322c6838..0e5194d9f 100644
--- a/src/sass/login.scss
+++ b/src/sass/login.scss
@@ -3,6 +3,7 @@
 @import 'partials/basic';
 @import 'partials/button';
 @import 'partials/modal';
+@import 'partials/shape';
 
 .loginbody {
   display: block;
@@ -37,6 +38,9 @@ input[type='password'] {
   background: $panelColor;
   position: relative;
   max-width: 100%;
+  &.shape--classic_rounded {
+    border: 0 none;
+  }
 }
 
 .password-toggle {
diff --git a/src/sass/manual.scss b/src/sass/manual.scss
index 4514d77e8..1892c2860 100644
--- a/src/sass/manual.scss
+++ b/src/sass/manual.scss
@@ -3,6 +3,7 @@
 @import 'partials/button';
 @import 'partials/fonts';
 @import 'partials/toggle';
+@import 'partials/shape';
 
 $error: #e74c3c;
 $success: #2ecc71;
@@ -30,13 +31,17 @@ $success: #2ecc71;
   position: relative;
   max-width: 100%;
   color: $fontColor;
+  &.shape--classic_rounded {
+    border: 0 none;
+    border-radius: 10px;
+  }
 }
 
 .panel {
   .panel-heading {
     padding: 10px;
     cursor: pointer;
-    border: 1px solid $borderColor;
+
     .plus {
       display: inline-block;
     }
@@ -47,11 +52,32 @@ $success: #2ecc71;
     &:hover {
       background: $hoverPanelColor;
     }
+
+    &.shape--classic,
+    &.shape--classic_rounded {
+      border: 1px solid $borderColor;
+    }
+
+    &.shape--classic_rounded,
+    &.shape--modern,
+    &.shape--modern_squared {
+      margin: 5px;
+    }
   }
   .panel-body {
     display: none;
     padding: 20px;
-    border: 1px solid $borderColor;
+
+    &.shape--classic,
+    &.shape--classic_rounded {
+      border: 1px solid $borderColor;
+    }
+
+    &.shape--classic_rounded,
+    &.shape--modern,
+    &.shape--modern_squared {
+      margin: 5px;
+    }
   }
 
   &.open {
@@ -70,6 +96,12 @@ $success: #2ecc71;
       display: block;
     }
   }
+
+  &.shape--modern,
+  &.shape--modern_squared {
+    border: unset;
+    border-radius: unset;
+  }
 }
 
 .form-row {
@@ -89,6 +121,11 @@ $success: #2ecc71;
 .faq-btn {
   padding-top: 10px;
   width: 100%;
+
+  &.btn--classic_rounded {
+    border: 2px solid $borderColor;
+    border-radius: 10px;
+  }
 }
 
 .wiki-btn {
@@ -106,6 +143,11 @@ $success: #2ecc71;
   &:hover {
     background: $hoverColor;
   }
+
+  &.btn--classic_rounded {
+    border: 2px solid $borderColor;
+    border-radius: 10px;
+  }
 }
 
 code {
diff --git a/src/sass/modern_style.scss b/src/sass/modern_style.scss
index 40299cdc1..87005b88f 100644
--- a/src/sass/modern_style.scss
+++ b/src/sass/modern_style.scss
@@ -25,8 +25,8 @@ body {
 
   .cups-button {
     position: fixed;
-    left: 0;
-    top: 0;
+    left: 5px;
+    top: 5px;
     bottom: auto;
   }
 }
diff --git a/src/sass/partials/_button.scss b/src/sass/partials/_button.scss
index f617a717a..9a772c302 100644
--- a/src/sass/partials/_button.scss
+++ b/src/sass/partials/_button.scss
@@ -9,7 +9,8 @@
   width: 12.5em;
   z-index: 10;
 
-  &--classic {
+  &--classic,
+  &--classic_rounded {
     padding: 20px 40px;
     border: 0 none;
   }
@@ -83,7 +84,8 @@
   }
 }
 
-.btn--classic {
+.btn--classic,
+.btn--classic_rounded {
   &.btn--small {
     padding: 12px 40px;
   }
@@ -102,14 +104,16 @@
     .btn {
       margin-top: 3px;
     }
-    .btn--classic {
+    .btn--classic,
+    .btn--classic_rounded {
       width: auto;
       margin-top: 3px;
     }
 
     @media (max-width: 1024px) {
       .btn {
-        &.btn--classic {
+        &.btn--classic,
+        &.btn--classic_rounded {
           font-size: 0.8em;
           margin-top: 1px;
           width: 80%;
@@ -124,12 +128,21 @@
   z-index: 100;
 }
 
+.fs-button {
+  &.btn--modern_squared {
+    span {
+      font-size: 0.6em;
+    }
+  }
+}
+
 .livechroma-gallery-btn {
   position: fixed;
   top: 1em;
   left: 0;
 
-  &.btn--classic {
+  &.btn--classic,
+  &.btn--classic_rounded {
     width: auto;
     padding: 12px 40px;
   }
@@ -150,7 +163,8 @@
   top: 1em;
   right: 0;
 
-  &.btn--classic {
+  &.btn--classic,
+  &.btn--classic_rounded {
     width: auto;
     padding: 12px 40px;
   }
@@ -185,7 +199,8 @@
   }
 
   @media (max-width: 1280px) and (orientation: landscape) {
-    &.btn--classic {
+    &.btn--classic,
+    &.btn--classic_rounded {
       &.takeChroma,
       &.reloadPage,
       &.deletebtn {
@@ -206,7 +221,8 @@
 }
 
 .chroma-control-bar {
-  .btn--classic {
+  .btn--classic,
+  .btn--classic_rounded {
     &#save-chroma-btn,
     &#print-btn,
     &#close-btn {
@@ -220,7 +236,8 @@
   .btn--modern_squared {
     display: inline-block;
   }
-  .btn--classic {
+  .btn--classic,
+  .btn--classic_rounded {
     width: auto;
     padding: 20px 0;
     text-align: center;
@@ -261,7 +278,8 @@
   }
 }
 
-.btn--classic.gal-action-btn {
+.btn--classic.gal-action-btn,
+.btn--classic_rounded.gal-action-btn {
   background: $hoverColor;
 }
 
@@ -311,7 +329,8 @@
 @media (max-width: 1024px) {
   .takePic,
   .takeCollage {
-    &.btn--classic {
+    &.btn--classic,
+    &.btn--classic_rounded {
       padding: 10px 10px;
     }
   }
diff --git a/src/sass/partials/_gallery.scss b/src/sass/partials/_gallery.scss
index 1363e7ea6..5334371ae 100644
--- a/src/sass/partials/_gallery.scss
+++ b/src/sass/partials/_gallery.scss
@@ -83,6 +83,13 @@
     figure {
       margin: 0;
     }
+
+    &__close,
+    &__reload {
+      &.btn--classic_rounded {
+        border-radius: 5px;
+      }
+    }
   }
 
   figcaption {
diff --git a/src/sass/partials/_shape.scss b/src/sass/partials/_shape.scss
new file mode 100644
index 000000000..50af938bd
--- /dev/null
+++ b/src/sass/partials/_shape.scss
@@ -0,0 +1,22 @@
+.shape--classic_rounded {
+  border: 0 none;
+  border-radius: 10px;
+}
+
+.shape--modern {
+  border: 2px solid $borderColor;
+  border-radius: 10px;
+}
+
+.shape--modern_squared {
+  border: 2px solid $fontColor;
+  border-radius: 10px;
+}
+
+.shape--modern,
+.shape--modern_squared {
+  &.noborder {
+    border: 0;
+    border-radius: 0;
+  }
+}
diff --git a/src/sass/partials/_sidenav.scss b/src/sass/partials/_sidenav.scss
index 712f9954f..c8bca00b8 100644
--- a/src/sass/partials/_sidenav.scss
+++ b/src/sass/partials/_sidenav.scss
@@ -49,6 +49,10 @@
     &:hover {
       background: $hoverColor;
     }
+
+    &.btn--classic_rounded {
+      border-radius: 5px;
+    }
   }
 
   .activeSidenavBtn {
diff --git a/src/sass/rounded.scss b/src/sass/rounded.scss
deleted file mode 100644
index 5ba78bf60..000000000
--- a/src/sass/rounded.scss
+++ /dev/null
@@ -1,85 +0,0 @@
-@import 'modules/theme';
-
-#start {
-  .startInner {
-    border: 0 none;
-    border-radius: 10px;
-  }
-}
-
-.resultInner {
-  .btn {
-    margin-left: 2px;
-  }
-}
-
-.sidenav {
-  .closebtn {
-    border-radius: 5px;
-  }
-}
-
-.btn,
-.gal-action-btn {
-  border-radius: 10px;
-}
-
-.gallery {
-  &__close,
-  &__reload {
-    border-radius: 5px;
-  }
-}
-
-.gallery-button,
-.fs-button {
-  &.round-btn {
-    margin-top: auto;
-    margin-left: auto;
-  }
-}
-
-.admin-panel,
-.manual-panel,
-.login-panel {
-  border: 0 none;
-  border-radius: 10px;
-}
-
-.panel {
-  .panel-heading,
-  .panel-body {
-    margin-top: 2px;
-    border-radius: 5px;
-  }
-
-button {
-  border: 2px solid $borderColor;
-  border-radius: 10px;
-}
-
-.faq-btn,
-.wiki-btn {
-  border: 2px solid $borderColor;
-  border-radius: 10px;
-}
-
-.slider {
-  height: 15px;
-  border-radius: 5px;
-}
-
-.slider::-webkit-slider-thumb,
-.slider::-moz-range-thumb {
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
-}
-
-.toggle {
-  border-radius: 0.5em;
-}
-
-.toggle:before {
-  border-radius: 50%;
-}
diff --git a/src/sass/update.scss b/src/sass/update.scss
index 1f058f966..49f44aa3e 100644
--- a/src/sass/update.scss
+++ b/src/sass/update.scss
@@ -3,6 +3,7 @@
 @import 'partials/button';
 @import 'partials/fonts';
 @import 'partials/modal';
+@import 'partials/shape';
 
 .updatewrapper {
   display: block;
diff --git a/template/classic.template.php b/template/classic.template.php
index 05402bf2b..413d8ff9b 100644
--- a/template/classic.template.php
+++ b/template/classic.template.php
@@ -1,10 +1,10 @@
 		<!-- Start Page -->
-		<div class="stages rotarygroup" id="start">
+		<div class="stages shape--<?php echo $config['ui']['style']; ?> rotarygroup noborder" id="start">
 			<?php if ($config['gallery']['enabled']): ?>
 			<a class="<?php echo $btnClass; ?> gallery-button rotaryfocus" href="#"><i class="fa fa-th"></i> <span data-i18n="gallery"></span></a>
 			<?php endif; ?>
 
-			<div class="startInner">
+			<div class="startInner shape--<?php echo $config['ui']['style']; ?> noborder">
 				<?php if ($config['event']['enabled']): ?>
 				<div class="names">
 					<?php if ($config['ui']['decore_lines']): ?>
diff --git a/template/classic_rounded.template.php b/template/classic_rounded.template.php
new file mode 100644
index 000000000..2834066d0
--- /dev/null
+++ b/template/classic_rounded.template.php
@@ -0,0 +1,83 @@
+		<!-- Start Page -->
+		<div class="stages shape--<?php echo $config['ui']['style']; ?> rotarygroup noborder" id="start">
+			<?php if ($config['gallery']['enabled']): ?>
+			<a class="<?php echo $btnClass; ?> gallery-button rotaryfocus noborder" href="#"><i class="fa fa-th"></i> <span data-i18n="gallery"></span></a>
+			<?php endif; ?>
+
+			<div class="startInner shape--<?php echo $config['ui']['style']; ?>">
+				<?php if ($config['event']['enabled']): ?>
+				<div class="names">
+					<?php if ($config['ui']['decore_lines']): ?>
+					<hr class="small" />
+					<hr>
+					<?php endif; ?>
+					<div>
+						<h1><?=$config['event']['textLeft']?>
+							<i class="fa <?=$config['event']['symbol']?>" aria-hidden="true"></i>
+							<?=$config['event']['textRight']?>
+							<?php if ($config['start_screen']['title_visible']): ?>
+							<br>
+							<?=$config['start_screen']['title']?>
+							<?php endif; ?>
+						</h1>
+						<?php if ($config['start_screen']['subtitle_visible']): ?>
+						<h2><?=$config['start_screen']['subtitle']?></h2>
+						<?php endif; ?>
+					</div>
+					<?php if ($config['ui']['decore_lines']): ?>
+					<hr>
+					<hr class="small" />
+					<?php endif; ?>
+				</div>
+				<?php else: ?>
+				<div class="names">
+					<?php if ($config['ui']['decore_lines']): ?>
+					<hr class="small" />
+					<hr>
+					<?php endif; ?>
+					<div>
+						<?php if ($config['start_screen']['title_visible']): ?>
+						<h1><?=$config['start_screen']['title']?></h1>
+						<?php endif; ?>
+						<?php if ($config['start_screen']['subtitle_visible']): ?>
+						<h2><?=$config['start_screen']['subtitle']?></h2>
+						<?php endif; ?>
+					</div>
+					<?php if ($config['ui']['decore_lines']): ?>
+					<hr>
+					<hr class="small" />
+					<?php endif; ?>
+				</div>
+				<?php endif; ?>
+
+				<?php if ($config['button']['force_buzzer']): ?>
+				<div id="useBuzzer">
+						<span data-i18n="use_button"></span>
+				</div>
+				<?php else: ?>
+					<?php if (!($config['collage']['enabled'] && $config['collage']['only'])): ?>
+					<a href="#" class="<?php echo $btnClass; ?> takePic rotaryfocus"><i class="fa fa-camera"></i> <span data-i18n="takePhoto"></span></a>
+					<?php endif; ?>
+
+					<?php if ($config['collage']['enabled']): ?>
+					<a href="#" class="<?php echo $btnClass; ?> takeCollage rotaryfocus"><i class="fa fa-th-large"></i> <span
+							data-i18n="takeCollage"></span></a>
+					<?php endif; ?>
+
+				<?php endif; ?>
+				<button hidden class="closeGallery"></button>
+				<button hidden class="triggerPic"></button>
+				<button hidden class="triggerCollage"></button>
+			</div>
+
+			<?php if ($config['ui']['show_fork']): ?>
+			<a href="https://github.com/<?=$config['ui']['github']?>/photobooth" class="github-fork-ribbon" data-ribbon="Fork me on GitHub">Fork me on GitHub</a>
+			<?php endif; ?>
+
+			<?php if($config['button']['show_cups']): ?>
+				<a id="cups-button" class="<?php echo $btnClass; ?>  cups-button rotaryfocus" href="#" target="newwin"><i class="fa fa-print" aria-hidden="true"></i> <span>CUPS</span></a>
+			<?php endif; ?>
+			<?php if($config['button']['show_fs']): ?>
+				<a href="#" id="fs-button" class="<?php echo $btnClass; ?> btn--small fs-button"><i class="fa fa-arrows-alt"></i> <span data-i18n="toggleFullscreen"></span></a>
+			<?php endif; ?>
+		</div>
diff --git a/template/modern.template.php b/template/modern.template.php
index a853b5bb0..4065a685f 100644
--- a/template/modern.template.php
+++ b/template/modern.template.php
@@ -1,6 +1,6 @@
 		<!-- Start Page -->
-		<div class="stages" id="start">
-			<div class="startInner">
+		<div class="stages shape--<?php echo $config['ui']['style']; ?> noborder" id="start">
+			<div class="startInner shape--<?php echo $config['ui']['style']; ?> noborder">
 				<div class="divaussen">
 					<div class="divinnen">
             					<div class="divinnen2">
diff --git a/template/modern_squared.template.php b/template/modern_squared.template.php
index a853b5bb0..4065a685f 100644
--- a/template/modern_squared.template.php
+++ b/template/modern_squared.template.php
@@ -1,6 +1,6 @@
 		<!-- Start Page -->
-		<div class="stages" id="start">
-			<div class="startInner">
+		<div class="stages shape--<?php echo $config['ui']['style']; ?> noborder" id="start">
+			<div class="startInner shape--<?php echo $config['ui']['style']; ?> noborder">
 				<div class="divaussen">
 					<div class="divinnen">
             					<div class="divinnen2">
diff --git a/update.php b/update.php
index 52dfd3375..ffcaca5fb 100644
--- a/update.php
+++ b/update.php
@@ -44,9 +44,6 @@
 	<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
 	<link rel="stylesheet" href="resources/css/<?php echo $config['ui']['style']; ?>_style.css" />
 	<link rel="stylesheet" href="resources/css/update.css" />
-	<?php if ($config['ui']['rounded_corners'] && $config['ui']['style'] === 'classic'): ?>
-	<link rel="stylesheet" href="resources/css/rounded.css" />
-	<?php endif; ?>
 	<?php if (is_file("private/overrides.css")): ?>
 	<link rel="stylesheet" href="private/overrides.css" />
 	<?php endif; ?>
@@ -54,7 +51,7 @@
 
 <body class="updatewrapper">
 
-	<div class="white-box" id="white-box">
+	<div class="white-box shape--<?php echo $config['ui']['style']; ?>" id="white-box">
 		<h2><?=$config['ui']['branding']?> Updater (experimental)</h2>
 		<p><span data-i18n="os_check"></span></p>
 	</div>
