diff --git a/container.yaml b/container.yaml
index cecc8ca..42fbfa1 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,24 +1,125 @@
-compose:
-    modules:
-    - libreoffice:stable
 flatpak:
     id: org.libreoffice.LibreOffice
     branch: stable
+    runtime-name: flatpak-runtime
+    runtime-version: f44
+    component: libreoffice-flatpak
+    packages:
+        # apps
+        - libreoffice
+        - libreoffice-base
+        - libreoffice-calc
+        - libreoffice-draw
+        - libreoffice-impress
+        - libreoffice-math
+        - libreoffice-writer
+        # extensions
+        - libreoffice-emailmerge
+        - libreoffice-filters
+        - libreoffice-librelogo
+        - libreoffice-nlpsolver
+        - libreoffice-ogltrans
+        - libreoffice-postgresql
+        - libreoffice-wiki-publisher
+        # integration plugins
+        - libreoffice-gtk3
+        # for texlive extension
+        - libgs
+        # langpacks
+        - libreoffice-langpack-*
+        - libreoffice-voikko
     command: /app/bin/libreoffice
+    rename-mime-file: libreoffice.xml
+    add-extensions:
+        org.libreoffice.LibreOffice.BundledExtension:
+            directory: lib64/libreoffice/share/extensions
+            subdirectories: true
+            autodelete: true
+            no-autodownload: true
+        org.libreoffice.LibreOffice.Help:
+            directory: lib64/libreoffice/help
+            autodelete: true
+            no-autodownload: true
+        org.libreoffice.LibreOffice.Locale:
+            directory: share/runtime/locale
+            autodelete: true
+            locale-subset: true
+        org.fedoraproject.Sdk.Extension.texlive:
+            directory: texlive
+            version: f44
+            add-ld-path: lib
+            autodelete: true
+            no-autodownload: true
     finish-args: |-
         --share=network
         --share=ipc
-        --socket=x11
+        --socket=cups
+        --socket=fallback-x11
         --socket=wayland
         --socket=pulseaudio
         --device=dri
         --filesystem=host
-        --env=JAVA_HOME=/app/lib/jvm/jre-flatpak
+        --filesystem=xdg-config/gtk-3.0
+        --filesystem=xdg-config/fontconfig:ro
+        --filesystem=xdg-run/gvfsd
+        --env=JAVA_HOME=/app/lib/jvm/jre
         --env=LIBO_FLATPAK=1
+        --env=PATH=/app/texlive/bin:/app/bin:/usr/bin
+        --env=TEXMFROOT=/app/texlive
         --own-name=org.libreoffice.LibreOfficeIpc0
         --talk-name=org.gtk.vfs.*
     cleanup-commands: |
-        for i in /usr/share/myspell/*; do
-            ln -s "$i" /app/share/myspell/
+        find /app/lib64/libreoffice/help -mindepth 1 -delete
+        ln -s /usr/share/hunspell /app/share/hunspell
+        ln -s /usr/share/hyphen /app/share/hyphen
+        ln -s /usr/share/mythes /app/share/mythes
+        sed -i '/^NoDisplay/d' /app/share/applications/org.libreoffice.LibreOffice.desktop
+
+        cd /app/share/autocorr
+        for f in acor_*; do
+            l=`echo $f | sed -e 's/acor_\([^-_\.]*\)[-_\.].*/\1/'`
+            rm -f $f
+            ln -sf ../runtime/locale/$l/autocorr/$f .
+        done
+
+        cd /app/lib64/libreoffice/program/resource
+        for d in *; do
+            l=`echo $d | sed -e 's/\([^-_\.@]*\)[-_\.@].*/\1/'`
+            case $l in common) continue ;; esac
+            find $d -delete
+            ln -sf ../../../../share/runtime/locale/$l/resource/$d .
+        done
+
+        cd /app/lib64/libreoffice/share/autotext
+        for d in *; do
+            l=`echo $d | sed -e 's/\([^-_\.@]*\)[-_\.@].*/\1/'`
+            case $l in common) continue ;; esac
+            find $d -delete
+            ln -sf ../../../../share/runtime/locale/$l/autotext/$d .
+        done
+
+        cd /app/lib64/libreoffice/share/registry
+        for f in Langpack-*; do
+            l=`echo $f | sed -e 's/Langpack-\([^-_\.]*\)[-_\.].*/\1/'`
+            rm -f $f
+            ln -sf ../../../../share/runtime/locale/$l/registry/$f .
+        done
+
+        cd /app/lib64/libreoffice/share/registry/res
+        for f in fcfg_langpack_*; do
+            l=`echo $f | sed -e 's/fcfg_langpack_\([^-_\.]*\)[-_\.].*/\1/'`
+            rm -f $f
+            ln -sf ../../../../../share/runtime/locale/$l/registry/$f .
+        done
+        for f in registry_*; do
+            l=`echo $f | sed -e 's/registry_\([^-_\.]*\)[-_\.].*/\1/'`
+            rm -f $f
+            ln -sf ../../../../../share/runtime/locale/$l/registry/$f .
+        done
+
+        cd /app/lib64/libreoffice/share/wizards
+        for f in resources_*; do
+            l=`echo $f | sed -e 's/resources_\([^-_\.]*\)[-_\.].*/\1/'`
+            rm -f $f
+            ln -sf ../../../../share/runtime/locale/$l/wizards/$f .
         done
-        (cd /app/lib/jvm && ln -s jre-11-openjdk-* jre-flatpak)
diff --git a/libreoffice.yaml b/libreoffice.yaml
deleted file mode 100644
index 953b3e9..0000000
--- a/libreoffice.yaml
+++ /dev/null
@@ -1,695 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  summary: Free Software Productivity Suite
-  description: >-
-    LibreOffice is an Open Source, community-developed, office productivity suite.
-    It includes the key desktop applications, such as a word processor, spreadsheet,
-    presentation manager, formula editor and drawing program, with a user interface
-    and feature set similar to other office suites.  Sophisticated and flexible, LibreOffice
-    also works transparently with a variety of file formats, including Microsoft Office
-    File Formats.
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      flatpak-common: [f35]
-      flatpak-runtime: [f35]
-      platform: [f35]
-    requires:
-      flatpak-common: [f35]
-      flatpak-runtime: [f35]
-      platform: [f35]
-  profiles:
-    default:
-      rpms:
-      - libreoffice
-      - libreoffice-bsh
-      - libreoffice-filters
-      - libreoffice-gtk3
-      - libreoffice-langpack-af
-      - libreoffice-langpack-ar
-      - libreoffice-langpack-as
-      - libreoffice-langpack-bg
-      - libreoffice-langpack-bn
-      - libreoffice-langpack-br
-      - libreoffice-langpack-ca
-      - libreoffice-langpack-cs
-      - libreoffice-langpack-cy
-      - libreoffice-langpack-da
-      - libreoffice-langpack-de
-      - libreoffice-langpack-dz
-      - libreoffice-langpack-el
-      - libreoffice-langpack-eo
-      - libreoffice-langpack-es
-      - libreoffice-langpack-et
-      - libreoffice-langpack-eu
-      - libreoffice-langpack-fa
-      - libreoffice-langpack-fi
-      - libreoffice-langpack-fr
-      - libreoffice-langpack-fy
-      - libreoffice-langpack-ga
-      - libreoffice-langpack-gl
-      - libreoffice-langpack-gu
-      - libreoffice-langpack-he
-      - libreoffice-langpack-hi
-      - libreoffice-langpack-hr
-      - libreoffice-langpack-hu
-      - libreoffice-langpack-id
-      - libreoffice-langpack-it
-      - libreoffice-langpack-ja
-      - libreoffice-langpack-kk
-      - libreoffice-langpack-kn
-      - libreoffice-langpack-ko
-      - libreoffice-langpack-lt
-      - libreoffice-langpack-lv
-      - libreoffice-langpack-mai
-      - libreoffice-langpack-ml
-      - libreoffice-langpack-mr
-      - libreoffice-langpack-nb
-      - libreoffice-langpack-nl
-      - libreoffice-langpack-nn
-      - libreoffice-langpack-nr
-      - libreoffice-langpack-nso
-      - libreoffice-langpack-or
-      - libreoffice-langpack-pa
-      - libreoffice-langpack-pl
-      - libreoffice-langpack-pt-BR
-      - libreoffice-langpack-pt-PT
-      - libreoffice-langpack-ro
-      - libreoffice-langpack-ru
-      - libreoffice-langpack-si
-      - libreoffice-langpack-sk
-      - libreoffice-langpack-sl
-      - libreoffice-langpack-sr
-      - libreoffice-langpack-ss
-      - libreoffice-langpack-st
-      - libreoffice-langpack-sv
-      - libreoffice-langpack-ta
-      - libreoffice-langpack-te
-      - libreoffice-langpack-th
-      - libreoffice-langpack-tn
-      - libreoffice-langpack-tr
-      - libreoffice-langpack-ts
-      - libreoffice-langpack-uk
-      - libreoffice-langpack-ve
-      - libreoffice-langpack-xh
-      - libreoffice-langpack-zh-Hans
-      - libreoffice-langpack-zh-Hant
-      - libreoffice-langpack-zu
-      - libreoffice-librelogo
-      - libreoffice-nlpsolver
-      - libreoffice-ogltrans
-      - libreoffice-postgresql
-      - libreoffice-rhino
-      - libreoffice-wiki-publisher
-      - libreoffice-xsltfilter
-  components:
-    rpms:
-      Box2D:
-        rationale: Runtime dependency
-        ref: f35
-      apache-commons-logging:
-        rationale: Runtime dependency
-        ref: f35
-      bsf:
-        rationale: Runtime dependency
-        ref: f35
-      bsh:
-        rationale: Runtime dependency
-        ref: f35
-      clucene:
-        rationale: Runtime dependency
-        ref: f35
-      dconf:
-        rationale: Runtime dependency
-        ref: f35
-      firebird:
-        rationale: Runtime dependency
-        ref: f35
-      flute:
-        rationale: Runtime dependency
-        ref: f35
-      hawtjni:
-        rationale: Runtime dependency
-        ref: f35
-      hspell:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-af:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ar:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-as:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-bg:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-bn:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-br:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ca:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-cy:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-da:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-de:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-el:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-eo:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-es:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-et:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-eu:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-fa:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-fr:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-fy:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ga:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-gl:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-gu:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-hi:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-hr:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-hu:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-id:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-it:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-kk:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-kn:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ko:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-lt:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ml:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-mr:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-nl:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-no:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-nr:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-nso:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-or:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-pa:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-pl:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-pt:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ro:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ru:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-si:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-sk:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-sl:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-sr:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ss:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-st:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-sv:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ta:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-te:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-th:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-tn:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ts:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-uk:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-ve:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-xh:
-        rationale: Runtime dependency
-        ref: f35
-      hunspell-zu:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-as:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-bg:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-bn:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-ca:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-cy:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-da:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-de:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-el:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-es:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-eu:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-fa:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-fr:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-ga:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-gl:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-gu:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-hi:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-hu:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-id:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-it:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-kn:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-lt:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-ml:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-mr:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-nl:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-or:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-pa:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-pl:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-pt:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-ro:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-ru:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-sk:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-sl:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-sv:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-ta:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-te:
-        rationale: Runtime dependency
-        ref: f35
-      hyphen-uk:
-        rationale: Runtime dependency
-        ref: f35
-      jansi1:
-        rationale: Runtime dependency
-        ref: f35
-      jansi-native:
-        rationale: Runtime dependency
-        ref: f35
-      java-11-openjdk:
-        rationale: Runtime dependency
-        ref: f35
-      javapackages-tools:
-        rationale: Runtime dependency
-        ref: f35
-      jline2:
-        rationale: Runtime dependency
-        ref: f35
-      libabw:
-        rationale: Runtime dependency
-        ref: f35
-      libbase:
-        rationale: Runtime dependency
-        ref: f35
-      libcdr:
-        rationale: Runtime dependency
-        ref: f35
-      libcmis:
-        rationale: Runtime dependency
-        ref: f35
-      libe-book:
-        rationale: Runtime dependency
-        ref: f35
-      libeot:
-        rationale: Runtime dependency
-        ref: f35
-      libepubgen:
-        rationale: Runtime dependency
-        ref: f35
-      libetonyek:
-        rationale: Runtime dependency
-        ref: f35
-      libexttextcat:
-        rationale: Runtime dependency
-        ref: f35
-      libfonts:
-        rationale: Runtime dependency
-        ref: f35
-      libformula:
-        rationale: Runtime dependency
-        ref: f35
-      libfreehand:
-        rationale: Runtime dependency
-        ref: f35
-      liblangtag:
-        rationale: Runtime dependency
-        ref: f35
-      liblayout:
-        rationale: Runtime dependency
-        ref: f35
-      libloader:
-        rationale: Runtime dependency
-        ref: f35
-      libmspub:
-        rationale: Runtime dependency
-        ref: f35
-      libmwaw:
-        rationale: Runtime dependency
-        ref: f35
-      libnumbertext:
-        rationale: Runtime dependency
-        ref: f35
-      libodfgen:
-        rationale: Runtime dependency
-        ref: f35
-      liborcus:
-        rationale: Runtime dependency
-        ref: f35
-      libpagemaker:
-        rationale: Runtime dependency
-        ref: f35
-      libpq:
-        rationale: Runtime dependency
-        ref: f35
-      libqxp:
-        rationale: Runtime dependency
-        ref: f35
-      libreoffice:
-        rationale: Application package
-        ref: f35
-        buildorder: 10
-      libreoffice-voikko:
-        rationale: Runtime dependency
-        ref: f35
-      librepository:
-        rationale: Runtime dependency
-        ref: f35
-      librevenge:
-        rationale: Runtime dependency
-        ref: f35
-      libserializer:
-        rationale: Runtime dependency
-        ref: f35
-      libstaroffice:
-        rationale: Runtime dependency
-        ref: f35
-      libtomcrypt:
-        rationale: Runtime dependency
-        ref: f35
-      libtommath:
-        rationale: Runtime dependency
-        ref: f35
-      libvisio:
-        rationale: Runtime dependency
-        ref: f35
-      libvoikko:
-        rationale: Runtime dependency
-        ref: f35
-      libwpd:
-        rationale: Runtime dependency
-        ref: f35
-      libwpg:
-        rationale: Runtime dependency
-        ref: f35
-      libwps:
-        rationale: Runtime dependency
-        ref: f35
-      libzmf:
-        rationale: Runtime dependency
-        ref: f35
-      lksctp-tools:
-        rationale: Runtime dependency
-        ref: f35
-      lpsolve:
-        rationale: Runtime dependency
-        ref: f35
-      mariadb-connector-c:
-        rationale: Runtime dependency
-        ref: f35
-      mkfontscale:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-bg:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-ca:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-cs:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-da:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-de:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-el:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-en:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-eo:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-es:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-fr:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-ga:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-hu:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-it:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-nl:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-pl:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-pt:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-ro:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-ru:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-sk:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-sl:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-sv:
-        rationale: Runtime dependency
-        ref: f35
-      mythes-uk:
-        rationale: Runtime dependency
-        ref: f35
-      neon:
-        rationale: Runtime dependency
-        ref: f35
-      ongres-scram:
-        rationale: Runtime dependency
-        ref: f35
-      openoffice-lv:
-        rationale: Runtime dependency
-        ref: f35
-      openoffice.org-dict-cs_CZ:
-        rationale: Runtime dependency
-        ref: f35
-      pakchois:
-        rationale: Runtime dependency
-        ref: f35
-      pentaho-libxml:
-        rationale: Runtime dependency
-        ref: f35
-      pentaho-reporting-flow-engine:
-        rationale: Runtime dependency
-        ref: f35
-      postgresql-jdbc:
-        rationale: Runtime dependency
-        ref: f35
-      qr-code-generator:
-        rationale: Runtime dependency
-        ref: f35
-      raptor2:
-        rationale: Runtime dependency
-        ref: f35
-      rasqal:
-        rationale: Runtime dependency
-        ref: f35
-      redland:
-        rationale: Runtime dependency
-        ref: f35
-      sac:
-        rationale: Runtime dependency
-        ref: f35
-      ttmkfdir:
-        rationale: Runtime dependency
-        ref: f35
-      tzdata:
-        rationale: Runtime dependency
-        ref: f35
-      voikko-fi:
-        rationale: Runtime dependency
-        ref: f35
-      xmlsec1:
-        rationale: Runtime dependency
-        ref: f35
-      xorg-x11-fonts:
-        rationale: Runtime dependency
-        ref: f35
-      yajl:
-        rationale: Runtime dependency
-        ref: f35
-      zaf:
-        rationale: Runtime dependency
-        ref: f35
-filters:
-  rpm:
-    - hyphen
-    - tzdata
-...