diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 867bb83..be7ad44 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -394,4 +394,22 @@
         <item>3</item>
         <item>4</item>
     </string-array>
+
+    <!-- Lockscreen Clock -->
+    <string-array name="lock_screen_custom_clock_face_entries" translatable="false">
+        <item>@string/lock_screen_custom_clock_face_default</item>
+        <item>@string/lock_screen_custom_clock_face_sfunny</item>
+        <item>@string/lock_screen_custom_clock_face_oos</item>
+        <item>@string/lock_screen_custom_clock_face_clockertino</item>
+        <item>@string/lock_screen_custom_clock_face_spark</item>
+        <item>@string/lock_screen_custom_clock_face_spark_circle</item>
+    </string-array>
+    <string-array name="lock_screen_custom_clock_face_values" translatable="false">
+        <item>com.android.keyguard.clock.DefaultClockController</item>
+        <item>com.android.keyguard.clock.SfunnyClockController</item>
+        <item>com.android.keyguard.clock.OOSClockController</item>
+        <item>com.android.keyguard.clock.ClockertinoClockController</item>
+        <item>com.android.keyguard.clock.SparkClockController</item>
+        <item>com.android.keyguard.clock.SparkCircleClockController</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 8ccf999..83c8f2d 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -604,4 +604,14 @@
     <string name="disable_usercard_title">Settings UserCard</string>
     <string name="disable_usercard_summary">Toggle in order not to show the usercard on main settings page</string>
 
+	<!-- Lockscreen Clocks -->
+    <string name="lock_screen_custom_clock_face_category">Lockscreen Clock</string>
+    <string name="lock_screen_custom_clock_face_title">Lockscreen clock style</string>
+    <string name="lock_screen_custom_clock_face_default">Default</string>
+    <string name="lock_screen_custom_clock_face_sfunny">Sfuny</string>
+    <string name="lock_screen_custom_clock_face_oos">OOS</string>
+    <string name="lock_screen_custom_clock_face_clockertino">Clockertino</string>
+    <string name="lock_screen_custom_clock_face_spark">Spark</string>
+    <string name="lock_screen_custom_clock_face_spark_circle">Spark Circle</string>
+
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index f9c38d3..04b4b7b 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -57,6 +57,18 @@
         android:title="@string/lockscreen_charging_info_title"
         android:summary="@string/lockscreen_charging_info_summary"
         android:defaultValue="true" />
+		
+	<PreferenceCategory
+        android:title="@string/lock_screen_custom_clock_face_category">
+
+        <ListPreference
+            android:key="lock_screen_custom_clock_face"
+            android:summary="%s"
+            android:title="@string/lock_screen_custom_clock_face_title"
+            android:entries="@array/lock_screen_custom_clock_face_entries"
+            android:entryValues="@array/lock_screen_custom_clock_face_values" />
+
+    </PreferenceCategory>
 	
 	<PreferenceCategory
         android:key="lockscreen_media_art_options"
diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java
index 983a36b..6c66dbf 100644
--- a/src/com/cherish/settings/fragments/LockScreenSettings.java
+++ b/src/com/cherish/settings/fragments/LockScreenSettings.java
@@ -59,6 +59,8 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
 			
 	private static final String AOD_SCHEDULE_KEY = "always_on_display_schedule";
+	private static final String CUSTOM_CLOCK_FACE = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE;
+    private static final String DEFAULT_CLOCK = "com.android.keyguard.clock.DefaultClockController";
 	
 	static final int MODE_DISABLED = 0;
     static final int MODE_NIGHT = 1;
@@ -66,6 +68,9 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
     static final int MODE_MIXED_SUNSET = 3;
     static final int MODE_MIXED_SUNRISE = 4;
 	
+	private ListPreference mLockClockStyles;
+	private Context mContext;
+	
 	Preference mAODPref;
 
     @Override
@@ -89,6 +94,12 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
 		
 		mAODPref = findPreference(AOD_SCHEDULE_KEY);
         updateAlwaysOnSummary();
+		
+		mLockClockStyles = (ListPreference) findPreference(CUSTOM_CLOCK_FACE);
+        String mLockClockStylesValue = getLockScreenCustomClockFace();
+        mLockClockStyles.setValue(mLockClockStylesValue);
+        mLockClockStyles.setSummary(mLockClockStyles.getEntry());
+        mLockClockStyles.setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -123,8 +134,39 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
+	    if (preference == mLockClockStyles) {
+            setLockScreenCustomClockFace((String) newValue);
+            int index = mLockClockStyles.findIndexOfValue((String) newValue);
+            mLockClockStyles.setSummary(mLockClockStyles.getEntries()[index]);
+            return true;
+         }
         return false;
     }
+	
+	private String getLockScreenCustomClockFace() {
+        mContext = getActivity();
+        String value = Settings.Secure.getStringForUser(mContext.getContentResolver(),
+                CUSTOM_CLOCK_FACE, USER_CURRENT);
+
+        if (value == null || value.isEmpty()) value = DEFAULT_CLOCK;
+
+        try {
+            JSONObject json = new JSONObject(value);
+            return json.getString("clock");
+        } catch (JSONException ex) {
+        }
+        return value;
+    }
+
+    private void setLockScreenCustomClockFace(String value) {
+        try {
+            JSONObject json = new JSONObject();
+            json.put("clock", value);
+            Settings.Secure.putStringForUser(mContext.getContentResolver(), CUSTOM_CLOCK_FACE,
+                    json.toString(), USER_CURRENT);
+        } catch (JSONException ex) {
+        }
+    }
 
     @Override
     public int getMetricsCategory() {