diff --git a/archetypes/event.md b/archetypes/event.md
index 62939c53e..c5227cec0 100644
--- a/archetypes/event.md
+++ b/archetypes/event.md
@@ -1,8 +1,6 @@
 +++
 Description = ""
-title = ""
-speaker = ""
-images = [""]
-aliases = [""]
-type = "event"
+Title = ""
+Aliases = [""]
+Type = "event"
 +++
diff --git a/archetypes/program.md b/archetypes/program.md
new file mode 100644
index 000000000..9ca3d468e
--- /dev/null
+++ b/archetypes/program.md
@@ -0,0 +1,6 @@
++++
+City = ""
+Year = ""
+Title = ""
+Type = "program"
++++
diff --git a/archetypes/speaker.md b/archetypes/speaker.md
index 6999a1fe2..8ee651e66 100644
--- a/archetypes/speaker.md
+++ b/archetypes/speaker.md
@@ -6,5 +6,5 @@ Facebook = ""
 Linkedin = ""
 Pronouns = ""
 Image = ""
-kind = "speaker"
+Type = "speaker"
 +++
diff --git a/archetypes/talk.md b/archetypes/talk.md
index 14ccbb2c8..685774efa 100644
--- a/archetypes/talk.md
+++ b/archetypes/talk.md
@@ -2,14 +2,15 @@
 Description = ""
 City = ""
 Year = ""
-title = ""
-speaker = ""
-images = ["https://www.arresteddevops.com/img/social/fb/friendly.png"]
-aliases = ["/##"]
-youtube = ""
-vimeo = ""
-speakerdeck = ""
-slideshare = ""
-slides = ""
-type = "talk"
+Title = ""
+Speaker = ""
+Talk_date = ""
+Talk_start_time = ""
+Talk_end_time = ""
+Youtube = ""
+Vimeo = ""
+Speakerdeck = ""
+Slideshare = ""
+Slides = ""
+Type = "talk"
 +++
diff --git a/exampleSite/content/events/2017-ponyville/program/rainbow-dash.md b/exampleSite/content/events/2017-ponyville/program/rainbow-dash.md
index 80df82659..f4e01e4e7 100644
--- a/exampleSite/content/events/2017-ponyville/program/rainbow-dash.md
+++ b/exampleSite/content/events/2017-ponyville/program/rainbow-dash.md
@@ -1,18 +1,19 @@
 +++
+Description = ""
 City = "Ponyville"
 Year = "2017"
 date = "2016-07-15T22:06:24-06:00"
-talk_date = ""
-talk_start_time = ""
-talk_end_time = ""
-title = "Contiuous Delivery of Ponies"
-type = "talk"
-speakers = ["rainbow-dash","fluttershy"]
-youtube = ""
-vimeo = ""
-speakerdeck = ""
-slideshare = ""
-slides = ""
+Talk_date = ""
+Talk_start_time = ""
+Talk_end_time = ""
+Title = "Contiuous Delivery of Ponies"
+Type = "talk"
+Speakers = ["rainbow-dash","fluttershy"]
+Youtube = "emGKB8TABvI"
+Vimeo = ""
+Speakerdeck = "https://speakerdeck.com/mattstratton/shifting-left-securely"
+Slideshare = "http://www.slideshare.net/mattstratton/the-five-love-languages-of-devops-54549536"
+Slides = ""
 +++
 
 Ideate actionable insight long shadow driven SpaceTeam ideate user story intuitive bootstrapping. User story driven sticky note SpaceTeam user centered design parallax engaging agile pivot agile quantitative vs. qualitative agile quantitative vs. qualitative. Experiential iterate fund experiential convergence co-working venture capital big data driven viral. Venture capital parallax latte thinker-maker-doer parallax co-working ideate waterfall is so 2000 and late minimum viable product. Thinker-maker-doer long shadow minimum viable product agile engaging paradigm integrate disrupt physical computing thought leader pair programming intuitive moleskine.
diff --git a/exampleSite/content/events/2017-ponyville/speakers/rainbow-dash.md b/exampleSite/content/events/2017-ponyville/speakers/rainbow-dash.md
index 29f0b6527..d892d5220 100644
--- a/exampleSite/content/events/2017-ponyville/speakers/rainbow-dash.md
+++ b/exampleSite/content/events/2017-ponyville/speakers/rainbow-dash.md
@@ -3,8 +3,10 @@ Website = ""
 Title = "Rainbow Dash"
 Twitter = ""
 date = "2016-12-08T20:55:58-06:00"
-PublishDate = "2016-12-08T20:55:58-06:00"
-type = "speaker"
-image = "rainbow-dash.png"
+Type = "speaker"
+Image = "rainbow-dash.png"
+Facebook = ""
+Linkedin = ""
+Pronouns = ""
 +++
 Food-truck SpaceTeam pivot earned media agile big data entrepreneur actionable insight iterate unicorn convergence driven moleskine. User centered design piverate physical computing disrupt moleskine co-working fund pivot. Waterfall is so 2000 and late integrate responsive big data agile piverate affordances. Agile earned media pivot viral engaging thought leader prototype workflow.
diff --git a/exampleSite/content/events/2017-ponyville/welcome.md b/exampleSite/content/events/2017-ponyville/welcome.md
index ed6ec776a..87a76606b 100644
--- a/exampleSite/content/events/2017-ponyville/welcome.md
+++ b/exampleSite/content/events/2017-ponyville/welcome.md
@@ -1,9 +1,8 @@
 +++
 Description = ""
-title = ""
-speaker = ""
-images = [""]
-aliases = ["/events/2017-ponyville/"]
-type = "event"
+Title = ""
+Speaker = ""
+Aliases = ["/events/2017-ponyville/"]
+Type = "event"
 +++
 Pivot paradigm sticky note agile grok unicorn waterfall is so 2000 and late responsive affordances thought leader. Grok big data ship it unicorn long shadow long shadow hacker. Entrepreneur waterfall is so 2000 and late integrate user centered design innovate integrate parallax prototype pivot user story fund latte iterate driven. Human-centered design SpaceTeam pitch deck workflow responsive venture capital earned media ideate user centered design thinker-maker-doer viral. Engaging co-working paradigm prototype latte prototype parallax sticky note ship it.