Forced to merge

.github/workflows/tf_update_dev.yml

@@ -1,7 +1,7 @@
-name: Threefold_io
+name: www2.threefold_io
 on: 
   push:
-    branch: [ development ]
+    branches: [ development ]
 
 jobs:
   job_one:
@@ -18,9 +18,8 @@ jobs:
         script: |
           cd /opt/www_threefold_io/
           git log -1
-          git restore config.toml
+          git restore .
-          git restore static/css/index.css
           git pull
-          sed -i "s/https:\/\/threefoldfoundation.github.io\/www_threefold_io/https:\/\/www2.threefold.io/g" config.toml
+          sed -i "s/https:\/\/www.threefold.io/https:\/\/www2.threefold.io/g" config.toml
           ./build.sh
           

.github/workflows/tf_update_prod.yml

@@ -0,0 +1,25 @@
+name: www.threefold_io
+on: 
+  push:
+    branches: [ master ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on www.threefold.io
+      uses: appleboy/ssh-action@master
+      with:
+        host: www.threefold.io
+        username: root
+        key: ${{ secrets.TF_SECRET }}
+        port: 22
+        script: |
+          cd /opt/www_threefold_io/
+          git log -1
+          git restore .
+          git pull
+          sed -i "s/https:\/\/www2.threefold.io/https:\/\/www.threefold.io/g" config.toml
+          ./build.sh
+          

README.md

@@ -1,15 +1,39 @@
-# Welcome to ThreeFold Website Repository
+# Welcome to Welcome to ThreeFold Website RepositoryWebsite Repository
 
 ![](./static/images/tf_logo.png)
 
 ## About
 
-The official website of ThreeFold Foundation.
+The official website of ThreeFold Foundation. <br>
 
-[www.threefold.io](https://www.threefold.io)
+Production: [www.threefold.io](https://www.threefold.io) (master branch)
 
-Last Updated: March 2023
+Staging: www2.threefold.io (development branch)
 
-## Contribution
+Last Updated: May 2023
 
-Feel free to [create a new issue](https://github.com/threefoldfoundation/www_threefold_io/issues) to report an error on the website, or if you have any suggestions on website improvements. 
+## Administrators
+[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin)
+
+## 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.
+
+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 www.threefold.io (master branch).

config.toml

@@ -1,6 +1,6 @@
 # The URL the site will be built for
-base_url = "https://threefoldfoundation.github.io/www_threefold_io"
+base_url = "https://www2.threefold.io"
-# Change this to your own URL! Please note this variable **must** be uncommented.
+# Change this to your own URL! Please note this variable **must** be uncommented .
 
 title = "ThreeFold"
 description="Our global digital backbone"

content/_index.md

@@ -111,7 +111,7 @@ True digital sovereignty for open-source builders. The ThreeFold Grid provides l
 
 |||
 
-<button>[The Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)</button>
+<button>[The Manual](https://manual.grid.tf/)</button>
 
 |||
 

content/blog/internet_evolution/index.md

@@ -2,14 +2,14 @@
 id: internet_evolution
 title: "The Evolution Towards A More Secure, Private, And Sovereign Internet"
 image_caption: "The Evolution Towards A More Secure, Private, And Sovereign Internet"
-description: In the current Internet system, each of us exists many times, each application provider owns _our_ data while offering functionality _they_ own. We become the user. We become the product. Instead, what if we were at the center of our digital lives?
+description: Today, the Internet is a ubiquitous part of our daily lives, and it continues to evolve. As we continue to innovate and collaborate, we can build a better, more secure digital future for all.
 date: 2023-04-11
 taxonomies:
-    people: [victoria_obeegadoo]
+  people: [victoria_obeegadoo]
-    tags: [threefold_grid,technology,peer_to_peer,threefold_cloud]
+  tags: [threefold_grid, technology, peer_to_peer, threefold_cloud]
-    categories: [foundation]
+  categories: [foundation]
 extra:
-    imgPath: internet_evolution.png
+  imgPath: internet_evolution.png
 ---
 
 The Internet has undergone a natural evolution from its early days as a fragmented network of computers, to the vast interconnected web of infrastructure and platforms we know today. This has shaped the way we communicate, work, and live. With each passing decade, new technologies and protocols have emerged to address growing concerns about cybercrime, surveillance, and censorship. Let's take a closer look at each phase of this evolution and how ThreeFold is taking action for the next step.
@@ -76,7 +76,7 @@ Together, these emerging technologies are driving a paradigm shift towards a mor
 
 ## Looking Ahead: Together We Build
 
-Today, the Internet is a ubiquitous part of our daily lives, and it continues to evolve. As we continue to innovate and collaborate, we can build a better, more secure digital future for all. Already, we are seeing the emergence of new technologies, such as blockchain, artificial intelligence, and the Internet of Things, that promise to transform the Internet even further.  As we move forward, we can expect to see more innovations and developments that aim to create a more secure, decentralized, and user-centric Internet that prioritizes privacy, data ownership, and security.
+Today, the Internet is a ubiquitous part of our daily lives, and it continues to evolve. As we continue to innovate and collaborate, we can build a better, more secure digital future for all. Already, we are seeing the emergence of new technologies, such as blockchain, artificial intelligence, and the Internet of Things, that promise to transform the Internet even further. As we move forward, we can expect to see more innovations and developments that aim to create a more secure, decentralized, and user-centric Internet that prioritizes privacy, data ownership, and security.
 
 <br/>
 
@@ -84,6 +84,13 @@ On our side, at ThreeFold, we see that many of the solutions being presented tod
 
 <br/>
 
+- Visit our [Website](https://www.threefold.io).
+- Visit our [Forum](https://forum.threefold.io/).
+- Collaborate on [GitHub](https://github.com/threefoldtech).
+- Subscribe to our [Weekly & Monthly Newsletters](https://bit.ly/threefoldweekly).
+- Connect with us on [Twitter](https://twitter.com/threefold_io), [LinkedIn](https://ae.linkedin.com/company/threefold-foundation), & [Reddit](https://www.reddit.com/r/threefold/).
+- Join our [Community Chat](https://t.me/threefold) and [Updates Channel](https://t.me/threefoldnews).
+
 * Visit our [Website](https://www.threefold.io). 
 * Visit our [Forum](https://forum.threefold.io/).
 * Collaborate on [GitHub](https://github.com/threefoldtech).

content/build/index.md

@@ -19,12 +19,12 @@ Deploy any workload with unprecedented security, scalability, and efficiency, on
 
 <button>[Dashboard](https://dashboard.grid.tf)</button>
 <button>[Playground](https://play.grid.tf)</button>
-<button>[Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)
+<button>[Manual](https://manual.grid.tf/)
 <button>[Grid Chat](https://t.me/threefoldtesting)</button>
 
 {% end %}
 
-<!-- section 2  -->
+<!-- section 4 -->
 
 {% row(style="center mbottom") %}
 
@@ -44,7 +44,7 @@ Plug in standard tools and protocols to the most resilient and versatile storage
 
 Native support for containers and virtual machines. Migrate existing applications effortlessly or build from scratch in a cutting-edge computing environment.
 
-<button>[Learn More](https://library.threefold.me/info/manual/#/manual__weblets_home)</button>
+<button>[Learn More](https://manual.grid.tf/weblets/weblets_home.html)</button>
 
 |||
 
@@ -63,62 +63,6 @@ Private overlay networks and global end-to-end encryption minimize attack surfac
 
 {% row(style="center mtop narrow") %}
 
-## Designed for <br> **Demanding Workloads**
-
-{% end %}
-
-{% row(style="center between") %}
-
-![Image](capacity.png#medium)
-
-<br/>
-
-### **Edge Capacity**
-
-Achieve low latencies and bandwidth efficiency by reserving capacity locally.
-
-|||
-
-![Image](secure.png#medium)
-
-<br/>
-
-### **Secure**
-
-Open-source system built from the ground-up for a fully transparent and auditable stack.
-
-|||
-
-![Image](scalable.png#medium)
-
-<br/>
-
-### **Scalable**
-
-An autonomous infrastructure that grows naturally with demand, where and when it is needed.
-
-|||
-
-![Image](effecient.png#medium)
-
-<br/>
-
-### **Efficient**
-
-A carefully designed collection of lightweight components that minimize overheads.
-
-{% end %}
-
-<!-- section 4 -->
-
-{% row(style="center mbottom narrow") %}
-
-<button>[Learn More](https://library.threefold.me/info/threefold#/cloud/threefold__cloud_home)</button>
-
-{% end %}
-
-{% row(style="center mtop narrow") %}
-
 ## Explore **What's Possible**
 
 Build in a truly decentralized environment on the ThreeFold Grid. A sandbox of limitless possibilities awaits for the open source builders of a decentralized tomorrow.
@@ -127,29 +71,29 @@ Build in a truly decentralized environment on the ThreeFold Grid. A sandbox of l
 
 {% row(style="center mtop between") %}
 
-[![virtual machine](virtual_machine.png#mx-auto)](https://library.threefold.me/info/manual/#/manual__weblets_vm)
+[![virtual machine](virtual_machine.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_vm)
 
 |||
 
-[![kubernetes](kubernetes.png#mx-auto)](https://library.threefold.me/info/manual/#/manual__weblets_k8s)
+[![kubernetes](kubernetes.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_k8s)
 
 |||
 
-[![terraform](terraform.png#mx-auto)](https://library.threefold.me/info/manual/#/manual__manual3_iac_home)
+[![terraform](terraform.png#medium)](https://library.threefold.me/info/manual/#/manual__manual3_iac_home)
 
 {% end %}
 
 {% row(style="center mbottom between") %}
 
-[![weblets](weblets.png#mx-auto)](https://library.threefold.me/info/manual/#/manual__weblets_home)
+[![weblets](weblets.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_home)
 
 |||
 
-[![quantum safe storage](qss.png#mx-auto)](https://library.threefold.me/info/manual/#/technology/qsss/threefold__qsss_home)
+[![quantum safe storage](qss.png#medium)](https://library.threefold.me/info/manual/#/technology/qsss/threefold__qsss_home)
 
 |||
 
-[![planetary network](planetary_network.png#mx-auto)](https://library.threefold.me/info/manual/#/cloud/threefold__planetary_network)
+[![planetary network](planetary_network.png#medium)](https://library.threefold.me/info/manual/#/cloud/threefold__planetary_network)
 
 {% end %}
 

content/developer/index.md

@@ -46,15 +46,15 @@ ThreeFold is here to build an open-source Internet and Cloud infrastructure. It'
 
 ### **Fundamentals:**
 
-[Set up your account](https://library.threefold.me/info/threefold#/tokens/threefold__threefold_connect)
+[Set up your account](https://.grid.tf/getstarted/TF_Connect/TF_Connect.html)
 
 [Charge your wallet](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy)
 
 <!-- [How billing works](https://library.threefold.me/info/threefold#/manual_tfgrid3/threefold__grid3_billing) -->
 
-[Deploy workloads](https://library.threefold.me/info/manual/#/getstarted/manual__tfgrid3_getstarted)
+[Deploy workloads](https://manual.grid.tf/getstarted/tfgrid3_getstarted.html)
 
-[Create a Farm](https://library.threefold.me/info/manual/#/manual__create_farm)
+[Create a Farm](https://manual.grid.tf/TF_Farmer_Guide/TF_Complete_Farmer_Guide/farmer_guide.html)
 
 |||
 

content/footer/_index.md

@@ -44,7 +44,7 @@ extra:
 
 ###### [ThreeFold Token](https://library.threefold.me/info/threefold/#/tokens/threefold__tokens_home)
 
-###### [Manuals](https://library.threefold.me/info/threefold/#/manual_tfgrid3/threefold__manual3_home)
+###### [Manuals](https://manual.grid.tf/)
 
 ###### [ThreeFold Glossary](https://library.threefold.me/info/threefold/#/threefold__definitions_concepts)
 

content/grid/index.md

@@ -32,7 +32,7 @@ The Internet was meant to be a peer-to-peer infrastructure with us in the center
 
 Any current or future technology, including blockchain, metaverses and web 3.0, can be hosted natively on the ThreeFold Grid via smart contracts with minimum migration. The grid is compatible with most open source tools and protocols.
 
-<button>[Build on the Grid](https://library.threefold.me/info/manual/#/getstarted/manual__tfgrid3_getstarted)</button>
+<button>[Build on the Grid](https://manual.grid.tf/getstarted/tfgrid3_getstarted.html)</button>
 <button>[Expand The Grid](/farm)</button>
 
 {% end %}

content/header/index.md

@@ -104,7 +104,7 @@ extra:
 
 </button>
 
-<button onclick="openInNewTab('https&#58;//github.com/')">
+<button onclick="openInNewTab('https&#58;//github.com/threefoldtech/')">
 
 [GitHub](https://github.com/threefoldtech/)
 <br>

content/home/index.md

@@ -11,9 +11,18 @@ extra:
 
 <!-- section 1 (header) -->
 
-{% row(style="center mtop narrow") %}
+{% row(style="center narrow") %}
 
-![image](black_threefold_header.png#medium)
+<br/>
+<br/>
+
+![Image](black_threefold_header.png#medium)
+
+<br/>
+
+## A Co-Owned Global Sovereign **Internet**
+
+ThreeFold is **a peer-to-peer open-source Internet platform that connects users directly with local Internet capacity** (storage, compute, and network) provided by farmers. A decentralized sovereign alternative to today's centralized Internet model.
 
 <br>
 <br>
@@ -30,7 +39,7 @@ We empower individuals and communities to regain control of their digital lives
 
 {% grid_stats() %}
 
-### The ThreeFold Grid v3.9.0
+### The ThreeFold Grid v3.9
 
 ## **Live and Operational**
 
@@ -40,6 +49,140 @@ We empower individuals and communities to regain control of their digital lives
 
 {% row(style="center narrow") %}
 
+![Image](grid_wide_1.png#mx-auto#large)
+
+## The **Layer Zero** for a Decentralized World
+
+Anything that runs on Linux can run on ThreeFold – with more security, more sustainably, and in true decentralization. The ThreeFold Grid can support workloads from Blockchain to Web2 to Web3 to IoT and Metaverse and more.
+
+<br>
+
+<button>[Learn About the Grid](/grid)</button>
+<button>[Use the Grid](/build)</button>
+
+{% end %}
+
+{% row(style="center mtop narrow") %}
+
+## Experience the Benefits <br> of **ThreeFold**
+
+{% end %}
+
+{% row(style="center between") %}
+
+![Image](capacity.png#medium)
+
+<br/>
+
+### **Edge Capacity**
+
+Achieve low latencies and bandwidth efficiency by reserving capacity locally.
+
+|||
+
+![Image](secure.png#medium)
+
+<br/>
+
+### **Secure**
+
+Open-source system built from the ground-up for a fully transparent and auditable stack.
+
+|||
+
+![Image](scalable.png#medium)
+
+<br/>
+
+### **Scalable**
+
+An autonomous infrastructure that grows naturally with demand, where and when it is needed.
+
+|||
+
+![Image](effecient.png#medium)
+
+<br/>
+
+### **Efficient**
+
+A carefully designed collection of lightweight components that minimize overheads.
+
+{% end %}
+
+<br>
+<br>
+<br>
+
+{% row(style="center narrow") %}
+
+![Image](grid_wide_1.png#mx-auto#large)
+
+## The **Layer Zero** for a Decentralized World
+
+Anything that runs on Linux can run on ThreeFold – with more security, more sustainably, and in true decentralization. The ThreeFold Grid can support workloads from Blockchain to Web2 to Web3 to IoT and Metaverse and more.
+
+<br>
+
+<button>[Learn About the Grid](/grid)</button>
+<button>[Use the Grid](/build)</button>
+
+{% end %}
+
+{% row(style="center mtop narrow") %}
+
+## Experience the Benefits <br> of **ThreeFold**
+
+{% end %}
+
+{% row(style="center between") %}
+
+![Image](capacity.png#medium)
+
+<br/>
+
+### **Edge Capacity**
+
+Achieve low latencies and bandwidth efficiency by reserving capacity locally.
+
+|||
+
+![Image](secure.png#medium)
+
+<br/>
+
+### **Secure**
+
+Open-source system built from the ground-up for a fully transparent and auditable stack.
+
+|||
+
+![Image](scalable.png#medium)
+
+<br/>
+
+### **Scalable**
+
+An autonomous infrastructure that grows naturally with demand, where and when it is needed.
+
+|||
+
+![Image](effecient.png#medium)
+
+<br/>
+
+### **Efficient**
+
+A carefully designed collection of lightweight components that minimize overheads.
+
+{% end %}
+
+<br>
+<br>
+<br>
+
+{% row(style="center narrow") %}
+
 ![image](grid_wide_1.png#mx-auto)
 
 ## Why __ThreeFold__
@@ -48,19 +191,37 @@ We empower individuals and communities to regain control of their digital lives
 
 ThreeFold’s unique infrastructure can operate without centralized authority or server, empowering people and communities to build and store applications on a decentralized network owned and operated by its participants.  
 <br>
-ThreeFold is open-source, nobody owns or controls the ThreeFold Grid and everyone can take part. Through many of its unique properties, ThreeFold fosters the security, trust and freedom that are often missing in today’s internet.
+
+![Image](farm_do_it_home.png#mx-auto#medium)
+
+<br>
+
+By connecting hardware at your home or office – or anywhere you'd like – you provide Internet capacity <br> for the people around you and earn a new digital currency, TFT.
+
+<br>
+
+<button>[Buy a 3Node](http://marketplace.3node.global/)</button>
+<button>[Build a 3Node](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__diy_guide)</button>
+<button>[Learn](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro)</button>
+<button>[Farmers Chat](https://t.me/threefoldfarmers)</button>
 
 {% end %}
 
 <br>
 <br>
 
-<!-- section 3 (EXPAND) -->
+![Image](developer_header_home.jpg#mx-auto#medium)
 
 {% row(style="center between narrow") %}
 
-## Experience the Benefits
+True digital sovereignty for open-source builders. The ThreeFold Grid provides limitless possibilities, <br> and brings a playground of industry-compatible easy-to-deploy solutions for developers.
-## of __ThreeFold__
+
+<br>
+
+<button>[Dashboard](https://dashboard.grid.tf/)</button>
+<button>[Playground](https://play.grid.tf)</button>
+<button>[Manual](https://manual.grid.tf/)</button>
+<button>[Grid Chat](https://t.me/threefoldtesting)</button>
 
 {% end %}
 
@@ -79,7 +240,7 @@ Build secure applications with predeterministic smart contracts and access unpar
 
 ### **Self-Sovereign**
 
-Take control of your digital future with ThreeFold's self-sovereign technology, using cryptography to ensure you own and control your data.
+![Image](community_header_home.jpg#mx-auto)
 
 |||
 
@@ -148,7 +309,7 @@ At ThreeFold, we believe that sustainability is a fundamental part of the intern
 
 <br>
 
-We also prioritize equality, diversity, and inclusion in our culture and vision of an internet for everyone, everywhere.
+<button>[Check All Partners](/partners)</button>
 
 {% end %}
 

content/newsroom/cc_apr_23_rec/index.md

@@ -0,0 +1,27 @@
+---
+id: cc_apr_23_rec
+title: 🍿 Watch April's Community Call on TF Grid 4!
+image_caption: Watch April's Community Call on TF Grid 4!
+description: For those who couldn't make it yesterday or would like a second look, please find the recording of the call here.
+date: 2023-04-19
+taxonomies:
+    people: [sam_taggart]
+    tags: [update, technology, news, community]
+    news-category: [foundation]
+extra:
+    imgPath: cc_apr_23_rec.png
+---
+
+For those who couldn't make it yesterday or would like a second look, please find the recording of the call [here](https://forum.threefold.io/t/april-2023-tf-grid-4-community-call-recording/3896).
+
+<br/>
+
+We went through TF Grid 4.0, which brings forward the Internet of Internets model, including topics such as why Grid 4 is needed for ThreeFold to scale, what’s new in version 4, why TFT remains important, the updated farming / tokenomics model, and how you can [participate](https://t.me/+C-KhvHiblfo2ZWVh).
+
+<br/>
+
+Thanks to Weynand, Kristof, and Scott for sharing, and to all those who were able to join live.
+
+<br/>
+
+_Please note the content of this call is for information purposes only and is subject to change as the project evolves._

content/newsroom/cc_apr_23_std/index.md

@@ -0,0 +1,23 @@
+---
+id: cc_apr_23_std
+title: 🗓 Save the date for April's Community Call
+image_caption: Save the date for April's Community Call
+description: Join us next week, on Tuesday 18th at 17:00 CEST / 11:00 EST for April's Community Call! 
+date: 2023-04-12
+taxonomies:
+    people: [victoria_obeegadoo]
+    tags: [update, technology, news, community]
+    news-category: [foundation]
+extra:
+    imgPath: cc_apr_23_std.png
+---
+
+Join us next week, on Tuesday 18th at 17:00 CEST / 11:00 EST for [April's Community Call](https://forum.threefold.io/t/april-community-call-lets-talk-about-tf-grid-4/3886)! During this session, we will be going over updates regarding ThreeFold Grid 4.0 and related topics.
+
+<br/>
+
+Looking forward to seeing you there!
+
+<br/>
+
+_Ps: Let us know if you'll be joining us via the poll within the link above._

content/newsroom/deploy_fullvm_ssh_videos/index.md

@@ -0,0 +1,30 @@
+---
+id: deploy_fullvm_ssh_videos
+title: 🎥 Deploy a Full VM with SSH, learn how to do so using different OSs
+image_caption: Deploy a Full VM with SSH, learn how to do so using different OSs
+description: Mik created 4 more ThreeFold Guides for how to easily do so on the ThreeFold Playground.
+date: 2023-04-14
+taxonomies:
+    people: [victoria_obeegadoo]
+    tags: [update, technology, news, community]
+    news-category: [foundation]
+extra:
+    imgPath: deploy_fullvm_ssh_videos.png
+---
+
+Curious how to deploy a full VM with SSH? Mik created 4 more ThreeFold Guides for how to easily do so on the ThreeFold Playground. These guides cover two more operating systems, Linux & Mac, check it out according to your needs!
+
+<br/>
+
+- [Full VM SSH: Linux, IPV4](https://www.youtube.com/watch?v=WRHlzv-jpbo&list=PLTGQlepPqwUV0IA8BjDFetyjPD4XqVb6K&index=12&pp=gAQBiAQB)
+ - [Full VM SSH: Linux, Planetary Network](https://www.youtube.com/watch?v=146vFBXr5pM&list=PLTGQlepPqwUV0IA8BjDFetyjPD4XqVb6K&index=13&pp=gAQBiAQB)
+ - [Full VM SSH: Mac, IPV4](https://www.youtube.com/watch?v=lICN-XXtt0A&list=PLTGQlepPqwUV0IA8BjDFetyjPD4XqVb6K&index=14&pp=gAQBiAQB)
+ - [Full VM SSH: Mac, Planetary Network](https://www.youtube.com/watch?v=_7Lem9Y5jCQ&list=PLTGQlepPqwUV0IA8BjDFetyjPD4XqVb6K&index=15&pp=gAQBiAQB)
+ 
+ <br/>
+ 
+ This completes the series of ThreeFold Guides on deploying Full VMs with SSH. As a reminder, you can also find videos about how to deploy using Windows in the [ThreeFold Guides playlist](https://www.youtube.com/playlist?list=PLTGQlepPqwUV0IA8BjDFetyjPD4XqVb6K) on our YouTube Channel, and more. 
+
+<br/>
+
+_Don't hesitate to ask questions or offer feedback using [our forum](https://forum.threefold.io/)._

content/newsroom/grid39_mainnet/index.md

@@ -0,0 +1,27 @@
+---
+id: grid39_mainnet
+title: ✅ Mainnet Upgrade to TF Grid 3.9 is Complete!
+image_caption: Mainnet Upgrade to TF Grid 3.9 is Complete!
+description: ... Which means Farmerbot is now live on mainnet as well, along with the Reliable Message Bus.
+date: 2023-04-12
+taxonomies:
+    people: [sam_taggart]
+    tags: [update, technology, news, community]
+    news-category: [foundation]
+extra:
+    imgPath: grid39_mainnet.png
+---
+
+Mainnet Upgrade to TF Grid 3.9 is Complete!
+
+<br/> 
+
+... Which means Farmerbot is now live on mainnet as well, along with the Reliable Message Bus. These two features/components are the main focus of version 3.9. Find the complete release notes [here](https://library.threefold.me/info/manual/#/manual__tfgrid_release_3_9_0).
+
+<br/> 
+
+Thank you to the team for pushing this exciting update through to mainnet and to the [community of testers](https://t.me/threefoldtesting) for their support as well.
+
+<br/> 
+
+_Stay tuned for April's Product Update for more._

content/newsroom/join_discussion_grid4/index.md

@@ -0,0 +1,23 @@
+---
+id: join_discussion_grid4
+title: 💬 Join the Discussion About TF Grid 4.0
+image_caption: Join the Discussion About TF Grid 4.0
+description: We have been working on the plan for TF Grid 4.0 and are now pleased to open up the conversation now with the community.
+date: 2023-04-10
+taxonomies:
+    people: [sam_taggart]
+    tags: [update, technology, news, community]
+    news-category: [foundation]
+extra:
+    imgPath: join_discussion_grid4.png
+---
+
+We have been working on the plan for TF Grid 4.0 and are now pleased to open up the conversation now with the community.
+
+<br/>
+
+Some highlights: TF Grid 4.0 brings forward an updated farming economic system, the long-discussed Regional Internet Model, as well as 3Bot – a feature familiar to those who have been around the project for a while.
+
+<br/>
+
+For those who would like to be a part of the discussion, we invite you to [this group](https://t.me/+C-KhvHiblfo2ZWVh).

content/newsroom/tf_grid4_series/index.md

@@ -0,0 +1,27 @@
+---
+id: tf_grid4_series
+title: 📜 TF Grid 4 Series on the Forum
+image_caption: TF Grid 4 Series on the Forum
+description: We thought it would be beneficial to share a series of posts diving into specific topics explored during the call
+date: 2023-04-21
+taxonomies:
+    people: [victoria_obeegadoo]
+    tags: [update, technology, news, community]
+    news-category: [foundation]
+extra:
+    imgPath: tf_grid4_series.png
+---
+
+We held [a community call](https://forum.threefold.io/t/april-2023-tf-grid-4-community-call-recording/3896) a few days ago to discuss TF Grid 4.0. While we encourage you to watch [the full recording](https://youtu.be/7OwE3BPKJXk) to catch up with everything, we thought it would be beneficial to share a series of posts diving into specific topics explored during the call:
+
+<br/>
+
+- 💡 [What’s New with Grid 4.0](https://forum.threefold.io/t/tf-grid-4-series-what-s-new-with-grid-4-0/3902/2)
+- 💡 [Why Version 4.0 is Needed](https://forum.threefold.io/t/tf-grid-4-series-why-version-4-is-needed/3903/2)
+- 💡 [How TFT Remains Relevant in Version 4.0](https://forum.threefold.io/t/tf-grid-4-series-how-tft-remains-relevant-in-version-4/3904/2)
+- 💡 [3Bot: Hello, Old Friend](https://forum.threefold.io/t/tf-grid-4-series-3bot-hello-old-friend/3905/2)
+- 💡 [Version 4.0 Farming Model & Tokenomics](https://forum.threefold.io/t/tf-grid-4-series-v4-farming-model-tokenomics/3906/2)
+
+<br/>
+
+As a reminder, ThreeFold is all of ours. The current plan for Grid 4 is open to feedback from the community. If you’d like to provide input, please join the [Grid 4 Telegram Group](https://t.me/+C-KhvHiblfo2ZWVh).

content/newsroom/tf_prod_updates_apr/index.md

@@ -0,0 +1,31 @@
+---
+id: tf_prod_updates_apr
+title: 📣 April's ThreeFold Product Updates
+image_caption: April's ThreeFold Product Updates
+description: In this month's Product Updates, Sasha gives us a sneak peak into the progress & new features expected as part of Grid v3.10.0.
+date: 2023-04-13
+taxonomies:
+    people: [victoria_obeegadoo]
+    tags: [update, technology, news, community]
+    news-category: [foundation]
+extra:
+    imgPath: tf_prod_updates_apr.png
+---
+
+While [Grid v3.9.0 ](https://library.threefold.me/info/manual/#/manual__tfgrid_release_3_9_0)has just been released on mainnet, including the Farmerbot feature & the new Reliable Message Bus, the team is already working on developing Grid v3.10.0! 
+
+<br/>
+
+In this month's [Product Updates](https://forum.threefold.io/t/threefold-product-updates-april-2023/3887), Sasha gives us a sneak peak into the progress & new features expected as part of Grid v3.10.0. These include: 
+
+<br/>
+
+- ✨ Improvements of TF Weblets 
+- ✨ Web3 Proxy
+- ✨ Stability improvements on TF Chain
+- ✨ QSFS stability improvements
+- ✨ General improvements of ZOS
+
+<br/>
+
+_All of the TFGrid v3.10.0 improvements are being implemented in order to prepare the Grid for v4.0.0! Join us next week for [April's Community Call](https://forum.threefold.io/t/april-community-call-lets-talk-about-tf-grid-4/3886) to learn more about it!_

content/newsroom/zuzalu/index.md

@@ -0,0 +1,32 @@
+---
+id: 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: [sam_taggart]
+    tags: [update, news, community]
+    news-category: [foundation]
+extra:
+    imgPath: zuzalu.png
+---
+
+Some of the team has arrived to Zuzalu in Montenegro for this weekend's New Cities & Network States event. Kristof will be speaking on Sunday and we'll also be hosting several side events including a hackathon around the Web3 Gateway.
+
+<br/>
+
+Other speakers include Vitalik Buterin (founder of Ethereum), Balaji Srinivasan (author of The Network State), and Mark Lutter (founder & chairman of the Charter Cities Institute).
+
+<br/>
+
+Looking forward to a productive event with a like-minded community of people and sharing how ThreeFold provides the ideal underlying infrastructure for new cities and network states!
+
+<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)

css/index.css

@@ -424,6 +424,16 @@ header {
   .header {
     padding: 80px 0;
   }
+
+  .article h2{
+    font-size: 1.5rem;
+  }
+
+  img[src*="#medium"] {
+    width: 250px;
+    margin: auto;
+  }
+
   img[src*="#sm_none"] {
     display: none;
   }

templates/blogPage.html

@@ -24,11 +24,11 @@
 
     <div>
       <article class="article lg:w-4/6 mx-auto">
-        <h1 class="lg:text-5xl font-medium leading-none mt-0  text-gray-700">
+        <h1 class="lg:text-5xl text-2xl font-medium leading-none mt-0  text-gray-700">
           {{ page.title }}
         </h1>
 
-        <h4 class="text-2xl text-gray-600 leading-8">
+        <h4 class="lg:text-2xl text-base text-gray-600 leading-8">
           {{ page.description }}
         </h4>
         <section class="post-author-list mb-3 mx-0">

templates/newsPage.html

@@ -38,10 +38,10 @@
 
     <div class="pt-8">
       <section class="post-header container mx-auto px-0 mb-4 border-b">
-        <h1 class="text-5xl font-medium leading-none mt-0">
+        <h1 class="lg:text-5xl text-2xl font-medium leading-none mt-0">
           {{ page.title }}
         </h1>
-        <div class="text-2xl pt-4 pb-10 text-gray-700">{{ page.description }}</div>
+        <div class="lg:text-2xl text-base pt-4 pb-10 text-gray-700">{{ page.description }}</div>
       </section>
       <section class="post-author-list mb-10 mx-0">
         <div class="flex items-center">

templates/partials/blogPosts.html

@@ -1,8 +1,8 @@
 {% block content %}
 
-<div class="text-center main-title px-0 md:w-full md:w-2/3 lg:w-2/3 mx-8 md:mx-12">
+<div class="text-center main-title px-0 md:w-2/3 lg:w-2/3 mx-8 md:mx-12">
   <h1
-    class="tracking-tight text-5xl text-left text-2xl sm:text-3xl md:text-4xl lg:text-5xl fw-500 leading-snug font-normal mb-10"
+    class="tracking-tight text-left text-2xl md:text-4xl lg:text-5xl fw-500 leading-snug font-normal mb-10"
   >
   {% set path_array = current_path | split(pat="/") %}
   {% set taxonomy = path_array[1] %}

templates/partials/featuredBlog.html

@@ -24,8 +24,8 @@
 
     </div>
 
-    <div class="-mx-4 relative lg:mt-0 max-w-full">
+    <div class="mx-4 relative lg:mt-0 max-w-full">
-      <img class="relative mx-auto w-7/12 md:w-auto rounded md:max-w-full max-h-80" src={{featured.permalink}}{{featured.extra.imgPath}} alt="" />
+      <img class="relative mx-auto md:w-auto rounded md:max-w-full max-h-80" src={{featured.permalink}}{{featured.extra.imgPath}} alt="" />
     </div>
   </div>
 

templates/partials/featuredNews.html

@@ -30,9 +30,9 @@
 
     </div>
 
-    <div class="-mx-4 relative lg:mt-0 max-w-full">
+    <div class="mx-4 relative lg:mt-0 max-w-full">
         {% if featured.extra.imgPath %}
-      <img class="relative mx-auto w-7/12 md:w-auto md:max-w-full max-h-80" src={{featured.permalink}}{{featured.extra.imgPath}} alt="" />
+      <img class="relative mx-auto md:w-auto md:max-w-full max-h-80" src={{featured.permalink}}{{featured.extra.imgPath}} alt="" />
         {% endif %}
     </div>
   </div>

templates/partials/newsPosts.html

@@ -1,8 +1,8 @@
 {% block content %}
 
-<div class="text-center main-title px-0 md:w-full md:w-2/3 lg:w-2/3 mx-8 md:mx-12">
+<div class="text-center main-title px-0 md:w-2/3 lg:w-2/3 mx-8 md:mx-12">
   <h1
-    class="tracking-tight text-5xl text-left text-2xl sm:text-3xl md:text-4xl lg:text-5xl fw-500 leading-snug font-normal mb-10"
+    class="tracking-tight text-left text-2xl md:text-4xl lg:text-5xl fw-500 leading-snug font-normal mb-10"
   >
   {% set path_array = current_path | split(pat="/") %}
   {% set taxonomy = path_array[1] %}

templates/shortcodes/team_sec.html

@@ -38,7 +38,7 @@
                 duration-300
                 ease-in-out
               ">
-                    <a href="/people/adnanfatayerji/" title="Adnan Fatayerji">
+                    <a href="/people/adnan-fatayerji/" title="Adnan Fatayerji">
                         <img src="images/people/adnan_fatayerji.jpg"
                             class="rounded-full mx-auto mt-3" alt="Adnan Fatayerji" />
                     </a>