diff --git a/content/page/home/cta3/cta3.md b/content/page/home/cta3/cta3.md
index ff9d1605d..b139f8c93 100644
--- a/content/page/home/cta3/cta3.md
+++ b/content/page/home/cta3/cta3.md
@@ -1,7 +1,7 @@
 ---
 id: home_cta3
-title1:
-title2: 
+title: ''
+title2: ''
 button: Explore the ThreeFold Universe
 link: /universe
 button2: ''
diff --git a/content/page/home/cta4/cta4.md b/content/page/home/cta4/cta4.md
index 2ae7e90c2..c511c568e 100644
--- a/content/page/home/cta4/cta4.md
+++ b/content/page/home/cta4/cta4.md
@@ -1,9 +1,9 @@
 ---
 id: home_cta4
-title1: 'is the'
-title2: 'only solution'
-slogan : 'this'
-subtitle : 'the threefold grid' 
+title: is the
+title2: only solution
+slogan : this
+subtitle : the threefold grid
 button: ''
 link: ''
 button2: ''
diff --git a/content/page/home/cta5/cta5.md b/content/page/home/cta5/cta5.md
index 6c35dca11..fe0daaa43 100644
--- a/content/page/home/cta5/cta5.md
+++ b/content/page/home/cta5/cta5.md
@@ -1,9 +1,9 @@
 ---
 id: home_cta5
 title: ''
-button: 'Know More'
+button: Know More
 link: 'https://threefold.io/info/threefold#/threefold__grid_why'
-button2: 'Live Stats'
+button2: Live Stats
 link2: 'https://explorer.threefold.io/'
 button3: ''
 link3: ''
diff --git a/content/page/support/header2/header2.md b/content/page/support/header2/header2.md
index 17637c762..7e22e795e 100644
--- a/content/page/support/header2/header2.md
+++ b/content/page/support/header2/header2.md
@@ -1,9 +1,9 @@
 ---
 id: forum_button
 title: ''
-subtitle: 
+subtitle: ''
 btn1: ThreeFold Forum
-link1: https://forum.threefold.io/
+link1: 'https://forum.threefold.io/'
 btn2: ''
 link2: ''
 ---
diff --git a/content/page/support/support.md b/content/page/support/support.md
index 5c1831c3e..5d03827a4 100644
--- a/content/page/support/support.md
+++ b/content/page/support/support.md
@@ -10,12 +10,11 @@ header_altImg: support
 header_excerpt: ''
 button: ''
 link: ''
-productsMain2: faqMain
-productData2: [tf_faq, farming_faq, token_faq]
+productsMain: faqMain
+productData: [tf_faq, farming_faq, token_faq]
 header: forum
 solution_image2: ./forum.png
 header2: forum_button
-header3: telegram
 logosMain: support_logosMain
 logos: [support_tele_1, support_tele_4, support_tele_3, support_tele_2]
 header4: live_chat
diff --git a/gridsome.config.js b/gridsome.config.js
index 2ecc079f3..39d1ff7a9 100644
--- a/gridsome.config.js
+++ b/gridsome.config.js
@@ -11,21 +11,6 @@ module.exports = {
     plugins: [
 
         // Local models
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'Card',
-                path: './content/page/**/cards/**/*.md',
-            }
-        },
-
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'Slide',
-                path: './content/page/**/sliders/**/*.md',
-            }
-        },
 
         {
             use: '@gridsome/source-filesystem',
@@ -35,22 +20,6 @@ module.exports = {
             }
         },
 
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'HowItWorks',
-                path: './content/page/**/how_it_works/**/*.md',
-            }
-        },
-
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'HowItWorks_2',
-                path: './content/page/**/how_it_works_2/**/*.md',
-            }
-        },
-
         {
             use: '@gridsome/source-filesystem',
             options: {
@@ -62,7 +31,7 @@ module.exports = {
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'Header',
+                typeName: 'Header2',
                 path: './content/page/**/header2/*.md',
             }
         },
@@ -70,7 +39,7 @@ module.exports = {
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'Header',
+                typeName: 'Header3',
                 path: './content/page/**/header3/*.md',
             }
         },
@@ -78,18 +47,11 @@ module.exports = {
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'Header',
+                typeName: 'Header4',
                 path: './content/page/**/header4/*.md',
             }
         },
 
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'SolutionsHeader',
-                path: './content/page/**/headerSolution/*.md',
-            }
-        },
 
         {
             use: '@gridsome/source-filesystem',
@@ -101,29 +63,15 @@ module.exports = {
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'ProductTitle',
-                path: './content/page/**/productData/**/*.md',
+                typeName: 'ProductMain',
+                path: './content/page/**/productData/main/*.md',
             }
         },
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'Product',
-                path: './content/page/**/productData2/**/*.md',
-            }
-        },
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'ProductTitle',
-                path: './content/page/**/productsMain2/**/*.md',
-            }
-        },
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'Features',
-                path: './content/page/**/features/**/*.md',
+                typeName: 'FeaturesMain2',
+                path: './content/page/**/features2/main/*.md',
             }
         },
         {
@@ -160,7 +108,7 @@ module.exports = {
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'Cta',
+                typeName: 'Cta2',
                 path: './content/page/**/cta2/*.md',
             }
         },
@@ -168,7 +116,7 @@ module.exports = {
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'Cta',
+                typeName: 'Cta3',
                 path: './content/page/**/cta3/*.md',
             }
         },
@@ -176,7 +124,7 @@ module.exports = {
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'Cta',
+                typeName: 'Cta4',
                 path: './content/page/**/cta4/*.md',
             }
         },
@@ -184,26 +132,11 @@ module.exports = {
         {
             use: '@gridsome/source-filesystem',
             options: {
-                typeName: 'Cta',
+                typeName: 'Cta5',
                 path: './content/page/**/cta5/*.md',
             }
         },
 
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'SignUp',
-                path: './content/page/**/signup/*.md',
-            }
-        },
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'About',
-                path: './content/about/**/*.md',
-            }
-        },
-
         {
             use: '@gridsome/source-filesystem',
             options: {
@@ -220,29 +153,6 @@ module.exports = {
             }
         },
 
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'Roadmap',
-                path: './content/page/**/roadmap/*.md',
-            }
-        },
-
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'PricingPlans',
-                path: './content/page/**/pricing_plans/**/*.md',
-            }
-        },
-
-        {
-            use: '@gridsome/source-filesystem',
-            options: {
-                typeName: 'Plans',
-                path: './content/page/**/withComparisonTable/**/*.md',
-            }
-        },
 
         {
             use: '@gridsome/source-filesystem',
@@ -441,47 +351,28 @@ module.exports = {
                 typeName: 'MarkdownPage',
                 path: './content/page/*/*.md',
                 refs: {
-                    cards: 'Card',
-                    slides: 'Slide',
                     contactData: 'Contact',
                     header: 'Header',
-                    header2: 'Header',
-                    header3: 'Header',
-                    header4: 'Header',
-                    headerSolution: 'SolutionsHeader',
-                    howItWorks: 'HowItWorks',
-                    howItWorksMain: 'HowItWorks',
-                    productsMain: 'ProductTitle',
+                    header2: 'Header2',
+                    header3: 'Header3',
+                    header4: 'Header4',
+                    productsMain: 'ProductMain',
                     productData: 'Product',
-                    productsMain2: 'ProductTitle',
-                    productData2: 'Product',
-                    appsMain: 'ProductTitle',
-                    appData: 'Product',
-                    featuresMain: 'Features',
-                    features: 'Features',
-                    featuresMain2: 'Features2',
+                    featuresMain2: 'FeaturesMain2',
                     features2: 'Features2',
                     logos: 'Logo',
                     logosMain: 'LogosMain',
                     cta: 'Cta',
-                    cta2: 'Cta',
-                    cta3: 'Cta',
-                    cta4: 'Cta',
-                    cta5: 'Cta',
-                    signup: 'SignUp',
+                    cta2: 'Cta2',
+                    cta3: 'Cta3',
+                    cta4: 'Cta4',
+                    cta5: 'Cta5',
                     comparisonMain: 'ComparisonMain',
                     comparisonSecs: 'Comparison',
-                    howItWorksMain_2: 'HowItWorks_2',
-                    howItWorks_2: 'HowItWorks_2',
-                    roadmap: 'Roadmap',
-                    pricing_plansMain: 'PricingPlans',
-                    pricingPlans: 'PricingPlans',
                     jobsMain: 'JobsMain',
-                    plans: 'Plans',
                     inTheNews: 'InTheNews',
                     brandPanel: 'BrandPanel',
                     brandPanel2: 'BrandPanel2',
-                    allSlides: 'About',
                     partenershipsMain: 'PartenershipsMain',
                     partnerships: 'Partenerships',
                     stats: 'Stats',
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
index ab0319c18..be9a3cef8 100644
--- a/src/pages/Index.vue
+++ b/src/pages/Index.vue
@@ -158,15 +158,6 @@
          button
          url
        }
-        cards{
-          id
-          title
-          image
-          button
-          link
-          order
-          content
-        }
         cta{
           id
           title
@@ -212,7 +203,7 @@
         }
         cta3{
           id
-          title1
+          title
           title2
           content
           button
@@ -224,7 +215,7 @@
         }
         cta4{
           id
-          title1
+          title
           title2
           subtitle
           slogan
@@ -309,10 +300,6 @@
           image
           url
         }
-        headerSolution{
-         subtitle
-         content
-       }
         inTheNews {
           id
           content
@@ -321,14 +308,6 @@
             logo
           }
         }
-        signup{
-          id
-          title
-          button1
-          link1
-          button2
-          link2
-        }
         videoPanel {
           id
           video
diff --git a/src/templates/MarkdownPage.vue b/src/templates/MarkdownPage.vue
index f1fefdc3b..a38a6a600 100644
--- a/src/templates/MarkdownPage.vue
+++ b/src/templates/MarkdownPage.vue
@@ -224,12 +224,12 @@
       <ShowcaseProducts
         class="my-20"
         v-if="
-          $page.markdownPage.productData2 &&
-          $page.markdownPage.productData2.length > 0
+          $page.markdownPage.productData &&
+          $page.markdownPage.productData.length > 0
         "
         :id="$page.markdownPage.id"
-        :main="$page.markdownPage.productsMain2"
-        :products="$page.markdownPage.productData2"
+        :main="$page.markdownPage.productsMain"
+        :products="$page.markdownPage.productData"
       />
 
       <SolutionsHeader
@@ -248,10 +248,10 @@
         :header="$page.markdownPage.header2"
       />
 
-      <SolutionsHeader
+      <!-- <SolutionsHeader
         v-if="$page.markdownPage.header3"
         :header="$page.markdownPage.header3"
-      />
+      /> -->
 
       <logoShowcase
         v-if="$page.markdownPage.logos.length > 0"
@@ -335,15 +335,6 @@
          link1
          btn2
          link2
-       }
-        header3{
-         title
-         subtitle
-         content
-         btn1
-         link1
-         btn2
-         link2
        }
         header4{
          title
@@ -370,37 +361,6 @@
          image
          button
          link
-       }
-       productsMain2{
-          id
-          title
-          subtitle
-          content
-          button
-          link
-       #  image
-        }
-       productData2{
-         id
-         title
-         content
-         image
-         button
-         link
-       }
-      appsMain{
-          id
-          title
-       # slogan
-          content
-       #  image
-        }
-       appData{
-         id
-         title
-         content
-         image
-         link
        }
         comparisonMain{
           id
@@ -442,7 +402,6 @@
         }
         cta3{
           title
-          slogan
           content
           button
           link
@@ -523,14 +482,6 @@
          mail
          phone
       }
-      signup{
-          id
-          title
-          button1
-          link1
-          button2
-          link2
-      }
      pageHeader {
       id
       title