diff --git a/res/layout/fragment_clock_picker.xml b/res/layout/fragment_clock_picker.xml
index da4f891..1528666 100644
--- a/res/layout/fragment_clock_picker.xml
+++ b/res/layout/fragment_clock_picker.xml
@@ -23,40 +23,89 @@
     android:background="?android:colorPrimary">
     <include layout="@layout/section_header"/>
 
-    <com.android.customization.widget.PreviewPager
-        android:id="@+id/clock_preview_pager"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/secondary_color"
-        app:card_style="screen_aspect_ratio"/>
+        android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/options_section"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingVertical="10dp"
-        android:orientation="vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/options_container"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/content_section"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/options_container_height"
-            android:layout_gravity="center_horizontal"/>
+            android:layout_height="match_parent">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="10dp">
+            <com.android.customization.widget.PreviewPager
+                android:id="@+id/clock_preview_pager"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/secondary_color"
+                app:layout_constrainedHeight="true"
+                app:layout_constraintBottom_toTopOf="@id/options_container"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_max="@dimen/preview_pager_max_height"
+                app:layout_constraintHeight_min="@dimen/preview_pager_min_height"
+                app:layout_constraintVertical_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="spread_inside"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/options_container"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/options_container_height"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="10dp"
+                app:layout_constraintBottom_toTopOf="@id/placeholder"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/clock_preview_pager"
+                app:layout_constraintVertical_bias="1.0"/>
+
+            <Space
+                android:id="@+id/placeholder"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/min_taptarget_height"
+                app:layout_constraintBottom_toTopOf="@id/apply_button"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_min="@dimen/min_taptarget_height"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/options_container"
+                app:layout_constraintVertical_bias="1.0"/>
+
             <Button
                 android:id="@+id/apply_button"
                 style="@style/ActionPrimaryButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:text="@string/apply_btn"/>
-        </RelativeLayout>
+                android:layout_gravity="end"
+                android:layout_marginEnd="10dp"
+                android:layout_marginVertical="10dp"
+                android:layout_weight="1"
+                android:text="@string/apply_theme_btn"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </LinearLayout>
-
+        <androidx.core.widget.ContentLoadingProgressBar
+            android:id="@+id/loading_indicator"
+            style="@android:style/Widget.DeviceDefault.ProgressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="200dp"
+            android:layout_gravity="center_horizontal|top"
+            android:indeterminate="true"/>
+        <FrameLayout
+            android:id="@+id/error_section"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/error_message"
+                style="@style/HeaderTextAppearance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/something_went_wrong"/>
+        </FrameLayout>
+    </FrameLayout>
 </LinearLayout>
diff --git a/res/layout/fragment_custom_theme_component.xml b/res/layout/fragment_custom_theme_component.xml
index e9dd927..13b0b33 100644
--- a/res/layout/fragment_custom_theme_component.xml
+++ b/res/layout/fragment_custom_theme_component.xml
@@ -16,54 +16,83 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="?android:colorPrimary">
     <include layout="@layout/section_header"/>
 
-    <FrameLayout
-        android:id="@+id/component_preview_container"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="?android:colorPrimary">
-        <include
-            android:id="@+id/component_preview_content"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:id="@+id/component_preview_container"
             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_component_preview"/>
-    </FrameLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/divider_color"/>
-    <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">
+            android:layout_height="0dp"
+            android:background="?android:colorPrimary"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintBottom_toTopOf="@+id/guideline"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="@dimen/preview_pager_max_height"
+            app:layout_constraintHeight_min="@dimen/preview_pager_min_height"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0">
+
+            <include
+                android:id="@+id/component_preview_content"
+                layout="@layout/theme_component_preview"
+                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/indicator_container_height"/>
+        </FrameLayout>
+        <View
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/divider_color"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/component_preview_container"/>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent=".7"/>
+
 
         <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:layout_marginTop="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
             android:textAlignment="center"
-            android:textAppearance="@style/HeaderTextAppearance"/>
+            android:textAppearance="@style/HeaderTextAppearance"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/guideline"/>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/options_container"
             android:layout_width="match_parent"
             android:layout_height="@dimen/options_container_height"
-            android:layout_gravity="center_horizontal"/>
+            android:layout_gravity="center_horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/component_options_title"
+            app:layout_constraintVertical_bias=".2"/>
 
-    </LinearLayout>
-
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>
diff --git a/res/layout/fragment_custom_theme_name.xml b/res/layout/fragment_custom_theme_name.xml
index 98feb60..9ac0b21 100644
--- a/res/layout/fragment_custom_theme_name.xml
+++ b/res/layout/fragment_custom_theme_name.xml
@@ -16,59 +16,78 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     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"
+    <androidx.constraintlayout.widget.ConstraintLayout
         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_height="match_parent">
+
+        <FrameLayout
+            android:id="@+id/component_preview_container"
             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">
+            android:layout_height="0dp"
+            android:background="@color/secondary_color"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintBottom_toTopOf="@+id/guideline"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="@dimen/preview_pager_max_height"
+            app:layout_constraintHeight_min="@dimen/preview_pager_min_height"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0">
+
+            <include
+                android:id="@+id/component_preview_content"
+                layout="@layout/theme_preview_card"
+                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/indicator_container_height"/>
+        </FrameLayout>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent=".7"/>
 
         <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:layout_marginTop="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
             android:textAlignment="center"
-            android:textAppearance="@style/HeaderTextAppearance"/>
+            android:textAppearance="@style/HeaderTextAppearance"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/guideline"/>
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/options_container_height"
-            android:layout_gravity="center">
+        <EditText
+            android:id="@+id/custom_theme_name"
+            style="@style/CustomThemeNameEditText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAutofill="no"
+            android:minWidth="300dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/component_options_title"
+            app:layout_constraintVertical_bias=".2"/>
 
-            <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>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
diff --git a/res/layout/fragment_grid_picker.xml b/res/layout/fragment_grid_picker.xml
index d7618f3..467a620 100644
--- a/res/layout/fragment_grid_picker.xml
+++ b/res/layout/fragment_grid_picker.xml
@@ -16,46 +16,95 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="?android:colorPrimary">
     <include layout="@layout/section_header"/>
 
-    <com.android.customization.widget.PreviewPager
-        android:id="@+id/grid_preview_pager"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/secondary_color"
-        app:card_style="screen_aspect_ratio"/>
+        android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/options_section"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingVertical="10dp"
-        android:orientation="vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/options_container"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/content_section"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/options_container_height"
-            android:layout_gravity="center_horizontal"/>
+            android:layout_height="match_parent">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="10dp">
+            <com.android.customization.widget.PreviewPager
+                android:id="@+id/grid_preview_pager"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/secondary_color"
+                app:card_style="screen_aspect_ratio"
+                app:layout_constrainedHeight="true"
+                app:layout_constraintBottom_toTopOf="@id/options_container"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_max="@dimen/preview_pager_max_height"
+                app:layout_constraintHeight_min="@dimen/preview_pager_min_height"
+                app:layout_constraintVertical_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="spread_inside"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/options_container"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/options_container_height"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="10dp"
+                app:layout_constraintBottom_toTopOf="@id/placeholder"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/grid_preview_pager"
+                app:layout_constraintVertical_bias="1.0"/>
+
+            <Space
+                android:id="@+id/placeholder"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/min_taptarget_height"
+                app:layout_constraintBottom_toTopOf="@id/apply_button"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/options_container"
+                app:layout_constraintVertical_bias="1.0"/>
+
             <Button
                 android:id="@+id/apply_button"
                 style="@style/ActionPrimaryButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:text="@string/apply_btn"/>
-        </RelativeLayout>
+                android:layout_gravity="end"
+                android:layout_marginEnd="10dp"
+                android:layout_marginVertical="10dp"
+                android:layout_weight="1"
+                android:text="@string/apply_theme_btn"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
 
-    </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <androidx.core.widget.ContentLoadingProgressBar
+            android:id="@+id/loading_indicator"
+            style="@android:style/Widget.DeviceDefault.ProgressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="200dp"
+            android:layout_gravity="center_horizontal|top"
+            android:indeterminate="true"/>
+        <FrameLayout
+            android:id="@+id/error_section"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/error_message"
+                style="@style/HeaderTextAppearance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/something_went_wrong"/>
+        </FrameLayout>
+    </FrameLayout>
 </LinearLayout>
diff --git a/res/layout/fragment_theme_picker.xml b/res/layout/fragment_theme_picker.xml
index 2cfac1d..dbb633e 100644
--- a/res/layout/fragment_theme_picker.xml
+++ b/res/layout/fragment_theme_picker.xml
@@ -16,56 +16,102 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="?android:colorPrimary">
     <include layout="@layout/section_header"/>
 
-    <com.android.customization.widget.PreviewPager
-        android:id="@+id/theme_preview_pager"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/secondary_color"/>
+        android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/options_section"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingVertical="10dp"
-        android:orientation="vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/options_container"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/content_section"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/options_container_height"
-            android:layout_gravity="center_horizontal"/>
+            android:layout_height="match_parent">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="10dp">
+            <com.android.customization.widget.PreviewPager
+                android:id="@+id/theme_preview_pager"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/secondary_color"
+                app:layout_constrainedHeight="true"
+                app:layout_constraintBottom_toTopOf="@id/options_container"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_max="@dimen/preview_pager_max_height"
+                app:layout_constraintHeight_min="@dimen/preview_pager_min_height"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.0"
+                app:layout_constraintVertical_chainStyle="spread_inside"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/options_container"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/options_container_height"
+                android:layout_gravity="bottom|center_horizontal"
+                android:layout_marginTop="10dp"
+                android:layout_weight="1"
+                app:layout_constraintBottom_toTopOf="@id/use_my_wallpaper"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/theme_preview_pager"
+                app:layout_constraintVertical_bias="1.0"/>
+
             <CheckBox
                 android:id="@+id/use_my_wallpaper"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:layout_toStartOf="@+id/apply_button"
+                android:layout_height="@dimen/min_taptarget_height"
+                android:layout_marginStart="10dp"
                 android:ellipsize="end"
+                android:gravity="start|center_vertical"
                 android:paddingLeft="4dp"
-                android:minHeight="@dimen/min_taptarget_height"
-                android:text="@string/keep_my_wallpaper"/>
+                android:text="@string/keep_my_wallpaper"
+                app:layout_constraintBottom_toTopOf="@id/apply_button"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_min="@dimen/min_taptarget_height"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/options_container"
+                app:layout_constraintVertical_bias="1.0"/>
+
             <Button
                 android:id="@+id/apply_button"
                 style="@style/ActionPrimaryButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:text="@string/apply_theme_btn"/>
-        </RelativeLayout>
+                android:layout_gravity="end"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                android:text="@string/apply_theme_btn"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </LinearLayout>
+        <androidx.core.widget.ContentLoadingProgressBar
+            android:id="@+id/loading_indicator"
+            style="@android:style/Widget.DeviceDefault.ProgressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="200dp"
+            android:layout_gravity="center_horizontal|top"
+            android:indeterminate="true"/>
 
+        <FrameLayout
+            android:id="@+id/error_section"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/error_message"
+                style="@style/HeaderTextAppearance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/something_went_wrong"/>
+        </FrameLayout>
+    </FrameLayout>
 </LinearLayout>
diff --git a/res/layout/preview_card_color_content.xml b/res/layout/preview_card_color_content.xml
index 8587652..1de2cd4 100644
--- a/res/layout/preview_card_color_content.xml
+++ b/res/layout/preview_card_color_content.xml
@@ -75,14 +75,13 @@
                 android:layout_width="@dimen/preview_theme_icon_size"
                 android:layout_height="@dimen/preview_theme_icon_size"
                 android:layout_gravity="center"
-                android:id="@+id/preview_color_qs_2_bg"
-                android:tint="@color/tile_disabled_background_color"/>
+                android:id="@+id/preview_color_qs_2_bg"/>
             <ImageView
                 android:layout_width="@dimen/preview_theme_tile_size"
                 android:layout_height="@dimen/preview_theme_tile_size"
                 android:layout_gravity="center"
                 android:id="@+id/preview_color_qs_2_icon"
-                android:color="@color/tile_disabled_icon_color"/>
+                android:color="@color/tile_enabled_icon_color"/>
         </FrameLayout>
     </LinearLayout>
     <Space
diff --git a/res/layout/preview_card_cover_content.xml b/res/layout/preview_card_cover_content.xml
index d052642..055a126 100644
--- a/res/layout/preview_card_cover_content.xml
+++ b/res/layout/preview_card_cover_content.xml
@@ -67,13 +67,12 @@
         <ImageView
             android:layout_width="@dimen/preview_theme_icon_size"
             android:layout_height="@dimen/preview_theme_icon_size"
-            android:id="@+id/preview_color_qs_2_bg"
-            android:tint="@color/tile_disabled_background_color"/>
+            android:id="@+id/preview_color_qs_2_bg"/>
         <ImageView
             android:layout_width="@dimen/preview_theme_tile_size"
             android:layout_height="@dimen/preview_theme_tile_size"
             android:id="@+id/preview_color_qs_2_icon"
-            android:color="@color/tile_disabled_icon_color"
+            android:tint="@color/tile_enabled_icon_color"
             android:layout_gravity="center"/>
     </FrameLayout>
 
diff --git a/res/layout/theme_component_preview.xml b/res/layout/theme_component_preview.xml
index a087c0d..32d3f20 100644
--- a/res/layout/theme_component_preview.xml
+++ b/res/layout/theme_component_preview.xml
@@ -14,55 +14,47 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<FrameLayout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:id="@+id/theme_preview_card_background"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/theme_preview_card_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:focusable="true" tools:showIn="@layout/theme_preview_card">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingHorizontal="@dimen/preview_card_padding"
-        android:paddingTop="@dimen/preview_card_padding"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent">
+    android:maxHeight="@dimen/preview_theme_max_height"
+    android:minHeight="@dimen/preview_theme_min_height"
+    android:paddingHorizontal="@dimen/preview_card_padding"
+    android:paddingTop="@dimen/preview_card_padding">
 
         <ViewStub
             android:id="@+id/theme_preview_top_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout="@layout/theme_preview_topbar"
+            app:layout_constraintBottom_toTopOf="@+id/theme_preview_card_header"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="spread_inside"/>
 
         <TextView
             android:id="@+id/theme_preview_card_header"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginVertical="@dimen/card_header_top_margin"
-            android:drawablePadding="12dp"
+            android:drawablePadding="@dimen/theme_preview_header_drawable_padding"
             android:textAppearance="@style/CardTitleTextAppearance"
+            app:layout_constraintBottom_toTopOf="@id/theme_preview_card_body_container"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/theme_preview_top_bar"
-            app:layout_goneMarginTop="@dimen/card_header_top_margin"/>
-
-        <Space
-            android:id="@+id/theme_preview_content_spacer"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="48dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/theme_preview_card_header"/>
+            app:layout_goneMarginTop="@dimen/card_header_top_margin"
+            app:layout_constraintVertical_chainStyle="spread_inside"
+            tools:text="Default"/>
 
         <FrameLayout
             android:id="@+id/theme_preview_card_body_container"
@@ -76,23 +68,23 @@
             app:layout_constraintHeight_min="@dimen/preview_theme_content_min_height"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/theme_preview_content_spacer">
-
-        </FrameLayout>
+            app:layout_constraintTop_toBottomOf="@+id/theme_preview_card_header"/>
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            app:layout_constraintGuide_end="40dp"
-        />
+            app:layout_constraintBottom_toTopOf="@+id/edit_label"
+            app:layout_constraintGuide_end="@dimen/min_taptarget_height"
+            app:layout_constraintTop_toBottomOf="@+id/theme_preview_card_body_container"/>
 
         <TextView
             android:id="@+id/edit_label"
             style="@style/EditLabelStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:minHeight="@dimen/min_taptarget_height"
             android:drawableStart="@drawable/ic_tune"
             android:drawablePadding="8dp"
             android:gravity="center"
@@ -102,8 +94,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/theme_preview_card_body_container"
+            app:layout_constraintTop_toBottomOf="@+id/guideline"
             app:layout_constraintVertical_bias="0.5"/>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/theme_icon_option.xml b/res/layout/theme_icon_option.xml
index 4872ffc..62925ad 100644
--- a/res/layout/theme_icon_option.xml
+++ b/res/layout/theme_icon_option.xml
@@ -38,6 +38,7 @@
             android:id="@+id/option_icon"
             android:layout_width="@dimen/component_icon_thumb_size"
             android:layout_height="@dimen/component_icon_thumb_size"
-            android:layout_gravity="center"/>
+            android:layout_gravity="center"
+            android:tint="?android:colorForeground"/>
     </FrameLayout>
 </LinearLayout>
diff --git a/res/layout/theme_option.xml b/res/layout/theme_option.xml
index de81231..1cb9ffa 100644
--- a/res/layout/theme_option.xml
+++ b/res/layout/theme_option.xml
@@ -45,7 +45,8 @@
             android:layout_height="@dimen/theme_option_icon_sample_height"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
-            android:layout_margin="@dimen/theme_option_sample_padding"/>
+            android:layout_margin="@dimen/theme_option_sample_padding"
+            android:tint="?android:colorForeground"/>
         <ImageView
             android:id="@+id/theme_option_shape"
             android:layout_width="@dimen/theme_option_shape_sample_width"
diff --git a/res/layout/theme_preview_topbar.xml b/res/layout/theme_preview_topbar.xml
index 2422064..5642668 100644
--- a/res/layout/theme_preview_topbar.xml
+++ b/res/layout/theme_preview_topbar.xml
@@ -20,7 +20,8 @@
     android:id="@+id/theme_preview_top_bar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:visibility="visible" tools:showIn="@layout/theme_preview_card">
+    tools:visibility="visible"
+    tools:showIn="@layout/theme_preview_card">
     <TextView
         android:id="@+id/theme_preview_clock"
         android:layout_width="wrap_content"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 57c1c71..461a19e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Horlosie is toegepas"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Gepasmaakte <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Kies ikone"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Kies kleur"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Kies vorm"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Gee jou styl \'n naam"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikone <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Vee gepasmaakte styl uit?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Vee uit"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Gebruik <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nee, dankie"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g>-horlosievoorskou"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f96cca0..edc5264 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ሰዓት ተተግብሯል"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"ብጁ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"አዶዎችን ይምረጡ"</string>
     <string name="color_component_title" msgid="1194089273921078816">"ቀለም ይምረጡ"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ቅርጽ ይምረጡ"</string>
+    <string name="name_component_title" msgid="532425087968663437">"ቅጥዎን ይሰይሙት"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"አዶዎች <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"ብጁ ቅጥ ይሰረዝ?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ሰርዝ"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g>ን ይጠቀሙ"</string>
     <string name="no_thanks" msgid="7286616980115687627">"አይ፣ አመሰግናለሁ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"የ<xliff:g id="ID_1">%1$s</xliff:g> ሰዓት ቅድመ-እይታ"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3346ba8..d119172 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"تم تطبيق الساعة"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> مخصّصة"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"اختيار الرموز"</string>
     <string name="color_component_title" msgid="1194089273921078816">"اختيار اللون"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"اختيار الشكل"</string>
+    <string name="name_component_title" msgid="532425087968663437">"تسمية النمط"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"الرموز <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"هل تريد حذف النمط المُخصّص؟"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"حذف"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"استخدام <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"لا، شكرًا"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"معاينة الساعة <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index fb0cf4d..2c6bced 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Saat tətbiq edildi"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Fərdi <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"İkona seçin"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Rəng seçin"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Fiqur seçin"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Üslubunuza ad verin"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"İkonalar <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Fərdi üslub silinsin?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Silin"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> istifadə edin"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Xeyr, təşəkkürlər"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g>, saatın önizlənməsi"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index e080d5a..dc3a8d8 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Sat je primenjen"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Prilagođeno <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Izaberite ikone"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Odaberite boju"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Odaberite oblik"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Imenujte stil"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikone <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Želite li da izbrišete prilagođeni stil?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Izbriši"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Koristi <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ne, hvala"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Pregled sata <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a03e94c..a44c7bf 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Гадзіннік ужыты"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Карыстальніцкі <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Выберыце значкі"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Выберыце колер"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Выберыце фігуру"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Дайце назву стылю"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Значкі <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Выдаліць карыстальніцкі стыль?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Выдаліць"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Выкарыстоўваць <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Не, дзякуй"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Папярэдні прагляд гадзінніка <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5a48e55..e48f9d3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Часовникът е приложен"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Персонализ.: <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Избиране на икони"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Изберете цвят"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Избиране на форма"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Задайте име на стила си"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Икони <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Да се изтрие ли персонализираният стил?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Изтриване"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Използване на „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Не, благодаря"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Визуализация на циферблата <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 90ffa5d..c3ae1e8 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ঘড়ি প্রয়োগ করা হয়েছে"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"কাস্টম <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"আইকন বেছে নিন"</string>
     <string name="color_component_title" msgid="1194089273921078816">"রঙ বেছে নিন"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"আকার বেছে নিন"</string>
+    <string name="name_component_title" msgid="532425087968663437">"স্টাইলের নাম"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"আইকন <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"কাস্টম স্টাইল মুছবেন?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"মুছে ফেলুন"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> ব্যবহার করুন"</string>
     <string name="no_thanks" msgid="7286616980115687627">"না, থাক"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ঘড়ির প্রিভিউ"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index c0968c2..416f1fa 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Sat je primijenjen"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Prilagođeno <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Odaberite ikone"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Odaberite boju"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Odaberite oblik"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Dajte naziv svom stilu"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikone <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Izbrisati prilagođeni stil?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Izbriši"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Koristi stil <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ne, hvala"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Pregled sata <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6881756..3de292b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"S\'ha aplicat el rellotge"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Personalitzat <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Tria icones"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Selecciona un color"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Tria una forma"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Posa un nom a l\'estil"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Icones <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Vols suprimir l\'estil personalitzat?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Suprimeix"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Utilitza l\'estil <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No, gràcies"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Previsualització de rellotge <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 57110fc..2ffb142 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Nastavení hodin bylo použito"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Vlastní <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Výběr ikon"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Vybrat barvu"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Výběr tvaru"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Pojmenujte svůj styl"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikony <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Smazat vlastní styl?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Smazat"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Použít styl <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ne, děkuji"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Náhled ciferníku <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9b4fa89..241b298 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Uret anvendes"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Tilpasset <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Vælg ikoner"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Vælg farve"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Vælg form"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Giv din typografi et navn"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikoner <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Vil du slette din tilpassede stil?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Slet"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Brug <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nej tak"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Forhåndsvisning af urskiven <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1d7713e..f4c5bdc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Uhr angewendet"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Benutzerdefiniert <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Symbole auswählen"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Farbe wählen"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Form auswählen"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Design benennen"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Symbole <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Benutzerdefiniertes Design löschen?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Löschen"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> verwenden"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nein danke"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Vorschau für Zifferblatt <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5cb7e69..55dc19e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Το ρολόι εφαρμόστηκε"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Προσαρμοσμένο <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Επιλογή εικονιδίων"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Επιλογή χρώματος"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Επιλογή σχήματος"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Δώστε ένα όνομα στο στιλ σας"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Εικονίδια <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Θέλετε να διαγράψετε το προσαρμοσμένο στιλ;"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Διαγραφή"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Χρήση <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Όχι, ευχαριστώ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Προεπισκόπηση ρολογιού <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index f2fcf27..2e092ef 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Clock applied"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Custom <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Choose icons"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Choose colour"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Choose shape"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Name your style"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Icons <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Delete Custom style?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Delete"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Use <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No thanks"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> clock preview"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f2fcf27..2e092ef 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Clock applied"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Custom <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Choose icons"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Choose colour"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Choose shape"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Name your style"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Icons <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Delete Custom style?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Delete"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Use <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No thanks"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> clock preview"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f2fcf27..2e092ef 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Clock applied"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Custom <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Choose icons"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Choose colour"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Choose shape"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Name your style"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Icons <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Delete Custom style?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Delete"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Use <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No thanks"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> clock preview"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8f3ba5e..23e5d9c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Se aplicó el reloj"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> personalizado"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Elegir íconos"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Elegir color"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Elegir forma"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Asígnale un nombre a tu estilo"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Íconos <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"¿Borrar estilo personalizado?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Borrar"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Usar <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No, gracias"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Vista previa del reloj <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ae656eb..01cb456 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Reloj aplicado"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> personalizado"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Elegir iconos"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Elegir color"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Elegir forma"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Asigna un nombre a tu estilo"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Iconos <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"¿Eliminar estilo personalizado?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Eliminar"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Utilizar <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No, gracias"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Vista previa del reloj <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 570fabf..a53833d 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Kell on rakendatud"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Kohandatud <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Valige ikoonid"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Värvi valimine"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Kuju valimine"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Stiilile nime andmine"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikoonid <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Kas kustutada kohandatud stiil?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Kustuta"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Kasuta teemat <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Tänan, ei"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Kella <xliff:g id="ID_1">%1$s</xliff:g> eelvaade"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index dbb0fbd..4c5ed2c 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Aplikatu da erlojua"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> pertsonalizat."</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Aukeratu ikonoak"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Aukeratu kolorea"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Aukeratu forma"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Ezarri izena estiloari"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikonoak <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Estilo pertsonalizatua ezabatu nahi duzu?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Ezabatu"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Erabili <xliff:g id="ID_1">%1$s</xliff:g> estiloa"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ez"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> erlojuaren aurrebista"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 70c9347..717b382 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ساعت اعمال شد"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> سفارشی"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"انتخاب نمادها"</string>
     <string name="color_component_title" msgid="1194089273921078816">"انتخاب رنگ"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"انتخاب شکل"</string>
+    <string name="name_component_title" msgid="532425087968663437">"نام‌گذاری سبک"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"نمادها <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"سبک سفارشی حذف شود؟"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"حذف"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"استفاده از <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"نه، متشکرم"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> پیش‌نمایش ساعت"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d29c8cb..0b33a4d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Kello käytössä"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Oma <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Valitse kuvakkeet"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Valitse väri"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Valitse muoto"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Nimeä tyyli"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Kuvakkeet <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Poistetaanko oma tyyli?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Poista"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Valitse <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ei kiitos"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Kellon esikatselu: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index bd1cb68..4d2e045 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"L\'horloge a été appliquée"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Personnalisé <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Choisissez des icônes"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Sélectionnez une couleur"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Choisissez une forme"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Nommez votre style"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Icônes <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Supprimer le style personnalisé?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Supprimer"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Utiliser <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Non, merci"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Aperçu de l\'horloge <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a62c7a2..51fa243 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Horloge appliquée"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Personnalisé<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Sélectionner des icônes"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Choisir une couleur"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Sélectionner une forme"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Donner un nom à votre style"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Icônes <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Supprimer le style personnalisé ?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Supprimer"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Utiliser <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Non, merci"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> aperçu d\'horloge"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 2a5a720..c2ae8ba 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Aplicouse o reloxo"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Personalizado <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Escoller iconas"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Escoller cor"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Escoller forma"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Introduce un nome para o estilo"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Iconas <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Queres eliminar o estilo personalizado?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Eliminar"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Utilizar <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Non, grazas"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Vista previa do reloxo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3edd181..a2f46c9 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ઘડિયાળ લાગુ કરી"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"કસ્ટમ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"આઇકન પસંદ કરો"</string>
     <string name="color_component_title" msgid="1194089273921078816">"રંગ પસંદ કરો"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"આકાર પસંદ કરો"</string>
+    <string name="name_component_title" msgid="532425087968663437">"તમારી શૈલીને નામ આપો"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"આઇકન <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"શું કસ્ટમ શૈલી ડિલીટ કરીએ?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ડિલીટ કરો"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g>નો ઉપયોગ કરો"</string>
     <string name="no_thanks" msgid="7286616980115687627">"ના, આભાર"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ઘડિયાળનું પ્રીવ્યૂ"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-h740dp/dimens.xml b/res/values-h740dp/dimens.xml
new file mode 100644
index 0000000..a752b6b
--- /dev/null
+++ b/res/values-h740dp/dimens.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+<resources>
+    <dimen name="preview_theme_content_margin">12dp</dimen>
+
+    <dimen name="preview_theme_icon_size">40dp</dimen>
+    <dimen name="preview_theme_tile_size">20dp</dimen>
+    <dimen name="preview_theme_shape_size">52dp</dimen>
+    <dimen name="preview_theme_cover_content_extra_margin">8dp</dimen>
+
+    <dimen name="preview_theme_content_min_height">152dp</dimen>
+
+    <dimen name="theme_preview_header_drawable_padding">12dp</dimen>
+
+    <dimen name="card_header_top_margin">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ede44fa..81f5402 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"घड़ी की सुविधा जोड़ी गई"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"कस्टम <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"आइकॉन चुनें"</string>
     <string name="color_component_title" msgid="1194089273921078816">"रंग चुनें"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"आकार चुनें"</string>
+    <string name="name_component_title" msgid="532425087968663437">"अपनी शैली को नाम दें"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"आइकॉन <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"मनमुताबिक बनाया गया स्टाइल मिटाना चाहते हैं?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"मिटाएं"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> इस्तेमाल करें"</string>
     <string name="no_thanks" msgid="7286616980115687627">"रहने दें"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> घड़ी की झलक"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 199f677..d7747bd 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Sat je primijenjen"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Prilagođeno <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Odaberite ikone"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Izbor boje"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Odaberite oblik"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Unesite naziv svojeg stila"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikone <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Želite li izbrisati prilagođeni stil?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Izbriši"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Koristi <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ne, hvala"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Pregled sata <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 63d83ba..07fa1cf 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Óra alkalmazva"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Egyéni <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Ikonok kiválasztása"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Színválasztás"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Forma kiválasztása"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Nevezze el a stílust"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikonok <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Törli az egyéni stílust?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Törlés"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> használata"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nem, köszönöm"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> – óra előnézete"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index fe4f040..31279ea 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Ժամացույցը կիրառվեց"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Հատուկ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Ընտրեք պատկերակներ"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Ընտրեք գույնը"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Ընտրեք ձև"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Անվանեք ձեր թեման"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Պատկերակներ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Ջնջե՞լ հատուկ ոճը"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Ջնջել"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Օգտագործել <xliff:g id="ID_1">%1$s</xliff:g> ոճը"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ոչ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ժամացույցի նախադիտում"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f6c1852..e97b054 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Jam diterapkan"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> khusus"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Pilih ikon"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Pilih warna"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Pilih bentuk"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Beri nama gaya Anda"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikon <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Hapus Gaya kustom?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Hapus"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Gunakan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Lain kali"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Pratinjau jam <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index fcc4137..9b0b014 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Klukka notuð"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Sérsniðið <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Velja tákn"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Velja lit"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Velja form"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Gefðu stílnum heiti"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Tákn <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Viltu eyða sérsniðnu útliti?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Eyða"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Nota „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nei, takk"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> forskoðun klukku"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a308878..e24b840 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Orologio applicato"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Personalizzato <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Scegli le icone"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Scegli colore"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Scegli la forma"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Assegna un nome al tuo stile"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Icone <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Vuoi eliminare lo stile personalizzato?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Elimina"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Usa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"No, grazie"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Anteprima dell\'orologio <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4cbd32b..1ea3b94 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"השעון הותקן"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"מותאם אישית <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"בחירת סמלים"</string>
     <string name="color_component_title" msgid="1194089273921078816">"בחירת צבע"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"בחירת צורה"</string>
+    <string name="name_component_title" msgid="532425087968663437">"מה הסגנון שלך?"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"סמלים <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"למחוק את הסגנון בהתאמה אישית?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"מחיקה"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"שימוש בעיצוב <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"לא תודה"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"תצוגה מקדימה של שעון <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index dff4eff..dacda95 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -37,25 +37,24 @@
     <string name="preview_name_font" msgid="4465423899630037038">"フォント"</string>
     <string name="preview_name_icon" msgid="6818927315316316440">"アイコン"</string>
     <string name="preview_name_color" msgid="8776203144994416172">"色"</string>
-    <string name="preview_name_shape" msgid="5676971146080968721">"図形"</string>
+    <string name="preview_name_shape" msgid="5676971146080968721">"形状"</string>
     <string name="preview_name_wallpaper" msgid="1738652462949531828">"壁紙"</string>
     <string name="font_card_title" msgid="2343292653502548685">"ABC • abc • 123"</string>
     <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="applied_clock_msg" msgid="1938218786265793285">"時計を適用しました"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"カスタム <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"アイコンの選択"</string>
     <string name="color_component_title" msgid="1194089273921078816">"色の選択"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"形状の選択"</string>
+    <string name="name_component_title" msgid="532425087968663437">"スタイルの名前を指定"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"アイコン <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"カスタム スタイルを削除しますか？"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"削除"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> を使用"</string>
     <string name="no_thanks" msgid="7286616980115687627">"いいえ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> クロックのプレビュー"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index aa88875..08e0db8 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"საათი მისადაგებულია"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"მორგებული <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"ხატულების არჩევა"</string>
     <string name="color_component_title" msgid="1194089273921078816">"აირჩიეთ ფერი"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ფორმის არჩევა"</string>
+    <string name="name_component_title" msgid="532425087968663437">"დაარქვით სახელი თქვენს სტილს"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"ხატულები <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"გსურთ მორგებული სტილის წაშლა?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"წაშლა"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g>-ის გამოყენება"</string>
     <string name="no_thanks" msgid="7286616980115687627">"არა, გმადლობთ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> საათის გადახედვა"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 98dd689..c9573b8 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Сағат қолданылды."</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Арнаулы <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Белгішелерді таңдау"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Түс таңдау"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Пішін таңдау"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Стиль атауын көрсетіңіз"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"<xliff:g id="ID_1">%1$d</xliff:g> белгішелері"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Арнаулы стиль жойылсын ба?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Жою"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> пайдалану"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Жоқ, рақмет"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> сағатын алдын ала қарау"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 9a1bec6..1bbf4aa 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"បានប្រើ​នាឡិកា"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> ផ្ទាល់ខ្លួន"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"ជ្រើសរើស​រូបតំណាង"</string>
     <string name="color_component_title" msgid="1194089273921078816">"ជ្រើសរើសពណ៌"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ជ្រើសរើស​រូបរាង"</string>
+    <string name="name_component_title" msgid="532425087968663437">"ដាក់ឈ្មោះ​រចនាប័ទ្ម​របស់អ្នក"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"រូបតំណាង <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"លុប​រចនាប័ទ្ម​ផ្ទាល់ខ្លួន?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"លុប"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"ប្រើ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"ទេ អរគុណ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"ការមើល​នាឡិកា <xliff:g id="ID_1">%1$s</xliff:g> សាកល្បង"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 046f1e8..dde11e6 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ಗಡಿಯಾರವನ್ನು ಅನ್ವಯಿಸಲಾಗಿದೆ"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"ಕಸ್ಟಮ್ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"ಐಕಾನ್‌ಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="color_component_title" msgid="1194089273921078816">"ಬಣ್ಣ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ಆಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="name_component_title" msgid="532425087968663437">"ನಿಮ್ಮ ಶೈಲಿಯನ್ನು ಹೆಸರಿಸಿ"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"ಐಕಾನ್‌ಗಳು <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"ಕಸ್ಟಮ್ ಶೈಲಿಯನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ಅಳಿಸಿ"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> ಅನ್ನು ಬಳಸಿ"</string>
     <string name="no_thanks" msgid="7286616980115687627">"ಬೇಡ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ಗಡಿಯಾರ ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4f2d551..cddfc2e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"시계 적용됨"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"맞춤설정 <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"아이콘 선택"</string>
     <string name="color_component_title" msgid="1194089273921078816">"색상 선택"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"모양 선택"</string>
+    <string name="name_component_title" msgid="532425087968663437">"스타일 이름 지정"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"아이콘 <xliff:g id="ID_1">%1$d</xliff:g>개"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"맞춤 스타일을 삭제하시겠습니까?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"삭제"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> 사용"</string>
     <string name="no_thanks" msgid="7286616980115687627">"아니요"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> 시계 미리보기"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index db8cd75..9399872 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Саат колдонулду"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Жеке <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Сүрөтчөлөрдү тандоо"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Түс тандоо"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Формасын тандоо"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Стилиңизге ат коюңуз"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Сүрөтчөлөр <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Жеке стиль жок кылынсынбы?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Жок кылуу"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> колдонулсун"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Жок, рахмат"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> саатын алдын ала көрүү"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 30f22c5..0373e16 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ນຳໃຊ້ໂມງແລ້ວ"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> ແບບກຳນົດເອງ"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"ເລືອກໄອຄອນ"</string>
     <string name="color_component_title" msgid="1194089273921078816">"ເລືອກ​ສີ"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ເລືອກຮູບຮ່າງ"</string>
+    <string name="name_component_title" msgid="532425087968663437">"ຕັ້ງຊື່ຮູບແບບຂອງທ່ານ"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"ໄອຄອນ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"ລຶບຮູບແບບກຳນົດເອງບໍ?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ລຶບ"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"ໃຊ້ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"ບໍ່, ຂອບໃຈ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"ຕົວຢ່າງໂມງ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 045ff61..4fcb5d6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Laikrodis pritaikytas"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Tinkintas <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Pasirinkite piktogramas"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Pasirinkite spalvą"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Formos pasirinkimas"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Pavadinkite stilių"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"<xliff:g id="ID_1">%1$d</xliff:g> piktogramos"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Ištrinti tinkintą stilių?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Ištrinti"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Naudoti „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ne, ačiū"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Ciferblato „<xliff:g id="ID_1">%1$s</xliff:g>“ peržiūra"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 090a9b7..277a2d4 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Ciparnīca tiek lietota"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Pielāgots <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Ikonu izvēle"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Krāsas izvēle"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Formas izvēle"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Nosaukuma piešķiršana stilam"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikonas <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Vai dzēst pielāgoto stilu?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Dzēst"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Izmantojiet <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nē, paldies"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g>: pulksteņa priekšskatījums"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index d3f3ace..8e940d8 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Часовникот е применет"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Приспособен <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Изберете икони"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Изберете боја"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Изберете форма"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Именувајте го вашиот стил"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Икони <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Да се избрише приспособениот стил?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Избриши"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Користи <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Не, фала"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Преглед на часовник <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 0dd8c87..79ef993 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ക്ലോക്ക് പ്രയോഗിച്ചു"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"ഇഷ്‌ടാനുസൃതം <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"ഐക്കണുകൾ തിരഞ്ഞെടുക്കുക"</string>
     <string name="color_component_title" msgid="1194089273921078816">"വര്‍ണം തിരഞ്ഞെടുക്കുക"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"രൂപം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="name_component_title" msgid="532425087968663437">"നിങ്ങളുടെ സ്‌റ്റൈലിന് പേര് നൽകുക"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"ഐക്കണുകൾ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"ഇഷ്‌ടാനുസൃത സ്‌റ്റൈൽ ഇല്ലാതാക്കണോ?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ഇല്ലാതാക്കുക"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിക്കുക"</string>
     <string name="no_thanks" msgid="7286616980115687627">"വേണ്ട"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ക്ലോക്ക് പ്രിവ്യൂ"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 33b6a45..c67faaf 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Цагийг ашигласан"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Захиалгат <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Дүрс тэмдэг сонгох"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Өнгө сонгох"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Дүрс сонгох"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Загвараа нэрлэнэ үү"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"<xliff:g id="ID_1">%1$d</xliff:g> дүрс тэмдэг"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Захиалгат загварыг устгах уу?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Устгах"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g>-г ашиглах"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Үгүй, баярлалаа"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> цагийг урьдчилан үзэх"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 642a0e3..3ea4c6c 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"क्लॉक लागू केले"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"कस्टम <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"आयकन निवडा"</string>
     <string name="color_component_title" msgid="1194089273921078816">"रंग निवडा"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"आकार निवडा"</string>
+    <string name="name_component_title" msgid="532425087968663437">"तुमच्या शैलीला नाव द्या"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"आयकन <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"कस्टम शैली हटवायची आहे का?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"हटवा"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> वापरा"</string>
     <string name="no_thanks" msgid="7286616980115687627">"नाही, नको"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> घड्याळाचे पूर्वावलोकन"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6502d47..33a8030 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Jam digunakan"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Tersuai <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Pilih ikon"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Pilih warna"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Pilih bentuk"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Namakan gaya anda"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikon <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Padamkan gaya Tersuai?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Padam"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Gunakan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Tidak perlu"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> pratonton jam"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 750fd31..14e12d4 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"နာရီကို အသုံးပြုထားသည်"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"စိတ်ကြိုက် <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"သင်္ကေတများ ရွေးပါ"</string>
     <string name="color_component_title" msgid="1194089273921078816">"အရောင်ရွေးပါ"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ပုံသဏ္ဌာန် ရွေးပါ"</string>
+    <string name="name_component_title" msgid="532425087968663437">"သင့်ပုံစံကို အမည်ပေးခြင်း"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"သင်္ကေတများ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"\'စိတ်ကြိုက်\' အပြင်အဆင်ကို ဖျက်လိုသလား။"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ဖျက်ရန်"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> သုံးရန်"</string>
     <string name="no_thanks" msgid="7286616980115687627">"မလိုပါ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> နာရီ အစမ်းကြည့်ခြင်း"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c1a5a91..1d91f1f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Klokken brukes"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Tilpasset <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Velg ikoner"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Velg farge"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Velg form"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Gi stilen din et navn"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikoner <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Vil du slette en egendefinert stil?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Slett"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Bruk <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nei takk"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Forhåndsvisning av <xliff:g id="ID_1">%1$s</xliff:g>-klokke"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 2f25a67..a480c5f 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"घडी लागू गरियो"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"आफू अनुकूल <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"आइकनहरू छनौट गर्नुहोस्"</string>
     <string name="color_component_title" msgid="1194089273921078816">"रङ छनौट गर्नुहोस्"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"आकार छनौट गर्नुहोस्"</string>
+    <string name="name_component_title" msgid="532425087968663437">"आफ्नो शैलीको नाम राख्नुहोस्"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"आइकनहरू <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"आफू अनुकूल शैली मेट्ने हो?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"मेट्नुहोस्"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> प्रयोग गर्नु…"</string>
     <string name="no_thanks" msgid="7286616980115687627">"पर्दैन, धन्यवाद"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> घडीको पूर्वावलोकन"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 6a79445..9179bc2 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -35,7 +35,6 @@
     <color name="selected_check_background_color">#81C995</color>
 
     <color name="toolbar_icon_color">@color/text_color_light</color>
-    <color name="toolbar_color">#000000</color>
 
     <color name="divider_color">@color/white_14_alpha</color>
 
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 23de92c..a67e00f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Klok toegepast"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Custom <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Pictogrammen kiezen"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Kleur kiezen"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Vorm kiezen"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Je stijl een naam geven"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Pictogrammen <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Aangepaste stijl verwijderen?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Verwijderen"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> gebruiken"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nee, bedankt"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Voorbeeld van <xliff:g id="ID_1">%1$s</xliff:g>-klok bekijken"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 855378a..488ab13 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ਘੜੀ ਲਾਗੂ ਕੀਤੀ ਗਈ"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"ਵਿਉਂਤਿਆ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"ਪ੍ਰਤੀਕ ਚੁਣੋ"</string>
     <string name="color_component_title" msgid="1194089273921078816">"ਰੰਗ ਚੁਣੋ"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ਆਕ੍ਰਿਤੀ ਚੁਣੋ"</string>
+    <string name="name_component_title" msgid="532425087968663437">"ਆਪਣੀ ਸ਼ੈਲੀ ਨੂੰ ਨਾਮ ਦਿਓ"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"ਪ੍ਰਤੀਕ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"ਕੀ ਵਿਉਂਤੀ ਸ਼ੈਲੀ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ਮਿਟਾਓ"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤੋ"</string>
     <string name="no_thanks" msgid="7286616980115687627">"ਨਹੀਂ, ਧੰਨਵਾਦ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ਘੜੀ ਦੀ ਪੂਰਵ-ਝਲਕ"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ba21c65..df71281 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Zastosowano zegar"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Niestandardowy <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Wybierz ikony"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Wybierz kolor"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Wybierz kształt"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Wpisz nazwę stylu"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikony <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Usunąć styl niestandardowy?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Usuń"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Użyj motywu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nie, dziękuję"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Podgląd zegara <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1ff7731..37d6a65 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Relógio aplicado."</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Personalizado <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Escolha os ícones"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Escolha a cor"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Escolha a forma"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Atribua um nome ao seu estilo"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ícones <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Pretende eliminar o estilo personalizado?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Eliminar"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Utilizar <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Não, obrigado"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Pré-visualização do relógio <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0564b57..9b493e3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"O relógio foi aplicado"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Personalizado <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Escolher ícones"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Escolher cor"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Escolher forma"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Dê um nome ao estilo"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ícones <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Excluir estilo personalizado?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Excluir"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Usar <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Não"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Visualização do relógio <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f7e9d89..6875a24 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"S-a aplicat ceasul"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> personalizat"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Alegeți pictogramele"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Alegeți culoarea"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Alegeți o formă"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Denumiți stilul"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Pictogramele <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Ștergeți stilul personalizat?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Ștergeți"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Folosiți <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nu, mulțumesc"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Previzualizarea ceasului <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7ff6321..a724329 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Стиль часов изменен."</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Своя тема <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Выберите значки"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Выберите цвет"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Выберите форму значков"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Укажите название стиля"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Значки <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Удалить пользовательский стиль?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Удалить"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g>: использовать"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Нет"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g>: предварительный просмотр циферблата"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 3fd779a..ada8809 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ඔරලෝසුව යෙදිණි"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"අභිරුචි <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"නිරූපක තෝරා ගන්න"</string>
     <string name="color_component_title" msgid="1194089273921078816">"වර්ණය තෝරා ගන්න"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"හැඩය තෝරා ගන්න"</string>
+    <string name="name_component_title" msgid="532425087968663437">"ඔබේ විලාසය නම් කරන්න"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"නිරූපක <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"අභිරුචි විලාසය මකන්න ද?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"මකන්න"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> භාවිතා කරන්න"</string>
     <string name="no_thanks" msgid="7286616980115687627">"එපා, ස්තූතියි"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ඔරලෝසු පෙරදසුන"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f9a7921..6359531 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Hodiny boli použité"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g>. vlastný motív"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Vyberte ikony"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Vyberte farbu"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Vyberte tvar ikon"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Pomenovanie štýlu"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikony <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Chcete odstrániť vlastný štýl?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Odstrániť"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Použiť <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nie, ďakujem"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Ukážka ciferníka <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 82e379a..9cc2ee7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Ura je uporabljena"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Po meri <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Izbira ikon"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Izbira barve"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Izbira oblike"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Poimenujte svoj slog"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikone <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Želite izbrisati slog po meri?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Izbriši"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Uporabi slog <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ne, hvala"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Predogled ure <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 68f0d79..daf97e3 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Ora u zbatua"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"E personalizuar <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Zgjidh ikonat"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Zgjidh ngjyrën"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Zgjidh formën"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Emërtoje stilin tënd"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikonat <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Të fshihet stili i personalizuar?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Fshi"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Përdor <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Jo, faleminderit"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Pamja paraprake e orës <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 59ad566..1a49013 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Сат је примењен"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Прилагођено <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Изаберите иконе"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Одаберите боју"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Одаберите облик"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Именујте стил"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Иконе <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Желите ли да избришете прилагођени стил?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Избриши"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Користи <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Не, хвала"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Преглед сата <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 85a3eb4..db41e6e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Klockan har tillämpats"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Anpassad <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Välj ikoner"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Välj färg"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Välj form"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Ange ett namn för formatmallen"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikoner <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Vill du radera anpassat format?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Radera"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Använd <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Nej tack"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Förhandsvisning av urtavlan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 91eed18..fa5141e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Saa inatumika"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> Maalum"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Chagua aikoni"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Chagua rangi"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Chagua umbo"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Andika jina la muundo wako"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Aikoni za <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Ungependa kufuta muundo Maalum?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Futa"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Tumia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Hapana, asante"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Onyesho la kukagua saa ya <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index dc98dc8..c0e2db8 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"கடிகாரம் பயன்படுத்தப்பட்டது"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"தனிப்பயன் <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"ஐகான்களைத் தேர்ந்தெடுத்தல்"</string>
     <string name="color_component_title" msgid="1194089273921078816">"தீம் வண்ணத்தை தேர்ந்தெடுத்தல்"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ஐகான் உருவத்தைத் தேர்ந்தெடுத்தல்"</string>
+    <string name="name_component_title" msgid="532425087968663437">"உங்கள் ஸ்டைலுக்குப் பெயரிடவும்"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"<xliff:g id="ID_1">%1$d</xliff:g> ஐகான்கள்"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"பிரத்தியேக ஸ்டைலை நீக்கவா?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"நீக்கு"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g>ஐப் பயன்படுத்து"</string>
     <string name="no_thanks" msgid="7286616980115687627">"வேண்டாம்"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> கடிகார மாதிரிக்காட்சி"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5876772..e453dfe 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"గడియారం వర్తింపజేయబడింది"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"అనుకూల <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"చిహ్నాలను ఎంచుకోండి"</string>
     <string name="color_component_title" msgid="1194089273921078816">"రంగును ఎంచుకోండి"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"ఆకారాన్ని ఎంచుకోండి"</string>
+    <string name="name_component_title" msgid="532425087968663437">"మీ శైలికి పేరు పెట్టండి"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"<xliff:g id="ID_1">%1$d</xliff:g> చిహ్నాలు"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"అనుకూల శైలిని తొలగించాలా?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"తొలగించు"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g>ని ఉపయోగించు"</string>
     <string name="no_thanks" msgid="7286616980115687627">"వద్దు, ధన్యవాదం"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> గడియార ప్రివ్యూ"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 550c501..396e859 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"ใช้นาฬิกาแล้ว"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"กำหนดเอง <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"เลือกไอคอน"</string>
     <string name="color_component_title" msgid="1194089273921078816">"เลือกสี"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"เลือกรูปร่าง"</string>
+    <string name="name_component_title" msgid="532425087968663437">"ตั้งชื่อสไตล์ของคุณ"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"ไอคอน <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"ลบรูปแบบที่กำหนดเองใช่ไหม"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"ลบ"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"ใช้ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"ไม่เป็นไร"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"ตัวอย่างนาฬิกา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b582bf1..bb8cf62 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -30,8 +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>
-    <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="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, kasalukuyang nakalapat at pini-preview"</string>
+    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, kasalukuyang pini-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>
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Inilapat ang orasan"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Custom <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Pumili ng mga icon"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Pumili ng kulay"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Pumili ng hugis"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Pangalanan ang iyong istilo"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Mga Icon <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"I-delete ang Custom na istilo?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"I-delete"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Gamitin ang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Hindi, salamat"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> preview ng orasan"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 65a14be..0bb97d2 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Saat uygulandı"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Özel <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Simge seçin"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Renk seçin"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Şekil seçin"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Stilinizi adlandırın"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Simgeler <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Özel stil silinsin mi?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Sil"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> stilini kullan"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Hayır"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> saat önizleme"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 032c409..ef7cfd1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Годинник застосовано"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Власна тема <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Виберіть значки"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Виберіть колір"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Вибрати форму"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Введіть назву стилю"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Значки <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Видалити власний стиль?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Видалити"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Вибрати стиль \"<xliff:g id="ID_1">%1$s</xliff:g>\""</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ні, дякую"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Попередній перегляд годинника \"<xliff:g id="ID_1">%1$s</xliff:g>\""</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1c1faf6..6d10452 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -30,10 +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="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>
@@ -45,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"گھڑی لاگو ہو گئی"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"حسب ضرورت <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"آئیکنز منتخب کریں"</string>
     <string name="color_component_title" msgid="1194089273921078816">"رنگ منتخب کریں"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"شکل منتخب کریں"</string>
+    <string name="name_component_title" msgid="532425087968663437">"اپنے طرز کو نام دیں"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"آئیکنز <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"حسب ضرورت طرز کو حذف کریں؟"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"حذف کریں"</string>
@@ -68,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> استعمال کریں"</string>
     <string name="no_thanks" msgid="7286616980115687627">"نہیں، شکریہ"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> گھڑی کا پیش منظر"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 9455acc..e3d5459 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Soat tatbiq qilindi"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Maxsus <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Ikonkalarni tanlash"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Rang tanlang"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Shakl tanlang"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Uslub nomini kiriting"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Ikonkalar <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Maxsus uslub oʻchirib tashlansinmi?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Oʻchirish"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"<xliff:g id="ID_1">%1$s</xliff:g> ishlatish"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Kerak emas"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> soatiga razm solish"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4033609..9c54e71 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Đã áp dụng đồng hồ"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> tùy chỉnh"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Chọn biểu tượng"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Chọn màu"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Chọn hình dạng"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Đặt tên cho giao diện tùy chỉnh"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Biểu tượng <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Xóa kiểu tùy chỉnh?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Xóa"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Sử dụng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Không, cảm ơn"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"Bản xem trước đồng hồ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ebad6ac..7565044 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"已应用时钟"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"自定义 <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"选择图标"</string>
     <string name="color_component_title" msgid="1194089273921078816">"选择颜色"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"选择形状"</string>
+    <string name="name_component_title" msgid="532425087968663437">"为样式命名"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"图标 <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"要删除自定义样式吗？"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"删除"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"使用<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"不用了"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g>时钟预览"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e54b23e..27ee1ad 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"已套用時鐘"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"自訂 <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"選擇圖示"</string>
     <string name="color_component_title" msgid="1194089273921078816">"選擇顏色"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"選擇形狀"</string>
+    <string name="name_component_title" msgid="532425087968663437">"為您的風格命名"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"圖示 <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"要刪除自訂樣式嗎？"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"刪除"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"使用「<xliff:g id="ID_1">%1$s</xliff:g>」"</string>
     <string name="no_thanks" msgid="7286616980115687627">"不用了，謝謝"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"「<xliff:g id="ID_1">%1$s</xliff:g>」時鐘預覽"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b845991..2bf640c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -37,25 +37,24 @@
     <string name="preview_name_font" msgid="4465423899630037038">"字型"</string>
     <string name="preview_name_icon" msgid="6818927315316316440">"圖示"</string>
     <string name="preview_name_color" msgid="8776203144994416172">"顏色"</string>
-    <string name="preview_name_shape" msgid="5676971146080968721">"圖案"</string>
+    <string name="preview_name_shape" msgid="5676971146080968721">"形狀"</string>
     <string name="preview_name_wallpaper" msgid="1738652462949531828">"桌布"</string>
     <string name="font_card_title" msgid="2343292653502548685">"ABC • abc • 123"</string>
     <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="applied_clock_msg" msgid="1938218786265793285">"已套用時鐘"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"自訂 <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"選擇圖示"</string>
     <string name="color_component_title" msgid="1194089273921078816">"選擇顏色"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"選擇形狀"</string>
+    <string name="name_component_title" msgid="532425087968663437">"為樣式命名"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"圖示 <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"要刪除自訂樣式嗎？"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"刪除"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"使用「<xliff:g id="ID_1">%1$s</xliff:g>」"</string>
     <string name="no_thanks" msgid="7286616980115687627">"不用了，謝謝"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"「<xliff:g id="ID_1">%1$s</xliff:g>」時鐘預覽畫面"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 523eef8..9edfd64 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -43,19 +43,18 @@
     <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="applied_clock_msg" msgid="1938218786265793285">"Iwashi lifakiwe"</string>
     <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>
-    <!-- no translation found for custom_theme_title (2192300350332693631) -->
-    <skip />
+    <string name="custom_theme_title" msgid="2192300350332693631">"Ngokwezifiso <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <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>
     <string name="icon_component_title" msgid="5779787138399083903">"Khetha izithonjana"</string>
     <string name="color_component_title" msgid="1194089273921078816">"Khetha umbala"</string>
     <string name="shape_component_title" msgid="8366847436022025538">"Khetha umumo"</string>
+    <string name="name_component_title" msgid="532425087968663437">"Qamba isitayela sakho"</string>
     <string name="icon_component_label" msgid="2625784884001407944">"Izithonjana <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Susa isitayela sangokwezifiso?"</string>
     <string name="delete_custom_theme_button" msgid="5102462988130208824">"Susa"</string>
@@ -66,4 +65,6 @@
     <string name="use_style_button" msgid="1754493078383627019">"Sebenzisa i-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Cha, ngiyabonga"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> ukubuka kuqala iwashi"</string>
+    <!-- no translation found for something_went_wrong (529840112449799117) -->
+    <skip />
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ed05ee5..f3f0e86 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -58,22 +58,27 @@
     <dimen name="theme_option_font_text_size">16dp</dimen>
     <dimen name="theme_option_title_font_text_size">12sp</dimen>
 
-    <dimen name="option_tile_margin_horizontal">2dp</dimen>
+    <dimen name="option_tile_margin_horizontal">6dp</dimen>
     <dimen name="theme_option_label_margin">4dp</dimen>
 
     <dimen name="preview_card_padding">20dp</dimen>
 
     <dimen name="card_title_text_size">16sp</dimen>
     <dimen name="card_cover_title_text_size">24sp</dimen>
-    <dimen name="card_header_top_margin">16dp</dimen>
-    <dimen name="preview_theme_content_margin">40dp</dimen>
+    <dimen name="card_header_top_margin">0dp</dimen>
+    <dimen name="preview_pager_max_height">450dp</dimen>
+    <dimen name="preview_pager_min_height">350dp</dimen>
+    <dimen name="preview_theme_max_height">400dp</dimen>
+    <dimen name="preview_theme_min_height">180dp</dimen>
+    <dimen name="theme_preview_header_drawable_padding">8dp</dimen>
+    <dimen name="preview_theme_content_margin">18dp</dimen>
     <dimen name="preview_theme_content_max_height">192dp</dimen>
-    <dimen name="preview_theme_content_min_height">152dp</dimen>
-    <dimen name="preview_theme_icon_size">40dp</dimen>
-    <dimen name="preview_theme_tile_size">20dp</dimen>
-    <dimen name="preview_theme_shape_size">52dp</dimen>
-    <dimen name="preview_theme_cover_topbar_icon_size">20dp</dimen>
-    <dimen name="preview_theme_cover_content_extra_margin">8dp</dimen>
+    <dimen name="preview_theme_content_min_height">120dp</dimen>
+    <dimen name="preview_theme_icon_size">30dp</dimen>
+    <dimen name="preview_theme_tile_size">16dp</dimen>
+    <dimen name="preview_theme_shape_size">36dp</dimen>
+    <dimen name="preview_theme_cover_topbar_icon_size">16dp</dimen>
+    <dimen name="preview_theme_cover_content_extra_margin">16dp</dimen>
 
     <dimen name="font_preview_body_width">200dp</dimen>
     <dimen name="font_preview_divider_gap">30dp</dimen>
diff --git a/res/values/override.xml b/res/values/override.xml
index 818f357..a01507e 100644
--- a/res/values/override.xml
+++ b/res/values/override.xml
@@ -31,10 +31,10 @@
         typically GMS apps so they should be available in GMS devices. -->
     <array name="icon_shape_preview_packages">
         <item>com.google.android.gm</item>
-        <item>com.google.android.apps.maps</item>
+        <item>com.google.android.googlequicksearchbox</item>
         <item>com.google.android.apps.photos</item>
         <item>com.google.android.apps.docs</item>
         <item>com.google.android.youtube</item>
         <item>com.android.vending</item>
     </array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 46de146..f571b6b 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -187,4 +187,7 @@
 
     <!-- Content description for a screen showing the preview of a clock face. [CHAR_LIMIT=NONE] -->
     <string name="clock_preview_content_description"><xliff:g name="clock_name">%1$s</xliff:g> clock preview</string>
+
+    <!-- Generic error message [CHAR_LIMIT=NONE] -->
+    <string name="something_went_wrong">Oops! Something went wrong.</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 800e99a..622cd90 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+
+    <!-- Main themes -->
     <style name="CustomizationTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="colorPrimary">?android:colorPrimary</item>
 
@@ -30,6 +32,7 @@
         <item name="actionButtonStyle">?android:actionButtonStyle</item>
         <item name="actionMenuTextColor">?android:actionMenuTextColor</item>
     </style>
+
     <style name="CustomizationTheme.NoActionBar">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
@@ -37,6 +40,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
+    <!-- Bottom nav -->
     <style name="BottomNavStyle">
         <item name="itemIconTint">@color/bottom_nav_item_color</item>
         <item name="itemTextColor">@color/bottom_nav_item_color</item>
@@ -49,12 +53,8 @@
     <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">
-        <item name="android:background">@color/toolbar_color</item>
-        <item name="android:elevation">0dp</item>
-        <item name="android:theme">@style/WallpaperTheme</item>
-    </style>
 
+    <!-- Common components and widgets -->
     <style name="HeaderTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
         <item name="android:textFontWeight">400</item>
     </style>
@@ -63,13 +63,14 @@
 
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button.Borderless.Colored"/>
 
+    <!-- Option tiles -->
     <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>
     </style>
 
-
+    <!-- Preview cards -->
     <style name="PreviewCard" parent="CardView">
         <item name="cardCornerRadius">?android:dialogCornerRadius</item>
         <item name="android:clipChildren">true</item>
@@ -104,6 +105,7 @@
         <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault</item>
     </style>
 
+    <!-- Custom theme editor -->
     <style name="EditLabelStyle">
         <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault</item>
         <item name="android:textColor">@color/material_white_100</item>
diff --git a/src/com/android/customization/model/CustomizationManager.java b/src/com/android/customization/model/CustomizationManager.java
index 3296ca1..7b9f463 100644
--- a/src/com/android/customization/model/CustomizationManager.java
+++ b/src/com/android/customization/model/CustomizationManager.java
@@ -15,6 +15,9 @@
  */
 package com.android.customization.model;
 
+import android.util.Log;
+import android.widget.Toast;
+
 import androidx.annotation.Nullable;
 
 import java.util.List;
@@ -49,6 +52,15 @@
          * Called when the options have been retrieved.
          */
         void onOptionsLoaded(List<T> options);
+
+        /**
+         * Called if there was an error loading grid options
+         */
+        default void onError(@Nullable Throwable throwable) {
+            if (throwable != null) {
+                Log.e("OptionsFecthedListener", "Error loading options", throwable);
+            }
+        }
     }
 
     /**
diff --git a/src/com/android/customization/model/ResourceConstants.java b/src/com/android/customization/model/ResourceConstants.java
index be3b548..0b1dec2 100644
--- a/src/com/android/customization/model/ResourceConstants.java
+++ b/src/com/android/customization/model/ResourceConstants.java
@@ -83,7 +83,9 @@
             "ic_qs_dnd",
             "ic_qs_flashlight",
             "ic_qs_auto_rotate",
-            "ic_qs_airplane"
+            "ic_qs_airplane",
+            "ic_signal_cellular_3_4_bar",
+            "ic_battery_80_24dp"
     };
 
     ArrayList<String> sTargetPackages = new ArrayList<>();
diff --git a/src/com/android/customization/model/grid/GridOptionsManager.java b/src/com/android/customization/model/grid/GridOptionsManager.java
index ba5968e..1599dde 100644
--- a/src/com/android/customization/model/grid/GridOptionsManager.java
+++ b/src/com/android/customization/model/grid/GridOptionsManager.java
@@ -78,8 +78,19 @@
         @Override
         protected void onPostExecute(List<GridOption> gridOptions) {
             if (mCallback != null) {
-                mCallback.onOptionsLoaded(gridOptions != null ? gridOptions
-                        : Collections.emptyList());
+                if (gridOptions != null && !gridOptions.isEmpty()) {
+                    mCallback.onOptionsLoaded(gridOptions);
+                } else {
+                    mCallback.onError(null);
+                }
+            }
+        }
+
+        @Override
+        protected void onCancelled() {
+            super.onCancelled();
+            if (mCallback != null) {
+                mCallback.onError(null);
             }
         }
     }
diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index 58b6daf..87b5b4a 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -15,6 +15,8 @@
  */
 package com.android.customization.model.theme;
 
+import static android.content.res.Resources.ID_NULL;
+
 import static com.android.customization.model.ResourceConstants.ANDROID_PACKAGE;
 import static com.android.customization.model.ResourceConstants.ICONS_FOR_PREVIEW;
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_COLOR;
@@ -33,6 +35,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.service.wallpaper.WallpaperService;
 import android.text.TextUtils;
@@ -83,12 +86,17 @@
     private static final String WALLPAPER_PREFIX = "theme_wallpaper_";
     private static final String WALLPAPER_TITLE_PREFIX = "theme_wallpaper_title_";
     private static final String WALLPAPER_ATTRIBUTION_PREFIX = "theme_wallpaper_attribution_";
+    private static final String WALLPAPER_THUMB_PREFIX = "theme_wallpaper_thumbnail_";
     private static final String WALLPAPER_ACTION_PREFIX = "theme_wallpaper_action_";
+    private static final String WALLPAPER_OPTIONS_PREFIX = "theme_wallpaper_options_";
 
     private static final String DEFAULT_THEME_NAME= "default";
     private static final String THEME_TITLE_FIELD = "_theme_title";
     private static final String THEME_ID_FIELD = "_theme_id";
 
+    // Maximum number of themes allowed (including default, pre-bundled and custom)
+    private static final int MAX_TOTAL_THEMES = 10;
+
     private final OverlayThemeExtractor mOverlayProvider;
     private List<ThemeBundle> mThemes;
     private final CustomizationPreferences mCustomizationPreferences;
@@ -181,7 +189,11 @@
             String wallpaperResName = WALLPAPER_PREFIX + themeName;
             int wallpaperResId = mStubApkResources.getIdentifier(wallpaperResName,
                     "drawable", mStubPackageName);
-            if (wallpaperResId > 0) {
+            // Check in case the theme has a separate thumbnail for the wallpaper
+            String wallpaperThumbnailResName = WALLPAPER_THUMB_PREFIX + themeName;
+            int wallpaperThumbnailResId = mStubApkResources.getIdentifier(wallpaperThumbnailResName,
+                    "drawable", mStubPackageName);
+            if (wallpaperResId != ID_NULL) {
                 builder.setWallpaperInfo(mStubPackageName, wallpaperResName,
                         themeName, wallpaperResId,
                         mStubApkResources.getIdentifier(WALLPAPER_TITLE_PREFIX + themeName,
@@ -191,19 +203,26 @@
                                 mStubPackageName),
                         mStubApkResources.getIdentifier(WALLPAPER_ACTION_PREFIX + themeName,
                                 "string", mStubPackageName))
-                        .setWallpaperAsset(
-                                getDrawableResourceAsset(WALLPAPER_PREFIX, themeName));
+                        .setWallpaperAsset(wallpaperThumbnailResId != ID_NULL ?
+                                getDrawableResourceAsset(WALLPAPER_THUMB_PREFIX, themeName)
+                                : getDrawableResourceAsset(WALLPAPER_PREFIX, themeName));
             } else {
                 // Try to see if it's a live wallpaper reference
                 wallpaperResId = mStubApkResources.getIdentifier(wallpaperResName,
                         "string", mStubPackageName);
-                if (wallpaperResId > 0) {
+                if (wallpaperResId != ID_NULL) {
                     String wpComponent = mStubApkResources.getString(wallpaperResId);
+
+                    int wallpaperOptionsResId = mStubApkResources.getIdentifier(
+                            WALLPAPER_OPTIONS_PREFIX + themeName, "string", mStubPackageName);
+                    String wallpaperOptions = wallpaperOptionsResId != ID_NULL
+                            ? mStubApkResources.getString(wallpaperOptionsResId) : null;
+
                     String[] componentParts = wpComponent.split("/");
                     Intent liveWpIntent =  new Intent(WallpaperService.SERVICE_INTERFACE);
                     liveWpIntent.setComponent(
-                            new ComponentName(componentParts[0],
-                                    componentParts[0] + componentParts[1]));
+                            new ComponentName(componentParts[0], componentParts[1]));
+
                     Context appContext = mContext.getApplicationContext();
                     PackageManager pm = appContext.getPackageManager();
                     ResolveInfo resolveInfo =
@@ -213,8 +232,11 @@
                         try {
                             wallpaperInfo = new android.app.WallpaperInfo(appContext, resolveInfo);
                             LiveWallpaperInfo liveInfo = new LiveWallpaperInfo(wallpaperInfo);
-                            builder.setLiveWallpaperInfo(liveInfo)
-                                    .setWallpaperAsset(liveInfo.getThumbAsset(mContext));
+                            builder.setLiveWallpaperInfo(liveInfo).setWallpaperAsset(
+                                    wallpaperThumbnailResId != ID_NULL ?
+                                        getDrawableResourceAsset(WALLPAPER_THUMB_PREFIX, themeName)
+                                        : liveInfo.getThumbAsset(mContext))
+                                    .setWallpaperOptions(wallpaperOptions);
                         } catch (XmlPullParserException | IOException e) {
                             Log.w(TAG, "Skipping wallpaper " + resolveInfo.serviceInfo, e);
                         }
@@ -384,9 +406,11 @@
             }
         }
 
-        // 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));
+        if (mThemes.size() < MAX_TOTAL_THEMES) {
+            // 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));
+        }
 
     }
 
diff --git a/src/com/android/customization/model/theme/ThemeBundle.java b/src/com/android/customization/model/theme/ThemeBundle.java
index 12ec32c..7c543d4 100644
--- a/src/com/android/customization/model/theme/ThemeBundle.java
+++ b/src/com/android/customization/model/theme/ThemeBundle.java
@@ -75,17 +75,19 @@
     private final boolean mIsDefault;
     protected final Map<String, String> mPackagesByCategory;
     @Nullable private final WallpaperInfo mWallpaperInfo;
+    @Nullable private final String mWallpaperOptions;
     private WallpaperInfo mOverrideWallpaper;
     private Asset mOverrideWallpaperAsset;
     private CharSequence mContentDescription;
 
     protected ThemeBundle(String title, Map<String, String> overlayPackages,
             boolean isDefault, @Nullable WallpaperInfo wallpaperInfo,
-            PreviewInfo previewInfo) {
+            @Nullable String wallpaperOptions, PreviewInfo previewInfo) {
         mTitle = title;
         mIsDefault = isDefault;
         mPreviewInfo = previewInfo;
         mWallpaperInfo = wallpaperInfo;
+        mWallpaperOptions = wallpaperOptions;
         mPackagesByCategory = Collections.unmodifiableMap(overlayPackages);
     }
 
@@ -179,6 +181,11 @@
         return mWallpaperInfo;
     }
 
+    @Nullable
+    public String getWallpaperOptions() {
+        return mWallpaperOptions;
+    }
+
     boolean isDefault() {
         return mIsDefault;
     }
@@ -300,11 +307,12 @@
         @Dimension private int mCornerRadius;
         private Asset mWallpaperAsset;
         private WallpaperInfo mWallpaperInfo;
+        private String mWallpaperOptions;
         protected Map<String, String> mPackages = new HashMap<>();
         private List<Drawable> mAppIcons = new ArrayList<>();
 
         public ThemeBundle build(Context context) {
-            return new ThemeBundle(mTitle, mPackages, mIsDefault, mWallpaperInfo,
+            return new ThemeBundle(mTitle, mPackages, mIsDefault, mWallpaperInfo, mWallpaperOptions,
                     createPreviewInfo(context));
         }
 
@@ -409,6 +417,11 @@
             return this;
         }
 
+        public Builder setWallpaperOptions(String wallpaperOptions) {
+            mWallpaperOptions = wallpaperOptions;
+            return this;
+        }
+
         public Builder asDefault() {
             mIsDefault = true;
             return this;
diff --git a/src/com/android/customization/model/theme/ThemeManager.java b/src/com/android/customization/model/theme/ThemeManager.java
index f7bbd00..8846338 100644
--- a/src/com/android/customization/model/theme/ThemeManager.java
+++ b/src/com/android/customization/model/theme/ThemeManager.java
@@ -26,8 +26,8 @@
 
 import android.graphics.Point;
 import android.provider.Settings;
-
 import android.text.TextUtils;
+
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 
@@ -42,6 +42,7 @@
 import com.android.wallpaper.module.WallpaperSetter;
 import com.android.wallpaper.picker.SetWallpaperDialogFragment.Listener;
 import com.android.wallpaper.util.WallpaperCropUtils;
+
 import org.json.JSONObject;
 
 import java.util.HashSet;
@@ -67,7 +68,7 @@
     private final OverlayManagerCompat mOverlayManagerCompat;
 
     private final WallpaperSetter mWallpaperSetter;
-    private final FragmentActivity mActivity;
+    protected final FragmentActivity mActivity;
     private final ThemesUserEventLogger mEventLogger;
 
     private Map<String, String> mCurrentOverlays;
@@ -122,6 +123,7 @@
         return new SetWallpaperCallback() {
             @Override
             public void onSuccess() {
+                applyWallpaperOptions(theme);
                 applyOverlays(theme, callback);
             }
 
@@ -132,6 +134,10 @@
         };
     }
 
+    protected void applyWallpaperOptions(ThemeBundle theme) {
+        //Do nothing.
+    }
+
     private void applyWallpaper(ThemeBundle theme, int destination,
             SetWallpaperCallback callback) {
         Point defaultCropSurfaceSize = WallpaperCropUtils.getDefaultCropSurfaceSize(
diff --git a/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java b/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
index 020e3ef..a37f250 100644
--- a/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
+++ b/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
@@ -81,9 +81,6 @@
         }
         for (String iconName : ICONS_FOR_PREVIEW) {
             try {
-                if (previewIcons.size() == COLOR_TILES_ICON_IDS.length) {
-                    break;
-                }
                 previewIcons.add(loadIconPreviewDrawable(iconName, iconPackage));
             } catch (NameNotFoundException | NotFoundException e) {
                 Log.w(TAG, String.format("Couldn't load icon in %s for color preview, will skip it",
diff --git a/src/com/android/customization/model/theme/custom/CustomTheme.java b/src/com/android/customization/model/theme/custom/CustomTheme.java
index 97a1876..8a7ca05 100644
--- a/src/com/android/customization/model/theme/custom/CustomTheme.java
+++ b/src/com/android/customization/model/theme/custom/CustomTheme.java
@@ -41,7 +41,7 @@
 
     public CustomTheme(@NonNull String id, String title, Map<String, String> overlayPackages,
             @Nullable PreviewInfo previewInfo) {
-        super(title, overlayPackages, false, null, previewInfo);
+        super(title, overlayPackages, false, null, null, previewInfo);
         mId = id;
     }
 
diff --git a/src/com/android/customization/model/theme/custom/ThemeComponentOption.java b/src/com/android/customization/model/theme/custom/ThemeComponentOption.java
index 994b5f3..8966dc5 100644
--- a/src/com/android/customization/model/theme/custom/ThemeComponentOption.java
+++ b/src/com/android/customization/model/theme/custom/ThemeComponentOption.java
@@ -47,7 +47,9 @@
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.Dimension;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
 import com.android.customization.model.CustomizationManager;
 import com.android.customization.model.CustomizationOption;
@@ -138,9 +140,7 @@
 
         @Override
         public void bindPreview(ViewGroup container) {
-            TextView header = container.findViewById(R.id.theme_preview_card_header);
-            header.setText(R.string.preview_name_font);
-            header.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_font, 0, 0);
+            bindPreviewHeader(container, R.string.preview_name_font, R.drawable.ic_font);
 
             ViewGroup cardBody = container.findViewById(R.id.theme_preview_card_body_container);
             if (cardBody.getChildCount() == 0) {
@@ -161,6 +161,15 @@
         }
     }
 
+    void bindPreviewHeader(ViewGroup container, @StringRes int headerTextResId,
+            @DrawableRes int headerIcon) {
+        TextView header = container.findViewById(R.id.theme_preview_card_header);
+        header.setText(headerTextResId);
+        header.setCompoundDrawablesWithIntrinsicBounds(0, headerIcon, 0, 0);
+        header.setCompoundDrawableTintList(ColorStateList.valueOf(
+                header.getCurrentTextColor()));
+    }
+
     public static class IconOption extends ThemeComponentOption {
 
         public static final int THUMBNAIL_ICON_POSITION = 0;
@@ -210,9 +219,7 @@
 
         @Override
         public void bindPreview(ViewGroup container) {
-            TextView header = container.findViewById(R.id.theme_preview_card_header);
-            header.setText(R.string.preview_name_icon);
-            header.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_wifi_24px, 0, 0);
+            bindPreviewHeader(container, R.string.preview_name_icon, R.drawable.ic_wifi_24px);
 
             ViewGroup cardBody = container.findViewById(R.id.theme_preview_card_body_container);
             if (cardBody.getChildCount() == 0) {
@@ -258,9 +265,15 @@
         private static int[] COLOR_TILE_IDS = {
                 R.id.preview_color_qs_0_bg, R.id.preview_color_qs_1_bg, R.id.preview_color_qs_2_bg
         };
-        static int[] COLOR_TILES_ICON_IDS = {
-                R.id.preview_color_qs_0_icon, R.id.preview_color_qs_1_icon,
-                R.id.preview_color_qs_2_icon
+
+        /**
+         * Ids of the views for the foreground of the icon, mapping to the corresponding index of
+         * the actual icon drawable.
+         */
+        static int[][] COLOR_TILES_ICON_IDS = {
+                new int[]{ R.id.preview_color_qs_0_icon, 0},
+                new int[]{ R.id.preview_color_qs_1_icon, 1},
+                new int[] { R.id.preview_color_qs_2_icon, 3}
         };
 
         /**
@@ -296,11 +309,13 @@
 
         @Override
         public void bindThumbnailTile(View view) {
-            int color = resolveColor(view.getResources());
-            ((ImageView) view.findViewById(R.id.option_tile)).getDrawable().setTint(color);
+            @ColorInt int color = resolveColor(view.getResources());
+            ((ImageView) view.findViewById(R.id.option_tile)).setImageTintList(
+                    ColorStateList.valueOf(color));
             view.setContentDescription(mLabel);
         }
 
+        @ColorInt
         private int resolveColor(Resources res) {
             Configuration configuration = res.getConfiguration();
             return (configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK)
@@ -321,9 +336,7 @@
 
         @Override
         public void bindPreview(ViewGroup container) {
-            TextView header = container.findViewById(R.id.theme_preview_card_header);
-            header.setText(R.string.preview_name_color);
-            header.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_colorize_24px, 0, 0);
+            bindPreviewHeader(container, R.string.preview_name_color, R.drawable.ic_colorize_24px);
 
             ViewGroup cardBody = container.findViewById(R.id.theme_preview_card_body_container);
             if (cardBody.getChildCount() == 0) {
@@ -364,14 +377,15 @@
             seekbar.setOnTouchListener((view, motionEvent) -> true);
             if (!mIcons.isEmpty() && mShapeDrawable != null) {
                 for (int i = 0; i < COLOR_TILE_IDS.length; i++) {
-                    Drawable icon = mIcons.get(i).getConstantState().newDrawable();
+                    Drawable icon = mIcons.get(COLOR_TILES_ICON_IDS[i][1]).getConstantState()
+                            .newDrawable();
                     //TODO: load and set the shape.
                     Drawable bgShape = mShapeDrawable.getConstantState().newDrawable();
                     bgShape.setTint(accentColor);
 
                     ImageView bg = container.findViewById(COLOR_TILE_IDS[i]);
                     bg.setImageDrawable(bgShape);
-                    ImageView fg = container.findViewById(COLOR_TILES_ICON_IDS[i]);
+                    ImageView fg = container.findViewById(COLOR_TILES_ICON_IDS[i][0]);
                     fg.setImageDrawable(icon);
                 }
             }
@@ -453,9 +467,7 @@
 
         @Override
         public void bindPreview(ViewGroup container) {
-            TextView header = container.findViewById(R.id.theme_preview_card_header);
-            header.setText(R.string.preview_name_shape);
-            header.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_shapes_24px, 0, 0);
+            bindPreviewHeader(container, R.string.preview_name_shape, R.drawable.ic_shapes_24px);
 
             ViewGroup cardBody = container.findViewById(R.id.theme_preview_card_body_container);
             if (cardBody.getChildCount() == 0) {
diff --git a/src/com/android/customization/module/CustomizationInjector.java b/src/com/android/customization/module/CustomizationInjector.java
index 90333f0..d25f925 100644
--- a/src/com/android/customization/module/CustomizationInjector.java
+++ b/src/com/android/customization/module/CustomizationInjector.java
@@ -17,9 +17,19 @@
 
 import android.content.Context;
 
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.customization.model.theme.OverlayManagerCompat;
+import com.android.customization.model.theme.ThemeBundleProvider;
+import com.android.customization.model.theme.ThemeManager;
 import com.android.wallpaper.module.Injector;
+import com.android.wallpaper.module.WallpaperSetter;
 
 public interface CustomizationInjector extends Injector {
 
     CustomizationPreferences getCustomizationPreferences(Context context);
+
+    ThemeManager getThemeManager(ThemeBundleProvider provider, FragmentActivity activity,
+            WallpaperSetter wallpaperSetter, OverlayManagerCompat overlayManagerCompat,
+            ThemesUserEventLogger logger);
 }
diff --git a/src/com/android/customization/module/DefaultCustomizationInjector.java b/src/com/android/customization/module/DefaultCustomizationInjector.java
index 7af90a3..3d47b72 100644
--- a/src/com/android/customization/module/DefaultCustomizationInjector.java
+++ b/src/com/android/customization/module/DefaultCustomizationInjector.java
@@ -18,16 +18,19 @@
 import android.content.Context;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 
+import com.android.customization.model.theme.OverlayManagerCompat;
+import com.android.customization.model.theme.ThemeBundleProvider;
+import com.android.customization.model.theme.ThemeManager;
 import com.android.wallpaper.model.CategoryProvider;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.BaseWallpaperInjector;
 import com.android.wallpaper.module.DefaultCategoryProvider;
 import com.android.wallpaper.module.LoggingOptInStatusProvider;
-import com.android.wallpaper.module.NoOpUserEventLogger;
-import com.android.wallpaper.module.UserEventLogger;
 import com.android.wallpaper.module.WallpaperPreferences;
 import com.android.wallpaper.module.WallpaperRotationRefresher;
+import com.android.wallpaper.module.WallpaperSetter;
 import com.android.wallpaper.monitor.PerformanceMonitor;
 import com.android.wallpaper.picker.PreviewFragment;
 
@@ -109,4 +112,11 @@
         return null;
     }
 
+    @Override
+    public ThemeManager getThemeManager(ThemeBundleProvider provider, FragmentActivity activity,
+            WallpaperSetter wallpaperSetter, OverlayManagerCompat overlayManagerCompat,
+            ThemesUserEventLogger logger) {
+        return new ThemeManager(provider, activity, wallpaperSetter, overlayManagerCompat, logger);
+    }
+
 }
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index b85948d..5b1623c 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -19,7 +19,6 @@
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
@@ -159,6 +158,7 @@
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         if (WALLPAPER_ONLY.equals(intent.getStringExtra(WALLPAPER_FLAVOR_EXTRA))) {
+            Log.d(TAG, "WALLPAPER_ONLY intent, reverting to Wallpaper Picker");
             skipToWallpaperPicker();
         }
     }
@@ -177,15 +177,11 @@
     private void initSections() {
         mSections.clear();
         if (!BuildCompat.isAtLeastQ()) {
-            return;
-        }
-        //if (!BuildCompat.isAtLeastQ()) {
-        //    return;
-        //}
-        if (Build.TYPE.equals("user")) {
+            Log.d(TAG, "Build version < Q detected");
             return;
         }
         if (WALLPAPER_ONLY.equals(getIntent().getStringExtra(WALLPAPER_FLAVOR_EXTRA))) {
+            Log.d(TAG, "WALLPAPER_ONLY intent");
             return;
         }
         //Theme
@@ -194,18 +190,22 @@
                 injector.getPreferences(this), mUserEventLogger, false);
         ThemesUserEventLogger eventLogger = (ThemesUserEventLogger) injector.getUserEventLogger(
                 this);
-        ThemeManager themeManager = new ThemeManager(
+        ThemeManager themeManager = injector.getThemeManager(
                 new DefaultThemeProvider(this, injector.getCustomizationPreferences(this)),
                 this,
                 mWallpaperSetter, new OverlayManagerCompat(this), eventLogger);
         if (themeManager.isAvailable()) {
             mSections.put(R.id.nav_theme, new ThemeSection(R.id.nav_theme, themeManager));
+        } else {
+            Log.d(TAG, "ThemeManager not available, removing Style section");
         }
         //Clock
         ClockManager clockManager = new ClockManager(getContentResolver(),
                 new ContentProviderClockProvider(this), eventLogger);
         if (clockManager.isAvailable()) {
             mSections.put(R.id.nav_clock, new ClockSection(R.id.nav_clock, clockManager));
+        } else {
+            Log.d(TAG, "ClockManager not available, removing Clock section");
         }
         //Grid
         GridOptionsManager gridManager = new GridOptionsManager(
@@ -214,9 +214,10 @@
                 eventLogger);
         if (gridManager.isAvailable()) {
             mSections.put(R.id.nav_grid, new GridSection(R.id.nav_grid, gridManager));
+        } else {
+            Log.d(TAG, "GridOptionsManager not available, removing Grid section");
         }
         mSections.put(R.id.nav_wallpaper, new WallpaperSection(R.id.nav_wallpaper));
-        //TODO (santie): add other sections if supported by the device
     }
 
     private void setUpBottomNavView() {
diff --git a/src/com/android/customization/picker/TimeTicker.java b/src/com/android/customization/picker/TimeTicker.java
new file mode 100644
index 0000000..2cf5dbf
--- /dev/null
+++ b/src/com/android/customization/picker/TimeTicker.java
@@ -0,0 +1,41 @@
+package com.android.customization.picker;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+import androidx.annotation.Nullable;
+
+/**
+ * BroadcastReceiver that can notify a listener when the system time (minutes) changes.
+ * Use {@link #registerNewReceiver(Context, TimeListener)} to create a new instance that will be
+ * automatically registered using the given Context.
+ */
+public class TimeTicker extends BroadcastReceiver {
+
+    public interface TimeListener {
+        void onCurrentTimeChanged();
+    }
+
+    public static TimeTicker registerNewReceiver(Context context, TimeListener listener) {
+        TimeTicker receiver = new TimeTicker(listener);
+        // Register broadcast receiver for time tick
+        final IntentFilter filter = new IntentFilter(Intent.ACTION_TIME_TICK);
+        context.registerReceiver(receiver, filter);
+        return receiver;
+    }
+
+    @Nullable private TimeListener mListener;
+
+    private TimeTicker(TimeListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (mListener != null) {
+            mListener.onCurrentTimeChanged();
+        }
+    }
+}
diff --git a/src/com/android/customization/picker/clock/ClockFragment.java b/src/com/android/customization/picker/clock/ClockFragment.java
index c3e1c97..14dbc16 100644
--- a/src/com/android/customization/picker/clock/ClockFragment.java
+++ b/src/com/android/customization/picker/clock/ClockFragment.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,9 +27,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.widget.ContentLoadingProgressBar;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.customization.model.CustomizationManager.Callback;
+import com.android.customization.model.CustomizationManager.OptionsFetchedListener;
 import com.android.customization.model.clock.BaseClockManager;
 import com.android.customization.model.clock.Clockface;
 import com.android.customization.module.ThemesUserEventLogger;
@@ -41,11 +44,15 @@
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.picker.ToolbarFragment;
 
+import java.util.List;
+
 /**
  * Fragment that contains the main UI for selecting and applying a Clockface.
  */
 public class ClockFragment extends ToolbarFragment {
 
+    private static final String TAG = "ClockFragment";
+
     /**
      * Interface to be implemented by an Activity hosting a {@link ClockFragment}
      */
@@ -64,6 +71,9 @@
     private Clockface mSelectedOption;
     private BaseClockManager mClockManager;
     private PreviewPager mPreviewPager;
+    private ContentLoadingProgressBar mLoading;
+    private View mContent;
+    private View mError;
     private ThemesUserEventLogger mEventLogger;
 
     @Override
@@ -81,8 +91,11 @@
         View view = inflater.inflate(
                 R.layout.fragment_clock_picker, container, /* attachToRoot */ false);
         setUpToolbar(view);
+        mContent = view.findViewById(R.id.content_section);
         mPreviewPager = view.findViewById(R.id.clock_preview_pager);
         mOptionsContainer = view.findViewById(R.id.options_container);
+        mLoading = view.findViewById(R.id.loading_indicator);
+        mError = view.findViewById(R.id.error_section);
         setUpOptions();
         view.findViewById(R.id.apply_button).setOnClickListener(v -> {
             mClockManager.apply(mSelectedOption, new Callback() {
@@ -95,6 +108,9 @@
 
                 @Override
                 public void onError(@Nullable Throwable throwable) {
+                    if (throwable != null) {
+                        Log.e(TAG, "Error loading clockfaces", throwable);
+                    }
                     //TODO(santie): handle
                 }
             });
@@ -108,26 +124,50 @@
     }
 
     private void setUpOptions() {
-        mClockManager.fetchOptions(options -> {
-            mOptionsController = new OptionSelectorController<>(mOptionsContainer, options);
+        hideError();
+        mLoading.show();
+        mClockManager.fetchOptions(new OptionsFetchedListener<Clockface>() {
+           @Override
+           public void onOptionsLoaded(List<Clockface> options) {
+               mLoading.hide();
+               mOptionsController = new OptionSelectorController<>(mOptionsContainer, options);
 
-            mOptionsController.addListener(selected -> {
-                mSelectedOption = (Clockface) selected;
-                mEventLogger.logClockSelected(mSelectedOption);
-                createAdapter();
-            });
-            mOptionsController.initOptions(mClockManager);
-            for (Clockface option : options) {
-                if (option.isActive(mClockManager)) {
-                    mSelectedOption = option;
+               mOptionsController.addListener(selected -> {
+                   mSelectedOption = (Clockface) selected;
+                   mEventLogger.logClockSelected(mSelectedOption);
+                   createAdapter();
+               });
+               mOptionsController.initOptions(mClockManager);
+               for (Clockface option : options) {
+                   if (option.isActive(mClockManager)) {
+                       mSelectedOption = option;
+                   }
+               }
+               // For development only, as there should always be a grid set.
+               if (mSelectedOption == null) {
+                   mSelectedOption = options.get(0);
+               }
+               createAdapter();
+           }
+           @Override
+            public void onError(@Nullable Throwable throwable) {
+                if (throwable != null) {
+                   Log.e(TAG, "Error loading clockfaces", throwable);
                 }
+                showError();
             }
-            // For development only, as there should always be a grid set.
-            if (mSelectedOption == null) {
-                mSelectedOption = options.get(0);
-            }
-            createAdapter();
-        }, false);
+       }, false);
+    }
+
+    private void hideError() {
+        mContent.setVisibility(View.VISIBLE);
+        mError.setVisibility(View.GONE);
+    }
+
+    private void showError() {
+        mLoading.hide();
+        mContent.setVisibility(View.GONE);
+        mError.setVisibility(View.VISIBLE);
     }
 
     private static class ClockfacePreviewPage extends PreviewPage {
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java
index d50c7a8..3c395a1 100644
--- a/src/com/android/customization/picker/grid/GridFragment.java
+++ b/src/com/android/customization/picker/grid/GridFragment.java
@@ -22,6 +22,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
@@ -31,9 +32,11 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
+import androidx.core.widget.ContentLoadingProgressBar;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.customization.model.CustomizationManager.Callback;
+import com.android.customization.model.CustomizationManager.OptionsFetchedListener;
 import com.android.customization.model.grid.GridOption;
 import com.android.customization.model.grid.GridOptionsManager;
 import com.android.customization.module.ThemesUserEventLogger;
@@ -51,6 +54,8 @@
 
 import com.bumptech.glide.request.RequestOptions;
 
+import java.util.List;
+
 /**
  * Fragment that contains the UI for selecting and applying a GridOption.
  */
@@ -58,6 +63,8 @@
 
     private static final int PREVIEW_FADE_DURATION_MS = 100;
 
+    private static final String TAG = "GridFragment";
+
     /**
      * Interface to be implemented by an Activity hosting a {@link GridFragment}
      */
@@ -82,6 +89,9 @@
     private GridOptionsManager mGridManager;
     private GridOption mSelectedOption;
     private PreviewPager mPreviewPager;
+    private ContentLoadingProgressBar mLoading;
+    private View mContent;
+    private View mError;
     private ThemesUserEventLogger mEventLogger;
 
     @Override
@@ -99,8 +109,11 @@
         View view = inflater.inflate(
                 R.layout.fragment_grid_picker, container, /* attachToRoot */ false);
         setUpToolbar(view);
+        mContent = view.findViewById(R.id.content_section);
         mPreviewPager = view.findViewById(R.id.grid_preview_pager);
         mOptionsContainer = view.findViewById(R.id.options_container);
+        mLoading = view.findViewById(R.id.loading_indicator);
+        mError = view.findViewById(R.id.error_section);
         final Resources res = getResources();
         DisplayMetrics dm = res.getDisplayMetrics();
         mScreenAspectRatio = (float) dm.heightPixels / dm.widthPixels;
@@ -161,28 +174,53 @@
     }
 
     private void setUpOptions() {
-        mGridManager.fetchOptions(options -> {
-            mOptionsController = new OptionSelectorController<>(mOptionsContainer, options);
+        hideError();
+        mLoading.show();
+        mGridManager.fetchOptions(new OptionsFetchedListener<GridOption>() {
+            @Override
+            public void onOptionsLoaded(List<GridOption> options) {
+                mLoading.hide();
+                mOptionsController = new OptionSelectorController<>(mOptionsContainer, options);
 
-            mOptionsController.addListener(selected -> {
-                mSelectedOption = (GridOption) selected;
-                mEventLogger.logGridSelected(mSelectedOption);
-                createAdapter();
-            });
-            mOptionsController.initOptions(mGridManager);
-            for (GridOption option : options) {
-                if (option.isActive(mGridManager)) {
-                    mSelectedOption = option;
+                mOptionsController.addListener(selected -> {
+                    mSelectedOption = (GridOption) selected;
+                    mEventLogger.logGridSelected(mSelectedOption);
+                    createAdapter();
+                });
+                mOptionsController.initOptions(mGridManager);
+                for (GridOption option : options) {
+                    if (option.isActive(mGridManager)) {
+                        mSelectedOption = option;
+                    }
                 }
+                // For development only, as there should always be a grid set.
+                if (mSelectedOption == null) {
+                    mSelectedOption = options.get(0);
+                }
+                createAdapter();
             }
-            // For development only, as there should always be a grid set.
-            if (mSelectedOption == null) {
-                mSelectedOption = options.get(0);
+
+            @Override
+            public void onError(@Nullable Throwable throwable) {
+                if (throwable != null) {
+                    Log.e(TAG, "Error loading grid options", throwable);
+                }
+                showError();
             }
-            createAdapter();
         }, false);
     }
 
+    private void hideError() {
+        mContent.setVisibility(View.VISIBLE);
+        mError.setVisibility(View.GONE);
+    }
+
+    private void showError() {
+        mLoading.hide();
+        mContent.setVisibility(View.GONE);
+        mError.setVisibility(View.VISIBLE);
+    }
+
     private class GridPreviewPage extends PreviewPage {
         private final int mPageId;
         private final Asset mPreviewAsset;
diff --git a/src/com/android/customization/picker/theme/CustomThemeActivity.java b/src/com/android/customization/picker/theme/CustomThemeActivity.java
index 2bc371d..fe537ba 100644
--- a/src/com/android/customization/picker/theme/CustomThemeActivity.java
+++ b/src/com/android/customization/picker/theme/CustomThemeActivity.java
@@ -15,7 +15,6 @@
  */
 package com.android.customization.picker.theme;
 
-import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.content.Intent;
 import android.os.Bundle;
@@ -104,7 +103,7 @@
             }
         }
 
-        mThemeManager = new ThemeManager(
+        mThemeManager = injector.getThemeManager(
                 new DefaultThemeProvider(this, injector.getCustomizationPreferences(this)),
                 this,
                 new WallpaperSetter(injector.getWallpaperPersister(this),
diff --git a/src/com/android/customization/picker/theme/CustomThemeNameFragment.java b/src/com/android/customization/picker/theme/CustomThemeNameFragment.java
index 04aac7d..5f7381a 100644
--- a/src/com/android/customization/picker/theme/CustomThemeNameFragment.java
+++ b/src/com/android/customization/picker/theme/CustomThemeNameFragment.java
@@ -36,6 +36,7 @@
 import androidx.cardview.widget.CardView;
 
 import com.android.customization.model.theme.ThemeBundle.PreviewInfo;
+import com.android.customization.picker.TimeTicker;
 import com.android.customization.picker.theme.ThemePreviewPage.ThemeCoverPage;
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
@@ -63,8 +64,10 @@
     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[][] mColorTileIconIds = {
+            new int[]{ R.id.preview_color_qs_0_icon, 0},
+            new int[]{ R.id.preview_color_qs_1_icon, 1},
+            new int[] { R.id.preview_color_qs_2_icon, 3}
     };
 
     private int[] mShapeIconIds = {
@@ -74,7 +77,7 @@
 
     private Asset mWallpaperAsset;
     private ThemeCoverPage mCoverPage;
-
+    private TimeTicker mTicker;
     private EditText mNameEditor;
 
     @Override
@@ -106,6 +109,27 @@
         return view;
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        mTicker = TimeTicker.registerNewReceiver(getContext(), this::updateTime);
+        updateTime();
+    }
+
+    private void updateTime() {
+        if (mCoverPage != null) {
+            mCoverPage.updateTime();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (getContext() != null) {
+            getContext().unregisterReceiver(mTicker);
+        }
+    }
+
     private void bindCover(CardView card) {
         Context context = getContext();
         PreviewInfo previewInfo = mCustomThemeManager.buildCustomThemePreviewInfo(context);
diff --git a/src/com/android/customization/picker/theme/ThemeFragment.java b/src/com/android/customization/picker/theme/ThemeFragment.java
index 22fa1d4..bec3cf8 100644
--- a/src/com/android/customization/picker/theme/ThemeFragment.java
+++ b/src/com/android/customization/picker/theme/ThemeFragment.java
@@ -17,6 +17,7 @@
 
 import android.app.Activity;
 import android.app.WallpaperColors;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
@@ -42,16 +43,21 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.widget.ContentLoadingProgressBar;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.customization.model.CustomizationManager.Callback;
+import com.android.customization.model.CustomizationManager.OptionsFetchedListener;
+import com.android.customization.model.grid.GridOption;
 import com.android.customization.model.theme.ThemeBundle;
 import com.android.customization.model.theme.ThemeBundle.PreviewInfo;
 import com.android.customization.model.theme.ThemeManager;
 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.TimeTicker;
 import com.android.customization.picker.theme.ThemePreviewPage.ThemeCoverPage;
+import com.android.customization.picker.theme.ThemePreviewPage.TimeContainer;
 import com.android.customization.widget.OptionSelectorController;
 import com.android.customization.widget.PreviewPager;
 import com.android.wallpaper.R;
@@ -91,9 +97,13 @@
     private ThemeBundle mSelectedTheme;
     private ThemePreviewAdapter mAdapter;
     private PreviewPager mPreviewPager;
+    private ContentLoadingProgressBar mLoading;
+    private View mContent;
+    private View mError;
     private boolean mUseMyWallpaper;
     private WallpaperInfo mCurrentHomeWallpaper;
     private CurrentWallpaperInfoFactory mCurrentWallpaperFactory;
+    private TimeTicker mTicker;
 
     @Override
     public void onAttach(Context context) {
@@ -111,6 +121,9 @@
                 R.layout.fragment_theme_picker, container, /* attachToRoot */ false);
         setUpToolbar(view);
 
+        mContent = view.findViewById(R.id.content_section);
+        mLoading = view.findViewById(R.id.loading_indicator);
+        mError = view.findViewById(R.id.error_section);
         mCurrentWallpaperFactory = InjectorProvider.getInjector()
                 .getCurrentWallpaperFactory(getActivity().getApplicationContext());
         mPreviewPager = view.findViewById(R.id.theme_preview_pager);
@@ -120,7 +133,6 @@
         });
         mUseMyWallpaperButton = view.findViewById(R.id.use_my_wallpaper);
         mUseMyWallpaperButton.setOnCheckedChangeListener(this::onUseMyWallpaperCheckChanged);
-
         setUpOptions(savedInstanceState);
 
         return view;
@@ -148,7 +160,23 @@
     @Override
     public void onResume() {
         super.onResume();
+        mTicker = TimeTicker.registerNewReceiver(getContext(), this::updateTime);
         reloadWallpaper();
+        updateTime();
+    }
+
+    private void updateTime() {
+        if (mAdapter != null) {
+            mAdapter.updateTime();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (getContext() != null) {
+            getContext().unregisterReceiver(mTicker);
+        }
     }
 
     @Override
@@ -215,48 +243,73 @@
 
     private void updateButtonsVisibility() {
         mUseMyWallpaperButton.setVisibility(mSelectedTheme instanceof CustomTheme
-                ? View.GONE : View.VISIBLE);
+                ? View.INVISIBLE : View.VISIBLE);
+    }
+
+    private void hideError() {
+        mContent.setVisibility(View.VISIBLE);
+        mError.setVisibility(View.GONE);
+    }
+
+    private void showError() {
+        mLoading.hide();
+        mContent.setVisibility(View.GONE);
+        mError.setVisibility(View.VISIBLE);
     }
 
     private void setUpOptions(@Nullable Bundle savedInstanceState) {
-        mThemeManager.fetchOptions(options -> {
-            mOptionsController = new OptionSelectorController<>(mOptionsContainer, options);
-            mOptionsController.addListener(selected -> {
-                if (selected instanceof CustomTheme && !((CustomTheme) selected).isDefined()) {
-                    navigateToCustomTheme((CustomTheme) selected);
-                } else {
-                    mSelectedTheme = (ThemeBundle) selected;
-                    if (mUseMyWallpaper || mSelectedTheme instanceof CustomTheme) {
-                        mSelectedTheme.setOverrideThemeWallpaper(mCurrentHomeWallpaper);
+        hideError();
+        mLoading.show();
+        mThemeManager.fetchOptions(new OptionsFetchedListener<ThemeBundle>() {
+            @Override
+            public void onOptionsLoaded(List<ThemeBundle> options) {
+                mOptionsController = new OptionSelectorController<>(mOptionsContainer, options);
+                mOptionsController.addListener(selected -> {
+                    mLoading.hide();
+                    if (selected instanceof CustomTheme && !((CustomTheme) selected).isDefined()) {
+                        navigateToCustomTheme((CustomTheme) selected);
                     } else {
-                        mSelectedTheme.setOverrideThemeWallpaper(null);
+                        mSelectedTheme = (ThemeBundle) selected;
+                        if (mUseMyWallpaper || mSelectedTheme instanceof CustomTheme) {
+                            mSelectedTheme.setOverrideThemeWallpaper(mCurrentHomeWallpaper);
+                        } else {
+                            mSelectedTheme.setOverrideThemeWallpaper(null);
+                        }
+                        mEventLogger.logThemeSelected(mSelectedTheme,
+                                selected instanceof CustomTheme);
+                        createAdapter(options);
+                        updateButtonsVisibility();
                     }
-                    mEventLogger.logThemeSelected(mSelectedTheme, selected instanceof CustomTheme);
-                    createAdapter(options);
-                    updateButtonsVisibility();
+                });
+                mOptionsController.initOptions(mThemeManager);
+                String previouslySelected = savedInstanceState != null
+                        ? savedInstanceState.getString(KEY_SELECTED_THEME) : null;
+                for (ThemeBundle theme : options) {
+                    if (previouslySelected != null
+                            && previouslySelected.equals(theme.getSerializedPackages())) {
+                        mSelectedTheme = theme;
+                    } else if (theme.isActive(mThemeManager)) {
+                        mSelectedTheme = theme;
+                        break;
+                    }
                 }
-            });
-            mOptionsController.initOptions(mThemeManager);
-            String previouslySelected = savedInstanceState != null
-                    ? savedInstanceState.getString(KEY_SELECTED_THEME) : null;
-            for (ThemeBundle theme : options) {
-                if (previouslySelected != null
-                        && previouslySelected.equals(theme.getSerializedPackages())) {
-                    mSelectedTheme = theme;
-                } else if (theme.isActive(mThemeManager)) {
-                    mSelectedTheme = theme;
-                    break;
+                if (mSelectedTheme == null) {
+                    // Select the default theme if there is no matching custom enabled theme
+                    // TODO(b/124796742): default to custom if there is no matching theme bundle
+                    mSelectedTheme = options.get(0);
+                } else {
+                    // Only show show checkmark if we found a matching theme
+                    mOptionsController.setAppliedOption(mSelectedTheme);
                 }
+                mOptionsController.setSelectedOption(mSelectedTheme);
             }
-            if (mSelectedTheme == null) {
-                // Select the default theme if there is no matching custom enabled theme
-                // TODO(b/124796742): default to custom if there is no matching theme bundle
-                mSelectedTheme = options.get(0);
-            } else {
-                // Only show show checkmark if we found a matching theme
-                mOptionsController.setAppliedOption(mSelectedTheme);
+            @Override
+            public void onError(@Nullable Throwable throwable) {
+                if (throwable != null) {
+                    Log.e(TAG, "Error loading theme bundles", throwable);
+                }
+                showError();
             }
-            mOptionsController.setSelectedOption(mSelectedTheme);
         }, false);
     }
 
@@ -307,8 +360,10 @@
         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[][] mColorTileIconIds = {
+                new int[]{ R.id.preview_color_qs_0_icon, 0},
+                new int[]{ R.id.preview_color_qs_1_icon, 1},
+                new int[] { R.id.preview_color_qs_2_icon, 3}
         };
 
         private int[] mShapeIconIds = {
@@ -326,12 +381,15 @@
                     ? res.getDrawable(R.drawable.theme_cover_scrim_custom, activity.getTheme())
                     : res.getDrawable(R.drawable.theme_cover_scrim, activity.getTheme());
 
+            WallpaperPreviewLayoutListener wallpaperListener = new WallpaperPreviewLayoutListener(
+                    theme, previewInfo, coverScrim);
+
             addPage(new ThemeCoverPage(activity, theme.getTitle(),
                     previewInfo.resolveAccentColor(res), previewInfo.icons,
                     previewInfo.headlineFontFamily, previewInfo.bottomSheeetCornerRadius,
                     previewInfo.shapeDrawable, previewInfo.shapeAppIcons, editClickListener,
                     mColorButtonIds, mColorTileIds, mColorTileIconIds, mShapeIconIds,
-                    new WallpaperPreviewLayoutListener(theme, previewInfo, coverScrim)));
+                    wallpaperListener, coverCardLayoutListener));
             addPage(new ThemePreviewPage(activity, R.string.preview_name_font, R.drawable.ic_font,
                     R.layout.preview_card_font_content,
                     previewInfo.resolveAccentColor(res)) {
@@ -397,7 +455,7 @@
 
                         for (int i = 0; i < mColorTileIds.length && i < previewInfo.icons.size();
                                 i++) {
-                            Drawable icon = previewInfo.icons.get(i)
+                            Drawable icon = previewInfo.icons.get(mColorTileIconIds[i][1])
                                     .getConstantState().newDrawable().mutate();
                             Drawable bgShape =
                                     previewInfo.shapeDrawable.getConstantState().newDrawable();
@@ -405,7 +463,7 @@
 
                             ImageView bg = card.findViewById(mColorTileIds[i]);
                             bg.setImageDrawable(bgShape);
-                            ImageView fg = card.findViewById(mColorTileIconIds[i]);
+                            ImageView fg = card.findViewById(mColorTileIconIds[i][0]);
                             fg.setImageDrawable(icon);
                         }
                     }
@@ -461,6 +519,14 @@
             }
         }
 
+        public void updateTime() {
+            for (ThemePreviewPage page : mPages) {
+                if (page instanceof TimeContainer) {
+                    ((TimeContainer)page).updateTime();
+                }
+            }
+        }
+
         private static class WallpaperPreviewLayoutListener implements OnLayoutChangeListener {
             private final ThemeBundle mTheme;
             private final PreviewInfo mPreviewInfo;
diff --git a/src/com/android/customization/picker/theme/ThemePreviewPage.java b/src/com/android/customization/picker/theme/ThemePreviewPage.java
index 3c58079..47282eb 100644
--- a/src/com/android/customization/picker/theme/ThemePreviewPage.java
+++ b/src/com/android/customization/picker/theme/ThemePreviewPage.java
@@ -30,6 +30,11 @@
 import java.util.TimeZone;
 
 abstract class ThemePreviewPage extends PreviewPage {
+
+    public interface TimeContainer {
+        void updateTime();
+    }
+
     @StringRes
     final int nameResId;
     @DrawableRes
@@ -71,7 +76,13 @@
 
     protected abstract void bindBody(boolean forceRebind);
 
-    static class ThemeCoverPage extends ThemePreviewPage {
+    static class ThemeCoverPage extends ThemePreviewPage implements TimeContainer {
+
+        /**
+         * Maps which icon from ResourceConstants#ICONS_FOR_PREVIEW to use for each icon in the
+         * top bar (fake "status bar") of the cover page.
+         */
+        private static final int [] sTopBarIconToPreviewIcon = new int [] { 0, 6, 7 };
 
         private final Typeface mHeadlineFont;
         private final List<Drawable> mIcons;
@@ -79,12 +90,12 @@
         private Drawable mShapeDrawable;
         private final int[] mColorButtonIds;
         private final int[] mColorTileIds;
-        private final int[] mColorTileIconIds;
+        private final int[][] mColorTileIconIds;
         private final int[] mShapeIconIds;
         private final Resources mRes;
         private String mTitle;
         private OnClickListener mEditClickListener;
-        private final OnLayoutChangeListener mListener;
+        private final OnLayoutChangeListener[] mListeners;
         private final int mCornerRadius;
         private final ColorStateList mTintList;
 
@@ -93,8 +104,8 @@
                 Drawable shapeDrawable,
                 List<Drawable> shapeAppIcons,
                 OnClickListener editClickListener,
-                int[] colorButtonIds, int[] colorTileIds, int[] colorTileIconIds,
-                int[] shapeIconIds, OnLayoutChangeListener wallpaperListener) {
+                int[] colorButtonIds, int[] colorTileIds, int[][] colorTileIconIds,
+                int[] shapeIconIds, OnLayoutChangeListener... wallpaperListeners) {
             super(context, 0, 0, R.layout.preview_card_cover_content, accentColor);
             mRes = context.getResources();
             mTitle = title;
@@ -108,7 +119,7 @@
             mColorTileIds = colorTileIds;
             mColorTileIconIds = colorTileIconIds;
             mShapeIconIds = shapeIconIds;
-            mListener = wallpaperListener;
+            mListeners = wallpaperListeners;
             // Color QS icons:
             int controlGreyColor = mRes.getColor(R.color.control_grey, null);
             mTintList = new ColorStateList(
@@ -130,8 +141,14 @@
             if (card == null) {
                 return;
             }
+            if (mListeners != null) {
+                for (OnLayoutChangeListener listener : mListeners) {
+                    if (listener != null) {
+                        card.addOnLayoutChangeListener(listener);
+                    }
+                }
+            }
 
-            card.addOnLayoutChangeListener(mListener);
             if (forceRebind) {
                 card.requestLayout();
             }
@@ -143,14 +160,14 @@
                 }
             }
             for (int i = 0; i < 3 && i < mIcons.size(); i++) {
-                Drawable icon =
-                        mIcons.get(i).getConstantState().newDrawable().mutate();
+                Drawable icon = mIcons.get(mColorTileIconIds[i][1]).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]);
+                ImageView fg = card.findViewById(mColorTileIconIds[i][0]);
                 fg.setImageDrawable(icon);
             }
 
@@ -176,9 +193,15 @@
 
             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());
+            for (int i = 0; i < iconsContainer.getChildCount(); i++) {
+                int iconIndex = sTopBarIconToPreviewIcon[i];
+                if (iconIndex < mIcons.size()) {
+                    ((ImageView) iconsContainer.getChildAt(i))
+                            .setImageDrawable(mIcons.get(iconIndex).getConstantState()
+                                    .newDrawable().mutate());
+                } else {
+                    iconsContainer.getChildAt(i).setVisibility(View.GONE);
+                }
             }
 
             ViewGroup body = card.findViewById(R.id.theme_preview_card_body_container);
@@ -206,6 +229,14 @@
             }
         }
 
+        @Override
+        public void updateTime() {
+            if (card != null) {
+                ((TextView) card.findViewById(R.id.theme_preview_clock)).setText(
+                        getFormattedTime());
+            }
+        }
+
         private boolean useRoundedQSB(int cornerRadius) {
             return cornerRadius >=
                     card.getResources().getDimensionPixelSize(R.dimen.roundCornerThreshold);
diff --git a/src/com/android/customization/widget/PreviewPager.java b/src/com/android/customization/widget/PreviewPager.java
index 9bf7651..73a5554 100644
--- a/src/com/android/customization/widget/PreviewPager.java
+++ b/src/com/android/customization/widget/PreviewPager.java
@@ -117,7 +117,7 @@
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        if (mPageStyle == STYLE_ASPECT_RATIO && mViewPager.getMeasuredWidth() == 0) {
+        if (mPageStyle == STYLE_ASPECT_RATIO) {
             int availableWidth = MeasureSpec.getSize(widthMeasureSpec);
             int availableHeight = MeasureSpec.getSize(heightMeasureSpec);
             int indicatorHeight = mPageIndicator.getVisibility() == VISIBLE