diff --git a/green4cloud b/green4cloud
index 4b5f7b4..587a082 160000
--- a/green4cloud
+++ b/green4cloud
@@ -1 +1 @@
-Subproject commit 4b5f7b48ac1b01b59597d8347b620c899e9d1d0c
+Subproject commit 587a0828364090105356e86b75fc0072f77142f1
diff --git a/twenty-one/header.tpl b/twenty-one/header.tpl
index 8bef1d2..4b89318 100644
--- a/twenty-one/header.tpl
+++ b/twenty-one/header.tpl
@@ -14,7 +14,7 @@
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap" rel="stylesheet">
 </head>
-<body class="primary-bg-color" data-phone-cc-input="{$phoneNumberInputStyle}">
+<body class="bg-white" data-phone-cc-input="{$phoneNumberInputStyle}">
 
     {$headeroutput}
 
@@ -162,7 +162,7 @@
         {/if}
     {/if}
 
-    <section id="main-body">
+    <section id="main-body pt-0 ">
         <div class="">
             <div class="">
 
diff --git a/twenty-one/homepage.tpl b/twenty-one/homepage.tpl
index 5f93717..d51baa6 100644
--- a/twenty-one/homepage.tpl
+++ b/twenty-one/homepage.tpl
@@ -1,4 +1,47 @@
 {if !empty($productGroups) || $registerdomainenabled || $transferdomainenabled}
+<div class="SAAS ubuntu-light pb-5 pt-5 pl-2">
+  <div class="p-5">
+    <h3 class="SAAS-text text-uppercase font-weight-bold">
+      notre offre de services pour tous vos besoins cloud
+    </h3>
+    <h1 class="SAAS-text font-weight-bold">Nos solutions SAAS</h1>
+  </div>
+
+  <div class="row pb-5 pt-3 m-0">
+    <div class="col d-flex flex-column align-items-center justify-content-center">
+      <img src="{$WEB_ROOT}/assets/img/solution-hosting.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
+      <p class="lato-bold text-center">Hébergement</p>
+    </div>
+
+    <div class="col d-flex flex-column align-items-center justify-content-center">
+      <img src="{$WEB_ROOT}/assets/img/solution-workspace.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
+      <p class="lato-bold text-center">Messagerie et espace de travail numérique</p>
+    </div>
+
+    <div class="col d-flex flex-column align-items-center justify-content-center">
+      <img src="{$WEB_ROOT}/assets/img/solution-audit.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
+      <p class="lato-bold text-center">Conseil et Audit</p>
+    </div>
+  </div>
+
+  <div class="row pb-5 m-0">
+    <div class="col d-flex flex-column align-items-center justify-content-center">
+      <img src="{$WEB_ROOT}/assets/img/solution-backup.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
+      <p class="lato-bold text-center">Sauvegarde</p>
+    </div>
+
+    <div class="col d-flex flex-column align-items-center justify-content-center">
+      <img src="{$WEB_ROOT}/assets/img/solution-security.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
+      <p class="lato-bold text-center">Expertise informatique et sécurité</p>
+    </div>
+
+    <div class="col d-flex flex-column align-items-center justify-content-center">
+      <img src="{$WEB_ROOT}/assets/img/solution-managed-services.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
+      <p class="lato-bold text-center">Services managés</p>
+    </div>
+  </div>
+</div>
+
     <h2 class="text-center m-4 ubuntu-medium pb-5">Parcourir nos produits et services</h2>
 
     <div class="card-columns container">
@@ -47,88 +90,47 @@
     </div>
 {/if}
 
-<div class="SAAS ubuntu-light pb-5 pt-5 pl-2">
-  <div class="p-5">
-    <h6 class="SAAS-text text-uppercase font-weight-bold">
-      notre offre de services pour tout vos besoin cloud
-    </h6>
-    <h4 class="SAAS-text font-weight-bold">Nos solution SAAS</h4>
-  </div>
 
-  <div class="row pb-5 pt-3 m-0">
-    <div class="col d-flex flex-column align-items-center justify-content-center">
-      <img src="{$WEB_ROOT}/assets/img/solution-hosting.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
-      <p class="lato-regular text-center">heberg</p>
-    </div>
-
-    <div class="col d-flex flex-column align-items-center justify-content-center">
-      <img src="{$WEB_ROOT}/assets/img/solution-workspace.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
-      <p class="lato-regular text-center">Messagerie et escpace de travail numérique</p>
-    </div>
-
-    <div class="col d-flex flex-column align-items-center justify-content-center">
-      <img src="{$WEB_ROOT}/assets/img/solution-audit.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
-      <p class="lato-regular text-center">Conseil et Audit</p>
-    </div>
-  </div>
-
-  <div class="row pb-5 m-0">
-    <div class="col d-flex flex-column align-items-center justify-content-center">
-      <img src="{$WEB_ROOT}/assets/img/solution-backup.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
-      <p class="lato-regular text-center">Sauvegarde</p>
-    </div>
-
-    <div class="col d-flex flex-column align-items-center justify-content-center">
-      <img src="{$WEB_ROOT}/assets/img/solution-security.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
-      <p class="lato-regular text-center">Expertise informatique et sécurité</p>
-    </div>
-
-    <div class="col d-flex flex-column align-items-center justify-content-center">
-      <img src="{$WEB_ROOT}/assets/img/solution-managed-services.svg" alt="{$companyname}" class="pb-2" width="100" height="80">
-      <p class="lato-regular text-center">services managés</p>
-    </div>
-  </div>
-</div>
 
 <h2 class="text-center m-4">{lang key='howCanWeHelp'}</h2>
 
 <div class="row my-5 mx-0 action-icon-btns px-5">
     <div class="col-6 col-md-4 col-lg">
-        <a href="{routePath('announcement-index')}" class="card-accent-teal">
+        <a href="{routePath('announcement-index')}" class="card-accent-teal bordert-color">
             <figure class="ico-container">
-                <i class="fal fa-bullhorn"></i>
+                <i class="fal fa-bullhorn icon-color"></i>
             </figure>
             {lang key='announcementstitle'}
         </a>
     </div>
     <div class="col-6 col-md-4 col-lg">
-        <a href="serverstatus.php" class="card-accent-pomegranate">
+        <a href="serverstatus.php" class="card-accent-pomegranate bordert-color">
             <figure class="ico-container">
-                <i class="fal fa-server"></i>
+                <i class="fal fa-server icon-color icon-color"></i>
             </figure>
             {lang key='networkstatustitle'}
         </a>
     </div>
     <div class="col-6 col-md-4 col-lg">
-        <a href="{routePath('knowledgebase-index')}" class="card-accent-sun-flower">
+        <a href="{routePath('knowledgebase-index')}" class="card-accent-sun-flower bordert-color">
             <figure class="ico-container">
-                <i class="fal fa-book"></i>
+                <i class="fal fa-book icon-color"></i>
             </figure>
             {lang key='knowledgebasetitle'}
         </a>
     </div>
     <div class="col-6 col-md-4 offset-md-2 offset-lg-0 col-lg">
-        <a href="{routePath('download-index')}" class="card-accent-asbestos">
+        <a href="{routePath('download-index')}" class="card-accent-asbestos bordert-color">
             <figure class="ico-container">
-                <i class="fal fa-download"></i>
+                <i class="fal fa-download icon-color"></i>
             </figure>
             {lang key='downloadstitle'}
         </a>
     </div>
     <div class="col-6 offset-3 offset-md-0 col-md-4 col-lg">
-        <a href="submitticket.php" class="card-accent-green">
+        <a href="submitticket.php" class="card-accent-green bordert-color">
             <figure class="ico-container">
-                <i class="fal fa-life-ring"></i>
+                <i class="fal fa-life-ring icon-color"></i>
             </figure>
             {lang key='homepage.submitTicket'}
         </a>
@@ -139,9 +141,9 @@
 
 <div class="row my-5 mx-0 action-icon-btns px-5">
     <div class="col-6 col-md-4 col-lg">
-        <a href="clientarea.php" class="card-accent-midnight-blue">
+        <a href="clientarea.php" class="card-accent-midnight-blue bordert-color">
             <figure class="ico-container">
-                <i class="fal fa-home"></i>
+                <i class="fal fa-home icon-color"></i>
             </figure>
             {lang key='homepage.yourAccount'}
         </a>
@@ -149,7 +151,7 @@
     <div class="col-6 col-md-4 col-lg">
         <a href="clientarea.php?action=services" class="card-accent-midnight-blue">
             <figure class="ico-container">
-                <i class="far fa-cubes"></i>
+                <i class="far fa-cubes icon-color"></i>
             </figure>
             {lang key='homepage.manageServices'}
         </a>
@@ -158,7 +160,7 @@
         <div class="col-6 col-md-4 col-lg">
             <a href="clientarea.php?action=domains" class="card-accent-midnight-blue">
                 <figure class="ico-container">
-                    <i class="fal fa-globe"></i>
+                    <i class="fal fa-globe icon-color"></i>
                 </figure>
                 {lang key='homepage.manageDomains'}
             </a>
@@ -167,7 +169,7 @@
     <div class="col-6 col-md-4 offset-md-2 offset-lg-0 col-lg">
         <a href="supporttickets.php" class="card-accent-midnight-blue">
             <figure class="ico-container">
-                <i class="fal fa-comments"></i>
+                <i class="fal fa-comments icon-color"></i>
             </figure>
             {lang key='homepage.supportRequests'}
         </a>
@@ -175,7 +177,7 @@
     <div class="col-6 offset-3 offset-md-0 col-md-4 col-lg">
         <a href="clientarea.php?action=masspay&all=true" class="card-accent-midnight-blue">
             <figure class="ico-container">
-                <i class="fal fa-credit-card"></i>
+                <i class="fal fa-credit-card icon-color"></i>
             </figure>
             {lang key='homepage.makeAPayment'}
         </a>
diff --git a/twenty-one/includes/domain-search.tpl b/twenty-one/includes/domain-search.tpl
index e3c7bcc..e66fea0 100644
--- a/twenty-one/includes/domain-search.tpl
+++ b/twenty-one/includes/domain-search.tpl
@@ -12,7 +12,7 @@
     <div class="col d-flex flex-column">
     <h4 class="lato-bold text-uppercase color-text">cloud français</h4>
     <h3 class="ubuntu-light font-weight-bold">Se rapprocher pour mieux préserver</h3>
-      <p class="lato-regular">protégez vos données et l'environement</p>
+      <p class="lato-regular">Protégez vos données et l'environement</p>
     </div>
 
       <img src="{$WEB_ROOT}/assets/img/hero.svg" alt="{$companyname}" class="img-header">
