diff --git a/android/uhabits-android/src/main/AndroidManifest.xml b/android/uhabits-android/src/main/AndroidManifest.xml
index 904b5bb9c..c86f2bc3e 100644
--- a/android/uhabits-android/src/main/AndroidManifest.xml
+++ b/android/uhabits-android/src/main/AndroidManifest.xml
@@ -137,15 +137,15 @@
         </receiver>
 
         <receiver
-            android:name=".widgets.CheckmarkWidgetWithTimeProvider"
-            android:label="CheckmarkTime">
+            android:name=".widgets.TimedCheckmarkWidgetProvider"
+            android:label="Timed Checkmark">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_checkmarktime_info" />
+                android:resource="@xml/widget_timed_checkmark_info" />
         </receiver>
 
         <service
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
index 998e8757a..61031fad4 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
@@ -2,8 +2,6 @@ package org.isoron.uhabits.widgets;
 
 import org.isoron.uhabits.R;
 
-import java.lang.annotation.Target;
-
 /**
  * Created by victoryu on 11/3/17.
  */
@@ -61,7 +59,7 @@ public enum StackWidgetType {
             case TARGET:
                 return R.layout.target_stackview_widget;
             case CHECKMARKTIME:
-                return R.layout.checkmarktime_stackview_widget;
+                return R.layout.timed_checkmark_stackview_widget;
         }
         return 0;
     }
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetWithTime.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TimedCheckmarkWidget.kt
similarity index 94%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetWithTime.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TimedCheckmarkWidget.kt
index ed623485b..f89209b31 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetWithTime.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TimedCheckmarkWidget.kt
@@ -27,7 +27,7 @@ import org.isoron.uhabits.core.models.*
 import org.isoron.uhabits.utils.*
 import org.isoron.uhabits.widgets.views.*
 
-open class CheckmarkWidgetWithTime(
+open class TimedCheckmarkWidget(
         context: Context,
         widgetId: Int,
         protected val habit: Habit
@@ -42,7 +42,7 @@ open class CheckmarkWidgetWithTime(
     }
 
     override fun refreshData(v: View) {
-        (v as CheckmarkTimeWidgetView).apply {
+        (v as TimedCheckmarkWidgetView).apply {
             setBackgroundAlpha(preferedBackgroundAlpha)
             setNewest(habit.repetitions.newest)
             setActiveColor(PaletteUtils.getColor(context, habit.color))
@@ -60,7 +60,7 @@ open class CheckmarkWidgetWithTime(
     }
 
     override fun buildView(): View {
-        return CheckmarkTimeWidgetView(context)
+        return TimedCheckmarkWidgetView(context)
     }
 
     override fun getDefaultHeight() = 125
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetWithTimeProvider.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TimedCheckmarkWidgetProvider.kt
similarity index 87%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetWithTimeProvider.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TimedCheckmarkWidgetProvider.kt
index 69955a6ca..deed1f05f 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetWithTimeProvider.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TimedCheckmarkWidgetProvider.kt
@@ -20,10 +20,10 @@ package org.isoron.uhabits.widgets
 
 import android.content.*
 
-class CheckmarkWidgetWithTimeProvider : BaseWidgetProvider() {
+class TimedCheckmarkWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        if (habits.size == 1) return CheckmarkWidgetWithTime(context, id, habits[0])
+        if (habits.size == 1) return TimedCheckmarkWidget(context, id, habits[0])
         else return StackWidget(context, id, StackWidgetType.CHECKMARKTIME, habits)
     }
 }
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
index 14c383245..96e1c79b7 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
@@ -68,7 +68,7 @@ class WidgetUpdater
             updateWidgets(modifiedHabitId, StreakWidgetProvider::class.java)
             updateWidgets(modifiedHabitId, FrequencyWidgetProvider::class.java)
             updateWidgets(modifiedHabitId, TargetWidgetProvider::class.java)
-            updateWidgets(modifiedHabitId, CheckmarkWidgetWithTimeProvider::class.java)
+            updateWidgets(modifiedHabitId, TimedCheckmarkWidgetProvider::class.java)
         }
     }
 
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkTimeWidgetView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/TimedCheckmarkWidgetView.java
similarity index 88%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkTimeWidgetView.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/TimedCheckmarkWidgetView.java
index 13bd50be7..62fcf9e34 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkTimeWidgetView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/TimedCheckmarkWidgetView.java
@@ -20,9 +20,13 @@
 package org.isoron.uhabits.widgets.views;
 
 import android.content.Context;
+import android.os.Build;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.widget.TextView;
 
+import androidx.annotation.RequiresApi;
+
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.RingView;
 import org.isoron.uhabits.activities.habits.list.views.NumberButtonViewKt;
@@ -31,16 +35,20 @@ import org.isoron.uhabits.core.models.Repetition;
 import org.isoron.uhabits.core.models.Timestamp;
 import org.isoron.uhabits.utils.PaletteUtils;
 
-public class CheckmarkTimeWidgetView extends CheckmarkWidgetView {
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Calendar;
+
+public class TimedCheckmarkWidgetView extends CheckmarkWidgetView {
     protected Repetition newest;
 
-    public CheckmarkTimeWidgetView(Context context)
+    public TimedCheckmarkWidgetView(Context context)
     {
         super(context);
         init();
     }
 
-    public CheckmarkTimeWidgetView(Context context, AttributeSet attrs)
+    public TimedCheckmarkWidgetView(Context context, AttributeSet attrs)
     {
         super(context, attrs);
         init();
diff --git a/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_timed_checkmark.png b/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_timed_checkmark.png
new file mode 100644
index 000000000..f29c2699b
Binary files /dev/null and b/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_timed_checkmark.png differ
diff --git a/android/uhabits-android/src/main/res/layout/checkmarktime_stackview_widget.xml b/android/uhabits-android/src/main/res/layout/timed_checkmark_stackview_widget.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/checkmarktime_stackview_widget.xml
rename to android/uhabits-android/src/main/res/layout/timed_checkmark_stackview_widget.xml
diff --git a/android/uhabits-android/src/main/res/layout/widget_checkmarktime.xml b/android/uhabits-android/src/main/res/layout/widget_timed_checkmark.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/widget_checkmarktime.xml
rename to android/uhabits-android/src/main/res/layout/widget_timed_checkmark.xml
diff --git a/android/uhabits-android/src/main/res/xml/widget_checkmarktime_info.xml b/android/uhabits-android/src/main/res/xml/widget_timed_checkmark_info.xml
similarity index 97%
rename from android/uhabits-android/src/main/res/xml/widget_checkmarktime_info.xml
rename to android/uhabits-android/src/main/res/xml/widget_timed_checkmark_info.xml
index 5e988f548..bea1159d3 100644
--- a/android/uhabits-android/src/main/res/xml/widget_checkmarktime_info.xml
+++ b/android/uhabits-android/src/main/res/xml/widget_timed_checkmark_info.xml
@@ -22,7 +22,7 @@
                     android:minHeight="40dp"
                     android:minWidth="40dp"
                     android:initialLayout="@layout/widget_wrapper"
-                    android:previewImage="@drawable/widget_preview_checkmark"
+                    android:previewImage="@drawable/widget_preview_timed_checkmark"
                     android:resizeMode="none"
                     android:updatePeriodMillis="3600000"
                     android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog"