diff --git a/c/CNTK/CNTK-2.0-GCC-7.1.0-2.28-Python-3.6.1.eb b/c/CNTK/CNTK-2.0-GCC-7.1.0-2.28-Python-3.6.1.eb
new file mode 100644
index 00000000..b821de0f
--- /dev/null
+++ b/c/CNTK/CNTK-2.0-GCC-7.1.0-2.28-Python-3.6.1.eb
@@ -0,0 +1,28 @@
+easyblock = 'PythonPackage'
+
+name = 'CNTK'
+version = '2.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://cntk.ai/'
+description = """The Microsoft Cognitive Toolkit is a unified deep-learning toolkit that describes neural networks as a series of computational steps via a directed graph. In this directed graph, leaf nodes represent input values or network parameters, while other nodes represent matrix operations upon their inputs. CNTK allows to easily realize and combine popular model types such as feed-forward DNNs, convolutional nets (CNNs), and recurrent networks (RNNs/LSTMs). It implements stochastic gradient descent (SGD, error backpropagation) learning with automatic differentiation and parallelization across multiple GPUs and servers. """
+
+toolchain = {'name': 'GCC', 'version': '7.1.0-2.28'}
+
+source_urls = ['https://cntk.ai/PythonWheel/CPU-Only']
+sources = ['cntk-%(version)s-cp36-cp36m-linux_x86_64.whl']
+
+use_pip = True
+unpack_sources = False
+
+dependencies = [
+    ('Python', '3.6.1', '', True),
+    ('OpenMPI', '1.10.7'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/k/Keras/.Keras-2.0.5-Theano-0.9.0-Python-3.6.1.eb.swp b/k/Keras/.Keras-2.0.5-Theano-0.9.0-Python-3.6.1.eb.swp
new file mode 100644
index 00000000..8c83736c
Binary files /dev/null and b/k/Keras/.Keras-2.0.5-Theano-0.9.0-Python-3.6.1.eb.swp differ
diff --git a/k/Keras/Keras-2.0.5-Tensorflow-1.2.0-Python-3.6.1.eb b/k/Keras/Keras-2.0.5-Tensorflow-1.2.0-Python-3.6.1.eb
new file mode 100644
index 00000000..e36a0340
--- /dev/null
+++ b/k/Keras/Keras-2.0.5-Tensorflow-1.2.0-Python-3.6.1.eb
@@ -0,0 +1,33 @@
+easyblock = 'PythonPackage'
+
+name = 'Keras'
+version = '2.0.5'
+versionsuffix = '-Tensorflow-1.2.0-Python-%(pyver)s'
+
+homepage = 'https://keras.io/'
+description = """Keras is a minimalist, highly modular neural networks library, written in Python and
+capable of running on top of either TensorFlow or Theano."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+use_pip = True
+
+dependencies = [
+    ('Python', '3.6.1'),
+    ('Tensorflow', '1.2.0', '', ('GCC', '7.1.0-2.28')),
+#   ('h5py', '2.7.0', '%(versionsuffix)s'), internal Python 3.6.1
+#   ('PyYAML', '3.12', versionsuffix),      internal Python 3.6.1
+]
+
+# it defaults to Tensorflow
+modextravars = {'KERAS_BACKEND': 'tensorflow'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/k/Keras/Keras-2.0.5-intel-2017a-Python-3.6.1.eb b/k/Keras/Keras-2.0.5-Theano-0.9.0-Python-3.6.1.eb
similarity index 81%
rename from k/Keras/Keras-2.0.5-intel-2017a-Python-3.6.1.eb
rename to k/Keras/Keras-2.0.5-Theano-0.9.0-Python-3.6.1.eb
index 4c5e4492..084886eb 100644
--- a/k/Keras/Keras-2.0.5-intel-2017a-Python-3.6.1.eb
+++ b/k/Keras/Keras-2.0.5-Theano-0.9.0-Python-3.6.1.eb
@@ -2,13 +2,13 @@ easyblock = 'PythonPackage'
 
 name = 'Keras'
 version = '2.0.5'
-versionsuffix = '-Python-%(pyver)s'
+versionsuffix = '-Theano-1.2.0-Python-%(pyver)s'
 
 homepage = 'https://keras.io/'
 description = """Keras is a minimalist, highly modular neural networks library, written in Python and
 capable of running on top of either TensorFlow or Theano."""
 
-toolchain = {'name': 'GCC', 'version': '7.1.0-2.28'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
@@ -16,8 +16,8 @@ sources = [SOURCE_TAR_GZ]
 use_pip = True
 
 dependencies = [
-    ('Python', '3.6.1', '', True),
-    ('Tensorflow', '1.2.0',),
+    ('Python', '3.6.1'),
+    ('Theano', '0.9.0', ''),
 #   ('h5py', '2.7.0', '%(versionsuffix)s'), internal Python 3.6.1
 #   ('PyYAML', '3.12', versionsuffix),      internal Python 3.6.1
 ]
diff --git a/l/libzlib/libzip-1.2.0.eb b/l/libzlib/libzip-1.2.0.eb
new file mode 100644
index 00000000..2dbb977d
--- /dev/null
+++ b/l/libzlib/libzip-1.2.0.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'libzip'
+version = '1.2.0'
+
+homepage = 'https://nih.at/libzip/'
+description = """libzip is a C library for reading, creating, and modifying zip archives. 
+Files can be added from data buffers, files, or compressed data copied directly from other 
+zip archives. Changes made without closing the archive can be reverted. The API is documented 
+by man pages."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://nih.at/libzip']
+sources = ['%(name)s-%(version)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/zipcmp', 'bin/zipmerge', 'bin/ziptool'],
+    'dirs': ['bin', 'include', 'lib', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/t/Theano/Theano-0.9.0-Python-3.6.1.eb b/t/Theano/Theano-0.9.0-Python-3.6.1.eb
new file mode 100644
index 00000000..5f133e45
--- /dev/null
+++ b/t/Theano/Theano-0.9.0-Python-3.6.1.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'Theano'
+version = '0.9.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://deeplearning.net/software/theano'
+description = """Theano is a Python library that allows you to define, optimize,
+and evaluate mathematical expressions involving multi-dimensional arrays efficiently."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.6.1')]
+
+sanity_check_paths = {
+    'files': ['bin/theano-cache', 'bin/theano-nose'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'