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,94 +1,41 @@
-# Welcome to OurWorld Website Repository
+# Welcome to Ourworld Website Repository
 
-- Website Name: OurWorld
-- Brief Description: This is the official website of OurWorld.
-Last Updated: Aug 2024
+- Website Name: Ourworld
+- Brief Description: This is the official website of Ourworld.
+Last Updated: March 2023
 
 - production(master branch) https://ourworld.tf/
 - staging(development branch) https://www2.ourworld.tf/
 
 - For any suggestions or improvement ideas please 
-Create an issue on: https://git.ourworld.tf/tfgrid/circle_web_presence/issues
-
-## Project Overview
-
-The TF9 website is built using modern, efficient web technologies to ensure a seamless user experience. The stack includes:
-
-- **Zola**: A fast, static site generator designed for simplicity and performance.
-- **Tailwind CSS**: A utility-first CSS framework for rapid UI development.
-- **JavaScript**: Enhancing interactivity and functionality on the website.
-- **Markdown**: Used for writing content in a simple and readable format, which Zola converts into HTML.
-- **HTML**: The backbone of the web pages, structuring the content and defining the layout of the website.
-
-## Installation
-
-To get started with the development environment, ensure that you have the following installed on your machine:
-
-1. **Zola**: [Installation Guide](https://www.getzola.org/documentation/getting-started/installation/)
-2. **Tailwind CSS**: [Installation Guide](https://tailwindcss.com/docs/installation)
-3. **Node.js & npm**: Required for managing JavaScript dependencies.
-
-
-## Getting Started
-
-Once these dependencies are installed, you can clone this repository and navigate into the project directory:
-
-```bash
-git clone https://git.ourworld.tf/tfcoop/www_tf9_new
-cd www_tf9_new
-
-```
-
-### Reviewing New Website Changes Locally
-
-#### Access the Terminal
-Within your code editor, open the terminal or command line interface. Make sure you are in the root directory of your website project in the terminal.
-
-1. Create an Issue
-Feel free to [create a new issue](https://git.ourworld.tf/tfgrid/circle_web_presence/issues) to report an error on the website, or if you have any suggestions on website improvements. 
-
-
-#### Run the Build Script: 
-Type **./build.sh** in the terminal and press Enter. This script is responsible for building or compiling your website code and assets.
-
-#### Run the Start Script: 
-After the build process is complete, type **./start.sh** in the terminal and press Enter. This script typically starts a local development server.
-
-Wait for the Localhost URL: The start script will initiate a local development server, and it will display a localhost URL, such as **http://localhost:xxxx**, where xxxx is a port number. Wait for this URL to be generated.
-
-### Open the URL in Your Browser
-Once the localhost URL is generated, open your web browser and enter the provided URL (e.g., http://localhost:xxxx). This will display your website locally, allowing you to review the changes you made.
-
-## Contributing
-
-We welcome contributions from the community! To contribute:
-
-Create a new branch (git checkout -b feature/your-feature-name).
-Make your changes and commit them (git commit -m 'Add new feature').
-Push to the branch (git push origin feature/your-feature-name).
-Open a Pull Request.
-
-## Issues and Suggestions
-
-We welcome feedback, bug reports, and feature requests to help improve the TF9 website. If you encounter any issues or have suggestions, please follow the steps below:
-
-1. Go to the **TF Web Presence project** board on Gitea: [Project](https://git.ourworld.tf/tfgrid/circle_web_presence/projects/35)
-2. Click on the "New Issue" button.
-3. Provide a clear title and detailed description of the issue or suggestion.
-4. Add relevant labels, milestones, or assignees if applicable.
-5. Submit the issue.
-
-Our team will review and address your submission as soon as possible.
-
-Thank you for helping us improve TF9!
-
+Create an issue on: https://github.com/threefoldfoundation/www_ourworld_tf/issues
 
 ## Administrators
-[ThreeFold's Web Presence Team](https://git.ourworld.tf/tfgrid/circle_web_presence/)
+[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin)
 
-## Website Maintenance
+## Contribution Procedure
 
 ![readme](https://user-images.githubusercontent.com/43240801/236867088-56c95abd-510c-4202-b0c5-317cdfb75cb3.png)
 
 It is highly important to follow this procedure to contribute to the website content. <br>
-__WARNING__: DO NOT commit straight into __master__ / __development__ branch.
+__WARNING__: DO NOT commit straight into __master__ / __development__ branch.
+
+1. Create an Issue
+Feel free to [create a new issue](https://github.com/threefoldfoundation/www_threefold_io/issues/new) to report an error on the website, or if you have any suggestions on website improvements. 
+
+2. Make your own branch from __'development'__ branch.
+by creating a new branch from 'Master' you will be provided with the latest copy of the live website content.
+
+3. Add your edits into your own branch via code editor locally, and push your local changes online. WARNING: DO NOT add your edits straight into __master__ / __development__ branch.
+
+5. Create a PR to merge your own branch into '**development**', and assign one of [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) on your PR as reviewer, or assign @sasha-astiadi as reviewer.
+
+7. When PR is approved, you can see your changes on staging env on www2.threefold.io (development branch)
+
+8. Admin will then create a PR to merge 'development' into into '**maste**r' (production branch)
+
+10. When PR is approved, you can see your changes live on production  (master branch).
+
+
+
+

build.sh

@@ -26,7 +26,7 @@ elif [[ "$(uname -m)" == "arm64"* ]]; then
     ASSET="$ASSET-arm64"
 fi
 
-curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.17/${ASSET}"
+curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/${ASSET}"
 chmod +x $ASSET
 mv $ASSET tailwindcss
 

content/about/index.md

@@ -4,23 +4,103 @@ description: ""
 date: 2018-09-14
 updated: 2021-02-20
 draft: false
-weight: 2
-template: "layouts/about.html"
+weight: 1
 ---
 
-<!--
-  This page is designed by combining different 'block' (partial html pages) together.
-  To edit the page content, please go to specific 'block' that you would like to edit.
-  To see the list of blocks in this page, add or remove some of the partial pages, go to: layouts/about.html.
+<!-- section 1 -->
 
-ABOUT PAGE (layouts/about.html) contains:
+{% row(style="center" margin="tight" bgPath="img/about.jpeg" bgStyle="full") %} 
 
-  1. Company Overview: "partials/company.html"
+# About
+ 
+### What & Who We Are.
 
----
-  Extras:
-  1. header: "partials/header_custom.html"
-  2. footer: "partials/footer.html"
--->
+<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,25 +0,0 @@
----
-title: "About"
-description: ""
-date: 2018-09-14
-updated: 2021-02-20
-draft: false
-weight: 2
-template: "layouts/contact.html"
----
-
-<!--
-  This page is designed by combining specific 'block' (partial html pages) together.
-  To edit the page content, please go to the partial html files listed below.
-  CONTACT PAGE (layouts/contact.html) contains:
-
-  1. Contact Section: "partials/contact.html"
-  2. Quote Section: "partials/quote.html"
-  
----
-  Extras:
-  1. header: "partials/header_custom.html"
-  2. footer: "partials/footer.html"
--->
-
-

content/creator-zones/index.md

@@ -0,0 +1,144 @@
+---
+title: "Creator Zones"
+description: "A better world is where we all have access to endless information and opportunities."
+date: 2018-09-14T21:00:00-05:00
+updated: 2021-02-20T14:40:00-06:00
+draft: false
+extra:
+  author:
+---
+
+<!-- section 1 (header) -->
+
+<div class="container mx-auto">
+
+
+<br>
+
+<br>
+
+{% row(style="center lean-right") %}
+
+### GROWTH BEGINS IN
+
+## THE CREATOR ZONE
+
+<br>
+
+Creator Zones are set up to allow aspiring entrepreneurs, business people and digital nomads to work together on projects and experiences that bring a positive impact to the society.
+
+<button>[EXPLORE]("/experiences/")</button>
+
+|||
+
+![Image](images/creator.png)
+
+{% end %}
+
+{{ space() }}
+
+{% row(style="center lean-left" bgColor="#c4ffeb") %}
+
+![Image](images/nature.png)
+
+|||
+
+### THE
+## LOVE OF NATURE
+
+<br/>
+
+Creator Zones are always integrated with nature.
+This creates a more sustainable environment that
+allows community members to be more
+sustainable. This also promotes greener habits
+to become the standard of every Creator Zone.
+
+{% end %}
+
+{{ space() }}
+
+{% row(style="center lean-left") %}
+
+
+### BUILT BY
+
+## TOGETHERNESS
+
+<br/>
+
+Co-living and coworking in Creator Zones allow members to create effective and innovative experiences.
+
+<br>
+
+We have created an environment where collaboration and team work lead to the developoment of advanced technologies that focus on endless creating opportunities.
+
+|||
+
+![Image](images/ow_lp1.png)
+
+{% end %}
+
+{{ space() }}
+
+{% row(style="center narrow") %}
+
+<br>
+
+![Image](images/regenerative.png)
+
+<br>
+
+### REGENERATIVE
+
+## FARMING
+
+<br>
+
+We work with the local population to allow them to help and earn from the Creator Zone community by assisting in regenerative farming. This makes our communities promote healthier living and also allows us to become more self-sufficient.
+
+{% end %}
+
+{{ space() }}
+
+{% row(style="center lean-right") %}
+
+### THE POWER OF
+
+## P2P
+
+<br>
+
+All Creator Zone experiences and technologies are built on top of the world’s largest decentralized and peer-to-peer network, the ThreeFold Grid. This allows endless security and scalability for all projects whilst offering limitless opportunities.
+
+<a class="text-white" href="https://library.threefold.me/info/manual/#/threefold__peer2peer" target="_blanck"><button >LEARN MORE</button></a>
+
+|||
+
+![Image](images/p2p.png)
+
+{% end %}
+
+
+</div>
+
+
+{{ space() }}
+
+{% row(style="center narrow invert-color" bgColor="#4ec48f") %}
+
+## WANNA GET **INVOLVED?**
+
+<br/>
+
+Interested in partnering up? Or just wanna say hi?
+
+Drop us a message!
+
+<a class="text-white" href="mailto:info@ourverse.tf" target="_blanck"><button >Email</button></a>
+
+<br>
+
+#### OUR**WORLD**
+
+{% end %}

content/footer/_index.md

@@ -4,57 +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>
 
-###### [Sikana](https://sikana.tv/)
+<a onclick="window.open('https://sikana.tv/)', '_blank')"><h6>Sikana</h6></a>
 
-###### [VVerse](https://vverse.co/)
+<a onclick="window.open('https://ourverse.tf/', '_blank')"><h6>OurVerse</h6></a>
 
-|||
-
-##### 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('/presskit', '_blank')"><h6>Press Kit</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

@@ -10,6 +10,36 @@ extra:
 
 - [About]("/about")
 - [Ventures]("/ventures")
-- [People]("/people")
-- [Contact]("/contact")
+- 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,23 +7,229 @@ draft: false
 weight: 1
 ---
 
-<!--
-  This page is made by combining different 'block' (partial html pages) together. 
-  To edit the page content, please go to specific 'block' that you would like to edit.
-  To see the list of the blocks in this page, add or remove some of the partial pages, go to: layouts/index.html.
+<!-- section 1 -->
 
-HOMEPAGE (layouts/index.html) contains:
+{% row(style="center" margin="tight" bgPath="img/horizon.jpeg" bgStyle="full") %} 
 
-  1. Hero section: "partials/hero.html
-  2. About section: "partials/about.html"
-  3. Foundation section: "partials/features.html"
-  4. Milestones section: "partials/stats.html
-  5. Ventures section: "partials/ventures.html"
-  5. Quote: "partials/quotes.html"
+# OurWorld
+ 
+### A Platform to Enable Self-Sovereignty.
 
----
-  Extras:
-  1. header: "partials/header_custom.html"
-  2. footer: "partials/footer.html"
-  -->
-  
+<br>
+
+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.
+
+<button>[Our Ventures](/ventures)</button>
+
+{% end %}
+
+<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/mediakit/index.md

@@ -1,25 +0,0 @@
----
-title: "Media Kits"
-description: ""
-date: 2018-09-14
-updated: 2021-02-20
-draft: false
-weight: 2
-template: "layouts/mediakit.html"
----
-
-<!--
-  This page is designed by combining specific 'block' (partial html pages) together.
-  To edit the page content, please go to the partial html files listed below.
-  CONTACT PAGE (layouts/contact.html) contains:
-
-  1. Contact Section: "partials/contact.html"
-  2. Quote Section: "partials/quote.html"
-  
----
-  Extras:
-  1. header: "partials/header_custom.html"
-  2. footer: "partials/footer.html"
--->
-
-

content/newsroom/africanregensummit/index.md

@@ -1,13 +1,13 @@
 ---
 id: africanregensummit
-title: African Regenerative Cities Summit
+title: 🌍 African Regenerative Cities Summit
 image_caption: African Regenerative Cities Summit
 description: Learn about the summit we hosted this past weekend in Zanzibar to unite innovators and investors to support Africa's future.
 date: 2023-07-23
 taxonomies:
-    people: []
-    tags: []
-    news-category: []
+    people: [sam_taggart]
+    tags: [community,technology,update,event]
+    news-category: [foundation]
 extra:
     imgPath: africanregensummit.png
 ---

content/newsroom/networkstateconference/index.md

@@ -1,32 +0,0 @@
----
-id: networkstateconference
-title: "Recap: Network State Conference"
-image_caption: Network State Conference
-description: "'We are building the infrastructure layer for Network State as a Service,' Florian Fournier."
-date: 2024-09-25
-taxonomies:
-    people: []
-    tags: []
-    news-category: []
-extra:
-    imgPath: networkstateconference.png
-    isFeatured: false
----
-
-Florian represented ThreeFold and OurWorld on stage at the Network State Conference in Singapore last week, to share a powerful solution for any network state.
-
-<br>
-
-“We are building the infrastructure layer for Network State as a Service by combining a decentralized cloud running on bare metal with a digital free zone from where we can all exist freely.”
-
-<br>
-
-Florian explained that if we want to create “cloud-first’ network states, “we definitely don’t want to run them on Amazon Web Services or Google Cloud. Because privacy is power – and we need to own our digital life, and we need to own our data.”
-
-<br>
-
-“We built a network layer and platform where any community can deploy directly its own sovereign cloud.”
-
-<br>
-
-Take a look at Florian’s talk [here](https://www.youtube.com/live/OWEGg-ZTtSE?si=EukLJY9t0cO_8Ut9&t=14763).

content/newsroom/ourworldfreezone/index.md

@@ -1,13 +1,13 @@
 ---
 id: ourworldfreezone
-title: In the News – OurWorld Digital Free Zone
+title: 🗞 In the News – OurWorld Digital Free Zone
 image_caption: OurWorld Digital Free Zone
 description: OurWorld Digital Free Zone received some coverage recently from IPPMEDIA. Take a look!
 date: 2023-08-01
 taxonomies:
-    people: []
-    tags: []
-    news-category: []
+    people: [sam_taggart]
+    tags: [partner,news,community,technology,update]
+    news-category: [foundation]
 extra:
     imgPath: ourworldfreezone.png
     isFeatured: true

content/newsroom/transformativeimpactzanzibar/index.md

@@ -1,36 +0,0 @@
----
-id: transformativeimpactsummit
-title: Transformative Impact Summit Recap  
-image_caption: Transformative Impact Summit Recap
-description: Held June 7 - 9 in Zanzibar, TIS brought together a global audience from the impact ecosystem.
-date: 2024-06-14
-taxonomies:
-  people: []
-  tags: []
-  news-category: []
-extra:
-    imgPath: transformativeimpactzanzibar.png
----
-
-*By bringing together those dedicating their lives to making the world a better place, and empowering them with exposure, support, connection, and funding, we not only celebrate transformative impact, we create it.*
-
-<br/>
-
-Held this June 7 - 9 in Zanzibar, Tanzania, the Transformative Impact Summit convened with this important focus, attracting an audience of people from around the world working across the entire impact ecosystem, along with students from local IT universities, and government officials from Zanzibar.
-
-<br/>
-
-A [jam-packed three-day schedule of focused talks](https://www.catalist.network/1-column-agenda/tis-africa-24) gave essential background and context to the incredible group of participants and their initiatives. Different tracks for the summit included Financial Innovation, Regenerative Finance, Regenerative Agriculture and Food, health and social connection, AI, Web3, and Tech for Good.
-
-<br/>
-
-The diverse array of speakers and topics included:
-
-<br/>
-
-- Kristof, Florian, and Greg from the OurWorld team
-- Matthew Schutte, co-founder of [HoloChain](https://holochain.org), who talked about HoloChain and their perspective on application development
-- Omrei Abumadi, founder of OurVerse, who discussed the metaverse and showcased a virtual environment built just for the event
-- Victor Muhagachi and David Machuche, co-founders of [Chatafisha](https://chatafisha.com/) and [Dunia Yetu](https://duniayetu.com) collaborators, who spoke about how FinTech can empower Africa’s waste pickers
-- Dr. Cornelia Wallner-Frisee, co-founder of [Africa Amini Life](https://www.africaaminilife.com/en), who presented “Education is Our Strongest Medicine”
-- El Fuego Mutaz, Head of Africa at [Refunite](https://refunite.org/), a tech non-profit that uses technology and innovation to provide humanitarian assistance, who spoke about how technology can reconnect families, as well as reshaping the future of aid with local community leadership

content/newsroom/zuzalu/index.md

@@ -1,13 +1,13 @@
 ---
 id: zuzalu
-title: ThreeFold & OurWorld Teams @ Zuzalu
-image_caption: ThreeFold / OurWorld Teams Attending Zuzalu
+title: 🗓 ThreeFold Team @ Zuzalu
+image_caption: ThreeFold Team @ Zuzalu
 description: Some of the team is at the New Cities & Network States event at Zuzalu, where Kristof will be speaking.
 date: 2023-04-26
 taxonomies:
-    people: []
-    tags: []
-    news-category: []
+    people: [sam_taggart]
+    tags: [update, news, community]
+    news-category: [foundation]
 extra:
     imgPath: zuzalu.png
 ---
@@ -24,5 +24,9 @@ Looking forward to a productive event with a like-minded community of people and
 
 <br/>
 
+We'll share more as we have it here and/or on other channels.
+
+<br/>
+
 - Zuzalu | [Site](https://zuzalu.city/)
 - The Event | [Site](https://lu.ma/ae66qgco)

content/people/adnan_fatayerji/index.md

@@ -1,20 +1,21 @@
 ---
-title: Adnan Fateryji
-weight: 2
-description: Co-Founder, CEO of TF DMCC
+title: Adnan Fatayerji
+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: []
+    people: [adnan_fatayerji]
+    memberships: [farmers, foundation, cofounders, wisdom_council, aci_members]
+    categories: [foundation, farming, cloud, aci]
 extra:
     imgPath: adnan_fatayerji.jpg
-    organizations: []
-    countries: []
-    cities: []
+    organizations: [threefold_foundation]
+    countries: [UAE, Spain]
+    cities: [Dubai, Ibiza]
     private: 0
     socialLinks: {
         LinkedIn: https://www.linkedin.com/in/adnansf/,
+        websites: https://threefold.io/, https://www.mazraa.io/,
     }
 ---
 
-Social entrepreneur and ethical technologist with experience advancing sovereign technologies.
+Honored to be part of a team that has the potential to make the world a better place by connecting billions of people to a new, accessible, data sovereign and environmentally conscious internet. A social entrepreneur, plant based warrior and a sovereign digital economy advocate with a passion for music creation and collaboration. Adnan has been based in the United Arab Emirates for the past 20 years, during which he has built successful grass-root businesses and invested startups in various sectors. At ThreeFold Adnan is responsible for driving the ThreeFold Foundation Ecosystem. Adnan is also the CEO of the @Mazraa Cooperative which is a founding farm and P2P Cloud Capacity provider on the ThreeFold Network.

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
+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:
     }
 ---
 
-Capable finance specialist with a deep passion in driving lean and innovative business models.
+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/amrit_gayan/index.md

@@ -1,20 +0,0 @@
----
-title: Amrit Gayan
-weight: 4
-description: Advisor, Finance & Operations
-taxonomies:
-    people: [amrit_gayan]
-    memberships: []
-    categories: []
-extra:
-    imgPath: amrit_gayan.jpeg
-    organizations: []
-    countries: []
-    cities: []
-    private: 0
-    socialLinks: {
-        LinkedIn: https://www.linkedin.com/in/amrit-gayan-mba-38083462,
-    }
----
-
-+20 years experience leading award-winning banks. AI and technology enthusiast.

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