diff --git a/metadata/at.tomtasche.reader.yml b/metadata/at.tomtasche.reader.yml
index ca841b85e8..94f92d6463 100644
--- a/metadata/at.tomtasche.reader.yml
+++ b/metadata/at.tomtasche.reader.yml
@@ -369,125 +369,6 @@ Builds:
         ui/*/*.java ui/*.java; done
     ndk: 26.3.11579264
 
-  - versionName: '3.34'
-    versionCode: 188
-    disable: bug
-    commit: v3.34
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y cmake make ninja-build pipx
-      - PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install conan
-    gradle:
-      - pro
-    srclibs:
-      - conan-odr-index@455b0c03e031d0ae3e8fbfa7b8a6fb92ba491b34
-    prebuild:
-      - conan remote remove "*"
-      - conan remote add odr $$conan-odr-index$$
-      - conan remote add conancenter https://center2.conan.io
-      - conan profile detect
-      - sed -i -e '/gms/d' -e '/firebase/d' -e 's/build=missing/build=*/' {.,..}/build.gradle
-      - sed -i -e '/com.google.android.play/d' -e '/ump/d' -e '/pro"/d' build.gradle
-      - sed -i -e '/INTERNET/d' -e '/^        <meta-data/,+5d' -e '/property/,+4d'
-        src/main/AndroidManifest.xml
-      - cd src/main/java/at/tomtasche/reader
-      - sed -i -e '/gms/d' -e '/play.core/d' -e '/firebase/d' -e '/void initializeProprietaryLibraries/,/^    }/d'
-        -e '/initializeProprietaryLibraries/d' -e 's/billingManager.hasPurchased()/true/'
-        ui/activity/*.java background/FileLoader.java background/LoaderService.java
-      - sed -i -e '/private Uri doFirebaseConvert/,/^    }/d' -e 's/viewerUri = doFirebaseConvert(options)/return/'
-        -e '/gms/d' -e '/firebase/Id' -e '/Storage/d' -e '/auth /d' -e '/storage /d'
-        background/OnlineLoader.java
-      - sed -i -e '/getBooleanConfig("show_in_app_rating/,/});/d' -e '/void offerUpload/,/^    }/d'
-        -e '/offerUpload/d' -e '/void requestInAppRating/,/^    }/d' -e '/requestInAppRating/d'
-        ui/activity/DocumentFragment.java
-      - sed -i -e 's/configManager.getBooleanConfig(".*")/null/' background/CoreLoader.java
-      - for class in AdManager AnalyticsManager BillingManager ConfigManager CrashManager
-        HelpManager; do echo "package at.tomtasche.reader.nonfree; public class ${class}
-        {}" > nonfree/${class}.java; sed -i -e "/${class}\./Id" background/*.java
-        ui/*/*.java ui/*.java; done
-    ndk: 26.3.11579264
-
-  - versionName: '3.35'
-    versionCode: 189
-    disable: bug
-    commit: v3.35
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y cmake make ninja-build pipx
-      - PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install conan
-    gradle:
-      - pro
-    srclibs:
-      - conan-odr-index@455b0c03e031d0ae3e8fbfa7b8a6fb92ba491b34
-    prebuild:
-      - conan remote remove "*"
-      - conan remote add odr $$conan-odr-index$$
-      - conan remote add conancenter https://center2.conan.io
-      - conan profile detect
-      - sed -i -e '/gms/d' -e '/firebase/d' -e 's/build=missing/build=*/' {.,..}/build.gradle
-      - sed -i -e '/com.google.android.play/d' -e '/ump/d' -e '/pro"/d' build.gradle
-      - sed -i -e '/INTERNET/d' -e '/^        <meta-data/,+5d' -e '/property/,+4d'
-        src/main/AndroidManifest.xml
-      - cd src/main/java/at/tomtasche/reader
-      - sed -i -e '/gms/d' -e '/play.core/d' -e '/firebase/d' -e '/void initializeProprietaryLibraries/,/^    }/d'
-        -e '/initializeProprietaryLibraries/d' -e 's/billingManager.hasPurchased()/true/'
-        ui/activity/*.java background/FileLoader.java background/LoaderService.java
-      - sed -i -e '/private Uri doFirebaseConvert/,/^    }/d' -e 's/viewerUri = doFirebaseConvert(options)/return/'
-        -e '/gms/d' -e '/firebase/Id' -e '/Storage/d' -e '/auth /d' -e '/storage /d'
-        background/OnlineLoader.java
-      - sed -i -e '/getBooleanConfig("show_in_app_rating/,/});/d' -e '/void offerUpload/,/^    }/d'
-        -e '/offerUpload/d' -e '/void requestInAppRating/,/^    }/d' -e '/requestInAppRating/d'
-        ui/activity/DocumentFragment.java
-      - sed -i -e 's/configManager.getBooleanConfig(".*")/null/' background/CoreLoader.java
-      - for class in AdManager AnalyticsManager BillingManager ConfigManager CrashManager
-        HelpManager; do echo "package at.tomtasche.reader.nonfree; public class ${class}
-        {}" > nonfree/${class}.java; sed -i -e "/${class}\./Id" background/*.java
-        ui/*/*.java ui/*.java; done
-    ndk: 26.3.11579264
-
-  - versionName: '3.36'
-    versionCode: 190
-    disable: bug
-    commit: v3.36
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y cmake make ninja-build pipx
-      - PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install conan
-    gradle:
-      - pro
-    srclibs:
-      - conan-odr-index@8ec140a221791147797063e2112376de58bd01ac
-    prebuild:
-      - date=$(git show --format=%ad --no-patch --no-notes)
-      - git -C $$conan-odr-index$$ checkout $(git log -1 --before=$date main)
-      - conan remote remove "*"
-      - conan remote add odr $$conan-odr-index$$
-      - conan remote add conancenter https://center2.conan.io
-      - conan profile detect
-      - sed -i -e '/gms/d' -e '/firebase/d' -e 's/build=missing/build=*/' {.,..}/build.gradle
-      - sed -i -e '/com.google.android.play/d' -e '/ump/d' -e '/pro"/d' build.gradle
-      - sed -i -e '/INTERNET/d' -e '/^        <meta-data/,+5d' -e '/property/,+4d'
-        src/main/AndroidManifest.xml
-      - cd src/main/java/at/tomtasche/reader
-      - sed -i -e '/gms/d' -e '/play.core/d' -e '/firebase/d' -e '/void initializeProprietaryLibraries/,/^    }/d'
-        -e '/initializeProprietaryLibraries/d' -e 's/billingManager.hasPurchased()/true/'
-        ui/activity/*.java background/FileLoader.java background/LoaderService.java
-      - sed -i -e '/private Uri doFirebaseConvert/,/^    }/d' -e 's/viewerUri = doFirebaseConvert(options)/return/'
-        -e '/gms/d' -e '/firebase/Id' -e '/Storage/d' -e '/auth /d' -e '/storage /d'
-        background/OnlineLoader.java
-      - sed -i -e '/getBooleanConfig("show_in_app_rating/,/});/d' -e '/void offerUpload/,/^    }/d'
-        -e '/offerUpload/d' -e '/void requestInAppRating/,/^    }/d' -e '/requestInAppRating/d'
-        ui/activity/DocumentFragment.java
-      - sed -i -e 's/configManager.getBooleanConfig(".*")/null/' background/CoreLoader.java
-      - for class in AdManager AnalyticsManager BillingManager ConfigManager CrashManager
-        HelpManager; do echo "package at.tomtasche.reader.nonfree; public class ${class}
-        {}" > nonfree/${class}.java; sed -i -e "/${class}\./Id" background/*.java
-        ui/*/*.java ui/*.java; done
-    ndk: 26.3.11579264
-
   - versionName: '3.39'
     versionCode: 193
     commit: v3.39
@@ -525,8 +406,49 @@ Builds:
         ui/*/*.java ui/*.java; done
     ndk: r26d
 
+  - versionName: '4.0'
+    versionCode: 196
+    commit: 774494a9d7c502750b36357ac9af6627c44cb63d
+    subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake make ninja-build pipx
+      - PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install conan
+    gradle:
+      - pro
+    srclibs:
+      - conan-odr-index@8ec140a221791147797063e2112376de58bd01ac
+    prebuild:
+      - date=$(git show --format=%ad --no-patch --no-notes)
+      - pushd $$conan-odr-index$$
+      - git checkout $(git rev-list -1 --before="$date" main)
+      - popd
+      - conan remote remove "*"
+      - conan remote add odr $$conan-odr-index$$
+      - conan remote add conancenter https://center2.conan.io
+      - conan profile detect
+      - sed -i -e '/gms/d' -e '/firebase/d' -e 's/build=missing/build=*/' {.,..}/build.gradle
+      - sed -i -e '/com.google.android.play/d' -e '/ump/d' -e '/pro"/d' build.gradle
+      - sed -i -e '/^        <meta-data/,+5d' -e '/property/,+4d' src/main/AndroidManifest.xml
+      - cd src/main/java/at/tomtasche/reader
+      - sed -i -e '/gms/d' -e '/play.core/d' -e '/firebase/d' -e '/void initializeProprietaryLibraries/,/^    }/d'
+        -e '/initializeProprietaryLibraries/d' -e 's/billingManager.hasPurchased()/true/'
+        ui/activity/*.java background/FileLoader.java background/LoaderService.java
+      - sed -i -e '/private Uri doFirebaseConvert/,/^    }/d' -e 's/viewerUri = doFirebaseConvert(options)/return/'
+        -e '/gms/d' -e '/firebase/Id' -e '/Storage/d' -e '/auth /d' -e '/storage /d'
+        background/OnlineLoader.java
+      - sed -i -e '/getBooleanConfig("show_in_app_rating/,/});/d' -e '/void offerUpload/,/^    }/d'
+        -e '/offerUpload/d' -e '/void requestInAppRating/,/^    }/d' -e '/requestInAppRating/d'
+        ui/activity/DocumentFragment.java
+      - sed -i -e 's/configManager.getBooleanConfig(".*")/null/' background/CoreLoader.java
+      - for class in AdManager AnalyticsManager BillingManager ConfigManager CrashManager
+        HelpManager; do echo "package at.tomtasche.reader.nonfree; public class ${class}
+        {}" > nonfree/${class}.java; sed -i -e "/${class}\./Id" background/*.java
+        ui/*/*.java ui/*.java; done
+    ndk: r28b
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: app/src/main/AndroidManifest.xml|versionCode="(\d+)|.|versionName="([\d.]+)
-CurrentVersion: '3.39'
-CurrentVersionCode: 193
+CurrentVersion: '4.0'
+CurrentVersionCode: 196