diff --git a/metadata/com.anysoftkeyboard.languagepack.basque.yml b/metadata/com.anysoftkeyboard.languagepack.basque.yml
index 5b8ca94626..9012af2008 100644
--- a/metadata/com.anysoftkeyboard.languagepack.basque.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.basque.yml
@@ -1,11 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Basque
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Basque'
 AutoName: AnySoftKeyboard - Basque
 Description: |-
     Basque Language pack
@@ -25,7 +24,7 @@ Description: |-
     Xuxen B (Biscayan dialect).
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '1.0'
@@ -39,7 +38,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/basque
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Basque
-CurrentVersion: '1.0'
-CurrentVersionCode: 1
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.brazilian.yml b/metadata/com.anysoftkeyboard.languagepack.brazilian.yml
index 18ce76d8ea..d7db8ad1ba 100644
--- a/metadata/com.anysoftkeyboard.languagepack.brazilian.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.brazilian.yml
@@ -1,11 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Brazilian
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Brazilian'
 AutoName: AnySoftKeyboard - Brazilian Portuguese Language Pack
 Description: |-
     Brazilian Portuguese keyboard layout with dictionary.
@@ -16,7 +15,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '2.0'
@@ -39,7 +38,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/brazilian
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Brazilian
-CurrentVersion: 2.0.1
-CurrentVersionCode: 101
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.catalan.yml b/metadata/com.anysoftkeyboard.languagepack.catalan.yml
index a475cc09e7..3f5fb85f56 100644
--- a/metadata/com.anysoftkeyboard.languagepack.catalan.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.catalan.yml
@@ -1,12 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-WebSite: http://s.evendanan.net/ask
-SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/tree/HEAD/addons/languages/catalan
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard
 IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
-Donate: https://anysoftkeyboard.github.io/
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Catalan'
 AutoName: AnySoftKeyboard - Catalan Language Pack
 Description: |-
     Dictionary is based on the Wikipedia article database which can be distributed
@@ -16,8 +14,8 @@ Description: |-
     Install https://f-droid.org/packages/com.menny.android.anysoftkeyboard first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
-RepoType: git-svn
-Repo: https://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Catalan
+RepoType: git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '20110220'
@@ -38,7 +36,26 @@ Builds:
       - rm -rf assets/ libs/
     build: java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/catalan
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: Static
-CurrentVersion: '20110220'
-CurrentVersionCode: 3
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.danish.yml b/metadata/com.anysoftkeyboard.languagepack.danish.yml
index 35a48e13cd..c7dfa07a1d 100644
--- a/metadata/com.anysoftkeyboard.languagepack.danish.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.danish.yml
@@ -1,12 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-WebSite: http://s.evendanan.net/ask
-SourceCode: https://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Danish
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
-Donate: https://anysoftkeyboard.github.io/
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Danish'
 AutoName: AnySoftKeyboard - Danish Language Pack
 Description: |-
     Dictionary based on AOSP dictionary.
@@ -15,7 +13,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '20100614'
@@ -45,7 +43,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/danish
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Danish
-CurrentVersion: '2.0'
-CurrentVersionCode: 100
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch.yml b/metadata/com.anysoftkeyboard.languagepack.dutch.yml
index eaa2a05588..67bbc31354 100644
--- a/metadata/com.anysoftkeyboard.languagepack.dutch.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch.yml
@@ -1,14 +1,14 @@
 Categories:
   - Writing
 License: Apache-2.0
-WebSite: https://www.opentaal.org/het-laatste-nieuws/projectnieuws/51-publicaties/221-anysoftkeyboard
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Dutch
-IssueTracker: https://github.com/OpenTaal/LanguagePack/issues
-Donate: https://www.opentaal.org/vrienden-van-opentaal
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: AnySoftKeyboard Dutch
 AutoName: AnySoftKeyboard - Dutch Language Pack
 Description: |-
+    <b>This app has been deprecated in favor of https://f-droid.org/en/packages/com.anysoftkeyboard.languagepack.dutch_oss/</b>
+
     This is the Dutch language pack for AnySoftKeyboard. It offers an extensive
     Dutch dictionary and optimised keyboard. In order to use it, first install
     https://f-droid.org/packages/com.menny.android.anysoftkeyboard – a practical input method for Android
@@ -25,7 +25,7 @@ Description: |-
     foundation at [https://www.opentaal.org/vrienden-van-opentaal]
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '1.0'
@@ -47,7 +47,30 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/dutch
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e "s calculateApplicationId(project) 'com.anysoftkeyboard.languagepack.dutch'
+        " ../../../gradle/apk_module.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
+MaintainerNotes: Package ID is now com.anysoftkeyboard.languagepack.dutch_oss
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Dutch
+UpdateCheckMode: None
 CurrentVersion: '1.5'
 CurrentVersionCode: 6
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss.yml b/metadata/com.anysoftkeyboard.languagepack.dutch_oss.yml
new file mode 100644
index 0000000000..38ad2030d3
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss.yml
@@ -0,0 +1,51 @@
+Categories:
+  - Writing
+License: Apache-2.0
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
+
+AutoName: AnySoftKeyboard - Dutch Language Pack
+Description: |-
+    This is the Dutch language pack for AnySoftKeyboard. It offers an extensive
+    Dutch dictionary and optimised keyboard. In order to use it, first install
+    https://f-droid.org/packages/com.menny.android.anysoftkeyboard – a practical input method for Android
+    smartphones and tablets.
+
+    The dictionary is based on the word list from Stichting OpenTaal and has the
+    Quality Mark Spelling (Keurmerk Spelling) of the Dutch Language Union
+    (Taalunie). This language pack has been created by Stichting OpenTaal and can be
+    installed by all without any costs. The language-specific files in this language
+    pack have a dual license. Both the BSD 2-Clause License as the Creative Commons,
+    Attribution 4.0 (unported) apply.
+
+    Please, help us create free and open Dutch writing tools. Donate tax free to our
+    foundation at [https://www.opentaal.org/vrienden-van-opentaal]
+
+RepoType: git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
+
+Builds:
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/dutch
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/de/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/de/summary.txt
new file mode 100644
index 0000000000..55a28b184a
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/de/summary.txt
@@ -0,0 +1 @@
+Niederländisch für AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/en-US/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/en-US/summary.txt
new file mode 100644
index 0000000000..57385ce30c
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/en-US/summary.txt
@@ -0,0 +1 @@
+Dutch Language Pack for AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/es/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/es/summary.txt
new file mode 100644
index 0000000000..4c660be1e9
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/es/summary.txt
@@ -0,0 +1 @@
+Paquete de idioma neerlandés para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/fr/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/fr/summary.txt
new file mode 100644
index 0000000000..3430e19789
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/fr/summary.txt
@@ -0,0 +1 @@
+Pack de langue néerlandaise pour AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/he/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/he/summary.txt
new file mode 100644
index 0000000000..70a9048b78
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/he/summary.txt
@@ -0,0 +1 @@
+חבילת השפה ההולנדית ל־AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/is/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/is/summary.txt
new file mode 100644
index 0000000000..d20dae343c
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/is/summary.txt
@@ -0,0 +1 @@
+Hollenskur tungumálapakki fyrir AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/it/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/it/summary.txt
new file mode 100644
index 0000000000..beaec13d6d
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/it/summary.txt
@@ -0,0 +1 @@
+Pacchetto lingua olandese per AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/nb/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/nb/summary.txt
new file mode 100644
index 0000000000..bedfcaf71c
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/nb/summary.txt
@@ -0,0 +1 @@
+Nederlandsk språkpakke for AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/nn/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/nn/summary.txt
new file mode 100644
index 0000000000..bedfcaf71c
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/nn/summary.txt
@@ -0,0 +1 @@
+Nederlandsk språkpakke for AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pl/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pl/summary.txt
new file mode 100644
index 0000000000..e6773da44d
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pl/summary.txt
@@ -0,0 +1 @@
+Holenderski pakiet językowy dla AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt-BR/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt-BR/summary.txt
new file mode 100644
index 0000000000..9a4ff6fcfb
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt-BR/summary.txt
@@ -0,0 +1 @@
+Pacote do idioma holandês para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt-PT/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt-PT/summary.txt
new file mode 100644
index 0000000000..cc4c9a39a7
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt-PT/summary.txt
@@ -0,0 +1 @@
+Pacote de idioma holandês para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt/summary.txt
new file mode 100644
index 0000000000..cc4c9a39a7
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/pt/summary.txt
@@ -0,0 +1 @@
+Pacote de idioma holandês para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/ro/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/ro/summary.txt
new file mode 100644
index 0000000000..a50c879a24
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/ro/summary.txt
@@ -0,0 +1 @@
+Pachet de limbă olandeză pentru AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/ru/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/ru/summary.txt
new file mode 100644
index 0000000000..56482948ba
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/ru/summary.txt
@@ -0,0 +1 @@
+Голландский языковой пакет для AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/sc/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/sc/summary.txt
new file mode 100644
index 0000000000..2854c9dc12
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/sc/summary.txt
@@ -0,0 +1 @@
+Pachete pro sa limba olandesa pro AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/sq/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/sq/summary.txt
new file mode 100644
index 0000000000..7e9c0b57d0
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/sq/summary.txt
@@ -0,0 +1 @@
+Paketë gjuhe për AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/tr/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/tr/summary.txt
new file mode 100644
index 0000000000..aba3de73dd
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/tr/summary.txt
@@ -0,0 +1 @@
+AnySoftKeyboard için Flemenkçe dil paketi
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/uk/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/uk/summary.txt
new file mode 100644
index 0000000000..f54d67427f
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/uk/summary.txt
@@ -0,0 +1 @@
+Голландський мовний пакет для AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.dutch_oss/zh-CN/summary.txt b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/zh-CN/summary.txt
new file mode 100644
index 0000000000..df3493af96
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.dutch_oss/zh-CN/summary.txt
@@ -0,0 +1 @@
+AnySoftKeyboard 荷兰语语言包
diff --git a/metadata/com.anysoftkeyboard.languagepack.french.yml b/metadata/com.anysoftkeyboard.languagepack.french.yml
index 303279d420..74613bb1b3 100644
--- a/metadata/com.anysoftkeyboard.languagepack.french.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.french.yml
@@ -1,11 +1,9 @@
 Categories:
   - Writing
 License: Apache-2.0
-WebSite: https://anysoftkeyboard.github.io/
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/French
-IssueTracker: https://github.com/anysoftkeyboard/LanguagePack/issues
-Changelog: https://github.com/AnySoftKeyboard/LanguagePack/blob/French/src/main/play/en-US/whatsnew
-Donate: https://anysoftkeyboard.github.io/
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
 AutoName: AnySoftKeyboard - French Language Pack
 Description: |-
@@ -21,7 +19,7 @@ Description: |-
     from AnySoftKeyboard's Settings -> Languages -> Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack/
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
 
 Builds:
   - versionName: 1.0.67
@@ -30,7 +28,26 @@ Builds:
     gradle:
       - yes
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/french
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: Static
-CurrentVersion: 1.0.67
-CurrentVersionCode: 67
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.german.yml b/metadata/com.anysoftkeyboard.languagepack.german.yml
index 7af0b6a7bf..042c979658 100644
--- a/metadata/com.anysoftkeyboard.languagepack.german.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.german.yml
@@ -1,11 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/German
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: German'
 AutoName: AnySoftKeyboard - German Language Pack
 Description: |-
     German keyboard layout and dictionary of over 100,000 words.
@@ -16,7 +15,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: v2.0.1
@@ -50,7 +49,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/german
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/German
-CurrentVersion: v2.0.4
-CurrentVersionCode: 173
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.greek.yml b/metadata/com.anysoftkeyboard.languagepack.greek.yml
index beb3fb0c37..ec047e6793 100644
--- a/metadata/com.anysoftkeyboard.languagepack.greek.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.greek.yml
@@ -1,12 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-WebSite: http://s.evendanan.net/ask
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Greek
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Greek'
 AutoName: AnySoftKeyboard - Ελληνικό Γλωσσικό Πακέτο
 Description: |-
     Greek keyboard layouts and AOSP dictionary.
@@ -15,7 +13,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '20110717'
@@ -45,7 +43,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/greek
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Greek
-CurrentVersion: '2.0'
-CurrentVersionCode: 200
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.hebrew.yml b/metadata/com.anysoftkeyboard.languagepack.hebrew.yml
index 1143586935..a6009d6fd9 100644
--- a/metadata/com.anysoftkeyboard.languagepack.hebrew.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.hebrew.yml
@@ -1,11 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Hebrew
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Hebrew'
 AutoName: AnySoftKeyboard - Hebrew Language Pack
 Description: |-
     Hebrew keyboard layout (regular, 16 keys and Phonetic) and dictionary of over
@@ -17,7 +16,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: 3.0.0
@@ -43,7 +42,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/hebrew
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Hebrew
-CurrentVersion: 3.1.184
-CurrentVersionCode: 168
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian.yml b/metadata/com.anysoftkeyboard.languagepack.hungarian.yml
index 2af7cd4903..4d5ca525b1 100644
--- a/metadata/com.anysoftkeyboard.languagepack.hungarian.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian.yml
@@ -1,14 +1,14 @@
 Categories:
   - Writing
 License: GPL-3.0-only
-WebSite: https://github.com/rhornig/anysoftkeyboard-hungarian/wiki
-SourceCode: https://github.com/rhornig/anysoftkeyboard-hungarian
-IssueTracker: https://github.com/rhornig/anysoftkeyboard-hungarian/issues
-Donate: https://anysoftkeyboard.github.io/
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Magyar'
 AutoName: AnySoftKeyboard - Hungarian Language Pack
 Description: |-
+    <b>This app has been deprecated in favor of https://f-droid.org/en/packages/com.anysoftkeyboard.languagepack.hungarian_oss/</b>
+
     Layouts and dictionaries for for the Hungarian language. See the Google Play
     description for usage tips.
 
@@ -18,7 +18,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/rhornig/anysoftkeyboard-hungarian
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '20120208'
@@ -67,9 +67,30 @@ Builds:
       - rm -rf assets/ dic/
     build: java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
-MaintainerNotes: Tags not always reliable.
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/hungarian
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e "s calculateApplicationId(project) 'com.anysoftkeyboard.languagepack.hungarian'
+        " ../../../gradle/apk_module.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
+MaintainerNotes: Package ID is now com.anysoftkeyboard.languagepack.hungarian_oss
 
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest
-CurrentVersion: '20180709'
-CurrentVersionCode: 18
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss.yml b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss.yml
new file mode 100644
index 0000000000..6a9c602eab
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss.yml
@@ -0,0 +1,44 @@
+Categories:
+  - Writing
+License: Apache-2.0
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
+
+AutoName: AnySoftKeyboard - Hungarian Language Pack
+Description: |-
+    Layouts and dictionaries for for the Hungarian language. See the Google Play
+    description for usage tips.
+
+    Dictionary is via [http://magyarispell.sourceforge.net].
+
+    Install https://f-droid.org/packages/com.menny.android.anysoftkeyboard first, then select the desired
+    layout from AnySoftKeyboard's Settings->Keyboards menu.
+
+RepoType: git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
+
+Builds:
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/hungarian
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/de/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/de/summary.txt
new file mode 100644
index 0000000000..6559acf6ed
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/de/summary.txt
@@ -0,0 +1 @@
+Ungarisch für AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/en-US/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/en-US/summary.txt
new file mode 100644
index 0000000000..d477002a1d
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/en-US/summary.txt
@@ -0,0 +1 @@
+Language pack for AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/fr/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/fr/summary.txt
new file mode 100644
index 0000000000..ac7d8f52e7
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/fr/summary.txt
@@ -0,0 +1 @@
+Pack de langue pour le clavier AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/he/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/he/summary.txt
new file mode 100644
index 0000000000..3b217ad4e0
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/he/summary.txt
@@ -0,0 +1 @@
+חבילת שפה ל־AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/it/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/it/summary.txt
new file mode 100644
index 0000000000..1e9f0f2ea5
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/it/summary.txt
@@ -0,0 +1 @@
+Pacchetto lingua per AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/nn/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/nn/summary.txt
new file mode 100644
index 0000000000..6d23325354
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/nn/summary.txt
@@ -0,0 +1 @@
+Språkpakke for AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pl/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pl/summary.txt
new file mode 100644
index 0000000000..50687ee628
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pl/summary.txt
@@ -0,0 +1 @@
+Węgierski pakiet językowy dla AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt-BR/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt-BR/summary.txt
new file mode 100644
index 0000000000..f1be7cfe62
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt-BR/summary.txt
@@ -0,0 +1 @@
+Pacote de idioma para o AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt-PT/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt-PT/summary.txt
new file mode 100644
index 0000000000..5fd6757213
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt-PT/summary.txt
@@ -0,0 +1 @@
+Pacote do idioma húngaro para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt/summary.txt
new file mode 100644
index 0000000000..5fd6757213
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/pt/summary.txt
@@ -0,0 +1 @@
+Pacote do idioma húngaro para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/ro/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/ro/summary.txt
new file mode 100644
index 0000000000..981a4682ca
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/ro/summary.txt
@@ -0,0 +1 @@
+Pachet de limbi pentru AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/ru/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/ru/summary.txt
new file mode 100644
index 0000000000..0826b77996
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/ru/summary.txt
@@ -0,0 +1 @@
+Языковой пакет для AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/sc/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/sc/summary.txt
new file mode 100644
index 0000000000..25f277fe04
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/sc/summary.txt
@@ -0,0 +1 @@
+Pachete de limba pro AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/sq/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/sq/summary.txt
new file mode 100644
index 0000000000..7e9c0b57d0
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/sq/summary.txt
@@ -0,0 +1 @@
+Paketë gjuhe për AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/tr/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/tr/summary.txt
new file mode 100644
index 0000000000..9f0d884e1b
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/tr/summary.txt
@@ -0,0 +1 @@
+AnySoftKeyboard için dil paketi
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/uk/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/uk/summary.txt
new file mode 100644
index 0000000000..bdd66a88f0
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/uk/summary.txt
@@ -0,0 +1 @@
+Мовний пакет для AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/zh-CN/summary.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/zh-CN/summary.txt
new file mode 100644
index 0000000000..54b9947e4c
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian_oss/zh-CN/summary.txt
@@ -0,0 +1 @@
+AnySoftKeyboard 语言包
diff --git a/metadata/com.anysoftkeyboard.languagepack.indonesian.yml b/metadata/com.anysoftkeyboard.languagepack.indonesian.yml
index a053dbe5c6..897214963b 100644
--- a/metadata/com.anysoftkeyboard.languagepack.indonesian.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.indonesian.yml
@@ -1,22 +1,19 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Indonesian
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Indonesian'
 AutoName: AnySoftKeyboard - Indonesian Language Pack
 Description: |-
-    Indonesian language pack with keyboard layout and dictionary..
-
-    The source code is in another branch to the default.
+    Indonesian language pack with keyboard layout and dictionary.
 
     Install https://f-droid.org/packages/com.menny.android.anysoftkeyboard first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: 2.0.0
@@ -28,7 +25,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1400
+    versionCode: 2912
+    commit: 1.10-r4
+    subdir: addons/languages/indonesian
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Indonesian
-CurrentVersion: 2.0.0
-CurrentVersionCode: 67
+UpdateCheckMode: None
+CurrentVersion: 4.0.1400
+CurrentVersionCode: 2912
diff --git a/metadata/com.anysoftkeyboard.languagepack.italian.yml b/metadata/com.anysoftkeyboard.languagepack.italian.yml
index 935e0c121f..cbaf61936b 100644
--- a/metadata/com.anysoftkeyboard.languagepack.italian.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.italian.yml
@@ -1,11 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Italian
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Italian'
 AutoName: AnySoftKeyboard - Italian Language Pack
 Description: |-
     Italian keyboard layout and dictionary of over 100,000 words.
@@ -16,7 +15,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '2.0'
@@ -28,7 +27,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/italian
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Italian
-CurrentVersion: '2.0'
-CurrentVersionCode: 100
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.latvian.yml b/metadata/com.anysoftkeyboard.languagepack.latvian.yml
index b49c0036a5..6e7f7a9ddb 100644
--- a/metadata/com.anysoftkeyboard.languagepack.latvian.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.latvian.yml
@@ -1,22 +1,21 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Latvian
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Latvian'
 AutoName: AnySoftKeyboard - Latvian Language Pack
 Description: |-
     Latvian keyboard layout and dictionary of over 100,000 words.
 
-    Dictionary comes from AOSP. The source code is in another branch to the default.
+    Dictionary comes from AOSP.
 
     Install https://f-droid.org/packages/com.menny.android.anysoftkeyboard first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '2.0'
@@ -28,7 +27,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/latvian
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Latvian
-CurrentVersion: '2.0'
-CurrentVersionCode: 100
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.norwegian.yml b/metadata/com.anysoftkeyboard.languagepack.norwegian.yml
index e70465fc26..6937a96c8d 100644
--- a/metadata/com.anysoftkeyboard.languagepack.norwegian.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.norwegian.yml
@@ -1,22 +1,21 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Norwegian
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Norwegian'
 AutoName: AnySoftKeyboard - Norwegian Language Pack
 Description: |-
     Norwegian keyboard layout and dictionary of over 100,000 words.
 
-    Dictionary comes from AOSP. The source code is in another branch to the default.
+    Dictionary comes from AOSP.
 
     Install https://f-droid.org/packages/com.menny.android.anysoftkeyboard first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: 2.0.0
@@ -48,7 +47,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/norwegian
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Norwegian
-CurrentVersion: 2.0.2
-CurrentVersionCode: 102
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.ossturkish.yml b/metadata/com.anysoftkeyboard.languagepack.ossturkish.yml
index 1cfa00e4c2..a9a90c1dda 100644
--- a/metadata/com.anysoftkeyboard.languagepack.ossturkish.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.ossturkish.yml
@@ -1,22 +1,19 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Turkish
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Turkish'
 AutoName: AnySoftKeyboard - Türkçe Dil Paketi
 Description: |-
-    Turkish language pack with keyboard layout and dictionary..
-
-    The source code is in another branch to the default.
+    Turkish language pack with keyboard layout and dictionary.
 
     Install https://f-droid.org/packages/com.menny.android.anysoftkeyboard first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: 2.0.0
@@ -28,7 +25,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/ossturkish
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Turkish
-CurrentVersion: 2.0.0
-CurrentVersionCode: 65
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.russian2.yml b/metadata/com.anysoftkeyboard.languagepack.russian2.yml
index 13ade89841..4344c3df8e 100644
--- a/metadata/com.anysoftkeyboard.languagepack.russian2.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.russian2.yml
@@ -1,22 +1,21 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Russian
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Русский'
 AutoName: AnySoftKeyboard - Russian Language Pack
 Description: |-
     Russian layouts and a dictionary for auto-complete for AnySoftKeyboard.
 
-    Dictionary comes from AOSP. The source code is in another branch to the default.
+    Dictionary comes from AOSP.
 
     Install https://f-droid.org/packages/com.menny.android.anysoftkeyboard first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: '20121016'
@@ -61,7 +60,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/russian2
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Russian
-CurrentVersion: 2.0.1
-CurrentVersionCode: 101
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.spain.yml b/metadata/com.anysoftkeyboard.languagepack.spain.yml
index fb66fc92dd..f48f75474a 100644
--- a/metadata/com.anysoftkeyboard.languagepack.spain.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.spain.yml
@@ -1,12 +1,10 @@
 Categories:
   - Writing
 License: Apache-2.0
-WebSite: http://s.evendanan.net/ask
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Spanish
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Spanish'
 AutoName: AnySoftKeyboard - Spanish Language Pack
 Description: |-
     AnySoftKeyboard keyboards pack: Spanish and Catalan keyboards, and Spanish
@@ -22,7 +20,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: 20110717-smaller
@@ -104,7 +102,26 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/spain
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Spanish
-CurrentVersion: 2.1.2
-CurrentVersionCode: 168
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908