diff --git a/app/src/main/res/drawable/lockscreen_clock_24_bg.xml b/app/src/main/res/drawable/lockscreen_clock_24_bg.xml
index e2539f361..4214472f2 100644
--- a/app/src/main/res/drawable/lockscreen_clock_24_bg.xml
+++ b/app/src/main/res/drawable/lockscreen_clock_24_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#33FFFFFF" />
+    <solid android:color="#33000000" />
     <corners android:radius="24dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/lockscreen_clock_50_dot.xml b/app/src/main/res/drawable/lockscreen_clock_50_dot.xml
index f076a7a00..deb2c9eef 100644
--- a/app/src/main/res/drawable/lockscreen_clock_50_dot.xml
+++ b/app/src/main/res/drawable/lockscreen_clock_50_dot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-	<stroke android:width="0.0dip" android:color="#c5000000" />
-	<corners android:radius="100.0dip" />
-	<solid android:color="#ffffff" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="100dp" />
+    <solid android:color="#FFFFFF" />
 </shape>
diff --git a/app/src/main/res/drawable/lockscreen_clock_50_dot2.xml b/app/src/main/res/drawable/lockscreen_clock_50_dot2.xml
index 1b442a055..7b25b1dfc 100644
--- a/app/src/main/res/drawable/lockscreen_clock_50_dot2.xml
+++ b/app/src/main/res/drawable/lockscreen_clock_50_dot2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-	<stroke android:width="0.0dip" android:color="#c5000000" />
-	<corners android:radius="20.0dip" />
-	<solid android:color="?android:colorAccent" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <solid android:color="@android:color/system_accent1_600" />
 </shape>
diff --git a/app/src/main/res/font/japanese.ttf b/app/src/main/res/font/japanese.ttf
deleted file mode 100644
index 671cd7103..000000000
Binary files a/app/src/main/res/font/japanese.ttf and /dev/null differ
diff --git a/app/src/main/res/font/montserrat_bold.ttf b/app/src/main/res/font/montserrat_bold.ttf
new file mode 100644
index 000000000..ae33a4538
Binary files /dev/null and b/app/src/main/res/font/montserrat_bold.ttf differ
diff --git a/app/src/main/res/font/ios.ttf b/app/src/main/res/font/sf_pro_stencil.ttf
similarity index 100%
rename from app/src/main/res/font/ios.ttf
rename to app/src/main/res/font/sf_pro_stencil.ttf
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_19.xml b/app/src/main/res/layout/preview_lockscreen_clock_19.xml
index 96e647254..be3b41314 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_19.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_19.xml
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:alpha="0.9"
-            android:fontFamily="@font/ios"
+            android:fontFamily="@font/sf_pro_stencil"
             android:format12Hour="hh:mm"
             android:format24Hour="HH:mm"
             android:gravity="center"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_2.xml b/app/src/main/res/layout/preview_lockscreen_clock_2.xml
index 67cfb2f7f..d490c80c7 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_2.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_2.xml
@@ -14,19 +14,19 @@
         android:orientation="vertical">
 
         <TextClock
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:format12Hour="EEEE"
             android:format24Hour="EEEE"
+            android:includeFontPadding="false"
             android:singleLine="true"
             android:tag="text1|nolineheight"
-            android:includeFontPadding="false"
             android:textAlignment="viewStart"
             android:textColor="@android:color/white"
             android:textSize="36dp" />
 
         <TextView
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
             android:singleLine="true"
@@ -36,44 +36,39 @@
             android:textColor="@android:color/white"
             android:textSize="30sp" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <FrameLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="start">
+            android:layout_gravity="start"
+            android:layoutDirection="ltr">
 
-            <FrameLayout
+            <TextClock
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="start"
-                android:layoutDirection="ltr">
+                android:format12Hour="hh:mm"
+                android:format24Hour="HH:mm"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:tag="text1"
+                android:textColor="@android:color/white"
+                android:textSize="40dp" />
 
-                <TextClock
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:format12Hour="hh:mm"
-                    android:format24Hour="HH:mm"
-                    android:includeFontPadding="false"
-                    android:singleLine="true"
-                    android:tag="text1"
-                    android:textColor="@android:color/white"
-                    android:textSize="40dp" />
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="hh:mm"
+                android:format24Hour="HH:mm"
+                android:includeFontPadding="false"
+                android:maxLength="1"
+                android:singleLine="true"
+                android:tag="accent1"
+                android:textColor="@android:color/system_accent1_300"
+                android:textSize="40dp" />
 
-                <TextClock
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:format12Hour="hh:mm"
-                    android:format24Hour="HH:mm"
-                    android:includeFontPadding="false"
-                    android:maxLength="1"
-                    android:singleLine="true"
-                    android:tag="accent1"
-                    android:textColor="@android:color/system_accent1_300"
-                    android:textSize="40dp" />
-            </FrameLayout>
-        </LinearLayout>
+        </FrameLayout>
 
         <TextClock
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:format12Hour="MMMM dd "
             android:format24Hour="dd MMMM "
@@ -83,5 +78,6 @@
             android:textAlignment="viewStart"
             android:textColor="@android:color/white"
             android:textSize="20dp" />
+
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_28.xml b/app/src/main/res/layout/preview_lockscreen_clock_28.xml
index 44e3ed69e..9d762667e 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_28.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_28.xml
@@ -19,10 +19,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|center"
-            app:cardBackgroundColor="@android:color/system_accent1_300"
+            app:cardBackgroundColor="@android:color/system_accent1_200"
             app:cardCornerRadius="18dp"
-            app:strokeColor="@android:color/system_accent3_900"
-            app:strokeWidth="6dp">
+            app:strokeColor="@android:color/system_accent1_900"
+            app:strokeWidth="4dp">
 
             <TextClock
                 android:layout_width="wrap_content"
@@ -30,13 +30,15 @@
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="48dp"
                 android:layout_marginVertical="16dp"
+                android:fontFamily="@font/detoks"
                 android:format12Hour="EEEE"
                 android:format24Hour="EEEE"
                 android:gravity="center"
                 android:includeFontPadding="false"
+                android:letterSpacing="0.1"
                 android:tag="text2|nolineheight"
                 android:textColor="#000000"
-                android:textSize="40sp"
+                android:textSize="28sp"
                 android:textStyle="bold" />
 
         </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_29.xml b/app/src/main/res/layout/preview_lockscreen_clock_29.xml
index cec564422..890c1c5e9 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_29.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_29.xml
@@ -38,8 +38,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="-2dp"
                 android:includeFontPadding="false"
-                android:tag="accent1|nolineheight"
-                android:text="Oni Chan!!"
+                android:tag="accent1|nolineheight|username"
+                android:text="Onii-Chan!!"
                 android:textColor="@android:color/system_accent1_300"
                 android:textSize="22sp" />
 
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_3.xml b/app/src/main/res/layout/preview_lockscreen_clock_3.xml
index 5c3dc0f96..ac532dccf 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_3.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_3.xml
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:alpha="0.9"
-            android:fontFamily="@font/ios"
+            android:fontFamily="@font/sf_pro_stencil"
             android:format12Hour="hh:mm"
             android:format24Hour="HH:mm"
             android:gravity="center"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_33.xml b/app/src/main/res/layout/preview_lockscreen_clock_33.xml
index fa4edc0dc..d6213434e 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_33.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_33.xml
@@ -32,6 +32,7 @@
                 android:format12Hour="EEEE"
                 android:format24Hour="EEEE"
                 android:includeFontPadding="false"
+                android:letterSpacing="0.1"
                 android:tag="text2|nolineheight"
                 android:textColor="#000000"
                 android:textSize="20sp"
@@ -68,7 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end|center"
             android:background="@drawable/lockscreen_clock_33_bg"
-            android:paddingHorizontal="20dp"
+            android:paddingHorizontal="30dp"
             android:paddingVertical="10dp"
             android:tag="accent1">
 
@@ -76,8 +77,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:format12Hour="hh • mm"
-                android:format24Hour="kk • mm"
+                android:format12Hour="hh:mm"
+                android:format24Hour="HH:mm"
                 android:includeFontPadding="false"
                 android:tag="text2|nolineheight"
                 android:textColor="#000000"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_37.xml b/app/src/main/res/layout/preview_lockscreen_clock_37.xml
index 77c03bd41..de4e78218 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_37.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_37.xml
@@ -90,6 +90,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="12dp"
+                        android:layout_marginTop="4dp"
                         android:gravity="center"
                         android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_40.xml b/app/src/main/res/layout/preview_lockscreen_clock_40.xml
index f85e7dd23..2202f6d0f 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_40.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_40.xml
@@ -25,7 +25,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center"
                 android:layout_marginStart="12dp"
-                android:fontFamily="@font/japanese"
+                android:fontFamily="@font/japanese3017"
                 android:format12Hour="hh : mm"
                 android:format24Hour="HH : mm"
                 android:includeFontPadding="false"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_42.xml b/app/src/main/res/layout/preview_lockscreen_clock_42.xml
index 5c9350af2..c8c79b017 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_42.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_42.xml
@@ -54,9 +54,8 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="6dp"
-            android:layout_marginBottom="10dp"
-            android:padding="10dp">
+            android:layout_marginHorizontal="10dp"
+            android:layout_marginTop="10dp">
 
             <ImageView
                 android:layout_width="50dp"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_45.xml b/app/src/main/res/layout/preview_lockscreen_clock_45.xml
index 36a24be26..9394c8284 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_45.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_45.xml
@@ -41,7 +41,7 @@
                 android:layout_marginStart="5dp"
                 android:orientation="vertical">
 
-                <LinearLayout
+                <View
                     android:layout_width="match_parent"
                     android:layout_height="6dp"
                     android:layout_gravity="top"
@@ -63,7 +63,7 @@
                     android:textColor="@android:color/system_accent1_600"
                     android:textSize="30sp" />
 
-                <LinearLayout
+                <View
                     android:layout_width="match_parent"
                     android:layout_height="6dp"
                     android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_46.xml b/app/src/main/res/layout/preview_lockscreen_clock_46.xml
index 4dc015163..fe0ce9328 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_46.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_46.xml
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|center"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="6dp"
             android:format12Hour="hh • mm | MMM dd"
             android:format24Hour="HH • mm | dd MMM"
             android:includeFontPadding="false"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_48.xml b/app/src/main/res/layout/preview_lockscreen_clock_48.xml
index 5c577ed68..eb1a257b2 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_48.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_48.xml
@@ -62,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="48dp"
-                android:layout_marginTop="-18dp"
+                android:layout_marginTop="-14dp"
                 android:fontFamily="@font/montserrat"
                 android:format12Hour="EEEE"
                 android:format24Hour="EEEE"
@@ -78,6 +78,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="48dp"
+                android:layout_marginTop="2dp"
                 android:layout_marginBottom="18dp"
                 android:alpha="0.6"
                 android:fontFamily="@font/montserrat"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_50.xml b/app/src/main/res/layout/preview_lockscreen_clock_50.xml
index a7dfbb498..ba96ea971 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_50.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_50.xml
@@ -421,20 +421,20 @@
                 android:layout_marginTop="16dp"
                 android:orientation="horizontal">
 
-                <LinearLayout
+                <View
                     android:layout_width="10dp"
                     android:layout_height="10dp"
                     android:background="@drawable/lockscreen_clock_50_dot"
                     android:orientation="horizontal" />
 
-                <LinearLayout
+                <View
                     android:layout_width="10dp"
                     android:layout_height="10dp"
                     android:layout_marginStart="5dp"
                     android:background="@drawable/lockscreen_clock_50_dot2"
                     android:orientation="horizontal" />
 
-                <LinearLayout
+                <View
                     android:layout_width="10dp"
                     android:layout_height="10dp"
                     android:layout_marginStart="5dp"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_51.xml b/app/src/main/res/layout/preview_lockscreen_clock_51.xml
index 8707668b0..f4f1952f3 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_51.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_51.xml
@@ -24,7 +24,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:alpha="0.5"
-                android:fontFamily="@font/sans_bold"
+                android:fontFamily="@font/montserrat_bold"
                 android:format12Hour="hh mm"
                 android:format24Hour="HH mm"
                 android:includeFontPadding="false"
@@ -37,7 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:fontFamily="@font/sans_bold"
+                android:fontFamily="@font/montserrat_bold"
                 android:format12Hour="EEEE"
                 android:format24Hour="EEEE"
                 android:gravity="center"
@@ -54,7 +54,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="-20dp"
-            android:fontFamily="@font/sans_bold"
+            android:fontFamily="@font/montserrat_bold"
             android:format12Hour="dd MMMM yyyy"
             android:format24Hour="dd MMMM yyyy"
             android:includeFontPadding="false"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_54.xml b/app/src/main/res/layout/preview_lockscreen_clock_54.xml
index 65bdbd746..d6f20cb1e 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_54.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_54.xml
@@ -154,36 +154,20 @@
                 android:textSize="22sp"
                 android:textStyle="bold" />
 
-            <LinearLayout
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
-                android:layout_marginTop="1dp"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:rotation="15">
-
-                <View
-                    android:layout_width="2dp"
-                    android:layout_height="15dp"
-                    android:background="@android:color/system_accent1_400"
-                    android:orientation="horizontal"
-                    android:tag="accent1" />
-
-                <View
-                    android:layout_width="2dp"
-                    android:layout_height="15dp"
-                    android:layout_marginStart="4dp"
-                    android:background="@android:color/system_accent1_400"
-                    android:orientation="horizontal"
-                    android:tag="accent1" />
-
-            </LinearLayout>
+                android:includeFontPadding="false"
+                android:tag="accent1"
+                android:text=" // "
+                android:textColor="@android:color/system_accent1_400"
+                android:textSize="22sp"
+                android:textStyle="bold" />
 
             <TextClock
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
+                android:layout_gravity="bottom"
                 android:fontFamily="@font/lovelo"
                 android:format12Hour="MMMM"
                 android:format24Hour="MMMM"
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_55.xml b/app/src/main/res/layout/preview_lockscreen_clock_55.xml
index aaf52384c..30dee5890 100644
--- a/app/src/main/res/layout/preview_lockscreen_clock_55.xml
+++ b/app/src/main/res/layout/preview_lockscreen_clock_55.xml
@@ -153,24 +153,24 @@
             android:layout_gravity="top|center"
             android:layout_marginTop="8dp">
 
-            <FrameLayout
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="3dp"
                 android:layout_gravity="center"
                 android:background="@drawable/lockscreen_clock_55_bg3" />
 
-            <FrameLayout
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="3dp"
                 android:layout_gravity="center"
-                android:layout_marginHorizontal="20dp"
+                android:layout_marginHorizontal="40dp"
                 android:background="@drawable/lockscreen_clock_55_bg4" />
 
-            <FrameLayout
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="3dp"
                 android:layout_gravity="center"
-                android:layout_marginHorizontal="40dp"
+                android:layout_marginHorizontal="70dp"
                 android:background="@drawable/lockscreen_clock_55_bg3" />
 
         </FrameLayout>