diff --git a/pom.xml b/pom.xml
index 5012b39..3df57bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<artifactId>d4science-responsive-theme</artifactId>
 	<packaging>war</packaging>
 	<name>d4science-responsive-theme Theme</name>
-	<version>6.3.2-SNAPSHOT</version>
+	<version>6.4.0-SNAPSHOT</version>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/src/main/webapp/WEB-INF/liferay-look-and-feel.xml b/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
index 416d135..9893669 100644
--- a/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
+++ b/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
@@ -5,5 +5,18 @@
 	<compatibility>
 		<version>6.2.5+</version>
 	</compatibility>
-	<theme id="d4science-responsive" name="d4science-responsive-theme" />
+	<theme id="d4science-responsive" name="d4science-responsive-theme">
+		<settings>
+			<setting configurable="true" key="background-image-name"
+				type="text" />
+			<setting configurable="true" key="override-logo-on-dockbar"
+				type="checkbox" value="true" />
+			<setting configurable="true" key="footer-website-name" type="text" />
+			<setting configurable="true" key="footer-website-url" type="text" />
+			<setting configurable="true" key="footer-website-name" type="text" />
+			<setting configurable="true" key="footer-text-about" type="text" />
+			<setting configurable="true" key="show-eu-flag" type="checkbox"
+				value="true" />
+		</settings>
+	</theme>
 </look-and-feel>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index c3ad2ba..05cf14f 100644
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,6 +1,6 @@
 name=d4science-responsive-theme
 module-group-id=liferay
-module-incremental-version=6
+module-incremental-version=7
 tags=
 short-description=
 change-log=
diff --git a/src/main/webapp/images/custom/body_bg.png b/src/main/webapp/images/custom/body_bg.png
deleted file mode 100644
index 34646df..0000000
Binary files a/src/main/webapp/images/custom/body_bg.png and /dev/null differ
diff --git a/src/main/webapp/images/custom/e_infrastructure.gif b/src/main/webapp/images/custom/e_infrastructure.gif
deleted file mode 100644
index 2dbcb85..0000000
Binary files a/src/main/webapp/images/custom/e_infrastructure.gif and /dev/null differ
diff --git a/src/main/webapp/images/custom/fotolia.jpg b/src/main/webapp/images/custom/fotolia.jpg
deleted file mode 100644
index 0dafc5d..0000000
Binary files a/src/main/webapp/images/custom/fotolia.jpg and /dev/null differ
diff --git a/src/main/webapp/images/custom/logo-ec.jpg b/src/main/webapp/images/custom/logo-ec.jpg
new file mode 100644
index 0000000..08d697b
Binary files /dev/null and b/src/main/webapp/images/custom/logo-ec.jpg differ
diff --git a/src/main/webapp/images/custom/splash-stretched.jpg b/src/main/webapp/images/custom/splash-stretched.jpg
new file mode 100644
index 0000000..e75dc54
Binary files /dev/null and b/src/main/webapp/images/custom/splash-stretched.jpg differ
diff --git a/src/main/webapp/templates/init_custom.vm b/src/main/webapp/templates/init_custom.vm
index 5c53376..12e19fd 100644
--- a/src/main/webapp/templates/init_custom.vm
+++ b/src/main/webapp/templates/init_custom.vm
@@ -2,4 +2,8 @@
 
 #set ($css_class = "${css_class} dockbar-split")
 
-*#
\ No newline at end of file
+*#
+
+#if ($theme.getSetting("background-image-name") !="")
+	#set ($background-image-name = $themeDisplay.getPathThemeImages() + "/custom/" + $theme.getSetting("background-image-name"))
+#end
\ No newline at end of file
diff --git a/src/main/webapp/templates/portal_normal.vm b/src/main/webapp/templates/portal_normal.vm
index 6a9168d..dd4c8e9 100644
--- a/src/main/webapp/templates/portal_normal.vm
+++ b/src/main/webapp/templates/portal_normal.vm
@@ -18,6 +18,20 @@
 	$theme.include($top_head_include)
 	<script type="text/javascript" src="$javascript_folder/jquery-1.12.0.min.js"></script>
 	<script type="text/javascript" src="$javascript_folder/gcube-context.js"></script>	
+	<style>
+	#if ($theme.getSetting("override-logo-on-dockbar") == "true")
+		.aui .dockbar .navbar-inner, .aui .dockbar-split .dockbar .navbar-inner  {
+			background-image: url($site_logo);
+			background-size: auto 25px;
+		}	
+	#end	
+	#if ($theme.getSetting("background-image-name") !="")
+		.aui div#wrapper {
+			background: #fff url($background-image-name) center top no-repeat;
+			background-size: 100% 100%;	
+		}	
+	#end	
+	</style>
 </head>
 
 <body class="$css_class">
@@ -53,12 +67,8 @@ $theme.include($body_top_include)
 
 <div class="container-fluid" id="wrapper">
 	<header id="banner" role="banner">
-		
 	</header>
-
 	<div id="content">
-		<!-- nav id="breadcrumbs">#breadcrumbs()</nav -->
-
 		#if ($selectable)
 			$theme.include($content_include)
 		#else
@@ -78,10 +88,16 @@ $theme.include($body_top_include)
 	<a href="/web/guest/terms-of-use">Terms of Use</a> |
 	<a href="/web/guest/cookie-policy">Cookies Policy</a> |
 	<a target="_blank" href="https://www.iubenda.com/privacy-policy/441050">Privacy Policy</a>  |  
-	<a target="_blank" href="http://www.liferay.com" title="liferay website">Liferay Portal</a> | 
-	<a target="_blank" href="http://www.d4science.org">D4Science Org Website</a>        
-
+	<a target="_blank" href="$theme.getSetting("footer-website-url")">$theme.getSetting("footer-website-name")</a>        
     </div> 
+	<div style="float:right; text-align: right;">  
+		#if ($theme.getSetting("show-eu-flag") == "true")
+		<a href="http://ec.europa.eu/programmes/horizon2020/" target="_blank">
+			<img src="$themeDisplay.getPathThemeImages()/custom/logo-ec.jpg" style="width: 35px;" alt="EU H2020 programme" hspace="5" />
+		</a>
+		#end
+		<div style="color: #CCC; font-size: 12px;">$theme.getSetting("footer-text-about")</div>
+		</div>	
 </footer>
 $theme.include($body_bottom_include)