diff --git a/Gemfile b/Gemfile
index 02e01cb111..d2f1f2d5a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem "jekyll", "~> 4.1"
+gem "jekyll"
 gem "jekyll-environment-variables"
\ No newline at end of file
diff --git a/README.md b/README.md
index 76d7b0855d..292e416c27 100755
--- a/README.md
+++ b/README.md
@@ -74,15 +74,21 @@ This theme has been tested to work with Github Pages (and Github Project Pages).
 
 For example the site https://zerostaticthemes.github.io/jekyll-serif-theme would have `baseurl: "/jekyll-serif-theme/"`
 
-## Other
+## License & Credits
 
 ### Credits
 
 - Beautiful royalty free Illustrations by Icons8 - https://icons8.com/illustrations/style--pixeltrue
+- Stock images by Unsplash - https://unsplash.com/
+- Feature icons by Noun Project - https://thenounproject.com/
 
 ### License
 
-This theme is open source under the MIT license. Please be respectful 🙏🏽
+This theme is open source under the MIT license. Please be respectful 🙏🏽 Leave me as an original author in the LICENSE file if you fork or copy this theme. 
 
-* If you fork or copy this theme please leave me as an original author in the LICENSE file on line 3 where I am listed as the author.
-* Please don't create ports of this theme without at least asking me. Yes this theme is open-source but I've had several people "port" this theme (with only minor changes) and then advertise the theme as their own. Then they don't update it and it starts to get old and break etc. Now lots of people are finding these old crappy versions of the theme.
+> Do not create ports of this theme. Do You can't re-distribute or re-sell this theme as a theme, stock, in a tool or as a template.
+
+### Other Versions
+
+- [Hugo Serif Theme](https://github.com/zerostaticthemes/hugo-serif-theme) (official)
+- [Gatsby Serif Theme](https://github.com/zerostaticthemes/gatsby-serif-theme) (official)
diff --git a/_config.yml b/_config.yml
index cfc89d62f9..bbed00abd1 100755
--- a/_config.yml
+++ b/_config.yml
@@ -2,35 +2,29 @@ baseurl: '/'
 permalink: pretty
 title: 'Jekyll Serif'
 
-google_analytics_id: ""
-
-homepage:
-  show_call_box: true
-
 logo:
   mobile: "images/logo/logo-mobile.svg"
   desktop: "images/logo/logo.svg"
   desktop_height: "36px"
 
-footer:
-  copyright_text: 'Free Jekyll theme by <a class="zerostatic" href="https://www.zerostatic.io">www.zerostatic.io</a>'
-
-seo:
-  meta_og_title: "Jekyll Serif Theme"
-  meta_og_type: "website"
-  meta_og_url: "https://jekyll-serif.netlify.app"
-  meta_og_image: "https://raw.githubusercontent.com/zerostaticthemes/jekyll-serif-theme/master/screenshots/tn.png"
-  meta_og_description: "Jekyll Serif is a modern business theme for Hugo. It contains content types for the archetypical business website. The theme is fully responsive, blazing fast and artfully illustrated."
-  meta_twitter_card: "summary"
-  meta_twitter_site: "@zerostaticio"
-  meta_twitter_creator: "@zerostaticio"
-
 collections:
   services:
     output: true
   team:
     output: true
 
+defaults:
+  - scope:
+      path: ""
+      type: "services"
+    values:
+      layout: "service"
+  - scope:
+      path: ""
+      type: "team"
+    values:
+      layout: "team"
+
 sass:
   indentWidth: 4
   style: compact # possible values: nested expanded compact compressed
diff --git a/_data/seo.yml b/_data/seo.yml
new file mode 100644
index 0000000000..64d106b3b5
--- /dev/null
+++ b/_data/seo.yml
@@ -0,0 +1,4 @@
+google_analytics_id: ""  
+meta_twitter_site: "@zerostaticio"
+meta_twitter_creator: "@zerostaticio"
+copyright_text: 'Free Jekyll theme by <a class="zerostatic" href="https://www.zerostatic.io">www.zerostatic.io</a>'
diff --git a/_includes/google-analytics.html b/_includes/google-analytics.html
index 8b50e6eb1c..aa70c78fe0 100644
--- a/_includes/google-analytics.html
+++ b/_includes/google-analytics.html
@@ -11,8 +11,8 @@
       gtag('js', new Date());
       gtag('config', '{{ $gid }}');
     </script>
-    {% elsif site.google_analytics_id %}
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics_id }}"></script>
+    {% elsif site.data.seo.google_analytics_id %}
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.data.seo.google_analytics_id }}"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
 
@@ -20,7 +20,7 @@
         dataLayer.push(arguments);
       }
       gtag('js', new Date());
-      gtag('config', '{{ site.google_analytics_id }}');
+      gtag('config', '{{ site.data.seo.google_analytics_id }}');
     </script>
     {% endif %}
 {% endif %}
\ No newline at end of file
diff --git a/_includes/sub-footer.html b/_includes/sub-footer.html
index 6e72935453..ec8cd308bf 100644
--- a/_includes/sub-footer.html
+++ b/_includes/sub-footer.html
@@ -6,8 +6,8 @@
           {% if site.data.social %}
             {% include social.html %}
           {% endif %}
-          {% if site.footer.copyright_text %}
-          <div class="copyright">{{ site.footer.copyright_text }}</div>
+          {% if site.data.seo.copyright_text %}
+          <div class="copyright">{{ site.data.seo.copyright_text }}</div>
           {% endif %}
         </div>
       </div>
diff --git a/_layouts/contact.html b/_layouts/contact.html
index eac33fcc88..2f9cb6ddae 100644
--- a/_layouts/contact.html
+++ b/_layouts/contact.html
@@ -1,7 +1,7 @@
 ---
 title: Contact
 layout: default
-bodyClass: page-contact
+bodyClass: "page-contact"
 ---
 
 <div class="container pb-6 pt-6 pt-md-10 pb-md-10">
diff --git a/_layouts/default.html b/_layouts/default.html
index 82b2f81d2d..08f63cf5c2 100755
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta charset="utf-8">
   <title>{% if page.title %}{{page.title}}{% else %}{{ site.title | escape }}{% endif %}</title>
@@ -7,19 +8,20 @@
   <link rel="icon" type="image/png" href="{{ '/images/favicon-32x32.svg' | relative_url }}">
   <link href="https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;700&display=swap" rel="stylesheet">
   <link href="{{ '/assets/css/style.css' | relative_url }}" rel="stylesheet">
-  {% if page.description %}
-  <meta name="description" content="{{ page.description }}" />
-  {% endif %}
-  <meta property="og:title" content="{{ site.seo.meta_og_title }}" />
-  <meta property="og:type" content="{{ site.seo.meta_og_type }}" />
-  <meta property="og:url" content="{{ site.seo.meta_og_url }}" />
-  <meta property="og:image" content="{{ site.seo.meta_og_image }}" />
-  <meta property="og:description" content="{{ site.seo.meta_og_description }}" />
-  <meta name="twitter:card" content="{{ site.seo.meta_twitter_card }}" />
-  <meta name="twitter:site" content="{{ site.seo.meta_twitter_site }}" />
-  <meta name="twitter:creator" content="{{ site.seo.meta_twitter_creator }}" />
+  
+  {% if page.description %}<meta name="description" content="{{ page.description }}" />{% endif %}
+  {% if page.meta_title %}<meta property="og:title" content="{{ page.meta_title }}"/>{% else %}<meta property="og:title" content="{{ page.title }}"/>{% endif %}
+  <meta property="og:type" content="website"/>
+  <meta property="og:url" content="{{ url }}"/>
+  {% if page.image %}<meta property="og:image" content="{{ page.image | absolute_url }}"/>{% endif %}
+  {% if page.description %}<meta property="og:description" content="{{ page.description }}"/>{% endif %}
+  <meta name="twitter:card" content="summary"/>
+  {% if site.data.seo.meta_twitter_site %}<meta name="twitter:site" content="{{ site.seo.meta_twitter_site }}"/>{% endif %}
+  {% if site.data.seo.meta_twitter_creator %}<meta name="twitter:creator" content="{{ site.seo.meta_twitter_creator }}"/>{% endif %}
+
 </head>
-<body class='page {{page.bodyClass}}'>
+
+<body class='page {{layout.bodyClass}}'>
   {% include main-menu-mobile.html %}
   <div id="wrapper" class="wrapper">
     {% include header.html headerClass='header-extra' %}
diff --git a/_layouts/home.html b/_layouts/home.html
index f3a90e996e..89ff970dd4 100755
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -1,7 +1,6 @@
 ---
-title: Jekyll Serif - Jekyll Small Business Theme
 layout: default
-bodyClass: page-home
+bodyClass: "page-home"
 ---
 
 <div class="intro">
@@ -9,7 +8,7 @@
     <div class="row justify-content-start">
       <div class="col-12 col-md-7 col-lg-6 order-2 order-md-1">
         {{ content }}
-        {% if site.homepage.show_call_box %}
+        {% if page.show_call_box %}
           {% include call.html show_button=true %}
         {% endif %}
       </div>
diff --git a/_layouts/page.html b/_layouts/page.html
index 8d2696e6a4..766d222bd5 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+bodyClass: "page-basic"
 ---
 
 <div class="container pb-6 pt-6 pt-md-10 pb-md-10">
diff --git a/_layouts/service.html b/_layouts/service.html
index 9be334e7f0..85821d1fa9 100644
--- a/_layouts/service.html
+++ b/_layouts/service.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+bodyClass: "page-service"
 ---
 
 <div class="container pb-6 pt-6 pt-md-10 pb-md-10">
diff --git a/_layouts/services.html b/_layouts/services.html
index 0ff2381dac..dda8b2d22d 100644
--- a/_layouts/services.html
+++ b/_layouts/services.html
@@ -1,6 +1,6 @@
 ---
 layout: default
-bodyClass: page-services-list
+bodyClass: "page-services"
 ---
 
 <div class="intro">
diff --git a/_layouts/team.html b/_layouts/team.html
index cec4c23210..68219cb48e 100644
--- a/_layouts/team.html
+++ b/_layouts/team.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+bodyClass: "page-team"
 ---
 
 <div class="container pb-6 pt-6 pt-md-10 pb-md-10">
diff --git a/_layouts/teams.html b/_layouts/teams.html
index e0485ea314..67d06e2c64 100644
--- a/_layouts/teams.html
+++ b/_layouts/teams.html
@@ -1,6 +1,6 @@
 ---
 layout: default
-bodyClass: page-team-list
+bodyClass: "page-teams"
 ---
 
 <div class="intro">
diff --git a/_sass/pages/_home.scss b/_sass/pages/_page-home.scss
similarity index 100%
rename from _sass/pages/_home.scss
rename to _sass/pages/_page-home.scss
diff --git a/_sass/pages/services/_page-services-single.scss b/_sass/pages/_page-service.scss
similarity index 89%
rename from _sass/pages/services/_page-services-single.scss
rename to _sass/pages/_page-service.scss
index 88b9449efa..e9504c8204 100644
--- a/_sass/pages/services/_page-services-single.scss
+++ b/_sass/pages/_page-service.scss
@@ -1,4 +1,4 @@
-.page-services-single {
+.page-service {
   .content {
     > p {
       &:first-of-type {
diff --git a/_sass/pages/_page-teams.scss b/_sass/pages/_page-teams.scss
new file mode 100644
index 0000000000..76fec90c9d
--- /dev/null
+++ b/_sass/pages/_page-teams.scss
@@ -0,0 +1,52 @@
+.page-teams {
+  .team-summary {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    .team-image {
+      height: 60px;
+      width: 60px;
+      margin-right: 10px;
+      border-radius: 50%;
+      overflow: hidden;
+      img {
+        width: 60px;
+      }
+    }
+    .team-meta {
+      flex: 1;
+      h2 {
+        margin: 0;
+        font-size: 22px;
+        font-weight: normal;
+      }
+      p {
+        color: $black;
+        text-transform: uppercase;
+        margin: 0;
+        font-size: 12px;
+        font-weight: 500;
+      }
+    }
+    .team-content {
+      margin-top: 20px;
+      flex: 1 0 100%;
+    }
+  }
+
+  .team-summary-large {
+    background-color: $white-offset;
+    padding: 30px;
+    border-radius: 3px;
+    .team-image {
+      height: 90px;
+      width: 90px;
+      margin-right: 20px;
+      border-radius: 50%;
+      overflow: hidden;
+      img {
+        width: 90px;
+      }
+    }
+  }
+}
diff --git a/_sass/pages/team/_team-summary.scss b/_sass/pages/team/_team-summary.scss
deleted file mode 100644
index 44e19cc0a6..0000000000
--- a/_sass/pages/team/_team-summary.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-.team-summary {
-  display: flex;
-  flex-wrap: wrap;
-  flex-direction: row;
-  .team-image {
-    height: 60px;
-    width: 60px;
-    margin-right: 10px;
-    border-radius: 50%;
-    overflow: hidden;
-    img {
-      width: 60px;
-    }
-  }
-  .team-meta {
-    flex: 1;
-    h2 {
-      margin: 0;
-      font-size: 22px;
-      font-weight: normal;
-    }
-    p {
-      color: $black;
-      text-transform: uppercase;
-      margin: 0;
-      font-size: 12px;
-      font-weight: 500;
-    }
-  }
-  .team-content {
-    margin-top: 20px;
-    flex: 1 0 100%;
-  }
-}
-
-.team-summary-large {
-  background-color: $white-offset;
-  padding: 30px;
-  border-radius: 3px;
-  .team-image {
-    height: 90px;
-    width: 90px;
-    margin-right: 20px;
-    border-radius: 50%;
-    overflow: hidden;
-    img {
-      width: 90px;
-    }
-  }
-}
\ No newline at end of file
diff --git a/_services/accounting.md b/_services/accounting.md
index e8591392ca..20e0b06af5 100644
--- a/_services/accounting.md
+++ b/_services/accounting.md
@@ -3,7 +3,6 @@ title: "Accounting"
 date: 2018-11-18T12:33:46+10:00
 featured: true
 weight: 1
-layout: service
 ---
 
 Financial accounting (or financial accountancy) is the field of accounting concerned with the **summary, analysis and reporting** of financial transactions related to a business.
diff --git a/_services/business-advisory.md b/_services/business-advisory.md
index 1623f85fc6..f2079ca00a 100644
--- a/_services/business-advisory.md
+++ b/_services/business-advisory.md
@@ -3,7 +3,6 @@ title: "Business Advisory"
 date: 2018-11-28T15:14:39+10:00
 featured: true
 weight: 2
-layout: service
 ---
 
 Lorem markdownum, dictis umbrosum dextrum, Lelegeia quamquam distantes pares
diff --git a/_services/business-sales.md b/_services/business-sales.md
index d37604dd9d..5823833937 100644
--- a/_services/business-sales.md
+++ b/_services/business-sales.md
@@ -3,7 +3,6 @@ title: "Business Sales"
 date: 2018-11-28T15:15:26+10:00
 featured: true
 weight: 3
-layout: service
 ---
 
 Cyanee nec pedicis positi. Esse et diem forte quoque et ieiunia
diff --git a/_services/mergers.md b/_services/mergers.md
index 4b929c260d..56b85cb561 100644
--- a/_services/mergers.md
+++ b/_services/mergers.md
@@ -3,7 +3,6 @@ title: "Mergers"
 date: 2018-11-28T15:15:34+10:00
 featured: true
 weight: 4
-layout: service
 ---
 
 Lorem markdownum aequalis strigis. Saetigeri iubeas, vultu huic alvum nondum
diff --git a/_team/mike-vance.md b/_team/mike-vance.md
index c938c24b0d..aa131be305 100644
--- a/_team/mike-vance.md
+++ b/_team/mike-vance.md
@@ -6,7 +6,6 @@ image: 'images/team/joseph-gonzalez-399972-unsplash.jpg'
 jobtitle: 'Art Director'
 linkedinurl: ""
 weight: 3
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.
diff --git a/_team/robert-johnson.md b/_team/robert-johnson.md
index fbc2a6440b..5f8b41048a 100644
--- a/_team/robert-johnson.md
+++ b/_team/robert-johnson.md
@@ -6,7 +6,6 @@ image: 'images/team/vince-fleming-613817-unsplash.jpg'
 jobtitle: 'Developer'
 linkedinurl: "https://www.linkedin.com/"
 weight: 3
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.
diff --git a/_team/sage-kirk.md b/_team/sage-kirk.md
index 03a543b55d..ee2338d2c0 100644
--- a/_team/sage-kirk.md
+++ b/_team/sage-kirk.md
@@ -7,7 +7,6 @@ jobtitle: "Accounting Partner"
 linkedinurl: "https://www.linkedin.com/example2"
 promoted: true
 weight: 2
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.
diff --git a/_team/susan-shelton.md b/_team/susan-shelton.md
index 28a639e431..8df0f5cbac 100644
--- a/_team/susan-shelton.md
+++ b/_team/susan-shelton.md
@@ -5,7 +5,6 @@ draft: false
 image: 'images/team/cristian-newman-94319-unsplash.jpg'
 jobtitle: 'Developer'
 weight: 5
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.
diff --git a/_team/tamara-ells.md b/_team/tamara-ells.md
index 152a60df54..bfc63529b3 100644
--- a/_team/tamara-ells.md
+++ b/_team/tamara-ells.md
@@ -5,7 +5,6 @@ draft: false
 image: 'images/team/michael-dam-258165-unsplash.jpg'
 jobtitle: 'UI Designer'
 weight: 4
-layout: team
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum arcu vitae elementum curabitur vitae nunc sed. Tortor at risus viverra adipiscing at in.
diff --git a/about.md b/about.md
index ccb53e5b35..1604cbbda3 100644
--- a/about.md
+++ b/about.md
@@ -1,5 +1,5 @@
 ---
-title: 'About'
+title: "About"
 date: 2018-02-22T17:01:34+07:00
 layout: page
 bodyClass: page-about
diff --git a/assets/css/style.scss b/assets/css/style.scss
index 7cec731b79..e696ae97fe 100755
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -57,9 +57,9 @@ $sub-footer-text-color: $white;
 @import 'components/social';
 
 // Pages
-@import 'pages/home';
-@import 'pages/team/team-summary';
-@import 'pages/services/page-services-single';
+@import 'pages/page-home';
+@import 'pages/page-teams';
+@import 'pages/page-service';
 
 body {
   font-size: 16px;
diff --git a/contact.md b/contact.md
index b617b23055..852158f347 100644
--- a/contact.md
+++ b/contact.md
@@ -1,7 +1,6 @@
 ---
 title: Contact
 layout: contact
-bodyClass: page-contact
 ---
 
 Lorem markdownum aequalis strigis. Saetigeri iubeas, vultu huic alvum nondum de obside ut laniavit arbor palmis, cum quin. Rupes vetat videndo, armigerae crimen habet Priamum nec.
diff --git a/index.md b/index.md
index b6255ee0bd..7bb6f63f25 100755
--- a/index.md
+++ b/index.md
@@ -5,6 +5,7 @@ description: Jekyll Serif contains content types for a typical business website.
 intro_image: "images/illustrations/pointing.svg"
 intro_image_absolute: true
 intro_image_hide_on_mobile: true
+show_call_box: true
 ---
 
 # Serif - A Jekyll Business Theme.
diff --git a/screenshots/github-social-preview.png b/screenshots/github-social-preview.png
deleted file mode 100644
index d12635699b..0000000000
Binary files a/screenshots/github-social-preview.png and /dev/null differ
diff --git a/screenshots/jekyll-serif-github-readme-screenshot.png b/screenshots/jekyll-serif-github-readme-screenshot.png
deleted file mode 100644
index b71661a2c2..0000000000
Binary files a/screenshots/jekyll-serif-github-readme-screenshot.png and /dev/null differ
diff --git a/screenshots/screenshot.png b/screenshots/screenshot.png
deleted file mode 100644
index 4585e819cb..0000000000
Binary files a/screenshots/screenshot.png and /dev/null differ
diff --git a/screenshots/tn.png b/screenshots/tn.png
deleted file mode 100644
index e067128afc..0000000000
Binary files a/screenshots/tn.png and /dev/null differ
diff --git a/stackbit.yaml b/stackbit.yaml
index 63bd9af94f..90ecd548a6 100644
--- a/stackbit.yaml
+++ b/stackbit.yaml
@@ -25,180 +25,15 @@ models:
         hidden: true
       - type: string
         name: permalink
-        label: Permalink
-        description: 'The output path for your pages, posts, or collections.'
-        default: '/posts/:slug:output_ext'
         hidden: true
-      - type: string
-        name: google_analytics_id
-      - type: object
-        name: homepage
-        fields:
-          - type: boolean
-            name: show_call_box
-      - type: object
-        name: logo
-        fields:
-          - type: image
-            name: desktop
-            required: true
-          - type: image
-            name: mobile
-          - type: string
-            name: desktop_height
-      - type: object
-        name: footer
-        fields:
-          - type: string
-            name: copyright_text
-      - type: object
-        name: seo
-        fields:
-          - type: string
-            name: meta_description
-            label: meta_description
-          - type: string
-            name: meta_og_title
-            label: meta_og_title
-          - type: string
-            name: meta_og_type
-            label: meta_og_type
-          - type: string
-            name: meta_og_url
-            label: meta_og_url
-          - type: string
-            name: meta_og_image
-            label: meta_og_image
-          - type: string
-            name: meta_og_description
-            label: meta_og_description
-          - type: string
-            name: meta_twitter_card
-            label: meta_twitter_card
-          - type: string
-            name: meta_twitter_site
-            label: meta_twitter_site
-          - type: string
-            name: meta_twitter_creator
-            label: meta_twitter_creator
-      - type: object
-        name: collections
-        fields:
-          - type: object
-            name: services
-            fields:
-              - type: boolean
-                name: output
-              - type: string
-                name: permalink
-          - type: object
-            name: team
-            fields:
-              - type: boolean
-                name: output
-              - type: string
-                name: permalink
-      - type: object
-        name: sass
-        label: Sass
-        hidden: true
-        fields:
-          - type: number
-            name: indentWidth
-            label: Indent Width
-            description: >-
-              Used to determine the number of spaces or tabs to be used for
-              indentation.
-            default: 4
-          - type: enum
-            name: style
-            label: Output Style
-            description: Determines the output format of the final CSS style.
-            options:
-              - nested
-              - expanded
-              - compact
-              - compressed
-            default: nested
-          - type: number
-            name: precision
-            label: Precision
-            description: >-
-              Used to determine how many digits after the decimal will be
-              allowed.
-            default: 10
-      - type: list
-        name: plugins
-        label: Plugins
-        hidden: true
-      - type: list
-        name: exclude
-        label: Exclude
-        description: Exclude directories and/or files from the conversion.
-        hidden: true
-  site_menus:
-    type: object
-    label: Site Menus
-    description: >-
-      Site menus model, defines list of menus that can be specified from within
-      site configuration
-    fields:
-      - type: list
-        name: main
-        label: Main menu
-        description: List of items for Main menu
-        items:
-          type: model
-          models:
-            - site_menu_item
-      - type: list
-        name: footer
-        label: Footer menu
-        description: List of items for Footer menu
-        items:
-          type: model
-          models:
-            - site_menu_item
-  site_menu_item:
-    type: object
-    label: Site Menu Item
-    labelField: name
-    description: 'Site menu item model, defines fields for a single site menu item'
-    fields:
-      - type: string
-        name: identifier
-        label: Identifier
-        description: >-
-          The identifier of a menu item could be used as a parent menu of
-          another menu item
-      - type: string
-        name: name
-        label: Title
-        description: The title of the menu item
-        required: true
-      - type: string
-        name: url
-        label: URL
-        description: The URL the menu item links to
-        required: true
-      - type: number
-        name: weight
-        label: Weight
-        description: Position for sorting
-      - type: string
-        name: parent
-        label: Parent Menu Identifier
-        description: The parent of an entry should be the identifier of another entry.
   home:
     type: page
     label: Home
-    file: index.md
-    hideContent: false
+    file: ['index.md', 'services.md', 'team.md']
     singleInstance: true
     fields:
       - type: string
         name: title
-        label: Title
         required: true
       - type: string
         name: description
@@ -214,11 +49,19 @@ models:
         name: intro_image_hide_on_mobile
         label: Hide the intro image on mobile
         description: Hide the intro image on mobile screen sizes
+      - type: date
+        name: date
+      - type: string
+        name: bodyClass
       - type: enum
         name: layout
         options:
           - label: home
             value: home
+          - label: services
+            value: services
+          - label: teams
+            value: teams
   basicpage:
     type: page
     label: Basic Page
@@ -227,11 +70,10 @@ models:
     fields:
       - type: string
         name: title
-        label: Title
-        description: The title of the page.
       - type: date
         name: date
-        label: Date
+      - type: string
+        name: bodyClass
       - type: enum
         name: layout
         options:
@@ -239,16 +81,6 @@ models:
             value: page
           - label: contact
             value: contact
-      - type: enum
-        name: menu
-        label: Menu
-        options:
-          - label: Main Menu
-            value: main
-          - label: Footer Menu
-            value: footer
-      - type: string
-        name: bodyClass
   service:
     type: page
     label: Service
@@ -269,7 +101,6 @@ models:
         options:
           - label: service
             value: service
-  services:
     type: page
     label: Services Overview
     file: services.md
@@ -337,7 +168,6 @@ models:
         options:
           - label: team
             value: team
-  teams:
     type: page
     label: Team Overview
     file: team.md
@@ -367,3 +197,27 @@ models:
         options:
           - label: teams
             value: teams
+  contact:
+    type: data
+    label: Contact Details
+    file: contact.yml
+    fields:
+      - type: string
+        name: email
+      - type: string
+        name: phone
+      - type: string
+        name: contact_button_link  
+  seo:
+    type: data
+    label: SEO
+    file: seo.yml
+    fields:
+      - type: string
+        name: google_analytics_id
+      - type: string
+        name: meta_twitter_site
+      - type: string
+        name: meta_twitter_creator
+      - type: string
+        name: copyright_text
diff --git a/team.md b/team.md
index bacf6310f7..af1083bd67 100644
--- a/team.md
+++ b/team.md
@@ -1,7 +1,7 @@
 ---
 title: Team
 layout: teams
-permalink: /team/
+permalink: "/team/"
 intro_image_absolute: true
 intro_image_hide_on_mobile: false
 ---