diff --git a/build.gradle.kts b/build.gradle.kts
index 993a59a6c..102ed1278 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     val kotlinVersion = "1.5.0"
-    id("com.android.application") version ("7.0.2") apply (false)
+    id("com.android.application") version ("7.0.3") apply (false)
     id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.android.extensions") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false)
-    id("org.jlleitschuh.gradle.ktlint") version "10.1.0"
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
 }
 
 apply {
@@ -18,7 +18,6 @@ allprojects {
         mavenCentral()
         maven(url = "https://plugins.gradle.org/m2/")
         maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
-        maven(url = "https://kotlin.bintray.com/ktor")
-        maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers")
+        maven(url = "https://jitpack.io")
     }
 }
diff --git a/gradle.properties b/gradle.properties
index a1f977f3b..b54c6c097 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.parallel=false
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms2048m -Xmx2048m -XX:MaxPermSize=2048m
+org.gradle.jvmargs=-Xms2048m -Xmx2048m
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index 319a19f2f..b4ef2d919 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -18,7 +18,7 @@
  */
 
 plugins {
-    id("com.github.triplet.play") version "3.6.0"
+    id("com.github.triplet.play") version "3.7.0"
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
@@ -32,13 +32,13 @@ tasks.compileLint {
 
 android {
 
-    compileSdk = 30
+    compileSdk = 31
 
     defaultConfig {
         versionCode = 20003
         versionName = "2.0.3"
         minSdk = 23
-        targetSdk = 30
+        targetSdk = 31
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -86,10 +86,10 @@ android {
 }
 
 dependencies {
-    val daggerVersion = "2.38.1"
-    val kotlinVersion = "1.5.30"
-    val kxCoroutinesVersion = "1.5.1"
-    val ktorVersion = "1.6.3"
+    val daggerVersion = "2.41"
+    val kotlinVersion = "1.6.10"
+    val kxCoroutinesVersion = "1.6.0"
+    val ktorVersion = "1.6.7"
     val espressoVersion = "3.4.0"
 
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
@@ -98,17 +98,17 @@ dependencies {
     androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1")
     androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
-    androidTestImplementation("androidx.annotation:annotation:1.2.0")
+    androidTestImplementation("androidx.annotation:annotation:1.3.0")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
     androidTestImplementation("androidx.test:rules:1.4.0")
     androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
     compileOnly("javax.annotation:jsr250-api:1.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
-    implementation("com.github.paolorotolo:appintro:4.1.0")
+    implementation("com.github.AppIntro:AppIntro:6.2.0")
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.dagger:dagger:$daggerVersion")
-    implementation("com.google.guava:guava:30.1.1-android")
+    implementation("com.google.guava:guava:31.1-android")
     implementation("io.ktor:ktor-client-android:$ktorVersion")
     implementation("io.ktor:ktor-client-core:$ktorVersion")
     implementation("io.ktor:ktor-client-jackson:$ktorVersion")
@@ -116,11 +116,11 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion")
-    implementation("androidx.appcompat:appcompat:1.3.1")
+    implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("androidx.legacy:legacy-preference-v14:1.0.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("com.google.android.material:material:1.4.0")
-    implementation("com.opencsv:opencsv:5.5.1")
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("com.opencsv:opencsv:5.6")
     implementation(project(":uhabits-core"))
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")
     kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion")
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png
index 86e6a5406..c45314e03 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png and b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_above.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_above.png
new file mode 100644
index 000000000..4cea80498
Binary files /dev/null and b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_above.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_below.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_below.png
new file mode 100644
index 000000000..ac4c0f5c9
Binary files /dev/null and b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_below.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_between.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_between.png
new file mode 100644
index 000000000..12063c425
Binary files /dev/null and b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_at_most_between.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png
index 5f6bf8c65..a405c0092 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png and b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png
index 22584afb3..a8571c3fa 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png and b/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png b/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png
index dafb53f4f..f1cfd0676 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png and b/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png differ
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.kt
index 171a9ed41..bfbdf3bb8 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.kt
@@ -55,6 +55,7 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class HabitsTest : BaseUserInterfaceTest() {
+
     @Test
     @Throws(Exception::class)
     fun shouldCreateHabit() {
@@ -180,6 +181,8 @@ class HabitsTest : BaseUserInterfaceTest() {
         longPressCheckmarks("Wake up early", count = 2)
         clickText("Wake up early")
         verifyShowsScreen(SHOW_HABIT)
+        // TODO: find a better way than sleeping in tests
+        Thread.sleep(2001L)
         verifyDisplaysText("10%")
     }
 
@@ -194,6 +197,8 @@ class HabitsTest : BaseUserInterfaceTest() {
         verifyDoesNotDisplayText("Track time")
         verifyDisplaysText("Wake up early")
         longPressCheckmarks("Wake up early", count = 1)
+        // TODO: find a better way than sleeping in tests
+        Thread.sleep(2001L)
         verifyDoesNotDisplayText("Wake up early")
         clickMenu(TOGGLE_COMPLETED)
         verifyDisplaysText("Track time")
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
index 6f1923aaa..935fc7028 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
@@ -24,6 +24,7 @@ import androidx.test.filters.MediumTest
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
+import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.utils.PaletteUtils
 import org.junit.Before
 import org.junit.Test
@@ -42,6 +43,7 @@ class NumberButtonViewTest : BaseViewTest() {
         super.setUp()
         view = component.getNumberButtonViewFactory().create().apply {
             units = "steps"
+            targetType = NumericalHabitType.AT_LEAST
             threshold = 100.0
             color = PaletteUtils.getAndroidTestColor(8)
             onEdit = { edited = true }
@@ -74,10 +76,10 @@ class NumberButtonViewTest : BaseViewTest() {
     }
 
     @Test
-    fun testRender_emptyUnits() {
+    fun testRender_atMostAboveThreshold() {
         view.value = 500.0
-        view.units = ""
-        assertRenders(view, "$PATH/render_unitless.png")
+        view.targetType = NumericalHabitType.AT_MOST
+        assertRenders(view, "$PATH/render_at_most_above.png")
     }
 
     @Test
@@ -86,6 +88,13 @@ class NumberButtonViewTest : BaseViewTest() {
         assertRenders(view, "$PATH/render_below.png")
     }
 
+    @Test
+    fun testRender_atMostBetweenThresholds() {
+        view.value = 110.0
+        view.targetType = NumericalHabitType.AT_MOST
+        assertRenders(view, "$PATH/render_at_most_between.png")
+    }
+
     @Test
     fun testRender_zero() {
         view.value = 0.0
@@ -93,15 +102,21 @@ class NumberButtonViewTest : BaseViewTest() {
     }
 
     @Test
-    fun testClick_shortToggleDisabled() {
-        prefs.isShortToggleEnabled = false
-        view.performClick()
-        assertFalse(edited)
+    fun testRender_atMostBelowThreshold() {
+        view.value = 0.0
+        view.targetType = NumericalHabitType.AT_MOST
+        assertRenders(view, "$PATH/render_at_most_below.png")
+    }
+
+    @Test
+    fun testRender_emptyUnits() {
+        view.value = 500.0
+        view.units = ""
+        assertRenders(view, "$PATH/render_unitless.png")
     }
 
     @Test
-    fun testClick_shortToggleEnabled() {
-        prefs.isShortToggleEnabled = true
+    fun testClick() {
         view.performClick()
         assertTrue(edited)
     }
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
index bd046acc7..da0a2eb8a 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
@@ -24,6 +24,7 @@ import androidx.test.filters.MediumTest
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
+import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.utils.PaletteUtils
 import org.junit.After
@@ -55,6 +56,7 @@ class NumberPanelViewTest : BaseViewTest() {
             buttonCount = 4
             color = PaletteUtils.getAndroidTestColor(7)
             units = "steps"
+            targetType = NumericalHabitType.AT_LEAST
             threshold = 5000.0
         }
         view.onAttachedToWindow()
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt
index a43543936..3323f78df 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt
@@ -53,8 +53,6 @@ class SubtitleCardViewTest : BaseViewTest() {
                 isNumerical = false,
                 question = "Did you meditate this morning?",
                 reminder = Reminder(8, 30, EVERY_DAY),
-                unit = "",
-                targetValue = 0.0,
                 theme = LightTheme(),
             )
         )
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.kt
index 10ad56057..d2debb851 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.kt
@@ -61,7 +61,7 @@ class PerformanceTest : BaseAndroidTest() {
         val habit = fixtures.createEmptyHabit()
         for (i in 0..4999) {
             val timestamp: Timestamp = Timestamp(i * DAY_LENGTH)
-            CreateRepetitionCommand(habitList, habit, timestamp, 1).run()
+            CreateRepetitionCommand(habitList, habit, timestamp, 1, "").run()
         }
         db.setTransactionSuccessful()
         db.endTransaction()
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.kt
index b73c49c1b..05adfdbbe 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.kt
@@ -24,8 +24,8 @@ import android.widget.FrameLayout
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.hamcrest.CoreMatchers
-import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
 import org.isoron.uhabits.R
diff --git a/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/src/main/AndroidManifest.xml
index b5d06f181..3b0851207 100644
--- a/uhabits-android/src/main/AndroidManifest.xml
+++ b/uhabits-android/src/main/AndroidManifest.xml
@@ -17,9 +17,10 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.isoron.uhabits">
 
+    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
@@ -48,11 +49,11 @@
             android:name=".activities.habits.list.ListHabitsActivity"
             android:exported="true"
             android:label="@string/main_activity_title"
-            android:launchMode="singleTop">
-        </activity>
+            android:launchMode="singleTop" />
 
         <activity-alias
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/main_activity_title"
             android:launchMode="singleTop"
             android:targetActivity=".activities.habits.list.ListHabitsActivity">
@@ -85,6 +86,7 @@
 
         <activity
             android:name=".widgets.activities.HabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -93,6 +95,7 @@
 
         <activity
             android:name=".widgets.activities.BooleanHabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -101,6 +104,7 @@
 
         <activity
             android:name=".widgets.activities.NumericalHabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -117,9 +121,10 @@
 
         <activity
             android:name=".widgets.activities.NumericalCheckmarkWidgetActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
             android:label="NumericalCheckmarkWidget"
             android:noHistory="true"
-            android:excludeFromRecents="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="org.isoron.uhabits.ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY" />
@@ -128,13 +133,14 @@
 
         <activity
             android:name=".notifications.SnoozeDelayPickerActivity"
-            android:taskAffinity=""
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
+            android:taskAffinity=""
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <receiver
             android:name=".widgets.CheckmarkWidgetProvider"
+            android:exported="true"
             android:label="@string/checkmark">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -152,6 +158,7 @@
 
         <receiver
             android:name=".widgets.HistoryWidgetProvider"
+            android:exported="true"
             android:label="@string/history">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -164,6 +171,7 @@
 
         <receiver
             android:name=".widgets.ScoreWidgetProvider"
+            android:exported="true"
             android:label="@string/score">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -176,6 +184,7 @@
 
         <receiver
             android:name=".widgets.StreakWidgetProvider"
+            android:exported="true"
             android:label="@string/streaks">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -188,6 +197,7 @@
 
         <receiver
             android:name=".widgets.FrequencyWidgetProvider"
+            android:exported="true"
             android:label="@string/frequency">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -200,6 +210,7 @@
 
         <receiver
             android:name=".widgets.TargetWidgetProvider"
+            android:exported="true"
             android:label="@string/target">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -210,13 +221,17 @@
                 android:resource="@xml/widget_target_info" />
         </receiver>
 
-        <receiver android:name=".receivers.ReminderReceiver">
+        <receiver
+            android:name=".receivers.ReminderReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".receivers.WidgetReceiver">
+        <receiver android:name=".receivers.WidgetReceiver"
+            android:exported="true"
+            android:permission="false">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="org.isoron.uhabits.ACTION_SET_NUMERICAL_VALUE" />
@@ -267,7 +282,7 @@
         <!-- Locale/Tasker -->
         <receiver
             android:name=".automation.FireSettingReceiver"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>
diff --git a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
index df5d5e184..0a8c5ee68 100644
--- a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
+++ b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
@@ -49,23 +49,12 @@ class AndroidDataView(
     override fun onShowPress(e: MotionEvent?) = Unit
 
     override fun onSingleTapUp(e: MotionEvent?): Boolean {
-        val x: Float
-        val y: Float
-        try {
-            val pointerId = e!!.getPointerId(0)
-            x = e.getX(pointerId)
-            y = e.getY(pointerId)
-        } catch (ex: RuntimeException) {
-            // Android often throws IllegalArgumentException here. Apparently,
-            // the pointer id may become invalid shortly after calling
-            // e.getPointerId.
-            return false
-        }
-        view?.onClick(x / canvas.innerDensity, y / canvas.innerDensity)
-        return true
+        return handleClick(e, true)
     }
 
-    override fun onLongPress(e: MotionEvent?) = Unit
+    override fun onLongPress(e: MotionEvent?) {
+        handleClick(e)
+    }
 
     override fun onScroll(
         e1: MotionEvent?,
@@ -137,4 +126,22 @@ class AndroidDataView(
             }
         }
     }
+
+    private fun handleClick(e: MotionEvent?, isSingleTap: Boolean = false): Boolean {
+        val x: Float
+        val y: Float
+        try {
+            val pointerId = e!!.getPointerId(0)
+            x = e.getX(pointerId)
+            y = e.getY(pointerId)
+        } catch (ex: RuntimeException) {
+            // Android often throws IllegalArgumentException here. Apparently,
+            // the pointer id may become invalid shortly after calling
+            // e.getPointerId.
+            return false
+        }
+        if (isSingleTap) view?.onClick(x / canvas.innerDensity, y / canvas.innerDensity)
+        else view?.onLongClick(x / canvas.innerDensity, y / canvas.innerDensity)
+        return true
+    }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
new file mode 100644
index 000000000..4e62b614b
--- /dev/null
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
@@ -0,0 +1,119 @@
+package org.isoron.uhabits.activities.common.dialogs
+
+import android.content.Context
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.View
+import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+import android.widget.Button
+import androidx.appcompat.app.AlertDialog
+import org.isoron.platform.gui.toInt
+import org.isoron.platform.time.JavaLocalDateFormatter
+import org.isoron.platform.time.LocalDate
+import org.isoron.uhabits.R
+import org.isoron.uhabits.core.models.Entry.Companion.NO
+import org.isoron.uhabits.core.models.Entry.Companion.SKIP
+import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN
+import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
+import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
+import org.isoron.uhabits.core.models.PaletteColor
+import org.isoron.uhabits.core.preferences.Preferences
+import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
+import org.isoron.uhabits.core.ui.views.Theme
+import org.isoron.uhabits.databinding.CheckmarkDialogBinding
+import org.isoron.uhabits.inject.ActivityContext
+import org.isoron.uhabits.utils.InterfaceUtils
+import org.isoron.uhabits.utils.StyledResources
+import java.util.Locale
+import javax.inject.Inject
+
+class CheckmarkDialog
+@Inject constructor(
+    @ActivityContext private val context: Context,
+    private val preferences: Preferences,
+) : View.OnClickListener {
+
+    private lateinit var binding: CheckmarkDialogBinding
+    private lateinit var fontAwesome: Typeface
+    private val allButtons = mutableListOf<Button>()
+    private var selectedButton: Button? = null
+
+    fun create(
+        selectedValue: Int,
+        notes: String,
+        date: LocalDate,
+        paletteColor: PaletteColor,
+        callback: ListHabitsBehavior.CheckMarkDialogCallback,
+        theme: Theme,
+    ): AlertDialog {
+        binding = CheckmarkDialogBinding.inflate(LayoutInflater.from(context))
+        fontAwesome = InterfaceUtils.getFontAwesome(context)!!
+        binding.etNotes.append(notes)
+        setUpButtons(selectedValue, theme.color(paletteColor).toInt())
+
+        val dialog = AlertDialog.Builder(context)
+            .setView(binding.root)
+            .setTitle(JavaLocalDateFormatter(Locale.getDefault()).longFormat(date))
+            .setPositiveButton(R.string.save) { _, _ ->
+                val newValue = when (selectedButton?.id) {
+                    R.id.yesBtn -> YES_MANUAL
+                    R.id.noBtn -> NO
+                    R.id.skippedBtn -> SKIP
+                    else -> UNKNOWN
+                }
+                callback.onNotesSaved(newValue, binding.etNotes.text.toString())
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                callback.onNotesDismissed()
+            }
+            .setOnDismissListener {
+                callback.onNotesDismissed()
+            }
+            .create()
+
+        dialog.setOnShowListener {
+            binding.etNotes.requestFocus()
+            dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+        }
+
+        return dialog
+    }
+
+    private fun setUpButtons(value: Int, color: Int) {
+        val sres = StyledResources(context)
+        val mediumContrastColor = sres.getColor(R.attr.contrast60)
+        setButtonAttrs(binding.yesBtn, color)
+        setButtonAttrs(binding.noBtn, mediumContrastColor)
+        setButtonAttrs(binding.skippedBtn, color, visible = preferences.isSkipEnabled)
+        setButtonAttrs(binding.questionBtn, mediumContrastColor, visible = preferences.areQuestionMarksEnabled)
+        when (value) {
+            UNKNOWN -> if (preferences.areQuestionMarksEnabled) {
+                binding.questionBtn.performClick()
+            } else {
+                binding.noBtn.performClick()
+            }
+            SKIP -> binding.skippedBtn.performClick()
+            YES_MANUAL -> binding.yesBtn.performClick()
+            YES_AUTO, NO -> binding.noBtn.performClick()
+        }
+    }
+
+    private fun setButtonAttrs(button: Button, color: Int, visible: Boolean = true) {
+        button.apply {
+            visibility = if (visible) View.VISIBLE else View.GONE
+            typeface = fontAwesome
+            setTextColor(color)
+            setOnClickListener(this@CheckmarkDialog)
+        }
+        allButtons.add(button)
+    }
+
+    override fun onClick(v: View?) {
+        allButtons.forEach {
+            if (v?.id == it.id) {
+                it.isSelected = true
+                selectedButton = it
+            } else it.isSelected = false
+        }
+    }
+}
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt
index 7cb7f3ba6..8411e3a96 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt
@@ -68,13 +68,12 @@ class FrequencyPickerDialog(
 
         contentView.everyDayRadioButton.setOnClickListener {
             check(contentView.everyDayRadioButton)
-            unfocusAll()
         }
 
         contentView.everyXDaysRadioButton.setOnClickListener {
             check(contentView.everyXDaysRadioButton)
             val everyXDaysTextView = contentView.everyXDaysTextView
-            focus(everyXDaysTextView)
+            selectInputField(everyXDaysTextView)
         }
 
         contentView.everyXDaysTextView.setOnFocusChangeListener { v, hasFocus ->
@@ -83,7 +82,7 @@ class FrequencyPickerDialog(
 
         contentView.xTimesPerWeekRadioButton.setOnClickListener {
             check(contentView.xTimesPerWeekRadioButton)
-            focus(contentView.xTimesPerWeekTextView)
+            selectInputField(contentView.xTimesPerWeekTextView)
         }
 
         contentView.xTimesPerWeekTextView.setOnFocusChangeListener { v, hasFocus ->
@@ -92,7 +91,7 @@ class FrequencyPickerDialog(
 
         contentView.xTimesPerMonthRadioButton.setOnClickListener {
             check(contentView.xTimesPerMonthRadioButton)
-            focus(contentView.xTimesPerMonthTextView)
+            selectInputField(contentView.xTimesPerMonthTextView)
         }
 
         contentView.xTimesPerMonthTextView.setOnFocusChangeListener { v, hasFocus ->
@@ -101,7 +100,7 @@ class FrequencyPickerDialog(
 
         contentView.xTimesPerYDaysRadioButton.setOnClickListener {
             check(contentView.xTimesPerYDaysRadioButton)
-            focus(contentView.xTimesPerYDaysXTextView)
+            selectInputField(contentView.xTimesPerYDaysXTextView)
         }
 
         contentView.xTimesPerYDaysXTextView.setOnFocusChangeListener { v, hasFocus ->
@@ -185,7 +184,7 @@ class FrequencyPickerDialog(
         if (freqDenominator == 30 || freqDenominator == 31) {
             contentView.xTimesPerMonthRadioButton.isChecked = true
             contentView.xTimesPerMonthTextView.setText(freqNumerator.toString())
-            focus(contentView.xTimesPerMonthTextView)
+            selectInputField(contentView.xTimesPerMonthTextView)
         } else {
             if (freqNumerator == 1) {
                 if (freqDenominator == 1) {
@@ -193,13 +192,13 @@ class FrequencyPickerDialog(
                 } else {
                     contentView.everyXDaysRadioButton.isChecked = true
                     contentView.everyXDaysTextView.setText(freqDenominator.toString())
-                    focus(contentView.everyXDaysTextView)
+                    selectInputField(contentView.everyXDaysTextView)
                 }
             } else {
                 if (freqDenominator == 7) {
                     contentView.xTimesPerWeekRadioButton.isChecked = true
                     contentView.xTimesPerWeekTextView.setText(freqNumerator.toString())
-                    focus(contentView.xTimesPerWeekTextView)
+                    selectInputField(contentView.xTimesPerWeekTextView)
                 } else {
                     contentView.xTimesPerYDaysRadioButton.isChecked = true
                     contentView.xTimesPerYDaysXTextView.setText(freqNumerator.toString())
@@ -209,8 +208,7 @@ class FrequencyPickerDialog(
         }
     }
 
-    private fun focus(view: EditText) {
-        view.requestFocus()
+    private fun selectInputField(view: EditText) {
         view.setSelection(view.text.length)
     }
 
@@ -221,10 +219,4 @@ class FrequencyPickerDialog(
         contentView.xTimesPerMonthRadioButton.isChecked = false
         contentView.xTimesPerYDaysRadioButton.isChecked = false
     }
-
-    private fun unfocusAll() {
-        contentView.everyXDaysTextView.clearFocus()
-        contentView.xTimesPerWeekTextView.clearFocus()
-        contentView.xTimesPerMonthTextView.clearFocus()
-    }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
index fcad26125..21999d4e1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
@@ -62,9 +62,11 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
             firstWeekday = preferences.firstWeekday,
             paletteColor = habit.color,
             series = emptyList(),
+            defaultSquare = HistoryChart.Square.OFF,
+            notesIndicators = emptyList(),
             theme = themeSwitcher.currentTheme,
             today = DateUtils.getTodayWithOffset().toLocalDate(),
-            onDateClickedListener = onDateClickedListener ?: OnDateClickedListener { },
+            onDateClickedListener = onDateClickedListener ?: object : OnDateClickedListener {},
             padding = 10.0,
         )
         dataView = AndroidDataView(context!!, null)
@@ -101,6 +103,8 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
             theme = LightTheme()
         )
         chart?.series = model.series
+        chart?.defaultSquare = model.defaultSquare
+        chart?.notesIndicators = model.notesIndicators
         dataView.postInvalidate()
     }
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
index c531e758b..0845999c2 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
@@ -19,12 +19,16 @@
 
 package org.isoron.uhabits.activities.common.dialogs
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
 import android.text.InputFilter
+import android.text.Spanned
 import android.view.LayoutInflater
+import android.view.View
 import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
 import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.NumberPicker
 import android.widget.TextView
@@ -33,6 +37,7 @@ import org.isoron.uhabits.R
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
 import org.isoron.uhabits.inject.ActivityContext
 import org.isoron.uhabits.utils.InterfaceUtils
+import java.text.DecimalFormatSymbols
 import javax.inject.Inject
 import kotlin.math.roundToLong
 
@@ -40,18 +45,39 @@ class NumberPickerFactory
 @Inject constructor(
     @ActivityContext private val context: Context
 ) {
+
+    @SuppressLint("SetTextI18n")
     fun create(
         value: Double,
         unit: String,
+        notes: String,
+        dateString: String,
         callback: ListHabitsBehavior.NumberPickerCallback
     ): AlertDialog {
-
         val inflater = LayoutInflater.from(context)
         val view = inflater.inflate(R.layout.number_picker_dialog, null)
 
         val picker = view.findViewById<NumberPicker>(R.id.picker)
         val picker2 = view.findViewById<NumberPicker>(R.id.picker2)
-        val tvUnit = view.findViewById<TextView>(R.id.tvUnit)
+        val etNotes = view.findViewById<EditText>(R.id.etNotes)
+
+        // Install filter to intercept decimal separator before it is parsed
+        val watcherFilter: InputFilter = SeparatorWatcherInputFilter(picker2)
+        val pickerInputText = getNumberPickerInputText(picker)
+        pickerInputText.filters = arrayOf(watcherFilter).plus(pickerInputText.filters)
+
+        // Install custom focus listener to replace "5" by "50" instead of "05"
+        val picker2InputText = getNumberPickerInputText(picker2)
+        val prevFocusChangeListener = picker2InputText.onFocusChangeListener
+        picker2InputText.onFocusChangeListener = View.OnFocusChangeListener { v, hasFocus ->
+            val str = picker2InputText.text.toString()
+            if (str.length == 1) picker2InputText.setText("${str}0")
+            prevFocusChangeListener.onFocusChange(v, hasFocus)
+        }
+
+        view.findViewById<TextView>(R.id.tvUnit).text = unit
+        view.findViewById<TextView>(R.id.tvSeparator).text =
+            DecimalFormatSymbols.getInstance().decimalSeparator.toString()
 
         val intValue = (value * 100).roundToLong().toInt()
 
@@ -61,20 +87,23 @@ class NumberPickerFactory
         picker.wrapSelectorWheel = false
 
         picker2.minValue = 0
-        picker2.maxValue = 19
-        picker2.setFormatter { v -> String.format("%02d", 5 * v) }
-        picker2.value = intValue % 100 / 5
-        refreshInitialValue(picker2)
-
-        tvUnit.text = unit
+        picker2.maxValue = 99
+        picker2.setFormatter { v -> String.format("%02d", v) }
+        picker2.value = intValue % 100
 
+        etNotes.setText(notes)
         val dialog = AlertDialog.Builder(context)
             .setView(view)
-            .setTitle(R.string.change_value)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
+            .setTitle(dateString)
+            .setPositiveButton(R.string.save) { _, _ ->
                 picker.clearFocus()
-                val v = picker.value + 0.05 * picker2.value
-                callback.onNumberPicked(v)
+                picker2.clearFocus()
+                val v = picker.value + 0.01 * picker2.value
+                val note = etNotes.text.toString()
+                callback.onNumberPicked(v, note)
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                callback.onNumberPickerDismissed()
             }
             .setOnDismissListener {
                 callback.onNumberPickerDismissed()
@@ -82,27 +111,63 @@ class NumberPickerFactory
             .create()
 
         dialog.setOnShowListener {
-            picker.getChildAt(0)?.requestFocus()
-            dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+            showSoftInput(dialog, pickerInputText)
         }
 
         InterfaceUtils.setupEditorAction(
             picker
         ) { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE)
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
                 dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick()
+            }
+            false
+        }
+
+        InterfaceUtils.setupEditorAction(
+            picker2
+        ) { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick()
+            }
             false
         }
 
         return dialog
     }
 
-    private fun refreshInitialValue(picker: NumberPicker) {
-        // Workaround for Android bug:
-        // https://code.google.com/p/android/issues/detail?id=35482
+    @SuppressLint("DiscouragedPrivateApi")
+    private fun getNumberPickerInputText(picker: NumberPicker): EditText {
         val f = NumberPicker::class.java.getDeclaredField("mInputText")
         f.isAccessible = true
-        val inputText = f.get(picker) as EditText
-        inputText.filters = arrayOfNulls<InputFilter>(0)
+        return f.get(picker) as EditText
+    }
+
+    private fun showSoftInput(dialog: AlertDialog, v: View) {
+        dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+        v.requestFocus()
+        val inputMethodManager = context.getSystemService(InputMethodManager::class.java)
+        inputMethodManager?.showSoftInput(v, 0)
+    }
+}
+
+class SeparatorWatcherInputFilter(private val nextPicker: NumberPicker) : InputFilter {
+    override fun filter(
+        source: CharSequence?,
+        start: Int,
+        end: Int,
+        dest: Spanned?,
+        dstart: Int,
+        dend: Int
+    ): CharSequence {
+        if (source == null || source.isEmpty()) {
+            return ""
+        }
+        for (c in source) {
+            if (c == DecimalFormatSymbols.getInstance().decimalSeparator || c == '.' || c == ',') {
+                nextPicker.performLongClick()
+                break
+            }
+        }
+        return source
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
index 1a02d8845..572917d10 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
@@ -88,6 +88,7 @@ class EditHabitActivity : AppCompatActivity() {
     var reminderHour = -1
     var reminderMin = -1
     var reminderDays: WeekdayList = WeekdayList.EVERY_DAY
+    var targetType = NumericalHabitType.AT_LEAST
 
     override fun onCreate(state: Bundle?) {
         super.onCreate(state)
@@ -107,6 +108,7 @@ class EditHabitActivity : AppCompatActivity() {
             color = habit.color
             freqNum = habit.frequency.numerator
             freqDen = habit.frequency.denominator
+            targetType = habit.targetType
             habit.reminder?.let {
                 reminderHour = it.hour
                 reminderMin = it.minute
@@ -138,6 +140,7 @@ class EditHabitActivity : AppCompatActivity() {
             HabitType.YES_NO -> {
                 binding.unitOuterBox.visibility = View.GONE
                 binding.targetOuterBox.visibility = View.GONE
+                binding.targetTypeOuterBox.visibility = View.GONE
             }
             HabitType.NUMERICAL -> {
                 binding.nameInput.hint = getString(R.string.measurable_short_example)
@@ -172,6 +175,23 @@ class EditHabitActivity : AppCompatActivity() {
             dialog.show(supportFragmentManager, "frequencyPicker")
         }
 
+        populateTargetType()
+        binding.targetTypePicker.setOnClickListener {
+            val builder = AlertDialog.Builder(this)
+            val arrayAdapter = ArrayAdapter<String>(this, android.R.layout.select_dialog_item)
+            arrayAdapter.add(getString(R.string.target_type_at_least))
+            arrayAdapter.add(getString(R.string.target_type_at_most))
+            builder.setAdapter(arrayAdapter) { dialog, which ->
+                targetType = when (which) {
+                    0 -> NumericalHabitType.AT_LEAST
+                    else -> NumericalHabitType.AT_MOST
+                }
+                populateTargetType()
+                dialog.dismiss()
+            }
+            builder.show()
+        }
+
         binding.numericalFrequencyPicker.setOnClickListener {
             val builder = AlertDialog.Builder(this)
             val arrayAdapter = ArrayAdapter<String>(this, android.R.layout.select_dialog_item)
@@ -262,7 +282,7 @@ class EditHabitActivity : AppCompatActivity() {
         habit.frequency = Frequency(freqNum, freqDen)
         if (habitType == HabitType.NUMERICAL) {
             habit.targetValue = targetInput.text.toString().toDouble()
-            habit.targetType = NumericalHabitType.AT_LEAST
+            habit.targetType = targetType
             habit.unit = unitInput.text.trim().toString()
         }
         habit.type = habitType
@@ -324,6 +344,13 @@ class EditHabitActivity : AppCompatActivity() {
         }
     }
 
+    private fun populateTargetType() {
+        binding.targetTypePicker.text = when (targetType) {
+            NumericalHabitType.AT_MOST -> getString(R.string.target_type_at_most)
+            else -> getString(R.string.target_type_at_least)
+        }
+    }
+
     private fun updateColors() {
         androidColor = themeSwitcher.currentTheme.color(color).toInt()
         binding.colorButton.backgroundTintList = ColorStateList.valueOf(androidColor)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
index f8d1ef477..22fd1b42e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
@@ -53,6 +53,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
 
     override fun onQuestionMarksChanged() {
         invalidateOptionsMenu()
+        menu.behavior.onPreferencesChanged()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
index c92d0dd3f..a70008d13 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
@@ -39,7 +39,7 @@ class ListHabitsMenu @Inject constructor(
     @ActivityContext context: Context,
     private val preferences: Preferences,
     private val themeSwitcher: ThemeSwitcher,
-    private val behavior: ListHabitsMenuBehavior
+    val behavior: ListHabitsMenuBehavior
 ) {
     val activity = (context as AppCompatActivity)
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
index 58ad6a031..774e5345f 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -24,7 +24,9 @@ import android.content.Context
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import dagger.Lazy
+import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
 import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialogFactory
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
 import org.isoron.uhabits.activities.common.dialogs.NumberPickerFactory
@@ -89,6 +91,7 @@ class ListHabitsScreen
     private val importTaskFactory: ImportDataTaskFactory,
     private val colorPickerFactory: ColorPickerDialogFactory,
     private val numberPickerFactory: NumberPickerFactory,
+    private val checkMarkDialog: CheckmarkDialog,
     private val behavior: Lazy<ListHabitsBehavior>
 ) : CommandRunner.Listener,
     ListHabitsBehavior.Screen,
@@ -225,9 +228,29 @@ class ListHabitsScreen
     override fun showNumberPicker(
         value: Double,
         unit: String,
+        notes: String,
+        dateString: String,
         callback: ListHabitsBehavior.NumberPickerCallback
     ) {
-        numberPickerFactory.create(value, unit, callback).show()
+        numberPickerFactory.create(value, unit, notes, dateString, callback).show()
+    }
+
+    override fun showCheckmarkDialog(
+        selectedValue: Int,
+        notes: String,
+        date: LocalDate,
+        dateString: String,
+        color: PaletteColor,
+        callback: ListHabitsBehavior.CheckMarkDialogCallback
+    ) {
+        checkMarkDialog.create(
+            selectedValue,
+            notes,
+            date,
+            color,
+            callback,
+            themeSwitcher.currentTheme!!,
+        ).show()
     }
 
     private fun getExecuteString(command: Command): String? {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
index 339cc46b4..9108e5123 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
@@ -37,9 +37,9 @@ import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
 import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.inject.ActivityContext
-import org.isoron.uhabits.utils.dim
+import org.isoron.uhabits.utils.drawNotesIndicator
 import org.isoron.uhabits.utils.getFontAwesome
-import org.isoron.uhabits.utils.showMessage
+import org.isoron.uhabits.utils.sp
 import org.isoron.uhabits.utils.sres
 import org.isoron.uhabits.utils.toMeasureSpec
 import javax.inject.Inject
@@ -71,7 +71,15 @@ class CheckmarkButtonView(
             invalidate()
         }
 
+    var hasNotes = false
+        set(value) {
+            field = value
+            invalidate()
+        }
+
     var onToggle: (Int) -> Unit = {}
+
+    var onEdit: () -> Unit = {}
     private var drawer = Drawer()
 
     init {
@@ -93,11 +101,12 @@ class CheckmarkButtonView(
 
     override fun onClick(v: View) {
         if (preferences.isShortToggleEnabled) performToggle()
-        else showMessage(resources.getString(R.string.long_press_to_toggle))
+        else onEdit()
     }
 
     override fun onLongClick(v: View): Boolean {
-        performToggle()
+        if (preferences.isShortToggleEnabled) onEdit()
+        else performToggle()
         return true
     }
 
@@ -145,6 +154,11 @@ class CheckmarkButtonView(
                 }
                 else -> R.string.fa_check
             }
+            paint.textSize = when {
+                id == R.string.fa_question -> sp(12.0f)
+                value == YES_AUTO -> sp(13.0f)
+                else -> sp(14.0f)
+            }
             if (value == YES_AUTO) {
                 paint.strokeWidth = 5f
                 paint.style = Paint.Style.STROKE
@@ -153,11 +167,6 @@ class CheckmarkButtonView(
                 paint.style = Paint.Style.FILL
             }
 
-            paint.textSize = when (id) {
-                UNKNOWN -> dim(R.dimen.smallerTextSize)
-                else -> dim(R.dimen.smallTextSize)
-            }
-
             val label = resources.getString(id)
             val em = paint.measureText("m")
 
@@ -170,6 +179,8 @@ class CheckmarkButtonView(
                 paint.style = Paint.Style.FILL
                 canvas.drawText(label, rect.centerX(), rect.centerY(), paint)
             }
+
+            drawNotesIndicator(canvas, color, em, hasNotes)
         }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
index 136ea0050..859cf734d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
@@ -54,12 +54,24 @@ class CheckmarkPanelView(
             setupButtons()
         }
 
+    var notesIndicators = BooleanArray(0)
+        set(values) {
+            field = values
+            setupButtons()
+        }
+
     var onToggle: (Timestamp, Int) -> Unit = { _, _ -> }
         set(value) {
             field = value
             setupButtons()
         }
 
+    var onEdit: (Timestamp) -> Unit = {}
+        set(value) {
+            field = value
+            setupButtons()
+        }
+
     override fun createButton(): CheckmarkButtonView = buttonFactory.create()
 
     @Synchronized
@@ -72,8 +84,13 @@ class CheckmarkPanelView(
                 index + dataOffset < values.size -> values[index + dataOffset]
                 else -> UNKNOWN
             }
+            button.hasNotes = when {
+                index + dataOffset < notesIndicators.size -> notesIndicators[index + dataOffset]
+                else -> false
+            }
             button.color = color
             button.onToggle = { value -> onToggle(timestamp, value) }
+            button.onEdit = { onEdit(timestamp) }
         }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.kt
index a780bad08..b8770d0cb 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.kt
@@ -124,8 +124,9 @@ class HabitCardListAdapter @Inject constructor(
         val habit = cache.getHabitByPosition(position)
         val score = cache.getScore(habit!!.id!!)
         val checkmarks = cache.getCheckmarks(habit.id!!)
+        val notesIndicators = cache.getNoteIndicators(habit.id!!)
         val selected = selected.contains(habit)
-        listView!!.bindCardView(holder, habit, score, checkmarks, selected)
+        listView!!.bindCardView(holder, habit, score, checkmarks, notesIndicators, selected)
     }
 
     override fun onViewAttachedToWindow(holder: HabitCardViewHolder) {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
index 58ee2b36a..8ce805098 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
@@ -87,6 +87,7 @@ class HabitCardListView(
         habit: Habit,
         score: Double,
         checkmarks: IntArray,
+        notesIndicators: BooleanArray,
         selected: Boolean
     ): View {
         val cardView = holder.itemView as HabitCardView
@@ -98,6 +99,7 @@ class HabitCardListView(
         cardView.score = score
         cardView.unit = habit.unit
         cardView.threshold = habit.targetValue / habit.frequency.denominator
+        cardView.notesIndicators = notesIndicators
 
         val detector = GestureDetector(context, CardViewGestureDetector(holder))
         cardView.setOnTouchListener { _, ev ->
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
index c59b61ec1..551cb73c3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
@@ -57,6 +57,12 @@ class HabitCardViewFactory
     fun create() = HabitCardView(context, checkmarkPanelFactory, numberPanelFactory, behavior)
 }
 
+data class DelayedToggle(
+    var habit: Habit,
+    var timestamp: Timestamp,
+    var value: Int
+)
+
 class HabitCardView(
     @ActivityContext context: Context,
     checkmarkPanelFactory: CheckmarkPanelViewFactory,
@@ -115,12 +121,22 @@ class HabitCardView(
             numberPanel.threshold = value
         }
 
+    var notesIndicators
+        get() = checkmarkPanel.notesIndicators
+        set(values) {
+            checkmarkPanel.notesIndicators = values
+            numberPanel.notesIndicators = values
+        }
+
     var checkmarkPanel: CheckmarkPanelView
     private var numberPanel: NumberPanelView
     private var innerFrame: LinearLayout
     private var label: TextView
     private var scoreRing: RingView
 
+    private var currentToggleTaskId = 0
+    private var queuedToggles = mutableListOf<DelayedToggle>()
+
     init {
         scoreRing = RingView(context).apply {
             val thickness = dp(3f)
@@ -143,7 +159,14 @@ class HabitCardView(
         checkmarkPanel = checkmarkPanelFactory.create().apply {
             onToggle = { timestamp, value ->
                 triggerRipple(timestamp)
-                habit?.let { behavior.onToggle(it, timestamp, value) }
+                habit?.let {
+                    val taskId = queueToggle(it, timestamp, value);
+                    { runPendingToggles(taskId) }.delay(TOGGLE_DELAY_MILLIS)
+                }
+            }
+            onEdit = { timestamp ->
+                triggerRipple(timestamp)
+                habit?.let { behavior.onEdit(it, timestamp) }
             }
         }
 
@@ -179,6 +202,24 @@ class HabitCardView(
         addView(innerFrame)
     }
 
+    @Synchronized
+    private fun runPendingToggles(id: Int) {
+        if (currentToggleTaskId != id) return
+        for ((h, t, v) in queuedToggles) behavior.onToggle(h, t, v)
+        queuedToggles.clear()
+    }
+
+    @Synchronized
+    private fun queueToggle(
+        it: Habit,
+        timestamp: Timestamp,
+        value: Int
+    ): Int {
+        currentToggleTaskId += 1
+        queuedToggles.add(DelayedToggle(it, timestamp, value))
+        return currentToggleTaskId
+    }
+
     override fun onModelChange() {
         Handler(Looper.getMainLooper()).post {
             habit?.let { copyAttributesFrom(it) }
@@ -236,6 +277,7 @@ class HabitCardView(
         numberPanel.apply {
             color = c
             units = h.unit
+            targetType = h.targetType
             threshold = h.targetValue
             visibility = when (h.isNumerical) {
                 true -> View.VISIBLE
@@ -262,4 +304,12 @@ class HabitCardView(
         }
         innerFrame.setBackgroundResource(background)
     }
+
+    companion object {
+        const val TOGGLE_DELAY_MILLIS = 2000L
+
+        fun (() -> Unit).delay(delayInMillis: Long) {
+            Handler(Looper.getMainLooper()).postDelayed(this, delayInMillis)
+        }
+    }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
index 3e48ed1a6..d0d705fb3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
@@ -29,13 +29,15 @@ import android.view.View
 import android.view.View.OnClickListener
 import android.view.View.OnLongClickListener
 import org.isoron.uhabits.R
+import org.isoron.uhabits.core.models.NumericalHabitType.AT_LEAST
+import org.isoron.uhabits.core.models.NumericalHabitType.AT_MOST
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.inject.ActivityContext
 import org.isoron.uhabits.utils.InterfaceUtils.getDimension
-import org.isoron.uhabits.utils.StyledResources
 import org.isoron.uhabits.utils.dim
+import org.isoron.uhabits.utils.drawNotesIndicator
 import org.isoron.uhabits.utils.getFontAwesome
-import org.isoron.uhabits.utils.showMessage
+import org.isoron.uhabits.utils.sres
 import java.text.DecimalFormat
 import javax.inject.Inject
 
@@ -88,11 +90,22 @@ class NumberButtonView(
             invalidate()
         }
 
+    var targetType = AT_LEAST
+        set(value) {
+            field = value
+            invalidate()
+        }
+
     var units = ""
         set(value) {
             field = value
             invalidate()
         }
+    var hasNotes = false
+        set(value) {
+            field = value
+            invalidate()
+        }
 
     var onEdit: () -> Unit = {}
     private var drawer: Drawer = Drawer(context)
@@ -103,8 +116,7 @@ class NumberButtonView(
     }
 
     override fun onClick(v: View) {
-        if (preferences.isShortToggleEnabled) onEdit()
-        else showMessage(resources.getString(R.string.long_press_to_edit))
+        onEdit()
     }
 
     override fun onLongClick(v: View): Boolean {
@@ -127,7 +139,6 @@ class NumberButtonView(
 
         private val em: Float
         private val rect: RectF = RectF()
-        private val sr = StyledResources(context)
 
         private val lowContrast: Int
         private val mediumContrast: Int
@@ -148,15 +159,16 @@ class NumberButtonView(
 
         init {
             em = pNumber.measureText("m")
-            lowContrast = sr.getColor(R.attr.contrast40)
-            mediumContrast = sr.getColor(R.attr.contrast60)
+            lowContrast = sres.getColor(R.attr.contrast40)
+            mediumContrast = sres.getColor(R.attr.contrast60)
         }
 
         fun draw(canvas: Canvas) {
             val activeColor = when {
-                value <= 0.0 -> lowContrast
-                value < threshold -> mediumContrast
-                else -> color
+                value < 0.0 -> lowContrast
+                (targetType == AT_LEAST) && (value >= threshold) -> color
+                (targetType == AT_MOST) && (value <= threshold) -> color
+                else -> mediumContrast
             }
 
             val label: String
@@ -196,6 +208,8 @@ class NumberButtonView(
                 rect.offset(0f, 1.3f * em)
                 canvas.drawText(units, rect.centerX(), rect.centerY(), pUnit)
             }
+
+            drawNotesIndicator(canvas, color, em, hasNotes)
         }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
index 491656a77..520401f65 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
@@ -20,6 +20,7 @@
 package org.isoron.uhabits.activities.habits.list.views
 
 import android.content.Context
+import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.utils.DateUtils
@@ -47,6 +48,12 @@ class NumberPanelView(
             setupButtons()
         }
 
+    var targetType = NumericalHabitType.AT_LEAST
+        set(value) {
+            field = value
+            setupButtons()
+        }
+
     var threshold = 0.0
         set(value) {
             field = value
@@ -65,6 +72,12 @@ class NumberPanelView(
             setupButtons()
         }
 
+    var notesIndicators = BooleanArray(0)
+        set(values) {
+            field = values
+            setupButtons()
+        }
+
     var onEdit: (Timestamp) -> Unit = {}
         set(value) {
             field = value
@@ -83,7 +96,12 @@ class NumberPanelView(
                 index + dataOffset < values.size -> values[index + dataOffset]
                 else -> 0.0
             }
+            button.hasNotes = when {
+                index + dataOffset < notesIndicators.size -> notesIndicators[index + dataOffset]
+                else -> false
+            }
             button.color = color
+            button.targetType = targetType
             button.threshold = threshold
             button.units = units
             button.onEdit = { onEdit(timestamp) }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
index 202adb88d..0b696ad4e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
@@ -27,17 +27,20 @@ import androidx.appcompat.app.AppCompatActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.AndroidDirFinder
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.activities.HabitsDirFinder
+import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
 import org.isoron.uhabits.activities.common.dialogs.HistoryEditorDialog
 import org.isoron.uhabits.activities.common.dialogs.NumberPickerFactory
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.Habit
+import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
@@ -164,9 +167,29 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
         override fun showNumberPicker(
             value: Double,
             unit: String,
+            notes: String,
+            dateString: String,
             callback: ListHabitsBehavior.NumberPickerCallback,
         ) {
-            NumberPickerFactory(this@ShowHabitActivity).create(value, unit, callback).show()
+            NumberPickerFactory(this@ShowHabitActivity).create(value, unit, notes, dateString, callback).show()
+        }
+
+        override fun showCheckmarkDialog(
+            selectedValue: Int,
+            notes: String,
+            date: LocalDate,
+            preferences: Preferences,
+            color: PaletteColor,
+            callback: ListHabitsBehavior.CheckMarkDialogCallback
+        ) {
+            CheckmarkDialog(this@ShowHabitActivity, preferences).create(
+                selectedValue,
+                notes,
+                date,
+                color,
+                callback,
+                themeSwitcher.currentTheme!!,
+            ).show()
         }
 
         override fun showEditHabitScreen(habit: Habit) {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt
index c60e84bd1..74e566fbb 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt
@@ -43,6 +43,8 @@ class HistoryCardView(context: Context, attrs: AttributeSet) : LinearLayout(cont
             theme = state.theme,
             dateFormatter = JavaLocalDateFormatter(Locale.getDefault()),
             series = state.series,
+            defaultSquare = state.defaultSquare,
+            notesIndicators = state.notesIndicators,
             firstWeekday = state.firstWeekday,
         )
         binding.chart.postInvalidate()
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt
index 49c67aae1..5bbfb46d6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt
@@ -28,6 +28,7 @@ import org.isoron.platform.gui.toInt
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.habits.edit.formatFrequency
 import org.isoron.uhabits.activities.habits.list.views.toShortString
+import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.ui.screens.habits.show.views.SubtitleCardState
 import org.isoron.uhabits.databinding.ShowHabitSubtitleBinding
 import org.isoron.uhabits.utils.InterfaceUtils
@@ -65,7 +66,12 @@ class SubtitleCardView(context: Context, attrs: AttributeSet) : LinearLayout(con
         binding.questionLabel.visibility = View.VISIBLE
         binding.targetIcon.visibility = View.VISIBLE
         binding.targetText.visibility = View.VISIBLE
-        if (!state.isNumerical) {
+        if (state.isNumerical) {
+            binding.targetIcon.text = when (state.targetType) {
+                NumericalHabitType.AT_LEAST -> resources.getString(R.string.fa_arrow_circle_up)
+                else -> resources.getString(R.string.fa_arrow_circle_down)
+            }
+        } else {
             binding.targetIcon.visibility = View.GONE
             binding.targetText.visibility = View.GONE
         }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt
index 7336bbd41..499694a90 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt
@@ -21,8 +21,9 @@ package org.isoron.uhabits.activities.intro
 
 import android.graphics.Color
 import android.os.Bundle
-import com.github.paolorotolo.appintro.AppIntro2
-import com.github.paolorotolo.appintro.AppIntroFragment
+import androidx.fragment.app.Fragment
+import com.github.appintro.AppIntro2
+import com.github.appintro.AppIntroFragment
 import org.isoron.uhabits.R
 
 /**
@@ -30,7 +31,9 @@ import org.isoron.uhabits.R
  * launched for the first time.
  */
 class IntroActivity : AppIntro2() {
-    override fun init(savedInstanceState: Bundle?) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         showStatusBar(false)
 
         addSlide(
@@ -61,11 +64,13 @@ class IntroActivity : AppIntro2() {
         )
     }
 
-    override fun onNextPressed() {}
-
-    override fun onDonePressed() {
+    override fun onDonePressed(currentFragment: Fragment?) {
+        super.onDonePressed(currentFragment)
         finish()
     }
 
-    override fun onSlideChanged() {}
+    override fun onSkipPressed(currentFragment: Fragment?) {
+        super.onSkipPressed(currentFragment)
+        finish()
+    }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
index c40335545..6361397ef 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
@@ -23,17 +23,17 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
-import org.isoron.uhabits.core.models.HabitMatcherBuilder
+import org.isoron.uhabits.core.models.HabitMatcher
 
 class EditSettingActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val app = applicationContext as HabitsApplication
         val habits = app.component.habitList.getFiltered(
-            HabitMatcherBuilder()
-                .setArchivedAllowed(false)
-                .setCompletedAllowed(true)
-                .build()
+            HabitMatcher(
+                isArchivedAllowed = false,
+                isCompletedAllowed = true,
+            )
         )
         AndroidThemeSwitcher(this, app.component.preferences).apply()
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
index 5a4c79f1d..089af4af2 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
@@ -25,8 +25,6 @@ import android.app.AlarmManager.RTC_WAKEUP
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Context.ALARM_SERVICE
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.M
 import android.util.Log
 import org.isoron.uhabits.core.AppScope
 import org.isoron.uhabits.core.models.Habit
@@ -58,10 +56,7 @@ class IntentScheduler
             )
             return SchedulerResult.IGNORED
         }
-        if (SDK_INT >= M)
-            manager.setExactAndAllowWhileIdle(alarmType, timestamp, intent)
-        else
-            manager.setExact(alarmType, timestamp, intent)
+        manager.setExactAndAllowWhileIdle(alarmType, timestamp, intent)
         return SchedulerResult.OK
     }
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
index 5df329a95..841fa55e6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
@@ -20,6 +20,7 @@
 package org.isoron.uhabits.intents
 
 import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.app.PendingIntent.getBroadcast
 import android.content.Context
@@ -49,7 +50,7 @@ class PendingIntentFactory
                 action = WidgetReceiver.ACTION_ADD_REPETITION
                 if (timestamp != null) putExtra("timestamp", timestamp.unixTime)
             },
-            FLAG_UPDATE_CURRENT
+            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
 
     fun dismissNotification(habit: Habit): PendingIntent =
@@ -60,7 +61,7 @@ class PendingIntentFactory
                 action = WidgetReceiver.ACTION_DISMISS_REMINDER
                 data = Uri.parse(habit.uriString)
             },
-            FLAG_UPDATE_CURRENT
+            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
 
     fun removeRepetition(habit: Habit, timestamp: Timestamp?): PendingIntent =
@@ -72,7 +73,7 @@ class PendingIntentFactory
                 data = Uri.parse(habit.uriString)
                 if (timestamp != null) putExtra("timestamp", timestamp.unixTime)
             },
-            FLAG_UPDATE_CURRENT
+            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
 
     fun showHabit(habit: Habit): PendingIntent =
@@ -84,7 +85,7 @@ class PendingIntentFactory
                     habit
                 )
             )
-            .getPendingIntent(0, FLAG_UPDATE_CURRENT)!!
+            .getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)!!
 
     fun showReminder(
         habit: Habit,
@@ -100,7 +101,7 @@ class PendingIntentFactory
                 putExtra("timestamp", timestamp)
                 putExtra("reminderTime", reminderTime)
             },
-            FLAG_UPDATE_CURRENT
+            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
 
     fun snoozeNotification(habit: Habit): PendingIntent =
@@ -111,7 +112,7 @@ class PendingIntentFactory
                 data = Uri.parse(habit.uriString)
                 action = ReminderReceiver.ACTION_SNOOZE_REMINDER
             },
-            FLAG_UPDATE_CURRENT
+            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
 
     fun toggleCheckmark(habit: Habit, timestamp: Long?): PendingIntent =
@@ -123,7 +124,7 @@ class PendingIntentFactory
                 action = WidgetReceiver.ACTION_TOGGLE_REPETITION
                 if (timestamp != null) putExtra("timestamp", timestamp)
             },
-            FLAG_UPDATE_CURRENT
+            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
 
     fun setNumericalValue(
@@ -142,7 +143,7 @@ class PendingIntentFactory
                 putExtra("numericalValue", numericalValue)
                 if (timestamp != null) putExtra("timestamp", timestamp)
             },
-            FLAG_UPDATE_CURRENT
+            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
 
     fun updateWidgets(): PendingIntent =
@@ -152,6 +153,6 @@ class PendingIntentFactory
             Intent(context, WidgetReceiver::class.java).apply {
                 action = WidgetReceiver.ACTION_UPDATE_WIDGETS_VALUE
             },
-            FLAG_UPDATE_CURRENT
+            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
index 04f3d8d92..3721f04d5 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
@@ -153,13 +153,15 @@ class AndroidNotificationTray
         if (preferences.shouldMakeNotificationsLed())
             builder.setLights(Color.RED, 1000, 1000)
 
-        val snoozeAction = Action(
-            R.drawable.ic_action_snooze,
-            context.getString(R.string.snooze),
-            pendingIntents.snoozeNotification(habit)
-        )
-        wearableExtender.addAction(snoozeAction)
-        builder.addAction(snoozeAction)
+        if (SDK_INT < Build.VERSION_CODES.S) {
+            val snoozeAction = Action(
+                R.drawable.ic_action_snooze,
+                context.getString(R.string.snooze),
+                pendingIntents.snoozeNotification(habit)
+            )
+            wearableExtender.addAction(snoozeAction)
+            builder.addAction(snoozeAction)
+        }
 
         builder.extend(wearableExtender)
         return builder.build()
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt
index 951b46ae8..6eb10dc7e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt
@@ -22,6 +22,8 @@ import android.content.BroadcastReceiver
 import android.content.ContentUris
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
 import android.util.Log
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.core.models.Habit
@@ -76,8 +78,21 @@ class ReminderReceiver : BroadcastReceiver() {
                 }
                 ACTION_SNOOZE_REMINDER -> {
                     if (habit == null) return
-                    Log.d("ReminderReceiver", String.format("onSnoozePressed habit=%d", habit.id))
-                    reminderController.onSnoozePressed(habit, context)
+                    if (SDK_INT < Build.VERSION_CODES.S) {
+                        Log.d(
+                            "ReminderReceiver",
+                            String.format("onSnoozePressed habit=%d", habit.id)
+                        )
+                        reminderController.onSnoozePressed(habit, context)
+                    } else {
+                        Log.w(
+                            "ReminderReceiver",
+                            String.format(
+                                "onSnoozePressed habit=%d, should be deactivated in recent versions.",
+                                habit.id
+                            )
+                        )
+                    }
                 }
                 Intent.ACTION_BOOT_COMPLETED -> {
                     Log.d("ReminderReceiver", "onBootCompleted")
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
index bfa64ebf0..b6903b3b0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
@@ -22,7 +22,9 @@ package org.isoron.uhabits.utils
 import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.Paint
 import android.graphics.drawable.ColorDrawable
 import android.os.Handler
 import android.view.LayoutInflater
@@ -199,5 +201,15 @@ fun View.dim(id: Int) = InterfaceUtils.getDimension(context, id)
 fun View.sp(value: Float) = InterfaceUtils.spToPixels(context, value)
 fun View.dp(value: Float) = InterfaceUtils.dpToPixels(context, value)
 fun View.str(id: Int) = resources.getString(id)
+
+fun View.drawNotesIndicator(canvas: Canvas, color: Int, size: Float, hasNotes: Boolean) {
+    val pNotesIndicator = Paint()
+    pNotesIndicator.color = color
+    if (hasNotes) {
+        val cy = 0.8f * size
+        canvas.drawCircle(width.toFloat() - cy, cy, 8f, pNotesIndicator)
+    }
+}
+
 val View.sres: StyledResources
     get() = StyledResources(context)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
index 2e26a487b..25d8b7348 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
@@ -56,7 +56,10 @@ class HistoryWidget(
             theme = WidgetTheme(),
         )
         (widgetView.dataView as AndroidDataView).apply {
-            (this.view as HistoryChart).series = model.series
+            val historyChart = (this.view as HistoryChart)
+            historyChart.series = model.series
+            historyChart.defaultSquare = model.defaultSquare
+            historyChart.notesIndicators = model.notesIndicators
         }
     }
 
@@ -71,6 +74,8 @@ class HistoryWidget(
                     dateFormatter = JavaLocalDateFormatter(Locale.getDefault()),
                     firstWeekday = prefs.firstWeekday,
                     series = listOf(),
+                    defaultSquare = HistoryChart.Square.OFF,
+                    notesIndicators = listOf(),
                 )
             }
         ).apply {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
index deed570ac..fa6452a0e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
@@ -26,8 +26,8 @@ import android.content.Intent
 import android.net.Uri
 import android.view.View
 import android.widget.RemoteViews
+import org.isoron.platform.utils.StringUtils
 import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.core.utils.StringUtils
 
 class StackWidget(
     context: Context,
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.kt
index 0e60914e5..dc86b9b66 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.kt
@@ -27,11 +27,11 @@ import android.util.Log
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import android.widget.RemoteViewsService.RemoteViewsFactory
+import org.isoron.platform.utils.StringUtils.Companion.splitLongs
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitNotFoundException
 import org.isoron.uhabits.core.preferences.Preferences
-import org.isoron.uhabits.core.utils.StringUtils.Companion.splitLongs
 import org.isoron.uhabits.utils.InterfaceUtils.dpToPixels
 import java.util.ArrayList
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
index 696fa8c81..c557ed942 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
@@ -60,8 +60,8 @@ class NumericalCheckmarkWidgetActivity : Activity(), ListHabitsBehavior.NumberPi
         SystemUtils.unlockScreen(this)
     }
 
-    override fun onNumberPicked(newValue: Double) {
-        behavior.setValue(data.habit, data.timestamp, (newValue * 1000).toInt())
+    override fun onNumberPicked(newValue: Double, notes: String) {
+        behavior.setValue(data.habit, data.timestamp, (newValue * 1000).toInt(), notes)
         widgetUpdater.updateWidgets()
         finish()
     }
@@ -79,6 +79,8 @@ class NumericalCheckmarkWidgetActivity : Activity(), ListHabitsBehavior.NumberPi
         numberPickerFactory.create(
             entry.value / 1000.0,
             data.habit.unit,
+            entry.notes,
+            today.toDialogDateString(),
             this
         ).show()
     }
diff --git a/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_down_dark.xml b/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_down_dark.xml
deleted file mode 100644
index 665d5d593..000000000
--- a/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_down_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF"
-    android:alpha="0.8">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
-</vector>
diff --git a/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_down_light.xml b/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_down_light.xml
deleted file mode 100644
index 856e1d1e0..000000000
--- a/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_down_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
-</vector>
diff --git a/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_up_dark.xml b/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_up_dark.xml
deleted file mode 100644
index 088d70f19..000000000
--- a/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_up_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF"
-    android:alpha="0.8">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
-</vector>
diff --git a/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_up_light.xml b/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_up_light.xml
deleted file mode 100644
index 5703c0c96..000000000
--- a/uhabits-android/src/main/res/drawable-anydpi/ic_arrow_up_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
-</vector>
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png
deleted file mode 100644
index fb70e738f..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png
deleted file mode 100644
index 4d25429bc..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png
deleted file mode 100644
index 374fc6fc0..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png
deleted file mode 100644
index 329ea2fc3..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png
deleted file mode 100644
index 06586fb51..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png
deleted file mode 100644
index bcee60651..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png
deleted file mode 100644
index cd22795b4..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png
deleted file mode 100644
index cd5af349d..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png
deleted file mode 100644
index 70cb75e1f..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png
deleted file mode 100644
index 7e8a6b536..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png
deleted file mode 100644
index 257274d8a..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png
deleted file mode 100644
index ec03c334c..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_down_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_down_dark.png
deleted file mode 100644
index 193b429a3..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_down_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_down_light.png b/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_down_light.png
deleted file mode 100644
index 3eee81705..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_down_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_up_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_up_dark.png
deleted file mode 100644
index ecaca87de..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_up_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_up_light.png b/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_up_light.png
deleted file mode 100644
index a7f677ab3..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_arrow_up_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
deleted file mode 100644
index 3cbfe1a84..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png b/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png
deleted file mode 100644
index 7732cf993..000000000
Binary files a/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png
deleted file mode 100644
index 278f816ac..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png
deleted file mode 100644
index 1083759ea..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png
deleted file mode 100644
index e7de03a06..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png
deleted file mode 100644
index 700d076ed..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png
deleted file mode 100644
index 6f814532b..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png
deleted file mode 100644
index ae93910e6..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png
deleted file mode 100644
index 47fda04ff..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png
deleted file mode 100644
index ee59997a9..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png
deleted file mode 100644
index 7807f449f..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png
deleted file mode 100644
index 59a2ec755..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png
deleted file mode 100644
index 63b4274f8..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png
deleted file mode 100644
index 95e085c1c..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_down_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_down_dark.png
deleted file mode 100644
index 8609f3dd0..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_down_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_down_light.png b/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_down_light.png
deleted file mode 100644
index 16535149d..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_down_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_up_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_up_dark.png
deleted file mode 100644
index 55245b753..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_up_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_up_light.png b/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_up_light.png
deleted file mode 100644
index 9b95c85b1..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_arrow_up_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
deleted file mode 100644
index acbdecac2..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png b/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png
deleted file mode 100644
index 062788bd1..000000000
Binary files a/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png
deleted file mode 100644
index 454cd4f44..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png
deleted file mode 100644
index 9f0623bdc..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png
deleted file mode 100644
index dbd10906c..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png
deleted file mode 100644
index cf32c2a53..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png
deleted file mode 100644
index 08981ad0f..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png
deleted file mode 100644
index ad5f11429..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png
deleted file mode 100644
index 6700e6694..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
deleted file mode 100644
index ac1f3fa8f..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png
deleted file mode 100644
index 472959624..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png
deleted file mode 100644
index 9416c70ec..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png
deleted file mode 100644
index 951ebdab8..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png
deleted file mode 100644
index bc6c288ad..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_down_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_down_dark.png
deleted file mode 100644
index 7bd939f54..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_down_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_down_light.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_down_light.png
deleted file mode 100644
index e9253415f..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_down_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_up_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_up_dark.png
deleted file mode 100644
index f07abec9e..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_up_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_up_light.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_up_light.png
deleted file mode 100644
index 277b1e6f6..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_arrow_up_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
deleted file mode 100644
index 812ff2c39..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png
deleted file mode 100644
index 99411ad4e..000000000
Binary files a/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
deleted file mode 100644
index 6c8df63b2..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png
deleted file mode 100644
index 953960774..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png
deleted file mode 100644
index 20591def4..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png
deleted file mode 100644
index 99266ebb9..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png
deleted file mode 100644
index ae50bcdf8..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png
deleted file mode 100644
index 21b853953..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png
deleted file mode 100644
index 4c09750f4..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
deleted file mode 100644
index a1647d879..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
deleted file mode 100644
index f8e12dda3..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png
deleted file mode 100644
index 1263ae82e..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png
deleted file mode 100644
index c1b201cea..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png
deleted file mode 100644
index 8179a8bd0..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_down_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_down_dark.png
deleted file mode 100644
index 50e2e2754..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_down_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_down_light.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_down_light.png
deleted file mode 100644
index 6bf117145..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_down_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_up_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_up_dark.png
deleted file mode 100644
index 1e4054c40..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_up_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_up_light.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_up_light.png
deleted file mode 100644
index dd4a46c6f..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_arrow_up_light.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png
deleted file mode 100644
index 5ec39593a..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png
deleted file mode 100644
index cb2207f11..000000000
Binary files a/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/uhabits-android/src/main/res/drawable/bg_select_button.xml b/uhabits-android/src/main/res/drawable/bg_select_button.xml
new file mode 100644
index 000000000..029882bb7
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/bg_select_button.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape>
+            <solid android:color="?attr/contrast40" />
+            <corners android:radius="4dp"/>
+            <padding
+                android:bottom="0dp"
+                android:left="8dp"
+                android:right="8dp"
+                android:top="0dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/drawable/dialog_bg_input_box.xml b/uhabits-android/src/main/res/drawable/dialog_bg_input_box.xml
new file mode 100644
index 000000000..0f2a651a7
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/dialog_bg_input_box.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:width="1dp" android:color="?attr/contrast40" />
+    <corners android:radius="4dp"/>
+    <padding
+        android:left="0dp"
+        android:top="8dp"
+        android:right="0dp"
+        android:bottom="0dp" />
+</shape>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/drawable/ic_action_add_dark.xml b/uhabits-android/src/main/res/drawable/ic_action_add_dark.xml
new file mode 100644
index 000000000..b82a35857
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_add_dark.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#D8D9D9"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_archive_dark.xml b/uhabits-android/src/main/res/drawable/ic_action_archive_dark.xml
new file mode 100644
index 000000000..86598bd41
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_archive_dark.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#D8D9D9"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_cancel.xml b/uhabits-android/src/main/res/drawable/ic_action_cancel.xml
new file mode 100644
index 000000000..611c1ba39
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_cancel.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_check.xml b/uhabits-android/src/main/res/drawable/ic_action_check.xml
new file mode 100644
index 000000000..69ba4eb39
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_check.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#373839"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_color_dark.xml b/uhabits-android/src/main/res/drawable/ic_action_color_dark.xml
new file mode 100644
index 000000000..f5eebed9d
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_color_dark.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#D8D9D9"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_color_light.xml b/uhabits-android/src/main/res/drawable/ic_action_color_light.xml
new file mode 100644
index 000000000..46579a20c
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_color_light.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#373839"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_download_dark.xml b/uhabits-android/src/main/res/drawable/ic_action_download_dark.xml
new file mode 100644
index 000000000..cd8c52cb0
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_download_dark.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#D8D9D9"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_edit_dark.xml b/uhabits-android/src/main/res/drawable/ic_action_edit_dark.xml
new file mode 100644
index 000000000..b96d7c500
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_edit_dark.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#D8D9D9"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_edit_light.xml b/uhabits-android/src/main/res/drawable/ic_action_edit_light.xml
new file mode 100644
index 000000000..77e5f58ce
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_edit_light.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#373839"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_filter_dark.xml b/uhabits-android/src/main/res/drawable/ic_action_filter_dark.xml
new file mode 100644
index 000000000..f31c712ac
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_filter_dark.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_snooze.xml b/uhabits-android/src/main/res/drawable/ic_action_snooze.xml
new file mode 100644
index 000000000..99a56248b
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_snooze.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#373839"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M22,5.7l-4.6,-3.9 -1.3,1.5 4.6,3.9L22,5.7zM7.9,3.4L6.6,1.9 2,5.7l1.3,1.5 4.6,-3.8zM12.5,8L11,8v6l4.7,2.9 0.8,-1.2 -4,-2.4L12.5,8zM12,4c-5,0 -9,4 -9,9s4,9 9,9 9,-4 9,-9 -4,-9 -9,-9zM12,20c-3.9,0 -7,-3.1 -7,-7s3.1,-7 7,-7 7,3.1 7,7 -3.1,7 -7,7z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_action_unarchive_dark.xml b/uhabits-android/src/main/res/drawable/ic_action_unarchive_dark.xml
new file mode 100644
index 000000000..ba1430de5
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_action_unarchive_dark.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="#D8D9D9"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M20.55,5.22l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6C5.53,3 5.12,3.21 4.85,3.55L3.46,5.22C3.17,5.57 3,6.01 3,6.5V19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5C21,6.01 20.83,5.57 20.55,5.22zM12,9.5l5.5,5.5H14v2h-4v-2H6.5L12,9.5zM5.12,5l0.82,-1h12l0.93,1H5.12z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_arrow_down_dark.xml b/uhabits-android/src/main/res/drawable/ic_arrow_down_dark.xml
new file mode 100644
index 000000000..a0b5f9083
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_arrow_down_dark.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#D8D9D9"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z" />
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_arrow_down_light.xml b/uhabits-android/src/main/res/drawable/ic_arrow_down_light.xml
new file mode 100644
index 000000000..d653deaca
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_arrow_down_light.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#373839"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z" />
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_arrow_up_dark.xml b/uhabits-android/src/main/res/drawable/ic_arrow_up_dark.xml
new file mode 100644
index 000000000..80f922f0c
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_arrow_up_dark.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#D8D9D9"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z" />
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_arrow_up_light.xml b/uhabits-android/src/main/res/drawable/ic_arrow_up_light.xml
new file mode 100644
index 000000000..8f5c3fad1
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_arrow_up_light.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#373839"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z" />
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_colorpicker_swatch_selected.xml b/uhabits-android/src/main/res/drawable/ic_colorpicker_swatch_selected.xml
new file mode 100644
index 000000000..4d50dde76
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_colorpicker_swatch_selected.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <group
+        android:translateX="4"
+        android:translateY="4">
+        <path
+            android:fillColor="#000000"
+            android:fillAlpha="0.50"
+            android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/ic_notification.xml b/uhabits-android/src/main/res/drawable/ic_notification.xml
new file mode 100644
index 000000000..fccfd645f
--- /dev/null
+++ b/uhabits-android/src/main/res/drawable/ic_notification.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="484"
+    android:viewportHeight="484">
+    <group
+        android:scaleX="0.9"
+        android:scaleY="0.9"
+        android:pivotX="242"
+        android:pivotY="242">
+        <path
+            android:fillColor="#FFFFFF"
+            android:pathData="M212,0.7c-40.2,6.2 -67.7,15.9 -100.7,35.6 -19.2,11.4 -46.1,35 -57.3,50.2 -2.4,3.3 -5.3,6.9 -6.3,8 -6.1,6.4 -19.7,29.6 -27,46 -8.7,19.6 -16,44.9 -19.2,66.6 -2.1,14.6 -2.1,55.2 0,69.8 2.9,20 10.6,47.1 18.1,64.1 4.3,9.8 13.4,27.2 15.4,29.5 1,1.1 2.5,3.4 3.3,5 2.9,5.7 15,22 21.6,29 11.1,11.7 24.4,24.4 28.6,27.2 2.2,1.5 6.7,4.8 10,7.4 24.6,19 63.2,35.1 102.5,42.6 13.9,2.6 68.1,2.6 82,-0 39.3,-7.5 77.9,-23.6 102.5,-42.6 3.3,-2.6 7.8,-5.9 10,-7.4 4.2,-2.8 17.5,-15.5 28.6,-27.2 6.6,-7 18.7,-23.3 21.6,-29 0.8,-1.6 2.3,-3.9 3.3,-5 4.5,-5.2 16.5,-30.7 22.2,-47.5 9.8,-28.6 12.8,-47.9 12.8,-81 0,-26.6 -1.1,-37.3 -6,-57.5 -5,-20.8 -13.7,-44.3 -22.3,-59.5 -8.2,-14.8 -15.8,-26.7 -19.4,-30.5 -1,-1.1 -3.9,-4.7 -6.3,-8 -11.2,-15.2 -38.1,-38.8 -57.3,-50.2 -25.5,-15.2 -45.9,-23.7 -73.2,-30.4 -20.9,-5.1 -29.4,-5.9 -58.5,-5.8 -14.6,0.1 -27.6,0.3 -29,0.6zM209,101.5c6,3.1 6,3.2 6,50.7 0,41.1 -0.1,43.4 -1.9,46.2 -2.5,3.7 -5.7,5.5 -9.8,5.6 -3.8,-0 -7,-2.6 -22.1,-18l-10.4,-10.5 -2.4,3c-23.6,28.6 -28.4,67.7 -12.3,99.7 12.2,24.2 34.2,42 59.9,48.4 10.5,2.7 33.5,2.6 44,-0 32,-8 58.6,-34.6 66.6,-66.6 2.9,-11.4 2.6,-34.6 -0.4,-45.9 -4.9,-17.9 -14.7,-33 -30.5,-46.9 -6.4,-5.6 -5.7,-7.3 9.1,-21.8 14.7,-14.5 16.3,-15.8 19.2,-14.9 2.8,0.9 17.6,15.7 22.9,22.9 13.1,17.7 21.6,36.1 25.9,56 2.2,10.3 2.6,14.6 2.6,28.6 0,23.7 -3.4,38.8 -13.4,59.5 -7.2,15.1 -14.2,24.8 -27,37.5 -12.7,12.8 -22.4,19.8 -37.5,27 -20.5,9.9 -35.8,13.3 -59,13.4 -18.2,-0 -27.7,-1.5 -44.5,-7 -40.2,-13.3 -73.8,-47.1 -87,-87.4 -14.1,-43 -6.2,-89.6 21.2,-126 3.1,-4.2 6.6,-8.4 7.8,-9.5l2.1,-1.9 -12.7,-12.7c-12.3,-12.3 -12.7,-12.8 -13.2,-17.7 -0.5,-5.8 0.7,-8.6 5.1,-11.2 3,-1.9 5.4,-2 46,-2 36.3,-0 43.2,0.2 45.7,1.5z"
+            android:strokeColor="#00000000" />
+    </group>
+</vector>
diff --git a/uhabits-android/src/main/res/drawable/round_ripple.xml b/uhabits-android/src/main/res/drawable/round_ripple.xml
index 5131e5db5..f2f8d9189 100644
--- a/uhabits-android/src/main/res/drawable/round_ripple.xml
+++ b/uhabits-android/src/main/res/drawable/round_ripple.xml
@@ -23,6 +23,7 @@
     android:color="?colorAccent">
     <item android:gravity="center">
         <shape android:shape="rectangle">
+            <stroke android:width="2dp" android:color="?android:textColor"/>
             <solid android:color="?cardBgColor"/>
             <corners android:radius="5dp" />
         </shape>
diff --git a/uhabits-android/src/main/res/layout/about.xml b/uhabits-android/src/main/res/layout/about.xml
index df5123f10..b995d428c 100644
--- a/uhabits-android/src/main/res/layout/about.xml
+++ b/uhabits-android/src/main/res/layout/about.xml
@@ -120,17 +120,20 @@
                 linked at the bottom of the list. If you qualify, please feel free to
                 submit a pull request adding yourself here.
                 -->
-                <TextView style="@style/About.Item" android:text="Álinson Santos Xavier"/>
-                <TextView style="@style/About.Item" android:text="Quentin Hibon"/>
-                <TextView style="@style/About.Item" android:text="Oleg Ivashchenko"/>
-                <TextView style="@style/About.Item" android:text="Rechee Jozil"/>
-                <TextView style="@style/About.Item" android:text="Luboš Luňák"/>
-                <TextView style="@style/About.Item" android:text="Kristian Tashkov"/>
-                <TextView style="@style/About.Item" android:text="Victor Yu"/>
-                <TextView style="@style/About.Item" android:text="Денис (sciamano)"/>
-                <TextView style="@style/About.Item" android:text="Christoph Hennemann"/>
-                <TextView style="@style/About.Item" android:text="Joseph Tran"/>
-                <TextView style="@style/About.Item" android:text="Nikhil (regularcoder)"/>
+                <TextView style="@style/About.Item" android:text="Álinson S. Xavier (@iSoron)"/>
+                <TextView style="@style/About.Item" android:text="Quentin Hibon (@hiqua)"/>
+                <TextView style="@style/About.Item" android:text="Oleg Ivashchenko (@olegivo)"/>
+                <TextView style="@style/About.Item" android:text="Rechee Jozil (@recheej)"/>
+                <TextView style="@style/About.Item" android:text="Jakub Kalinowski (@kalina559)"/>
+                <TextView style="@style/About.Item" android:text="Luboš Luňák (@llunak)"/>
+                <TextView style="@style/About.Item" android:text="Sebastian Gallese (@sgallese)"/>
+                <TextView style="@style/About.Item" android:text="Kristian Tashkov (@KristianTashkov)"/>
+                <TextView style="@style/About.Item" android:text="Bindu (@vbh)"/>
+                <TextView style="@style/About.Item" android:text="Victor Yu (@vyu1)"/>
+                <TextView style="@style/About.Item" android:text="Christoph Hennemann (@chennemann)"/>
+                <TextView style="@style/About.Item" android:text="Денис (@sciamano)"/>
+                <TextView style="@style/About.Item" android:text="Joseph Tran (@JotraN)"/>
+                <TextView style="@style/About.Item" android:text="Nikhil (@regularcoder)"/>
                 <TextView style="@style/About.Item" android:text="JanetQC"/>
                 <TextView
                         android:id="@+id/tvContributors"
diff --git a/uhabits-android/src/main/res/layout/activity_edit_habit.xml b/uhabits-android/src/main/res/layout/activity_edit_habit.xml
index b3a33c373..75dddb551 100644
--- a/uhabits-android/src/main/res/layout/activity_edit_habit.xml
+++ b/uhabits-android/src/main/res/layout/activity_edit_habit.xml
@@ -167,6 +167,7 @@
                         android:hint="@string/measurable_units_example"/>
                 </LinearLayout>
             </FrameLayout>
+
             <LinearLayout
                 android:id="@+id/targetOuterBox"
                 android:layout_width="match_parent"
@@ -207,6 +208,22 @@
                 </FrameLayout>
             </LinearLayout>
 
+            <FrameLayout
+                android:id="@+id/targetTypeOuterBox"
+                style="@style/FormOuterBox">
+                <LinearLayout style="@style/FormInnerBox">
+                    <TextView
+                        style="@style/FormLabel"
+                        android:text="@string/target_type" />
+                    <TextView
+                        style="@style/FormDropdown"
+                        android:id="@+id/targetTypePicker"
+                        android:textColor="?attr/contrast100"
+                        />
+                </LinearLayout>
+            </FrameLayout>
+
+
             <!-- Reminder -->
             <FrameLayout style="@style/FormOuterBox">
                 <LinearLayout style="@style/FormInnerBox">
diff --git a/uhabits-android/src/main/res/layout/checkmark_dialog.xml b/uhabits-android/src/main/res/layout/checkmark_dialog.xml
new file mode 100644
index 000000000..70f3d3a91
--- /dev/null
+++ b/uhabits-android/src/main/res/layout/checkmark_dialog.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="12dp"
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="8dp"
+        android:baselineAligned="false">
+
+        <FrameLayout
+            style="@style/FormOuterBox"
+            android:layout_width="0dp"
+            android:layout_weight="1">
+            <LinearLayout style="@style/DialogFormInnerBox">
+
+                <TextView
+                    style="@style/DialogFormLabel"
+                    android:text="@string/value" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:gravity="center_horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="8dp">
+
+                    <Button
+                        android:id="@+id/yesBtn"
+                        android:text="@string/fa_check"
+                        style="@style/CheckmarkDialogBtn"/>
+                    <Button
+                        android:id="@+id/skippedBtn"
+                        android:text="@string/fa_skipped"
+                        android:visibility="gone"
+                        style="@style/CheckmarkDialogBtn"/>
+
+                    <Button
+                        android:id="@+id/noBtn"
+                        android:text="@string/fa_times"
+                        style="@style/CheckmarkDialogBtn"/>
+
+                    <Button
+                        android:id="@+id/questionBtn"
+                        android:text="@string/fa_question"
+                        android:visibility="gone"
+                        style="@style/CheckmarkDialogBtn"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="5dp"
+        android:baselineAligned="false">
+
+        <FrameLayout
+            style="@style/FormOuterBox"
+            android:layout_width="0dp"
+            android:layout_weight="1">
+
+            <LinearLayout style="@style/DialogFormInnerBox">
+
+                <TextView
+                    style="@style/DialogFormLabel"
+                    android:text="@string/notes" />
+
+                <EditText
+                    android:id="@+id/etNotes"
+                    android:inputType="textCapSentences|textMultiLine"
+                    style="@style/FormInput"
+                    android:scrollbars="vertical"
+                    android:hint="@string/example_notes"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/layout/number_picker_dialog.xml b/uhabits-android/src/main/res/layout/number_picker_dialog.xml
index 585a86a25..6d199ac1c 100644
--- a/uhabits-android/src/main/res/layout/number_picker_dialog.xml
+++ b/uhabits-android/src/main/res/layout/number_picker_dialog.xml
@@ -19,34 +19,98 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:gravity="center"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-
-    <NumberPicker
-        android:id="@+id/picker"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:id="@+id/tvSeparator"
-        android:layout_width="wrap_content"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="12dp"
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="."/>
+        android:orientation="horizontal"
+        android:padding="5dp"
+        android:baselineAligned="false">
+
+        <FrameLayout
+            style="@style/FormOuterBox"
+            android:layout_width="0dp"
+            android:layout_weight="1">
+            <LinearLayout style="@style/DialogFormInnerBox">
+
+                <TextView
+                    style="@style/DialogFormLabel"
+                    android:text="@string/value" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:gravity="center_horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                    <NumberPicker
+                        android:id="@+id/picker"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+                    <TextView
+                        android:id="@+id/tvSeparator"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        />
+
+                    <NumberPicker
+                        android:id="@+id/picker2"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        />
+
+                    <TextView
+                        android:id="@+id/tvUnit"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+        </FrameLayout>
 
-    <NumberPicker
-        android:id="@+id/picker2"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:descendantFocusability="blocksDescendants"
-        />
+        android:orientation="horizontal"
+        android:padding="5dp"
+        android:baselineAligned="false">
+
+        <FrameLayout
+            style="@style/FormOuterBox"
+            android:layout_width="0dp"
+            android:layout_weight="1">
+
+            <LinearLayout style="@style/DialogFormInnerBox">
+
+                <TextView
+                    style="@style/DialogFormLabel"
+                    android:text="@string/notes" />
+
+                <EditText
+                    android:id="@+id/etNotes"
+                    android:inputType="textCapSentences|textMultiLine"
+                    style="@style/FormInput"
+                    android:scrollbars="vertical"
+                    android:hint="@string/example_notes"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
 
-    <TextView
-        android:id="@+id/tvUnit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/layout/show_habit_notes.xml b/uhabits-android/src/main/res/layout/show_habit_notes.xml
index 52c9627d7..d645f4001 100644
--- a/uhabits-android/src/main/res/layout/show_habit_notes.xml
+++ b/uhabits-android/src/main/res/layout/show_habit_notes.xml
@@ -28,7 +28,6 @@
         android:id="@+id/habitNotes"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:textColor="?attr/contrast100"
         tools:text="This is some example text for the notes" />
 </merge>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/layout/show_habit_subtitle.xml b/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
index f8f3924bc..7361b4565 100644
--- a/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
+++ b/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
@@ -47,7 +47,6 @@
             android:id="@+id/targetIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/fa_arrow_circle_up"
             android:textColor="?attr/contrast60"
             android:textSize="16sp" />
 
diff --git a/uhabits-android/src/main/res/values-ar-rSA/strings.xml b/uhabits-android/src/main/res/values-ar-rSA/strings.xml
index 4542684b6..ae82ed8f9 100644
--- a/uhabits-android/src/main/res/values-ar-rSA/strings.xml
+++ b/uhabits-android/src/main/res/values-ar-rSA/strings.xml
@@ -23,7 +23,7 @@
     <string name="action_settings">إعدادات</string>
     <string name="edit">تعديل</string>
     <string name="delete">حذف</string>
-    <string name="archive">أرشفة</string>
+    <string name="archive">أرشيف</string>
     <string name="unarchive">إزالة من الأرشيف</string>
     <string name="add_habit">إضافة عادة</string>
     <string name="color_picker_default_title">تغيير اللون</string>
@@ -48,22 +48,22 @@
     <string name="intro_title_2">إنشاء بعض عادات جديدة</string>
     <string name="intro_description_2">كل يوم، بعد أداء عادتك، ضع علامة عليها في التطبيق.</string>
     <string name="intro_title_4">تتبع تقدمك</string>
-    <string name="intro_description_4">رسوم بيانية مفصلة تُريك كيف تحسنت عاداتك مع مرور الوقت.</string>
+    <string name="intro_description_4">رسوم بيانية مفصلة تُريك كيف تحسنت عاداتك مع مرور الوقت.  </string>
     <string name="interval_15_minutes">15 دقيقة</string>
     <string name="interval_30_minutes">30 دقيقة</string>
     <string name="interval_1_hour">ساعة واحدة</string>
     <string name="interval_2_hour">ساعتان</string>
     <string name="interval_4_hour">أربع ساعات</string>
     <string name="interval_8_hour">8 ساعات</string>
-    <string name="interval_24_hour">٢٤ ساعة</string>
+    <string name="interval_24_hour">24 ساعة</string>
     <string name="interval_always_ask">اسأل دائماً   </string>
     <string name="interval_custom">مخصص...   </string>
     <string name="pref_toggle_title">تبديل وضعية العادة بضغطة قصيرة   </string>
-    <string name="pref_toggle_description">وضع علامات الاختيار الموجودة بنقرة واحدة بدلاً من الصحافة وعقد. أكثر ملاءمة، ولكن قد يتسبب في تبديل عرضي.   </string>
+    <string name="pref_toggle_description_2">ضع علامات اختيار بنقرة واحدة بدلاً من الضغط مع الاستمرار.</string>
     <string name="pref_rate_this_app">تقييم هذا التطبيق على جوجل بلاي   </string>
     <string name="pref_send_feedback">أرسل الملاحظات إلى المطور   </string>
     <string name="pref_view_source_code">إفحص التعليمات البرمجية على GitHub   </string>
-    <string name="links">روابط   </string>
+    <string name="links">روابط </string>
     <string name="name">اسم  </string>
     <string name="settings">إعدادات</string>
     <string name="select_snooze_delay">حدد تأخير الغفوة   </string>
@@ -103,7 +103,7 @@
     <string name="generate_bug_report">توليد تقرير الاعطال. </string>
     <string name="troubleshooting">استكشاف الأخطاء وإصلاحها. </string>
     <string name="help_translate">المساعدة في ترجمة هذا البرنامج. </string>
-    <string name="night_mode" comment="dark_theme">الوضع الليلي. </string>
+    <string name="night_mode">الوضع الليلي. </string>
     <string name="use_pure_black">استخدام أسود نقي في الوضع الليلي. </string>
     <string name="pure_black_description">يستبدل خلفيات رمادية مع أسود نقي في الوضع الليلي. يقلل من استهلاك البطارية في الهواتف مع شاشة AMOLED. .</string>
     <string name="interface_preferences">السطح البيني. </string>
@@ -113,7 +113,7 @@
     <string name="week">أسبوع. </string>
     <string name="month">شهر. </string>
     <string name="quarter">ربع سنه. </string>
-    <string name="year">عام. </string>
+    <string name="year">عام</string>
     <string name="total">المجموع. </string>
     <string name="yes_or_no">نعم أو لا </string>
     <string name="every_x_days">كل %d أيام </string>
@@ -123,6 +123,7 @@
     <string name="none">صامت </string>
     <string name="filter">تصنيف </string>
     <string name="hide_completed">إخفاء المكتملة </string>
+    <string name="hide_entered">إخفاء المُدخل</string>
     <string name="hide_archived">إخفاء المؤرشفة </string>
     <string name="sticky_notifications">جعل الإشعارات ثابتة </string>
     <string name="sticky_notifications_description">منع الإشعارات من تمريرها بعيداً. </string>
@@ -142,9 +143,12 @@
     <string name="by_status">حسب الحالة</string>
     <string name="export">استخراج </string>
     <string name="long_press_to_edit">اضغط مع الاستمرار لتغيرالقيمه</string>
-    <string name="change_value">تغيير القيمة </string>
+    <string name="value">القيمة</string>
     <string name="calendar">التقويم </string>
     <string name="unit">الوحدة </string>
+    <string name="target_type">نوع الهدف</string>
+    <string name="target_type_at_least">على الأقل</string>
+    <string name="target_type_at_most">على الأكثر</string>
     <string name="example_question_boolean">على سبيل المثال هل تمرنت اليوم؟ </string>
     <string name="question">السؤال </string>
     <string name="target">الهدف </string>
@@ -166,6 +170,7 @@
     <string name="measurable_example">مثال، كم ميلاً قطعته اليوم؟ كم عدد الصفحات التي قرأتها؟</string>
     <string name="x_times_per_week">%d مرة في الأسبوع</string>
     <string name="x_times_per_month">%d مرة في الشهر</string>
+    <string name="x_times_per_y_days">%d مرات في %d أيام</string>
     <string name="yes_or_no_short_example">مثال: التمرين</string>
     <string name="color">اللون</string>
     <string name="example_target">مثال: 15</string>
@@ -184,6 +189,7 @@
     <string name="pref_skip_title">تمكين أيام التخطي</string>
     <string name="pref_skip_description">بدّل مرتين لإضافة تخطي بدلاً من علامة اختيار. التخطيات تحافظ على درجاتك دون تغيير أو خسارة سلسلة الانتصارات.</string>
     <string name="pref_unknown_title">إظهار علامات الاستفهام للبيانات المفقودة</string>
+    <string name="pref_unknown_description">التفريق بين الأيام التي لا تحتوي على بيانات من الهفوات الفعلية. للدخول في اللقطات المتتابعة ، قم بالتبديل مرتين.</string>
     <string name="you_are_now_a_developer">أنت الآن مطوَِر برمجيات!</string>
     <string name="activity_not_found">لم يتم العثور على تطبيق لإتمام هذا الإجراء</string>
     <string name="pref_midnight_delay_title">تمديد اليوم بضع ساعات بعد منتصف الليل</string>
diff --git a/uhabits-android/src/main/res/values-bg-rBG/strings.xml b/uhabits-android/src/main/res/values-bg-rBG/strings.xml
index 50010bb83..e68ce594b 100644
--- a/uhabits-android/src/main/res/values-bg-rBG/strings.xml
+++ b/uhabits-android/src/main/res/values-bg-rBG/strings.xml
@@ -56,7 +56,6 @@
     <string name="interval_8_hour">8 часа</string>
     <string name="interval_24_hour">24 часа</string>
     <string name="pref_toggle_title">Маркиране с кратко натискане</string>
-    <string name="pref_toggle_description">Поставяне на отметки с кратко натискане вместо с натискане и задържане. По-удобно, но може да доведе до неволно маркиране.</string>
     <string name="pref_rate_this_app">Оценяване на това приложение в Google Play</string>
     <string name="pref_send_feedback">Изпращане на отзиви към разработчика</string>
     <string name="pref_view_source_code">Преглед на програмния код в GitHub</string>
@@ -99,7 +98,7 @@
     <string name="generate_bug_report">Генериране на доклад за грешки</string>
     <string name="troubleshooting">Отстраняване на проблеми</string>
     <string name="help_translate">Помагане за превода на това приложение</string>
-    <string name="night_mode" comment="dark_theme">Нощен режим</string>
+    <string name="night_mode">Нощен режим</string>
     <string name="use_pure_black">Използване на чисто черно при нощен режим</string>
     <string name="pure_black_description">Заменя сивите фонове с чисто черни при нощен режим. Намаля разхода на батерията при телефони с AMOLED дисплеи.</string>
     <string name="interface_preferences">Интерфейс</string>
@@ -133,4 +132,5 @@
     <string name="by_color">По цвят</string>
     <string name="by_score">По сила</string>
     <string name="export">Експортиране</string>
+    <string name="x_times_per_y_days">%d пъти в период от %d дни</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-ca-rES/strings.xml b/uhabits-android/src/main/res/values-ca-rES/strings.xml
index cd5714e1a..ec2979478 100644
--- a/uhabits-android/src/main/res/values-ca-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-ca-rES/strings.xml
@@ -26,7 +26,7 @@
     <string name="archive">Arxivar</string>
     <string name="unarchive">Treure de l\'arxiu</string>
     <string name="add_habit">Afegir hàbit</string>
-    <string name="color_picker_default_title">Canviar color</string>
+    <string name="color_picker_default_title">Canviar el color</string>
     <string name="toast_habit_created">Hàbit creat.</string>
     <plurals name="toast_habits_changed">
         <item quantity="one">Hàbit modificat.</item>
@@ -67,7 +67,6 @@
     <string name="interval_always_ask">Pregunta sempre</string>
     <string name="interval_custom">Personalitza...</string>
     <string name="pref_toggle_title">Activar/desactivar repeticions prement curt</string>
-    <string name="pref_toggle_description">Posar les marques de verificació amb un sol toc enlloc de prémer i mantenir. Més adequat, però pot causar activacions accidentals.</string>
     <string name="pref_rate_this_app">Valora aquesta app a Google Play</string>
     <string name="pref_send_feedback">Enviar resposta al desenvolupador</string>
     <string name="pref_view_source_code">Veure codi font a Github</string>
@@ -82,6 +81,10 @@
         <item quantity="one">Esborrar hàbit</item>
         <item quantity="other">Esborrar hàbit</item>
     </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="one">L\' hàbit serà esborrat permanentment. Aquesta acció no es pot desfer.</item>
+        <item quantity="other">Els hàbits seran esborrats permanentment. Aquesta acció no es pot desfer.</item>
+    </plurals>
     <string name="habit_not_found">Hàbit suprimit / no trobat</string>
     <string name="weekends">Caps de setmana</string>
     <string name="any_weekday">Dilluns a divendres</string>
@@ -115,7 +118,7 @@
     <string name="generate_bug_report">Generar informe d\'error</string>
     <string name="troubleshooting">Resolució de problemes</string>
     <string name="help_translate">Ajuda a traduïr aquesta app</string>
-    <string name="night_mode" comment="dark_theme">Mode nocturn</string>
+    <string name="night_mode">Mode nocturn</string>
     <string name="use_pure_black">Utilitzar negre pur en el mode nocturn</string>
     <string name="pure_black_description">Reemplaça fons grisos per negre pur en el mode nocturn. Redueix consum de bateria en telèfons amb pantalla AMOLED.</string>
     <string name="interface_preferences">Interfície</string>
@@ -154,7 +157,6 @@
     <string name="by_status">Per estat</string>
     <string name="export">Exportar</string>
     <string name="long_press_to_edit">Prémer i mantenir per a canviar el valor</string>
-    <string name="change_value">Canviar el valor</string>
     <string name="calendar">Calendari</string>
     <string name="unit">Unitat</string>
     <string name="example_question_boolean">p.e. Has fet exercici avui?</string>
@@ -175,8 +177,10 @@
     <string name="example_notes">Opcional</string>
     <string name="yes_or_no_example">Per exemple, us heu despertat aviat? Heu fet exercici? Heu jugat a escacs?</string>
     <string name="measurable">Mesurable</string>
+    <string name="measurable_example">p.e. Quants quilòmetres has fet hui? Quantes pàgines has llegit?</string>
     <string name="x_times_per_week">%d vegades per setmana</string>
     <string name="x_times_per_month">%d vegades al mes</string>
+    <string name="x_times_per_y_days">%d vegades en %d dies</string>
     <string name="yes_or_no_short_example">Ex. Exercici</string>
     <string name="color">Color</string>
     <string name="example_target">ex. 15</string>
@@ -186,4 +190,18 @@
     <string name="every_month">Cada mes</string>
     <string name="validation_cannot_be_blank">No es pot deixar en blanc</string>
     <string name="today">Avui</string>
+    <string name="enter">Introduïr</string>
+    <string name="no_habits">No s\'han trobat hàbits.</string>
+    <string name="no_numerical_habits">No s\'han trobat hàbits mesurables</string>
+    <string name="no_boolean_habits">No s\'han trobat hàbits de sí o no</string>
+    <string name="increment">Increment</string>
+    <string name="decrement">Disminueix</string>
+    <string name="pref_skip_title">Activa omitir dies</string>
+    <string name="pref_skip_description">Toca dues vegades per a afegir una omissió en compte d\'una marca de verificació. Les omissions mantenen la teua puntuació sense canvis i no trenquen la ratxa.</string>
+    <string name="pref_unknown_title">Mostra signes d\'interrogació per a les dades que falten</string>
+    <string name="pref_unknown_description">Diferenciar els dies sense dades dels lapses reals. Per introduir un lapse, canvia dues vegades.</string>
+    <string name="you_are_now_a_developer">Ara eres un desenvolupador</string>
+    <string name="activity_not_found">No s\'ha trobat cap aplicació per a gestionar aquesta acció</string>
+    <string name="pref_midnight_delay_title">Ampliar el dia unes hores després de la mitjanit</string>
+    <string name="pref_midnight_delay_description">Esperar fins a les 3:00 per mostrar un nou dia. Útil si normalment vas a dormir després de la mitjanit. Requereix el reinici de l\'aplicació.</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-cs-rCZ/strings.xml b/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
index 0e02cfcfa..222fd3c2a 100644
--- a/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
+++ b/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
@@ -35,7 +35,8 @@
     <string name="reminder">Připomenutí</string>
     <string name="save">Uložit</string>
     <string name="streaks">Série</string>
-    <string name="no_habits_found">Nemáte žádné nedokončené zvyky</string>
+    <string name="no_habits_found">Nemáte zapsané žádné zvyky</string>
+    <string name="no_habits_left_to_do">Splnili jste vše pro dnešní den!</string>
     <string name="long_press_to_toggle">Stiskni a drž pro označení</string>
     <string name="reminder_off">Vyp.</string>
     <string name="create_habit">Vytvořit zvyk</string>
@@ -43,11 +44,11 @@
     <string name="check">Hotovo</string>
     <string name="snooze">Odložit</string>
     <string name="intro_title_1">Vítejte</string>
-    <string name="intro_description_1">Sledování zvyků ti pomůže vytvořit a dosáhnout dobrých návyků.</string>
+    <string name="intro_description_1">Sledování zvyků Vám pomůže vytvořit a dosáhnout dobrých návyků.</string>
     <string name="intro_title_2">Vytvoř si nové zvyky</string>
-    <string name="intro_description_2">Každý den po splnění zvyku, si ho v aplikaci zaškrtni.</string>
-    <string name="intro_title_4">Sleduj svůj postup</string>
-    <string name="intro_description_4">Detailní grafy ti ukážou, jak se tvé zvyky v průběhu času zlepšily.</string>
+    <string name="intro_description_2">Každý den po splnění zvyku si ho v aplikaci zaškrtněte.</string>
+    <string name="intro_title_4">Sledujte svůj pokrok</string>
+    <string name="intro_description_4">Detailní grafy Vám ukážou, jak se Vaše zvyky v průběhu času zlepšily. </string>
     <string name="interval_15_minutes">15 minut</string>
     <string name="interval_30_minutes">30 minut</string>
     <string name="interval_1_hour">Hodina</string>
@@ -58,7 +59,6 @@
     <string name="interval_always_ask">Vždy se ptát</string>
     <string name="interval_custom">Vlastní...</string>
     <string name="pref_toggle_title">Označte opakování krátkým stisknutím</string>
-    <string name="pref_toggle_description">Praktičtější, ale může způsobit nechtěné označení.</string>
     <string name="pref_rate_this_app">Ohodnoťte nás v Google Play</string>
     <string name="pref_send_feedback">Zpětná vazba vývojáři</string>
     <string name="pref_view_source_code">Zobrazit zdroj. kód na GitHub</string>
@@ -67,66 +67,66 @@
     <string name="settings">Nastavení</string>
     <string name="select_snooze_delay">Nastavit délku odložení</string>
     <string name="hint_title">Věděli jste?</string>
-    <string name="hint_drag">Přeřazení záznamů proveď stisknutím a podržením názvu zvyku a poté přesunutím na správné místo.</string>
-    <string name="hint_landscape">Můžeš vidět více dnů otočením telefonu na šířku.</string>
+    <string name="hint_drag">Přeřazení záznamů proveďte stisknutím a podržením názvu zvyku a poté přesunutím na správné místo.</string>
+    <string name="hint_landscape">Můžete vidět více dnů otočením telefonu na šířku.</string>
     <string name="habit_not_found">Zvyk smazán / nenalezen</string>
     <string name="weekends">Víkendy</string>
     <string name="any_weekday">Pondělí až pátek</string>
     <string name="any_day">Jakýkoliv den v týdnu</string>
-    <string name="select_weekdays">Vyber dny</string>
+    <string name="select_weekdays">Vyberte dny</string>
     <string name="export_to_csv">Exportovat CSV</string>
     <string name="done_label">Hotovo</string>
     <string name="clear_label">Smazat</string>
-    <string name="select_hours">Vyber hodiny</string>
-    <string name="select_minutes">Vyber minuty</string>
+    <string name="select_hours">Vyberte hodiny</string>
+    <string name="select_minutes">Vyberte minuty</string>
     <string name="about">O nás</string>
     <string name="translators">Překladatelé</string>
     <string name="developers">Vývojáři</string>
     <string name="version_n">Verze %s</string>
     <string name="frequency">Frekvence</string>
-    <string name="checkmark">Zatržítko</string>
-    <string name="best_streaks">Nejlepší serie</string>
+    <string name="checkmark">Fajfka</string>
+    <string name="best_streaks">Nejlepší série</string>
     <string name="every_day">Každý den</string>
     <string name="every_week">Každý týden</string>
     <string name="help">Pomoc a FAQ</string>
     <string name="could_not_export">Export selhal.</string>
     <string name="could_not_import">Import selhal.</string>
-    <string name="file_not_recognized">Soubor netozpoznán.</string>
+    <string name="file_not_recognized">Soubor nerozpoznán.</string>
     <string name="habits_imported">Zvyky úspěšně importovány.</string>
     <string name="import_data">Importovat</string>
     <string name="export_full_backup">Kompletní export</string>
-    <string name="import_data_summary">Podpora exportů z této aplikace, ale také souborů vygenerovaných aplikacemi od Tickmate, HabitBull nebo Rewire. Pro více info si prečti FAQ.</string>
-    <string name="export_as_csv_summary">Generuje soubory, které můžeš otevřít v tabulkových editorech, jako jsou Microsoft Excel nebo OpenOffice Calc. Tyto soubory nelze importovat zpět.</string>
-    <string name="export_full_backup_summary">Generuje soubor, který obsahuje všechna tvoje data. Tento soubor můžeš importovat zpět.</string>
+    <string name="import_data_summary">Podporuje exporty z této aplikace, ale také soubory vygenerované aplikacemi od Tickmate, HabitBull nebo Rewire. Pro více informací si prečtěte FAQ.</string>
+    <string name="export_as_csv_summary">Generuje soubory, které mohou být otevřeny v tabulkových editorech jako jsou Microsoft Excel nebo OpenOffice Calc. Tyto soubory nelze importovat zpět.</string>
+    <string name="export_full_backup_summary">Generuje soubor, který obsahuje všechna Vaše data. Tento soubor může být importován zpět.</string>
     <string name="bug_report_failed">Generace výpisu chyb selhala.</string>
     <string name="generate_bug_report">Generovat výpis chyb</string>
     <string name="troubleshooting">Řešení problémů</string>
     <string name="help_translate">Pomozte s překladem aplikace</string>
-    <string name="night_mode" comment="dark_theme">Noční téma</string>
-    <string name="use_pure_black">Zobrazit čistě černou v nočním tématu</string>
-    <string name="pure_black_description">Nahradí šedé pozadí čistou černou v nočním tématu. Snižuje spotřebu baterie v telefonech s AMOLED displejem.</string>
+    <string name="night_mode">Temný motiv</string>
+    <string name="use_pure_black">Zobrazit čistě černou v temném motivu</string>
+    <string name="pure_black_description">Nahrazuje v temném motivu šedé pozadí čistou černou. Snižuje spotřebu baterie v telefonech s AMOLED displejem.</string>
     <string name="interface_preferences">Rozhraní</string>
     <string name="reverse_days">Otočit pořadí dnů</string>
-    <string name="reverse_days_description">Zobrazí dny na úvodní stránce v obráceném pořadí</string>
+    <string name="reverse_days_description">Zobrazit dny na úvodní stránce v obráceném pořadí.</string>
     <string name="day">Den</string>
     <string name="week">Týden</string>
     <string name="month">Měsíc</string>
     <string name="quarter">Čtvrtletí</string>
     <string name="year">Rok</string>
     <string name="total">Celkem</string>
-    <string name="yes_or_no">Ano, či Ne</string>
+    <string name="yes_or_no">Ano nebo Ne</string>
     <string name="every_x_days">Každých %d dní</string>
     <string name="every_x_weeks">Každých %d týdnů</string>
     <string name="score">Skóre</string>
-    <string name="reminder_sound">Zvuk upomínky</string>
+    <string name="reminder_sound">Zvuk připomínky</string>
     <string name="none">Žádný</string>
     <string name="filter">Filtr</string>
     <string name="hide_completed">Skrýt dokončené</string>
     <string name="hide_archived">Skrýt archivované</string>
-    <string name="sticky_notifications">Připnout notifikaci</string>
-    <string name="sticky_notifications_description">Zabraňuje notifikaci její odstranění odsunutím.</string>
-    <string name="led_notifications">Světelná notifikace</string>
-    <string name="led_notifications_description">Telefon zabliká při upozornění. Fungující pouze na telefonech s notifikační LED diodou.</string>
+    <string name="sticky_notifications">Připnout upozornění</string>
+    <string name="sticky_notifications_description">Zabraňuje odstranění upozornění přejetím. </string>
+    <string name="led_notifications">Světelné upozornění</string>
+    <string name="led_notifications_description">Blikání diody při upozornění. Funkční pouze na telefonech s notifikační LED diodou.</string>
     <string name="repair_database">Opravit databázi</string>
     <string name="database_repaired">Databáze opravena.</string>
     <string name="uncheck">Odznačit</string>
@@ -138,39 +138,54 @@
     <string name="by_name">Abecedně</string>
     <string name="by_color">Podle barvy</string>
     <string name="by_score">Podle skóre</string>
+    <string name="by_status">Podle statusu</string>
     <string name="export">Export</string>
-    <string name="long_press_to_edit">Stiskni a drž pro změnu hodnoty</string>
-    <string name="change_value">Změnit hodnotu</string>
+    <string name="long_press_to_edit">Stiskněte a držte pro změnu hodnoty</string>
     <string name="calendar">Kalendář</string>
     <string name="unit">Jednotka</string>
-    <string name="example_question_boolean">např. Cvičil jsi dnes?</string>
+    <string name="example_question_boolean">Např. Cvičil jsi dnes?</string>
     <string name="question">Otázka</string>
     <string name="target">Cíl</string>
     <string name="yes">Ano</string>
     <string name="no">Ne</string>
-    <string name="customize_notification_summary">Změnit zvuk, vibrace, světlo a další nastavení notifikací</string>
-    <string name="customize_notification">Přizpůsobit oznámení</string>
+    <string name="customize_notification_summary">Změnit zvuk, vibrace, světlo a další nastavení upozornění</string>
+    <string name="customize_notification">Přizpůsobit upozornění</string>
     <string name="pref_view_privacy">Zobrazit zásady ochrany osobních údajů</string>
     <string name="view_all_contributors">Zobrazit všechny přispěvatele&#8230;</string>
     <string name="database">Databáze</string>
-    <string name="widget_opacity_title">Neprůhlednost widgetu</string>
-    <string name="widget_opacity_description">Udělá widgety průhlednější nebo neprůhlednější na domovské obrazovce.</string>
+    <string name="widget_opacity_title">Průhlednost widgetu</string>
+    <string name="widget_opacity_description">Upravuje průhlednost pozadí widgetu na domovské obrazovce.</string>
     <string name="first_day_of_the_week">První den v týdnu</string>
-    <string name="default_reminder_question">Dokončili jste dnes tento návyk?</string>
+    <string name="default_reminder_question">Dokončili jste dnes tento zvyk?</string>
     <string name="notes">Poznámky</string>
     <string name="example_notes">(nepovinné)</string>
-    <string name="yes_or_no_example">např. Vzbudil ses dnes brzy? Cvičil jsi dnes? Hrál jsi šachy?</string>
+    <string name="yes_or_no_example">Např. Vzbudil ses dnes brzy? Cvičil jsi dnes? Hrál jsi šachy?</string>
     <string name="measurable">Měřitelný</string>
+    <string name="measurable_example">Např. Kolik kilometrů jsi dnes uběhl? Kolik stránek jsi dnes přečetl?</string>
     <string name="x_times_per_week">%d krát týdně</string>
     <string name="x_times_per_month">%d krát za měsíc</string>
-    <string name="yes_or_no_short_example">např. Cvičení</string>
+    <string name="x_times_per_y_days">%d krát za %d dní</string>
+    <string name="yes_or_no_short_example">Např. Cvičení</string>
     <string name="color">Barva</string>
-    <string name="example_target">např. 15</string>
-    <string name="measurable_short_example">např. Běh</string>
-    <string name="measurable_question_example">Např. kolik mil jste dnes uběhl?</string>
-    <string name="measurable_units_example">např. míle</string>
+    <string name="example_target">Např. 15</string>
+    <string name="measurable_short_example">Např. Běh</string>
+    <string name="measurable_question_example">Např. Kolik kilometrů jste dnes uběhl?</string>
+    <string name="measurable_units_example">Např. Kilometry</string>
     <string name="every_month">Každý měsíc</string>
     <string name="validation_cannot_be_blank">Musíte vyplnit</string>
     <string name="today">Dnes</string>
+    <string name="enter">Vyplnit</string>
+    <string name="no_habits">Nenalezeny žádné zvyky</string>
+    <string name="no_numerical_habits">Nenalezeny žádné měřitelné zvyky</string>
+    <string name="no_boolean_habits">Nenalezeny žádné \"ano/ne\" zvyky</string>
+    <string name="increment">Zvětšit</string>
+    <string name="decrement">Zmenšit</string>
+    <string name="pref_skip_title">Povolit přeskakování dnů</string>
+    <string name="pref_skip_description">Klikněte dvakrát pro přidání pomlčky (přeskočení dne) místo fajfky. Pomlčka nezmění Vaše skóre, ani nepřeruší Vaši výzvu. </string>
+    <string name="pref_unknown_title">Při chybějícím údaji zobrazit otazník</string>
+    <string name="pref_unknown_description">Odlište dny bez údajů od nesplněného zvyku. Pro zadání \"nesplněno\" klikněte dvakrát. </string>
     <string name="you_are_now_a_developer">Nyní jste vývojář</string>
+    <string name="activity_not_found">Pro daný krok nebyla nalezena aplikace</string>
+    <string name="pref_midnight_delay_title">Po půlnoci prodloužit den o několik hodin</string>
+    <string name="pref_midnight_delay_description">Počkat do 3:00 ráno pro zobrazení nového dne. Užitečné, pokud chodíte spát po půlnoci. Vyžaduje restartování aplikace. </string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-da-rDK/strings.xml b/uhabits-android/src/main/res/values-da-rDK/strings.xml
index 779054665..fdf19c6a8 100644
--- a/uhabits-android/src/main/res/values-da-rDK/strings.xml
+++ b/uhabits-android/src/main/res/values-da-rDK/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Spørg altid</string>
     <string name="interval_custom">Brugerdefineret...</string>
     <string name="pref_toggle_title">Tjek vaner med kort tryk</string>
-    <string name="pref_toggle_description">Sæt tjekmærker med et enkelt tryk i stedet for tryk-og-hold. Mere bekvemmeligt, men kan forårsage uhensigtede tryk.</string>
     <string name="pref_rate_this_app">Bedøm denne app på Google Play</string>
     <string name="pref_send_feedback">Send feedback til udvikleren</string>
     <string name="pref_view_source_code">Se kildekoden på GitHub</string>
@@ -136,7 +135,7 @@
     <string name="generate_bug_report">Generer fejlrapport</string>
     <string name="troubleshooting">Fejlfinding</string>
     <string name="help_translate">Hjælpe med at oversætte denne app</string>
-    <string name="night_mode" comment="dark_theme">Nat-tilstand</string>
+    <string name="night_mode">Nat-tilstand</string>
     <string name="use_pure_black">Brug ren sort i nat-tilstand</string>
     <string name="pure_black_description">Erstatter grå baggrunde med ren sort i nat-tilstand. Reducerer batteriforbruget i telefoner med AMOLED skærm.</string>
     <string name="interface_preferences">Grænseflade</string>
@@ -175,7 +174,6 @@
     <string name="by_status">Efter status</string>
     <string name="export">Eksporter</string>
     <string name="long_press_to_edit">Tryk-og-hold for at ændre værdien</string>
-    <string name="change_value">Skift værdi</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Enhed</string>
     <string name="example_question_boolean">f.eks. Har du trænet i dag?</string>
@@ -199,6 +197,7 @@
     <string name="measurable_example">f.eks Hvor mange kilometer kørte du i dag? Hvor mange sider læste du?</string>
     <string name="x_times_per_week">%d gange om ugen</string>
     <string name="x_times_per_month">%d gange om måneden</string>
+    <string name="x_times_per_y_days">%d gange på %d dage</string>
     <string name="yes_or_no_short_example">f.eks. Motion</string>
     <string name="color">Farve</string>
     <string name="example_target">f.eks. 15</string>
diff --git a/uhabits-android/src/main/res/values-de-rDE/strings.xml b/uhabits-android/src/main/res/values-de-rDE/strings.xml
index aa21bfd11..c4d852e5c 100644
--- a/uhabits-android/src/main/res/values-de-rDE/strings.xml
+++ b/uhabits-android/src/main/res/values-de-rDE/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Immer fragen</string>
     <string name="interval_custom">Benutzerdefiniert...</string>
     <string name="pref_toggle_title">Markierung durch kurzes Tippen ändern</string>
-    <string name="pref_toggle_description">Abhaken durch einfaches Tippen, anstatt durch Tippen und Halten. Bequemer, kann aber eine falsche Auswahl verursachen.</string>
     <string name="pref_rate_this_app">Bewerte diese App auf Google Play</string>
     <string name="pref_send_feedback">Sende dem Entwickler Feedback</string>
     <string name="pref_view_source_code">Zeige den Quellcode auf GitHub</string>
@@ -127,7 +126,7 @@
     <string name="generate_bug_report">Erstelle einen Fehlerbericht</string>
     <string name="troubleshooting">Fehlerbehebung</string>
     <string name="help_translate">Hilf mit, diese App zu übersetzen</string>
-    <string name="night_mode" comment="dark_theme">Nachtmodus</string>
+    <string name="night_mode">Nachtmodus</string>
     <string name="use_pure_black">Verwende reines Schwarz im Nachtmodus</string>
     <string name="pure_black_description">Ersetzt im Nachtmodus das Grau des Hintergrunds durch Schwarz. Reduziert den Stromverbrauch von Smartphones mit AMOLED Displays.</string>
     <string name="interface_preferences">Oberfläche</string>
@@ -166,7 +165,6 @@
     <string name="by_status">Nach Zustand</string>
     <string name="export">Exportieren</string>
     <string name="long_press_to_edit">Gedrückt halten, um den Wert zu ändern</string>
-    <string name="change_value">Wert ändern</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Einheit</string>
     <string name="example_question_boolean">z.B. Hast du heute trainiert?</string>
@@ -190,6 +188,7 @@
     <string name="measurable_example">z.B. Wie viele Kilometer bist du heute gelaufen? Wie viele Seiten hast du gelesen?</string>
     <string name="x_times_per_week">%d mal pro Woche</string>
     <string name="x_times_per_month">%d mal pro Monat</string>
+    <string name="x_times_per_y_days">%d Mal in %d Tagen</string>
     <string name="yes_or_no_short_example">z.B. Übung</string>
     <string name="color">Farbe</string>
     <string name="example_target">z.B. 15</string>
diff --git a/uhabits-android/src/main/res/values-el-rGR/strings.xml b/uhabits-android/src/main/res/values-el-rGR/strings.xml
index 8bd41559e..3457ddac7 100644
--- a/uhabits-android/src/main/res/values-el-rGR/strings.xml
+++ b/uhabits-android/src/main/res/values-el-rGR/strings.xml
@@ -58,7 +58,6 @@
     <string name="interval_always_ask">Να ερωτούμαι πάντα</string>
     <string name="interval_custom">Προσαρμογή</string>
     <string name="pref_toggle_title">Κάντε εναλλαγή των επαναλήψεων με σύντομο πάτημα</string>
-    <string name="pref_toggle_description">Βολικότερο, αλλά ίσως προκαλέσει ακούσιες εναλλαγές.</string>
     <string name="pref_rate_this_app">Βαθμολογήστε αυτή την εφαρμογή στο Google Play</string>
     <string name="pref_send_feedback">Στείλετε σχόλια</string>
     <string name="pref_view_source_code">Δείτε τον πηγαίο κώδικα στο GitHub</string>
@@ -102,7 +101,7 @@
     <string name="generate_bug_report">Παραγωγή αναφοράς bug.</string>
     <string name="troubleshooting">Αντιμετ.Προβλημάτων</string>
     <string name="help_translate">Βοηθήστε στην μετάφραση</string>
-    <string name="night_mode" comment="dark_theme">Νυχτ.Λειτ.</string>
+    <string name="night_mode">Νυχτ.Λειτ.</string>
     <string name="use_pure_black">Χρήση απόλυτου μαύρου στη νυχτ.λειτουργία</string>
     <string name="pure_black_description">Αντικαθιστά τα γκρί υπόβαθρα με απόλυτα μαύρα σε νυχτ.λειτουργία. Μειώνει την κατανάλωση μπαταρίας σε συσκευές με οθόνη AMOLED.</string>
     <string name="interface_preferences">Διεπιφάνεια</string>
@@ -140,7 +139,6 @@
     <string name="by_score">Με σκορ</string>
     <string name="export">Εξαγωγή</string>
     <string name="long_press_to_edit">Πατήστε και κρατήστε πατημένο για να αλλάξετε την τιμή</string>
-    <string name="change_value">Αλλαγή τιμής</string>
     <string name="calendar">Ημερολόγιο</string>
     <string name="unit">Μονάδα</string>
     <string name="example_question_boolean">π.χ. Ασκήθηκες σήμερα;</string>
@@ -163,6 +161,7 @@
     <string name="measurable">Μετρήσιμο</string>
     <string name="x_times_per_week">%d φορές την εβδομάδα</string>
     <string name="x_times_per_month">%d φορές το μήνα</string>
+    <string name="x_times_per_y_days">%d φορές την %d ημέρες</string>
     <string name="yes_or_no_short_example">π.χ. Σωματική άσκηση</string>
     <string name="color">Χρώμα</string>
     <string name="example_target">π.χ. 15</string>
diff --git a/uhabits-android/src/main/res/values-eo-rUY/strings.xml b/uhabits-android/src/main/res/values-eo-rUY/strings.xml
index 780529432..cfbf83e9b 100644
--- a/uhabits-android/src/main/res/values-eo-rUY/strings.xml
+++ b/uhabits-android/src/main/res/values-eo-rUY/strings.xml
@@ -58,7 +58,6 @@
     <string name="interval_always_ask">Ĉiam demandu</string>
     <string name="interval_custom">Kutimo</string>
     <string name="pref_toggle_title">Ŝalti per mallonga gazetaro</string>
-    <string name="pref_toggle_description">Metu markilojn per sola frapeto anstataŭ premi kaj teni. Pli oportune, sed eble kaŭzas hazardajn ŝanĝojn.</string>
     <string name="pref_rate_this_app">Taksu ĉi tiun aplikaĵon en Google Play</string>
     <string name="pref_send_feedback">Sendu reagojn al programisto</string>
     <string name="pref_view_source_code">Vidu fontkodon ĉe GitHub</string>
@@ -102,7 +101,7 @@
     <string name="generate_bug_report">Generu raporton pri eraroj</string>
     <string name="troubleshooting">Problemserĉado</string>
     <string name="help_translate">Helpu traduki ĉi tiun aplikon</string>
-    <string name="night_mode" comment="dark_theme">Nokta reĝimo</string>
+    <string name="night_mode">Nokta reĝimo</string>
     <string name="use_pure_black">Uzu puran nigron en malhela temo</string>
     <string name="pure_black_description">Anstataŭigas grizajn fonojn per pura nigra en malhela temo. Reduktas baterian uzon en telefonoj kun AMOLED-ekrano.</string>
     <string name="interface_preferences">Intervizago</string>
@@ -140,7 +139,6 @@
     <string name="by_score">Laŭ poentaro</string>
     <string name="export">Eksporti</string>
     <string name="long_press_to_edit">Premu kaj tenu por ŝanĝi la valoron</string>
-    <string name="change_value">Ŝanĝi valoron</string>
     <string name="calendar">Kalendaro:</string>
     <string name="unit">Unueco</string>
     <string name="example_question_boolean">ekz. Ĉu vi ekzercis hodiaŭ?</string>
diff --git a/uhabits-android/src/main/res/values-es-rES/strings.xml b/uhabits-android/src/main/res/values-es-rES/strings.xml
index 30b4cc448..47bbd9fb4 100644
--- a/uhabits-android/src/main/res/values-es-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-es-rES/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">Preguntar siempre</string>
     <string name="interval_custom">Personalizar...</string>
     <string name="pref_toggle_title">Marca las repeticiones con una pulsación corta</string>
-    <string name="pref_toggle_description">Más cómodo, pero puede causar marcas accidentales.</string>
+    <string name="pref_toggle_description_2">Ponga marcas de verificación con un solo toque en lugar de mantener presionado.</string>
     <string name="pref_rate_this_app">Valora esta aplicación en Google Play</string>
     <string name="pref_send_feedback">Enviar sugerencias al desarrollador</string>
     <string name="pref_view_source_code">Ver código fuente en GitHub</string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">Generar reporte de errores</string>
     <string name="troubleshooting">Solución de problemas</string>
     <string name="help_translate">Ayuda a traducir esta app</string>
-    <string name="night_mode" comment="dark_theme">Modo nocturno</string>
+    <string name="night_mode">Modo nocturno</string>
     <string name="use_pure_black">Utilizar color negro en modo nocturno</string>
     <string name="pure_black_description">Reemplaza fondos grises por color negro en modo nocturno. Reduce el consumo de batería en teléfonos con pantalla AMOLED.</string>
     <string name="interface_preferences">Interfície</string>
@@ -147,6 +147,7 @@
     <string name="none">Ninguno</string>
     <string name="filter">Filtrar</string>
     <string name="hide_completed">Ocultar completos</string>
+    <string name="hide_entered">Ocultar ingresado</string>
     <string name="hide_archived">Ocultar archivados</string>
     <string name="sticky_notifications">Hacer notificaciones fijas</string>
     <string name="sticky_notifications_description">Evita que las notificaciones sean descartadas.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">Por estado</string>
     <string name="export">Exportar</string>
     <string name="long_press_to_edit">Mantenga presionado para cambiar el valor</string>
-    <string name="change_value">Cambiar valor</string>
+    <string name="value">Valor</string>
     <string name="calendar">Calendario</string>
     <string name="unit">Unidad</string>
+    <string name="target_type">Tipo de objetivo</string>
+    <string name="target_type_at_least">Al menos</string>
+    <string name="target_type_at_most">Como máximo</string>
     <string name="example_question_boolean">ej. ¿Has ejercitado hoy?</string>
     <string name="question">Pregunta</string>
     <string name="target">Objetivo</string>
@@ -190,6 +194,7 @@
     <string name="measurable_example">ej. ¿Cuántas millas ha corrido hoy? ¿Cuántas páginas ha leído?</string>
     <string name="x_times_per_week">%d veces por semana</string>
     <string name="x_times_per_month">%d veces al mes</string>
+    <string name="x_times_per_y_days">%d veces en %d días</string>
     <string name="yes_or_no_short_example">ej. Ejercicio</string>
     <string name="color">Color</string>
     <string name="example_target">ej. 15</string>
diff --git a/uhabits-android/src/main/res/values-eu-rES/strings.xml b/uhabits-android/src/main/res/values-eu-rES/strings.xml
index cdffcab40..68a984267 100644
--- a/uhabits-android/src/main/res/values-eu-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-eu-rES/strings.xml
@@ -36,6 +36,7 @@
     <string name="save">Gorde</string>
     <string name="streaks">Boladak</string>
     <string name="no_habits_found">Ez duzu ohitura aktiborik</string>
+    <string name="no_habits_left_to_do">Gaurkoz amaitu duzu!</string>
     <string name="long_press_to_toggle">Sakatu eta mantendu markatu edo desmarkatzeko</string>
     <string name="reminder_off">Itzalita</string>
     <string name="create_habit">Ohitura sortu</string>
@@ -58,7 +59,6 @@
     <string name="interval_always_ask">Galdetu beti</string>
     <string name="interval_custom">Pertsonalizatua...</string>
     <string name="pref_toggle_title">Ukitze laburrarekin markatu</string>
-    <string name="pref_toggle_description">Ukitze bakar batekin marka jartzen du ukitu eta mantendu egin beharrean. Erosoagoa, baina nahi gabeko markak ekar litzake.</string>
     <string name="pref_rate_this_app">Aplikazio hau Google Playen puntuatu</string>
     <string name="pref_send_feedback">Zure iritzia garatzaileari bidali</string>
     <string name="pref_view_source_code">Iturburu kodea GitHuben ikusi</string>
@@ -69,6 +69,10 @@
     <string name="hint_title">Ba al zenekien?</string>
     <string name="hint_drag">Sarrerak berrantolatzeko, sakatu eta mantendu ohituraren izena, ondoren mugi ezazu leku aproposera.</string>
     <string name="hint_landscape">Egun gehiago ikus ditzakezu zure gailua paisai moduan jarriz.</string>
+    <plurals name="delete_habits_title">
+        <item quantity="one">Ohiturak ezabatu</item>
+        <item quantity="other">Ohiturak ezabatu</item>
+    </plurals>
     <string name="habit_not_found">Ohitura ezabatua / ez aurkitua</string>
     <string name="weekends">Asteburuak</string>
     <string name="any_weekday">Astelehenetik ostiralera</string>
@@ -102,7 +106,7 @@
     <string name="generate_bug_report">Akats txostena sortu</string>
     <string name="troubleshooting">Arazoen konponketa</string>
     <string name="help_translate">Lagundu aplikazio hau itzultzen</string>
-    <string name="night_mode" comment="dark_theme">Azal iluna</string>
+    <string name="night_mode">Azal iluna</string>
     <string name="use_pure_black">erabili beltz hutsa azal ilunean</string>
     <string name="pure_black_description">Atzeko plano grisak beltz hutsez aldatzen ditu azal ilunean. Bateriaren erabilera gutxitzen du AMOLED duten gailuetan.</string>
     <string name="interface_preferences">Interfazea</string>
@@ -138,11 +142,13 @@
     <string name="by_name">Izenaren arabera</string>
     <string name="by_color">Kolorearen arabera</string>
     <string name="by_score">Puntuen arabera</string>
+    <string name="by_status">Egoeraren arabera</string>
     <string name="export">Esportatu</string>
     <string name="long_press_to_edit">Sakatu luze balioa aldatzeko</string>
-    <string name="change_value">Aldatu balioa</string>
+    <string name="value">Balioa</string>
     <string name="calendar">Egutegia</string>
     <string name="unit">Unitatea</string>
+    <string name="target_type_at_most">Gehienez</string>
     <string name="example_question_boolean">adib. ariketa egin al duzu gaur?</string>
     <string name="question">Galdera</string>
     <string name="target">Helburua</string>
@@ -163,6 +169,7 @@
     <string name="measurable">Neurgarria</string>
     <string name="x_times_per_week">Astean %d aldiz</string>
     <string name="x_times_per_month">Hilean %d aldiz</string>
+    <string name="x_times_per_y_days">%d aldiz %d egunetan</string>
     <string name="yes_or_no_short_example">adib. Ariketa</string>
     <string name="color">Kolorea</string>
     <string name="example_target">adib. 15</string>
@@ -172,4 +179,8 @@
     <string name="every_month">Hilabetero</string>
     <string name="validation_cannot_be_blank">Ezin da hutsik egon</string>
     <string name="today">Gaur</string>
+    <string name="no_habits">Ez da ohiturarik aurkitu</string>
+    <string name="pref_unknown_title">Adierazi galdera ikurra falta diren datuetan</string>
+    <string name="you_are_now_a_developer">Garatzailea zara!</string>
+    <string name="activity_not_found">Ez da aurkitu akzio hau gauzatu dezakeen aplikaziorik</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-fa-rIR/strings.xml b/uhabits-android/src/main/res/values-fa-rIR/strings.xml
index 98730e033..ae6c915cf 100644
--- a/uhabits-android/src/main/res/values-fa-rIR/strings.xml
+++ b/uhabits-android/src/main/res/values-fa-rIR/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">همیشه پرسیده شود </string>
     <string name="interval_custom">سفارشی‌سازی </string>
     <string name="pref_toggle_title">با اشاره‌ی کوتاه‌مدت وضعیت عادت را تغییر بده</string>
-    <string name="pref_toggle_description">تیک زدن با تک‌ضربه در مقابل ضربه‌زدن و نگه‌داشتن راحت‌تر است ولی ممکن است باعث شود اشتباهی عادتی را تیک بزنید. </string>
+    <string name="pref_toggle_description_2">به جای فشار دادن و نگه‌داشتن، با یک ضربه تیک بزنید.</string>
     <string name="pref_rate_this_app">به این برنامه در گوگل‌پلی امتیاز بدهید </string>
     <string name="pref_send_feedback">ارسال بازخورد به توسعه‌دهنده</string>
     <string name="pref_view_source_code">دیدن منبع برنامه در گیت‌هاب </string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">ایجاد گزارش مشکلات</string>
     <string name="troubleshooting">ایرادیابی</string>
     <string name="help_translate">کمک برای ترجمه این برنامه</string>
-    <string name="night_mode" comment="dark_theme">حالت تیره</string>
+    <string name="night_mode">حالت تیره</string>
     <string name="use_pure_black">استفاده از رنگ سیاه خالص در حالت تیره</string>
     <string name="pure_black_description">جایگزینی پس‌زمینه خاکستری با سیاه خالص در حالت تیره. استفاده از باتری را در گوشی‌های با صفحه نمایش AMOLED کاهش می‌دهد.</string>
     <string name="interface_preferences">رابط کاربری</string>
@@ -147,6 +147,7 @@
     <string name="none">هیچ‌کدام</string>
     <string name="filter">فیلتر</string>
     <string name="hide_completed">مخفی کردن کامل‌شده‌ها</string>
+    <string name="hide_entered">پنهان کردن مقادیر</string>
     <string name="hide_archived">مخفی کردن بایگانی‌شده‌ها</string>
     <string name="sticky_notifications">چسبناک کردن اعلان‌ها</string>
     <string name="sticky_notifications_description">از رد کردن اعلان با کشیدن جلوگیری می‌کند.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">براساس وضعیت</string>
     <string name="export">خروجی گرفتن</string>
     <string name="long_press_to_edit">فشار دهید و نگه دارید تا مقدار را تغییر دهید</string>
-    <string name="change_value">تغییر مقدار</string>
+    <string name="value">مقدار</string>
     <string name="calendar">تقویم</string>
     <string name="unit">واحد</string>
+    <string name="target_type">نوع داده هدف</string>
+    <string name="target_type_at_least">حداقل</string>
+    <string name="target_type_at_most">حداکثر</string>
     <string name="example_question_boolean">مثلا آیا امروز ورزش کردید؟</string>
     <string name="question">سوال</string>
     <string name="target">هدف</string>
@@ -190,6 +194,7 @@
     <string name="measurable_example">مثلاً امروز چند کیلومتر دویدید؟ چند صفحه مطالعه کردید؟</string>
     <string name="x_times_per_week">%d بار در هفته</string>
     <string name="x_times_per_month">%d بار در ماه</string>
+    <string name="x_times_per_y_days">%d بار در هر %d روز</string>
     <string name="yes_or_no_short_example">مثلاً ورزش کنید</string>
     <string name="color">رنگ</string>
     <string name="example_target">مثلاً 15</string>
diff --git a/uhabits-android/src/main/res/values-fi-rFI/strings.xml b/uhabits-android/src/main/res/values-fi-rFI/strings.xml
index ca001b0ad..867aec122 100644
--- a/uhabits-android/src/main/res/values-fi-rFI/strings.xml
+++ b/uhabits-android/src/main/res/values-fi-rFI/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">Kysy aina</string>
     <string name="interval_custom">Muu</string>
     <string name="pref_toggle_title">Vaihda merkintää lyhyellä painalluksella</string>
-    <string name="pref_toggle_description">Tee merkit yhdellä painalluksella pitkän painalluksen sijaan. Kätevämpi, mutta saattaa aiheuttaa vahingossa painamista.</string>
+    <string name="pref_toggle_description_2">Lisää valinnat yhdellä napautuksella pitkään painettuna pitämisen sijaan.</string>
     <string name="pref_rate_this_app">Arvostele Google Playssä</string>
     <string name="pref_send_feedback">Lähetä palautetta kehittäjälle</string>
     <string name="pref_view_source_code">Katso lähdekoodi GitHubissa</string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">Luo virheraportti</string>
     <string name="troubleshooting">Apua</string>
     <string name="help_translate">Auta kääntämään tämä sovellus</string>
-    <string name="night_mode" comment="dark_theme">Yötila</string>
+    <string name="night_mode">Yötila</string>
     <string name="use_pure_black">Käytä puhdasta mustaa yötilassa</string>
     <string name="pure_black_description">Korvaa harmaat taustat puhtaalla mustalla tummalla teemalla. Vähentää akun käyttöä puhelimissa AMOLED-näytöllä.</string>
     <string name="interface_preferences">Käyttöliittymä</string>
@@ -147,6 +147,7 @@
     <string name="none">Ei mitään</string>
     <string name="filter">Suodata</string>
     <string name="hide_completed">Piilota suoritetut</string>
+    <string name="hide_entered">Piilota syötetty</string>
     <string name="hide_archived">Piilota arkistoidut</string>
     <string name="sticky_notifications">Tee ilmoituksesta kiinnitettyjä</string>
     <string name="sticky_notifications_description">Estää ilmoitusten pois pyyhkäisemisen.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">Tilan mukaan</string>
     <string name="export">Vie</string>
     <string name="long_press_to_edit">Pidä painettuna muuttaaksesi arvoa</string>
-    <string name="change_value">Muuta arvo</string>
+    <string name="value">Arvo</string>
     <string name="calendar">Kalenteri</string>
     <string name="unit">Yksikkö</string>
+    <string name="target_type">Kohdetyyppi</string>
+    <string name="target_type_at_least">Vähintään</string>
+    <string name="target_type_at_most">Enintään</string>
     <string name="example_question_boolean">esim. Harrastitko tänään liikuntaa?</string>
     <string name="question">Kysymys</string>
     <string name="target">Tavoite</string>
@@ -190,6 +194,7 @@
     <string name="measurable_example">esim. Montako kilometriä juoksit tänään? Montako sivua luit?</string>
     <string name="x_times_per_week">%d kertaa viikossa</string>
     <string name="x_times_per_month">%d kertaa kuukaudessa</string>
+    <string name="x_times_per_y_days">%d kertaa %d päivässä</string>
     <string name="yes_or_no_short_example">Esim. kuntoilu</string>
     <string name="color">Väri</string>
     <string name="example_target">Esim. 15</string>
diff --git a/uhabits-android/src/main/res/values-fr-rFR/strings.xml b/uhabits-android/src/main/res/values-fr-rFR/strings.xml
index 7f57fcc16..69672682b 100644
--- a/uhabits-android/src/main/res/values-fr-rFR/strings.xml
+++ b/uhabits-android/src/main/res/values-fr-rFR/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">Toujours demander</string>
     <string name="interval_custom">Personnaliser...</string>
     <string name="pref_toggle_title">Valider l\'habitude avec un appui court</string>
-    <string name="pref_toggle_description">Valide l\'habitude avec un appui court plutôt qu\'un appuie long. Plus pratique, mais peut causer des activations accidentelles.</string>
+    <string name="pref_toggle_description_2">Cochez les cases d\'un simple appuie au lieu de les maintenir</string>
     <string name="pref_rate_this_app">Notez cette app sur le Google Play Store</string>
     <string name="pref_send_feedback">Envoyez un avis au développeur</string>
     <string name="pref_view_source_code">Voir le code source sur GitHub</string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">Générer un rapport de bug.</string>
     <string name="troubleshooting">Résolution de problèmes</string>
     <string name="help_translate">Aider à traduire cette application</string>
-    <string name="night_mode" comment="dark_theme">Mode Nuit</string>
+    <string name="night_mode">Mode Nuit</string>
     <string name="use_pure_black">Utiliser un noir pur dans le mode nuit</string>
     <string name="pure_black_description">Remplace le fond gris par un noir pur dans le mode nuit ; cela réduit l’usage de la batterie des appareils ayant un écran AMOLED.</string>
     <string name="interface_preferences">Interface</string>
@@ -147,6 +147,7 @@
     <string name="none">Aucun</string>
     <string name="filter">Filtre</string>
     <string name="hide_completed">Cacher les habitudes complétées</string>
+    <string name="hide_entered">Cacher les entrées</string>
     <string name="hide_archived">Cacher les habitudes archivées</string>
     <string name="sticky_notifications">Rendre les notifications persistantes</string>
     <string name="sticky_notifications_description">Évite que les notifications ne soient enlevées.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">Par statut</string>
     <string name="export">Exporter</string>
     <string name="long_press_to_edit">Appuyez et maintenez pour changer la valeur</string>
-    <string name="change_value">Modifier la valeur</string>
+    <string name="value">Valeur</string>
     <string name="calendar">Calendrier</string>
     <string name="unit">Unité</string>
+    <string name="target_type">Type d\'objectif</string>
+    <string name="target_type_at_least">Au moins</string>
+    <string name="target_type_at_most">Au plus</string>
     <string name="example_question_boolean">Par ex., avez-vous fait de l\'exercice aujourd\'hui?</string>
     <string name="question">Question</string>
     <string name="target">Cible</string>
@@ -191,6 +195,7 @@
 Combien de pages avez-vous lu ?</string>
     <string name="x_times_per_week">%d fois par semaine</string>
     <string name="x_times_per_month">%d fois par mois</string>
+    <string name="x_times_per_y_days">%d fois en %d jours</string>
     <string name="yes_or_no_short_example">Par ex, Entrainement</string>
     <string name="color">Couleur</string>
     <string name="example_target">Par ex, 15</string>
diff --git a/uhabits-android/src/main/res/values-hi-rIN/strings.xml b/uhabits-android/src/main/res/values-hi-rIN/strings.xml
index 2d107b1b3..916cf90d0 100644
--- a/uhabits-android/src/main/res/values-hi-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-hi-rIN/strings.xml
@@ -75,8 +75,6 @@
     <string name="interval_always_ask">हमेशा पूछें</string>
     <string name="interval_custom">अपने तरीके से बनाएं</string>
     <string name="pref_toggle_title">टॉगल पुनरावृत्ति  हल्का दबाने से</string>
-    <string name="pref_toggle_description">\"
-अधिक सुविधाजनक है, लेकिन आकस्मिक टॉगल  हो सकता है ।\"</string>
     <string name="pref_rate_this_app">\"
 गूगले प्ले पर इस ऐप्लिकेशन को रेट करें\"</string>
     <string name="pref_send_feedback">डेवेलपर को प्रतिक्रिया भेजें </string>
@@ -149,7 +147,7 @@
 समस्या निवारण\"</string>
     <string name="help_translate">\"
 इस एप्लिकेशन का अनुवाद करने में मदद करें\"</string>
-    <string name="night_mode" comment="dark_theme">नाइट मोड</string>
+    <string name="night_mode">नाइट मोड</string>
     <string name="use_pure_black">नाइट मोड मे पूरा काला यूज़ करें</string>
     <string name="pure_black_description">\"
 रात मोड में शुद्ध काले रंग के साथ ग्रे पृष्ठभूमि में बदलें.  अमोलेड प्रदर्शन के साथ फोन में बैटरी उपयोग कम कर देता है ।\"</string>
@@ -193,7 +191,6 @@
     <string name="by_status">स्थिति से</string>
     <string name="export">एक्सपोर्ट करे</string>
     <string name="long_press_to_edit">बदलने के लिए दबाकर रखें</string>
-    <string name="change_value">वैल्यू बदलें</string>
     <string name="calendar">कैलेंडर</string>
     <string name="unit">इकाई</string>
     <string name="example_question_boolean">जैसे आपने आज व्यायाम किया?</string>
@@ -219,6 +216,7 @@
 प्रति सप्ताह %d बार\"</string>
     <string name="x_times_per_month">\"
 प्रति माह %d बार\"</string>
+    <string name="x_times_per_y_days">%d बार %d दिन</string>
     <string name="yes_or_no_short_example">जैसे व्यायाम</string>
     <string name="color">रंग</string>
     <string name="example_target">जैसे १५</string>
diff --git a/uhabits-android/src/main/res/values-hr-rHR/strings.xml b/uhabits-android/src/main/res/values-hr-rHR/strings.xml
index fab62ad07..950eb1b46 100644
--- a/uhabits-android/src/main/res/values-hr-rHR/strings.xml
+++ b/uhabits-android/src/main/res/values-hr-rHR/strings.xml
@@ -56,7 +56,6 @@
     <string name="interval_8_hour">8 sati</string>
     <string name="interval_24_hour">24 sata</string>
     <string name="pref_toggle_title">Označi ponavljanja sa kratkim pritisk.</string>
-    <string name="pref_toggle_description">Zgodnije je, no može uzrokovati slučajna označavanja.</string>
     <string name="pref_rate_this_app">Ocijeni ovu aplikaciju na Google Playu</string>
     <string name="pref_send_feedback">Pošalji povratne informacije raz. programeru</string>
     <string name="pref_view_source_code">Pogledaj izvorni kod na GitHubu</string>
@@ -99,7 +98,7 @@
     <string name="generate_bug_report">Generiraj izvješće o pogreški</string>
     <string name="troubleshooting">Rješavanje problema</string>
     <string name="help_translate">Pomozi prevesti ovu aplikaciju</string>
-    <string name="night_mode" comment="dark_theme">Noćni način</string>
+    <string name="night_mode">Noćni način</string>
     <string name="use_pure_black">Koristi crnu boju za noćni način</string>
     <string name="pure_black_description">Zamjenjuje sivu pozadinu sa crnom u noćnom načinu. To smanjuje potrošnju bateriju na uređajima s AMOLED zaslonima.</string>
     <string name="interface_preferences">Sučelje</string>
@@ -133,4 +132,5 @@
     <string name="by_color">Po boji</string>
     <string name="by_score">Po rezultatu</string>
     <string name="export">Izvezi</string>
+    <string name="x_times_per_y_days">%d puta u %d dani</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-hu-rHU/strings.xml b/uhabits-android/src/main/res/values-hu-rHU/strings.xml
index 7cba2c6ed..ec0953246 100644
--- a/uhabits-android/src/main/res/values-hu-rHU/strings.xml
+++ b/uhabits-android/src/main/res/values-hu-rHU/strings.xml
@@ -28,6 +28,22 @@
     <string name="add_habit">Új szokás</string>
     <string name="color_picker_default_title">Szín módosítása</string>
     <string name="toast_habit_created">Szokás létrehozva</string>
+    <plurals name="toast_habits_changed">
+        <item quantity="one">Szokás módosítva</item>
+        <item quantity="other">Szokások módosítva</item>
+    </plurals>
+    <plurals name="toast_habits_deleted">
+        <item quantity="one">Szokás törölve</item>
+        <item quantity="other">Szokások törölve</item>
+    </plurals>
+    <plurals name="toast_habits_archived">
+        <item quantity="one">Szokás archiválva</item>
+        <item quantity="other">Szokások archiválva</item>
+    </plurals>
+    <plurals name="toast_habits_unarchived">
+        <item quantity="one">Szokás újraaktiválva</item>
+        <item quantity="other">Szokások újraaktiválva</item>
+    </plurals>
     <string name="overview">Áttekintés</string>
     <string name="habit_strength">Szokás erőssége</string>
     <string name="history">Napló</string>
@@ -36,6 +52,7 @@
     <string name="save">Mentés</string>
     <string name="streaks">Szériák</string>
     <string name="no_habits_found">Nincs aktív szokásod</string>
+    <string name="no_habits_left_to_do">Mára minden kész!</string>
     <string name="long_press_to_toggle">Tartsd lenyomva a bejelöléshez, vagy a jelölés törléséhez</string>
     <string name="reminder_off">Kikapcsolva</string>
     <string name="create_habit">Szokás rögzítése</string>
@@ -58,7 +75,6 @@
     <string name="interval_always_ask">Mindig rákérdez</string>
     <string name="interval_custom">Egyedi...</string>
     <string name="pref_toggle_title">Bejelölés rövid koppintással</string>
-    <string name="pref_toggle_description">Bejelölés koppintással nyomva tartás helyett. Kényelmesebb, de véletlen bejelöléseket okozhat.</string>
     <string name="pref_rate_this_app">Értékeld az alkalmazást a Google Play-en</string>
     <string name="pref_send_feedback">Visszajelzés küldése a fejlesztőnek</string>
     <string name="pref_view_source_code">Forráskód megtekintése a GitHub-on</string>
@@ -69,6 +85,14 @@
     <string name="hint_title">Tudtad?</string>
     <string name="hint_drag">Az elemek újrarendezéséhez a koppints a szokás nevére, majd húzd a megfelelő helyre.</string>
     <string name="hint_landscape">Több nap válik láthatóvá, ha fekvő módba állítod a telefonod kijelzőjét.</string>
+    <plurals name="delete_habits_title">
+        <item quantity="one">Törli a szokást?</item>
+        <item quantity="other">Törli a szokásokat?</item>
+    </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="one">A szokás véglegesen törölve lesz. A műveletet nem lehet visszavonni.</item>
+        <item quantity="other">A szokások véglegesen törölve lesznek. A műveletet nem lehet visszavonni.</item>
+    </plurals>
     <string name="habit_not_found">Szokás törölve / nem található</string>
     <string name="weekends">Hétvégente</string>
     <string name="any_weekday">Hétfőtől péntekig</string>
@@ -107,7 +131,7 @@
     <string name="generate_bug_report">Hibabejelentés generálása</string>
     <string name="troubleshooting">Hibaelhárítás</string>
     <string name="help_translate">Segíts lefordítani ezt az alkalmazást</string>
-    <string name="night_mode" comment="dark_theme">Éjszakai mód</string>
+    <string name="night_mode">Éjszakai mód</string>
     <string name="use_pure_black">Fekete használata éjszakai módban</string>
     <string name="pure_black_description">A szürke hátteret tiszta feketére cseréli éjszakai módban. Csökkenti az energiafelhasználást AMOLED kijelzős telefonokon.</string>
     <string name="interface_preferences">Kezelőfelület</string>
@@ -143,9 +167,9 @@
     <string name="by_name">Megnevezés szerint</string>
     <string name="by_color">Színek szerint</string>
     <string name="by_score">Pont szerint</string>
+    <string name="by_status">Állapot szerint</string>
     <string name="export">Exportálás</string>
     <string name="long_press_to_edit">Az érték módosításához tartsd lenyomva</string>
-    <string name="change_value">Érték módosítása</string>
     <string name="calendar">Naptár</string>
     <string name="unit">Egység</string>
     <string name="example_question_boolean">pl. Edzettél ma?</string>
@@ -166,8 +190,10 @@
     <string name="example_notes">(opcionális)</string>
     <string name="yes_or_no_example">pl. Korán keltél ma fel? Edzettél? Sakkoztál?</string>
     <string name="measurable">Mérhető</string>
+    <string name="measurable_example">pl. Hány kilométert futottál ma? Hány oldalt olvastál el?</string>
     <string name="x_times_per_week">Heti %d alkalommal</string>
     <string name="x_times_per_month">Havi %d alkalommal</string>
+    <string name="x_times_per_y_days">%d alk. / %d nap</string>
     <string name="yes_or_no_short_example">pl. Edzés</string>
     <string name="color">Szín</string>
     <string name="example_target">pl. 15</string>
@@ -177,4 +203,18 @@
     <string name="every_month">Minden hónapban</string>
     <string name="validation_cannot_be_blank">Nem lehet üres</string>
     <string name="today">Ma</string>
+    <string name="enter">Bevitel</string>
+    <string name="no_habits">Nem találhatók szokások</string>
+    <string name="no_numerical_habits">Nem található mérhető szokás</string>
+    <string name="no_boolean_habits">Nem található igen-vagy-nem szokás</string>
+    <string name="increment">Növelés</string>
+    <string name="decrement">Csökkentés</string>
+    <string name="pref_skip_title">Napok kihagyásának engedélyezése</string>
+    <string name="pref_skip_description">Váltás kétszer, ha kihagyást szeretne hozzáadni a pipa helyett. A kihagyások változatlanul tartják a pontszámot, és nem szakítják meg a sorozatot.</string>
+    <string name="pref_unknown_title">Kérdőjelek megjelenítése a hiányzó adatoknál</string>
+    <string name="pref_unknown_description">Az adatok nélküli napok megkülönböztetése a tényleges kihagyásoktól. Kihagyás megadásához váltson kétszer.</string>
+    <string name="you_are_now_a_developer">Ön mostantól már fejlesztő!</string>
+    <string name="activity_not_found">Ezen művelet elvégzéséhez nem található alkalmazás.</string>
+    <string name="pref_midnight_delay_title">A nap meghosszabbítása éjfél után néhány órával</string>
+    <string name="pref_midnight_delay_description">Várjon hajnali 3 -ig, hogy új napot mutasson. Hasznos, ha általában éjfél után fekszik le. Az alkalmazás újraindítását igényli.</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-hy-rAM/strings.xml b/uhabits-android/src/main/res/values-hy-rAM/strings.xml
new file mode 100644
index 000000000..dc98ed87d
--- /dev/null
+++ b/uhabits-android/src/main/res/values-hy-rAM/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="app_name">Loop Habit Tracker</string>
+    <string name="main_activity_title">Սովորություններ</string>
+    <string name="action_settings">Կարգավորումներ</string>
+    <string name="edit">Փոփոխել</string>
+    <string name="delete">Ջնջել</string>
+    <string name="archive">Արխիվ</string>
+    <string name="unarchive">Անարխիվ</string>
+    <string name="add_habit">Ավելացնել սովորություն</string>
+    <string name="color_picker_default_title">Փոխել գույնը</string>
+    <string name="toast_habit_created">Սովորությունը ստեղծեց</string>
+    <string name="history">Պատմություն</string>
+    <string name="clear">Մաքրել</string>
+    <string name="reminder">Հիշեցում</string>
+    <string name="save">Պահել</string>
+    <string name="reminder_off">Անջ.</string>
+    <string name="create_habit">Ստեղծել սովորությունը</string>
+    <string name="edit_habit">Փոփոխել սովորությունը</string>
+    <string name="snooze">Հետո</string>
+    <string name="intro_title_1">Բարի գալուստ</string>
+    <string name="interval_15_minutes">15 րոպե</string>
+    <string name="interval_30_minutes">30 րոպե</string>
+    <string name="interval_1_hour">1 ժամ</string>
+    <string name="interval_2_hour">2 ժամ</string>
+    <string name="interval_4_hour">4 ժամ</string>
+    <string name="interval_8_hour">8 ժամ</string>
+    <string name="interval_24_hour">24 ժամ</string>
+    <string name="interval_always_ask">Միշտ հարցնել</string>
+    <string name="links">Հղումներ</string>
+    <string name="name">Անուն</string>
+    <string name="settings">Կարգավորումներ</string>
+    <string name="hint_title">Գիտե՞ք</string>
+    <string name="weekends">Հանգստյան օրեր</string>
+    <string name="select_weekdays">Նշել օրեր</string>
+    <string name="done_label">Պատրաստ է</string>
+    <string name="clear_label">Մաքրել</string>
+    <string name="about">Մասին</string>
+    <string name="translators">Թարգմանիչներ</string>
+    <string name="version_n">Տարբերակ %s</string>
+    <string name="frequency">Հաճախություն</string>
+    <string name="every_day">Ամեն օր</string>
+    <string name="every_week">Ամեն շաբաթ</string>
+    <string name="night_mode">Մուգ տեսք</string>
+    <string name="day">Օր</string>
+    <string name="week">Շաբաթ</string>
+    <string name="month">Ամիս</string>
+    <string name="year">Տարի</string>
+    <string name="yes_or_no">Այո կամ ոչ</string>
+    <string name="every_x_days">Ամեն %d օրը մեկ</string>
+    <string name="every_x_weeks">Ամեն %d շաբաթը մեկ</string>
+    <string name="filter">Զտել</string>
+    <string name="habit">Սովորություն</string>
+    <string name="manually">Ձեռքով</string>
+    <string name="by_name">Անունով</string>
+    <string name="by_color">Գույնով</string>
+    <string name="calendar">Օրացույց</string>
+    <string name="unit">Միավոր</string>
+    <string name="question">Հարց</string>
+    <string name="yes">Այո</string>
+    <string name="no">Ոչ</string>
+    <string name="measurable">Չափելի</string>
+    <string name="x_times_per_week">Շաբաթական %d անգամ</string>
+    <string name="x_times_per_month">Ամսական %d անգամ</string>
+    <string name="color">Գույն</string>
+    <string name="today">Այսօր</string>
+</resources>
diff --git a/uhabits-android/src/main/res/values-in-rID/strings.xml b/uhabits-android/src/main/res/values-in-rID/strings.xml
index 8a75b12ac..fc5d023b6 100644
--- a/uhabits-android/src/main/res/values-in-rID/strings.xml
+++ b/uhabits-android/src/main/res/values-in-rID/strings.xml
@@ -71,7 +71,7 @@
     <string name="interval_always_ask">Selalu bertanya</string>
     <string name="interval_custom">Kustom...</string>
     <string name="pref_toggle_title">Tandai dengan cepat</string>
-    <string name="pref_toggle_description">Beri tanda centang dengan sekali ketuk bukan tekan-dan-tahan. Lebih nyaman, tapi dapat menyebabkan kesalahan penandaan.</string>
+    <string name="pref_toggle_description_2">Beri tanda centang dengan satu ketukan alih-alih tekan dan tahan.</string>
     <string name="pref_rate_this_app">Berikan rating aplikasi ini di Google Play</string>
     <string name="pref_send_feedback">Kirimkan umpan balik kepada Developer</string>
     <string name="pref_view_source_code">Lihat kode program di GitHub</string>
@@ -130,7 +130,7 @@
     <string name="generate_bug_report">Membuat laporan masalah</string>
     <string name="troubleshooting">Troubleshoot</string>
     <string name="help_translate">Bantu menerjemahkan aplikasi ini</string>
-    <string name="night_mode" comment="dark_theme">Mode malam</string>
+    <string name="night_mode">Mode malam</string>
     <string name="use_pure_black">Gunakan warna hitam pekat pada mode malam</string>
     <string name="pure_black_description">Ganti warna latar abu-abu dengan warna hitam pada mode malam. Mengurangi penggunaan baterai pada layar AMOLED.</string>
     <string name="interface_preferences">Antarmuka</string>
@@ -169,7 +169,6 @@
     <string name="by_status">Berdasarkan status</string>
     <string name="export">Ekspor</string>
     <string name="long_press_to_edit">Tekan-dan-tahan untuk mengubah nilai</string>
-    <string name="change_value">Ubah nilai (value)</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Unit</string>
     <string name="example_question_boolean">mis. Apakah kamu sudah berolahraga hari ini?</string>
@@ -193,6 +192,7 @@
     <string name="measurable_example">mis. Berapa km kamu berlari hari ini? Berapa lembar yang sudah kamu baca?</string>
     <string name="x_times_per_week">%d kali per minggu</string>
     <string name="x_times_per_month">%d kali per bulan</string>
+    <string name="x_times_per_y_days">%d kali dalam %d hari</string>
     <string name="yes_or_no_short_example">mis. Olahraga</string>
     <string name="color">Warna</string>
     <string name="example_target">mis. 15</string>
diff --git a/uhabits-android/src/main/res/values-it-rIT/strings.xml b/uhabits-android/src/main/res/values-it-rIT/strings.xml
index bf7a45773..bc1dd2885 100644
--- a/uhabits-android/src/main/res/values-it-rIT/strings.xml
+++ b/uhabits-android/src/main/res/values-it-rIT/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">Chiedi sempre</string>
     <string name="interval_custom">Personalizza...</string>
     <string name="pref_toggle_title">Spunta le ripetizioni velocemente</string>
-    <string name="pref_toggle_description">Metti le spunte con un tocco singolo invece che tenendo premuto. Più comodo, ma potrebbe causare delle spunte accidentali.</string>
+    <string name="pref_toggle_description_2">Metti i segni di spunta con un tocco rapido invece di tenere premuto.</string>
     <string name="pref_rate_this_app">Valuta quest\'app su Google Play</string>
     <string name="pref_send_feedback">Manda un feedback allo sviluppatore</string>
     <string name="pref_view_source_code">Vedi il codice sorgente su GitHub</string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">Genera bug report</string>
     <string name="troubleshooting">Risoluzione dei problemi</string>
     <string name="help_translate">Aiuta a tradurre questa app</string>
-    <string name="night_mode" comment="dark_theme">Modalità notte</string>
+    <string name="night_mode">Modalità notte</string>
     <string name="use_pure_black">Usa nero puro nella modalità notte</string>
     <string name="pure_black_description">Sostituisce gli sfondi grigi con sfondi neri nella modalità notte. Riduce il consumo di batteria nei dispositivi con schermo AMOLED.</string>
     <string name="interface_preferences">Interfaccia</string>
@@ -147,6 +147,7 @@
     <string name="none">Nessuno</string>
     <string name="filter">Filtra</string>
     <string name="hide_completed">Nascondi completati</string>
+    <string name="hide_entered">Nascondi inserito</string>
     <string name="hide_archived">Nascondi archiviati</string>
     <string name="sticky_notifications">Notifiche non rimuovibili</string>
     <string name="sticky_notifications_description">Impedisce di poter rimuovere le notifiche.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">Per stato</string>
     <string name="export">Esporta</string>
     <string name="long_press_to_edit">Tieni premuto per cambiare il valore</string>
-    <string name="change_value">Cambia valore</string>
+    <string name="value">Valore</string>
     <string name="calendar">Calendario</string>
     <string name="unit">Unità</string>
+    <string name="target_type">Tipo di destinazione</string>
+    <string name="target_type_at_least">Almeno</string>
+    <string name="target_type_at_most">Al massimo</string>
     <string name="example_question_boolean">ad es. Ti sei allenato oggi?</string>
     <string name="question">Domanda</string>
     <string name="target">Obiettivo</string>
@@ -190,6 +194,7 @@
     <string name="measurable_example">es. Quanti chilometri hai percorso oggi? Quante pagine hai letto?</string>
     <string name="x_times_per_week">%d volte a settimana</string>
     <string name="x_times_per_month">%d volte al mese</string>
+    <string name="x_times_per_y_days">%d volte in %d giorni</string>
     <string name="yes_or_no_short_example">ad es. Esercizio</string>
     <string name="color">Colore</string>
     <string name="example_target">ad es. 15</string>
diff --git a/uhabits-android/src/main/res/values-iw-rIL/strings.xml b/uhabits-android/src/main/res/values-iw-rIL/strings.xml
index c81a2d15e..ccc172e07 100644
--- a/uhabits-android/src/main/res/values-iw-rIL/strings.xml
+++ b/uhabits-android/src/main/res/values-iw-rIL/strings.xml
@@ -70,7 +70,7 @@
     <string name="intro_title_1">ברוך בואך</string>
     <string name="intro_description_1">‏„Loop למעקב אחר ההרגלים” מסייע לך ביצירה ובשימור הרגלים טובים.</string>
     <string name="intro_title_2">יצירת הרגלים חדשים</string>
-    <string name="intro_description_2">בכל יום, לאחר שביצעת את ההרגל, יש לסמן זאת ביישום.</string>
+    <string name="intro_description_2">בכל יום, לאחר ביצוע ההרגל, יש לסמן זאת ביישום.</string>
     <string name="intro_title_4">מעקב אחר ההתקדמות</string>
     <string name="intro_description_4">גרפים מפורטים מציגים כיצד ההרגלים שלך השתפרו לאורך זמן.</string>
     <string name="interval_15_minutes">15 דקות</string>
@@ -83,7 +83,6 @@
     <string name="interval_always_ask">תמיד לשאול</string>
     <string name="interval_custom">התאמה אישית...</string>
     <string name="pref_toggle_title">סימון הרגלים בלחיצה קצרה</string>
-    <string name="pref_toggle_description">סימון יעדים בהקשה קצרה במקום בלחיצה ממושכת. זה נוח יותר, אך יכול להוביל לסימוני הרגלים בטעות.</string>
     <string name="pref_rate_this_app">דירוג היישום ב־Google Play</string>
     <string name="pref_send_feedback">שליחת משוב למפתחים</string>
     <string name="pref_view_source_code">צפייה בקוד המקור ב־GitHub</string>
@@ -108,7 +107,7 @@
     </plurals>
     <string name="habit_not_found">ההרגל נמחק / לא נמצא</string>
     <string name="weekends">סופי שבוע</string>
-    <string name="any_weekday">ימי חול</string>
+    <string name="any_weekday">שני עד שישי</string>
     <string name="any_day">כל ימות השבוע</string>
     <string name="select_weekdays">בחירת ימים</string>
     <string name="export_to_csv">ייצוא כקובץ CSV</string>
@@ -139,7 +138,7 @@
     <string name="generate_bug_report">יצירת דו״ח תקלה</string>
     <string name="troubleshooting">פתרון תקלות</string>
     <string name="help_translate">עזרה בתרגום היישום</string>
-    <string name="night_mode" comment="dark_theme">ערכת נושא כהה</string>
+    <string name="night_mode">ערכת נושא כהה</string>
     <string name="use_pure_black">רקע שחור מוחלט בערכת הנושא הכהה</string>
     <string name="pure_black_description">להחלפת הרקע האפור בערכת הנושא הכהה לשחור מוחלט. זה מפחית את צריכת הסוללה במכשירים עם תצוגת AMOLED.</string>
     <string name="interface_preferences">ממשק</string>
@@ -178,7 +177,6 @@
     <string name="by_status">לפי מצב</string>
     <string name="export">ייצוא</string>
     <string name="long_press_to_edit">לחיצה והחזקה ישנו את הערך</string>
-    <string name="change_value">שינוי ערך</string>
     <string name="calendar">לוח שנה</string>
     <string name="unit">יחידה</string>
     <string name="example_question_boolean">למשל: האם התעמלת היום?</string>
@@ -202,6 +200,7 @@
     <string name="measurable_example">למשל: כמה קילומטרים רצת היום? כמה עמודים קראת?</string>
     <string name="x_times_per_week">%d פעמים בשבוע</string>
     <string name="x_times_per_month">%d פעמים בחודש</string>
+    <string name="x_times_per_y_days">%d פעמים ב- %d ימים</string>
     <string name="yes_or_no_short_example">למשל: התעמלות</string>
     <string name="color">צבע</string>
     <string name="example_target">למשל: 15</string>
diff --git a/uhabits-android/src/main/res/values-ja-rJP/strings.xml b/uhabits-android/src/main/res/values-ja-rJP/strings.xml
index 2debaa378..c016c08d6 100644
--- a/uhabits-android/src/main/res/values-ja-rJP/strings.xml
+++ b/uhabits-android/src/main/res/values-ja-rJP/strings.xml
@@ -37,6 +37,9 @@
     <plurals name="toast_habits_archived">
         <item quantity="other">習慣をアーカイブしました</item>
     </plurals>
+    <plurals name="toast_habits_unarchived">
+        <item quantity="other">習慣のアーカイブを解除しました</item>
+    </plurals>
     <string name="overview">概要</string>
     <string name="habit_strength">習慣の強さ</string>
     <string name="history">履歴</string>
@@ -68,7 +71,6 @@
     <string name="interval_always_ask">毎回選択する</string>
     <string name="interval_custom">カスタム...</string>
     <string name="pref_toggle_title">タップでチェックをON/OFF</string>
-    <string name="pref_toggle_description">長押しではなくシングルタップでチェックを付けます。より便利ですが、誤って切り替えが起こる可能性があります。</string>
     <string name="pref_rate_this_app">Google Play でこのアプリを評価</string>
     <string name="pref_send_feedback">開発者にフィードバックを送信</string>
     <string name="pref_view_source_code">GitHub でソースコードを参照</string>
@@ -118,7 +120,7 @@
     <string name="generate_bug_report">バグレポートの作成</string>
     <string name="troubleshooting">トラブルシューティング</string>
     <string name="help_translate">このアプリの翻訳を支援する</string>
-    <string name="night_mode" comment="dark_theme">ダークテーマ</string>
+    <string name="night_mode">ダークテーマ</string>
     <string name="use_pure_black">ダークテーマで完全な黒を使用する</string>
     <string name="pure_black_description">夜間モードで灰色の背景を完全な黒で置き換えます。AMOLED ディスプレイの電話でバッテリー使用量を抑えます。</string>
     <string name="interface_preferences">インターフェース</string>
@@ -157,7 +159,6 @@
     <string name="by_status">ステータス順</string>
     <string name="export">エクスポート</string>
     <string name="long_press_to_edit">長押しすると値を変更できます</string>
-    <string name="change_value">値を変更する</string>
     <string name="calendar">カレンダー</string>
     <string name="unit">単位</string>
     <string name="example_question_boolean">例：今日は運動しましたか？</string>
@@ -181,6 +182,7 @@
     <string name="measurable_example">例：今日は何キロ走ったの？何ページ読んだの？</string>
     <string name="x_times_per_week">1 週間に %d 回</string>
     <string name="x_times_per_month">1 か月に %d 回</string>
+    <string name="x_times_per_y_days">%d 回 %d 日</string>
     <string name="yes_or_no_short_example">例：運動</string>
     <string name="color">色</string>
     <string name="example_target">例：15</string>
@@ -192,5 +194,7 @@
     <string name="today">今日</string>
     <string name="enter">入力</string>
     <string name="no_habits">習慣が見つかりませんでした</string>
+    <string name="pref_skip_title">スキップ日を有効にする</string>
     <string name="you_are_now_a_developer">これで開発者になりました!</string>
+    <string name="activity_not_found">この操作を行うアプリが見つかりませんでした。</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-ko-rKR/strings.xml b/uhabits-android/src/main/res/values-ko-rKR/strings.xml
index 77a169a99..5394968e1 100644
--- a/uhabits-android/src/main/res/values-ko-rKR/strings.xml
+++ b/uhabits-android/src/main/res/values-ko-rKR/strings.xml
@@ -28,6 +28,18 @@
     <string name="add_habit">습관 추가하기</string>
     <string name="color_picker_default_title">색상 변경</string>
     <string name="toast_habit_created">습관이 생성되었습니다.</string>
+    <plurals name="toast_habits_changed">
+        <item quantity="other">습관이 변경되었습니다</item>
+    </plurals>
+    <plurals name="toast_habits_deleted">
+        <item quantity="other">습관이 삭제되었습니다</item>
+    </plurals>
+    <plurals name="toast_habits_archived">
+        <item quantity="other">습관이 보관 되었습니다 </item>
+    </plurals>
+    <plurals name="toast_habits_unarchived">
+        <item quantity="other">습관 보관이 취소되었습니다 </item>
+    </plurals>
     <string name="overview">한눈에 보기</string>
     <string name="habit_strength">습관 강도</string>
     <string name="history">이력</string>
@@ -36,6 +48,7 @@
     <string name="save">저장</string>
     <string name="streaks">연속</string>
     <string name="no_habits_found">활성화된 습관이 없습니다.</string>
+    <string name="no_habits_left_to_do">오늘 할 일을 모두 마쳤습니다 </string>
     <string name="long_press_to_toggle">체크하거나 해제하려면 길게 누르세요.</string>
     <string name="reminder_off">끔</string>
     <string name="create_habit">습관 만들기</string>
@@ -58,7 +71,6 @@
     <string name="interval_always_ask">항상 묻기</string>
     <string name="interval_custom">사용자 지정.</string>
     <string name="pref_toggle_title">짧게 눌러서 전환하기</string>
-    <string name="pref_toggle_description">길게 누르고 있는 대신에 짧은 탭 한 번으로 체크합니다. 더 편리하지만, 실수로 전환될 수도 있습니다.</string>
     <string name="pref_rate_this_app">Google Play에서 평가</string>
     <string name="pref_send_feedback">개발자에게 피드백 보내기</string>
     <string name="pref_view_source_code">Github에서 소스보기</string>
@@ -69,6 +81,12 @@
     <string name="hint_title">아시나요?</string>
     <string name="hint_drag">목록의 순서를 재배치하려면, 습관의 제목을 길게 누르고 다른 위치로 드래그하면 됩니다.</string>
     <string name="hint_landscape">가로 모드에서는 더 많은 날짜를 볼 수 있습니다.</string>
+    <plurals name="delete_habits_title">
+        <item quantity="other">습관을 삭제하시겠습니까?</item>
+    </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="other">습관을 영구적으로 삭제합니다. 삭제 후 취소할 수 없습니다.</item>
+    </plurals>
     <string name="habit_not_found">습관 삭제 / 찾을 수 없음</string>
     <string name="weekends">주말</string>
     <string name="any_weekday">주중</string>
@@ -102,7 +120,7 @@
     <string name="generate_bug_report">오류보고서 작성하기</string>
     <string name="troubleshooting">문제 해결</string>
     <string name="help_translate">이 앱의 번역을 도와주세요</string>
-    <string name="night_mode" comment="dark_theme">야간 모드</string>
+    <string name="night_mode">야간 모드</string>
     <string name="use_pure_black">야간 모드에서 검정색 사용하기</string>
     <string name="pure_black_description">야간 모드의 회색 배경을 검정색으로 대체합니다. AMOLED 디스플레이를 사용하는 기기에서 배터리 사용량을 감소시킵니다.</string>
     <string name="interface_preferences">인터페이스</string>
@@ -138,9 +156,9 @@
     <string name="by_name">이름 순으로</string>
     <string name="by_color">색상 순으로</string>
     <string name="by_score">점수 순으로</string>
+    <string name="by_status">상태별로</string>
     <string name="export">내보내기</string>
     <string name="long_press_to_edit">길게 누르면 값이 변경됩니다.</string>
-    <string name="change_value">값 변경</string>
     <string name="calendar">캘린더</string>
     <string name="unit">단위</string>
     <string name="example_question_boolean">예 : 오늘 운동을 했습니까?</string>
@@ -153,11 +171,21 @@
     <string name="pref_view_privacy">개인 정보 취급 방침 보기</string>
     <string name="view_all_contributors">모든 기여자보기&#8230;</string>
     <string name="database">데이터베이스</string>
+    <string name="widget_opacity_title">위젯 투명도</string>
+    <string name="widget_opacity_description">위젯을 홈 화면에서 더 투명하게 또는 더 불투명하게 합니다.</string>
     <string name="first_day_of_the_week">첫번째 요일</string>
     <string name="default_reminder_question">오늘 습관을 지키셨나요?</string>
     <string name="notes">메모</string>
     <string name="example_notes">(선택사항)</string>
+    <string name="yes_or_no_example">예) 오늘 일찍 일어났나요? 운동 하셨나요? 체스를 하셨나요?</string>
+    <string name="measurable">측정 가능한</string>
+    <string name="measurable_example">예) 오늘 몇 마일을 달렸습니까? 몇 페이지를 읽었습니까?</string>
+    <string name="x_times_per_week">일주일에 몇 번</string>
+    <string name="x_times_per_month">한 달에 몇 번</string>
+    <string name="x_times_per_y_days">%d 번 %d 일 동안</string>
+    <string name="yes_or_no_short_example">예) 운동</string>
     <string name="color">색</string>
+    <string name="example_target">예) 15</string>
     <string name="every_month">매월</string>
     <string name="today">오늘</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-nl-rNL/strings.xml b/uhabits-android/src/main/res/values-nl-rNL/strings.xml
index 7d2e8223f..c7314dcf7 100644
--- a/uhabits-android/src/main/res/values-nl-rNL/strings.xml
+++ b/uhabits-android/src/main/res/values-nl-rNL/strings.xml
@@ -71,7 +71,6 @@
     <string name="interval_always_ask">Altijd vragen</string>
     <string name="interval_custom">Aangepast...</string>
     <string name="pref_toggle_title">Wijzig herhalingen door kort indrukken</string>
-    <string name="pref_toggle_description">Zet vinkjes met een enkel tikje in plaats van ingedrukt houden. Handiger, maar kan onbedoelde wijzigingen veroorzaken.</string>
     <string name="pref_rate_this_app">Beoordeel deze app in Google Play</string>
     <string name="pref_send_feedback">Stuur feedback aan de ontwikkelaar</string>
     <string name="pref_view_source_code">Bekijk de broncode op GitHub</string>
@@ -115,7 +114,7 @@
     <string name="generate_bug_report">Genereer foutenrapport</string>
     <string name="troubleshooting">Probleemoplossing</string>
     <string name="help_translate">Help deze app te vertalen</string>
-    <string name="night_mode" comment="dark_theme">Nachtmodus</string>
+    <string name="night_mode">Nachtmodus</string>
     <string name="use_pure_black">Gebruik puur zwart bij het donkere thema</string>
     <string name="pure_black_description">Vervangt grijze achtergronden door puur zwart in het donkere thema. Vermindert batterijgebruik bij telefoons met AMOLED scherm.</string>
     <string name="interface_preferences">Interface</string>
@@ -154,9 +153,11 @@
     <string name="by_status">Per status</string>
     <string name="export">Exporteren</string>
     <string name="long_press_to_edit">Ingedrukt houden om de waarde te wijzigen</string>
-    <string name="change_value">Waarde wijzigen</string>
+    <string name="value">Waarde</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Eenheid</string>
+    <string name="target_type_at_least">Minimaal</string>
+    <string name="target_type_at_most">Maximaal</string>
     <string name="example_question_boolean">bijv. Heb je vandaag gesport?</string>
     <string name="question">Vraag</string>
     <string name="target">Doel</string>
@@ -178,6 +179,7 @@
     <string name="measurable_example">bijv. Hoeveel kilometer heb je vandaag gelopen? Hoeveel pagina\'s heb je gelezen?</string>
     <string name="x_times_per_week">%d keer per week</string>
     <string name="x_times_per_month">%d keer per maand</string>
+    <string name="x_times_per_y_days">%d keer in  %d dagen</string>
     <string name="yes_or_no_short_example">bijv. Sporten</string>
     <string name="color">Kleur</string>
     <string name="example_target">bijv. 15</string>
diff --git a/uhabits-android/src/main/res/values-no-rNO/strings.xml b/uhabits-android/src/main/res/values-no-rNO/strings.xml
index 6ed9097fd..16d054db8 100644
--- a/uhabits-android/src/main/res/values-no-rNO/strings.xml
+++ b/uhabits-android/src/main/res/values-no-rNO/strings.xml
@@ -57,7 +57,6 @@
     <string name="interval_24_hour">1 døgn</string>
     <string name="interval_custom">Egendefinert...</string>
     <string name="pref_toggle_title">Veksl med enkelttrykk</string>
-    <string name="pref_toggle_description">Sett på haker med et enkelttrykk i stedet for å tykke og holde. Mer praktisk, men kan forårsake utilsiktede vekslinger.</string>
     <string name="pref_rate_this_app">Vurdér denne appen på Google Play</string>
     <string name="pref_send_feedback">Send tilbakemelding til utviklerne</string>
     <string name="pref_view_source_code">Vis kildekode på GitHub</string>
@@ -100,7 +99,7 @@
     <string name="generate_bug_report">Generér feilrapport</string>
     <string name="troubleshooting">Feilsøkning</string>
     <string name="help_translate">Hjelp med å oversette denne appen</string>
-    <string name="night_mode" comment="dark_theme">Nattmodus</string>
+    <string name="night_mode">Nattmodus</string>
     <string name="use_pure_black">Bruk batterisparing i nattmodus</string>
     <string name="pure_black_description">Bytter ut grå bakgunner med helt svarte i nattmodus. Reduserer betteribruk hos telefoner med AMOLED-skjerm.</string>
     <string name="interface_preferences">Grensesnitt</string>
@@ -135,6 +134,6 @@
     <string name="by_color">Etter farge</string>
     <string name="by_score">Etter poengsum</string>
     <string name="export">Eksportér</string>
-    <string name="change_value">Endre verdi</string>
     <string name="question">Spørsmål</string>
+    <string name="x_times_per_y_days">%d ganger på %d dager</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-pl-rPL/strings.xml b/uhabits-android/src/main/res/values-pl-rPL/strings.xml
index 4768592d8..f658155cf 100644
--- a/uhabits-android/src/main/res/values-pl-rPL/strings.xml
+++ b/uhabits-android/src/main/res/values-pl-rPL/strings.xml
@@ -83,7 +83,7 @@
     <string name="interval_always_ask">Zawsze pytaj</string>
     <string name="interval_custom">Własne ustawienia...</string>
     <string name="pref_toggle_title">Przełącz powtarzanie krótkim naciśnięciem</string>
-    <string name="pref_toggle_description">Wygodniejsze, ale może spowodować przypadkowe przełączenia.</string>
+    <string name="pref_toggle_description_2">Umieść znaczniki wyboru jednym dotknięciem zamiast naciśnięcia i przytrzymania.</string>
     <string name="pref_rate_this_app">Oceń tę aplikację w Google Play</string>
     <string name="pref_send_feedback">Prześlij uwagi do programisty</string>
     <string name="pref_view_source_code">Zobacz kod źródłowy na GitHub\'ie</string>
@@ -139,7 +139,7 @@
     <string name="generate_bug_report">Wygeneruj raport o błędach</string>
     <string name="troubleshooting">Rozwiązywanie problemów</string>
     <string name="help_translate">Pomóż w tłumaczeniu tej aplikacji</string>
-    <string name="night_mode" comment="dark_theme">Tryb nocny</string>
+    <string name="night_mode">Tryb nocny</string>
     <string name="use_pure_black">Używaj pełnej czerni w trybie nocnym</string>
     <string name="pure_black_description">Zamienia szare tła na pełną czerń w trybie nocnym. Zmniejsza zużycie baterii w telefonach z ekranem AMOLED.</string>
     <string name="interface_preferences">Interfejs</string>
@@ -159,6 +159,7 @@
     <string name="none">Brak</string>
     <string name="filter">Filtruj</string>
     <string name="hide_completed">Ukryj zakończone</string>
+    <string name="hide_entered">Ukryj wprowadzone</string>
     <string name="hide_archived">Ukryj archiwizowane</string>
     <string name="sticky_notifications">Przypinaj powiadomienia</string>
     <string name="sticky_notifications_description">Zapobiega usunięciu powiadomień.</string>
@@ -178,9 +179,12 @@
     <string name="by_status">Według statusu</string>
     <string name="export">Eksportuj</string>
     <string name="long_press_to_edit">Naciśnij i przytrzymaj, aby zmienić wartość</string>
-    <string name="change_value">Zmień wartość</string>
+    <string name="value">Wartość</string>
     <string name="calendar">Kalendarz</string>
     <string name="unit">Jednostka</string>
+    <string name="target_type">Rodzaj celu:</string>
+    <string name="target_type_at_least">Co najmniej</string>
+    <string name="target_type_at_most">Maksymalnie</string>
     <string name="example_question_boolean">np. Czy ćwiczyłeś dzisiaj?</string>
     <string name="question">Pytanie</string>
     <string name="target">Cel</string>
@@ -202,6 +206,7 @@
     <string name="measurable_example">np. Ile mil przejechałeś dzisiaj? Ile stron przeczytałeś?</string>
     <string name="x_times_per_week">%d razy w tygodniu</string>
     <string name="x_times_per_month">%d razy w miesiącu</string>
+    <string name="x_times_per_y_days">%d razy w ciągu %d dni</string>
     <string name="yes_or_no_short_example">np. ćwiczenia</string>
     <string name="color">Kolor</string>
     <string name="example_target">np. 15</string>
diff --git a/uhabits-android/src/main/res/values-pt-rBR/strings.xml b/uhabits-android/src/main/res/values-pt-rBR/strings.xml
index ae07c2e04..6d3f95856 100644
--- a/uhabits-android/src/main/res/values-pt-rBR/strings.xml
+++ b/uhabits-android/src/main/res/values-pt-rBR/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Perguntar sempre</string>
     <string name="interval_custom">Personalizar...</string>
     <string name="pref_toggle_title">Marcar repetições com um toque curto</string>
-    <string name="pref_toggle_description">Mais conveniente, mas pode causar marcações acidentais</string>
     <string name="pref_rate_this_app">Avaliar esse app no Google Play</string>
     <string name="pref_send_feedback">Mandar sugestões para o desenvolvedor</string>
     <string name="pref_view_source_code">Ver código-fonte no GitHub</string>
@@ -127,7 +126,7 @@
     <string name="generate_bug_report">Gerar relatório de erros.</string>
     <string name="troubleshooting">Solução de problemas</string>
     <string name="help_translate">Ajude a traduzir este app</string>
-    <string name="night_mode" comment="dark_theme">Modo noturno</string>
+    <string name="night_mode">Modo noturno</string>
     <string name="use_pure_black">Usar preto em modo noturno</string>
     <string name="pure_black_description">Substitui os tons de cinza por preto puro em modo noturno. Economiza bateria em telefones com tela AMOLED.</string>
     <string name="interface_preferences">Interface</string>
@@ -166,7 +165,6 @@
     <string name="by_status">Por status</string>
     <string name="export">Exportar</string>
     <string name="long_press_to_edit">Pressione e segure para alterar o valor</string>
-    <string name="change_value">Alterar valor</string>
     <string name="calendar">Calendário</string>
     <string name="unit">Unidade</string>
     <string name="example_question_boolean">ex.: Você se exercitou hoje?</string>
@@ -190,6 +188,7 @@
     <string name="measurable_example">ex.: Quantos km você correu hoje? Quantas páginas você leu?</string>
     <string name="x_times_per_week">%d vezes por semana</string>
     <string name="x_times_per_month">%d vezes por mês</string>
+    <string name="x_times_per_y_days">%d vezes em %d dias</string>
     <string name="yes_or_no_short_example">ex: Exercício</string>
     <string name="color">Cor</string>
     <string name="example_target">Ex: 15</string>
diff --git a/uhabits-android/src/main/res/values-pt-rPT/strings.xml b/uhabits-android/src/main/res/values-pt-rPT/strings.xml
index 6d9b58162..374fded4c 100644
--- a/uhabits-android/src/main/res/values-pt-rPT/strings.xml
+++ b/uhabits-android/src/main/res/values-pt-rPT/strings.xml
@@ -58,7 +58,6 @@
     <string name="interval_always_ask">Perguntar sempre</string>
     <string name="interval_custom">Personalizar...</string>
     <string name="pref_toggle_title">Toque para alternar entre repetições</string>
-    <string name="pref_toggle_description">Mais conveniente, mas pode causar toques acidentais</string>
     <string name="pref_rate_this_app">Avaliar a app no Google Play</string>
     <string name="pref_send_feedback">Enviar feedback ao programador</string>
     <string name="pref_view_source_code">Ver código-fonte no GitHub</string>
@@ -102,7 +101,7 @@
     <string name="generate_bug_report">Gerar relatório de erros</string>
     <string name="troubleshooting">Resolução de problemas</string>
     <string name="help_translate">Ajude a traduzir esta aplicação</string>
-    <string name="night_mode" comment="dark_theme">Modo noturno</string>
+    <string name="night_mode">Modo noturno</string>
     <string name="use_pure_black">Usar preto puro no modo noturno</string>
     <string name="pure_black_description">Substitui os fundos cinzentos por pretos puros no modo noturno. Reduz a utilização da bateria em telemóveis com ecrã AMOLED.</string>
     <string name="interface_preferences">Interface</string>
@@ -140,7 +139,6 @@
     <string name="by_score">Por pontuação</string>
     <string name="export">Exportar</string>
     <string name="long_press_to_edit">Pressione e segure para alterar o valor</string>
-    <string name="change_value">Alterar o valor</string>
     <string name="calendar">Calendário</string>
     <string name="unit">Unidade</string>
     <string name="example_question_boolean">ex.: Você se exercitou hoje?</string>
@@ -163,6 +161,7 @@
     <string name="measurable">Mensurável</string>
     <string name="x_times_per_week">%d vezes por semana</string>
     <string name="x_times_per_month">%d vezes por mês</string>
+    <string name="x_times_per_y_days">%d vezes em %d dias</string>
     <string name="yes_or_no_short_example">ex. Exercício</string>
     <string name="color">Cor</string>
     <string name="example_target">ex. 15</string>
diff --git a/uhabits-android/src/main/res/values-ro-rRO/strings.xml b/uhabits-android/src/main/res/values-ro-rRO/strings.xml
index d4cc5a3f8..0062c1147 100644
--- a/uhabits-android/src/main/res/values-ro-rRO/strings.xml
+++ b/uhabits-android/src/main/res/values-ro-rRO/strings.xml
@@ -58,7 +58,6 @@
     <string name="interval_always_ask">Intreaba mereu</string>
     <string name="interval_custom">Diferit...</string>
     <string name="pref_toggle_title">Comută repetițiile printr-o apăsare scurtă</string>
-    <string name="pref_toggle_description">Mai convenabil, dar poate cauza comutări accidentale.</string>
     <string name="pref_rate_this_app">Evaluează aplicația pe Magazin Play</string>
     <string name="pref_send_feedback">Trimite păreri dezvoltatorului</string>
     <string name="pref_view_source_code">Vezi codul sursă pe GitHub</string>
@@ -102,7 +101,7 @@
     <string name="generate_bug_report">Generează raport de erori</string>
     <string name="troubleshooting">Depanare</string>
     <string name="help_translate">Ajută la traducerea aplicației</string>
-    <string name="night_mode" comment="dark_theme">Mod întunecat</string>
+    <string name="night_mode">Mod întunecat</string>
     <string name="use_pure_black">Utilizează modul întunecat</string>
     <string name="pure_black_description">Înlocuiește fundalurile gri cu negru pur în modul întunecat. Reduce utilizarea bateriei la telefoanele cu ecran AMOLED.</string>
     <string name="interface_preferences">Interfață</string>
@@ -140,7 +139,6 @@
     <string name="by_score">După scor</string>
     <string name="export">Exportă</string>
     <string name="long_press_to_edit">Ține apăsat pentru a modifica valoarea</string>
-    <string name="change_value">Modifică valoarea</string>
     <string name="calendar">Calendar</string>
     <string name="unit">Unități</string>
     <string name="example_question_boolean">ex.: Ai îndeplinit exerciții fizice azi?</string>
@@ -153,4 +151,5 @@
     <string name="pref_view_privacy">Consultați politica de confidențialitate</string>
     <string name="view_all_contributors">Vizualizați toți colaboratorii&#8230;</string>
     <string name="database">Bază de date</string>
+    <string name="x_times_per_y_days">%d ori în %d zile</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-ru-rRU/strings.xml b/uhabits-android/src/main/res/values-ru-rRU/strings.xml
index c5e0e3583..1916cb0a1 100644
--- a/uhabits-android/src/main/res/values-ru-rRU/strings.xml
+++ b/uhabits-android/src/main/res/values-ru-rRU/strings.xml
@@ -83,7 +83,7 @@
     <string name="interval_always_ask">Всегда спрашивать</string>
     <string name="interval_custom">Настроить...</string>
     <string name="pref_toggle_title">Отмечать коротким нажатием</string>
-    <string name="pref_toggle_description">Ставить галочки коротким нажатием вместо удержания. Удобнее, но может стать причиной случайных отметок.</string>
+    <string name="pref_toggle_description_2">Ставить галочки одним касанием вместо нажатия и удерживания.</string>
     <string name="pref_rate_this_app">Оценить приложение в Google Play</string>
     <string name="pref_send_feedback">Отправить сообщение разработчику</string>
     <string name="pref_view_source_code">Посмотреть исходный код на GitHub</string>
@@ -139,7 +139,7 @@
     <string name="generate_bug_report">Сгенерировать отчёт об ошибке</string>
     <string name="troubleshooting">Устранение неполадок</string>
     <string name="help_translate">Помогите перевести это приложение</string>
-    <string name="night_mode" comment="dark_theme">Ночной режим</string>
+    <string name="night_mode">Ночной режим</string>
     <string name="use_pure_black">Использовать подлинный чёрный в ночном режиме</string>
     <string name="pure_black_description">Заменяет серый фон на подлинный чёрный в ночном режиме. Сокращает расход батареи в телефонах с дисплеем AMOLED.</string>
     <string name="interface_preferences">Интерфейс</string>
@@ -159,6 +159,7 @@
     <string name="none">Без звука</string>
     <string name="filter">Фильтр</string>
     <string name="hide_completed">Скрыть завершённые</string>
+    <string name="hide_entered">Скрыть введённые</string>
     <string name="hide_archived">Скрыть архивированные</string>
     <string name="sticky_notifications">Сделать уведомления \"липкими\"</string>
     <string name="sticky_notifications_description">Предотвращает смахивание уведомлений.</string>
@@ -178,9 +179,12 @@
     <string name="by_status">По статусу</string>
     <string name="export">Экспортировать</string>
     <string name="long_press_to_edit">Нажмите и удерживайте, чтобы изменить значение</string>
-    <string name="change_value">Изменить значение</string>
+    <string name="value">Значение</string>
     <string name="calendar">Календарь</string>
     <string name="unit">Ед. изм.</string>
+    <string name="target_type">Тип цели</string>
+    <string name="target_type_at_least">Не меньше</string>
+    <string name="target_type_at_most">Не больше</string>
     <string name="example_question_boolean">напр.: Вы упражнялись сегодня?</string>
     <string name="question">Вопрос</string>
     <string name="target">Цель</string>
@@ -202,6 +206,7 @@
     <string name="measurable_example">напр.: Сколько км вы пробежали сегодня? Сколько страниц прочитали?</string>
     <string name="x_times_per_week">%d раз в неделю</string>
     <string name="x_times_per_month">%d раз в месяц</string>
+    <string name="x_times_per_y_days">%d раз в %d дней</string>
     <string name="yes_or_no_short_example">напр.: Поупражняться</string>
     <string name="color">Цвет</string>
     <string name="example_target">напр.: 15</string>
diff --git a/uhabits-android/src/main/res/values-sk-rSK/strings.xml b/uhabits-android/src/main/res/values-sk-rSK/strings.xml
index 6bf7b0e50..6838ff94d 100644
--- a/uhabits-android/src/main/res/values-sk-rSK/strings.xml
+++ b/uhabits-android/src/main/res/values-sk-rSK/strings.xml
@@ -28,6 +28,12 @@
     <string name="add_habit">Pridaj návyk</string>
     <string name="color_picker_default_title">Zmeniť farbu</string>
     <string name="toast_habit_created">Návyk vytvorený</string>
+    <plurals name="toast_habits_changed">
+        <item quantity="one">Návyk zmenený</item>
+        <item quantity="few">Návyky zmenené</item>
+        <item quantity="many">Návykov zmenených</item>
+        <item quantity="other">Návykov zmenených</item>
+    </plurals>
     <string name="overview">Prehľad</string>
     <string name="habit_strength">Sila návyku</string>
     <string name="history">História</string>
@@ -36,6 +42,7 @@
     <string name="save">Uložiť</string>
     <string name="streaks">Série</string>
     <string name="no_habits_found">Nemáte žiadne aktívne návyky</string>
+    <string name="no_habits_left_to_do">Na dnes máte všetko hotové!</string>
     <string name="long_press_to_toggle">Stlačením a podržaním začiarknite alebo zrušte začiarknutie políčka</string>
     <string name="reminder_off">Vypnuté</string>
     <string name="create_habit">Vytvoriť návyk</string>
@@ -58,7 +65,6 @@
     <string name="interval_always_ask">Vždy sa spýtať</string>
     <string name="interval_custom">Vlastné ...</string>
     <string name="pref_toggle_title">Prepnúť krátkym stlačením</string>
-    <string name="pref_toggle_description">Pridajte začiarknutie jediným klepnutím namiesto stlačenia a podržania. Je to pohodlnejšie, ale môže dôjsť k náhodným prepnutiam.</string>
     <string name="pref_rate_this_app">Ohodnoťte túto aplikáciu na Google Play</string>
     <string name="pref_send_feedback">Odošlite spätnú väzbu vývojárovi</string>
     <string name="pref_view_source_code">Zobraziť zdrojový kód na stránke GitHub</string>
@@ -102,7 +108,7 @@
     <string name="generate_bug_report">Vygenerujte hlásenie o chybe</string>
     <string name="troubleshooting">Riešenie problémov</string>
     <string name="help_translate">Pomôžte preložiť túto aplikáciu</string>
-    <string name="night_mode" comment="dark_theme">Tmavá téma</string>
+    <string name="night_mode">Tmavá téma</string>
     <string name="use_pure_black">Použite čisto čiernu farbu v tmavej téme</string>
     <string name="pure_black_description">Nahrádza sivé pozadie čisto čiernym v tmavej téme. Znižuje spotrebu batérie v telefónoch s displejom AMOLED.</string>
     <string name="interface_preferences">Rozhranie</string>
@@ -138,9 +144,9 @@
     <string name="by_name">Podľa názvu</string>
     <string name="by_color">Podľa farby</string>
     <string name="by_score">Podľa skóre</string>
+    <string name="by_status">Podľa stavu</string>
     <string name="export">Exportovať</string>
     <string name="long_press_to_edit">Stlačením a podržaním zmeníte hodnotu</string>
-    <string name="change_value">Zmeniť hodnotu</string>
     <string name="calendar">Kalendár</string>
     <string name="unit">Jednotka</string>
     <string name="example_question_boolean">napr. Cvičili ste dnes?</string>
@@ -161,15 +167,28 @@
     <string name="example_notes">(voliteľné)</string>
     <string name="yes_or_no_example">napr. Zobudili ste sa dnes skoro? Cvičili ste? Hrali ste šach?</string>
     <string name="measurable">Merateľné</string>
+    <string name="measurable_example">napr. Koľko kilometrov ste dnes nabehali? Koľko strán ste prečítali?</string>
     <string name="x_times_per_week">%d krát týždenne</string>
     <string name="x_times_per_month">%d krát za mesiac</string>
     <string name="yes_or_no_short_example">napr. Cvičenie</string>
     <string name="color">Farba</string>
     <string name="example_target">napr. 15</string>
     <string name="measurable_short_example">napr. Beh</string>
-    <string name="measurable_question_example">napr. Koľko míľ ste dnes prešli?</string>
-    <string name="measurable_units_example">napr. míle</string>
+    <string name="measurable_question_example">napr. Koľko kilometrov ste dnes prešli?</string>
+    <string name="measurable_units_example">napr. kilometre</string>
     <string name="every_month">Každý mesiac</string>
     <string name="validation_cannot_be_blank">Nemôže byť prázdne</string>
     <string name="today">Dnes</string>
+    <string name="enter">Zadať</string>
+    <string name="no_habits">Nenašli sa žiadne návyky</string>
+    <string name="no_numerical_habits">Nenašli sa žiadne merateľné návyky</string>
+    <string name="no_boolean_habits">Nenašli sa žiadne áno-alebo-nie návyky</string>
+    <string name="pref_skip_title">Povoliť preskočenie dní</string>
+    <string name="pref_skip_description">Dvojitým prepnutím pridáte namiesto začiarknutia preskočenie. Preskočenia udržia vaše skóre nezmenené a neprerušia vašu sériu.</string>
+    <string name="pref_unknown_title">Zobraziť otázniky pre chýbajúce údaje</string>
+    <string name="pref_unknown_description">Odlíšte dni bez údajov od skutočných prerušení. Ak chcete zadať prerušenie, dvakrát prepnite.</string>
+    <string name="you_are_now_a_developer">Teraz ste vývojár</string>
+    <string name="activity_not_found">Nenašla sa žiadna aplikácia podporujúca túto akciu</string>
+    <string name="pref_midnight_delay_title">Predĺžte deň o niekoľko hodín po polnoci</string>
+    <string name="pref_midnight_delay_description">Na zobrazenie nového dňa počkajte do 3:00. Užitočné, ak zvyčajne chodíte spať po polnoci. Vyžaduje reštart aplikácie.</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-sl-rSI/strings.xml b/uhabits-android/src/main/res/values-sl-rSI/strings.xml
index 295c68c85..6e1f450d5 100644
--- a/uhabits-android/src/main/res/values-sl-rSI/strings.xml
+++ b/uhabits-android/src/main/res/values-sl-rSI/strings.xml
@@ -56,7 +56,6 @@
     <string name="interval_8_hour">8 ur</string>
     <string name="interval_24_hour">24 ur</string>
     <string name="pref_toggle_title">Preklopi ponovitve s kratkim pritiskom</string>
-    <string name="pref_toggle_description">Bolj priročno ampak lahko povzroči nenamerne preklapljanje.</string>
     <string name="pref_rate_this_app">Oceni to aplikacijo na Google Play</string>
     <string name="pref_send_feedback">Pošlji povratne informacije razvijalcem</string>
     <string name="pref_view_source_code">Poglej izvorno kodo na GitHub</string>
@@ -99,7 +98,7 @@
     <string name="generate_bug_report">Ustvari poročilo o napakah</string>
     <string name="troubleshooting">Odpravljanje napak</string>
     <string name="help_translate">Pomagajte prevesti to aplikacijo</string>
-    <string name="night_mode" comment="dark_theme">Nočni način</string>
+    <string name="night_mode">Nočni način</string>
     <string name="use_pure_black">Uporabite popolno črnino v nočnem načinu</string>
     <string name="pure_black_description">Zamenja siva ozadja s popolno črnino v nočnem načinu. Zmanjša porabo baterije na telefonih z AMOLED zasloni.</string>
     <string name="interface_preferences">Vmesnik</string>
@@ -133,4 +132,5 @@
     <string name="by_color">Po barvi</string>
     <string name="by_score">Po rezultatu</string>
     <string name="export">Izvozi</string>
+    <string name="x_times_per_y_days">%d krat v %d dni</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-sr-rCS/strings.xml b/uhabits-android/src/main/res/values-sr-rCS/strings.xml
index 0c6758362..fd7a8fcbf 100644
--- a/uhabits-android/src/main/res/values-sr-rCS/strings.xml
+++ b/uhabits-android/src/main/res/values-sr-rCS/strings.xml
@@ -79,7 +79,6 @@
     <string name="interval_always_ask">Uvek pitaj</string>
     <string name="interval_custom">Prilagođeno...</string>
     <string name="pref_toggle_title">Menjaj stanje dodirom</string>
-    <string name="pref_toggle_description">Stavlja kvačice dodirom umesto dugog pritiska. Zgodnije, ali može slučajno doći do prebacivanja.</string>
     <string name="pref_rate_this_app">Oceni aplikaciju</string>
     <string name="pref_send_feedback">Povratne informacije</string>
     <string name="pref_view_source_code">Izvorni kôd na Githabu</string>
@@ -133,7 +132,7 @@
     <string name="generate_bug_report">Napravi izveštaj o grešci</string>
     <string name="troubleshooting">Rešavanje problema</string>
     <string name="help_translate">Pomozite prevođenje</string>
-    <string name="night_mode" comment="dark_theme">Tamna tema</string>
+    <string name="night_mode">Tamna tema</string>
     <string name="use_pure_black">Čista crna u tamnoj temi</string>
     <string name="pure_black_description">Menja sivu pozadinu sa čistom crnom u tamnoj temi. Smanjuje potrošnju baterije kod telefona sa AMOLED ekranom.</string>
     <string name="interface_preferences">Sučelje</string>
@@ -172,7 +171,6 @@
     <string name="by_status">po stanju</string>
     <string name="export">Izvoz</string>
     <string name="long_press_to_edit">Dug pritisak za promenu vrednosti</string>
-    <string name="change_value">Izmeni vrednost</string>
     <string name="calendar">Kalendar</string>
     <string name="unit">Jedinica</string>
     <string name="example_question_boolean">npr. Da li ste vežbali danas?</string>
diff --git a/uhabits-android/src/main/res/values-sr-rSP/strings.xml b/uhabits-android/src/main/res/values-sr-rSP/strings.xml
index 95e931888..cb73a795e 100644
--- a/uhabits-android/src/main/res/values-sr-rSP/strings.xml
+++ b/uhabits-android/src/main/res/values-sr-rSP/strings.xml
@@ -79,7 +79,6 @@
     <string name="interval_always_ask">Увек питај</string>
     <string name="interval_custom">Прилагођено...</string>
     <string name="pref_toggle_title">Мењај стање додиром</string>
-    <string name="pref_toggle_description">Ставља квачице додиром уместо дугог притиска. Згодније, али може случајно доћи до пребацивања.</string>
     <string name="pref_rate_this_app">Оцени апликацију</string>
     <string name="pref_send_feedback">Повратне информације</string>
     <string name="pref_view_source_code">Изворни кôд на Гитхабу</string>
@@ -133,7 +132,7 @@
     <string name="generate_bug_report">Направи извештај о грешци</string>
     <string name="troubleshooting">Решавање проблема</string>
     <string name="help_translate">Помозите превођење</string>
-    <string name="night_mode" comment="dark_theme">Тамна тема</string>
+    <string name="night_mode">Тамна тема</string>
     <string name="use_pure_black">Чиста црна у тамној теми</string>
     <string name="pure_black_description">Мења сиву позадину са чистом црном у тамној теми. Смањује потрошњу батерије код телефона са АМОЛЕД екраном.</string>
     <string name="interface_preferences">Сучеље</string>
@@ -172,7 +171,6 @@
     <string name="by_status">по стању</string>
     <string name="export">Извоз</string>
     <string name="long_press_to_edit">Дуг притисак за промену вредности</string>
-    <string name="change_value">Измени вредност</string>
     <string name="calendar">Календар</string>
     <string name="unit">Јединица</string>
     <string name="example_question_boolean">нпр. Да ли сте вежбали данас?</string>
@@ -196,6 +194,7 @@
     <string name="measurable_example">нпр. Колико сте километара претрчали данас? Колико сте страница прочитали?</string>
     <string name="x_times_per_week">%d пута недељно</string>
     <string name="x_times_per_month">%d пута месечно</string>
+    <string name="x_times_per_y_days">%d пута у %d дана</string>
     <string name="yes_or_no_short_example">нпр. вежбање</string>
     <string name="color">Боја</string>
     <string name="example_target">нпр. 15</string>
diff --git a/uhabits-android/src/main/res/values-sv-rSE/strings.xml b/uhabits-android/src/main/res/values-sv-rSE/strings.xml
index e0586ca77..26fb08024 100644
--- a/uhabits-android/src/main/res/values-sv-rSE/strings.xml
+++ b/uhabits-android/src/main/res/values-sv-rSE/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Fråga alltid</string>
     <string name="interval_custom">Anpassad...</string>
     <string name="pref_toggle_title">Växla med snabb tryckning</string>
-    <string name="pref_toggle_description">Markera genom att trycka snabbt istället för att hålla ner. Mer bekvämt, men kan orsaka oavsiktliga aktiveringar.</string>
     <string name="pref_rate_this_app">Betygsätt oss på Google Play</string>
     <string name="pref_send_feedback">Skicka feedback till utvecklarna</string>
     <string name="pref_view_source_code">Visa källkod på GitHub</string>
@@ -136,7 +135,7 @@
     <string name="generate_bug_report">Generera felrapport</string>
     <string name="troubleshooting">Felsökning</string>
     <string name="help_translate">Hjälp till att översätta appen</string>
-    <string name="night_mode" comment="dark_theme">Nattläge</string>
+    <string name="night_mode">Nattläge</string>
     <string name="use_pure_black">Använd svart färg i nattläge</string>
     <string name="pure_black_description">Ersätter gråa bakgrunder med svart färg i nattläge. Reducerar batterianvändningen för telefoner med AMOLED-skärm.</string>
     <string name="interface_preferences">Gränssnitt</string>
@@ -175,7 +174,6 @@
     <string name="by_status">Efter status</string>
     <string name="export">Exportera</string>
     <string name="long_press_to_edit">Tryck och håll ned för att ändra värdet</string>
-    <string name="change_value">Ändra värde</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Enhet</string>
     <string name="example_question_boolean">t.ex. Tränade du idag?</string>
@@ -199,6 +197,7 @@
     <string name="measurable_example">t.ex. Hur många kilometer sprang du idag? Hur många sidor läste du?</string>
     <string name="x_times_per_week">%d gånger per vecka</string>
     <string name="x_times_per_month">%d gånger per månad</string>
+    <string name="x_times_per_y_days">%d gånger i %d dagar</string>
     <string name="yes_or_no_short_example">t.ex. Träna</string>
     <string name="color">Färg</string>
     <string name="example_target">t.ex. 15</string>
diff --git a/uhabits-android/src/main/res/values-ta-rIN/strings.xml b/uhabits-android/src/main/res/values-ta-rIN/strings.xml
index d8ecdd40c..3b1c16a18 100644
--- a/uhabits-android/src/main/res/values-ta-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-ta-rIN/strings.xml
@@ -57,7 +57,6 @@
     <string name="interval_24_hour">24 மணி நேரம்</string>
     <string name="interval_always_ask">எப்போதும் கேள்</string>
     <string name="pref_toggle_title">சிறிய அழுத்தலின் மூலம் தாவு</string>
-    <string name="pref_toggle_description">சரிப் பார்ப்பு குறி யை இட அழுத்தி பிடிப்பதற்கு பதில் ஒரு முறை தட்டலாம். இது முன்னதை விட எளிமையானது. ஆனால் இது தற்செயலான தாவல்களுக்கு வழி வகுக்கும்.</string>
     <string name="pref_rate_this_app">Google Play-ல் இந்த செயலியை மதிப்பிட</string>
     <string name="pref_send_feedback">இந்த செயலியை மேம்படுத்த உங்கள் கருத்துகளை பகிர</string>
     <string name="pref_view_source_code">இந்த செயலியின் மூல நிரலை GitHub வலைதளத்தில் பார்க்கவும்</string>
@@ -100,7 +99,7 @@
     <string name="generate_bug_report">பிழை அறிக்கை உருவாக்கு</string>
     <string name="troubleshooting">பழுது இடமறிதல்</string>
     <string name="help_translate">இந்த செயலியை மற்ற மொழிகளில் மொழிபெயர்க்க உதவி செய்யவும்</string>
-    <string name="night_mode" comment="dark_theme">இருள் வண்ண பாங்கு</string>
+    <string name="night_mode">இருள் வண்ண பாங்கு</string>
     <string name="use_pure_black">இருள் பாங்கில் முழு கருப்பு நிறத்தை பயண்படுத்து</string>
     <string name="pure_black_description">இதன் மூலம் செயலியில் உள்ள பழுப்பு பின்புலங்கள் நீக்கப்பட்டு முழுவதும் கருப்பு நிற பின்புலங்களாக மாற்றப்படும். இது AMOLED திரை கொண்ட கைப்பேசிகளில் மின்கல பயன்பாட்டை குறைக்கும்.</string>
     <string name="interface_preferences">இடைமுகம்</string>
@@ -135,4 +134,5 @@
     <string name="by_color">நிறத்தின் மூலம்</string>
     <string name="by_score">மதிப்பெண்களின் மூலம்</string>
     <string name="export">ஏற்றுமதி</string>
+    <string name="x_times_per_y_days">%d காலங்களில் %d நாட்கள்</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-te-rIN/strings.xml b/uhabits-android/src/main/res/values-te-rIN/strings.xml
index 60fab75e4..56acf23a0 100644
--- a/uhabits-android/src/main/res/values-te-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-te-rIN/strings.xml
@@ -18,6 +18,7 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="app_name">Datasheet </string>
     <string name="main_activity_title">అలవాట్లు</string>
     <string name="action_settings">సెట్టింగులు</string>
     <string name="edit">మార్చు</string>
diff --git a/uhabits-android/src/main/res/values-tr-rTR/strings.xml b/uhabits-android/src/main/res/values-tr-rTR/strings.xml
index cc63aeba7..ac985b368 100644
--- a/uhabits-android/src/main/res/values-tr-rTR/strings.xml
+++ b/uhabits-android/src/main/res/values-tr-rTR/strings.xml
@@ -18,7 +18,7 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Loop Alışkanlık Takibi</string>
+    <string name="app_name">Loop - Alışkanlık Takip Uygulaması</string>
     <string name="main_activity_title">Alışkanlıklar</string>
     <string name="action_settings">Ayarlar</string>
     <string name="edit">Düzenle</string>
@@ -52,18 +52,19 @@
     <string name="save">Kaydet</string>
     <string name="streaks">Seriler</string>
     <string name="no_habits_found">Etkin alışkanlığın yok</string>
+    <string name="no_habits_left_to_do">Bugünlük bu kadar!</string>
     <string name="long_press_to_toggle">İşaretlemek veya işareti kaldırmak için basılı tut</string>
     <string name="reminder_off">Kapalı</string>
     <string name="create_habit">Alışkanlık oluştur</string>
-    <string name="edit_habit">Alışkanlık düzenle</string>
+    <string name="edit_habit">Alışkanlığı düzenle</string>
     <string name="check">İşaretle</string>
     <string name="snooze">Sonra</string>
     <string name="intro_title_1">Hoşgeldin</string>
     <string name="intro_description_1">Loop Alışkanlık Takibi, iyi alışkanlıklar edinmene ve sürdürmene yardımcı olur.</string>
-    <string name="intro_title_2">Yeni alışkanlıklar oluşturun</string>
-    <string name="intro_description_2">Alışkanlığınızı gerçekleştirdikten sonra her gün uygulamada yapıldı işareti koyun.</string>
-    <string name="intro_title_4">Gelişimini izle</string>
-    <string name="intro_description_4">Detaylı grafiklerle, zaman içinde alışkanlıklarının nasıl geliştiğini gör.</string>
+    <string name="intro_title_2">Yeni alışkanlıklar oluştur</string>
+    <string name="intro_description_2">Alışkanlığın gerçekleştiği günleri işaretle.</string>
+    <string name="intro_title_4">Gelişimini takip et</string>
+    <string name="intro_description_4">Ayrıntılı tablolarla katettiğin ilerlemeyi gör.</string>
     <string name="interval_15_minutes">15 dakika</string>
     <string name="interval_30_minutes">30 dakika</string>
     <string name="interval_1_hour">1 saat</string>
@@ -73,29 +74,32 @@
     <string name="interval_24_hour">24 saat</string>
     <string name="interval_always_ask">Her zaman sor</string>
     <string name="interval_custom">Özel...</string>
-    <string name="pref_toggle_title">Tek dokunuşla işaretle veya işareti kaldır</string>
-    <string name="pref_toggle_description">Alışkanlıklarınızı, uzun dokunuş yerine tek dokunuşla işaretlemenizi sağlar. Kullanımı daha kolaydır ancak hatalı olarak işaretleme yapılmasına neden olabilir.</string>
+    <string name="pref_toggle_title">Tek dokunuşla işaretle</string>
     <string name="pref_rate_this_app">Google Play\'de uygulamayı oyla</string>
     <string name="pref_send_feedback">Geliştiriciye geri bildirim gönder</string>
-    <string name="pref_view_source_code">Github\'da kaynak kodunu gör</string>
+    <string name="pref_view_source_code">Github\'da kaynak kodunu görüntüle</string>
     <string name="links">Bağlantılar</string>
-    <string name="name">Ad</string>
+    <string name="name">Alışkanlık ismi</string>
     <string name="settings">Ayarlar</string>
     <string name="select_snooze_delay">Erteleme süresini ayarla</string>
     <string name="hint_title">Biliyor muydun?</string>
     <string name="hint_drag">Girdileri sıralamak için, alışkanlık adının üstüne basılı tut ve doğru yere sürükle.</string>
-    <string name="hint_landscape">Cihazınızı yatay tutarak daha fazla gün görüntüleyebilirsiniz.</string>
+    <string name="hint_landscape">Daha fazla gün görüntülemek için cihazını yatay tut.</string>
     <plurals name="delete_habits_title">
         <item quantity="one">Alışkanlık silinsin mi?</item>
         <item quantity="other">Alışkanlıklar silinsin mi?</item>
     </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="one">Alışkanlık kalıcı olarak silinecek. Bu işlem geri alınamaz.</item>
+        <item quantity="other">Alışkanlıklar kalıcı olarak silinecek. Bu işlem geri alınamaz.</item>
+    </plurals>
     <string name="habit_not_found">Alışkanlık silinmiş ya da bulunamadı</string>
     <string name="weekends">Hafta sonları</string>
     <string name="any_weekday">Pazartesinden Cumaya</string>
     <string name="any_day">Haftanın herhangi bir günü</string>
     <string name="select_weekdays">Günleri seç</string>
     <string name="export_to_csv">CSV olarak dışa aktar</string>
-    <string name="done_label">Tamam</string>
+    <string name="done_label">Seç</string>
     <string name="clear_label">Temizle</string>
     <string name="select_hours">Saat seç</string>
     <string name="select_minutes">Dakika seç</string>
@@ -115,14 +119,14 @@
     <string name="habits_imported">Alışkanlıklar başarıyla içeri aktarıldı.</string>
     <string name="import_data">İçeri veri aktar</string>
     <string name="export_full_backup">Tüm yedeği dışarı aktar</string>
-    <string name="import_data_summary">Hem bu uygulama tarafından dışarı aktarılmış tam yedekleri, hem de Tickmate, HabitBull veya Rewire tarafından üretilmiş dosyaları destekler. Daha fazla bilgi için SSS\'a başvurun.</string>
-    <string name="export_as_csv_summary">Üretilen dosyalar, Microsoft Excel veya OpenOffice Calc. gibi hesap taplosu uygulamaları ile açılabilir. Bu dosya yeniden içeri aktarılamaz.</string>
-    <string name="export_full_backup_summary">Tüm verilerini içeren bir dosya üretir. Bu dosya yeniden içeri aktarılabilir.</string>
+    <string name="import_data_summary">Loop tarafından oluşturulan yedeklemelerin yanı sıra Tickmate, HabitBull veya Rewire tarafından oluşturulan yedeklemeler da desteklenir. Detaylı bilgi için SSS bölümüne bak.</string>
+    <string name="export_as_csv_summary">Microsoft Excel veya OpenOffice Calc. tarafından açılabilen bir dosya oluşturur. Bu dosya tekrar içeri aktarılamaz.</string>
+    <string name="export_full_backup_summary">Tüm verilerini içeren bir dosya oluştur. Bu dosya tekrar içeri aktarılabilir.</string>
     <string name="bug_report_failed">Hata raporu oluşturulamadı.</string>
     <string name="generate_bug_report">Hata raporu oluştur</string>
     <string name="troubleshooting">Sorun Giderme</string>
-    <string name="help_translate">Bu uygulamanın çevirisine yardım et</string>
-    <string name="night_mode" comment="dark_theme">Gece modu</string>
+    <string name="help_translate">Bu uygulamanın çevirisinde yardım et</string>
+    <string name="night_mode">Gece modu</string>
     <string name="use_pure_black">Gece modunda saf siyah kullan</string>
     <string name="pure_black_description">Gece modunda gri arkaplanı saf siyah ile değiştirir. AMOLED ekranlı cihazlarda pil kullanımını azaltır.</string>
     <string name="interface_preferences">Arayüz</string>
@@ -144,9 +148,9 @@
     <string name="hide_completed">Tamamlananları gizle</string>
     <string name="hide_archived">Arşivlenenleri gizle</string>
     <string name="sticky_notifications">Bildirimleri kalıcı yap</string>
-    <string name="sticky_notifications_description">Bildirimlerin kaydırılarak temizlenmesini engelle.</string>
+    <string name="sticky_notifications_description">Bildirimlerin kaydırılmasını engeller.</string>
     <string name="led_notifications">Bildirim ışığı</string>
-    <string name="led_notifications_description">Hatırlatıcılar için yanıp sönen bir ışık gösterir. Yalnızca LED bildirim ışıklarına sahip telefonlarda mevcuttur.</string>
+    <string name="led_notifications_description">Hatırlatıcılar için yanıp sönen bir ışık gösterir. Yalnızca LED bildirim ışığı olan telefonlarda kullanılabilir.</string>
     <string name="repair_database">Veritabanını onar</string>
     <string name="database_repaired">Veritabanı onarıldı.</string>
     <string name="uncheck">İşareti kaldır</string>
@@ -158,38 +162,54 @@
     <string name="by_name">Ada göre</string>
     <string name="by_color">Renge göre</string>
     <string name="by_score">Puana göre</string>
+    <string name="by_status">Duruma göre</string>
     <string name="export">Dışarı aktar</string>
-    <string name="long_press_to_edit">Değeri değiştirmek için basılı tutun</string>
-    <string name="change_value">Değeri değiştir</string>
+    <string name="long_press_to_edit">Değeri değiştirmek için basılı tut</string>
     <string name="calendar">Takvim</string>
     <string name="unit">Birim</string>
-    <string name="example_question_boolean">Örneğin, Bugün spor yaptım mı?</string>
+    <string name="example_question_boolean">örn: Bugün egzersiz yaptın mı?</string>
     <string name="question">Soru</string>
     <string name="target">Hedef</string>
     <string name="yes">Evet</string>
     <string name="no">Hayır</string>
-    <string name="customize_notification_summary">Ses, titreşim, ışık ve diğer bildirim ayarlarını değiştirin</string>
+    <string name="customize_notification_summary">Ses, titreşim, ışık ve diğer bildirim ayarlarını değiştir</string>
     <string name="customize_notification">Bildirimleri özelleştir</string>
-    <string name="pref_view_privacy">Gizlilik politikasını görüntüleyin</string>
-    <string name="view_all_contributors">Tüm katkıda bulunanları görüntüle&#8230;</string>
+    <string name="pref_view_privacy">Gizlilik politikasını görüntüle</string>
+    <string name="view_all_contributors">Katkıda bulunanları görüntüle&#8230;</string>
     <string name="database">Veritabanı</string>
     <string name="widget_opacity_title">Widget saydamlığı</string>
-    <string name="widget_opacity_description">Ana ekranınızda widget\'ları daha saydam veya daha opak hale getirir.</string>
+    <string name="widget_opacity_description">Ana ekrandaki widget\'ları daha saydam veya daha opak hâle getir.</string>
     <string name="first_day_of_the_week">Haftanın ilk günü</string>
-    <string name="default_reminder_question">Bu alışkanlığı bugün tamamladın mı?</string>
+    <string name="default_reminder_question">Bugün bu alışkanlığı tamamladın mı?</string>
     <string name="notes">Notlar</string>
-    <string name="example_notes">(Tercihe bağlı)</string>
-    <string name="yes_or_no_example">Örneğin,  Bugün erken uyandın mı? Spor yaptın mı? Satranç oynadın mı?</string>
+    <string name="example_notes">(isteğe bağlı)</string>
+    <string name="yes_or_no_example">örn: Bugün erken kalktın mı? Egzersiz yaptın mı? Satranç oynadın mı?</string>
     <string name="measurable">Ölçülebilir</string>
+    <string name="measurable_example">örn: Bugün kaç km koştun? Bugün kaç sayfa kitap okudun?</string>
     <string name="x_times_per_week">Haftada %d kez</string>
     <string name="x_times_per_month">Ayda %d kez</string>
-    <string name="yes_or_no_short_example">Örneğin, Spor</string>
+    <string name="x_times_per_y_days">%d defa / %d gün</string>
+    <string name="yes_or_no_short_example">örn: Egzersiz</string>
     <string name="color">Renk</string>
-    <string name="example_target">Ör. 15</string>
-    <string name="measurable_short_example">Örneğin, Koşu</string>
-    <string name="measurable_question_example">Örneğin, Bugün kaç km. koştunuz?</string>
-    <string name="measurable_units_example">Örneğin, Km.</string>
+    <string name="example_target">örn: 15</string>
+    <string name="measurable_short_example">örn: Kitap</string>
+    <string name="measurable_question_example">örn: Bugün kaç sayfa kitap okudun?</string>
+    <string name="measurable_units_example">örn: Sayfa</string>
     <string name="every_month">Her ay</string>
     <string name="validation_cannot_be_blank">Boş bırakılamaz</string>
     <string name="today">Bugün</string>
+    <string name="enter">Değer gir</string>
+    <string name="no_habits">Alışkanlık bulunamadı</string>
+    <string name="no_numerical_habits">Ölçülebilir alışkanlık bulunamadı</string>
+    <string name="no_boolean_habits">İşaretlemeli alışkanlık bulunamadı</string>
+    <string name="increment">Artış</string>
+    <string name="decrement">Azalma</string>
+    <string name="pref_skip_title">Gün atlama özelliğini etkinleştir</string>
+    <string name="pref_skip_description">Gün atlamak için ikinci kez işaretleme yapın. Atlanmış günler puanınızı etkilemez ve serinizi bozmaz.</string>
+    <string name="pref_unknown_title">Eksik verileri soru işaretiyle göster</string>
+    <string name="pref_unknown_description">Eksik verilerle boş günleri ayırt etmenizde yardımcı olur. Boş gün girmek için iki kere işaretleme yapın.</string>
+    <string name="you_are_now_a_developer">Artık bir geliştiricisin</string>
+    <string name="activity_not_found">Bu işlemi gerçekleştirebilecek bir uygulama bulunamadı.</string>
+    <string name="pref_midnight_delay_title">Yeni günü gece yarısından birkaç saat sonra başlat</string>
+    <string name="pref_midnight_delay_description">Yeni gün saat 03:00\'ten sonra başlar. Geç saatlerde uyuyanlar için kullanışlıdır. Uygulamanın yeniden başlatılmasını gerektirir.</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-uk-rUA/strings.xml b/uhabits-android/src/main/res/values-uk-rUA/strings.xml
index e33911ce0..0b5865660 100644
--- a/uhabits-android/src/main/res/values-uk-rUA/strings.xml
+++ b/uhabits-android/src/main/res/values-uk-rUA/strings.xml
@@ -83,7 +83,6 @@
     <string name="interval_always_ask">Завжди запитувати</string>
     <string name="interval_custom">Налаштувати...</string>
     <string name="pref_toggle_title">Відзначати коротким натисканням</string>
-    <string name="pref_toggle_description">Ставити пташки коротким натисканням, замість утримування. Дещо зручніше, але може стати причиною випадкових натискань.</string>
     <string name="pref_rate_this_app">Оцінити цю програму в Google Play</string>
     <string name="pref_send_feedback">Надіслати відгук розробникові</string>
     <string name="pref_view_source_code">Подивитися вихідний код на GitHub</string>
@@ -148,7 +147,7 @@
     <string name="generate_bug_report">Створити звіт про помилку</string>
     <string name="troubleshooting">Усунення несправностей</string>
     <string name="help_translate">Допоможіть перекласти цю програму</string>
-    <string name="night_mode" comment="dark_theme">Нічний режим</string>
+    <string name="night_mode">Нічний режим</string>
     <string name="use_pure_black">Користати цілком чорне тло у нічному режимі</string>
     <string name="pure_black_description">Замінює сіре тло на цілком чорне у нічному режимі. Зменшує використання батареї в телефонах із дисплеєм AMOLED.</string>
     <string name="interface_preferences">Оболонка</string>
@@ -187,7 +186,7 @@
     <string name="by_status">За станом</string>
     <string name="export">Експортувати</string>
     <string name="long_press_to_edit">Натисніть і утримуйте, аби змінити значення</string>
-    <string name="change_value">Змінити значення</string>
+    <string name="value">Значення</string>
     <string name="calendar">Календар</string>
     <string name="unit">Одиниця</string>
     <string name="example_question_boolean">напр.: Ви робили сьогодні вправи?</string>
@@ -211,6 +210,7 @@
     <string name="measurable_example">напр.: Скільки кілометрів ви сьогодні пробігли? Скільки сторінок прочитали?</string>
     <string name="x_times_per_week">%d разів на тиждень</string>
     <string name="x_times_per_month">%d разів на місяць</string>
+    <string name="x_times_per_y_days">%d разів за %d днів</string>
     <string name="yes_or_no_short_example">напр., вправа</string>
     <string name="color">Колір</string>
     <string name="example_target">напр., 15</string>
diff --git a/uhabits-android/src/main/res/values-vi-rVN/strings.xml b/uhabits-android/src/main/res/values-vi-rVN/strings.xml
index 82006cd8f..98d03b750 100644
--- a/uhabits-android/src/main/res/values-vi-rVN/strings.xml
+++ b/uhabits-android/src/main/res/values-vi-rVN/strings.xml
@@ -71,7 +71,7 @@
     <string name="interval_always_ask">Luôn hỏi</string>
     <string name="interval_custom">Tùy chỉnh...</string>
     <string name="pref_toggle_title">Bấm nhanh để chuyển trạng thái</string>
-    <string name="pref_toggle_description">Chỉ cần chạm một lần để đánh dấu thay cho việc nhấn giữ. Tiện lợi hơn nhưng có thể đánh dấu sai.</string>
+    <string name="pref_toggle_description_2">Đặt dấu kiểm bằng một lần nhấn thay vì nhấn và giữ.</string>
     <string name="pref_rate_this_app">Đánh giá ứng dụng trên Google Play</string>
     <string name="pref_send_feedback">Gửi phản hồi cho nhà phát triển</string>
     <string name="pref_view_source_code">Xem mã nguồn trên Github</string>
@@ -121,7 +121,7 @@
     <string name="generate_bug_report">Tạo báo cáo lỗi</string>
     <string name="troubleshooting">Xử lí sự cố</string>
     <string name="help_translate">Giúp dịch ứng dụng</string>
-    <string name="night_mode" comment="dark_theme">Chế độ ban đêm</string>
+    <string name="night_mode">Chế độ ban đêm</string>
     <string name="use_pure_black">Sử dụng màu đen thuần trong chế độ ban đêm</string>
     <string name="pure_black_description">Thay thế nền màu xám bởi màu đen thuần trong chế độ ban đêm. Giảm thiểu việc sử dụng pin của điện thoại có màn hình AMOLED.</string>
     <string name="interface_preferences">Giao diện</string>
@@ -141,6 +141,7 @@
     <string name="none">Không có</string>
     <string name="filter">Lọc</string>
     <string name="hide_completed">Ẩn mục đã hoàn thành</string>
+    <string name="hide_entered">Ẩn đã nhập</string>
     <string name="hide_archived">Ẩn mục đã lưu trữ</string>
     <string name="sticky_notifications">Gửi thông báo cố định</string>
     <string name="sticky_notifications_description">Không cho các thông báo bị vuốt ngang mất.</string>
@@ -160,9 +161,12 @@
     <string name="by_status">Theo trạng thái</string>
     <string name="export">Xuất dữ liệu ra</string>
     <string name="long_press_to_edit">Nhấn và giữ để thay đổi giá trị</string>
-    <string name="change_value">Thay đổi giá trị</string>
+    <string name="value">Giá trị</string>
     <string name="calendar">Lịch</string>
     <string name="unit">Đơn vị</string>
+    <string name="target_type">Loại mục tiêu</string>
+    <string name="target_type_at_least">Ít nhất</string>
+    <string name="target_type_at_most">Nhiều nhất</string>
     <string name="example_question_boolean">v.d. Hôm nay bạn đã tập thể dục chưa?</string>
     <string name="question">Câu hỏi</string>
     <string name="target">Mục tiêu</string>
@@ -184,6 +188,7 @@
     <string name="measurable_example">Ví dụ: Hôm nay bạn đã chạy bao nhiêu dặm? Bạn đã đọc bao nhiêu trang?</string>
     <string name="x_times_per_week">%d lần mỗi tuần</string>
     <string name="x_times_per_month">%d lần mỗi tháng</string>
+    <string name="x_times_per_y_days">%d lần trong %d ngày</string>
     <string name="yes_or_no_short_example">Ví dụ: Tập thể dục</string>
     <string name="color">Màu sắc</string>
     <string name="example_target">Ví dụ: 15</string>
diff --git a/uhabits-android/src/main/res/values-zh-rCN/strings.xml b/uhabits-android/src/main/res/values-zh-rCN/strings.xml
index dd2e70d2c..ec3ff280c 100644
--- a/uhabits-android/src/main/res/values-zh-rCN/strings.xml
+++ b/uhabits-android/src/main/res/values-zh-rCN/strings.xml
@@ -71,8 +71,8 @@
     <string name="interval_always_ask">总是询问</string>
     <string name="interval_custom">自定义</string>
     <string name="pref_toggle_title">短按切换</string>
-    <string name="pref_toggle_description">更加方便，但有可能造成意外记录</string>
-    <string name="pref_rate_this_app">去 Play 商店评价这个应用</string>
+    <string name="pref_toggle_description_2">只需轻按一下即可放置复选标记，而不是按住。</string>
+    <string name="pref_rate_this_app">去 Play 商店评价此应用</string>
     <string name="pref_send_feedback">发送反馈给开发者</string>
     <string name="pref_view_source_code">在 GitHub 上查看源代码</string>
     <string name="links">链接</string>
@@ -120,14 +120,14 @@
     <string name="bug_report_failed">错误报告生成失败</string>
     <string name="generate_bug_report">生成错误报告</string>
     <string name="troubleshooting">故障排除</string>
-    <string name="help_translate">帮助翻译这个应用</string>
-    <string name="night_mode" comment="dark_theme">深色主题</string>
+    <string name="help_translate">帮助翻译本应用</string>
+    <string name="night_mode">深色主题</string>
     <string name="use_pure_black">在深色主题中使用纯黑色</string>
     <string name="pure_black_description">以纯黑色背景代替深色主题中的灰色背景。
 这可以降低 AMOLED 屏幕手机的耗电量。</string>
     <string name="interface_preferences">界面</string>
-    <string name="reverse_days">反向顺序的日子</string>
-    <string name="reverse_days_description">在主界面显示反向顺序的日子</string>
+    <string name="reverse_days">逆序显示日子</string>
+    <string name="reverse_days_description">在主界面以相反的顺序显示日子</string>
     <string name="day">天</string>
     <string name="week">周</string>
     <string name="month">月</string>
@@ -138,15 +138,16 @@
     <string name="every_x_days">每 %d 天</string>
     <string name="every_x_weeks">每 %d 周</string>
     <string name="score">成绩</string>
-    <string name="reminder_sound">提醒声音</string>
+    <string name="reminder_sound">提醒提示音</string>
     <string name="none">无</string>
     <string name="filter">筛选</string>
     <string name="hide_completed">隐藏已完成</string>
+    <string name="hide_entered">隐藏已输入</string>
     <string name="hide_archived">隐藏已存档</string>
-    <string name="sticky_notifications">使提醒持久</string>
-    <string name="sticky_notifications_description">防止提醒被滑掉</string>
-    <string name="led_notifications">通知指示灯</string>
-    <string name="led_notifications_description">通过闪烁指示灯来提醒。仅限于有 LED 通知指示灯的手机。</string>
+    <string name="sticky_notifications">使通知持久</string>
+    <string name="sticky_notifications_description">防止通知被滑掉。</string>
+    <string name="led_notifications">呼吸灯</string>
+    <string name="led_notifications_description">有提醒时，呼吸灯会闪烁提示。仅限于有 LED 通知呼吸灯的手机。</string>
     <string name="repair_database">修复数据库</string>
     <string name="database_repaired">数据库已修复</string>
     <string name="uncheck">取消选中</string>
@@ -160,31 +161,35 @@
     <string name="by_score">按分数</string>
     <string name="by_status">按状态</string>
     <string name="export">导出</string>
-    <string name="long_press_to_edit">长按可更改值</string>
-    <string name="change_value">更改值</string>
+    <string name="long_press_to_edit">长按即可更改值</string>
+    <string name="value">值</string>
     <string name="calendar">日历</string>
     <string name="unit">单位</string>
+    <string name="target_type">目标类型</string>
+    <string name="target_type_at_least">至少</string>
+    <string name="target_type_at_most">至多</string>
     <string name="example_question_boolean">例如：你今天锻炼了吗？</string>
     <string name="question">问题</string>
     <string name="target">目标</string>
     <string name="yes">是</string>
     <string name="no">否</string>
-    <string name="customize_notification_summary">更改声音、振动、灯光和其他通知设置</string>
+    <string name="customize_notification_summary">更改声音、振动、指示灯（呼吸灯）和其他通知设置</string>
     <string name="customize_notification">自定义通知</string>
     <string name="pref_view_privacy">查看隐私政策</string>
     <string name="view_all_contributors">查看所有贡献者</string>
     <string name="database">数据库</string>
     <string name="widget_opacity_title">微件不透明度</string>
-    <string name="widget_opacity_description">调整主屏幕上微件的不透明度</string>
+    <string name="widget_opacity_description">调整主屏幕上微件的不透明度。</string>
     <string name="first_day_of_the_week">一周的第一天</string>
     <string name="default_reminder_question">你今天完成这个习惯了吗？</string>
     <string name="notes">备注</string>
     <string name="example_notes">（选填）</string>
     <string name="yes_or_no_example">例如：你今天早起了吗？你锻炼了吗？你下棋了吗？</string>
     <string name="measurable">可量化的</string>
-    <string name="measurable_example">例如：今天你跑了几公里？你阅读了几页书？</string>
+    <string name="measurable_example">例如：今天你跑了几公里？你读了几页书？</string>
     <string name="x_times_per_week">每周 %d 次</string>
     <string name="x_times_per_month">每月 %d 次</string>
+    <string name="x_times_per_y_days">每 %d 天 %d 次</string>
     <string name="yes_or_no_short_example">例如：锻炼</string>
     <string name="color">颜色</string>
     <string name="example_target">例如：15</string>
@@ -198,8 +203,8 @@
     <string name="no_habits">找不到习惯</string>
     <string name="no_numerical_habits">找不到可量化的习惯</string>
     <string name="no_boolean_habits">找不到“是或不是”类的习惯</string>
-    <string name="increment">增量</string>
-    <string name="decrement">减量</string>
+    <string name="increment">增加（+1）</string>
+    <string name="decrement">减少（-1）</string>
     <string name="pref_skip_title">启用跳过天数</string>
     <string name="pref_skip_description">切换两次以添加跳过而不是复选标记。跳过将保持您的得分不变，且不会打破你的连续纪录</string>
     <string name="pref_unknown_title">对丢失的数据显示问号</string>
diff --git a/uhabits-android/src/main/res/values-zh-rTW/strings.xml b/uhabits-android/src/main/res/values-zh-rTW/strings.xml
index 30f5bf5e4..2d425ec82 100644
--- a/uhabits-android/src/main/res/values-zh-rTW/strings.xml
+++ b/uhabits-android/src/main/res/values-zh-rTW/strings.xml
@@ -71,7 +71,6 @@
     <string name="interval_always_ask">每次都詢問</string>
     <string name="interval_custom">自訂</string>
     <string name="pref_toggle_title">換成輕碰來記錄習慣</string>
-    <string name="pref_toggle_description">雖然更方便，但有可能變成不小心就點到</string>
     <string name="pref_rate_this_app">在 Google Play 上評價這個 App</string>
     <string name="pref_send_feedback">傳送改進意見給開發者</string>
     <string name="pref_view_source_code">在 GitHub 上查看原始碼</string>
@@ -125,7 +124,7 @@
     <string name="generate_bug_report">製作錯誤報告</string>
     <string name="troubleshooting">問題排除</string>
     <string name="help_translate">協助翻譯本程式</string>
-    <string name="night_mode" comment="dark_theme">夜間模式</string>
+    <string name="night_mode">夜間模式</string>
     <string name="use_pure_black">在夜間模式中使用深色設定</string>
     <string name="pure_black_description">在夜間模式中，使用黑色背景取代灰色背景。這樣可以減少 AMOLED 螢幕手機的電量消耗。</string>
     <string name="interface_preferences">介面</string>
@@ -164,7 +163,6 @@
     <string name="by_status">依據狀態</string>
     <string name="export">匯出</string>
     <string name="long_press_to_edit">持續按住來改換數值</string>
-    <string name="change_value">更改數值</string>
     <string name="calendar">日曆</string>
     <string name="unit">單位</string>
     <string name="example_question_boolean">例如：你今天運動了嗎？</string>
@@ -188,6 +186,7 @@
     <string name="measurable_example">例如：今天你跑了幾英哩？你讀了幾頁書？</string>
     <string name="x_times_per_week">每周 %d 次</string>
     <string name="x_times_per_month">每月 %d 次</string>
+    <string name="x_times_per_y_days">%d 次每 %d 日</string>
     <string name="yes_or_no_short_example">例如：運動</string>
     <string name="color">顏色</string>
     <string name="example_target">例如：15</string>
diff --git a/uhabits-android/src/main/res/values/attrs.xml b/uhabits-android/src/main/res/values/attrs.xml
index 081878e5b..b00eaf69b 100644
--- a/uhabits-android/src/main/res/values/attrs.xml
+++ b/uhabits-android/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
     <attr name="iconFilter" format="reference"/>
     <attr name="iconArrowUp" format="reference"/>
     <attr name="iconArrowDown" format="reference"/>
+    <attr name="dialogFormLabelColor" format="reference"/>
 
     <attr name="toolbarPopupTheme" format="reference"/>
 
diff --git a/uhabits-android/src/main/res/values/fontawesome.xml b/uhabits-android/src/main/res/values/fontawesome.xml
index 917cf0d73..0ff190382 100644
--- a/uhabits-android/src/main/res/values/fontawesome.xml
+++ b/uhabits-android/src/main/res/values/fontawesome.xml
@@ -21,6 +21,7 @@
 <resources>
     <string translatable="false" name="fa_star_half_o">&#xf5c0;</string>
 	<string translatable="false" name="fa_arrow_circle_up">&#xf0aa;</string>
+	<string translatable="false" name="fa_arrow_circle_down">&#xf0ab;</string>
 	<string translatable="false" name="fa_check">&#xf00c;</string>
 	<string translatable="false" name="fa_times">&#xf00d;</string>
 	<string translatable="false" name="fa_skipped">&#xf068;</string>
@@ -181,7 +182,6 @@
 	<!--<string translatable="false" name="fa_hand_o_down">&#xf0a7;</string>-->
 	<!--<string translatable="false" name="fa_arrow_circle_left">&#xf0a8;</string>-->
 	<!--<string translatable="false" name="fa_arrow_circle_right">&#xf0a9;</string>-->
-	<!--<string translatable="false" name="fa_arrow_circle_down">&#xf0ab;</string>-->
 	<!--<string translatable="false" name="fa_globe">&#xf0ac;</string>-->
 	<!--<string translatable="false" name="fa_wrench">&#xf0ad;</string>-->
 	<!--<string translatable="false" name="fa_tasks">&#xf0ae;</string>-->
diff --git a/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml
index 3aec3b72d..75d7d88a7 100644
--- a/uhabits-android/src/main/res/values/strings.xml
+++ b/uhabits-android/src/main/res/values/strings.xml
@@ -80,7 +80,7 @@
     <string name="interval_always_ask">Always ask</string>
     <string name="interval_custom">Custom...</string>
     <string name="pref_toggle_title">Toggle with short press</string>
-    <string name="pref_toggle_description">Put checkmarks with a single tap instead of press-and-hold. More convenient, but might cause accidental toggles.</string>
+    <string name="pref_toggle_description_2">Put checkmarks with a single tap instead of press-and-hold.</string>
     <string name="pref_rate_this_app">Rate this app on Google Play</string>
     <string name="pref_send_feedback">Send feedback to developer</string>
     <string name="pref_view_source_code">View source code at GitHub</string>
@@ -181,9 +181,12 @@
     <string name="by_status">By status</string>
     <string name="export">Export</string>
     <string name="long_press_to_edit">Press-and-hold to change the value</string>
-    <string name="change_value">Change value</string>
+    <string name="value">Value</string>
     <string name="calendar">Calendar</string>
     <string name="unit">Unit</string>
+    <string name="target_type">Target Type</string>
+    <string name="target_type_at_least">At least</string>
+    <string name="target_type_at_most">At most</string>
     <string name="example_question_boolean">e.g. Did you exercise today?</string>
     <string name="question">Question</string>
     <string name="target">Target</string>
diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml
index 9bba46775..147d05d24 100644
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/uhabits-android/src/main/res/values/styles.xml
@@ -63,6 +63,7 @@
         <item name="windowBackgroundColor">@color/grey_200</item>
         <item name="android:textColorAlertDialogListItem">@color/grey_800</item>
         <item name="singleLineTitle">false</item>
+        <item name="dialogFormLabelColor">@color/white</item>
     </style>
 
     <style name="AppBaseThemeDark" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
@@ -110,6 +111,7 @@
         <item name="buttonBarPositiveButtonStyle">@style/DialogButtonStyle</item>
         <item name="android:textColorAlertDialogListItem">@color/grey_100</item>
         <item name="singleLineTitle">false</item>
+        <item name="dialogFormLabelColor">@color/grey_800</item>
     </style>
 
     <style name="AppBaseThemeDark.PureBlack">
@@ -130,6 +132,7 @@
         <item name="textColorAlertDialogListItem">@color/grey_100</item>
         <item name="windowBackgroundColor">@color/black</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material.PureBlack</item>
+        <item name="dialogFormLabelColor">@color/grey_800</item>
     </style>
 
     <style name="BaseDialog" parent="Theme.AppCompat.Light.Dialog">
@@ -140,6 +143,7 @@
         <item name="contrast80">@color/grey_700</item>
         <item name="contrast100">@color/grey_800</item>
         <item name="palette">@array/lightPalette</item>
+        <item name="dialogFormLabelColor">@color/white</item>
     </style>
 
     <style name="BaseDialogDark" parent="Theme.AppCompat.Dialog">
@@ -150,6 +154,7 @@
         <item name="contrast80">@color/grey_300</item>
         <item name="contrast100">@color/grey_100</item>
         <item name="palette">@array/darkPalette</item>
+        <item name="dialogFormLabelColor">@color/grey_800</item>
     </style>
 
     <style name="PreferenceThemeOverlay.v14.Material.PureBlack">
@@ -169,6 +174,7 @@
     </style>
 
     <style name="DialogButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textSize">@dimen/regularTextSize</item>
         <item name="android:textColor">@color/grey_100</item>
     </style>
 
@@ -359,4 +365,38 @@
         <item name="android:layout_height">1dp</item>
         <item name="android:background">?attr/contrast20</item>
     </style>
+
+    <style name="DialogFormInnerBox">
+        <item name="android:background">@drawable/dialog_bg_input_box</item>
+        <item name="android:clipChildren">false</item>
+        <item name="android:clipToPadding">false</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+
+    <style name="DialogFormLabel">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">8dp</item>
+        <item name="android:layout_marginTop">-15dp</item>
+        <item name="android:layout_marginBottom">-4dp</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:background">?attr/dialogFormLabelColor</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:textSize">@dimen/smallTextSize</item>
+    </style>
+
+    <style name="CheckmarkDialogBtn">
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:layout_marginEnd">12dp</item>
+        <item name="android:textSize">@dimen/regularTextSize</item>
+        <item name="backgroundTint">@null</item>
+        <item name="android:background">@drawable/bg_select_button</item>
+        <item name="selectable">true</item>
+    </style>
+
 </resources>
diff --git a/uhabits-android/src/main/res/xml/preferences.xml b/uhabits-android/src/main/res/xml/preferences.xml
index baf20e5f0..89ab445f9 100644
--- a/uhabits-android/src/main/res/xml/preferences.xml
+++ b/uhabits-android/src/main/res/xml/preferences.xml
@@ -27,7 +27,7 @@
         <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_short_toggle"
-                android:summary="@string/pref_toggle_description"
+                android:summary="@string/pref_toggle_description_2"
                 android:title="@string/pref_toggle_title"
                 app:iconSpaceReserved="false" />
 
diff --git a/uhabits-core/assets/test/csv_export/001 Meditate/Checkmarks.csv b/uhabits-core/assets/test/csv_export/001 Meditate/Checkmarks.csv
new file mode 100644
index 000000000..e69de29bb
diff --git a/uhabits-core/assets/test/csv_export/001 Meditate/Scores.csv b/uhabits-core/assets/test/csv_export/001 Meditate/Scores.csv
new file mode 100644
index 000000000..6004f60bc
--- /dev/null
+++ b/uhabits-core/assets/test/csv_export/001 Meditate/Scores.csv	
@@ -0,0 +1 @@
+2015-01-25,0.0000
diff --git a/uhabits-core/assets/test/csv_export/002 Wake up early/Checkmarks.csv b/uhabits-core/assets/test/csv_export/002 Wake up early/Checkmarks.csv
new file mode 100644
index 000000000..89f788f68
--- /dev/null
+++ b/uhabits-core/assets/test/csv_export/002 Wake up early/Checkmarks.csv	
@@ -0,0 +1,10 @@
+2015-01-25,2
+2015-01-24,0
+2015-01-23,1
+2015-01-22,2
+2015-01-21,2
+2015-01-20,2
+2015-01-19,1
+2015-01-18,1
+2015-01-17,2
+2015-01-16,2
diff --git a/uhabits-core/assets/test/csv_export/002 Wake up early/Scores.csv b/uhabits-core/assets/test/csv_export/002 Wake up early/Scores.csv
new file mode 100644
index 000000000..7f4fa4780
--- /dev/null
+++ b/uhabits-core/assets/test/csv_export/002 Wake up early/Scores.csv	
@@ -0,0 +1,10 @@
+2015-01-25,0.2557
+2015-01-24,0.2226
+2015-01-23,0.1991
+2015-01-22,0.1746
+2015-01-21,0.1379
+2015-01-20,0.0995
+2015-01-19,0.0706
+2015-01-18,0.0515
+2015-01-17,0.0315
+2015-01-16,0.0107
diff --git a/uhabits-core/assets/test/csv_export/Checkmarks.csv b/uhabits-core/assets/test/csv_export/Checkmarks.csv
new file mode 100644
index 000000000..c0788570b
--- /dev/null
+++ b/uhabits-core/assets/test/csv_export/Checkmarks.csv
@@ -0,0 +1,11 @@
+Date,Meditate,Wake up early,
+2015-01-25,-1,2,
+2015-01-24,-1,0,
+2015-01-23,-1,1,
+2015-01-22,-1,2,
+2015-01-21,-1,2,
+2015-01-20,-1,2,
+2015-01-19,-1,1,
+2015-01-18,-1,1,
+2015-01-17,-1,2,
+2015-01-16,-1,2,
diff --git a/uhabits-core/assets/test/csv_export/Habits.csv b/uhabits-core/assets/test/csv_export/Habits.csv
new file mode 100644
index 000000000..672189f33
--- /dev/null
+++ b/uhabits-core/assets/test/csv_export/Habits.csv
@@ -0,0 +1,3 @@
+Position,Name,Question,Description,NumRepetitions,Interval,Color
+001,Meditate,Did you meditate this morning?,,1,1,#FF8F00
+002,Wake up early,Did you wake up before 6am?,,2,3,#00897B
diff --git a/uhabits-core/assets/test/csv_export/Scores.csv b/uhabits-core/assets/test/csv_export/Scores.csv
new file mode 100644
index 000000000..931c6c41c
--- /dev/null
+++ b/uhabits-core/assets/test/csv_export/Scores.csv
@@ -0,0 +1,11 @@
+Date,Meditate,Wake up early,
+2015-01-25,0.0000,0.2557,
+2015-01-24,0.0000,0.2226,
+2015-01-23,0.0000,0.1991,
+2015-01-22,0.0000,0.1746,
+2015-01-21,0.0000,0.1379,
+2015-01-20,0.0000,0.0995,
+2015-01-19,0.0000,0.0706,
+2015-01-18,0.0000,0.0515,
+2015-01-17,0.0000,0.0315,
+2015-01-16,0.0000,0.0107,
diff --git a/uhabits-core/assets/test/habitbull.csv b/uhabits-core/assets/test/habitbull.csv
index 977a8e8df..014b7d656 100644
--- a/uhabits-core/assets/test/habitbull.csv
+++ b/uhabits-core/assets/test/habitbull.csv
@@ -1,5 +1,5 @@
 HabitName,HabitDescription,HabitCategory,CalendarDate,Value,CommentText
-Breed dragons,with love and fire,Diet & Food,2016-03-18,1,
+Breed dragons,with love and fire,Diet & Food,2016-03-18,1,text
 Breed dragons,with love and fire,Diet & Food,2016-03-19,1,
 Breed dragons,with love and fire,Diet & Food,2016-03-21,1,
 Reduce sleep,only 2 hours per day,Time Management,2016-03-15,1,
diff --git a/uhabits-core/assets/test/habitbull2.csv b/uhabits-core/assets/test/habitbull2.csv
index 890632bbd..9296b1ebc 100644
--- a/uhabits-core/assets/test/habitbull2.csv
+++ b/uhabits-core/assets/test/habitbull2.csv
@@ -1,7 +1,7 @@
 HabitName,HabitDescription,HabitCategory,CalendarDate,Value,CommentText
 H1,,C1,11/5/2020,1,
 H2,,C2,11/5/2020,-2150000000,
-H3,Habit 3,C3,4/11/2019,1,
+H3,Habit 3,C3,4/11/2019,1,text
 H3,Habit 3,C3,4/12/2019,1,
 H3,Habit 3,C3,4/13/2019,0,
 H3,Habit 3,C3,4/14/2019,1,
@@ -65,7 +65,7 @@ H3,Habit 3,C3,6/10/2019,1,
 H3,Habit 3,C3,6/11/2019,1,
 H3,Habit 3,C3,6/12/2019,1,
 H3,Habit 3,C3,6/13/2019,1,
-H3,Habit 3,C3,6/14/2019,0,
+H3,Habit 3,C3,6/14/2019,0,Habit 3 notes
 H3,Habit 3,C3,6/15/2019,1,
 H4,Habit 4,C4,11/6/2020,1,
 H4,Habit 4,C4,11/9/2020,1,
diff --git a/uhabits-core/assets/test/habitbull3.csv b/uhabits-core/assets/test/habitbull3.csv
new file mode 100644
index 000000000..65b7bbbab
--- /dev/null
+++ b/uhabits-core/assets/test/habitbull3.csv
@@ -0,0 +1,11 @@
+HabitName,HabitDescription,HabitCategory,CalendarDate,Value,CommentText
+Pushups,,Fitness,2021-09-01,30,
+Pushups,,Fitness,2022-01-08,100,
+Pushups,,Fitness,2022-01-09,100,
+Pushups,,Fitness,2022-01-10,100,
+Pushups,,Fitness,2022-01-11,100,
+Pushups,,Fitness,2022-01-12,100,
+Pushups,,Fitness,2022-01-13,100,
+run,,Fitness,2022-01-03,1,
+run,,Fitness,2022-01-18,1,
+run,,Fitness,2022-01-19,1,
diff --git a/uhabits-core/build.gradle.kts b/uhabits-core/build.gradle.kts
index 58424882f..df0308761 100644
--- a/uhabits-core/build.gradle.kts
+++ b/uhabits-core/build.gradle.kts
@@ -43,13 +43,13 @@ kotlin {
         val jvmMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
-                compileOnly("com.google.dagger:dagger:2.38.1")
-                implementation("com.google.guava:guava:30.1.1-android")
-                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.5.30")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1")
-                implementation("androidx.annotation:annotation:1.2.0")
+                compileOnly("com.google.dagger:dagger:2.41")
+                implementation("com.google.guava:guava:31.1-android")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.10")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.0")
+                implementation("androidx.annotation:annotation:1.3.0")
                 implementation("com.google.code.findbugs:jsr305:3.0.2")
-                implementation("com.opencsv:opencsv:5.5.1")
+                implementation("com.opencsv:opencsv:5.6")
                 implementation("commons-codec:commons-codec:1.15")
                 implementation("org.apache.commons:commons-lang3:3.12.0")
             }
diff --git a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/View.kt b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/View.kt
index b58e1affe..c6ee60b65 100644
--- a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/View.kt
+++ b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/View.kt
@@ -23,6 +23,8 @@ interface View {
     fun draw(canvas: Canvas)
     fun onClick(x: Double, y: Double) {
     }
+    fun onLongClick(x: Double, y: Double) {
+    }
 }
 
 interface DataView : View {
diff --git a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/utils/StringUtils.kt b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/utils/StringUtils.kt
new file mode 100644
index 000000000..8f3cf62d0
--- /dev/null
+++ b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/utils/StringUtils.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.platform.utils
+
+class StringUtils {
+
+    companion object {
+
+        fun joinLongs(values: LongArray): String = values.joinToString(separator = ",")
+
+        fun splitLongs(str: String): LongArray = str.split(",").map { it.toLong() }.toLongArray()
+    }
+}
diff --git a/uhabits-core/src/commonTest/kotlin/org/isoron/platform/utils/StringUtilsTest.kt b/uhabits-core/src/commonTest/kotlin/org/isoron/platform/utils/StringUtilsTest.kt
new file mode 100644
index 000000000..a92219f5f
--- /dev/null
+++ b/uhabits-core/src/commonTest/kotlin/org/isoron/platform/utils/StringUtilsTest.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.platform.utils
+
+import kotlin.test.Test
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+
+class StringUtilsTest {
+
+    @Test
+    fun testJoinLongs() {
+        val string = StringUtils.joinLongs(longArrayOf(0, 1, 2))
+        assertEquals(string, "0,1,2")
+    }
+
+    @Test
+    fun testSplitLongs() {
+        val longArray = StringUtils.splitLongs("0,1,2")
+        assertContentEquals(longArray, longArrayOf(0, 1, 2))
+    }
+}
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/platform/time/JavaDates.kt b/uhabits-core/src/jvmMain/java/org/isoron/platform/time/JavaDates.kt
index b922b88fe..32c75eb8c 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/platform/time/JavaDates.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/platform/time/JavaDates.kt
@@ -19,6 +19,7 @@
 
 package org.isoron.platform.time
 
+import java.text.DateFormat
 import java.util.Calendar.DAY_OF_MONTH
 import java.util.Calendar.DAY_OF_WEEK
 import java.util.Calendar.HOUR_OF_DAY
@@ -66,4 +67,10 @@ class JavaLocalDateFormatter(private val locale: Locale) : LocalDateFormatter {
         val cal = date.toGregorianCalendar()
         return cal.getDisplayName(DAY_OF_WEEK, SHORT, locale)
     }
+
+    fun longFormat(date: LocalDate): String {
+        val df = DateFormat.getDateInstance(DateFormat.LONG, locale)
+        df.timeZone = TimeZone.getTimeZone("UTC")
+        return df.format(date.toGregorianCalendar().time)
+    }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/Constants.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/Constants.kt
index 1388cb5f8..be6c9634b 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/Constants.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/Constants.kt
@@ -20,4 +20,4 @@ package org.isoron.uhabits.core
 
 const val DATABASE_FILENAME = "uhabits.db"
 
-const val DATABASE_VERSION = 24
+const val DATABASE_VERSION = 25
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CreateHabitCommand.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CreateHabitCommand.kt
index 49e3bae7a..8ff21f407 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CreateHabitCommand.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CreateHabitCommand.kt
@@ -31,5 +31,6 @@ data class CreateHabitCommand(
         val habit = modelFactory.buildHabit()
         habit.copyFrom(model)
         habitList.add(habit)
+        habit.recompute()
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.kt
index cf0081152..3dd71c14e 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.kt
@@ -28,10 +28,11 @@ data class CreateRepetitionCommand(
     val habit: Habit,
     val timestamp: Timestamp,
     val value: Int,
+    val notes: String,
 ) : Command {
     override fun run() {
         val entries = habit.originalEntries
-        entries.add(Entry(timestamp, value))
+        entries.add(Entry(timestamp, value, notes))
         habit.recompute()
         habitList.resort()
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt
index bdf7b70c9..4d47ca8c2 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt
@@ -23,6 +23,7 @@ import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitList
+import org.isoron.uhabits.core.models.HabitType
 import org.isoron.uhabits.core.models.ModelFactory
 import org.isoron.uhabits.core.models.Timestamp
 import java.io.BufferedReader
@@ -50,7 +51,7 @@ class HabitBullCSVImporter
     logging: Logging,
 ) : AbstractImporter() {
 
-    val logger = logging.getLogger("HabitBullCSVImporter")
+    private val logger = logging.getLogger("HabitBullCSVImporter")
 
     override fun canHandle(file: File): Boolean {
         val reader = BufferedReader(FileReader(file))
@@ -76,8 +77,17 @@ class HabitBullCSVImporter
                 map[name] = h
                 logger.info("Creating habit: $name")
             }
-            if (parseInt(cols[4]) == 1) {
-                h.originalEntries.add(Entry(timestamp, Entry.YES_MANUAL))
+            val notes = cols[5] ?: ""
+            when (val value = parseInt(cols[4])) {
+                0 -> h.originalEntries.add(Entry(timestamp, Entry.NO, notes))
+                1 -> h.originalEntries.add(Entry(timestamp, Entry.YES_MANUAL, notes))
+                else -> {
+                    if (value > 1 && h.type != HabitType.NUMERICAL) {
+                        logger.info("Found a value of $value, considering this habit as numerical.")
+                        h.type = HabitType.NUMERICAL
+                    }
+                    h.originalEntries.add(Entry(timestamp, value, notes))
+                }
             }
         }
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt
index 341b6716c..35e459a27 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt
@@ -167,7 +167,7 @@ class HabitsCSVExporter(
             checksWriter.write(sb.toString())
             scoresWriter.write(sb.toString())
             for (j in selectedHabits.indices) {
-                checksWriter.write(checkmarks[j][i].toString())
+                checksWriter.write(checkmarks[j][i].value.toString())
                 checksWriter.write(delimiter)
                 val score = String.format(Locale.US, "%.4f", scores[j][i].value)
                 scoresWriter.write(score)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/LoopDBImporter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/LoopDBImporter.kt
index 0969cd849..918c2084d 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/LoopDBImporter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/LoopDBImporter.kt
@@ -101,8 +101,9 @@ class LoopDBImporter
 
             for (r in entryRecords) {
                 val t = Timestamp(r.timestamp!!)
-                val (_, value) = habit!!.originalEntries.get(t)
-                if (value != r.value) CreateRepetitionCommand(habitList, habit, t, r.value!!).run()
+                val (_, value, notes) = habit!!.originalEntries.get(t)
+                val oldNotes = r.notes ?: ""
+                if (value != r.value || notes != oldNotes) CreateRepetitionCommand(habitList, habit, t, r.value!!, oldNotes).run()
             }
 
             runner.notifyListeners(command)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Entry.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Entry.kt
index e7aefb8a6..88d0593ef 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Entry.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Entry.kt
@@ -21,6 +21,7 @@ package org.isoron.uhabits.core.models
 data class Entry(
     val timestamp: Timestamp,
     val value: Int,
+    val notes: String = "",
 ) {
     companion object {
         /**
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
index b11baea24..5212923b1 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
@@ -100,7 +100,7 @@ open class EntryList {
             val intervals = buildIntervals(frequency, original)
             snapIntervalsTogether(intervals)
             val computed = buildEntriesFromInterval(original, intervals)
-            computed.filter { it.value != UNKNOWN }.forEach { add(it) }
+            computed.filter { it.value != UNKNOWN || it.notes.isNotEmpty() }.forEach { add(it) }
         }
     }
 
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
index 2d354e7b8..68bbabc08 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
@@ -68,17 +68,10 @@ data class Habit(
         }
     }
 
-    fun isFailedToday(): Boolean {
+    fun isEnteredToday(): Boolean {
         val today = DateUtils.getTodayWithOffset()
         val value = computedEntries.get(today).value
-        return if (isNumerical) {
-            when (targetType) {
-                NumericalHabitType.AT_LEAST -> value / 1000.0 < targetValue
-                NumericalHabitType.AT_MOST -> value / 1000.0 > targetValue
-            }
-        } else {
-            value == Entry.NO
-        }
+        return value != Entry.UNKNOWN
     }
 
     fun recompute() {
@@ -88,14 +81,16 @@ data class Habit(
             isNumerical = isNumerical,
         )
 
-        val to = DateUtils.getTodayWithOffset().plus(30)
+        val today = DateUtils.getTodayWithOffset()
+        val to = today.plus(30)
         val entries = computedEntries.getKnown()
-        var from = entries.lastOrNull()?.timestamp ?: to
+        var from = entries.lastOrNull()?.timestamp ?: today
         if (from.isNewerThan(to)) from = to
 
         scores.recompute(
             frequency = frequency,
             isNumerical = isNumerical,
+            numericalHabitType = targetType,
             targetValue = targetValue,
             computedEntries = computedEntries,
             from = from,
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitList.kt
index 69b738dda..74ee0a700 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitList.kt
@@ -43,7 +43,7 @@ abstract class HabitList : Iterable<Habit> {
      */
     constructor() {
         observable = ModelObservable()
-        filter = HabitMatcherBuilder().setArchivedAllowed(true).build()
+        filter = HabitMatcher(isArchivedAllowed = true)
     }
 
     protected constructor(filter: HabitMatcher) {
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitMatcher.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitMatcher.kt
index f26e00006..ed6bc023b 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitMatcher.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitMatcher.kt
@@ -22,19 +22,21 @@ data class HabitMatcher(
     val isArchivedAllowed: Boolean = false,
     val isReminderRequired: Boolean = false,
     val isCompletedAllowed: Boolean = true,
+    val isEnteredAllowed: Boolean = true,
 ) {
     fun matches(habit: Habit): Boolean {
         if (!isArchivedAllowed && habit.isArchived) return false
         if (isReminderRequired && !habit.hasReminder()) return false
-        if (!isCompletedAllowed && (habit.isCompletedToday() || habit.isFailedToday())) return false
+        if (!isCompletedAllowed && habit.isCompletedToday()) return false
+        if (!isEnteredAllowed && habit.isEnteredToday()) return false
         return true
     }
 
     companion object {
         @JvmField
-        val WITH_ALARM = HabitMatcherBuilder()
-            .setArchivedAllowed(true)
-            .setReminderRequired(true)
-            .build()
+        val WITH_ALARM = HabitMatcher(
+            isArchivedAllowed = true,
+            isReminderRequired = true,
+        )
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.kt
deleted file mode 100644
index c9f1a7f7e..000000000
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.isoron.uhabits.core.models
-
-class HabitMatcherBuilder {
-    private var archivedAllowed = false
-    private var reminderRequired = false
-    private var completedAllowed = true
-
-    fun build(): HabitMatcher {
-        return HabitMatcher(
-            isArchivedAllowed = archivedAllowed,
-            isReminderRequired = reminderRequired,
-            isCompletedAllowed = completedAllowed,
-        )
-    }
-
-    fun setArchivedAllowed(archivedAllowed: Boolean): HabitMatcherBuilder {
-        this.archivedAllowed = archivedAllowed
-        return this
-    }
-
-    fun setCompletedAllowed(completedAllowed: Boolean): HabitMatcherBuilder {
-        this.completedAllowed = completedAllowed
-        return this
-    }
-
-    fun setReminderRequired(reminderRequired: Boolean): HabitMatcherBuilder {
-        this.reminderRequired = reminderRequired
-        return this
-    }
-}
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt
index b5dff17de..23bd88fd1 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt
@@ -68,19 +68,19 @@ class ScoreList {
     fun recompute(
         frequency: Frequency,
         isNumerical: Boolean,
+        numericalHabitType: NumericalHabitType,
         targetValue: Double,
         computedEntries: EntryList,
         from: Timestamp,
         to: Timestamp,
     ) {
         map.clear()
-        if (computedEntries.getKnown().isEmpty()) return
-        if (from.isNewerThan(to)) return
         var rollingSum = 0.0
         var numerator = frequency.numerator
         var denominator = frequency.denominator
         val freq = frequency.toDouble()
         val values = computedEntries.getByInterval(from, to).map { it.value }.toIntArray()
+        val isAtMost = numericalHabitType == NumericalHabitType.AT_MOST
 
         // For non-daily boolean habits, we double the numerator and the denominator to smooth
         // out irregular repetition schedules (for example, weekly habits performed on different
@@ -90,19 +90,29 @@ class ScoreList {
             denominator *= 2
         }
 
-        var previousValue = 0.0
+        var previousValue = if (isNumerical && isAtMost) 1.0 else 0.0
         for (i in values.indices) {
             val offset = values.size - i - 1
             if (isNumerical) {
                 rollingSum += max(0, values[offset])
                 if (offset + denominator < values.size) {
-                    rollingSum -= values[offset + denominator]
+                    rollingSum -= max(0, values[offset + denominator])
                 }
-                val percentageCompleted = if (targetValue > 0) {
-                    min(1.0, rollingSum / 1000 / targetValue)
+
+                val normalizedRollingSum = rollingSum / 1000
+                val percentageCompleted = if (!isAtMost) {
+                    if (targetValue > 0)
+                        min(1.0, normalizedRollingSum / targetValue)
+                    else
+                        1.0
                 } else {
-                    1.0
+                    if (targetValue > 0) {
+                        (1 - ((normalizedRollingSum - targetValue) / targetValue)).coerceIn(0.0, 1.0)
+                    } else {
+                        if (normalizedRollingSum > 0) 0.0 else 1.0
+                    }
                 }
+
                 previousValue = compute(freq, previousValue, percentageCompleted)
             } else {
                 if (values[offset] == Entry.YES_MANUAL) {
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Timestamp.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Timestamp.kt
index feb118ce5..2233237c0 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Timestamp.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Timestamp.kt
@@ -20,6 +20,7 @@ package org.isoron.uhabits.core.models
 
 import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.core.utils.DateFormats.Companion.getCSVDateFormat
+import org.isoron.uhabits.core.utils.DateFormats.Companion.getDialogDateFormat
 import org.isoron.uhabits.core.utils.DateUtils
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getStartOfTodayCalendar
 import org.isoron.uhabits.core.utils.DateUtils.Companion.truncate
@@ -81,6 +82,10 @@ data class Timestamp(var unixTime: Long) : Comparable<Timestamp> {
         return day
     }
 
+    fun toDialogDateString(): String {
+        return getDialogDateFormat().format(Date(unixTime))
+    }
+
     override fun toString(): String {
         return getCSVDateFormat().format(Date(unixTime))
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/WeekdayList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/WeekdayList.kt
index f104cb32b..55dfa3b9b 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/WeekdayList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/WeekdayList.kt
@@ -20,8 +20,6 @@ package org.isoron.uhabits.core.models
 
 import org.apache.commons.lang3.builder.EqualsBuilder
 import org.apache.commons.lang3.builder.HashCodeBuilder
-import org.apache.commons.lang3.builder.ToStringBuilder
-import org.isoron.uhabits.core.utils.StringUtils.Companion.defaultToStringStyle
 import java.util.Arrays
 
 class WeekdayList {
@@ -71,11 +69,7 @@ class WeekdayList {
         return HashCodeBuilder(17, 37).append(weekdays).toHashCode()
     }
 
-    override fun toString(): String {
-        return ToStringBuilder(this, defaultToStringStyle())
-            .append("weekdays", weekdays)
-            .toString()
-    }
+    override fun toString() = "{weekdays: [${weekdays.joinToString(separator = ",")}]}"
 
     companion object {
         val EVERY_DAY = WeekdayList(127)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecord.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecord.kt
index eb2bf858f..aaf8fe9f9 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecord.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecord.kt
@@ -41,12 +41,17 @@ class EntryRecord {
 
     @field:Column
     var id: Long? = null
+
+    @field:Column
+    var notes: String? = null
     fun copyFrom(entry: Entry) {
         timestamp = entry.timestamp.unixTime
         value = entry.value
+        notes = entry.notes
     }
 
     fun toEntry(): Entry {
-        return Entry(Timestamp(timestamp!!), value!!)
+        val notes = notes ?: ""
+        return Entry(Timestamp(timestamp!!), value!!, notes)
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt
index 66d255d3c..6e6f6f85a 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt
@@ -19,12 +19,12 @@
 package org.isoron.uhabits.core.preferences
 
 import org.isoron.platform.time.DayOfWeek
+import org.isoron.platform.utils.StringUtils.Companion.joinLongs
+import org.isoron.platform.utils.StringUtils.Companion.splitLongs
 import org.isoron.uhabits.core.models.HabitList
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.ui.ThemeSwitcher
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getFirstWeekdayNumberAccordingToLocale
-import org.isoron.uhabits.core.utils.StringUtils.Companion.joinLongs
-import org.isoron.uhabits.core.utils.StringUtils.Companion.splitLongs
 import java.util.LinkedList
 import kotlin.math.max
 import kotlin.math.min
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/test/HabitFixtures.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/test/HabitFixtures.kt
index 38a34f0e1..fffe4ac85 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/test/HabitFixtures.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/test/HabitFixtures.kt
@@ -50,6 +50,19 @@ class HabitFixtures(private val modelFactory: ModelFactory, private val habitLis
         return habit
     }
 
+    fun createEmptyNumericalHabit(targetType: NumericalHabitType): Habit {
+        val habit = modelFactory.buildHabit()
+        habit.type = HabitType.NUMERICAL
+        habit.name = "Run"
+        habit.question = "How many miles did you run today?"
+        habit.unit = "miles"
+        habit.targetType = targetType
+        habit.targetValue = 2.0
+        habit.color = PaletteColor(1)
+        saveIfSQLite(habit)
+        return habit
+    }
+
     fun createLongHabit(): Habit {
         val habit = createEmptyHabit()
         habit.frequency = Frequency(3, 7)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
index 4d6c87fbe..5239ed44b 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
@@ -23,13 +23,11 @@ import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
 import org.isoron.uhabits.core.commands.DeleteHabitsCommand
-import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.tasks.Task
 import org.isoron.uhabits.core.tasks.TaskRunner
-import org.isoron.uhabits.core.utils.DateUtils.Companion.getTodayWithOffset
 import java.util.HashMap
 import java.util.Locale
 import java.util.Objects
@@ -106,17 +104,17 @@ class NotificationTray @Inject constructor(
     internal class NotificationData(val timestamp: Timestamp, val reminderTime: Long)
     private inner class ShowNotificationTask(private val habit: Habit, data: NotificationData) :
         Task {
-        var todayValue = 0
+        var isCompleted = false
         private val timestamp: Timestamp = data.timestamp
         private val reminderTime: Long = data.reminderTime
+
         override fun doInBackground() {
-            val today = getTodayWithOffset()
-            todayValue = habit.computedEntries.get(today).value
+            isCompleted = habit.isCompletedToday()
         }
 
         override fun onPostExecute() {
             systemTray.log("Showing notification for habit=" + habit.id)
-            if (todayValue != Entry.UNKNOWN) {
+            if (isCompleted) {
                 systemTray.log(
                     String.format(
                         Locale.US,
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.kt
index a1490421a..f1e306758 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.kt
@@ -78,6 +78,11 @@ class HabitCardListCache @Inject constructor(
         return data.checkmarks[habitId]!!
     }
 
+    @Synchronized
+    fun getNoteIndicators(habitId: Long): BooleanArray {
+        return data.notesIndicators[habitId]!!
+    }
+
     @Synchronized
     fun hasNoHabit(): Boolean {
         return allHabits.isEmpty
@@ -163,6 +168,7 @@ class HabitCardListCache @Inject constructor(
         data.habits.removeAt(position)
         data.idToHabit.remove(id)
         data.checkmarks.remove(id)
+        data.notesIndicators.remove(id)
         data.scores.remove(id)
         listener.onItemRemoved(position)
     }
@@ -207,6 +213,7 @@ class HabitCardListCache @Inject constructor(
         val habits: MutableList<Habit>
         val checkmarks: HashMap<Long?, IntArray>
         val scores: HashMap<Long?, Double>
+        val notesIndicators: HashMap<Long?, BooleanArray>
 
         @Synchronized
         fun copyCheckmarksFrom(oldData: CacheData) {
@@ -217,6 +224,15 @@ class HabitCardListCache @Inject constructor(
             }
         }
 
+        @Synchronized
+        fun copyNoteIndicatorsFrom(oldData: CacheData) {
+            val empty = BooleanArray(checkmarkCount)
+            for (id in idToHabit.keys) {
+                if (oldData.notesIndicators.containsKey(id)) notesIndicators[id] =
+                    oldData.notesIndicators[id]!! else notesIndicators[id] = empty
+            }
+        }
+
         @Synchronized
         fun copyScoresFrom(oldData: CacheData) {
             for (id in idToHabit.keys) {
@@ -241,6 +257,7 @@ class HabitCardListCache @Inject constructor(
             habits = LinkedList()
             checkmarks = HashMap()
             scores = HashMap()
+            notesIndicators = HashMap()
         }
     }
 
@@ -271,6 +288,7 @@ class HabitCardListCache @Inject constructor(
             newData.fetchHabits()
             newData.copyScoresFrom(data)
             newData.copyCheckmarksFrom(data)
+            newData.copyNoteIndicatorsFrom(data)
             val today = getTodayWithOffset()
             val dateFrom = today.minus(checkmarkCount - 1)
             if (runner != null) runner!!.publishProgress(this, -1)
@@ -280,10 +298,14 @@ class HabitCardListCache @Inject constructor(
                 if (targetId != null && targetId != habit.id) continue
                 newData.scores[habit.id] = habit.scores[today].value
                 val list: MutableList<Int> = ArrayList()
-                for ((_, value) in habit.computedEntries.getByInterval(dateFrom, today))
+                val notesIndicators: MutableList<Boolean> = ArrayList()
+                for ((_, value, note) in habit.computedEntries.getByInterval(dateFrom, today)) {
                     list.add(value)
+                    notesIndicators.add(note.isNotEmpty())
+                }
                 val entries = list.toTypedArray()
                 newData.checkmarks[habit.id] = ArrayUtils.toPrimitive(entries)
+                newData.notesIndicators[habit.id] = notesIndicators.toBooleanArray()
                 runner!!.publishProgress(this, position)
             }
         }
@@ -311,6 +333,7 @@ class HabitCardListCache @Inject constructor(
             data.idToHabit[id] = habit
             data.scores[id] = newData.scores[id]!!
             data.checkmarks[id] = newData.checkmarks[id]!!
+            data.notesIndicators[id] = newData.notesIndicators[id]!!
             listener.onItemInserted(position)
         }
 
@@ -338,14 +361,18 @@ class HabitCardListCache @Inject constructor(
         private fun performUpdate(id: Long, position: Int) {
             val oldScore = data.scores[id]!!
             val oldCheckmarks = data.checkmarks[id]
+            val oldNoteIndicators = data.notesIndicators[id]
             val newScore = newData.scores[id]!!
             val newCheckmarks = newData.checkmarks[id]!!
+            val newNoteIndicators = newData.notesIndicators[id]!!
             var unchanged = true
             if (oldScore != newScore) unchanged = false
             if (!Arrays.equals(oldCheckmarks, newCheckmarks)) unchanged = false
+            if (!Arrays.equals(oldNoteIndicators, newNoteIndicators)) unchanged = false
             if (unchanged) return
             data.scores[id] = newScore
             data.checkmarks[id] = newCheckmarks
+            data.notesIndicators[id] = newNoteIndicators
             listener.onItemChanged(position)
         }
 
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
index 89fb09af4..d39227927 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
@@ -18,10 +18,13 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
+import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitList
+import org.isoron.uhabits.core.models.HabitType
+import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.tasks.ExportCSVTask
@@ -47,14 +50,28 @@ open class ListHabitsBehavior @Inject constructor(
     }
 
     fun onEdit(habit: Habit, timestamp: Timestamp?) {
-        val entries = habit.computedEntries
-        val oldValue = entries.get(timestamp!!).value.toDouble()
-        screen.showNumberPicker(
-            oldValue / 1000,
-            habit.unit
-        ) { newValue: Double ->
-            val value = (newValue * 1000).roundToInt()
-            commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, value))
+        val entry = habit.computedEntries.get(timestamp!!)
+        if (habit.type == HabitType.NUMERICAL) {
+            val oldValue = entry.value.toDouble()
+            screen.showNumberPicker(
+                oldValue / 1000,
+                habit.unit,
+                entry.notes,
+                timestamp.toDialogDateString(),
+            ) { newValue: Double, newNotes: String, ->
+                val value = (newValue * 1000).roundToInt()
+                commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, value, newNotes))
+            }
+        } else {
+            screen.showCheckmarkDialog(
+                entry.value,
+                entry.notes,
+                timestamp.toLocalDate(),
+                timestamp.toDialogDateString(),
+                habit.color,
+            ) { newValue, newNotes ->
+                commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, newValue, newNotes))
+            }
         }
     }
 
@@ -105,8 +122,9 @@ open class ListHabitsBehavior @Inject constructor(
     }
 
     fun onToggle(habit: Habit, timestamp: Timestamp?, value: Int) {
+        val notes = habit.computedEntries.get(timestamp!!).notes
         commandRunner.run(
-            CreateRepetitionCommand(habitList, habit, timestamp!!, value)
+            CreateRepetitionCommand(habitList, habit, timestamp, value, notes)
         )
     }
 
@@ -131,10 +149,15 @@ open class ListHabitsBehavior @Inject constructor(
     }
 
     fun interface NumberPickerCallback {
-        fun onNumberPicked(newValue: Double)
+        fun onNumberPicked(newValue: Double, notes: String)
         fun onNumberPickerDismissed() {}
     }
 
+    fun interface CheckMarkDialogCallback {
+        fun onNotesSaved(value: Int, notes: String)
+        fun onNotesDismissed() {}
+    }
+
     interface Screen {
         fun showHabitScreen(h: Habit)
         fun showIntroScreen()
@@ -142,8 +165,18 @@ open class ListHabitsBehavior @Inject constructor(
         fun showNumberPicker(
             value: Double,
             unit: String,
+            notes: String,
+            dateString: String,
             callback: NumberPickerCallback
         )
+        fun showCheckmarkDialog(
+            selectedValue: Int,
+            notes: String,
+            date: LocalDate,
+            dateString: String,
+            color: PaletteColor,
+            callback: CheckMarkDialogCallback
+        )
 
         fun showSendBugReportToDeveloperScreen(log: String)
         fun showSendFileScreen(filename: String)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.kt
index d538f1950..deb42e384 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.kt
@@ -20,7 +20,6 @@ package org.isoron.uhabits.core.ui.screens.habits.list
 
 import org.isoron.uhabits.core.models.HabitList
 import org.isoron.uhabits.core.models.HabitMatcher
-import org.isoron.uhabits.core.models.HabitMatcherBuilder
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.ui.ThemeSwitcher
 import javax.inject.Inject
@@ -33,6 +32,7 @@ class ListHabitsMenuBehavior @Inject constructor(
 ) {
     private var showCompleted: Boolean
     private var showArchived: Boolean
+
     fun onCreateHabit() {
         screen.showSelectHabitTypeDialog()
     }
@@ -97,13 +97,26 @@ class ListHabitsMenuBehavior @Inject constructor(
         screen.applyTheme()
     }
 
+    fun onPreferencesChanged() {
+        updateAdapterFilter()
+    }
+
     private fun updateAdapterFilter() {
-        adapter.setFilter(
-            HabitMatcherBuilder()
-                .setArchivedAllowed(showArchived)
-                .setCompletedAllowed(showCompleted)
-                .build()
-        )
+        if (preferences.areQuestionMarksEnabled) {
+            adapter.setFilter(
+                HabitMatcher(
+                    isArchivedAllowed = showArchived,
+                    isEnteredAllowed = showCompleted,
+                )
+            )
+        } else {
+            adapter.setFilter(
+                HabitMatcher(
+                    isArchivedAllowed = showArchived,
+                    isCompletedAllowed = showCompleted,
+                )
+            )
+        }
         adapter.refresh()
     }
 
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
index bd201e0c5..de1820bbd 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
@@ -29,21 +29,29 @@ import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
 import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitList
+import org.isoron.uhabits.core.models.NumericalHabitType.AT_LEAST
+import org.isoron.uhabits.core.models.NumericalHabitType.AT_MOST
 import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
 import org.isoron.uhabits.core.ui.views.HistoryChart
+import org.isoron.uhabits.core.ui.views.HistoryChart.Square.DIMMED
+import org.isoron.uhabits.core.ui.views.HistoryChart.Square.GREY
+import org.isoron.uhabits.core.ui.views.HistoryChart.Square.HATCHED
+import org.isoron.uhabits.core.ui.views.HistoryChart.Square.OFF
+import org.isoron.uhabits.core.ui.views.HistoryChart.Square.ON
 import org.isoron.uhabits.core.ui.views.OnDateClickedListener
 import org.isoron.uhabits.core.ui.views.Theme
 import org.isoron.uhabits.core.utils.DateUtils
-import kotlin.math.max
 import kotlin.math.roundToInt
 
 data class HistoryCardState(
     val color: PaletteColor,
     val firstWeekday: DayOfWeek,
     val series: List<HistoryChart.Square>,
+    val defaultSquare: HistoryChart.Square,
+    val notesIndicators: List<Boolean>,
     val theme: Theme,
     val today: LocalDate,
 )
@@ -56,36 +64,74 @@ class HistoryCardPresenter(
     val screen: Screen,
 ) : OnDateClickedListener {
 
-    override fun onDateClicked(date: LocalDate) {
+    override fun onDateLongPress(date: LocalDate) {
         val timestamp = Timestamp.fromLocalDate(date)
         screen.showFeedback()
         if (habit.isNumerical) {
-            val entries = habit.computedEntries
-            val oldValue = entries.get(timestamp).value
-            screen.showNumberPicker(oldValue / 1000.0, habit.unit) { newValue: Double ->
-                val thousands = (newValue * 1000).roundToInt()
+            showNumberPicker(timestamp)
+        } else {
+            val entry = habit.computedEntries.get(timestamp)
+            val nextValue = Entry.nextToggleValue(
+                value = entry.value,
+                isSkipEnabled = preferences.isSkipEnabled,
+                areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
+            )
+            commandRunner.run(
+                CreateRepetitionCommand(
+                    habitList,
+                    habit,
+                    timestamp,
+                    nextValue,
+                    entry.notes,
+                ),
+            )
+        }
+    }
+
+    override fun onDateShortPress(date: LocalDate) {
+        val timestamp = Timestamp.fromLocalDate(date)
+        screen.showFeedback()
+        if (habit.isNumerical) {
+            showNumberPicker(timestamp)
+        } else {
+            val entry = habit.computedEntries.get(timestamp)
+            screen.showCheckmarkDialog(
+                entry.value,
+                entry.notes,
+                timestamp.toLocalDate(),
+                preferences,
+                habit.color,
+            ) { newValue, newNotes ->
                 commandRunner.run(
                     CreateRepetitionCommand(
                         habitList,
                         habit,
                         timestamp,
-                        thousands,
+                        newValue,
+                        newNotes,
                     ),
                 )
             }
-        } else {
-            val currentValue = habit.computedEntries.get(timestamp).value
-            val nextValue = Entry.nextToggleValue(
-                value = currentValue,
-                isSkipEnabled = preferences.isSkipEnabled,
-                areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
-            )
+        }
+    }
+
+    private fun showNumberPicker(timestamp: Timestamp) {
+        val entry = habit.computedEntries.get(timestamp)
+        val oldValue = entry.value
+        screen.showNumberPicker(
+            oldValue / 1000.0,
+            habit.unit,
+            entry.notes,
+            timestamp.toDialogDateString(),
+        ) { newValue: Double, newNotes: String ->
+            val thousands = (newValue * 1000).roundToInt()
             commandRunner.run(
                 CreateRepetitionCommand(
                     habitList,
                     habit,
                     timestamp,
-                    nextValue,
+                    thousands,
+                    newNotes,
                 ),
             )
         }
@@ -106,23 +152,29 @@ class HistoryCardPresenter(
             val entries = habit.computedEntries.getByInterval(oldest, today)
             val series = if (habit.isNumerical) {
                 entries.map {
-                    Entry(it.timestamp, max(0, it.value))
-                }.map {
-                    when (it.value) {
-                        0 -> HistoryChart.Square.OFF
-                        else -> HistoryChart.Square.ON
+                    when {
+                        it.value == Entry.UNKNOWN -> OFF
+                        (habit.targetType == AT_MOST) && (it.value / 1000.0 <= habit.targetValue) -> ON
+                        (habit.targetType == AT_LEAST) && (it.value / 1000.0 >= habit.targetValue) -> ON
+                        else -> GREY
                     }
                 }
             } else {
                 entries.map {
                     when (it.value) {
-                        YES_MANUAL -> HistoryChart.Square.ON
-                        YES_AUTO -> HistoryChart.Square.DIMMED
-                        SKIP -> HistoryChart.Square.HATCHED
-                        else -> HistoryChart.Square.OFF
+                        YES_MANUAL -> ON
+                        YES_AUTO -> DIMMED
+                        SKIP -> HATCHED
+                        else -> OFF
                     }
                 }
             }
+            val notesIndicators = entries.map {
+                when (it.notes) {
+                    "" -> false
+                    else -> true
+                }
+            }
 
             return HistoryCardState(
                 color = habit.color,
@@ -130,6 +182,8 @@ class HistoryCardPresenter(
                 today = today.toLocalDate(),
                 theme = theme,
                 series = series,
+                defaultSquare = OFF,
+                notesIndicators = notesIndicators,
             )
         }
     }
@@ -140,7 +194,17 @@ class HistoryCardPresenter(
         fun showNumberPicker(
             value: Double,
             unit: String,
+            notes: String,
+            dateString: String,
             callback: ListHabitsBehavior.NumberPickerCallback,
         )
+        fun showCheckmarkDialog(
+            selectedValue: Int,
+            notes: String,
+            date: LocalDate,
+            preferences: Preferences,
+            color: PaletteColor,
+            callback: ListHabitsBehavior.CheckMarkDialogCallback,
+        )
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt
index 525f8fc7c..4cbbd74ec 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt
@@ -21,6 +21,7 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views
 
 import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.Habit
+import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.models.Reminder
 import org.isoron.uhabits.core.ui.views.Theme
@@ -31,8 +32,9 @@ data class SubtitleCardState(
     val isNumerical: Boolean,
     val question: String,
     val reminder: Reminder?,
-    val targetValue: Double,
-    val unit: String,
+    val targetValue: Double = 0.0,
+    val targetType: NumericalHabitType = NumericalHabitType.AT_LEAST,
+    val unit: String = "",
     val theme: Theme,
 )
 
@@ -48,6 +50,7 @@ class SubtitleCardPresenter {
             question = habit.question,
             reminder = habit.reminder,
             targetValue = habit.targetValue,
+            targetType = habit.targetType,
             unit = habit.unit,
             theme = theme,
         )
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt
index 699cc2ee6..efd7737c5 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt
@@ -32,8 +32,9 @@ import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.round
 
-fun interface OnDateClickedListener {
-    fun onDateClicked(date: LocalDate)
+interface OnDateClickedListener {
+    fun onDateShortPress(date: LocalDate) {}
+    fun onDateLongPress(date: LocalDate) {}
 }
 
 class HistoryChart(
@@ -41,15 +42,18 @@ class HistoryChart(
     var firstWeekday: DayOfWeek,
     var paletteColor: PaletteColor,
     var series: List<Square>,
+    var defaultSquare: Square,
+    var notesIndicators: List<Boolean>,
     var theme: Theme,
     var today: LocalDate,
-    var onDateClickedListener: OnDateClickedListener = OnDateClickedListener { },
+    var onDateClickedListener: OnDateClickedListener = object : OnDateClickedListener {},
     var padding: Double = 0.0,
 ) : DataView {
 
     enum class Square {
         ON,
         OFF,
+        GREY,
         DIMMED,
         HATCHED,
     }
@@ -71,6 +75,14 @@ class HistoryChart(
         get() = squareSpacing + squareSize
 
     override fun onClick(x: Double, y: Double) {
+        onDateClicked(x, y, false)
+    }
+
+    override fun onLongClick(x: Double, y: Double) {
+        onDateClicked(x, y, true)
+    }
+
+    private fun onDateClicked(x: Double, y: Double, isLongClick: Boolean) {
         if (width <= 0.0) throw IllegalStateException("onClick must be called after draw(canvas)")
         val col = ((x - padding) / squareSize).toInt()
         val row = ((y - padding) / squareSize).toInt()
@@ -78,7 +90,11 @@ class HistoryChart(
         if (row == 0 || col == nColumns) return
         val clickedDate = topLeftDate.plus(offset)
         if (clickedDate.isNewerThan(today)) return
-        onDateClickedListener.onDateClicked(clickedDate)
+        if (isLongClick) {
+            onDateClickedListener.onDateLongPress(clickedDate)
+        } else {
+            onDateClickedListener.onDateShortPress(clickedDate)
+        }
     }
 
     override fun draw(canvas: Canvas) {
@@ -189,8 +205,10 @@ class HistoryChart(
         offset: Int,
     ) {
 
-        val value = if (offset >= series.size) Square.OFF else series[offset]
+        val value = if (offset >= series.size) defaultSquare else series[offset]
+        val hasNotes = if (offset >= notesIndicators.size) false else notesIndicators[offset]
         val squareColor: Color
+        val circleColor: Color
         val color = theme.color(paletteColor.paletteIndex)
         squareColor = when (value) {
             Square.ON -> {
@@ -199,6 +217,9 @@ class HistoryChart(
             Square.OFF -> {
                 theme.lowContrastTextColor
             }
+            Square.GREY -> {
+                theme.mediumContrastTextColor
+            }
             Square.DIMMED, Square.HATCHED -> {
                 color.blendWith(theme.cardBackgroundColor, 0.5)
             }
@@ -234,5 +255,14 @@ class HistoryChart(
         canvas.setColor(textColor)
         canvas.setTextAlign(TextAlign.CENTER)
         canvas.drawText(date.day.toString(), x + width / 2, y + width / 2)
+
+        if (hasNotes) {
+            circleColor = when (value) {
+                Square.ON, Square.GREY -> theme.lowContrastTextColor
+                else -> color
+            }
+            canvas.setColor(circleColor)
+            canvas.fillCircle(x + width - width / 5, y + width / 5, width / 12)
+        }
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.kt
index 164ca04f3..879b788be 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.kt
@@ -37,40 +37,45 @@ class WidgetBehavior @Inject constructor(
 ) {
     fun onAddRepetition(habit: Habit, timestamp: Timestamp?) {
         notificationTray.cancel(habit)
-        setValue(habit, timestamp, Entry.YES_MANUAL)
+        val entry = habit.originalEntries.get(timestamp!!)
+        setValue(habit, timestamp, Entry.YES_MANUAL, entry.notes)
     }
 
     fun onRemoveRepetition(habit: Habit, timestamp: Timestamp?) {
         notificationTray.cancel(habit)
-        setValue(habit, timestamp, Entry.NO)
+        val entry = habit.originalEntries.get(timestamp!!)
+        setValue(habit, timestamp, Entry.NO, entry.notes)
     }
 
     fun onToggleRepetition(habit: Habit, timestamp: Timestamp) {
-        val currentValue = habit.originalEntries.get(timestamp).value
+        val entry = habit.originalEntries.get(timestamp)
+        val currentValue = entry.value
         val newValue = nextToggleValue(
             value = currentValue,
             isSkipEnabled = preferences.isSkipEnabled,
             areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
         )
-        setValue(habit, timestamp, newValue)
+        setValue(habit, timestamp, newValue, entry.notes)
         notificationTray.cancel(habit)
     }
 
     fun onIncrement(habit: Habit, timestamp: Timestamp, amount: Int) {
-        val currentValue = habit.computedEntries.get(timestamp).value
-        setValue(habit, timestamp, currentValue + amount)
+        val entry = habit.computedEntries.get(timestamp)
+        val currentValue = entry.value
+        setValue(habit, timestamp, currentValue + amount, entry.notes)
         notificationTray.cancel(habit)
     }
 
     fun onDecrement(habit: Habit, timestamp: Timestamp, amount: Int) {
-        val currentValue = habit.computedEntries.get(timestamp).value
-        setValue(habit, timestamp, currentValue - amount)
+        val entry = habit.computedEntries.get(timestamp)
+        val currentValue = entry.value
+        setValue(habit, timestamp, currentValue - amount, entry.notes)
         notificationTray.cancel(habit)
     }
 
-    fun setValue(habit: Habit, timestamp: Timestamp?, newValue: Int) {
+    fun setValue(habit: Habit, timestamp: Timestamp?, newValue: Int, notes: String) {
         commandRunner.run(
-            CreateRepetitionCommand(habitList, habit, timestamp!!, newValue)
+            CreateRepetitionCommand(habitList, habit, timestamp!!, newValue, notes)
         )
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateFormats.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateFormats.kt
index fc18d5374..8b7b4253b 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateFormats.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateFormats.kt
@@ -41,5 +41,8 @@ class DateFormats {
 
         @JvmStatic fun getCSVDateFormat(): SimpleDateFormat =
             fromSkeleton("yyyy-MM-dd", Locale.US)
+
+        @JvmStatic fun getDialogDateFormat(): SimpleDateFormat =
+            fromSkeleton("MMM dd, yyyy", Locale.US)
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt
index fd7929b87..7c2c0a4fd 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt
@@ -36,10 +36,15 @@ abstract class DateUtils {
         private var startDayHourOffset: Int = 0
         private var startDayMinuteOffset: Int = 0
 
+        /**
+         * Number of milliseconds in one second.
+         */
+        const val SECOND_LENGTH: Long = 1000
+
         /**
          * Number of milliseconds in one minute.
          */
-        const val MINUTE_LENGTH: Long = 60 * 1000
+        const val MINUTE_LENGTH: Long = 60 * SECOND_LENGTH
 
         /**
          * Number of milliseconds in one hour.
@@ -72,11 +77,11 @@ abstract class DateUtils {
         }
 
         @JvmStatic
-        fun getLocalTime(): Long {
+        fun getLocalTime(utcTimeInMillis: Long? = null): Long {
             if (fixedLocalTime != null) return fixedLocalTime as Long
 
             val tz = getTimeZone()
-            val now = Date().time
+            val now = utcTimeInMillis ?: Date().time
             return now + tz.getOffset(now)
         }
 
@@ -95,7 +100,7 @@ abstract class DateUtils {
             format: Int,
             firstWeekDay: Int
         ): Array<String> {
-            val calendar = GregorianCalendar()
+            val calendar = GregorianCalendar(getLocale())
             calendar.set(DAY_OF_WEEK, firstWeekDay)
 
             val daysNullable = ArrayList<String>()
@@ -144,7 +149,7 @@ abstract class DateUtils {
          */
         @JvmStatic
         fun getFirstWeekdayNumberAccordingToLocale(): Int {
-            return GregorianCalendar().firstDayOfWeek
+            return GregorianCalendar(getLocale()).firstDayOfWeek
         }
 
         /**
@@ -209,13 +214,7 @@ abstract class DateUtils {
         @JvmStatic
         fun getStartOfTodayCalendarWithOffset(): GregorianCalendar = getCalendar(getStartOfTodayWithOffset())
 
-        @JvmStatic
-        fun getTimeZone(): TimeZone {
-            return fixedTimeZone ?: TimeZone.getDefault()
-        }
-
-        @JvmStatic
-        fun getTimezone(): TimeZone {
+        private fun getTimeZone(): TimeZone {
             return fixedTimeZone ?: TimeZone.getDefault()
         }
 
@@ -231,8 +230,7 @@ abstract class DateUtils {
             startDayMinuteOffset = minuteOffset
         }
 
-        @JvmStatic
-        fun getLocale(): Locale {
+        private fun getLocale(): Locale {
             return fixedLocale ?: Locale.getDefault()
         }
 
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/MidnightTimer.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/MidnightTimer.kt
index e0661ba77..903099293 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/MidnightTimer.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/MidnightTimer.kt
@@ -33,31 +33,39 @@ open class MidnightTimer @Inject constructor() {
     private val listeners: MutableList<MidnightListener> = LinkedList()
     private lateinit var executor: ScheduledExecutorService
 
-    @Synchronized fun addListener(listener: MidnightListener) {
+    @Synchronized
+    fun addListener(listener: MidnightListener) {
         this.listeners.add(listener)
     }
 
-    @Synchronized fun onPause(): MutableList<Runnable>? = executor.shutdownNow()
+    @Synchronized
+    fun onPause(): MutableList<Runnable>? = executor.shutdownNow()
 
-    @Synchronized fun onResume() {
-        executor = Executors.newSingleThreadScheduledExecutor()
+    @Synchronized
+    fun onResume(
+        delayOffsetInMillis: Long = DateUtils.SECOND_LENGTH,
+        testExecutor: ScheduledExecutorService? = null
+    ) {
+        executor = testExecutor ?: Executors.newSingleThreadScheduledExecutor()
         executor.scheduleAtFixedRate(
             { notifyListeners() },
-            DateUtils.millisecondsUntilTomorrowWithOffset() + 1000,
+            DateUtils.millisecondsUntilTomorrowWithOffset() + delayOffsetInMillis,
             DateUtils.DAY_LENGTH,
             TimeUnit.MILLISECONDS
         )
     }
 
-    @Synchronized fun removeListener(listener: MidnightListener) = this.listeners.remove(listener)
+    @Synchronized
+    fun removeListener(listener: MidnightListener) = this.listeners.remove(listener)
 
-    @Synchronized private fun notifyListeners() {
+    @Synchronized
+    private fun notifyListeners() {
         for (l in listeners) {
             l.atMidnight()
         }
     }
 
-    interface MidnightListener {
+    fun interface MidnightListener {
         fun atMidnight()
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/StringUtils.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/StringUtils.kt
deleted file mode 100644
index a65cf4241..000000000
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/StringUtils.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.core.utils
-
-import org.apache.commons.lang3.builder.StandardToStringStyle
-import org.apache.commons.lang3.builder.ToStringStyle
-import java.math.BigInteger
-import java.util.Random
-
-class StringUtils {
-
-    companion object {
-        private lateinit var toStringStyle: StandardToStringStyle
-
-        @JvmStatic
-        fun getRandomId(): String {
-            return BigInteger(260, Random()).toString(32).subSequence(0, 32).toString()
-        }
-
-        @JvmStatic
-        fun defaultToStringStyle(): ToStringStyle {
-            toStringStyle = StandardToStringStyle()
-            toStringStyle.apply {
-                fieldSeparator = ", "
-                isUseClassName = false
-                isUseIdentityHashCode = false
-                contentStart = "{"
-                contentEnd = "}"
-                fieldNameValueSeparator = ": "
-                arrayStart = "["
-                arrayEnd = "]"
-            }
-
-            return toStringStyle
-        }
-
-        @JvmStatic
-        fun joinLongs(values: LongArray): String {
-            return org.apache.commons.lang3.StringUtils.join(values, ',')
-        }
-
-        @JvmStatic
-        fun splitLongs(str: String): LongArray {
-            val parts: Array<String> = org.apache.commons.lang3.StringUtils.split(str, ',')
-            return LongArray(parts.size) {
-                i ->
-                parts[i].toLong()
-            }
-        }
-    }
-}
diff --git a/uhabits-core/src/jvmMain/resources/migrations/25.sql b/uhabits-core/src/jvmMain/resources/migrations/25.sql
new file mode 100644
index 000000000..627a686d5
--- /dev/null
+++ b/uhabits-core/src/jvmMain/resources/migrations/25.sql
@@ -0,0 +1 @@
+alter table Repetitions add column notes text;
\ No newline at end of file
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/BaseUnitTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/BaseUnitTest.kt
index f97991b6d..4079600ab 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/BaseUnitTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/BaseUnitTest.kt
@@ -95,15 +95,13 @@ open class BaseUnitTest {
     }
 
     fun unixTime(year: Int, month: Int, day: Int): Long {
-        val cal = getStartOfTodayCalendar()
-        cal.set(year, month, day, 0, 0, 0)
-        return cal.timeInMillis
+        return unixTime(year, month, day, 0, 0)
     }
 
-    open fun unixTime(year: Int, month: Int, day: Int, hour: Int, minute: Int): Long {
+    open fun unixTime(year: Int, month: Int, day: Int, hour: Int, minute: Int, milliseconds: Long = 0): Long {
         val cal = getStartOfTodayCalendar()
         cal.set(year, month, day, hour, minute)
-        return cal.timeInMillis
+        return cal.timeInMillis + milliseconds
     }
 
     fun timestamp(year: Int, month: Int, day: Int): Timestamp {
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt
index fade73e69..974af722b 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.kt
@@ -38,7 +38,7 @@ class CreateRepetitionCommandTest : BaseUnitTest() {
         habit = fixtures.createShortHabit()
         habitList.add(habit)
         today = getToday()
-        command = CreateRepetitionCommand(habitList, habit, today, 100)
+        command = CreateRepetitionCommand(habitList, habit, today, 100, "")
     }
 
     @Test
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt
index c6655bba6..c56bfe622 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt
@@ -34,6 +34,7 @@ import java.util.zip.ZipFile
 
 class HabitsCSVExporterTest : BaseUnitTest() {
     private lateinit var baseDir: File
+
     @Before
     @Throws(Exception::class)
     override fun setUp() {
@@ -41,12 +42,7 @@ class HabitsCSVExporterTest : BaseUnitTest() {
         habitList.add(fixtures.createShortHabit())
         habitList.add(fixtures.createEmptyHabit())
         baseDir = Files.createTempDirectory("csv").toFile()
-    }
-
-    @Throws(Exception::class)
-    override fun tearDown() {
-        FileUtils.deleteDirectory(baseDir)
-        super.tearDown()
+        baseDir.deleteOnExit()
     }
 
     @Test
@@ -63,14 +59,20 @@ class HabitsCSVExporterTest : BaseUnitTest() {
         assertAbsolutePathExists(filename)
         val archive = File(filename)
         unzip(archive)
-        assertPathExists("Habits.csv")
-        assertPathExists("001 Meditate/Checkmarks.csv")
-        assertPathExists("001 Meditate/Scores.csv")
-        assertPathExists("002 Wake up early")
-        assertPathExists("002 Wake up early/Checkmarks.csv")
-        assertPathExists("002 Wake up early/Scores.csv")
-        assertPathExists("Checkmarks.csv")
-        assertPathExists("Scores.csv")
+        val filesToCheck = arrayOf(
+            "001 Meditate/Checkmarks.csv",
+            "001 Meditate/Scores.csv",
+            "002 Wake up early/Checkmarks.csv",
+            "002 Wake up early/Scores.csv",
+            "Checkmarks.csv",
+            "Habits.csv",
+            "Scores.csv"
+        )
+
+        for (file in filesToCheck) {
+            assertPathExists(file)
+            assertFileAndReferenceAreEqual(file)
+        }
     }
 
     @Throws(IOException::class)
@@ -104,4 +106,18 @@ class HabitsCSVExporterTest : BaseUnitTest() {
             file.exists()
         )
     }
+
+    private fun assertFileAndReferenceAreEqual(s: String) {
+        val assetFilename = String.format("csv_export/%s", s)
+        val file = File.createTempFile("asset", "")
+        file.deleteOnExit()
+        copyAssetToFile(assetFilename, file)
+
+        assertTrue(
+            FileUtils.contentEquals(
+                file,
+                File(String.format("%s/%s", baseDir.absolutePath, s))
+            )
+        )
+    }
 }
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt
index 6a8bd0c4f..b8949d4b0 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt
@@ -26,6 +26,7 @@ import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.Habit
+import org.isoron.uhabits.core.models.HabitType
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getStartOfTodayCalendar
 import org.isoron.uhabits.core.utils.DateUtils.Companion.setFixedLocalTime
@@ -54,6 +55,7 @@ class ImportTest : BaseUnitTest() {
         assertTrue(isChecked(habit, 2016, 3, 18))
         assertTrue(isChecked(habit, 2016, 3, 19))
         assertFalse(isChecked(habit, 2016, 3, 20))
+        assertTrue(isNotesEqual(habit, 2016, 3, 18, "text"))
     }
 
     @Test
@@ -68,6 +70,32 @@ class ImportTest : BaseUnitTest() {
         assertTrue(isChecked(habit, 2019, 4, 11))
         assertTrue(isChecked(habit, 2019, 5, 7))
         assertFalse(isChecked(habit, 2019, 6, 14))
+        assertTrue(isNotesEqual(habit, 2019, 4, 11, "text"))
+        assertTrue(isNotesEqual(habit, 2019, 6, 14, "Habit 3 notes"))
+    }
+
+    @Test
+    @Throws(IOException::class)
+    fun testHabitBullCSV3() {
+        importFromFile("habitbull3.csv")
+        assertThat(habitList.size(), equalTo(2))
+
+        val habit = habitList.getByPosition(0)
+        assertThat(habit.name, equalTo("Pushups"))
+        assertThat(habit.type, equalTo(HabitType.NUMERICAL))
+        assertThat(habit.description, equalTo(""))
+        assertThat(habit.frequency, equalTo(Frequency.DAILY))
+        assertThat(getValue(habit, 2021, 9, 1), equalTo(30))
+        assertThat(getValue(habit, 2022, 1, 8), equalTo(100))
+
+        val habit2 = habitList.getByPosition(1)
+        assertThat(habit2.name, equalTo("run"))
+        assertThat(habit2.type, equalTo(HabitType.YES_NO))
+        assertThat(habit2.description, equalTo(""))
+        assertThat(habit2.frequency, equalTo(Frequency.DAILY))
+        assertTrue(isChecked(habit2, 2022, 1, 3))
+        assertTrue(isChecked(habit2, 2022, 1, 18))
+        assertTrue(isChecked(habit2, 2022, 1, 19))
     }
 
     @Test
@@ -121,10 +149,21 @@ class ImportTest : BaseUnitTest() {
     }
 
     private fun isChecked(h: Habit, year: Int, month: Int, day: Int): Boolean {
+        return getValue(h, year, month, day) == Entry.YES_MANUAL
+    }
+
+    private fun getValue(h: Habit, year: Int, month: Int, day: Int): Int {
+        val date = getStartOfTodayCalendar()
+        date.set(year, month - 1, day)
+        val timestamp = Timestamp(date)
+        return h.originalEntries.get(timestamp).value
+    }
+
+    private fun isNotesEqual(h: Habit, year: Int, month: Int, day: Int, notes: String): Boolean {
         val date = getStartOfTodayCalendar()
         date.set(year, month - 1, day)
         val timestamp = Timestamp(date)
-        return h.originalEntries.get(timestamp).value == Entry.YES_MANUAL
+        return h.originalEntries.get(timestamp).notes == notes
     }
 
     @Throws(IOException::class)
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt
index 7f67d3adf..0d2314be5 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt
@@ -53,12 +53,12 @@ class HabitListTest : BaseUnitTest() {
         habitsArray[1].isArchived = true
         habitsArray[4].isArchived = true
         habitsArray[7].isArchived = true
-        activeHabits = habitList.getFiltered(HabitMatcherBuilder().build())
+        activeHabits = habitList.getFiltered(HabitMatcher())
         reminderHabits = habitList.getFiltered(
-            HabitMatcherBuilder()
-                .setArchivedAllowed(true)
-                .setReminderRequired(true)
-                .build()
+            HabitMatcher(
+                isArchivedAllowed = true,
+                isReminderRequired = true,
+            )
         )
     }
 
@@ -181,10 +181,10 @@ class HabitListTest : BaseUnitTest() {
     fun testOrder_inherit() {
         habitList.primaryOrder = HabitList.Order.BY_COLOR_ASC
         val filteredList = habitList.getFiltered(
-            HabitMatcherBuilder()
-                .setArchivedAllowed(false)
-                .setCompletedAllowed(false)
-                .build()
+            HabitMatcher(
+                isArchivedAllowed = false,
+                isCompletedAllowed = false,
+            )
         )
         assertEquals(filteredList.primaryOrder, HabitList.Order.BY_COLOR_ASC)
     }
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt
index 5ba6ced1f..da568adf2 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt
@@ -82,12 +82,12 @@ class HabitTest : BaseUnitTest() {
 
     @Test
     @Throws(Exception::class)
-    fun test_isFailed() {
+    fun test_isEntered() {
         val h = modelFactory.buildHabit()
-        assertFalse(h.isFailedToday())
+        assertFalse(h.isEnteredToday())
         h.originalEntries.add(Entry(getToday(), Entry.NO))
         h.recompute()
-        assertTrue(h.isFailedToday())
+        assertTrue(h.isEnteredToday())
     }
 
     @Test
@@ -119,35 +119,6 @@ class HabitTest : BaseUnitTest() {
         assertTrue(h.isCompletedToday())
     }
 
-    @Test
-    @Throws(Exception::class)
-    fun test_isFailedNumerical() {
-        val h = modelFactory.buildHabit()
-        h.type = HabitType.NUMERICAL
-        h.targetType = NumericalHabitType.AT_LEAST
-        h.targetValue = 100.0
-        assertTrue(h.isFailedToday())
-        h.originalEntries.add(Entry(getToday(), 200000))
-        h.recompute()
-        assertFalse(h.isFailedToday())
-        h.originalEntries.add(Entry(getToday(), 100000))
-        h.recompute()
-        assertFalse(h.isFailedToday())
-        h.originalEntries.add(Entry(getToday(), 50000))
-        h.recompute()
-        assertTrue(h.isFailedToday())
-        h.targetType = NumericalHabitType.AT_MOST
-        h.originalEntries.add(Entry(getToday(), 200000))
-        h.recompute()
-        assertTrue(h.isFailedToday())
-        h.originalEntries.add(Entry(getToday(), 100000))
-        h.recompute()
-        assertFalse(h.isFailedToday())
-        h.originalEntries.add(Entry(getToday(), 50000))
-        h.recompute()
-        assertFalse(h.isFailedToday())
-    }
-
     @Test
     @Throws(Exception::class)
     fun testURI() {
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt
index f78af6d21..6ca3e2806 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt
@@ -28,14 +28,36 @@ import org.junit.Before
 import org.junit.Test
 import java.util.ArrayList
 
-class ScoreListTest : BaseUnitTest() {
-    private lateinit var habit: Habit
-    private lateinit var today: Timestamp
+open class BaseScoreListTest : BaseUnitTest() {
+    protected lateinit var habit: Habit
+    protected lateinit var today: Timestamp
+
     @Before
     @Throws(Exception::class)
     override fun setUp() {
         super.setUp()
         today = getToday()
+    }
+
+    protected fun checkScoreValues(expectedValues: DoubleArray) {
+        var current = today
+        val scores = habit.scores
+        for (expectedValue in expectedValues) {
+            assertThat(scores[current].value, IsCloseTo.closeTo(expectedValue, E))
+            current = current.minus(1)
+        }
+    }
+
+    companion object {
+        const val E = 1e-6
+    }
+}
+
+class YesNoScoreListTest : BaseScoreListTest() {
+    @Before
+    @Throws(Exception::class)
+    override fun setUp() {
+        super.setUp()
         habit = fixtures.createEmptyHabit()
     }
 
@@ -122,14 +144,6 @@ class ScoreListTest : BaseUnitTest() {
         checkScoreValues(expectedValues)
     }
 
-    @Test
-    fun test_withZeroTarget() {
-        habit = fixtures.createNumericalHabit()
-        habit.targetValue = 0.0
-        habit.recompute()
-        assertTrue(habit.scores[today].value.isFinite())
-    }
-
     @Test
     fun test_imperfectNonDaily() {
         // If the habit should be performed 3 times per week and the user misses 1 repetition
@@ -255,17 +269,204 @@ class ScoreListTest : BaseUnitTest() {
         val entries = habit.originalEntries
         entries.add(Entry(today.minus(day), Entry.SKIP))
     }
+}
 
-    private fun checkScoreValues(expectedValues: DoubleArray) {
-        var current = today
-        val scores = habit.scores
-        for (expectedValue in expectedValues) {
-            assertThat(scores[current].value, IsCloseTo.closeTo(expectedValue, E))
-            current = current.minus(1)
-        }
+open class NumericalScoreListTest : BaseScoreListTest() {
+    protected fun addEntry(day: Int, value: Int) {
+        val entries = habit.originalEntries
+        entries.add(Entry(today.minus(day), value))
     }
 
-    companion object {
-        private const val E = 1e-6
+    protected fun addEntries(from: Int, to: Int, value: Int) {
+        val entries = habit.originalEntries
+        for (i in from until to) entries.add(Entry(today.minus(i), value))
+        habit.recompute()
+    }
+}
+
+class NumericalAtLeastScoreListTest : NumericalScoreListTest() {
+    @Before
+    @Throws(Exception::class)
+    override fun setUp() {
+        super.setUp()
+        habit = fixtures.createEmptyNumericalHabit(NumericalHabitType.AT_LEAST)
+    }
+
+    @Test
+    fun test_withZeroTarget() {
+        habit = fixtures.createNumericalHabit()
+        habit.targetValue = 0.0
+        habit.recompute()
+        assertTrue(habit.scores[today].value.isFinite())
+    }
+
+    @Test
+    fun test_getValue() {
+        addEntries(0, 20, 2000)
+        val expectedValues = doubleArrayOf(
+            0.655747,
+            0.636894,
+            0.617008,
+            0.596033,
+            0.573910,
+            0.550574,
+            0.525961,
+            0.500000,
+            0.472617,
+            0.443734,
+            0.413270,
+            0.381137,
+            0.347244,
+            0.311495,
+            0.273788,
+            0.234017,
+            0.192067,
+            0.147820,
+            0.101149,
+            0.051922,
+            0.000000,
+            0.000000,
+            0.000000
+        )
+        checkScoreValues(expectedValues)
+    }
+
+    @Test
+    fun test_recompute() {
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.0, E))
+        addEntries(0, 2, 2000)
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.101149, E))
+        habit.frequency = Frequency(1, 2)
+        habit.recompute()
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.072631, E))
+    }
+
+    @Test
+    fun shouldAchieveHighScoreInReasonableTime() {
+        // Daily habits should achieve at least 99% in 3 months
+        habit = fixtures.createEmptyNumericalHabit(NumericalHabitType.AT_LEAST)
+        habit.frequency = Frequency.DAILY
+        for (i in 0..89) addEntry(i, 2000)
+        habit.recompute()
+        assertThat(habit.scores[today].value, OrderingComparison.greaterThan(0.99))
+
+        // Weekly habits should achieve at least 99% in 9 months
+        habit = fixtures.createEmptyNumericalHabit(NumericalHabitType.AT_LEAST)
+        habit.frequency = Frequency.WEEKLY
+        for (i in 0..38) addEntry(7 * i, 2000)
+        habit.recompute()
+        assertThat(habit.scores[today].value, OrderingComparison.greaterThan(0.99))
+
+        // Monthly habits should achieve at least 99% in 18 months
+        habit.frequency = Frequency(1, 30)
+        for (i in 0..17) addEntry(30 * i, 2000)
+        habit.recompute()
+        assertThat(habit.scores[today].value, OrderingComparison.greaterThan(0.99))
+    }
+
+    @Test
+    fun shouldAchieveComparableScoreToProgress() {
+        addEntries(0, 500, 1000)
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.5, E))
+
+        addEntries(0, 500, 500)
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.25, E))
+    }
+
+    @Test
+    fun overeachievingIsntRelevant() {
+        addEntry(0, 10000000)
+        habit.recompute()
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.051922, E))
+    }
+}
+
+class NumericalAtMostScoreListTest : NumericalScoreListTest() {
+    @Before
+    @Throws(Exception::class)
+    override fun setUp() {
+        super.setUp()
+        habit = fixtures.createEmptyNumericalHabit(NumericalHabitType.AT_MOST)
+    }
+
+    @Test
+    fun test_withZeroTarget() {
+        habit = fixtures.createNumericalHabit()
+        habit.targetType = NumericalHabitType.AT_MOST
+        habit.targetValue = 0.0
+        habit.recompute()
+        assertTrue(habit.scores[today].value.isFinite())
+    }
+
+    @Test
+    fun test_getValue() {
+        addEntry(20, 1000)
+        addEntries(0, 20, 5000)
+        val expectedValues = doubleArrayOf(
+            0.344253,
+            0.363106,
+            0.382992,
+            0.403967,
+            0.426090,
+            0.449426,
+            0.474039,
+            0.500000,
+            0.527383,
+            0.556266,
+            0.586730,
+            0.618863,
+            0.652756,
+            0.688505,
+            0.726212,
+            0.765983,
+            0.807933,
+            0.852180,
+            0.898851,
+            0.948078,
+            1.0,
+            0.0,
+            0.0
+        )
+        checkScoreValues(expectedValues)
+    }
+
+    @Test
+    fun test_recompute() {
+        habit.recompute()
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(1.0, E))
+        addEntries(0, 2, 5000)
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.898850, E))
+        habit.frequency = Frequency(1, 2)
+        habit.recompute()
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.927369, E))
+    }
+
+    @Test
+    fun shouldAchieveComparableScoreToProgress() {
+        addEntries(0, 500, 3000)
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.5, E))
+
+        addEntries(0, 500, 3500)
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.25, E))
+    }
+
+    @Test
+    fun undereachievingIsntRelevant() {
+        addEntry(1, 10000000)
+        habit.recompute()
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.950773, E))
+    }
+
+    @Test
+    fun overeachievingIsntRelevant() {
+        addEntry(0, 5000)
+
+        addEntry(1, 0)
+        habit.recompute()
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.948077, E))
+
+        addEntry(1, 1000)
+        habit.recompute()
+        assertThat(habit.scores[today].value, IsCloseTo.closeTo(0.948077, E))
     }
 }
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/WeekdayListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/WeekdayListTest.kt
index 8bcde06fb..9d622d540 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/WeekdayListTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/WeekdayListTest.kt
@@ -44,4 +44,18 @@ class WeekdayListTest : BaseUnitTest() {
         assertTrue(list.isEmpty)
         assertFalse(WeekdayList.EVERY_DAY.isEmpty)
     }
+
+    @Test
+    fun testWeekdayList_IntConstructor_toString() {
+        val string = WeekdayList(0).toString()
+        assertThat(string, equalTo("{weekdays: [false,false,false,false,false,false,false]}"))
+    }
+
+    @Test
+    fun testWeekdayList_BooleanArrayConstructor_toString() {
+        val string = WeekdayList(
+            booleanArrayOf(false, false, true, true, true, true, true)
+        ).toString()
+        assertThat(string, equalTo("{weekdays: [false,false,true,true,true,true,true]}"))
+    }
 }
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt
index 59ee7a585..d5a551012 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt
@@ -28,7 +28,7 @@ import org.isoron.uhabits.core.database.Database
 import org.isoron.uhabits.core.database.Repository
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitList
-import org.isoron.uhabits.core.models.HabitMatcherBuilder
+import org.isoron.uhabits.core.models.HabitMatcher
 import org.isoron.uhabits.core.models.ModelObservable
 import org.isoron.uhabits.core.models.Reminder
 import org.isoron.uhabits.core.models.WeekdayList
@@ -69,12 +69,12 @@ class SQLiteHabitListTest : BaseUnitTest() {
         habitsArray[4].isArchived = true
         habitsArray[7].isArchived = true
         habitList.update(habitsArray)
-        activeHabits = habitList.getFiltered(HabitMatcherBuilder().build())
+        activeHabits = habitList.getFiltered(HabitMatcher())
         reminderHabits = habitList.getFiltered(
-            HabitMatcherBuilder()
-                .setArchivedAllowed(true)
-                .setReminderRequired(true)
-                .build()
+            HabitMatcher(
+                isArchivedAllowed = true,
+                isReminderRequired = true,
+            )
         )
         habitList.observable.addListener(listener)
     }
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.kt
index d354e81f0..cf81fbe9a 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.kt
@@ -138,7 +138,7 @@ class ReminderSchedulerTest : BaseUnitTest() {
         reminderScheduler.schedule(habit)
     }
 
-    override fun unixTime(year: Int, month: Int, day: Int, hour: Int, minute: Int): Long {
+    override fun unixTime(year: Int, month: Int, day: Int, hour: Int, minute: Int, milliseconds: Long): Long {
         val cal: Calendar = getStartOfTodayCalendar()
         cal[year, month, day, hour] = minute
         return cal.timeInMillis
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt
index af3132dde..97da833a5 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt
@@ -70,7 +70,7 @@ class HabitCardListCacheTest : BaseUnitTest() {
     @Test
     fun testCommandListener_single() {
         val h2 = habitList.getByPosition(2)
-        commandRunner.run(CreateRepetitionCommand(habitList, h2, today, Entry.NO))
+        commandRunner.run(CreateRepetitionCommand(habitList, h2, today, Entry.NO, ""))
         verify(listener).onItemChanged(2)
         verify(listener).onRefreshFinished()
         verifyNoMoreInteractions(listener)
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt
index b81d96284..8192583ad 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt
@@ -79,8 +79,8 @@ class ListHabitsBehaviorTest : BaseUnitTest() {
     @Test
     fun testOnEdit() {
         behavior.onEdit(habit2, getToday())
-        verify(screen).showNumberPicker(eq(0.1), eq("miles"), picker.capture())
-        picker.lastValue.onNumberPicked(100.0)
+        verify(screen).showNumberPicker(eq(0.1), eq("miles"), eq(""), eq("Jan 25, 2015"), picker.capture())
+        picker.lastValue.onNumberPicked(100.0, "")
         val today = getTodayWithOffset()
         assertThat(habit2.computedEntries.get(today).value, equalTo(100000))
     }
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
index bce63bcec..8a9d523ab 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
@@ -49,6 +49,7 @@ class HistoryChartTest {
         dateFormatter = JavaLocalDateFormatter(Locale.US),
         firstWeekday = SUNDAY,
         onDateClickedListener = dateClickedListener,
+        defaultSquare = OFF,
         series = listOf(
             2, // today
             2, 1, 2, 1, 2, 1, 2,
@@ -71,6 +72,10 @@ class HistoryChartTest {
                 1 -> DIMMED
                 else -> OFF
             }
+        },
+        notesIndicators = MutableList(85) {
+            index: Int ->
+            index % 3 == 0
         }
     )
 
@@ -85,20 +90,20 @@ class HistoryChartTest {
 
         // Click top left date
         view.onClick(20.0, 46.0)
-        verify(dateClickedListener).onDateClicked(LocalDate(2014, 10, 26))
+        verify(dateClickedListener).onDateShortPress(LocalDate(2014, 10, 26))
         reset(dateClickedListener)
         view.onClick(2.0, 28.0)
-        verify(dateClickedListener).onDateClicked(LocalDate(2014, 10, 26))
+        verify(dateClickedListener).onDateShortPress(LocalDate(2014, 10, 26))
         reset(dateClickedListener)
 
         // Click date in the middle
         view.onClick(163.0, 113.0)
-        verify(dateClickedListener).onDateClicked(LocalDate(2014, 12, 10))
+        verify(dateClickedListener).onDateShortPress(LocalDate(2014, 12, 10))
         reset(dateClickedListener)
 
         // Click today
         view.onClick(336.0, 37.0)
-        verify(dateClickedListener).onDateClicked(LocalDate(2015, 1, 25))
+        verify(dateClickedListener).onDateShortPress(LocalDate(2015, 1, 25))
         reset(dateClickedListener)
 
         // Click header
@@ -110,6 +115,37 @@ class HistoryChartTest {
         verifyNoMoreInteractions(dateClickedListener)
     }
 
+    @Test
+    fun testLongClick() = runBlocking {
+        assertRenders(400, 200, "$base/base.png", view)
+
+        // Click top left date
+        view.onLongClick(20.0, 46.0)
+        verify(dateClickedListener).onDateLongPress(LocalDate(2014, 10, 26))
+        reset(dateClickedListener)
+        view.onLongClick(2.0, 28.0)
+        verify(dateClickedListener).onDateLongPress(LocalDate(2014, 10, 26))
+        reset(dateClickedListener)
+
+        // Click date in the middle
+        view.onLongClick(163.0, 113.0)
+        verify(dateClickedListener).onDateLongPress(LocalDate(2014, 12, 10))
+        reset(dateClickedListener)
+
+        // Click today
+        view.onLongClick(336.0, 37.0)
+        verify(dateClickedListener).onDateLongPress(LocalDate(2015, 1, 25))
+        reset(dateClickedListener)
+
+        // Click header
+        view.onLongClick(160.0, 15.0)
+        verifyNoMoreInteractions(dateClickedListener)
+
+        // Click right axis
+        view.onLongClick(360.0, 60.0)
+        verifyNoMoreInteractions(dateClickedListener)
+    }
+
     @Test
     fun testDrawWeekDay() = runBlocking {
         view.firstWeekday = DayOfWeek.MONDAY
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt
index 18a06c8da..d58ef1979 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt
@@ -58,7 +58,7 @@ class WidgetBehaviorTest : BaseUnitTest() {
     fun testOnAddRepetition() {
         behavior.onAddRepetition(habit, today)
         verify(commandRunner).run(
-            CreateRepetitionCommand(habitList, habit, today, Entry.YES_MANUAL)
+            CreateRepetitionCommand(habitList, habit, today, Entry.YES_MANUAL, "")
         )
         verify(notificationTray).cancel(habit)
         verifyZeroInteractions(preferences)
@@ -68,7 +68,7 @@ class WidgetBehaviorTest : BaseUnitTest() {
     fun testOnRemoveRepetition() {
         behavior.onRemoveRepetition(habit, today)
         verify(commandRunner).run(
-            CreateRepetitionCommand(habitList, habit, today, Entry.NO)
+            CreateRepetitionCommand(habitList, habit, today, Entry.NO, "")
         )
         verify(notificationTray).cancel(habit)
         verifyZeroInteractions(preferences)
@@ -94,7 +94,7 @@ class WidgetBehaviorTest : BaseUnitTest() {
             behavior.onToggleRepetition(habit, today)
             verify(preferences).isSkipEnabled
             verify(commandRunner).run(
-                CreateRepetitionCommand(habitList, habit, today, nextValue)
+                CreateRepetitionCommand(habitList, habit, today, nextValue, "")
             )
             verify(notificationTray).cancel(
                 habit
@@ -110,7 +110,7 @@ class WidgetBehaviorTest : BaseUnitTest() {
         habit.recompute()
         behavior.onIncrement(habit, today, 100)
         verify(commandRunner).run(
-            CreateRepetitionCommand(habitList, habit, today, 600)
+            CreateRepetitionCommand(habitList, habit, today, 600, "")
         )
         verify(notificationTray).cancel(habit)
         verifyZeroInteractions(preferences)
@@ -123,7 +123,7 @@ class WidgetBehaviorTest : BaseUnitTest() {
         habit.recompute()
         behavior.onDecrement(habit, today, 100)
         verify(commandRunner).run(
-            CreateRepetitionCommand(habitList, habit, today, 400)
+            CreateRepetitionCommand(habitList, habit, today, 400, "")
         )
         verify(notificationTray).cancel(habit)
         verifyZeroInteractions(preferences)
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt
index 1b440279e..75280ab9b 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt
@@ -37,6 +37,7 @@ import org.isoron.uhabits.core.utils.DateUtils.Companion.truncate
 import org.junit.Before
 import org.junit.Test
 import java.util.Calendar
+import java.util.GregorianCalendar
 import java.util.Locale
 import java.util.TimeZone
 
@@ -58,6 +59,129 @@ class DateUtilsTest : BaseUnitTest() {
         assertThat(formatted, equalTo("Thu\n31"))
     }
 
+    @Test
+    fun testGetLocalTime() {
+        setFixedLocalTime(null)
+        setFixedTimeZone(TimeZone.getTimeZone("Australia/Sydney"))
+        val utcTestTimeInMillis = unixTime(2015, Calendar.JANUARY, 11)
+        val localTimeInMillis = DateUtils.getLocalTime(utcTestTimeInMillis)
+        val expectedUnixTimeOffsetForSydney = 11 * 60 * 60 * 1000
+        val expectedUnixTimeForSydney = utcTestTimeInMillis + expectedUnixTimeOffsetForSydney
+        assertThat(expectedUnixTimeForSydney, equalTo(localTimeInMillis))
+    }
+
+    @Test
+    fun testGetWeekdaySequence() {
+        val weekdaySequence = DateUtils.getWeekdaySequence(3)
+        assertThat(arrayOf(3, 4, 5, 6, 7, 1, 2), equalTo(weekdaySequence))
+    }
+
+    @Test
+    fun testGetFirstWeekdayNumberAccordingToLocale_germany() {
+        setFixedLocale(Locale.GERMANY)
+        val firstWeekdayNumber = DateUtils.getFirstWeekdayNumberAccordingToLocale()
+        assertThat(2, equalTo(firstWeekdayNumber))
+    }
+
+    @Test
+    fun testGetFirstWeekdayNumberAccordingToLocale_us() {
+        setFixedLocale(Locale.US)
+        val firstWeekdayNumber = DateUtils.getFirstWeekdayNumberAccordingToLocale()
+        assertThat(1, equalTo(firstWeekdayNumber))
+    }
+
+    @Test
+    fun testGetLongWeekdayNames_germany() {
+        setFixedLocale(Locale.GERMANY)
+        val longWeekdayNames = DateUtils.getLongWeekdayNames(Calendar.SATURDAY)
+        assertThat(arrayOf("Samstag", "Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag"), equalTo(longWeekdayNames))
+    }
+
+    @Test
+    fun testGetLongWeekdayNames_us() {
+        setFixedLocale(Locale.US)
+        val longWeekdayNames = DateUtils.getLongWeekdayNames(Calendar.SATURDAY)
+        assertThat(arrayOf("Saturday", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"), equalTo(longWeekdayNames))
+    }
+
+    @Test
+    fun testGetShortWeekdayNames_germany() {
+        setFixedLocale(Locale.GERMANY)
+        val longWeekdayNames = DateUtils.getShortWeekdayNames(Calendar.SATURDAY)
+        assertThat(arrayOf("Sa.", "So.", "Mo.", "Di.", "Mi.", "Do.", "Fr."), equalTo(longWeekdayNames))
+    }
+
+    @Test
+    fun testGetShortWeekdayNames_us() {
+        setFixedLocale(Locale.US)
+        val longWeekdayNames = DateUtils.getShortWeekdayNames(Calendar.SATURDAY)
+        assertThat(arrayOf("Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri"), equalTo(longWeekdayNames))
+    }
+
+    @Test
+    fun testGetToday() {
+        setFixedLocalTime(FIXED_LOCAL_TIME)
+        val today = DateUtils.getToday()
+        assertThat(Timestamp(FIXED_LOCAL_TIME), equalTo(today))
+    }
+
+    @Test
+    fun testGetStartOfDay() {
+        val expectedStartOfDayUtc = fixedStartOfToday()
+        val laterInTheDayUtc = fixedStartOfTodayWithOffset(20)
+        val startOfDay = DateUtils.getStartOfDay(laterInTheDayUtc)
+        assertThat(expectedStartOfDayUtc, equalTo(startOfDay))
+    }
+
+    @Test
+    fun testGetStartOfToday() {
+        val expectedStartOfDayUtc = fixedStartOfToday()
+        val laterInTheDayUtc = fixedStartOfTodayWithOffset(20)
+        setFixedLocalTime(laterInTheDayUtc)
+        val startOfToday = DateUtils.getStartOfToday()
+        assertThat(expectedStartOfDayUtc, equalTo(startOfToday))
+    }
+
+    @Test
+    fun testGetStartOfTomorrowWithOffset_priorToOffset() {
+        val priorToOffset = HOUR_OFFSET - 1
+        testGetStartOfTomorrowWithOffset(priorToOffset)
+    }
+
+    @Test
+    fun testGetStartOfTomorrowWithOffset_afterOffset() {
+        val afterOffset = HOUR_OFFSET + 1 - HOURS_IN_ONE_DAY
+        testGetStartOfTomorrowWithOffset(afterOffset)
+    }
+
+    private fun testGetStartOfTomorrowWithOffset(startOfTodayOffset: Int) {
+        configureOffsetTest(startOfTodayOffset)
+        assertThat(
+            fixedStartOfTodayWithOffset(HOUR_OFFSET),
+            equalTo(DateUtils.getStartOfTomorrowWithOffset())
+        )
+    }
+
+    @Test
+    fun testGetStartOfTodayWithOffset_priorToOffset() {
+        val priorToOffset = HOURS_IN_ONE_DAY + HOUR_OFFSET - 1
+        testGetStartOfTodayWithOffset(priorToOffset)
+    }
+
+    @Test
+    fun testGetStartOfTodayWithOffset_afterOffset() {
+        val afterOffset = HOUR_OFFSET + 1
+        testGetStartOfTodayWithOffset(afterOffset)
+    }
+
+    private fun testGetStartOfTodayWithOffset(startOfTodayOffset: Int) {
+        configureOffsetTest(startOfTodayOffset)
+        assertThat(
+            fixedStartOfToday(),
+            equalTo(DateUtils.getStartOfTodayWithOffset())
+        )
+    }
+
     @Test
     fun testTruncate_dayOfWeek() {
         val field = DateUtils.TruncateField.WEEK_NUMBER
@@ -142,22 +266,39 @@ class DateUtilsTest : BaseUnitTest() {
         assertThat(truncate(field, t2, firstWeekday), equalTo(expected))
     }
 
+    @Test
+    fun testTruncate_timestamp() {
+        val field = DateUtils.TruncateField.YEAR
+        val nonTruncatedDate = unixTime(2016, Calendar.MAY, 30)
+        val expected = Timestamp(unixTime(2016, Calendar.JANUARY, 1))
+        assertThat(expected, equalTo(truncate(field, Timestamp(nonTruncatedDate), firstWeekday)))
+    }
+
+    @Test
+    fun testGetUpcomingTimeInMillis() {
+        setFixedLocalTime(FIXED_LOCAL_TIME)
+        setFixedTimeZone(TimeZone.getTimeZone("GMT"))
+        val expected = unixTime(2015, Calendar.JANUARY, 25, 10, 1)
+        val upcomingTimeMillis = DateUtils.getUpcomingTimeInMillis(10, 1)
+        assertThat(expected, equalTo(upcomingTimeMillis))
+    }
+
     @Test
     @Throws(Exception::class)
     fun testMillisecondsUntilTomorrow() {
         setFixedTimeZone(TimeZone.getTimeZone("GMT"))
         setFixedLocalTime(unixTime(2017, Calendar.JANUARY, 1, 23, 59))
         assertThat(millisecondsUntilTomorrowWithOffset(), equalTo(DateUtils.MINUTE_LENGTH))
-        setFixedLocalTime(unixTime(2017, Calendar.JANUARY, 1, 20, 0))
+        setFixedLocalTime(fixedStartOfTodayWithOffset(20))
         assertThat(
             millisecondsUntilTomorrowWithOffset(),
             equalTo(4 * DateUtils.HOUR_LENGTH)
         )
-        setStartDayOffset(3, 30)
+        setStartDayOffset(HOUR_OFFSET, 30)
         setFixedLocalTime(unixTime(2017, Calendar.JANUARY, 1, 23, 59))
         assertThat(
             millisecondsUntilTomorrowWithOffset(),
-            equalTo(3 * DateUtils.HOUR_LENGTH + 31 * DateUtils.MINUTE_LENGTH)
+            equalTo(HOUR_OFFSET * DateUtils.HOUR_LENGTH + 31 * DateUtils.MINUTE_LENGTH)
         )
         setFixedLocalTime(unixTime(2017, Calendar.JANUARY, 2, 1, 0))
         assertThat(
@@ -166,6 +307,52 @@ class DateUtilsTest : BaseUnitTest() {
         )
     }
 
+    @Test
+    fun testGetStartOfTodayCalendar() {
+        setFixedLocalTime(FIXED_LOCAL_TIME)
+        setFixedLocale(Locale.GERMANY)
+        val expectedStartOfDay = unixTime(2015, Calendar.JANUARY, 25, 0, 0)
+        val expectedCalendar = GregorianCalendar(TimeZone.getTimeZone("GMT"), Locale.GERMANY)
+        expectedCalendar.timeInMillis = expectedStartOfDay
+        val startOfTodayCalendar = DateUtils.getStartOfTodayCalendar()
+        assertThat(expectedCalendar, equalTo(startOfTodayCalendar))
+    }
+
+    @Test
+    fun testGetStartOfTodayCalendarWithOffset_priorToOffset() {
+        val priorToOffset = HOUR_OFFSET - 1
+        testGetStartOfTodayCalendarWithOffset(priorToOffset)
+    }
+
+    @Test
+    fun testGetStartOfTodayCalendarWithOffset_afterOffset() {
+        val afterOffset = HOUR_OFFSET + 1
+        testGetStartOfTodayCalendarWithOffset(afterOffset)
+    }
+
+    private fun testGetStartOfTodayCalendarWithOffset(startOfTodayOffset: Int) {
+        configureOffsetTest(startOfTodayOffset)
+        setFixedLocale(Locale.GERMANY)
+        val expectedCalendar = GregorianCalendar(TimeZone.getTimeZone("GMT"), Locale.GERMANY)
+        expectedCalendar.timeInMillis = fixedStartOfToday()
+        assertThat(
+            expectedCalendar,
+            equalTo(DateUtils.getStartOfTodayCalendar())
+        )
+    }
+
+    private fun configureOffsetTest(startOfTodayOffset: Int) {
+        setStartDayOffset(HOUR_OFFSET, 0)
+        setFixedTimeZone(TimeZone.getTimeZone("GMT"))
+        setFixedLocalTime(fixedStartOfTodayWithOffset(startOfTodayOffset))
+    }
+
+    private fun fixedStartOfToday() = fixedStartOfTodayWithOffset(0)
+
+    private fun fixedStartOfTodayWithOffset(hourOffset: Int): Long {
+        return unixTime(2017, Calendar.JANUARY, 1, hourOffset, 0)
+    }
+
     @Test
     @Throws(Exception::class)
     fun testGetTodayWithOffset() {
@@ -469,4 +656,9 @@ class DateUtilsTest : BaseUnitTest() {
             unixTime(2018, Calendar.APRIL, 1, 18, 0)
         )
     }
+
+    companion object {
+        const val HOUR_OFFSET = 3
+        const val HOURS_IN_ONE_DAY = 24
+    }
 }
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/FileExtensionsTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/FileExtensionsTest.kt
new file mode 100644
index 000000000..627422608
--- /dev/null
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/FileExtensionsTest.kt
@@ -0,0 +1,17 @@
+package org.isoron.uhabits.core.utils
+
+import org.isoron.uhabits.core.BaseUnitTest
+import org.junit.Test
+import java.io.File
+import kotlin.test.assertTrue
+
+class FileExtensionsTest : BaseUnitTest() {
+
+    @Test
+    fun testIsSQLite3File() {
+        val file = File.createTempFile("asset", "")
+        copyAssetToFile("loop.db", file)
+        val isSqlite3File = file.isSQLite3File()
+        assertTrue(isSqlite3File)
+    }
+}
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/MidnightTimerTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/MidnightTimerTest.kt
new file mode 100644
index 000000000..b92507da0
--- /dev/null
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/MidnightTimerTest.kt
@@ -0,0 +1,48 @@
+package org.isoron.uhabits.core.utils
+
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.isoron.uhabits.core.BaseUnitTest
+import org.junit.Test
+import java.util.Calendar
+import java.util.TimeZone
+import java.util.concurrent.Executors
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+import kotlin.test.assertEquals
+
+class MidnightTimerTest : BaseUnitTest() {
+
+    @Test
+    fun testMidnightTimer_notifyListener_atMidnight() = runBlocking {
+        // Given
+        val executor = Executors.newSingleThreadScheduledExecutor()
+        val dispatcher = executor.asCoroutineDispatcher()
+
+        withContext(dispatcher) {
+            DateUtils.setFixedTimeZone(TimeZone.getTimeZone("GMT"))
+            DateUtils.setFixedLocalTime(
+                unixTime(
+                    2017,
+                    Calendar.JANUARY,
+                    1,
+                    23,
+                    59,
+                    DateUtils.MINUTE_LENGTH - 1
+                )
+            )
+
+            val suspendedListener = suspendCoroutine<Boolean> { continuation ->
+                MidnightTimer().apply {
+                    addListener { continuation.resume(true) }
+                    // When
+                    onResume(1, executor)
+                }
+            }
+
+            // Then
+            assertEquals(true, suspendedListener)
+        }
+    }
+}
diff --git a/uhabits-core/src/jvmTest/resources/databases/021.db b/uhabits-core/src/jvmTest/resources/databases/021.db
deleted file mode 100644
index 850479ca0..000000000
Binary files a/uhabits-core/src/jvmTest/resources/databases/021.db and /dev/null differ
diff --git a/uhabits-core/src/jvmTest/resources/databases/022.db b/uhabits-core/src/jvmTest/resources/databases/022.db
deleted file mode 100644
index 01237dfc8..000000000
Binary files a/uhabits-core/src/jvmTest/resources/databases/022.db and /dev/null differ
diff --git a/uhabits-core/src/jvmTest/resources/habitbull.csv b/uhabits-core/src/jvmTest/resources/habitbull.csv
deleted file mode 100644
index 977a8e8df..000000000
--- a/uhabits-core/src/jvmTest/resources/habitbull.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-HabitName,HabitDescription,HabitCategory,CalendarDate,Value,CommentText
-Breed dragons,with love and fire,Diet & Food,2016-03-18,1,
-Breed dragons,with love and fire,Diet & Food,2016-03-19,1,
-Breed dragons,with love and fire,Diet & Food,2016-03-21,1,
-Reduce sleep,only 2 hours per day,Time Management,2016-03-15,1,
-Reduce sleep,only 2 hours per day,Time Management,2016-03-16,1,
-Reduce sleep,only 2 hours per day,Time Management,2016-03-17,1,
-Reduce sleep,only 2 hours per day,Time Management,2016-03-21,1,
-No-arms pushup,Become like water my friend!,Fitness,2016-03-15,1,
-No-arms pushup,Become like water my friend!,Fitness,2016-03-16,1,
-No-arms pushup,Become like water my friend!,Fitness,2016-03-18,1,
-No-arms pushup,Become like water my friend!,Fitness,2016-03-21,1,
-No-arms pushup,Become like water my friend!,Fitness,2016-03-15,1,
-No-arms pushup,Become like water my friend!,Fitness,2016-03-16,1,
-No-arms pushup,Become like water my friend!,Fitness,2016-03-18,1,
-No-arms pushup,Become like water my friend!,Fitness,2016-03-21,1,
-Grow spiritually,"transcend ego, practice compassion, smile and breath",Meditation,2016-03-15,1,
-Grow spiritually,"transcend ego, practice compassion, smile and breath",Meditation,2016-03-17,1,
-Grow spiritually,"transcend ego, practice compassion, smile and breath",Meditation,2016-03-21,1,
diff --git a/uhabits-core/src/jvmTest/resources/loop.db b/uhabits-core/src/jvmTest/resources/loop.db
deleted file mode 100644
index 25f0f32cd..000000000
Binary files a/uhabits-core/src/jvmTest/resources/loop.db and /dev/null differ
diff --git a/uhabits-core/src/jvmTest/resources/rewire.db b/uhabits-core/src/jvmTest/resources/rewire.db
deleted file mode 100644
index 21f55032f..000000000
Binary files a/uhabits-core/src/jvmTest/resources/rewire.db and /dev/null differ
diff --git a/uhabits-core/src/jvmTest/resources/tickmate.db b/uhabits-core/src/jvmTest/resources/tickmate.db
deleted file mode 100644
index a4bec769c..000000000
Binary files a/uhabits-core/src/jvmTest/resources/tickmate.db and /dev/null differ
diff --git a/uhabits-server/build.gradle.kts b/uhabits-server/build.gradle.kts
index dbb410194..0a6ff1514 100644
--- a/uhabits-server/build.gradle.kts
+++ b/uhabits-server/build.gradle.kts
@@ -22,7 +22,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     application
     id("kotlin")
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
 
@@ -33,9 +33,9 @@ application {
 }
 
 dependencies {
-    val ktorVersion = "1.6.3"
-    val kotlinVersion = "1.5.30"
-    val logbackVersion = "1.2.5"
+    val ktorVersion = "1.6.7"
+    val kotlinVersion = "1.6.10"
+    val logbackVersion = "1.2.10"
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("io.ktor:ktor-server-netty:$ktorVersion")
     implementation("ch.qos.logback:logback-classic:$logbackVersion")
@@ -43,9 +43,9 @@ dependencies {
     implementation("io.ktor:ktor-html-builder:$ktorVersion")
     implementation("io.ktor:ktor-jackson:$ktorVersion")
     implementation("org.jetbrains:kotlin-css-jvm:1.0.0-pre.148-kotlin-1.4.30")
-    implementation("io.prometheus:simpleclient:0.12.0")
-    implementation("io.prometheus:simpleclient_httpserver:0.12.0")
-    implementation("io.prometheus:simpleclient_hotspot:0.12.0")
+    implementation("io.prometheus:simpleclient:0.15.0")
+    implementation("io.prometheus:simpleclient_httpserver:0.15.0")
+    implementation("io.prometheus:simpleclient_hotspot:0.15.0")
     testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
     testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
     testImplementation(kotlin("test"))