diff --git a/src/components/HomepageFeatures/index.tsx b/src/components/HomepageFeatures/index.tsx
index 9a08de3..69fe978 100644
--- a/src/components/HomepageFeatures/index.tsx
+++ b/src/components/HomepageFeatures/index.tsx
@@ -14,7 +14,7 @@ type FeatureItem = {
 };
 
 const FeatureList: FeatureItem[] = [
-  
+
   {
     title: 'Guests management',
     imagePath: guestsFeatureImage,
@@ -25,7 +25,7 @@ const FeatureList: FeatureItem[] = [
     ),
   },
   {
-    title: 'Control expenses',
+    title: 'Expenses control',
     imagePath: expensesFeatureImage,
     description: (
       <>
@@ -42,18 +42,9 @@ const FeatureList: FeatureItem[] = [
       </>
     ),
   },
-  {
-    title: 'Free and Open Source',
-    imagePath: openSourceFeatureImage,
-    description: (
-      <>
-        Libre Wedding Planner is free software, licensed under the AGPLv3. You can use it, modify it, and distribute it according to the license terms. Please, find the source code links in the footer of this page.
-      </>
-    ),
-  },
 ];
 
-function Feature({title, imagePath, description}: FeatureItem) {
+function Feature({ title, imagePath, description }: FeatureItem) {
   return (
     <div className={clsx('col')}>
       <div className="text--center">
@@ -70,16 +61,35 @@ function Feature({title, imagePath, description}: FeatureItem) {
 export default function HomepageFeatures(): JSX.Element {
   return (
     <>
-    <h2>Features</h2>
-    <section className={styles.features}>
-      <div className="container">
-        <div className="row ">
-          {FeatureList.map((props, idx) => (
-            <Feature key={idx} {...props} />
-          ))}
+      <h2>Features</h2>
+      <section className={styles.features}>
+        <div className="container">
+          <div className="row ">
+            {FeatureList.map((props, idx) => (
+              <Feature key={idx} {...props} />
+            ))}
+          </div>
         </div>
-      </div>
-    </section>
+      </section>
+      <h2>Free & Open Source Software</h2>
+      <section className={styles.project}>
+        <p>
+          This project was created to help individuals organize their own wedding, without the need to rely on proprietary software or services.
+          We firmly believe that the data related to your wedding should be owned by you, and not by a third party. For that reason, our
+          recommendation is that you host your own instance of Libre Wedding Planner, either at home, on your own server or on a cloud provider
+          of your choice.
+        </p>
+        <p>
+          However, we are well aware that most users don't have the technical skills or resources to host their own instance. For that reason,
+          we are working on a hosted version of Libre Wedding Planner you will be able to use <em>as a service</em> for an affordable fee. Still, we encourage you to
+          not use this service if you can host your own instance. We don't care, and don't need to know how much you're going to spend,
+          or who your guests are.
+        </p>
+        <p>
+          Libre Wedding Planner is free (as in freedom), open source software, licensed under the AGPLv3. You are free to download the source code, use it,
+          modify it, and distribute it according to the license terms. Please, find links to the source code in the footer of this page.
+        </p>
+      </section>
     </>
   );
 }
diff --git a/src/components/HomepageFeatures/styles.module.css b/src/components/HomepageFeatures/styles.module.css
index d9c7290..91787bc 100644
--- a/src/components/HomepageFeatures/styles.module.css
+++ b/src/components/HomepageFeatures/styles.module.css
@@ -15,3 +15,9 @@ h2 {
   padding: 2rem;
   font-size: 2rem;
 }
+
+.project {
+  padding: 2rem 0;
+  width: 60%;
+  margin: auto;
+}