diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f2e30097..19fd9106c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Changelog
 
+## [2.1.0] -- Unreleased
+### Added
+- Allow user to add notes to specific dates (@vbh, #1103)
+- Allow user to track "at most" numerical habits (@KristianTashkov, #1101)
+- Allow user to add skips to measurable habits (@kalina559, #1319)
+- Bring back custom frequencies (x times in y days) (@hiqua, #1079)
+- Improve number picker (@hiqua, @iSoron, #1082, #1370)
+- Add new checkmark state picker (@iSoron, #1370)
+- Allow user to import numerical habits from HabitBull (@hiqua, #1278)
+
+### Removed
+- Hide snooze button Android 12 notifications (@hiqua, #1226)
+- Remove preference to set LED lights (@iSoron)
+
+### Changed
+- Hide failed habits along with completed ones (@hiqua, #1052)
+- Cycle through all checkmark states when toggling (@iSoron)
+- Add delay after toggling a habit (@hiqua, @kalina559, #1147)
+- Small theme improvements (@KristianTashkov, #1113)
+- Left-align habit notes (@iSoron)
+
+### Fixed
+- Fix small dialog buttons (@kalina559, #1096)
+- Fix invalid CSV files (@hiqua, #1177)
+- Fix small issues in calendar chart (@kalina559, #1314)
+- Resort habit list after edit (@hiqua, #1350)
+
+### Refactoring & Testing
+- Replace raster icons by vector assets (@kalina559)
+- Remove JVM dependencies from uhabits-core module (@sgallese)
+- Add various missing tests (@sgallese)
+- Upgrade project dependencies (@hiqua, @sgallese)
+- Increase target SDK to 31 (@hiqua)
+
 ## [2.0.3] - 2021-08-21
 ### Fixed
 - Improve automatic checkmarks for monthly habits (@iSoron, #947)
diff --git a/uhabits-android/src/main/res/layout/about.xml b/uhabits-android/src/main/res/layout/about.xml
index b995d428c..3eb152757 100644
--- a/uhabits-android/src/main/res/layout/about.xml
+++ b/uhabits-android/src/main/res/layout/about.xml
@@ -123,11 +123,11 @@
                 <TextView style="@style/About.Item" android:text="Álinson S. Xavier (@iSoron)"/>
                 <TextView style="@style/About.Item" android:text="Quentin Hibon (@hiqua)"/>
                 <TextView style="@style/About.Item" android:text="Oleg Ivashchenko (@olegivo)"/>
-                <TextView style="@style/About.Item" android:text="Rechee Jozil (@recheej)"/>
+                <TextView style="@style/About.Item" android:text="Kristian Tashkov (@KristianTashkov)"/>
                 <TextView style="@style/About.Item" android:text="Jakub Kalinowski (@kalina559)"/>
-                <TextView style="@style/About.Item" android:text="Luboš Luňák (@llunak)"/>
+                <TextView style="@style/About.Item" android:text="Rechee Jozil (@recheej)"/>
                 <TextView style="@style/About.Item" android:text="Sebastian Gallese (@sgallese)"/>
-                <TextView style="@style/About.Item" android:text="Kristian Tashkov (@KristianTashkov)"/>
+                <TextView style="@style/About.Item" android:text="Luboš Luňák (@llunak)"/>
                 <TextView style="@style/About.Item" android:text="Bindu (@vbh)"/>
                 <TextView style="@style/About.Item" android:text="Victor Yu (@vyu1)"/>
                 <TextView style="@style/About.Item" android:text="Christoph Hennemann (@chennemann)"/>