diff --git a/content/authors/admin/_index.md b/content/authors/admin/_index.md
index 6076d93..f61615a 100644
--- a/content/authors/admin/_index.md
+++ b/content/authors/admin/_index.md
@@ -1,86 +1,74 @@
-+++
+---
 # Display name
-name = "Nelson Bighetti"
+name: Nelson Bighetti
 
 # Username (this should match the folder name)
-authors = ["admin"]
+authors:
+- admin
 
 # Is this the primary user of the site?
-superuser = true
+superuser: true
 
 # Role/position
-role = "Professor of Artificial Intelligence"
+role: Professor of Artificial Intelligence
 
 # Organizations/Affiliations
-#   Separate multiple entries with a comma, using the form: `[ {name="Org1", url=""}, {name="Org2", url=""} ]`.
-organizations = [ { name = "Stanford University", url = "" } ]
+organizations:
+- name: Stanford University
+  url: ""
 
 # Short bio (displayed in user profile at end of posts)
-bio = "My research interests include distributed robotics, mobile computing and programmable matter."
+bio: My research interests include distributed robotics, mobile computing and programmable matter.
 
-# Enter email to display Gravatar (if Gravatar enabled in Config)
-email = ""
+interests:
+- Artificial Intelligence
+- Computational Linguistics
+- Information Retrieval
 
-# List (academic) interests or hobbies
-interests = [
-  "Artificial Intelligence",
-  "Computational Linguistics",
-  "Information Retrieval"
-]
-
-# Organizational groups that you belong to (for People widget)
-#   Set this to `[]` or comment out if you are not using People widget.
-user_groups = ["Researchers", "Visitors"]
-
-# List qualifications (such as academic degrees)
-[[education.courses]]
-  course = "PhD in Artificial Intelligence"
-  institution = "Stanford University"
-  year = 2012
-
-[[education.courses]]
-  course = "MEng in Artificial Intelligence"
-  institution = "Massachusetts Institute of Technology"
-  year = 2009
-
-[[education.courses]]
-  course = "BSc in Artificial Intelligence"
-  institution = "Massachusetts Institute of Technology"
-  year = 2008
+education:
+  courses:
+  - course: PhD in Artificial Intelligence
+    institution: Stanford University
+    year: 2012
+  - course: MEng in Artificial Intelligence
+    institution: Massachusetts Institute of Technology
+    year: 2009
+  - course: BSc in Artificial Intelligence
+    institution: Massachusetts Institute of Technology
+    year: 2008
 
 # Social/Academic Networking
 # For available icons, see: https://sourcethemes.com/academic/docs/widgets/#icons
 #   For an email link, use "fas" icon pack, "envelope" icon, and a link in the
 #   form "mailto:your-email@example.com" or "#contact" for contact widget.
-
-[[social]]
-  icon = "envelope"
-  icon_pack = "fas"
-  link = "#contact"  # For a direct email link, use "mailto:test@example.org".
-
-[[social]]
-  icon = "twitter"
-  icon_pack = "fab"
-  link = "https://twitter.com/GeorgeCushen"
-
-[[social]]
-  icon = "google-scholar"
-  icon_pack = "ai"
-  link = "https://scholar.google.co.uk/citations?user=sIwtMXoAAAAJ"
-
-[[social]]
-  icon = "github"
-  icon_pack = "fab"
-  link = "https://github.com/gcushen"
-
+social:
+- icon: envelope
+  icon_pack: fas
+  link: '#contact'  # For a direct email link, use "mailto:test@example.org".
+- icon: twitter
+  icon_pack: fab
+  link: https://twitter.com/GeorgeCushen
+- icon: google-scholar
+  icon_pack: ai
+  link: https://scholar.google.co.uk/citations?user=sIwtMXoAAAAJ
+- icon: github
+  icon_pack: fab
+  link: https://github.com/gcushen
 # Link to a PDF of your resume/CV from the About widget.
-# To enable, copy your resume/CV to `static/files/cv.pdf` and uncomment the lines below.
-# [[social]]
-#   icon = "cv"
-#   icon_pack = "ai"
-#   link = "files/cv.pdf"
+# To enable, copy your resume/CV to `static/files/cv.pdf` and uncomment the lines below.  
+# - icon: cv
+#   icon_pack: ai
+#   link: files/cv.pdf
 
-+++
+# Enter email to display Gravatar (if Gravatar enabled in Config)
+email: ""
+  
+# Organizational groups that you belong to (for People widget)
+#   Set this to `[]` or comment out if you are not using People widget.  
+user_groups:
+- Researchers
+- Visitors
+---
 
 Nelson Bighetti is a professor of artificial intelligence at the Stanford AI Lab. His research interests include distributed robotics, mobile computing and programmable matter. He leads the Robotic Neurobiology group, which develops self-reconfiguring robots, systems of self-organizing robots, and mobile sensor networks.
 
diff --git a/content/post/_index.md b/content/post/_index.md
index 026a4b4..5ba086f 100644
--- a/content/post/_index.md
+++ b/content/post/_index.md
@@ -1,14 +1,14 @@
-+++
-title = "Posts"
+---
+title: Posts
 
 # View.
 #   1 = List
 #   2 = Compact
 #   3 = Card
-view = 2
+view: 2
 
-# Optional featured image (relative to `static/img/` folder).
-[header]
-image = ""
-caption = ""
-+++
+# Optional header image (relative to `static/img/` folder).
+header:
+  caption: ""
+  image: ""
+---
diff --git a/content/publication/_index.md b/content/publication/_index.md
index bc92542..510d576 100644
--- a/content/publication/_index.md
+++ b/content/publication/_index.md
@@ -1,15 +1,15 @@
-+++
-title = "Publications"
+---
+title: Publications
 
 # View.
 #   1 = List
 #   2 = Compact
 #   3 = Card
 #   4 = Citation
-view = 4
+view: 4
 
-# Optional featured image (relative to `static/img/` folder).
-[header]
-image = ""
-caption = ""
-+++
+# Optional header image (relative to `static/img/` folder).
+header:
+  caption: ""
+  image: ""
+---
diff --git a/content/talk/_index.md b/content/talk/_index.md
index 2758568..7d27cb3 100644
--- a/content/talk/_index.md
+++ b/content/talk/_index.md
@@ -1,14 +1,14 @@
-+++
-title = "Recent & Upcoming Talks"
+---
+title: Recent & Upcoming Talks
 
 # View.
 #   1 = List
 #   2 = Compact
 #   3 = Card
-view = 2
+view: 2
 
-# Optional featured image (relative to `static/img/` folder).
-[header]
-image = ""
-caption = ""
-+++
+# Optional header image (relative to `static/img/` folder).
+header:
+  caption: ""
+  image: ""
+---
diff --git a/scripts/init_kickstart.sh b/scripts/init_kickstart.sh
index 20053df..d9d06f8 100644
--- a/scripts/init_kickstart.sh
+++ b/scripts/init_kickstart.sh
@@ -13,7 +13,7 @@ cd scripts/
 rsync -av ../themes/academic/exampleSite/config/ ../config/
 
 # Install demo user
-rsync -av ../themes/academic/exampleSite/content/author/ ../content/author/
+rsync -av ../themes/academic/exampleSite/content/authors/ ../content/authors/
 
 # Install an example instance of each widget type
 rsync -av --exclude gallery/ ../themes/academic/exampleSite/content/home/ ../content/home/
diff --git a/themes/academic b/themes/academic
index 8a6d151..8857bff 160000
--- a/themes/academic
+++ b/themes/academic
@@ -1 +1 @@
-Subproject commit 8a6d151efb4a20f25d2e08c3fda1bdfb4a5d9de4
+Subproject commit 8857bffa20f083a6972afe38d052fa4eeea095ab