diff --git a/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-gpsmkl-2021b.eb b/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-gpsmkl-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b1a80472f5caf718f67c2bb9b73c68420a393db3
--- /dev/null
+++ b/Golden_Repo/a/ADIOS2/ADIOS2-2.7.1-gpsmkl-2021b.eb
@@ -0,0 +1,166 @@
+easyblock = 'CMakeMake'
+
+name = 'ADIOS2'
+version = '2.7.1'
+
+homepage = 'https://www.olcf.ornl.gov/center-projects/adios/'
+description = """The Adaptable IO System (ADIOS) provides a simple,
+flexible way for scientists to describe the data in their code that may
+need to be written, read, or processed outside of the running
+simulation."""
+
+toolchain = {'name': 'gpsmkl', 'version': '2021b'}
+toolchainopts = {'pic': True, 'usempi': False}
+
+github_account = 'ornladios'
+source_urls = [GITHUB_SOURCE]
+sources = ['v%(version)s.tar.gz']
+checksums = ['c8e237fd51f49d8a62a0660db12b72ea5067512aa7970f3fcf80b70e3f87ca3e']
+patches = ['include4gcc11.patch']
+
+builddependencies = [
+    ('CMake', '3.21.1'),
+    ('pkg-config', '0.29.2'),
+]
+
+dependencies = [
+    ('Python', '3.9.6'),
+    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
+    ('zlib', '1.2.11'),
+    ('bzip2', '1.0.8'),
+    ('Szip', '2.1.1'),
+    ('SZ', '2.1.12'),
+    ('zfp', '0.5.5'),
+    ('Blosc', '1.21.1'),
+    ('HDF5', '1.12.1'),
+    ('mpi4py', '3.1.3'),
+    ('libpng', '1.6.37'),
+    ('ZeroMQ', '4.3.4'),
+    ('nlohmann-json', '3.10.4'),
+    ('pybind11', '2.7.1'),
+]
+
+separate_build_dir = True
+
+configopts = "-DCMAKE_VERBOSE_MAKEFILE=ON "
+
+configopts += "-DADIOS2_USE_Fortran=ON "
+configopts += "-DADIOS2_USE_MPI=ON "
+
+# Examples/Testing
+configopts += "-DADIOS2_BUILD_EXAMPLES=OFF "
+configopts += "-DADIOS2_BUILD_EXAMPLES_EXPERIMENTAL=OFF "
+configopts += "-DADIOS2_BUILD_TESTING=OFF "
+
+# Compression
+configopts += "-DADIOS2_USE_BZip2=ON "
+configopts += "-DBZIP2_DIR=${EBROOTBZIP2} "
+
+configopts += "-DADIOS2_USE_PNG=ON "
+configopts += "-DPNG_DIR=${EBROOTLIBPNG} "
+
+configopts += "-DADIOS2_USE_SZ=ON "
+configopts += "-DSZ_DIR=${EBROOTSZ} "
+
+configopts += "-DADIOS2_USE_ZFP=ON "
+configopts += "-DZFP_DIR=${EBROOTZFP} "
+
+configopts += "-DADIOS2_USE_Blosc=ON "
+configopts += "-DBLOSC_DIR=${EBROOTBLOSC} "
+
+configopts += "-DZLIB_DIR=${EBROOTZLIB} "
+configopts += "-DADIOS2_USE_MGARD=OFF "
+
+# HDF5
+configopts += "-DADIOS2_USE_HDF5=ON "
+configopts += "-DHDF5_DIR=${EBROOTHDF5} "
+
+# ZeroMQ
+configopts += "-DADIOS2_USE_ZeroMQ=ON "
+configopts += "-DZeroMQ_DIR=${EBROOTZEROMQ} "
+
+# Python
+configopts += "-DADIOS2_USE_Python=ON "
+configopts += "-DPython_DIR=${EBROOTPYTHON} "
+
+# System Virtual Shared Memory
+configopts += "-DADIOS2_USE_SysVShMem=ON "
+
+# Strong Staging Coupler
+# https://adios2.readthedocs.io/en/latest/engines/engines.html#ssc-strong-staging-coupler
+configopts += "-DADIOS2_USE_SSC=ON "
+
+# Sustainable Staging Transport
+# https://adios2.readthedocs.io/en/latest/engines/engines.html#sst-sustainable-staging-transport
+configopts += "-DADIOS2_USE_SST=ON "
+# Can optionally use LibFabric for RDMA transport: if -DLIBFABRIC_ROOT=<path> is set.
+
+# DataMan
+# https://adios2.readthedocs.io/en/latest/engines/engines.html#dataman-for-wide-area-network-data-staging
+configopts += "-DADIOS2_USE_DataMan=ON "
+
+# DataSpaces (mind. version 1.8)
+configopts += "-DADIOS2_USE_DataSpaces=OFF "
+
+# external libs
+configopts += "-DADIOS2_USE_EXTERNAL_PYBIND11=ON "
+configopts += "-Dpybind11_DIR=${EBROOTPYBIND11} "
+configopts += "-DADIOS2_USE_EXTERNAL_NLOHMANN_JSON=ON "
+configopts += "-Dnlohmann_json_DIR=${EBROOTNLOHMANNMINJSON} "
+
+# more options
+configopts += "-DADIOS2_USE_IME=OFF "
+configopts += "-DADIOS2_USE_Profiling=OFF "
+configopts += "-DADIOS2_USE_Table=OFF "
+# configopts += "-DADIOS2_USE_Endian_Reverse=ON "
+
+runtest = False
+
+# create pkgconfig files
+postinstallcmds = [
+    'mkdir %(installdir)s/lib/pkgconfig',
+    """echo -e "Name: adios2
+Description: ADIOS2 I/O library
+Version: %(version)s
+Requires: bzip2, zfp, sz, libpng, blosc
+Libs: $(%(installdir)s/bin/adios2-config --c-libs)
+Cflags: $(%(installdir)s/bin/adios2-config --c-flags)" > %(installdir)s/lib/pkgconfig/adios2.pc""",
+    """echo -e "Name: adios2_cxx
+Description: ADIOS2 I/O library (C++)
+Version: %(version)s
+Libs: $(%(installdir)s/bin/adios2-config --cxx-libs)
+Cflags: $(%(installdir)s/bin/adios2-config --cxx-flags)" > %(installdir)s/lib/pkgconfig/adios2_cxx.pc""",
+    """echo -e "Name: adios2_f
+Description: ADIOS2 I/O library (Fortran)
+Version: %(version)s
+Libs: $(%(installdir)s/bin/adios2-config --fortran-libs)
+Cflags: $(%(installdir)s/bin/adios2-config --fortran-flags)" > %(installdir)s/lib/pkgconfig/adios2_f.pc""",
+]
+
+sanity_check_paths = {
+    'files': ['bin/adios2-config', 'bin/bpls', 'bin/bp4dbg'],
+    'files': ['include/adios2.h', 'include/adios2_c.h', 'include/adios2/fortran/adios2.mod'],
+    'files': [
+             	'lib64/libadios2_core.so', 'lib64/libadios2_core_mpi.so', 'lib64/cmake/adios2/adios2-config.cmake',
+                'lib64/libadios2_c.so', 'lib64/libadios2_c_mpi.so', 'lib64/libadios2_cxx11.so',
+                'lib64/libadios2_cxx11_mpi.so', 'lib64/libadios2_fortran.so', 'lib64/libadios2_fortran_mpi.so'
+             ],
+    'dirs': ['lib/python%(pyshortver)s/site-packages']
+}
+
+sanity_check_paths = {
+    'files': ['bin/adios2-config', 'bin/bpls'],
+    'dirs': ['include/adios2', 'lib/python%(pyshortver)s'],
+}
+
+modextrapaths = {
+    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
+}
+
+modextravars = {
+    'ADIOS2_PKGCONFIG_LIBS': 'adios2',
+    'ADIOS2_CXX_PKGCONFIG_LIBS': 'adios2_cxx',
+    'ADIOS2_FORTRAN_PKGCONFIG_LIBS': 'adios2_f',
+}
+
+moduleclass = 'data'
diff --git a/Golden_Repo/a/ADIOS2/include4gcc11.patch b/Golden_Repo/a/ADIOS2/include4gcc11.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e0714c2d8842b86ec90d996fa1b8131857671c54
--- /dev/null
+++ b/Golden_Repo/a/ADIOS2/include4gcc11.patch
@@ -0,0 +1,22 @@
+From 8d04bda12988ac4190780e1d75bedaf3e510d32c Mon Sep 17 00:00:00 2001
+From: Erik Schnetter <schnetter@gmail.com>
+Date: Thu, 20 May 2021 08:55:59 -0400
+Subject: [PATCH] Add missing #include <memory>
+
+Closes https://github.com/ornladios/ADIOS2/issues/2709
+---
+ source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h b/source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h
+index 3648ded1d..a0c381a05 100644
+--- a/source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h
++++ b/source/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h
+@@ -11,6 +11,7 @@
+ #ifndef ADIOS2_TOOLKIT_ZMQ_ZMQPUBSUB_H_
+ #define ADIOS2_TOOLKIT_ZMQ_ZMQPUBSUB_H_
+ 
++#include <memory>
+ #include <mutex>
+ #include <queue>
+ #include <thread>
diff --git a/Golden_Repo/b/Blosc/Blosc-1.21.1-GCCcore-11.2.0.eb b/Golden_Repo/b/Blosc/Blosc-1.21.1-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35ae6fea852d209436bf2c413a4e9c526f6bbd41
--- /dev/null
+++ b/Golden_Repo/b/Blosc/Blosc-1.21.1-GCCcore-11.2.0.eb
@@ -0,0 +1,28 @@
+easyblock = 'CMakeMake'
+
+name = 'Blosc'
+version = '1.21.1'
+
+homepage = 'https://www.blosc.org/'
+
+description = "Blosc, an extremely fast, multi-threaded, meta-compressor library"
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True, 'cstd': 'c++11'}
+
+source_urls = ['https://github.com/Blosc/c-blosc/archive/']
+sources = ['v%(version)s.tar.gz']
+checksums = ['f387149eab24efa01c308e4cba0f59f64ccae57292ec9c794002232f7903b55b']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+]
+
+sanity_check_paths = {
+    'files': ['include/blosc-export.h', 'include/blosc.h', 'lib/libblosc.a',
+              'lib/libblosc.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/p/ParaView/ParaView-5.10.0-EGL-gpsmkl-2021b.eb b/Golden_Repo/p/ParaView/ParaView-5.10.0-EGL-gpsmkl-2021b.eb
index cbf2327c20c0ce7981ff52174a5c9899a446d64e..35ca0b8f1a74fa89d0108b98b52038e34b924dc4 100644
--- a/Golden_Repo/p/ParaView/ParaView-5.10.0-EGL-gpsmkl-2021b.eb
+++ b/Golden_Repo/p/ParaView/ParaView-5.10.0-EGL-gpsmkl-2021b.eb
@@ -8,7 +8,7 @@ homepage = "http://www.paraview.org"
 description = """Paraview is a scientific parallel visualizer.
 """
 
-toolchain = {'name': 'gpsmkl', 'version': '2021bbb'}
+toolchain = {'name': 'gpsmkl', 'version': '2021b'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile='
@@ -40,7 +40,7 @@ dependencies = [
     ('netCDF', '4.8.1'),
     ('netCDF-C++4', '4.3.1'),
     ('netCDF-Fortran', '4.5.3'),
-    ('mpi4py', '3.0.3', '-Python-%(pyver)s'),
+    ('mpi4py', '3.1.3') # , '-Python-%(pyver)s'),
     ('nlohmann-json', '3.10.4'),  # for ParFlow plugin
     # ('VTK', '8.2.0', '-Python-%(pyver)s', ('gcccoremkl', '8.3.0-2019.3.199')),
     # ('VTKm','1.1.0','-AVX2'),
diff --git a/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b.eb b/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b.eb
index 927bd9284da83f5b1fce9c52cec7ad901c764e8e..d7fe95f1007227608c1c460b6f84d1f14dab6f06 100644
--- a/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b.eb
+++ b/Golden_Repo/p/ParaView/ParaView-5.10.0-gpsmkl-2021b.eb
@@ -13,11 +13,12 @@ toolchainopts = {'pic': True, 'usempi': True}
 local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile='
 source_urls = [('http://www.paraview.org/paraview-downloads/%s' % local_dwnlsfx_src)]
 sources = [("ParaView-v%(version)s.tar.gz")]
-checksums = [('sha256', '3e5e4cc08cb0c418e7e27300f3304a492c299798a25dea4abdb8bb93c0af4a64')]
+checksums = [('sha256', '4273dd90c858a6440a72d9c1ad054e76f336446138c895148a797b486603afbd')]
 
 builddependencies = [
     ('CMake', '3.21.1', '', SYSTEM),
     ('git', '2.33.1', '-nodocs'),
+    ('pkg-config', '0.29.2'),
 ]
 
 dependencies = [
@@ -26,6 +27,7 @@ dependencies = [
     ('X11', '20210802'),
     ('bzip2', '1.0.8'),
     ('HDF5', '1.12.1'),
+    ('ADIOS2', '2.7.1'),
     ('FFmpeg', '4.4.1'),
     ('Embree', '3.13.2'),
     ('OSPRay', '2.8.0'),
@@ -39,13 +41,12 @@ dependencies = [
     ('netCDF', '4.8.1'),
     ('netCDF-C++4', '4.3.1'),
     ('netCDF-Fortran', '4.5.3'),
-    ('mpi4py', '3.0.3', '-Python-%(pyver)s'),
-    ('nlohmann-json', '3.10.4'),  # for ParFlow plugin
-    # ('VTK', '8.2.0', '-Python-%(pyver)s', ('gcccoremkl', '8.3.0-2019.3.199')),
-    # ('VTKm','1.1.0','-AVX2'),
+    ('mpi4py', '3.1.3'),
+    ('nlohmann-json', '3.10.4'),
+    ('double-conversion', '3.1.6'),
+    ('Eigen', '3.3.9'),
     ('Qt5', '5.15.2'),
-    ('SciPy-Stack', '2021b', '-Python-%(pyver)s', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('VirtualGL', '2.6.4'),
+    ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
     ('OpenGL', '2021b'),
 ]
 
@@ -60,26 +61,22 @@ separate_build_dir = True
 # https://gitlab.kitware.com/paraview/paraview/blob/master/Documentation/dev/build.md  #
 ########################################################################################
 
-configopts = '-DCMAKE_POLICY_DEFAULT_CMP0074=OLD '
-configopts += '-DCMAKE_POLICY_DEFAULT_CMP0077=OLD '
+# configopts = '-DCMAKE_POLICY_DEFAULT_CMP0074=OLD '
+# configopts += '-DCMAKE_POLICY_DEFAULT_CMP0077=OLD '
 
 # --- general settings --- #
+configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
 configopts += '-DCMAKE_CXX_STANDARD=11 '
-configopts += '-DCXX_STANDARD_REQUIRED=ON '
-configopts += '-DCMAKE_CXX_EXTENSIONS=OFF '  # eg.-std=c++11 rather than -std=gnu++11
-configopts += '-DVTK_USE_CXX11_FEATURES=ON '
-# configopts  = '-DCMAKE_VERBOSE_MAKEFILE=ON '
 
 configopts += '-DBUILD_TESTING=OFF '  # Without internet connection turn off testing
 # Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
 # and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
 # configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
+# configopts += '-DExternalData_URL_TEMPLATES= '
+# configopts += '-DVTK_DATA_STORE=%(algo)/%(hash) '
 
 configopts += '-DBUILD_EXAMPLES=ON '
 
-configopts += '-DCMAKE_BUILD_TYPE=Release '
-configopts += '-DZLIB_LIBRARY_DEBUG=$EBROOTZLIB/lib/libz.so '
-
 # https://forum.openframeworks.cc/t/nvidia-drivers-pthreads-and-segfaults/2524
 configopts += '-DCMAKE_CXX_FLAGS="-lpthread $CMAKE_CXX_FLAGS" '
 configopts += '-DCMAKE_C_FLAGS="-lpthread $CMAKE_C_FLAGS" '
@@ -87,13 +84,16 @@ configopts += '-DCMAKE_C_FLAGS="-lpthread $CMAKE_C_FLAGS" '
 configopts += '-DPARAVIEW_BUILD_EDITION=CANONICAL '
 configopts += '-DPARAVIEW_BUILD_WITH_KITS=OFF '
 configopts += '-DPARAVIEW_USE_QT=ON '
-configopts += '-DPARAVIEW_QT_VERSION=5 '
+
+# --- web --- #
 configopts += '-DPARAVIEW_ENABLE_WEB=ON '
+configopts += '-DPARAVIEW_USE_QTWEBENGINE=ON '
+configopts += '-DVTK_MODULE_ENABLE_ParaView_PVWebPython=YES '
 
-configopts += '-DPARAVIEW_SHARED_LIBS=ON '
+# --- python --- #
 configopts += '-DPARAVIEW_USE_PYTHON=ON '
 configopts += '-DPARAVIEW_PYTHON_VERSION=3 '
-configopts += "-DPYTHON_EXECUTABLE=$EBROOTPYTHON/bin/python "
+configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python "
 
 configopts += '-DVTK_PYTHON_VERSION=3 '
 configopts += '-DVTK_NO_PYTHON_THREADS=OFF '
@@ -114,12 +114,14 @@ configopts += '-DPARAVIEW_USE_MPI=ON '
 configopts += '-DXDMF_BUILD_MPI=ON '
 configopts += '-DPARAVIEW_ENABLE_XDMF3=ON '
 
+configopts += '-DPARAVIEW_ENABLE_ADIOS2=ON '
+# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderPixie=ON '  # req. ADIOS1
+# configopts += '-DPARAVIEW_PLUGIN_ENABLE_AdiosReaderStaging=ON ' # req. ADIOS1
+
 # --- large data --- #
 configopts += '-DVTK_USE_64BIT_IDS=ON '
-configopts += '-DVTK_USE_LARGE_DATA=ON '
 
 # --- rendering --- #
-configopts += '-DVTK_RENDERING_BACKEND:STRING=OpenGL2 '
 
 # OpenGL (hardware)
 #  https://kitware.github.io/paraview-docs/latest/cxx/Offscreen.html
@@ -180,40 +182,50 @@ configopts += '-DPARAVIEW_ENABLE_RAYTRACING=ON '
 configopts += '-DVTK_ENABLE_OSPRAY=ON '
 configopts += '-DVTK_ENABLE_VISRTX=OFF '
 
-configopts += '-DPARAVIEW_USE_OSPRAY=ON '
 configopts += "-Dospray_DIR=${EBROOTOSPRAY} "
 configopts += "-Dembree_DIR=${EBROOTEMBREE}/lib64/cmake/embree-3.12.2 "
 configopts += '-DModule_vtkRenderingOSPRay=ON '
 configopts += '-DVTKOSPRAY_ENABLE_DENOISER=OFF '
 
+# configopts += '-DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX=YES '
+
 # --- extra libs --- #
 # configopts += "-DVTKm_DIR=$EBROOTVTKM/lib/cmake/vtkm-1.1/ "
 configopts += '-DPARAVIEW_USE_VTKM=ON '
-configopts += '-DModule_vtkAcceleratorsVTKm=ON '
+configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES '
+configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES '
+configopts += '-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES '
+
 configopts += '-DVTKm_Vectorization=AVX2 '
 configopts += '-DVTKm_ENABLE_OPENMP=ON '
-# configopts += '-DVTKm_ENABLE_MPI=ON '
+configopts += '-DVTKm_ENABLE_MPI=ON '
+# configopts += '-DVTKm_ENABLE_HDF5_IO=OFF '
+# configopts += '-DVTKm_ENABLE_KOKKOS=OFF '
+# configopts += '-DVTKm_ENABLE_TBB=OFF '
 # configopts += '-DVTKm_ENABLE_LOGGING=ON '
 # configopts += '-DVTKm_ENABLE_CUDA=ON '
 
 configopts += "-DFFMPEG_ROOT=$EBROOTFFMPEG "
 configopts += '-DPARAVIEW_ENABLE_FFMPEG=ON '
-configopts += '-DModule_vtkIOFFMPEG=ON '
-configopts += '-DModule_vtkIOVideo=ON '
+configopts += '-DVTK_MODULE_ENABLE_VTK_IOFFMPEG=YES '
+configopts += '-DVTK_MODULE_ENABLE_VTK_IOVideo=YES '
 
 configopts += '-DModule_SignedTensor=ON '
 
-configopts += '-DModule_vtkDICOM=ON '
+configopts += '-DVTK_MODULE_ENABLE_VTK_DICOMParser=YES '
 
 # configopts += '-DModule_vtkFiltersMatlab=OFF '
-configopts += '-DModule_vtkFiltersReebGraph=ON '
-configopts += '-DModule_vtkFiltersSMP=ON '
-configopts += '-DModule_vtkFiltersSelection=ON '
+configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersReebGraph=YES '
+configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSMP=YES '
+configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersSelection=YES '
+configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTopology=YES '
+configopts += '-DVTK_MODULE_ENABLE_VTK_FiltersTexture=YES '
 # configopts += '-DModule_vtkFiltersStatisticsGnu=OFF '
-configopts += '-DModule_vtkFiltersTopology=ON '
 
 # --- coupling --- #
-# configopts += '-DPARAVIEW_ENABLE_CATALYST=ON '  # variable is obsolete and no longer has any effect
+configopts += '-DCATALYST_BUILD_TOOLS=ON '
+configopts += '-DVTK_MODULE_ENABLE_ParaView_InSitu=YES '
+configopts += '-DVTK_MODULE_ENABLE_ParaView_PythonCatalyst=YES '
 
 # --- development & testing --- #
 configopts += '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON '
@@ -229,28 +241,29 @@ configopts += '-DXDMF_USE_BZIP2=ON '
 configopts += '-DXDMF_USE_GZIP=ON '
 
 # --- VTK external libraries --- #
-configopts += '-DVTK_USE_SYSTEM_EXPAT=ON '
-configopts += '-DVTK_USE_SYSTEM_FREETYPE=ON '
-configopts += '-DVTK_USE_SYSTEM_HDF5=ON '
-configopts += '-DVTK_USE_SYSTEM_JPEG=ON '
-configopts += '-DVTK_USE_SYSTEM_LIBXML2=ON '
-configopts += '-DVTK_USE_SYSTEM_MPI4PY=ON '
-configopts += '-DVTK_USE_SYSTEM_NETCDF=ON '
-configopts += '-DVTK_USE_SYSTEM_PNG=ON '
-configopts += '-DVTK_USE_SYSTEM_PYGMENTS=ON '
-configopts += '-DVTK_USE_SYSTEM_SIX=ON '
-configopts += '-DVTK_USE_SYSTEM_TIFF=ON '
-configopts += '-DVTK_USE_SYSTEM_ZLIB=ON '
-configopts += '-DNETCDF_CXX_ROOT=$EBROOTNETCDFMINCPLUSPLUS '
-configopts += '-DNETCDF_F77_ROOT=$EBROOTNETCDFMINFORTRAN '
-configopts += '-DNETCDF_F90_ROOT=$EBROOTNETCDFMINFORTRAN '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON '
+configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON '
+configopts += '-Dnetcdf_cxx_DIR=$EBROOTNETCDFMINCPLUSPLUS '
+configopts += '-Dnetcdf_f77_DIR=$EBROOTNETCDFMINFORTRAN '
+configopts += '-Dnetcdf_f90_DIR=$EBROOTNETCDFMINFORTRAN '
 
 # --- ParaView Extra-Reader --- #
 configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=ON '
 
 # https://gitlab.kitware.com/paraview/visitbridge/-/blob/master/databases/CMakeLists.txt
 configopts += '-DPARAVIEW_ENABLE_VISITBRIDGE=ON '
-configopts += '-DVISIT_BUILD_READER_Nek5000=ON '
+configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES '
+# configopts += '-DVISIT_BUILD_READER_Nek5000=ON '
 # configopts += '-DVISIT_BUILD_READER_Boxlib3D=ON '  # req. external dependency
 # configopts += '-DVISIT_BUILD_READER_Mili=ON '  # req. external dependency
 # configopts += '-DVISIT_BUILD_READER_Silo=ON '  # req. external dependency
diff --git a/Golden_Repo/s/SZ/SZ-2.1.12-GCCcore-11.2.0.eb b/Golden_Repo/s/SZ/SZ-2.1.12-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9d5d3edbf06906fa9db1969e2f8ad8a2aa0f36d3
--- /dev/null
+++ b/Golden_Repo/s/SZ/SZ-2.1.12-GCCcore-11.2.0.eb
@@ -0,0 +1,43 @@
+easyblock = 'CMakeMake'
+
+name = 'SZ'
+version = '2.1.12'
+
+homepage = 'https://szcompressor.org'
+description = """SZ is a modular parametrizable lossy compressor framework
+for scientific data (floating point and integers)."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+github_account = 'szcompressor'
+source_urls = [GITHUB_SOURCE]
+sources = ['v%(version)s.tar.gz']
+checksums = ['3712b2cd7170d1511569e48a208f02dfb72ecd7ad053c321e2880b9083e150de']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+    ('pkg-config', '0.29.2'),
+]
+
+dependencies = [
+    ('HDF5', '1.12.1', '-serial'),
+    ('netCDF', '4.8.1', '-serial'),
+]
+
+separate_build_dir = True
+
+configopts = "-DCMAKE_VERBOSE_MAKEFILE=ON "
+
+configopts += "-DBUILD_FORTRAN=ON "
+configopts += "-DBUILD_HDF5_FILTER=ON "
+configopts += "-DBUILD_NETCDF_READER=ON "
+configopts += "-DBUILD_OPENMP=ON "
+
+sanity_check_paths = {
+    'files': ['bin/sz', 'lib/libSZ.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include', 'lib'],
+}
+
+moduleclass = 'data'
diff --git a/Golden_Repo/z/zfp/zfp-0.5.5-GCCcore-11.2.0.eb b/Golden_Repo/z/zfp/zfp-0.5.5-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c0294b79c1de733a0798e8cb7c1e32b607c3b8b1
--- /dev/null
+++ b/Golden_Repo/z/zfp/zfp-0.5.5-GCCcore-11.2.0.eb
@@ -0,0 +1,59 @@
+easyblock = 'CMakeMake'
+
+name = 'zfp'
+version = '0.5.5'
+
+homepage = "https://github.com/LLNL/zfp"
+description = """Optionally error-bounded lossy compressor for HPC data
+with high throughput read and write random access to individual array elements."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True}
+
+github_account = 'LLNL'
+source_urls = [GITHUB_SOURCE]
+sources = ['%(version)s.tar.gz']
+checksums = ['6a7f4934489087d9c117a4af327fd6495ea757924f4df467b9c537abf8bd86c4']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+    ('pkg-config', '0.29.2'),
+]
+
+separate_build_dir = True
+
+configopts = '-DBUILD_SHARED_LIBS:BOOL=ON '
+configopts += '-DBUILD_EXAMPLES:BOOL=OFF '
+configopts += '-DBUILD_TESTING:BOOL=OFF '
+
+configopts += '-DZFP_WITH_OPENMP:BOOL=ON '
+configopts += '-DZFP_WITH_CUDA:BOOL=OFF '
+
+configopts += '-DBUILD_CFP:BOOL=ON '
+configopts += '-DBUILD_ZFPY:BOOL=OFF ' # fails
+configopts += '-DBUILD_ZFORP:BOOL=ON '
+
+configopts += '-DBUILD_UTILITIES:BOOL=ON '
+configopts += '-DCMAKE_C_STANDARD_LIBRARIES="-lm" ' # needed to link UTILITIES
+
+# create pkgconfig file
+postinstallcmds = [
+    "mkdir -p %(installdir)s/lib/pkgconfig",
+    """echo -e "prefix=%(installdir)s
+libdir=\${prefix}/lib64
+includedir=\${prefix}/include
+Name: %(name)s
+Description: %(name)s compression library
+Version: %(version)s
+Requires:
+Libs: -L\${libdir} -lzfp -lcfp
+Cflags: -I\${includedir}" > %(installdir)s/lib/pkgconfig/%(name)s.pc""",
+]
+
+sanity_check_paths = {
+    'files': ['lib64/libzfp.so', 'lib64/libcfp.so', 'include/zfp.h'],
+    'dirs': ['lib/pkgconfig' ]
+}
+
+moduleclass = 'lib'