diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png
index 6b250de8..8f450c76 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png and b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png
index b436db6c..065542a5 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png and b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png
index 48fc4f7e..5c5db36d 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png and b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png
index 4ae316a4..49e77eab 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png and b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png
index e110acdd..c8d3c0e9 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png
index f2ae9ae5..3b6c105a 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png
index 946615f9..c58cb89c 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png
index e7aca20a..78385ea3 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png
index e8192ea7..f4ce5a6c 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png
index ba05929d..256e8f43 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png and b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png
index ce7b1b57..1c23c438 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png and b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png
index ba05929d..256e8f43 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png and b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png b/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png
index aa876e06..f91e0fa3 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png and b/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png b/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png
index b8435b1c..10274dce 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png and b/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png b/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png
index e1139312..724e62f4 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png and b/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png b/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png
index 05950b41..c6c9faec 100644
Binary files a/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png and b/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png differ
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java
index a4157ee7..e431f487 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.pebble;
+package org.isoron.uhabits.receivers;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -29,12 +29,11 @@ import com.getpebble.android.kit.util.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
-import org.isoron.uhabits.receivers.*;
 import org.json.*;
 import org.junit.*;
 import org.junit.runner.*;
 
-import static com.getpebble.android.kit.Constants.*;
+import static com.getpebble.android.kit.Constants.MSG_DATA;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
 
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
index 594fd060..21e33242 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
@@ -30,6 +30,7 @@ import java.util.*;
 
 import javax.annotation.concurrent.*;
 
+import static java.lang.Math.min;
 import static org.isoron.uhabits.core.models.Checkmark.CHECKED_EXPLICITLY;
 import static org.isoron.uhabits.core.models.Checkmark.CHECKED_IMPLICITLY;
 import static org.isoron.uhabits.core.models.Checkmark.UNCHECKED;
@@ -60,8 +61,7 @@ public abstract class CheckmarkList
         long today = DateUtils.getStartOfToday();
 
         long begin = reps[0].getTimestamp();
-        if (intervals.size() > 0)
-            begin = Long.min(begin, intervals.get(0).begin);
+        if (intervals.size() > 0) begin = min(begin, intervals.get(0).begin);
 
         int nDays = (int) ((today - begin) / day) + 1;
 
@@ -295,7 +295,7 @@ public abstract class CheckmarkList
         final long today = DateUtils.getStartOfToday();
 
         Checkmark newest = getNewestComputed();
-        if(newest != null && newest.getTimestamp() == today) return;
+        if (newest != null && newest.getTimestamp() == today) return;
         invalidateNewerThan(0);
 
         Repetition oldestRep = habit.getRepetitions().getOldest();