diff --git a/d/deMonNano/deMonNano-4.3.6.eb b/d/deMonNano/deMonNano-4.3.6.eb
new file mode 100644
index 00000000..0ea2b16a
--- /dev/null
+++ b/d/deMonNano/deMonNano-4.3.6.eb
@@ -0,0 +1,30 @@
+easyblock = 'PackedBinary'
+
+name = 'deMonNano'
+version = '4.3.6'
+
+homepage = 'http://www.demon-software.com'
+description = """deMonNano is a software package for density functional theory based tight binding calculations. 
+It is part of the deMon (density of Montréal) suite of programs. The present version of the code of deMon for 
+DFT is now known as deMon2k. This code and general information about deMon are available at http://www.demon-software.com
+"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://demon-nano.ups-tlse.fr/']
+sources = ['%(name)s.tar.gz']
+
+postinstallcmds = [
+    'mkdir %(installdir)s/bin',
+    'mv %(installdir)s/deMon.static-website.x %(installdir)s/bin',
+    'sed -i "s|type here the path to your \\\"basis\\\" directory|%(installdir)s/basis|" %(installdir)s/deMon.inp',
+]
+
+sanity_check_paths = {
+    'files': ['bin/deMon.static-website.x'],
+    'dirs': ['basis'],
+}
+
+modluafooter = 'execute {cmd=\'echo "Please, copy deMon.inp from $EBROOTDEMONNANO to your folder before execute \\\`deMon.static-website.x\\\` ( cp \\\$EBROOTDEMONNANO/deMon.inp . )"\',modeA={\'load\'}}'
+
+moduleclass = 'cae'
diff --git a/p/protobuf/protobuf-3.2.0-GCC-7.1.0-2.28-Python-3.6.1.eb b/p/protobuf/protobuf-3.2.0-GCC-7.1.0-2.28-Python-3.6.1.eb
new file mode 100644
index 00000000..843ae5e0
--- /dev/null
+++ b/p/protobuf/protobuf-3.2.0-GCC-7.1.0-2.28-Python-3.6.1.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'protobuf'
+version = '3.2.0'
+versionsuffix = '-Python-3.6.1'
+
+homepage = 'https://code.google.com/p/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'GCC', 'version': '7.1.0-2.28'}
+
+sources = ['%(name)s-python-%(version)s.tar.gz']
+source_urls = ['https://github.com/google/protobuf/releases/download/v%(version)s/']
+
+#builddependencies = [
+#    ('GCC', '4.9.3-tf'),
+#]
+
+dependencies = [
+    ('Python', '3.6.1', '', True),
+]
+
+# after instalation: python3 setup.py install --cpp_implementation
+postinstallcmds = [
+    'cp %(builddir)s/%(name)s-%(version)s/  %(installdir)s/build -R',
+]
+
+sanity_check_paths = {
+    'files': ['bin/protoc'],
+    'dirs': [],
+}
+
+modextravars = {
+    'PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION': 'cpp',
+}
+
+moduleclass = 'devel'
diff --git a/x/X11/.X11-20170314-test.eb.swp b/x/X11/.X11-20170314-test.eb.swp
deleted file mode 100644
index 7012ac10..00000000
Binary files a/x/X11/.X11-20170314-test.eb.swp and /dev/null differ
diff --git a/x/X11/X11-20170314-test.eb b/x/X11/X11-20170314-test.eb
index 1bec07f9..e2a971cc 100644
--- a/x/X11/X11-20170314-test.eb
+++ b/x/X11/X11-20170314-test.eb
@@ -44,12 +44,14 @@ default_easyblock = 'ConfigureMake'
 common_specs = {
     'sources': [SOURCE_TAR_GZ],
     'start_dir': '%(name)s-%(version)s',
+    'parallel': '16',
 }
 
 server_specs = {
     'sources': [SOURCE_TAR_GZ],
     'start_dir': '%(name)s-%(version)s',
-    'configopts': '--disable-glamor --enable-suid-wrapper --disable-systemd-logind -enable-install-setuid --with-xkb-path=/apps/all/X11/20170314-test/share/X11/xkb', #--with-xkb-path=%(installdir)s/share/X11/xkb
+    'preconfigopts': 'export XSERVERCFLAGS_CFLAGS=" " && export XSERVERCFLAGS_LIBS=$EBROOTX11/lib &&',
+    'configopts': '--disable-glamor --enable-suid-wrapper --disable-systemd-logind --with-xkb-path=/apps/all/X11/20170314-test/share/X11/xkb', #--with-xkb-path=%(installdir)s/share/X11/xkb
 }
 
 
diff --git a/x/xorg-server/xorg-server-1.17.4.eb b/x/xorg-server/xorg-server-1.17.4.eb
new file mode 100644
index 00000000..e7efda1e
--- /dev/null
+++ b/x/xorg-server/xorg-server-1.17.4.eb
@@ -0,0 +1,20 @@
+easyblock = 'Rpm'
+
+name = 'xorg-Xvfb'
+version = '1.17.4'
+
+homepage = "http://www.x.org/wiki/"
+description = "The Xorg Server is the core of the X Window system."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['xorg-x11-server-Xvfb-1.17.4-16.el6.centos.x86_64.rpm']
+source_urls = ['http://195.220.108.108/linux/centos/6.9/os/x86_64/Packages']
+
+
+sanity_check_paths = {
+    'files': ['bin/Xorg', 'bin/Xvfb', 'bin/Xnest'],
+    'dirs': ['bin', 'lib', 'include'],
+}
+
+moduleclass = 'vis'
diff --git a/x/xorg-server/xorg-server-1.19.3-intel-2017a.eb b/x/xorg-server/xorg-server-1.19.3-intel-2017a.eb
index d54fa8d6..73951f91 100644
--- a/x/xorg-server/xorg-server-1.19.3-intel-2017a.eb
+++ b/x/xorg-server/xorg-server-1.19.3-intel-2017a.eb
@@ -11,15 +11,17 @@ toolchain = {'name': 'intel', 'version': '2017a'}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['https://www.x.org/archive/individual/xserver/']
 
-configopts = '--disable-glamor --enable-suid-wrapper --disable-systemd-logind'
+#preconfigopts = 'export XSERVERCFLAGS_CFLAGS=" " && export XSERVERCFLAGS_LIBS=$EBROOTX11/lib &&'
+
+configopts = '--disable-glamor --enable-suid-wrapper --disable-systemd-logind --enable-builtin-fonts --with-xkb-path=/apps/all/XKeyboardConfig/2.21/share/X11/xkb/' #--with-xkb-path=%(installdir)s/share/X11/xkb
 
 #builddependencies = [
-#   ('xorg-macros', '1.19.1'),
+#   ('pkg-config', '0.29.2', '', True),
 #]
 
 dependencies = [
     ('Mesa', '17.0.2'),
-    ('X11', '20170314', '-test', True),
+#    ('X11', '20170314', '', True),
     ('nettle', '3.3'),
     ('XKeyboardConfig', '2.21', '', True)
 ]