diff --git a/src/themes/d4science/login/template.ftl b/src/themes/d4science/login/template.ftl
index 0eb6ec2..a6ed5be 100644
--- a/src/themes/d4science/login/template.ftl
+++ b/src/themes/d4science/login/template.ftl
@@ -9,6 +9,29 @@
 
   <title>${properties.titleTag}</title>
   <link rel="icon" href="${properties.favicon}" />
+  <style>
+    html {
+      position: relative;
+      min-height: 100%;
+    }
+    body {
+      margin-bottom: 60px; /* Margin bottom by footer height */
+    }
+    .footer {
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      /* height: 60px; Set the fixed height of the footer here */
+      line-height: 60px; /* Vertically center the text there */
+      color: #fff;
+      font-size: 0.7em;
+      background-color: #f5f5f5;
+    }
+    .footer a {
+      color: #fff;
+    }
+  </style>
+
 </head>
 <body>
   
@@ -20,11 +43,13 @@
             <img class="img-fluid float-left" alt="${properties.logoAlt}" src="${properties.logoSrc}" style="${properties.logoStyle}">
           </a>
         </div>
-        <div class="col">
-          <a target="_blank" href="http://www.d4science.org">
-            <img class="img-fluid float-right" alt="D4Science Infrastructure" src="https://sobigdata.d4science.org/sobigdata-site-theme/images/custom/PoweredByD4Science.png">
-          </a>
-        </div>
+				<#if properties.logoInfrastructure?has_content && properties.logoInfrastructure='yes'>
+					<div class="col">
+						<a target="_blank" href="http://www.d4science.org">
+							<img class="img-fluid float-right" alt="D4Science Infrastructure" src="https://sobigdata.d4science.org/sobigdata-site-theme/images/custom/PoweredByD4Science.png">
+						</a>
+					</div>
+				</#if>
       </div>
     </div>    
     <nav class="navbar navbar-expand-lg navbar-light" style="${properties.navbarStyle}">
@@ -68,16 +93,16 @@
  
   </div>
 
-  <footer class="container-fluid" style="${properties.footerStyle}">
+  <footer class="footer container-fluid" style="${properties.footerStyle}">
     <div class="row">
-      <div class="col">
+      <div class="col-12">
         <a href="${properties.linkTerms}">Terms of Use</a> | 
         <a href="${properties.linkCookies}">Cookies Policy</a> | 
         <a href="${properties.linkPrivacy}" target="_blank">Privacy Policy</a> | 
-        <a href="${properties.linkWebsite}" target="_blank">${properties.descWebsite}</a>
+        <#if properties.linkWebsite?has_content>
+          <a href="${properties.linkWebsite}" target="_blank">${properties.descWebsite}</a>
+        </#if>
       </div>
-    </div>
-    <div class="row justify-content-end">
       <div class="col-12">
         <a href="http://ec.europa.eu/programmes/horizon2020/" target="_blank">
           <img class="float-right" alt="EU H2020 programme" src="${properties.logoEC}" style="${properties.logoECStyle}">
diff --git a/src/themes/d4science/login/theme.properties b/src/themes/d4science/login/theme.properties
index 3a16eab..05fcc0f 100644
--- a/src/themes/d4science/login/theme.properties
+++ b/src/themes/d4science/login/theme.properties
@@ -6,13 +6,15 @@ favicon=
 linkWebsite=
 descWebsite=
 
+logoInfrastructure=yes
+
 logoSrc=
 logoAlt=
 logoStyle=max-height: 50px;
 
 navbarStyle=
 
-footerStyle=
+footerStyle=background-color: #f5f5f5;
 
 linkTerms=
 linkCookies=
diff --git a/src/themes/dev.d4science/login/theme.properties b/src/themes/dev.d4science/login/theme.properties
deleted file mode 100644
index ae0943e..0000000
--- a/src/themes/dev.d4science/login/theme.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-parent=d4science
-
-titleTag=D4Science DEV Login
-#favicon=
-
-linkWebsite=https://dev.d4science.org/
-descWebsite=D4Science Developers
-
-logoSrc=https://dev.d4science.org/image/layout_set_logo?img_id=36727858&t=1592844138024
-logoAlt=D4Science Developers
-logoStyle=max-height: 100px;
-
-#navbarStyle=
-
-#footerStyle=
-
-linkTerms=https://dev.d4science.org/terms-of-use
-#linkCookies=
-#linkPrivacy=https://www.iubenda.com/privacy-policy/441050
-
-#logoEC=
-#logoECStyle=max-width: 35px;
-
-#footerRow1=...
-#footerRow2=...
\ No newline at end of file
diff --git a/src/themes/dev.d4science/account/theme.properties b/src/themes/dev4.d4science.org/account/theme.properties
similarity index 100%
rename from src/themes/dev.d4science/account/theme.properties
rename to src/themes/dev4.d4science.org/account/theme.properties
diff --git a/src/themes/dev.d4science/admin/theme.properties b/src/themes/dev4.d4science.org/admin/theme.properties
similarity index 100%
rename from src/themes/dev.d4science/admin/theme.properties
rename to src/themes/dev4.d4science.org/admin/theme.properties
diff --git a/src/themes/dev.d4science/email/theme.properties b/src/themes/dev4.d4science.org/email/theme.properties
similarity index 100%
rename from src/themes/dev.d4science/email/theme.properties
rename to src/themes/dev4.d4science.org/email/theme.properties
diff --git a/src/themes/dev4.d4science.org/login/theme.properties b/src/themes/dev4.d4science.org/login/theme.properties
new file mode 100644
index 0000000..2301295
--- /dev/null
+++ b/src/themes/dev4.d4science.org/login/theme.properties
@@ -0,0 +1,27 @@
+parent=d4science
+
+titleTag=gCube Snapshot Gateway - Sign in
+favicon=https://dev4.d4science.org/generic-configurable-theme/images/favicon.ico
+
+linkWebsite=https://dev4.d4science.org
+descWebsite=Go to D4Science Gateway
+
+logoSrc=https://dev4.d4science.org/image/company_logo?img_id=0&amp;t=1590160581995
+logoAlt=gCube Snapshot Gateway
+logoStyle=height: 70px;
+logoInfrastructure=no
+
+navbarStyle=color: #FFF; background: #0271BE;
+
+footerStyle=background-color: #555;
+
+linkTerms=https://dev4.d4science.org/terms-of-use
+linkCookies=https://dev4.d4science.org/cookie-policy
+#linkPrivacy=https://www.iubenda.com/privacy-policy/441050
+
+logoEC=https://dev4.d4science.org/generic-configurable-theme/images/custom/logo-ec.jpg
+#logoECStyle=max-width: 35px;
+
+#footerRow1=...
+#footerRow2=...
+
diff --git a/src/themes/next.d4science.org/account/theme.properties b/src/themes/next.d4science.org/account/theme.properties
new file mode 100644
index 0000000..42c1a4c
--- /dev/null
+++ b/src/themes/next.d4science.org/account/theme.properties
@@ -0,0 +1 @@
+parent=d4science
diff --git a/src/themes/next.d4science.org/admin/theme.properties b/src/themes/next.d4science.org/admin/theme.properties
new file mode 100644
index 0000000..df811eb
--- /dev/null
+++ b/src/themes/next.d4science.org/admin/theme.properties
@@ -0,0 +1 @@
+parent=d4science
\ No newline at end of file
diff --git a/src/themes/next.d4science.org/email/theme.properties b/src/themes/next.d4science.org/email/theme.properties
new file mode 100644
index 0000000..42c1a4c
--- /dev/null
+++ b/src/themes/next.d4science.org/email/theme.properties
@@ -0,0 +1 @@
+parent=d4science
diff --git a/src/themes/next.d4science.org/login/theme.properties b/src/themes/next.d4science.org/login/theme.properties
new file mode 100644
index 0000000..7215629
--- /dev/null
+++ b/src/themes/next.d4science.org/login/theme.properties
@@ -0,0 +1,26 @@
+parent=d4science
+
+titleTag=gCubeDev Gateway - Sign in
+favicon=https://next.d4science.org/generic-configurable-theme/images/favicon.ico
+
+linkWebsite=https://next.d4science.org/
+descWebsite=Go to D4Science Gateway
+
+logoSrc=https://next.d4science.org/image/layout_set_logo?img_id=9133999&amp;t=1592922317362
+logoAlt=gCubeDev Gateway
+logoStyle=height: 70px;
+logoInfrastructure=no
+
+navbarStyle=color: #FFF; background: #0271BE;
+
+footerStyle=background-color: #555;
+
+linkTerms=https://next.d4science.org/terms-of-use
+linkCookies=https://next.d4science.org/cookie-policy
+#linkPrivacy=https://www.iubenda.com/privacy-policy/441050
+
+logoEC=https://next.d4science.org/generic-configurable-theme/images/custom/logo-ec.jpg
+#logoECStyle=max-width: 35px;
+
+#footerRow1=...
+#footerRow2=...
