diff --git a/packages/texlive/parse_tlpdb.py b/packages/texlive/parse_tlpdb.py
index f9e1a9ff1..4dd4922a8 100755
--- a/packages/texlive/parse_tlpdb.py
+++ b/packages/texlive/parse_tlpdb.py
@@ -18,7 +18,7 @@
 ##  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 def parse_tlpdb_to_dict(tlpdb_path):
-    """Reads given tlpdb database and creates dict with packages and their dependencies and files
+    """Reads given tlpdb database and creates dict with packages, their dependencies and files
     """
 
     with open(tlpdb_path, "r") as f:
@@ -29,14 +29,27 @@ def parse_tlpdb_to_dict(tlpdb_path):
         if not pkg == "":
             pkg_lines = pkg.split("\n")
             pkg_name = pkg_lines[0].split(" ")[1]
-            # We only care about getting all the files so only check for "depend" and files
+            # We only care about files and depends
             pkg_dict[pkg_name] = {"depends" : [], "files" : []}
-            for line in pkg_lines:
-                line_description = line.split(" ")[0]
-                if line_description == "":
-                    pkg_dict[pkg_name]["files"].append(line.split(" ")[1])
-                elif line_description == "depend":
-                    pkg_dict[pkg_name]["depends"].append(line.split(" ")[1])
+            i = 0
+            while i < len(pkg_lines):
+                if pkg_lines[i].split(" ")[0].startswith("runfiles"):
+                    # Start of file list
+                    i += 1
+                    while i < len(pkg_lines) and pkg_lines[i].startswith(" "):
+                        # files starts with space, for example
+                        # " texmf-dist/tex/latex/collref/collref.sty"
+                        pkg_dict[pkg_name]["files"].append(pkg_lines[i].split(" ")[1])
+                        i += 1
+
+                if i == len(pkg_lines):
+                    break
+
+                if pkg_lines[i].split(" ")[0] == "depend":
+                    pkg_dict[pkg_name]["depends"].append(pkg_lines[i].split(" ")[1])
+
+                i += 1
+
     return pkg_dict
 
 def get_files_in_package(package, files_in_package, visited_pkgs, visit_collections=False):
@@ -45,7 +58,6 @@ def get_files_in_package(package, files_in_package, visited_pkgs, visit_collecti
     for f in pkg_dict[package]["files"]:
         files_in_package.append(f)
     for dep in pkg_dict[package]["depends"]:
-        print(dep.split("."))
         if dep.split(".")[-1] == "ARCH":
             # skip arch dependent packages, which we lack since we build our own binaries
             continue
@@ -60,98 +72,206 @@ def get_files_in_package(package, files_in_package, visited_pkgs, visit_collecti
             files_in_package, visited_pkgs = get_files_in_package(dep, files_in_package, visited_pkgs)
     return files_in_package, visited_pkgs
 
-def Files(*args, **kwargs):
-    """Wrapper around function get_files. Prepends "collection-" to package unless prepend_collection=False is passed. Also uses visit_collections=False per default.
+def Files(packages, bool_visit_collections = False):
+    """
+    Wrapper around function get_files. Does not visit collections unless bool_.
     """
-    prefix = "collection-"
-    bool_visit_collections = False
-    for k,v in kwargs.items():
-        if k == "prepend_collection" and not v:
-            prefix = ""
-        elif k == "visit_collections" and v:
-            bool_visit_collections = True
-
     files = []
-    for pkg in args[0]:
-        files += get_files_in_package(prefix+pkg, [], [], visit_collections=bool_visit_collections)[0]
+    for pkg in packages:
+        files += get_files_in_package(pkg, [], [],
+                                      visit_collections=bool_visit_collections)[0]
     return files
 
 def get_conflicting_pkgs(package):
     """Returns list of packages that contain some files that are also found in 'package'.
     These packages should be listed as dependencies.
     """
-    if package in ["basic"]:
+    if package in ["collection-basic"]:
+        conflicting_pkgs = []
+
+    elif package in ["collection-latex"]:
+        conflicting_pkgs = ["collection-basic"]
+
+    elif package in ["collection-langeuropean",
+                     "collection-langenglish",
+                     "collection-langfrench",
+                     "collection-langgerman",
+                     "collection-binextra",
+                     "collection-fontutils",
+                     "collection-langarabic",
+                     "collection-langgreek",
+                     "collection-langitalian",
+                     "collection-langother",
+                     "collection-langpolish",
+                     "collection-langportuguese",
+                     "collection-langspanish",
+                     "collection-metapost",
+                     "collection-fontsrecommended",
+                     "collection-games",
+                     "collection-luatex",
+                     "collection-music",
+                     "collection-plaingeneric",
+                     "collection-publishers",
+                     "collection-texworks",
+                     "collection-wintools"]:
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex"]
+
+    elif package == "collection-langczechslovak":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-fontsextra",
+                            "collection-luatex"]
+
+    elif package == "collection-langcyrillic":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-fontsextra",
+                            "collection-fontsrecommended",
+                            "collection-langgreek",
+                            "collection-latexrecommended"]
+
+    elif package == "collection-formatsextra":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-langcyrillic",
+                            "collection-mathscience",
+                            "collection-fontsrecommended",
+                            "collection-plaingeneric"]
+
+    elif package == "collection-context":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-mathscience",
+                            "collection-fontsrecommended",
+                            "collection-metapost",
+                            "collection-xetex"]
+
+    elif package == "collection-langjapanese":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-langcjk",
+                            "collection-langchinese"]
+
+    elif package == "collection-langchinese":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-langcjk",
+                            "collection-fontutils"]
+
+    elif package == "collection-bibtexextra":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-binextra"]
+
+    elif package == "collection-langcjk":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-langother"]
+
+    elif package == "collection-latexrecommended":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-fontsrecommended",
+                            "collection-latexextra",
+                            "collection-pictures",
+                            "collection-plaingeneric"]
+
+    elif package == "collection-mathscience":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-langgreek"]
+
+    elif package == "collection-langkorean":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-langjapanese",
+                            "collection-langcjk",
+                            "collection-latexrecommended"]
+
+    elif package == "collection-latexextra":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-fontsextra"]
+
+    elif package == "collection-humanities":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-latexextra"]
+
+    elif package == "collection-pictures":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-latexextra"]
+
+    elif package == "collection-fontsextra":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-plaingeneric",
+                            "noto",
+                            "alegreya",
+                            "montserrat",
+                            "fira",
+                            "lato",
+                            "mpfonts",
+                            "libertine",
+                            "drm",
+                            "poltawski",
+                            "cm-unicode",
+                            "roboto",
+                            "dejavu",
+                            "plex",
+                            "stickstoo",
+                            "ebgaramond",
+                            "ipaex-type1",
+                            "paratype",
+                            "antt",
+                            "cormorantgaramond",
+                            "libertinus-type1"]
+
+    elif package == "collection-pstricks":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex",
+                            "collection-plaingeneric"]
+
+    elif package == "collection-xetex":
+        conflicting_pkgs = ["collection-basic",
+                            "collection-latex"]
+
+    elif not package.startswith("collection-"):
         conflicting_pkgs = []
-    elif package in ["latex"]:
-        conflicting_pkgs = ["basic"]
-    elif package in ["langeuropean", "langenglish", "langfrench", "langgerman",
-                     "binextra", "fontutils", "langarabic", "langgreek",
-                     "langitalian", "langother", "langpolish", "langportuguese",
-                     "langspanish", "metapost", "fontsrecommended", "games",
-                     "luatex", "music", "plaingeneric", "publishers",
-                     "texworks", "wintools"]:
-        conflicting_pkgs = ["basic", "latex"]
-    elif package == "langczechslovak":
-        conflicting_pkgs = ["basic", "latex", "fontsextra", "luatex"]
-    elif package == "langcyrillic":
-        conflicting_pkgs = ["basic", "latex", "fontsextra", "fontsrecommended",
-                "langgreek", "latexrecommended"]
-    elif package == "formatsextra":
-        conflicting_pkgs = ["basic", "latex", "langcyrillic", "mathscience",
-                "fontsrecommended", "plaingeneric"]
-    elif package == "context":
-        conflicting_pkgs = ["basic", "latex", "mathscience", "fontsrecommended",
-                "metapost", "xetex"]
-    elif package == "langjapanese":
-        conflicting_pkgs = ["basic", "latex", "langcjk", "langchinese"]
-    elif package == "langchinese":
-        conflicting_pkgs = ["basic", "latex", "langcjk", "fontutils"]
-    elif package == "bibtexextra":
-        conflicting_pkgs = ["basic", "latex", "binextra"]
-    elif package == "langcjk":
-        conflicting_pkgs = ["basic", "latex", "langother"]
-    elif package == "latexrecommended":
-        conflicting_pkgs = ["basic", "latex", "fontsrecommended", "latexextra", "pictures", "plaingeneric"]
-    elif package == "mathscience":
-        conflicting_pkgs = ["basic", "latex", "langgreek"]
-    elif package == "langkorean":
-        conflicting_pkgs = ["basic", "latex", "langjapanese", "langcjk", "latexrecommended"]
-    elif package == "latexextra":
-        conflicting_pkgs = ["basic", "latex", "fontsextra"]
-    elif package == "humanities":
-        conflicting_pkgs = ["basic", "latex", "latexextra"]
-    elif package == "pictures":
-        conflicting_pkgs = ["basic", "latex", "latexextra"]
-    elif package == "fontsextra":
-        conflicting_pkgs = ["basic", "latex", "plaingeneric"]
-    elif package == "pstricks":
-        conflicting_pkgs = ["basic", "latex", "plaingeneric"]
-    elif package == "xetex":
-        conflicting_pkgs = ["basic", "latex"]
     else:
         raise ValueError(sys.argv[1]+" isn't a known package name")
 
     return conflicting_pkgs
 
-import sys
-tlpdb = sys.argv[2]
-pkg_dict = parse_tlpdb_to_dict(tlpdb)
-
-if len(sys.argv) > 2 and sys.argv[-1] == "print_names":
-    """Generate dependencies to put into TERMUX_SUBPKG_DEPENDS"""
-    # Strip latex and basic since those are part of termux package "texlive"
-    pkgs_in_texlive = ["latex", "basic"]
-    dependencies = ["texlive-"+pkg for pkg in get_conflicting_pkgs(sys.argv[1]) if not pkg in pkgs_in_texlive]
-    if len(dependencies) > 0:
-        print("texlive, "+", ".join(dependencies))
+if __name__ == '__main__':
+    import sys
+    tlpdb = sys.argv[2]
+    pkg_dict = parse_tlpdb_to_dict(tlpdb)
+    
+    if len(sys.argv) > 2 and sys.argv[-1] == "print_names":
+        """Generate dependencies to put into TERMUX_SUBPKG_DEPENDS"""
+        # Strip latex and basic since those are part of termux package "texlive"
+        pkgs_in_texlive = ["latex", "basic"]
+        dependencies = ["texlive-"+pkg for pkg in get_conflicting_pkgs(sys.argv[1]) if not pkg in pkgs_in_texlive]
+        if len(dependencies) > 0:
+            print("texlive, "+", ".join(dependencies))
+        else:
+            print("texlive")
     else:
-        print("texlive")
-else:
-    """Print files which should be included in the subpackage"""
-    # The last set of packages are needed to make our texlive package able to
-    # generate pdflatex.fmt and compile a simple LaTeX test file, so they
-    # should be part of texlive.
-    print("\n".join(["share/texlive/"+line for line in
-                     list( set(Files([sys.argv[1]])) -
-                           set(Files(get_conflicting_pkgs(sys.argv[1]))) -
-                           set(Files(["dehyph-exptl", "hyphen-afrikaans", "kpathsea", "amsfonts", "texlive-scripts-extra", "l3backend", "latexconfig", "tex-ini-files"], prepend_collection=False)) )]))
+        """Print files which should be included in the subpackage"""
+        # The last set of packages are needed to make our texlive package able to
+        # generate pdflatex.fmt and compile a simple LaTeX test file, so they
+        # should be part of texlive.
+        print("\n".join(["share/texlive/"+line for line in
+                         list( set(Files([sys.argv[1]])) -
+                               set(Files(get_conflicting_pkgs(sys.argv[1]))) -
+                               set(Files(["dehyph-exptl",
+                                          "hyphen-afrikaans",
+                                          "kpathsea",
+                                          "amsfonts",
+                                          "texlive-scripts-extra",
+                                          "l3backend",
+                                          "latexconfig",
+                                          "tex-ini-files"])) )]))
diff --git a/packages/texlive/texlive-alegreya.subpackage.sh b/packages/texlive/texlive-alegreya.subpackage.sh
new file mode 100644
index 000000000..1a53dfe51
--- /dev/null
+++ b/packages/texlive/texlive-alegreya.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's alegreya package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py alegreya $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-antt.subpackage.sh b/packages/texlive/texlive-antt.subpackage.sh
new file mode 100644
index 000000000..16e8a733c
--- /dev/null
+++ b/packages/texlive/texlive-antt.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's antt package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py antt $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-bibtexextra.subpackage.sh b/packages/texlive/texlive-bibtexextra.subpackage.sh
index 73905642b..5830d834e 100644
--- a/packages/texlive/texlive-bibtexextra.subpackage.sh
+++ b/packages/texlive/texlive-bibtexextra.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-bibtexextra"
 TERMUX_SUBPKG_DEPENDS="texlive-binextra"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py bibtexextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-bibtexextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-binextra.subpackage.sh b/packages/texlive/texlive-binextra.subpackage.sh
index 5b76216a5..a229acf58 100644
--- a/packages/texlive/texlive-binextra.subpackage.sh
+++ b/packages/texlive/texlive-binextra.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-binextra"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py binextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-binextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-cm-unicode.subpackage.sh b/packages/texlive/texlive-cm-unicode.subpackage.sh
new file mode 100644
index 000000000..f61b3f5e9
--- /dev/null
+++ b/packages/texlive/texlive-cm-unicode.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's cm-unicode package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py cm $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-context.subpackage.sh b/packages/texlive/texlive-context.subpackage.sh
index 7340e79a7..8f79cfb31 100644
--- a/packages/texlive/texlive-context.subpackage.sh
+++ b/packages/texlive/texlive-context.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-context"
 TERMUX_SUBPKG_DEPENDS="texlive-mathscience, texlive-fontsrecommended, texlive-metapost, texlive-xetex"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py context $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-context $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-cormorantgaramond.subpackage.sh b/packages/texlive/texlive-cormorantgaramond.subpackage.sh
new file mode 100644
index 000000000..8bcd696a5
--- /dev/null
+++ b/packages/texlive/texlive-cormorantgaramond.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's cormorantgaramond package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py cormorantgaramond $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-dejavu.subpackage.sh b/packages/texlive/texlive-dejavu.subpackage.sh
new file mode 100644
index 000000000..12cb2f94c
--- /dev/null
+++ b/packages/texlive/texlive-dejavu.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's dejavu package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py dejavu $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-drm.subpackage.sh b/packages/texlive/texlive-drm.subpackage.sh
new file mode 100644
index 000000000..0ed460342
--- /dev/null
+++ b/packages/texlive/texlive-drm.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's drm package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py drm $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-ebgaramond.subpackage.sh b/packages/texlive/texlive-ebgaramond.subpackage.sh
new file mode 100644
index 000000000..e767a9205
--- /dev/null
+++ b/packages/texlive/texlive-ebgaramond.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's ebgaramond package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py ebgaramond $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-fira.subpackage.sh b/packages/texlive/texlive-fira.subpackage.sh
new file mode 100644
index 000000000..6456ed625
--- /dev/null
+++ b/packages/texlive/texlive-fira.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's fira package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py fira $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-fontsextra.subpackage.sh b/packages/texlive/texlive-fontsextra.subpackage.sh
index 75e840310..40f4a72be 100644
--- a/packages/texlive/texlive-fontsextra.subpackage.sh
+++ b/packages/texlive/texlive-fontsextra.subpackage.sh
@@ -1,6 +1,8 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-fontsextra"
-TERMUX_SUBPKG_DEPENDS="texlive-plaingeneric"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py fontsextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+# noto, alegreya, montserrat and so on are splitted out because they together
+# consists of roughly 55 % of the total size of texlive-fontsextra
+TERMUX_SUBPKG_DEPENDS="texlive-plaingeneric, texlive-noto, texlive-alegreya, texlive-montserrat, texlive-fira, texlive-lato, texlive-mpfonts, texlive-libertine, texlive-drm, texlive-poltawski, texlive-cm-unicode, texlive-roboto, texlive-dejavu, texlive-plex, texlive-stickstoo, texlive-ebgaramond, texlive-ipaex-type1, texlive-paratype, texlive-antt, texlive-cormorantgaramond, texlive-libertinus-type1"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-fontsextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410), texlive-latexextra (<= 20190410-2), texlive-fontutils (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-fontsrecommended.subpackage.sh b/packages/texlive/texlive-fontsrecommended.subpackage.sh
index 34fe5ce6d..327b53f09 100644
--- a/packages/texlive/texlive-fontsrecommended.subpackage.sh
+++ b/packages/texlive/texlive-fontsrecommended.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-fontsrecommended"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py fontsrecommended $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-fontsrecommended $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-fontutils.subpackage.sh b/packages/texlive/texlive-fontutils.subpackage.sh
index 3e88d4ee0..2dcc2950d 100644
--- a/packages/texlive/texlive-fontutils.subpackage.sh
+++ b/packages/texlive/texlive-fontutils.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-fontutils"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py fontutils $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-fontutils $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-formatsextra.subpackage.sh b/packages/texlive/texlive-formatsextra.subpackage.sh
index 2e4e30bea..925f76b45 100644
--- a/packages/texlive/texlive-formatsextra.subpackage.sh
+++ b/packages/texlive/texlive-formatsextra.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-formatsextra"
 TERMUX_SUBPKG_DEPENDS="texlive-langcyrillic, texlive-mathscience, texlive-fontsrecommended, texlive-plaingeneric"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py formatsextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-formatsextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-games.subpackage.sh b/packages/texlive/texlive-games.subpackage.sh
index b367fc6cf..f17ba5ab3 100644
--- a/packages/texlive/texlive-games.subpackage.sh
+++ b/packages/texlive/texlive-games.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-games"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py games $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-games $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-humanities.subpackage.sh b/packages/texlive/texlive-humanities.subpackage.sh
index ef7948649..08d05ecb4 100644
--- a/packages/texlive/texlive-humanities.subpackage.sh
+++ b/packages/texlive/texlive-humanities.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-humanities"
 TERMUX_SUBPKG_DEPENDS="texlive-latexextra"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py humanities $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-humanities $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-ipaex-type1.subpackage.sh b/packages/texlive/texlive-ipaex-type1.subpackage.sh
new file mode 100644
index 000000000..511ff7559
--- /dev/null
+++ b/packages/texlive/texlive-ipaex-type1.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's ipaex-type1 package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py ipaex $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-langarabic.subpackage.sh b/packages/texlive/texlive-langarabic.subpackage.sh
index f3246c7fd..0f3dcee87 100644
--- a/packages/texlive/texlive-langarabic.subpackage.sh
+++ b/packages/texlive/texlive-langarabic.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langarabic"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langarabic $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langarabic $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langchinese.subpackage.sh b/packages/texlive/texlive-langchinese.subpackage.sh
index 464fbef15..6acaa8e17 100644
--- a/packages/texlive/texlive-langchinese.subpackage.sh
+++ b/packages/texlive/texlive-langchinese.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langchinese"
 TERMUX_SUBPKG_DEPENDS="texlive-langcjk, texlive-fontutils"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langchinese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langchinese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langcjk.subpackage.sh b/packages/texlive/texlive-langcjk.subpackage.sh
index b449d5fa9..a376e73c0 100644
--- a/packages/texlive/texlive-langcjk.subpackage.sh
+++ b/packages/texlive/texlive-langcjk.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langcjk"
 TERMUX_SUBPKG_DEPENDS="texlive-langother"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langcjk $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langcjk $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langcyrillic.subpackage.sh b/packages/texlive/texlive-langcyrillic.subpackage.sh
index a17c75ea6..1a67d7774 100644
--- a/packages/texlive/texlive-langcyrillic.subpackage.sh
+++ b/packages/texlive/texlive-langcyrillic.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langcyrillic"
 TERMUX_SUBPKG_DEPENDS="texlive-fontsextra, texlive-fontsrecommended, texlive-langgreek, texlive-latexrecommended"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langcyrillic $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langcyrillic $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langczechslovak.subpackage.sh b/packages/texlive/texlive-langczechslovak.subpackage.sh
index c36969513..d9b23e151 100644
--- a/packages/texlive/texlive-langczechslovak.subpackage.sh
+++ b/packages/texlive/texlive-langczechslovak.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langczechslovak"
 TERMUX_SUBPKG_DEPENDS="texlive-fontsextra, texlive-luatex"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langczechslovak $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langczechslovak $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langenglish.subpackage.sh b/packages/texlive/texlive-langenglish.subpackage.sh
index 4bc8b8295..84aab4d9d 100644
--- a/packages/texlive/texlive-langenglish.subpackage.sh
+++ b/packages/texlive/texlive-langenglish.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langenglish"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langenglish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langenglish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langeuropean.subpackage.sh b/packages/texlive/texlive-langeuropean.subpackage.sh
index e2e97e0b9..8e925b26f 100644
--- a/packages/texlive/texlive-langeuropean.subpackage.sh
+++ b/packages/texlive/texlive-langeuropean.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langeuropean"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langeuropean $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langeuropean $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langfrench.subpackage.sh b/packages/texlive/texlive-langfrench.subpackage.sh
index 9a6e3317c..6762898cd 100644
--- a/packages/texlive/texlive-langfrench.subpackage.sh
+++ b/packages/texlive/texlive-langfrench.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langfrench"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langfrench $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langfrench $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langgerman.subpackage.sh b/packages/texlive/texlive-langgerman.subpackage.sh
index 0bcef4a5b..b8c16442a 100644
--- a/packages/texlive/texlive-langgerman.subpackage.sh
+++ b/packages/texlive/texlive-langgerman.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langgerman"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langgerman $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langgerman $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langgreek.subpackage.sh b/packages/texlive/texlive-langgreek.subpackage.sh
index 0c4d1c5f8..2b143a236 100644
--- a/packages/texlive/texlive-langgreek.subpackage.sh
+++ b/packages/texlive/texlive-langgreek.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langgreek"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langgreek $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langgreek $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langitalian.subpackage.sh b/packages/texlive/texlive-langitalian.subpackage.sh
index 0191e5812..0dd76db41 100644
--- a/packages/texlive/texlive-langitalian.subpackage.sh
+++ b/packages/texlive/texlive-langitalian.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langitalian"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langitalian $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langitalian $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langjapanese.subpackage.sh b/packages/texlive/texlive-langjapanese.subpackage.sh
index 5b95909f4..1973b64ee 100644
--- a/packages/texlive/texlive-langjapanese.subpackage.sh
+++ b/packages/texlive/texlive-langjapanese.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langjapanese"
 TERMUX_SUBPKG_DEPENDS="texlive-langcjk, texlive-langchinese"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langjapanese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langjapanese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410), texlive-luatex (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langkorean.subpackage.sh b/packages/texlive/texlive-langkorean.subpackage.sh
index 7db1363f8..3d1538767 100644
--- a/packages/texlive/texlive-langkorean.subpackage.sh
+++ b/packages/texlive/texlive-langkorean.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langkorean"
 TERMUX_SUBPKG_DEPENDS="texlive-langjapanese, texlive-langcjk, texlive-latexrecommended"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langkorean $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langkorean $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langother.subpackage.sh b/packages/texlive/texlive-langother.subpackage.sh
index 5a2a75149..efd982f43 100644
--- a/packages/texlive/texlive-langother.subpackage.sh
+++ b/packages/texlive/texlive-langother.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langother"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langother $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langother $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langpolish.subpackage.sh b/packages/texlive/texlive-langpolish.subpackage.sh
index 4ce864995..c14bb470b 100644
--- a/packages/texlive/texlive-langpolish.subpackage.sh
+++ b/packages/texlive/texlive-langpolish.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langpolish"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langpolish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langpolish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langportuguese.subpackage.sh b/packages/texlive/texlive-langportuguese.subpackage.sh
index c60612479..f03fa7f2b 100644
--- a/packages/texlive/texlive-langportuguese.subpackage.sh
+++ b/packages/texlive/texlive-langportuguese.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langportuguese"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langportuguese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langportuguese $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-langspanish.subpackage.sh b/packages/texlive/texlive-langspanish.subpackage.sh
index c18597437..28236093e 100644
--- a/packages/texlive/texlive-langspanish.subpackage.sh
+++ b/packages/texlive/texlive-langspanish.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-langspanish"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py langspanish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-langspanish $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-latexextra.subpackage.sh b/packages/texlive/texlive-latexextra.subpackage.sh
index 9a153154c..85556a01d 100644
--- a/packages/texlive/texlive-latexextra.subpackage.sh
+++ b/packages/texlive/texlive-latexextra.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-latexextra"
 TERMUX_SUBPKG_DEPENDS="texlive-fontsextra"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py latexextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-latexextra $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<= 20190410-2), texlive-latexrecommended (<= 20190410-2), texlive-pictures (<= 20190410-2), texlive-luatex (<= 20190410-2), texlive-plaingeneric (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-latexrecommended.subpackage.sh b/packages/texlive/texlive-latexrecommended.subpackage.sh
index 75993cf23..02bfbc111 100644
--- a/packages/texlive/texlive-latexrecommended.subpackage.sh
+++ b/packages/texlive/texlive-latexrecommended.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-latexrecommended"
 TERMUX_SUBPKG_DEPENDS="texlive-fontsrecommended, texlive-latexextra, texlive-pictures, texlive-plaingeneric"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py latexrecommended $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-latexrecommended $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-lato.subpackage.sh b/packages/texlive/texlive-lato.subpackage.sh
new file mode 100644
index 000000000..478bc59f1
--- /dev/null
+++ b/packages/texlive/texlive-lato.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's lato package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py lato $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-libertine.subpackage.sh b/packages/texlive/texlive-libertine.subpackage.sh
new file mode 100644
index 000000000..a29b79223
--- /dev/null
+++ b/packages/texlive/texlive-libertine.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's libertine package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py libertine $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-libertinus-type1.subpackage.sh b/packages/texlive/texlive-libertinus-type1.subpackage.sh
new file mode 100644
index 000000000..5122a7a10
--- /dev/null
+++ b/packages/texlive/texlive-libertinus-type1.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's libertinus-type1 package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py libertinus $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-luatex.subpackage.sh b/packages/texlive/texlive-luatex.subpackage.sh
index 97688ebd6..4b3c82f33 100644
--- a/packages/texlive/texlive-luatex.subpackage.sh
+++ b/packages/texlive/texlive-luatex.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-luatex"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py luatex $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-luatex $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<= 20190410-2), texlive-fontsrecommended (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-mathscience.subpackage.sh b/packages/texlive/texlive-mathscience.subpackage.sh
index 93c1b4f6b..000d7fbbe 100644
--- a/packages/texlive/texlive-mathscience.subpackage.sh
+++ b/packages/texlive/texlive-mathscience.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-mathscience"
 TERMUX_SUBPKG_DEPENDS="texlive-langgreek"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py mathscience $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-mathscience $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-metapost.subpackage.sh b/packages/texlive/texlive-metapost.subpackage.sh
index 9db4d420f..d116a09d6 100644
--- a/packages/texlive/texlive-metapost.subpackage.sh
+++ b/packages/texlive/texlive-metapost.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-metapost"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py metapost $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-metapost $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-montserrat.subpackage.sh b/packages/texlive/texlive-montserrat.subpackage.sh
new file mode 100644
index 000000000..d172fa9e6
--- /dev/null
+++ b/packages/texlive/texlive-montserrat.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's montserrat package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py montserrat $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-mpfonts.subpackage.sh b/packages/texlive/texlive-mpfonts.subpackage.sh
new file mode 100644
index 000000000..3b7e452c0
--- /dev/null
+++ b/packages/texlive/texlive-mpfonts.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's mpfonts package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py mpfonts $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-music.subpackage.sh b/packages/texlive/texlive-music.subpackage.sh
index 747853992..7ae7cb716 100644
--- a/packages/texlive/texlive-music.subpackage.sh
+++ b/packages/texlive/texlive-music.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-music"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py music $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-music $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-noto.subpackage.sh b/packages/texlive/texlive-noto.subpackage.sh
new file mode 100644
index 000000000..7b17baa66
--- /dev/null
+++ b/packages/texlive/texlive-noto.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's noto package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py noto $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-paratype.subpackage.sh b/packages/texlive/texlive-paratype.subpackage.sh
new file mode 100644
index 000000000..c6684de9b
--- /dev/null
+++ b/packages/texlive/texlive-paratype.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's paratype package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py paratype $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-pictures.subpackage.sh b/packages/texlive/texlive-pictures.subpackage.sh
index 80eab60dc..a2f486975 100644
--- a/packages/texlive/texlive-pictures.subpackage.sh
+++ b/packages/texlive/texlive-pictures.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-pictures"
 TERMUX_SUBPKG_DEPENDS="texlive-latexextra"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py pictures $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-pictures $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-plaingeneric.subpackage.sh b/packages/texlive/texlive-plaingeneric.subpackage.sh
index 8220af5cc..3c82975ee 100644
--- a/packages/texlive/texlive-plaingeneric.subpackage.sh
+++ b/packages/texlive/texlive-plaingeneric.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-plaingeneric"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py plaingeneric $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-plaingeneric $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-plex.subpackage.sh b/packages/texlive/texlive-plex.subpackage.sh
new file mode 100644
index 000000000..77be05aa4
--- /dev/null
+++ b/packages/texlive/texlive-plex.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's plex package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py plex $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-poltawski.subpackage.sh b/packages/texlive/texlive-poltawski.subpackage.sh
new file mode 100644
index 000000000..1d4417d43
--- /dev/null
+++ b/packages/texlive/texlive-poltawski.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's poltawski package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py poltawski $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-pstricks.subpackage.sh b/packages/texlive/texlive-pstricks.subpackage.sh
index 747502344..dbac774b0 100644
--- a/packages/texlive/texlive-pstricks.subpackage.sh
+++ b/packages/texlive/texlive-pstricks.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-pstricks"
 TERMUX_SUBPKG_DEPENDS="texlive-plaingeneric"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py pstricks $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-pstricks $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410), texlive-latexextra (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-publishers.subpackage.sh b/packages/texlive/texlive-publishers.subpackage.sh
index 624a5f1e1..6ba2e991e 100644
--- a/packages/texlive/texlive-publishers.subpackage.sh
+++ b/packages/texlive/texlive-publishers.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-publishers"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py publishers $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-publishers $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<= 20190410-2)"
 
 termux_step_create_subpkg_debscripts() {
diff --git a/packages/texlive/texlive-roboto.subpackage.sh b/packages/texlive/texlive-roboto.subpackage.sh
new file mode 100644
index 000000000..267549e5c
--- /dev/null
+++ b/packages/texlive/texlive-roboto.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's roboto package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py roboto $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-stickstoo.subpackage.sh b/packages/texlive/texlive-stickstoo.subpackage.sh
new file mode 100644
index 000000000..597a3cc8f
--- /dev/null
+++ b/packages/texlive/texlive-stickstoo.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Texlive's stickstoo package"
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py stickstoo $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+termux_step_create_subpkg_debscripts() {
+	echo "#lsTERMUX_PREFIX/bin/sh" > postinst
+	echo mktexlsr >> postinst
+}
diff --git a/packages/texlive/texlive-xetex.subpackage.sh b/packages/texlive/texlive-xetex.subpackage.sh
index 2b601e2e4..452836a3a 100644
--- a/packages/texlive/texlive-xetex.subpackage.sh
+++ b/packages/texlive/texlive-xetex.subpackage.sh
@@ -1,5 +1,5 @@
 TERMUX_SUBPKG_DESCRIPTION="Texlive's collection-xetex"
-TERMUX_SUBPKG_INCLUDE=$(python3 $TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py xetex $TERMUX_PKG_TMPDIR/texlive.tlpdb)
+TERMUX_SUBPKG_INCLUDE=$($TERMUX_PKG_BUILDER_DIR/parse_tlpdb.py collection-xetex $TERMUX_PKG_TMPDIR/texlive.tlpdb)
 TERMUX_SUBPKG_CONFLICTS="texlive-bin (<< 20190410), texlive (<< 20190410)"
 
 termux_step_create_subpkg_debscripts() {