diff --git a/g/grace/grace-5.1.25-intel-2017a.eb b/g/grace/grace-5.1.25-intel-2017a.eb
new file mode 100644
index 00000000..2857cf3b
--- /dev/null
+++ b/g/grace/grace-5.1.25-intel-2017a.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'grace'
+version = '5.1.25'
+
+homepage = 'http://freecode.com/projects/grace'
+description = """Grace is a WYSIWYG 2D plotting tool for X Windows System and Motif."""
+
+source_urls = ['ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable']
+sources = [SOURCE_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+
+dependencies = [
+    ('motif', '2.3.7', '', True),
+    ('netCDF', '4.4.1.1'),
+]
+
+runtest = 'tests'
+
+# we also need to run make links right before or after make install.
+installopts = 'links'
+
+sanity_check_paths = {
+    'files': ['bin/xmgrace'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/m/motif/motif-2.3.7.eb b/m/motif/motif-2.3.7.eb
new file mode 100644
index 00000000..a49945bd
--- /dev/null
+++ b/m/motif/motif-2.3.7.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'motif'
+version = '2.3.7'
+
+homepage = 'http://motif.ics.com/'
+description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building
+ applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems.
+ It was the standard toolkit for the Common Desktop Environment and thus for Unix."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['%(name)s-%(version)s.tar.gz']
+source_urls = [SOURCEFORGE_SOURCE]
+
+dependencies = [
+    ('X11', '20170314'),
+    ('libpng', '1.6.29'),
+    ('xbitmaps', '1.1.1'),
+    ('freetype', '2.8'),
+    ('libjpeg-turbo', '1.5.1'),
+    ('bzip2', '1.0.6'),
+]
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('flex', '2.6.3'),
+    ('Bison', '3.0.4'),
+    ('util-linux', '2.29.2'),
+]
+
+# makefile is not parallel safe
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['lib/libMrm.a', 'lib/libUil.a', 'lib/libXm.a', 'bin/mwm', 'bin/uil', 'bin/xmbind'],
+    'dirs': ['include/Mrm', 'include/uil', 'include/X11', 'include/Xm'],
+}
+
+moduleclass = 'vis'
diff --git a/o/ORCA/ORCA-4.0.1.2.eb b/o/ORCA/ORCA-4.0.1.2.eb
index 162d22cb..c13ee710 100644
--- a/o/ORCA/ORCA-4.0.1.2.eb
+++ b/o/ORCA/ORCA-4.0.1.2.eb
@@ -27,7 +27,11 @@ sanity_check_paths = {
     ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
                              'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
                                       'md', 'mergefrag', 'ndoint', 'numfreq', 'plot',
+<<<<<<< HEAD
                                       'pltvib', 'pop', 'rel', 'vib', 'vpot']], 
+=======
+                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']],
+>>>>>>> 96f1245aa28a346d2bdb7f950751af4e8748184f
     'dirs': [],
 }
 
diff --git a/o/OpenCL-runtime/OpenCL-runtime-16.1.1.eb b/o/OpenCL-runtime/OpenCL-runtime-16.1.1.eb
index a21089b4..a2ffddea 100644
--- a/o/OpenCL-runtime/OpenCL-runtime-16.1.1.eb
+++ b/o/OpenCL-runtime/OpenCL-runtime-16.1.1.eb
@@ -1,3 +1,4 @@
+#IT4Innovations 2017
 easyblock = 'OpenCL'
 
 name = 'OpenCL-runtime'
@@ -20,8 +21,9 @@ source_urls = [
 sources = ['opencl_runtime_%(version)s_x64_rh_6.4.0.25.tgz']
 
 # license file
-import os
-license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+#import os
+#license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+license_file = "/apps/licenses/intel/license.lic"
 
 skipsteps = ['build']
 
diff --git a/p/ParaView/.ParaView-5.4.0-intel-2017a-OSPRay-test.eb.swp b/p/ParaView/.ParaView-5.4.0-intel-2017a-OSPRay-test.eb.swp
new file mode 100644
index 00000000..0b683af6
Binary files /dev/null and b/p/ParaView/.ParaView-5.4.0-intel-2017a-OSPRay-test.eb.swp differ
diff --git a/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay.eb b/p/ParaView/ParaView-5.4.0-intel-2017a-mpi-OSPRay.eb
similarity index 100%
rename from p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay.eb
rename to p/ParaView/ParaView-5.4.0-intel-2017a-mpi-OSPRay.eb