1 files changed, 36 insertions, 6 deletions
diff --git a/2021/info/erg-schedule.md b/2021/info/erg-schedule.md
index dc36b167..fbe0c9ef 100644
--- a/2021/info/erg-schedule.md
+++ b/2021/info/erg-schedule.md
@@ -1,17 +1,47 @@
 <!-- Automatically generated by conf-create-info-pages -->
 
-Status: Finished  
+[[!toc  ]]
 Duration: 10:23  
 
 [[!inline pages="internal(2021/inline-alternate)" raw="yes"]]  
 
 If you have questions and the speaker has not indicated public contact information on this page, please feel free to e-mail us at <emacsconf-submit@gnu.org> and we'll forward your question to the speaker.
 
-<div class="mainVideo"><div class="video-card vid" data-id="mainVideo"><figure><video controls preload="metadata" id="mainVideo">
-<source src="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main.webm"><track label="English" kind="captions" srclang="en" src="/2021/captions/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main.vtt" default><track kind="chapters" label="Chapters" srclang="en" src="/2021/captions/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--chapters.vtt" default onload="displayChapters(this)">
-</video></figure>
-<div class="files resources"><ul><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main.webm">Download .webm video (10:23, 11MB)</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier.org">Download .org</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main.vtt">Download --main.vtt</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--chapters.vtt">Download --chapters.vtt</a></li><li><a href="https://toobnix.org/w/jXni2SVVquM8FLjMLuK4Fg">View on Toobnix</a></li></ul></div><ol class="chapters"></ol></div>
-</div>
+# Talk
+
+[[!template id="vid" vidid="mainVideo" src="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main.webm" poster="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main.png" captions="""<track label="English" kind="captions" srclang="en" src="/2021/captions/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main.vtt" default />"""
+size="33.7M" duration="10:23" other_resources="""[Download .org](https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier.org)  
+[Download --compressed56.webm (11MB)](https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--compressed56.webm)  
+[Download --main.vtt](https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main.vtt)  
+[Download --chapters.vtt](https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--chapters.vtt)  
+[Download --main--chapters.vtt](https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--main--chapters.vtt)  
+[View on Toobnix](https://toobnix.org/w/jXni2SVVquM8FLjMLuK4Fg)  
+"""]]
+[[!template id="chapters" vidid="mainVideo" data="""
+00:00 Introduction
+01:46 Background and technology: Emacs Research Group
+02:53 Prerecorded demo
+05:13 Organising metaphor
+05:35 Timetable
+06:00 Project Action Review
+06:32 Causal Layered Analysis
+07:02 Design Patterns and Next Steps
+07:42 Projects
+07:53 Patterns of Patterns (PLoP 2021)
+08:24 PLACARD Workshop roles
+08:57 Initial user studies
+09:38 Broader context
+10:08 Conclusion
+"""]]
+
+
+# Q&A
+
+[[!template id="vid" vidid="qanda" src="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--answers.webm" poster="https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--answers.png" 
+size="40.1M" duration="14:05" other_resources="""[Download --answers--compressed32.webm (35.7MB)](https://media.emacsconf.org/2021/emacsconf-2021-erg--emacs-research-group-season-zero-what-we-did-together-with-emacs-in-2-hours-a-week-for-a-year--noorah-alhasan-joe-corneli-raymond-puzio-leo-vivier--answers--compressed32.webm)  
+"""]]
+
+
 # Description