diff --git a/config/elpa/configure-elpa-gnu.sh b/config/elpa/configure-elpa-gnu.sh
index ec4edd1..33ccaf2 100755
--- a/config/elpa/configure-elpa-gnu.sh
+++ b/config/elpa/configure-elpa-gnu.sh
@@ -70,14 +70,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 # Development versions may require autotools mechanics
 if [ -e "${HERE}/autogen.sh" ]; then
@@ -100,8 +95,8 @@ fi
 
 if [ -e "${HERE}/Makefile" ]; then
   sed -i \
-    -e "s/-openmp/-qopenmp/" \
     -e "s/all-am:\(.*\) \$(PROGRAMS)/all-am:\1/" \
+    -e "s/-fopenmp/-qopenmp/" \
     Makefile
 fi
 
diff --git a/config/elpa/configure-elpa-hsw-gnu.sh b/config/elpa/configure-elpa-hsw-gnu.sh
index c951597..7e6fe55 100755
--- a/config/elpa/configure-elpa-hsw-gnu.sh
+++ b/config/elpa/configure-elpa-hsw-gnu.sh
@@ -62,14 +62,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 # Development versions may require autotools mechanics
 if [ -e "${HERE}/autogen.sh" ]; then
@@ -93,8 +88,8 @@ fi
 
 if [ -e "${HERE}/Makefile" ]; then
   sed -i \
-    -e "s/-openmp/-qopenmp/" \
     -e "s/all-am:\(.*\) \$(PROGRAMS)/all-am:\1/" \
+    -e "s/-fopenmp/-qopenmp/" \
     Makefile
 fi
 
diff --git a/config/elpa/configure-elpa-hsw.sh b/config/elpa/configure-elpa-hsw.sh
index 8be4be4..9044449 100755
--- a/config/elpa/configure-elpa-hsw.sh
+++ b/config/elpa/configure-elpa-hsw.sh
@@ -54,36 +54,26 @@ FLAGS="-O2 ${TARGET} -I${MKLROOT}/include"
 export LDFLAGS="-L${MKLROOT}/lib/intel64"
 export CFLAGS="${FLAGS} -fno-alias -ansi-alias ${FPFLAGS}"
 export CXXFLAGS="${CFLAGS}"
-export FCFLAGS="${FLAGS} -I${MKLROOT}/include/intel64/lp64 -align array64byte -threads -heap-arrays 4096"
+export FCFLAGS="${FLAGS} -I${MKLROOT}/include/intel64/lp64 -align array64byte -threads"
 export LIBS="-lmkl_${MKL_FCRTL}_lp64 -lmkl_core -lmkl_${MKL_OMPRTL} -Wl,--as-needed -liomp5 -Wl,--no-as-needed"
 export SCALAPACK_LDFLAGS="-lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64"
 export F77FLAGS=${FCFLAGS}
 export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 CC_VERSION_STRING=$(${CC} --version 2>/dev/null | head -n1 | sed "s/..* \([0-9][0-9]*\.[0-9][0-9]*\.*[0-9]*\)[ \S]*.*/\1/")
 CC_VERSION_MAJOR=$(echo "${CC_VERSION_STRING}" | cut -d"." -f1)
@@ -128,8 +118,8 @@ fi
 
 if [ -e "${HERE}/Makefile" ]; then
   sed -i \
-    -e "s/-openmp/-qopenmp/" \
     -e "s/all-am:\(.*\) \$(PROGRAMS)/all-am:\1/" \
+    -e "s/-fopenmp/-qopenmp/" \
     Makefile
 fi
 
diff --git a/config/elpa/configure-elpa-skx-gnu.sh b/config/elpa/configure-elpa-skx-gnu.sh
index 17cd78d..3095397 100755
--- a/config/elpa/configure-elpa-skx-gnu.sh
+++ b/config/elpa/configure-elpa-skx-gnu.sh
@@ -62,14 +62,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 # Development versions may require autotools mechanics
 if [ -e "${HERE}/autogen.sh" ]; then
@@ -92,8 +87,8 @@ fi
 
 if [ -e "${HERE}/Makefile" ]; then
   sed -i \
-    -e "s/-openmp/-qopenmp/" \
     -e "s/all-am:\(.*\) \$(PROGRAMS)/all-am:\1/" \
+    -e "s/-fopenmp/-qopenmp/" \
     Makefile
 fi
 
diff --git a/config/elpa/configure-elpa-skx.sh b/config/elpa/configure-elpa-skx.sh
index edc23d8..4435405 100755
--- a/config/elpa/configure-elpa-skx.sh
+++ b/config/elpa/configure-elpa-skx.sh
@@ -54,36 +54,26 @@ FLAGS="-O2 ${TARGET} -I${MKLROOT}/include"
 export LDFLAGS="-L${MKLROOT}/lib/intel64"
 export CFLAGS="${FLAGS} -fno-alias -ansi-alias ${FPFLAGS}"
 export CXXFLAGS="${CFLAGS}"
-export FCFLAGS="${FLAGS} -I${MKLROOT}/include/intel64/lp64 -align array64byte -threads -heap-arrays 4096"
+export FCFLAGS="${FLAGS} -I${MKLROOT}/include/intel64/lp64 -align array64byte -threads"
 export LIBS="-lmkl_${MKL_FCRTL}_lp64 -lmkl_core -lmkl_${MKL_OMPRTL} -Wl,--as-needed -liomp5 -Wl,--no-as-needed"
 export SCALAPACK_LDFLAGS="-lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64"
 export F77FLAGS=${FCFLAGS}
 export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 CC_VERSION_STRING=$(${CC} --version 2>/dev/null | head -n1 | sed "s/..* \([0-9][0-9]*\.[0-9][0-9]*\.*[0-9]*\)[ \S]*.*/\1/")
 CC_VERSION_MAJOR=$(echo "${CC_VERSION_STRING}" | cut -d"." -f1)
@@ -127,8 +117,8 @@ fi
 
 if [ -e "${HERE}/Makefile" ]; then
   sed -i \
-    -e "s/-openmp/-qopenmp/" \
     -e "s/all-am:\(.*\) \$(PROGRAMS)/all-am:\1/" \
+    -e "s/-fopenmp/-qopenmp/" \
     Makefile
 fi
 
diff --git a/config/elpa/configure-elpa.sh b/config/elpa/configure-elpa.sh
index 5a225e2..5c6d5fb 100755
--- a/config/elpa/configure-elpa.sh
+++ b/config/elpa/configure-elpa.sh
@@ -50,7 +50,7 @@ then
   CONFOPTS="--disable-avx512"
 fi
 
-CONFOPTS="${CONFOPTS} --enable-openmp --enable-generic-kernels --without-threading-support-check-during-build"
+CONFOPTS="${CONFOPTS} --enable-openmp --without-threading-support-check-during-build"
 FPFLAGS="-fp-model fast"
 MKL_OMPRTL="intel_thread"
 MKL_FCRTL="intel"
@@ -62,36 +62,26 @@ FLAGS="-O2 ${TARGET} -I${MKLROOT}/include"
 export LDFLAGS="-L${MKLROOT}/lib/intel64"
 export CFLAGS="${FLAGS} -fno-alias -ansi-alias ${FPFLAGS}"
 export CXXFLAGS="${CFLAGS}"
-export FCFLAGS="${FLAGS} -I${MKLROOT}/include/intel64/lp64 -align array64byte -threads -heap-arrays 4096"
+export FCFLAGS="${FLAGS} -I${MKLROOT}/include/intel64/lp64 -align array64byte -threads"
 export LIBS="-lmkl_${MKL_FCRTL}_lp64 -lmkl_core -lmkl_${MKL_OMPRTL} -Wl,--as-needed -liomp5 -Wl,--no-as-needed"
 export SCALAPACK_LDFLAGS="-lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64"
 export F77FLAGS=${FCFLAGS}
 export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 CC_VERSION_STRING=$(${CC} --version 2>/dev/null | head -n1 | sed "s/..* \([0-9][0-9]*\.[0-9][0-9]*\.*[0-9]*\)[ \S]*.*/\1/")
 CC_VERSION_MAJOR=$(echo "${CC_VERSION_STRING}" | cut -d"." -f1)
@@ -133,8 +123,8 @@ fi
 
 if [ -e "${HERE}/Makefile" ]; then
   sed -i \
-    -e "s/-openmp/-qopenmp/" \
     -e "s/all-am:\(.*\) \$(PROGRAMS)/all-am:\1/" \
+    -e "s/-fopenmp/-qopenmp/" \
     Makefile
 fi
 
diff --git a/config/hdf5/configure-hdf5-gnu.sh b/config/hdf5/configure-hdf5-gnu.sh
index 1dee2ac..5956fbb 100755
--- a/config/hdf5/configure-hdf5-gnu.sh
+++ b/config/hdf5/configure-hdf5-gnu.sh
@@ -40,14 +40,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/hdf5/configure-hdf5-hsw-gnu.sh b/config/hdf5/configure-hdf5-hsw-gnu.sh
index fcd06cf..beb2e2c 100755
--- a/config/hdf5/configure-hdf5-hsw-gnu.sh
+++ b/config/hdf5/configure-hdf5-hsw-gnu.sh
@@ -40,14 +40,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/hdf5/configure-hdf5-hsw.sh b/config/hdf5/configure-hdf5-hsw.sh
index 05e97c1..61ee589 100755
--- a/config/hdf5/configure-hdf5-hsw.sh
+++ b/config/hdf5/configure-hdf5-hsw.sh
@@ -40,29 +40,19 @@ export CFLAGS="${FLAGS} -Wno-trigraphs ${FPCMODEL}"
 export CXXFLAGS="${FLAGS} -Wno-trigraphs ${FPCMODEL}"
 export FCFLAGS="${FLAGS} ${FPFMODEL} -align array64byte"
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/hdf5/configure-hdf5-skx-gnu.sh b/config/hdf5/configure-hdf5-skx-gnu.sh
index 0cca172..1cacfc3 100755
--- a/config/hdf5/configure-hdf5-skx-gnu.sh
+++ b/config/hdf5/configure-hdf5-skx-gnu.sh
@@ -40,14 +40,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/hdf5/configure-hdf5-skx.sh b/config/hdf5/configure-hdf5-skx.sh
index 069c2e8..277fa51 100755
--- a/config/hdf5/configure-hdf5-skx.sh
+++ b/config/hdf5/configure-hdf5-skx.sh
@@ -40,29 +40,19 @@ export CFLAGS="${FLAGS} -Wno-trigraphs ${FPCMODEL}"
 export CXXFLAGS="${FLAGS} -Wno-trigraphs ${FPCMODEL}"
 export FCFLAGS="${FLAGS} ${FPFMODEL} -align array64byte"
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/hdf5/configure-hdf5.sh b/config/hdf5/configure-hdf5.sh
index 34ef54a..4d65174 100755
--- a/config/hdf5/configure-hdf5.sh
+++ b/config/hdf5/configure-hdf5.sh
@@ -40,29 +40,19 @@ export CFLAGS="${FLAGS} -Wno-trigraphs ${FPCMODEL}"
 export CXXFLAGS="${FLAGS} -Wno-trigraphs ${FPCMODEL}"
 export FCFLAGS="${FLAGS} ${FPFMODEL} -align array64byte"
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libint/configure-libint-gnu.sh b/config/libint/configure-libint-gnu.sh
index 63e9767..1ffaac6 100755
--- a/config/libint/configure-libint-gnu.sh
+++ b/config/libint/configure-libint-gnu.sh
@@ -46,8 +46,9 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 if [ -e "${HERE}/configure.in" ] || [ -e "${HERE}/autogen.sh" ]; then
   if [ -e "${HERE}/fortran/Makefile" ] || [ -e "${HERE}/fortran/Makefile.in" ]; then
diff --git a/config/libint/configure-libint-hsw-gnu.sh b/config/libint/configure-libint-hsw-gnu.sh
index fed46a1..48cb9d1 100755
--- a/config/libint/configure-libint-hsw-gnu.sh
+++ b/config/libint/configure-libint-hsw-gnu.sh
@@ -46,8 +46,9 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 if [ -e "${HERE}/configure.in" ] || [ -e "${HERE}/autogen.sh" ]; then
   if [ -e "${HERE}/fortran/Makefile" ] || [ -e "${HERE}/fortran/Makefile.in" ]; then
diff --git a/config/libint/configure-libint-skx-gnu.sh b/config/libint/configure-libint-skx-gnu.sh
index 72e519a..b17820e 100755
--- a/config/libint/configure-libint-skx-gnu.sh
+++ b/config/libint/configure-libint-skx-gnu.sh
@@ -46,8 +46,9 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 if [ -e "${HERE}/configure.in" ] || [ -e "${HERE}/autogen.sh" ]; then
   if [ -e "${HERE}/fortran/Makefile" ] || [ -e "${HERE}/fortran/Makefile.in" ]; then
diff --git a/config/libmed/configure-libmed-gnu.sh b/config/libmed/configure-libmed-gnu.sh
index 1dcfdcd..284ebf3 100755
--- a/config/libmed/configure-libmed-gnu.sh
+++ b/config/libmed/configure-libmed-gnu.sh
@@ -43,14 +43,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libmed/configure-libmed-hsw-gnu.sh b/config/libmed/configure-libmed-hsw-gnu.sh
index a66c506..80005c6 100755
--- a/config/libmed/configure-libmed-hsw-gnu.sh
+++ b/config/libmed/configure-libmed-hsw-gnu.sh
@@ -43,14 +43,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libmed/configure-libmed-hsw.sh b/config/libmed/configure-libmed-hsw.sh
index fe3ab11..2faca63 100755
--- a/config/libmed/configure-libmed-hsw.sh
+++ b/config/libmed/configure-libmed-hsw.sh
@@ -43,29 +43,19 @@ export F77FLAGS=${FCFLAGS}
 export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libmed/configure-libmed-skx-gnu.sh b/config/libmed/configure-libmed-skx-gnu.sh
index 5030688..1fcd1bf 100755
--- a/config/libmed/configure-libmed-skx-gnu.sh
+++ b/config/libmed/configure-libmed-skx-gnu.sh
@@ -43,14 +43,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libmed/configure-libmed-skx.sh b/config/libmed/configure-libmed-skx.sh
index 83f9822..4f21e42 100755
--- a/config/libmed/configure-libmed-skx.sh
+++ b/config/libmed/configure-libmed-skx.sh
@@ -43,29 +43,19 @@ export F77FLAGS=${FCFLAGS}
 export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libmed/configure-libmed.sh b/config/libmed/configure-libmed.sh
index a4f5d46..0ec796f 100755
--- a/config/libmed/configure-libmed.sh
+++ b/config/libmed/configure-libmed.sh
@@ -43,29 +43,19 @@ export F77FLAGS=${FCFLAGS}
 export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libxc/configure-libxc-gnu.sh b/config/libxc/configure-libxc-gnu.sh
index 06631cc..f4ee50f 100755
--- a/config/libxc/configure-libxc-gnu.sh
+++ b/config/libxc/configure-libxc-gnu.sh
@@ -44,8 +44,9 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libxc/configure-libxc-hsw-gnu.sh b/config/libxc/configure-libxc-hsw-gnu.sh
index c519f63..b6d6a91 100755
--- a/config/libxc/configure-libxc-hsw-gnu.sh
+++ b/config/libxc/configure-libxc-hsw-gnu.sh
@@ -44,8 +44,9 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libxc/configure-libxc-hsw.sh b/config/libxc/configure-libxc-hsw.sh
index 8eb1385..bde6919 100755
--- a/config/libxc/configure-libxc-hsw.sh
+++ b/config/libxc/configure-libxc-hsw.sh
@@ -44,15 +44,15 @@ export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 export LIBS=""
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
 export FC CC CXX AR
diff --git a/config/libxc/configure-libxc-skx-gnu.sh b/config/libxc/configure-libxc-skx-gnu.sh
index 3c03c30..8eeb0af 100755
--- a/config/libxc/configure-libxc-skx-gnu.sh
+++ b/config/libxc/configure-libxc-skx-gnu.sh
@@ -44,8 +44,9 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/libxc/configure-libxc-skx.sh b/config/libxc/configure-libxc-skx.sh
index a4e7ef9..5a86906 100755
--- a/config/libxc/configure-libxc-skx.sh
+++ b/config/libxc/configure-libxc-skx.sh
@@ -44,15 +44,15 @@ export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 export LIBS=""
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
 export FC CC CXX AR
diff --git a/config/libxc/configure-libxc.sh b/config/libxc/configure-libxc.sh
index 59e0cba..b1b089c 100755
--- a/config/libxc/configure-libxc.sh
+++ b/config/libxc/configure-libxc.sh
@@ -44,15 +44,15 @@ export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 export LIBS=""
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
 export FC CC CXX AR
diff --git a/config/metis/configure-metis-gnu.sh b/config/metis/configure-metis-gnu.sh
index 128d7be..26d575b 100755
--- a/config/metis/configure-metis-gnu.sh
+++ b/config/metis/configure-metis-gnu.sh
@@ -49,7 +49,8 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 make config prefix="${DEST}" cc=${CC} ${CONFOPTS} "$@"
diff --git a/config/metis/configure-metis-hsw-gnu.sh b/config/metis/configure-metis-hsw-gnu.sh
index 5757c00..765652d 100755
--- a/config/metis/configure-metis-hsw-gnu.sh
+++ b/config/metis/configure-metis-hsw-gnu.sh
@@ -49,7 +49,8 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 make config prefix="${DEST}" cc=${CC} ${CONFOPTS} "$@"
diff --git a/config/metis/configure-metis-hsw.sh b/config/metis/configure-metis-hsw.sh
index dde979b..97fb2c6 100755
--- a/config/metis/configure-metis-hsw.sh
+++ b/config/metis/configure-metis-hsw.sh
@@ -49,15 +49,15 @@ export F77FLAGS=${FCFLAGS}
 export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
 export FC CC CXX AR
diff --git a/config/metis/configure-metis-skx-gnu.sh b/config/metis/configure-metis-skx-gnu.sh
index 50851c0..b238535 100755
--- a/config/metis/configure-metis-skx-gnu.sh
+++ b/config/metis/configure-metis-skx-gnu.sh
@@ -49,7 +49,8 @@ export AR="gcc-ar"
 export FC="gfortran"
 export CC="gcc"
 export CXX="g++"
-export F77=${FC}
-export F90=${FC}
+
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 make config prefix="${DEST}" cc=${CC} ${CONFOPTS} "$@"
diff --git a/config/metis/configure-metis-skx.sh b/config/metis/configure-metis-skx.sh
index e6611ab..4ccc5ab 100755
--- a/config/metis/configure-metis-skx.sh
+++ b/config/metis/configure-metis-skx.sh
@@ -45,15 +45,15 @@ export LDFLAGS=""
 export CFLAGS="${FLAGS} ${FPCMODEL}"
 export CXXFLAGS="${FLAGS} ${FPCMODEL}"
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
 export FC CC CXX AR
diff --git a/config/metis/configure-metis.sh b/config/metis/configure-metis.sh
index dd61dad..a3b45cf 100755
--- a/config/metis/configure-metis.sh
+++ b/config/metis/configure-metis.sh
@@ -49,15 +49,15 @@ export F77FLAGS=${FCFLAGS}
 export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
 export FC CC CXX AR
diff --git a/config/plumed/configure-plumed-gnu.sh b/config/plumed/configure-plumed-gnu.sh
index f257549..b155b80 100755
--- a/config/plumed/configure-plumed-gnu.sh
+++ b/config/plumed/configure-plumed-gnu.sh
@@ -44,14 +44,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/plumed/configure-plumed-hsw-gnu.sh b/config/plumed/configure-plumed-hsw-gnu.sh
index 6ed30cb..21758bb 100755
--- a/config/plumed/configure-plumed-hsw-gnu.sh
+++ b/config/plumed/configure-plumed-hsw-gnu.sh
@@ -44,14 +44,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/plumed/configure-plumed-hsw.sh b/config/plumed/configure-plumed-hsw.sh
index a2a5b15..4444f41 100755
--- a/config/plumed/configure-plumed-hsw.sh
+++ b/config/plumed/configure-plumed-hsw.sh
@@ -44,29 +44,19 @@ export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 export LIBS="-L${MKLROOT}/lib/intel64 -lmkl_rt -lz"
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/plumed/configure-plumed-skx-gnu.sh b/config/plumed/configure-plumed-skx-gnu.sh
index 71e3939..a730248 100755
--- a/config/plumed/configure-plumed-skx-gnu.sh
+++ b/config/plumed/configure-plumed-skx-gnu.sh
@@ -44,14 +44,9 @@ export AR="gcc-ar"
 export FC="mpif90"
 export CC="mpicc"
 export CXX="mpicxx"
-export F77=${FC}
-export F90=${FC}
 
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC}
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/plumed/configure-plumed-skx.sh b/config/plumed/configure-plumed-skx.sh
index 1390a55..b21c4f5 100755
--- a/config/plumed/configure-plumed-skx.sh
+++ b/config/plumed/configure-plumed-skx.sh
@@ -44,29 +44,19 @@ export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 export LIBS="-L${MKLROOT}/lib/intel64 -lmkl_rt -lz"
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"
diff --git a/config/plumed/configure-plumed.sh b/config/plumed/configure-plumed.sh
index 5251af0..164c41a 100755
--- a/config/plumed/configure-plumed.sh
+++ b/config/plumed/configure-plumed.sh
@@ -44,29 +44,19 @@ export F90FLAGS=${FCFLAGS}
 export FFLAGS=${FCFLAGS}
 export LIBS="-L${MKLROOT}/lib/intel64 -lmkl_rt -lz"
 
-FC="ifx"; CC="icx"; CXX="icpx"; AR=$(command -v xiar || echo "ar")
-if [ "1" = "${INTEL}" ] || 
-   [ ! "$(command -v ${FC})" ] || [ ! "$(command -v ${CC})" ] || [ ! "$(command -v ${CXX})" ];
-then
-  FC="ifort"
-  if [ "1" != "${INTEL}" ]; then
-    CC="icc"
-    CXX="icpc"
-  fi
+AR=$(command -v xiar || echo "ar")
+if [ "1" != "${INTEL}" ]; then
+  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
+  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  FC=$(command -v mpiifx || echo "mpiifort -fc=ifx")
+else
+  CXX=mpiicpc -cxx=$(command -v icpc || echo "icpx")
+  CC=mpiicc -cc=$(command -v icc || echo "icx")
+  FC="mpiifort"
 fi
 
-export FC="mpiifort -fc=${FC}"
-export CC="mpiicc   -cc=${CC}"
-export CXX="mpiicpc -cxx=${CXX}"
-export F77=${FC}
-export F90=${FC}
-export AR
-
-export MPICC=${CC}
-export MPIFC=${FC}
-export MPIF77=${F77}
-export MPIF90=${F90}
-export MPICXX=${CXX}
+export F77=${FC} F90=${FC} MPIFC=${FC} MPICC=${CC} AR
+export MPIF77=${F77} MPIF90=${F90} MPICXX=${CXX}
 
 cat << EOM > .autom4te.cfg
 begin-language: "Autoconf-without-aclocal-m4"