diff --git a/cfg/clifton/cgal.profile b/cfg/clifton/cgal.profile
new file mode 100644
index 0000000000000000000000000000000000000000..6674aec168ce97de42427cda82a1909c8c99c6af
--- /dev/null
+++ b/cfg/clifton/cgal.profile
@@ -0,0 +1,2 @@
+#add2env LIB "/opt/cgal"
+add2env INCLUDE "/opt/cgal"
diff --git a/cfg/clifton/comp.cfg b/cfg/clifton/comp.cfg
index 0d7cd49c3a857b85cc5cc876029ab78761433a0f..9eb28702832a513011994e88c6d814cf72fe9316 100644
--- a/cfg/clifton/comp.cfg
+++ b/cfg/clifton/comp.cfg
@@ -1,5 +1,5 @@
-self.pars['CMAKELIST'].val='gaston.cmake'
-self.pars['NB_TASKS'].val='6'
+self.pars['CMAKELIST'].val='clifton.cmake'
+self.pars['NB_TASKS'].val='12'
 self.pars['NB_THREADS'].val='1'
 self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
 self.pars['RUNMETHOD'].val='batch'
diff --git a/cfg/clifton/gmsh.profile b/cfg/clifton/gmsh.profile
index 412f3fcb47cd01cfd224b34e5ac684e0516fecd4..5e99eacd2c8535a3999b0e06bbb1dfdd739f6655 100644
--- a/cfg/clifton/gmsh.profile
+++ b/cfg/clifton/gmsh.profile
@@ -1,3 +1,4 @@
+
 add2env PATH "/opt/gmsh/bin" front
 add2env LD_LIBRARY_PATH "/opt/gmsh/lib"
 add2env PYTHONPATH "/opt/gmsh/lib"
diff --git a/cfg/clifton/intelCommunity.bashrc b/cfg/clifton/intelCommunity.bashrc
deleted file mode 100644
index 2d14ff92dd8decb05ab870de1b83467ec9634c83..0000000000000000000000000000000000000000
--- a/cfg/clifton/intelCommunity.bashrc
+++ /dev/null
@@ -1,8 +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
diff --git a/cfg/clifton/intelCommunity.profile b/cfg/clifton/intelCommunity.profile
deleted file mode 100644
index e5d1ff529ac7757508667647255d5708529c0467..0000000000000000000000000000000000000000
--- a/cfg/clifton/intelCommunity.profile
+++ /dev/null
@@ -1,10 +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
diff --git a/cfg/clifton/launch.cfg b/cfg/clifton/launch.cfg
index 12256a89f06c5501b848f3489ea602aed964e83d..42954536ad82b897ed29039391532746f8193064 100644
--- a/cfg/clifton/launch.cfg
+++ b/cfg/clifton/launch.cfg
@@ -1,4 +1,4 @@
-self.pars['NB_THREADS'].val='6'
+self.pars['NB_THREADS'].val='12'
 self.pars['NB_TASKS'].val='1'
 self.pars['RUNMETHOD'].vals=['interactive','at','batch']
 self.pars['RUNMETHOD'].val='batch'
diff --git a/cfg/clifton/oneApi.bashrc b/cfg/clifton/oneApi.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..a3b39398ee7ab4a2a72182bd6a379ce039b77ce6
--- /dev/null
+++ b/cfg/clifton/oneApi.bashrc
@@ -0,0 +1,11 @@
+# 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
diff --git a/cfg/clifton/oneApi.profile b/cfg/clifton/oneApi.profile
new file mode 100644
index 0000000000000000000000000000000000000000..a3b39398ee7ab4a2a72182bd6a379ce039b77ce6
--- /dev/null
+++ b/cfg/clifton/oneApi.profile
@@ -0,0 +1,11 @@
+# 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
diff --git a/cfg/clifton/scilab.profile b/cfg/clifton/scilab.profile
deleted file mode 100644
index 4b11b33d967c929213b16746e667cf88356e164b..0000000000000000000000000000000000000000
--- a/cfg/clifton/scilab.profile
+++ /dev/null
@@ -1 +0,0 @@
-add2env PATH "/opt/scilab/bin"