diff --git a/content/_index.md b/content/_index.md
index f80462c0f..011cbcd7b 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -7,4 +7,199 @@ draft: false
extra:
author: Your name here
imgPath: images/threefold_globe.png
----
\ No newline at end of file
+<<<<<<< HEAD
+---
+
+
+
+
+{% row(style="center") %}
+
+
+
+
+
+
+
+
+## The (Re)Birth of **the Internet.**
+
+ThreeFold is a peer-to-peer open-source Internet platform that connects users directly with local Internet capacity provided by farmers. No intermediaries such as centralized servers.
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+
+
+|||
+
+
+
+|||
+
+
+
+|||
+
+
+
+{% end %}
+
+
+
+
+{% grid_stats() %}
+
+### The ThreeFold Grid v3.7.0
+
+## **Live and Operational**
+
+{% end %}
+
+
+
+
+{% row(style="center narrow") %}
+
+## Together **We Build.**
+
+The future is about decentralization, participation, and working together to achieve our goals. As a decentralized movement, we encourage the community to get involved. This new Internet can only succeed if we find ways to collaborate where we together pull this Internet concept forward. Below, please find some of the ways you can join us in building a better Internet.
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+
+
+
+
+### Farm Local Internet Capacity **and Earn TFT**
+
+By connecting hardware at your home or office – or anywhere you'd like – you provide Internet capacity for the people around you and earn a new digital currency, TFT.
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+
+
+|||
+
+
+
+|||
+
+
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+
+
+
+
+### Build On Top of a **Decentralized Infrastructure**
+
+True digital sovereignty for open-source builders. The ThreeFold Grid provides limitless possibilities, and brings a playground of industry-compatible easy-to-deploy solutions for developers.
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+
+
+|||
+
+
+
+|||
+
+
+
+{% end %}
+
+
+
+{% featured_stories() %}
+
+## Featured Stories
+
+{% end %}
+
+
+
+{% team_sec() %}
+
+## **The Team**
+
+{% end %}
+
+
+
+{% row(style="center margin") %}
+
+## Believers and Collaborators **In a Better Internet**
+
+We are truly proud to be trusted by some of the biggest names in the industry.
+
+
+
+
+
+{% end %}
+
+
+
+
+
+
+
+{% row(style="center") %}
+
+## **In the News**
+
+{% end %}
+
+{% row(style="center between") %}
+
+[](https://www.forbes.com/sites/johnkoetsier/2020/06/20/largest-distributed-peer-to-peer-grid-on-the-planet-laying-foundation-for-a-decentralized-internet/?fbclid=IwAR1WKCpqLcWPRWg5bPD6RCQE5JJjRPt6ey5vbEnu3db2FvJnp6-YKeVZNW8#79aa340e6798)
+
+|||
+
+[](https://cointelegraph.com/news/peer-to-peer-internet-has-lofty-goal-to-bring-true-decentralization)
+
+|||
+
+[](https://news.yahoo.com/news/threefold-set-disrupt-status-quo-051457787.html?guccounter=1)
+
+{% end %}
+
+{% row(style="center between") %}
+
+[](https://hackernoon.com/is-it-possible-to-create-a-decentralized-internet-this-startup-and-its-farmers-think-so-ey2e3ycf)
+
+|||
+
+[](https://smartereum.com/189750/threefold-is-audaciously-building-a-new-decentralized-internet/)
+
+|||
+
+[](https://tgdaily.com/web/6-dfinity-threefold-are-leading-an-internet-decentralization-revolution/)
+
+{% end %}
+
+{% row(style="center between") %}
+
+[](https://cointelegraph-com.cdn.ampproject.org/c/s/cointelegraph.com/news/is-a-new-decentralized-internet-or-web-3-0-possible/amp)
+
+|||
+
+[](https://www.banklesstimes.com/2021/06/14/threefolds-green-technology-strategy-to-a-fairer-more-sustainable-world/)
+
+|||
+
+[](https://gritdaily.com/belarus-governments-control-internet/)
+
+{% end %}
diff --git a/content/farm/index.md b/content/farm/index.md
index f81b71771..d34cf2a18 100644
--- a/content/farm/index.md
+++ b/content/farm/index.md
@@ -10,7 +10,7 @@ insert_anchor_links: "left"
## Be the **Internet**
-Become an Internet Farmer. Expand the ThreeFold Grid and earn for it.
+Become a ThreeFold Farmer. Provide Internet capacity to the people around you, and earn for it.
diff --git a/content/header/index.md b/content/header/index.md
index 156a6a2f4..8c37e0795 100644
--- a/content/header/index.md
+++ b/content/header/index.md
@@ -21,7 +21,7 @@ extra:
[Our People](/people)
-Team, stories, & more
+