diff --git a/README.md b/README.md
index 7ccf26ad..d8d6d4e5 100644
--- a/README.md
+++ b/README.md
@@ -21,23 +21,28 @@ stage.
 
 ### Layouts
 * [x] Latin character layout (QWERTY)
-* [ ] Other character layouts (both latin and non-latin)
+* [x] Other character layouts (both latin and non-latin) (Currently
+      QWERTZ and AZERTY are supported besides QWERTY)
 * [x] Adapt to situation in app (password, url, text, etc. )
 * [x] Special character layout(s)
 * [x] Numeric layout
 * [x] Numeric layout (advanced)
 * [x] Phone number layout
-* [x] Emoji layout (buggy atm)
+* [x] Emoji layout (popups buggy atm)
 * [ ] Emoticon layout
+* [ ] Kaomoji layout
 
 ### Preferences
+* [ ] Setup wizard
 * [x] Preferences screen
 * [x] Customize look and behaviour of keyboard (currently only
       light/dark theme)
 * [ ] Theme customization
 * [ ] Theme import/export (?)
-* [ ] Layout selection
+* [x] Subtype selection (language/layout)
+* [x] Keyboard behaviour preferences
 * [ ] Text suggestion / Auto correct preferences
+* [ ] Gesture preferences
 
 ### Composing suggestions
 * [ ] Auto suggest words from precompiled dictionary
@@ -51,8 +56,10 @@ stage.
 * [ ] Floating keyboard
 * [ ] Gesture support
 * [ ] Glide typing (?)
-* [ ] Search emojis/emoticons by name within media context
-* [ ] Full integration in IME service list of Android (xml/method)
+* [x] Full integration in IME service list of Android (xml/method)
+      (integration is internal-only, because Android's default subtype
+      implementation not really allows for dynamic language/layout
+      pairs, only compile-time defined ones)
 * [ ] (dev only) Generate well-structured documentation of code
 * [ ] ...
 
diff --git a/app/build.gradle b/app/build.gradle
index e61b13e9..83fb9fc4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "dev.patrickgold.florisboard"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 6
-        versionName "0.1.0.alpha6"
+        versionCode 7
+        versionName "0.1.0.alpha7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }