diff --git a/exampleSite/content/home/about.md b/exampleSite/content/home/about.md
index 13d45394..7cdc8f5f 100644
--- a/exampleSite/content/home/about.md
+++ b/exampleSite/content/home/about.md
@@ -1,14 +1,21 @@
-+++
-# About widget.
-widget = "about"  # See https://sourcethemes.com/academic/docs/page-builder/
-headless = true  # This file represents a page section.
-active = true  # Activate this widget? true/false
-weight = 20  # Order that this section will appear in.
+---
+# An instance of the About widget.
+# Documentation: https://sourcethemes.com/academic/docs/page-builder/
+widget: about
 
-title = "Biography"
+# Activate this widget? true/false
+active: true
+
+# This file represents a page section.
+headless: true
+
+# Order that this section appears on the page.
+weight: 20
+
+title: Biography
 
 # Choose the user profile to display
-# This should be the username of a profile in your `content/authors/` folder.
+# This should be the username (folder name) of a profile in your `content/authors/` folder.
 # See https://sourcethemes.com/academic/docs/get-started/#introduce-yourself
-author = "admin"
-+++
+author: admin
+---
diff --git a/exampleSite/content/home/accomplishments.md b/exampleSite/content/home/accomplishments.md
index e2fd9a21..a381e9b5 100644
--- a/exampleSite/content/home/accomplishments.md
+++ b/exampleSite/content/home/accomplishments.md
@@ -1,51 +1,52 @@
-+++
-# Accomplishments widget.
-widget = "accomplishments"  # See https://sourcethemes.com/academic/docs/page-builder/
-headless = true  # This file represents a page section.
-active = true  # Activate this widget? true/false
-weight = 50  # Order that this section will appear.
+---
+# An instance of the Accomplishments widget.
+# Documentation: https://sourcethemes.com/academic/docs/page-builder/
+widget: accomplishments
 
-title = "Accomplish­ments"
-subtitle = ""
+# Activate this widget? true/false
+active: true
+
+# This file represents a page section.
+headless: true
+
+# Order that this section appears on the page.
+weight: 50
+
+title: Accomplish­ments
+subtitle:
 
 # Date format
 #   Refer to https://sourcethemes.com/academic/docs/customization/#date-format
-date_format = "Jan 2006"
+date_format: Jan 2006
 
 # Accomplishments.
-#   Add/remove as many `[[item]]` blocks below as you like.
+#   Add/remove as many `item` blocks below as you like.
 #   `title`, `organization` and `date_start` are the required parameters.
 #   Leave other parameters empty if not required.
-#   Begin/end multi-line descriptions with 3 quotes `"""`.
-
-[[item]]
-  organization = "Coursera"
-  organization_url = "https://www.coursera.org"
-  title = "Neural Networks and Deep Learning"
-  url = ""
-  certificate_url = "https://www.coursera.org"
-  date_start = "2018-10-01"
-  date_end = ""
-  description = ""
-
-[[item]]
-  organization = "edX"
-  organization_url = "https://www.edx.org"
-  title = "Blockchain Fundamentals"
-  url = "https://www.edx.org/professional-certificate/uc-berkeleyx-blockchain-fundamentals"
-  certificate_url = "https://www.edx.org"
-  date_start = "2018-03-01"
-  date_end = ""
-  description = "Formulated informed blockchain models, hypotheses, and use cases."
-  
-[[item]]
-  organization = "DataCamp"
-  organization_url = "https://www.datacamp.com"
-  title = "Object-Oriented Programming in R: S3 and R6 Course"
-  url = ""
-  certificate_url = "https://www.datacamp.com"
-  date_start = "2017-07-01"
-  date_end = "2017-12-21"
-  description = ""
-
-+++
+#   You can begin a multiline `description` using YAML's `|-`.
+item:
+- certificate_url: https://www.coursera.org
+  date_end: ""
+  date_start: "2018-10-01"
+  description: ""
+  organization: Coursera
+  organization_url: https://www.coursera.org
+  title: Neural Networks and Deep Learning
+  url: ""
+- certificate_url: https://www.edx.org
+  date_end: ""
+  date_start: "2018-03-01"
+  description: Formulated informed blockchain models, hypotheses, and use cases.
+  organization: edX
+  organization_url: https://www.edx.org
+  title: Blockchain Fundamentals
+  url: https://www.edx.org/professional-certificate/uc-berkeleyx-blockchain-fundamentals
+- certificate_url: https://www.datacamp.com
+  date_end: "2017-12-21"
+  date_start: "2017-07-01"
+  description: ""
+  organization: DataCamp
+  organization_url: https://www.datacamp.com
+  title: 'Object-Oriented Programming in R: S3 and R6 Course'
+  url: ""
+---
diff --git a/exampleSite/content/home/contact.md b/exampleSite/content/home/contact.md
index 25188e2b..9d65963e 100644
--- a/exampleSite/content/home/contact.md
+++ b/exampleSite/content/home/contact.md
@@ -1,24 +1,30 @@
-+++
-# Contact widget.
-widget = "contact"  # See https://sourcethemes.com/academic/docs/page-builder/
-headless = true  # This file represents a page section.
-active = true  # Activate this widget? true/false
-weight = 130  # Order that this section will appear.
+---
+# An instance of the Contact widget.
+# Documentation: https://sourcethemes.com/academic/docs/page-builder/
+widget: contact
 
-title = "Contact"
-subtitle = ""
+# Activate this widget? true/false
+active: true
 
-# Automatically link email and phone?
-autolink = true
+# This file represents a page section.
+headless: true
+
+# Order that this section appears on the page.
+weight: 130
+
+title: Contact
+subtitle:
+
+# Automatically link email and phone or display as text?
+autolink: true
 
 # Email form provider
 #   0: Disable email form
 #   1: Netlify (requires that the site is hosted by Netlify)
 #   2: formspree.io
-email_form = 2
-
-# Netlify form settings.
-[netlify]
-  captcha = false  # Enable CAPTCHA challenge to reduce spam?
-+++
+email_form: 2
 
+netlify:
+  # Enable CAPTCHA challenge to reduce spam?
+  captcha: false
+---
diff --git a/exampleSite/content/home/demo.md b/exampleSite/content/home/demo.md
index fb4258a3..a5524f0c 100644
--- a/exampleSite/content/home/demo.md
+++ b/exampleSite/content/home/demo.md
@@ -1,60 +1,38 @@
-+++
-# A Demo section created with the Blank widget.
-# Any elements can be added in the body: https://sourcethemes.com/academic/docs/writing-markdown-latex/
-# Add more sections by duplicating this file and customizing to your requirements.
+---
+# An instance of the Blank widget.
+# Documentation: https://sourcethemes.com/academic/docs/page-builder/
+widget: blank
 
-widget = "blank"  # See https://sourcethemes.com/academic/docs/page-builder/
-headless = true  # This file represents a page section.
-active = true  # Activate this widget? true/false
-weight = 15  # Order that this section will appear.
+# Activate this widget? true/false
+active: true
 
-title = "Demos"
-subtitle = ""
+# This file represents a page section.
+headless: true
 
-[design]
-  # Choose how many columns the section has. Valid values: 1 or 2.
-  columns = "1"
+# Order that this section appears on the page.
+weight: 15
 
-[design.background]
-  # Apply a background color, gradient, or image.
-  #   Uncomment (by removing `#`) an option to apply it.
-  #   Choose a light or dark text color by setting `text_color_light`.
-  #   Any HTML color name or Hex value is valid.
+title: Demos
+subtitle:
 
-  # Background color.
-  # color = "navy"
-  
-  # Background gradient.
-  # gradient_start = "DeepSkyBlue"
-  # gradient_end = "SkyBlue"
-  
-  # Background image.
-  image = "headers/bubbles-wide.jpg"  # Name of image in `static/media/`.
-  image_darken = 0.6  # Darken the image? Range 0-1 where 0 is transparent and 1 is opaque.
-  image_size = "cover"  #  Options are `cover` (default), `contain`, or `actual` size.
-  image_position = "center"  # Options include `left`, `center` (default), or `right`.
-  image_parallax = true  # Use a fun parallax-like fixed background effect? true/false
+design:
+  columns: "1"
+  background:
+    image: headers/bubbles-wide.jpg
+    image_darken: 0.6
+    image_parallax: true
+    image_position: center
+    image_size: cover
+    text_color_light: true
+  spacing:
+    padding: ["20px", "0", "20px", "0"]
+---
 
-  # Text color (true=light or false=dark).
-  text_color_light = true
+Welcome to the demo of the **resumé template** for Academic.
 
-[design.spacing]
-  # Customize the section spacing. Order is top, right, bottom, left.
-  padding = ["20px", "0", "20px", "0"]
+[View more templates](https://sourcethemes.com/academic/templates/) for Academic.
 
-[advanced]
- # Custom CSS. 
- css_style = ""
- 
- # CSS class.
- css_class = ""
-+++
-
-Welcome to the **personal demo** of Academic. Other demos available include:
-
-- [**Project Demo** (Academic's actual site)](https://sourcethemes.com/academic/)
-
-**Over 100,000 [Amazing Websites](https://sourcethemes.com/academic/#expo) have Already Been Built with Academic**
+**Over 500,000 [Amazing Websites](https://sourcethemes.com/academic/) have Already Been Built with Academic**
 
 **[Join](https://sourcethemes.com/academic/docs/install/) the Most Empowered Hugo Community**
 
diff --git a/exampleSite/content/home/experience.md b/exampleSite/content/home/experience.md
index 12d7b3db..cee49769 100644
--- a/exampleSite/content/home/experience.md
+++ b/exampleSite/content/home/experience.md
@@ -1,44 +1,46 @@
-+++
-# Experience widget.
-widget = "experience"  # See https://sourcethemes.com/academic/docs/page-builder/
-headless = true  # This file represents a page section.
-active = true  # Activate this widget? true/false
-weight = 40  # Order that this section will appear.
+---
+# An instance of the Experience widget.
+# Documentation: https://sourcethemes.com/academic/docs/page-builder/
+widget: experience
 
-title = "Experience"
-subtitle = ""
+# Activate this widget? true/false
+active: true
 
-# Date format for experience
+# This file represents a page section.
+headless: true
+
+# Order that this section appears on the page.
+weight: 40
+
+title: Experience
+subtitle:
+
+# Date format
 #   Refer to https://sourcethemes.com/academic/docs/customization/#date-format
-date_format = "Jan 2006"
+date_format: Jan 2006
 
 # Experiences.
-#   Add/remove as many `[[experience]]` blocks below as you like.
+#   Add/remove as many `experience` blocks below as you like.
 #   Required fields are `title`, `company`, and `date_start`.
 #   Leave `date_end` empty if it's your current employer.
-#   Begin/end multi-line descriptions with 3 quotes `"""`.
-[[experience]]
-  title = "CEO"
-  company = "GenCoin"
-  company_url = ""
-  location = "California"
-  date_start = "2017-01-01"
-  date_end = ""
-  description = """
-  Responsibilities include:
-  
-  * Analysing
-  * Modelling
-  * Deploying
-  """
-
-[[experience]]
-  title = "Professor"
-  company = "University X"
-  company_url = ""
-  location = "California"
-  date_start = "2016-01-01"
-  date_end = "2016-12-31"
-  description = """Taught electronic engineering and researched semiconductor physics."""
-
-+++
+#   You can begin a multiline `description` using YAML's `|-`.
+experience:
+- company: GenCoin
+  company_url: ""
+  date_end: ""
+  date_start: "2017-01-01"
+  description: |-
+    Responsibilities include:
+    * Analysing
+    * Modelling
+    * Deploying
+  location: California
+  title: CEO
+- company: University X
+  company_url: ""
+  date_end: "2016-12-31"
+  date_start: "2016-01-01"
+  description: Taught electronic engineering and researched semiconductor physics.
+  location: California
+  title: Professor
+---
diff --git a/exampleSite/content/home/featured.md b/exampleSite/content/home/featured.md
index 5fa4c527..a1b7ab1a 100644
--- a/exampleSite/content/home/featured.md
+++ b/exampleSite/content/home/featured.md
@@ -1,68 +1,40 @@
-+++
-# A Featured Publications section created with the Featured Content widget.
-# This section displays publications from `content/publication/` which have
-# `featured = true` in their front matter.
+---
+# An instance of the Featured widget.
+# Documentation: https://sourcethemes.com/academic/docs/page-builder/
+widget: featured
 
-widget = "featured"  # See https://sourcethemes.com/academic/docs/page-builder/
-headless = true  # This file represents a page section.
-active = true  # Activate this widget? true/false
-weight = 80  # Order that this section will appear.
+# Activate this widget? true/false
+active: true
 
-title = "Featured Publications"
-subtitle = ""
+# This file represents a page section.
+headless: true
 
-[content]
-  # Page type to display. E.g. post, talk, or publication.
-  page_type = "publication"
-  
+# Order that this section appears on the page.
+weight: 80
+
+title: Featured Publications
+subtitle: ""
+
+content:
+  # Page type to display. E.g. post, talk, publication...
+  page_type: publication
   # Choose how much pages you would like to display (0 = all pages)
-  count = 0
-
-  # Page order. Descending (desc) or ascending (asc) date.
-  order = "desc"
-
-  # Show a "See all pages" link underneath the featured content?
-  link_to_archive = false
-
-  # Filter posts by a taxonomy term.
-  [content.filters]
-    tag = ""
-    category = ""
-    publication_type = ""
-    author = ""
-  
-[design]
-  # Toggle between the various page layout types.
+  count: 0
+  # Filter on criteria
+  filters:
+    author: ""
+    category: ""
+    publication_type: ""
+    tag: ""
+  # Page order: descending (desc) or ascending (asc) date.
+  order: desc
+  # Show a "See all" link?
+  link_to_archive: false
+design:
+  # Choose a view for the listings:
   #   1 = List
   #   2 = Compact
   #   3 = Card
   #   4 = Citation (publication only)
-  view = 3
-  
-[design.background]
-  # Apply a background color, gradient, or image.
-  #   Uncomment (by removing `#`) an option to apply it.
-  #   Choose a light or dark text color by setting `text_color_light`.
-  #   Any HTML color name or Hex value is valid.
-  
-  # Background color.
-  # color = "navy"
-  
-  # Background gradient.
-  # gradient_start = "DeepSkyBlue"
-  # gradient_end = "SkyBlue"
-  
-  # Background image.
-  # image = "background.jpg"  # Name of image in `static/media/`.
-  # image_darken = 0.6  # Darken the image? Range 0-1 where 0 is transparent and 1 is opaque.
-
-  # Text color (true=light or false=dark).
-  # text_color_light = true  
-  
-[advanced]
- # Custom CSS. 
- css_style = ""
- 
- # CSS class.
- css_class = ""
-+++
+  view: 3
+---
diff --git a/exampleSite/content/home/index.md b/exampleSite/content/home/index.md
index ef8bad51..7fa0d2ac 100644
--- a/exampleSite/content/home/index.md
+++ b/exampleSite/content/home/index.md
@@ -1,5 +1,7 @@
-+++
+---
 # Homepage
-type = "widget_page"
-headless = true  # Homepage is headless, other widget pages are not.
-+++
+type: widget_page
+
+# Homepage is headless, other widget pages are not.
+headless: true
+---
diff --git a/exampleSite/content/home/tags.md b/exampleSite/content/home/tags.md
index 6da5875c..5e291845 100644
--- a/exampleSite/content/home/tags.md
+++ b/exampleSite/content/home/tags.md
@@ -1,22 +1,28 @@
-+++
-# Tag Cloud widget.
-widget = "tag_cloud"  # See https://sourcethemes.com/academic/docs/page-builder/
-headless = true  # This file represents a page section.
-active = true  # Activate this widget? true/false
-weight = 120  # Order that this section will appear.
+---
+# An instance of the Tag Cloud widget.
+# Documentation: https://sourcethemes.com/academic/docs/page-builder/
+widget: tag_cloud
 
-title = "Popular Topics"
-subtitle = ""
+# Activate this widget? true/false
+active: true
 
-[content]
-  # Choose the taxonomy from `config.toml` to display (e.g. tags, categories)
-  taxonomy = "tags"
-  
+# This file represents a page section.
+headless: true
+
+# Order that this section appears on the page.
+weight: 120
+
+title: Popular Topics
+subtitle:
+
+content:
   # Choose how many tags you would like to display (0 = all tags)
-  count = 20
+  count: 20
+  
+  # Choose the taxonomy from `config.toml` to display (e.g. tags, categories)
+  taxonomy: tags
 
-[design]
-  # Minimum and maximum font sizes (1.0 = 100%).
-  font_size_min = 0.7
-  font_size_max = 2.0
-+++
+design:
+  font_size_min: 0.7
+  font_size_max: 2
+---
diff --git a/exampleSite/content/home/talks.md b/exampleSite/content/home/talks.md
index 0b1fdd1a..bbbf4a5f 100644
--- a/exampleSite/content/home/talks.md
+++ b/exampleSite/content/home/talks.md
@@ -1,70 +1,44 @@
-+++
-# A Recent and Upcoming Talks section created with the Pages widget.
-# This section displays recent talks from `content/talk/`.
+---
+# An instance of the Pages widget.
+# Documentation: https://sourcethemes.com/academic/docs/page-builder/
+widget: pages
 
-widget = "pages"  # See https://sourcethemes.com/academic/docs/page-builder/
-headless = true  # This file represents a page section.
-active = true  # Activate this widget? true/false
-weight = 70  # Order that this section will appear.
+# Activate this widget? true/false
+active: true
 
-title = "Recent & Upcoming Talks"
-subtitle = ""
+# This file represents a page section.
+headless: true
 
-[content]
-  # Page type to display. E.g. post, talk, or publication.
-  page_type = "talk"
-  
+# Order that this section appears on the page.
+weight: 70
+
+title: Recent & Upcoming Talks
+subtitle:
+
+content:
+  # Page type to display. E.g. post, talk, publication...
+  page_type: talk
   # Choose how much pages you would like to display (0 = all pages)
-  count = 5
-  
+  count: 5
+  # Filter on criteria
+  filters:
+    author: ""
+    category: ""
+    tag: ""
+    exclude_featured: false
+    exclude_future: false
+    exclude_past: false
+    publication_type: ""
   # Choose how many pages you would like to offset by
-  offset = 0
+  offset: 0
+  # Page order: descending (desc) or ascending (asc) date.
+  order: desc
 
-  # Page order. Descending (desc) or ascending (asc) date.
-  order = "desc"
-
-  # Filter posts by a taxonomy term.
-  [content.filters]
-    tag = ""
-    category = ""
-    publication_type = ""
-    author = ""
-    exclude_featured = false
-    exclude_past = false
-    exclude_future = false
-    
-[design]
-  # Toggle between the various page layout types.
+design:
+  # Choose a view for the listings:
   #   1 = List
   #   2 = Compact
   #   3 = Card
   #   4 = Citation (publication only)
-  view = 2
-  
-[design.background]
-  # Apply a background color, gradient, or image.
-  #   Uncomment (by removing `#`) an option to apply it.
-  #   Choose a light or dark text color by setting `text_color_light`.
-  #   Any HTML color name or Hex value is valid.
-
-  # Background color.
-  # color = "navy"
-  
-  # Background gradient.
-  # gradient_start = "DeepSkyBlue"
-  # gradient_end = "SkyBlue"
-  
-  # Background image.
-  # image = "background.jpg"  # Name of image in `static/media/`.
-  # image_darken = 0.6  # Darken the image? Range 0-1 where 0 is transparent and 1 is opaque.
-
-  # Text color (true=light or false=dark).
-  # text_color_light = true  
-  
-[advanced]
- # Custom CSS. 
- css_style = ""
- 
- # CSS class.
- css_class = ""
-+++
+  view: 2
+---