diff --git a/cfg/clifton/eigen.profile b/cfg/clifton/eigen.profile
new file mode 100644
index 0000000000000000000000000000000000000000..b0978f22aec4fcb1c32ce619c412ce5e719babba
--- /dev/null
+++ b/cfg/clifton/eigen.profile
@@ -0,0 +1 @@
+add2env INCLUDE /opt/eigen/include/eigen3
diff --git a/cfg/clifton/gmsh.profile b/cfg/clifton/gmsh.profile
index 4a3ec051441ecc8b4892b76cca8038877445e44d..3bb33ff2a83ef55b84a208219203deeb402413b3 100644
--- a/cfg/clifton/gmsh.profile
+++ b/cfg/clifton/gmsh.profile
@@ -1,4 +1,3 @@
-
 add2env PATH "/opt/gmsh/bin" front
 add2env INCLUDE "/opt/gmsh/include" front
 add2env LIB "/opt/gmsh/lib" front
diff --git a/cfg/vaillant/eigen.profile b/cfg/vaillant/eigen.profile
new file mode 100644
index 0000000000000000000000000000000000000000..8477a380dbf5f7024156aec2f10df25e4ea6e524
--- /dev/null
+++ b/cfg/vaillant/eigen.profile
@@ -0,0 +1 @@
+add2env INCLUDE "/opt/eigen/include/eigen3"
diff --git a/cfg/vaillant/gmsh.profile b/cfg/vaillant/gmsh.profile
index 412f3fcb47cd01cfd224b34e5ac684e0516fecd4..db85932a1f7db6db8f23bf46a7db4f99ea27f207 100644
--- a/cfg/vaillant/gmsh.profile
+++ b/cfg/vaillant/gmsh.profile
@@ -1,3 +1,5 @@
 add2env PATH "/opt/gmsh/bin" front
 add2env LD_LIBRARY_PATH "/opt/gmsh/lib"
 add2env PYTHONPATH "/opt/gmsh/lib"
+add2env INCLUDE "/opt/gmsh/include"
+add2env LIB "/opt/gmsh/lib"
diff --git a/cfg/warson/cmake.profile b/cfg/warson/cmake.profile
deleted file mode 100644
index aa827bc444b3676e163d75670b55147543fe2e90..0000000000000000000000000000000000000000
--- a/cfg/warson/cmake.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Trilinos requires cmake >= 3.10
-add2env PATH "/opt/cmake/bin" front
diff --git a/cfg/warson/compilers.bashrc b/cfg/warson/compilers.bashrc
deleted file mode 100644
index 2e502d83aaf2a9e1ed93294553f217acf51edbd4..0000000000000000000000000000000000000000
--- a/cfg/warson/compilers.bashrc
+++ /dev/null
@@ -1,7 +0,0 @@
-add2env PATH "/opt/gcc-9.4.0/bin" front
-add2env LD_LIBRARY_PATH "/opt/gcc-9.4.0/lib64" front
-# sinon cmake build avec /usr/bin/c++...
-export CC=gcc
-export CXX=g++
-export FC=gfortran
-
diff --git a/cfg/warson/compilers.profile b/cfg/warson/compilers.profile
deleted file mode 100644
index 3e1604a097f470a8f845e11af0b71d86dcebfbc1..0000000000000000000000000000000000000000
--- a/cfg/warson/compilers.profile
+++ /dev/null
@@ -1,8 +0,0 @@
-add2env PATH "/opt/gcc-9.4.0/bin" front
-add2env LD_LIBRARY_PATH "/opt/gcc-9.4.0/lib64" front
-
-# sinon cmake build avec /usr/bin/c++...
-export CC=gcc
-export CXX=g++
-export FC=gfortran
-
diff --git a/cfg/warson/gmsh.profile b/cfg/warson/gmsh.profile
index 412f3fcb47cd01cfd224b34e5ac684e0516fecd4..bc68515e729ec126fe560efc3a6fd8d84dda3207 100644
--- a/cfg/warson/gmsh.profile
+++ b/cfg/warson/gmsh.profile
@@ -1,3 +1,5 @@
-add2env PATH "/opt/gmsh/bin" front
+add2env PATH            "/opt/gmsh/bin" front
+add2env INCLUDE         "/opt/gmsh/include" front
+add2env LIB             "/opt/gmsh/lib" front
 add2env LD_LIBRARY_PATH "/opt/gmsh/lib"
-add2env PYTHONPATH "/opt/gmsh/lib"
+add2env PYTHONPATH      "/opt/gmsh/lib"
diff --git a/cfg/warson/intelCommunity.bashrc b/cfg/warson/intelCommunity.bashrc
deleted file mode 100644
index 06b19829f74c80dfdd976ee5101827abd29d4a99..0000000000000000000000000000000000000000
--- a/cfg/warson/intelCommunity.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -d /opt/intel ] ; then
-    . /opt/intel/mkl/bin/mklvars.sh intel64
-    . /opt/intel/tbb/bin/tbbvars.sh intel64
-fi
-export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intelCommunity.profile b/cfg/warson/intelCommunity.profile
deleted file mode 100644
index 3e1712b61b2a5ce6663f92f7e136e05e370bb2fe..0000000000000000000000000000000000000000
--- a/cfg/warson/intelCommunity.profile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -n "$BASH_VERSION" ]; then
-    if [ -d /opt/intel ] ; then
-        . /opt/intel/mkl/bin/mklvars.sh intel64
-        . /opt/intel/tbb/bin/tbbvars.sh intel64
-    fi
-fi
-export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/leanVTK.profile b/cfg/warson/leanVTK.profile
new file mode 100644
index 0000000000000000000000000000000000000000..02bfbe93b89e19ea08e33f2a75c3565ae475c9e5
--- /dev/null
+++ b/cfg/warson/leanVTK.profile
@@ -0,0 +1 @@
+add2env PATH "/usr/local/lib/LeanVTK-1.0"
diff --git a/cfg/warson/metafor.profile b/cfg/warson/metafor.profile
deleted file mode 100644
index 3fe8c1e1de6b4b0fa74cbb4791608142a0f3779f..0000000000000000000000000000000000000000
--- a/cfg/warson/metafor.profile
+++ /dev/null
@@ -1 +0,0 @@
-add2env PATH /home/$USER/dev/Metafor_master/oo_metaB/bin
diff --git a/cfg/warson/oneApi.bashrc b/cfg/warson/oneApi.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..0e8e36f622535c9f747cfe71949a6f9aa049e1df
--- /dev/null
+++ b/cfg/warson/oneApi.bashrc
@@ -0,0 +1,9 @@
+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
+fi
diff --git a/cfg/warson/oneApi.profile b/cfg/warson/oneApi.profile
new file mode 100644
index 0000000000000000000000000000000000000000..0272e8b34d7501a47c2e1bf541a027193046c85c
--- /dev/null
+++ b/cfg/warson/oneApi.profile
@@ -0,0 +1,10 @@
+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     #. /opt/intel/oneapi/setvars.sh intel64
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
+fi