17 files changed, 34 insertions, 1 deletions
diff --git a/2020/info/16.md b/2020/info/16.md
index dfb3ddda..590b3ad9 100644
--- a/2020/info/16.md
+++ b/2020/info/16.md
@@ -1,6 +1,8 @@
 # Org-roam: Presentation, Demonstration, and What's on the Horizon
 Leo Vivier
 
+[[!taglink CategoryOrgRoam]]
+
 [[!template id=vid src="https://mirror.csclub.uwaterloo.ca/emacsconf/2020/emacsconf-2020--16-org-roam-presentation-demonstration-and-whats-on-the-horizon--leo-vivier.webm" subtitles="/2020/subtitles/emacsconf-2020--16-org-roam-presentation-demonstration-and-whats-on-the-horizon--leo-vivier.vtt"]]  
 [Download .webm video, 720p, 263MB](https://mirror.csclub.uwaterloo.ca/emacsconf/2020/emacsconf-2020--16-org-roam-presentation-demonstration-and-whats-on-the-horizon--leo-vivier.webm)
 [View transcript](#transcript)
diff --git a/2020/info/17.md b/2020/info/17.md
index 83675788..9a65f0e7 100644
--- a/2020/info/17.md
+++ b/2020/info/17.md
@@ -1,6 +1,8 @@
 # Org-mode and Org-Roam for Scholars and Researchers
 Noorah Alhasan
 
+[[!taglink CategoryOrgRoam]]
+
 [[!template id=vid src="https://mirror.csclub.uwaterloo.ca/emacsconf/2020/emacsconf-2020--17-org-mode-and-org-roam-for-scholars-and-researchers--noorah-alhasan.webm" subtitles="/2020/subtitles/emacsconf-2020--17-org-mode-and-org-roam-for-scholars-and-researchers--noorah-alhasan.vtt"]]  
 [Download compressed .webm video (50.8M)](https://media.emacsconf.org/2020/emacsconf-2020--17-org-mode-and-org-roam-for-scholars-and-researchers--noorah-alhasan--compressed32.webm)  
 [Download compressed .webm video (22.2M, highly compressed)](https://mirror.csclub.uwaterloo.ca/emacsconf/2020/smaller/emacsconf-2020--17-org-mode-and-org-roam-for-scholars-and-researchers--noorah-alhasan--vp9-q56-video-original-audio.webm)
diff --git a/2020/info/18.md b/2020/info/18.md
index 80390a73..527aebff 100644
--- a/2020/info/18.md
+++ b/2020/info/18.md
@@ -1,6 +1,8 @@
 # Org-roam: Technical Presentation
 Leo Vivier
 
+[[!taglink CategoryOrgRoam]]
+
 [[!template id=vid src="https://mirror.csclub.uwaterloo.ca/emacsconf/2020/emacsconf-2020--18-org-roam-technical-presentation--leo-vivier.webm" subtitles="/2020/subtitles/emacsconf-2020--18-org-roam-technical-presentation--leo-vivier.vtt"]]  
 [Download compressed .webm video (47.4M)](https://media.emacsconf.org/2020/emacsconf-2020--18-org-roam-technical-presentation--leo-vivier--compressed32.webm)  
 [Download compressed .webm video (23.5M, highly compressed)](https://mirror.csclub.uwaterloo.ca/emacsconf/2020/smaller/emacsconf-2020--18-org-roam-technical-presentation--leo-vivier--vp9-q56-video-original-audio.webm)
diff --git a/2020/talks/16.md b/2020/talks/16.md
index 66f4a5eb..f148be6e 100644
--- a/2020/talks/16.md
+++ b/2020/talks/16.md
@@ -8,7 +8,6 @@ Back to the [[schedule]]
 Previous: <a href="/2020/talks/15">Moving from Jekyll to OrgMode, an experience report</a>  
 Next: <a href="/2020/talks/17">Org-mode and Org-Roam for Scholars and Researchers</a>  
 
-
 [[!inline pages="internal(2020/info/16)" raw="yes"]]
 
 Saturday, Nov 28 2020, ~ 2:54 PM -  3:14 PM EST  
diff --git a/2021/talks/babel.md b/2021/talks/babel.md
index 742f8b40..cd28d54b 100644
--- a/2021/talks/babel.md
+++ b/2021/talks/babel.md
@@ -7,6 +7,8 @@
 # Babel for academics
 Asilata Bapat
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/babel-schedule)" raw="yes"]]
 
 Plain org-mode is already an extremely powerful and
diff --git a/2021/talks/cs.md b/2021/talks/cs.md
index 905c9426..0b1fb3ad 100644
--- a/2021/talks/cs.md
+++ b/2021/talks/cs.md
@@ -8,6 +8,8 @@
 # One effective CS grad student workflow
 Greg Coladonato
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/cs-schedule)" raw="yes"]]
 
 When I was an undergrad, I learned many things, most of
diff --git a/2021/talks/invoice.md b/2021/talks/invoice.md
index 1ed5fb37..c3534656 100644
--- a/2021/talks/invoice.md
+++ b/2021/talks/invoice.md
@@ -8,6 +8,8 @@
 # Find Your (In)voice: Emacs for Invoicing
 Bala Ramadurai
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/invoice-schedule)" raw="yes"]]
 
 [[!table header="no" class="speaker-details" data="""
diff --git a/2021/talks/molecular.md b/2021/talks/molecular.md
index 46905bcb..3cc7d829 100644
--- a/2021/talks/molecular.md
+++ b/2021/talks/molecular.md
@@ -8,6 +8,8 @@
 # Reproducible molecular graphics with Org-mode
 Blaine Mooers
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/molecular-schedule)" raw="yes"]]
 
 Research papers in structural biology should include the code used to make 
diff --git a/2021/talks/org-outside.md b/2021/talks/org-outside.md
index f6f26e19..e13948b0 100644
--- a/2021/talks/org-outside.md
+++ b/2021/talks/org-outside.md
@@ -8,6 +8,8 @@
 # The use of Org mode syntax outside of GNU/Emacs
 Karl Voit
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/org-outside-schedule)" raw="yes"]]
 
 With the rising interest in Org mode, the GNU/Emacs community gained
diff --git a/2021/talks/professional.md b/2021/talks/professional.md
index e0233886..5a16d2c1 100644
--- a/2021/talks/professional.md
+++ b/2021/talks/professional.md
@@ -8,6 +8,8 @@
 # Using Org-Mode For Recording Continuous Professional Development
 Philip Beadling
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/professional-schedule)" raw="yes"]]
 
 I recently had the pleasure of being audited for my CPD record with one
diff --git a/2021/talks/project.md b/2021/talks/project.md
index 36fabeb2..d7f93c01 100644
--- a/2021/talks/project.md
+++ b/2021/talks/project.md
@@ -8,6 +8,8 @@
 # Budgeting, Project Monitoring and Invoicing with Org Mode
 Adolfo Villafiorita
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/project-schedule)" raw="yes"]]
 
 In this talk I will present how we use Org Mode at Shair.Tech for
diff --git a/2021/talks/research.md b/2021/talks/research.md
index 770e6185..a0468c64 100644
--- a/2021/talks/research.md
+++ b/2021/talks/research.md
@@ -8,6 +8,9 @@
 # Managing a research workflow (bibliographies, note-taking, and arXiv)
 Ahmed Khaled
 
+[[!taglink CategoryOrgMode]]
+[[!taglink CategoryOrgRoam]]
+
 [[!inline pages="internal(2021/info/research-schedule)" raw="yes"]]
 
 [Configuration I use in Doom Emacs as part of my academic reading/notetaking workflow](https://gist.github.com/rka97/57779810d3664f41b0ed68a855fcab54)
diff --git a/2021/talks/teach.md b/2021/talks/teach.md
index bdb36066..16052178 100644
--- a/2021/talks/teach.md
+++ b/2021/talks/teach.md
@@ -8,6 +8,8 @@
 # Using Org-mode to teach programming
 Daniel German
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/teach-schedule)" raw="yes"]]
 
 In this presentation I will explain how to use org-mode effectively to
diff --git a/2021/talks/tech.md b/2021/talks/tech.md
index 18b84a75..c327181d 100644
--- a/2021/talks/tech.md
+++ b/2021/talks/tech.md
@@ -8,6 +8,8 @@
 # Creating technical API documentation and presentations using org-babel, restclient, and org-treeslide
 Jan Ypma
 
+[[!taglink CategoryOrgMode]]
+
 [[!inline pages="internal(2021/info/tech-schedule)" raw="yes"]]
 
 The emacs org-babel package is often mentioned in conjunction with
diff --git a/CategoryCategory.md b/CategoryCategory.md
new file mode 100644
index 00000000..2e9234ce
--- /dev/null
+++ b/CategoryCategory.md
@@ -0,0 +1 @@
+[[!inline pages="tagged(CategoryCategory)" archive="yes" limit="0" trail="yes"]]
diff --git a/CategoryOrgMode.md b/CategoryOrgMode.md
new file mode 100644
index 00000000..3e050428
--- /dev/null
+++ b/CategoryOrgMode.md
@@ -0,0 +1,3 @@
+[[!inline pages="tagged(CategoryOrgMode)" archive="yes" limit="0" trail="yes"]]
+
+[[!taglink CategoryCategory]]
diff --git a/CategoryOrgRoam.md b/CategoryOrgRoam.md
new file mode 100644
index 00000000..f4d07e31
--- /dev/null
+++ b/CategoryOrgRoam.md
@@ -0,0 +1,3 @@
+[[!inline pages="tagged(CategoryOrgRoam)" archive="yes" limit="0" trail="yes"]]
+
+[[!taglink CategoryCategory]]