diff --git a/application/config/version.php b/application/config/version.php
index 9e3726450ea..ff967f6e204 100644
--- a/application/config/version.php
+++ b/application/config/version.php
@@ -12,7 +12,7 @@
  */
 
 $config['versionnumber'] = '6.2.0-dev';
-$config['dbversionnumber'] = 611;
+$config['dbversionnumber'] = 612;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;
diff --git a/application/core/LsDefaultDataSets.php b/application/core/LsDefaultDataSets.php
index fbeef1dcbfa..22d02cb8d1d 100644
--- a/application/core/LsDefaultDataSets.php
+++ b/application/core/LsDefaultDataSets.php
@@ -978,8 +978,7 @@ public static function getTemplateConfigurationData()
             'files_print_css'   => '{"add":["css/print_theme.css"]}',
             'options'           => '{"hideprivacyinfo":"off","showpopups":"1","showclearall":"off","questionhelptextposition":"top","fixnumauto":"enable","backgroundimage":"off","backgroundimagefile":".\/files\/pattern.png",
                                      "brandlogo":"off","brandlogofile":"image::theme::files\/logo.png","font":"ibm-sans",
-                                     "cssframework":{"@attributes":{"type":"dropdown","category":"Simple options",
-                                     "width":"12","title":"Variations","parent":"cssframework"}}}',
+                                     "cssframework":"Apple"}',
             'cssframework_name' => '',
             'cssframework_css'  => '',
             'cssframework_js'   => '',
diff --git a/application/helpers/update/updates/Update_612.php b/application/helpers/update/updates/Update_612.php
new file mode 100644
index 00000000000..bf63d8935f3
--- /dev/null
+++ b/application/helpers/update/updates/Update_612.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace LimeSurvey\Helpers\Update;
+
+use CException;
+
+class Update_612 extends DatabaseUpdateBase
+{
+    /**
+     * @inheritDoc
+     * @throws CException
+     */
+    public function up()
+    {
+        $templateConfigurations = $this->db->createCommand()
+            ->select('id, options')
+            ->from('{{template_configuration}}')
+            ->where('template_name = :template_name', [':template_name' => 'fruity_twentythree'])
+            ->andWhere(['NOT IN', 'options', 'inherit'])
+            ->queryAll();
+
+        if (!empty($templateConfigurations)) {
+            foreach ($templateConfigurations as $templateConfiguration) {
+                if ($templateConfiguration['options'] !== 'inherit') {
+                    $sOptionsJson = $templateConfiguration['options'];
+                    $oOldOptions = json_decode($sOptionsJson);
+                    $oOldOptions->cssframework = 'Apple';
+                    $oNewOtionsJson = json_encode($oOldOptions);
+                    $this->db->createCommand()->update(
+                        '{{template_configuration}}',
+                        ['options' => $oNewOtionsJson],
+                        'id = :id',
+                        [':id' => $templateConfiguration['id']]
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/themes/survey/fruity_twentythree/config.xml b/themes/survey/fruity_twentythree/config.xml
index a89245a71b8..13cc5c15950 100644
--- a/themes/survey/fruity_twentythree/config.xml
+++ b/themes/survey/fruity_twentythree/config.xml
@@ -104,7 +104,8 @@
         </brandlogofile>
         <!-- fonts -->
         <!--  When adding new items, please keep them ordered alphabetically -->
-        <font type="dropdown" category="Fonts" width="12" title="Fonts" parent="font">ibm-sans
+        <font type="dropdown" category="Fonts" width="12" title="Fonts" parent="font">
+            ibm-sans
             <dropdownoptions>
                 <optgroup label="User browser">
                     <option class="font-arial           " value="arial" data-font-package="websafe">Arial</option>
@@ -133,11 +134,14 @@
             </dropdownoptions>
         </font>
         <cssframework type="dropdown" category="Simple options" width="12" title="Variations" parent="cssframework">
+            Apple
             <dropdownoptions>
-                <option data-value="css/variations/theme_apple.css" value="apple">Apple</option>
-                <option data-value="css/variations/theme_blueberry.css" value="blueberry">Blueberry</option>
-                <option data-value="css/variations/theme_grape.css" value="grape">Grape</option>
-                <option data-value="css/variations/theme_mango.css" value="mango">Mango</option>
+                <optgroup>
+                    <option data-value="css/variations/theme_apple.css" value="apple">Apple</option>
+                    <option data-value="css/variations/theme_blueberry.css" value="blueberry">Blueberry</option>
+                    <option data-value="css/variations/theme_grape.css" value="grape">Grape</option>
+                    <option data-value="css/variations/theme_mango.css" value="mango">Mango</option>
+                </optgroup>
             </dropdownoptions>
         </cssframework>
     </options>