Merge branch 'development' of https://github.com/threefoldfoundation/www_threefold_io into development

.github/workflows/tf_update_dev.yml

@@ -4,14 +4,14 @@ on:
     branches: [ development ]
 
 jobs:
-  job_one:
+  deploy:
     name: Deploy
     runs-on: ubuntu-latest
     steps:
     - name: pushing latest change on www2.threefold.io
       uses: appleboy/ssh-action@master
       with:
-        host: www2.threefold.io
+        host: dev.threefold.io
         username: webuser
         key: ${{ secrets.TF_SECRET }}
         port: 34022
@@ -20,5 +20,27 @@ jobs:
           git log -1
           git fetch
           git reset --hard origin/development
-          sed -i "s/https:\/\/www.threefold.io/https:\/\/www2.threefold.io/g" config.toml
+          sed -i "s/https:\/\/www.threefold.io/https:\/\/dev.threefold.io/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.threefold.io -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:
@@ -20,5 +20,27 @@ jobs:
           git log -1
           git fetch
           git reset --hard origin/master
-          sed -i "s/https:\/\/www2.threefold.io/https:\/\/www.threefold.io/g" config.toml
+          sed -i "s/https:\/\/dev.threefold.io/https:\/\/www.threefold.io/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.threefold.io -w 404'

.github/workflows/update_www3.yml

@@ -0,0 +1,46 @@
+name: www3.threefold_io
+on: 
+  push:
+    branches: [ 3.10.0 ]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on www3.threefold.io
+      uses: appleboy/ssh-action@master
+      with:
+        host: www3.threefold.io
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www3/www_threefold_io/
+          git log -1
+          git restore .
+          git pull
+          sed -i "s/https:\/\/www.threefold.io/https:\/\/www3.threefold.io/g" config.toml
+          bash 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://www3.threefold.io -w 404'

.gitignore

@@ -17,7 +17,6 @@ publishtools/publishtools
 .cache
 .DS_Store
 src/.temp
-content/news
 content/person
 content/project
 node_modules

Makefile

@@ -0,0 +1,7 @@
+SHELL := /bin/bash
+
+build:
+	. ./build.sh
+
+start:
+	. ./start.sh

README.md

@@ -20,20 +20,50 @@ Last Updated: May 2023
 ![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 the __master__ / __development__ branches.
 
-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. 
+1. 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.
+2. Make your own branch from the __development__ branch. By creating a new branch from __development__ you will be provided with the latest copy of the live website content at the staging site, www2.threefold.io.
 
 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.
+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)
+8. Admin will then create a PR to merge **development** into into **master** (production branch)
 
 10. When PR is approved, you can see your changes live on production www.threefold.io (master branch).
+
+## Development
+
+While contributing content to this site doesn't strictly require setting up a development environment, it will allow you to preview your changes and that's super handy.
+
+To do that, the following prerequisites are needed:
+
+* macOS or Linux
+* [Zola](https://www.getzola.org/documentation/getting-started/installation/)
+
+Then clone the repository recursively to also pull in contents of `threefold_data`:
+
+```
+git clone --recursive https://github.com/threefoldfoundation/www_threefold_io.git
+```
+
+Now run `build.sh` to download Tailwind, build the CSS, and also build the site with Zola:
+
+```
+cd www_threefold_io
+bash build.sh
+```
+
+Finally, start a browsable local copy of the site that will respond to changes in the source files like this:
+
+```
+zola serve
+```
+
+Zola will display a local address such as `http://127.0.0.1:1111` which you can click or copy and paste into your browser to view the site on your own machine.
+
+That's it—have fun!

config.toml

@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://www2.threefold.io"
+base_url = "https://dev.threefold.io"
 # Change this to your own URL! Please note this variable **must** be uncommented .
 
 title = "ThreeFold"
@@ -95,7 +95,3 @@ paginate_path = "people/memberships"
 
 [extra]
 # Put all your custom variables here
-
-
-
-

content/_index.md

@@ -1,12 +1,12 @@
 ---
 title: "Home"
-description: "A global movement together building an open-source, community-driven, decentralized Internet – from the ground up." # quotation marks to allow colons where used
+description: "ThreeFold is the world’s first system enabling anyone to become a cloud and internet service provider." # quotation marks to allow colons where used
 date: 2018-09-14T21:00:00-05:00
 updated: 2021-02-20T14:40:00-06:00
 draft: false
 extra:
   author: Your name here
-  imgPath: images/threefold_globe.png
+  imgPath: home/header_new.jpeg
 ---
 
 
@@ -41,7 +41,7 @@ ThreeFold is a peer-to-peer open-source Internet platform that connects users di
 
 |||
 
-<button>[Get TFT](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy)</button>
+<button>[Get TFT](https://www.manual.grid.tf/documentation/threefold_token/buy_sell_tft/tft_lobstr/tft_lobstr_short_guide.html)</button>
 
 {% end %}
 

content/about/index.md

@@ -1,188 +1,143 @@
 ---
 title: "About"
+description: "About a decade ago, a group of passionate Internet & Cloud veterans came together to build a system." # quotation marks to allow colons where used
 template: "page.html"
 insert_anchor_links: "left"
+extra:
+  author: Your name here
+  imgPath: about/people.png
 ---
 
 <!-- section 1 (header) -->
 
 
-{% row(style="center") %}
+<div class="container mx-auto">
 
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+{% row(style="header") %}
 
-### **Founded by Internet 1.0 Pioneers**
+![Image](people.png#mx-auto)
 
-About a decade ago, a group of passionate Internet & Cloud veterans came together to build<br>a new foundational layer for a better Internet – more like how the Internet was originally intended.
+|||
 
-<br>
+## Founded by <span class="blue">**Internet 1.0 Pioneers**</span>
 
-#### **30+** Years Experience | **7** Past Exits | **Thousands** of Community Members
-
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+About a decade ago, a group of passionate Internet & cloud veterans came together to build a system which can grow to a scalable, safe, compatible, and co-owned IT infrastructure.
 
 {% end %}
 
+
+
+
+<!-- section 2  -->
+
 {% row( style="center narrow mtop") %}
 
-![Image](global.png#medium)
+## **Our Why**
 
-### **Supported by a global community**
-
-Thousands of individuals and organizations are now supporting the ThreeFold ecosystem,<br>by connecting capacity, deploying workloads, holding tokens, and a lot more.
-
-<br>
-
-<button>[Learn how you can participate](/community)</button>
+Pioneering a new digital era, ThreeFold empowers communities to reclaim digital sovereignty and promote collective prosperity online.
 
 {% end %}
 
-{% row(style="center narrow mtop") %}
+{% row( style="center semiNarrow") %}
 
-![Image](mission.png#medium)
+<div class="shadow-md border-solid border-2 border-gray-100 rounded-md p-2 lg:p-4 my-0 lg:my-4">
 
-### **Our mission is to empower**
-
-The world needs a safe infrastructure to deploy cutting edge technology, where everyone can take part. We exist to help others to create on top of what the team has built, to enable others to become truly decentralized, and to make it easy for everyone to play their role within this new ecosystem.
+![Image](nations.png#mx-auto)
 
 <br>
+
+#### **Empower Nations**
+
+Most countries only rely on cable networks, meaning they lack control over their own digital infrastructure.
+
+
+</div>
+
+|||
+
+<div class="shadow-md border-solid border-2 border-gray-100 rounded-md p-2 lg:p-4 my-0 lg:my-4">
+
+![Image](own.png#mx-auto)
+
 <br>
-<br>
-<br>
-<br>
+
+#### **Own Your Data**
+
+Today, most of the cloud is owned and operated by few major companies taking all the profits and control of Internet.
+
+</div>
 
 {% end %}
 
-{% row(style="center narrow mtop") %}
+{% row( style="center semiNarrow mbottom") %}
 
-![Image](vision.png#medium)
+<div class="shadow-md border-solid border-2 border-gray-100 rounded-md p-2 lg:p-4 my-0 lg:my-4">
 
-### **Our vision is a better digital world**
+![Image](human_right.png#mx-auto)
+
+<br>
+
+#### **A Basic Human Right**
+
+Billions of people are being left behind due to the IT landscape’s centralized infrastructure.
+
+</div>
+
+|||
+
+<div class="shadow-md border-solid border-2 border-gray-100 rounded-md p-2 lg:p-4 my-0 lg:my-4">
+
+![Image](greener.png#mx-auto)
+
+<br>
+
+#### **A Greener Planet Earth**
+
+Current IT infrastructures consume far too much energy. It's time we do something about it.
+
+</div>
+
+{% end %}
+
+
+</div>
+
+
+<!-- section 3  -->
+
+<div class="bg-gray-200">
+
+<div class="container mx-auto">
+
+{% row( style="centerItem center semiNarrow margin") %}
+
+
+## **Our Mission**
+
+![Image](mission.png#mx-auto)
+
+<br>
+
+#### To Empower Human Potential
+
+The world needs a safe infrastructure to deploy cutting edge technology, where everyone can take part. We exist to make cloud capacity available everywhere on Earth, to help others host and create new digital experiences and to enable true decentralization.
+
+|||
+
+## **Our Vision**
+
+![Image](vision.png#mx-auto)
+
+<br>
+
+#### A Better Digital World
 
 We believe in an Internet where everyone can communicate freely, exchange fairly, access educational information, and own their own data. Our digital experiences should not addict nor manipulate, rather empower.
 
-<br>
-<br>
-<br>
-<br>
-<br>
 
 {% end %}
 
-{% row( style="center between mtop") %}
+</div>
 
-### **Our values define us**
 
-Everything we do must put the planet and people first.
-
-{% end %}
-
-{% row( style="center between mbottom") %}
-
-![Image](green_.png#medium)
-
-### **Planet-First**
-
-Our solutions must be sustainable. There is no Planet B.
-
-<br>
-
-And the Internet is consumed a surprisingly large amount of the world’s energy, ±10%. This is why ThreeFold has designed with efficiency in mind to create the most sustainable Internet infrastructure in the world. We must respect our mother earth.
-
-|||
-
-![Image](empowering_.png#medium)
-
-### **People-First**
-
-We empower self-sovereignty and autonomy.
-
-<br>
-
-Equality, diversity, and inclusion are key to our vision of an Internet for everyone, everywhere. ThreeFold has created a participatory infrastructure and movement, and is prioritizing efforts to bring a more accessible Internet to developing regions around the world.
-
-{% end %}
-
-{% row(style="center narrow mtop") %}
-
-### **And these tools guide us**
-
-{% end %}
-
-{% row(style="center narrow mbottom") %}
-
-<br>
-<br>
-
-![Image](open.png#medium)
-
-#### **Open-Source**
-Collaboration and openness are key to building a better world.
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-![Image](simple.png#medium)
-
-#### **Simplicity**
-Fostering clarity. Driving innovation. Enabling scalability.
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-![Image](authenticity.png#medium)
-
-#### **Authenticity**
-We are genuine and vulnerable.
-
-<br>
-<br>
-
-{%end %}
-
-<!-- section 7 (REVOLUTION) -->
-
-{% row(style="center margin") %}
-
-### **Join in**
-
-Connect, share and collaborate with our open community to expand ThreeFold's horizons.<br> Bring your ideas and let’s co-create together!
-
-<br>
-
-<button>[Join the community](/community)</button>
-
-{% end %}
+</div>

content/blog/access_threefold_token_and_provide_liquidity_on_stellar/index.md

@@ -107,7 +107,7 @@ The time has come to fund your Albedo account with TFT. Simply swap other assets
 
 <br/>
 
-*Good to know: Albedo doesn’t provide a direct fiat gateway. Visit our TFT knowledge base to discover all the ways you can [buy TFT](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html), including fiat options.*
+*Good to know: Albedo doesn’t provide a direct fiat gateway. Visit our TFT knowledge base to discover all the ways you can [buy TFT](https://www.manual.grid.tf/documentation/threefold_token/buy_sell_tft/buy_sell_tft.html), including fiat options.*
 
 ### Step 2.2.A: Deposit TFT to your Albedo account
 

content/blog/an_org_building_a_decentralized_internet/index.md

@@ -78,7 +78,7 @@ Much of what you see today at Threefold.io is the work of 100s of decentralized
 
 There are many discussions happening on the [Threefold Forum](https://forum.threefold.io) about partnerships with other projects and how we can better support both the crypto landscape and the general internet user base. Even by just joining discussions on the Threefold Forum and providing your input and ideas you can help to make sure that the internet of tomorrow is built for and by the users of tomorrow. but there are lots of ways to contribute:
 
-- You can purchase the TFT token following [this guide](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html).
+- You can purchase the TFT token following [this guide](https://www.manual.grid.tf/documentation/threefold_token/buy_sell_tft/tft_lobstr/tft_lobstr_short_guide.html).
 - You can learn about farming [here](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro).
 - You can learn more about the Threefold Cloud and Deploying [here](https://library.threefold.me/info/threefold#/cloud/threefold__cloud_home).
 

content/blog/bitcoin_threefold/index.md

@@ -56,4 +56,4 @@ But what differentiates ThreeFold the most from the crowd is that it’s a proje
 
 <br/>
 
-Stake your claim in the decentralized Internet by [hosting the Internet](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro) or [getting TFT](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html) today.
+Stake your claim in the decentralized Internet by [hosting the Internet](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro) or [getting TFT](https://www.manual.grid.tf/documentation/threefold_token/buy_sell_tft/tft_lobstr/tft_lobstr_short_guide.html) today.

content/blog/decentralised_internet_india/index.md

@@ -14,6 +14,8 @@ extra:
 
 ## How would Decentralisation of the Internet help India?
 
+*"This article was originally published by Ashish Bansal, a former member of ThreeFold Foundation."*
+
 *Ashish Bansal has been a member of the ThreeFold support team since October 2021. He was born in India. Ashish believes that we all deserve a better internet which is free, decentralized and equal for all.*
 
 <br>

content/blog/future_tft_ecosystem/index.md

@@ -28,7 +28,7 @@ That doesn’t have to be a bad thing, though. And it won’t be, for projects l
 
 <br/>
 
-We believe in decentralization. And we believe that the future is decentralized. DeFi is great and fortunately, many decentralized alternatives already exist, with thriving ecosystems and communities. There are many options to [buy and sell TFT](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html) in a decentralized way, including multiple options within the [Stellar ecosystem](https://threefold.io/blog/thriving_with_stellar/) – and we’re also exploring meaningful partnership opportunities with Algorand. Both Stellar and Algorand already provide everything we need for a healthy financial ecosystem and offer various functions crucial for the [TFT](https://forum.threefold.io/t/the-potential-of-the-threefold-token-tft/1796) ecosystem – from order books to wallets to AMM liquidity pools and on/off ramp options. And both have huge, thriving communities.
+We believe in decentralization. And we believe that the future is decentralized. DeFi is great and fortunately, many decentralized alternatives already exist, with thriving ecosystems and communities. There are many options to [buy and sell TFT](https://www.manual.grid.tf/documentation/threefold_token/buy_sell_tft/buy_sell_tft.html) in a decentralized way, including multiple options within the [Stellar ecosystem](https://threefold.io/blog/thriving_with_stellar/) – and we’re also exploring meaningful partnership opportunities with Algorand. Both Stellar and Algorand already provide everything we need for a healthy financial ecosystem and offer various functions crucial for the [TFT](https://forum.threefold.io/t/the-potential-of-the-threefold-token-tft/1796) ecosystem – from order books to wallets to AMM liquidity pools and on/off ramp options. And both have huge, thriving communities.
 
 <br/>
 

content/blog/planet_first_people_first/index.md

@@ -20,7 +20,7 @@ Today, the world is facing an unprecedented number of crises and disruptions ste
 
 <br/>
 
-We have always believed that technology can help some of humanity’s greatest challenges – for example by providing the foundation for an interconnected world that can enable abundance to spread. ThreeFold has focused on developing a more reliable Internet which can meet the demands and challenges of the future. A [more sustainable](https://threefold.io/blog/planting_the_seeds/) Internet that uses [less energy](https://threefold.io/blog/for_our_planet/) and is offsetting its carbon emissions by supporting tree planting and other impact initiatives. And an Internet that empowers us with digital [sovereignty](https://threefold.io/blog/threefold_data_sovereignty/) while providing high levels of [privacy and security](https://forum.threefold.io/t/critical-security-updates-for-apple-and-google-underline-need-for-secure-it-ecosystem/1271?u=hannahcordes). One that is [inclusive](https://threefold.io/blog/more_inclusive_internet/) by being more affordable and accessible.
+We have always believed that technology can help some of humanity’s greatest challenges – for example by providing the foundation for an interconnected world that can enable abundance to spread. ThreeFold has focused on developing a more reliable Internet that can meet the demands and challenges of the future. A [more sustainable](https://threefold.io/blog/planting_the_seeds/) Internet that uses [less energy](https://threefold.io/blog/for_our_planet/) and is offsetting its carbon emissions by supporting tree planting and other impact initiatives. And an Internet that empowers us with digital [sovereignty](https://threefold.io/blog/threefold_data_sovereignty/) while providing high levels of [privacy and security](https://forum.threefold.io/t/critical-security-updates-for-apple-and-google-underline-need-for-secure-it-ecosystem/1271?u=hannahcordes). One that is [inclusive](https://threefold.io/blog/more_inclusive_internet/) by being more affordable and accessible.
 
 <br/>
 
@@ -40,7 +40,7 @@ ThreeFold aims to deliver on our promise of providing better solutions for our p
 
 <br/>
 
-Our approach is also based on community and connection. We’re determined to build better, sustainable and inclusive systems for the planet and people – from realizing the Internet of Internets on a global scale to reimagining business, governance, finance, education and more in order to provide better alternatives for people, enterprises and governments. And we are in dialogue and partnership with global leaders who share a similar vision.
+Our approach is also based on community and connection. We’re determined to build better, sustainable, and inclusive systems for the planet and people – from realizing the Internet of Internets on a global scale to reimagining business, governance, finance, education, and more in order to provide better alternatives for people, enterprises, and governments. And we are in dialogue and partnership with global leaders who share a similar vision.
 
 <br/>
 
@@ -48,11 +48,11 @@ Here are three examples of the impact we’re creating together:
 
 <br/>
 
-* Together with [Take Action Global](https://threefold.io/blog/planting_the_seeds/), we’re offsetting the ThreeFold Grid’s emissions three times through planting and protecting trees
+* Together with [Take Action Global](https://threefold.io/blog/planting_the_seeds/), we’re offsetting the ThreeFold Grid’s emissions three times by planting and protecting trees
 
 <br/>
 
-* Together with [IETSA](https://threefold.io/news/post/threefold_ietsa/), we’re making the decentralized Internet more accessible in underserved South African communities while also providing education in blockchain and Web 3.0 technologies
+* Together with [IETSA](https://www.threefold.io/newsroom/threefold-ietsa/), we’re making the decentralized Internet more accessible in underserved South African communities while also providing education in blockchain and Web 3.0 technologies
 
 <br/>
 
@@ -64,15 +64,15 @@ We strongly believe in the ThreeFold Law which states that any good you do will
 
 <br/>
 
-We’re aware that this mission is a big one. We’re aware how aspirational it is. We’re aware that we are not perfect. And we realize that changing the world for the better requires patience and community. We’re in it for the [long run](https://threefold.io/blog/four_phases_of_threefold/) and we’re in it together.
+We’re aware that this mission is a big one. We’re aware of how aspirational it is. We’re aware that we are not perfect. And we realize that changing the world for the better requires patience and community. We’re in it for the [long run](https://threefold.io/blog/four_phases_of_threefold/) and we’re in it together.
 
 <br/>
 
-*“It's an honor every day to wake up and be a part of a global movement of people who are trying to build a better Internet for humanity that can uplift and empower.” – [Adnan Fatayerji](https://threefold.io/news/post/threefold_cybernews/)*
+*“It's an honor every day to wake up and be a part of a global movement of people who are trying to build a better Internet for humanity that can uplift and empower.” – [Adnan Fatayerji](https://www.threefold.io/newsroom/threefold-cybernews/)*
 
 <br/>
 
-ThreeFold is more than a company or a project. ThreeFold is a global movement consisting of like-minded individuals and partners who share these values and vision. A movement united in our shared beliefs in open source, peer-to-peer, equality and inclusion. By coming together to build a better Internet, we can create the foundation for a better world. We’re incredibly proud of the ThreeFold community and ecosystem. This beautiful community consists of open-minded, passionate and determined people from all around the world, just like you. We’re dreamers, creators, builders and change makers.
+ThreeFold is more than a company or a project. ThreeFold is a global movement consisting of like-minded individuals and partners who share these values and vision. A movement united in our shared beliefs in open source, peer-to-peer, equality, and inclusion. By coming together to build a better Internet, we can create the foundation for a better world. We’re incredibly proud of the ThreeFold community and ecosystem. This beautiful community consists of open-minded, passionate, and determined people from all around the world, just like you. We’re dreamers, creators, builders, and change-makers.
 
 <br/>
 
@@ -80,7 +80,7 @@ ThreeFold is more than a company or a project. ThreeFold is a global movement co
 
 ## We are part of the solution
 
-There are many great projects and organizations out there that also follow the planet-first people-first philosophy. Like [Ecosia](https://www.ecosia.org/?c=en) – the search engine that plants trees and thereby positively impacts ecosystems, communities and our planet. Like [ShareTheMeal](https://sharethemeal.org/en/index.html) – the world’s first app against global hunger that enables you to ‘share the meal’ with a child in need with one simple tap on your phone. Like [Patagonia](https://www.patagonia.com/home/?utm_source=actionworks&utm_medium=referral&utm_campaign=global_nav&utm_content=link) – a designer of outdoor clothing and sports gear that turned into an environmental activist. And like so many others.
+There are many great projects and organizations out there that also follow the planet-first people-first philosophy. Like [Ecosia](https://www.ecosia.org/?c=en) – the search engine that plants trees and thereby positively impacts ecosystems, communities, and our planet. Like [ShareTheMeal](https://sharethemeal.org/en/index.html) – the world’s first app against global hunger that enables you to ‘share the meal’ with a child in need with one simple tap on your phone. Like [Patagonia](https://www.patagonia.com/home/?utm_source=actionworks&utm_medium=referral&utm_campaign=global_nav&utm_content=link) – a designer of outdoor clothing and sports gear that turned into an environmental activist. And like so many others.
 
 <br/>
 
@@ -102,4 +102,4 @@ If not us, who? If not now, when?
 
 * *[Join](https://t.me/threefold) this growing movement*
 * *[Buy](https://marketplace.3node.global/) or [build](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__diy_guide) a 3Node and be the Internet*
-* *[Buy](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html) TFT*
+* *[Buy](https://www.manual.grid.tf/documentation/threefold_token/buy_sell_tft/buy_sell_tft.html) TFT*

content/blog/reliability/index.md

@@ -10,6 +10,7 @@ taxonomies:
     categories: [foundation]
 extra:
     imgPath: reliability.png
+    isFeatured: true
 ---
 
 In today's digital landscape, the development of a decentralized open-source Internet infrastructure marks a significant leap forward. However, while the foundational structure of this innovation brings promise, its inherent reliability isn't guaranteed. After more than five years of building and expanding the open-source ThreeFold Grid, it's now time we pivot towards commercialization. Ensuring a robust, dependable, and trustworthy offering becomes paramount. In this post, we'll share the various ways that the ThreeFold Grid is and will become reliable.

content/blog/solar_comparison/index.md

@@ -0,0 +1,51 @@
+---
+id: solar_comparison
+title: "Exploring the Parallels Between Decentralized Energy and Internet Capacity"
+image_caption: Solar and ThreeFold
+description: Read how the decentralization of the energy and internet industries are empowering individuals and communities.
+date: 2024-03-01
+taxonomies:
+    people: [emilie_ouwerx]
+    tags: [threefold_grid, peer_to_peer, community, farming]
+    categories: [foundation]
+extra:
+    imgPath: solar_comparison.png
+---
+
+In recent years, we've witnessed a transformation in how energy is generated and distributed, marking a shift towards a more sustainable and democratic system. This change has been most notable in the transition from centralized energy production, particularly nuclear power, to decentralized solar energy. The latter empowers individuals and communities to produce their energy locally, an alternative to the traditional approach to power generation.
+
+<br>
+
+Similarly, the Internet landscape, typically dominated by massive data centers and centralized servers, is experiencing a shift towards decentralization. These movements share a common ethos to empower individuals and communities.
+
+### **The Rise of Decentralized Solar Energy**
+
+Decentralized solar energy has transformed the landscape of power generation. Unlike the centralized model, where nuclear power plants are often miles away from the end-users and controlled by large corporations or government bodies, solar energy allows for energy production right where it's needed—at home or within the community.
+
+<br>
+
+By installing solar panels on rooftops or creating local solar farms, individuals can capture the sun's energy directly. This shift not only reduces our dependency on distant power plants and the complex grid systems but also mitigates the risks associated with them.
+
+<br>
+
+This localized energy production model enhances sustainability by tapping into an inexhaustible natural resource and encourages a more environmentally conscious and self-sufficient society. It signifies a move away from the centralized, traditional systems of energy production, returning power to the people and prioritizing the planet's well-being.
+
+### **ThreeFold: Pioneering a Decentralized Digital Future**
+
+Parallel to the energy sector's evolution, the digital world is also undergoing a transformation, led by innovative platforms like ThreeFold. Just as decentralized solar energy provides an alternative to the centralized power generation model, ThreeFold is reshaping the cloud computing landscape with its autonomous edge cloud.
+
+<br>
+
+ThreeFold's model deviates from the norm, where cloud services are dominated by a few massive data centers. Instead, we depend on our global network of independent nodes set up by individuals and businesses to contribute their own computing and storage resources to the cloud. This approach democratizes access to cloud resources, bolstering data privacy, security, and resilience against potential outages or cyberattacks.
+
+<br>
+
+![Image](solar.png#mx-auto)
+
+<br>
+
+Beyond merely disrupting the existing model, ThreeFold aims to foster a more sustainable, efficient, and user-centric internet. Distributing decentralized infrastructure worldwide reduces the environmental footprint associated with large data centers and promotes fairer internet resource distribution.
+
+<br>
+
+Both the shift towards decentralized solar energy and ThreeFold's revolutionary approach to cloud computing reflect a broader movement towards decentralization. This movement is not just about bringing alternatives to existing systems but about creating a more inclusive, resilient, and sustainable future for all.

content/blog/stake_tft_become_validator/index.md

@@ -61,7 +61,7 @@ ThreeFold is realizing the initial promise of an open-source, peer-to-peer Inter
 <br/>
 
 * **Step 1**: Create an account (wallet) with the [ThreeFold Connect](https://library.threefold.me/info/threefold#/tokens/threefold__threefold_connect) app.
-* **Step 2**: Buy the required amount of TFT to reserve your validator. Find all TFT buying options [here](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html).
+* **Step 2**: Buy the required amount of TFT to reserve your validator. Find all TFT buying options [here](https://www.manual.grid.tf/documentation/threefold_token/buy_sell_tft/buy_sell_tft.html).
 * **Step 3**: Log into the [ThreeFold Forum](https://forum.threefold.io/) using ThreeFold Connect and go to the [L2 Validator Signup](https://forum.threefold.io/c/dao/validators-signup-l2/83) category.
 * **Step 4**: Follow the [registration instructions](https://forum.threefold.io/t/procedure-to-register-your-l2-validator-node/1864) to become a L2 Validator, and review the checklist of your application before submission.
  

content/blog/three_layers/index.md

@@ -0,0 +1,52 @@
+---
+id: three_layers
+title: "How the Internet Works"
+image_caption: How the Internet Works
+description: Learn about the layers of the Internet to grasp how digital information is processed, stored, and accessed.
+date: 2024-03-04
+taxonomies:
+    people: [emilie_ouwerx]
+    tags: [threefold_grid, peer_to_peer, technology]
+    categories: [foundation]
+extra:
+    imgPath: three_layers.png
+    isFeatured: true
+---
+
+The Internet is complex and multi-layered, touching virtually every aspect of our modern lives. At its core, it comprises three essential layers: compute & storage, network, and application. Understanding these components is key to grasping how digital information is processed, stored, and accessed across the globe.
+
+<br>
+
+This blog post will explore these foundational aspects of the Internet and share insights into ThreeFold's journey in reshaping the global Cloud & Internet infrastructure.
+
+### **The Three Layers of the Internet**
+
+Understanding the three fundamental layers of the Internet’s architecture is crucial to grasping how digital services are delivered to end-users around the globe. Let's break down these components:
+
+#### **Compute & Storage**
+
+Compute is the powerhouse of the Internet, providing the necessary processing power to run the various software applications and services that populate the Internet. This involves everything from simple web hosting to complex computational tasks like data analysis and artificial intelligence. In essence, it's the brain behind the operations, turning code into action. Compute resources are provided by servers located in data centers, cloud platforms, and increasingly, decentralized networks.
+
+<br>
+
+Storage acts as the Internet's memory, a space where data is securely kept for future access. This includes everything from your personal photos and documents to the databases that store website content and user information. Efficient and reliable storage solutions are vital for keeping the Internet's vast amount of information organized and accessible.
+
+#### **Network**
+
+The network is the Internet's circulatory system, consisting of the physical and virtual connections that enable data to flow from one point to another. This includes the cables, satellites, routers, and protocols that transport information across the globe, ensuring that an email or a video call can reach its destination in milliseconds.
+
+#### **Applications**
+
+At the top of the Internet stack are applications — the user-facing software that provides the services and experiences we interact with daily. Applications range from web browsers and social media to more complex systems like blockchain platforms and decentralized apps (dApps). They are the interface through which users interact with the digital world.
+
+### **Blockchain's Place in the Application Layer**
+
+Blockchain technology, known for its decentralized and secure nature, resides within the application layer of the Internet. It offers a revolutionary approach to conducting transactions, managing data, and establishing trust online, offering a level of security, transparency, and efficiency previously unattainable with traditional centralized systems. As a part of the application layer, blockchain applications leverage the underlying compute, storage, and network infrastructure to operate efficiently and securely. The full blockchain landscape can run on top of ThreeFold’s Internet stack. 
+
+### **ThreeFold Today: Focusing on Compute and Storage**
+
+At ThreeFold, we're committed to enhancing the foundational layers of the Internet, with a particular focus to date on compute and storage. Our journey has been driven by the belief that decentralizing these components can lead to a more secure, efficient, and equitable digital world. By distributing compute power and storage capacity across a global network, we aim to reduce reliance on centralized data centers, mitigate privacy and security risks, and lower the environmental impact of digital infrastructure.
+
+### **The Road Ahead: Expanding to Connectivity**
+
+Looking to the future, ThreeFold plans to integrate advanced connectivity solutions into our ecosystem. Recognizing the importance of robust network infrastructure, we're dedicated to improving bandwidth and reducing latency to ensure seamless access to digital services for everyone, everywhere. This expansion is not only about enhancing Internet performance but also about empowering blockchain applications and other innovations that depend on strong connectivity to thrive.

content/blog/threefold_cooperative/index.md

@@ -10,6 +10,7 @@ taxonomies:
     categories: [foundation]
 extra:
     imgPath: threefold_cooperative.png
+    isFeatured: true
 ---
 
 In the next phase of ThreeFold, we are focused on utilization and commercialization. With this comes a requirement for our project to establish reliable and trusted systems that allow anyone to enter the ecosystem with confidence.

content/blog/thriving_with_stellar/index.md

@@ -110,7 +110,7 @@ Visit the linked library pages to find detailed step-by-step guides for all meth
 
 ## What’s next for TFT
 
-One of our key objectives is to make TFT more accessible. Already, there are many options to [buy and sell TFT](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html) – like [gettft.com](https://gettft.com/) or Stellar’s DEX, and more coming soon. We’re also exploring the feasibility and synergies for a meaningful partnership with Algorand – including making TFT available on Algorand order books. 
+One of our key objectives is to make TFT more accessible. Already, there are many options to [buy and sell TFT](https://www.manual.grid.tf/documentation/threefold_token/buy_sell_tft/tft_lobstr/tft_lobstr_short_guide.html) – like [gettft.com](https://gettft.com/) or Stellar’s DEX, and more coming soon. We’re also exploring the feasibility and synergies for a meaningful partnership with Algorand – including making TFT available on Algorand order books. 
 
 <br/>
 

content/careers/index.md

@@ -22,7 +22,8 @@ title: "Careers"
 
 {% row(bgPath="team_joinus.jpg" style="center margin") %}
 
-# **Join Our Team**
+
+<h1 class="font-medium text-gray-800">Join Our Team</h1>
 
 
 {% end %}

content/community/index.md

@@ -1,344 +0,0 @@
----
-title: "Community"
-template: "page.html"
-insert_anchor_links: "left"
----
-
-<!-- section 1 (THE FOLD) -->
-
-{% row(style="center") %}
-
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-
-### **Welcome to the Community**
-
-We’re a 100% open-source and community-driven project. Anyone can contribute to ThreeFold and there are many ways to get involved.
-
-<br>
-
-#### **Thousands** of Community Members | **Many** Participation Opportunities | **Limitless** Potential
-
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-
-{% end %}
-
-{% row(style="center mtop between") %}
-
-### **Get involved today**
-
-Already today there are many ways to take part!
-
-{% end %}
-
-{% row(style="center between") %}
-
-<br>
-<br>
-
-#### Farmer
-
-Connects capacity to our new Internet, makes it available to all particpants.
-
-<button>[Farm](/farm)</button>
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-#### Grid User
-
-Tests or uses the technology to deploy workloads and/or administer.
-
-<button>[Deploy](/deploy)</button>
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-#### TFT Holder
-
-Buys and holds TFT to support the project and use grid services.
-
-<button>[Buy](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html)</button>
-
-<br>
-<br>
-
-{% end %}
-
-{% row(style="center between") %}
-
-<br>
-<br>
-
-#### Technology Provider
-
-Creates open source technology to be used on the TF Grid (e.g. TF Tech).
-
-<br>
-
-*Get in touch if you'd like to become a technology provider.*
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-#### 3Node Supplier
-
-Builds and sells 3Nodes to the community. Provides support as needed.
-
-<button>[3Node Marketplace](https://marketplace.3node.global/)</button>
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-#### Advocate
-
-Supports the project by spreading the word and growing the community.
-
-<br>
-<br>
-
-{% end %}
-
-{% row(style="center mtop between") %}
-
-### **Community of the future**
-
-These roles will activate soon. Read about [the upcoming cooperative](/blog/threefold-cooperative).
-
-{% end %}
-
-{% row(style="center between") %}
-
-<br>
-<br>
-
-#### TF Cooperative
-
-Our governance layer, which we are all a part of. Together we build.
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-#### Guardians
-
-A trusted group to protect the network and provide governance.
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-#### Farming Pools
-
-Help farmers to be more effective.
-
-<br>
-<br>
-
-{% end %}
-
-{% row(style="center between") %}
-
-<br>
-<br>
-
-#### Network Bridgers
-
-Bridge the old and new (Internets), provide bandwidth to Mycelium.
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-#### Digital Sovereign Zones
-
-Leverage TF technology for end-to-end sovereign regulated sandbox environments.
-
-<br>
-
-*Our first digital sovereign zone will come alive in Zanzibar in 2024.*
-
-<br>
-<br>
-
-|||
-
-<br>
-<br>
-
-#### DePIN Flow Provider
-
-A project (company, community) which will launch us into the DePIN world.
-
-<br>
-<br>
-
-{% end %}
-
-<!-- section 8 (IN THE NEWS) -->
-
-{% row(style="center mtop between") %}
-
-### **Helpful links for the community**
-
-{% end %}
-
-{% row(style="center between") %}
-
-[![](discourse.png)](https://forum.threefold.io/)
-
-#### Forum
-
-Ask Questions
-
-|||
-
-[![](gh.png)](https://github.com/threefoldtech)
-
-#### GitHub
-
-Collaborate
-
-|||
-
-[![](manual.png)](https://manual.grid.tf)
-
-#### Manual
-
-Dive In
-
-{% end %}
-
-{% row(style="center between") %}
-
-[![](x.png)](https://twitter.com/threefold_io)
-
-#### X (Twitter)
-
-"Tweet" with us
-
-|||
-
-[![](tg_news.png)](https://t.me/threefoldnews)
-
-#### Telegram News
-
-Stay updated
-
-|||
-
-[![](tg_chat.png)](https://t.me/threefold)
-
-#### Telegram Chat
-
-Community conversations
-
-{% end %}
-
-{% row(style="center between") %}
-
-[![](tg_farm.png)](https://t.me/threefoldfarmers)
-
-#### Telegram Farmers Chat
-
-Farming Community
-
-|||
-
-[![](tg_chat.png)](https://t.me/threefoldtesting)
-
-#### Telegram Grid Users Chat
-
-Grid User Community
-
-|||
-
-[![](reddit.png)](https://www.reddit.com/r/threefold/)
-
-#### Reddit
-
-Join in
-
-{% end %}
-
-{% row(style="center mbottom between") %}
-
-[![](youtube.png)](https://www.youtube.com/threefoldfoundation)
-
-#### YouTube
-
-Watch things unfold
-
-|||
-
-[![](mail.png)](https://www.threefold.io/#subscribe)
-
-#### Mailing List
-
-Updates in your inbox
-
-|||
-
-[![](linkedin.png)](https://linkedin.com/company/threefold-foundation)
-
-#### LinkedIn
-
-Let's network
-
-{% end %}
-
-    

content/deploy/index.md

@@ -1,149 +0,0 @@
----
-title: "Deploy"
-template: "page.html"
-insert_anchor_links: "left"
----
-
-<!-- section 1  -->
-
-{% row(style="center") %}
-
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-
-### **Deploy the future**
-
-Deploy and administer on a decentralized autonomous edge infrastructure.<br>Experience true ownership of your deployments, along with greater scalability, efficiency, privacy, and security.
-
-<br>
-
-#### **Hundreds** of Grid Users | **Thousands** of Deployments | **Limitless** Potential
-
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-
-{% end %}
-
-<!-- section 4 -->
-
-{% row(style="center narrow mtop") %}
-
-![Image](yourway.png#medium)
-
-### **Your deployments, your way**
-
-ThreeFold is designed for compatibility. Developers and system administrators are provided with familiar ways of deploying and managing resources. From decentralized cloud computing to blockchain integration to overseeing infrastructures and optimizing performance, grid users have a breadth of options for smooth and efficient operation.
-
-<button>[For developers](https://manual.grid.tf/developers/developers.html)</button>
-<button>[For sysadmins](https://manual.grid.tf/system_administrators/system_administrators.html)</button>
-
-<br>
-<br>
-<br>
-<br>
-<br>
-
-{% end %}
-
-{% row(style="center narrow mtop") %}
-
-### **A world of use cases**
-
-ThreeFold supports a wide array of use cases, but here is a sampling of who can benefit most from the ThreeFold Grid today:
-
-{% end %}
-
-{% row(style="center narrow") %}
-
-![Image](depin.png#medium)
-
-#### For DePIN
-
-<br>
-
-Any current or future IT workload can run on the ThreeFold Grid
-
-<br>
-
-Smart Contract enabled provisioning of IT capacity in a few clicks
-
-<br>
-
-First-of-its-kind P2P network (Mycelium)
-
-|||
-
-![Image](countries.png#medium)
-
-#### For Countries
-
-<br>
-
-Deploy their own sovereign Internets
-
-<br>
-
-Keep data and economic benefits inside the country
-
-<br>
-
-Greater security, resilience, and customization
-
-|||
-
-![Image](cicd.png#medium)
-
-#### For CI & CD
-
-<br>
-
-Redundancy and resilience
-
-<br>
-
-Improved performance, security, and scalability
-
-<br>
-
-Greater autonomy and flexibility
-
-|||
-
-![Image](apps.png#medium)
-
-#### For Social Media Apps
-
-<br>
-
-Allow users to own their own data
-
-<br>
-
-Greater interoperability and openness
-
-<br>
-
-Reduced monopolistic power, enables healthy competition
-
-{% end %}