Merge pull request #168 from threefoldfoundation/development_sam

Development sam into Development

content/_index.md

@@ -14,127 +14,101 @@ extra:
 
 {% row(style="center narrow") %}
 
-## WELCOME TO THE <br> **PEOPLE’S INTERNET**
+<br/>
+<br/>
 
-### Join the peer-to-peer revolution
+![Image](images/black_threefold_header.png#mx-auto#medium)
-
-Powered by the ThreeFold blockchain the People’s Internet is the layer 0 infrastructure for an open source P2P Internet owned by humanity.
 
 
 
+<br/>
+
+## Planet & People-First **Internet.**
+
+We are a global, decentralized, open-source movement of believers in a better world who choose to act. Together we are building an equal, safe, private, and regenerative Internet.
+
 {% end %}
 
-{% row(style="lean") %}
+{% row(style="center narrow") %}
 
-![Image](images/threefold_img.jpg#mx-auto)
+<button>[Farm](/farm)</button>
+
+|||
+
+<button>[Build](/cloud)</button>
+
+|||
+
+<button>[Token](https://library.threefold.me/info/threefold#/tokens/threefold__tokens_home)</button>
+
+|||
+
+<button>[Chat](https://t.me/threefold)</button>
 
 {% end %}
 
+<!-- section 5 (Map) -->
+
+
+{% grid_stats() %}
+### The ThreeFold Grid
+
+## **Live and Operational**
+
+{% end %}
 
 
 <!-- section 2 (EXPAND) -->
 
 {% row(style="center margin") %}
 
-### EXPAND THE PEOPLE’S INTERNET **AND EARN TFT**
+### Expand Our New Internet <br> **and Earn TFT**
 
 By connecting hardware at your home or office, support the growth of a decentralized Internet and earn a new digital currency, TFT.
 
-<button>[Become a farmer](farm)</button>
+<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>
+
+<br>
 
 ![Image](images/become_farmer_new.jpg#mx-auto)
 
 |||
 
-### DECENTRALIZE YOUR **DATA AND WORKLOADS**
+### Decentralize Your <br> **Data and Workloads**
 
+The community has already started using ThreeFold for its autonomous, decentralization and privacy features.
 
+<button>[Deploy on ThreeFold](https://dashboard.grid.tf/)</button>
+<button>[The Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)</button>
 
-Companies and developers have already started using ThreeFold for it’s autonomous, decentralization and privacy features.
+<br>
-
-<button>[Deploy](cloud)</button>
-
-
 
 ![Image](images/network_new.jpg#mx-auto)
 
 {% end %}
 
+<!-- section 9 (FEATURED STORIES) -->
 
+{% featured_stories() %}
 
-<!-- section 3 (P2P) -->
+## Featured Stories
-
-{% row(style="center margin") %}
-
-![Image](images/p4p_new.png#medium)
-
-|||
-
-## BUILT BY <br> THE PEOPLE <br> **FOR HUMANITY**
-
-The People’s Internet is formed by independent people from all around the world who connect Internet capacity to a new Planetary Network. Together they form a collective that brings a new paradigm – an open-source peer-to-peer Internet owned by humanity.
-
-<button>[Learn More](grid)</button>
 
 {% end %}
 
-
-<!-- section 4 (DECENTRALIZED) -->
-
-
-{% row(style="center margin") %}
-
-## POWERED BY A <br> **DECENTRALIZED OS**
-
-Zero-OS is a stateless and lightweight operating system designed to host anything that runs on Linux in a decentralized way. Once installed, Zero-OS locks the hardware and dedicates its capacity to the People’s Internet via the ThreeFold Blockchain.
-
-<button>[Learn More](farm)</button>
-
-|||
-
-![Image](images/zero_os.jpg#large)
-
-{% end %}
-
-
-<br>
-
-<br>
-
-
-<!-- section 5 (Map) -->
-
-
-
-{% grid_stats() %}
-### THE THREEFOLD GRID
-
-## **NOW OPERATIONAL**
-
-{% end %}
-
-
-<br>
-
-<br>
-
-
 <!-- section 6 (THE TEAM) -->
 
 {% team_sec() %}
 
-## **THE TEAM**
+## **The Team**
 
 {% end %}
 
-
-
-
 <!-- section 7 (PARTNERS) -->
 
 {% row(style="center margin") %}
 
-## OUR GREATEST STRENGTH <br> **COMES FROM OUR PARTNERS**
+## Believers and Collaborators <br> **In a Better Internet**
 
 We are truly proud to be trusted by some of the biggest names in the industry.
 
@@ -144,17 +118,15 @@ We are truly proud to be trusted by some of the biggest names in the industry.
 
 {% end %}
 
-
 <br>
 
 <br>
 
-
 <!-- section 8 (IN THE NEWS) -->
 
 {% row(style="center") %}
 
-## **IN THE NEWS**
+## **In the News**
 
 {% end %}
 
@@ -185,6 +157,7 @@ We are truly proud to be trusted by some of the biggest names in the industry.
 [![tga_daily](images/tga_daily.png#mx-auto)](https://tgdaily.com/web/6-dfinity-threefold-are-leading-an-internet-decentralization-revolution/)
 
 {% end %}
+
 {% row(style="center between") %}
 
 [![cointelegraph](images/cointelegraph.png#mx-auto)](https://cointelegraph-com.cdn.ampproject.org/c/s/cointelegraph.com/news/is-a-new-decentralized-internet-or-web-3-0-possible/amp)
@@ -198,16 +171,3 @@ We are truly proud to be trusted by some of the biggest names in the industry.
 [![grit_daily](images/grit_daily.png#mx-auto)](https://gritdaily.com/belarus-governments-control-internet/)
 
 {% end %}
-
-<br>
-
-<br>
-
-
-<!-- section 9 (FEATURED STORIES) -->
-
-{% featured_stories() %}
-
-## FEATURED STORIES
-
-{% end %}

content/cloud/index.md

@@ -4,26 +4,53 @@ template: "page.html"
 insert_anchor_links: "left"
 ---
 
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+
 {% row(style="center narrow") %}
 
-## THE NEXT GENERATION OF **CLOUD COMPUTING**
+## The Next Generation of <br> **Cloud Computing**
 
-Deploy any workload with unprecedented security, scalability, and efficiency, on a fully comprehensive peer-to-peer digital infrastructure. Discover a cloud like no other.
+Deploy any workload with unprecedented security, scalability, and efficiency, on a fully comprehensive peer-to-peer digital infrastructure. Discover a cloud like no other.
 
 {% end %}
 
-{% cloud_header() %}
+{% row(style="center narrow") %}
 
-## THE NEXT GENERATION OF **CLOUD COMPUTING**
+<button>[Deploy](https://dashboard.grid.tf)</button>
+
+|||
+
+<button>[Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)</button>
+
+|||
+
+<button>[Learn](https://library.threefold.me/info/threefold#/cloud/threefold__cloud_intro)</button>
+
+|||
+
+<button>[Chat](https://t.me/threefoldtesting)
 
 {% end %}
 
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
 
 {% row(style="center margin") %}
 
 ![storage](storage.jpg#medium)
 
-### **STORAGE**
+### **Storage**
 
 Plug in standard tools and protocols to the most resilient and versatile storage system ever created, or access raw disk on the location of your choice.
 
@@ -33,7 +60,7 @@ Plug in standard tools and protocols to the most resilient and versatile storage
 
 ![compute](compute.jpg#medium)
 
-### **COMPUTE**
+### **Compute**
 
 Native support for containers and virtual machines. Migrate existing applications effortlessly or build from scratch in a cutting-edge computing environment.
 
@@ -43,7 +70,7 @@ Native support for containers and virtual machines. Migrate existing application
 
 ![network](network.jpg#medium)
 
-### **NETWORK**
+### **Network**
 
 Private overlay networks and global end-to-end encryption minimize attack surface. Handle inbound traffic with uniquely secure web gateways.
 
@@ -88,34 +115,9 @@ Private overlay networks and global end-to-end encryption minimize attack surfac
 <br />
 <br />
 
-{% row(gradient="linear-gradient(90deg, #000, #323232)" style="margin text-white") %}
+{% row(style="center narrow") %}
 
-## **LIMITLESS POSSIBILITIES**
+## Designed for <br> **Demanding Workloads**
-
-Optimized for efficient and affordable hosting of cloud alternatives, blockchains, IoT networks, and decentralized applications with seamless migration.
-
-|||
-
-![Image](limitless.png#mx-auto)
-
-{% end %}
-
-
-{% row(style="center narrow margin") %}
-
-![Image](zero_os.png#mx-auto#medium)
-
-## **INTRODUCING ZERO-OS**
-
-A decentralized autonomous OS designed to dedicate hardware capacity to the People’s Internet via the ThreeFold Blockchain. Zero-OS can be booted on most modern computers to host anything that runs on Linux in a decentralized way.
-
-<button>[Learn More](https://library.threefold.me/info/threefold#/technology/threefold__zos)</button> <button>[Expand The Grid](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro)</button>
-
-{% end %}
-
-{% row(style="center moderate") %}
-
-## **DESIGNED FOR DEMANDING** <br> **WORKLOADS**
 
 {% end %}
 
@@ -126,12 +128,12 @@ A decentralized autonomous OS designed to dedicate hardware capacity to the Peop
 <br/>
 <br/>
 
-#### **EDGE CAPACITY**
+#### **Edge Capacity**
 
 <br/>
 <br/>
 
-Achieve low latencies and bandwidth efficiency by reserving capacity locally.
+Achieve low latencies and bandwidth efficiency by reserving capacity locally.
 
 |||
 
@@ -140,7 +142,7 @@ Achieve low latencies and bandwidth efficiency by reserving capacity locally.
 <br/>
 <br/>
 
-#### **SECURE**
+#### **Secure**
 
 <br/>
 <br/>
@@ -154,7 +156,7 @@ Open-source system built from the ground-up for a fully transparent and auditabl
 <br/>
 <br/>
 
-#### **SCALABLE**
+#### **Scalable**
 
 <br/>
 <br/>
@@ -168,7 +170,7 @@ An autonomous infrastructure that grows naturally with demand, where and when it
 <br/>
 <br/>
 
-#### **EFFICIENT**
+#### **Efficient**
 
 <br/>
 <br/>
@@ -185,16 +187,6 @@ A carefully designed collection of lightweight components that minimize overhead
 
 {% cloud_stats() %}
 
-## **A GLOBAL EDGE INFRASTRUCTURE**
+## A Global **Edge Infrastructure**
-
-{% end %}
-<br/>
-<br/>
-
-{% row(gradient="linear-gradient(351deg, #8f8f8f, #8c8c8c)" style="center margin text-white") %}
-
-## **TAKE THREEFOLD** <br> **CLOUD ON A TEST DRIVE**
-
-<button>[Get Started](https://library.threefold.me/info/manual/#/getstarted/manual__tfgrid3_getstarted)</button>
 
 {% end %}

content/community/index.md

@@ -10,7 +10,7 @@ insert_anchor_links: "left"
 
 {% row(style="center narrow") %}
 
-## WELCOME INTO <br> **THE FOLD**
+## Welcome Into <br> **The Fold**
 
 We're a 100% open-source and community-driven project that builds the critical infrastructure for a decentralized world. Anyone can contribute to ThreeFold and there are many ways to get involved.
 
@@ -79,7 +79,7 @@ We're a 100% open-source and community-driven project that builds the critical i
 
 |||
 
-[![yahoo_news](linkedin.png)](https://ae.linkedin.com/company/threefold-foundatiooon)
+[![yahoo_news](linkedin.png)](https://ae.linkedin.com/company/threefold-foundation)
 
 {% end %}
 
@@ -87,30 +87,15 @@ We're a 100% open-source and community-driven project that builds the critical i
 
 <br>
 
-<!-- section 3 (INTERNET) -->
-
-{% row(style="center between margin") %}
-
-## EXPAND THE PEOPLE'S <br> **INTERNET**
-
-Join the movement by connecting a node at your home or office. All you need is compatible hardware, electricity and network bandwidth to take part in the decentralization of the global Internet.
-
-<button>[Learn More](/farm)</button>
-
-{% end %}
-
-<br>
-<br>
-
 <!-- section 4 (DEVELOPER COMMUNITY) -->
 
 {% row(bgColor="#f2f2f2" style="narrow margin") %}
 
-## JOIN THE THREEFOLD <br> **DEVELOPER COMMUNITY**
+## Join the ThreeFold <br> **Developer Community**
 
 From testing our latest releases to joining our development teams or applying for a ThreeFold Foundation grant – there are many ways to engage with ThreeFold’s technology.
 
-<button>[Developer Resource](/developer)</button>
+<button>[Developer Resources](/developer)</button>
 
 |||
 
@@ -118,33 +103,11 @@ From testing our latest releases to joining our development teams or applying fo
 
 {% end %}
 
-<br>
-<br>
-
-<!-- section 5 (PATHFINDER) -->
-
-{% row() %}
-
-![Image](community_pathefinder.jpg)
-
-|||
-
-## BECOME A THREEFOLD <br> **PATHFINDER**
-
-Join the growing community of ThreeFold’s most passionate supporters. Bring your dreams to the table and help expand the people's Internet to new frontiers.
-
-<button>[Sign Up](https://honf2dpejik.typeform.com/to/Hubtbirs)</button>
-
-{% end %}
-
-<br>
-<br>
-
 <!-- section 6 (QUESTIONS) -->
 
 {% row(style="center between margin") %}
 
-## FREQUENTLY ASKED <br> **QUESTIONS**
+## Frequently Asked <br> **Questions**
 
 Check out the FAQs or ask a question on the ThreeFold Forum.
 

content/developer/index.md

@@ -9,7 +9,7 @@ template: "page.html"
 
 {% row(style="center margin") %}
 
-## **THREEFOLD <br> DEVELOPER <br> RESOURCES**
+## ThreeFold <br> **Developer** <br> **Resources**
 
 A builder’s manual for ThreeFold. Built <br> by visionaries, for visionaries.
 
@@ -21,43 +21,20 @@ A builder’s manual for ThreeFold. Built <br> by visionaries, for visionaries.
 
 {% end %}
 
-
-
-<!-- section 2 (TESTING GRANTS) -->
-
-{% row(bgColor="#f2f2f2" style="narrow margin") %}
-
-![Image](developer_testing.png)
-
-|||
-
-## APPLY FOR <br> **TESTING GRANTS**
-
-We have different use cases for you to take ThreeFold’s technology on a test drive. From zero to hero –- are you ready for the challenge?
-
-<br>
-
-<button>[Sign Up](https://088nfpf6v5s.typeform.com/to/DS8hUAdV)</button>
-
-{% end %}
-
-<br>
-<br>
-
 <!-- section 4 (DEVELOPER RESOURCES) -->
 
 {% dev_resourses() %}
 
-## WHERE WOULD YOU LIKE TO START?
+## Where Would You Like to Start
 
-## **NOW OPERATIONAL**
+## Now Operational**
 
 {% end %}
 
 
 {% row(bgColor="#f2f2f2" style="center between margin") %}
 
-## OUR <br> **DEVELOPER RESOURCES**
+## Our <br> **Developer Resources**
 
 ThreeFold is here to build the open-source Internet and Cloud infrastructure. The documentation helps you <br> build on ThreeFold by introducing you to some foundational concepts as well as our development stacks.<br>
 Inspired by the open-source movement, everything at ThreeFold is open to be audited, extended and improved.<br> If you have any feedback, please reach out with a GitHub issue or on our telegram.
@@ -80,7 +57,7 @@ Inspired by the open-source movement, everything at ThreeFold is open to be audi
 
 |||
 
-## JOIN US IN MAKING <br> **THREEFOLD BETTER**
+## Join Us In Making <br> **ThreeFold Better**
 
 All our docs are the results of community efforts. Create a pull request if you see mistakes, room for improvement, or new opportunities to help the ThreeFold community.
 
@@ -97,7 +74,7 @@ All our docs are the results of community efforts. Create a pull request if you
 
 {% row(style="center between" id="table_link") %}
 
-## EXPLORE THE <br> **DOCUMENTATION**
+## Explore the <br> **Documentation**
 
 {% end %}
 
@@ -122,13 +99,11 @@ All our docs are the results of community efforts. Create a pull request if you
 
 [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)
+<!-- [How billing works](https://library.threefold.me/info/threefold#/manual_tfgrid3/threefold__grid3_billing) -->
 
-[Deploy workloads](https://library.threefold.me/info/threefold#/manual_tfgrid3/threefold__manual3_getstarted_home)
+[Deploy workloads](https://library.threefold.me/info/manual/#/getstarted/manual__tfgrid3_getstarted)
 
-[Infrastructure as Code](https://library.threefold.me/info/threefold#/manual_tfgrid3/threefold__manual3_iac_home)
+[Create a Farm](https://library.threefold.me/info/manual/#/manual__create_farm)
-
-[Create a Farm](https://library.threefold.me/info/threefold#/manual_tfgrid3/threefold__create_farm)
 
 |||
 

content/farm/index.md

@@ -4,33 +4,58 @@ template: "page.html"
 insert_anchor_links: "left"
 ---
 
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
 <br>
 
 <!-- section 1 (be the Internet) -->
 
-{% row(style="margin") %}
+{% row(style="center narrow") %}
 
-![Image](farm_header.jpg)
+## Be the **Internet**
 
-|||
+Become an Internet Farmer. Expand the ThreeFold Grid and earn for it.
-
-# BE THE <br> INTERNET
-
-
-The People’s Internet is powered by an entirely new incentive model made possible by the ThreeFold Blockchain.
-
-
-<button>[Get a 3Node](https://marketplace.3node.global/)</button>
 
 {% end %}
 
+{% row(style="center narrow") %}
 
+<button>[Buy](https://marketplace.3node.global/)</button>
+
+|||
+
+<button>[D.I.Y.](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>[Chat](https://t.me/threefoldfarmers)
+
+{% end %}
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
 
 <!-- section 2 (Farm) -->
 
 {% row(style="center narrow ") %}
 
-# FARM
+<br>
+<br>
+
+## Farm
 
 ### A new way of growing the Internet
 
@@ -63,13 +88,6 @@ Every month, you earn TFT for keeping the 3Node connected to the network.
 
 {% end %}
 
-{% row(style="center") %}
-
-<button>[Build My 3Node](https://library.threefold.me/info/manual/#/manual__create_farm)</button>
-
-
-{% end %}
-
 
 
 <!-- section 3 (world of farmers) -->
@@ -77,7 +95,7 @@ Every month, you earn TFT for keeping the 3Node connected to the network.
 {% row(style="center margin") %}
 
 
-## JOIN **A WORLD OF FARMERS**
+## Join **a World of Farmers**
 
 ### We are growing fast
 
@@ -85,56 +103,15 @@ Every month, you earn TFT for keeping the 3Node connected to the network.
 
 ![Image](farm_map.png#mx-auto)
 
-<button>[Explore ThreeFold Grid Capacity](https://explorer.threefold.io/all)</button>
+<br>
+
+<br>
+
+<button>[Explore ThreeFold Grid Capacity](https://dashboard.grid.tf/explorer/statistics)</button>
 
 
 {% end %}
 
-
-
-<!-- section 4 (Hello Titan) -->
-
-{% row(style="margin") %}
-
-# HELLO <br> TITAN
-
-<br>
-
-The Titan was designed to fit in any home or office. It's compact, optimized for performance, and comes plug-and-farm. Just connect the Titan to electricity and network to start earning. Yes, it's that simple!
-
-
-<button>[Get Titan](https://marketplace.3node.global/index.php?dispatch=categories.view&category_id=167)</button>
-
-|||
-
-![Image](farm_titan.jpg)
-
-{% end %}
-
-
-<!-- section 5 (Do It Yourself) -->
-
-{% row(bgColor="#f2f2f2" style="narrow margin") %}
-
-![Image](farm_do_it.png)
-
-
-|||
-
-## DO IT <br> **YOURSELF**
-
-ThreeFold’s operating system, Zero-OS, can run on any Intel or AMD hardware. From building your own 3Node to using refurbished hardware, define your ideal configurations and start farming today.
-
-<br>
-
-
-<button>[See Requirements](https://forum.threefold.io/t/diy-nodes-guide/837)</button>
-
-{% end %}
-
-<br>
-<br>
-
 <!-- section 6 (How To Earn TFT) -->
 
 {% row(style="center narrow") %}
@@ -146,9 +123,9 @@ Farmers earn TFT according to the amount of Internet capacity their 3Nodes conne
 
 <br>
 
-#### PROOF OF CAPACITY
+#### Proof of Capacity
 
-### THE FARMING PROCESS
+### The Farming Process
 
 {% end %}
 
@@ -177,7 +154,7 @@ Farmers earn the TFT after meeting the minimum uptime as proof-of-capacity.
 {% row(style="center between margin") %}
 
 
-## THE  **VALUE OF TFT**
+## The **Value of TFT**
 
 The ThreeFold Grid is the only Internet infrastructure that can scale to the far edges of our world and meet the insatiable demands of emerging IT workloads. The more the ThreeFold Grid is used, the more TFT are “burnt” to reduce the total circulating supply..
 
@@ -185,5 +162,11 @@ The ThreeFold Grid is the only Internet infrastructure that can scale to the far
 
 ![Image](farm_value_tft.jpg#large)
 
+<br>
+
+<button>[Buy a 3Node](https://marketplace.3node.global/)</button>
+<button>[Build a 3Node](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__diy_guide)</button>
+<button>[More About TFT](/tft)</button>
+
 {% end %}
 

content/farmfaq/q1/index.md

@@ -7,7 +7,7 @@ Farming is connecting a 3Node (server-type hardware) in your home or office, tha
 <br/>
 <br/>
 
-3Nodes are powered by ThreeFold’s open source operating system Zero-OS, and can host the data and workloads of thousands of people. When providing Internet capacity to the People's Internet, you are rewarded with TFT. And thanks to our proof-of-capacity model, your 3Node does all the heavy lifting for you.
+3Nodes are powered by ThreeFold’s open source operating system Zero-OS, and can host the data and workloads of thousands of people. When providing Internet capacity to the ThreeFold Grid, you are rewarded with TFT. And thanks to our proof-of-capacity model, your 3Node does all the heavy lifting for you.
 <br/>
 <br/>
 

content/footer/_index.md

@@ -4,37 +4,27 @@ description: ""
 insert_anchor_links: "left"
 template: "partials/footer.html"
 extra:
-  logoPath: "images/tft_log.svg"
+  logoPath: "images/black_threefold.png"
-  socialLinks: { Facebook: "https://www.facebook.com/threefold.io", Github: "https://github.com/threefoldfoundation", Github2: "https://github.com/threefoldtech", Twitter: "https://twitter.com/threefold_io", Telegram: "https://t.me/threefoldnews"  }
+  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") %}
 
-##### THREEFOLD <br> UNIVERSE
-
-<br>
-
-###### [ThreeFold Token](/tft)
-
-###### [ThreeFold Cloud](https://library.threefold.me/info/manual/#/manual__manual3_home_new)
-
-###### [Grid Explorer](https://explorer.threefold.io/all)
-
-###### [Alliance](https://consciousinternet.org/)
-
-|||
-
 ##### PARTICIPATE
 
 <br>
 
-###### [Start Farming](/farm)
+###### [Talk to ThreeFolders](https://t.me/threefold)
 
 ###### [Buy the Token](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy)
 
-###### [Use the Cloud](https://library.threefold.me/info/threefold/#/cloud/threefold__cloud_home)
+###### [Start Farming](/farm)
 
-###### [Testing Community](https://t.me/joinchat/BwOvOxxgK59GmRoZ2_sM0w)
+###### [Farming Community](https://t.me/threefoldfarmers)
+
+###### [Use the Grid](https://dashboard.grid.tf/)
+
+###### [Testing Community](https://t.me/threefoldtesting)
 
 
 |||

content/grid/index.md

@@ -5,24 +5,53 @@ insert_anchor_links: "left"
 ---
 
 <br>
-
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
 
 {% row(style="center narrow") %}
 
-## **INTER-CONNECTING HUMANITY**
+## Internet **Evolution.**
 
 <br>
 
-Expand the ThreeFold Grid – an open source peer-to-peer Internet infrastructure powered by the ThreeFold Blockchain and owned by humanity.
+The Internet was meant to be a peer-to-peer infrastructure with us in the center of our data and digital lives. Inspired by the past, we're building an Internet how "the" Internet was originally intended.
-
-
-<button>[Be The Internet](/farm)</button>
 
 {% end %}
 
-{% row(style="lean") %}
+{% row(style="center narrow") %}
 
-![Image](gride_header.png#mx-auto)
+<button>[Discover the Grid](https://library.threefold.me/info/threefold#/tfgrid/threefold__grid_intro)</button>
+
+|||
+
+<button>[The Magic of the Tech](https://library.threefold.me/info/threefold#/technology/threefold__technology)</button>
+
+{% end %}
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+
+{% row() %}
+
+![Image](grid_people.jpg)
+
+|||
+
+## The Layer-0 for **Decentralization**
+
+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>[Expand The Grid](/farm)</button>
 
 {% end %}
 
@@ -31,9 +60,9 @@ Expand the ThreeFold Grid – an open source peer-to-peer Internet infrastructur
 
 {% row() %}
 
-## SCALED BY PEOPLE <br> TO THE EDGE
+## Scaled by the People <br> **to the Edge**
 
-The People’s Internet is formed by Farmers, independent people that connect 3Nodes to the ThreeFold Grid anywhere electricity and network is present. Together, they form a globally distributed Internet infrastructure and earn income in the form of TFT.
+The ThreeFold Grid is formed by Farmers, independent people who connect 3Nodes (decentralized Internet capacity) anywhere electricity and network are present. Together, they form a globally distributed Internet infrastructure and earn income in the form of TFT.
 
 <button>[Learn About TFT](/tft)</button>
 
@@ -49,34 +78,14 @@ The People’s Internet is formed by Farmers, independent people that connect 3N
 
 {% row() %}
 
-![Image](grid_people.jpg)
+![Image](grid_new_internet.jpg)
 
 |||
 
-## THE LAYER-0 FOR DECENTRALIZATION
+## A New **Internet Blueprint**
-
-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, as the infrastructure is compatible with most open source tools and protocols.
-
-<button>[Meet The First Projects](/partners)</button>
-
-
-{% end %}
-
-
-<br>
-<br>
-
-{% row() %}
-
-## A NEW INTERNET BLUEPRINT
 
 All our code is made open source to energize open collaboration and promote universal access to a peer-to-peer Internet owned by all of us. More than just an Internet infrastructure, the ThreeFold Grid holds the potential to decentralize everything.
 
-
-|||
-
-![Image](grid_new_internet.jpg)
-
 {% end %}
 
 
@@ -88,13 +97,12 @@ All our code is made open source to energize open collaboration and promote univ
 
 ![Image](zero_os.png#medium)
 
-## **INTRODUCING ZERO-OS**
+## A Revolutionary <br> **Operating System**
 
-A decentralized autonomous OS designed to dedicate hardware capacity to the People’s Internet via the ThreeFold Blockchain. Zero-OS can be booted on most modern computers to host anything that runs on Linux in a decentralized way.
+A decentralized autonomous operating system designed to dedicate hardware capacity to the People’s Internet via the ThreeFold Blockchain. Zero-OS can be booted on most modern computers to host anything that runs on Linux in a decentralized way.
 
 
-<button>[Learn More](https://library.threefold.me/info/threefold#/technology/threefold__technology)</button>
+<button>[Learn More](https://library.threefold.me/info/threefold#/technology/threefold__zos)</button>
-<button>[Expand The Grid](/farm)</button>
 
 {% end %}
 
@@ -103,11 +111,12 @@ A decentralized autonomous OS designed to dedicate hardware capacity to the Peop
 
 {% row() %}
 
-## A DECENTRALIZED INTERNET ECONOMY
+## A Decentralized **Internet Economy**
 
 TFT is the official medium of exchange for Internet capacity on the ThreeFold Grid. The utility token allows users to reserve Internet capacity via the ThreeFold Blockchain and rewards farmers for their contribution to the network.
 
-<button>[Learn More About TFT](/tft)</button>
+<button>[About TFT](/tft)</button>
+<button>[Expand The Grid](/farm)</button>
 
 |||
 

content/header/index.md

@@ -3,7 +3,7 @@ title: "Header"
 insert_anchor_links: "left"
 template: "partials/header.html"
 extra:
-  logoPath: "images/tft_log.svg"
+  logoPath: "images/black_threefold.png"
   button_Path: "/images/gettft_white.png"
 ---
 
@@ -19,9 +19,9 @@ extra:
 
 <button>
 
-[Our Partners](/partners)
+[Our People](/people)
 <br>
-Explore Our Partners
+Team, stories, & more
 
 </button>
 
@@ -29,24 +29,9 @@ Explore Our Partners
 
 <button>
 
-[Alliance](https://consciousinternet.org/)
+[Our Partners](/partners)
 <br>
-Alliance For A Conscious Internet
+Explore Our Partners
-
-</button>
-
-{% end %}
-- Community
-
-{% row() %}
-
-<button>
-
-[Our People](/people)
-<br>
-Team, stories, & more
-
-</button>
 
 |||
 
@@ -62,7 +47,7 @@ Welcome To The Fold
 
 <button>
 
-[Developers Resources](/developer)
+[Developer Resources](/developer)
 <br>
 Join The Developer Community
 
@@ -74,11 +59,11 @@ Join The Developer Community
 
 {% row() %}
 
-#### RESOURCES 
+#### Resources 
 
 <button>
 
-[Explorer](https://explorer.threefold.io/all)
+[Explorer](https://dashboard.grid.tf/)
 
 ThreeFold Capacity Explorer
 
@@ -89,19 +74,25 @@ ThreeFold Capacity Explorer
 
 [Library](https://library.threefold.me/info/threefold#/)
 <br>
-Explorer The documentation
+Explore the Documentation
 
 </button>
 
+<button>
+
+[Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)
+<br>
+Get Started on the Grid
+
 |||
 
-#### DIVE DEEPER
+#### Dive Deeper
 
 <button>
 
 [Blog](/blog)
 <br>
-Explorer The Blogs
+Explore the Blogs
 
 </button>
 
@@ -109,27 +100,39 @@ Explorer The Blogs
 
 [Newsroom](/newsroom)
 <br>
-Check Last Updates
+Check the Latest Updates
 
 </button>
 
-|||
-
-#### SUPPORT AND HELP
-
 <button>
 
-[Careers](/careers)
+[Litepaper](https://litepaper.threefold.me)
 <br>
-Join The TEAM
+Get the Full Picture
 
-</button>
+|||
+
+#### Support & Help
+
+<button>
+
+[Forum](https://forum.threefold.io)
+<br>
+Questions & Feedback
 
 <button>
 
 [Support](/support)
 <br>
-Get In Touch With ThreeFold
+Speak Live with a Human
+
+</button>
+
+<button>
+
+[Careers](/careers)
+<br>
+Join the Team
 
 </button>
 

content/mission/index.md

@@ -6,25 +6,45 @@ insert_anchor_links: "left"
 
 <!-- section 1 (header) -->
 
-{% row(style="center") %}
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+
+{% row(style="center narrow") %}
+
+## Our **Mission**
 
 <br>
 
-# OUR MISSION
+To build an open-source peer-to-peer Internet infrastructure that removes all forms of centralization from the global IT systems. Anything we do needs to improve the planet's situation and benefit the people around us.
-
-<br>
-
-To build an open-source peer-to-peer Internet infrastructure that removes all forms of centralization from the global IT systems.
-
-<button>[The collective dream](/blog/2021/07/post-2)</button>
-
-|||
-
-![Image](mission_header.png)
 
 {% end %}
 
+{% row(style="center narrow") %}
 
+<button>[Collective Dream](https://threefold.io/blog/post/tf_grid_peoples_internet/)</button>
+
+|||
+
+<button>[Planet & People First](https://threefold.io/blog/post/planet_first_people_first/)</button>
+
+|||
+
+<button>[Mission & Goals](https://mission.threefold.me)</button>
+
+{% end %}
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
 
 <!-- section 2 (INTERCONNECTED) -->
 
@@ -34,9 +54,9 @@ To build an open-source peer-to-peer Internet infrastructure that removes all fo
 
 |||
 
-## SUPPORTING AN INTERCONNECTED WORLD
+## Supporting an **Interconnected World**
 
-Internet access is a human right and it can change everything for the lives of people as an infinite source of tools and information. Our technology was designed to scale the People’s Internet anywhere electricity and bandwidth are present.
+Internet access is a human right and it can change everything for the lives of people as an infinite source of tools and information. Our technology was designed to scale ThreeFold anywhere electricity and bandwidth are present.
 
 {% end %}
 
@@ -45,7 +65,7 @@ Internet access is a human right and it can change everything for the lives of p
 
 {% row(style="margin") %}
 
-## EMPOWERING PEOPLE TO BE SOVEREIGN
+## Empowering People **To Be Sovereign**
 
 Create, store and share in full control of where your data resides and who can access it. By combining peer-to-peer, blockchain and autonomous technologies, the People’s Internet provides 100% data ownership and privacy.
 
@@ -65,7 +85,7 @@ Create, store and share in full control of where your data resides and who can a
 
 |||
 
-## OUR VALUES DEFINE OUR ACTIONS
+## Our Values Define **Our Actions**
 
 The ThreeFold Law states that any good you do will return to you threefold in this lifetime. By making our technology actionable, we energize a collective approach towards a single mission – empowering humanity while regenerating our planet.
 {% end %}
@@ -76,15 +96,15 @@ The ThreeFold Law states that any good you do will return to you threefold in th
 
 {% row(style="center between margin") %}
 
-## **JOIN THE FOLD**
+## **Join **The Fold****
 
-Together, we build the People’s Internet. Our Internet.
+Together, we build a better Internet for the planet, and for all of us.
 
 <br>
 
 ![Image](100_mission.png#meduim)
 
-<button>[Join Us](https://t.me/threefold)</button>
+<button>[Join Us](/community)</button>
 
 {% end %}
 
@@ -94,7 +114,7 @@ Together, we build the People’s Internet. Our Internet.
 
 {% row(style="center between") %}
 
-## WE’VE COME A LONG WAY, <br> **AND WE’RE JUST GETTING STARTED**
+## We've Come A Long Way <br> **And We're Just Getting Started**
 
 After setting world records in Internet storage and cloud automation technologies throughout the past 20 years, some of our co-founders decided to start from scratch and build a new Internet infrastructure that is universally open source and peer-to-peer.
 
@@ -104,7 +124,7 @@ After setting world records in Internet storage and cloud automation technologie
 
 <br>
 
-And we’re aiming for new heights. The People’s Internet will turn into a DAO in 2022, inviting developers and enterprises from all around the world to collaborate on the decentralization of everything that is digital, and beyond.
+And we’re aiming for new heights. ThreeFold is turning into a DAO in 2022, inviting developers and enterprises from all around the world to collaborate on the decentralization of everything that is digital, and beyond.
 
 {% end %}
 
@@ -115,12 +135,12 @@ And we’re aiming for new heights. The People’s Internet will turn into a DAO
 
 {% row(bgColor="#70dfc9" style="center narrow margin") %}
 
-## **START THE INTERNET <br> REVOLUTION**
+## Join the Internet <br> **(R)evolution**
 
-Connect, share and collaborate with our open community to expand the horizons of the People’s Internet.<br> Bring your ideas and let’s co-create together!
+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 Fold](https://t.me/threefold)</button>
+<button>[Join The Fold](/community)</button>
 
 {% end %}

content/tft/index.md

@@ -5,19 +5,29 @@ page_template: "tft_header.html"
 insert_anchor_links: "left"
 ---
 
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
 
 <!-- section 1 (be the Internet) -->
 
-{% row(style="center between margin") %}
+{% row(style="center narrow") %}
 
-![Image](tft_header.png#medium)
+## Decentralizing <br>**the Internet Economy**
 
+ThreeFold creates an entirely new decentralized Internet economy that allows anyone to join the world’s fastest growing market – the Internet.
 
+{% end %}
 
-## **DECENTRALIZING <br>THE INTERNET ECONOMY**
+{% row(style="center narrow") %}
 
-
+<button>[Learn About TFT](https://library.threefold.me/info/threefold#/tokens/threefold__tokens_home)</button>
-The People’s Internet creates an entirely new decentralized Internet economy that allows anyone to join the world’s fastest growing market – the Internet.
+<button>[Get TFT](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy)</button>
+<button>[Liquidity Litepaper](https://threefold.docsend.com/view/3mu3cddgj7znuixj)</button>
 
 {% end %}
 
@@ -34,10 +44,13 @@ The People’s Internet creates an entirely new decentralized Internet economy t
 
 {% row(style="center ") %}
 
-## **MEETING EMERGING DEMAND**
+<br>
+<br>
+
+## Meeting **Emerging Demand**
 
 
-Data has become the most valuable commodity on earth, the Internet infrastructure is experiencing significant growth. While the current centralized model is facing limitations, ThreeFold can scale to the edge to service the emerging demand.
+Data has become the most valuable commodity on earth, the Internet infrastructure is experiencing significant growth.<br> While the current centralized model is facing limitations, ThreeFold can scale to the edge to service the emerging demand.
 
 {% end %}
 
@@ -75,7 +88,7 @@ That is a number with 21 zeroes!
 {% row(style="center between margin") %}
 
 
-## **THE MISSING LAYERS**
+## The **Missing Layer**
 
 
 While many projects have created bits and pieces of what a decentralized Internet would look like, ThreeFold is decentralizing the entire Internet model. The blockchain world is missing this decentralized foundational layer. ThreeFold provides the peer-to-peer Internet infrastructure to interconnect the entire blockchain and web3 space.
@@ -99,7 +112,7 @@ While many projects have created bits and pieces of what a decentralized Interne
 
 |||
 
-## **THE CURRENCY OF THE DECENTRALIZED INTERNET**
+## The Currency of the **Decentralized Internet**
 
 TFT is a utility token that allows people to hold current and future Internet capacity on the ThreeFold Grid. It incentivizes an open ecosystem where anyone can connect and utilize Internet capacity without any intermediaries.
 
@@ -119,7 +132,7 @@ TFT is a utility token that allows people to hold current and future Internet ca
 {% row(style="center narrow") %}
 
 
-## **OPEN NETWORK**
+## Open **Network**
 
 3Nodes provide Internet capacity for millions of people using ThreeFold’s Planetary Network, and you earn TFT for doing so. And because of a unique operating system, called Zero-OS, once turned on your 3Node runs by itself.
 
@@ -155,7 +168,7 @@ People buy TFT to store data and run applications privately on a peer-to-peer In
 
 {% row(style="margin") %}
 
-## **LOYALTY REWARDS**
+## Loyalty **Rewards**
 
 The ThreeFold blockchain automatically scans wallets and provides up-to 60% discounts on the utilization of the ThreeFold Grid. The more TFT you hold across time, the higher the discounts.
 
@@ -178,7 +191,7 @@ The ThreeFold blockchain automatically scans wallets and provides up-to 60% disc
 
 |||
 
-## **A REAL UTILITY TOKEN**
+## A Real **Utility Token**
 
 TFT is minted only when new Internet capacity is added to the ThreeFold Grid. A limited supply of 4 Billion TFT has been set to ensure the value keeps steady for the years to come with rising demand for a decentralized Internet.
 
@@ -191,7 +204,7 @@ TFT is minted only when new Internet capacity is added to the ThreeFold Grid. A
 
 {% row(style="margin") %}
 
-## **BURN AND FARM EQUILIBRIUM**
+## Burn and Farm **Equilibrium**
 
 Burning permanently removes TFT from the circulating supply when the ThreeFold Grid gets used. It ensures a positive impact on pricing while ensuring rewards for all current and future nodes.
 
@@ -209,7 +222,7 @@ Burning permanently removes TFT from the circulating supply when the ThreeFold G
 
 {% row(style="center") %}
 
-## **JOIN THE PEOPLE'S INTERNET**
+## Join the **Movement**
 
 Get TFT today and participate in the realization of a truly decentralized world.
 
@@ -217,7 +230,7 @@ Get TFT today and participate in the realization of a truly decentralized world.
 
 {% tft_links() %}
 
-## **DECENTRALIZING <br>THE INTERNET ECONOMY**
+## **Decentralizing <br>the Internet Economy**
 
 {% end %}
 
@@ -241,7 +254,7 @@ Get TFT today and participate in the realization of a truly decentralized world.
 
 {% row(style="center") %}
 
-## **BELIEVERS IN TFT**
+## **Believers in TFT**
 
 
 ![Image](ourpartners.png#mx-auto)

templates/partials/footer.html

@@ -13,7 +13,7 @@
           <div class="max-w-screen-2xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
             <div class="xl:flex xl:gap-4">
               <div class="space-y-8 lg:max-w-sm xl:max-w-sm lg:mr-8 lg:mb-8 xl:col-span-1">
-                <img class="w-20 h-auto sm:w-15" src="{{ get_url(path=logoPath)}}" alt="ThreeFold Logo" />
+                <img class="w-16 h-auto sm:w-15" src="{{ get_url(path=logoPath)}}" alt="ThreeFold Logo" />
                 <p class="text-gray-500 text-base leading-6 ">
                   {{section.description}}
                 </p>

templates/partials/header.html

@@ -7,7 +7,7 @@
         <div class="mx-auto flex z-50 shadow justify-between items-center px-6 sm:px-4 md:px-6 py-2 lg:px-5 lg:justify-start space-x-10 sm:space-x-4 ">
             <div>
                 <a href="{{get_url(path='/')}}" class="flex">
-                    <img class="w-20 h-auto sm:w-15" style="max-width: none;" src="{{ get_url(path=section.extra.logoPath)}}" alt="ThreeFold Logo" />
+                    <img class="w-16 h-auto sm:w-15" style="max-width: none;" src="{{ get_url(path=section.extra.logoPath)}}" alt="ThreeFold Logo" />
                 </a>
             </div>
             <div class="-mr-2 -my-2 lg:hidden">

templates/shortcodes/featured_stories.html

@@ -8,27 +8,25 @@
                 lg:text-6xl
                 leading-tight
                 font-normal font-heading
-                uppercase
+                
                 sm:leading-10
                 lg:pb-10
               ">
-                Featured Stories
+              Dive Deeper
             </h2>
         </div>
         <div class="mt-12 grid gap-5 max-w-lg mx-auto lg:grid-cols-3 lg:max-w-none">
             <div class="flex flex-col rounded-lg shadow-lg overflow-hidden">
                 <div class="flex-shrink-0">
-                    <img class="h-48 w-full object-cover" src="images/the_threefold_movement.png" alt="" />
+                    <img class="h-48 w-full object-cover" src="images/planet_first_people_first.png" alt="" />
                 </div>
                 <div class="flex-1 bg-white p-6 flex flex-col justify-between">
                     <div class="flex-1">
-                        <a href="/blog/2021/07/post-4/" class="block">
+                        <a href="/blog/post/planet_first_people_first/" class="block">
                             <h3 class="mt-2 text-2xl leading-7 font-normal text-gray-900">
-                                Into the Fold – The ThreeFold Movement
+                                Planet first. People first.
                             </h3>
-                            <div class="mt-3 leading-6 text-gray-500 text-lg">It's not by mistake that you're here,
+                            <div class="mt-3 leading-6 text-gray-500 text-lg">Together with our community and partners, we're taking action and making productive choices for our planet and humanity.</div>
-                                reading this post. You can feel that a global shift is happening. And you want to do
-                                something about it.</div>
                         </a>
                     </div>
                 </div>
@@ -36,17 +34,15 @@
 
             <div class="flex flex-col rounded-lg shadow-lg overflow-hidden">
                 <div class="flex-shrink-0">
-                    <img class="h-48 w-full object-cover" src="images/new_internet.jpg" alt="" />
+                    <img class="h-48 w-full object-cover" src="images/internet_of_internets.png" alt="" />
                 </div>
                 <div class="flex-1 bg-white p-6 flex flex-col justify-between">
                     <div class="flex-1">
-                        <a href="/blog/2021/07/post-3/" class="block">
+                        <a href="/blog/2022/05/post-7/" class="block">
                             <h3 class="mt-2 text-2xl leading-7 font-normal text-gray-900">
-                                Building a New Internet From the Ground Up – Part 1: Introduction
+                                Welcome to the Internet of Internets
                             </h3>
-                            <div class="mt-3 leading-6 text-gray-500 text-lg">The first episode in an approachable
+                            <div class="mt-3 leading-6 text-gray-500 text-lg">Together, we’re building our own future through the Internet of Internets – decentralized, open, inclusive, regenerative, and resilient.</div>
-                                series on the inner workings of the ThreeFold Grid. Explore our technology stack and
-                                what makes ThreeFold special.</div>
                         </a>
                     </div>
                 </div>

templates/shortcodes/grid_stats.html

@@ -69,7 +69,8 @@
                 {{ cores | num_format }}
                 <span class="block text-2xl uppercase">cores</span>
             </div>
-            <button><a href="https://explorer.threefold.io/all" target="_blank">Explore ThreeFold Grid Capacity</a></button>
+            
+            <button class="my-8"><a href="https://dashboard.grid.tf/explorer/statistics" target="_blank">Explore ThreeFold Grid Capacity</a></button>
         </div>
     </div>
 </section>

templates/shortcodes/team_sec.html

@@ -1,6 +1,6 @@
 <div class="lg:my-32 flex flex-col mt-5 p-auto lg:px-20">
-    <h2 class="flex py-2 mx-auto uppercase font-normal lg:text-6xl">
+    <h2 class="flex py-2 mx-auto font-normal lg:text-6xl">
-        THE TEAM
+        The Team
     </h2>
     <div class="lg:max-w-4xl text-xl text-center mb-8 mx-auto leading-relaxed">Spread across the world, our team has
         built some of the world’s best Internet storage and cloud automation technologies since the ‘90s. With a strong

templates/shortcodes/tft_links.html

@@ -4,6 +4,12 @@
     <a class="center" href="https://gettft.com/gettft/" rel="some text" target="_blank">
         {% set link = page.permalink ~ "get_tft_button.png"%}
         <img class="py-2 mr-2 my-2 px-5 border-2 border-black" src="{{link}}" alt="gettft">
+    </a>
+    <a class="center"
+    href="https://library.threefold.me/info/threefold#/tokens/threefold__tft_stellar_dex"
+    target="_blank">
+    {% set link = page.permalink ~ "stellar_logo.png"%}
+    <img class="py-2 mr-2 px-5 border-2 border-black" src="{{link}}" alt="stellar">
 </a>
     <a class="center"
         href="https://pancakeswap.finance/swap?exactField=output&exactAmount=100&outputCurrency=0x8f0FB159380176D324542b3a7933F0C2Fd0c2bbf&inputCurrency=0xe9e7cea3dedca5984780bafc599bd69add087d56?use=v2"