diff --git a/build.gradle.kts b/build.gradle.kts
index ebfccb5e6..25e353b53 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     val kotlinVersion = "1.7.21"
-    id("com.android.application") version ("7.3.1") apply (false)
+    id("com.android.application") version "7.4.2" 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 "11.0.0"
+    id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
 }
 
 apply {
diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index 5e9adb694..e74c578a1 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -19,7 +19,7 @@
 
 plugins {
     id("com.github.triplet.play") version "3.7.0"
-    id("com.android.application")
+    id("com.android.application") version "7.4.2"
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
     id("org.jetbrains.kotlin.android.extensions")
@@ -37,7 +37,7 @@ android {
     defaultConfig {
         versionCode = 20200
         versionName = "2.2.0"
-        minSdk = 23
+        minSdk = 28
         targetSdk = 31
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -96,7 +96,7 @@ dependencies {
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
     androidTestImplementation("androidx.test:rules:1.5.0")
-    androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+    androidTestImplementation("org.mockito.kotlin:mockito-kotlin:2.2.11")
     compileOnly("javax.annotation:jsr250-api:1.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
     implementation("com.github.AppIntro:AppIntro:6.2.0")
@@ -121,7 +121,7 @@ dependencies {
     kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion")
     testImplementation("com.google.dagger:dagger:$daggerVersion")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:2.2.11")
 }
 
 kapt {
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.kt
index 657eaf086..5553c234a 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.kt
@@ -39,6 +39,7 @@ open class BaseUserInterfaceTest {
     private lateinit var prefs: Preferences
     private lateinit var fixtures: HabitFixtures
     private lateinit var cache: HabitCardListCache
+
     @Before
     @Throws(Exception::class)
     fun setUp() {
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.kt
index bcec69dfa..2f6daca23 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.kt
@@ -153,18 +153,22 @@ open class BaseViewTest : BaseAndroidTest() {
         var filename = filename
         var dir = getSDCardDir("test-screenshots")
         if (dir == null) dir = AndroidDirFinder(targetContext).getFilesDir("test-screenshots")
-        if (dir == null) throw RuntimeException(
-            "Could not find suitable dir for screenshots"
-        )
+        if (dir == null) {
+            throw RuntimeException(
+                "Could not find suitable dir for screenshots"
+            )
+        }
         filename = filename.replace("\\.png$".toRegex(), "$suffix.png")
         val absolutePath = String.format("%s/%s", dir.absolutePath, filename)
         val parent = File(absolutePath).parentFile
-        if (!parent.exists() && !parent.mkdirs()) throw RuntimeException(
-            String.format(
-                "Could not create dir: %s",
-                parent.absolutePath
+        if (!parent.exists() && !parent.mkdirs()) {
+            throw RuntimeException(
+                String.format(
+                    "Could not create dir: %s",
+                    parent.absolutePath
+                )
             )
-        )
+        }
         val out = FileOutputStream(absolutePath)
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
         return absolutePath
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
index a7a1b2759..38df23db2 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
@@ -19,7 +19,6 @@
 
 package org.isoron.uhabits
 
-import com.nhaarman.mockitokotlin2.mock
 import dagger.Component
 import dagger.Module
 import dagger.Provides
@@ -35,6 +34,7 @@ import org.isoron.uhabits.inject.ActivityScope
 import org.isoron.uhabits.inject.HabitModule
 import org.isoron.uhabits.inject.HabitsActivityModule
 import org.isoron.uhabits.inject.HabitsApplicationComponent
+import org.mockito.kotlin.mock
 
 @Module
 class TestModule {
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt
index 3d71853ec..4f504d8be 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt
@@ -44,7 +44,7 @@ class ScoreChartTest : BaseViewTest() {
             habit = habit,
             firstWeekday = prefs.firstWeekdayInt,
             spinnerPosition = 0,
-            theme = LightTheme(),
+            theme = LightTheme()
         )
         view = ScoreChart(targetContext).apply {
             setScores(state.scores)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.kt
index 58ed5e7d3..ec11b27ed 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.kt
@@ -30,6 +30,7 @@ import org.junit.runner.RunWith
 @MediumTest
 class StreakChartTest : BaseViewTest() {
     private lateinit var view: StreakChart
+
     @Before
     override fun setUp() {
         super.setUp()
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.kt
index 6bf7e2a81..3a972a57c 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.kt
@@ -20,15 +20,15 @@ package org.isoron.uhabits.activities.habits.list.views
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
-import com.nhaarman.mockitokotlin2.whenever
 import org.isoron.uhabits.BaseViewTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
+import org.mockito.kotlin.whenever
 
 @RunWith(AndroidJUnit4::class)
 @MediumTest
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.kt
index af1f30df8..f065d8c37 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.kt
@@ -20,9 +20,6 @@ package org.isoron.uhabits.activities.habits.list.views
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
@@ -30,6 +27,9 @@ import org.isoron.uhabits.core.ui.screens.habits.list.HintList
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 @RunWith(AndroidJUnit4::class)
 @MediumTest
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
index c26b55775..66cc0a7d9 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
@@ -48,7 +48,7 @@ class FrequencyCardViewTest : BaseViewTest() {
             FrequencyCardPresenter.buildState(
                 habit = habit,
                 firstWeekday = 0,
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 600f)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt
index 71fe4e751..249f56972 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt
@@ -49,7 +49,7 @@ class HistoryCardViewTest : BaseViewTest() {
             HistoryCardPresenter.buildState(
                 habit = habit,
                 firstWeekday = SUNDAY,
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 600f)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt
index 9a5fc81d3..1018978f2 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt
@@ -51,7 +51,7 @@ class OverviewCardViewTest : BaseViewTest() {
                 scoreYearDiff = 0.74f,
                 totalCount = 44,
                 color = PaletteColor(7),
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 300f)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt
index 8bd2bc520..85f66add2 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt
@@ -49,7 +49,7 @@ class ScoreCardViewTest : BaseViewTest() {
                 habit = habit,
                 firstWeekday = 0,
                 spinnerPosition = 0,
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 600f)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt
index 2c70e3b92..14d5c3d27 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt
@@ -48,7 +48,7 @@ class StreakCardViewTest : BaseViewTest() {
             StreakCardState(
                 bestStreaks = habit.streaks.getBest(10),
                 color = habit.color,
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 600f)
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 3323f78df..642517827 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,7 +53,7 @@ class SubtitleCardViewTest : BaseViewTest() {
                 isNumerical = false,
                 question = "Did you meditate this morning?",
                 reminder = Reminder(8, 30, EVERY_DAY),
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 200f)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt
index 551c76c17..d514fdbfb 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt
@@ -119,7 +119,7 @@ class ListHabitsRegressionTest : BaseUserInterfaceTest() {
             "Wake up early",
             "Meditate",
             "Read books",
-            "Track time",
+            "Track time"
         )
     }
 }
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt
index e2fe9a2a3..628a2ebbf 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt
@@ -33,6 +33,7 @@ import java.io.IOException
 @MediumTest
 class CheckmarkWidgetViewTest : BaseViewTest() {
     private lateinit var view: CheckmarkWidgetView
+
     @Before
     override fun setUp() {
         super.setUp()
diff --git a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt
index ae1d1f52f..36d79596e 100644
--- a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt
+++ b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt
@@ -60,7 +60,7 @@ class AndroidCanvas : Canvas {
             y1.toDp(),
             x2.toDp(),
             y2.toDp(),
-            paint,
+            paint
         )
     }
 
@@ -69,7 +69,7 @@ class AndroidCanvas : Canvas {
             text,
             x.toDp(),
             y.toDp() + 0.6f * mHeight,
-            textPaint,
+            textPaint
         )
     }
 
@@ -83,7 +83,7 @@ class AndroidCanvas : Canvas {
         y: Double,
         width: Double,
         height: Double,
-        cornerRadius: Double,
+        cornerRadius: Double
     ) {
         paint.style = Paint.Style.FILL
         innerCanvas.drawRoundRect(
@@ -93,7 +93,7 @@ class AndroidCanvas : Canvas {
             (y + height).toDp(),
             cornerRadius.toDp(),
             cornerRadius.toDp(),
-            paint,
+            paint
         )
     }
 
@@ -108,7 +108,7 @@ class AndroidCanvas : Canvas {
             y.toDp(),
             (x + width).toDp(),
             (y + height).toDp(),
-            paint,
+            paint
         )
     }
 
@@ -148,7 +148,7 @@ class AndroidCanvas : Canvas {
         centerY: Double,
         radius: Double,
         startAngle: Double,
-        swipeAngle: Double,
+        swipeAngle: Double
     ) {
         paint.style = Paint.Style.FILL
         innerCanvas.drawArc(
@@ -159,14 +159,14 @@ class AndroidCanvas : Canvas {
             -startAngle.toFloat(),
             -swipeAngle.toFloat(),
             true,
-            paint,
+            paint
         )
     }
 
     override fun fillCircle(
         centerX: Double,
         centerY: Double,
-        radius: Double,
+        radius: Double
     ) {
         paint.style = Paint.Style.FILL
         innerCanvas.drawCircle(centerX.toDp(), centerY.toDp(), radius.toDp(), paint)
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 0a8c5ee68..990314a06 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
@@ -33,7 +33,7 @@ import kotlin.math.max
  */
 class AndroidDataView(
     context: Context,
-    attrs: AttributeSet? = null,
+    attrs: AttributeSet? = null
 ) : AndroidView<DataView>(context, attrs),
     GestureDetector.OnGestureListener,
     ValueAnimator.AnimatorUpdateListener {
@@ -60,7 +60,7 @@ class AndroidDataView(
         e1: MotionEvent?,
         e2: MotionEvent?,
         dx: Float,
-        dy: Float,
+        dy: Float
     ): Boolean {
         if (abs(dx) > abs(dy)) {
             val parent = parent
@@ -82,7 +82,7 @@ class AndroidDataView(
         e1: MotionEvent?,
         e2: MotionEvent?,
         velocityX: Float,
-        velocityY: Float,
+        velocityY: Float
     ): Boolean {
         scroller.fling(
             scroller.currX,
@@ -140,8 +140,11 @@ class AndroidDataView(
             // e.getPointerId.
             return false
         }
-        if (isSingleTap) view?.onClick(x / canvas.innerDensity, y / canvas.innerDensity)
-        else view?.onLongClick(x / canvas.innerDensity, y / canvas.innerDensity)
+        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/platform/gui/AndroidImage.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt
index 0b313f9a4..b382c220c 100644
--- a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt
+++ b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt
@@ -47,6 +47,6 @@ fun Color.toInt(): Int {
         (255 * this.alpha).roundToInt(),
         (255 * this.red).roundToInt(),
         (255 * this.green).roundToInt(),
-        (255 * this.blue).roundToInt(),
+        (255 * this.blue).roundToInt()
     )
 }
diff --git a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt
index 4fd22541c..139989178 100644
--- a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt
+++ b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt
@@ -24,7 +24,7 @@ import android.util.AttributeSet
 
 open class AndroidView<T : View>(
     context: Context,
-    attrs: AttributeSet? = null,
+    attrs: AttributeSet? = null
 ) : android.view.View(context, attrs) {
 
     var view: T? = null
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
index be9d0eb02..c47eb968d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
@@ -39,7 +39,7 @@ import org.isoron.uhabits.inject.ActivityScope
 class AndroidThemeSwitcher
 constructor(
     @ActivityContext val context: Context,
-    preferences: Preferences,
+    preferences: Preferences
 ) : ThemeSwitcher(preferences) {
 
     override var currentTheme: Theme = LightTheme()
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt
index 8909431b2..04fa715fd 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt
@@ -27,7 +27,7 @@ import org.isoron.uhabits.utils.startActivitySafely
 class AboutScreen(
     private val activity: AboutActivity,
     private val intents: IntentFactory,
-    private val prefs: Preferences,
+    private val prefs: Preferences
 ) {
 
     private var developerCountdown = 5
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt
index 5eeb67f19..bc52f6fc0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt
@@ -32,7 +32,7 @@ import org.isoron.uhabits.utils.setupToolbar
 @SuppressLint("ViewConstructor")
 class AboutView(
     context: Context,
-    private val screen: AboutScreen,
+    private val screen: AboutScreen
 ) : FrameLayout(context) {
 
     private var binding = AboutBinding.inflate(LayoutInflater.from(context))
@@ -43,7 +43,7 @@ class AboutView(
             toolbar = binding.toolbar,
             color = PaletteColor(11),
             title = resources.getString(R.string.about),
-            theme = currentTheme(),
+            theme = currentTheme()
         )
         val version = resources.getString(R.string.version_n)
         binding.tvContributors.setOnClickListener { screen.showCodeContributorsWebsite() }
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 5173aa6f9..6c1a941eb 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
@@ -48,22 +48,22 @@ class FrequencyPickerDialog(
 
         addBeforeAfterText(
             this.getString(R.string.every_x_days),
-            contentView.everyXDaysContainer,
+            contentView.everyXDaysContainer
         )
 
         addBeforeAfterText(
             this.getString(R.string.x_times_per_week),
-            contentView.xTimesPerWeekContainer,
+            contentView.xTimesPerWeekContainer
         )
 
         addBeforeAfterText(
             this.getString(R.string.x_times_per_month),
-            contentView.xTimesPerMonthContainer,
+            contentView.xTimesPerMonthContainer
         )
 
         addBeforeAfterText(
             this.getString(R.string.x_times_per_y_days),
-            contentView.xTimesPerYDaysContainer,
+            contentView.xTimesPerYDaysContainer
         )
 
         contentView.everyDayRadioButton.setOnClickListener {
@@ -124,7 +124,8 @@ class FrequencyPickerDialog(
         val parts = str.split("%d")
         for (i in parts.indices) {
             container.addView(
-                TextView(activity).apply { text = parts[i].trim() }, 2 * i + 1,
+                TextView(activity).apply { text = parts[i].trim() },
+                2 * i + 1
             )
         }
     }
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 27898e87f..02796eca4 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
@@ -69,7 +69,7 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
             theme = themeSwitcher.currentTheme,
             today = DateUtils.getTodayWithOffset().toLocalDate(),
             onDateClickedListener = onDateClickedListener ?: object : OnDateClickedListener {},
-            padding = 10.0,
+            padding = 10.0
         )
         dataView = AndroidDataView(requireContext(), null)
         dataView.view = chart!!
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.kt
index 41c67ff27..10aeaf29b 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.kt
@@ -181,8 +181,9 @@ class FrequencyChart : ScrollableChart {
             rect[0f, 0f, baseSize.toFloat()] = baseSize.toFloat()
             rect.offset(prevRect!!.left, prevRect!!.top + baseSize * j)
             val i = localeWeekdayList[j] % 7
-            if (values != null)
+            if (values != null) {
                 drawMarker(canvas, rect, values[i], weekDaysInMonth[i])
+            }
             rect.offset(0f, rowHeight)
         }
         drawFooter(canvas, rect, date)
@@ -196,12 +197,14 @@ class FrequencyChart : ScrollableChart {
             rect.centerY() - 0.1f * em,
             pText!!
         )
-        if (date[Calendar.MONTH] == 1) canvas.drawText(
-            dfYear!!.format(time),
-            rect.centerX(),
-            rect.centerY() + 0.9f * em,
-            pText!!
-        )
+        if (date[Calendar.MONTH] == 1) {
+            canvas.drawText(
+                dfYear!!.format(time),
+                rect.centerX(),
+                rect.centerY() + 0.9f * em,
+                pText!!
+            )
+        }
     }
 
     private fun drawGrid(canvas: Canvas, rGrid: RectF?) {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt
index 4a3b10679..870097800 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt
@@ -148,8 +148,12 @@ class RingView : View {
         pRing!!.color = inactiveColor!!
         activeCanvas.drawArc(rect!!, angle - 90, 360 - angle, true, pRing!!)
         if (thickness > 0) {
-            if (isTransparencyEnabled) pRing!!.xfermode = XFERMODE_CLEAR else pRing!!.color =
-                backgroundColor!!
+            if (isTransparencyEnabled) {
+                pRing!!.xfermode = XFERMODE_CLEAR
+            } else {
+                pRing!!.color =
+                    backgroundColor!!
+            }
             rect!!.inset(thickness, thickness)
             activeCanvas.drawArc(rect!!, 0f, 360f, true, pRing!!)
             pRing!!.xfermode = null
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
index 0a7e98cc5..e3e8f076c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
@@ -97,7 +97,7 @@ class ListHabitsRootView @Inject constructor(
             title = resources.getString(R.string.main_activity_title),
             color = PaletteColor(17),
             displayHomeAsUpEnabled = false,
-            theme = currentTheme(),
+            theme = currentTheme()
         )
         addView(rootView, MATCH_PARENT, MATCH_PARENT)
         listAdapter.setListView(listView)
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 acbb8c102..c525e624a 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
@@ -96,7 +96,7 @@ class ListHabitsScreen
     private val colorPickerFactory: ColorPickerDialogFactory,
     private val behavior: Lazy<ListHabitsBehavior>,
     private val preferences: Preferences,
-    private val rootView: Lazy<ListHabitsRootView>,
+    private val rootView: Lazy<ListHabitsRootView>
 ) : CommandRunner.Listener,
     ListHabitsBehavior.Screen,
     ListHabitsMenuBehavior.Screen,
@@ -321,8 +321,11 @@ class ListHabitsScreen
     private fun onExportDB() {
         taskRunner.execute(
             exportDBFactory.create { filename ->
-                if (filename != null) activity.showSendFileScreen(filename)
-                else activity.showMessage(activity.resources.getString(R.string.could_not_export))
+                if (filename != null) {
+                    activity.showSendFileScreen(filename)
+                } else {
+                    activity.showMessage(activity.resources.getString(R.string.could_not_export))
+                }
             }
         )
     }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
index faf53b298..3218ea754 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
@@ -60,8 +60,11 @@ abstract class ButtonPanelView<T : View>(
         repeat(buttonCount) { buttons.add(createButton()) }
 
         removeAllViews()
-        if (reverse) buttons.reversed().forEach { addView(it) }
-        else buttons.forEach { addView(it) }
+        if (reverse) {
+            buttons.reversed().forEach { addView(it) }
+        } else {
+            buttons.forEach { addView(it) }
+        }
         setupButtons()
         requestLayout()
     }
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 6a5bd5a49..e572bda07 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
@@ -104,13 +104,19 @@ class CheckmarkButtonView(
     }
 
     override fun onClick(v: View) {
-        if (preferences.isShortToggleEnabled) performToggle(v)
-        else onEdit()
+        if (preferences.isShortToggleEnabled) {
+            performToggle(v)
+        } else {
+            onEdit()
+        }
     }
 
     override fun onLongClick(v: View): Boolean {
-        if (preferences.isShortToggleEnabled) onEdit()
-        else performToggle(v)
+        if (preferences.isShortToggleEnabled) {
+            onEdit()
+        } else {
+            performToggle(v)
+        }
         return true
     }
 
@@ -144,8 +150,11 @@ class CheckmarkButtonView(
             paint.color = when (value) {
                 YES_MANUAL, YES_AUTO, SKIP -> color
                 NO -> {
-                    if (preferences.areQuestionMarksEnabled) mediumContrastColor
-                    else lowContrastColor
+                    if (preferences.areQuestionMarksEnabled) {
+                        mediumContrastColor
+                    } else {
+                        lowContrastColor
+                    }
                 }
                 else -> lowContrastColor
             }
@@ -153,8 +162,11 @@ class CheckmarkButtonView(
                 SKIP -> R.string.fa_skipped
                 NO -> R.string.fa_times
                 UNKNOWN -> {
-                    if (preferences.areQuestionMarksEnabled) R.string.fa_question
-                    else R.string.fa_times
+                    if (preferences.areQuestionMarksEnabled) {
+                        R.string.fa_question
+                    } else {
+                        R.string.fa_times
+                    }
                 }
                 else -> R.string.fa_check
             }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
index 1cb3462f9..a70805139 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
@@ -156,10 +156,11 @@ class HabitCardListController @Inject constructor(
         }
 
         private fun notifyListener() {
-            if (activeMode is SelectionMode)
+            if (activeMode is SelectionMode) {
                 selectionMenu.get().onSelectionChange()
-            else
+            } else {
                 selectionMenu.get().onSelectionFinish()
+            }
         }
     }
 }
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 189c5c532..8e5e9d21e 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
@@ -225,7 +225,6 @@ class HabitCardView(
     }
 
     private fun copyAttributesFrom(h: Habit) {
-
         fun getActiveColor(habit: Habit): Int {
             return when (habit.isArchived) {
                 true -> sres.getColor(R.attr.contrast60)
@@ -271,7 +270,6 @@ class HabitCardView(
     }
 
     private fun updateBackground(isSelected: Boolean) {
-
         val background = when (isSelected) {
             true -> R.drawable.selected_box
             false -> R.drawable.ripple
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
index fa81c1c59..c11c1bbba 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
@@ -124,15 +124,20 @@ class HeaderView(
                 rect.set(0f, 0f, width, height)
                 rect.offset(canvas.width.toFloat() - dp(3.0f), 0f)
 
-                if (isReversed) rect.offset(-(index + 1) * width, 0f)
-                else rect.offset((index - buttonCount) * width, 0f)
-
-                if (isRTL()) rect.set(
-                    canvas.width - rect.right,
-                    rect.top,
-                    canvas.width - rect.left,
-                    rect.bottom
-                )
+                if (isReversed) {
+                    rect.offset(-(index + 1) * width, 0f)
+                } else {
+                    rect.offset((index - buttonCount) * width, 0f)
+                }
+
+                if (isRTL()) {
+                    rect.set(
+                        canvas.width - rect.right,
+                        rect.top,
+                        canvas.width - rect.left,
+                        rect.bottom
+                    )
+                }
 
                 val y1 = rect.centerY() - 0.25 * em
                 val y2 = rect.centerY() + 1.25 * em
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 8a2f20ce3..21289a0bd 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
@@ -88,7 +88,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
             habit = habit,
             habitList = habitList,
             preferences = preferences,
-            screen = screen,
+            screen = screen
         )
 
         view = ShowHabitView(this)
@@ -99,13 +99,13 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
             habitList = habitList,
             screen = screen,
             system = HabitsDirFinder(AndroidDirFinder(this)),
-            taskRunner = appComponent.taskRunner,
+            taskRunner = appComponent.taskRunner
         )
 
         menu = ShowHabitMenu(
             activity = this,
             presenter = menuPresenter,
-            preferences = preferences,
+            preferences = preferences
         )
 
         view.setListener(presenter)
@@ -150,7 +150,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
                     ShowHabitPresenter.buildState(
                         habit = habit,
                         preferences = preferences,
-                        theme = themeSwitcher.currentTheme,
+                        theme = themeSwitcher.currentTheme
                     )
                 )
             }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
index 5a4214610..60b079738 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
@@ -28,7 +28,7 @@ import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuPresenter
 class ShowHabitMenu(
     val activity: ShowHabitActivity,
     val presenter: ShowHabitMenuPresenter,
-    val preferences: Preferences,
+    val preferences: Preferences
 ) {
     fun onCreateOptionsMenu(menu: Menu): Boolean {
         activity.menuInflater.inflate(R.menu.show_habit, menu)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
index 38fba3baf..cbb85825e 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
@@ -39,7 +39,7 @@ class ShowHabitView(context: Context) : FrameLayout(context) {
             binding.toolbar,
             title = data.title,
             color = data.color,
-            theme = data.theme,
+            theme = data.theme
         )
         binding.subtitleCard.setState(data.subtitle)
         binding.overviewCard.setState(data.overview)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt
index fa3122ed3..980f6c1d1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt
@@ -63,7 +63,7 @@ class BarCardView(context: Context, attrs: AttributeSet) : LinearLayout(context,
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long,
+                id: Long
             ) {
                 presenter.onBoolSpinnerPosition(position)
             }
@@ -77,7 +77,7 @@ class BarCardView(context: Context, attrs: AttributeSet) : LinearLayout(context,
                     parent: AdapterView<*>?,
                     view: View?,
                     position: Int,
-                    id: Long,
+                    id: Long
                 ) {
                     presenter.onNumericalSpinnerPosition(position)
                 }
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 74e566fbb..f576a115a 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
@@ -45,7 +45,7 @@ class HistoryCardView(context: Context, attrs: AttributeSet) : LinearLayout(cont
             series = state.series,
             defaultSquare = state.defaultSquare,
             notesIndicators = state.notesIndicators,
-            firstWeekday = state.firstWeekday,
+            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 5bbfb46d6..c29894c18 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
@@ -52,7 +52,7 @@ class SubtitleCardView(context: Context, attrs: AttributeSet) : LinearLayout(con
         binding.frequencyLabel.text = formatFrequency(
             state.frequency.numerator,
             state.frequency.denominator,
-            resources,
+            resources
         )
         binding.questionLabel.setTextColor(color)
         binding.questionLabel.text = state.question
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt
index 60a12ac17..0d5e25224 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt
@@ -40,7 +40,7 @@ class SettingsActivity : AppCompatActivity() {
             toolbar = binding.toolbar,
             title = resources.getString(R.string.settings),
             color = PaletteColor(11),
-            theme = themeSwitcher.currentTheme,
+            theme = themeSwitcher.currentTheme
         )
         setContentView(binding.root)
     }
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 6361397ef..55468cfda 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
@@ -32,7 +32,7 @@ class EditSettingActivity : AppCompatActivity() {
         val habits = app.component.habitList.getFiltered(
             HabitMatcher(
                 isArchivedAllowed = false,
-                isCompletedAllowed = true,
+                isCompletedAllowed = true
             )
         )
         AndroidThemeSwitcher(this, app.component.preferences).apply()
@@ -43,7 +43,7 @@ class EditSettingActivity : AppCompatActivity() {
             context = this,
             habitList = app.component.habitList,
             onSave = controller::onSave,
-            args = args,
+            args = args
         )
         setContentView(view)
     }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
index 30c13c95d..91aaccce9 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
@@ -54,7 +54,7 @@ class EditSettingRootView(
             title = resources.getString(R.string.app_name),
             color = PaletteColor(11),
             displayHomeAsUpEnabled = false,
-            theme = currentTheme(),
+            theme = currentTheme()
         )
         populateHabitSpinner()
         binding.habitSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -69,7 +69,7 @@ class EditSettingRootView(
             val habit = habitList.getByPosition(binding.habitSpinner.selectedItemPosition)
             val action = mapSpinnerPositionToAction(
                 isNumerical = habit.isNumerical,
-                itemPosition = binding.actionSpinner.selectedItemPosition,
+                itemPosition = binding.actionSpinner.selectedItemPosition
             )
             onSave(habit, action)
         }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
index cb0b9f894..ed2ee19a7 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
@@ -27,22 +27,34 @@ class AndroidCursor(private val cursor: android.database.Cursor) : Cursor {
     override fun moveToNext() = cursor.moveToNext()
 
     override fun getInt(index: Int): Int? {
-        return if (cursor.isNull(index)) null
-        else cursor.getInt(index)
+        return if (cursor.isNull(index)) {
+            null
+        } else {
+            cursor.getInt(index)
+        }
     }
 
     override fun getLong(index: Int): Long? {
-        return if (cursor.isNull(index)) null
-        else cursor.getLong(index)
+        return if (cursor.isNull(index)) {
+            null
+        } else {
+            cursor.getLong(index)
+        }
     }
 
     override fun getDouble(index: Int): Double? {
-        return if (cursor.isNull(index)) null
-        else cursor.getDouble(index)
+        return if (cursor.isNull(index)) {
+            null
+        } else {
+            cursor.getDouble(index)
+        }
     }
 
     override fun getString(index: Int): String? {
-        return if (cursor.isNull(index)) null
-        else cursor.getString(index)
+        return if (cursor.isNull(index)) {
+            null
+        } else {
+            cursor.getString(index)
+        }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
index d764e7a63..3c8214d7a 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
@@ -26,7 +26,7 @@ import java.io.File
 
 class AndroidDatabase(
     private val db: SQLiteDatabase,
-    override val file: File?,
+    override val file: File?
 ) : Database {
 
     override fun beginTransaction() = db.beginTransaction()
@@ -45,7 +45,7 @@ class AndroidDatabase(
         tableName: String,
         values: Map<String, Any?>,
         where: String,
-        vararg params: String,
+        vararg params: String
     ): Int {
         val contValues = mapToContentValues(values)
         return db.update(tableName, contValues, where, params)
@@ -59,7 +59,7 @@ class AndroidDatabase(
     override fun delete(
         tableName: String,
         where: String,
-        vararg params: String,
+        vararg params: String
     ) {
         db.delete(tableName, where, params)
     }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
index 923ae1bf7..96d010aca 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
@@ -30,7 +30,7 @@ class AndroidDatabaseOpener @Inject constructor() : DatabaseOpener {
             db = SQLiteDatabase.openDatabase(
                 file.absolutePath,
                 null,
-                SQLiteDatabase.OPEN_READWRITE,
+                SQLiteDatabase.OPEN_READWRITE
             ),
             file = file
         )
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.kt
index 89efc00af..29027d9e2 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.kt
@@ -25,5 +25,6 @@ import dagger.Provides
 @Module
 class ActivityContextModule(
     @get:Provides
-    @get:ActivityContext val context: Context
+    @get:ActivityContext
+    val context: Context
 )
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.kt
index 74b433ea2..e7cc78f49 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.kt
@@ -26,5 +26,6 @@ import dagger.Provides
 class AppContextModule(
     @get:Provides
     @get:AppContext
-    @param:AppContext val context: Context
+    @param:AppContext
+    val context: Context
 )
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
index 6be35b4c9..c3981baf2 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
@@ -53,8 +53,9 @@ class IntentParser
         var timestamp = intent.getLongExtra("timestamp", today)
         timestamp = DateUtils.getStartOfDay(timestamp)
 
-        if (timestamp < 0 || timestamp > today)
+        if (timestamp < 0 || timestamp > today) {
             throw IllegalArgumentException("timestamp is not valid")
+        }
 
         return Timestamp(timestamp)
     }
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 09d8f8b46..a63982358 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
@@ -96,7 +96,6 @@ class AndroidNotificationTray
         timestamp: Timestamp,
         disableSound: Boolean = false
     ): Notification {
-
         val addRepetitionAction = Action(
             R.drawable.ic_action_check,
             context.getString(R.string.yes),
@@ -146,8 +145,9 @@ class AndroidNotificationTray
                 .addAction(removeRepetitionAction)
         }
 
-        if (!disableSound)
+        if (!disableSound) {
             builder.setSound(ringtoneManager.getURI())
+        }
 
         if (SDK_INT < Build.VERSION_CODES.S) {
             val snoozeAction = Action(
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
index 1e79ae857..0c30520d1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
@@ -61,8 +61,9 @@ class RingtoneManager
             "pref_ringtone_uri",
             defaultRingtoneUri.toString()
         )!!
-        if (prefRingtoneUri.isNotEmpty())
+        if (prefRingtoneUri.isNotEmpty()) {
             ringtoneUri = Uri.parse(prefRingtoneUri)
+        }
 
         return ringtoneUri
     }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt
index f1723ee16..f7e532984 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt
@@ -103,7 +103,9 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
         if (snoozeValues[position] >= 0) {
             reminderController!!.onSnoozeDelayPicked(habit!!, snoozeValues[position])
             finish()
-        } else showTimePicker()
+        } else {
+            showTimePicker()
+        }
     }
 
     override fun finish() {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt
index 94481bb62..b1d031292 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt
@@ -27,7 +27,7 @@ import javax.inject.Inject
 class ExportDBTaskFactory
 @Inject constructor(
     @AppContext private val context: Context,
-    private val system: AndroidDirFinder,
+    private val system: AndroidDirFinder
 ) {
     fun create(listener: ExportDBTask.Listener) = ExportDBTask(context, system, listener)
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt
index 5b3efe630..9a6287f02 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt
@@ -27,7 +27,7 @@ import javax.inject.Inject
 class ImportDataTaskFactory
 @Inject constructor(
     private val importer: GenericImporter,
-    private val modelFactory: ModelFactory,
+    private val modelFactory: ModelFactory
 ) {
     fun create(file: File, listener: ImportDataTask.Listener) =
         ImportDataTask(importer, modelFactory, file, listener)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.kt
index 7ab5a1e34..34205fd5c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.kt
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.Contract
 
 object AttributeSetUtils {
     const val ISORON_NAMESPACE = "http://isoron.org/android"
+
     @JvmStatic
     fun getAttribute(
         context: Context,
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.kt
index db25f279d..81ea121db 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.kt
@@ -33,6 +33,7 @@ import java.text.SimpleDateFormat
 
 object DatabaseUtils {
     private var opener: HabitsDatabaseOpener? = null
+
     @JvmStatic
     fun getDatabaseFile(context: Context): File {
         val databaseFilename = databaseFilename
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 2a9e161f9..583bc5048 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
@@ -67,7 +67,6 @@ fun RelativeLayout.addBelow(
     height: Int = WRAP_CONTENT,
     applyCustomRules: (params: RelativeLayout.LayoutParams) -> Unit = {}
 ) {
-
     view.layoutParams = RelativeLayout.LayoutParams(width, height).apply {
         addRule(BELOW, subject.id)
         applyCustomRules(this)
@@ -81,7 +80,6 @@ fun RelativeLayout.addAtBottom(
     width: Int = MATCH_PARENT,
     height: Int = WRAP_CONTENT
 ) {
-
     view.layoutParams = RelativeLayout.LayoutParams(width, height).apply {
         addRule(ALIGN_PARENT_BOTTOM)
     }
@@ -96,7 +94,6 @@ fun RelativeLayout.addAtTop(
     width: Int = MATCH_PARENT,
     height: Int = WRAP_CONTENT
 ) {
-
     view.layoutParams = RelativeLayout.LayoutParams(width, height).apply {
         addRule(ALIGN_PARENT_TOP)
     }
@@ -196,7 +193,7 @@ fun Activity.restartWithFade(cls: Class<*>?) {
             overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
             startActivity(Intent(this, cls))
         },
-        500,
+        500
     ) // HACK: Let the menu disappear first
 }
 
@@ -205,7 +202,7 @@ fun View.setupToolbar(
     title: String,
     color: PaletteColor,
     theme: Theme,
-    displayHomeAsUpEnabled: Boolean = true,
+    displayHomeAsUpEnabled: Boolean = true
 ) {
     toolbar.elevation = InterfaceUtils.dpToPixels(context, 2f)
     val res = StyledResources(context)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.kt
index bc9654529..4dcdbb0f9 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.kt
@@ -147,10 +147,11 @@ abstract class BaseWidget(val context: Context, val id: Int, val stacked: Boolea
 
     protected val preferedBackgroundAlpha: Int
         get() {
-            return if (stacked)
+            return if (stacked) {
                 255
-            else
+            } else {
                 prefs.widgetOpacity
+            }
         }
 
     init {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
index 5fe11d7af..017f67a29 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
@@ -33,7 +33,7 @@ open class CheckmarkWidget(
     context: Context,
     widgetId: Int,
     protected val habit: Habit,
-    stacked: Boolean = false,
+    stacked: Boolean = false
 ) : BaseWidget(context, widgetId, stacked) {
 
     override val defaultHeight: Int = 125
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
index af8010014..ca9ebcd90 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
@@ -23,7 +23,10 @@ import android.content.Context
 class CheckmarkWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        return if (habits.size == 1) CheckmarkWidget(context, id, habits[0])
-        else StackWidget(context, id, StackWidgetType.CHECKMARK, habits)
+        return if (habits.size == 1) {
+            CheckmarkWidget(context, id, habits[0])
+        } else {
+            StackWidget(context, id, StackWidgetType.CHECKMARK, habits)
+        }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
index f96a93e48..7caf44fec 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
@@ -27,7 +27,7 @@ import org.isoron.uhabits.widgets.views.EmptyWidgetView
 class EmptyWidget(
     context: Context,
     widgetId: Int,
-    stacked: Boolean = false,
+    stacked: Boolean = false
 ) : BaseWidget(context, widgetId, stacked) {
     override val defaultHeight: Int = 200
     override val defaultWidth: Int = 200
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
index 8b76cb1b3..88c6b7655 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
@@ -33,7 +33,7 @@ class FrequencyWidget(
     widgetId: Int,
     private val habit: Habit,
     private val firstWeekday: Int,
-    stacked: Boolean = false,
+    stacked: Boolean = false
 ) : BaseWidget(context, widgetId, stacked) {
     override val defaultHeight: Int = 200
     override val defaultWidth: Int = 200
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
index 3d380ec25..698f002f4 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
@@ -24,12 +24,15 @@ import android.content.Context
 class FrequencyWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        return if (habits.size == 1) FrequencyWidget(
-            context,
-            id,
-            habits[0],
-            preferences.firstWeekdayInt
-        )
-        else StackWidget(context, id, StackWidgetType.FREQUENCY, habits)
+        return if (habits.size == 1) {
+            FrequencyWidget(
+                context,
+                id,
+                habits[0],
+                preferences.firstWeekdayInt
+            )
+        } else {
+            StackWidget(context, id, StackWidgetType.FREQUENCY, habits)
+        }
     }
 }
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 25d8b7348..659a89ee9 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
@@ -36,7 +36,7 @@ class HistoryWidget(
     context: Context,
     id: Int,
     private val habit: Habit,
-    stacked: Boolean = false,
+    stacked: Boolean = false
 ) : BaseWidget(context, id, stacked) {
 
     override val defaultHeight: Int = 250
@@ -53,7 +53,7 @@ class HistoryWidget(
         val model = HistoryCardPresenter.buildState(
             habit = habit,
             firstWeekday = prefs.firstWeekday,
-            theme = WidgetTheme(),
+            theme = WidgetTheme()
         )
         (widgetView.dataView as AndroidDataView).apply {
             val historyChart = (this.view as HistoryChart)
@@ -75,7 +75,7 @@ class HistoryWidget(
                     firstWeekday = prefs.firstWeekday,
                     series = listOf(),
                     defaultSquare = HistoryChart.Square.OFF,
-                    notesIndicators = listOf(),
+                    notesIndicators = listOf()
                 )
             }
         ).apply {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
index c9dd8da66..ab6dbc9eb 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
@@ -23,11 +23,14 @@ import android.content.Context
 class HistoryWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        return if (habits.size == 1) HistoryWidget(
-            context,
-            id,
-            habits[0]
-        )
-        else StackWidget(context, id, StackWidgetType.HISTORY, habits)
+        return if (habits.size == 1) {
+            HistoryWidget(
+                context,
+                id,
+                habits[0]
+            )
+        } else {
+            StackWidget(context, id, StackWidgetType.HISTORY, habits)
+        }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
index 14ccc1d30..8be9dfed5 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
@@ -33,7 +33,7 @@ class ScoreWidget(
     context: Context,
     id: Int,
     private val habit: Habit,
-    stacked: Boolean = false,
+    stacked: Boolean = false
 ) : BaseWidget(context, id, stacked) {
     override val defaultHeight: Int = 300
     override val defaultWidth: Int = 300
@@ -46,7 +46,7 @@ class ScoreWidget(
             habit = habit,
             firstWeekday = prefs.firstWeekdayInt,
             spinnerPosition = prefs.scoreCardSpinnerPosition,
-            theme = WidgetTheme(),
+            theme = WidgetTheme()
         )
         val widgetView = view as GraphWidgetView
         widgetView.setBackgroundAlpha(preferedBackgroundAlpha)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
index f271fb799..160054da1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
@@ -23,7 +23,10 @@ import android.content.Context
 class ScoreWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        return if (habits.size == 1) ScoreWidget(context, id, habits[0])
-        else StackWidget(context, id, StackWidgetType.SCORE, habits)
+        return if (habits.size == 1) {
+            ScoreWidget(context, id, habits[0])
+        } else {
+            StackWidget(context, id, StackWidgetType.SCORE, habits)
+        }
     }
 }
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 ab2bace27..6c59c1e1d 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
@@ -34,7 +34,7 @@ class StackWidget(
     widgetId: Int,
     private val widgetType: StackWidgetType,
     private val habits: List<Habit>,
-    stacked: Boolean = true,
+    stacked: Boolean = true
 ) : BaseWidget(context, widgetId, stacked) {
     override val defaultHeight: Int = 0
     override val defaultWidth: Int = 0
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
index e07c95359..e997c54c6 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
@@ -34,7 +34,7 @@ class StreakWidget(
     context: Context,
     id: Int,
     private val habit: Habit,
-    stacked: Boolean = false,
+    stacked: Boolean = false
 ) : BaseWidget(context, id, stacked) {
     override val defaultHeight: Int = 200
     override val defaultWidth: Int = 200
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
index 98b9e8dd9..5e9e8d7b3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
@@ -23,7 +23,10 @@ import android.content.Context
 class StreakWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        return if (habits.size == 1) StreakWidget(context, id, habits[0])
-        else StackWidget(context, id, StackWidgetType.STREAKS, habits)
+        return if (habits.size == 1) {
+            StreakWidget(context, id, habits[0])
+        } else {
+            StackWidget(context, id, StackWidgetType.STREAKS, habits)
+        }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt
index f98331e8f..31a9d20d3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt
@@ -37,7 +37,7 @@ class TargetWidget(
     context: Context,
     id: Int,
     private val habit: Habit,
-    stacked: Boolean = false,
+    stacked: Boolean = false
 ) : BaseWidget(context, id, stacked) {
     override val defaultHeight: Int = 200
     override val defaultWidth: Int = 200
@@ -53,7 +53,7 @@ class TargetWidget(
         val data = TargetCardPresenter.buildState(
             habit = habit,
             firstWeekday = prefs.firstWeekdayInt,
-            theme = WidgetTheme(),
+            theme = WidgetTheme()
         )
         chart.setColor(WidgetTheme().color(habit.color).toInt())
         chart.setTargets(data.targets)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt
index cb14d61ca..920307bb1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt
@@ -23,7 +23,10 @@ import android.content.Context
 class TargetWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        return if (habits.size == 1) TargetWidget(context, id, habits[0])
-        else StackWidget(context, id, StackWidgetType.TARGET, habits)
+        return if (habits.size == 1) {
+            TargetWidget(context, id, habits[0])
+        } else {
+            StackWidget(context, id, StackWidgetType.TARGET, habits)
+        }
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
index a0e455688..6515542b0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
@@ -96,21 +96,23 @@ class CheckmarkWidgetView : HabitWidgetView {
     private val text: String
         get() = if (isNumerical) {
             (max(0, entryValue) / 1000.0).toShortString()
-        } else when (entryState) {
-            YES_MANUAL, YES_AUTO -> resources.getString(R.string.fa_check)
-            SKIP -> resources.getString(R.string.fa_skipped)
-            UNKNOWN -> {
-                run {
-                    if (preferences!!.areQuestionMarksEnabled) {
-                        return resources.getString(R.string.fa_question)
-                    } else {
-                        resources.getString(R.string.fa_times)
+        } else {
+            when (entryState) {
+                YES_MANUAL, YES_AUTO -> resources.getString(R.string.fa_check)
+                SKIP -> resources.getString(R.string.fa_skipped)
+                UNKNOWN -> {
+                    run {
+                        if (preferences!!.areQuestionMarksEnabled) {
+                            return resources.getString(R.string.fa_question)
+                        } else {
+                            resources.getString(R.string.fa_times)
+                        }
                     }
+                    resources.getString(R.string.fa_times)
                 }
-                resources.getString(R.string.fa_times)
+                NO -> resources.getString(R.string.fa_times)
+                else -> resources.getString(R.string.fa_times)
             }
-            NO -> resources.getString(R.string.fa_times)
-            else -> resources.getString(R.string.fa_times)
         }
 
     override val innerLayoutId: Int
diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.kt b/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.kt
index a6a1e5021..ccfb1b453 100644
--- a/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.kt
+++ b/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.kt
@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits
 
-import com.nhaarman.mockitokotlin2.spy
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.HabitList
 import org.isoron.uhabits.core.models.memory.MemoryModelFactory
@@ -31,6 +30,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.spy
 
 @RunWith(MockitoJUnitRunner::class)
 open class BaseAndroidJVMTest {
diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.kt b/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.kt
index a855a9018..0c6bfe84f 100644
--- a/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.kt
+++ b/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.kt
@@ -18,9 +18,6 @@
  */
 package org.isoron.uhabits.receivers
 
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import org.isoron.uhabits.BaseAndroidJVMTest
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.Timestamp
@@ -28,6 +25,9 @@ import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.reminders.ReminderScheduler
 import org.isoron.uhabits.core.ui.NotificationTray
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
 
 class ReminderControllerTest : BaseAndroidJVMTest() {
     private lateinit var controller: ReminderController
diff --git a/uhabits-core/build.gradle.kts b/uhabits-core/build.gradle.kts
index c0854f067..3b28fb535 100644
--- a/uhabits-core/build.gradle.kts
+++ b/uhabits-core/build.gradle.kts
@@ -61,7 +61,7 @@ kotlin {
                 implementation("org.xerial:sqlite-jdbc:3.40.0.0")
                 implementation("org.hamcrest:hamcrest:2.2")
                 implementation("org.apache.commons:commons-io:1.3.2")
-                implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+                implementation("org.mockito.kotlin:mockito-kotlin:2.2.11")
             }
         }
     }
diff --git a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt
index 1459956ce..e6cda0a5c 100644
--- a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt
+++ b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt
@@ -31,7 +31,7 @@ enum class Font {
 
 data class ScreenLocation(
     val x: Double,
-    val y: Double,
+    val y: Double
 )
 
 interface Canvas {
diff --git a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Color.kt b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Color.kt
index 32a58a25f..0b528e76c 100644
--- a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Color.kt
+++ b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Color.kt
@@ -23,7 +23,7 @@ data class Color(
     val red: Double,
     val green: Double,
     val blue: Double,
-    val alpha: Double,
+    val alpha: Double
 ) {
     val luminosity: Double
         get() {
diff --git a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt
index 8a528d08b..6cb46a3f9 100644
--- a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt
+++ b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt
@@ -29,7 +29,7 @@ enum class DayOfWeek(val daysSinceSunday: Int) {
     WEDNESDAY(3),
     THURSDAY(4),
     FRIDAY(5),
-    SATURDAY(6),
+    SATURDAY(6)
 }
 
 data class LocalDate(val daysSince2000: Int) {
@@ -155,7 +155,6 @@ val nonLeapOffset = arrayOf(
 )
 
 private fun daysSince2000(year: Int, month: Int, day: Int): Int {
-
     var result = 365 * (year - 2000)
     result += ceil((year - 2000) / 4.0).toInt()
     result -= ceil((year - 2000) / 100.0).toInt()
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/platform/gui/JavaCanvas.kt b/uhabits-core/src/jvmMain/java/org/isoron/platform/gui/JavaCanvas.kt
index 36a8a1393..21ce0a1e3 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/platform/gui/JavaCanvas.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/platform/gui/JavaCanvas.kt
@@ -37,7 +37,7 @@ import kotlin.math.roundToInt
 
 class JavaCanvas(
     val image: BufferedImage,
-    val pixelScale: Double = 2.0,
+    val pixelScale: Double = 2.0
 ) : Canvas {
 
     override fun toImage(): Image {
@@ -131,7 +131,7 @@ class JavaCanvas(
         y: Double,
         width: Double,
         height: Double,
-        cornerRadius: Double,
+        cornerRadius: Double
     ) {
         g2d.fill(
             RoundRectangle2D.Double(
@@ -140,7 +140,7 @@ class JavaCanvas(
                 toPixel(width).toDouble(),
                 toPixel(height).toDouble(),
                 toPixel(cornerRadius).toDouble(),
-                toPixel(cornerRadius).toDouble(),
+                toPixel(cornerRadius).toDouble()
             )
         )
     }
@@ -194,9 +194,8 @@ class JavaCanvas(
         centerY: Double,
         radius: Double,
         startAngle: Double,
-        swipeAngle: Double,
+        swipeAngle: Double
     ) {
-
         g2d.fillArc(
             toPixel(centerX - radius),
             toPixel(centerY - radius),
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/platform/io/JavaFiles.kt b/uhabits-core/src/jvmMain/java/org/isoron/platform/io/JavaFiles.kt
index e2a7a3e46..1af817835 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/platform/io/JavaFiles.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/platform/io/JavaFiles.kt
@@ -33,8 +33,11 @@ class JavaResourceFile(val path: String) : ResourceFile {
         get() {
             val mainPath = Paths.get("assets/main/$path")
             val testPath = Paths.get("assets/test/$path")
-            return if (Files.exists(mainPath)) mainPath
-            else testPath
+            return if (Files.exists(mainPath)) {
+                mainPath
+            } else {
+                testPath
+            }
         }
 
     override suspend fun exists(): Boolean {
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.kt
index 573380203..70cada425 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.kt
@@ -23,7 +23,7 @@ import org.isoron.uhabits.core.models.HabitList
 
 data class ArchiveHabitsCommand(
     val habitList: HabitList,
-    val selected: List<Habit>,
+    val selected: List<Habit>
 ) : Command {
     override fun run() {
         for (h in selected) h.isArchived = true
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt
index 466025f51..6616d3f62 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt
@@ -25,7 +25,7 @@ import org.isoron.uhabits.core.models.PaletteColor
 data class ChangeHabitColorCommand(
     val habitList: HabitList,
     val selected: List<Habit>,
-    val newColor: PaletteColor,
+    val newColor: PaletteColor
 ) : Command {
     override fun run() {
         for (h in selected) h.color = newColor
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CommandRunner.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CommandRunner.kt
index d685a175a..434536887 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CommandRunner.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/CommandRunner.kt
@@ -27,7 +27,7 @@ import javax.inject.Inject
 @AppScope
 open class CommandRunner
 @Inject constructor(
-    private val taskRunner: TaskRunner,
+    private val taskRunner: TaskRunner
 ) {
     private val listeners: LinkedList<Listener> = LinkedList()
 
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 8ff21f407..3dd8300dc 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
@@ -25,7 +25,7 @@ import org.isoron.uhabits.core.models.ModelFactory
 data class CreateHabitCommand(
     val modelFactory: ModelFactory,
     val habitList: HabitList,
-    val model: Habit,
+    val model: Habit
 ) : Command {
     override fun run() {
         val habit = modelFactory.buildHabit()
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 3dd71c14e..c07e08159 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,7 +28,7 @@ data class CreateRepetitionCommand(
     val habit: Habit,
     val timestamp: Timestamp,
     val value: Int,
-    val notes: String,
+    val notes: String
 ) : Command {
     override fun run() {
         val entries = habit.originalEntries
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.kt
index 8f9190e65..e61ba1626 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.kt
@@ -23,7 +23,7 @@ import org.isoron.uhabits.core.models.HabitList
 
 data class DeleteHabitsCommand(
     val habitList: HabitList,
-    val selected: List<Habit>,
+    val selected: List<Habit>
 ) : Command {
     override fun run() {
         for (h in selected) habitList.remove(h)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/EditHabitCommand.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/EditHabitCommand.kt
index 1fe966f46..8e168293d 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/EditHabitCommand.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/EditHabitCommand.kt
@@ -25,7 +25,7 @@ import org.isoron.uhabits.core.models.HabitNotFoundException
 data class EditHabitCommand(
     val habitList: HabitList,
     val habitId: Long,
-    val modified: Habit,
+    val modified: Habit
 ) : Command {
     override fun run() {
         val habit = habitList.getById(habitId) ?: throw HabitNotFoundException()
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.kt
index c75bc3e41..1bbbe0e77 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.kt
@@ -23,7 +23,7 @@ import org.isoron.uhabits.core.models.HabitList
 
 data class UnarchiveHabitsCommand(
     val habitList: HabitList,
-    val selected: List<Habit>,
+    val selected: List<Habit>
 ) : Command {
     override fun run() {
         for (h in selected) h.isArchived = false
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/Database.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/Database.kt
index e3593868a..75ca50b0c 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/Database.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/Database.kt
@@ -35,7 +35,7 @@ interface Database {
         tableName: String,
         values: Map<String, Any?>,
         where: String,
-        vararg params: String,
+        vararg params: String
     ): Int
 
     fun insert(tableName: String, values: Map<String, Any?>): Long?
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/JdbcDatabase.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/JdbcDatabase.kt
index bd5733036..2effb8ae9 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/JdbcDatabase.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/JdbcDatabase.kt
@@ -41,7 +41,7 @@ class JdbcDatabase(private val connection: Connection) : Database {
         tableName: String,
         values: Map<String, Any?>,
         where: String,
-        vararg params: String,
+        vararg params: String
     ): Int {
         return try {
             val fields = ArrayList<String?>()
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/MigrationHelper.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/MigrationHelper.kt
index 28b5e9e89..f538c0dd6 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/MigrationHelper.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/MigrationHelper.kt
@@ -24,7 +24,7 @@ import java.io.InputStream
 import java.util.Locale
 
 class MigrationHelper(
-    private val db: Database,
+    private val db: Database
 ) {
     fun migrateTo(newVersion: Int) {
         try {
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/Repository.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/Repository.kt
index 7fc3a6142..80f747cc9 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/Repository.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/Repository.kt
@@ -28,7 +28,7 @@ import java.util.LinkedList
 
 class Repository<T>(
     private val klass: Class<T>,
-    private val db: Database,
+    private val db: Database
 ) {
     /**
      * Returns the record that has the id provided. If no record is found, returns null.
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/SQLParser.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/SQLParser.kt
index 40320feb0..3e4f2eb38 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/SQLParser.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/database/SQLParser.kt
@@ -20,7 +20,7 @@ import java.io.InputStream
 import java.util.ArrayList
 
 internal class Tokenizer(
-    private val mStream: InputStream,
+    private val mStream: InputStream
 ) {
     private var mIsNext = false
     private var mCurrent = 0
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/GenericImporter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/GenericImporter.kt
index f0cb04ce1..bc8e3a0c2 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/GenericImporter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/GenericImporter.kt
@@ -30,14 +30,14 @@ class GenericImporter
     loopDBImporter: LoopDBImporter,
     rewireDBImporter: RewireDBImporter,
     tickmateDBImporter: TickmateDBImporter,
-    habitBullCSVImporter: HabitBullCSVImporter,
+    habitBullCSVImporter: HabitBullCSVImporter
 ) : AbstractImporter() {
 
     var importers: List<AbstractImporter> = listOf(
         loopDBImporter,
         rewireDBImporter,
         tickmateDBImporter,
-        habitBullCSVImporter,
+        habitBullCSVImporter
     )
 
     override fun canHandle(file: File): Boolean {
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 63f359115..4f18528c8 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
@@ -48,7 +48,7 @@ class HabitBullCSVImporter
 @Inject constructor(
     private val habitList: HabitList,
     private val modelFactory: ModelFactory,
-    logging: Logging,
+    logging: Logging
 ) : AbstractImporter() {
 
     private val logger = logging.getLogger("HabitBullCSVImporter")
@@ -98,7 +98,7 @@ class HabitBullCSVImporter
         val formats = listOf(
             DateFormat.getDateInstance(DateFormat.SHORT),
             SimpleDateFormat("yyyy-MM-dd", Locale.US),
-            SimpleDateFormat("MM/dd/yyyy", Locale.US),
+            SimpleDateFormat("MM/dd/yyyy", Locale.US)
         )
         var parsedDate: Date? = null
         for (fmt in formats) {
@@ -116,7 +116,7 @@ class HabitBullCSVImporter
         return Timestamp.from(
             parsedCalendar[YEAR],
             parsedCalendar[MONTH],
-            parsedCalendar[DAY_OF_MONTH],
+            parsedCalendar[DAY_OF_MONTH]
         )
     }
 
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 69a7b956a..0c93c74ad 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
@@ -45,7 +45,7 @@ class LoopDBImporter
     @AppScope val modelFactory: ModelFactory,
     @AppScope val opener: DatabaseOpener,
     @AppScope val runner: CommandRunner,
-    @AppScope logging: Logging,
+    @AppScope logging: Logging
 ) : AbstractImporter() {
 
     private val logger = logging.getLogger("LoopDBImporter")
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/RewireDBImporter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/RewireDBImporter.kt
index 52202e40f..1be99c398 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/RewireDBImporter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/RewireDBImporter.kt
@@ -125,7 +125,7 @@ class RewireDBImporter
         try {
             c = db.query(
                 "select distinct date from checkins where habit_id=? and type=2",
-                rewireHabitId.toString(),
+                rewireHabitId.toString()
             )
             if (!c.moveToNext()) return
             do {
@@ -147,7 +147,7 @@ class RewireDBImporter
         try {
             c = db.query(
                 "select time, active_days from reminders where habit_id=? limit 1",
-                rewireHabitId.toString(),
+                rewireHabitId.toString()
             )
             if (!c.moveToNext()) return
             val rewireReminder = c.getInt(0)!!
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/TickmateDBImporter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/TickmateDBImporter.kt
index e4c31395f..0805125bf 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/TickmateDBImporter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/TickmateDBImporter.kt
@@ -72,7 +72,7 @@ class TickmateDBImporter @Inject constructor(
         try {
             c = db.query(
                 "select distinct year, month, day from ticks where _track_id=?",
-                tickmateTrackId.toString(),
+                tickmateTrackId.toString()
             )
             if (!c.moveToNext()) return
             do {
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 88d0593ef..99eb81950 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,7 +21,7 @@ package org.isoron.uhabits.core.models
 data class Entry(
     val timestamp: Timestamp,
     val value: Int,
-    val notes: String = "",
+    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 774181e7d..5c5499f49 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
@@ -90,7 +90,7 @@ open class EntryList {
     open fun recomputeFrom(
         originalEntries: EntryList,
         frequency: Frequency,
-        isNumerical: Boolean,
+        isNumerical: Boolean
     ) {
         clear()
         val original = originalEntries.getKnown()
@@ -167,7 +167,7 @@ open class EntryList {
          */
         fun buildEntriesFromInterval(
             original: List<Entry>,
-            intervals: List<Interval>,
+            intervals: List<Interval>
         ): List<Entry> {
             val result = arrayListOf<Entry>()
             if (original.isEmpty()) return result
@@ -246,7 +246,7 @@ open class EntryList {
 
         fun buildIntervals(
             freq: Frequency,
-            entries: List<Entry>,
+            entries: List<Entry>
         ): ArrayList<Interval> {
             val filtered = entries.filter { it.value == YES_MANUAL }
             val num = freq.numerator
@@ -294,21 +294,22 @@ open class EntryList {
 fun List<Entry>.groupedSum(
     truncateField: DateUtils.TruncateField,
     firstWeekday: Int = Calendar.SATURDAY,
-    isNumerical: Boolean,
+    isNumerical: Boolean
 ): List<Entry> {
     return this.map { (timestamp, value) ->
         if (isNumerical) {
-            if (value == SKIP)
+            if (value == SKIP) {
                 Entry(timestamp, 0)
-            else
+            } else {
                 Entry(timestamp, max(0, value))
+            }
         } else {
             Entry(timestamp, if (value == YES_MANUAL) 1000 else 0)
         }
     }.groupBy { entry ->
         entry.timestamp.truncate(
             truncateField,
-            firstWeekday,
+            firstWeekday
         )
     }.entries.map { (timestamp, entries) ->
         Entry(timestamp, entries.sumOf { it.value })
@@ -333,7 +334,7 @@ fun List<Entry>.countSkippedDays(
     }.groupBy { entry ->
         entry.timestamp.truncate(
             truncateField,
-            firstWeekday,
+            firstWeekday
         )
     }.entries.map { (timestamp, entries) ->
         Entry(timestamp, entries.sumOf { it.value })
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt
index 64ee3287f..b8673211a 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt
@@ -20,7 +20,7 @@ package org.isoron.uhabits.core.models
 
 data class Frequency(
     var numerator: Int,
-    var denominator: Int,
+    var denominator: Int
 ) {
     init {
         if (numerator == denominator) {
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 68bbabc08..abbfc4c48 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
@@ -39,7 +39,7 @@ data class Habit(
     val computedEntries: EntryList,
     val originalEntries: EntryList,
     val scores: ScoreList,
-    val streaks: StreakList,
+    val streaks: StreakList
 ) {
     init {
         if (uuid == null) this.uuid = UUID.randomUUID().toString().replace("-", "")
@@ -78,7 +78,7 @@ data class Habit(
         computedEntries.recomputeFrom(
             originalEntries = originalEntries,
             frequency = frequency,
-            isNumerical = isNumerical,
+            isNumerical = isNumerical
         )
 
         val today = DateUtils.getTodayWithOffset()
@@ -94,13 +94,13 @@ data class Habit(
             targetValue = targetValue,
             computedEntries = computedEntries,
             from = from,
-            to = to,
+            to = to
         )
 
         streaks.recompute(
             computedEntries,
             from,
-            to,
+            to
         )
     }
 
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 ed6bc023b..b39e661ff 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,7 +22,7 @@ data class HabitMatcher(
     val isArchivedAllowed: Boolean = false,
     val isReminderRequired: Boolean = false,
     val isCompletedAllowed: Boolean = true,
-    val isEnteredAllowed: Boolean = true,
+    val isEnteredAllowed: Boolean = true
 ) {
     fun matches(habit: Habit): Boolean {
         if (!isArchivedAllowed && habit.isArchived) return false
@@ -36,7 +36,7 @@ data class HabitMatcher(
         @JvmField
         val WITH_ALARM = HabitMatcher(
             isArchivedAllowed = true,
-            isReminderRequired = true,
+            isReminderRequired = true
         )
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ModelFactory.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ModelFactory.kt
index 2edeeed51..8c4339258 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ModelFactory.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ModelFactory.kt
@@ -35,7 +35,7 @@ interface ModelFactory {
             scores = scores,
             streaks = streaks,
             originalEntries = buildOriginalEntries(),
-            computedEntries = buildComputedEntries(),
+            computedEntries = buildComputedEntries()
         )
     }
     fun buildComputedEntries(): EntryList
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Reminder.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Reminder.kt
index fcd1ff73b..69b59e1c9 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Reminder.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Reminder.kt
@@ -23,7 +23,7 @@ import org.isoron.uhabits.core.utils.DateUtils
 data class Reminder(
     val hour: Int,
     val minute: Int,
-    val days: WeekdayList,
+    val days: WeekdayList
 ) {
     val timeInMillis: Long
         get() = DateUtils.getUpcomingTimeInMillis(hour, minute)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Score.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Score.kt
index 4b7bc5730..ae9546e75 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Score.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Score.kt
@@ -23,7 +23,7 @@ import kotlin.math.sqrt
 
 data class Score(
     val timestamp: Timestamp,
-    val value: Double,
+    val value: Double
 ) {
 
     companion object {
@@ -39,7 +39,7 @@ data class Score(
         fun compute(
             frequency: Double,
             previousScore: Double,
-            checkmarkValue: Double,
+            checkmarkValue: Double
         ): Double {
             val multiplier = 0.5.pow(sqrt(frequency) / 13.0)
             var score = previousScore * multiplier
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 385ee0f0c..3acc19e1c 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
@@ -49,7 +49,7 @@ class ScoreList {
     @Synchronized
     fun getByInterval(
         fromTimestamp: Timestamp,
-        toTimestamp: Timestamp,
+        toTimestamp: Timestamp
     ): List<Score> {
         val result: MutableList<Score> = ArrayList()
         if (fromTimestamp.isNewerThan(toTimestamp)) return result
@@ -72,7 +72,7 @@ class ScoreList {
         targetValue: Double,
         computedEntries: EntryList,
         from: Timestamp,
-        to: Timestamp,
+        to: Timestamp
     ) {
         map.clear()
         var rollingSum = 0.0
@@ -102,10 +102,11 @@ class ScoreList {
                 val normalizedRollingSum = rollingSum / 1000
                 if (values[offset] != Entry.SKIP) {
                     val percentageCompleted = if (!isAtMost) {
-                        if (targetValue > 0)
+                        if (targetValue > 0) {
                             min(1.0, normalizedRollingSum / targetValue)
-                        else
+                        } else {
                             1.0
+                        }
                     } else {
                         if (targetValue > 0) {
                             (1 - ((normalizedRollingSum - targetValue) / targetValue)).coerceIn(
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Streak.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Streak.kt
index d3815b368..582dbf6f1 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Streak.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Streak.kt
@@ -22,11 +22,14 @@ import java.lang.Long.signum
 
 data class Streak(
     val start: Timestamp,
-    val end: Timestamp,
+    val end: Timestamp
 ) {
     fun compareLonger(other: Streak): Int {
-        return if (length != other.length) signum(length - other.length.toLong())
-        else compareNewer(other)
+        return if (length != other.length) {
+            signum(length - other.length.toLong())
+        } else {
+            compareNewer(other)
+        }
     }
 
     fun compareNewer(other: Streak): Int {
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt
index e93ce031e..d3bed0af7 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt
@@ -37,7 +37,7 @@ class StreakList {
     fun recompute(
         computedEntries: EntryList,
         from: Timestamp,
-        to: Timestamp,
+        to: Timestamp
     ) {
         list.clear()
         val timestamps = computedEntries
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.kt
index 1ef5fa338..096397576 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.kt
@@ -33,7 +33,7 @@ import javax.inject.Inject
  */
 class SQLModelFactory
 @Inject constructor(
-    val database: Database,
+    val database: Database
 ) : ModelFactory {
     override fun buildOriginalEntries() = SQLiteEntryList(database)
     override fun buildComputedEntries() = EntryList()
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 1598b2ca1..e01ac73c8 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
@@ -158,8 +158,10 @@ open class Preferences(private val storage: Storage) {
 
     open var isCheckmarkSequenceReversed: Boolean
         get() {
-            if (shouldReverseCheckmarks == null) shouldReverseCheckmarks =
-                storage.getBoolean("pref_checkmark_reverse_order", false)
+            if (shouldReverseCheckmarks == null) {
+                shouldReverseCheckmarks =
+                    storage.getBoolean("pref_checkmark_reverse_order", false)
+            }
             return shouldReverseCheckmarks!!
         }
         set(reverse) {
@@ -255,9 +257,13 @@ open class Preferences(private val storage: Storage) {
 
         fun getLongArray(key: String, defValue: LongArray): LongArray {
             val string = getString(key, "")
-            return if (string.isEmpty()) defValue else splitLongs(
-                string
-            )
+            return if (string.isEmpty()) {
+                defValue
+            } else {
+                splitLongs(
+                    string
+                )
+            }
         }
     }
 
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/tasks/ExportCSVTaskFactory.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/tasks/ExportCSVTaskFactory.kt
index 3d5fa0554..e0c08d358 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/tasks/ExportCSVTaskFactory.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/tasks/ExportCSVTaskFactory.kt
@@ -31,6 +31,6 @@ class ExportCSVTaskFactory
     fun create(
         selectedHabits: List<Habit>,
         outputDir: File,
-        listener: ExportCSVTask.Listener,
+        listener: ExportCSVTask.Listener
     ) = ExportCSVTask(habitList, selectedHabits, outputDir, listener)
 }
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 606f1cb09..c7d861813 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
@@ -56,7 +56,7 @@ class HabitCardListCache @Inject constructor(
     private val allHabits: HabitList,
     private val commandRunner: CommandRunner,
     taskRunner: TaskRunner,
-    logging: Logging,
+    logging: Logging
 ) : CommandRunner.Listener {
 
     private val logger = logging.getLogger("HabitCardListCache")
@@ -219,8 +219,12 @@ class HabitCardListCache @Inject constructor(
         fun copyCheckmarksFrom(oldData: CacheData) {
             val empty = IntArray(checkmarkCount)
             for (id in idToHabit.keys) {
-                if (oldData.checkmarks.containsKey(id)) checkmarks[id] =
-                    oldData.checkmarks[id]!! else checkmarks[id] = empty
+                if (oldData.checkmarks.containsKey(id)) {
+                    checkmarks[id] =
+                        oldData.checkmarks[id]!!
+                } else {
+                    checkmarks[id] = empty
+                }
             }
         }
 
@@ -228,16 +232,24 @@ class HabitCardListCache @Inject constructor(
         fun copyNoteIndicatorsFrom(oldData: CacheData) {
             val empty = (0..checkmarkCount).map { "" }.toTypedArray()
             for (id in idToHabit.keys) {
-                if (oldData.notes.containsKey(id)) notes[id] =
-                    oldData.notes[id]!! else notes[id] = empty
+                if (oldData.notes.containsKey(id)) {
+                    notes[id] =
+                        oldData.notes[id]!!
+                } else {
+                    notes[id] = empty
+                }
             }
         }
 
         @Synchronized
         fun copyScoresFrom(oldData: CacheData) {
             for (id in idToHabit.keys) {
-                if (oldData.scores.containsKey(id)) scores[id] =
-                    oldData.scores[id]!! else scores[id] = 0.0
+                if (oldData.scores.containsKey(id)) {
+                    scores[id] =
+                        oldData.scores[id]!!
+                } else {
+                    scores[id] = 0.0
+                }
             }
         }
 
@@ -384,11 +396,13 @@ class HabitCardListCache @Inject constructor(
             if (prevPosition < 0) {
                 performInsert(habit, currentPosition)
             } else {
-                if (prevPosition != currentPosition) performMove(
-                    habit,
-                    prevPosition,
-                    currentPosition
-                )
+                if (prevPosition != currentPosition) {
+                    performMove(
+                        habit,
+                        prevPosition,
+                        currentPosition
+                    )
+                }
                 if (id == null) throw NullPointerException()
                 performUpdate(id, currentPosition)
             }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListFactory.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListFactory.kt
index df8eb0032..06248f1a3 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListFactory.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListFactory.kt
@@ -24,7 +24,7 @@ import javax.inject.Inject
 
 class HintListFactory
 @Inject constructor(
-    val preferences: Preferences,
+    val preferences: Preferences
 ) {
     fun create(hints: Array<String>) = HintList(preferences, hints)
 }
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 5041ab066..3db3cdbaf 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
@@ -60,7 +60,7 @@ open class ListHabitsBehavior @Inject constructor(
             screen.showCheckmarkPopup(
                 entry.value,
                 entry.notes,
-                habit.color,
+                habit.color
             ) { newValue, newNotes ->
                 commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, newValue, newNotes))
             }
@@ -73,9 +73,13 @@ open class ListHabitsBehavior @Inject constructor(
         val outputDir = dirFinder.getCSVOutputDir()
         taskRunner.execute(
             ExportCSVTask(habitList, selected, outputDir) { filename: String? ->
-                if (filename != null) screen.showSendFileScreen(filename) else screen.showMessage(
-                    Message.COULD_NOT_EXPORT
-                )
+                if (filename != null) {
+                    screen.showSendFileScreen(filename)
+                } else {
+                    screen.showMessage(
+                        Message.COULD_NOT_EXPORT
+                    )
+                }
             }
         )
     }
@@ -125,7 +129,7 @@ open class ListHabitsBehavior @Inject constructor(
         IMPORT_FAILED,
         DATABASE_REPAIRED,
         COULD_NOT_GENERATE_BUG_REPORT,
-        FILE_NOT_RECOGNIZED,
+        FILE_NOT_RECOGNIZED
     }
 
     interface BugReporter {
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 deb42e384..7769dd32b 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
@@ -106,14 +106,14 @@ class ListHabitsMenuBehavior @Inject constructor(
             adapter.setFilter(
                 HabitMatcher(
                     isArchivedAllowed = showArchived,
-                    isEnteredAllowed = showCompleted,
+                    isEnteredAllowed = showCompleted
                 )
             )
         } else {
             adapter.setFilter(
                 HabitMatcher(
                     isArchivedAllowed = showArchived,
-                    isCompletedAllowed = showCompleted,
+                    isCompletedAllowed = showCompleted
                 )
             )
         }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt
index 4dc729aa4..92d985e21 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt
@@ -57,7 +57,7 @@ data class ShowHabitState(
     val frequency: FrequencyCardState,
     val history: HistoryCardState,
     val bar: BarCardState,
-    val theme: Theme,
+    val theme: Theme
 )
 
 class ShowHabitPresenter(
@@ -65,31 +65,31 @@ class ShowHabitPresenter(
     val habitList: HabitList,
     val preferences: Preferences,
     val screen: Screen,
-    val commandRunner: CommandRunner,
+    val commandRunner: CommandRunner
 ) {
     val historyCardPresenter = HistoryCardPresenter(
         commandRunner = commandRunner,
         habit = habit,
         habitList = habitList,
         preferences = preferences,
-        screen = screen,
+        screen = screen
     )
 
     val barCardPresenter = BarCardPresenter(
         preferences = preferences,
-        screen = screen,
+        screen = screen
     )
 
     val scoreCardPresenter = ScoreCardPresenter(
         preferences = preferences,
-        screen = screen,
+        screen = screen
     )
 
     companion object {
         fun buildState(
             habit: Habit,
             preferences: Preferences,
-            theme: Theme,
+            theme: Theme
         ): ShowHabitState {
             return ShowHabitState(
                 title = habit.name,
@@ -98,47 +98,47 @@ class ShowHabitPresenter(
                 theme = theme,
                 subtitle = SubtitleCardPresenter.buildState(
                     habit = habit,
-                    theme = theme,
+                    theme = theme
                 ),
                 overview = OverviewCardPresenter.buildState(
                     habit = habit,
-                    theme = theme,
+                    theme = theme
                 ),
                 notes = NotesCardPresenter.buildState(
-                    habit = habit,
+                    habit = habit
                 ),
                 target = TargetCardPresenter.buildState(
                     habit = habit,
                     firstWeekday = preferences.firstWeekdayInt,
-                    theme = theme,
+                    theme = theme
                 ),
                 streaks = StreakCartPresenter.buildState(
                     habit = habit,
-                    theme = theme,
+                    theme = theme
                 ),
                 scores = ScoreCardPresenter.buildState(
                     spinnerPosition = preferences.scoreCardSpinnerPosition,
                     habit = habit,
                     firstWeekday = preferences.firstWeekdayInt,
-                    theme = theme,
+                    theme = theme
                 ),
                 frequency = FrequencyCardPresenter.buildState(
                     habit = habit,
                     firstWeekday = preferences.firstWeekdayInt,
-                    theme = theme,
+                    theme = theme
                 ),
                 history = HistoryCardPresenter.buildState(
                     habit = habit,
                     firstWeekday = preferences.firstWeekday,
-                    theme = theme,
+                    theme = theme
                 ),
                 bar = BarCardPresenter.buildState(
                     habit = habit,
                     firstWeekday = preferences.firstWeekdayInt,
                     boolSpinnerPosition = preferences.barCardBoolSpinnerPosition,
                     numericalSpinnerPosition = preferences.barCardNumericalSpinnerPosition,
-                    theme = theme,
-                ),
+                    theme = theme
+                )
             )
         }
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt
index 49dc07af7..4ea4bc854 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt
@@ -38,7 +38,7 @@ class ShowHabitMenuPresenter(
     private val habitList: HabitList,
     private val screen: Screen,
     private val system: System,
-    private val taskRunner: TaskRunner,
+    private val taskRunner: TaskRunner
 ) {
     fun onEditHabit() {
         screen.showEditHabitScreen(habit)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt
index 4c1f73133..303b33cee 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt
@@ -34,12 +34,12 @@ data class BarCardState(
     val color: PaletteColor,
     val entries: List<Entry>,
     val isNumerical: Boolean,
-    val numericalSpinnerPosition: Int,
+    val numericalSpinnerPosition: Int
 )
 
 class BarCardPresenter(
     val preferences: Preferences,
-    val screen: Screen,
+    val screen: Screen
 ) {
     companion object {
         val numericalBucketSizes = intArrayOf(1, 7, 31, 92, 365)
@@ -50,7 +50,7 @@ class BarCardPresenter(
             firstWeekday: Int,
             numericalSpinnerPosition: Int,
             boolSpinnerPosition: Int,
-            theme: Theme,
+            theme: Theme
         ): BarCardState {
             val bucketSize = if (habit.isNumerical) {
                 numericalBucketSizes[numericalSpinnerPosition]
@@ -62,7 +62,7 @@ class BarCardPresenter(
             val entries = habit.computedEntries.getByInterval(oldest, today).groupedSum(
                 truncateField = ScoreCardPresenter.getTruncateField(bucketSize),
                 firstWeekday = firstWeekday,
-                isNumerical = habit.isNumerical,
+                isNumerical = habit.isNumerical
             )
             return BarCardState(
                 theme = theme,
@@ -71,7 +71,7 @@ class BarCardPresenter(
                 color = habit.color,
                 isNumerical = habit.isNumerical,
                 numericalSpinnerPosition = numericalSpinnerPosition,
-                boolSpinnerPosition = boolSpinnerPosition,
+                boolSpinnerPosition = boolSpinnerPosition
             )
         }
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt
index cdb12d32d..0246daf7d 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt
@@ -46,7 +46,7 @@ class FrequencyCardPresenter {
                 isNumerical = habit.isNumerical
             ),
             firstWeekday = firstWeekday,
-            theme = theme,
+            theme = theme
         )
     }
 }
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 8b6126090..cfbe5e0f3 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
@@ -53,7 +53,7 @@ data class HistoryCardState(
     val defaultSquare: HistoryChart.Square,
     val notesIndicators: List<Boolean>,
     val theme: Theme,
-    val today: LocalDate,
+    val today: LocalDate
 )
 
 class HistoryCardPresenter(
@@ -61,7 +61,7 @@ class HistoryCardPresenter(
     val habit: Habit,
     val habitList: HabitList,
     val preferences: Preferences,
-    val screen: Screen,
+    val screen: Screen
 ) : OnDateClickedListener {
 
     override fun onDateLongPress(date: LocalDate) {
@@ -70,8 +70,11 @@ class HistoryCardPresenter(
         if (habit.isNumerical) {
             showNumberPopup(timestamp)
         } else {
-            if (preferences.isShortToggleEnabled) showCheckmarkPopup(timestamp)
-            else toggle(timestamp)
+            if (preferences.isShortToggleEnabled) {
+                showCheckmarkPopup(timestamp)
+            } else {
+                toggle(timestamp)
+            }
         }
     }
 
@@ -81,8 +84,11 @@ class HistoryCardPresenter(
         if (habit.isNumerical) {
             showNumberPopup(timestamp)
         } else {
-            if (preferences.isShortToggleEnabled) toggle(timestamp)
-            else showCheckmarkPopup(timestamp)
+            if (preferences.isShortToggleEnabled) {
+                toggle(timestamp)
+            } else {
+                showCheckmarkPopup(timestamp)
+            }
         }
     }
 
@@ -91,7 +97,7 @@ class HistoryCardPresenter(
         screen.showCheckmarkPopup(
             entry.value,
             entry.notes,
-            habit.color,
+            habit.color
         ) { newValue, newNotes ->
             commandRunner.run(
                 CreateRepetitionCommand(
@@ -99,8 +105,8 @@ class HistoryCardPresenter(
                     habit,
                     timestamp,
                     newValue,
-                    newNotes,
-                ),
+                    newNotes
+                )
             )
         }
     }
@@ -118,8 +124,8 @@ class HistoryCardPresenter(
                 habit,
                 timestamp,
                 nextValue,
-                entry.notes,
-            ),
+                entry.notes
+            )
         )
     }
 
@@ -128,7 +134,7 @@ class HistoryCardPresenter(
         val oldValue = entry.value
         screen.showNumberPopup(
             value = oldValue / 1000.0,
-            notes = entry.notes,
+            notes = entry.notes
         ) { newValue: Double, newNotes: String ->
             val thousands = (newValue * 1000).roundToInt()
             commandRunner.run(
@@ -137,8 +143,8 @@ class HistoryCardPresenter(
                     habit,
                     timestamp,
                     thousands,
-                    newNotes,
-                ),
+                    newNotes
+                )
             )
         }
     }
@@ -151,7 +157,7 @@ class HistoryCardPresenter(
         fun buildState(
             habit: Habit,
             firstWeekday: DayOfWeek,
-            theme: Theme,
+            theme: Theme
         ): HistoryCardState {
             val today = DateUtils.getTodayWithOffset()
             val oldest = habit.computedEntries.getKnown().lastOrNull()?.timestamp ?: today
@@ -190,7 +196,7 @@ class HistoryCardPresenter(
                 theme = theme,
                 series = series,
                 defaultSquare = OFF,
-                notesIndicators = notesIndicators,
+                notesIndicators = notesIndicators
             )
         }
     }
@@ -201,13 +207,13 @@ class HistoryCardPresenter(
         fun showNumberPopup(
             value: Double,
             notes: String,
-            callback: ListHabitsBehavior.NumberPickerCallback,
+            callback: ListHabitsBehavior.NumberPickerCallback
         )
         fun showCheckmarkPopup(
             selectedValue: Int,
             notes: String,
             color: PaletteColor,
-            callback: ListHabitsBehavior.CheckMarkDialogCallback,
+            callback: ListHabitsBehavior.CheckMarkDialogCallback
         )
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/NotesCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/NotesCard.kt
index f6aaeeaf5..47049bb83 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/NotesCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/NotesCard.kt
@@ -22,13 +22,13 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views
 import org.isoron.uhabits.core.models.Habit
 
 data class NotesCardState(
-    val description: String,
+    val description: String
 )
 
 class NotesCardPresenter {
     companion object {
         fun buildState(habit: Habit) = NotesCardState(
-            description = habit.description,
+            description = habit.description
         )
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt
index d9d431112..e15c08403 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt
@@ -31,7 +31,7 @@ data class OverviewCardState(
     val scoreYearDiff: Float,
     val scoreToday: Float,
     val totalCount: Long,
-    val theme: Theme,
+    val theme: Theme
 )
 
 class OverviewCardPresenter {
@@ -54,7 +54,7 @@ class OverviewCardPresenter {
                 scoreMonthDiff = scoreToday - scoreLastMonth,
                 scoreYearDiff = scoreToday - scoreLastYear,
                 totalCount = totalCount,
-                theme = theme,
+                theme = theme
             )
         }
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt
index 92268a7c0..b85d75204 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt
@@ -31,12 +31,12 @@ data class ScoreCardState(
     val bucketSize: Int,
     val spinnerPosition: Int,
     val color: PaletteColor,
-    val theme: Theme,
+    val theme: Theme
 )
 
 class ScoreCardPresenter(
     val preferences: Preferences,
-    val screen: Screen,
+    val screen: Screen
 ) {
     companion object {
         val BUCKET_SIZES = intArrayOf(1, 7, 31, 92, 365)
@@ -55,7 +55,7 @@ class ScoreCardPresenter(
             habit: Habit,
             firstWeekday: Int,
             spinnerPosition: Int,
-            theme: Theme,
+            theme: Theme
         ): ScoreCardState {
             val bucketSize = BUCKET_SIZES[spinnerPosition]
             val today = DateUtils.getTodayWithOffset()
@@ -80,7 +80,7 @@ class ScoreCardPresenter(
                 scores = scores,
                 bucketSize = bucketSize,
                 spinnerPosition = spinnerPosition,
-                theme = theme,
+                theme = theme
             )
         }
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt
index 97700f633..a242ab4b7 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt
@@ -27,7 +27,7 @@ import org.isoron.uhabits.core.ui.views.Theme
 data class StreakCardState(
     val color: PaletteColor,
     val bestStreaks: List<Streak>,
-    val theme: Theme,
+    val theme: Theme
 )
 
 class StreakCartPresenter {
@@ -36,7 +36,7 @@ class StreakCartPresenter {
             return StreakCardState(
                 color = habit.color,
                 bestStreaks = habit.streaks.getBest(10),
-                theme = theme,
+                theme = theme
             )
         }
     }
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 4cbbd74ec..fb839933c 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
@@ -35,14 +35,14 @@ data class SubtitleCardState(
     val targetValue: Double = 0.0,
     val targetType: NumericalHabitType = NumericalHabitType.AT_LEAST,
     val unit: String = "",
-    val theme: Theme,
+    val theme: Theme
 )
 
 class SubtitleCardPresenter {
     companion object {
         fun buildState(
             habit: Habit,
-            theme: Theme,
+            theme: Theme
         ): SubtitleCardState = SubtitleCardState(
             color = habit.color,
             frequency = habit.frequency,
@@ -52,7 +52,7 @@ class SubtitleCardPresenter {
             targetValue = habit.targetValue,
             targetType = habit.targetType,
             unit = habit.unit,
-            theme = theme,
+            theme = theme
         )
     }
 }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt
index afc7c635c..49c95011d 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt
@@ -34,7 +34,7 @@ data class TargetCardState(
     val values: List<Double> = listOf(),
     val targets: List<Double> = listOf(),
     val intervals: List<Int> = listOf(),
-    val theme: Theme,
+    val theme: Theme
 )
 
 class TargetCardPresenter {
@@ -42,7 +42,7 @@ class TargetCardPresenter {
         fun buildState(
             habit: Habit,
             firstWeekday: Int,
-            theme: Theme,
+            theme: Theme
         ): TargetCardState {
             val today = DateUtils.getTodayWithOffset()
             val oldest = habit.computedEntries.getKnown().lastOrNull()?.timestamp ?: today
@@ -74,7 +74,7 @@ class TargetCardPresenter {
             ).firstOrNull()?.value ?: 0
 
             val skippedDaysThisMonth = entries.countSkippedDays(
-                truncateField = DateUtils.TruncateField.MONTH,
+                truncateField = DateUtils.TruncateField.MONTH
             ).firstOrNull()?.value ?: 0
 
             val valueThisQuarter = entries.groupedSum(
@@ -162,7 +162,7 @@ class TargetCardPresenter {
                 values = values,
                 targets = targets,
                 intervals = intervals,
-                theme = theme,
+                theme = theme
             )
         }
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
index 493ec68dc..32d640554 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
@@ -31,7 +31,7 @@ import kotlin.math.round
 
 class BarChart(
     var theme: Theme,
-    var dateFormatter: LocalDateFormatter,
+    var dateFormatter: LocalDateFormatter
 ) : DataView {
 
     // Data
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 a752e271c..a6bd0ae25 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
@@ -47,7 +47,7 @@ class HistoryChart(
     var theme: Theme,
     var today: LocalDate,
     var onDateClickedListener: OnDateClickedListener = object : OnDateClickedListener {},
-    var padding: Double = 0.0,
+    var padding: Double = 0.0
 ) : DataView {
 
     enum class Square {
@@ -55,7 +55,7 @@ class HistoryChart(
         OFF,
         GREY,
         DIMMED,
-        HATCHED,
+        HATCHED
     }
 
     var squareSpacing = 1.0
@@ -147,7 +147,7 @@ class HistoryChart(
         canvas: Canvas,
         column: Int,
         topDate: LocalDate,
-        topOffset: Int,
+        topOffset: Int
     ) {
         drawHeader(canvas, column, topDate)
         repeat(7) { row ->
@@ -202,9 +202,8 @@ class HistoryChart(
         width: Double,
         height: Double,
         date: LocalDate,
-        offset: Int,
+        offset: Int
     ) {
-
         val value = if (offset >= series.size) defaultSquare else series[offset]
         val hasNotes = if (offset >= notesIndicators.size) false else notesIndicators[offset]
         val squareColor: Color
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 b06513140..b91b0e33a 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
@@ -138,7 +138,7 @@ abstract class DateUtils {
                 (firstWeekday + 2) % 7 + 1,
                 (firstWeekday + 3) % 7 + 1,
                 (firstWeekday + 4) % 7 + 1,
-                (firstWeekday + 5) % 7 + 1,
+                (firstWeekday + 5) % 7 + 1
             )
         }
 
@@ -279,7 +279,6 @@ abstract class DateUtils {
             val cal = getCalendar(timestamp)
 
             return when (field) {
-
                 TruncateField.DAY -> { cal.timeInMillis }
 
                 TruncateField.MONTH -> {
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/platform/gui/JavaCanvasTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/platform/gui/JavaCanvasTest.kt
index 6870d2385..8d2745d55 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/platform/gui/JavaCanvasTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/platform/gui/JavaCanvasTest.kt
@@ -69,7 +69,7 @@ suspend fun assertRenders(
     width: Int,
     height: Int,
     expectedPath: String,
-    view: View,
+    view: View
 ) {
     val canvas = createCanvas(width, height)
     view.draw(canvas)
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 4079600ab..b8fd183db 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
@@ -18,8 +18,6 @@
  */
 package org.isoron.uhabits.core
 
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.validateMockitoUsage
 import org.apache.commons.io.IOUtils
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.database.Database
@@ -40,6 +38,8 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.validateMockitoUsage
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.kt
index 4a774340b..05b9e1605 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.kt
@@ -28,6 +28,7 @@ import org.junit.Test
 class ArchiveHabitsCommandTest : BaseUnitTest() {
     private lateinit var command: ArchiveHabitsCommand
     private lateinit var habit: Habit
+
     @Before
     @Throws(Exception::class)
     override fun setUp() {
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 974af722b..bc5c234d5 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
@@ -31,6 +31,7 @@ class CreateRepetitionCommandTest : BaseUnitTest() {
     private lateinit var command: CreateRepetitionCommand
     private lateinit var habit: Habit
     private lateinit var today: Timestamp
+
     @Before
     @Throws(Exception::class)
     override fun setUp() {
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.kt
index 2ce4b8e86..72f4a0d06 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.kt
@@ -33,6 +33,7 @@ class EditHabitCommandTest : BaseUnitTest() {
     private lateinit var habit: Habit
     private lateinit var modified: Habit
     private lateinit var today: Timestamp
+
     @Before
     @Throws(Exception::class)
     override fun setUp() {
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryListTest.kt
index c1f1bde2d..7b163f945 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryListTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryListTest.kt
@@ -86,7 +86,7 @@ class EntryListTest {
             Entry(today.minus(9), YES_MANUAL),
             Entry(today.minus(10), YES_MANUAL),
             Entry(today.minus(11), YES_AUTO),
-            Entry(today.minus(12), YES_AUTO),
+            Entry(today.minus(12), YES_AUTO)
         )
         assertEquals(expected, computed.getKnown())
 
@@ -110,7 +110,7 @@ class EntryListTest {
         val expected = listOf(
             Entry(today.minus(4), 100),
             Entry(today.minus(9), 200),
-            Entry(today.minus(10), 300),
+            Entry(today.minus(10), 300)
         )
         assertEquals(expected, computed.getKnown())
     }
@@ -144,7 +144,7 @@ class EntryListTest {
 
         val byMonth = entries.getKnown().groupedSum(
             truncateField = DateUtils.TruncateField.MONTH,
-            isNumerical = true,
+            isNumerical = true
         )
         assertThat(byMonth.size, equalTo(17))
         assertThat(byMonth[0], equalTo(Entry(Timestamp.from(2014, Calendar.JUNE, 1), 230)))
@@ -153,7 +153,7 @@ class EntryListTest {
 
         val byQuarter = entries.getKnown().groupedSum(
             truncateField = DateUtils.TruncateField.QUARTER,
-            isNumerical = true,
+            isNumerical = true
         )
         assertThat(byQuarter.size, equalTo(6))
         assertThat(byQuarter[0], equalTo(Entry(Timestamp.from(2014, Calendar.APRIL, 1), 3263)))
@@ -162,7 +162,7 @@ class EntryListTest {
 
         val byYear = entries.getKnown().groupedSum(
             truncateField = DateUtils.TruncateField.YEAR,
-            isNumerical = true,
+            isNumerical = true
         )
         assertThat(byYear.size, equalTo(2))
         assertThat(byYear[0], equalTo(Entry(Timestamp.from(2014, Calendar.JANUARY, 1), 8227)))
@@ -188,7 +188,7 @@ class EntryListTest {
 
         val byMonth = entries.getKnown().groupedSum(
             truncateField = DateUtils.TruncateField.MONTH,
-            isNumerical = false,
+            isNumerical = false
         )
         assertThat(byMonth.size, equalTo(17))
         assertThat(byMonth[0], equalTo(Entry(Timestamp.from(2014, Calendar.JUNE, 1), 1_000)))
@@ -197,7 +197,7 @@ class EntryListTest {
 
         val byQuarter = entries.getKnown().groupedSum(
             truncateField = DateUtils.TruncateField.QUARTER,
-            isNumerical = false,
+            isNumerical = false
         )
         assertThat(byQuarter.size, equalTo(6))
         assertThat(byQuarter[0], equalTo(Entry(Timestamp.from(2014, Calendar.APRIL, 1), 15_000)))
@@ -206,7 +206,7 @@ class EntryListTest {
 
         val byYear = entries.getKnown().groupedSum(
             truncateField = DateUtils.TruncateField.YEAR,
-            isNumerical = false,
+            isNumerical = false
         )
         assertThat(byYear.size, equalTo(2))
         assertThat(byYear[0], equalTo(Entry(Timestamp.from(2014, Calendar.JANUARY, 1), 34_000)))
@@ -221,12 +221,12 @@ class EntryListTest {
             Entry(day(4), NO),
             Entry(day(5), YES_MANUAL),
             Entry(day(10), YES_MANUAL),
-            Entry(day(11), NO),
+            Entry(day(11), NO)
         )
         val intervals = listOf(
             EntryList.Interval(day(2), day(2), day(1)),
             EntryList.Interval(day(6), day(5), day(4)),
-            EntryList.Interval(day(10), day(8), day(8)),
+            EntryList.Interval(day(10), day(8), day(8))
         )
         val expected = listOf(
             Entry(day(1), YES_MANUAL),
@@ -239,7 +239,7 @@ class EntryListTest {
             Entry(day(8), YES_AUTO),
             Entry(day(9), YES_AUTO),
             Entry(day(10), YES_MANUAL),
-            Entry(day(11), NO),
+            Entry(day(11), NO)
         )
         val actual = EntryList.buildEntriesFromInterval(entries, intervals)
         assertThat(actual, equalTo(expected))
@@ -251,13 +251,13 @@ class EntryListTest {
             EntryList.Interval(day(8), day(8), day(2)),
             EntryList.Interval(day(12), day(12), day(6)),
             EntryList.Interval(day(20), day(20), day(14)),
-            EntryList.Interval(day(27), day(27), day(21)),
+            EntryList.Interval(day(27), day(27), day(21))
         )
         val expected = arrayListOf(
             EntryList.Interval(day(8), day(8), day(2)),
             EntryList.Interval(day(15), day(12), day(9)),
             EntryList.Interval(day(22), day(20), day(16)),
-            EntryList.Interval(day(29), day(27), day(23)),
+            EntryList.Interval(day(29), day(27), day(23))
         )
         EntryList.snapIntervalsTogether(original)
         assertThat(original, equalTo(expected))
@@ -267,11 +267,11 @@ class EntryListTest {
     fun testSnapIntervalsTogether2() {
         val original = arrayListOf(
             EntryList.Interval(day(6), day(4), day(0)),
-            EntryList.Interval(day(11), day(8), day(5)),
+            EntryList.Interval(day(11), day(8), day(5))
         )
         val expected = arrayListOf(
             EntryList.Interval(day(6), day(4), day(0)),
-            EntryList.Interval(day(13), day(8), day(7)),
+            EntryList.Interval(day(13), day(8), day(7))
         )
         EntryList.snapIntervalsTogether(original)
         assertThat(original, equalTo(expected))
@@ -282,12 +282,12 @@ class EntryListTest {
         val entries = listOf(
             Entry(day(8), YES_MANUAL),
             Entry(day(18), YES_MANUAL),
-            Entry(day(23), YES_MANUAL),
+            Entry(day(23), YES_MANUAL)
         )
         val expected = listOf(
             EntryList.Interval(day(8), day(8), day(2)),
             EntryList.Interval(day(18), day(18), day(12)),
-            EntryList.Interval(day(23), day(23), day(17)),
+            EntryList.Interval(day(23), day(23), day(17))
         )
         val actual = EntryList.buildIntervals(Frequency.WEEKLY, entries)
         assertThat(actual, equalTo(expected))
@@ -298,12 +298,12 @@ class EntryListTest {
         val entries = listOf(
             Entry(day(8), YES_MANUAL),
             Entry(day(18), YES_MANUAL),
-            Entry(day(23), YES_MANUAL),
+            Entry(day(23), YES_MANUAL)
         )
         val expected = listOf(
             EntryList.Interval(day(8), day(8), day(8)),
             EntryList.Interval(day(18), day(18), day(18)),
-            EntryList.Interval(day(23), day(23), day(23)),
+            EntryList.Interval(day(23), day(23), day(23))
         )
         val actual = EntryList.buildIntervals(Frequency.DAILY, entries)
         assertThat(actual, equalTo(expected))
@@ -316,12 +316,12 @@ class EntryListTest {
             Entry(day(15), YES_MANUAL),
             Entry(day(18), YES_MANUAL),
             Entry(day(22), YES_MANUAL),
-            Entry(day(23), YES_MANUAL),
+            Entry(day(23), YES_MANUAL)
         )
         val expected = listOf(
             EntryList.Interval(day(18), day(15), day(12)),
             EntryList.Interval(day(22), day(18), day(16)),
-            EntryList.Interval(day(23), day(22), day(17)),
+            EntryList.Interval(day(23), day(22), day(17))
         )
         val actual = EntryList.buildIntervals(Frequency.TWO_TIMES_PER_WEEK, entries)
         assertThat(actual, equalTo(expected))
@@ -332,11 +332,11 @@ class EntryListTest {
         val entries = listOf(
             Entry(day(10), YES_MANUAL),
             Entry(day(20), Entry.SKIP),
-            Entry(day(30), YES_MANUAL),
+            Entry(day(30), YES_MANUAL)
         )
         val expected = listOf(
             EntryList.Interval(day(10), day(10), day(8)),
-            EntryList.Interval(day(30), day(30), day(28)),
+            EntryList.Interval(day(30), day(30), day(28))
         )
         val actual = EntryList.buildIntervals(Frequency(1, 3), entries)
         assertThat(actual, equalTo(expected))
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryTest.kt
index 0f79969a6..17d38dc85 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryTest.kt
@@ -37,10 +37,10 @@ class EntryTest {
                 YES_MANUAL to SKIP,
                 SKIP to NO,
                 NO to UNKNOWN,
-                UNKNOWN to YES_MANUAL,
+                UNKNOWN to YES_MANUAL
             ),
             isSkipEnabled = true,
-            areQuestionMarksEnabled = true,
+            areQuestionMarksEnabled = true
         )
         check(
             mapOf(
@@ -48,10 +48,10 @@ class EntryTest {
                 YES_MANUAL to NO,
                 SKIP to NO,
                 NO to UNKNOWN,
-                UNKNOWN to YES_MANUAL,
+                UNKNOWN to YES_MANUAL
             ),
             isSkipEnabled = false,
-            areQuestionMarksEnabled = true,
+            areQuestionMarksEnabled = true
         )
         check(
             mapOf(
@@ -59,10 +59,10 @@ class EntryTest {
                 YES_MANUAL to SKIP,
                 SKIP to NO,
                 NO to YES_MANUAL,
-                UNKNOWN to YES_MANUAL,
+                UNKNOWN to YES_MANUAL
             ),
             isSkipEnabled = true,
-            areQuestionMarksEnabled = false,
+            areQuestionMarksEnabled = false
         )
         check(
             mapOf(
@@ -70,10 +70,10 @@ class EntryTest {
                 YES_MANUAL to NO,
                 SKIP to NO,
                 NO to YES_MANUAL,
-                UNKNOWN to YES_MANUAL,
+                UNKNOWN to YES_MANUAL
             ),
             isSkipEnabled = false,
-            areQuestionMarksEnabled = false,
+            areQuestionMarksEnabled = false
         )
     }
 
@@ -87,9 +87,9 @@ class EntryTest {
                 nextToggleValue(
                     value = value,
                     isSkipEnabled = isSkipEnabled,
-                    areQuestionMarksEnabled = areQuestionMarksEnabled,
+                    areQuestionMarksEnabled = areQuestionMarksEnabled
                 ),
-                expected,
+                expected
             )
         }
     }
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 0d2314be5..6b591cdb6 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
@@ -57,7 +57,7 @@ class HabitListTest : BaseUnitTest() {
         reminderHabits = habitList.getFiltered(
             HabitMatcher(
                 isArchivedAllowed = true,
-                isReminderRequired = true,
+                isReminderRequired = true
             )
         )
     }
@@ -183,7 +183,7 @@ class HabitListTest : BaseUnitTest() {
         val filteredList = habitList.getFiltered(
             HabitMatcher(
                 isArchivedAllowed = false,
-                isCompletedAllowed = false,
+                isCompletedAllowed = false
             )
         )
         assertEquals(filteredList.primaryOrder, HabitList.Order.BY_COLOR_ASC)
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 a152bdfe0..622e1d116 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
@@ -257,12 +257,14 @@ class YesNoScoreListTest : BaseScoreListTest() {
 
     private fun check(values: ArrayList<Int>) {
         val entries = habit.originalEntries
-        for (i in values.indices) if (values[i] == Entry.YES_MANUAL) entries.add(
-            Entry(
-                today.minus(i),
-                Entry.YES_MANUAL
+        for (i in values.indices) if (values[i] == Entry.YES_MANUAL) {
+            entries.add(
+                Entry(
+                    today.minus(i),
+                    Entry.YES_MANUAL
+                )
             )
-        )
+        }
         habit.recompute()
     }
 
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt
index 3057b8993..9f2457fb6 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt
@@ -67,15 +67,15 @@ class SQLiteEntryListTest {
         )
         assertEquals(
             Entry(timestamp = today, value = 500),
-            entries.get(today),
+            entries.get(today)
         )
         assertEquals(
             Entry(timestamp = today.minus(1), value = UNKNOWN),
-            entries.get(today.minus(1)),
+            entries.get(today.minus(1))
         )
         assertEquals(
             Entry(timestamp = today.minus(5), value = 300),
-            entries.get(today.minus(5)),
+            entries.get(today.minus(5))
         )
     }
 
@@ -100,7 +100,7 @@ class SQLiteEntryListTest {
         return repository.findFirst(
             "where habit = ? and timestamp = ?",
             habitId.toString(),
-            timestamp.unixTime.toString(),
+            timestamp.unixTime.toString()
         )
     }
 }
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 d5a551012..c6cb93ec8 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
@@ -18,8 +18,6 @@
  */
 package org.isoron.uhabits.core.models.sqlite
 
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
 import junit.framework.Assert.assertNull
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
@@ -37,6 +35,8 @@ import org.isoron.uhabits.core.test.HabitFixtures
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.ExpectedException
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 import java.util.ArrayList
 
 class SQLiteHabitListTest : BaseUnitTest() {
@@ -73,7 +73,7 @@ class SQLiteHabitListTest : BaseUnitTest() {
         reminderHabits = habitList.getFiltered(
             HabitMatcher(
                 isArchivedAllowed = true,
-                isReminderRequired = true,
+                isReminderRequired = true
             )
         )
         habitList.observable.addListener(listener)
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt
index 52117c181..2f54ac25a 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt
@@ -18,7 +18,6 @@
  */
 package org.isoron.uhabits.core.preferences
 
-import com.nhaarman.mockitokotlin2.mock
 import junit.framework.Assert.assertFalse
 import junit.framework.Assert.assertNull
 import junit.framework.Assert.assertTrue
@@ -30,6 +29,7 @@ import org.isoron.uhabits.core.models.Timestamp.Companion.ZERO
 import org.isoron.uhabits.core.ui.ThemeSwitcher
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.mock
 import java.io.File
 
 class PreferencesTest : BaseUnitTest() {
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 cf81fbe9a..8772ce4d3 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
@@ -18,10 +18,6 @@
  */
 package org.isoron.uhabits.core.reminders
 
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.Reminder
@@ -37,6 +33,10 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import java.util.Calendar
 import java.util.TimeZone
 
@@ -149,10 +149,14 @@ class ReminderSchedulerTest : BaseUnitTest() {
         expectedCheckmarkTime: Long,
         expectedReminderTime: Long
     ) {
-        if (atTime == null) reminderScheduler.schedule(habit) else reminderScheduler.scheduleAtTime(
-            habit,
-            atTime
-        )
+        if (atTime == null) {
+            reminderScheduler.schedule(habit)
+        } else {
+            reminderScheduler.scheduleAtTime(
+                habit,
+                atTime
+            )
+        }
         verify(sys).scheduleShowReminder(
             expectedReminderTime,
             habit,
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt
index 0dbc97bfd..6bb10c0c9 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt
@@ -18,12 +18,12 @@
  */
 package org.isoron.uhabits.core.tasks
 
-import com.nhaarman.mockitokotlin2.inOrder
-import com.nhaarman.mockitokotlin2.mock
 import org.isoron.uhabits.core.BaseUnitTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.mockito.kotlin.inOrder
+import org.mockito.kotlin.mock
 
 @RunWith(JUnit4::class)
 class SingleThreadTaskRunnerTest : BaseUnitTest() {
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 97da833a5..e3ff88c18 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
@@ -18,10 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.reset
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
@@ -30,6 +26,10 @@ import org.isoron.uhabits.core.commands.DeleteHabitsCommand
 import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.reset
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
 
 class HabitCardListCacheTest : BaseUnitTest() {
     private lateinit var cache: HabitCardListCache
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt
index 1bc588d9a..b420604b8 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt
@@ -18,9 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
 import junit.framework.Assert.assertFalse
 import junit.framework.Assert.assertNull
 import junit.framework.Assert.assertTrue
@@ -31,6 +28,9 @@ import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 
 class HintListTest : BaseUnitTest() {
     private lateinit var hintList: HintList
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 c5e5f7b44..6926b4384 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
@@ -18,14 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import com.nhaarman.mockitokotlin2.KArgumentCaptor
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.argumentCaptor
-import com.nhaarman.mockitokotlin2.clearInvocations
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
 import junit.framework.Assert.assertFalse
 import junit.framework.Assert.assertTrue
 import org.apache.commons.io.FileUtils
@@ -39,6 +31,14 @@ import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getTodayWithOffset
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.clearInvocations
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import java.io.IOException
 import java.nio.file.Files
 
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt
index 2485c8ba5..466daa304 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt
@@ -18,15 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import com.nhaarman.mockitokotlin2.KArgumentCaptor
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.argumentCaptor
-import com.nhaarman.mockitokotlin2.clearInvocations
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
-import com.nhaarman.mockitokotlin2.whenever
 import junit.framework.Assert.assertFalse
 import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
@@ -37,6 +28,15 @@ import org.isoron.uhabits.core.models.HabitMatcher
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.ui.ThemeSwitcher
 import org.junit.Test
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.clearInvocations
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
+import org.mockito.kotlin.whenever
 
 class ListHabitsMenuBehaviorTest : BaseUnitTest() {
     private lateinit var behavior: ListHabitsMenuBehavior
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt
index 56fe20a3f..b67a43d8e 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt
@@ -18,12 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
-import com.nhaarman.mockitokotlin2.KArgumentCaptor
-import com.nhaarman.mockitokotlin2.argumentCaptor
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
 import junit.framework.Assert.assertFalse
 import junit.framework.Assert.assertNull
 import junit.framework.Assert.assertTrue
@@ -35,6 +29,12 @@ import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.ui.callbacks.OnColorPickedCallback
 import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
 import org.junit.Test
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 
 class ListHabitsSelectionMenuBehaviorTest : BaseUnitTest() {
     private val screen: ListHabitsSelectionMenuBehavior.Screen = mock()
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.kt
index aac1cf320..cbb889f82 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.kt
@@ -18,15 +18,15 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.show
 
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
 import org.apache.commons.io.FileUtils
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.models.Habit
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import java.nio.file.Files
 
 class ShowHabitMenuPresenterTest : BaseUnitTest() {
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 d25483fb1..72cfb8b7e 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
@@ -19,10 +19,6 @@
 
 package org.isoron.uhabits.core.ui.views
 
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.reset
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import kotlinx.coroutines.runBlocking
 import org.isoron.platform.gui.assertRenders
 import org.isoron.platform.time.DayOfWeek
@@ -35,6 +31,10 @@ 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.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.reset
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
 import java.util.Locale
 
 class HistoryChartTest {
@@ -64,7 +64,7 @@ class HistoryChartTest {
             1, 2, 1, 1, 1, 1, 2,
             2, 2, 2, 2, 2, 1, 1,
             1, 1, 2, 2, 1, 2, 1,
-            1, 1, 1, 1, 2, 2, 2,
+            1, 1, 1, 1, 2, 2, 2
         ).map {
             when (it) {
                 3 -> HATCHED
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 d58ef1979..27a1c8cba 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
@@ -18,11 +18,6 @@
  */
 package org.isoron.uhabits.core.ui.widgets
 
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.reset
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyZeroInteractions
-import com.nhaarman.mockitokotlin2.whenever
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
 import org.isoron.uhabits.core.models.Entry
@@ -34,6 +29,11 @@ import org.isoron.uhabits.core.ui.NotificationTray
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getTodayWithOffset
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.reset
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyZeroInteractions
+import org.mockito.kotlin.whenever
 
 class WidgetBehaviorTest : BaseUnitTest() {
     private lateinit var notificationTray: NotificationTray
@@ -77,12 +77,12 @@ class WidgetBehaviorTest : BaseUnitTest() {
     @Test
     fun testOnToggleRepetition() {
         for (skipEnabled in listOf(true, false)) for (
-            currentValue in listOf(
-                Entry.NO,
-                Entry.YES_MANUAL,
-                Entry.YES_AUTO,
-                Entry.SKIP,
-            )
+        currentValue in listOf(
+            Entry.NO,
+            Entry.YES_MANUAL,
+            Entry.YES_AUTO,
+            Entry.SKIP
+        )
         ) {
             whenever(preferences.isSkipEnabled).thenReturn(skipEnabled)
             val nextValue: Int = nextToggleValue(
diff --git a/uhabits-server/build.gradle.kts b/uhabits-server/build.gradle.kts
index 9a59b33a8..a96d02131 100644
--- a/uhabits-server/build.gradle.kts
+++ b/uhabits-server/build.gradle.kts
@@ -47,7 +47,7 @@ dependencies {
     implementation("io.prometheus:simpleclient_httpserver:0.16.0")
     implementation("io.prometheus:simpleclient_hotspot:0.16.0")
     testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
-    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:2.2.11")
     testImplementation(kotlin("test"))
     testImplementation(kotlin("test-junit"))
 }
diff --git a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/BaseApplicationTest.kt b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/BaseApplicationTest.kt
index 7b5c6d27b..3c1aa33dd 100644
--- a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/BaseApplicationTest.kt
+++ b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/BaseApplicationTest.kt
@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.sync.app
 
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
 import io.ktor.application.*
 import org.isoron.uhabits.sync.server.*
 
diff --git a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/LinksModuleTest.kt b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/LinksModuleTest.kt
index ef2bc8963..7ee49aa14 100644
--- a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/LinksModuleTest.kt
+++ b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/LinksModuleTest.kt
@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.sync.app
 
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.whenever
 import io.ktor.http.ContentType
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpMethod
diff --git a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt
index 8fa80883a..8b5710743 100644
--- a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt
+++ b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt
@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.sync.app
 
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.whenever
 import io.ktor.http.HttpMethod
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.testing.handleRequest
diff --git a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/StorageModuleTest.kt b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/StorageModuleTest.kt
index 7609587e0..36872a194 100644
--- a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/StorageModuleTest.kt
+++ b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/StorageModuleTest.kt
@@ -19,8 +19,8 @@
 
 package org.isoron.uhabits.sync.app
 
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import io.ktor.http.*
 import io.ktor.server.testing.*
 import kotlinx.coroutines.*