diff --git a/g/GObject-Introspection/GObject-Introspection-1.74.0-GCCcore-12.2.0-Python-3.10.8.eb b/g/GObject-Introspection/GObject-Introspection-1.74.0-GCCcore-12.2.0-Python-3.10.8.eb
new file mode 100644
index 00000000..d0d4e474
--- /dev/null
+++ b/g/GObject-Introspection/GObject-Introspection-1.74.0-GCCcore-12.2.0-Python-3.10.8.eb
@@ -0,0 +1,48 @@
+# IT4Innovations
+# BS 2024
+
+easyblock = 'MesonNinja'
+
+name = 'GObject-Introspection'
+version = '1.74.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://gi.readthedocs.io/en/latest/'
+description = """GObject introspection is a middleware layer between C libraries
+ (using GObject) and language bindings. The C library can be scanned at
+ compile time and generate a metadata file, in addition to the actual
+ native C library. Then at runtime, language bindings can read this
+ metadata and automatically provide bindings to call into the C library."""
+
+toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+checksums = ['eac05a63091c81adfdc8ef34820bcc7e7778c5b9e34734d344fc9e69ddf4fc82']
+
+builddependencies = [
+    ('binutils', '2.39'),
+    ('pkg-config', '0.29.2'),
+    ('Meson', '0.64.1', '-Python-3.10.8'),
+    ('Ninja', '1.11.1'),
+    ('flex', '2.6.4'),
+    ('Bison', '3.8.2'),
+    ('cairo', '1.17.4'),
+]
+
+dependencies = [
+    ('Python', '3.10.8'),
+    ('GLib', '2.75.0'),
+    ('libffi', '3.4.4'),
+    ('util-linux', '2.38.1'),
+]
+
+preconfigopts = "env GI_SCANNER_DISABLE_CACHE=true "
+
+sanity_check_paths = {
+    'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
+             ['lib/libgirepository-1.0.' + SHLIB_EXT],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/g/GPAW/GPAW-23.9.1-intel-2022a.eb b/g/GPAW/GPAW-23.9.1-intel-2022a.eb
index 1ad22113..077fbefb 100644
--- a/g/GPAW/GPAW-23.9.1-intel-2022a.eb
+++ b/g/GPAW/GPAW-23.9.1-intel-2022a.eb
@@ -12,7 +12,7 @@ description = """GPAW is a density-functional theory (DFT) Python code based on
  atom-centered basis-functions."""
 
 toolchain = {'name': 'intel', 'version': '2022a'}
-toolchainopts = {'usempi': True, 'openmp': False}
+toolchainopts = {'usempi': True, 'openmp': True}
 
 source_urls = [PYPI_LOWER_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/g/glibc/glibc-2.29-GCCcore-12.2.0.eb b/g/glibc/glibc-2.29-GCCcore-12.2.0.eb
new file mode 100644
index 00000000..79191272
--- /dev/null
+++ b/g/glibc/glibc-2.29-GCCcore-12.2.0.eb
@@ -0,0 +1,37 @@
+# IT4Innovations 
+# BS 2024
+
+easyblock = 'ConfigureMake'
+
+name = 'glibc'
+version = '2.29'
+
+homepage = 'https://www.gnu.org/software/libc/'
+description = """The GNU C Library project provides the core libraries for the GNU system and GNU/Linux systems,
+ as well as many other systems that use Linux as the kernel."""
+
+toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+
+source_urls = ['https://ftp.gnu.org/gnu/glibc/']
+sources = ['glibc-%(version)s.tar.xz']
+checksums = ['f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b']
+
+builddependencies = [
+    ('binutils', '2.39'),
+    ('make', '4.2.1'),
+    ('texinfo', '7.0.2'),
+    ('Bison', '3.7.1'),
+    ('Python', '3.8.6'),
+]
+
+preconfigopts = 'mkdir obj && cd obj && CC="$CC -fuse-ld=bfd -w" ' # --disable-werror" '
+configure_cmd_prefix = '../'
+prebuildopts = "cd obj && "
+preinstallopts = prebuildopts
+
+sanity_check_paths = {
+    'files': ['bin/ldd', 'lib/libc.a', 'lib/libc.%s' % SHLIB_EXT],
+    'dirs': ['etc', 'libexec', 'include', 'sbin', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/m/MRCC/MRCC-2023-08-intel-2021b.eb b/m/MRCC/MRCC-2023-08-intel-2021b.eb
index a8b24f7f..b570215c 100644
--- a/m/MRCC/MRCC-2023-08-intel-2021b.eb
+++ b/m/MRCC/MRCC-2023-08-intel-2021b.eb
@@ -1,36 +1,41 @@
-easyblock = 'ConfigureMake'
+#IT4Innovations 2024
+#BS
+
+#easyblock = 'MakeCp'
+easyblock = 'Tarball'
 
 name = 'MRCC'
 version = '2023.08'
 homepage = 'https://www.mrcc.hu/'
-description = """MRCC is a software package for ab initio calculations of molecular electronic structure."""
+description = """MRCC is a suite of ab initio and density functional quantum chemistry programs for high-accuracy electronic structure calculations developed and maintained by the quantum chemistry research group at the Department of Physical Chemistry and Materials Science, TU Budapest."""
+
 toolchain = {'name': 'intel', 'version': '2021b'}
 
-source_urls = ['https://www.mrcc.hu/downloads/']
-sources = ['mrcc-2023-08.tar.gz']
+sources = ['mrcc.2023-08-28.tar.gz']
+
+checksums = ['8c07f9e7b2b63f3a9f02bba0d5b3b5b36a5c9f50f3fbcf4e923f0aae6d8e0c5d']
+
+dependencies = [
+    ('libfabric', '1.13.2'),
+    ('libxc', '5.1.5'),
+]
+
+
+#files_to_copy = [
+ #   (['*'], 'bin'),
+#]
 
-dependencies = []
 
 sanity_check_paths = {
-    'files': ['bin/mrcc', 'README.md'],
-    'dirs': ['lib', 'include'],
+    'files': ['prog/mrcc'],
+    'dirs': ['prog']
 }
 
+
+#buildcmd = '.%(installdir)s/build.mrcc Intel -pOMP -pMPI=IntelMPI -llibxc -lpcm -f%(installdir)s/prog/mrcc'
+
+buildcmd = './apps/all/MRCC/2023.08-intel-2021b/ Intel -pOMP -pMPI=IntelMPI -llibxc -lpcm -f/apps/all/MRCC/2023.08-intel-2021b/prog/mrcc'
+
 moduleclass = 'chem'
 
-sanity_check_commands = [
-    'bin/mrcc --version',
-    'bin/mrcc <inputfile>'
-]
-
-docurls = [
-    'https://www.mrcc.hu/index.php/getting-started/installation'
-]
-
-prebuildopts = 'export LICENSE_SERVER=<your-license-server> && '
-
-postinstallcmds = [
-    'echo "MRCC installed successfully. Please ensure you have the appropriate license."'
-]
-
 
diff --git a/m/MRCC/mrcc.2023-08-28.tar.gz b/m/MRCC/mrcc.2023-08-28.tar.gz
new file mode 100644
index 00000000..08a8ca27
Binary files /dev/null and b/m/MRCC/mrcc.2023-08-28.tar.gz differ
diff --git a/m/Meson/Meson-0.64.1-GCCcore-12.2.0-Python-3.10.8.eb b/m/Meson/Meson-0.64.1-GCCcore-12.2.0-Python-3.10.8.eb
new file mode 100644
index 00000000..8d2fbc59
--- /dev/null
+++ b/m/Meson/Meson-0.64.1-GCCcore-12.2.0-Python-3.10.8.eb
@@ -0,0 +1,38 @@
+# IT4Innovations
+# BS 2024
+
+easyblock = 'PythonPackage'
+
+name = 'Meson'
+version = '0.64.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://mesonbuild.com'
+description = "Meson is a cross-platform build system designed to be both as fast and as user friendly as possible."
+
+toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080']
+
+builddependencies = [
+    ('binutils', '2.39'),
+]
+
+dependencies = [
+    ('Python', '3.10.8'),
+    ('Ninja', '1.11.1'),
+]
+
+download_dep_fail = True
+use_pip = True
+sanity_pip_check = True
+
+options = {'modulename': 'mesonbuild'}
+
+sanity_check_paths = {
+    'files': ['bin/meson'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/n/NSS/NSS-3.57-GCCcore-10.2.0.eb b/n/NSS/NSS-3.57-GCCcore-10.2.0.eb
new file mode 100644
index 00000000..4fb80aed
--- /dev/null
+++ b/n/NSS/NSS-3.57-GCCcore-10.2.0.eb
@@ -0,0 +1,59 @@
+# IT4Innovation
+# BS
+
+easyblock = 'MakeCp'
+
+name = 'NSS'
+version = '3.57'
+
+homepage = 'https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS'
+description = """Network Security Services (NSS) is a set of libraries designed to support cross-platform development
+ of security-enabled client and server applications."""
+
+toolchain = {'name': 'GCCcore', 'version': '10.2.0'}
+
+source_urls = ['https://ftp.mozilla.org/pub/security/nss/releases/NSS_%(version_major)s_%(version_minor)s_RTM/src/']
+sources = [SOURCELOWER_TAR_GZ]
+patches = [
+    'NSS-3.39_pkgconfig.patch',
+    'NSS-3.42.1_CVE-2021-43527.patch',
+]
+checksums = [
+    '55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382',  # nss-3.57.tar.gz
+    '5c4b55842e5afd1e8e67b90635f6474510b89242963c4ac2622d3e3da9062774',  # NSS-3.39_pkgconfig.patch
+    'cc17945edcc8f6d951e8710a4e99604439a1758e38539d1b7b8c0cd95ac59355',  # NSS-3.42.1_CVE-2021-43527.patch
+]
+
+builddependencies = [('binutils', '2.35')]
+dependencies = [
+    ('NSPR', '4.29'),
+    ('zlib', '1.2.11'),
+]
+
+# building in parallel fails
+parallel = 1
+
+# fix for not being able to find header files
+buildopts = 'BUILD_OPT=1 USE_64=1 CPATH="$EBROOTNSPR/include/nspr:$CPATH" NSS_ENABLE_WERROR=0 '
+# fix c standard causing missing functions
+buildopts += 'OS_REL_CFLAGS="-D_XOPEN_SOURCE " && '
+# also install pkgconfig file (see patch)
+buildopts += "cd config && make PREFIX=%(installdir)s BUILD_OPT=1 USE_64=1 && cd -"
+# optional testsuite (takes a long time)
+# buildopts += " && cd %(builddir)s/%(namelower)s-%(version)s/%(namelower)s/tests && BUILD_OPT=1 USE_64=1 ./all.sh "
+
+files_to_copy = ['../dist/Linux*.OBJ/*', (['../dist/public/*'], 'include')]
+
+sanity_check_paths = {
+    'files': ['bin/nss-config', 'bin/multinit', 'lib/libnss.a'],
+    'dirs': ['include/dbm', 'include/nss'],
+}
+
+sanity_check_commands = [
+    "multinit --help",
+    "nss-config --version",
+]
+
+modextrapaths = {'CPATH': 'include/nss'}
+
+moduleclass = 'lib'
diff --git a/o/OpenJPEG/OpenJPEG-2.5.0-GCCcore-12.2.0.eb b/o/OpenJPEG/OpenJPEG-2.5.0-GCCcore-12.2.0.eb
new file mode 100644
index 00000000..07d541ec
--- /dev/null
+++ b/o/OpenJPEG/OpenJPEG-2.5.0-GCCcore-12.2.0.eb
@@ -0,0 +1,45 @@
+# IT4Innovations
+# BS 2024
+
+easyblock = 'CMakeMake'
+
+name = 'OpenJPEG'
+version = '2.5.0'
+
+homepage = 'https://www.openjpeg.org/'
+description = """OpenJPEG is an open-source JPEG 2000 codec written in
+ C language. It has been developed in order to promote the use of JPEG 2000,
+ a still-image compression standard from the Joint Photographic Experts Group
+ (JPEG). Since may 2015, it is officially recognized by ISO/IEC and ITU-T as
+ a JPEG 2000 Reference Software."""
+
+toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/uclouvain/%(namelower)s/archive']
+sources = ['v%(version)s.tar.gz']
+checksums = ['0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a']
+
+builddependencies = [
+    ('binutils', '2.39'),
+    ('CMake', '3.24.3'),
+]
+# for running the binary of openjpeg like opj_compress you need the libraries like zlib etc.
+dependencies = [
+    ('zlib', '1.2.12'),
+    ('libpng', '1.6.38'),
+    ('LibTIFF', '4.4.0'),
+]
+
+sanity_check_paths = {
+    'files': [
+        'bin/opj_compress',
+        'bin/opj_decompress',
+        'bin/opj_dump',
+        'include/openjpeg-%(version_major)s.%(version_minor)s/openjpeg.h',
+        'lib/libopenjp2.%s' % SHLIB_EXT
+    ],
+    'dirs': ['bin', 'include', 'lib'],
+}
+
+moduleclass = 'lib'
diff --git a/o/OpenMPI/OpenMPI-4.1.6-NVHPC-23.5-CUDA-12.2.0.eb b/o/OpenMPI/OpenMPI-4.1.6-NVHPC-23.5-CUDA-12.2.0.eb
index 39962fbb..4ee91b5f 100644
--- a/o/OpenMPI/OpenMPI-4.1.6-NVHPC-23.5-CUDA-12.2.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.6-NVHPC-23.5-CUDA-12.2.0.eb
@@ -73,7 +73,8 @@ configopts += ' --with-hwloc=$EBROOTHWLOC'  # hwloc support
 configopts += ' --with-slurm' # Enable slurm
 configopts += ' --enable-mpi-cxx'  # Enable building the C++ MPI bindings
 configopts += ' --with-ucx=$EBROOTUCX'
-configopts += ' --with-knem=/opt/knem-1.1.4.90mlnx1'
+#configopts += ' --with-knem=/opt/knem-1.1.4.90mlnx1'
+configopts += ' --with-knem=/opt/knem-1.1.4.90mlnx3'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/p/pkgconfig/pkgconfig-1.5.5-GCCcore-12.2.0-Python-3.10.8.eb b/p/pkgconfig/pkgconfig-1.5.5-GCCcore-12.2.0-Python-3.10.8.eb
new file mode 100644
index 00000000..0cdafc57
--- /dev/null
+++ b/p/pkgconfig/pkgconfig-1.5.5-GCCcore-12.2.0-Python-3.10.8.eb
@@ -0,0 +1,31 @@
+# IT4Innovations
+# BS 2024
+
+easyblock = 'PythonPackage'
+
+name = 'pkgconfig'
+version = '1.5.5'
+# The -python versionsuffix is used to avoid confusion between
+# pkg-config (the tool) and pkgconfig (the Python wrappers)
+versionsuffix = '-Python-3.10.8'
+
+homepage = 'https://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+
+sources = [SOURCE_TAR_GZ]
+checksums = ['deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899']
+
+builddependencies = [('binutils', '2.39')]
+
+dependencies = [
+    ('Python', '3.10.8'),
+    ('pkgconf', '1.9.3'),
+]
+
+use_pip = True
+download_dep_fail = True
+sanity_pip_check = True
+
+moduleclass = 'devel'
diff --git a/p/pkgconfig/pkgconfig-1.8.0-GCCcore-10.2.0-Python-3.8.6.eb b/p/pkgconfig/pkgconfig-1.8.0-GCCcore-10.2.0-Python-3.8.6.eb
new file mode 100644
index 00000000..38861520
--- /dev/null
+++ b/p/pkgconfig/pkgconfig-1.8.0-GCCcore-10.2.0-Python-3.8.6.eb
@@ -0,0 +1,43 @@
+# IT4Innovations
+# BS 2024
+
+easyblock = 'PythonBundle'
+
+name = 'pkgconfig'
+version = '1.8.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'GCCcore', 'version': '10.2.0'}
+
+
+#source_urls = ['https://distfiles.ariadne.space/pkgconf/']
+#sources = [SOURCELOWER_TAR_GZ]
+#checksums = ['d7b6fdb522d81c11f5a0e0a0629a9f5480809ec90e595058674c1517822dfb8c']
+
+
+builddependencies = [('binutils', '2.35')]
+
+dependencies = [
+    ('Python', '2.7.18'),
+    ('pkg-config', '0.29.2'),
+]
+
+# Due to poetry doing the actual build of pkgconfig we need use_pip=False
+use_pip = False
+
+exts_list = [
+    # Not updating this since it is basically a build dep
+    ('poetry', '0.12.17', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/poetry/'],
+        'checksums': ['6e535de38df7e6ab46ff8d197f53632b071675287d1477efc7bf4a5c4c63bc3f'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pkgconfig/'],
+        'checksums': ['97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f'],
+    }),
+]
+
+moduleclass = 'devel'
diff --git a/p/pkgconfig/pkgconfig-1.9.3-GCCcore-12.2.0-Python-3.10.8.eb b/p/pkgconfig/pkgconfig-1.9.3-GCCcore-12.2.0-Python-3.10.8.eb
new file mode 100644
index 00000000..00a3974d
--- /dev/null
+++ b/p/pkgconfig/pkgconfig-1.9.3-GCCcore-12.2.0-Python-3.10.8.eb
@@ -0,0 +1,43 @@
+# IT4Innovations
+# BS 2024
+
+easyblock = 'PythonBundle'
+
+name = 'pkgconfig'
+version = '1.9.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+
+
+#source_urls = ['https://distfiles.ariadne.space/pkgconf/']
+#sources = [SOURCELOWER_TAR_GZ]
+#checksums = ['d7b6fdb522d81c11f5a0e0a0629a9f5480809ec90e595058674c1517822dfb8c']
+
+
+builddependencies = [('binutils', '2.39')]
+
+dependencies = [
+    ('Python', '3.10.8'),
+    ('pkg-config', '0.29.2'),
+]
+
+# Due to poetry doing the actual build of pkgconfig we need use_pip=False
+use_pip = False
+
+exts_list = [
+    # Not updating this since it is basically a build dep
+    ('poetry', '0.12.17', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/poetry/'],
+        'checksums': ['6e535de38df7e6ab46ff8d197f53632b071675287d1477efc7bf4a5c4c63bc3f'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pkgconfig/'],
+        'checksums': ['97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f'],
+    }),
+]
+
+moduleclass = 'devel'
diff --git a/p/poppler/poppler-0.90.1-GCCcore-10.2.0.eb b/p/poppler/poppler-0.90.1-GCCcore-10.2.0.eb
new file mode 100644
index 00000000..51735e88
--- /dev/null
+++ b/p/poppler/poppler-0.90.1-GCCcore-10.2.0.eb
@@ -0,0 +1,50 @@
+# IT4Innovation
+# BS 2024
+easyblock = 'CMakeMake'
+
+name = 'poppler'
+version = '0.90.1'
+
+homepage = 'https://poppler.freedesktop.org/'
+description = """Poppler is a PDF rendering library based on the xpdf-3.0 code
+ base."""
+
+toolchain = {'name': 'GCCcore', 'version': '10.2.0'}
+
+source_urls = ['https://poppler.freedesktop.org/']
+sources = [SOURCELOWER_TAR_XZ]
+checksums = ['984d82e72e91418d280885298c8bdc855a2fd92665fd52a1345b27235e0c71c4']
+
+separate_build_dir = True
+
+builddependencies = [
+    ('pkgconfig', '1.8.0', '-Python-2.7.18'),
+    ('binutils', '2.35'),
+    ('CMake', '3.18.4'),
+    ('Qt5', '5.14.2'),
+    ('cairo', '1.16.0'),
+    ('GObject-Introspection', '1.66.1'),   #'-Python-3.7.4'),
+    ('libjpeg-turbo', '2.0.5'),
+    ('libpng', '1.6.37'),
+    ('LibTIFF', '4.1.0'),
+    ('NSS', '3.57'),
+    ('OpenJPEG', '2.4.0'),
+]
+
+local_bin_files = ['pdfdetach', 'pdffonts', 'pdfimages', 'pdfinfo', 'pdfseparate',
+                   'pdftocairo', 'pdftohtml', 'pdftoppm', 'pdftops', 'pdftotext',
+                   'pdfunite']
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_bin_files] +
+             ['lib/libpoppler.%s' % SHLIB_EXT,
+              'lib/libpoppler-cpp.%s' % SHLIB_EXT,
+              'lib/libpoppler-glib.%s' % SHLIB_EXT,
+              'include/poppler/glib/poppler.h'],
+    'dirs': ['bin',
+             'include',
+             'include/poppler/glib',
+             ]
+}
+
+moduleclass = 'vis'
diff --git a/p/poppler/poppler-0.90.1-GCCcore-12.2.0.eb b/p/poppler/poppler-0.90.1-GCCcore-12.2.0.eb
new file mode 100644
index 00000000..45618325
--- /dev/null
+++ b/p/poppler/poppler-0.90.1-GCCcore-12.2.0.eb
@@ -0,0 +1,58 @@
+# IT4Innovation
+# BS 2024
+easyblock = 'CMakeMake'
+
+name = 'poppler'
+version = '0.90.1'
+
+homepage = 'https://poppler.freedesktop.org/'
+description = """Poppler is a PDF rendering library based on the xpdf-3.0 code
+ base."""
+
+toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+
+source_urls = ['https://poppler.freedesktop.org/']
+sources = [SOURCELOWER_TAR_XZ]
+checksums = ['984d82e72e91418d280885298c8bdc855a2fd92665fd52a1345b27235e0c71c4']
+
+separate_build_dir = True
+
+builddependencies = [
+    ('pkgconfig', '1.5.5', '-Python-3.10.8'),
+    ('binutils', '2.39'),
+    ('CMake', '3.24.3'),
+    ('Qt5', '5.15.7'),
+    ('cairo', '1.17.4'),
+    ('GObject-Introspection', '1.74.0', '-Python-3.10.8'),
+    ('libjpeg-turbo', '2.1.4'),
+    ('libpng', '1.6.38'),
+    ('LibTIFF', '4.4.0'),
+    ('NSS', '3.85'),
+    ('OpenJPEG', '2.5.0'),
+]
+
+
+#build_cmd = 'make'
+
+buildopts = 'MAKEFLAGS="-j 64"'
+
+#build_command = 'cmake -DCMAKE_BUILD_TYPE=Release . && make -j 64'
+
+local_bin_files = ['pdfdetach', 'pdffonts', 'pdfimages', 'pdfinfo', 'pdfseparate',
+                   'pdftocairo', 'pdftohtml', 'pdftoppm', 'pdftops', 'pdftotext',
+                   'pdfunite']
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_bin_files] +
+             ['lib/libpoppler.%s' % SHLIB_EXT,
+              'lib/libpoppler-cpp.%s' % SHLIB_EXT,
+              'lib/libpoppler-glib.%s' % SHLIB_EXT,
+              'include/poppler/glib/poppler.h'],
+    'dirs': ['bin',
+             'include',
+             'include/poppler/glib',
+             ]
+}
+
+
+moduleclass = 'vis'
diff --git a/p/poppler/poppler-21.06.1-GCC-10.2.0.eb b/p/poppler/poppler-21.06.1-GCC-10.2.0.eb
index 9b7cf20a..fc4ab660 100644
--- a/p/poppler/poppler-21.06.1-GCC-10.2.0.eb
+++ b/p/poppler/poppler-21.06.1-GCC-10.2.0.eb
@@ -14,18 +14,18 @@ toolchain = {'name': 'GCC', 'version': '10.2.0'}
 builddependencies = [
     ('CMake', '3.20.1'),
     ('pkg-config', '0.29.2'),
-    ('Python', '3.9.5', '-bare'),
+    ('Python', '2.7.18'),
 ]
 
 dependencies = [
-    ('freetype', '2.10.4'),
-    ('fontconfig', '2.13.93'),
-    ('libjpeg-turbo', '2.0.6'),
+    ('freetype', '2.10.3'),
+    ('fontconfig', '2.13.92'),
+    ('libjpeg-turbo', '2.0.5'),
     ('libpng', '1.6.37'),
-    ('NSS', '3.65'),
-    ('LibTIFF', '4.2.0'),
-    ('Qt5', '5.15.2'),
-    ('Boost', '1.76.0'),
+    ('NSS', '3.57'),
+    ('LibTIFF', '4.1.0'),
+    ('Qt5', '5.14.2'),
+    ('Boost', '1.74.0'),
     ('cairo', '1.16.0'),
     ('OpenJPEG', '2.4.0'),
     ('zlib', '1.2.11'),
diff --git a/q/Qt5/Qt5-5.14.2-GCCcore-10.2.0.eb b/q/Qt5/Qt5-5.14.2-GCCcore-10.2.0.eb
index e0a23dd3..a16e1ec7 100644
--- a/q/Qt5/Qt5-5.14.2-GCCcore-10.2.0.eb
+++ b/q/Qt5/Qt5-5.14.2-GCCcore-10.2.0.eb
@@ -47,7 +47,7 @@ builddependencies = [
     ('flex', '2.6.4'),
     ('gperf', '3.1'),
     ('Ninja', '1.10.1'),
-#    ('Python', '2.7.18'),
+    ('Python', '2.7.18'),
     ('re2c', '2.0.3')
 ]
 
diff --git a/t/texinfo/texinfo-6.7-GCCcore-10.2.0.eb b/t/texinfo/texinfo-6.7-GCCcore-10.2.0.eb
new file mode 100644
index 00000000..53bfa309
--- /dev/null
+++ b/t/texinfo/texinfo-6.7-GCCcore-10.2.0.eb
@@ -0,0 +1,40 @@
+# IT4Innovations
+# BS 2024
+
+easyblock = 'ConfigureMake'
+
+name = 'texinfo'
+version = '6.7'
+
+homepage = 'https://www.gnu.org/software/texinfo/'
+description = """Texinfo is the official documentation format of the GNU project."""
+
+toolchain = {'name': 'GCCcore', 'version': '10.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+checksums = ['f211ec3261383e1a89e4555a93b9d017fe807b9c3992fb2dff4871dae6da54ad']
+
+builddependencies = [('binutils', '2.35')]
+
+osdependencies = ['texlive']
+
+preinstallopts = "make TEXMF=%(installdir)s/texmf install-tex && "
+
+# This will overwrite a users $TEXMFHOME so this module is best used as a build dependency
+modextravars = {'TEXMFHOME': '%(installdir)s/texmf'}
+modloadmsg = "\n\nWARNING: This texinfo module has (re)defined the value for the environment variable $TEXMFHOME.\n"
+modloadmsg += "If you use a custom texmf directory (such as ~/texmf) you should copy files found in the\n"
+modloadmsg += "new $TEXMFHOME to your custom directory and reset the value of $TEXMFHOME to point to that space:\n"
+modloadmsg += "\tcp -r $TEXMFHOME/* /path/to/your/texmf\n"
+modloadmsg += "\texport TEXMFHOME=/path/to/your/texmf\n\n"
+
+sanity_check_paths = {
+    'files': [
+        'texmf/tex/texinfo/texinfo.tex',
+        'bin/install-info', 'bin/makeinfo', 'bin/pdftexi2dvi', 'bin/pod2texi', 'bin/texi2pdf'
+    ],
+    'dirs': ['bin', 'share', 'texmf'],
+}
+
+moduleclass = 'devel'
diff --git a/t/texlive/texlive-20210325-GCCcore-10.2.0-test.eb b/t/texlive/texlive-20210325-GCCcore-10.2.0-test.eb
new file mode 100644
index 00000000..4a5d0413
--- /dev/null
+++ b/t/texlive/texlive-20210325-GCCcore-10.2.0-test.eb
@@ -0,0 +1,67 @@
+# Based off the 2017 version by John Dey jfdey@fredhutch.org
+# https://github.com/easybuilders/easybuild-easyconfigs/pull/5085
+
+easyblock = 'Tarball'
+
+name = 'texlive'
+version = '20210325'
+local_version_year = version[:4]
+
+homepage = 'https://tug.org'
+description = """TeX is a typesetting language. Instead of visually formatting your text, you enter your manuscript
+ text intertwined with TeX commands in a plain text file. You then run TeX to produce formatted output, such as a
+ PDF file. Thus, in contrast to standard word processors, your document is a separate file that does not pretend to
+ be a representation of the final typeset output, and so can be easily edited and manipulated."""
+
+toolchain = {'name': 'GCC', 'version': '10.2.0'}
+
+source_urls = [
+    'ftp://tug.org/texlive/historic/%s/' % local_version_year,
+    'https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/%s/' % local_version_year,
+]
+sources = [
+    {
+        'download_filename': 'install-tl-unx.tar.gz',
+        'filename': 'install-tl-unx-%(version)s.tar.gz',
+    }
+]
+checksums = ['74eac0855e1e40c8db4f28b24ef354bd7263c1f76031bdc02b52156b572b7a1d']
+
+dependencies = [
+    ('X11', '20201008'),
+    ('libpng', '1.6.37'),
+    ('libGLU', '9.0.1'),
+    ('Perl', '5.32.0'),
+    ('HarfBuzz', '2.6.7'),
+    #('poppler', '21.06.1'),
+    ('cairo', '1.16.0'),
+    ('fontconfig', '2.13.92'),
+    ('zlib', '1.2.11'),
+    ('graphite2', '1.3.14'),
+]
+
+postinstallcmds = [
+    'echo "TEXDIR         %(installdir)s/" > %(installdir)s/texlive.profile && '
+    'echo "TEXMFLOCAL     %(installdir)s/texmf-local" >> %(installdir)s/texlive.profile && '
+    'echo "TEXMFSYSCONFIG %(installdir)s/texmf-config" >> %(installdir)s/texlive.profile && '
+    'echo "TEXMFSYSVAR    %(installdir)s/texmf-var" >> %(installdir)s/texlive.profile && '
+    '%(builddir)s/install-tl-%(version)s/install-tl -profile %(installdir)s/texlive.profile'
+    ' -repository ' + 'https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/%s/tlnet-final' % local_version_year
+]
+
+modextrapaths = {
+    'PATH': 'bin/%(arch)s-linux',
+    'INFOPATH': 'texmf-dist/doc/info',
+    'MANPATH': 'texmf-dist/doc/man',
+}
+modextravars = {
+    'TEXMFHOME': '%(installdir)s/texmf-dist'
+}
+
+sanity_check_paths = {
+    'files': ['bin/%(arch)s-linux/tex', 'bin/%(arch)s-linux/latex'],
+    'dirs': ['bin/%(arch)s-linux', 'texmf-dist'],
+}
+
+moduleclass = 'devel'
+
diff --git a/t/texlive/texlive-20210325-GCCcore-10.2.0-v2.eb b/t/texlive/texlive-20210325-GCCcore-10.2.0-v2.eb
new file mode 100644
index 00000000..99d451d3
--- /dev/null
+++ b/t/texlive/texlive-20210325-GCCcore-10.2.0-v2.eb
@@ -0,0 +1,62 @@
+# IT4Innovations
+# LK 2021
+
+easyblock = 'Tarball'
+
+name = 'texlive'
+version = '20210325'
+local_version_year = version[:4]
+
+homepage = 'https://tug.org'
+description = """TeX is a typesetting language. Instead of visually formatting your text, you enter your manuscript
+ text intertwined with TeX commands in a plain text file. You then run TeX to produce formatted output, such as a
+ PDF file. Thus, in contrast to standard word processors, your document is a separate file that does not pretend to
+ be a representation of the final typeset output, and so can be easily edited and manipulated."""
+
+toolchain = {'name': 'GCCcore', 'version': '10.2.0'}
+
+source_urls = ['https://pi.kwarc.info/historic/systems/texlive/2021/']
+sources = [
+    {
+        'download_filename': 'install-tl-unx.tar.gz',
+        'filename': 'install-tl-unx-%(version)s.tar.gz',
+    }
+]
+checksums = ['cba7ed246143e79864b991a9f88c2475']
+
+dependencies = [
+    ('X11', '20201008'),
+    ('libpng', '1.6.37'),
+    ('libGLU', '9.0.1'),
+    ('Perl', '5.32.0'),
+    ('HarfBuzz', '2.6.7'),
+#    ('poppler', '0.90.1'),
+    ('cairo', '1.16.0'),
+    ('fontconfig', '2.13.92'),
+    ('zlib', '1.2.11'),
+    ('graphite2', '1.3.14'),
+]
+
+postinstallcmds = [
+    'echo "TEXDIR         %(installdir)s/" > %(installdir)s/texlive.profile && '
+    'echo "TEXMFLOCAL     %(installdir)s/texmf-local" >> %(installdir)s/texlive.profile && '
+    'echo "TEXMFSYSCONFIG %(installdir)s/texmf-config" >> %(installdir)s/texlive.profile && '
+    'echo "TEXMFSYSVAR    %(installdir)s/texmf-var" >> %(installdir)s/texlive.profile && '
+    '%(builddir)s/install-tl-%(version)s/install-tl -profile %(installdir)s/texlive.profile'
+]
+
+modextrapaths = {
+    'PATH': 'install/bin/x86_64-linux',
+    'INFOPATH': 'install/texmf-dist/doc/info',
+    'MANPATH': 'install/texmf-dist/doc/man',
+}
+modextravars = {
+    'TEXMFHOME': '%(installdir)s/install/texmf-dist'
+}
+
+sanity_check_paths = {
+    'files': ['install/bin/x86_64-linux/tex', 'install/bin/x86_64-linux/latex'],
+    'dirs': ['install/bin/x86_64-linux', 'install/texmf-dist'],
+}
+
+moduleclass = 'devel'
diff --git a/t/texlive/texlive-20210325-GCCcore-10.2.0.eb b/t/texlive/texlive-20210325-GCCcore-10.2.0.eb
index bb6908e5..2ef4b006 100644
--- a/t/texlive/texlive-20210325-GCCcore-10.2.0.eb
+++ b/t/texlive/texlive-20210325-GCCcore-10.2.0.eb
@@ -6,6 +6,7 @@ easyblock = 'Tarball'
 name = 'texlive'
 version = '20210325'
 
+
 homepage = 'https://tug.org'
 description = """TeX is a typesetting language. Instead of visually formatting your text, you enter your manuscript
  text intertwined with TeX commands in a plain text file. You then run TeX to produce formatted output, such as a
@@ -29,7 +30,7 @@ dependencies = [
     ('libGLU', '9.0.1'),
     ('Perl', '5.32.0'),
     ('HarfBuzz', '2.6.7'),
-#    ('poppler', '0.90.1'),
+    ('poppler', '21.06.1'),
     ('cairo', '1.16.0'),
     ('fontconfig', '2.13.92'),
     ('zlib', '1.2.11'),
diff --git a/t/texlive/texlive-20210325-GCCcore-12.2.0.eb b/t/texlive/texlive-20210325-GCCcore-12.2.0.eb
new file mode 100644
index 00000000..2403a8a2
--- /dev/null
+++ b/t/texlive/texlive-20210325-GCCcore-12.2.0.eb
@@ -0,0 +1,62 @@
+# IT4Innovations
+# BS 2024
+
+easyblock = 'Tarball'
+
+name = 'texlive'
+version = '20210325'
+
+
+homepage = 'https://tug.org'
+description = """TeX is a typesetting language. Instead of visually formatting your text, you enter your manuscript
+ text intertwined with TeX commands in a plain text file. You then run TeX to produce formatted output, such as a
+ PDF file. Thus, in contrast to standard word processors, your document is a separate file that does not pretend to
+ be a representation of the final typeset output, and so can be easily edited and manipulated."""
+
+toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+
+source_urls = ['https://pi.kwarc.info/historic/systems/texlive/2021/']
+sources = [
+    {
+        'download_filename': 'install-tl-unx.tar.gz',
+        'filename': 'install-tl-unx-%(version)s.tar.gz',
+    }
+]
+checksums = ['cba7ed246143e79864b991a9f88c2475']
+
+dependencies = [
+    ('X11', '20221110'),
+    ('libpng', '1.6.38'),
+    ('libGLU', '9.0.2'),
+    ('Perl', '5.36.0'),
+    ('HarfBuzz', '5.3.1'),
+    ('poppler', '0.90.1'),
+    ('cairo', '1.17.4'),
+    ('fontconfig', '2.14.1'),
+    ('zlib', '1.2.12'),
+    ('graphite2', '1.3.14'),
+]
+
+postinstallcmds = [
+    'echo "TEXDIR         %(installdir)s/" > %(installdir)s/texlive.profile && '
+    'echo "TEXMFLOCAL     %(installdir)s/texmf-local" >> %(installdir)s/texlive.profile && '
+    'echo "TEXMFSYSCONFIG %(installdir)s/texmf-config" >> %(installdir)s/texlive.profile && '
+    'echo "TEXMFSYSVAR    %(installdir)s/texmf-var" >> %(installdir)s/texlive.profile && '
+    '%(builddir)s/install-tl-%(version)s/install-tl -profile %(installdir)s/texlive.profile'
+]
+
+modextrapaths = {
+    'PATH': 'install/bin/x86_64-linux',
+    'INFOPATH': 'install/texmf-dist/doc/info',
+    'MANPATH': 'install/texmf-dist/doc/man',
+}
+modextravars = {
+    'TEXMFHOME': '%(installdir)s/install/texmf-dist'
+}
+
+sanity_check_paths = {
+    'files': ['install/bin/x86_64-linux/tex', 'install/bin/x86_64-linux/latex'],
+    'dirs': ['install/bin/x86_64-linux', 'install/texmf-dist'],
+}
+
+moduleclass = 'devel'