diff --git a/Compiler/OpenBLAS/0/variants b/Compiler/OpenBLAS/0/variants
index 51b5aa1..d77356f 100644
--- a/Compiler/OpenBLAS/0/variants
+++ b/Compiler/OpenBLAS/0/variants
@@ -13,3 +13,5 @@ OpenBLAS/0.2.19		stable		gcc/6.2.0
 OpenBLAS/0.2.19		stable		gcc/6.3.0
 
 OpenBLAS/0.2.20		stable		gcc/7.3.0
+OpenBLAS/0.2.20		stable		clang-macos/9.0.0
+OpenBLAS/0.2.20		stable		intel/17.4
diff --git a/Compiler/OpenBLAS/build b/Compiler/OpenBLAS/build
index 6a7bdfd..12f2de1 100755
--- a/Compiler/OpenBLAS/build
+++ b/Compiler/OpenBLAS/build
@@ -10,6 +10,9 @@ pbuild::configure() {
 	intel )
 		CC='icc'
 		;;
+	clang-macos )
+		CC='gcc'
+		;;
 	* )
 		die 3 "Oops: unknown compiler: ${COMPILER}"
 		;;
@@ -23,6 +26,7 @@ EOF
 	echo "USE_SIMPLE_THREADED_LEVEL3 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
 	echo "NO_AVX = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
 	echo "NO_AVX2 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
+	echo "USE_THREAD = 0" >> "${MODULE_SRCDIR}/Makefile.rule"
 	sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${MODULE_SRCDIR}/Makefile.system"
 }
 
@@ -43,6 +47,6 @@ pbuild::install() {
 pbuild::add_to_group 'Compiler'
 pbuild::compile_in_sourcetree
 pbuild::set_docfiles 'LICENSE' 'README.md'
-pbuild::set_supported_compilers 'gcc' 'intel'
+pbuild::set_supported_compilers 'gcc' 'intel' 'clang-macos'
 pbuild::make_all
 pbuild::cleanup_src
diff --git a/Compiler/atlas/3/variants b/Compiler/atlas/3/variants
index 751bf86..eda70bd 100644
--- a/Compiler/atlas/3/variants
+++ b/Compiler/atlas/3/variants
@@ -2,4 +2,7 @@ atlas/3.10.3	unstable	gcc/4.8.5
 atlas/3.10.2	deprecated	gcc/4.9.2
 atlas/3.10.3	unstable	gcc/4.9.4
 atlas/3.10.3	unstable	gcc/5.4.0
+atlas/3.10.3	unstable	gcc/5.5.0
 atlas/3.10.3	unstable	gcc/6.2.0
+atlas/3.10.3	unstable	gcc/6.4.0
+atlas/3.10.3	unstable	gcc/7.3.0
diff --git a/Compiler/boost/1/variants b/Compiler/boost/1/variants
index 5aeaa58..076eed3 100644
--- a/Compiler/boost/1/variants
+++ b/Compiler/boost/1/variants
@@ -24,3 +24,5 @@ boost/1.63.0         stable     gcc/6.3.0 Python/2.7.12
 boost/1.64.0         unstable   gcc/5.4.0 Python/2.7.12
 
 boost/1.66.0         unstable   gcc/7.3.0 b:Python/2.7.12
+boost/1.66.0         unstable   clang-macos/9.0.0 b:Python/2.7.12
+boost/1.66.0         unstable   intel/17.4 b:Python/2.7.12
diff --git a/Compiler/gsl/2/variants b/Compiler/gsl/2/variants
index 9bb27da..e9bd14c 100644
--- a/Compiler/gsl/2/variants
+++ b/Compiler/gsl/2/variants
@@ -5,3 +5,5 @@ gsl/2.2.1            stable	gcc/6.2.0
 gsl/2.2.1            stable	gcc/6.3.0 
 
 gsl/2.4.0            stable	gcc/7.3.0 
+gsl/2.4.0            stable	clang-macos/9.0.0
+gsl/2.4.0            stable	intel/17.4
diff --git a/Compiler/gtest/1/variants b/Compiler/gtest/1/variants
index d383a10..e7a7d4d 100644
--- a/Compiler/gtest/1/variants
+++ b/Compiler/gtest/1/variants
@@ -1 +1,2 @@
-gtest/1.7.0	unstable	b:cmake b:gcc/5.4.0
+gtest/1.7.0	stable		b:cmake b:gcc/5.4.0
+gtest/1.7.0	stable		b:cmake b:gcc/7.3.0
diff --git a/Compiler/gtest/build b/Compiler/gtest/build
index ef24cc8..192730c 100755
--- a/Compiler/gtest/build
+++ b/Compiler/gtest/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="https://github.com/google/googletest/archive/release-1.7.0.tar.gz"
+
 declare -a config_args=()
 
 case "${OS}" in
diff --git a/Compiler/mpich/3/variants b/Compiler/mpich/3/variants
new file mode 100644
index 0000000..22f9e8b
--- /dev/null
+++ b/Compiler/mpich/3/variants
@@ -0,0 +1,3 @@
+mpich/3.2.1	stable		gcc/6.4.0
+mpich/3.2.1	stable		gcc/7.3.0
+mpich/3.2.1	unstable	intel/17.4
diff --git a/Compiler/mpich/build b/Compiler/mpich/build
index 4ff64cb..da4105d 100755
--- a/Compiler/mpich/build
+++ b/Compiler/mpich/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="http://www.mpich.org/static/downloads/$V/$P-$V.tar.gz"
+
 pbuild::configure() {
 	unset F90
 	"${MODULE_SRCDIR}"/configure \
@@ -9,9 +11,6 @@ pbuild::configure() {
 		|| exit 1
 }
 
-
 pbuild::add_to_group 'Compiler'
-pbuild::set_runtime_dependencies "${COMPILER}"
-pbuild::set_build_dependencies "${COMPILER}"
 pbuild::set_docfiles 'COPYRIGHT' 'README'
 pbuild::make_all
diff --git a/Compiler/openmpi/1.10/variants.Linux b/Compiler/openmpi/1.10/variants.Linux
index ec90688..4397553 100644
--- a/Compiler/openmpi/1.10/variants.Linux
+++ b/Compiler/openmpi/1.10/variants.Linux
@@ -26,3 +26,5 @@ openmpi/1.10.7	stable		gcc/6.2.0
 openmpi/1.10.7	stable		gcc/6.3.0
 openmpi/1.10.7	stable		gcc/7.2.0
 openmpi/1.10.7	stable		gcc/7.3.0
+
+openmpi/1.10.7	stable		intel/17.4
diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux
index f6b6a39..142c19e 100644
--- a/Compiler/openmpi/2.1/variants.Linux
+++ b/Compiler/openmpi/2.1/variants.Linux
@@ -5,3 +5,4 @@ openmpi/2.1.2	stable		gcc/7.3.0
 
 openmpi/2.1.1   unstable        intel/17.1
 openmpi/2.1.1   stable          intel/17.4
+openmpi/2.1.2   stable          intel/17.4
diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux
index 78ce29e..bff5698 100644
--- a/Compiler/openmpi/3.0/variants.Linux
+++ b/Compiler/openmpi/3.0/variants.Linux
@@ -1,2 +1,4 @@
+openmpi/3.0.0   stable          gcc/6.4.0
 openmpi/3.0.0   stable          gcc/7.2.0
 openmpi/3.0.0   stable          gcc/7.3.0
+openmpi/3.0.0   stable          intel/17.4
diff --git a/HDF5/H5hut/2/variants b/HDF5/H5hut/2/variants
index 5e7d714..7cd6c8d 100644
--- a/HDF5/H5hut/2/variants
+++ b/HDF5/H5hut/2/variants
@@ -16,3 +16,11 @@ H5hut/2.0.0rc3	unstable	gcc/5.4.0 openmpi/1.10.4 hdf5/1.8.18 b:automake/1.14 b:a
 H5hut/2.0.0rc3	unstable	gcc/6.2.0 openmpi/1.10.4 hdf5/1.8.18 b:automake/1.14 b:autoconf/2.69 b:libtool/2.4.2 b:Python/2.7.12 b:parmetis/4.0.3
 
 H5hut/2.0.0rc4	unstable	gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	gcc/7.3.0 openmpi/2.1.2  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	gcc/7.3.0 openmpi/3.0.0  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	clang-macos/9.0.0 openmpi/1.10.7 hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	clang-macos/9.0.0 openmpi/2.1.2  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	clang-macos/9.0.0 openmpi/3.0.0  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	intel/17.4 openmpi/1.10.7 hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	intel/17.4 openmpi/2.1.2  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	intel/17.4 openmpi/3.0.0  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
diff --git a/MPI/dks/1/variants b/MPI/dks/1/variants
index ff455aa..4e5b91c 100644
--- a/MPI/dks/1/variants
+++ b/MPI/dks/1/variants
@@ -5,3 +5,4 @@ dks/1.0.2	unstable	gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6
 dks/1.1.0	unstable	gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
 dks/1.1.1	unstable	gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
 dks/1.1.2	unstable	gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 cuda/8.0.44 b:cmake/3.6.3
+dks/1.1.2	unstable	gcc/7.3.0 openmpi/1.10.7 boost/1.66.0 cuda/8.0.44 b:cmake/3.6.3
diff --git a/MPI/dks/build b/MPI/dks/build
index 8bbcd6c..fa4793d 100755
--- a/MPI/dks/build
+++ b/MPI/dks/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="dks-1.1.2.tar.gz"
+
 declare -ra vers=( ${V//./ } )
 
 conf=()
diff --git a/MPI/hdf5/1.10/variants.Darwin b/MPI/hdf5/1.10/variants.Darwin
index ecd03ce..c05a94b 100644
--- a/MPI/hdf5/1.10/variants.Darwin
+++ b/MPI/hdf5/1.10/variants.Darwin
@@ -4,5 +4,9 @@ hdf5/1.10.0	stable		gcc/5.3.0 openmpi/1.10.2
 hdf5/1.10.0	stable		gcc/6.1.0 openmpi/1.10.2
 
 hdf5/1.10.1	unstable	clang-macos/9.0.0 openmpi/1.10.7
+hdf5/1.10.1	unstable	clang-macos/9.0.0 openmpi/2.1.2
+hdf5/1.10.1	unstable	clang-macos/9.0.0 openmpi/3.0.0
 hdf5/1.10.1	unstable	gcc/7.3.0 openmpi/1.10.7
+hdf5/1.10.1	unstable	gcc/7.3.0 openmpi/2.1.2
+hdf5/1.10.1	unstable	gcc/7.3.0 openmpi/3.0.0
 
diff --git a/MPI/hdf5/1.10/variants.Linux b/MPI/hdf5/1.10/variants.Linux
index 13b46ef..9e12ef4 100644
--- a/MPI/hdf5/1.10/variants.Linux
+++ b/MPI/hdf5/1.10/variants.Linux
@@ -8,3 +8,7 @@ hdf5/1.10.1	unstable	gcc/7.3.0 openmpi/1.10.7
 hdf5/1.10.1	unstable	gcc/7.3.0 openmpi/2.1.2
 hdf5/1.10.1	unstable	gcc/7.3.0 openmpi/3.0.0
 
+hdf5/1.10.1	unstable	intel/17.4 openmpi/1.10.7
+hdf5/1.10.1	unstable	intel/17.4 openmpi/2.1.2
+hdf5/1.10.1	unstable	intel/17.4 openmpi/3.0.0
+hdf5/1.10.1	unstable	intel/17.4 intel-mpi/17.4
diff --git a/MPI/parmetis/4/variants b/MPI/parmetis/4/variants
index 99f94ea..22dc938 100644
--- a/MPI/parmetis/4/variants
+++ b/MPI/parmetis/4/variants
@@ -11,8 +11,15 @@ parmetis/4.0.3	unstable	gcc/4.9.4 openmpi/1.10.4 b:cmake/3.6.3
 parmetis/4.0.3	unstable	gcc/5.4.0 openmpi/1.10.4 b:cmake/3.6.3
 parmetis/4.0.3	unstable	gcc/6.2.0 openmpi/1.10.4 b:cmake/3.6.3
 
-parmetis/4.0.3	unstable	gcc/6.2.0 openmpi/2.0.1  b:cmake/3.4.1
+parmetis/4.0.3	unstable	gcc/6.2.0 openmpi/2.0.1  b:cmake/3.6.3
 
-parmetis/4.0.3	stable		gcc/7.3.0 openmpi/1.10.7 b:cmake/3.4.1
-parmetis/4.0.3	stable		gcc/7.3.0 openmpi/2.1.2  b:cmake/3.4.1
-parmetis/4.0.3	stable		gcc/7.3.0 openmpi/3.0.0  b:cmake/3.4.1
+parmetis/4.0.3	stable		gcc/7.3.0 openmpi/1.10.7 b:cmake/3.6.3
+parmetis/4.0.3	stable		gcc/7.3.0 openmpi/2.1.2  b:cmake/3.6.3
+parmetis/4.0.3	stable		gcc/7.3.0 openmpi/3.0.0  b:cmake/3.6.3
+parmetis/4.0.3	stable		clang-macos/9.0.0 openmpi/1.10.7 b:cmake/3.6.3
+parmetis/4.0.3	stable		clang-macos/9.0.0 openmpi/2.1.2  b:cmake/3.6.3
+parmetis/4.0.3	stable		clang-macos/9.0.0 openmpi/3.0.0  b:cmake/3.6.3
+
+parmetis/4.0.3	stable		intel/17.4 openmpi/1.10.7 b:cmake/3.6.3
+parmetis/4.0.3	stable		intel/17.4 openmpi/2.1.2  b:cmake/3.6.3
+parmetis/4.0.3	stable		intel/17.4 openmpi/3.0.0  b:cmake/3.6.3
diff --git a/MPI/trilinos/12/variants b/MPI/trilinos/12/variants
index f8984d6..3b81be8 100644
--- a/MPI/trilinos/12/variants
+++ b/MPI/trilinos/12/variants
@@ -16,3 +16,9 @@ trilinos/12.10.1-2	unstable	gcc/5.4.0 openmpi/1.10.4 hdf5/1.8.18 b:cmake/3.6.3 b
 trilinos/12.10.1-1	unstable	gcc/6.2.0 openmpi/1.10.4 hdf5/1.8.18 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
 
 trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/2.1.2  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/3.0.0  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+
+trilinos/12.12.1	unstable	intel/17.4 openmpi/1.10.7 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+trilinos/12.12.1	unstable	intel/17.4 openmpi/2.1.2  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+trilinos/12.12.1	unstable	intel/17.4 openmpi/3.0.0  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
diff --git a/MPI/trilinos/12/variants.Darwin b/MPI/trilinos/12/variants.Darwin
index 6fece91..f8e3d1d 100644
--- a/MPI/trilinos/12/variants.Darwin
+++ b/MPI/trilinos/12/variants.Darwin
@@ -10,3 +10,5 @@ trilinos/12.10.1-1	unstable	gcc/5.4.0 openmpi/1.10.4 b:cmake/3.6.3 b:parmetis/4.
 trilinos/12.10.1	unstable	gcc/6.2.0 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
 
 trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/2.1.2  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/3.0.0  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
diff --git a/Programming/cmake/3/variants b/Programming/cmake/3/variants
index e105311..ba57829 100644
--- a/Programming/cmake/3/variants
+++ b/Programming/cmake/3/variants
@@ -3,3 +3,5 @@ cmake/3.3.2          stable
 cmake/3.4.1          stable
 cmake/3.6.3          stable
 cmake/3.8.1          stable
+cmake/3.9.6          stable
+cmake/3.10.3         stable b:gcc/7.3.0
diff --git a/Programming/cmake/3/variants.Darwin b/Programming/cmake/3/variants.Darwin
new file mode 100644
index 0000000..01472da
--- /dev/null
+++ b/Programming/cmake/3/variants.Darwin
@@ -0,0 +1,6 @@
+cmake/3.1.3          stable
+cmake/3.3.2          stable
+cmake/3.4.1          stable
+cmake/3.6.3          stable
+cmake/3.8.1          stable
+cmake/3.10.3         stable
diff --git a/Tools/git/2/variants b/Tools/git/2/variants
index 7a3f89d..59357c2 100644
--- a/Tools/git/2/variants
+++ b/Tools/git/2/variants
@@ -2,4 +2,5 @@ git/2.3.3	stable		Tcl/8.6.4 Tk/8.6.4
 git/2.5.2	stable		Tcl/8.6.4 Tk/8.6.4
 git/2.8.1	stable		Tcl/8.6.4 Tk/8.6.4
 git/2.11.1	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.13.0	unstable	Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
+git/2.13.0	stable		Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
+git/2.16.2	stable		Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
diff --git a/Tools/vim/8/variants b/Tools/vim/8/variants
new file mode 100644
index 0000000..f0bb62d
--- /dev/null
+++ b/Tools/vim/8/variants
@@ -0,0 +1 @@
+vim/8.0.586	unstable
diff --git a/Tools/vim/build b/Tools/vim/build
new file mode 100755
index 0000000..937d1aa
--- /dev/null
+++ b/Tools/vim/build
@@ -0,0 +1,23 @@
+#!/usr/bin/env modbuild
+
+SOURCE_URL="ftp://ftp.vim.org/pub/vim/unix/$P-$V.tar.bz2"
+
+
+pbuild::configure() {
+	cd "${MODULE_SRCDIR}"
+	"${MODULE_SRCDIR}"/configure \
+		--prefix="${PREFIX}" \
+		|| exit 1
+}
+
+
+pbuild::add_to_group 'Tools'
+pbuild::compile_in_sourcetree
+#pbuild::set_docfiles 'COPYING' 'README.md'
+pbuild::make_all
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Tools/vim/modulefile b/Tools/vim/modulefile
new file mode 100644
index 0000000..d852a39
--- /dev/null
+++ b/Tools/vim/modulefile
@@ -0,0 +1,22 @@
+#%Module1.0
+
+
+module-whatis		"the ubiquitous text editor"
+module-url		"https://www.vim.org/"
+module-license		"GNU GPL v2"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help	"
+im is a highly configurable text editor built to make creating and
+changing any kind of text very efficient. It is included as 'vi'
+with most UNIX systems and with Apple OS X.
+
+Vim is rock stable and is continuously being developed to become
+even better. Among its features are:
+
+    persistent, multi-level undo tree
+    extensive plugin system
+    support for hundreds of programming languages and file formats
+    powerful search and replace
+    integrates with many tools
+"