diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index 7d23eea..47f4110 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -45,467 +45,435 @@ subsystems. See https://www.drupal.org/contribute/core-maintainers for more
 information on their responsibilities, and to find out how to become a subsystem
 maintainer. Current subsystem maintainers for Drupal 8:
 
-Ajax system
-- Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
-- Earl Miles 'merlinofchaos' https://www.drupal.org/u/merlinofchaos
-- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
-
-Asset library system
-- ?
-
-Authentication and authorization system
+Action
 - ?
 
-Base system
-- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
-- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
-
-Batch system
-- Yves Chedemois 'yched' https://www.drupal.org/u/yched
-
-Bootstrap system
-- ?
-
-Cache system
-- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
-- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
-- Mark Sonnabaum 'msonnabaum' https://www.drupal.org/u/msonnabaum
-
-Configuration system
-- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
-- Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
-- Matthew Tift 'mtift' https://www.drupal.org/u/mtift
-
-Configuration entity system
-- Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
-- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
-- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
-
-Cron system
-- Derek Wright 'dww' https://www.drupal.org/u/dww
-
-CSS
-- John Albin Wilkins 'JohnAlbin' https://www.drupal.org/u/johnalbin
-
-Database system
-- Larry Garfield 'Crell' https://www.drupal.org/u/crell
-
-  MySQL DB driver
-  - Larry Garfield 'Crell' https://www.drupal.org/u/crell
-  - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
-
-  PostgreSQL DB driver
-  - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
-  - Josh Waihi 'fiasco' https://www.drupal.org/u/fiasco
-
-  Sqlite DB driver
-  - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
-
-Database update system
-- ?
-
-Entity system
-- Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
-- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
-- Sascha Grossenbacher 'Berdir' https://www.drupal.org/u/berdir
-
-Extension system
-- ?
-
-Field system
-- Yves Chedemois 'yched' https://www.drupal.org/u/yched
-- Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
-
-File system
-- Andrew Morton 'drewish' https://www.drupal.org/u/drewish
-- Aaron Winborn 'aaron' https://www.drupal.org/u/aaron
-
-Form system
-- Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
-- Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
-- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
-- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
-
-Image system
-- Claudiu Cristea 'claudiu.cristea' https://www.drupal.org/u/claudiu.cristea
-
-Install system
-- ?
-
-JavaScript
-- Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
-- Kay Leung 'droplet' https://www.drupal.org/u/droplet
-
-Language system
-- Francesco Placella 'plach' https://www.drupal.org/u/plach
-- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
-
-Lock system
-- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
-
-Mail system
-- ?
-
-Markup
-- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
-
-Migration system
-- Adam Globus-Hoenich 'phenaproxima' https://www.drupal.org/u/phenaproxima
-- Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
-- Michael Anello 'ultimike' https://www.drupal.org/u/ultimike
-- Mike Ryan 'mikeryan' https://www.drupal.org/u/mikeryan
-
-Menu system
-- Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner
-- Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
-
-Node Access
-- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
-- Ken Rickard 'agentrickard' https://www.drupal.org/u/agentrickard
-- Jess Myrbo 'xjm' https://www.drupal.org/u/xjm
-
-Path system
-- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
-
-Plugin system
-- Kris Vanderwater 'EclipseGc' https://www.drupal.org/u/eclipseGc
-- Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
-- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
-
-Queue system
-- James Gilliland 'neclimdul' https://www.drupal.org/u/neclimdul
-- Mark Sonnabaum 'msonnabaum' https://www.drupal.org/u/msonnabaum
+Aggregator
+- Paris Liakos 'ParisLiakos' https://www.drupal.org/u/parisliakos
 
-Render system
-- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
+Ajax
 - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
-
-Request processing system
-- Larry Garfield 'Crell' https://www.drupal.org/u/crell
-
-Routing system
-- Larry Garfield 'Crell' https://www.drupal.org/u/crell
+- Earl Miles 'merlinofchaos' https://www.drupal.org/u/merlinofchaos
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 
-Theme system
-- Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
-- Scott Reeves 'Cottser' https://www.drupal.org/u/cottser
-- Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
-- Joël Pittet 'joelpittet' https://www.drupal.org/u/joelpittet
-- Lauri Eskola 'lauriii' https://www.drupal.org/u/lauriii
-
-Token system
-- Dave Reid 'davereid' https://www.drupal.org/u/davereid
-
-Translations
-- ?
-
-Transliteration system
-- Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
-- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
-- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
-
-Typed data system
-- Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
-
-Topic maintainers
------------------
-
-Accessibility
-- Mike Gifford 'mgifford' https://www.drupal.org/u/mgifford
-- Jesse Renée Beach 'jessebeach' https://www.drupal.org/u/jessebeach
-- Andrew Macpherson 'andrewmacpherson' https://www.drupal.org/u/andrewmacpherson
-
-Documentation
+Asset Library API
 - ?
 
-Performance
-- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
-
-Testing
+Authentication and Authorization
 - ?
 
-Usability
-- Roy Scholten 'yoroy' https://www.drupal.org/u/yoroy
-- Bojhan Somers 'Bojhan' https://www.drupal.org/u/bojhan
-
-Provisional membership: None at this time.
-
-Security team
------------------
-
-To report a security issue, see:
-https://www.drupal.org/security-team/report-issue
-
-The Drupal security team provides Security Advisories for vulnerabilities,
-assists developers in resolving security issues, and provides security
-documentation. See https://www.drupal.org/security-team for more information.
-The security team lead is:
-
-- Michael Hess 'mlhess' https://www.drupal.org/u/mlhess
-
-
-Module maintainers
-------------------
-
-Action module
+Automated Cron
 - ?
 
-Aggregator module
-- Paris Liakos 'ParisLiakos' https://www.drupal.org/u/parisliakos
-
-Automated Cron module
+Ban
 - ?
 
-Ban module
-- ?
+Bartik
+- Jen Simmons 'jensimmons' https://www.drupal.org/u/jensimmons
+- Emma Maria Karayiannis 'emma.maria' https://www.drupal.org/u/emma.maria
 
-Basic Auth module
+Basic Auth
 - Klaus Purer 'klausi' https://www.drupal.org/u/klausi
 - Juampy Novillo Requena 'juampy' https://www.drupal.org/u/juampy
 
-BigPipe module
+Batch
+- Yves Chedemois 'yched' https://www.drupal.org/u/yched
+
+BigPipe
 - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
 - Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
 
-Block module
+Block
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 - Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
 
-Block Content module
+Block Content
 - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
 
-Book module
+Book
 - Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
 
-Breakpoint module
+Bootstrap
+- ?
+
+Breakpoint
 - Peter Droogmans 'attiks' https://www.drupal.org/u/attiks
 - Marc Drummond 'mdrummond' https://www.drupal.org/u/mdrummond
 
-CKEditor module
+Cache
+- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
+- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
+- Mark Sonnabaum 'msonnabaum' https://www.drupal.org/u/msonnabaum
+
+CKEditor
 - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
 - Marek 'mlewand' Lewandowski https://www.drupal.org/u/mlewand
 
-Color module
+Classy
+- David Hernandez 'davidhernandez' https://www.drupal.org/u/davidhernandez
+- Morten Birch Heide-Jørgensen 'mortendk' https://www.drupal.org/u/mortendk
+
+Color
 - ?
 
-Comment module
+Comment
 - Dick Olsson 'dixon_' https://www.drupal.org/u/dixon_
 - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
 - Andrey Postnikov 'andypost' https://www.drupal.org/u/andypost
 
-Configuration module
+Configuration
+- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
+- Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
+- Matthew Tift 'mtift' https://www.drupal.org/u/mtift
+
+Configuration Entity API
+- Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
+- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 
-Configuration Translation module
+Configuration Translation
 - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
 - Tobias Stöckler 'tstoeckler' https://www.drupal.org/u/tstoeckler
 - Vijayachandran Mani 'vijaycs85' https://www.drupal.org/u/vijaycs85
 
-Contact module
+Configuration UI
+- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
+
+Contact
 - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
 - Jibran Ijaz 'jibran' https://www.drupal.org/u/jibran
 - Andrey Postnikov 'andypost' https://www.drupal.org/u/andypost
 
-Content Moderation module
+Content Moderation
 - Tim Millwood 'timmillwood' https://www.drupal.org/u/timmillwood
 
-Content Translation module
+Content Translation
 - Francesco Placella 'plach' https://www.drupal.org/u/plach
 
-Contextual module
+Contextual
 - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 
-Database Logging module
+Cron
+- Derek Wright 'dww' https://www.drupal.org/u/dww
+
+CSS
+- John Albin Wilkins 'JohnAlbin' https://www.drupal.org/u/johnalbin
+
+Database API
+- Larry Garfield 'Crell' https://www.drupal.org/u/crell
+
+  MySQL DB driver
+  - Larry Garfield 'Crell' https://www.drupal.org/u/crell
+  - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
+
+  PostgreSQL DB driver
+  - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
+  - Josh Waihi 'fiasco' https://www.drupal.org/u/fiasco
+
+  Sqlite DB driver
+  - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
+
+Database Logging
 - Khalid Baheyeldin 'kbahey' https://www.drupal.org/u/kbahey
 
-DateTime module
+Database Update API
+- ?
+
+DateTime
 - Jonathan Hedstrom 'jhedstrom' https://www.drupal.org/u/jhedstrom
 - Matthew Donadio 'mpdonadio' https://www.drupal.org/u/mpdonadio
 
-Dynamic Page Cache module
+Dynamic Page Cache
 - Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
 - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
 
-Email module
+Email
 - Nils Destoop 'zuuperman' https://www.drupal.org/u/zuuperman
 
-Editor module
+Editor
 - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
 
-Field UI module
+Entity API
+- Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
+- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
+- Sascha Grossenbacher 'Berdir' https://www.drupal.org/u/berdir
+
+Extension
+- ?
+
+Field API
+- Yves Chedemois 'yched' https://www.drupal.org/u/yched
+- Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
+
+Field UI
 - Yves Chedemois 'yched' https://www.drupal.org/u/yched
 - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
 
-File module
+File
+- Andrew Morton 'drewish' https://www.drupal.org/u/drewish
 - Aaron Winborn 'aaron' https://www.drupal.org/u/aaron
 
-Filter module
+Filter
+- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
+
+Form
+- Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
+- Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
 - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
+- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 
-Forum module
+Forum
 - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
 
-History module
+History
 - Andrey Postnikov 'andypost' https://www.drupal.org/u/andypost
 
-Hypertext Application Language (HAL) module
+Hypertext Application Language (HAL)
 - ?
 
-Help module
+Help
 - ?
 
-Image module
+Image
 - Claudiu Cristea 'claudiu.cristea' https://www.drupal.org/u/claudiu.cristea
 
-Interface Translation (locale) module
+Interface Translation (locale)
 - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
 
-Language module
+Installer
+- ?
+
+JavaScript
+- Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
+- Kay Leung 'droplet' https://www.drupal.org/u/droplet
+
+Language
 - Francesco Placella 'plach' https://www.drupal.org/u/plach
 - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
+- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 
-Link module
+Link
 - Weber Macedo 'Mac_Weber' https://www.drupal.org/u/mac_weber
 
-Menu link content module
+Lock
+- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
+
+Mail
+- ?
+
+Markup
+- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
+
+Menu
 - Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner
 - Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
 
-Menu UI module
+Menu Link Content
+- Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner
+- Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
+
+Menu UI
 - ?
 
-Migrate module
+Migrate
+- Adam Globus-Hoenich 'phenaproxima' https://www.drupal.org/u/phenaproxima
 - Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
 - Michael Anello 'ultimike' https://www.drupal.org/u/ultimike
 - Mike Ryan 'mikeryan' https://www.drupal.org/u/mikeryan
 
-Migrate (Drupal) module
+Migrate (Drupal)
 - Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
 - Michael Anello 'ultimike' https://www.drupal.org/u/ultimike
 - Mike Ryan 'mikeryan' https://www.drupal.org/u/mikeryan
 
-Node module
+Node
 - Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
 - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
 
-Number module
+Node Access
+- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
+- Ken Rickard 'agentrickard' https://www.drupal.org/u/agentrickard
+- Jess Myrbo 'xjm' https://www.drupal.org/u/xjm
+
+Number
 - ?
 
-Options module
+Options
 - Yves Chedemois 'yched' https://www.drupal.org/u/yched
 
-Outside In module
+Outside In
 - Ted Bowman 'tedbow' https://www.drupal.org/u/tedbow
 
-Page Cache module
+Page Cache
 - Lorenz Schori 'znerol' https://www.drupal.org/u/znerol
 - Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
 
-Path module
-- ?
+Path
+- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
+
+Plugin
+- Kris Vanderwater 'EclipseGc' https://www.drupal.org/u/eclipseGc
+- Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
+- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 
-Quick Edit module
+Queue
+- James Gilliland 'neclimdul' https://www.drupal.org/u/neclimdul
+- Mark Sonnabaum 'msonnabaum' https://www.drupal.org/u/msonnabaum
+
+Quick Edit
 - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
 - Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
 
-RDF module
+RDF
 - Stéphane Corlosquet 'scor' https://www.drupal.org/u/scor
 
-REST module
-- Klaus Purer 'klausi' https://www.drupal.org/u/klausi
+Render API
+- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
+- Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
+
+Request Processing
 - Larry Garfield 'Crell' https://www.drupal.org/u/crell
-- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
 
-Responsive Image module
+Responsive Image
 - Peter Droogmans 'attiks' https://www.drupal.org/u/attiks
 - Marc Drummond 'mdrummond' https://www.drupal.org/u/mdrummond
 - Jelle Sebreghts 'Jelle_S' https://www.drupal.org/u/jelle_s
 
-Search module
+REST
+- Klaus Purer 'klausi' https://www.drupal.org/u/klausi
+- Larry Garfield 'Crell' https://www.drupal.org/u/crell
+- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
+
+Routing
+- Larry Garfield 'Crell' https://www.drupal.org/u/crell
+- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
+
+Search
 - Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
 
-Serialization module
+Serialization
 - Damian Lee 'damiankloip' https://www.drupal.org/u/damiankloip
 
-Shortcut module
+Seven
+- ?
+
+Shortcut
 - Tobias Stöckler 'tstoeckler' https://www.drupal.org/u/tstoeckler
 - Jibran Ijaz 'jibran' https://www.drupal.org/u/jibran
 
-Simpletest module
+Simpletest
 - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 - Sascha Grossenbacher 'Berdir' https://www.drupal.org/u/berdir
 - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
 
-Statistics module
+Stable
+- Scott Reeves 'Cottser' https://www.drupal.org/u/cottser
+
+Stark
+- John Albin Wilkins 'JohnAlbin' https://www.drupal.org/u/johnalbin
+
+Statistics
 - Tim Millwood 'timmillwood' https://www.drupal.org/u/timmillwood
 
-Syslog module
+Syslog
 - Khalid Baheyeldin 'kbahey' https://www.drupal.org/u/kbahey
 
-System module
-- ?
-
-Taxonomy module
+Taxonomy
 - Jess Myrbo 'xjm' https://www.drupal.org/u/xjm
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
 - Benjamin Doherty 'bangpound' https://www.drupal.org/u/bangpound
 
-Telephone module
+Theme
+- Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
+- Scott Reeves 'Cottser' https://www.drupal.org/u/cottser
+- Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
+- Joël Pittet 'joelpittet' https://www.drupal.org/u/joelpittet
+- Lauri Eskola 'lauriii' https://www.drupal.org/u/lauriii
+
+Telephone
 - Dave Reid 'dave-reid' https://www.drupal.org/u/dave-reid
 
-Text module
+Text
 - ?
 
-Toolbar module
+Token
+- Dave Reid 'davereid' https://www.drupal.org/u/davereid
+
+Toolbar
 - Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
 
-Tour module
+Tour
 - Nick Schuch 'nick_schuch' https://www.drupal.org/u/nick_schuch
 
-Tracker module
+Tracker
 - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
 
-Update module
+Translations
+- ?
+
+Transliteration
+- Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
+- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
+- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
+
+Typed Data
+- Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
+
+Update
 - Derek Wright 'dww' https://www.drupal.org/u/dww
 
-User module
+User
 - Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
 - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
 
-Views module
+Views
 - Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 - Damian Lee 'damiankloip' https://www.drupal.org/u/damiankloip
 - Jess Myrbo 'xjm' https://www.drupal.org/u/xjm
 - Len Swaneveld 'Lendude' https://www.drupal.org/u/lendude
 
-Views UI module
+Views UI
 - Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 - Damian Lee 'damiankloip' https://www.drupal.org/u/damiankloip
 - Len Swaneveld 'Lendude' https://www.drupal.org/u/lendude
 
-
-Theme maintainers
+Topic maintainers
 -----------------
 
-Bartik theme
-- Jen Simmons 'jensimmons' https://www.drupal.org/u/jensimmons
-- Emma Maria Karayiannis 'emma.maria' https://www.drupal.org/u/emma.maria
+Accessibility
+- Mike Gifford 'mgifford' https://www.drupal.org/u/mgifford
+- Jesse Renée Beach 'jessebeach' https://www.drupal.org/u/jessebeach
+- Andrew Macpherson 'andrewmacpherson' https://www.drupal.org/u/andrewmacpherson
 
-Classy theme
-- David Hernandez 'davidhernandez' https://www.drupal.org/u/davidhernandez
-- Morten Birch Heide-Jørgensen 'mortendk' https://www.drupal.org/u/mortendk
+Documentation
+- ?
+
+Performance
+- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
 
-Seven theme
+Testing
 - ?
 
-Stable theme
-- Scott Reeves 'Cottser' https://www.drupal.org/u/cottser
+Usability
+- Roy Scholten 'yoroy' https://www.drupal.org/u/yoroy
+- Bojhan Somers 'Bojhan' https://www.drupal.org/u/bojhan
 
-Stark theme
-- John Albin Wilkins 'JohnAlbin' https://www.drupal.org/u/johnalbin
+Provisional membership: None at this time.
+
+Security team
+-----------------
+
+To report a security issue, see:
+https://www.drupal.org/security-team/report-issue
+
+The Drupal security team provides Security Advisories for vulnerabilities,
+assists developers in resolving security issues, and provides security
+documentation. See https://www.drupal.org/security-team for more information.
+The security team lead is:
+
+- Michael Hess 'mlhess' https://www.drupal.org/u/mlhess
 
 
 Initiative coordinators
