diff --git a/Makefile b/Makefile
index 787007bb..954a3491 100644
--- a/Makefile
+++ b/Makefile
@@ -25,22 +25,28 @@ $(CALENDAR_DIR)/%.ics: calendars/%.yaml $(CALENDAR_DIR)
CALENDAR_SOURCES = $(wildcard calendars/*.yaml)
calendars: $(subst calendars,$(CALENDAR_DIR),$(CALENDAR_SOURCES:.yaml=.ics))
-TEAMS_DIR = static/teams
-TEAMS = community-managers spec-steering-committee community-leaders emeritus-spec-steering-committee emeritus-community-leaders
+TEAMS_DIR = content/about
+SPEC_DIR = content/specs/steering-committee
+TEAMS = community-managers community-leaders emeritus-community-leaders
+SPEC_TEAMS = spec-steering-committee emeritus-spec-steering-committee
TEAMS_QUERY = python themes/scientific-python-hugo-theme/tools/team_query.py
-$(TEAMS_DIR):
- mkdir -p $(TEAMS_DIR)
+$(TEAMS_DIR)/%.toml:
+ $(TEAMS_QUERY) --org scientific-python --team "$*" > $(TEAMS_DIR)/$*.toml
-$(TEAMS_DIR)/%.md: $(TEAMS_DIR)
- $(TEAMS_QUERY) --org scientific-python --team "$*" > $(TEAMS_DIR)/$*.html
+$(SPEC_DIR)/%.toml:
+ $(TEAMS_QUERY) --org scientific-python --team "$*" > $(SPEC_DIR)/$*.toml
teams-clean:
for team in $(TEAMS); do \
- rm -f $(TEAMS_DIR)/$${team}.html ;\
+ rm -f $(TEAMS_DIR)/$${team}.toml ;\
+ done
+ for team in $(SPEC_TEAMS); do \
+ rm -f $(SPEC_DIR)/$${team}.toml ;\
done
-teams: | teams-clean $(patsubst %,$(TEAMS_DIR)/%.md,$(TEAMS)) ## generates team gallery pages
+# generates team gallery pages
+teams: | teams-clean $(patsubst %,$(TEAMS_DIR)/%.toml,$(TEAMS)) $(patsubst %,$(SPEC_DIR)/%.toml,$(SPEC_TEAMS))
core-project-json: content/specs/core-projects/core-projects.json
diff --git a/content/about/_index.md b/content/about/_index.md
index 7d38db37..083e09ce 100644
--- a/content/about/_index.md
+++ b/content/about/_index.md
@@ -82,9 +82,17 @@ Read about the [grants]({{< relref "/grants" >}}) that fund the work we do.
The following people are involved with leading the overall project.
For more information, see our [governance and decision making process]({{% relref "/about/governance" %}}).
-{{< include-html "static/teams/community-managers.html" >}}
-{{< include-html "static/teams/community-leaders.html" >}}
-{{< include-html "static/teams/emeritus-community-leaders.html" >}}
+### Community Managers
+
+{{< grid1 file="community-managers.toml" columns="2 3 4 5" />}}
+
+### Community Leaders
+
+{{< grid1 file="community-leaders.toml" columns="2 3 4 5" />}}
+
+### Emeritus Community Leaders
+
+{{< grid1 file="emeritus-community-leaders.toml" columns="2 3 4 5" />}}
### Other Teams
diff --git a/content/about/community-leaders.toml b/content/about/community-leaders.toml
new file mode 100644
index 00000000..afbbff48
--- /dev/null
+++ b/content/about/community-leaders.toml
@@ -0,0 +1,49 @@
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Brigitta Sipőcz'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/6788290?u=d9a388224b87d55106cb3e6199d02ebc1d8e0553&v=4"'
+alt = 'Avatar of Brigitta Sipőcz'
+{{< /image >}}'''
+link = 'https://github.com/bsipocz'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Jarrod Millman'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/123428?v=4"'
+alt = 'Avatar of Jarrod Millman'
+{{< /image >}}'''
+link = 'https://github.com/jarrodmillman'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Juanita Gomez'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/18587879?u=83f10fabe466ae8e7052c03c5e6e9cde684a4e10&v=4"'
+alt = 'Avatar of Juanita Gomez'
+{{< /image >}}'''
+link = 'https://github.com/juanis2112'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Stefan van der Walt'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/45071?u=c779b5e06448fbc638bc987cdfe305c7f9a7175e&v=4"'
+alt = 'Avatar of Stefan van der Walt'
+{{< /image >}}'''
+link = 'https://github.com/stefanv'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Pamphile Roy'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/23188539?u=64445b52dbf3f75de8006ed4264fdd2afaed97a3&v=4"'
+alt = 'Avatar of Pamphile Roy'
+{{< /image >}}'''
+link = 'https://github.com/tupui'
diff --git a/content/about/community-managers.toml b/content/about/community-managers.toml
new file mode 100644
index 00000000..b643088c
--- /dev/null
+++ b/content/about/community-managers.toml
@@ -0,0 +1,119 @@
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Brigitta Sipőcz'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/6788290?u=d9a388224b87d55106cb3e6199d02ebc1d8e0553&v=4"'
+alt = 'Avatar of Brigitta Sipőcz'
+{{< /image >}}'''
+link = 'https://github.com/bsipocz'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Sarah Kaiser'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/6486256?u=34be26023eb25da1c19a20e525af3da9277b52a2&v=4"'
+alt = 'Avatar of Sarah Kaiser'
+{{< /image >}}'''
+link = 'https://github.com/crazy4pi314'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Davina Zaman'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/5055644?u=6f173c252458b06645be90d69b9a220f08c81e7a&v=4"'
+alt = 'Avatar of Davina Zaman'
+{{< /image >}}'''
+link = 'https://github.com/davzaman'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Jarrod Millman'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/123428?v=4"'
+alt = 'Avatar of Jarrod Millman'
+{{< /image >}}'''
+link = 'https://github.com/jarrodmillman'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Juanita Gomez'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/18587879?u=83f10fabe466ae8e7052c03c5e6e9cde684a4e10&v=4"'
+alt = 'Avatar of Juanita Gomez'
+{{< /image >}}'''
+link = 'https://github.com/juanis2112'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Kira Evans'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/29165011?u=a9cad2941ed8ddec88ea9fc7523ff70433fce7e6&v=4"'
+alt = 'Avatar of Kira Evans'
+{{< /image >}}'''
+link = 'https://github.com/kne42'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Melissa Weber Mendonça'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/3949932?u=aacac68df60d2cf64c17c7e5aa17adf8b738aa7b&v=4"'
+alt = 'Avatar of Melissa Weber Mendonça'
+{{< /image >}}'''
+link = 'https://github.com/melissawm'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Marianne Corvellec'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/2227806?u=5320031216d435cd2bb0259a116a5623108c9b26&v=4"'
+alt = 'Avatar of Marianne Corvellec'
+{{< /image >}}'''
+link = 'https://github.com/mkcor'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Mridul Seth'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/5363860?u=ce5c6e9388d2fd153ebf8b0bb521c928b0813608&v=4"'
+alt = 'Avatar of Mridul Seth'
+{{< /image >}}'''
+link = 'https://github.com/MridulS'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Ross Barnowski'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/1268991?u=974707b96081a9705f3a239c0773320f353ee02f&v=4"'
+alt = 'Avatar of Ross Barnowski'
+{{< /image >}}'''
+link = 'https://github.com/rossbar'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Stefan van der Walt'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/45071?u=c779b5e06448fbc638bc987cdfe305c7f9a7175e&v=4"'
+alt = 'Avatar of Stefan van der Walt'
+{{< /image >}}'''
+link = 'https://github.com/stefanv'
+
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Pamphile Roy'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/23188539?u=64445b52dbf3f75de8006ed4264fdd2afaed97a3&v=4"'
+alt = 'Avatar of Pamphile Roy'
+{{< /image >}}'''
+link = 'https://github.com/tupui'
diff --git a/content/about/emeritus-community-leaders.toml b/content/about/emeritus-community-leaders.toml
new file mode 100644
index 00000000..ac76a7b3
--- /dev/null
+++ b/content/about/emeritus-community-leaders.toml
@@ -0,0 +1,9 @@
+[[item]]
+type = 'card'
+classcard = 'text-center'
+header = 'Melissa Weber Mendonça'
+body = '''{{< image >}}
+src = 'https://avatars.githubusercontent.com/u/3949932?u=aacac68df60d2cf64c17c7e5aa17adf8b738aa7b&v=4"'
+alt = 'Avatar of Melissa Weber Mendonça'
+{{< /image >}}'''
+link = 'https://github.com/melissawm'
diff --git a/static/teams/community-leaders.html b/static/teams/community-leaders.html
deleted file mode 100644
index 2a2ed58b..00000000
--- a/static/teams/community-leaders.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
diff --git a/static/teams/community-managers.html b/static/teams/community-managers.html
deleted file mode 100644
index 81482982..00000000
--- a/static/teams/community-managers.html
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-