Show tracks in program, rethread talks, add track info to nav

40 files changed, 154 insertions, 124 deletions

diff --git a/2022/info/asmblox-nav.md b/2022/info/asmblox-nav.md
index 3bbd9498..a2a9570c 100644
--- a/2022/info/asmblox-nav.md
+++ b/2022/info/asmblox-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/detached">Getting detached from Emacs</a>  
-Next: <a href="/2022/talks/tramp">Elisp and the TRAMP: How to NOT write code you don't have to</a>  
+Previous: <a href="/2022/talks/orgvm">orgvm: a simple HTTP server for org</a>  
+Next: <a href="/2022/talks/indieweb">Putting Org Mode on the Indieweb</a>  
+Track: Development  
diff --git a/2022/info/async-nav.md b/2022/info/async-nav.md
index bc19c32d..215060de 100644
--- a/2022/info/async-nav.md
+++ b/2022/info/async-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/tramp">Elisp and the TRAMP: How to NOT write code you don't have to</a>  
-Next: <a href="/2022/talks/sqlite">Using SQLite as a data source: a framework and an example</a>  
+Previous: <a href="/2022/talks/workflows">Org workflows for developers</a>  
+Next: <a href="/2022/talks/orgvm">orgvm: a simple HTTP server for org</a>  
+Track: Development  
diff --git a/2022/info/buddy-nav.md b/2022/info/buddy-nav.md
index 46ae83c6..9f9897b0 100644
--- a/2022/info/buddy-nav.md
+++ b/2022/info/buddy-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/meetups">Attending and organizing Emacs meetups</a>  
-Next: <a href="/2022/talks/school">Back to school with Emacs</a>  
+Previous: <a href="/2022/talks/sqlite">Using SQLite as a data source: a framework and an example</a>  
+Next: <a href="/2022/talks/mail">Revisiting the anatomy of Emacs mail user agents</a>  
+Track: General  
diff --git a/2022/info/buttons-nav.md b/2022/info/buttons-nav.md
index 7977d1a4..72618f55 100644
--- a/2022/info/buttons-nav.md
+++ b/2022/info/buttons-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/links">Linking headings with org-super-links (poor-man's Zettelkasten)</a>  
+Previous: <a href="/2022/talks/tramp">Elisp and the TRAMP: How to NOT write code you don't have to</a>  
 Next: <a href="/2022/talks/hyperorg">Powerful productivity with Hyperbole and Org Mode</a>  
+Track: General  
diff --git a/2022/info/community-nav.md b/2022/info/community-nav.md
index cfe40694..611ccade 100644
--- a/2022/info/community-nav.md
+++ b/2022/info/community-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/science">Writing and organizing literature notes for scientific writing</a>  
-Next: <a href="/2022/talks/realestate">Real estate and Org table formulas</a>  
+Previous: <a href="/2022/talks/mail">Revisiting the anatomy of Emacs mail user agents</a>  
+Next: <a href="/2022/talks/eev">Bidirectional links with eev</a>  
+Track: General  
diff --git a/2022/info/dbus-nav.md b/2022/info/dbus-nav.md
index 50604b7f..b56f758e 100644
--- a/2022/info/dbus-nav.md
+++ b/2022/info/dbus-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/mail">Revisiting the anatomy of Emacs mail user agents</a>  
-Next: <a href="/2022/talks/wayland">Emacs should become a Wayland compositor</a>  
+Previous: <a href="/2022/talks/indieweb">Putting Org Mode on the Indieweb</a>  
+Next: <a href="/2022/talks/fanfare">Fanfare for the Common Emacs User</a>  
+Track: Development  
diff --git a/2022/info/detached-nav.md b/2022/info/detached-nav.md
index e972157b..19962801 100644
--- a/2022/info/detached-nav.md
+++ b/2022/info/detached-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/eshell">Top 10 reasons why you should be using Eshell</a>  
-Next: <a href="/2022/talks/asmblox">asm-blox: a game based on WebAssembly that no one asked for</a>  
+Previous: <a href="/2022/talks/hyperorg">Powerful productivity with Hyperbole and Org Mode</a>  
+Next: <a href="/2022/talks/eshell">Top 10 reasons why you should be using Eshell</a>  
+Track: Development  
diff --git a/2022/info/eev-nav.md b/2022/info/eev-nav.md
index 375177df..67cb117e 100644
--- a/2022/info/eev-nav.md
+++ b/2022/info/eev-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/sqlite">Using SQLite as a data source: a framework and an example</a>  
-Next: <a href="/2022/talks/python">Short hyperlinks to Python docs</a>  
+Previous: <a href="/2022/talks/community">The ship that builds itself: How we used Emacs to develop a workshop for communities</a>  
+Next: <a href="/2022/talks/realestate">Real estate and Org table formulas</a>  
+Track: Development  
diff --git a/2022/info/eshell-nav.md b/2022/info/eshell-nav.md
index d4baf5d8..4085b66e 100644
--- a/2022/info/eshell-nav.md
+++ b/2022/info/eshell-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/rde">rde Emacs introduction</a>  
-Next: <a href="/2022/talks/detached">Getting detached from Emacs</a>  
+Previous: <a href="/2022/talks/detached">Getting detached from Emacs</a>  
+Next: <a href="/2022/talks/workflows">Org workflows for developers</a>  
+Track: Development  
diff --git a/2022/info/fanfare-nav.md b/2022/info/fanfare-nav.md
index e81fefaf..7b1d9938 100644
--- a/2022/info/fanfare-nav.md
+++ b/2022/info/fanfare-nav.md
@@ -1,2 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/maint">Maintaining the Maintainers: Attribution as an Economic Model for Open Source</a>  
+Previous: <a href="/2022/talks/dbus">The Wheels on D-Bus</a>  
+Next: <a href="/2022/talks/wayland">Emacs should become a Wayland compositor</a>  
+Track: General  
diff --git a/2022/info/handwritten-nav.md b/2022/info/handwritten-nav.md
index b8315e6e..f8b8ec32 100644
--- a/2022/info/handwritten-nav.md
+++ b/2022/info/handwritten-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/orgyear">This Year in Org</a>  
-Next: <a href="/2022/talks/rolodex">Build a Zettelkasten with the Hyperbole Rolodex</a>  
+Previous: <a href="/2022/talks/localizing">Pre-localizing Emacs</a>  
+Next: <a href="/2022/talks/treesitter">Tree-sitter beyond syntax highlighting</a>  
+Track: General  
diff --git a/2022/info/haskell-after.md b/2022/info/haskell-after.md
index b6f3432e..2ba9b57c 100644
--- a/2022/info/haskell-after.md
+++ b/2022/info/haskell-after.md
@@ -1,5 +1,5 @@
 <!-- Automatically generated by emacsconf-generate-after-page -->
 
 
-Questions or comments? Please e-mail [emacsconf-org-private@gnu.org](mailto:emacsconf-org-private@gnu.org?subject=Comment%20for%20EmacsConf%202022%20haskell%3A%20Haskell%20code%20exploration%20with%20Emacs)
+Questions or comments? Please e-mail [id@ypei.org](mailto:id@ypei.org?subject=Comment%20for%20EmacsConf%202022%20haskell%3A%20Haskell%20code%20exploration%20with%20Emacs)
 <!-- End of emacsconf-generate-after-page -->
diff --git a/2022/info/haskell-nav.md b/2022/info/haskell-nav.md
index cd47d239..fddea4be 100644
--- a/2022/info/haskell-nav.md
+++ b/2022/info/haskell-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/wayland">Emacs should become a Wayland compositor</a>  
-Next: <a href="/2022/talks/maint">Maintaining the Maintainers: Attribution as an Economic Model for Open Source</a>  
+Previous: <a href="/2022/talks/health">Health data journaling and visualization with Org Mode and GNUplot</a>  
+Next: <a href="/2022/talks/jupyter">Edit live Jupyter notebook cells with Emacs</a>  
+Track: Development  
diff --git a/2022/info/health-nav.md b/2022/info/health-nav.md
index 99bda8bd..3de37875 100644
--- a/2022/info/health-nav.md
+++ b/2022/info/health-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/realestate">Real estate and Org table formulas</a>  
-Next: <a href="/2022/talks/jupyter">Edit live Jupyter notebook cells with Emacs</a>  
+Previous: <a href="/2022/talks/maint">Maintaining the Maintainers: Attribution as an Economic Model for Open Source</a>  
+Next: <a href="/2022/talks/haskell">Haskell code exploration with Emacs</a>  
+Track: General  
diff --git a/2022/info/hyperorg-nav.md b/2022/info/hyperorg-nav.md
index bfa7ba58..6a91b6e2 100644
--- a/2022/info/hyperorg-nav.md
+++ b/2022/info/hyperorg-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
 Previous: <a href="/2022/talks/buttons">Linking personal info with Hyperbole implicit buttons</a>  
-Next: <a href="/2022/talks/meetups">Attending and organizing Emacs meetups</a>  
+Next: <a href="/2022/talks/detached">Getting detached from Emacs</a>  
+Track: General  
diff --git a/2022/info/indieweb-nav.md b/2022/info/indieweb-nav.md
index 10b78548..5099f6f1 100644
--- a/2022/info/indieweb-nav.md
+++ b/2022/info/indieweb-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/orgvm">orgvm: a simple HTTP server for org</a>  
-Next: <a href="/2022/talks/workflows">Org workflows for developers</a>  
+Previous: <a href="/2022/talks/asmblox">asm-blox: a game based on WebAssembly that no one asked for</a>  
+Next: <a href="/2022/talks/dbus">The Wheels on D-Bus</a>  
+Track: General  
diff --git a/2022/info/journalism-nav.md b/2022/info/journalism-nav.md
index f7f5bf4d..6278744b 100644
--- a/2022/info/journalism-nav.md
+++ b/2022/info/journalism-nav.md
@@ -1,3 +1,3 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/survey">Results of the 2022 Emacs Survey</a>  
-Next: <a href="/2022/talks/orgyear">This Year in Org</a>  
+Next: <a href="/2022/talks/school">Back to school with Emacs</a>  
+Track: General  
diff --git a/2022/info/jupyter-nav.md b/2022/info/jupyter-nav.md
index 163ba992..0fd587ee 100644
--- a/2022/info/jupyter-nav.md
+++ b/2022/info/jupyter-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/health">Health data journaling and visualization with Org Mode and GNUplot</a>  
-Next: <a href="/2022/talks/orgvm">orgvm: a simple HTTP server for org</a>  
+Previous: <a href="/2022/talks/haskell">Haskell code exploration with Emacs</a>  
+Next: <a href="/2022/talks/survey">Results of the 2022 Emacs Survey</a>  
+Track: General  
diff --git a/2022/info/justl-nav.md b/2022/info/justl-nav.md
index e9dcc828..98a3adca 100644
--- a/2022/info/justl-nav.md
+++ b/2022/info/justl-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/treesitter">Tree-sitter beyond syntax highlighting</a>  
-Next: <a href="/2022/talks/rde">rde Emacs introduction</a>  
+Previous: <a href="/2022/talks/rolodex">Build a Zettelkasten with the Hyperbole Rolodex</a>  
+Next: <a href="/2022/talks/links">Linking headings with org-super-links (poor-man's Zettelkasten)</a>  
+Track: Development  
diff --git a/2022/info/links-nav.md b/2022/info/links-nav.md
index 70d9f5c9..c132f40d 100644
--- a/2022/info/links-nav.md
+++ b/2022/info/links-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/rolodex">Build a Zettelkasten with the Hyperbole Rolodex</a>  
-Next: <a href="/2022/talks/buttons">Linking personal info with Hyperbole implicit buttons</a>  
+Previous: <a href="/2022/talks/justl">justl: Driving recipes within Emacs</a>  
+Next: <a href="/2022/talks/tramp">Elisp and the TRAMP: How to NOT write code you don't have to</a>  
+Track: General  
diff --git a/2022/info/localizing-nav.md b/2022/info/localizing-nav.md
index f8de7702..02914cf0 100644
--- a/2022/info/localizing-nav.md
+++ b/2022/info/localizing-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/workflows">Org workflows for developers</a>  
-Next: <a href="/2022/talks/lspbridge">lsp-bridge: complete asynchronous LSP client</a>  
+Previous: <a href="/2022/talks/school">Back to school with Emacs</a>  
+Next: <a href="/2022/talks/handwritten">How to incorporate handwritten notes into Emacs Orgmode</a>  
+Track: Development  
diff --git a/2022/info/lspbridge-nav.md b/2022/info/lspbridge-nav.md
index 0718548f..0c5a2e56 100644
--- a/2022/info/lspbridge-nav.md
+++ b/2022/info/lspbridge-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/localizing">Pre-localizing Emacs</a>  
-Next: <a href="/2022/talks/treesitter">Tree-sitter beyond syntax highlighting</a>  
+Previous: <a href="/2022/talks/science">Writing and organizing literature notes for scientific writing</a>  
+Next: <a href="/2022/talks/meetups">Attending and organizing Emacs meetups</a>  
+Track: Development  
diff --git a/2022/info/mail-nav.md b/2022/info/mail-nav.md
index 650357d0..10976d57 100644
--- a/2022/info/mail-nav.md
+++ b/2022/info/mail-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/python">Short hyperlinks to Python docs</a>  
-Next: <a href="/2022/talks/dbus">The Wheels on D-Bus</a>  
+Previous: <a href="/2022/talks/buddy">The Emacs Buddy initiative</a>  
+Next: <a href="/2022/talks/community">The ship that builds itself: How we used Emacs to develop a workshop for communities</a>  
+Track: Development  
diff --git a/2022/info/maint-nav.md b/2022/info/maint-nav.md
index f8e02020..fb34239b 100644
--- a/2022/info/maint-nav.md
+++ b/2022/info/maint-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/haskell">Haskell code exploration with Emacs</a>  
-Next: <a href="/2022/talks/fanfare">Fanfare for the Common Emacs User</a>  
+Previous: <a href="/2022/talks/python">Short hyperlinks to Python docs</a>  
+Next: <a href="/2022/talks/health">Health data journaling and visualization with Org Mode and GNUplot</a>  
+Track: Development  
diff --git a/2022/info/meetups-nav.md b/2022/info/meetups-nav.md
index bf7a6a7a..8d0d3595 100644
--- a/2022/info/meetups-nav.md
+++ b/2022/info/meetups-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/hyperorg">Powerful productivity with Hyperbole and Org Mode</a>  
-Next: <a href="/2022/talks/buddy">The Emacs Buddy initiative</a>  
+Previous: <a href="/2022/talks/lspbridge">lsp-bridge: complete asynchronous LSP client</a>  
+Next: <a href="/2022/talks/sqlite">Using SQLite as a data source: a framework and an example</a>  
+Track: General  
diff --git a/2022/info/orgvm-nav.md b/2022/info/orgvm-nav.md
index 6cd4d828..9db7830d 100644
--- a/2022/info/orgvm-nav.md
+++ b/2022/info/orgvm-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/jupyter">Edit live Jupyter notebook cells with Emacs</a>  
-Next: <a href="/2022/talks/indieweb">Putting Org Mode on the Indieweb</a>  
+Previous: <a href="/2022/talks/async">Emacs was async before async was cool</a>  
+Next: <a href="/2022/talks/asmblox">asm-blox: a game based on WebAssembly that no one asked for</a>  
+Track: General  
diff --git a/2022/info/orgyear-nav.md b/2022/info/orgyear-nav.md
index 2a86d40d..d334edb0 100644
--- a/2022/info/orgyear-nav.md
+++ b/2022/info/orgyear-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/journalism">Emacs journalism (or everything's a nail if you hit it with Emacs)</a>  
-Next: <a href="/2022/talks/handwritten">How to incorporate handwritten notes into Emacs Orgmode</a>  
+Previous: <a href="/2022/talks/survey">Results of the 2022 Emacs Survey</a>  
+Next: <a href="/2022/talks/rde">rde Emacs introduction</a>  
+Track: General  
diff --git a/2022/info/python-nav.md b/2022/info/python-nav.md
index 9ed0d1f1..81563ffd 100644
--- a/2022/info/python-nav.md
+++ b/2022/info/python-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/eev">Bidirectional links with eev</a>  
-Next: <a href="/2022/talks/mail">Revisiting the anatomy of Emacs mail user agents</a>  
+Previous: <a href="/2022/talks/realestate">Real estate and Org table formulas</a>  
+Next: <a href="/2022/talks/maint">Maintaining the Maintainers: Attribution as an Economic Model for Open Source</a>  
+Track: Development  
diff --git a/2022/info/rde-nav.md b/2022/info/rde-nav.md
index 1a0160ac..de2a64ae 100644
--- a/2022/info/rde-nav.md
+++ b/2022/info/rde-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/justl">justl: Driving recipes within Emacs</a>  
-Next: <a href="/2022/talks/eshell">Top 10 reasons why you should be using Eshell</a>  
+Previous: <a href="/2022/talks/orgyear">This Year in Org</a>  
+Next: <a href="/2022/talks/rolodex">Build a Zettelkasten with the Hyperbole Rolodex</a>  
+Track: Development  
diff --git a/2022/info/realestate-nav.md b/2022/info/realestate-nav.md
index 891d7fdd..564181b6 100644
--- a/2022/info/realestate-nav.md
+++ b/2022/info/realestate-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/community">The ship that builds itself: How we used Emacs to develop a workshop for communities</a>  
-Next: <a href="/2022/talks/health">Health data journaling and visualization with Org Mode and GNUplot</a>  
+Previous: <a href="/2022/talks/eev">Bidirectional links with eev</a>  
+Next: <a href="/2022/talks/python">Short hyperlinks to Python docs</a>  
+Track: General  
diff --git a/2022/info/rolodex-nav.md b/2022/info/rolodex-nav.md
index f3e4a646..43a05f9c 100644
--- a/2022/info/rolodex-nav.md
+++ b/2022/info/rolodex-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/handwritten">How to incorporate handwritten notes into Emacs Orgmode</a>  
-Next: <a href="/2022/talks/links">Linking headings with org-super-links (poor-man's Zettelkasten)</a>  
+Previous: <a href="/2022/talks/rde">rde Emacs introduction</a>  
+Next: <a href="/2022/talks/justl">justl: Driving recipes within Emacs</a>  
+Track: General  
diff --git a/2022/info/school-nav.md b/2022/info/school-nav.md
index 6cf96def..e5c97f58 100644
--- a/2022/info/school-nav.md
+++ b/2022/info/school-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/buddy">The Emacs Buddy initiative</a>  
-Next: <a href="/2022/talks/science">Writing and organizing literature notes for scientific writing</a>  
+Previous: <a href="/2022/talks/journalism">Emacs journalism (or everything's a nail if you hit it with Emacs)</a>  
+Next: <a href="/2022/talks/localizing">Pre-localizing Emacs</a>  
+Track: General  
diff --git a/2022/info/science-nav.md b/2022/info/science-nav.md
index a25b2c79..8ccab118 100644
--- a/2022/info/science-nav.md
+++ b/2022/info/science-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/school">Back to school with Emacs</a>  
-Next: <a href="/2022/talks/community">The ship that builds itself: How we used Emacs to develop a workshop for communities</a>  
+Previous: <a href="/2022/talks/treesitter">Tree-sitter beyond syntax highlighting</a>  
+Next: <a href="/2022/talks/lspbridge">lsp-bridge: complete asynchronous LSP client</a>  
+Track: General  
diff --git a/2022/info/sqlite-nav.md b/2022/info/sqlite-nav.md
index 492859a2..33992162 100644
--- a/2022/info/sqlite-nav.md
+++ b/2022/info/sqlite-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/async">Emacs was async before async was cool</a>  
-Next: <a href="/2022/talks/eev">Bidirectional links with eev</a>  
+Previous: <a href="/2022/talks/meetups">Attending and organizing Emacs meetups</a>  
+Next: <a href="/2022/talks/buddy">The Emacs Buddy initiative</a>  
+Track: Development  
diff --git a/2022/info/survey-nav.md b/2022/info/survey-nav.md
index cb34e48d..281cacd4 100644
--- a/2022/info/survey-nav.md
+++ b/2022/info/survey-nav.md
@@ -1,2 +1,4 @@
 Back to the [[talks]]  
-Next: <a href="/2022/talks/journalism">Emacs journalism (or everything's a nail if you hit it with Emacs)</a>  
+Previous: <a href="/2022/talks/jupyter">Edit live Jupyter notebook cells with Emacs</a>  
+Next: <a href="/2022/talks/orgyear">This Year in Org</a>  
+Track: General  
diff --git a/2022/info/tramp-nav.md b/2022/info/tramp-nav.md
index b1a5853a..95f6ada7 100644
--- a/2022/info/tramp-nav.md
+++ b/2022/info/tramp-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/asmblox">asm-blox: a game based on WebAssembly that no one asked for</a>  
-Next: <a href="/2022/talks/async">Emacs was async before async was cool</a>  
+Previous: <a href="/2022/talks/links">Linking headings with org-super-links (poor-man's Zettelkasten)</a>  
+Next: <a href="/2022/talks/buttons">Linking personal info with Hyperbole implicit buttons</a>  
+Track: Development  
diff --git a/2022/info/treesitter-nav.md b/2022/info/treesitter-nav.md
index aa2290f0..839a14fc 100644
--- a/2022/info/treesitter-nav.md
+++ b/2022/info/treesitter-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/lspbridge">lsp-bridge: complete asynchronous LSP client</a>  
-Next: <a href="/2022/talks/justl">justl: Driving recipes within Emacs</a>  
+Previous: <a href="/2022/talks/handwritten">How to incorporate handwritten notes into Emacs Orgmode</a>  
+Next: <a href="/2022/talks/science">Writing and organizing literature notes for scientific writing</a>  
+Track: Development  
diff --git a/2022/info/wayland-nav.md b/2022/info/wayland-nav.md
index 755ed4ed..3971236a 100644
--- a/2022/info/wayland-nav.md
+++ b/2022/info/wayland-nav.md
@@ -1,3 +1,3 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/dbus">The Wheels on D-Bus</a>  
-Next: <a href="/2022/talks/haskell">Haskell code exploration with Emacs</a>  
+Previous: <a href="/2022/talks/fanfare">Fanfare for the Common Emacs User</a>  
+Track: Development  
diff --git a/2022/info/workflows-nav.md b/2022/info/workflows-nav.md
index 32f894e4..8b4f2062 100644
--- a/2022/info/workflows-nav.md
+++ b/2022/info/workflows-nav.md
@@ -1,3 +1,4 @@
 Back to the [[talks]]  
-Previous: <a href="/2022/talks/indieweb">Putting Org Mode on the Indieweb</a>  
-Next: <a href="/2022/talks/localizing">Pre-localizing Emacs</a>  
+Previous: <a href="/2022/talks/eshell">Top 10 reasons why you should be using Eshell</a>  
+Next: <a href="/2022/talks/async">Emacs was async before async was cool</a>  
+Track: General  
diff --git a/2022/schedule-details.md b/2022/schedule-details.md
index 0ed5f203..95a6c101 100644
--- a/2022/schedule-details.md
+++ b/2022/schedule-details.md
@@ -1,51 +1,43 @@
-<table width="100%"><tr><th>Title</th><th>Speaker(s)</th></tr><tr><td colspan="2"><strong>Saturday, December 3<strong></td></tr>
-<tr><td colspan="2"><strong>Saturday opening remarks<strong></td></tr>
-<tr><td><a href="/2022/talks/survey">Results of the 2022 Emacs Survey</a></td><td>Timothy</td></tr>
-<tr><td><a href="/2022/talks/journalism">Emacs journalism (or everything's a nail if you hit it with Emacs)</a></td><td>Alfred Zanini</td></tr>
-<tr><td><a href="/2022/talks/orgyear">This Year in Org</a></td><td>Timothy</td></tr>
-<tr><td><a href="/2022/talks/handwritten">How to incorporate handwritten notes into Emacs Orgmode</a></td><td>Bala Ramadurai</td></tr>
-<tr><td><a href="/2022/talks/rolodex">Build a Zettelkasten with the Hyperbole Rolodex</a></td><td>Ramin Honary</td></tr>
-<tr><td colspan="2"><strong>SATURDAY MORNING BREAK<strong></td></tr>
-<tr><td><a href="/2022/talks/links">Linking headings with org-super-links (poor-man's Zettelkasten)</a></td><td>Karl Voit</td></tr>
-<tr><td><a href="/2022/talks/buttons">Linking personal info with Hyperbole implicit buttons</a></td><td>Mats Lidell</td></tr>
-<tr><td><a href="/2022/talks/hyperorg">Powerful productivity with Hyperbole and Org Mode</a></td><td>Robert Weiner</td></tr>
-<tr><td colspan="2"><strong>SATURDAY LUNCH<strong></td></tr>
-<tr><td><a href="/2022/talks/meetups">Attending and organizing Emacs meetups</a></td><td>Bhavin Gandhi</td></tr>
-<tr><td><a href="/2022/talks/buddy">The Emacs Buddy initiative</a></td><td>Andrea</td></tr>
-<tr><td><a href="/2022/talks/school">Back to school with Emacs</a></td><td>Daniel Rösel</td></tr>
-<tr><td><a href="/2022/talks/science">Writing and organizing literature notes for scientific writing</a></td><td>Vidianos</td></tr>
-<tr><td><a href="/2022/talks/community">The ship that builds itself: How we used Emacs to develop a workshop for communities</a></td><td>Noorah Alhasan, Joseph Corneli, Leo Vivier</td></tr>
-<tr><td><a href="/2022/talks/realestate">Real estate and Org table formulas</a></td><td>Daniel Gopar</td></tr>
-<tr><td colspan="2"><strong>SATURDAY AFTERNOON BREAK<strong></td></tr>
-<tr><td><a href="/2022/talks/health">Health data journaling and visualization with Org Mode and GNUplot</a></td><td>David O'Toole</td></tr>
-<tr><td><a href="/2022/talks/jupyter">Edit live Jupyter notebook cells with Emacs</a></td><td>Blaine Mooers</td></tr>
-<tr><td><a href="/2022/talks/orgvm">orgvm: a simple HTTP server for org</a></td><td>Corwin Brust</td></tr>
-<tr><td><a href="/2022/talks/indieweb">Putting Org Mode on the Indieweb</a></td><td>Michael Herstine</td></tr>
-<tr><td><a href="/2022/talks/workflows">Org workflows for developers</a></td><td>George Mauer</td></tr>
-<tr><td colspan="2"><strong>Saturday closing remarks<strong></td></tr>
-<tr><td colspan="2"><strong>Sunday, December 4<strong></td></tr>
-<tr><td colspan="2"><strong>Sunday opening remarks<strong></td></tr>
-<tr><td><a href="/2022/talks/localizing">Pre-localizing Emacs</a></td><td>Jean-Christophe Helary</td></tr>
-<tr><td><a href="/2022/talks/lspbridge">lsp-bridge: complete asynchronous LSP client</a></td><td>Andy Stewart</td></tr>
-<tr><td><a href="/2022/talks/treesitter">Tree-sitter beyond syntax highlighting</a></td><td>meain</td></tr>
-<tr><td colspan="2"><strong>SUNDAY MORNING BREAK<strong></td></tr>
-<tr><td><a href="/2022/talks/justl">justl: Driving recipes within Emacs</a></td><td>Sibi Prabakaran</td></tr>
-<tr><td><a href="/2022/talks/rde">rde Emacs introduction</a></td><td>Andrew Tropin</td></tr>
-<tr><td><a href="/2022/talks/eshell">Top 10 reasons why you should be using Eshell</a></td><td>Howard Abrams</td></tr>
-<tr><td><a href="/2022/talks/detached">Getting detached from Emacs</a></td><td>Niklas Eklund</td></tr>
-<tr><td><a href="/2022/talks/asmblox">asm-blox: a game based on WebAssembly that no one asked for</a></td><td>Zachary Romero</td></tr>
-<tr><td colspan="2"><strong>SUNDAY LUNCH<strong></td></tr>
-<tr><td><a href="/2022/talks/tramp">Elisp and the TRAMP: How to NOT write code you don't have to</a></td><td>Grant Shangreaux</td></tr>
-<tr><td><a href="/2022/talks/async">Emacs was async before async was cool</a></td><td>Michael Herstine</td></tr>
-<tr><td><a href="/2022/talks/sqlite">Using SQLite as a data source: a framework and an example</a></td><td>Andrew Hyatt</td></tr>
-<tr><td><a href="/2022/talks/eev">Bidirectional links with eev</a></td><td>Eduardo Ochs</td></tr>
-<tr><td><a href="/2022/talks/python">Short hyperlinks to Python docs</a></td><td>Eduardo Ochs</td></tr>
-<tr><td><a href="/2022/talks/mail">Revisiting the anatomy of Emacs mail user agents</a></td><td>Mohsen BANAN</td></tr>
-<tr><td colspan="2"><strong>SUNDAY AFTERNOON BREAK<strong></td></tr>
-<tr><td><a href="/2022/talks/dbus">The Wheels on D-Bus</a></td><td>Ian Eure</td></tr>
-<tr><td><a href="/2022/talks/wayland">Emacs should become a Wayland compositor</a></td><td>Michael Bauer</td></tr>
-<tr><td><a href="/2022/talks/haskell">Haskell code exploration with Emacs</a></td><td>Yuchen Pei</td></tr>
-<tr><td><a href="/2022/talks/maint">Maintaining the Maintainers: Attribution as an Economic Model for Open Source</a></td><td>Sid Kasivajhula</td></tr>
-<tr><td><a href="/2022/talks/fanfare">Fanfare for the Common Emacs User</a></td><td>John Cummings</td></tr>
-<tr><td colspan="2"><strong>Sunday closing remarks<strong></td></tr>
-<tr><td><a href="/2022/talks/news">Emacs News highlights</a></td><td>Sacha Chua</td></tr></table>
\ No newline at end of file
+<a href="#development">Jump to development talks</a>
+<a name="general"></a>
+# General talks
+<table width="100%"><tr><th>Title</th><th>Speaker(s)</th></tr><tr><td><a href="/2022/talks/journalism">Emacs journalism (or everything's a nail if you hit it with Emacs)</a><td>Alfred Zanini</td></tr>
+<tr><td><a href="/2022/talks/school">Back to school with Emacs</a><td>Daniel Rösel</td></tr>
+<tr><td><a href="/2022/talks/handwritten">How to incorporate handwritten notes into Emacs Orgmode</a><td>Bala Ramadurai</td></tr>
+<tr><td><a href="/2022/talks/science">Writing and organizing literature notes for scientific writing</a><td>Vidianos</td></tr>
+<tr><td><a href="/2022/talks/meetups">Attending and organizing Emacs meetups</a><td>Bhavin Gandhi</td></tr>
+<tr><td><a href="/2022/talks/buddy">The Emacs Buddy initiative</a><td>Andrea</td></tr>
+<tr><td><a href="/2022/talks/community">The ship that builds itself: How we used Emacs to develop a workshop for communities</a><td>Noorah Alhasan, Joseph Corneli, Leo Vivier</td></tr>
+<tr><td><a href="/2022/talks/realestate">Real estate and Org table formulas</a><td>Daniel Gopar</td></tr>
+<tr><td><a href="/2022/talks/health">Health data journaling and visualization with Org Mode and GNUplot</a><td>David O'Toole</td></tr>
+<tr><td><a href="/2022/talks/jupyter">Edit live Jupyter notebook cells with Emacs</a><td>Blaine Mooers</td></tr>
+<tr><td><a href="/2022/talks/survey">Results of the 2022 Emacs Survey</a><td>Timothy</td></tr>
+<tr><td><a href="/2022/talks/orgyear">This Year in Org</a><td>Timothy</td></tr>
+<tr><td><a href="/2022/talks/rolodex">Build a Zettelkasten with the Hyperbole Rolodex</a><td>Ramin Honary</td></tr>
+<tr><td><a href="/2022/talks/links">Linking headings with org-super-links (poor-man's Zettelkasten)</a><td>Karl Voit</td></tr>
+<tr><td><a href="/2022/talks/buttons">Linking personal info with Hyperbole implicit buttons</a><td>Mats Lidell</td></tr>
+<tr><td><a href="/2022/talks/hyperorg">Powerful productivity with Hyperbole and Org Mode</a><td>Robert Weiner</td></tr>
+<tr><td><a href="/2022/talks/workflows">Org workflows for developers</a><td>George Mauer</td></tr>
+<tr><td><a href="/2022/talks/orgvm">orgvm: a simple HTTP server for org</a><td>Corwin Brust</td></tr>
+<tr><td><a href="/2022/talks/indieweb">Putting Org Mode on the Indieweb</a><td>Michael Herstine</td></tr>
+<tr><td><a href="/2022/talks/fanfare">Fanfare for the Common Emacs User</a><td>John Cummings</td></tr></table>
+<a name="development"></a>
+# Development talks
+<table width="100%"><tr><th>Title</th><th>Speaker(s)</th></tr><tr><td><a href="/2022/talks/localizing">Pre-localizing Emacs</a><td>Jean-Christophe Helary</td></tr>
+<tr><td><a href="/2022/talks/treesitter">Tree-sitter beyond syntax highlighting</a><td>meain</td></tr>
+<tr><td><a href="/2022/talks/lspbridge">lsp-bridge: complete asynchronous LSP client</a><td>Andy Stewart</td></tr>
+<tr><td><a href="/2022/talks/sqlite">Using SQLite as a data source: a framework and an example</a><td>Andrew Hyatt</td></tr>
+<tr><td><a href="/2022/talks/mail">Revisiting the anatomy of Emacs mail user agents</a><td>Mohsen BANAN</td></tr>
+<tr><td><a href="/2022/talks/eev">Bidirectional links with eev</a><td>Eduardo Ochs</td></tr>
+<tr><td><a href="/2022/talks/python">Short hyperlinks to Python docs</a><td>Eduardo Ochs</td></tr>
+<tr><td><a href="/2022/talks/maint">Maintaining the Maintainers: Attribution as an Economic Model for Open Source</a><td>Sid Kasivajhula</td></tr>
+<tr><td><a href="/2022/talks/haskell">Haskell code exploration with Emacs</a><td>Yuchen Pei</td></tr>
+<tr><td><a href="/2022/talks/rde">rde Emacs introduction</a><td>Andrew Tropin</td></tr>
+<tr><td><a href="/2022/talks/justl">justl: Driving recipes within Emacs</a><td>Sibi Prabakaran</td></tr>
+<tr><td><a href="/2022/talks/tramp">Elisp and the TRAMP: How to NOT write code you don't have to</a><td>Grant Shangreaux</td></tr>
+<tr><td><a href="/2022/talks/detached">Getting detached from Emacs</a><td>Niklas Eklund</td></tr>
+<tr><td><a href="/2022/talks/eshell">Top 10 reasons why you should be using Eshell</a><td>Howard Abrams</td></tr>
+<tr><td><a href="/2022/talks/async">Emacs was async before async was cool</a><td>Michael Herstine</td></tr>
+<tr><td><a href="/2022/talks/asmblox">asm-blox: a game based on WebAssembly that no one asked for</a><td>Zachary Romero</td></tr>
+<tr><td><a href="/2022/talks/dbus">The Wheels on D-Bus</a><td>Ian Eure</td></tr>
+<tr><td><a href="/2022/talks/wayland">Emacs should become a Wayland compositor</a><td>Michael Bauer</td></tr></table>
\ No newline at end of file