updated workflow with link checker

.github/workflows/tf_update_dev.yml

@@ -4,7 +4,7 @@ on:
     branches: [ development ]
 
 jobs:
-  job_one:
+  deploy:
     name: Deploy
     runs-on: ubuntu-latest
     steps:
@@ -22,3 +22,25 @@ jobs:
           git reset --hard origin/development
           sed -i "s/https:\/\/www.ourworld.tf/https:\/\/www2.ourworld.tf/g" config.toml
           ./build.sh
+
+  wait:
+    needs: deploy
+    name: Wait for Website Update
+    runs-on: ubuntu-latest
+    steps:
+    - name: Wait Period
+      id: wait-deploy
+      run: |
+        echo "Sleeping for 30"
+        sleep 30
+        
+  checklinks:
+    needs: wait
+    name: Check for Broken Links
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for Broken Links
+        id: link-report
+        uses: docker://ghcr.io/threefoldfoundation/website-link-checker:latest
+        with:
+          args: 'https://www2.ourworld.tf -w 404'

.github/workflows/tf_update_prod.yml

@@ -4,7 +4,7 @@ on:
     branches: [ master ]
 
 jobs:
-  job_one:
+  deploy:
     name: Deploy
     runs-on: ubuntu-latest
     steps:
@@ -22,3 +22,25 @@ jobs:
           git reset --hard origin/master
           sed -i "s/https:\/\/www2.ourworld.tf/https:\/\/ourworld.tf/g" config.toml
           ./build.sh
+
+  wait:
+    needs: deploy
+    name: Wait for Website Update
+    runs-on: ubuntu-latest
+    steps:
+    - name: Wait Period
+      id: wait-deploy
+      run: |
+        echo "Sleeping for 30"
+        sleep 30
+        
+  checklinks:
+    needs: wait
+    name: Check for Broken Links
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for Broken Links
+        id: link-report
+        uses: docker://ghcr.io/threefoldfoundation/website-link-checker:latest
+        with:
+          args: 'https://www.ourworld.tf -w 404'

.gitignore

@@ -25,8 +25,4 @@ run*
 install*
 public
 static/css
-tailwindcss
-
-# .gitignore
-node_modules/
-.env
+tailwindcss

README.md

@@ -1,7 +1,7 @@
-# Welcome to OurWorld Website Repository
+# Welcome to Ourworld Website Repository
 
-- Website Name: OurWorld
-- Brief Description: This is the official website of OurWorld.
+- Website Name: Ourworld
+- Brief Description: This is the official website of Ourworld.
 Last Updated: March 2023
 
 - production(master branch) https://ourworld.tf/

content/about/index.md

@@ -4,9 +4,103 @@ description: ""
 date: 2018-09-14
 updated: 2021-02-20
 draft: false
-weight: 2
-template: "layouts/about.html"
+weight: 1
 ---
 
-<!-- see partials/company.html -->
+<!-- section 1 -->
 
+{% row(style="center" margin="tight" bgPath="img/about.jpeg" bgStyle="full") %} 
+
+# About
+ 
+### What & Who We Are.
+
+<br>
+
+A venture creator is a company or organization that creates and develops new businesses, typically in the form of startups. Support includes providing funding, resources, and mentorship.
+
+{% end %}
+
+
+
+<div class="container mx-auto">
+
+<!-- section 2 -->
+
+{% row(style="" reverse="rightreserve") %}
+
+The OurWorld Venture Creator is backed by the ThreeFold Team – with the goal of not just doing business, but doing good for the world while we’re at it. We are an international team of experts and passionate believers in a better world who choose to act to make a difference.
+
+<br/>
+
+This journey began with the creation of a new Internet infrastructure layer, a process that took over 20 years – and was made possible by the contributions of thousands of people. Thank you to everyone who has made this possible.
+
+<br/>
+
+Our co-founders also have experience running [Incubaid](https://incubaid.com), a successful incubator focused primarily on helping to change our planet for the better through technology that supports decentralization. Over 19 years, Incubaid did seven strong exits.
+
+|||
+
+![Image](./img/threefold.png#medium#mx-auto)
+
+{% end %}
+
+
+
+<!-- section 3 -->
+
+{% row(style="") %}
+
+![Image](./img/president.png#mx-auto)
+
+|||
+
+ThreeFold Tech has successfully created cutting-edge technology for an upgraded Internet and digital twin technology with an embedded ultra scaleable financial system.
+
+<br/>
+
+The ThreeFold Grid, which deploys this technology in an open-source model, has been active for years and is also in its third generation. The community continues to add capacity and use it on a daily basis, as seen on the ThreeFold Grid explorer statistics.
+
+<br/>
+
+We have signed an agreement with the government of Zanzibar for the implementation of a digital free zone utilizing our technology.
+
+{% end %}
+
+
+
+<!-- section 4 -->
+
+{% row(style="" reverse="rightreserve") %}
+
+We have also completed all necessary preparations for the launch of our digital twin, the freeflow twin, which can be viewed on the website [freeflow.life](https://freeflow.life). This venture is ready to launch and is eagerly anticipated by the community.
+
+<br/>
+
+There are multiple ventures waiting to be born as more funding comes in to use our technology and provide value for large communities.
+
+|||
+
+![Image](./img/freeflow.png)
+
+{% end %}
+
+
+</div>
+
+
+<!-- section 5 -->
+
+{% row(style="center" margin="header" padding="top" bgColor="#007fc7") %} 
+
+<div class="text-white">
+
+## We Are an Experienced Team
+
+### With Seven Exits Over Two Decades
+
+</div>
+
+![Image](./img/exits.png)
+
+{% end %}

content/contact/index.md

@@ -1,12 +0,0 @@
----
-title: "About"
-description: ""
-date: 2018-09-14
-updated: 2021-02-20
-draft: false
-weight: 2
-template: "layouts/contact.html"
----
-
-<!-- see partials/contact.html -->
-

content/footer/_index.md

@@ -4,62 +4,60 @@ description: ""
 insert_anchor_links: "left"
 template: "partials/footer.html"
 extra:
-  logoPath: "images/logo.png"
-  socialLinks: { Github: "https://github.com/ourworldfreezone", Twitter: "https://twitter.com/threefold_io", Telegram: "https://t.me/threefoldnews"  }
+  logoPath: "images/black_threefold.png"
+  socialLinks: { Github: "https://github.com/threefoldfoundation", Github2: "https://github.com/threefoldtech", Twitter: "https://twitter.com/threefold_io", Telegram: "https://t.me/threefoldnews"  }
 ---
 
 {% row(style="lean") %}
 
-##### Partners
+##### **LEARN**
+
+<br>
+
+<a onclick="window.open('https://ourworldventures.github.io/info_ourworld/intro/intro.html', '_blank')"><h6>Knowledgebase</h6></a>
+
+###### [Blog](/blog)
+
+###### [News](/newsroom)
+
+|||
+
+##### **THE VENTURES**
 
 <br>
 
 <a onclick="window.open('https://threefold.io', '_blank')"><h6>ThreeFold</h6></a>
 
-###### [Incubaid](https://incubaid.com/)
+<a onclick="window.open('https://freezone.ourworld.tf/', '_blank')"><h6>OW Digital Free Zone</h6></a>
 
-###### [Mazraa](https://maazra.io/)
+<a onclick="window.open('https://sikana.tv/)', '_blank')"><h6>Sikana</h6></a>
 
-###### [Sikana](https://sikana.tv/)
+<a onclick="window.open('https://ourverse.tf/', '_blank')"><h6>OurVerse</h6></a>
 
-###### [VVerse](https://vverse.co/)
-
-|||
-
-##### OurWorld
-
-<br>
-
-<a onclick="window.open('https://ourworld.tf', '_blank')"><h6>OurWorld</h6></a>
-
-<a onclick="window.open('https://ourphone.ourworld.tf/', '_blank')"><h6>OurPhone</h6></a>
-
-<a onclick="window.open('https://ourworld.vindo.ai/slider/95', '_blank')"><h6>ODEZ</h6></a>
-
-<a onclick="window.open('https://habari.ourworld.tf', '_blank')"><h6>Habari</h6></a>
+<a onclick="window.open('https://ourphone.tf/', '_blank')"><h6>OurPhone</h6></a>
 
 
 |||
 
-##### About Us
+##### **BUILT ON THREEFOLD**
 
 <br>
 
+<a onclick="window.open('https://threefold.io', '_blank')"><h6>ThreeFold</h6></a>
 
-<a onclick="window.open('https://t.me/threefoldnews', '_blank')"><h6>Telegram</h6></a>
+<a onclick="window.open('https://t.me/threefold', '_blank')"><h6>Main Community</h6></a>
 
+<a onclick="window.open('https://manual.grid.tf', '_blank')"><h6>Manual</h6></a>
 
-<a onclick="window.open('https://threefoldfaq.crisp.help/en/', '_blank')"><h6>Support</h6></a>
+<a onclick="window.open('https://forum.threefold.io/', '_blank')"><h6>Forum</h6></a>
 
 
 {% end %}
 
-
 <style>
   a {
 cursor: pointer;
 
   }
   
-  </style>
-  
+  </style>

content/header/_index.md

@@ -7,11 +7,39 @@ extra:
   logoPath: "/images/OW_Logo.png"
   imgPath: ""
 ---
-- [Home]("/")
-- [About]("/about")
-- [Invest]("/invest")
-- [Ventures]("/ventures")
-- [People]("/people")
-- [Newsroom]("/newsroom")
-- [Contact]("/contact")
 
+- [About]("/about")
+- [Ventures]("/ventures")
+- Info
+
+{% row(padding="none") %}
+
+<button onclick="window.location.href='/blog'">
+
+[Blog](/blog)
+<br>
+<p class="text-sm">Explore The Blogs</p>
+
+</button>
+
+|||
+
+<button onclick="window.location.href='/newsroom'">
+
+[Newsroom](/newsroom)
+<br>
+<p class="text-sm">Check The Latest Updates</p>
+
+|||
+
+<button onclick="window.location.href='/people'">
+
+[Team](/people)
+<br>
+<p class="text-sm">Team, Stories & More</p>
+
+</button>
+
+{% end %}
+
+- [Knowledge]("https://ourworldventures.github.io/info_ourworld/intro/intro.html")

content/home/home2/index.md

@@ -1,216 +0,0 @@
----
-title: "Home"
-description: ""
-date: 2018-09-14
-updated: 2021-02-20
-draft: false
-weight: 1
----
-
-<!-- section 2  -->
-
-
-{% row(style="center" padding="top") %}
-
-![Image](./img/platforms_wide.png#large#mx-auto)
-
-## What We Provide
-
-{% end %}
-
-<br>
-
-
-{% row(style="center" padding="none") %}
-
-### Funding Platform
-
-<br/>
-
-Funding for potentially hundreds of like-minded projects, with a primary focus on emering technology that puts the planet and people first.
-
-|||
-
-### Technological Platform
-
-<br/>
-
-A technological platform that enables everyone to be self-sovereign from a digital perspective. This is a fundamental requirement.
-
-{% end %}
-
-
-{% row(style="center" padding="both") %}
-
-### Legal & Financial<br/>Independence Platform
-
-<br/>
-
-Supplement technological sovereignty with a system that offers legal and financial independence through mechanisms like free zones and sovereign sustainable charter cities.
-
-|||
-
-### Life Supporting Platform
-
-<br/>
-
-Create a sovereign and efficient set of platforms for financial, educational, and health systems, which can be utilized by all startups within the venture creator.
-
-{% end %}
-
-
-<!-- section 3  -->
-
-
-{% row(style="center" margin="narrow" padding="top") %}
-
-![Image](./img/values.png#large#mx-auto)
-
-## The Foundation of Every Venture
-
-{% end %}
-
-<br>
-
-{% row(style="center" margin="narrow" padding="bottom") %}
-
-### Planet First
-
-<br/>
-
-Never do anything which does not respect mother earth.
-
-|||
-
-### People First
-
-<br/>
-
-Equality for everyone.
-
-|||
-
-### Open Source
-
-<br/>
-
-For all sectors from healthcare to software to legal to education.
-
-|||
-
-### Authenticity
-
-<br/>
-
-Restore authenticity of people and information.
-
-|||
-
-### Simplicity
-
-<br/>
-
-Complexity is killing progress.
-
-{% end %}
-
-
-
-<!-- section 4  -->
-
-
-{% row(style="center" margin="narrow" padding="top") %}
-
-## Our Journey
-
-{% end %}
-
-<br>
-
-{% row(style="center" padding="bottom") %}
-
-### Phase One
-
-![Image](./img/past.png#mx-auto)
-
-#### Creation of Core Tech
-
-<br/>
-
-10+ years of development.
-
-<br/>
-
-Built decentralized, autonomous, edge Internet technology.
-
-<br/>
-
-50M USD invested by community and TF Tech investors.
-
-|||
-
-### Phase Two
-
-![Image](./img/past.png)
-
-#### Expansion & Proof
-
-<br/>
-
-Signed with government of Zanzibar for digital free zone and connected charter city.
-
-<br/>
-
-Eight projects with working tech, active and ready to scale.
-
-<br/>
-
-Core technology proven.
-
-|||
-
-### Phase Three
-
-![Image](./img/current.png)
-
-#### Launch Our Ventures
-
-<br/>
-
-Conclude on 30M USD fundraise.
-
-<br/>
-
-Global awareness campaign.
-
-<br/>
-
-Launch digital asset exchange, carbon credits.
-
-<br/>
-
-Millions of people using services and products of our ventures.
-
-|||
-
-### Phase Four
-
-![Image](./img/future.png)
-
-#### Sovereignty For All
-
-<br/>
-
-+1 million nodes deployed.
-
-<br/>
-
-Impacting +100 million people.
-
-<br/>
-
-The startups in the venture creator are now community-owned and our investors received a good exit.
-
-{% end %}
-
-</div>

content/home/index.md

@@ -7,60 +7,229 @@ draft: false
 weight: 1
 ---
 
-<!-- section 2  -->
+<!-- section 1 -->
 
-<div class="hidden md:grid">
-
-{% row(style="center" padding="none") %}
+{% row(style="center" margin="tight" bgPath="img/horizon.jpeg" bgStyle="full") %} 
 
+# OurWorld
+ 
+### A Platform to Enable Self-Sovereignty.
 
 <br>
 
-![](img/brand1.png)
+Together we are creating a multi-faceted platform to support and empower startups aspiring to harness the potential of emerging technology while putting the planet and people first. The sun is rising on a new way forward.
 
-<br>
-
-|||
-
-
-<br>
-
-![](img/brand2.png)
-
-<br>
-
-|||
-
-<br>
-
-![](img/brand3.png)
-
-<br>
-
-|||
-
-<br>
-
-![](img/brand4.png)
-
-<br>
-
-|||
-
-<br>
-
-![](img/brand5.png)
-
-<br>
-
-|||
-
-<br>
-
-![](img/brand6.png)
-
-<br>
+<button>[Our Ventures](/ventures)</button>
 
 {% end %}
 
-</div>
+<div class="container mx-auto">
+
+
+
+<!-- section 2  -->
+
+{% row(style="center" padding="top") %}
+
+![Image](./img/platforms_wide.png#large#mx-auto)
+
+## What We Provide
+
+{% end %}
+
+<br>
+
+
+{% row(style="center" padding="none") %}
+
+### Funding Platform
+
+<br/>
+
+Funding for potentially hundreds of like-minded projects, with a primary focus on emering technology that puts the planet and people first.
+
+|||
+
+### Technological Platform
+
+<br/>
+
+A technological platform that enables everyone to be self-sovereign from a digital perspective. This is a fundamental requirement.
+
+{% end %}
+
+
+{% row(style="center" padding="both") %}
+
+### Legal & Financial<br/>Independence Platform
+
+<br/>
+
+Supplement technological sovereignty with a system that offers legal and financial independence through mechanisms like free zones and sovereign sustainable charter cities.
+
+|||
+
+### Life Supporting Platform
+
+<br/>
+
+Create a sovereign and efficient set of platforms for financial, educational, and health systems, which can be utilized by all startups within the venture creator.
+
+{% end %}
+
+
+<!-- section 3  -->
+
+
+{% row(style="center" margin="narrow" padding="top") %}
+
+![Image](./img/values.png#large#mx-auto)
+
+## The Foundation of Every Venture
+
+{% end %}
+
+<br>
+
+{% row(style="center" margin="narrow" padding="bottom") %}
+
+### Planet First
+
+<br/>
+
+Never do anything which does not respect mother earth.
+
+|||
+
+### People First
+
+<br/>
+
+Equality for everyone.
+
+|||
+
+### Open Source
+
+<br/>
+
+For all sectors from healthcare to software to legal to education.
+
+|||
+
+### Authenticity
+
+<br/>
+
+Restore authenticity of people and information.
+
+|||
+
+### Simplicity
+
+<br/>
+
+Complexity is killing progress.
+
+{% end %}
+
+
+
+<!-- section 4  -->
+
+
+{% row(style="center" margin="narrow" padding="top") %}
+
+## Our Journey
+
+{% end %}
+
+<br>
+
+{% row(style="center" padding="bottom") %}
+
+### Phase One
+
+![Image](./img/past.png#mx-auto)
+
+#### Creation of Core Tech
+
+<br/>
+
+10+ years of development.
+
+<br/>
+
+Built decentralized, autonomous, edge Internet technology.
+
+<br/>
+
+50M USD invested by community and TF Tech investors.
+
+|||
+
+### Phase Two
+
+![Image](./img/past.png)
+
+#### Expansion & Proof
+
+<br/>
+
+Signed with government of Zanzibar for digital free zone and connected charter city.
+
+<br/>
+
+Eight projects with working tech, active and ready to scale.
+
+<br/>
+
+Core technology proven.
+
+|||
+
+### Phase Three
+
+![Image](./img/current.png)
+
+#### Launch Our Ventures
+
+<br/>
+
+Conclude on 30M USD fundraise.
+
+<br/>
+
+Global awareness campaign.
+
+<br/>
+
+Launch digital asset exchange, carbon credits.
+
+<br/>
+
+Millions of people using services and products of our ventures.
+
+|||
+
+### Phase Four
+
+![Image](./img/future.png)
+
+#### Sovereignty For All
+
+<br/>
+
++1 million nodes deployed.
+
+<br/>
+
+Impacting +100 million people.
+
+<br/>
+
+The startups in the venture creator are now community-owned and our investors received a good exit.
+
+{% end %}
+
+</div>

content/invest/index.md

@@ -1,12 +0,0 @@
----
-title: "About"
-description: ""
-date: 2018-09-14
-updated: 2021-02-20
-draft: false
-weight: 2
-template: "layouts/ourpass.html"
----
-
-<!-- see partials/company.html -->
-

content/people/adnan_fatayerji/index.md

@@ -4,11 +4,11 @@ weight: 1
 description: Honored to be part of a team that has the potential to make the world a better place..
 taxonomies:
     people: [adnan_fatayerji]
-    memberships: []
-    categories: []
+    memberships: [farmers, foundation, cofounders, wisdom_council, aci_members]
+    categories: [foundation, farming, cloud, aci]
 extra:
     imgPath: adnan_fatayerji.jpg
-    organizations: []
+    organizations: [threefold_foundation]
     countries: [UAE, Spain]
     cities: [Dubai, Ibiza]
     private: 0

content/people/ahmed_hanafy/index.md

@@ -4,11 +4,11 @@ weight: 4
 description: Ahmed is an Automation Software Testing Engineer, started his career at Codescalers.
 taxonomies:
     people: [ahmed_hanafy]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: ahmed_hanafy.png
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/ahmed_harby/index.md

@@ -4,11 +4,11 @@ weight: 4
 description: Ahmed is a passionate software test engineer with experience in software testing and automation ....
 taxonomies:
     people: [ahmed_harby]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: ahmed_harby.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/ahmed_thabet/index.md

@@ -1,14 +1,14 @@
 ---
 title: Ahmed Thabet
-weight: 3
+weight: 2
 description: Wants to build beautiful applications that don't invade user privacy.
 taxonomies:
     people: [ahmed_thabet]
-    memberships: []
-    categories: []
+    memberships: [tech, foundation, technology_council]
+    categories: [foundation]
 extra:
     imgPath: ahmed_thabet.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/alexandre_hannelas/index.md

@@ -1,14 +1,14 @@
 ---
 title: Alexandre Hannelas
-weight: 3
-description: Finance manager, artist-painter, nature enthusiast.
+weight: 2
+description: Alexandre has worked with regenerative companies to help them in their funding rounds.
 taxonomies:
     people: [alexandre_hannelas]
-    memberships: []
-    categories: []
+    memberships: [foundation, twin, aci_members]
+    categories: [foundation, twin, aci]
 extra:
     imgPath: alexandre_hannelas.jpeg
-    organizations: []
+    organizations: [threefold_foundation]
     countries: [France]
     cities: [Aix-en-Provence]
     private: 0
@@ -19,4 +19,4 @@ extra:
     }
 ---
 
-After graduating from a Masters in Finance at Toulouse School of Management, Alexandre worked with regenerative companies to help them in their funding round. He quickly thought about how unsustainable our current financial market is and reflecting on how can we make this system more devoted to collaboration instead of competition. Believing that digital currencies can solve a lot economical problems, he joined first ThreeFold and then OurWorld because the projects are perfectly aligned with his vision of enhancing people’s life on this earth. Being an artist-painter on the side, he is creating an online gallery which will promote and support international artists whose inspirations come from their deep connection with nature. He has the aim of bridging the creative world with the business world.
+After graduating from a Master in Finance at Toulouse School of Management, Alexandre worked with regenerative companies to help them in their funding round. He quickly thought about how unsustainable our current financial market is and reflecting on how can we make this system more devoted to collaboration instead of competition. Believing that digital currencies can solve a lot economical problems, he joined ThreeFold because it is perfectly aligned with his vision of enhancing people’s life on this earth. Being an artist-painter on the side, he is creating an online gallery which will promote and support international artists whose inspirations come from their deep connection with nature. He has the aim of bridging the creative world with the business world.

content/people/amira_abouhadid/index.md

@@ -4,11 +4,11 @@ weight: 4
 description: Msc. Computer & Information Technology , Bsc. Chemical Engineering.
 taxonomies:
     people: [amira_abouhadid]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: amira_abouhadid.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/ashraf_fouda/index.md

@@ -1,14 +1,14 @@
 ---
 title: Ashraf Fouda
-weight: 4
+weight: 3
 description: Software Engineer with passion in new technologies, love every thing that is really new.
 taxonomies:
     people: [ashraf_fouda]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: ashraf_fouda.jpeg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/atef_nazmy/index.md

@@ -1,14 +1,14 @@
 ---
 title: Atef Nazmy
-weight: 4
+weight: 3
 description: I Believe that ThreeFold Foundation Drives the world to be Better and Greener.
 taxonomies:
     people: [atef_nazmy]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: atef_nazmy.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/bernadette_amanda_caster/index.md

@@ -1,14 +1,14 @@
 ---
 title: Bernadette Amanda Caster
-weight: 4
+weight: 3
 description: Passionate, Outgoing and Enthusiast 
 taxonomies:
     people: [bernadette_amanda_caster]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: bernadette_amanda_caster.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: []
     cities: []
     private: 0

content/people/ehab_hassan/index.md

@@ -1,14 +1,14 @@
 ---
 title: Ehab Hassan
-weight: 4
+weight: 3
 description: Positive person in every aspect of life.
 taxonomies:
     people: [ehab_hassan]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: ehab_hassan.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/erwan_renaut/index.md

@@ -4,11 +4,11 @@ weight: 4
 description: Contributing to define a new truly decentralized internet where you are not the product.
 taxonomies:
     people: [erwan_renaut]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: erwan_renaut.jpeg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Brazil]
     cities: [Rio de Janeiro]
     private: 0

content/people/evon_yacoub/index.md

@@ -4,11 +4,11 @@ weight: 5
 description: Experienced Office Manager with a demonstrated history of working in IT industry.
 taxonomies:
     people: [evon_yacoub]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: evon_yacoub.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/florian_fournier/index.md

@@ -1,14 +1,14 @@
 ---
 title: Florian Fournier
-weight: 1
-description: Ecosystem development. The vision is always the same - to enact individual actions that address global challenges.
+weight: 2
+description: The vision is always the same - to enact individual actions that address global challenges.
 taxonomies:
     people: [florian_fournier]
-    memberships: []
-    categories: []
+    memberships: [foundation, partners, aci_members, wisdom_council]
+    categories: [foundation, aci]
 extra:
     imgPath: florian_fournier.jpeg
-    organizations: []
+    organizations: [ootopia, threefold_foundation]
     countries: [Brazil]
     cities: [Rio de Janeiro]
     private: 0
@@ -18,4 +18,4 @@ extra:
     }
 ---
 
-When Florian left Apple he was 30 years old. It was the toughest decision he had ever made. Why leave a career so many people dream of – an executive position in the global company? Being really happy working at Apple and part of an amazing young and dynamic team that had been built over the last few years to take care of the marketing for Latin America. Florian was feeling accomplished to be working for such a great organization. But years were passing by. One after the other. And the iPhone 6S was replacing the iPhone 6 and so on. Year after year. A machine you cannot stop. Technology is amazing. Really. But so much seemed at stake about how it could be used to improve people’s lives and how they could really connect to each other.Florian feelt deep inside that working on the tools was not enough, and that he needed to work on the content and give it a different usage. He had to follow his heart and intuition. We will bring new ways of living together, relating, moving, consuming, taking care of each other and working in a more sustainable way, by unpicking current scenarios and anticipating future perspectives. The vision is always the same - to enact individual actions that address global challenges.
+When Florian left Apple he was 30 years old. It was the toughest decision he had ever made. Why leave a career so many people dream of – an executive position in the global company? Being really happy working at Appl and part of an amazing young and dynamic team that had been built over the last few years to take care of the marketing for Latin America. Florian was feeling accomplished to be working for such a great organization. But years were passing by. One after the other. And the iPhone 6S was replacing the iPhone 6 and so on. Year after year. A machine you cannot stop. Technology is amazing. Really. But so much seemed at stake about how it could be used to improve people’s lives and how they could really connect to each other.Florian feelt deep inside that working on the tools was not enough, and that he needed to work on the content and give it a different usage. He had to follow his heart and intuition. We will bring new ways of living together, relating, moving, consuming, taking care of each other and working in a more sustainable way, by unpicking current scenarios and anticipating future perspectives. The vision is always the same - to enact individual actions that address global challenges.

content/people/gregory_flipo/index.md

@@ -1,21 +0,0 @@
----
-title: Gregory Flipo
-weight: 1
-description: Community Development. I move people to develop their potential and serve the common good.
-taxonomies:
-    people: [gregory_flipo]
-    memberships: []
-    categories: []
-extra:
-    imgPath: gregory_flipo.jpg
-    organizations: []
-    countries: []
-    cities: []
-    private: 0
-    socialLinks: {
-        LinkedIn: https://www.linkedin.com/in/gregory-flipo-34a9947/,
-        websites: https://threefold.io/,
-    }
----
-
-Gregory Flipo is a purpose-driven Entrepreneur dedicated to accelerating human progress for 20 years. After a round-the-world trip, meeting hundreds of social entrepreneurs who focused on the 4 billion people who are living with less than 2 dollars per day. He founded Sikana, A learning and sharing collaborative platform to empower anyone with life skills to develop their potential and serve the common good. Hundreds of millions of people have been impacted by Sikana Original content all supported by thousands of engaged members from around the world. Gregory is bringing that innovative, impactful, and decentralized approach to our Ecosystem of ventures as a Community Developer.

content/people/jan_de_landtsheer/index.md

@@ -1,14 +1,14 @@
 ---
 title: Jan De Landtsheer
-weight: 2
+weight: 1
 description: Techie at heart, having lived professionally in the tech basements of the Internet.
 taxonomies:
     people: [jan_de_landtsheer]
-    memberships: []
-    categories: []
+    memberships: [foundation, tech, technology_council]
+    categories: [foundation]
 extra:
     imgPath: jan_de_landtsheer.jpeg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Belgium]
     cities: [Gent]
     private: 0

content/people/karoline_zizka/index.md

@@ -1,14 +1,14 @@
 ---
 title: Karoline Zizka
 weight: 2
-description: Coordination. Always having the most productive and playful outcomes for the Highest Good of all in mind and heart.
+description: Currently serving by coordinating with people on particular projects, always having the most productive and playful outcomes for the Highest Good of all in mind and heart.
 taxonomies:
     people: [karoline_zizka]
-    memberships: []
-    categories: []
+    memberships: [foundation]
+    categories: [foundation]
 extra:
     imgPath: karoline_zizka.jpeg
-    organizations: []
+    organizations: [threefold_foundation]
     countries: [Austria]
     cities: [Vienna]
     private: 0
@@ -18,4 +18,4 @@ extra:
     }
 ---
 
-The appetite to travel and work was already created before she even entered the twenty-year mark. Blessed by her parents showing her beautiful places, she did the (hard) work and joined an international catering company serving the Formula 1 races for three years around the globe. During that time she finished her diploma in urban tourism and event management in Vienna, Austria where she was born and raised. Shortly after she moved to Maastricht, NL until the Universe pulled her into the direction of a magical island and provided her with a hotel manager position in Bali, Indonesia. This impacted her life tremendously and her spiritual journey marked its starting point. Besides many challenges of being white, a woman, and in the early twenties in a developing country she managed to find a flow with 38 employees and grow out of her comfort zone. After that came some slow travel until she picked up the pace in the organization of conferences, which let her transition into the tech space. With a unique ‘chain reaction of people’ Karoline found herself lucky enough with an aligned organization like ThreeFold, and now OurWorld. Currently, she is serving by coordinating with people on particular projects, always having the most productive and playful outcomes for the Highest Good of all in mind and heart.
+The appetite to travel and work was already created before she even entered the twenty-year mark. Blessed by her parents showing her beautiful places, she did the (hard) work and joined an international catering company serving the Formula 1 races for three years around the globe. During that time she finished her diploma in urban tourism and event management in Vienna, Austria where she was born and raised. Shortly after she moved to Maastricht, NL until the Universe pulled her into the direction of a magical island and provided her with a hotel manager position in Bali, Indonesia. This impacted her life tremendously and her spiritual journey marked its starting point. Besides many challenges of being white, a woman, and in the early twenties in a developing country she managed to find a flow with 38 employees and grow out of her comfort zone. After that came some slow travel until she picked up the pace in the organization of conferences, which let her transition into the tech space. With a unique ‘chain reaction of people’ Karoline found herself lucky enough with an aligned organization like Threefold. Currently, she is serving by coordinating with people on particular projects, always having the most productive and playful outcomes for the Highest Good of all in mind and heart.

content/people/khaled_youssef/index.md

@@ -4,11 +4,11 @@ weight: 4
 description: khaled is a passionate software test engineer with experience in software testing ....
 taxonomies:
     people: [khaled_youssef]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: khaled.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0

content/people/kristof_de_spiegeleer/index.md

@@ -1,14 +1,14 @@
 ---
 title: Kristof de Spiegeleer
 weight: 1
-description: Founder & CEO. Nerd engineer, humanist & motivated entrepreneur.
+description: Nerd engineer, humanist & motivated entrepreneur.
 taxonomies:
     people: [kristof_de_spiegeleer]
-    memberships: []
-    categories: []
+    memberships: [farmers, foundation, tech, cofounders, aci_members, wisdom_council, technology_council]
+    categories: [foundation, aci, cloud, farming, twin]
 extra:
     imgPath: kristof_de_spiegeleer.jpeg
-    organizations: []
+    organizations: [threefold_foundation, threefold_tech]
     countries: [UAE, Egypt]
     cities: [Dubai, El Gouna]
     private: 0
@@ -19,4 +19,4 @@ extra:
     }
 ---
 
-Humanist & motivated entrepreneur, passionate to help make the world a better place. Kristof strongly believes there is need for a neutral internet owned by millions. We dream about a world where everyone can be happy, with respect for each other and the world’s resources. A world where we dare to love ourselves and we don’t have to be scared about our future. A world where we don’t need to be a product and we have learned to collaborate with openness and trust.
+Humanist & motivated entrepreneur, passionate to help make the world a better place. Kristof strongly believes there is need for a neutral internet owned by millions. We dream about a world where everyone can be happy, with respect for each other and the world’s resources. A world where we dare to love ourselves and we don’t have to be scared about our future. A world where we don’t need to be a product and we have learned to collaborate with openness and trust. <BR> More info on <a href="https://library.threefold.me/info/threefold#/kristof">library.threefold.me</a>

content/people/lee_smet/index.md

@@ -1,14 +1,14 @@
 ---
 title: Lee Smet
-weight: 3
+weight: 2
 description: In order to have a nice planet to live on for the next decades, we need to preserve what we have now.
 taxonomies:
     people: [lee_smet]
-    memberships: []
-    categories: []
+    memberships: [foundation, tech, technology_council]
+    categories: [foundation]
 extra:
     imgPath: lee_smet.png
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Belgium]
     cities: [Lochristi]
     private: 0

content/people/mahendra_varma/index.md

@@ -1,14 +1,14 @@
 ---
 title: Mahendra Varma
-weight: 4
+weight: 3
 description: Consultant at ThreeFold DMCC
 taxonomies:
     people: [mahendra_varma]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: mahendra_varma.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: []
     cities: []
     private: 0

content/people/mahmoud_emad/index.md

@@ -4,11 +4,11 @@ weight: 4
 description: Mahmoud is a young and dynamic Software Engineer who able to work in a multicultural environment with....
 taxonomies:
   people: [mahmoud_emad]
-  memberships: []
-  categories: []
+  memberships: [tech]
+  categories: [foundation]
 extra:
   imgPath: mahmoud_emad.jpg
-  organizations: []
+  organizations: [threefold_tech]
   countries: [Egypt]
   cities: [Cairo]
   private: 0

content/people/mario_bassem/index.md

@@ -4,11 +4,11 @@ weight: 4
 description: Software Engineer.
 taxonomies:
     people: [mario_bassem]
-    memberships: []
-    categories: []
+    memberships: [tech]
+    categories: [foundation]
 extra:
     imgPath: mario.jpg
-    organizations: []
+    organizations: [threefold_tech]
     countries: [Egypt]
     cities: [Cairo]
     private: 0