diff --git a/src/cpp/HTTPInterface/AdminCheckUserBackup.cpp b/src/cpp/HTTPInterface/AdminCheckUserBackup.cpp
index 47d910745..940d084bc 100644
--- a/src/cpp/HTTPInterface/AdminCheckUserBackup.cpp
+++ b/src/cpp/HTTPInterface/AdminCheckUserBackup.cpp
@@ -222,13 +222,26 @@ void AdminCheckUserBackup::handleRequest(Poco::Net::HTTPServerRequest& request,
 	responseStream << "\t\t</tbody>\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/AdminUserPasswordReset.cpp b/src/cpp/HTTPInterface/AdminUserPasswordReset.cpp
index fe41d3143..42778fd45 100644
--- a/src/cpp/HTTPInterface/AdminUserPasswordReset.cpp
+++ b/src/cpp/HTTPInterface/AdminUserPasswordReset.cpp
@@ -254,13 +254,26 @@ void AdminUserPasswordReset::handleRequest(Poco::Net::HTTPServerRequest& request
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/CheckEmailPage.cpp b/src/cpp/HTTPInterface/CheckEmailPage.cpp
index aef03f98f..b140451c6 100644
--- a/src/cpp/HTTPInterface/CheckEmailPage.cpp
+++ b/src/cpp/HTTPInterface/CheckEmailPage.cpp
@@ -10,7 +10,7 @@
 #include "../SingletonManager/SessionManager.h"
 #include "../SingletonManager/LanguageManager.h"
 #include "../SingletonManager/EmailManager.h"
-enum PageState 
+enum PageState
 {
 	MAIL_NOT_SEND,
 	ASK_VERIFICATION_CODE,
@@ -18,8 +18,8 @@ enum PageState
 	KONTO_ALREADY_EXIST
 };
 #line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-#include "../ServerConfig.h"	
+
+#include "../ServerConfig.h"
 
 
 CheckEmailPage::CheckEmailPage(Session* arg):
@@ -41,20 +41,20 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	const char* pageName = "Email Verification";
 	auto lm = LanguageManager::getInstance();
 	auto em = EmailManager::getInstance();
-	
+
 	auto lang = chooseLanguage(request);
 	auto langCatalog = lm->getFreeCatalog(lang);
 	unsigned long long verificationCode = 0;
-	
+
 	PageState state = ASK_VERIFICATION_CODE;
-	
-	if(mSession && model::table::EMAIL_OPT_IN_REGISTER_DIRECT == mSession->getEmailVerificationType()) 
+
+	if(mSession && model::table::EMAIL_OPT_IN_REGISTER_DIRECT == mSession->getEmailVerificationType())
 	{
 		state = EMAIL_ACTIVATED;
-	} 
+	}
 	else
 	{
-	
+
 		if(!form.empty()) {
 			auto langBtn = form.get("lang-btn", "");
 			auto verficationCodeStr = form.get("email-verification-code", "0");
@@ -69,11 +69,11 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 				langCatalog = lm->getFreeCatalog(lang);
 			}
 		}
-		
+
 		// remove old cookies if exist
 		auto sm = SessionManager::getInstance();
 		sm->deleteLoginCookies(request, response, mSession);
-		
+
 		if(mSession) {
 			getErrors(mSession);
 			if(mSession->getSessionState() < SESSION_STATE_EMAIL_VERIFICATION_SEND) {
@@ -86,8 +86,8 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 		}
 	}
 #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-	bool withMaterialIcons = false; 
+
+	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
 	Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
 	std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
@@ -106,7 +106,7 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
 #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "css/loginServer/style.css\">\n";
+	responseStream << "css/main.css\">\n";
 #line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  if(withMaterialIcons) { 	responseStream << "\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
@@ -116,185 +116,169 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 #line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
-	responseStream << "<body class=\"header-fixed\">\n";
-	responseStream << "<div class=\"versionstring dev-info\">\n";
-	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
-	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
-	responseStream << ( ServerConfig::g_versionString );
-	responseStream << "</p>\n";
-	responseStream << "</div>\n";
-	responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
-	responseStream << "\t<div class=\"grd-left-bar-section\">\n";
-	responseStream << "\t\t<ul class=\"grd-no-style\">\n";
-	responseStream << "\t\t  <li><a href=\"";
-#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << "<body>\n";
+	responseStream << "    <div class=\"layout\">\n";
+	responseStream << "        <div class=\"center-form-single\">\n";
+	responseStream << "            <div class=\"center-form-header\">\n";
+	responseStream << "                <a href=\"";
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
-	responseStream << "\t\t  <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
-	responseStream << "\t\t</ul>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</nav>-->";
-	// end include header.cpsp
-	responseStream << "\n";
-	responseStream << "<div class=\"authentication-theme auth-style_1\">\n";
-	responseStream << "      <div class=\"row\">\n";
-	responseStream << "        <div class=\"col-12 logo-section\">\n";
-	responseStream << "          <a href=\"";
-#line 71 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
-	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"logo\">\n";
-	responseStream << "            <picture>\n";
-	responseStream << "\t\t\t\t<source srcset=\"";
-#line 73 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "\" class=\"center-logo\">\n";
+	responseStream << "                    <picture>\n";
+	responseStream << "                        <source srcset=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
-	responseStream << "\t\t\t\t<source srcset=\"";
-#line 74 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "                        <source srcset=\"";
+#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "img/logo_schrift.png\" type=\"image/png\"> \n";
-	responseStream << "\t\t\t\t<img src=\"";
-#line 75 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
+	responseStream << "                        <img src=\"";
+#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
-	responseStream << "\t\t\t</picture>\n";
-	responseStream << "          </a>\n";
-	responseStream << "        </div>\n";
-	responseStream << "      </div>\n";
-	responseStream << "      <div class=\"row\">\n";
-	responseStream << "        <div class=\"col-lg-5 col-md-7 col-sm-9 col-11 mx-auto\">\n";
-	responseStream << "          <div class=\"grid\">\n";
-	responseStream << "            <div class=\"center-ul-container\">\n";
-	responseStream << "              ";
-#line 84 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "                    </picture>\n";
+	responseStream << "                </a>\n";
+	responseStream << "            </div>";
+	// end include header.cpsp
+	responseStream << "\n";
+#line 68 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
-	responseStream << "            </div>\n";
-	responseStream << "            <div class=\"grid-body\">\n";
-	responseStream << "              <form action=\"";
-#line 87 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "<div class=\"center-form-container\">\n";
+	responseStream << "    ";
+	// begin include flags.cpsp
+	responseStream << "<div class=\"center-form-selectors\">\n";
+	responseStream << "<form method=\"GET\" action=\"\">\n";
+	responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_EN) { 	responseStream << "class=\"flag-btn\"";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ } 	responseStream << ">\n";
+	responseStream << "\t  <span class=\"flag flag-england\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_DE) { 	responseStream << "class=\"flag-btn\"";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ } 	responseStream << ">\n";
+	responseStream << "\t  <span class=\"flag flag-germany\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "</form>\n";
+	responseStream << "</div>";
+	// end include flags.cpsp
+	responseStream << "\n";
+	responseStream << "    <div class=\"center-form-title\">\n";
+	responseStream << "        <h1>";
+#line 72 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << ( langCatalog->gettext("E-Mail verifizieren") );
+	responseStream << "</h1>\n";
+	responseStream << "    </div>\n";
+	responseStream << "    <div class=\"center-form-form\">\n";
+	responseStream << "      <form action=\"";
+#line 75 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "account/checkEmail\" method=\"GET\">\n";
-	responseStream << "                <div class=\"row pull-right-row\">\n";
-	responseStream << "                  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "                    <div class=\"grid-body-small text-center\">\n";
-	responseStream << "                        <button id=\"flag-england\" name=\"lang-btn\" value=\"en\" title=\"English\" type=\"submit\" ";
-#line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
- if(lang != LANG_EN) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
- } 
-						else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
- } 	responseStream << ">\n";
-	responseStream << "                          <span class=\"flag-england\"></span>\n";
-	responseStream << "                        </button>\n";
-	responseStream << "                    </div>\n";
-	responseStream << "                  </div>\n";
-	responseStream << "                  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "                    <div class=\"grid-body-small text-center\">\n";
-	responseStream << "                        <button id=\"flag-germany\" name=\"lang-btn\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
-#line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
- if(lang != LANG_DE) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
- } 
-						else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 100 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
- } 	responseStream << ">\n";
-	responseStream << "                          <span class=\"flag-germany\"></span>\n";
-	responseStream << "                        </button>\n";
-	responseStream << "                    </div>\n";
-	responseStream << "                  </div>\n";
-	responseStream << "                </div>\n";
-	responseStream << "\t\t\t\t";
-#line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "\t";
+#line 76 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
  if(EMAIL_ACTIVATED == state) { 	responseStream << "\n";
-	responseStream << "\t\t\t\t\t<p>";
-#line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "\t\t<p>";
+#line 77 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("Deine E-Mail wurde erfolgreich bestätigt. Du kannst nun Gradidos versenden.") );
 	responseStream << "</p>\n";
-	responseStream << "\t\t\t\t\t<a class=\"btn btn-sm btn-primary\" href=\"";
-#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "\t\t<a class=\"link-button\" href=\"";
+#line 78 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "\">";
-#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+#line 78 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("Zur Startseite") );
 	responseStream << "</a>\n";
-	responseStream << "\t\t\t\t";
-#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "\t";
+#line 79 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
  } else { 	responseStream << "\n";
-	responseStream << "                <div class=\"item-wrapper\">\n";
-	responseStream << "                        <div class=\"form-group\">\n";
-	responseStream << "                          <label for=\"email-verification-code\">";
-#line 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
-	responseStream << ( langCatalog->gettext("Bitte gebe deinen E-Mail Verification Code ein:"));
+	responseStream << "        <label class=\"form-label\" for=\"email-verification-code\">";
+#line 80 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << ( langCatalog->gettext("Bitte gib deinen E-Mail Verification Code ein:"));
 	responseStream << "</label>\n";
-	responseStream << "                          <input type=\"number\" class=\"form-control\" name=\"email-verification-code\" id=\"email-verification-code\" placeholder=\"";
-#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "        <input class=\"form-control\" type=\"number\" name=\"email-verification-code\" id=\"email-verification-code\" placeholder=\"";
+#line 81 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("Email Verification Code"));
 	responseStream << "\" ";
-#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+#line 81 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
  if(verificationCode) { 	responseStream << "value=\"";
-#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+#line 81 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( verificationCode );
 	responseStream << "\" ";
-#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+#line 81 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "                        </div>\n";
-	responseStream << "                        <button type=\"submit\" class=\"btn btn-sm btn-primary\">";
-#line 115 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "        <button type=\"submit\" class=\"center-form-submit form-button\">";
+#line 82 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("&Uuml;berpr&uuml;fe Code"));
 	responseStream << "</button>\n";
-	responseStream << "                </div>\n";
-	responseStream << "                </form>\n";
-	responseStream << "              <!--<p class=\"margin-top-10\">\n";
-	responseStream << "\t\t\t\t";
-#line 119 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "      </form>\n";
+	responseStream << "  <!--<p>\n";
+	responseStream << "\t";
+#line 85 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("Du hast bisher keinen Code erhalten?"));
-	responseStream << "<br> \n";
-	responseStream << "\t\t\t\t";
-#line 120 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "<br>\n";
+	responseStream << "\t";
+#line 86 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("E-Mail erneut zuschicken (in Arbeit)"));
 	responseStream << "\n";
-	responseStream << "\t\t\t  </p>-->\n";
-	responseStream << "              <p class=\"margin-top-10\">\n";
-	responseStream << "\t\t\t\t";
-#line 123 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "  </p>-->\n";
+	responseStream << "      <p>\n";
+	responseStream << "\t\t";
+#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("Funktioniert dein E-Mail Verification Code nicht?"));
 	responseStream << "<br>\n";
-	responseStream << "\t\t\t\t";
-#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "\t\t";
+#line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("Schicke uns eine E-Mail und wir k&uuml;mmern uns darum: "));
 	responseStream << "<br>\n";
-	responseStream << "                <b><a href=\"mailto:";
-#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "        <b><a href=\"mailto:";
+#line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( em->getAdminReceiver());
 	responseStream << "?subject=Invalid E-Mail Verification Code&amp;body=Hallo Dario,%0D%0A%0D%0Amein E-Mail Verification-Code: ";
-#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+#line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( verificationCode );
 	responseStream << " funktioniert nicht,%0D%0Akannst du das prüfen?%0D%0A%0D%0AMit freundlichen Grüßen%0D%0A\">";
-#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+#line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
 	responseStream << ( langCatalog->gettext("E-Mail an Support schicken"));
 	responseStream << "</a></b>\n";
-	responseStream << "\t\t\t  </p>\n";
-	responseStream << "\t\t\t  ";
-#line 127 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+	responseStream << "\t  </p>\n";
+	responseStream << "    </form>\n";
+	responseStream << "  ";
+#line 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
  } 	responseStream << "\n";
-	responseStream << "            </div>\n";
-	responseStream << "          </div>\n";
-	responseStream << "        </div>\n";
-	responseStream << "      </div>\n";
-	responseStream << "      <div class=\"auth_footer\">\n";
-	responseStream << "        <p class=\"text-muted text-center\">© Gradido 2019</p>\n";
-	responseStream << "      </div>\n";
-	responseStream << "    </div>\n";
+	responseStream << "</div>\n";
+	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/ConfigPage.cpp b/src/cpp/HTTPInterface/ConfigPage.cpp
index df63f3d0f..159b1a7c9 100644
--- a/src/cpp/HTTPInterface/ConfigPage.cpp
+++ b/src/cpp/HTTPInterface/ConfigPage.cpp
@@ -9,8 +9,8 @@
  
 	const char* pageName = "Config";
 #line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-#include "../ServerConfig.h"	
+
+#include "../ServerConfig.h"
 
 
 void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTTPServerResponse& response)
@@ -22,8 +22,8 @@ void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:
 
 	Poco::Net::HTMLForm form(request, request.stream());
 #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-	bool withMaterialIcons = false; 
+
+	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
 	Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
 	std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
@@ -42,7 +42,7 @@ void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
 #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "css/loginServer/style.css\">\n";
+	responseStream << "css/main.css\">\n";
 #line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  if(withMaterialIcons) { 	responseStream << "\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
@@ -52,25 +52,30 @@ void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:
 #line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
-	responseStream << "<body class=\"header-fixed\">\n";
-	responseStream << "<div class=\"versionstring dev-info\">\n";
-	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
-	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
-	responseStream << ( ServerConfig::g_versionString );
-	responseStream << "</p>\n";
-	responseStream << "</div>\n";
-	responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
-	responseStream << "\t<div class=\"grd-left-bar-section\">\n";
-	responseStream << "\t\t<ul class=\"grd-no-style\">\n";
-	responseStream << "\t\t  <li><a href=\"";
+	responseStream << "<body>\n";
+	responseStream << "    <div class=\"layout\">\n";
+	responseStream << "        <div class=\"center-form-single\">\n";
+	responseStream << "            <div class=\"center-form-header\">\n";
+	responseStream << "                <a href=\"";
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "\" class=\"center-logo\">\n";
+	responseStream << "                    <picture>\n";
+	responseStream << "                        <source srcset=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
+	responseStream << "                        <source srcset=\"";
+#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
+	responseStream << "                        <img src=\"";
 #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
-	responseStream << "\t\t  <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
-	responseStream << "\t\t</ul>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</nav>-->";
+	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
+	responseStream << "                    </picture>\n";
+	responseStream << "                </a>\n";
+	responseStream << "            </div>";
 	// end include header.cpsp
 	responseStream << "\n";
 	responseStream << "<h1>Config</h1>\n";
diff --git a/src/cpp/HTTPInterface/DashboardPage.cpp b/src/cpp/HTTPInterface/DashboardPage.cpp
index 80c830d5c..dcd034d63 100644
--- a/src/cpp/HTTPInterface/DashboardPage.cpp
+++ b/src/cpp/HTTPInterface/DashboardPage.cpp
@@ -167,13 +167,26 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "\t</div>\n";
 	responseStream << "</nav>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/DebugMnemonicPage.cpp b/src/cpp/HTTPInterface/DebugMnemonicPage.cpp
index 2061f8066..8065c725f 100644
--- a/src/cpp/HTTPInterface/DebugMnemonicPage.cpp
+++ b/src/cpp/HTTPInterface/DebugMnemonicPage.cpp
@@ -249,13 +249,26 @@ void DebugMnemonicPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poc
 	responseStream << "\t</form>\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/DebugPassphrasePage.cpp b/src/cpp/HTTPInterface/DebugPassphrasePage.cpp
index a1a7fbc8e..e5990c1d2 100644
--- a/src/cpp/HTTPInterface/DebugPassphrasePage.cpp
+++ b/src/cpp/HTTPInterface/DebugPassphrasePage.cpp
@@ -194,13 +194,26 @@ void DebugPassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, P
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/DecodeTransactionPage.cpp b/src/cpp/HTTPInterface/DecodeTransactionPage.cpp
index 22cbbc5c2..8348495e4 100644
--- a/src/cpp/HTTPInterface/DecodeTransactionPage.cpp
+++ b/src/cpp/HTTPInterface/DecodeTransactionPage.cpp
@@ -270,13 +270,26 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	if (_compressResponse) _gzipStream.close();
diff --git a/src/cpp/HTTPInterface/Error500Page.cpp b/src/cpp/HTTPInterface/Error500Page.cpp
index 1f05dc516..e36e1da31 100644
--- a/src/cpp/HTTPInterface/Error500Page.cpp
+++ b/src/cpp/HTTPInterface/Error500Page.cpp
@@ -128,13 +128,26 @@ void Error500Page::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/LoginPage.cpp b/src/cpp/HTTPInterface/LoginPage.cpp
index 2da987edf..e0b586aea 100644
--- a/src/cpp/HTTPInterface/LoginPage.cpp
+++ b/src/cpp/HTTPInterface/LoginPage.cpp
@@ -6,7 +6,7 @@
 
 
 #line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
- 
+
 #include "../gettext.h"
 
 #include "Poco/Net/HTTPCookie.h"
@@ -15,10 +15,10 @@
 #include "../SingletonManager/SessionManager.h"
 #include "../SingletonManager/LanguageManager.h"
 #include "../SingletonManager/ErrorManager.h"
-	
+
 #line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-#include "../ServerConfig.h"	
+
+#include "../ServerConfig.h"
 
 
 LoginPage::LoginPage(Session* arg):
@@ -36,23 +36,23 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 
 	Poco::Net::HTMLForm form(request, request.stream());
 #line 18 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
- 
+
 	const char* pageName = "Login";
 	auto sm = SessionManager::getInstance();
 	auto lm = LanguageManager::getInstance();
 	auto em = ErrorManager::getInstance();
-	
+
 	auto lang = chooseLanguage(request);
 	//printf("choose language return: %d\n", lang);
 	auto langCatalog = lm->getFreeCatalog(lang);
-	
+
 	std::string presetEmail("");
 	if(mSession && mSession->getUser()) {
 		presetEmail = mSession->getUser()->getEmail();
 	}
-	
+
 	if(!form.empty()) {
-		
+
 		bool langUpdatedByBtn = false;
 		auto langBtn = form.get("lang", "");
 		if(langBtn != "") {
@@ -67,7 +67,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 		} else if(langInput != "") {
 			updatedLang = chooseLanguage(request, langInput);
 		}
-		
+
 		if(updatedLang != LANG_NULL && updatedLang != lang) {
 			lang = updatedLang;
 			langCatalog = lm->getFreeCatalog(lang);
@@ -75,12 +75,12 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 		 */
 		auto email = form.get("login-email", "");
 		auto password = form.get("login-password", "");
-		
+
 		if(email != "" && password != "") {
 			//auto session = sm->getSession(request);
 			//if(!mSession) mSession = sm->findByEmail(email);
 			if(!mSession) {
-				mSession = sm->getNewSession();		
+				mSession = sm->getNewSession();
 				mSession->setLanguageCatalog(langCatalog);
 				// get language
 				// first check url, second check language header
@@ -98,7 +98,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 			}
 			auto userState = mSession->loadUser(email, password);
 			auto user = mSession->getNewUser();
-			
+
 			if(userState >= USER_LOADED_FROM_DB && !user->getModel()->getPublicKey()) {
 				if(mSession->generateKeys(true, true)) {
 					userState = USER_COMPLETE;
@@ -107,24 +107,24 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 					}
 				}
 			} else {
-				//printf("pubkey exist: %p\n",user->getModel()->getPublicKey()); 
+				//printf("pubkey exist: %p\n",user->getModel()->getPublicKey());
 			}
 			getErrors(mSession);
-			
+
 			auto uri_start = request.serverParams().getServerName();
 			auto lastExternReferer = mSession->getLastReferer();
-			
+
 			//printf("userState: %d\n", userState);
-		
+
 			switch(userState) {
-			case USER_EMPTY: 
+			case USER_EMPTY:
 			case USER_PASSWORD_INCORRECT:
 				addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("E-Mail or password isn't right, please try again!")), false);
 				break;
-			case USER_PASSWORD_ENCRYPTION_IN_PROCESS: 
+			case USER_PASSWORD_ENCRYPTION_IN_PROCESS:
 				addError(new Error(langCatalog->gettext("Passwort"), langCatalog->gettext("Passwort wird noch berechnet, bitte versuche es in etwa 1 Minute erneut.")), false);
 				break;
-			case USER_KEYS_DONT_MATCH: 
+			case USER_KEYS_DONT_MATCH:
 				addError(new Error(langCatalog->gettext("User"), langCatalog->gettext("Error in saved data, the server admin will look at it.")));
 				break;
 			case USER_DISABLED: 
@@ -146,8 +146,8 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 				if(lastExternReferer != "") {
 					//printf("redirect to: %s\n", lastExternReferer.data());
 					response.redirect(lastExternReferer);
-				} else if(refererString != "" && 
-				          refererString.find("login") == std::string::npos && 
+				} else if(refererString != "" &&
+				          refererString.find("login") == std::string::npos &&
 						  refererString.find("logout") == std::string::npos &&
 						  refererString.find("user_delete") == std::string::npos &&
 						  refererString != ServerConfig::g_serverPath + request.getURI()) {
@@ -160,13 +160,13 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 				}
 				return;
 			}
-			
+
 		} else if(!langUpdatedByBtn) {
 			addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("Username and password are needed!")), false);
 		}
-		
+
 	} else {
-		
+
 		// on enter login page with empty form
 		//auto session = sm->getSession(request);
 		// remove old cookies and session if exist
@@ -175,11 +175,11 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 			sm->releaseSession(mSession);
 		}
 		sm->deleteLoginCookies(request, response);
-	}	
-	
+	}
+
 #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-	bool withMaterialIcons = false; 
+
+	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
 	Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
 	std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
@@ -198,7 +198,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
 #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "css/loginServer/style.css\">\n";
+	responseStream << "css/main.css\">\n";
 #line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  if(withMaterialIcons) { 	responseStream << "\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
@@ -208,180 +208,138 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 #line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
-	responseStream << "<body class=\"header-fixed\">\n";
-	responseStream << "<div class=\"versionstring dev-info\">\n";
-	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
-	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
-	responseStream << ( ServerConfig::g_versionString );
-	responseStream << "</p>\n";
-	responseStream << "</div>\n";
-	responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
-	responseStream << "\t<div class=\"grd-left-bar-section\">\n";
-	responseStream << "\t\t<ul class=\"grd-no-style\">\n";
-	responseStream << "\t\t  <li><a href=\"";
-#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << "<body>\n";
+	responseStream << "    <div class=\"layout\">\n";
+	responseStream << "        <div class=\"center-form-single\">\n";
+	responseStream << "            <div class=\"center-form-header\">\n";
+	responseStream << "                <a href=\"";
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
-	responseStream << "\t\t  <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
-	responseStream << "\t\t</ul>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</nav>-->";
-	// end include header.cpsp
-	responseStream << "\n";
-	responseStream << "<style type=\"text/css\">\n";
-	responseStream << "@media (max-width: 400px) {\n";
-	responseStream << "\t.authentication-theme.auth-style_1 .signup-link {\n";
-	responseStream << "\t\tposition:relative;\n";
-	responseStream << "\t}\n";
-	responseStream << "\t.authentication-theme .signup-link {\n";
-	responseStream << "\t\tisplay:initial;\n";
-	responseStream << "\t}\n";
-	responseStream << "}\t\n";
-	responseStream << "</style>\n";
-	responseStream << "<div class=\"authentication-theme auth-style_1\">\n";
-	responseStream << "      <div class=\"row\">\n";
-	responseStream << "        <div class=\"col-12 logo-section\">\n";
-	responseStream << "          <a href=\"";
-#line 173 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
-	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"logo\">\n";
-	responseStream << "\t\t\t<picture>\n";
-	responseStream << "\t\t\t\t<source srcset=\"";
-#line 175 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\" class=\"center-logo\">\n";
+	responseStream << "                    <picture>\n";
+	responseStream << "                        <source srcset=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
-	responseStream << "\t\t\t\t<source srcset=\"";
-#line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "                        <source srcset=\"";
+#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "img/logo_schrift.png\" type=\"image/png\"> \n";
-	responseStream << "\t\t\t\t<img src=\"";
-#line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
+	responseStream << "                        <img src=\"";
+#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
-	responseStream << "\t\t\t</picture>\n";
-	responseStream << "          </a>\n";
-	responseStream << "        </div>\n";
-	responseStream << "      </div>\n";
-	responseStream << "      <div class=\"row\">\n";
-	responseStream << "        <div class=\"col-lg-5 col-md-7 col-sm-9 col-11 mx-auto\">\n";
-	responseStream << "          <div class=\"grid\">\n";
-	responseStream << "\t\t\t<div class=\"center-ul-container\">\n";
-	responseStream << "\t\t\t\t";
-#line 186 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "                    </picture>\n";
+	responseStream << "                </a>\n";
+	responseStream << "            </div>";
+	// end include header.cpsp
+	responseStream << "\n";
+#line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( getErrorsHtml() );
-	responseStream << "\t  \n";
-	responseStream << "\t\t\t</div>\n";
-	responseStream << "            <div class=\"grid-body\">\n";
-	responseStream << "              \n";
-	responseStream << "\t\t\t  <!--<input type=\"hidden\" name=\"lang\" value=\"";
-#line 190 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\n";
+	responseStream << "<!--<input type=\"hidden\" name=\"lang\" value=\"";
+#line 161 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( LanguageManager::keyForLanguage(lang) );
 	responseStream << "\">-->\n";
-	responseStream << "\t\t\t  ";
+	responseStream << "<div class=\"center-form-container\">\n";
+	responseStream << "    ";
 	// begin include flags.cpsp
+	responseStream << "<div class=\"center-form-selectors\">\n";
 	responseStream << "<form method=\"GET\" action=\"\">\n";
-	responseStream << "\t<div class=\"row pull-right-row\">\n";
-	responseStream << "\t  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
-	responseStream << "\t\t\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- if(lang != LANG_EN) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- } 
-			else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+	responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_EN) { 	responseStream << "class=\"flag-btn\"";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "\t\t\t  <span class=\"flag-england\"></span>\n";
-	responseStream << "\t\t\t</button>\n";
-	responseStream << "\t\t</div>\n";
-	responseStream << "\t  </div>\n";
-	responseStream << "\t  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
-	responseStream << "\t\t\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- if(lang != LANG_DE) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- } 
-			else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+	responseStream << "\t  <span class=\"flag flag-england\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_DE) { 	responseStream << "class=\"flag-btn\"";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "\t\t\t  <span class=\"flag-germany\"></span>\n";
-	responseStream << "\t\t\t</button>\n";
-	responseStream << "\t\t</div>\n";
-	responseStream << "\t  </div>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</form>";
+	responseStream << "\t  <span class=\"flag flag-germany\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "</form>\n";
+	responseStream << "</div>";
 	// end include flags.cpsp
 	responseStream << "\n";
-	responseStream << "\t\t\t  <form action=\"";
-#line 192 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "    <div class=\"center-form-form\">\n";
+	responseStream << "\t\t<form action=\"";
+#line 165 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( ServerConfig::g_serverPath );
 	responseStream << "/\" method=\"POST\">\n";
-	responseStream << "                <div class=\"row display-block\">\n";
-	responseStream << "                  <div class=\"col-lg-7 col-md-8 col-sm-9 col-12 mx-auto form-wrapper\">\n";
-	responseStream << "                    <div class=\"form-group input-rounded\">\n";
-	responseStream << "                      <input type=\"text\" class=\"form-control\" name=\"login-email\" placeholder=\"";
-#line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\t\t\t<input class=\"form-control\" type=\"text\" name=\"login-email\" placeholder=\"";
+#line 166 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("E-Mail") );
 	responseStream << "\" value=\"";
-#line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 166 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( presetEmail );
 	responseStream << "\"/>\n";
-	responseStream << "                    </div>\n";
-	responseStream << "                    <div class=\"form-group input-rounded\">\n";
-	responseStream << "                      <input type=\"password\" class=\"form-control\" name=\"login-password\" placeholder=\"";
-#line 199 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\t\t\t<input class=\"form-control\" type=\"password\" name=\"login-password\" placeholder=\"";
+#line 167 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("Password") );
 	responseStream << "\" />\n";
-	responseStream << "                    </div>\n";
-	responseStream << "                    <button type=\"submit\" name=\"submit\" class=\"btn btn-primary btn-block\">";
-#line 201 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\t\t    <button type=\"submit\" name=\"submit\" class=\"center-form-submit form-button\">";
+#line 168 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext(" Login ") );
 	responseStream << "</button>\n";
-	responseStream << "                    <div class=\"signup-link\">\n";
-	responseStream << "                      <p>";
-#line 203 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\t\t</form>\n";
+	responseStream << "    </div>\n";
+	responseStream << "    <div class=\"center-form-bottom\">\n";
+	responseStream << "        <div class=\"signup-link\">\n";
+	responseStream << "\t      <p>";
+#line 173 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") );
 	responseStream << "</p>\n";
-	responseStream << "                      <a href=\"";
-#line 204 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\t      <a href=\"";
+#line 174 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( ServerConfig::g_serverPath );
 	responseStream << "/registerDirect\">\n";
-	responseStream << "\t\t\t\t\t\t";
-#line 205 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\t\t\t";
+#line 175 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("Create New Account") );
 	responseStream << "\n";
-	responseStream << "\t\t\t\t\t  </a>\n";
-	responseStream << "                    </div>\n";
-	responseStream << "\t\t\t\t\t<div class=\"reset-pwd-link\">\n";
-	responseStream << "\t\t\t\t\t\t<a href=\"";
-#line 209 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+	responseStream << "\t\t  </a>\n";
+	responseStream << "\t    </div>\n";
+	responseStream << "\t\t<div class=\"reset-pwd-link\">\n";
+	responseStream << "\t\t\t<a href=\"";
+#line 179 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( ServerConfig::g_serverPath );
 	responseStream << "/resetPassword\">";
-#line 209 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 179 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("Passwort vergessen") );
 	responseStream << "</a>\n";
-	responseStream << "\t\t\t\t\t</div>\n";
-	responseStream << "                  </div>\n";
-	responseStream << "                </div>\n";
-	responseStream << "\t\t\t  </form>\n";
-	responseStream << "            </div>\n";
-	responseStream << "          </div>\n";
-	responseStream << "        </div>\n";
-	responseStream << "      </div>\n";
-	responseStream << "      <div class=\"auth_footer\">\n";
-	responseStream << "        <p class=\"text-muted text-center\">© Gradido 2019</p>\n";
-	responseStream << "      </div>\n";
-	responseStream << "    </div>\n";
+	responseStream << "\t\t</div>\n";
+	responseStream << "\t</div>\n";
+	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	if (_compressResponse) _gzipStream.close();
diff --git a/src/cpp/HTTPInterface/PassphrasePage.cpp b/src/cpp/HTTPInterface/PassphrasePage.cpp
index 63196f05b..39a353e4a 100644
--- a/src/cpp/HTTPInterface/PassphrasePage.cpp
+++ b/src/cpp/HTTPInterface/PassphrasePage.cpp
@@ -21,8 +21,8 @@ enum PageState
 	PAGE_FORCE_ASK_PASSPHRASE
 };
 #line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-#include "../ServerConfig.h"	
+
+#include "../ServerConfig.h"
 
 
 PassphrasePage::PassphrasePage(Session* arg):
@@ -157,8 +157,8 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	}
 	getErrors(mSession);
 #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-	bool withMaterialIcons = false; 
+
+	bool withMaterialIcons = false;
 #line 138 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
  withMaterialIcons = true; 	std::ostream& _responseStream = response.send();
 	Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
@@ -179,7 +179,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
 #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "css/loginServer/style.css\">\n";
+	responseStream << "css/main.css\">\n";
 #line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  if(withMaterialIcons) { 	responseStream << "\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
@@ -189,25 +189,30 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 #line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
-	responseStream << "<body class=\"header-fixed\">\n";
-	responseStream << "<div class=\"versionstring dev-info\">\n";
-	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
-	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
-	responseStream << ( ServerConfig::g_versionString );
-	responseStream << "</p>\n";
-	responseStream << "</div>\n";
-	responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
-	responseStream << "\t<div class=\"grd-left-bar-section\">\n";
-	responseStream << "\t\t<ul class=\"grd-no-style\">\n";
-	responseStream << "\t\t  <li><a href=\"";
+	responseStream << "<body>\n";
+	responseStream << "    <div class=\"layout\">\n";
+	responseStream << "        <div class=\"center-form-single\">\n";
+	responseStream << "            <div class=\"center-form-header\">\n";
+	responseStream << "                <a href=\"";
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "\" class=\"center-logo\">\n";
+	responseStream << "                    <picture>\n";
+	responseStream << "                        <source srcset=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
+	responseStream << "                        <source srcset=\"";
+#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
+	responseStream << "                        <img src=\"";
 #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
-	responseStream << "\t\t  <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
-	responseStream << "\t\t</ul>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</nav>-->";
+	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
+	responseStream << "                    </picture>\n";
+	responseStream << "                </a>\n";
+	responseStream << "            </div>";
 	// end include header.cpsp
 	responseStream << "\n";
 	responseStream << "<div class=\"authentication-theme auth-style_1\">\n";
@@ -252,38 +257,30 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
  } 	responseStream << "\n";
 	responseStream << "\t";
 	// begin include flags.cpsp
+	responseStream << "<div class=\"center-form-selectors\">\n";
 	responseStream << "<form method=\"GET\" action=\"\">\n";
-	responseStream << "\t<div class=\"row pull-right-row\">\n";
-	responseStream << "\t  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
-	responseStream << "\t\t\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- if(lang != LANG_EN) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- } 
-			else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+	responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_EN) { 	responseStream << "class=\"flag-btn\"";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "\t\t\t  <span class=\"flag-england\"></span>\n";
-	responseStream << "\t\t\t</button>\n";
-	responseStream << "\t\t</div>\n";
-	responseStream << "\t  </div>\n";
-	responseStream << "\t  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
-	responseStream << "\t\t\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- if(lang != LANG_DE) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- } 
-			else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+	responseStream << "\t  <span class=\"flag flag-england\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_DE) { 	responseStream << "class=\"flag-btn\"";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "\t\t\t  <span class=\"flag-germany\"></span>\n";
-	responseStream << "\t\t\t</button>\n";
-	responseStream << "\t\t</div>\n";
-	responseStream << "\t  </div>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</form>";
+	responseStream << "\t  <span class=\"flag flag-germany\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "</form>\n";
+	responseStream << "</div>";
 	// end include flags.cpsp
 	responseStream << "\n";
 #line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
diff --git a/src/cpp/HTTPInterface/PassphrasedTransaction.cpp b/src/cpp/HTTPInterface/PassphrasedTransaction.cpp
index e681f6ebb..79e9afe6f 100644
--- a/src/cpp/HTTPInterface/PassphrasedTransaction.cpp
+++ b/src/cpp/HTTPInterface/PassphrasedTransaction.cpp
@@ -269,13 +269,26 @@ void PassphrasedTransaction::handleRequest(Poco::Net::HTTPServerRequest& request
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/RegisterAdminPage.cpp b/src/cpp/HTTPInterface/RegisterAdminPage.cpp
index 0e44f850b..12d12111e 100644
--- a/src/cpp/HTTPInterface/RegisterAdminPage.cpp
+++ b/src/cpp/HTTPInterface/RegisterAdminPage.cpp
@@ -165,13 +165,26 @@ void RegisterAdminPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poc
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/RegisterDirectPage.cpp b/src/cpp/HTTPInterface/RegisterDirectPage.cpp
index de7899af9..5fa877e25 100644
--- a/src/cpp/HTTPInterface/RegisterDirectPage.cpp
+++ b/src/cpp/HTTPInterface/RegisterDirectPage.cpp
@@ -9,9 +9,9 @@
 
 #include "../SingletonManager/SessionManager.h"
 #include "Poco/Net/HTTPCookie.h"
-#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
- 
-#include "../ServerConfig.h"	
+#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+
+#include "../ServerConfig.h"
 
 
 void RegisterDirectPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTTPServerResponse& response)
@@ -26,30 +26,30 @@ void RegisterDirectPage::handleRequest(Poco::Net::HTTPServerRequest& request, Po
 
 	const char* pageName = "Registrieren";
 	auto sm = SessionManager::getInstance();
-	
+
 	bool userReturned = false;
-	
+
 	if(!form.empty()) {
 		if(form.get("register-password2", "") != form.get("register-password", "")) {
 			addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch."), false);
 		} else {
 			auto session = sm->getSession(request);
 			if(!session) {
-				session = sm->getNewSession();		
+				session = sm->getNewSession();
 				auto user_host = request.clientAddress().host();
 				session->setClientIp(user_host);
 				response.addCookie(session->getLoginCookie());
 			}
-			
+
 			userReturned = session->createUserDirect(
 				form.get("register-first-name", ""),
 				form.get("register-last-name", ""),
 				form.get("register-email", ""),
 				form.get("register-password", "")
 			);
-			
+
 			getErrors(session);
-			
+
 			if(!errorCount()) {
 				auto user_host = request.clientAddress().host();
 				session->setClientIp(user_host);
@@ -58,133 +58,122 @@ void RegisterDirectPage::handleRequest(Poco::Net::HTTPServerRequest& request, Po
 				return;
 			}
 		}
-		
+
 	} else {
 		// on enter login page with empty form
 		// remove old cookies if exist
 		sm->deleteLoginCookies(request, response);
 	}
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+
+	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
 	Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
 	std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
 	responseStream << "\n";
-	// begin include header_old.cpsp
+	// begin include header.cpsp
 	responseStream << "\n";
 	responseStream << "<!DOCTYPE html>\n";
 	responseStream << "<html>\n";
 	responseStream << "<head>\n";
 	responseStream << "<meta charset=\"UTF-8\">\n";
-	responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n";
+	responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n";
 	responseStream << "<title>Gradido Login Server: ";
-#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
+#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( pageName );
 	responseStream << "</title>\n";
-	responseStream << "<!--<link rel=\"stylesheet\" type=\"text/css\" href=\"css/styles.min.css\">-->\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
-#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
+#line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "/css/styles.css\">\n";
-	responseStream << "<style type=\"text/css\" >\n";
-	responseStream << ".grd_container\n";
-	responseStream << "{\n";
-	responseStream << "  max-width:820px;\n";
-	responseStream << "  margin-left:auto;\n";
-	responseStream << "  margin-right:auto;\n";
-	responseStream << "}\n";
-	responseStream << "\n";
-	responseStream << "input:not([type='radio']) {\n";
-	responseStream << "\twidth:200px;\n";
-	responseStream << "}\n";
-	responseStream << "label:not(.grd_radio_label) {\n";
-	responseStream << "\twidth:80px;\n";
-	responseStream << "\tdisplay:inline-block;\n";
-	responseStream << "}\n";
-	responseStream << ".grd_container_small\n";
-	responseStream << "{\n";
-	responseStream << "  max-width:500px;\n";
-	responseStream << "}\n";
-	responseStream << ".grd_text {\n";
-	responseStream << "  max-width:550px;\n";
-	responseStream << "  margin-bottom: 5px;\n";
-	responseStream << "}\n";
-	responseStream << ".dev-info {\n";
-	responseStream << "\tposition: fixed;\n";
-	responseStream << "\tcolor:grey;\n";
-	responseStream << "\tfont-size: smaller;\n";
-	responseStream << "\tleft:8px;\n";
-	responseStream << "}\n";
-	responseStream << ".grd-time-used {  \n";
-	responseStream << "  bottom:0;\n";
-	responseStream << "} \n";
-	responseStream << "\n";
-	responseStream << ".versionstring {\n";
-	responseStream << "\ttop:0;\n";
-	responseStream << "}\n";
-	responseStream << "</style>\n";
+	responseStream << "css/main.css\">\n";
+#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+ if(withMaterialIcons) { 	responseStream << "\n";
+	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
+#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "css/materialdesignicons.min.css\">\n";
+#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+ } 	responseStream << "\n";
 	responseStream << "</head>\n";
 	responseStream << "<body>\n";
-	responseStream << "<div class=\"versionstring dev-info\">\n";
-	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
-	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 53 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
-	responseStream << ( ServerConfig::g_versionString );
-	responseStream << "</p>\n";
-	responseStream << "</div>\n";
-	// end include header_old.cpsp
+	responseStream << "    <div class=\"layout\">\n";
+	responseStream << "        <div class=\"center-form-single\">\n";
+	responseStream << "            <div class=\"center-form-header\">\n";
+	responseStream << "                <a href=\"";
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "\" class=\"center-logo\">\n";
+	responseStream << "                    <picture>\n";
+	responseStream << "                        <source srcset=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
+	responseStream << "                        <source srcset=\"";
+#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
+	responseStream << "                        <img src=\"";
+#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
+	responseStream << "                    </picture>\n";
+	responseStream << "                </a>\n";
+	responseStream << "            </div>";
+	// end include header.cpsp
 	responseStream << "\n";
-	responseStream << "<div class=\"grd_container\">\n";
-	responseStream << "\t<h1>Einen neuen Account anlegen</h1>\n";
-	responseStream << "\t";
-#line 54 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp"
+#line 52 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
-	responseStream << "\t<form method=\"POST\">\n";
-	responseStream << "\t\t\n";
-	responseStream << "\t\t<fieldset class=\"grd_container_small\">\n";
-	responseStream << "\t\t\t<legend>Account anlegen</legend>\n";
-	responseStream << "\t\t\t<p>Bitte gebe deine Daten um einen Account anzulegen</p>\n";
-	responseStream << "\t\t\t<p class=\"grd_small\">\n";
-	responseStream << "\t\t\t\t<label for=\"register-first-name\">Vorname</label>\n";
-	responseStream << "\t\t\t\t<input id=\"register-first-name\" type=\"text\" name=\"register-first-name\" value=\"";
-#line 62 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp"
+	responseStream << "<div class=\"center-form-container\">\n";
+	responseStream << "\t<div class=\"center-form-title\">\n";
+	responseStream << "\t    <h1>Einen neuen Account anlegen</h1>\n";
+	responseStream << "\t</div>\n";
+	responseStream << "\t<div class=\"center-form-form\">\n";
+	responseStream << "\t\t<form method=\"POST\">\n";
+	responseStream << "\t\t\t<p>Bitte gib deine Daten um einen Account anzulegen:</p>\n";
+	responseStream << "\t\t\t<label class=\"form-label\" for=\"register-first-name\">Vorname</label>\n";
+	responseStream << "\t\t\t<input class=\"form-control\" id=\"register-first-name\" type=\"text\" name=\"register-first-name\" value=\"";
+#line 61 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp"
 	responseStream << ( !form.empty() ? form.get("register-first-name") : "" );
 	responseStream << "\"/>\n";
-	responseStream << "\t\t\t</p>\n";
-	responseStream << "\t\t\t<p class=\"grd_small\">\n";
-	responseStream << "\t\t\t\t<label for=\"register-last-name\">Nachname</label>\n";
-	responseStream << "\t\t\t\t<input id=\"register-last-name\" type=\"text\" name=\"register-last-name\" value=\"";
-#line 66 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp"
+	responseStream << "\t\t\t<label class=\"form-label\" for=\"register-last-name\">Nachname</label>\n";
+	responseStream << "\t\t\t<input class=\"form-control\" id=\"register-last-name\" type=\"text\" name=\"register-last-name\" value=\"";
+#line 63 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp"
 	responseStream << ( !form.empty() ? form.get("register-last-name") : "" );
 	responseStream << "\"/>\n";
-	responseStream << "\t\t\t</p>\n";
-	responseStream << "\t\t\t<p class=\"grd_small\">\n";
-	responseStream << "\t\t\t\t<label for=\"register-email\">E-Mail</label>\n";
-	responseStream << "\t\t\t\t<input id=\"register-email\" type=\"email\" name=\"register-email\" value=\"";
-#line 70 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp"
+	responseStream << "\t\t\t<label class=\"form-label\" for=\"register-email\">E-Mail</label>\n";
+	responseStream << "\t\t\t<input class=\"form-control\" id=\"register-email\" type=\"email\" name=\"register-email\" value=\"";
+#line 65 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp"
 	responseStream << ( !form.empty() ? form.get("register-email") : "" );
 	responseStream << "\"/>\n";
-	responseStream << "\t\t\t</p>\n";
-	responseStream << "\t\t\t<p class=\"grd_small\">\n";
-	responseStream << "\t\t\t\t<label for=\"register-password\">Passwort</label>\n";
-	responseStream << "\t\t\t\t<input id=\"register-password\" type=\"password\" name=\"register-password\"/>\n";
-	responseStream << "\t\t\t</p>\n";
-	responseStream << "\t\t\t<p class=\"grd_small\">\n";
-	responseStream << "\t\t\t\t<label for=\"register-password\">Passwort Best&auml;tigung</label>\n";
-	responseStream << "\t\t\t\t<input id=\"register-password2\" type=\"password\" name=\"register-password2\"/>\n";
-	responseStream << "\t\t\t</p>\n";
-	responseStream << "\t\t</fieldset>\n";
-	responseStream << "\t\t<input class=\"grd-form-bn grd-form-bn-succeed\" type=\"submit\" name=\"submit\" value=\"Anmelden\">\n";
-	responseStream << "\t\t\n";
+	responseStream << "\t\t\t<label class=\"form-label\" for=\"register-password\">Passwort</label>\n";
+	responseStream << "\t\t\t<input class=\"form-control\" id=\"register-password\" type=\"password\" name=\"register-password\"/>\n";
+	responseStream << "\t\t\t<label class=\"form-label\" for=\"register-password\">Passwort Best&auml;tigung</label>\n";
+	responseStream << "\t\t\t<input class=\"form-control\" id=\"register-password2\" type=\"password\" name=\"register-password2\"/>\n";
+	responseStream << "\t\t\t<input class=\"center-form-submit form-button\" type=\"submit\" name=\"submit\" value=\"Anmelden\">\n";
 	responseStream << "\t</form>\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/RegisterPage.cpp b/src/cpp/HTTPInterface/RegisterPage.cpp
index 8a798740d..9a3610fef 100644
--- a/src/cpp/HTTPInterface/RegisterPage.cpp
+++ b/src/cpp/HTTPInterface/RegisterPage.cpp
@@ -184,13 +184,26 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/RepairDefectPassphrase.cpp b/src/cpp/HTTPInterface/RepairDefectPassphrase.cpp
index 5a7b323f2..3b8087c0c 100644
--- a/src/cpp/HTTPInterface/RepairDefectPassphrase.cpp
+++ b/src/cpp/HTTPInterface/RepairDefectPassphrase.cpp
@@ -340,13 +340,26 @@ void RepairDefectPassphrase::handleRequest(Poco::Net::HTTPServerRequest& request
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	if (_compressResponse) _gzipStream.close();
diff --git a/src/cpp/HTTPInterface/ResetPassword.cpp b/src/cpp/HTTPInterface/ResetPassword.cpp
index 720a5203b..23d6b8331 100644
--- a/src/cpp/HTTPInterface/ResetPassword.cpp
+++ b/src/cpp/HTTPInterface/ResetPassword.cpp
@@ -6,24 +6,23 @@
 
 
 #line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
- 
+
 #include "../SingletonManager/LanguageManager.h"
 #include "../SingletonManager/SessionManager.h"
 #include "../SingletonManager/EmailManager.h"
 #include "../controller/User.h"
 #include "../controller/UserBackups.h"
-	
+
 enum PageState {
 	PAGE_EMAIL_ASK,
 	PAGE_ASK,
 	PAGE_WAIT_EMAIL,
 	PAGE_WAIT_ADMIN,
 	PAGE_EMAIL_ALREADY_SEND
-	
 };
 #line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-#include "../ServerConfig.h"	
+
+#include "../ServerConfig.h"
 
 
 void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTTPServerResponse& response)
@@ -34,72 +33,71 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	if (_compressResponse) response.set("Content-Encoding", "gzip");
 
 	Poco::Net::HTMLForm form(request, request.stream());
-#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
- 
+#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 
 	PageState state = PAGE_EMAIL_ASK;
 	auto lm = LanguageManager::getInstance();
 	auto sm = SessionManager::getInstance();
 	auto adminReceiver = EmailManager::getInstance()->getAdminReceiver();
-	
+
 	const char* pageName = "Passwort vergessen";
 	auto lang = chooseLanguage(request);
-	
+
 	// class="btn btn-outline-secondary flag-btn"
 	// class="btn btn-secondary disabled flag-btn" disabled
 	std::string eng_btn_classes = "";
 	std::string de_btn_classes = "";
-	
+
 	auto langCatalog = lm->getFreeCatalog(lang);
-	
+
 	std::string emailInputClass = "form-control";
 	std::string passphraseRadioClass = "group";
-	
+
 	std::string email = "";
-	
+
 	if(!form.empty()) {
-		auto session = sm->getNewSession();		
+		auto session = sm->getNewSession();
 		email = form.get("email", "");
 		auto passphraseMemorized = form.get("passphrase_memorized", "");
 		auto user = controller::User::create();
 		auto ask = form.get("ask_passphrase", "");
-		
-		if(email != "") 
+
+		if(email != "")
 		{
 			bool user_exist = false;
 			bool sendUserEmail = false;
-			
+
 			if(!sm->isValid(email, VALIDATE_EMAIL)) {
 				addError(new Error(gettext(session, "E-Mail"), gettext(session, "Das ist keine g&uuml;ltige E-Mail Adresse")), false);
-				emailInputClass += " is-invalid"; 
+				emailInputClass += " is-invalid";
 			}
 			user_exist = user->load(email) == 1;
-			
-			if(ask == "true") 
+
+			if(ask == "true")
 			{
 				if(passphraseMemorized == "") {
 					addError(new Error(gettext(session, "Passphrase"), gettext(session, "Bitte w&auml;hle eine Option aus.")), false);
-					passphraseRadioClass += " group-is-invalid"; 
+					passphraseRadioClass += " group-is-invalid";
 				} else if(passphraseMemorized == "true") {
 					sendUserEmail = true;
 				}
-				
-			} 
+
+			}
 			else
 			{
 				if(user_exist && (!user->tryLoadPassphraseUserBackup() || !user->hasPublicKey())) {
 					sendUserEmail = true;
 				}
 			}
-			
-			if(!errorCount()) 
+
+			if(!errorCount())
 			{
 				// send reset password email
 				int result = 0;
 				if(user_exist) {
 					result = session->sendResetPasswordEmail(user, sendUserEmail);
 				}
-			
+
 				if(2 == result) {
 					state = PAGE_EMAIL_ALREADY_SEND;
 				} else if(sendUserEmail) {
@@ -107,25 +105,24 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 				} else {
 					state = PAGE_WAIT_ADMIN;
 				}
-			} 
-		} 
-		else 
+			}
+		}
+		else
 		{
 			addError(new Error(gettext(session, "E-Mail"), gettext(session, "E-Mail Adresse nicht angegeben.")), false);
-			emailInputClass += " is-invalid"; 
+			emailInputClass += " is-invalid";
 		}
-		
+
 	}
-	
-	
+
+
 #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-	bool withMaterialIcons = false; 
+
+	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
 	Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
 	std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
 	responseStream << "\n";
-	// begin include login_header.cpsp
 	// begin include header.cpsp
 	responseStream << "\n";
 	responseStream << "<!DOCTYPE html>\n";
@@ -140,7 +137,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
 #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "css/loginServer/style.css\">\n";
+	responseStream << "css/main.css\">\n";
 #line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  if(withMaterialIcons) { 	responseStream << "\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
@@ -150,241 +147,188 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 #line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
-	responseStream << "<body class=\"header-fixed\">\n";
-	responseStream << "<div class=\"versionstring dev-info\">\n";
-	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
-	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
-	responseStream << ( ServerConfig::g_versionString );
-	responseStream << "</p>\n";
-	responseStream << "</div>\n";
-	responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
-	responseStream << "\t<div class=\"grd-left-bar-section\">\n";
-	responseStream << "\t\t<ul class=\"grd-no-style\">\n";
-	responseStream << "\t\t  <li><a href=\"";
-#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << "<body>\n";
+	responseStream << "    <div class=\"layout\">\n";
+	responseStream << "        <div class=\"center-form-single\">\n";
+	responseStream << "            <div class=\"center-form-header\">\n";
+	responseStream << "                <a href=\"";
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
-	responseStream << "\t\t  <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
-	responseStream << "\t\t</ul>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</nav>-->";
-	// end include header.cpsp
-	responseStream << "\n";
-	responseStream << "<div class=\"authentication-theme auth-style_1\">\n";
-	responseStream << "      <div class=\"row\">\n";
-	responseStream << "        <div class=\"col-12 logo-section\">\n";
-	responseStream << "          <a href=\"";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
-	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"logo\">\n";
-	responseStream << "            <picture>\n";
-	responseStream << "\t\t\t\t<source srcset=\"";
-#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
+	responseStream << "\" class=\"center-logo\">\n";
+	responseStream << "                    <picture>\n";
+	responseStream << "                        <source srcset=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
-	responseStream << "\t\t\t\t<source srcset=\"";
-#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
+	responseStream << "                        <source srcset=\"";
+#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "img/logo_schrift.png\" type=\"image/png\"> \n";
-	responseStream << "\t\t\t\t<img src=\"";
-#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
+	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
+	responseStream << "                        <img src=\"";
+#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
-	responseStream << "\t\t\t</picture>\n";
-	responseStream << "          </a>\n";
-	responseStream << "        </div>\n";
-	responseStream << "      </div>\n";
-	responseStream << "      <div class=\"row\">\n";
-	responseStream << "        <div class=\"col-lg-5 col-md-7 col-sm-9 col-11 mx-auto\">\n";
-	responseStream << "          <div class=\"grid\">\n";
-	responseStream << "            <div class=\"center-ul-container\">\n";
-	responseStream << "              ";
-#line 18 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
+	responseStream << "                    </picture>\n";
+	responseStream << "                </a>\n";
+	responseStream << "            </div>";
+	// end include header.cpsp
+	responseStream << "\n";
+	responseStream << "        ";
+#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
-	responseStream << "            </div>\n";
-	responseStream << "            <div class=\"grid-body\">";
-	// end include login_header.cpsp
-	responseStream << "\n";
-	responseStream << "<style type=\"text/css\">\n";
-	responseStream << ".group {\n";
-	responseStream << "\tpadding-left:10px;\n";
-	responseStream << "\tpadding-top:10px;\n";
-	responseStream << "\tpadding-bottom:10px;\n";
-	responseStream << "}\n";
-	responseStream << ".group-is-invalid {\n";
-	responseStream << "\tbackground-color: rgba(240,130,95,.2);\n";
-	responseStream << "\t border-color:#dc3545;\n";
-	responseStream << "\t padding-right:calc(1.5em + .75rem);\n";
-	responseStream << "\t background-image:url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23dc3545' viewBox='-2 -2 7 7'%3e%3cpath stroke='%23dc3545' d='M0 0l3 3m0-3L0 3'/%3e%3ccircle r='.5'/%3e%3ccircle cx='3' r='.5'/%3e%3ccircle cy='3' r='.5'/%3e%3ccircle cx='3' cy='3' r='.5'/%3e%3c/svg%3E\");\n";
-	responseStream << "\t background-repeat:no-repeat;\n";
-	responseStream << "\t background-position:center right calc(.375em + .1875rem);\n";
-	responseStream << "\t background-size:calc(.75em + .375rem) calc(.75em + .375rem)\n";
-	responseStream << "}\n";
-	responseStream << ".group-is-invalid .radio label .input-frame::before {\n";
-	responseStream << "\tborder-color:red;\n";
-	responseStream << "}\n";
-	responseStream << "\n";
-	responseStream << "</style>\n";
+	responseStream << "\t    <div class=\"center-form-container\">\n";
+	responseStream << "\t        <div class=\"center-form-title\">\n";
+	responseStream << "\t            <h1>Passwort zurücksetzen</h1>\n";
+	responseStream << "\t        </div>\n";
 	responseStream << "    ";
-#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
  if(state == PAGE_EMAIL_ASK) { 	responseStream << "\n";
-	responseStream << "\t\t<form action=\"";
-#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "            <div class=\"center-form-form\">\n";
+	responseStream << "\t\t\t\t<form action=\"";
+#line 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( ServerConfig::g_serverPath );
 	responseStream << "/resetPassword\">\n";
-	responseStream << "\t\t\t<div class=\"item-wrapper\">\n";
-	responseStream << "\t\t\t  <div class=\"form-group\">\n";
-	responseStream << "\t\t\t\t<label for=\"email\">";
-#line 129 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
-	responseStream << ( langCatalog->gettext("Gebe bitte hier deine E-Mail Adresse an:") );
-	responseStream << "&nbsp;&nbsp;&nbsp;&nbsp;</label>\n";
-	responseStream << "\t\t\t\t<input type=\"text\" class=\"";
-#line 130 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "\t\t\t\t\t<div class=\"item-wrapper\">\n";
+	responseStream << "\t\t\t\t\t  <div class=\"form-group\">\n";
+	responseStream << "\t\t\t\t\t\t<label class=\"form-label\" for=\"email\">";
+#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << ( langCatalog->gettext("Gib bitte hier deine E-Mail Adresse an:") );
+	responseStream << "</label>\n";
+	responseStream << "\t\t\t\t\t\t<input class=\"form-control\" type=\"text\" class=\"";
+#line 114 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( emailInputClass );
 	responseStream << "\" name=\"email\" id=\"email\" placeholder=\"E-Mail\" value=\"";
-#line 130 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 114 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( email );
 	responseStream << "\">\n";
-	responseStream << "\t\t\t  </div>\n";
-	responseStream << "\t\t\t  <button type=\"submit\" class=\"btn btn-sm btn-primary\" >";
-#line 132 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "\t\t\t\t\t  </div>\n";
+	responseStream << "\t\t\t\t\t  <button type=\"submit\" class=\"center-form-submit form-button\" >";
+#line 116 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Bestätigen") );
 	responseStream << "</button>\n";
+	responseStream << "\t\t\t\t\t</div>\n";
+	responseStream << "\t\t\t\t</form>\n";
 	responseStream << "\t\t\t</div>\n";
-	responseStream << "\t\t</form>\n";
 	responseStream << "\t";
-#line 135 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 120 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
  } else if(state == PAGE_ASK) { 	responseStream << "\n";
-	responseStream << "\t\t";
+	responseStream << "            <div class=\"center-form-form\">\n";
+	responseStream << "\t\t\t\t";
 	// begin include flags.cpsp
+	responseStream << "<div class=\"center-form-selectors\">\n";
 	responseStream << "<form method=\"GET\" action=\"\">\n";
-	responseStream << "\t<div class=\"row pull-right-row\">\n";
-	responseStream << "\t  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
-	responseStream << "\t\t\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- if(lang != LANG_EN) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- } 
-			else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+	responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_EN) { 	responseStream << "class=\"flag-btn\"";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "\t\t\t  <span class=\"flag-england\"></span>\n";
-	responseStream << "\t\t\t</button>\n";
-	responseStream << "\t\t</div>\n";
-	responseStream << "\t  </div>\n";
-	responseStream << "\t  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
-	responseStream << "\t\t\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- if(lang != LANG_DE) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- } 
-			else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+	responseStream << "\t  <span class=\"flag flag-england\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_DE) { 	responseStream << "class=\"flag-btn\"";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "\t\t\t  <span class=\"flag-germany\"></span>\n";
-	responseStream << "\t\t\t</button>\n";
-	responseStream << "\t\t</div>\n";
-	responseStream << "\t  </div>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</form>";
+	responseStream << "\t  <span class=\"flag flag-germany\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "</form>\n";
+	responseStream << "</div>";
 	// end include flags.cpsp
 	responseStream << "\n";
-	responseStream << "\t\t<form action=\"";
-#line 137 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "\t\t\t\t<form action=\"";
+#line 123 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( ServerConfig::g_serverPath );
 	responseStream << "/resetPassword\">\n";
-	responseStream << "\t\t\t<div class=\"item-wrapper\">\n";
-	responseStream << "\t\t\t  <div class=\"form-group\">\n";
-	responseStream << "\t\t\t\t<label for=\"email\">";
-#line 140 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
-	responseStream << ( langCatalog->gettext("Gebe bitte hier deine E-Mail Adresse an:") );
-	responseStream << "&nbsp;&nbsp;&nbsp;&nbsp;</label>\n";
-	responseStream << "\t\t\t\t<input type=\"text\" class=\"";
-#line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "\t\t\t\t\t<label class=\"form-label\" for=\"email\">";
+#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << ( langCatalog->gettext("Gib bitte hier deine E-Mail Adresse an:") );
+	responseStream << "</label>\n";
+	responseStream << "\t\t\t\t\t<input class=\"form-control\" type=\"text\" class=\"";
+#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( emailInputClass );
 	responseStream << "\" name=\"email\" id=\"email\" placeholder=\"E-Mail\" value=\"";
-#line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( email );
 	responseStream << "\">\n";
-	responseStream << "\t\t\t\t<label>";
-#line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "\t\t\t\t\t<label>";
+#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Hast du dir deine Passphrase notiert oder gemerkt?") );
-	responseStream << "</label>    \n";
-	responseStream << "\t\t\t\t<input type=\"hidden\" name=\"ask_passphrase\" value=\"true\">\n";
-	responseStream << "\t\t\t\t<div class=\"";
-#line 144 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "</label>\n";
+	responseStream << "\t\t\t\t\t<input class=\"form-control\" type=\"hidden\" name=\"ask_passphrase\" value=\"true\">\n";
+	responseStream << "\t\t\t\t\t<div class=\"";
+#line 128 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( passphraseRadioClass );
 	responseStream << "\">\n";
-	responseStream << "\t\t\t\t\t<div class=\"radio\">\n";
-	responseStream << "\t\t\t\t\t  <label class=\"radio-label mr-4\">\n";
-	responseStream << "\t\t\t\t\t\t<input name=\"passphrase_memorized\" onclick=\"removeGroupInvalidClass()\"  type=\"radio\" value=\"true\">";
-#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "\t\t\t\t\t\t<div class=\"radio\">\n";
+	responseStream << "\t\t\t\t\t\t  <label class=\"form-label\" class=\"radio-label mr-4\">\n";
+	responseStream << "\t\t\t\t\t\t\t<input class=\"form-control\" name=\"passphrase_memorized\" onclick=\"removeGroupInvalidClass()\"  type=\"radio\" value=\"true\">";
+#line 131 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Ja") );
 	responseStream << " <i class=\"input-frame\"></i>\n";
-	responseStream << "\t\t\t\t\t  </label>\n";
-	responseStream << "\t\t\t\t\t</div>\n";
-	responseStream << "\t\t\t\t\t<div class=\"radio\">\n";
-	responseStream << "\t\t\t\t\t  <label class=\"radio-label\">\n";
-	responseStream << "\t\t\t\t\t\t<input name=\"passphrase_memorized\" onclick=\"removeGroupInvalidClass()\" type=\"radio\" value=\"false\">";
-#line 152 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "\t\t\t\t\t\t  </label>\n";
+	responseStream << "\t\t\t\t\t\t</div>\n";
+	responseStream << "\t\t\t\t\t\t<div class=\"radio\">\n";
+	responseStream << "\t\t\t\t\t\t  <label class=\"form-label\" class=\"radio-label\">\n";
+	responseStream << "\t\t\t\t\t\t\t<input class=\"form-control\" name=\"passphrase_memorized\" onclick=\"removeGroupInvalidClass()\" type=\"radio\" value=\"false\">";
+#line 136 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Nein") );
 	responseStream << " <i class=\"input-frame\"></i>\n";
-	responseStream << "\t\t\t\t\t  </label>\n";
+	responseStream << "\t\t\t\t\t\t  </label>\n";
+	responseStream << "\t\t\t\t\t\t</div>\n";
 	responseStream << "\t\t\t\t\t</div>\n";
-	responseStream << "\t\t\t\t</div>\n";
-	responseStream << "\t\t\t  </div>\n";
-	responseStream << "\t\t\t  <button type=\"submit\" class=\"btn btn-sm btn-primary\" name=\"ask\" >";
-#line 157 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+	responseStream << "\t\t\t\t\t  <button type=\"submit\" class=\"center-form-submit form-button\" name=\"ask\" >";
+#line 140 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Absenden") );
 	responseStream << "</button>\n";
+	responseStream << "\t\t\t\t\t</div>\n";
+	responseStream << "\t\t\t\t</form>\n";
 	responseStream << "\t\t\t</div>\n";
-	responseStream << "\t\t</form>\n";
 	responseStream << "\t  ";
-#line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 144 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
  } else if(state == PAGE_WAIT_EMAIL) { 	responseStream << "\n";
 	responseStream << "\t\t\t";
-#line 161 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 145 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Dir wird eine E-Mail zugeschickt um dein Passwort zur&uuml;ckzusetzen.") );
 	responseStream << "\n";
 	responseStream << "\t  ";
-#line 162 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 146 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
  } else if(state == PAGE_WAIT_ADMIN) { 	responseStream << "\n";
 	responseStream << "\t\t\t";
-#line 163 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Der Admin hat eine E-Mail bekommen und wird sich bei dir melden.") );
 	responseStream << "\n";
 	responseStream << "\t  ";
-#line 164 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 148 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
  } else if(state == PAGE_EMAIL_ALREADY_SEND) { 	responseStream << "\n";
 	responseStream << "\t\t\t<p>";
-#line 165 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Du hast bereits eine E-Mail bekommen. Bitte schau auch in dein Spam-Verzeichnis nach. ") );
 	responseStream << "</p>\n";
 	responseStream << "\t\t\t<p>";
-#line 166 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Du hast wirklich keine E-Mail erhalten und auch schon ein paar Minuten gewartet?") );
 	responseStream << "</p>\n";
 	responseStream << "\t\t\t<p><b><a href=\"mailto:";
-#line 167 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( adminReceiver );
 	responseStream << "?subject=Error Reset Password email&amp;body=Hallo Dario,%0D%0A%0D%0Aich habe keine Passwort zurücksetzen E-Mail erhalten,%0D%0Akannst du das prüfen?%0D%0A%0D%0AMit freundlichen Grüßen%0D%0A\">";
-#line 167 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("E-Mail an Support schicken"));
 	responseStream << "</a></b></p>\n";
 	responseStream << "\t  ";
-#line 168 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 152 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
  } 	responseStream << "\n";
-	responseStream << "          </div>  \n";
+	responseStream << "          </div>\n";
 	responseStream << "          </div>\n";
 	responseStream << "        </div>\n";
 	responseStream << "      </div>\n";
-	responseStream << "      <div class=\"auth_footer\">\n";
-	responseStream << "        <p class=\"text-muted text-center\">© Gradido 2020</p>\n";
-	responseStream << "      </div>\n";
 	responseStream << "    </div>\n";
 	responseStream << "\t<script type=\"text/javascript\">\n";
 	responseStream << "\t\tfunction removeGroupInvalidClass() {\n";
@@ -395,13 +339,26 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "\t\t}\n";
 	responseStream << "\t</script>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/SaveKeysPage.cpp b/src/cpp/HTTPInterface/SaveKeysPage.cpp
index 453ac20a1..12064f812 100644
--- a/src/cpp/HTTPInterface/SaveKeysPage.cpp
+++ b/src/cpp/HTTPInterface/SaveKeysPage.cpp
@@ -253,13 +253,26 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/TranslatePassphrase.cpp b/src/cpp/HTTPInterface/TranslatePassphrase.cpp
index 746114aa9..512383518 100644
--- a/src/cpp/HTTPInterface/TranslatePassphrase.cpp
+++ b/src/cpp/HTTPInterface/TranslatePassphrase.cpp
@@ -10,8 +10,8 @@
 #include "../Crypto/KeyPair.h"
 #include "../ServerConfig.h"
 #line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-#include "../ServerConfig.h"	
+
+#include "../ServerConfig.h"
 
 
 TranslatePassphrase::TranslatePassphrase(Session* arg):
@@ -76,8 +76,8 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	   
 	}
 #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
- 
-	bool withMaterialIcons = false; 
+
+	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
 	Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
 	std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
@@ -97,7 +97,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
 #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "css/loginServer/style.css\">\n";
+	responseStream << "css/main.css\">\n";
 #line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  if(withMaterialIcons) { 	responseStream << "\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
@@ -107,25 +107,30 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 #line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
-	responseStream << "<body class=\"header-fixed\">\n";
-	responseStream << "<div class=\"versionstring dev-info\">\n";
-	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
-	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
-	responseStream << ( ServerConfig::g_versionString );
-	responseStream << "</p>\n";
-	responseStream << "</div>\n";
-	responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
-	responseStream << "\t<div class=\"grd-left-bar-section\">\n";
-	responseStream << "\t\t<ul class=\"grd-no-style\">\n";
-	responseStream << "\t\t  <li><a href=\"";
+	responseStream << "<body>\n";
+	responseStream << "    <div class=\"layout\">\n";
+	responseStream << "        <div class=\"center-form-single\">\n";
+	responseStream << "            <div class=\"center-form-header\">\n";
+	responseStream << "                <a href=\"";
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "\" class=\"center-logo\">\n";
+	responseStream << "                    <picture>\n";
+	responseStream << "                        <source srcset=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
+	responseStream << "                        <source srcset=\"";
+#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
+	responseStream << "                        <img src=\"";
 #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
-	responseStream << "\t\t  <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
-	responseStream << "\t\t</ul>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</nav>-->";
+	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
+	responseStream << "                    </picture>\n";
+	responseStream << "                </a>\n";
+	responseStream << "            </div>";
 	// end include header.cpsp
 	responseStream << "\n";
 	responseStream << "<div class=\"authentication-theme auth-style_1\">\n";
@@ -164,38 +169,30 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "            <div class=\"grid-body\">";
 	// end include login_header.cpsp
 	// begin include flags.cpsp
+	responseStream << "<div class=\"center-form-selectors\">\n";
 	responseStream << "<form method=\"GET\" action=\"\">\n";
-	responseStream << "\t<div class=\"row pull-right-row\">\n";
-	responseStream << "\t  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
-	responseStream << "\t\t\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- if(lang != LANG_EN) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- } 
-			else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+	responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_EN) { 	responseStream << "class=\"flag-btn\"";
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "\t\t\t  <span class=\"flag-england\"></span>\n";
-	responseStream << "\t\t\t</button>\n";
-	responseStream << "\t\t</div>\n";
-	responseStream << "\t  </div>\n";
-	responseStream << "\t  <div class=\"equel-grid pull-right\">\n";
-	responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
-	responseStream << "\t\t\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- if(lang != LANG_DE) { 	responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
- } 
-			else { 	responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
-#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+	responseStream << "\t  <span class=\"flag flag-england\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ if(lang != LANG_DE) { 	responseStream << "class=\"flag-btn\"";
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+ }
+	else { 	responseStream << "class=\"flag-btn\" disabled";
+#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
-	responseStream << "\t\t\t  <span class=\"flag-germany\"></span>\n";
-	responseStream << "\t\t\t</button>\n";
-	responseStream << "\t\t</div>\n";
-	responseStream << "\t  </div>\n";
-	responseStream << "\t</div>\n";
-	responseStream << "</form>";
+	responseStream << "\t  <span class=\"flag flag-germany\"></span>\n";
+	responseStream << "\t</button>\n";
+	responseStream << "</form>\n";
+	responseStream << "</div>";
 	// end include flags.cpsp
 	responseStream << "\n";
 	responseStream << "<div class=\"row mb-3\" style=\"margin-top:70px;\">\n";
diff --git a/src/cpp/HTTPInterface/UpdateUserPasswordPage.cpp b/src/cpp/HTTPInterface/UpdateUserPasswordPage.cpp
index 4584dbfe0..48a753305 100644
--- a/src/cpp/HTTPInterface/UpdateUserPasswordPage.cpp
+++ b/src/cpp/HTTPInterface/UpdateUserPasswordPage.cpp
@@ -16,9 +16,9 @@ enum PageState {
 	PAGE_STATE_SUCCEED
 };
 
-#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
- 
-#include "../ServerConfig.h"	
+#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+
+#include "../ServerConfig.h"
 
 
 UpdateUserPasswordPage::UpdateUserPasswordPage(Session* arg):
@@ -42,12 +42,12 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
 	auto sm = SessionManager::getInstance();
 	auto uri_start = ServerConfig::g_serverPath;
 	PageState state = PAGE_STATE_ASK_PASSWORD;
-	
+
 	// remove old cookies if exist
 	sm->deleteLoginCookies(request, response, mSession);
 	// save login cookie, because maybe we've get an new session
 	response.addCookie(mSession->getLoginCookie());
-	
+
 	if(!form.empty()) {
 		auto pwd = form.get("register-password", "");
 		if(pwd != "") {
@@ -55,12 +55,12 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
 				mSession->addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch."), false);
 			} else if(SessionManager::getInstance()->checkPwdValidation(pwd, mSession)) {
 			    auto sessionState = mSession->getSessionState();
-				
+
 				if(user->setNewPassword(pwd) >= 0) {
 					//std::string referUri = request.get("Referer", uri_start + "/");
 					//printf("[updateUserPasswordPage] redirect to referUri: %s\n", referUri.data());
-					
-					// I think we can savly assume that this session was loaded from verification code 
+
+					// I think we can savly assume that this session was loaded from verification code
 					//! \return 1 = konto already activated
 					//!        -1 = invalid code
 					//!        -2 = critical error
@@ -94,120 +94,119 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
 	}
 	//getErrors(user);
 	//printf("session state end [UpdateUserPassword Page]: %s\n", mSession->getSessionStateString());
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+
+	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
 	Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
 	std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
 	responseStream << "\n";
-	// begin include header_old.cpsp
+	// begin include header.cpsp
 	responseStream << "\n";
 	responseStream << "<!DOCTYPE html>\n";
 	responseStream << "<html>\n";
 	responseStream << "<head>\n";
 	responseStream << "<meta charset=\"UTF-8\">\n";
-	responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n";
+	responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n";
 	responseStream << "<title>Gradido Login Server: ";
-#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
+#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( pageName );
 	responseStream << "</title>\n";
-	responseStream << "<!--<link rel=\"stylesheet\" type=\"text/css\" href=\"css/styles.min.css\">-->\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
-#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
+#line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
-	responseStream << "/css/styles.css\">\n";
-	responseStream << "<style type=\"text/css\" >\n";
-	responseStream << ".grd_container\n";
-	responseStream << "{\n";
-	responseStream << "  max-width:820px;\n";
-	responseStream << "  margin-left:auto;\n";
-	responseStream << "  margin-right:auto;\n";
-	responseStream << "}\n";
-	responseStream << "\n";
-	responseStream << "input:not([type='radio']) {\n";
-	responseStream << "\twidth:200px;\n";
-	responseStream << "}\n";
-	responseStream << "label:not(.grd_radio_label) {\n";
-	responseStream << "\twidth:80px;\n";
-	responseStream << "\tdisplay:inline-block;\n";
-	responseStream << "}\n";
-	responseStream << ".grd_container_small\n";
-	responseStream << "{\n";
-	responseStream << "  max-width:500px;\n";
-	responseStream << "}\n";
-	responseStream << ".grd_text {\n";
-	responseStream << "  max-width:550px;\n";
-	responseStream << "  margin-bottom: 5px;\n";
-	responseStream << "}\n";
-	responseStream << ".dev-info {\n";
-	responseStream << "\tposition: fixed;\n";
-	responseStream << "\tcolor:grey;\n";
-	responseStream << "\tfont-size: smaller;\n";
-	responseStream << "\tleft:8px;\n";
-	responseStream << "}\n";
-	responseStream << ".grd-time-used {  \n";
-	responseStream << "  bottom:0;\n";
-	responseStream << "} \n";
-	responseStream << "\n";
-	responseStream << ".versionstring {\n";
-	responseStream << "\ttop:0;\n";
-	responseStream << "}\n";
-	responseStream << "</style>\n";
+	responseStream << "css/main.css\">\n";
+#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+ if(withMaterialIcons) { 	responseStream << "\n";
+	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
+#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "css/materialdesignicons.min.css\">\n";
+#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+ } 	responseStream << "\n";
 	responseStream << "</head>\n";
 	responseStream << "<body>\n";
-	responseStream << "<div class=\"versionstring dev-info\">\n";
-	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
-	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 53 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
-	responseStream << ( ServerConfig::g_versionString );
-	responseStream << "</p>\n";
-	responseStream << "</div>\n";
-	// end include header_old.cpsp
+	responseStream << "    <div class=\"layout\">\n";
+	responseStream << "        <div class=\"center-form-single\">\n";
+	responseStream << "            <div class=\"center-form-header\">\n";
+	responseStream << "                <a href=\"";
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "\" class=\"center-logo\">\n";
+	responseStream << "                    <picture>\n";
+	responseStream << "                        <source srcset=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
+	responseStream << "                        <source srcset=\"";
+#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
+	responseStream << "                        <img src=\"";
+#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+	responseStream << ( ServerConfig::g_php_serverPath );
+	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
+	responseStream << "                    </picture>\n";
+	responseStream << "                </a>\n";
+	responseStream << "            </div>";
+	// end include header.cpsp
 	responseStream << "\n";
-	responseStream << "<div class=\"grd_container\">\n";
-	responseStream << "\t";
-#line 77 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
- if(PAGE_STATE_ASK_PASSWORD == state ) { 	responseStream << "\n";
-	responseStream << "\t<h1>Passwort bestimmen</h1>\n";
-	responseStream << "\t";
-#line 79 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
+#line 76 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
-	responseStream << "\t<form method=\"POST\">\t\n";
-	responseStream << "\t\t<fieldset class=\"grd_container_small\">\n";
-	responseStream << "\t\t\t<div class=\"grd_text\">\n";
-	responseStream << "\t\t\t\tBitte denke dir ein sicheres Passwort aus, das mindestens 8 Zeichen lang ist, ein Klein- und einen Gro&szlig;buchstaben enth&auml;lt,\n";
-	responseStream << "\t\t\t\teine Zahl und eines der folgenden Sonderzeichen: @$!%*?&+-\n";
-	responseStream << "\t\t\t</div>\n";
-	responseStream << "\t\t\t<p class=\"grd_small\">\n";
-	responseStream << "\t\t\t\t<label for=\"register-password\">Passwort</label>\n";
-	responseStream << "\t\t\t\t<input id=\"register-password\" type=\"password\" name=\"register-password\"/>\n";
-	responseStream << "\t\t\t</p>\n";
-	responseStream << "\t\t\t<p class=\"grd_small\">\n";
-	responseStream << "\t\t\t\t<label for=\"register-password2\">Passwort Best&auml;tigung</label>\n";
-	responseStream << "\t\t\t\t<input id=\"register-password2\" type=\"password\" name=\"register-password2\"/>\n";
-	responseStream << "\t\t\t</p>\n";
-	responseStream << "\t\t</fieldset>\n";
-	responseStream << "\t\t<input class=\"grd-form-bn grd-form-bn-succeed grd_clickable\" type=\"submit\" name=\"submit\" value=\"&Auml;nderung(en) speichern\">\n";
-	responseStream << "\t</form>\n";
+	responseStream << "<div class=\"center-form-container\">\n";
 	responseStream << "\t";
-#line 97 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
+#line 78 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
+ if(PAGE_STATE_ASK_PASSWORD == state ) { 	responseStream << "\n";
+	responseStream << "    <div class=\"center-form-title\">\n";
+	responseStream << "        <h1>Passwort bestimmen</h1>\n";
+	responseStream << "    </div>\n";
+	responseStream << "    <div class=\"center-form-form\">\n";
+	responseStream << "\t\t<form method=\"POST\">\n";
+	responseStream << "\t\t\t<p>\n";
+	responseStream << "\t\t\t\tBitte denke dir ein sicheres Passwort aus, das mindestens 8 Zeichen lang ist, einen Klein- und einen Gro&szlig;buchstaben enth&auml;lt,\n";
+	responseStream << "\t\t\t\teine Zahl und eines der folgenden Sonderzeichen: @$!%*?&+-\n";
+	responseStream << "\t\t\t</p>\n";
+	responseStream << "\t\t\t<label class=\"form-label\" for=\"register-password\">Passwort</label>\n";
+	responseStream << "\t\t\t<input class=\"form-control\" id=\"register-password\" type=\"password\" name=\"register-password\"/>\n";
+	responseStream << "\t\t\t<label class=\"form-label\" for=\"register-password2\">Passwort Best&auml;tigung</label>\n";
+	responseStream << "\t\t\t<input class=\"form-control\" id=\"register-password2\" type=\"password\" name=\"register-password2\"/>\n";
+	responseStream << "\t\t\t<input class=\"grd-form-bn grd-form-bn-succeed grd_clickable\" type=\"submit\" name=\"submit\" value=\"&Auml;nderung(en) speichern\">\n";
+	responseStream << "\t\t</form>\n";
+	responseStream << "\t";
+#line 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
  } else if(PAGE_STATE_SUCCEED == state) { 	responseStream << "\n";
 	responseStream << "\t\t<p>Deine Daten werden jetzt mit dem neuen Passwort verschl&uuml;sselt. Du kannst dich in etwa 1 Minute mit deinem neuen Passwort einloggen</p>\n";
-	responseStream << "\t\t<a href=\"";
-#line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
+	responseStream << "\t\t<a class=\"link-button\" href=\"";
+#line 96 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
 	responseStream << ( uri_start );
-	responseStream << "/login\" class=\"grd-form-bn grd-form-bn-succeed\">Zum Login</a>\n";
+	responseStream << "/login\">Zum Login</a>\n";
 	responseStream << "\t";
-#line 100 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
+#line 97 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
  } 	responseStream << "\n";
+	responseStream << "\t</div>\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
-	responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
-	responseStream << "\t\t\t";
-#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << "            <div class=\"center-bottom\">\n";
+	responseStream << "                <p>Copyright © Gradido 2020</p>\n";
+	responseStream << "            </div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomleft\">\n";
+	responseStream << "            ";
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
-	responseStream << "\t</div>\n";
+	responseStream << "        </div>\n";
+	responseStream << "        <div class=\"bottomright\">\n";
+	responseStream << "            <p>Login Server in Entwicklung</p>\n";
+	responseStream << "            <p>Alpha ";
+#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+	responseStream << ( ServerConfig::g_versionString );
+	responseStream << "</p>\n";
+	responseStream << "        </div>\n";
+	responseStream << "    </div>\n";
 	responseStream << "</body>\n";
+	responseStream << "\n";
 	responseStream << "</html>";
 	// end include footer.cpsp
 	responseStream << "\n";