Merge "Use WP2 BuildCompat library until androidx library stabilizes Bug: 132340681" into ub-launcher3-qt-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4857768..6d06bcc 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="com.android.wallpaper">
 
-    <uses-sdk android:targetSdkVersion="Q" android:minSdkVersion="28"/>
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="28"/>
 
     <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
diff --git a/res/color/edittext_background_color.xml b/res/color/edittext_background_color.xml
new file mode 100644
index 0000000..9191154
--- /dev/null
+++ b/res/color/edittext_background_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.16" android:color="@color/edit_background_base" android:state_hovered="true"/>
+    <item android:alpha="0.04" android:color="@color/edit_background_base" android:state_enabled="false"/>
+    <item android:alpha="0.05" android:color="@color/edit_background_base"/>
+</selector>
\ No newline at end of file
diff --git a/res/color/edittext_text_color.xml b/res/color/edittext_text_color.xml
new file mode 100644
index 0000000..174f6ca
--- /dev/null
+++ b/res/color/edittext_text_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:textColorPrimaryNoDisable" android:state_focused="true"/>
+    <item android:alpha="0.4" android:color="?android:textColorPrimaryNoDisable"/>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/edittext_background.xml b/res/drawable/edittext_background.xml
new file mode 100644
index 0000000..8fa91c3
--- /dev/null
+++ b/res/drawable/edittext_background.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edittext_background_color"/>
+            <corners android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" android:topLeftRadius="4dp" android:topRightRadius="4dp"/>
+        </shape>
+    </item>
+    <item android:gravity="bottom">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:colorAccent"/>
+            <size android:height="1dp"/>
+        </shape>
+    </item>
+</layer-list>
+
diff --git a/res/layout-land/fragment_custom_theme_name.xml b/res/layout-land/fragment_custom_theme_name.xml
new file mode 100644
index 0000000..0f190a8
--- /dev/null
+++ b/res/layout-land/fragment_custom_theme_name.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="?android:colorPrimary">
+    <include layout="@layout/section_header"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+        <FrameLayout
+            android:id="@+id/component_preview_container"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/secondary_color">
+            <include
+                android:id="@+id/component_preview_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"
+                android:layout_marginTop="@dimen/preview_page_top_margin"
+                android:layout_marginBottom="@dimen/component_preview_page_bottom_margin"
+                layout="@layout/theme_preview_card"/>
+        </FrameLayout>
+        <LinearLayout
+            android:id="@+id/options_section"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:paddingTop="10dp"
+            android:paddingBottom="@dimen/custom_theme_nav_height"
+            android:paddingVertical="10dp"
+            android:clipToPadding="false"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/component_options_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="10dp"
+                android:textAlignment="center"
+                android:textAppearance="@style/HeaderTextAppearance"/>
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/options_container_height"
+                android:layout_gravity="center">
+
+                <EditText
+                    style="@style/CustomThemeNameEditText"
+                    android:id="@+id/custom_theme_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:minWidth="300dp"/>
+            </FrameLayout>
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/fragment_custom_theme_name.xml b/res/layout/fragment_custom_theme_name.xml
new file mode 100644
index 0000000..98feb60
--- /dev/null
+++ b/res/layout/fragment_custom_theme_name.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:background="?android:colorPrimary">
+    <include layout="@layout/section_header"/>
+
+    <FrameLayout
+        android:id="@+id/component_preview_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@color/secondary_color">
+        <include
+            android:id="@+id/component_preview_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"
+            android:layout_marginTop="@dimen/preview_page_top_margin"
+            android:layout_marginBottom="@dimen/component_preview_page_bottom_margin"
+            layout="@layout/theme_preview_card"/>
+    </FrameLayout>
+    <LinearLayout
+        android:id="@+id/options_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="10dp"
+        android:clipToPadding="false"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/component_options_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="10dp"
+            android:textAlignment="center"
+            android:textAppearance="@style/HeaderTextAppearance"/>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/options_container_height"
+            android:layout_gravity="center">
+
+            <EditText
+                style="@style/CustomThemeNameEditText"
+                android:id="@+id/custom_theme_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:minWidth="300dp"/>
+        </FrameLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c8b36b7..57c1c71 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Volgende"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Vorige"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, tans toegepas"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, word tans toegepas en voorbeskou"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, word tans voorbeskou"</string>
     <string name="theme_description" msgid="3697012391785254635">"Lettertipe: <xliff:g id="ID_1">%1$s</xliff:g>, ikone: <xliff:g id="ID_2">%2$s</xliff:g>, vorm: <xliff:g id="ID_3">%3$s</xliff:g>, kleur: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Verstek"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Lettertipe"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Voeg jou gunstelinglettertipes op elke skerm by"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Styl is toegepas"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Kon nie die styl toepas nie"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Volgende"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Vorige"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Gepasmaak"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Gepasmaakte styl"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Vee uit"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Kies lettertipe"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c6f764d..f96cca0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"ቀጣይ"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"ቀዳሚ"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>፣ አሁን ላይ ተፈጻሚ ሆኗል"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, currently applied and previewed"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, currently previewed"</string>
     <string name="theme_description" msgid="3697012391785254635">"ቅርጸ-ቁምፊ፦ <xliff:g id="ID_1">%1$s</xliff:g>፣ አዶዎች፦ <xliff:g id="ID_2">%2$s</xliff:g>፣ ቅርጽ፦ <xliff:g id="ID_3">%3$s</xliff:g>፣ ቀለም፦ <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ነባሪ"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ቅርጸ-ቁምፊ"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"የእርስዎን ተወዳጅ ቁፊዎች ወደ ሁሉም ማያ ገጽ ያክሉ"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"ቅጥ ተተግብሯል"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"ቅጡን መተግበር ላይ ችግር ነበር"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"ቀጣይ"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"ቀዳሚ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"ብጁ"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"ብጁ ቅጥ"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"ሰርዝ"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ቅርጸ-ቁምፊ ይምረጡ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0163851..3346ba8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"التالي"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"السابق"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>، مستخدَم حاليًا"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"تتم معاينة وتطبيق الخيار <xliff:g id="ID_1">%1$s</xliff:g> حاليًا."</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"تتم معاينة الخيار <xliff:g id="ID_1">%1$s</xliff:g> حاليًا."</string>
     <string name="theme_description" msgid="3697012391785254635">"الخط: <xliff:g id="ID_1">%1$s</xliff:g>، الرموز: <xliff:g id="ID_2">%2$s</xliff:g>، الشكل: <xliff:g id="ID_3">%3$s</xliff:g>، اللون: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"تلقائي"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"الخط"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"يمكنك إضافة خطوطك المفضّلة إلى كل شاشة."</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"تم تطبيق النمط."</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"حدثت مشكلة أثناء تطبيق النمط."</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"التالي"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"الخطوة السابقة"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"مخصّص"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"النمط المخصّص"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"حذف"</string>
     <string name="font_component_title" msgid="8800340833695292049">"اختيار الخط"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 6830d34..fb0cf4d 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -32,7 +32,6 @@
     <string name="option_applied_description" msgid="5022305212078053534">"Hazırda <xliff:g id="ID_1">%1$s</xliff:g> tətbiq edilir"</string>
     <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> hazırda tətbiq edilir və önizlənilir"</string>
     <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> hazırda önizlənilir"</string>
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"Şrift: <xliff:g id="ID_1">%1$s</xliff:g>, ikonalar: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, rəng: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Defolt"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Şrift"</string>
@@ -44,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Sevimli şriftlərinizi hər ekrana əlavə edin"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Üslub tətbiq edildi"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Üslub tətbiq edilərkən xəta baş verdi"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Növbəti"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Əvvəlki"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Fərdi"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Fərdi Üslub"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Silin"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Şrift seçin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 2a5ad89..e080d5a 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Sledeća"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Prethodna"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutno je primenjeno"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABV"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutno je primenjeno i pregleda se"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutno se pregleda"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, ikone: <xliff:g id="ID_2">%2$s</xliff:g>, oblik: <xliff:g id="ID_3">%3$s</xliff:g>, boja: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Podrazum."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Dodajte omiljene fontove na svaki ekran"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stil je primenjen"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Došlo je do problema pri primeni stila"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Dalje"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Prethodno"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Prilagođeno"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Prilagođeni stil"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Izbriši"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Izaberite font"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 010ad5a..a03e94c 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Далей"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Назад"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, цяпер ужыта"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"АБВ"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, цяпер ужыта і папярэдне паказана"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, цяпер папярэдне паказваецца"</string>
     <string name="theme_description" msgid="3697012391785254635">"Шрыфт: <xliff:g id="ID_1">%1$s</xliff:g>, значкі: <xliff:g id="ID_2">%2$s</xliff:g>, фігура: <xliff:g id="ID_3">%3$s</xliff:g>, колер: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Стандартна"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Шрыфт"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Дадавайце любімыя шрыфты на кожны экран"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Стыль ужыты"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Не ўдалося ўжыць стыль"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Далей"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Назад"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Карыстальніцкія"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Карыстальніцкі стыль"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Выдаліць"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Выберыце шрыфт"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6407201..5a48e55 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Напред"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Назад"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"Понастоящем е приложена опцията „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"Понастоящем е приложена и визуализирана опцията „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"Понастоящем е визуализирана опцията „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
     <string name="theme_description" msgid="3697012391785254635">"Шрифт: <xliff:g id="ID_1">%1$s</xliff:g> – икони: <xliff:g id="ID_2">%2$s</xliff:g> – форма: <xliff:g id="ID_3">%3$s</xliff:g> – цвят: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Основно"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Шрифт"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Добавете любимите си шрифтове на всеки екран"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Стилът бе приложен"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"При прилагането на стила възникна проблем"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Напред"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Назад"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Персонализирано"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Персонализиран стил"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Изтриване"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Избиране на шрифт"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3aef143..90ffa5d 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"ফন্ট: <xliff:g id="ID_1">%1$s</xliff:g>, আইকন: <xliff:g id="ID_2">%2$s</xliff:g>, আকার: <xliff:g id="ID_3">%3$s</xliff:g>, রঙ: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ডিফল্ট"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ফন্ট"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"প্রতিটি স্ক্রিনে আপনার পছন্দের ফন্ট যোগ করুন"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"স্টাইল প্রয়োগ করা হয়েছে"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"স্টাইল প্রয়োগ করার সময়ে সমস্যা হয়েছে"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"পরবর্তী"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"আগের"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"কাস্টম"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"কাস্টম স্টাইল"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"মুছে ফেলুন"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ফন্ট বেছে নিন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 82ec980..c0968c2 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -30,9 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Naprijed"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Nazad"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutno primijenjeno"</string>
-    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutačno se primjenjuje i pregledava"</string>
-    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutačno se pregledava"</string>
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"Opcija <xliff:g id="ID_1">%1$s</xliff:g> se trenutno primjenjuje i pregleda"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"Opcija <xliff:g id="ID_1">%1$s</xliff:g> se trenutno pregleda"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, ikone: <xliff:g id="ID_2">%2$s</xliff:g>, oblik: <xliff:g id="ID_3">%3$s</xliff:g>, boja: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Zadano"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -44,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Dodajte omiljene fontove na svaki ekran"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stil je primijenjen"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Došlo je do problema kod primjene stila"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Naprijed"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Nazad"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Prilagođeno"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Prilagođeni stil"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Izbriši"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Odaberite font"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d78b7ee..6881756 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Següent"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Anterior"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, aplicat actualment"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, aplicada i previsualitzada actualment"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, previsualitzada actualment"</string>
     <string name="theme_description" msgid="3697012391785254635">"Tipus de lletra: <xliff:g id="ID_1">%1$s</xliff:g>; icones: <xliff:g id="ID_2">%2$s</xliff:g>; forma: <xliff:g id="ID_3">%3$s</xliff:g>; color: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Predeterminat"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Tipus de lletra"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Afegeix els teus tipus de lletra preferits a cada pantalla"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"L\'estil s\'ha aplicat"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"S\'ha produït un error en aplicar l\'estil"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Següent"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personalitzat"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Estil personalitzat"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Suprimeix"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Tria un tipus de lletra"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9713fcd..57110fc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Další"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Předchozí"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, momentálně použito"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, momentálně použito a v náhledu"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, momentálně v náhledu"</string>
     <string name="theme_description" msgid="3697012391785254635">"Písmo: <xliff:g id="ID_1">%1$s</xliff:g>, ikony: <xliff:g id="ID_2">%2$s</xliff:g>, tvar: <xliff:g id="ID_3">%3$s</xliff:g>, barva: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Výchozí"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Písmo"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Přidejte si oblíbená písma na všechny obrazovky"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> × <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Styl byl použit"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Styl se nepodařilo použít"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Další"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Předchozí"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Vlastní"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Vlastní styl"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Smazat"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Výběr písma"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 445f00f..9b4fa89 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Næste"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Forrige"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, er valgt"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> er valgt og forhåndsvises i øjeblikket"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> forhåndsvises i øjeblikket"</string>
     <string name="theme_description" msgid="3697012391785254635">"Skrifttype: <xliff:g id="ID_1">%1$s</xliff:g>, ikoner: <xliff:g id="ID_2">%2$s</xliff:g>, form: <xliff:g id="ID_3">%3$s</xliff:g>, farve: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Standard"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Skrifttype"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Føj dine foretrukne skrifttyper til alle skærmbilleder"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stilen er anvendt"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Der opstod et problem under anvendelse af stilen"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Næste"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Forrige"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Tilpasset"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Tilpasset stil"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Slet"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Vælg skrifttype"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 150e685..1d7713e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Weiter"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Zurück"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, wird aktuell angewendet"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, derzeit angewendet und in der Vorschau"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, derzeit in der Vorschau"</string>
     <string name="theme_description" msgid="3697012391785254635">"Schriftart: <xliff:g id="ID_1">%1$s</xliff:g>, Symbole: <xliff:g id="ID_2">%2$s</xliff:g>, Form: <xliff:g id="ID_3">%3$s</xliff:g>, Farbe: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Standard"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Schriftart"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Füg jedem Bildschirm deine bevorzugten Schriftarten hinzu"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Design angewendet"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Beim Anwenden des Designs ist ein Fehler aufgetreten"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Weiter"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Zurück"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Benutzerdefiniert"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Benutzerdefiniertes Design"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Löschen"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Schriftart auswählen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 57930ac..5cb7e69 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Επόμενο"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Προηγούμενο"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"Αυτήν τη στιγμή εφαρμόζεται το θέμα <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ΑΒΓ"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"Αυτήν τη στιγμή εφαρμόζεται και εμφανίζεται σε προεπισκόπηση η επιλογή <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"Αυτήν τη στιγμή εμφανίζεται σε προεπισκόπηση η επιλογή <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="theme_description" msgid="3697012391785254635">"Γραμματοσειρά: <xliff:g id="ID_1">%1$s</xliff:g>, εικονίδια: <xliff:g id="ID_2">%2$s</xliff:g>, σχήμα: <xliff:g id="ID_3">%3$s</xliff:g>, χρώμα: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Προεπιλογή"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Γραμματοσειρά"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Προσθέστε τις αγαπημένες σας γραμματοσειρές σε κάθε οθόνη"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Εφαρμόστηκε στυλ"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Παρουσιάστηκε ένα πρόβλημα με την εφαρμογή του στυλ"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Επόμενο"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Προηγούμενο"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Προσαρμοσμένο"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Προσαρμοσμένο στυλ"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Διαγραφή"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Επιλέξτε γραμματοσειρά"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 65bca8b..f2fcf27 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Next"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Previous"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, currently applied"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, currently applied and previewed"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, currently previewed"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, icons: <xliff:g id="ID_2">%2$s</xliff:g>, shape: <xliff:g id="ID_3">%3$s</xliff:g>, colour: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Default"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Add your favourite fonts to every screen"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Style applied"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"There was a problem applying the style"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Next"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Previous"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Custom"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Custom Style"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Delete"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Choose font"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 65bca8b..f2fcf27 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Next"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Previous"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, currently applied"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, currently applied and previewed"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, currently previewed"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, icons: <xliff:g id="ID_2">%2$s</xliff:g>, shape: <xliff:g id="ID_3">%3$s</xliff:g>, colour: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Default"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Add your favourite fonts to every screen"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Style applied"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"There was a problem applying the style"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Next"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Previous"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Custom"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Custom Style"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Delete"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Choose font"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 65bca8b..f2fcf27 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Next"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Previous"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, currently applied"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, currently applied and previewed"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, currently previewed"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, icons: <xliff:g id="ID_2">%2$s</xliff:g>, shape: <xliff:g id="ID_3">%3$s</xliff:g>, colour: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Default"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Add your favourite fonts to every screen"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Style applied"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"There was a problem applying the style"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Next"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Previous"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Custom"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Custom Style"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Delete"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Choose font"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c3c8e93..8f3ba5e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Siguiente"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Anterior"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> (aplicado actualmente)"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> (opción aplicada y vista previa en curso)"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> (vista previa en curso)"</string>
     <string name="theme_description" msgid="3697012391785254635">"Fuente: <xliff:g id="ID_1">%1$s</xliff:g>, íconos: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, color: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Predeter."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Fuente"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Agrega tus fuentes favoritas a cada pantalla"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Se aplicó el estilo"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Se produjo un error al aplicar el estilo"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Siguiente"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personalizado"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Estilo personalizado"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Borrar"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Elegir fuente"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3920c57..ae656eb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Siguiente"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Anterior"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"Se ha aplicado <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> (opción aplicada y vista previa en curso)"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> (vista previa en curso)"</string>
     <string name="theme_description" msgid="3697012391785254635">"Fuente: <xliff:g id="ID_1">%1$s</xliff:g>; iconos: <xliff:g id="ID_2">%2$s</xliff:g>; forma: <xliff:g id="ID_3">%3$s</xliff:g>; color: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Predeterm."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Fuente"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Añade tus fuentes favoritas a cada pantalla"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Estilo aplicado"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"No se ha podido aplicar el estilo"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Siguiente"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personalizado"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Estilo personal"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Eliminar"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Elegir fuente"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index a68b476..570fabf 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Järgmine"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Eelmine"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, praegu rakendatud"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, praegu rakendatakse ja kuvatakse eelvaadet"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, praegu kuvatakse eelvaadet"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, ikoonid: <xliff:g id="ID_2">%2$s</xliff:g>, kuju: <xliff:g id="ID_3">%3$s</xliff:g>, värv: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Vaikeseade"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Lisage lemmikfondid igale erkaanikuvale"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> × <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stiil rakendati"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Stiili rakendamisel ilmnes probleem"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Järgmine"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Eelmine"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Kohandatud"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Kohandatud stiil"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Kustuta"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Valige font"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d553428..dbb0fbd 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -32,7 +32,6 @@
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> (aplikatuta dago)"</string>
     <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> (aplikatuta eta aurrebista gisa ikusgai)"</string>
     <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> (aurrebista gisa ikusgai)"</string>
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"Letra-tipoa: <xliff:g id="ID_1">%1$s</xliff:g>, ikonoak: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, kolorea: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Lehenetsia"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Letra-tipoa"</string>
@@ -44,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Gehitu gogoko dituzun letra-tipoak pantaila guztietan"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Aplikatu da estiloa"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Arazo bat izan da estiloa aplikatzean"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Hurrengoa"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Aurrekoa"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Pertsonalizatua"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Pertsonalizatu estiloa"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Ezabatu"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Aukeratu letra-tipoa"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8462819..70c9347 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"بعدی"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"قبلی"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>، درحال‌حاضر اعمال شده است"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>، درحال‌حاضر اعمال و پیش‌نمایش شده است"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>، درحال‌حاضر پیش‌نمایش شده است"</string>
     <string name="theme_description" msgid="3697012391785254635">"قلم: <xliff:g id="ID_1">%1$s</xliff:g>، نمادها: <xliff:g id="ID_2">%2$s</xliff:g>، شکل: <xliff:g id="ID_3">%3$s</xliff:g>، رنگ: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"پیش‌فرض"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"قلم"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"قلم‌های دلخواهتان را به همه صفحه‌نمایش‌ها اضافه کنید"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"سبک اعمال شد"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"مشکلی در اعمال سبک روی داد"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"بعدی"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"قبلی"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"سفارشی"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"سفارشی کردن سبک"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"حذف"</string>
     <string name="font_component_title" msgid="8800340833695292049">"انتخاب قلم"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 27d32b8..d29c8cb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Seuraava"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Edellinen"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, käytössä tällä hetkellä"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, käytössä ja esikatselussa tällä hetkellä"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, esikatselussa tällä hetkellä"</string>
     <string name="theme_description" msgid="3697012391785254635">"Kirjasin: <xliff:g id="ID_1">%1$s</xliff:g>, kuvakkeet: <xliff:g id="ID_2">%2$s</xliff:g>, muoto: <xliff:g id="ID_3">%3$s</xliff:g>, väri: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Oletus"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Kirjasin"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Lisää lempikirjasimesi joka näytölle"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Käytössä oleva tyyli"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Tyylin käyttöönotossa tapahtui virhe"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Seuraava"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Edellinen"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Oma"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Oma tyyli"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Poista"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Valitse kirjasin"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8bc2243..bd1cb68 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Suivant"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Précédent"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"L\'option <xliff:g id="ID_1">%1$s</xliff:g> est présentement active"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"Option appliquée et en cours d\'aperçu : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"Option en cours d\'aperçu : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="theme_description" msgid="3697012391785254635">"Police : <xliff:g id="ID_1">%1$s</xliff:g>, icônes : <xliff:g id="ID_2">%2$s</xliff:g>, forme : <xliff:g id="ID_3">%3$s</xliff:g>, couleur : <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Par défaut"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Police"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Ajoutez vos polices préférées à chaque écran"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Style appliqué"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Un problème est survenu lors de l\'application du style"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Suivant"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Précédent"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personnaliser"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Style personnalisé"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Supprimer"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Choisissez une police"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6169751..a62c7a2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Suivant"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Précédent"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, option appliquée actuellement"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> (option actuellement appliquée et prévisualisée)"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> (option actuellement prévisualisée)"</string>
     <string name="theme_description" msgid="3697012391785254635">"Police : <xliff:g id="ID_1">%1$s</xliff:g>, icônes : <xliff:g id="ID_2">%2$s</xliff:g>, forme : <xliff:g id="ID_3">%3$s</xliff:g>, couleur : <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Par défaut"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Police"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Ajoutez vos polices préférées sur chaque écran"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Le style a bien été appliqué"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Un problème est survenu au moment d\'appliquer le style"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Suivant"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Précédent"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personnalisé"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Style personnalisé"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Supprimer"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Sélectionner une police"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 3c858a2..2a5a720 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Seguinte"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Anterior"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, opción aplicada actualmente"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> (opción aplicada e en vista previa actualmente)"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> (opción en vista previa actualmente)"</string>
     <string name="theme_description" msgid="3697012391785254635">"Tipo de letra: <xliff:g id="ID_1">%1$s</xliff:g>, iconas: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, cor: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Predeterm."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Tipo de letra"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Engade as túas fontes favoritas a todas as pantallas"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Aplicouse o estilo"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Produciuse un problema ao aplicar o estilo"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Seguinte"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personalizado"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Estilo personalizado"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Eliminar"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Escoller tipo de letra"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 81f20a5..3edd181 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"ફોન્ટ: <xliff:g id="ID_1">%1$s</xliff:g>, આઇકન: <xliff:g id="ID_2">%2$s</xliff:g>, આકાર: <xliff:g id="ID_3">%3$s</xliff:g>, રંગ: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ડિફૉલ્ટ"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ફોન્ટ"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"દરેક સ્ક્રીન પર તમારા મનપસંદ ફોન્ટ ઉમેરો"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"શૈલી લાગુ કરી"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"શૈલી લાગુ કરવામાં સમસ્યા આવી હતી"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"આગલી થીમ"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"પાછળ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"કસ્ટમ"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"કસ્ટમ શૈલી"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"ડિલીટ કરો"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ફોન્ટ પસંદ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6f99b2c..ede44fa 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"फ़ॉन्ट: <xliff:g id="ID_1">%1$s</xliff:g>, आइकॉन: <xliff:g id="ID_2">%2$s</xliff:g>, बनावट: <xliff:g id="ID_3">%3$s</xliff:g>, रंग: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"डिफ़ॉल्ट"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"फ़ॉन्ट"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"हर स्क्रीन पर अपने पसंदीदा फ़ॉन्ट जोड़ें"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"शैली लागू की गई"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"शैली लागू करने में समस्या हुई"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"अगला"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"पीछे जाएं"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"कस्टम"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"शैली पसंद के मुताबिक बनाना"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"मिटाएं"</string>
     <string name="font_component_title" msgid="8800340833695292049">"फ़ॉन्ट चुनें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 077b86f..199f677 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -32,7 +32,6 @@
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutačno primijenjeno"</string>
     <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutačno se primjenjuje i pregledava"</string>
     <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, trenutačno se pregledava"</string>
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, ikone: <xliff:g id="ID_2">%2$s</xliff:g>, oblik: <xliff:g id="ID_3">%3$s</xliff:g>, boja: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Zadano"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -44,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Dodajte svoje omiljene fontove na svaki zaslon"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stil je primijenjen"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Pojavio se problem prilikom primjene stila"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Sljedeće"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Prethodno"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Prilagođeno"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Prilagođeni stil"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Izbriši"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Odaberite font"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8963675..63d83ba 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Tovább"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Előző"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, jelenleg érvényben van"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, alkalmazva és előnézet folyamatban"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, előnézet folyamatban"</string>
     <string name="theme_description" msgid="3697012391785254635">"Betűtípus: <xliff:g id="ID_1">%1$s</xliff:g>, ikonok: <xliff:g id="ID_2">%2$s</xliff:g>, alak: <xliff:g id="ID_3">%3$s</xliff:g>, szín: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Alap"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Betűtípus"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Adja hozzá kedvenc betűtípusát az összes képernyőhöz"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>×<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stílus alkalmazva"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Hiba történt a stílus alkalmazása során"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Tovább"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Előző"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Egyéni"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Egyéni stílus"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Törlés"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Betűtípus kiválasztása"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 0613a88..fe4f040 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Առաջ"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Հետ"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> (այժմ կիրառվում է)"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, այժմ կիրառվում և ցուցադրվում է"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, այժմ ցուցադրվում է"</string>
     <string name="theme_description" msgid="3697012391785254635">"Տառատեսակ՝ <xliff:g id="ID_1">%1$s</xliff:g>, պատկերակներ՝ <xliff:g id="ID_2">%2$s</xliff:g>, ձև՝ <xliff:g id="ID_3">%3$s</xliff:g>, գույն՝ <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Կանխադրված"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Տառատեսակ"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Ավելացրեք ձեր նախընտրած տառատեսակները յուրաքանչյուր էկրանին"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Ոճը կիրառվեց"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Չհաջողվեց կիրառել ոճը"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Առաջ"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Հետ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Հատուկ"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Հատուկ ոճ"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Ջնջել"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Ընտրեք տառատեսակ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5bc2e03..f6c1852 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Berikutnya"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Sebelumnya"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, saat ini diterapkan"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, saat ini diterapkan dan dilihat pratinjaunya"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, saat ini dilihat pratinjaunya"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, ikon: <xliff:g id="ID_2">%2$s</xliff:g>, bentuk: <xliff:g id="ID_3">%3$s</xliff:g>, warna: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Default"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Tambahkan font favorit ke setiap layar"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Gaya diterapkan"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Terjadi masalah saat menerapkan gaya"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Berikutnya"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Sebelumnya"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Kustom"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Gaya Kustom"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Hapus"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Pilih font"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 088b6fd..fcc4137 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Næsta"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Fyrra"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, notaður"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, í notkun og forskoðun"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, í forskoðun"</string>
     <string name="theme_description" msgid="3697012391785254635">"Leturgerð: <xliff:g id="ID_1">%1$s</xliff:g>, tákn: <xliff:g id="ID_2">%2$s</xliff:g>, form: <xliff:g id="ID_3">%3$s</xliff:g>, litur: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Sjálfgefið"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Leturgerð"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Fáðu uppáhaldsleturgerðirnar þínar á alla skjái"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stíll notaður"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Vandamál kom upp við að nota stílinn"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Næsta"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Fyrra"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Sérsniðið"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Sérsniðinn stíll"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Eyða"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Velja leturgerð"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5052a89..a308878 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Avanti"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Indietro"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, attualmente applicata"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, attualmente applicata e visualizzata in anteprima"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, attualmente visualizzata in anteprima"</string>
     <string name="theme_description" msgid="3697012391785254635">"Carattere: <xliff:g id="ID_1">%1$s</xliff:g>, icone: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, colore: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Predef."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Carattere"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Aggiungi i tuoi caratteri preferiti a ogni schermata"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stile applicato"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Si è verificato un problema durante l\'applicazione dello stile"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Avanti"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Indietro"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personalizzato"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Stile personalizzato"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Elimina"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Scegli il carattere"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 89734a6..4cbd32b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"אבג"</string>
     <string name="theme_description" msgid="3697012391785254635">"גופן: <xliff:g id="ID_1">%1$s</xliff:g>, סמלים: <xliff:g id="ID_2">%2$s</xliff:g>, צורה: <xliff:g id="ID_3">%3$s</xliff:g>, צבע: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ברירת מחדל"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"גופן"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"אפשר להוסיף את הפונטים המועדפים לכל מסך"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"הסגנון הוחל"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"הייתה בעיה בהחלת הסגנון"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"הבא"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"הקודם"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"מותאם אישית"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"סגנון מותאם אישית"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"מחיקה"</string>
     <string name="font_component_title" msgid="8800340833695292049">"בחירת גופן"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 87fc235..dff4eff 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"次へ"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"前へ"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>(現在適用中)"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>(現在、適用してプレビュー中)"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>(現在、プレビュー中)"</string>
     <string name="theme_description" msgid="3697012391785254635">"フォント: <xliff:g id="ID_1">%1$s</xliff:g>、アイコン: <xliff:g id="ID_2">%2$s</xliff:g>、形状: <xliff:g id="ID_3">%3$s</xliff:g>、色: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"デフォルト"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"フォント"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"お気に入りのフォントをすべての画面に追加できます"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"スタイルを適用しました"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"スタイルの適用中にエラーが発生しました"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"次へ"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"前へ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"カスタム"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"カスタム スタイル"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"削除"</string>
     <string name="font_component_title" msgid="8800340833695292049">"フォントの選択"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index c6e9d97..aa88875 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"შემდეგი"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"წინა"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, ამჟამად მისადაგებული"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"აბგ"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, ამჟამად მისადაგებულია და გადახედვის პროცესშია"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, გადახედვის პროცესშია"</string>
     <string name="theme_description" msgid="3697012391785254635">"შრიფტი: <xliff:g id="ID_1">%1$s</xliff:g>, ხატულები: <xliff:g id="ID_2">%2$s</xliff:g>, ფორმა: <xliff:g id="ID_3">%3$s</xliff:g>, ფერი: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ნაგულისხ."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"შრიფტი"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"დაამატეთ თქვენი საყვარელი შრიფტები ყოველ ეკრანზე"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"სტილი მისადაგებულია"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"სტილის მისადაგებისას პრობლემა წარმოიქმნა"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"შემდეგი"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"წინა"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"მორგებული"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"მორგებული სტილი"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"წაშლა"</string>
     <string name="font_component_title" msgid="8800340833695292049">"შრიფტის არჩევა"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 49d4733..98dd689 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Келесі"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Алдыңғы"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, қазір қосулы"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, қазір қолданылды және алдын ала қаралды"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, қазір алдын ала қаралды"</string>
     <string name="theme_description" msgid="3697012391785254635">"Қарпі: <xliff:g id="ID_1">%1$s</xliff:g>, белгішелері: <xliff:g id="ID_2">%2$s</xliff:g>, пішіні: <xliff:g id="ID_3">%3$s</xliff:g>, түсі: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Әдепкі"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Қаріп"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Әрбір экранға ұнайтын қаріптерді қосыңыз."</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Стиль қолданылды."</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Стильді қолдану кезінде қате шықты."</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Келесі"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Алдыңғы"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Арнаулы"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Арнаулы стиль"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Жою"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Қаріп таңдау"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 48fdb4f..9a1bec6 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"បន្ទាប់"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"មុន"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> ត្រូវបានប្រើ​បច្ចុប្បន្ននេះ"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> កំពុងត្រូវបានអនុវត្ត និង​មើលសាកល្បង​បច្ចុប្បន្ននេះ"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> កំពុងត្រូវបាន​មើលសាកល្បង​បច្ចុប្បន្ននេះ"</string>
     <string name="theme_description" msgid="3697012391785254635">"ពុម្ព​អក្សរ៖ <xliff:g id="ID_1">%1$s</xliff:g>, រូបតំណាង៖ <xliff:g id="ID_2">%2$s</xliff:g>, រូបរាង៖ <xliff:g id="ID_3">%3$s</xliff:g>, ពណ៌៖ <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"លំនាំដើម"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ពុម្ពអក្សរ"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"បញ្ចូលពុម្ព​អក្សរ​ដែលអ្នកចូលចិត្ត​ទៅគ្រប់អេក្រង់"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"បានប្រើ​រចនាប័ទ្ម"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"មានបញ្ហា​ក្នុងការប្រើ​រចនាប័ទ្ម"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"បន្ទាប់"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"មុន"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"ផ្ទាល់ខ្លួន"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"រចនាប័ទ្ម​ផ្ទាល់ខ្លួន"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"លុប"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ជ្រើសរើស​ពុម្ភអក្សរ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index eea69a7..046f1e8 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"ಫಾಂಟ್: <xliff:g id="ID_1">%1$s</xliff:g>, ಐಕಾನ್‌ಗಳು: <xliff:g id="ID_2">%2$s</xliff:g>, ಆಕಾರ: <xliff:g id="ID_3">%3$s</xliff:g>, ಬಣ್ಣ: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ಡೀಫಾಲ್ಟ್"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ಫಾಂಟ್"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"ಪ್ರತಿ ಸ್ಕ್ರೀನ್‌ಗೆ ನಿಮ್ಮ ಮೆಚ್ಚಿನ ಫಾಂಟ್‌ಗಳನ್ನು ಸೇರಿಸಿ"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"ಶೈಲಿಯನ್ನು ಅನ್ವಯಿಸಲಾಗಿದೆ"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"ಶೈಲಿಯನ್ನು ಅನ್ವಯಿಸುವಲ್ಲಿ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"ಮುಂದಿನದು"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"ಹಿಂದಿನ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"ಕಸ್ಟಮ್"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"ಕಸ್ಟಮ್ ಶೈಲಿ"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"ಅಳಿಸಿ"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ಫಾಂಟ್ ಆಯ್ಕೆಮಾಡಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c657074..4f2d551 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"다음"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"이전"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, 현재 적용됨"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, 현재 적용되어 미리보기 중"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, 현재 미리보기 중"</string>
     <string name="theme_description" msgid="3697012391785254635">"글꼴: <xliff:g id="ID_1">%1$s</xliff:g>, 아이콘: <xliff:g id="ID_2">%2$s</xliff:g>, 도형: <xliff:g id="ID_3">%3$s</xliff:g>, 색상: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"기본값"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"글꼴"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"모든 화면에 좋아하는 글꼴을 추가하세요."</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"스타일 적용됨"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"스타일을 적용하는 중에 문제가 발생했습니다."</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"다음"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"이전"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"맞춤"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"맞춤 스타일"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"삭제"</string>
     <string name="font_component_title" msgid="8800340833695292049">"글꼴 선택"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 6e28443..db8cd75 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Кийинки"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Мурунку"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, учурда колдонулууда"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"АБВ"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, учурда колдонулуп, текшерилди"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, учурда текшерилип жатат"</string>
     <string name="theme_description" msgid="3697012391785254635">"Арип: <xliff:g id="ID_1">%1$s</xliff:g>, сүрөтчөлөр: <xliff:g id="ID_2">%2$s</xliff:g>, форма: <xliff:g id="ID_3">%3$s</xliff:g>, түс: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Демейки"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Арип"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Жактырган ариптериңизди каалаган экранга коюп алсаңыз болот"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Стиль колдонулду"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Стилди колдонууда маселе келип чыкты"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Кийинки"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Мурунку"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Ыңгайлаштырылган"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Ыңгайлаштырылган стиль"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Жок кылуу"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Арип тандоо"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 3645caa..30f22c5 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"ຖັດໄປ"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"ກ່ອນໜ້າ"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, ຕອນນີ້ນຳໃຊ້ແລ້ວ"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, ຕອນນີ້ນຳໃຊ້ ແລະ ເບິ່ງຕົວຢ່າງແລ້ວ"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, ຕອນນີ້ເບິ່ງຕົວຢ່າງແລ້ວ"</string>
     <string name="theme_description" msgid="3697012391785254635">"ຟອນ: <xliff:g id="ID_1">%1$s</xliff:g>, ໄອຄອນ: <xliff:g id="ID_2">%2$s</xliff:g>, ຮູບຮ່າງ: <xliff:g id="ID_3">%3$s</xliff:g>, ສີ: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ຟອນ"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"ເພີ່ມຟອນທີ່ທ່ານມັກໃສ່ທຸກໜ້າຈໍ"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"ນຳໃຊ້ຮູບແບບແລ້ວ"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"ເກີດບັນຫາໃນການນຳໃຊ້ຮູບແບບ"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"ຖັດໄປ"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"ຜ່ານມາ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"ກຳນົດເອງ"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"ຮູບແບບກຳນົດເອງ"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"ລຶບ"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ເລືອກຟອນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3a81db5..045ff61 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Kitas"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Ankstesnis"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, šiuo metu taikoma"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, šiuo metu taikoma ir peržiūrima"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, šiuo metu peržiūrima"</string>
     <string name="theme_description" msgid="3697012391785254635">"Šriftas: <xliff:g id="ID_1">%1$s</xliff:g>, piktogramos: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, spalva: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Numatytoji"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Šriftas"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Pridėkite mėgstamiausių šriftų prie kiekvieno ekrano"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stilius pritaikytas"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Taikant stilių kilo problema"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Kitas"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Ankstesnis"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Tinkinta"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Tinkintas stilius"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Ištrinti"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Pasirinkite šriftą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 66441cf..090a9b7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Tālāk"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Atpakaļ"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, pašlaik tiek lietots"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, pašlaik tiek lietots un priekšskatīts"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, pašlaik tiek priekšskatīts"</string>
     <string name="theme_description" msgid="3697012391785254635">"Fonts: <xliff:g id="ID_1">%1$s</xliff:g>, ikonas: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, krāsa: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Noklus."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Fonts"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Pievienojiet savus iecienītos fontus visos ekrānos."</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stils tiek lietots"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Lietojot stilu, radās problēma."</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Tālāk"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Atpakaļ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Pielāgots"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Pielāgots stils"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Dzēst"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Fonta izvēle"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 75da376..d3f3ace 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Следно"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Претходно"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, применета во моментов"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, применети и прегледани во моментов"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, прегледани во моментов"</string>
     <string name="theme_description" msgid="3697012391785254635">"Фонт: <xliff:g id="ID_1">%1$s</xliff:g>, икони: <xliff:g id="ID_2">%2$s</xliff:g>, облик: <xliff:g id="ID_3">%3$s</xliff:g>, боја: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Стандардно"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Фонт"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Додајте ги омилените фонтови на секој екран"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Стилот е применет"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Настана проблем со применување на стилот"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Следно"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Претходно"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Приспособено"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Приспособен стил"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Избриши"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Изберете фонт"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 5e29e3e..0dd8c87 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"ഫോണ്ട്: <xliff:g id="ID_1">%1$s</xliff:g>, ഐക്കണുകൾ: <xliff:g id="ID_2">%2$s</xliff:g>, രൂപം: <xliff:g id="ID_3">%3$s</xliff:g>, വർണ്ണം: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ഡിഫോൾട്ട്"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ഫോണ്ട്"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"എല്ലാ സ്‌ക്രീനിലേക്കും നിങ്ങളുടെ പ്രിയപ്പെട്ട ഫോണ്ടുകൾ ചേർക്കുക"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"സ്‌റ്റൈൽ പ്രയോഗിച്ചു"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"സ്‌റ്റൈൽ പ്രയോഗിക്കുന്നതിൽ ഒരു പ്രശ്‌നമുണ്ടായി"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"അടുത്തത്"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"മുമ്പത്തെ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"ഇഷ്‌ടാനുസൃതം"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"ഇഷ്‌ടാനുസൃത സ്‌റ്റൈൽ"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"ഇല്ലാതാക്കുക"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ഫോണ്ട് തിരഞ്ഞെടുക്കുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 082565e..33b6a45 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Дараах"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Өмнөх"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>-г одоогоор ашигласан"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>-г одоогоор хэрэгжүүлсэн бөгөөд шалгасан"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>-г одоогоор шалгасан"</string>
     <string name="theme_description" msgid="3697012391785254635">"Фонт: <xliff:g id="ID_1">%1$s</xliff:g>, дүрс тэмдэг: <xliff:g id="ID_2">%2$s</xliff:g>, дүрс: <xliff:g id="ID_3">%3$s</xliff:g>, өнгө: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Өгөгдмөл"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Фонт"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Дэлгэц бүрд дуртай фонтоо нэмэх"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Загварыг ашигласан"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Загварыг ашиглахад асуудал гарлаа"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Дараах"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Өмнөх"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Захиалгат"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Захиалгат загвар"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Устгах"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Фонт сонгох"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index cfb15d7..642a0e3 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"फॉन्ट: <xliff:g id="ID_1">%1$s</xliff:g> आयकन: <xliff:g id="ID_2">%2$s</xliff:g> आकार: <xliff:g id="ID_3">%3$s</xliff:g> रंग: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"डीफॉल्ट"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"फॉन्ट"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"प्रत्येक स्क्रीनवर तुमचे आवडते फॉन्ट जोडा"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"शैली लागू केली आहे"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"शैली लागू करताना समस्या आली"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"पुढील"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"मागील"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"कस्टम"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"कस्टम शैली"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"हटवा"</string>
     <string name="font_component_title" msgid="8800340833695292049">"फॉन्ट निवडा"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index effe1f3..6502d47 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Seterusnya"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Sebelumnya"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, digunakan pada masa ini"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, digunakan dan dipratonton pada masa ini"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, dipratonton pada masa ini"</string>
     <string name="theme_description" msgid="3697012391785254635">"Fon: <xliff:g id="ID_1">%1$s</xliff:g>, ikon: <xliff:g id="ID_2">%2$s</xliff:g>, bentuk: <xliff:g id="ID_3">%3$s</xliff:g>, warna: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Lalai"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Fon"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Tambahkan fon kegemaran anda pada setiap skrin"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Gaya digunakan"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Terdapat masalah menggunakan gaya"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Seterusnya"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Sebelumnya"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Tersuai"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Gaya Tersuai"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Padam"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Pilih fon"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 13e42b0..750fd31 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -32,7 +32,6 @@
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> ကို လက်ရှိအသုံးပြုထားသည်"</string>
     <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>၊ လက်ရှိ အသုံးပြုပြီး အစမ်းကြည့်ထားသည်"</string>
     <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>၊ လက်ရှိ အစမ်းကြည့်ထားသည်"</string>
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"ဖောင့်- <xliff:g id="ID_1">%1$s</xliff:g>၊ သင်္ကေတများ- <xliff:g id="ID_2">%2$s</xliff:g>၊ ပုံသဏ္ဌာန်- <xliff:g id="ID_3">%3$s</xliff:g>၊ အရောင်- <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"မူရင်း"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ဖောင့်"</string>
@@ -44,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"မျက်နှာပြင်တိုင်းတွင် သင့်အကြိုက်ဆုံး ဖောင့်များ ထည့်ရန်"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"ပုံစံ အသုံပြုထားပါသည်"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"ဤပုံစံ အသုံးပြုရာတွင် ပြဿနာရှိသည်"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"ရှေ့သို့"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"ယခင်"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"စိတ်ကြိုက်"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"စိတ်ကြိုက် ပုံစံ"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"ဖျက်ရန်"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ဖောင့်ရွေးပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cbbd7d5..c1a5a91 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Neste"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Forrige"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, brukes for øyeblikket"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, brukes of forhåndsvises for øyeblikket"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, forhåndsvises for øyeblikket"</string>
     <string name="theme_description" msgid="3697012391785254635">"Skrifttype: <xliff:g id="ID_1">%1$s</xliff:g>, ikoner: <xliff:g id="ID_2">%2$s</xliff:g>, form: <xliff:g id="ID_3">%3$s</xliff:g>, farge: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Standard"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Skrifttype"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Legg til favorittskrifttypen din på alle skjermer"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stilen brukes"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Det oppsto et problem med implementering av stilen"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Neste"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Forrige"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Egendefinert"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Egendefinert stil"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Slett"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Velg skrifttype"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 91b2cde..2f25a67 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"फन्ट: <xliff:g id="ID_1">%1$s</xliff:g>, आइकनहरू: <xliff:g id="ID_2">%2$s</xliff:g>, आकार: <xliff:g id="ID_3">%3$s</xliff:g>, रङ: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"पूर्वनिर्धारित"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"फन्ट"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"प्रत्येक स्क्रिनमा आफूलाई मन पर्ने फन्टहरू थप्नुहोस्"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"शैली लागू गरियो"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"उक्त शैली लागू गर्ने क्रममा कुनै समस्या भयो"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"अर्को"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"अघिल्लो"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"आफू अनुकूल"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"आफू अनुकूल शैली"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"मेट्नुहोस्"</string>
     <string name="font_component_title" msgid="8800340833695292049">"फन्ट छनौट गर्नुहोस्"</string>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 1ddfc10..6a79445 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -38,4 +38,6 @@
     <color name="toolbar_color">#000000</color>
 
     <color name="divider_color">@color/white_14_alpha</color>
+
+    <color name="edit_background_base">@color/material_white_100</color>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3888fd0..23de92c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Volgende"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Vorige"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, momenteel toegepast"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, wordt momenteel toegepast en bekeken"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, wordt momenteel bekeken"</string>
     <string name="theme_description" msgid="3697012391785254635">"Lettertype: <xliff:g id="ID_1">%1$s</xliff:g>, pictogrammen: <xliff:g id="ID_2">%2$s</xliff:g>, vorm: <xliff:g id="ID_3">%3$s</xliff:g>, kleur: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Standaard"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Lettertype"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Voeg je favoriete lettertypen toe aan elk scherm"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stijl toegepast"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Er is een probleem opgetreden bij het toepassen van de stijl"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Volgende"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Vorige"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Aangepast"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Aangepaste stijl"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Verwijderen"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Lettertype kiezen"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 1f2f6dc..855378a 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"ਫੌਂਟ: <xliff:g id="ID_1">%1$s</xliff:g>, ਪ੍ਰਤੀਕ: <xliff:g id="ID_2">%2$s</xliff:g>, ਆਕ੍ਰਿਤੀ: <xliff:g id="ID_3">%3$s</xliff:g>, ਰੰਗ: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ਫੌਂਟ"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"ਹਰ ਸਕ੍ਰੀਨ \'ਤੇ ਆਪਣਾ ਮਨਪਸੰਦ ਫੌਂਟ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"ਸ਼ੈਲੀ ਲਾਗੂ ਕੀਤੀ ਗਈ"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"ਸ਼ੈਲੀ ਨੂੰ ਲਾਗੂ ਕਰਨ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"ਅੱਗੇ"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"ਪਿੱਛੇ"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"ਵਿਉਂਤੀ"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"ਵਿਉਂਂਤੀ ਸ਼ੈਲੀ"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"ਮਿਟਾਓ"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ਫੌਂਟ ਚੁਣੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 15756d9..ba21c65 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Dalej"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Wstecz"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, obecnie używana opcja"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, obecnie zastosowana i przeglądana"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, obecnie przeglądana"</string>
     <string name="theme_description" msgid="3697012391785254635">"Czcionka: <xliff:g id="ID_1">%1$s</xliff:g>, ikony: <xliff:g id="ID_2">%2$s</xliff:g>, kształt: <xliff:g id="ID_3">%3$s</xliff:g>, kolor: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Domyślny"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Czcionka"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Dodaj swoje ulubione czcionki do każdego ekranu"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Zastosowano styl"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Podczas stosowania stylu wystąpił problem"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Dalej"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Wstecz"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Własny styl"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Własny styl"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Usuń"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Wybierz czcionkę"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fa1805c..1ff7731 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Seguinte"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Anterior"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, aplicado atualmente"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, aplicado e em pré-visualização atualmente"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, em pré-visualização atualmente"</string>
     <string name="theme_description" msgid="3697012391785254635">"Tipo de letra: <xliff:g id="ID_1">%1$s</xliff:g>, ícones: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, cor: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Predef."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Tipo de letra"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Adicione os seus tipos de letra favoritos a todos os ecrãs."</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Estilo aplicado"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Ocorreu um problema ao aplicar o estilo."</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Seguinte"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personalizado"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Estilo personalizado"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Eliminar"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Escolha o tipo de letra"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index aa6d7a5..0564b57 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Próxima"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Anterior"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"Opção <xliff:g id="ID_1">%1$s</xliff:g> aplicada no momento"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"Opção <xliff:g id="ID_1">%1$s</xliff:g> aplicada e visualizada no momento"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"Opção <xliff:g id="ID_1">%1$s</xliff:g> visualizada no momento"</string>
     <string name="theme_description" msgid="3697012391785254635">"Fonte: <xliff:g id="ID_1">%1$s</xliff:g>, ícones: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, cor: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Padrão"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Fonte"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Adicione suas fontes favoritas a cada tela"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Estilo aplicado"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Ocorreu um problema na aplicação do estilo"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Próxima"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personalizado"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Estilo personalizado"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Excluir"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Escolher fonte"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0d9f5f6..f7e9d89 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Înainte"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Înapoi"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"S-a aplicat <xliff:g id="ID_1">%1$s</xliff:g> acum"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, aplicată și previzualizată acum"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, previzualizată acum"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, pictograme: <xliff:g id="ID_2">%2$s</xliff:g>, formă: <xliff:g id="ID_3">%3$s</xliff:g>, culoare: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Standard"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Adăugați fonturile preferate pe fiecare ecran"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"S-a aplicat stilul"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"A apărut o problemă la aplicarea stilului"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Înainte"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Înapoi"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Personalizat"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Stil personalizat"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Ștergeți"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Alegeți fontul"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 534d5cc..7ff6321 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Далее"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Назад"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"Применено сейчас: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"АБВ"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"Сейчас включено и показано: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"Сейчас показано: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="theme_description" msgid="3697012391785254635">"Шрифт: <xliff:g id="ID_1">%1$s</xliff:g>, значки: <xliff:g id="ID_2">%2$s</xliff:g>, форма: <xliff:g id="ID_3">%3$s</xliff:g>, цвет: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"По умолч."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Шрифт"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Добавьте любимые шрифты на каждый экран."</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Стиль применен."</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Не удалось применить стиль."</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Далее"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Назад"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Свой стиль"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Свой стиль"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Удалить"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Выберите шрифт"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index d9460e1..3fd779a 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"මීළඟ"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"පෙර"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, දැනට යෙදේ"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, දැනට යෙදිණි සහ පෙරදසුන්ගතයි"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, දැනට පෙරදසුන්ගතයි"</string>
     <string name="theme_description" msgid="3697012391785254635">"අකුර: <xliff:g id="ID_1">%1$s</xliff:g>, නිරූපක: <xliff:g id="ID_2">%2$s</xliff:g>, හැඩය: <xliff:g id="ID_3">%3$s</xliff:g>, වර්ණය: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"පෙරනිමි"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"අකුර"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"සෑම තිරයටම ඔබේ ප්‍රියතම අකුරු එක් කරන්න"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"විලාසය යෙදිණි"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"විලාසය යෙදීමේ දී ගැටලුවක් විය"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"මීළඟ"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"පෙර"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"අභිරුචි"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"අභිරුචි විලාසය"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"මකන්න"</string>
     <string name="font_component_title" msgid="8800340833695292049">"අකුර තෝරා ගන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1deaaec..f9a7921 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Ďalej"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Naspäť"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, momentálne použité"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, možnosť bola práve použitá a zobrazuje sa jej ukážka"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, práve sa zobrazuje ukážka"</string>
     <string name="theme_description" msgid="3697012391785254635">"Písmo: <xliff:g id="ID_1">%1$s</xliff:g>, ikony: <xliff:g id="ID_2">%2$s</xliff:g>, tvar: <xliff:g id="ID_3">%3$s</xliff:g>, farba: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Predvolené"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Písmo"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Pridajte na každú obrazovku svoje obľúbené písma"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> × <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Bol použitý štýl"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Vyskytol sa problém s použitím tohto štýlu"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Ďalej"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Späť"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Vlastný"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Vlastný štýl"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Odstrániť"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Vyberte písmo"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index fa8faa4..82e379a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Naprej"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Nazaj"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> – trenutno uporabljeno"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> – trenutno uporabljeno in v predogledu"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> – trenutno v predogledu"</string>
     <string name="theme_description" msgid="3697012391785254635">"Pisava: <xliff:g id="ID_1">%1$s</xliff:g>, ikone: <xliff:g id="ID_2">%2$s</xliff:g>, oblika: <xliff:g id="ID_3">%3$s</xliff:g>, barva: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Privzeto"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Pisava"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Dodajte priljubljeno pisavo na vsak zaslon"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Uporabljen je bil slog"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Pri uporabi sloga je prišlo do težave"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Naprej"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Nazaj"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Po meri"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Slog po meri"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Izbris"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Izbira pisave"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 64d7492..68f0d79 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Para"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Prapa"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, është zbatuar aktualisht"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, aktualisht është zbatuar dhe në pamje paraprake"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, aktualisht në pamje paraprake"</string>
     <string name="theme_description" msgid="3697012391785254635">"Fonti: <xliff:g id="ID_1">%1$s</xliff:g>, ikonat: <xliff:g id="ID_2">%2$s</xliff:g>, forma: <xliff:g id="ID_3">%3$s</xliff:g>, ngjyra: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Parazgjedhja"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Fonti"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Shto fontet e tua të preferuara në çdo ekran"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stili u zbatua"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Kishte një problem me zbatimin e stilit"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Para"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Prapa"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"E personalizuar"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Stili i personalizuar"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Fshi"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Zgjidh fontin"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 51cea51..59ad566 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Следећа"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Претходна"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, тренутно је примењено"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"АБВ"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, тренутно је примењено и прегледа се"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, тренутно се прегледа"</string>
     <string name="theme_description" msgid="3697012391785254635">"Фонт: <xliff:g id="ID_1">%1$s</xliff:g>, иконе: <xliff:g id="ID_2">%2$s</xliff:g>, облик: <xliff:g id="ID_3">%3$s</xliff:g>, боја: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Подразум."</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Фонт"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Додајте омиљене фонтове на сваки екран"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Стил је примењен"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Дошло је до проблема при примени стила"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Даље"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Претходно"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Прилагођено"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Прилагођени стил"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Избриши"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Изаберите фонт"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b401361..85a3eb4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Nästa"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Föregående"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> tillämpas för närvarande"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> förhandsgranskas och tillämpas just nu"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> förhandsgranskas just nu"</string>
     <string name="theme_description" msgid="3697012391785254635">"Teckensnitt: <xliff:g id="ID_1">%1$s</xliff:g>, ikoner: <xliff:g id="ID_2">%2$s</xliff:g>, former: <xliff:g id="ID_3">%3$s</xliff:g>, färger: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Standard"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Teckensnitt"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Lägg till teckensnitt som du gillar på varje skärm"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Formatet används"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Det gick inte att använda formatet"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Nästa"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Föregående"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Anpassat"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Anpassat format"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Radera"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Välj teckensnitt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b0a90c4..91eed18 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Unaofuata"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Uliotangulia"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, inayotumiwa sasa hivi"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, inayotumika na kukaguliwa kwanza sasa hivi"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, inakaguliwa kwanza sasa hivi"</string>
     <string name="theme_description" msgid="3697012391785254635">"Fonti: <xliff:g id="ID_1">%1$s</xliff:g>, aikoni: <xliff:g id="ID_2">%2$s</xliff:g>, umbo: <xliff:g id="ID_3">%3$s</xliff:g>, rangi: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Chaguomsingi"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Fonti"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Ongeza fonti unayopenda kwenye kila skrini"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Umetumia mtindo"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Hitilafu imetokea wakati wa kutumia muundo"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Endelea"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Ya awali"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Maalum"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Muundo Maalum"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Futa"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Chagua fonti"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 27a345b..dc98dc8 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"எழுத்துரு: <xliff:g id="ID_1">%1$s</xliff:g>, ஐகான்கள்: <xliff:g id="ID_2">%2$s</xliff:g>, வடிவம்: <xliff:g id="ID_3">%3$s</xliff:g>, நிறம்: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"இயல்புநிலை"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"எழுத்துரு"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"ஒவ்வொரு திரையிலும் உங்களுக்குப் பிடித்த எழுத்துருக்களைச் சேருங்கள்"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"ஸ்டைல் பயன்படுத்தப்பட்டது"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"இந்த ஸ்டைலைப் பயன்படுத்துவதில் சிக்கல் உள்ளது"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"அடுத்து"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"முந்தையது"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"பிரத்தியேகமானது"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"பிரத்தியேக ஸ்டைல்"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"நீக்கு"</string>
     <string name="font_component_title" msgid="8800340833695292049">"எழுத்துருவைத் தேர்ந்தெடுத்தல்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 542397a..5876772 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"ఫాంట్: <xliff:g id="ID_1">%1$s</xliff:g>, చిహ్నాలు: <xliff:g id="ID_2">%2$s</xliff:g>, ఆకారం: <xliff:g id="ID_3">%3$s</xliff:g>, రంగు: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"డిఫాల్ట్"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"ఫాంట్"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"ప్రతి స్క్రీన్‌కు మీకు ఇష్టమైన ఫాంట్‌లను జోడించండి"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"శైలి వర్తింపజేయబడింది"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"శైలిని వర్తింపజేస్తున్నప్పుడు సమస్య ఏర్పడింది"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"తర్వాత"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"మునుపటి"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"అనుకూలం"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"అనుకూల శైలి"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"తొలగించు"</string>
     <string name="font_component_title" msgid="8800340833695292049">"ఫాంట్‌ను ఎంచుకోండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e742fa7..550c501 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"ถัดไป"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"ก่อนหน้า"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> ใช้อยู่ในขณะนี้"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"กขค"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>แสดงตัวอย่างและใช้อยู่"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>แสดงตัวอย่างอยู่"</string>
     <string name="theme_description" msgid="3697012391785254635">"แบบอักษร: <xliff:g id="ID_1">%1$s</xliff:g>, ไอคอน: <xliff:g id="ID_2">%2$s</xliff:g>, รูปร่าง: <xliff:g id="ID_3">%3$s</xliff:g>, สี: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"เริ่มต้น"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"แบบอักษร"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"เพิ่มแบบอักษรที่ชอบในทุกหน้าจอ"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"ใช้รูปแบบแล้ว"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"เกิดปัญหาในการใช้รูปแบบนี้"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"ถัดไป"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"ก่อนหน้า"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"กำหนดเอง"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"รูปแบบที่กำหนดเอง"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"ลบ"</string>
     <string name="font_component_title" msgid="8800340833695292049">"เลือกแบบอักษร"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b68adbd..b582bf1 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Susunod"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Nakaraan"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, kasalukuyang nakalapat"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, kasalukuyang nakalapat at naka-preview"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, kasalukuyang naka-preview"</string>
     <string name="theme_description" msgid="3697012391785254635">"Font: <xliff:g id="ID_1">%1$s</xliff:g>, mga icon: <xliff:g id="ID_2">%2$s</xliff:g>, hugis: <xliff:g id="ID_3">%3$s</xliff:g>, kulay: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Default"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Font"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Idagdag ang mga paborito mong font sa bawat screen"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Inilapat ang istilo"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Nagkaproblema sa paglalapat ng istilo"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Susunod"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Nakaraan"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Custom"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Custom na Istilo"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"I-delete"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Pumili ng font"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e5c7e54..65a14be 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Sonraki"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Önceki"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, uygulanmış durumda"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, şu anda uygulandı ve önizleniyor"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, şu anda önizleniyor"</string>
     <string name="theme_description" msgid="3697012391785254635">"Yazı tipi: <xliff:g id="ID_1">%1$s</xliff:g>, simgeler: <xliff:g id="ID_2">%2$s</xliff:g>, şekil: <xliff:g id="ID_3">%3$s</xliff:g>, renk: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Varsayılan"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Yazı tipi"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"En sevdiğiniz yazı tiplerini her ekrana ekleyin"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Stil uygulandı"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Stili uygulamayla ilgili bir sorun oluştu"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Sonraki"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Önceki"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Özel"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Özel Stil"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Sil"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Yazı tipi seçin"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fb95cf5..032c409 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Далі"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Назад"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g> (зараз застосовано)"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"АБВ"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> (застосовано й відображається зараз)"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> (відображається зараз)"</string>
     <string name="theme_description" msgid="3697012391785254635">"Шрифт: <xliff:g id="ID_1">%1$s</xliff:g>; значки: <xliff:g id="ID_2">%2$s</xliff:g>; форма: <xliff:g id="ID_3">%3$s</xliff:g>; колір: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"За умовчанням"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Шрифт"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Додайте вибрані шрифти до кожного екрана"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Стиль застосовано"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Не вдалося застосувати стиль"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Далі"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Назад"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Власна тема"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Власний стиль"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Видалити"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Виберіть шрифт"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 73a4bd2..1c1faf6 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -34,7 +34,6 @@
     <skip />
     <!-- no translation found for option_previewed_description (3467217598865047661) -->
     <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
     <string name="theme_description" msgid="3697012391785254635">"فونٹ: <xliff:g id="ID_1">%1$s</xliff:g>، آئیکنز: <xliff:g id="ID_2">%2$s</xliff:g>، شکل: <xliff:g id="ID_3">%3$s</xliff:g>، رنگ: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"ڈیفالٹ"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"فونٹ"</string>
@@ -46,10 +45,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"ہر اسکرین میں اپنے پسندیدہ فونٹس شامل کریں"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"طرز لاگو کر دی گئی"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"طرز کو لاگو کرنے میں ایک مسئلہ پیش آ گیا"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"اگلا"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"پیچھے جائیں"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"حسب ضرورت"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"حسب ضرورت طرز"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"حذف کریں"</string>
     <string name="font_component_title" msgid="8800340833695292049">"فونٹ منتخب کریں…"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 5337544..9455acc 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Keyingisi"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Avvalgisi"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, hozirda tatbiq etilgan"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, hozirda tatbiq etilgan va tanishib chiqilgan"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, tanishib chiqilgan"</string>
     <string name="theme_description" msgid="3697012391785254635">"Shrifti: <xliff:g id="ID_1">%1$s</xliff:g>, belgilar: <xliff:g id="ID_2">%2$s</xliff:g>, shakli: <xliff:g id="ID_3">%3$s</xliff:g>, rangi: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Standart"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Shrift"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Sevimli shriftlarni har bir ekranga kiriting"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Uslub tatbiq etildi"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Uslubni tatbiq etishda xatolik yuz berdi"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Keyingisi"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Avvalgisi"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Boshqa"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Boshqa uslub"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Oʻchirish"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Shriftni tanlang"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ad01092..4033609 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Tiếp theo"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Trước"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, đang áp dụng"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, đang áp dụng và xem trước"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, đang xem trước"</string>
     <string name="theme_description" msgid="3697012391785254635">"Phông chữ: <xliff:g id="ID_1">%1$s</xliff:g>, biểu tượng: <xliff:g id="ID_2">%2$s</xliff:g>, hình dáng: <xliff:g id="ID_3">%3$s</xliff:g>, màu: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Mặc định"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Phông chữ"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Thêm phông chữ bạn yêu thích vào mọi màn hình"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Đã áp dụng kiểu"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Đã xảy ra sự cố khi áp dụng kiểu"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Tiếp theo"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Trước"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Tùy chỉnh"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Kiểu tùy chỉnh"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Xóa"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Chọn phông chữ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8c8b4c4..ebad6ac 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"下一页"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"上一页"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>,目前已应用"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>(目前应用及预览的项)"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>(目前预览的项)"</string>
     <string name="theme_description" msgid="3697012391785254635">"字体:<xliff:g id="ID_1">%1$s</xliff:g>,图标:<xliff:g id="ID_2">%2$s</xliff:g>,形状:<xliff:g id="ID_3">%3$s</xliff:g>,颜色:<xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"默认"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"字体"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"将您喜爱的字体应用于每个屏幕上的文字"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"已应用样式"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"应用样式时出现问题"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"下一步"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"上一步"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"自定义"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"自定义样式"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"删除"</string>
     <string name="font_component_title" msgid="8800340833695292049">"选择字体"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index ade253f..e54b23e 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"繼續"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"返回"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"目前已套用<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"目前已套用及預覽<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"目前已預覽<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="theme_description" msgid="3697012391785254635">"字型:<xliff:g id="ID_1">%1$s</xliff:g>,圖示:<xliff:g id="ID_2">%2$s</xliff:g>,形狀:<xliff:g id="ID_3">%3$s</xliff:g>,顏色:<xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"預設"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"字型"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"將您喜愛的字型放進每個畫面"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"已套用樣式"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"套用樣式時發生問題"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"繼續"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"上一步"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"自訂"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"自訂樣式"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"刪除"</string>
     <string name="font_component_title" msgid="8800340833695292049">"選擇字型"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index eaa0505..b845991 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"下一頁"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"上一頁"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"目前已套用「<xliff:g id="ID_1">%1$s</xliff:g>」"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g> (目前套用及預覽的項目)"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g> (目前預覽的項目)"</string>
     <string name="theme_description" msgid="3697012391785254635">"字型:<xliff:g id="ID_1">%1$s</xliff:g>,圖示:<xliff:g id="ID_2">%2$s</xliff:g>,圖形:<xliff:g id="ID_3">%3$s</xliff:g>,顏色:<xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"預設"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"字型"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"將你喜愛的字型套用到每個畫面上的文字"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"已套用樣式"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"套用樣式時發生問題"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"下一步"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"上一步"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"自訂"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"自訂樣式"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"刪除"</string>
     <string name="font_component_title" msgid="8800340833695292049">"選擇字型"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 4d7eeed..523eef8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -30,11 +30,8 @@
     <string name="next_page_content_description" msgid="5290226604542300962">"Okulandelayo"</string>
     <string name="previous_page_content_description" msgid="6025726405430262788">"Okwangaphambilini"</string>
     <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, okufakwe manje"</string>
-    <!-- no translation found for option_applied_previewed_description (5269654286638446858) -->
-    <skip />
-    <!-- no translation found for option_previewed_description (3467217598865047661) -->
-    <skip />
-    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>
+    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, manje isetshenzisiwe yaphinde yabukwa kuqala"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, manje ibukwe kuqala"</string>
     <string name="theme_description" msgid="3697012391785254635">"Ifonti: <xliff:g id="ID_1">%1$s</xliff:g>, izithonjana: <xliff:g id="ID_2">%2$s</xliff:g>, isimo: <xliff:g id="ID_3">%3$s</xliff:g>, umbala: <xliff:g id="ID_4">%4$s</xliff:g>"</string>
     <string name="default_theme_title" msgid="2555741736622366797">"Okuzenzekelayo"</string>
     <string name="preview_name_font" msgid="4465423899630037038">"Ifonti"</string>
@@ -46,10 +43,13 @@
     <string name="font_card_body" msgid="6790525594503904468">"Engeza amafonti akho owathandayo kuso sonke isikrini"</string>
     <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="applied_theme_msg" msgid="7348498271552054431">"Isitayela sifakiwe"</string>
+    <!-- no translation found for applied_clock_msg (1938218786265793285) -->
+    <skip />
     <string name="apply_theme_error_msg" msgid="791364062636538317">"Kube nenkinga ukufaka isitayela"</string>
     <string name="custom_theme_next" msgid="6235420097213197301">"Okulandelayo"</string>
     <string name="custom_theme_previous" msgid="4941132112640503022">"Okwangaphambilini"</string>
-    <string name="custom_theme_title" msgid="2485536123742716285">"Ngokwezifiso"</string>
+    <!-- no translation found for custom_theme_title (2192300350332693631) -->
+    <skip />
     <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Isitayela sangokwezifiso"</string>
     <string name="custom_theme_delete" msgid="4744494663184126202">"Susa"</string>
     <string name="font_component_title" msgid="8800340833695292049">"Khetha ifonti"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ad4c1d2..68ad908 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,4 +57,6 @@
     <color name="toolbar_color">@color/material_white_100</color>
 
     <color name="divider_color">@color/black_14_alpha</color>
+
+    <color name="edit_background_base">@color/google_grey700</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 217b0ef..46de146 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -133,18 +133,21 @@
         [CHAR LIMIT=30] -->
     <string name="custom_theme_delete">Delete</string>
 
-    <!-- Title of a page allowing the user to choose a font for a custom theme -->
+    <!-- Title of a page allowing the user to choose a font for a custom theme [CHAR LIMIT=40]-->
     <string name="font_component_title">Choose font</string>
 
-    <!-- Title of a page allowing the user to choose an icon set for a custom theme -->
+    <!-- Title of a page allowing the user to choose an icon set for a custom theme [CHAR LIMIT=40]-->
     <string name="icon_component_title">Choose icons</string>
 
-    <!-- Title of a page allowing the user to choose a color for a custom theme -->
+    <!-- Title of a page allowing the user to choose a color for a custom theme [CHAR LIMIT=40]-->
     <string name="color_component_title">Choose color</string>
 
-    <!-- Title of a page allowing the user to choose an icon shape for a custom theme -->
+    <!-- Title of a page allowing the user to choose an icon shape for a custom theme [CHAR LIMIT=40]-->
     <string name="shape_component_title">Choose shape</string>
 
+    <!-- Title of a page allowing the user to set a name for a custom theme [CHAR LIMIT=40]-->
+    <string name="name_component_title">Name your style</string>
+
     <!-- Title of a set of icons that the user can chose for their custom style (eg, "Icons 2") -->
     <string name="icon_component_label">Icons <xliff:g name="component_number" example="1">%1$d</xliff:g></string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 345a3ee..7857247 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -46,7 +46,7 @@
         <item name="android:background">?android:colorPrimary</item>
     </style>
 
-    <style name="BottomNavTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+    <style name="BottomNavTextAppearance" parent="HeaderTextAppearance">
         <item name="android:textSize">@dimen/bottom_navbar_font_text_size</item>
     </style>
     <style name="RegularToolbarStyle" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
@@ -55,13 +55,15 @@
         <item name="android:theme">@style/WallpaperTheme</item>
     </style>
 
-    <style name="HeaderTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"/>
+    <style name="HeaderTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+        <item name="android:textFontWeight">400</item>
+    </style>
 
     <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
 
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button.Borderless.Colored"/>
 
-    <style name="OptionTitleTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+    <style name="OptionTitleTextAppearance" parent="HeaderTextAppearance">
         <item name="android:textColor">@color/option_title_color</item>
         <item name="android:textAlignment">center</item>
         <item name="android:textSize">@dimen/theme_option_title_font_text_size</item>
@@ -81,7 +83,7 @@
         <item name="cardBackgroundColor">?android:colorPrimary</item>
     </style>
 
-    <style name="CardTitleTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+    <style name="CardTitleTextAppearance" parent="HeaderTextAppearance">
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">@dimen/card_title_text_size</item>
     </style>
@@ -90,9 +92,8 @@
         <item name="android:textSize">@dimen/card_cover_title_text_size</item>
     </style>
 
-    <style name="FontCardTitleStyle">
+    <style name="FontCardTitleStyle" parent="HeaderTextAppearance">
         <item name="android:textAlignment">center</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title</item>
     </style>
 
     <style name="FontCardBodyTextStyle">
@@ -105,4 +106,15 @@
     <style name="EditLabelStyle">
         <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault</item>
     </style>
+
+    <style name="CustomThemeNameEditText" parent="@android:style/Widget.DeviceDefault.EditText">
+        <item name="android:background">@drawable/edittext_background</item>
+        <item name="android:paddingTop">16dp</item>
+        <item name="android:paddingBottom">16dp</item>
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:paddingEnd">12dp</item>
+        <item name="android:textColor">@color/edittext_text_color</item>
+        <item name="android:inputType">text</item>
+        <item name="android:maxLength">100</item>
+    </style>
 </resources>
diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index c1c6bbe..5123910 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -373,14 +373,15 @@
                 }
             } catch (JSONException e) {
                 Log.w(TAG, "Couldn't read stored custom theme, resetting", e);
-                mThemes.add(new CustomTheme(CustomTheme.newId(), mContext.getString(R.string.custom_theme_title,
-                        customThemesCount + 1), new HashMap<>(), null));
+                mThemes.add(new CustomTheme(CustomTheme.newId(), mContext.getString(
+                        R.string.custom_theme_title, customThemesCount + 1),
+                        new HashMap<>(), null));
             }
         }
 
         // Add an empty one at the end.
-        mThemes.add(new CustomTheme(CustomTheme.newId(), mContext.getString(R.string.custom_theme_title,
-                customThemesCount + 1), new HashMap<>(), null));
+        mThemes.add(new CustomTheme(CustomTheme.newId(), mContext.getString(
+                R.string.custom_theme_title, customThemesCount + 1), new HashMap<>(), null));
 
     }
 
diff --git a/src/com/android/customization/model/theme/ThemeBundle.java b/src/com/android/customization/model/theme/ThemeBundle.java
index 9d2f397..12ec32c 100644
--- a/src/com/android/customization/model/theme/ThemeBundle.java
+++ b/src/com/android/customization/model/theme/ThemeBundle.java
@@ -49,7 +49,6 @@
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
 import com.android.wallpaper.asset.BitmapCachingAsset;
-import com.android.wallpaper.asset.ResourceAsset;
 import com.android.wallpaper.model.LiveWallpaperInfo;
 import com.android.wallpaper.model.WallpaperInfo;
 
@@ -295,7 +294,8 @@
         @ColorInt private int mColorAccentLight = -1;
         @ColorInt private int mColorAccentDark = -1;
         private List<Drawable> mIcons = new ArrayList<>();
-        private String mShapePath;
+        private String mPathString;
+        private Path mShapePath;
         private boolean mIsDefault;
         @Dimension private int mCornerRadius;
         private Asset mWallpaperAsset;
@@ -308,11 +308,14 @@
                     createPreviewInfo(context));
         }
 
-        protected PreviewInfo createPreviewInfo(Context context) {
+        public PreviewInfo createPreviewInfo(Context context) {
             ShapeDrawable shapeDrawable = null;
             List<Drawable> shapeIcons = new ArrayList<>();
-            if (!TextUtils.isEmpty(mShapePath)) {
-                Path path = PathParser.createPathFromPathData(mShapePath);
+            Path path = mShapePath;
+            if (!TextUtils.isEmpty(mPathString)) {
+                path = PathParser.createPathFromPathData(mPathString);
+            }
+            if (path != null) {
                 PathShape shape = new PathShape(path, PATH_SIZE, PATH_SIZE);
                 shapeDrawable = new ShapeDrawable(shape);
                 shapeDrawable.setIntrinsicHeight((int) PATH_SIZE);
@@ -322,6 +325,8 @@
                         AdaptiveIconDrawable adaptiveIcon = (AdaptiveIconDrawable) icon;
                         shapeIcons.add(new DynamicAdaptiveIconDrawable(adaptiveIcon.getBackground(),
                                 adaptiveIcon.getForeground(), path));
+                    } else if (icon instanceof DynamicAdaptiveIconDrawable) {
+                        shapeIcons.add(icon);
                     }
                     // TODO: add iconloader library's legacy treatment helper methods for
                     //  non-adaptive icons
@@ -332,6 +337,10 @@
                     mWallpaperAsset, shapeIcons);
         }
 
+        public Map<String, String> getPackages() {
+            return Collections.unmodifiableMap(mPackages);
+        }
+
         public String getTitle() {
             return mTitle;
         }
@@ -372,6 +381,11 @@
         }
 
         public Builder setShapePath(String path) {
+            mPathString = path;
+            return this;
+        }
+
+        public Builder setShapePath(Path path) {
             mShapePath = path;
             return this;
         }
diff --git a/src/com/android/customization/model/theme/ThemeManager.java b/src/com/android/customization/model/theme/ThemeManager.java
index de6a98b..d873972 100644
--- a/src/com/android/customization/model/theme/ThemeManager.java
+++ b/src/com/android/customization/model/theme/ThemeManager.java
@@ -164,7 +164,7 @@
     private void applyOverlays(ThemeBundle theme, Callback callback) {
         boolean allApplied = Settings.Secure.putString(mActivity.getContentResolver(),
                 ResourceConstants.THEME_SETTING, theme.getSerializedPackages());
-        if (theme instanceof CustomTheme && !((CustomTheme) theme).isDefined()) {
+        if (theme instanceof CustomTheme) {
             storeCustomTheme((CustomTheme) theme);
         }
         mCurrentOverlays = null;
diff --git a/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java b/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
index 07a876b..020e3ef 100644
--- a/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
+++ b/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
@@ -77,7 +77,7 @@
         String iconPackage =
                 mCustomThemeManager.getOverlayPackages().get(OVERLAY_CATEGORY_ICON_ANDROID);
         if (TextUtils.isEmpty(iconPackage)) {
-            iconPackage = SYSUI_PACKAGE;
+            iconPackage = ANDROID_PACKAGE;
         }
         for (String iconName : ICONS_FOR_PREVIEW) {
             try {
diff --git a/src/com/android/customization/model/theme/custom/CustomTheme.java b/src/com/android/customization/model/theme/custom/CustomTheme.java
index 15e4eb8..97a1876 100644
--- a/src/com/android/customization/model/theme/custom/CustomTheme.java
+++ b/src/com/android/customization/model/theme/custom/CustomTheme.java
@@ -34,6 +34,9 @@
         return UUID.randomUUID().toString();
     }
 
+    /**
+     * Used to uniquely identify a custom theme since names can change.
+     */
     private final String mId;
 
     public CustomTheme(@NonNull String id, String title, Map<String, String> overlayPackages,
diff --git a/src/com/android/customization/model/theme/custom/CustomThemeManager.java b/src/com/android/customization/model/theme/custom/CustomThemeManager.java
index 0cc0161..a3acba4 100644
--- a/src/com/android/customization/model/theme/custom/CustomThemeManager.java
+++ b/src/com/android/customization/model/theme/custom/CustomThemeManager.java
@@ -21,7 +21,9 @@
 import androidx.annotation.Nullable;
 
 import com.android.customization.model.CustomizationManager;
+import com.android.customization.model.theme.ThemeBundle.PreviewInfo;
 import com.android.customization.model.theme.ThemeManager;
+import com.android.customization.model.theme.custom.CustomTheme.Builder;
 import com.android.wallpaper.R;
 
 import java.util.HashMap;
@@ -29,12 +31,13 @@
 
 public class CustomThemeManager implements CustomizationManager<ThemeComponentOption> {
 
-    private final Map<String, String> mOverlayPackages = new HashMap<>();
     private final CustomTheme mOriginalTheme;
+    private final CustomTheme.Builder mBuilder;
 
     private CustomThemeManager(Map<String, String> overlayPackages,
             @Nullable CustomTheme originalTheme) {
-        mOverlayPackages.putAll(overlayPackages);
+        mBuilder = new Builder();
+        overlayPackages.forEach(mBuilder::addOverlayPackage);
         mOriginalTheme = originalTheme;
     }
 
@@ -45,22 +48,23 @@
 
     @Override
     public void apply(ThemeComponentOption option, @Nullable Callback callback) {
-        option.getOverlayPackages().forEach((category, packageName) -> {
-            if (!TextUtils.isEmpty(packageName)) {
-                mOverlayPackages.put(category, packageName);
-            }
-        });
+//        option.getOverlayPackages().forEach((category, packageName) -> {
+//            if (!TextUtils.isEmpty(packageName)) {
+//                mBuilder.addOverlayPackage(category, packageName);
+//            }
+//        });
+        option.buildStep(mBuilder);
         if (callback != null) {
             callback.onSuccess();
         }
     }
 
     public Map<String, String> getOverlayPackages() {
-        return mOverlayPackages;
+        return mBuilder.getPackages();
     }
 
-    public CustomTheme buildPartialCustomTheme(String id, String title) {
-        return new CustomTheme(id, title, mOverlayPackages, null);
+    public CustomTheme buildPartialCustomTheme(Context context, String id, String title) {
+        return ((CustomTheme.Builder)mBuilder.setId(id).setTitle(title)).build(context);
     }
 
     @Override
@@ -72,6 +76,10 @@
         return mOriginalTheme;
     }
 
+    public PreviewInfo buildCustomThemePreviewInfo(Context context) {
+        return mBuilder.createPreviewInfo(context);
+    }
+
     public static CustomThemeManager create(
             @Nullable CustomTheme customTheme, ThemeManager themeManager) {
         if (customTheme != null && customTheme.isDefined()) {
@@ -80,4 +88,5 @@
         // Seed the first custom theme with the currently applied theme.
         return new CustomThemeManager(themeManager.getCurrentOverlays(), customTheme);
     }
+
 }
diff --git a/src/com/android/customization/model/theme/custom/ShapeOptionsProvider.java b/src/com/android/customization/model/theme/custom/ShapeOptionsProvider.java
index 112ed43..b050e41 100644
--- a/src/com/android/customization/model/theme/custom/ShapeOptionsProvider.java
+++ b/src/com/android/customization/model/theme/custom/ShapeOptionsProvider.java
@@ -16,9 +16,8 @@
 package com.android.customization.model.theme.custom;
 
 import static com.android.customization.model.ResourceConstants.ANDROID_PACKAGE;
+import static com.android.customization.model.ResourceConstants.CONFIG_CORNERRADIUS;
 import static com.android.customization.model.ResourceConstants.CONFIG_ICON_MASK;
-import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_COLOR;
-import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_FONT;
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SHAPE;
 import static com.android.customization.model.ResourceConstants.PATH_SIZE;
 
@@ -28,7 +27,6 @@
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.graphics.Path;
-import android.graphics.Typeface;
 import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.ShapeDrawable;
@@ -36,6 +34,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.Dimension;
 import androidx.core.graphics.PathParser;
 
 import com.android.customization.model.ResourceConstants;
@@ -75,8 +74,8 @@
                 ShapeDrawable shapeDrawable = createShapeDrawable(path);
                 PackageManager pm = mContext.getPackageManager();
                 String label = pm.getApplicationInfo(overlayPackage, 0).loadLabel(pm).toString();
-                mOptions.add(new ShapeOption(overlayPackage, label, shapeDrawable,
-                        getShapedIcons(path)));
+                mOptions.add(new ShapeOption(overlayPackage, label, path,
+                        loadCornerRadius(overlayPackage), shapeDrawable, getShapedIcons(path)));
             } catch (NameNotFoundException | NotFoundException e) {
                 Log.w(TAG, String.format("Couldn't load shape overlay %s, will skip it",
                         overlayPackage), e);
@@ -88,7 +87,10 @@
         Resources system = Resources.getSystem();
         Path path = loadPath(system, ANDROID_PACKAGE);
         ShapeDrawable shapeDrawable = createShapeDrawable(path);
-        mOptions.add(new ShapeOption(null, mContext.getString(R.string.default_theme_title),
+        mOptions.add(new ShapeOption(null, mContext.getString(R.string.default_theme_title), path,
+                system.getDimensionPixelOffset(
+                    system.getIdentifier(ResourceConstants.CONFIG_CORNERRADIUS,
+                        "dimen", ResourceConstants.ANDROID_PACKAGE)),
                 shapeDrawable, getShapedIcons(path)));
     }
 
@@ -127,4 +129,15 @@
         }
         return null;
     }
+
+    @Dimension
+    private int loadCornerRadius(String packageName)
+            throws NameNotFoundException, NotFoundException {
+
+        Resources overlayRes =
+                mContext.getPackageManager().getResourcesForApplication(
+                        packageName);
+        return overlayRes.getDimensionPixelOffset(overlayRes.getIdentifier(
+                CONFIG_CORNERRADIUS, "dimen", packageName));
+    }
 }
diff --git a/src/com/android/customization/model/theme/custom/ThemeComponentOption.java b/src/com/android/customization/model/theme/custom/ThemeComponentOption.java
index 2dc163e..994b5f3 100644
--- a/src/com/android/customization/model/theme/custom/ThemeComponentOption.java
+++ b/src/com/android/customization/model/theme/custom/ThemeComponentOption.java
@@ -17,6 +17,11 @@
 
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_COLOR;
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_FONT;
+import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_ANDROID;
+import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_LAUNCHER;
+import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_SETTINGS;
+import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_SYSUI;
+import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_THEMEPICKER;
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SHAPE;
 
 import android.content.Context;
@@ -24,10 +29,12 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
+import android.graphics.Path;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.ShapeDrawable;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -39,17 +46,20 @@
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.Dimension;
 import androidx.annotation.Nullable;
 
 import com.android.customization.model.CustomizationManager;
 import com.android.customization.model.CustomizationOption;
 import com.android.customization.model.ResourceConstants;
+import com.android.customization.model.theme.custom.CustomTheme.Builder;
 import com.android.wallpaper.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Objects;
 
 /**
@@ -79,6 +89,15 @@
 
     public abstract void bindPreview(ViewGroup container);
 
+    public Builder buildStep(Builder builder) {
+        getOverlayPackages().forEach((category, packageName) -> {
+            if (!TextUtils.isEmpty(packageName)) {
+                builder.addOverlayPackage(category, packageName);
+            }
+        });
+        return builder;
+    }
+
     public static class FontOption extends ThemeComponentOption {
 
         private final String mLabel;
@@ -134,6 +153,12 @@
             TextView bodyText = container.findViewById(R.id.font_card_body);
             bodyText.setTypeface(mBodyFont);
         }
+
+        @Override
+        public Builder buildStep(Builder builder) {
+            builder.setHeadlineFontFamily(mHeadlineFont).setBodyFontFamily(mBodyFont);
+            return super.buildStep(builder);
+        }
     }
 
     public static class IconOption extends ThemeComponentOption {
@@ -161,16 +186,21 @@
         @Override
         public boolean isActive(CustomizationManager<ThemeComponentOption> manager) {
             CustomThemeManager customThemeManager = (CustomThemeManager) manager;
+            Map<String, String> themePackages = customThemeManager.getOverlayPackages();
             if (getOverlayPackages().isEmpty()) {
-                return customThemeManager.getOverlayPackages().isEmpty();
+                return themePackages.get(OVERLAY_CATEGORY_ICON_SYSUI) == null &&
+                        themePackages.get(OVERLAY_CATEGORY_ICON_SETTINGS) == null &&
+                        themePackages.get(OVERLAY_CATEGORY_ICON_ANDROID) == null &&
+                        themePackages.get(OVERLAY_CATEGORY_ICON_LAUNCHER) == null &&
+                        themePackages.get(OVERLAY_CATEGORY_ICON_THEMEPICKER) == null;
             }
-             for (Map.Entry<String, String> overlayEntry : getOverlayPackages().entrySet()) {
-                 if(!Objects.equals(overlayEntry.getValue(),
-                         customThemeManager.getOverlayPackages().get(overlayEntry.getKey()))) {
-                     return false;
-                 }
-             }
-             return true;
+            for (Map.Entry<String, String> overlayEntry : getOverlayPackages().entrySet()) {
+                if(!Objects.equals(overlayEntry.getValue(),
+                        themePackages.get(overlayEntry.getKey()))) {
+                    return false;
+                }
+            }
+            return true;
         }
 
         @Override
@@ -210,6 +240,14 @@
         public void setLabel(String label) {
             mLabel = label;
         }
+
+        @Override
+        public Builder buildStep(Builder builder) {
+            for (Drawable icon : mIcons) {
+                builder.addIcon(icon);
+            }
+            return super.buildStep(builder);
+        }
     }
 
     public static class ColorOption extends ThemeComponentOption {
@@ -346,6 +384,12 @@
         public void setShapeDrawable(@Nullable Drawable shapeDrawable) {
             mShapeDrawable = shapeDrawable;
         }
+
+        @Override
+        public Builder buildStep(Builder builder) {
+            builder.setColorAccentDark(mColorAccentDark).setColorAccentLight(mColorAccentLight);
+            return super.buildStep(builder);
+        }
     }
 
     public static class ShapeOption extends ThemeComponentOption {
@@ -353,16 +397,21 @@
         private final LayerDrawable mShape;
         private final List<Drawable> mAppIcons;
         private final String mLabel;
+        private final Path mPath;
+        private final int mCornerRadius;
         private int[] mShapeIconIds = {
                 R.id.shape_preview_icon_0, R.id.shape_preview_icon_1, R.id.shape_preview_icon_2,
                 R.id.shape_preview_icon_3, R.id.shape_preview_icon_4, R.id.shape_preview_icon_5
         };
 
-        ShapeOption(String packageName, String label, Drawable shapeDrawable,
+        ShapeOption(String packageName, String label, Path path,
+                @Dimension int cornerRadius, Drawable shapeDrawable,
                 List<Drawable> appIcons) {
             addOverlayPackage(OVERLAY_CATEGORY_SHAPE, packageName);
             mLabel = label;
             mAppIcons = appIcons;
+            mPath = path;
+            mCornerRadius = cornerRadius;
             Drawable background = shapeDrawable.getConstantState().newDrawable();
             Drawable foreground = shapeDrawable.getConstantState().newDrawable();
             mShape = new LayerDrawable(new Drawable[]{background, foreground});
@@ -418,5 +467,14 @@
                 iconView.setBackground(mAppIcons.get(i));
             }
         }
+
+        @Override
+        public Builder buildStep(Builder builder) {
+            builder.setShapePath(mPath).setBottomSheetCornerRadius(mCornerRadius);
+            for (Drawable appIcon : mAppIcons) {
+                builder.addShapePreviewIcon(appIcon);
+            }
+            return super.buildStep(builder);
+        }
     }
 }
diff --git a/src/com/android/customization/picker/theme/CustomThemeActivity.java b/src/com/android/customization/picker/theme/CustomThemeActivity.java
index 0ea9617..2bc371d 100644
--- a/src/com/android/customization/picker/theme/CustomThemeActivity.java
+++ b/src/com/android/customization/picker/theme/CustomThemeActivity.java
@@ -16,6 +16,7 @@
 package com.android.customization.picker.theme;
 
 import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -34,7 +35,6 @@
 import com.android.customization.model.theme.DefaultThemeProvider;
 import com.android.customization.model.theme.OverlayManagerCompat;
 import com.android.customization.model.theme.ThemeBundle;
-import com.android.customization.model.theme.ThemeBundle.Builder;
 import com.android.customization.model.theme.ThemeBundleProvider;
 import com.android.customization.model.theme.ThemeManager;
 import com.android.customization.model.theme.custom.ColorOptionsProvider;
@@ -51,7 +51,7 @@
 import com.android.customization.model.theme.custom.ThemeComponentOptionProvider;
 import com.android.customization.module.CustomizationInjector;
 import com.android.customization.module.ThemesUserEventLogger;
-import com.android.customization.picker.theme.CustomThemeComponentFragment.CustomThemeComponentFragmentHost;
+import com.android.customization.picker.theme.CustomThemeStepFragment.CustomThemeComponentStepHost;
 import com.android.wallpaper.R;
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.module.WallpaperSetter;
@@ -62,7 +62,7 @@
 import java.util.List;
 
 public class CustomThemeActivity extends FragmentActivity implements
-        CustomThemeComponentFragmentHost {
+        CustomThemeComponentStepHost {
     public static final String EXTRA_THEME_ID = "CustomThemeActivity.ThemeId";
     public static final String EXTRA_THEME_TITLE = "CustomThemeActivity.ThemeTitle";
     public static final String EXTRA_THEME_PACKAGES = "CustomThemeActivity.ThemePackages";
@@ -160,59 +160,64 @@
     private void initSteps(int currentStep) {
         mSteps = new ArrayList<>();
         OverlayManagerCompat manager = new OverlayManagerCompat(this);
-        mSteps.add(new FontStep(new FontOptionsProvider(this, manager), 0, 4));
-        mSteps.add(new IconStep(new IconOptionsProvider(this, manager), 1, 4));
-        mSteps.add(new ColorStep(new ColorOptionsProvider(this, manager, mCustomThemeManager),
-                2, 4));
-        mSteps.add(new ShapeStep(new ShapeOptionsProvider(this, manager), 3, 4));        
+        mSteps.add(new FontStep(new FontOptionsProvider(this, manager), 0));
+        mSteps.add(new IconStep(new IconOptionsProvider(this, manager), 1));
+        mSteps.add(new ColorStep(new ColorOptionsProvider(this, manager, mCustomThemeManager), 2));
+        mSteps.add(new ShapeStep(new ShapeOptionsProvider(this, manager), 3));
+        mSteps.add(new NameStep(4));
         mCurrentStep = currentStep;
     }
 
     private void onNextOrApply() {
-        mCustomThemeManager.apply(getCurrentStepFragment().getSelectedOption(), new Callback() {
-            @Override
-            public void onSuccess() {
-                if (mCurrentStep < mSteps.size() - 1) {
+        CustomThemeStepFragment stepFragment = getCurrentStepFragment();
+        if (stepFragment instanceof CustomThemeComponentFragment) {
+            CustomThemeComponentFragment fragment = (CustomThemeComponentFragment) stepFragment;
+            mCustomThemeManager.apply(fragment.getSelectedOption(), new Callback() {
+                @Override
+                public void onSuccess() {
                     navigateToStep(mCurrentStep + 1);
-                } else {
-                    CustomTheme originalTheme = mCustomThemeManager.getOriginalTheme();
-
-                    // We're on the last step, apply theme and leave
-                    CustomTheme themeToApply = mCustomThemeManager.buildPartialCustomTheme(
-                            originalTheme.getId(), originalTheme.getTitle());
-
-                    // If the current theme is equal to the original theme being edited, then
-                    // don't search for an equivalent, let the user apply the same one by keeping
-                    // it null.
-                    ThemeBundle equivalent = (originalTheme.isEquivalent(themeToApply))
-                                ? null : mThemeManager.findThemeByPackages(themeToApply);
-
-                    if (equivalent != null) {
-                        AlertDialog.Builder builder =
-                                new AlertDialog.Builder(CustomThemeActivity.this);
-                        builder.setTitle(getString(R.string.use_style_instead_title,
-                                    equivalent.getTitle()))
-                                .setMessage(getString(R.string.use_style_instead_body,
-                                        equivalent.getTitle()))
-                                .setPositiveButton(getString(R.string.use_style_button,
-                                        equivalent.getTitle()),
-                                        (dialogInterface, i) -> applyTheme(equivalent))
-                                .setNegativeButton(R.string.no_thanks, null)
-                                .create()
-                                .show();
-                    } else {
-                        applyTheme(themeToApply);
-                    }
                 }
-            }
 
-            @Override
-            public void onError(@Nullable Throwable throwable) {
-                Log.w(TAG, "Error applying custom theme component", throwable);
-                Toast.makeText(CustomThemeActivity.this, R.string.apply_theme_error_msg,
-                        Toast.LENGTH_LONG).show();
+                @Override
+                public void onError(@Nullable Throwable throwable) {
+                    Log.w(TAG, "Error applying custom theme component", throwable);
+                    Toast.makeText(CustomThemeActivity.this, R.string.apply_theme_error_msg,
+                            Toast.LENGTH_LONG).show();
+                }
+            });
+        } else if (stepFragment instanceof CustomThemeNameFragment) {
+            CustomThemeNameFragment fragment = (CustomThemeNameFragment) stepFragment;
+            CustomTheme originalTheme = mCustomThemeManager.getOriginalTheme();
+
+            // We're on the last step, apply theme and leave
+            CustomTheme themeToApply = mCustomThemeManager.buildPartialCustomTheme(this,
+                    originalTheme.getId(), fragment.getThemeName());
+
+            // If the current theme is equal to the original theme being edited, then
+            // don't search for an equivalent, let the user apply the same one by keeping
+            // it null.
+            ThemeBundle equivalent = (originalTheme.isEquivalent(themeToApply))
+                    ? null : mThemeManager.findThemeByPackages(themeToApply);
+
+            if (equivalent != null) {
+                Builder builder =
+                        new Builder(CustomThemeActivity.this);
+                builder.setTitle(getString(R.string.use_style_instead_title,
+                        equivalent.getTitle()))
+                        .setMessage(getString(R.string.use_style_instead_body,
+                                equivalent.getTitle()))
+                        .setPositiveButton(getString(R.string.use_style_button,
+                                equivalent.getTitle()),
+                                (dialogInterface, i) -> applyTheme(equivalent))
+                        .setNegativeButton(R.string.no_thanks, null)
+                        .create()
+                        .show();
+            } else {
+                applyTheme(themeToApply);
             }
-        });
+        } else {
+            throw new IllegalStateException("Unknown CustomThemeStepFragment");
+        }
     }
 
     private void applyTheme(ThemeBundle themeToApply) {
@@ -235,8 +240,8 @@
         });
     }
 
-    private CustomThemeComponentFragment getCurrentStepFragment() {
-        return (CustomThemeComponentFragment)
+    private CustomThemeStepFragment getCurrentStepFragment() {
+        return (CustomThemeStepFragment)
                 getSupportFragmentManager().findFragmentById(R.id.fragment_container);
     }
 
@@ -284,7 +289,7 @@
         @StringRes final int titleResId;
         final ThemeComponentOptionProvider<T> provider;
         final int position;
-        private CustomThemeComponentFragment mFragment;
+        private CustomThemeStepFragment mFragment;
 
         protected ComponentStep(@StringRes int titleResId, ThemeComponentOptionProvider<T> provider,
                                 int position) {
@@ -293,7 +298,7 @@
             this.position = position;
         }
 
-        CustomThemeComponentFragment getFragment(String title) {
+        CustomThemeStepFragment getFragment(String title) {
             if (mFragment == null) {
                 mFragment = createFragment(title);
             }
@@ -303,13 +308,13 @@
         /**
          * @return a newly created fragment that will handle this step's UI.
          */
-        abstract CustomThemeComponentFragment createFragment(String title);
+        abstract CustomThemeStepFragment createFragment(String title);
     }
 
     private class FontStep extends ComponentStep<FontOption> {
 
         protected FontStep(ThemeComponentOptionProvider<FontOption> provider,
-                int position, int totalSteps) {
+                int position) {
             super(R.string.font_component_title, provider, position);
         }
 
@@ -325,7 +330,7 @@
     private class IconStep extends ComponentStep<IconOption> {
 
         protected IconStep(ThemeComponentOptionProvider<IconOption> provider,
-                int position, int totalSteps) {
+                int position) {
             super(R.string.icon_component_title, provider, position);
         }
 
@@ -341,7 +346,7 @@
     private class ColorStep extends ComponentStep<ColorOption> {
 
         protected ColorStep(ThemeComponentOptionProvider<ColorOption> provider,
-                int position, int totalSteps) {
+                int position) {
             super(R.string.color_component_title, provider, position);
         }
 
@@ -358,7 +363,7 @@
     private class ShapeStep extends ComponentStep<ShapeOption> {
 
         protected ShapeStep(ThemeComponentOptionProvider<ShapeOption> provider,
-                int position, int totalSteps) {
+                int position) {
             super(R.string.shape_component_title, provider, position);
         }
 
@@ -370,4 +375,19 @@
                     titleResId);
         }
     }
+
+    private class NameStep extends ComponentStep {
+
+        protected NameStep(int position) {
+            super(R.string.name_component_title, null, position);
+        }
+
+        @Override
+        CustomThemeNameFragment createFragment(String title) {
+            return CustomThemeNameFragment.newInstance(
+                    title,
+                    position,
+                    titleResId);
+        }
+    }
 }
diff --git a/src/com/android/customization/picker/theme/CustomThemeComponentFragment.java b/src/com/android/customization/picker/theme/CustomThemeComponentFragment.java
index a50051b..f6471f0 100644
--- a/src/com/android/customization/picker/theme/CustomThemeComponentFragment.java
+++ b/src/com/android/customization/picker/theme/CustomThemeComponentFragment.java
@@ -37,22 +37,8 @@
 import com.android.wallpaper.R;
 import com.android.wallpaper.picker.ToolbarFragment;
 
-public class CustomThemeComponentFragment extends ToolbarFragment {
-    private static final String ARG_KEY_POSITION = "CustomThemeComponentFragment.position";
-    private static final String ARG_KEY_TITLE_RES_ID = "CustomThemeComponentFragment.title_res";
+public class CustomThemeComponentFragment extends CustomThemeStepFragment {
     private static final String ARG_USE_GRID_LAYOUT = "CustomThemeComponentFragment.use_grid";;
-    private CustomThemeComponentFragmentHost mHost;
-
-    public interface CustomThemeComponentFragmentHost {
-        void delete();
-        void cancel();
-        ThemeComponentOptionProvider<? extends ThemeComponentOption> getComponentOptionProvider(
-                int position);
-
-        CustomThemeManager getCustomThemeManager();
-
-        void setCurrentStep(int step);
-    }
 
     public static CustomThemeComponentFragment newInstance(CharSequence toolbarTitle, int position,
             int titleResId) {
@@ -71,53 +57,24 @@
     }
 
     private ThemeComponentOptionProvider<? extends ThemeComponentOption> mProvider;
-    private CustomThemeManager mCustomThemeManager;
-    private int mPosition;
-    @StringRes private int mTitleResId;
     private boolean mUseGridLayout;
 
     private RecyclerView mOptionsContainer;
     private OptionSelectorController<ThemeComponentOption> mOptionsController;
-    private ViewGroup mPreviewContainer;
-    private TextView mTitle;
     private ThemeComponentOption mSelectedOption;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mPosition = getArguments().getInt(ARG_KEY_POSITION);
-        mTitleResId = getArguments().getInt(ARG_KEY_TITLE_RES_ID);
         mUseGridLayout = getArguments().getBoolean(ARG_USE_GRID_LAYOUT);
         mProvider = mHost.getComponentOptionProvider(mPosition);
-        mCustomThemeManager = mHost.getCustomThemeManager();
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mHost = (CustomThemeComponentFragmentHost) context;
     }
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
             @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(
-                R.layout.fragment_custom_theme_component, container, /* attachToRoot */ false);
-        // No original theme means it's a new one, so no toolbar icon for deleting it is needed
-        if (mCustomThemeManager.getOriginalTheme() == null) {
-            setUpToolbar(view);
-        } else {
-            setUpToolbar(view, R.menu.custom_theme_editor_menu);
-            mToolbar.getMenu().getItem(0).setIconTintList(
-                    getContext().getColorStateList(R.color.toolbar_icon_color));
-        }
-        Drawable closeIcon = getResources().getDrawable(R.drawable.ic_close_24px, null).mutate();
-        closeIcon.setTintList(getResources().getColorStateList(R.color.toolbar_icon_color, null));
-        mToolbar.setNavigationIcon(closeIcon);
-
-        mToolbar.setNavigationContentDescription(R.string.cancel);
-        mToolbar.setNavigationOnClickListener(v -> mHost.cancel());
+        View view = super.onCreateView(inflater, container, savedInstanceState);
         mOptionsContainer = view.findViewById(R.id.options_container);
         mPreviewContainer = view.findViewById(R.id.component_preview_content);
         mTitle = view.findViewById(R.id.component_options_title);
@@ -128,24 +85,8 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        mHost.setCurrentStep(mPosition);
-    }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        if (item.getItemId() == R.id.custom_theme_delete) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-            builder.setMessage(R.string.delete_custom_theme_confirmation)
-                    .setPositiveButton(R.string.delete_custom_theme_button,
-                            (dialogInterface, i) -> mHost.delete())
-                    .setNegativeButton(R.string.cancel, null)
-                    .create()
-                    .show();
-            return true;
-        }
-        return super.onMenuItemClick(item);
+    protected int getFragmentLayoutResId() {
+        return R.layout.fragment_custom_theme_component;
     }
 
     public ThemeComponentOption getSelectedOption() {
diff --git a/src/com/android/customization/picker/theme/CustomThemeNameFragment.java b/src/com/android/customization/picker/theme/CustomThemeNameFragment.java
new file mode 100644
index 0000000..84915ff
--- /dev/null
+++ b/src/com/android/customization/picker/theme/CustomThemeNameFragment.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.customization.picker.theme;
+
+import android.app.WallpaperColors;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnLayoutChangeListener;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
+
+import com.android.customization.model.theme.ThemeBundle.PreviewInfo;
+import com.android.customization.model.theme.custom.CustomTheme;
+import com.android.customization.picker.theme.ThemePreviewPage.ThemeCoverPage;
+import com.android.wallpaper.R;
+import com.android.wallpaper.asset.Asset;
+import com.android.wallpaper.asset.BitmapCachingAsset;
+import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
+import com.android.wallpaper.module.InjectorProvider;
+import com.android.wallpaper.picker.ToolbarFragment;
+
+public class CustomThemeNameFragment extends CustomThemeStepFragment {
+
+    public static CustomThemeNameFragment newInstance(CharSequence toolbarTitle, int position,
+            int titleResId) {
+        CustomThemeNameFragment fragment = new CustomThemeNameFragment();
+        Bundle arguments = ToolbarFragment.createArguments(toolbarTitle);
+        arguments.putInt(ARG_KEY_POSITION, position);
+        arguments.putInt(ARG_KEY_TITLE_RES_ID, titleResId);
+        fragment.setArguments(arguments);
+        return fragment;
+    }
+
+
+    private int[] mColorButtonIds = {
+            R.id.preview_check_selected, R.id.preview_radio_selected, R.id.preview_toggle_selected
+    };
+    private int[] mColorTileIds = {
+            R.id.preview_color_qs_0_bg, R.id.preview_color_qs_1_bg, R.id.preview_color_qs_2_bg
+    };
+    private int[] mColorTileIconIds = {
+            R.id.preview_color_qs_0_icon, R.id.preview_color_qs_1_icon, R.id.preview_color_qs_2_icon
+    };
+
+    private int[] mShapeIconIds = {
+            R.id.shape_preview_icon_0, R.id.shape_preview_icon_1, R.id.shape_preview_icon_2,
+            R.id.shape_preview_icon_3, R.id.shape_preview_icon_4, R.id.shape_preview_icon_5
+    };
+
+    private Asset mWallpaperAsset;
+    private ThemeCoverPage mCoverPage;
+
+    private EditText mNameEditor;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        CurrentWallpaperInfoFactory currentWallpaperFactory = InjectorProvider.getInjector()
+                .getCurrentWallpaperFactory(getActivity().getApplicationContext());
+        currentWallpaperFactory.createCurrentWallpaperInfos(
+                (homeWallpaper, lockWallpaper, presentationMode) -> {
+                    mWallpaperAsset = new BitmapCachingAsset(getContext(),
+                            homeWallpaper.getThumbAsset(getContext()));
+                    if (mCoverPage != null) {
+                        mCoverPage.bindBody(true);
+                    }
+                }, false);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+        View view = super.onCreateView(inflater, container, savedInstanceState);
+        mTitle = view.findViewById(R.id.component_options_title);
+        mTitle.setText(mTitleResId);
+        mNameEditor = view.findViewById(R.id.custom_theme_name);
+        mNameEditor.setText(mCustomThemeManager.getOriginalTheme().getTitle());
+        bindCover(view.findViewById(R.id.component_preview_content));
+
+        return view;
+    }
+
+    private void bindCover(CardView card) {
+        PreviewInfo previewInfo = mCustomThemeManager.buildCustomThemePreviewInfo(getContext());
+        mCoverPage = new ThemeCoverPage(getContext(), getThemeName(),
+                previewInfo.resolveAccentColor(getResources()), previewInfo.icons,
+                previewInfo.headlineFontFamily, previewInfo.bottomSheeetCornerRadius,
+                previewInfo.shapeDrawable, previewInfo.shapeAppIcons, null,
+                mColorButtonIds, mColorTileIds, mColorTileIconIds, mShapeIconIds,
+                new WallpaperLayoutListener());
+        mCoverPage.setCard(card);
+        mCoverPage.bindPreviewContent();
+        mNameEditor.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+                ((TextView)card.findViewById(R.id.theme_preview_card_header)).setText(charSequence);
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+
+            }
+        });
+    }
+
+    private class WallpaperLayoutListener implements OnLayoutChangeListener {
+        @Override
+        public void onLayoutChange(View view, int left, int top, int right,
+                int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+            int targetWidth = right - left;
+            int targetHeight = bottom - top;
+            if (targetWidth > 0 && targetHeight > 0) {
+                if (mWallpaperAsset != null) {
+                    mWallpaperAsset.decodeBitmap(
+                            targetWidth, targetHeight,
+                            bitmap -> setWallpaperBitmap(view, bitmap));
+                }
+                view.removeOnLayoutChangeListener(this);
+            }
+        }
+
+        private void setWallpaperBitmap(View view, Bitmap bitmap) {
+            Resources res = view.getContext().getResources();
+            BitmapDrawable background = new BitmapDrawable(res, bitmap);
+            background.setAlpha(128);
+            view.findViewById(R.id.theme_preview_card_background).setBackground(background);
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mCoverPage = null;
+    }
+
+    @Override
+    protected int getFragmentLayoutResId() {
+        return R.layout.fragment_custom_theme_name;
+    }
+
+    public String getThemeName() {
+        return mNameEditor.getText().toString();
+    }
+}
diff --git a/src/com/android/customization/picker/theme/CustomThemeStepFragment.java b/src/com/android/customization/picker/theme/CustomThemeStepFragment.java
new file mode 100644
index 0000000..ebf55e3
--- /dev/null
+++ b/src/com/android/customization/picker/theme/CustomThemeStepFragment.java
@@ -0,0 +1,106 @@
+package com.android.customization.picker.theme;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
+import com.android.customization.model.theme.custom.CustomThemeManager;
+import com.android.customization.model.theme.custom.ThemeComponentOption;
+import com.android.customization.model.theme.custom.ThemeComponentOptionProvider;
+import com.android.wallpaper.R;
+import com.android.wallpaper.picker.ToolbarFragment;
+
+abstract class CustomThemeStepFragment extends ToolbarFragment {
+    protected static final String ARG_KEY_POSITION = "CustomThemeStepFragment.position";
+    protected static final String ARG_KEY_TITLE_RES_ID = "CustomThemeStepFragment.title_res";
+    protected CustomThemeComponentStepHost mHost;
+    protected CustomThemeManager mCustomThemeManager;
+    protected int mPosition;
+    protected ViewGroup mPreviewContainer;
+    protected TextView mTitle;
+    @StringRes
+    protected int mTitleResId;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mHost = (CustomThemeComponentStepHost) context;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mHost.setCurrentStep(mPosition);
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mPosition = getArguments().getInt(ARG_KEY_POSITION);
+        mTitleResId = getArguments().getInt(ARG_KEY_TITLE_RES_ID);
+        mCustomThemeManager = mHost.getCustomThemeManager();
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(
+                getFragmentLayoutResId(), container, /* attachToRoot */ false);
+        // No original theme means it's a new one, so no toolbar icon for deleting it is needed
+        if (mCustomThemeManager.getOriginalTheme() == null
+                || !mCustomThemeManager.getOriginalTheme().isDefined()) {
+            setUpToolbar(view);
+        } else {
+            setUpToolbar(view, R.menu.custom_theme_editor_menu);
+            mToolbar.getMenu().getItem(0).setIconTintList(
+                    getContext().getColorStateList(R.color.toolbar_icon_color));
+        }
+        Drawable closeIcon = getResources().getDrawable(R.drawable.ic_close_24px, null).mutate();
+        closeIcon.setTintList(getResources().getColorStateList(R.color.toolbar_icon_color, null));
+        mToolbar.setNavigationIcon(closeIcon);
+
+        mToolbar.setNavigationContentDescription(R.string.cancel);
+        mToolbar.setNavigationOnClickListener(v -> mHost.cancel());
+
+        mPreviewContainer = view.findViewById(R.id.component_preview_content);
+        return view;
+    }
+
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        if (item.getItemId() == R.id.custom_theme_delete) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+            builder.setMessage(R.string.delete_custom_theme_confirmation)
+                    .setPositiveButton(R.string.delete_custom_theme_button,
+                            (dialogInterface, i) -> mHost.delete())
+                    .setNegativeButton(R.string.cancel, null)
+                    .create()
+                    .show();
+            return true;
+        }
+        return super.onMenuItemClick(item);
+    }
+
+    protected abstract int getFragmentLayoutResId();
+
+    public interface CustomThemeComponentStepHost {
+        void delete();
+        void cancel();
+        ThemeComponentOptionProvider<? extends ThemeComponentOption> getComponentOptionProvider(
+                int position);
+
+        CustomThemeManager getCustomThemeManager();
+
+        void setCurrentStep(int step);
+    }
+}
diff --git a/src/com/android/customization/picker/theme/ThemeFragment.java b/src/com/android/customization/picker/theme/ThemeFragment.java
index 5b590f0..134d255 100644
--- a/src/com/android/customization/picker/theme/ThemeFragment.java
+++ b/src/com/android/customization/picker/theme/ThemeFragment.java
@@ -22,17 +22,12 @@
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.PorterDuff;
-import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.icu.text.DateFormat;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.MeasureSpec;
 import android.view.View.OnClickListener;
 import android.view.View.OnLayoutChangeListener;
 import android.view.ViewGroup;
@@ -44,12 +39,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.customization.model.CustomizationManager.Callback;
@@ -59,7 +50,7 @@
 import com.android.customization.model.theme.custom.CustomTheme;
 import com.android.customization.module.ThemesUserEventLogger;
 import com.android.customization.picker.BasePreviewAdapter;
-import com.android.customization.picker.BasePreviewAdapter.PreviewPage;
+import com.android.customization.picker.theme.ThemePreviewPage.ThemeCoverPage;
 import com.android.customization.widget.OptionSelectorController;
 import com.android.customization.widget.PreviewPager;
 import com.android.wallpaper.R;
@@ -69,10 +60,7 @@
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.picker.ToolbarFragment;
 
-import java.text.FieldPosition;
-import java.util.Calendar;
 import java.util.List;
-import java.util.TimeZone;
 
 /**
  * Fragment that contains the main UI for selecting and applying a ThemeBundle.
@@ -301,143 +289,6 @@
         startActivityForResult(intent, CustomThemeActivity.REQUEST_CODE_CUSTOM_THEME);
     }
 
-    private static abstract class ThemePreviewPage extends PreviewPage {
-        @StringRes final int nameResId;
-        @DrawableRes final int iconSrc;
-        @LayoutRes final int contentLayoutRes;
-        @ColorInt final int accentColor;
-        protected final LayoutInflater inflater;
-
-        private ThemePreviewPage(Context context, @StringRes int titleResId,
-                @DrawableRes int iconSrc, @LayoutRes int contentLayoutRes,
-                @ColorInt int accentColor) {
-            super(null);
-            this.nameResId = titleResId;
-            this.iconSrc = iconSrc;
-            this.contentLayoutRes = contentLayoutRes;
-            this.accentColor = accentColor;
-            this.inflater = LayoutInflater.from(context);
-        }
-
-        @Override
-        public void bindPreviewContent() {
-            TextView header = card.findViewById(R.id.theme_preview_card_header);
-            header.setText(nameResId);
-            header.setCompoundDrawablesWithIntrinsicBounds(0, iconSrc, 0, 0);
-            header.setCompoundDrawableTintList(ColorStateList.valueOf(accentColor));
-            card.findViewById(R.id.theme_preview_top_bar).setVisibility(View.GONE);
-            card.findViewById(R.id.edit_label).setVisibility(View.GONE);
-
-            ViewGroup body = card.findViewById(R.id.theme_preview_card_body_container);
-            inflater.inflate(contentLayoutRes, body, true);
-            bindBody(false);
-        }
-
-        protected boolean containsWallpaper() {
-            return false;
-        }
-
-        protected abstract void bindBody(boolean forceRebind);
-    }
-
-    private static class ThemeCoverPage extends ThemePreviewPage {
-
-        private final Typeface mHeadlineFont;
-        private final List<Drawable> mIcons;
-        private String mTitle;
-        private OnClickListener mEditClickListener;
-        private final ThemePreviewAdapter.WallpaperPreviewLayoutListener mListener;
-        private final int mCornerRadius;
-
-        private ThemeCoverPage(Context context, String title, int accentColor, List<Drawable> icons,
-                Typeface headlineFont, int cornerRadius,
-                OnClickListener editClickListener,
-                ThemePreviewAdapter.WallpaperPreviewLayoutListener wallpaperListener) {
-            super(context, 0, 0, R.layout.preview_card_cover_content, accentColor);
-            mTitle = title;
-            mHeadlineFont = headlineFont;
-            mIcons = icons;
-            mCornerRadius = cornerRadius;
-            mEditClickListener = editClickListener;
-            mListener = wallpaperListener;
-        }
-
-        @Override
-        protected void bindBody(boolean forceRebind) {
-            card.addOnLayoutChangeListener(mListener);
-            if (forceRebind) {
-                card.requestLayout();
-            }
-        }
-
-        @Override
-        public void bindPreviewContent() {
-            TextView header = card.findViewById(R.id.theme_preview_card_header);
-            header.setText(mTitle);
-            header.setTextAppearance(R.style.CoverTitleTextAppearance);
-            header.setTypeface(mHeadlineFont);
-
-            card.findViewById(R.id.theme_preview_top_bar).setVisibility(View.VISIBLE);
-            TextView clock = card.findViewById(R.id.theme_preview_clock);
-            clock.setText(getFormattedTime());
-            clock.setTypeface(mHeadlineFont);
-
-            ViewGroup iconsContainer = card.findViewById(R.id.theme_preview_top_bar_icons);
-
-            for (int i = 0; i < iconsContainer.getChildCount() && i < mIcons.size(); i++) {
-                ((ImageView) iconsContainer.getChildAt(i))
-                        .setImageDrawable(mIcons.get(i).getConstantState().newDrawable().mutate());
-            }
-
-            ViewGroup body = card.findViewById(R.id.theme_preview_card_body_container);
-
-            inflater.inflate(contentLayoutRes, body, true);
-
-            bindBody(false);
-
-            TextView editLabel = card.findViewById(R.id.edit_label);
-            editLabel.setOnClickListener(mEditClickListener);
-            card.setOnClickListener(mEditClickListener);
-            editLabel.setVisibility(mEditClickListener != null
-                    ? View.VISIBLE : View.INVISIBLE);
-            ColorStateList themeAccentColor = ColorStateList.valueOf(accentColor);
-            editLabel.setTextColor(themeAccentColor);
-            editLabel.setCompoundDrawableTintList(themeAccentColor);
-            View qsb = card.findViewById(R.id.theme_qsb);
-            if (qsb != null && qsb.getVisibility() == View.VISIBLE) {
-                if (qsb.getBackground() instanceof GradientDrawable) {
-                    GradientDrawable bg = (GradientDrawable) qsb.getBackground();
-                    float cornerRadius = useRoundedQSB(mCornerRadius)
-                            ? (float)qsb.getLayoutParams().height / 2 : mCornerRadius;
-                    bg.setCornerRadii(new float[]{
-                            cornerRadius, cornerRadius, cornerRadius, cornerRadius,
-                            cornerRadius, cornerRadius, cornerRadius, cornerRadius});
-                }
-            }
-        }
-
-        private boolean useRoundedQSB(int cornerRadius) {
-            return cornerRadius >=
-                    card.getResources().getDimensionPixelSize(R.dimen.roundCornerThreshold);
-        }
-
-        private String getFormattedTime() {
-            DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT);
-            StringBuffer time = new StringBuffer();
-            FieldPosition amPmPosition = new FieldPosition(DateFormat.Field.AM_PM);
-            df.format(Calendar.getInstance(TimeZone.getDefault()).getTime(), time, amPmPosition);
-            if (amPmPosition.getBeginIndex() > 0) {
-                time.delete(amPmPosition.getBeginIndex(), amPmPosition.getEndIndex());
-            }
-            return time.toString();
-        }
-
-        @Override
-        protected boolean containsWallpaper() {
-            return true;
-        }
-    }
-
     /**
      * Adapter class for mPreviewPager.
      * This is a ViewPager as it allows for a nice pagination effect (ie, pages snap on swipe,
@@ -473,66 +324,9 @@
             addPage(new ThemeCoverPage(activity, theme.getTitle(),
                     previewInfo.resolveAccentColor(res), previewInfo.icons,
                     previewInfo.headlineFontFamily, previewInfo.bottomSheeetCornerRadius,
-                    editClickListener,
-                    new WallpaperPreviewLayoutListener(theme, previewInfo, true)) {
-
-                @Override
-                protected void bindBody(boolean forceRebind) {
-                    if (card == null) {
-                        return;
-                    }
-                    card.addOnLayoutChangeListener(coverCardLayoutListener);
-                    super.bindBody(forceRebind);
-
-                    // Color QS icons:
-                    int controlGreyColor = res.getColor(R.color.control_grey);
-                    ColorStateList tintList = new ColorStateList(
-                            new int[][]{
-                                    new int[]{android.R.attr.state_selected},
-                                    new int[]{android.R.attr.state_checked},
-                                    new int[]{-android.R.attr.state_enabled},
-                            },
-                            new int[] {
-                                    accentColor,
-                                    accentColor,
-                                    controlGreyColor
-                            }
-                    );
-
-                    for (int i = 0; i < mColorButtonIds.length; i++) {
-                        CompoundButton button = card.findViewById(mColorButtonIds[i]);
-                        if (button != null) {
-                            button.setButtonTintList(tintList);
-                        }
-                    }
-                    for (int i = 0; i < 3 && i < previewInfo.icons.size(); i++) {
-                        Drawable icon =
-                                previewInfo.icons.get(i).getConstantState().newDrawable().mutate();
-                        Drawable bgShape =
-                                previewInfo.shapeDrawable.getConstantState().newDrawable();
-                        bgShape.setTint(accentColor);
-
-                        ImageView bg = card.findViewById(mColorTileIds[i]);
-                        bg.setImageDrawable(bgShape);
-                        ImageView fg = card.findViewById(mColorTileIconIds[i]);
-                        fg.setImageDrawable(icon);
-                    }
-
-                    // Shape preview icons:
-
-                    for (int i = 0; i < 3 && i < previewInfo.shapeAppIcons.size(); i++) {
-                        ImageView iconView = card.findViewById(mShapeIconIds[i]);
-                        iconView.setBackground(
-                                previewInfo.shapeAppIcons.get(i));
-                    }
-
-                    Drawable background = card.findViewById(R.id.theme_preview_card_background)
-                            .getBackground();
-                    if (background != null) {
-                        background.setAlpha(128);
-                    }
-                }
-            });
+                    previewInfo.shapeDrawable, previewInfo.shapeAppIcons, editClickListener,
+                    mColorButtonIds, mColorTileIds, mColorTileIconIds, mShapeIconIds,
+                    new WallpaperPreviewLayoutListener(theme, previewInfo, true)));
             addPage(new ThemePreviewPage(activity, R.string.preview_name_font, R.drawable.ic_font,
                     R.layout.preview_card_font_content,
                     previewInfo.resolveAccentColor(res)) {
diff --git a/src/com/android/customization/picker/theme/ThemePreviewPage.java b/src/com/android/customization/picker/theme/ThemePreviewPage.java
new file mode 100644
index 0000000..73bd886
--- /dev/null
+++ b/src/com/android/customization/picker/theme/ThemePreviewPage.java
@@ -0,0 +1,238 @@
+package com.android.customization.picker.theme;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.icu.text.DateFormat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLayoutChangeListener;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
+
+import com.android.customization.picker.BasePreviewAdapter.PreviewPage;
+import com.android.wallpaper.R;
+
+import java.text.FieldPosition;
+import java.util.Calendar;
+import java.util.List;
+import java.util.TimeZone;
+
+abstract class ThemePreviewPage extends PreviewPage {
+    @StringRes
+    final int nameResId;
+    @DrawableRes
+    final int iconSrc;
+    @LayoutRes
+    final int contentLayoutRes;
+    @ColorInt
+    final int accentColor;
+    protected final LayoutInflater inflater;
+
+    public ThemePreviewPage(Context context, @StringRes int titleResId,
+            @DrawableRes int iconSrc, @LayoutRes int contentLayoutRes,
+            @ColorInt int accentColor) {
+        super(null);
+        this.nameResId = titleResId;
+        this.iconSrc = iconSrc;
+        this.contentLayoutRes = contentLayoutRes;
+        this.accentColor = accentColor;
+        this.inflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public void bindPreviewContent() {
+        TextView header = card.findViewById(R.id.theme_preview_card_header);
+        header.setText(nameResId);
+        header.setCompoundDrawablesWithIntrinsicBounds(0, iconSrc, 0, 0);
+        header.setCompoundDrawableTintList(ColorStateList.valueOf(accentColor));
+        card.findViewById(R.id.theme_preview_top_bar).setVisibility(View.GONE);
+        card.findViewById(R.id.edit_label).setVisibility(View.GONE);
+
+        ViewGroup body = card.findViewById(R.id.theme_preview_card_body_container);
+        inflater.inflate(contentLayoutRes, body, true);
+        bindBody(false);
+    }
+
+    protected boolean containsWallpaper() {
+        return false;
+    }
+
+    protected abstract void bindBody(boolean forceRebind);
+
+    static class ThemeCoverPage extends ThemePreviewPage {
+
+        private final Typeface mHeadlineFont;
+        private final List<Drawable> mIcons;
+        private final List<Drawable> mShapeAppIcons;
+        private Drawable mShapeDrawable;
+        private final int[] mColorButtonIds;
+        private final int[] mColorTileIds;
+        private final int[] mColorTileIconIds;
+        private final int[] mShapeIconIds;
+        private final Resources mRes;
+        private String mTitle;
+        private OnClickListener mEditClickListener;
+        private final OnLayoutChangeListener mListener;
+        private final int mCornerRadius;
+
+        public ThemeCoverPage(Context context, String title, int accentColor, List<Drawable> icons,
+                Typeface headlineFont, int cornerRadius,
+                Drawable shapeDrawable,
+                List<Drawable> shapeAppIcons,
+                OnClickListener editClickListener,
+                int[] colorButtonIds, int[] colorTileIds, int[] colorTileIconIds,
+                int[] shapeIconIds, OnLayoutChangeListener wallpaperListener) {
+            super(context, 0, 0, R.layout.preview_card_cover_content, accentColor);
+            mRes = context.getResources();
+            mTitle = title;
+            mHeadlineFont = headlineFont;
+            mIcons = icons;
+            mCornerRadius = cornerRadius;
+            mShapeDrawable = shapeDrawable;
+            mShapeAppIcons = shapeAppIcons;
+            mEditClickListener = editClickListener;
+            mColorButtonIds = colorButtonIds;
+            mColorTileIds = colorTileIds;
+            mColorTileIconIds = colorTileIconIds;
+            mShapeIconIds = shapeIconIds;
+            mListener = wallpaperListener;
+        }
+
+        @Override
+        protected void bindBody(boolean forceRebind) {
+            if (card == null) {
+                return;
+            }
+
+            card.addOnLayoutChangeListener(mListener);
+            if (forceRebind) {
+                card.requestLayout();
+            }
+
+            // Color QS icons:
+            int controlGreyColor = mRes.getColor(R.color.control_grey, null);
+            ColorStateList tintList = new ColorStateList(
+                    new int[][]{
+                            new int[]{android.R.attr.state_selected},
+                            new int[]{android.R.attr.state_checked},
+                            new int[]{-android.R.attr.state_enabled},
+                    },
+                    new int[] {
+                            accentColor,
+                            accentColor,
+                            controlGreyColor
+                    }
+            );
+
+            for (int i = 0; i < mColorButtonIds.length; i++) {
+                CompoundButton button = card.findViewById(mColorButtonIds[i]);
+                if (button != null) {
+                    button.setButtonTintList(tintList);
+                }
+            }
+            for (int i = 0; i < 3 && i < mIcons.size(); i++) {
+                Drawable icon =
+                        mIcons.get(i).getConstantState().newDrawable().mutate();
+                Drawable bgShape = mShapeDrawable.getConstantState().newDrawable();
+                bgShape.setTint(accentColor);
+
+                ImageView bg = card.findViewById(mColorTileIds[i]);
+                bg.setImageDrawable(bgShape);
+                ImageView fg = card.findViewById(mColorTileIconIds[i]);
+                fg.setImageDrawable(icon);
+            }
+
+            // Shape preview icons:
+
+            for (int i = 0; i < 3 && i < mShapeAppIcons.size(); i++) {
+                ImageView iconView = card.findViewById(mShapeIconIds[i]);
+                iconView.setBackground(mShapeAppIcons.get(i));
+            }
+
+            Drawable background = card.findViewById(R.id.theme_preview_card_background)
+                    .getBackground();
+            if (background != null) {
+                background.setAlpha(128);
+            }
+        }
+
+        @Override
+        public void bindPreviewContent() {
+            TextView header = card.findViewById(R.id.theme_preview_card_header);
+            header.setText(mTitle);
+            header.setTextAppearance(R.style.CoverTitleTextAppearance);
+            header.setTypeface(mHeadlineFont);
+
+            card.findViewById(R.id.theme_preview_top_bar).setVisibility(View.VISIBLE);
+            TextView clock = card.findViewById(R.id.theme_preview_clock);
+            clock.setText(getFormattedTime());
+            clock.setTypeface(mHeadlineFont);
+
+            ViewGroup iconsContainer = card.findViewById(R.id.theme_preview_top_bar_icons);
+
+            for (int i = 0; i < iconsContainer.getChildCount() && i < mIcons.size(); i++) {
+                ((ImageView) iconsContainer.getChildAt(i))
+                        .setImageDrawable(mIcons.get(i).getConstantState().newDrawable().mutate());
+            }
+
+            ViewGroup body = card.findViewById(R.id.theme_preview_card_body_container);
+
+            inflater.inflate(contentLayoutRes, body, true);
+
+            bindBody(false);
+
+            TextView editLabel = card.findViewById(R.id.edit_label);
+            editLabel.setOnClickListener(mEditClickListener);
+            card.setOnClickListener(mEditClickListener);
+            editLabel.setVisibility(mEditClickListener != null
+                    ? View.VISIBLE : View.INVISIBLE);
+            ColorStateList themeAccentColor = ColorStateList.valueOf(accentColor);
+            editLabel.setTextColor(themeAccentColor);
+            editLabel.setCompoundDrawableTintList(themeAccentColor);
+            View qsb = card.findViewById(R.id.theme_qsb);
+            if (qsb != null && qsb.getVisibility() == View.VISIBLE) {
+                if (qsb.getBackground() instanceof GradientDrawable) {
+                    GradientDrawable bg = (GradientDrawable) qsb.getBackground();
+                    float cornerRadius = useRoundedQSB(mCornerRadius)
+                            ? (float)qsb.getLayoutParams().height / 2 : mCornerRadius;
+                    bg.setCornerRadii(new float[]{
+                            cornerRadius, cornerRadius, cornerRadius, cornerRadius,
+                            cornerRadius, cornerRadius, cornerRadius, cornerRadius});
+                }
+            }
+        }
+
+        private boolean useRoundedQSB(int cornerRadius) {
+            return cornerRadius >=
+                    card.getResources().getDimensionPixelSize(R.dimen.roundCornerThreshold);
+        }
+
+        private String getFormattedTime() {
+            DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT);
+            StringBuffer time = new StringBuffer();
+            FieldPosition amPmPosition = new FieldPosition(DateFormat.Field.AM_PM);
+            df.format(Calendar.getInstance(TimeZone.getDefault()).getTime(), time, amPmPosition);
+            if (amPmPosition.getBeginIndex() > 0) {
+                time.delete(amPmPosition.getBeginIndex(), amPmPosition.getEndIndex());
+            }
+            return time.toString();
+        }
+
+        @Override
+        protected boolean containsWallpaper() {
+            return true;
+        }
+    }
+}