update farming page

content/navigation/navigation.md

@@ -17,8 +17,8 @@ navLinks:
     expandable: false
 
   - name: Farm
-    link: 'https://farming.threefold.io/farm'
+    link: /farm
-    external: true
+    external: false
     expandable: false
 
   - name: TFT

content/page/farm/brandPanel/index.md

@@ -0,0 +1,8 @@
+---
+id: farm_brandPanel
+title: Hello, Titan
+image: farm_titan.jpg # src/assets/brandPanel/..
+btnTxt : Get a Titan Node
+sourceUrl : ''
+---
+The Titan node was designed to fit any home or office. It is packed with performance for its price and doesn’t require any technical knowledge. Just order, plug it in and start earning. Yes, that’s it!

content/page/farm/brandPanel2/index.md

@@ -0,0 +1,11 @@
+---
+id: farm_brandPanel2
+title: GOT QUESTIONS 
+subtitle : FUTURE FARMER? 
+image: farm_future.jpg # src/assets/brandPanel/..
+btnTxt : Farming Library 
+sourceUrl : ''
+btnTxt2 : Farming FAQs 
+sourceUrl2 : ''
+---
+We have an extensive library of information about farming and we’ve also gathered the most frequently asked questions and answers around farming in our forum. If you can’t find the answer you’re looking for, just ask away and our experts will get back to you.

content/page/farm/brandPanel3/index.md

@@ -0,0 +1,9 @@
+---
+id: farm_brandPanel3
+title: SET UP YOUR 
+subtitle : OWN NODE
+image: setup_nodes .png # src/assets/brandPanel/..
+btnTxt : See Requirements
+sourceUrl : ''
+---
+ThreeFold’s operating system can run on any Intel or AMD powered computers. From building your own 3Node to using refurbished hardware, define your ideal configurations and start farming today.

content/page/farm/cta/index.md

@@ -0,0 +1,9 @@
+---
+id: farm_cta
+title: JOIN A WORLD OF FARMERS
+image: ./farm_map.jpg
+button: ''
+link: ''
+---
+We are growing fast.
+

content/page/farm/cta2/index.md

@@ -0,0 +1,13 @@
+---
+id: farm_cta2
+title: A TOKEN OF  
+subtitle : IMMEASURABLE VALUE
+image: ./farm_graph.jpg
+button: ''
+link: ''
+---
+Anything that exists digitally needs cloud capacity to remain available and accessible. The ThreeFold Grid allows anyone to store data and run applications with unparalleled efficiency and privacy.
+
+<br>
+
+A  limited supply and  ‘burning’ mechanism was set to keep the currency scarce and ensure fair incentives for current and future farmers.

content/page/farm/farm.md

@@ -0,0 +1,21 @@
+---
+id: farm
+metaTitle: ThreeFold | Mission
+metaDesc: Farming TFT is done by connection a node or server to the ThreeFold Grid. Yes, it's that simple. Join thousands that make the Internet of tomorrow possible.
+metaImg: ./farm_header.jpg
+header_slogan: '' 
+header_title: BE THE
+header_title2: internet
+header_image: ./farm_header.jpg
+button: Become a Farmer
+link: ''
+header_altImg: threefold
+header_excerpt: Farming TFT is done by connection a node or server to the ThreeFold Grid. Yes, it's that simple. Join thousands that make the Internet of tomorrow possible.
+productsMain: product_farm
+productData: [farm_product1, farm_product2, farm_product3]
+cta: farm_cta
+cta2: farm_cta2
+brandPanel: farm_brandPanel
+brandPanel3: farm_brandPanel3
+brandPanel2 : farm_brandPanel2
+---

content/page/farm/productData/main/main.md

@@ -0,0 +1,7 @@
+---
+id: product_farm
+title: "Farm"
+subtitle: A new Way of growing the internet.
+---
+
+3Nodes are servers that provide the compute, storage and network capacity needed to store data and run applications on the global internet. Thanks to  ThreeFold’s  innovative Proof-of-Capacity model, you are rewarded with TFT for doing this.

content/page/farm/productData/product1/product1.md

@@ -0,0 +1,9 @@
+---
+id: farm_product1
+title: ''
+image: ./plug.png
+button: ''
+link: ''
+---
+
+All you need to get started is electricity, a network connection, and a 3Node.

content/page/farm/productData/product2/product2.md

@@ -0,0 +1,9 @@
+---
+id: farm_product2
+title: ''
+image: ./offer.png
+button: ''
+link: ''
+---
+
+Your capacity will be automatically detected by the OS and registered in the blockchain.

content/page/farm/productData/product3/product3.md

@@ -0,0 +1,9 @@
+---
+id: farm_product3
+title: ''
+image: ./earn.png
+button: ''
+link: ''
+---
+
+Earn ThreeFold Tokens for connecting and offering planet positive capacity.

content/page/tft/cta/cta.md

@@ -4,7 +4,7 @@ title: THE POTENTIAL IS ENDLESS
 image: ./potental.png
 button:  How ThreeFold Compares With The Industry
 link: https://forum.threefold.io/t/threefold-is-the-substrate-for-decloud/1295 
-button2: 
+button2: '' 
-link2: 
+link2: '' 
 ---
 Many projects created bits and pieces of what a decentralized cloud would look like, each with their own protocol and tools, making the industry more complicated than ever. With TFT, people can access the most comprehensive digital network ever created. 

src/components/custom/sections/CallToAction.vue

@@ -191,6 +191,144 @@
       >
     </div>
 
+    <!-- farm -->
+    <div
+      class="w-full mx-auto lg:mt-20 lg:py-20"
+      v-else-if="id == 'farm' && !lastCta"
+    >
+      <h2
+        v-if="cta.title"
+        class="
+          lg:text-6xl
+          text-center
+          uppercase
+          mb-2
+          leading-none
+          font-bold font-heading
+        "
+      >
+        {{ cta.title }}
+      </h2>
+      <div v-html="cta.content" class="mt-6 mb-8 lg:text-2xl"></div>
+      <g-image :src="cta.image" class="lg:my-20 mx-auto" />
+      <!-- <a
+        class="
+          inline-block
+          bg-white
+          text-lg
+          learn-button
+          hover:bg-gray-400
+          px-12
+          py-1
+          mr-5
+          my-4
+          border-2
+          shadow
+          border-black
+        "
+        target="_blank"
+        v-if="cta.button && cta.link.includes('http')"
+        :href="cta.link"
+        >{{ cta.button }}</a
+      >
+
+      <a
+        class="
+          inline-block
+          bg-white
+          text-lg
+          learn-button
+          hover:bg-gray-400
+          px-12
+          py-1
+          mr-5
+          my-4
+          border-2
+          shadow
+          border-black
+        "
+        v-else
+        :href="cta.link"
+        >{{ cta.button }}</a
+      > -->
+    </div>
+
+    <div class="w-full mx-auto py-20" v-else-if="id == 'farm' && lastCta">
+      <h2
+        v-if="cta.title"
+        class="
+          lg:text-6xl
+          text-center
+          uppercase
+          mb-2
+          leading-none
+          font-normal font-heading
+        "
+      >
+        {{ cta.title }}
+        <span class="font-bold">{{ cta.subtitle }}</span>
+      </h2>
+      <!-- <h2
+        v-if="cta.subtitle"
+        class="
+          lg:text-5xl
+          text-center
+          uppercase
+          mb-2
+          leading-none
+          font-bold font-heading
+        "
+      >
+        {{ cta.subtitle }}
+        
+      </h2> -->
+      <div
+        v-html="cta.content"
+        class="mt-6 mb-8 text-xl max-w-6xl mx-auto"
+      ></div>
+      <g-image :src="cta.image" class="lg:my-20 mx-auto" />
+      <!-- <a
+        class="
+          inline-block
+          bg-white
+          text-lg
+          learn-button
+          hover:bg-gray-400
+          px-12
+          py-1
+          mr-5
+          my-4
+          border-2
+          shadow
+          border-black
+        "
+        target="_blank"
+        v-if="cta.button && cta.link.includes('http')"
+        :href="cta.link"
+        >{{ cta.button }}</a
+      >
+
+      <a
+        class="
+          inline-block
+          bg-white
+          text-lg
+          learn-button
+          hover:bg-gray-400
+          px-12
+          py-1
+          mr-5
+          my-4
+          border-2
+          shadow
+          border-black
+        "
+        v-else
+        :href="cta.link"
+        >{{ cta.button }}</a
+      > -->
+    </div>
+
     <!-- home -->
 
     <div

src/components/marketing/sections/cta-sections/BrandPanel.vue

@@ -1,5 +1,12 @@
 <template>
-  <div :class="{ 'bg-about': id == 'mission' && brandPanel3 }">
+  <div 
+  class="bg-cover"
+  :class="{ 
+    
+     bg: id == 'mission' && brandPanel3,
+     gry: id == 'farm' && brandPanel3, 
+    }"
+  >
     <div class="mx-auto py-10">
       <!-- oldtft -->
       <div
@@ -9,8 +16,7 @@
           rounded-lg
           shadow-xl
           overflow-hidden
-          lg:grid lg:grid-cols-2
+          lg:grid lg:grid-cols-2 lg:gap-4
-          lg:gap-4
         "
       >
         <div class="relative pb-3/5 -mt-6 md:pb-1/2">
@@ -36,12 +42,9 @@
             pt-10
             pb-10
             px-6
-            sm:pt-16
+            sm:pt-16 sm:px-10
-            sm:px-10
+            lg:py-16 lg:pr-0
-            lg:py-16
+            xl:py-20 xl:px-15
-            lg:pr-0
-            xl:py-20
-            xl:px-15
           "
         >
           <div class="lg:self-center">
@@ -91,8 +94,7 @@
           rounded-lg
           shadow-xl
           overflow-hidden
-          lg:grid lg:grid-cols-2
+          lg:grid lg:grid-cols-2 lg:gap-4
-          lg:gap-4
         "
       >
         <div
@@ -100,12 +102,9 @@
             pt-10
             pb-12
             px-6
-            sm:pt-16
+            sm:pt-16 sm:px-16
-            sm:px-16
+            lg:py-16 lg:pr-0
-            lg:py-16
+            xl:py-20 xl:px-15
-            lg:pr-0
-            xl:py-20
-            xl:px-15
           "
         >
           <div class="lg:self-center text-center">
@@ -399,7 +398,154 @@
         </div>
       </div>
 
-      <!-- About us -->
+      <!-- farm -->
+      <div
+        v-else-if="id == 'farm' && !brandPanel2 && !brandPanel3"
+        class="flex flex-wrap lg:text-left lg:my-10"
+      >
+        <div
+          class="
+            lg:w-1/2 lg:mt-10
+            order-1
+            lg:order-none lg:text-left
+            text-center
+            lg:px-56
+            self-center
+           
+          "
+        >
+          <div class="lg:self-center">
+            <h2 class="text-9xl mb-8 uppercase leading-none font-heading">
+              <span class="block">{{ brand.title }}</span>
+              <span class="block" v-if="brand.subtitle">{{
+                brand.subtitle
+              }}</span>
+            </h2>
+            <div
+              class="py-6 mt-4 text-xl leading-tight tracking-wide"
+              v-html="brand.content"
+            ></div>
+            <a
+              v-if="brand.btnTxt"
+              target="_blank"
+              :href="brand.sourceUrl"
+              class="
+                inline-block
+                bg-white
+                text-lg
+                learn-button
+                hover:bg-gray-400
+                px-12
+                py-1
+                mr-5
+                my-4
+                border-2
+                shadow
+                border-black
+              "
+              >{{ brand.btnTxt }}</a
+            >
+          </div>
+        </div>
+        <div class="lg:w-1/2 px-2 self-center text-right">
+          <g-image class="lg:ml-60 mx-auto" :src="image" :alt="brand.title" />
+        </div>
+      </div>
+
+       <div
+        v-else-if="id == 'farm' && brandPanel2"
+        class="
+          flex flex-wrap
+          lg:text-left
+          text-center
+          lg:pt-16
+          px-4
+          lg:mb-20 lg:px-20
+        "
+      >
+        <div class="lg:w-1/2 px-2 self-center">
+          <g-image class="mx-auto" :src="image" :alt="brand.title" />
+        </div>
+        <div class="lg:w-1/2 px-2 lg:mt-10 order-1 lg:order-none self-center">
+          <div class="lg:self-center">
+            <h2 class="lg:text-6xl mb-8 uppercase leading-none font-light">
+              <span class="block font-normal">{{ brand.title }}</span>
+              <span class="block font-bold" v-if="brand.subtitle">{{
+                brand.subtitle
+              }}</span>
+            </h2>
+            <div
+              class="pb-6 text-gray-900 text-xl leading-tight tracking-wide lg:max-w-2xl"
+              v-html="brand.content"
+            ></div>
+            <a
+              v-if="brand.btnTxt"
+              target="_blank"
+              :href="brand.sourceUrl"
+              class="
+                inline-block
+                bg-white
+                text-lg
+                learn-button
+                hover:bg-gray-400
+                px-12
+                py-1
+                mr-5
+                my-4
+                border-2
+                shadow
+                border-black
+              "
+              >{{ brand.btnTxt }}</a
+            >
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-else-if="id == 'farm' && brandPanel3"
+        class="flex flex-wrap lg:text-left text-center lg:p-20 px-4"
+      >
+        <div class="lg:w-1/2 px-2 self-center">
+          <g-image class="lg:w-3/4 mx-auto" :src="image" :alt="brand.title" />
+        </div>
+        <div class="lg:w-1/2 px-2 lg:mt-10 order-1 lg:order-none">
+          <div class="lg:self-center">
+            <h2 class="lg:text-6xl mb-8 uppercase leading-none font-light">
+              <span class="block font-normal">{{ brand.title }}</span>
+              <span class="block font-bold" v-if="brand.subtitle">{{
+                brand.subtitle
+              }}</span>
+            </h2>
+            <div
+              class="pb-6 text-gray-900 text-xl leading-tight tracking-wide lg:max-w-2xl"
+              v-html="brand.content"
+            ></div>
+            <a
+              v-if="brand.btnTxt"
+              target="_blank"
+              :href="brand.sourceUrl"
+              class="
+                inline-block
+                bg-white
+                text-lg
+                learn-button
+                hover:bg-gray-400
+                px-12
+                py-1
+                mr-5
+                my-4
+                border-2
+                shadow
+                border-black
+              "
+              >{{ brand.btnTxt }}</a
+            >
+          </div>
+        </div>
+      </div>
+
+      <!-- mission -->
       <div
         v-else-if="id == 'mission' && !brandPanel2 && !brandPanel3"
         class="flex flex-wrap text-left lg:my-10 lg:px-20"
@@ -407,7 +553,15 @@
         <div class="lg:w-1/2 px-2 self-center">
           <g-image class="lg:w-2/3 mx-auto" :src="image" :alt="brand.title" />
         </div>
-        <div class="lg:w-1/2 lg:mt-10 order-1 lg:order-none lg:text-left text-center px-4">
+        <div
+          class="
+            lg:w-1/2 lg:mt-10
+            order-1
+            lg:order-none lg:text-left
+            text-center
+            px-4
+          "
+        >
           <div class="lg:self-center">
             <h2 class="lg:text-6xl mb-8 uppercase leading-none font-heading">
               <span class="block">{{ brand.title }}</span>
@@ -443,7 +597,14 @@
 
       <div
         v-else-if="id == 'mission' && brandPanel2"
-        class="flex flex-wrap lg:text-left text-center lg:pt-16 px-4 lg:mb-20 lg:px-20"
+        class="
+          flex flex-wrap
+          lg:text-left
+          text-center
+          lg:pt-16
+          px-4
+          lg:mb-20 lg:px-20
+        "
       >
         <div class="lg:w-1/2 px-2 lg:mt-10 order-1 lg:order-none">
           <div class="lg:self-center">
@@ -537,8 +698,7 @@
       >
         <div
           class="
-            lg:w-1/2
+            lg:w-1/2 lg:mt-10
-            lg:mt-10
             order-1
             lg:order-none
             text-left
@@ -806,12 +966,9 @@
       >
         <div
           class="
-            lg:w-1/2
+            lg:w-1/2 lg:mt-5
-            lg:mt-5
             order-1
-            lg:order-none
+            lg:order-none lg:text-left lg:self-center
-            lg:text-left
-            lg:self-center
             text-center
           "
         >
@@ -925,8 +1082,7 @@
           rounded-lg
           shadow-xl
           overflow-hidden
-          lg:grid lg:grid-cols-2
+          lg:grid lg:grid-cols-2 lg:gap-4
-          lg:gap-4
         "
       >
         <div
@@ -934,12 +1090,9 @@
             pt-10
             pb-12
             px-6
-            sm:pt-16
+            sm:pt-16 sm:px-16
-            sm:px-16
+            lg:py-16 lg:pr-0
-            lg:py-16
+            xl:py-20 xl:px-15
-            lg:pr-0
-            xl:py-20
-            xl:px-15
           "
         >
           <div class="lg:self-center">
@@ -997,9 +1150,13 @@ export default {
 </script>
 
 <style scoped>
-.bg-about {
+.bg {
   background: #70dfc9;
   background: -webkit-linear-gradient(to right, #70dfc9, #ea1ff7);
   background: linear-gradient(to right, #70dfc9, #ea1ff7);
 }
+.gry{
+  background: #f2f2f2;
+}
+
 </style>

src/components/marketing/sections/cta-sections/Header.vue

@@ -78,7 +78,6 @@
             :href="link"
             >{{ button }}</a
           >
-          
         </div>
       </div>
     </div>
@@ -88,16 +87,13 @@
         flex flex-wrap
         text-center
         items-center
-        lg:text-left
+        lg:text-left lg:mb-10 lg:mt-4
-        lg:mb-10
-        lg:mt-4
         -mx-2
       "
       v-if="id == 'mission'"
     >
       <div class="lg:w-1/2 px-2 lg:pr-10 lg:mt-10 order-1 lg:order-none">
         <h1
-          
           class="
             text-center
             uppercase
@@ -166,7 +162,95 @@
           <!-- <a class="text-gray-600 hover:underline" href="#">Learn more</a> -->
         </div>
       </div>
+      <div class="lg:w-1/2 px-2">
+        <g-image class="mx-auto" :src="img" :alt="altImg" />
+      </div>
+    </div>
+
+    <!-- Farm -->
+    <div
+      class="
+        flex flex-wrap
+        text-center
+        items-center
+        lg:text-left lg:mb-20 lg:mt-24 lg:mx-40
+        
+      "
+      v-if="id == 'farm'"
+    >
       <div class="lg:w-1/2 px-2"><g-image :src="img" :alt="altImg" /></div>
+      <div class="lg:w-1/2 px-10 lg:mt-10 order-1 lg:order-none lg:max-w-2xl lg:mx-10">
+        <h1
+          class="
+            lg:text-left lg:text-6xl
+            font-normal
+            uppercase
+            mb-6
+            mt-20
+            leading-none
+            font-heading
+          "
+        >
+          {{ title }}
+          <br />
+          <span class="block leading-none font-bold">{{ title2 }}</span>
+        </h1>
+        <div
+          class="
+            mb-8
+            text-center text-2xl text-extrabold
+            lg:text-left
+            leading-tight
+            mx-auto
+            
+          "
+          v-html="excerpt"
+        ></div>
+        <div v-if="button" class="block lg:text-left text-center">
+          <a
+            v-if="link.includes('http')"
+            target="_blank"
+            class="
+              inline-block
+              bg-white
+              text-lg
+              learn-button
+              hover:bg-gray-400
+              bo
+              px-12
+              py-1
+              mr-5
+              mb-4
+              border-2
+              shadow
+              border-black
+            "
+            :href="link"
+            >{{ button }}</a
+          >
+          <a
+            v-else
+            class="
+              inline-block
+              bg-white
+              text-lg
+              learn-button
+              hover:bg-gray-400
+              bo
+              px-12
+              py-1
+              mr-5
+              mb-4
+              border-2
+              shadow
+              border-black
+            "
+            :href="link"
+            >{{ button }}</a
+          >
+          <!-- <a class="text-gray-600 hover:underline" href="#">Learn more</a> -->
+        </div>
+      </div>
     </div>
 
     <!-- <div
@@ -314,7 +398,11 @@
           >{{ button }}</a
         >
       </div>
-      <g-image class="order-2 lg:order-none mx-auto w-full" :src="img" :alt="altImg" />
+      <g-image
+        class="order-2 lg:order-none mx-auto w-full"
+        :src="img"
+        :alt="altImg"
+      />
     </div>
 
     <div
@@ -382,7 +470,11 @@
           >{{ button }}</a
         >
       </div>
-      <g-image class="order-2 lg:order-none mx-auto w-full" :src="img" :alt="altImg" />
+      <g-image
+        class="order-2 lg:order-none mx-auto w-full"
+        :src="img"
+        :alt="altImg"
+      />
     </div>
 
     <div
@@ -446,7 +538,6 @@
             :href="link"
             >{{ button }}</a
           >
-         
         </div>
       </div>
       <div class="lg:w-1/2 px-2 self-center">

src/components/marketing/sections/cta-sections/ShowcaseProducts.vue

@@ -1,11 +1,12 @@
 <template>
-  <div class="py-0 mb-5 mx-4">
+  <div class="my-5 lg:mx-40">
-    <div class="text-center mx-auto my-4" v-if="id == 'why'">
+    <div class="text-center mx-auto my-20" v-if="id == 'farm'">
-      <h1 class="text-5xl text-gray-900 font-light sm:text-9xl sm:leading-10">
+      <h1 class="text-9xl uppercase leading-none font-heading">
-        {{ main.title }} <span class="font-extrabold">{{ main.subtitle }}</span>
+        {{ main.title }}
       </h1>
+      <span class="text-3xl font-normal">{{ main.subtitle }}</span>
       <div
-        class="mt-3 max-w-2xl mx-auto text-gray-600 sm:mt-4"
+        class="max-w-3xl mb-10 py-2 text-xl mx-auto leading-tight tracking-wide"
         v-html="main.content"
       ></div>
     </div>
@@ -143,8 +144,8 @@
 
     <!-- why -->
     <div
-      class="grid grid-cols-1 gap-4 sm:grid-cols-2 text-center"
+      class="grid grid-cols-1 gap-4 sm:grid-cols-3 text-center max-w-7xl mx-auto"
-      v-else-if="id == 'why'"
+      v-else-if="id == 'farm'"
     >
       <div
         v-for="(product, idx) in products"
@@ -158,7 +159,7 @@
           <div class="product font-bold text-2xl pt-5">
             {{ product.title }}
           </div>
-          <div v-html="product.content" class="product p-5 text-gray-600"></div>
+          <div v-html="product.content" class="product py-10 font-light text-xl px-2"></div>
           <div v-if="product.button" class="product mb-3 py-5 text-center">
             <a
               v-if="product.link.includes('http')"
@@ -348,6 +349,6 @@ export default {
   height: 400px;
 }
 .product {
-  background-color: #ebfefd;
+  background-color: #f2f2f2;
 }
 </style>

src/templates/MarkdownPage.vue

@@ -9,6 +9,7 @@
         "
         :id="$page.markdownPage.id"
         :title="$page.markdownPage.header_title"
+        :title2="$page.markdownPage.header_title2"
         :slogan="$page.markdownPage.header_slogan"
         :image="$page.markdownPage.header_image"
         :altImg="$page.markdownPage.header_altImg"
@@ -20,7 +21,10 @@
       <BrandPanel
         :id="$page.markdownPage.id"
         v-if="
-          $page.markdownPage.brandPanel && $page.markdownPage.id !== 'tft'
+          $page.markdownPage.brandPanel &&
+          $page.markdownPage.id !== 'tft' &&
+          $page.markdownPage.brandPanel &&
+          $page.markdownPage.id !== 'farm'
         "
         :brand="$page.markdownPage.brandPanel"
       />
@@ -29,7 +33,10 @@
         :id="$page.markdownPage.id"
         :brand="$page.markdownPage.brandPanel2"
         v-if="
-          $page.markdownPage.brandPanel2 && $page.markdownPage.id !== 'tft'
+          $page.markdownPage.brandPanel2 &&
+          $page.markdownPage.id !== 'tft' &&
+          $page.markdownPage.brandPanel2 &&
+          $page.markdownPage.id !== 'farm'
         "
         :brandPanel2="true"
       />
@@ -38,7 +45,10 @@
         :id="$page.markdownPage.id"
         :brand="$page.markdownPage.brandPanel3"
         v-if="
-          $page.markdownPage.brandPanel3 && $page.markdownPage.id !== 'tft'
+          $page.markdownPage.brandPanel3 &&
+          $page.markdownPage.id !== 'tft' &&
+          $page.markdownPage.brandPanel3 &&
+          $page.markdownPage.id !== 'farm'
         "
         :brandPanel3="true"
       />
@@ -56,6 +66,7 @@
           $page.markdownPage.header_title &&
           $page.markdownPage.header_title != '' &&
           $page.markdownPage.id !== 'mission' &&
+          $page.markdownPage.id !== 'farm' &&
           $page.markdownPage.id !== 'grid' &&
           $page.markdownPage.id !== 'tft'
         "
@@ -73,13 +84,18 @@
         v-if="
           $page.markdownPage.cta &&
           $page.markdownPage.id !== 'grid' &&
-          $page.markdownPage.id !== 'tft'
+          $page.markdownPage.id !== 'tft' &&
+          $page.markdownPage.id !== 'farm'
         "
         :cta="$page.markdownPage.cta"
       />
       <CallToAction
         :id="$page.markdownPage.id"
-        v-if="$page.markdownPage.cta2 && $page.markdownPage.id !== 'tft'"
+        v-if="
+          $page.markdownPage.cta2 &&
+          $page.markdownPage.id !== 'tft' &&
+          $page.markdownPage.id !== 'farm'
+        "
         :cta="$page.markdownPage.cta2"
         :textOnly="true"
       />
@@ -126,9 +142,7 @@
       <BrandPanel
         :id="$page.markdownPage.id"
         :brand="$page.markdownPage.brandPanel4"
-        v-if="
+        v-if="$page.markdownPage.brandPanel4 && $page.markdownPage.id !== 'tft'"
-          $page.markdownPage.brandPanel4 && $page.markdownPage.id !== 'tft'
-        "
         :brandPanel4="true"
       />
 
@@ -138,7 +152,8 @@
         :tft="$page.markdownPage.tft"
       />
 
-      <Features class="lg:my-20"
+      <Features
+        class="lg:my-20"
         :id="$page.markdownPage.id"
         v-if="$page.markdownPage.network.length > 0"
         :main="$page.markdownPage.networkMain"
@@ -154,17 +169,13 @@
       <BrandPanel
         :id="$page.markdownPage.id"
         :brand="$page.markdownPage.brandPanel2"
-        v-if="
+        v-if="$page.markdownPage.brandPanel2 && $page.markdownPage.id == 'tft'"
-          $page.markdownPage.brandPanel2 && $page.markdownPage.id == 'tft'
-        "
         :brandPanel2="true"
       />
       <BrandPanel
         :id="$page.markdownPage.id"
         :brand="$page.markdownPage.brandPanel3"
-        v-if="
+        v-if="$page.markdownPage.brandPanel3 && $page.markdownPage.id == 'tft'"
-          $page.markdownPage.brandPanel3 && $page.markdownPage.id == 'tft'
-        "
         :brandPanel3="true"
       />
 
@@ -206,6 +217,40 @@
         :main="$page.markdownPage.productsMain"
         :products="$page.markdownPage.productData"
       />
+
+      <CallToAction
+        :id="$page.markdownPage.id"
+        v-if="$page.markdownPage.cta && $page.markdownPage.id == 'farm'"
+        :cta="$page.markdownPage.cta"
+      />
+
+      <BrandPanel
+        :id="$page.markdownPage.id"
+        :brand="$page.markdownPage.brandPanel"
+        v-if="$page.markdownPage.brandPanel && $page.markdownPage.id == 'farm'"
+      />
+
+      <BrandPanel
+        :id="$page.markdownPage.id"
+        :brand="$page.markdownPage.brandPanel3"
+        v-if="$page.markdownPage.brandPanel3 && $page.markdownPage.id == 'farm'"
+        :brandPanel3="true"
+      />
+
+      <CallToAction
+        :id="$page.markdownPage.id"
+        v-if="$page.markdownPage.cta2 && $page.markdownPage.id == 'farm'"
+        :cta="$page.markdownPage.cta2"
+        :lastCta="true"
+      />
+
+      <BrandPanel
+        :id="$page.markdownPage.id"
+        :brand="$page.markdownPage.brandPanel2"
+        v-if="$page.markdownPage.brandPanel2 && $page.markdownPage.id == 'farm'"
+        :brandPanel2="true"
+      />
+
       <AppListItem
         v-if="
           $page.markdownPage.appData && $page.markdownPage.appData.length > 0
@@ -245,7 +290,8 @@
         v-if="$page.markdownPage.header"
         :header="$page.markdownPage.header"
       />
-      <g-image class="w-3/4 mx-auto"
+      <g-image
+        class="w-3/4 mx-auto"
         v-if="$page.markdownPage.solution_image2"
         :src="$page.markdownPage.solution_image2.src"
       />
@@ -318,6 +364,7 @@
         header_excerpt
         header_altImg
         header_title
+        header_title2
         header_image
         header_slogan
         button
@@ -408,6 +455,7 @@
         }
         cta2{
           title
+          subtitle
           image
           button
           link
@@ -440,6 +488,7 @@
         brandPanel2{
          id
          title
+         subtitle
          btnTxt
          sourceUrl
          content
@@ -449,6 +498,7 @@
          id
          title
          btnTxt
+         subtitle
          sourceUrl
          sourceUrl2
          content