diff --git a/README.md b/README.md
index a0e13f11..21023227 100644
--- a/README.md
+++ b/README.md
@@ -63,9 +63,10 @@ milestones, please refer to the [Feature roadmap](#feature-roadmap).
 
 ### Layouts
 * [x] Latin character layouts (QWERTY, QWERTZ, AZERTY, Swiss, Spanish,
-      Norwegian, Swedish/Finnish, Icelandic, Danish, Hungarian); more
-      coming in future versions
-* [x] Non-latin character layouts (Arabic, Persian)
+      Norwegian, Swedish/Finnish, Icelandic, Danish, Hungarian,
+      Croatian, Polish, Romanian); more coming in future versions
+* [x] Non-latin character layouts (Arabic, Persian, Greek, Russian
+      (JCUKEN))
 * [x] Adapt to situation in app (password, url, text, etc. )
 * [x] Special character layout(s)
 * [x] Numeric layout
@@ -78,7 +79,7 @@ milestones, please refer to the [Feature roadmap](#feature-roadmap).
 * [x] Setup wizard
 * [x] Preferences screen
 * [x] Customize look and behaviour of keyboard
-* [x] Theme presets (currently only day/night theme)
+* [x] Theme presets (currently only day/night theme + borderless)
 * [x] Theme customization
 * [x] Subtype selection (language/layout)
 * [x] Keyboard behaviour preferences
@@ -121,8 +122,8 @@ close as possible.
     words over time. Data collected here is stored locally and never leaves
     the user's device.
 
-- Module C: Extension packs
-  - Ability to load dictionaries (and later potentionally other cool
+- Module C: Extension packs (base implementation with #162)
+  - Ability to load dictionaries (and later potentially other cool
     features too) only if needed to keep the core APK size small
   - Currently unclear how exactly this will work, but this is definitely
     a must-have feature
@@ -131,6 +132,14 @@ close as possible.
   - Swiping over the characters will automatically convert this to a word
   - Possibly also add improvements based on the Flow keyboard
 
+- Module E: Theme rework (Implemented with #162)
+  - Themes are now based on the Asset schema
+  - Dynamic theme creation
+  - Different theme modes (`Always day`, `Always dark`, `Follow system`
+    and `Follow time`)
+  - Define a separate theme both for day and night theme
+  - Adapt to app theme if possible
+
 ### [v0.5.0](https://github.com/florisboard/florisboard/milestone/5)
 There's no exact roadmap yet but it is planned that the media part of
 FlorisBoard (emojis, emoticons, kaomoji) gets a rework. Also as an extension
diff --git a/app/build.gradle b/app/build.gradle
index 024fe4d8..96ef77b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId "dev.patrickgold.florisboard"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 21
-        versionName "0.3.2"
+        versionCode 22
+        versionName "0.3.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
new file mode 100644
index 00000000..6d5ade14
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -0,0 +1,11 @@
+- Complete theme rework (#162)
+- Rework how popups are implemented (#122)
+- Smart hint popup prioritization (#119)
+- Add Polish layout (#198) (thanks @klausweiss)
+- Add Romanian layout (#184) (thanks @bertin0)
+- Add Greek layout (#171) (thanks @tsiflimagas)
+- Add Russian layout (#137) (thanks @williamtheaker)
+- Add Croatian layout (#133) (thanks @HeDidNothingWrong)
+- Add gesture option to quick switch to previous keyboard (#117) (thanks @yashx)
+- Fix a lot of theme related bugs
+- Fix high CPU load issues