diff --git a/TODO.md b/TODO.md
index b0a1a413..c6aa5e49 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,7 @@
 # TODO
 
+## v1.0
+
 - [ ] trash: groups/empty/untrash
 - [ ] move groups/entries
 - [ ] help/tips
@@ -8,18 +10,20 @@
 - [ ] lock without closing
 - [ ] secure fields
 - [ ] close files
-- [ ] merge
 - [ ] show sync date
 - [ ] dropbox keyfiles
 - [ ] offline and local storage
 - [ ] trim history by rules
-- [ ] generation templates
 - [ ] advanced search
+
+## Future
+- [ ] sync merge
 - [ ] mobile apps
 - [ ] file type associations
 - [ ] auto-type for desktop
 - [ ] audit
 - [ ] native encryption for electron
+- [ ] generation templates
 - [ ] entry templates
 - [ ] custom icons
 - [ ] plugins