diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c825bba6ad..f5f7aa8efd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [21.9.0] - 2021-11-08
+### Changed
+- Misc a11y fixes
+- Removed RIDIE from registries dashboard
+- Replace help guide link on project registrations tab
+- Hide link to wiki on Registration overview page if registration has wiki disabled
+- Remove registration templates that are only for community oriented registries from the Registries Discover page registration-type facet
+- Fix registration overview page subjects search
+
 ## [21.8.0] - 2021-10-04
 ### Added
 - bulk upload component `Branded::Moderation::-Components::UploadCsv`
@@ -1801,7 +1810,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.7.0...develop
+[21.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.9.0
+[21.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.8.0
 [21.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.7.0
 [21.6.3]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.3
 [21.6.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.2
diff --git a/app/guid-node/registrations/controller.ts b/app/guid-node/registrations/controller.ts
index 764ac1b785a..74f2947a4e8 100644
--- a/app/guid-node/registrations/controller.ts
+++ b/app/guid-node/registrations/controller.ts
@@ -55,20 +55,15 @@ export default class GuidNodeRegistrations extends Controller {
         this.set('schemas', schemas);
     }
 
-    @computed('tab')
-    get activeTab() {
-        return this.tab ? this.tab : 'registrations';
-    }
-
     @computed('node.{id,root.id,root.userHasAdminPermission}')
     get isComponentRootAdmin() {
         return this.node && this.node.id !== this.node.root.get('id') && this.node.root.get('userHasAdminPermission');
     }
 
     @action
-    changeTab(activeId: string) {
-        this.set('tab', activeId === 'registrations' ? undefined : activeId);
-        this.analytics.click('tab', `Registrations tab - Change tab to: ${activeId}`);
+    changeTab(activeId: number) {
+        const tabName = activeId === 0 ? 'registrations' : 'drafts';
+        this.analytics.click('tab', `Registrations tab - Change tab to: ${tabName}`);
     }
 
     @action
diff --git a/app/guid-node/registrations/styles.scss b/app/guid-node/registrations/styles.scss
index e005378ff47..d88d4769385 100644
--- a/app/guid-node/registrations/styles.scss
+++ b/app/guid-node/registrations/styles.scss
@@ -69,3 +69,43 @@ h4:global(.NewRegistrationModal__header) {
 :global(.PreRegChallengeModal__consent) {
     font-weight: normal;
 }
+
+.Tabs {
+    /* stylelint-disable selector-no-qualifying-type */
+    ul.TabList {
+        margin-bottom: 10px;
+        border-bottom: 1px solid #ddd;
+        box-sizing: border-box;
+        color: rgb(51, 51, 51);
+        display: block;
+        line-height: 20px;
+        list-style-image: none;
+        list-style-position: outside;
+        list-style-type: none;
+        height: 41px;
+        padding: 0;
+    }
+    /* stylelint-enable selector-no-qualifying-type */
+    .TabList {
+        li {
+            display: block;
+            position: relative;
+            margin-bottom: -1px;
+            float: left;
+            height: 41px;
+            padding: 10px 15px;
+        }
+
+        li:global(.ember-tabs__tab--selected) {
+            background-color: #f8f8f8;
+            border-bottom: 2px solid #204762;
+        }
+
+        li:hover {
+            border-color: transparent;
+            text-decoration: none;
+            background-color: #f8f8f8;
+            color: var(--primary-color);
+        }
+    }
+}
diff --git a/app/guid-node/registrations/template.hbs b/app/guid-node/registrations/template.hbs
index 103c81ef1f1..882bfc0e99e 100644
--- a/app/guid-node/registrations/template.hbs
+++ b/app/guid-node/registrations/template.hbs
@@ -8,16 +8,25 @@
 >
     <div class='row'>
         <div class='col-xs-9 col-sm-8'>
-            <BsTab
+            <AriaTabs
                 data-analytics-scope='Registrations Tab'
-                @activeId={{this.activeTab}}
-                @onChange={{action this.changeTab}}
+                @defaultIndex={{0}}
+                @onSelect={{action this.changeTab}}
+                local-class='Tabs'
                 as |tab|
             >
-                <tab.pane
-                    @id='registrations'
-                    @title={{t 'node.registrations.registrations'}}
+                <tab.tabList
+                    local-class='TabList'
+                    as |tablist|
                 >
+                    <tablist.tab>{{t 'node.registrations.registrations'}}</tablist.tab>
+                    {{#if this.node.userHasReadPermission}}
+                        <tablist.tab data-test-drafts-tab>
+                            {{t 'node.registrations.draft_registrations'}}
+                        </tablist.tab>
+                    {{/if}}
+                </tab.tabList>
+                <tab.tabPanel>
                     <div class='row' local-class='RegistrationsPane' data-test-registrations-pane>
                         <NodeList
                             @modelTaskInstance={{this.model.taskInstance}}
@@ -37,20 +46,16 @@
                                 {{/if}}
                                 <p>
                                     {{t 'node.registrations.learn_more'
-                                        learnMoreLink='https://openscience.zendesk.com/hc/en-us/articles/360019930893'
+                                        learnMoreLink='https://help.osf.io/hc/en-us/categories/360001550953-Registrations'
                                         htmlSafe=true
                                     }}
                                 </p>
                             </nl.empty>
                         </NodeList>
                     </div>
-                </tab.pane>
+                </tab.tabPanel>
                 {{#if this.node.userHasReadPermission}}
-                    <tab.pane
-                        data-analytics-scope='Drafts tab'
-                        @id='drafts'
-                        @title={{t 'node.registrations.draft_registrations'}}
-                    >
+                    <tab.tabPanel data-analytics-scope='Drafts tab'>
                         <div class='row' local-class='RegistrationsPane' data-test-draft-registrations-pane>
                             <PaginatedList::HasMany
                                 data-analytics-scope='Project Draft Registrations'
@@ -74,16 +79,16 @@
                                     {{/if}}
                                     <p>
                                         {{t 'node.registrations.learn_more'
-                                          learnMoreLink='https://openscience.zendesk.com/hc/en-us/articles/360019930893'
+                                          learnMoreLink='https://help.osf.io/hc/en-us/categories/360001550953-Registrations'
                                           htmlSafe=true
                                         }}
                                     </p>
                                 </list.empty>
                             </PaginatedList::HasMany>
                         </div>
-                    </tab.pane>
+                    </tab.tabPanel>
                 {{/if}}
-            </BsTab>
+            </AriaTabs>
         </div>
         {{#if this.node.userHasAdminPermission}}
             <div class='col-xs-3 col-sm-4'>
diff --git a/app/institutions/index/template.hbs b/app/institutions/index/template.hbs
index d5202082892..f9f84683373 100644
--- a/app/institutions/index/template.hbs
+++ b/app/institutions/index/template.hbs
@@ -3,6 +3,7 @@
 <div
     data-analytics-scope='Institutions'
     local-class='Institutions__page'
+    role='main'
 >
     <div
         data-test-insitutions-header
@@ -97,6 +98,7 @@
                                 {{#if this.hasMore}}
                                     <BsButton
                                         data-test-more-institutions
+                                        aria-label={{t 'institutions.load_more'}}
                                         data-analytics-name='Next page'
                                         local-class='Institutions__more'
                                         @type='link'
diff --git a/app/meetings/detail/-components/meeting-submissions-list/template.hbs b/app/meetings/detail/-components/meeting-submissions-list/template.hbs
index 9e5a765b2b2..90005c760ce 100644
--- a/app/meetings/detail/-components/meeting-submissions-list/template.hbs
+++ b/app/meetings/detail/-components/meeting-submissions-list/template.hbs
@@ -4,6 +4,7 @@
             @type='text'
             @placeholder={{t 'meetings.index.meetings-list.search'}}
             @key-up={{perform this.searchSubmissions}}
+            aria-label={{t 'meetings.index.meetings-list.search'}}
         />
     </div>
 </div>
@@ -64,6 +65,7 @@
                 <div data-test-submissions-list-item-download>
                     {{#if submission.links.download}}
                         <BsButton
+                            aria-label={{t 'general.download'}}
                             @type='success'
                             class='btn-xs'
                             @onClick={{action this.downloadFile submission}}
diff --git a/app/meetings/index/-components/meetings-hero-banner/styles.scss b/app/meetings/index/-components/meetings-hero-banner/styles.scss
index c0b619dc3a7..960aae1e718 100644
--- a/app/meetings/index/-components/meetings-hero-banner/styles.scss
+++ b/app/meetings/index/-components/meetings-hero-banner/styles.scss
@@ -46,4 +46,10 @@
     h2 {
         font-size: 24px;
     }
+
+    .register-box {
+        a {
+            color: $color-link-dark;
+        }
+    }
 }
diff --git a/app/meetings/index/-components/meetings-hero-banner/template.hbs b/app/meetings/index/-components/meetings-hero-banner/template.hbs
index 59cdb3e58b6..c9c5e5a5d33 100644
--- a/app/meetings/index/-components/meetings-hero-banner/template.hbs
+++ b/app/meetings/index/-components/meetings-hero-banner/template.hbs
@@ -43,7 +43,7 @@
                     </div>
                     <CpPanel @open={{this.registerPanelOpen}} as |panel| >
                         <panel.body>
-                            <div data-test-register-panel-text class='m-lg osf-box-lt p-md text-left'>
+                            <div data-test-register-panel-text class='m-lg osf-box-lt p-md text-left' local-class='register-box'>
                                 {{t 'meetings.index.meetings-hero-banner.conference_organizers_register_panel_texts' htmlSafe=true}}
                             </div>
                         </panel.body>
diff --git a/app/meetings/index/-components/meetings-list/template.hbs b/app/meetings/index/-components/meetings-list/template.hbs
index 9460dd4e6b0..95f17dce282 100644
--- a/app/meetings/index/-components/meetings-list/template.hbs
+++ b/app/meetings/index/-components/meetings-list/template.hbs
@@ -5,6 +5,7 @@
 <div data-test-meetings-list-search local-class='search'>
     <div class='col-xs-12 col-sm-6 col-sm-offset-6'>
         <Input
+            aria-label={{t 'meetings.index.meetings-list.search'}}
             @type='text'
             @placeholder={{t 'meetings.index.meetings-list.search'}}
             @key-up={{perform this.searchMeetings}}
diff --git a/app/models/registration.ts b/app/models/registration.ts
index 81d73574fdb..85580f6b952 100644
--- a/app/models/registration.ts
+++ b/app/models/registration.ts
@@ -105,6 +105,7 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
     @attr('fixstring') iaUrl?: string;
     @attr('array') providerSpecificMetadata!: ProviderMetadata[];
     @attr('fixstring') revisionState!: RevisionReviewStates;
+    @attr('boolean') wikiEnabled!: boolean;
 
     // Write-only attributes
     @attr('array') includedNodeIds?: string[];
diff --git a/app/styles/_components.scss b/app/styles/_components.scss
index 6f98a09d107..73fd2d7ced5 100644
--- a/app/styles/_components.scss
+++ b/app/styles/_components.scss
@@ -140,7 +140,7 @@
 }
 
 .osf-project-navbar li.active a {
-    color: #f8f8f8;
+    color: #fff;
 }
 
 .osf-project-navbar a.project-title {
diff --git a/lib/analytics-page/addon/components/analytics-charts/x-chart-wrapper/styles.scss b/lib/analytics-page/addon/components/analytics-charts/x-chart-wrapper/styles.scss
index aea17343a79..b292ba15d63 100644
--- a/lib/analytics-page/addon/components/analytics-charts/x-chart-wrapper/styles.scss
+++ b/lib/analytics-page/addon/components/analytics-charts/x-chart-wrapper/styles.scss
@@ -7,7 +7,7 @@
 
 .DisabledPanel {
     :global(.panel-title) {
-        color: $color-text-gray-light;
+        color: $color-text-black;
     }
 }
 
diff --git a/lib/app-components/addon/components/project-contributors/list/item/styles.scss b/lib/app-components/addon/components/project-contributors/list/item/styles.scss
index a4f6a763cd8..f18e2010cef 100644
--- a/lib/app-components/addon/components/project-contributors/list/item/styles.scss
+++ b/lib/app-components/addon/components/project-contributors/list/item/styles.scss
@@ -37,11 +37,6 @@
     height: 30px;
 }
 
-.checkbox-label {
-    font-weight: normal;
-    padding-right: 5px;
-}
-
 @media (min-width: 768px) {
     .text-sm-center {
         text-align: center;
diff --git a/lib/app-components/addon/components/project-contributors/list/item/template.hbs b/lib/app-components/addon/components/project-contributors/list/item/template.hbs
index 729db0b00be..0d6b01378be 100644
--- a/lib/app-components/addon/components/project-contributors/list/item/template.hbs
+++ b/lib/app-components/addon/components/project-contributors/list/item/template.hbs
@@ -58,13 +58,12 @@
     {{! Bibliographic (Citation) }}
     <div data-test-project-contributors-list-item-citation-checkbox local-class='text-sm-center'
         class='col-xs-10 col-sm-2 col-sm-offset-0 bib-padding'>
-        <label local-class='checkbox-label' class='visible-xs-inline' for='{{@contributor.id}}-citation'>
-            <em>
-                {{t 'app_components.project_contributors.list.item.in_citation_label'}}
-            </em>
-        </label>
-        <Input @id={{concat @contributor.id '-citation'}} @type='checkbox' @disabled={{not this.canChangeBibliographic}}
-            @checked={{@contributor.bibliographic}} @change={{action @toggleBibliographic @contributor}} />
+        <Input
+            aria-label={{t 'app_components.project_contributors.list.item.in_citation_label'}}
+            @type='checkbox'
+            @disabled={{not this.canChangeBibliographic}}
+            @checked={{@contributor.bibliographic}}
+            @change={{action @toggleBibliographic @contributor}} />
     </div>
 
     {{! Remove }}
diff --git a/lib/app-components/addon/components/project-contributors/search/template.hbs b/lib/app-components/addon/components/project-contributors/search/template.hbs
index 7264bee1182..294ced6d181 100644
--- a/lib/app-components/addon/components/project-contributors/search/template.hbs
+++ b/lib/app-components/addon/components/project-contributors/search/template.hbs
@@ -5,6 +5,7 @@
         class='input-group'
     >
         <Input
+            aria-label={{t 'app_components.project_contributors.search.placeholder'}}
             @class='form-control'
             @value={{this.query}}
             @placeholder={{t 'app_components.project_contributors.search.placeholder'}}
@@ -12,6 +13,7 @@
         <span class='input-group-btn'>
             <button
                 data-test-project-contributors-search-button
+                aria-label={{t 'app_components.project_contributors.search.perform_search'}}
                 local-class='authors-search-button'
                 class='btn btn-default'
                 type='submit'
diff --git a/lib/app-components/addon/components/submit-section/active/styles.scss b/lib/app-components/addon/components/submit-section/active/styles.scss
index 58b8a0cc4c8..a9035e9c184 100644
--- a/lib/app-components/addon/components/submit-section/active/styles.scss
+++ b/lib/app-components/addon/components/submit-section/active/styles.scss
@@ -1,5 +1,5 @@
 .closed {
-    color: #888;
+    color: $color-text-black;
 }
 
 .green {
diff --git a/lib/collections/addon/components/collection-search-result/node/template.hbs b/lib/collections/addon/components/collection-search-result/node/template.hbs
index ac03ebc0852..8f37e2f9766 100644
--- a/lib/collections/addon/components/collection-search-result/node/template.hbs
+++ b/lib/collections/addon/components/collection-search-result/node/template.hbs
@@ -23,7 +23,7 @@
         <p>
             <div
                 data-test-collection-search-result-node-description
-                class='text-muted m-t-sm'>
+                class='m-t-sm'>
                 {{#if this.showBody}}
                     {{unescape-xml-entities this.item.description}}
                 {{else}}
diff --git a/lib/collections/addon/components/discover-page/active-filters/collection-provider/styles.scss b/lib/collections/addon/components/discover-page/active-filters/collection-provider/styles.scss
index 60106ba43b6..5825564c397 100644
--- a/lib/collections/addon/components/discover-page/active-filters/collection-provider/styles.scss
+++ b/lib/collections/addon/components/discover-page/active-filters/collection-provider/styles.scss
@@ -1,6 +1,6 @@
 .Component {
     span {
-        background-color: #578ca2;
-        color: #eee;
+        background-color: $color-bg-blue-darker;
+        color: $color-text-white;
     }
 }
diff --git a/lib/collections/addon/components/discover-page/active-filters/filter/template.hbs b/lib/collections/addon/components/discover-page/active-filters/filter/template.hbs
index 89745d424fd..22143247833 100644
--- a/lib/collections/addon/components/discover-page/active-filters/filter/template.hbs
+++ b/lib/collections/addon/components/discover-page/active-filters/filter/template.hbs
@@ -5,8 +5,9 @@
 >
     {{@text}}
     {{#unless @hide}}
-        <span aria-label={{@ariaLabel}}>
+        <span>
             <button
+                aria-label={{@ariaLabel}}
                 data-test-active-filter-remove-button
                 type='button'
                 local-class='removeActiveFilter'
diff --git a/lib/collections/addon/components/discover-page/template.hbs b/lib/collections/addon/components/discover-page/template.hbs
index 832a06e8e06..b5a2c9dd802 100644
--- a/lib/collections/addon/components/discover-page/template.hbs
+++ b/lib/collections/addon/components/discover-page/template.hbs
@@ -52,6 +52,10 @@
                     class='input-group input-group-lg'
                 >
                     <Input
+                        aria-label={{t
+                            (or this.searchPlaceholder 'collections.discover_page.searchPlaceholder')
+                            documentType=this.themeProvider.documentType
+                        }}
                         @id='searchBox'
                         @value={{this.q}}
                         @class='form-control'
@@ -111,7 +115,6 @@
                         {{this.sortDisplay}}
                         <span
                             class='caret'
-                            aria-label={{t 'collections.discover_page.sortSearchResults'}}
                             >
                         </span>
                     </dd.button>
@@ -202,14 +205,14 @@
                         {{!PROBLEM WITH SEARCH QUERY}}
                         <QuerySyntax @message={{this.queryError}} />
                     {{else if this.serverError}}
-                        <div class='text-muted text-center'>
+                        <div class='text-center'>
                             <p class='lead'>
                                 {{t 'collections.discover_page.searchUnavailable'}}
                             </p>
                         </div>
                     {{else}}
                         {{!NO RESULTS FOUND}}
-                        <div class='text-muted text-center'>
+                        <div class='text-center'>
                             <p class='lead'>
                                 {{t 'collections.discover_page.noResultsFound'}}
                             </p>
diff --git a/lib/osf-components/addon/components/files/list/styles.scss b/lib/osf-components/addon/components/files/list/styles.scss
index 33e2a33bd99..9b32775a5b3 100644
--- a/lib/osf-components/addon/components/files/list/styles.scss
+++ b/lib/osf-components/addon/components/files/list/styles.scss
@@ -5,7 +5,7 @@
     justify-content: center;
 
     height: 420px;
-    color: $color-text-gray-dark;
+    color: $color-black;
 }
 
 .list-container {
diff --git a/lib/osf-components/addon/components/registries/registration-form-navigation-dropdown/styles.scss b/lib/osf-components/addon/components/registries/registration-form-navigation-dropdown/styles.scss
index 6c51f978598..272f14249eb 100644
--- a/lib/osf-components/addon/components/registries/registration-form-navigation-dropdown/styles.scss
+++ b/lib/osf-components/addon/components/registries/registration-form-navigation-dropdown/styles.scss
@@ -42,7 +42,7 @@
     line-height: 2.8;
 }
 
-.ToggleNav__button:global(.btn.btn-link) {
+.ToggleNav__button {
     float: right;
     color: $color-text-blue-dark;
     padding: 3px 8px;
diff --git a/lib/osf-components/addon/components/registries/registration-form-navigation-dropdown/template.hbs b/lib/osf-components/addon/components/registries/registration-form-navigation-dropdown/template.hbs
index 55e983869ae..14bb2d6233c 100644
--- a/lib/osf-components/addon/components/registries/registration-form-navigation-dropdown/template.hbs
+++ b/lib/osf-components/addon/components/registries/registration-form-navigation-dropdown/template.hbs
@@ -1,15 +1,14 @@
 {{assert 'Registries::RegistrationFormNavigationDropdown requires schemablocks' @schemaBlocks}}
 <ResponsiveDropdown local-class='Dropdown' @renderInPlace={{true}} as |dd|>
-    <dd.trigger local-class='MenuTrigger'>
-        <BsButton
-            data-analytics-name='Expand'
-            data-test-toggle-anchor-nav-button
-            local-class='ToggleNav__button'
-            aria-label={{t 'registries.drafts.draft.review.toggle_dropdown'}}
-            @type='link'
-        >
+    <dd.trigger
+        local-class='MenuTrigger'
+        data-test-toggle-anchor-nav-button
+        data-analytics-name='Expand'
+        aria-label={{t 'registries.drafts.draft.review.toggle_dropdown'}}
+    >
+        <div local-class='ToggleNav__button'>
             <FaIcon @icon='bars' />
-        </BsButton>
+        </div>
     </dd.trigger>
     <dd.content>
         <nav
diff --git a/lib/osf-components/addon/components/side-nav/x-link/styles.scss b/lib/osf-components/addon/components/side-nav/x-link/styles.scss
index d46a0ea84b3..082b43eec5d 100644
--- a/lib/osf-components/addon/components/side-nav/x-link/styles.scss
+++ b/lib/osf-components/addon/components/side-nav/x-link/styles.scss
@@ -59,7 +59,7 @@ $sidenav-link-height: 40px;
 }
 
 .Count {
-    color: $color-text-slate-gray;
+    color: $color-text-gray;
     font-weight: 700;
 }
 
diff --git a/lib/osf-components/addon/components/sign-up-form/styles.scss b/lib/osf-components/addon/components/sign-up-form/styles.scss
index aa848321fd7..542f599d49f 100644
--- a/lib/osf-components/addon/components/sign-up-form/styles.scss
+++ b/lib/osf-components/addon/components/sign-up-form/styles.scss
@@ -31,6 +31,10 @@
             background-color: $color;
         }
     }
+
+    a {
+        color: $color-link-dark;
+    }
 }
 
 .CreatePassword:global(.progress) {
diff --git a/lib/osf-components/addon/components/subjects/browse/item/template.hbs b/lib/osf-components/addon/components/subjects/browse/item/template.hbs
index 470658a8dfd..2a05839f89c 100644
--- a/lib/osf-components/addon/components/subjects/browse/item/template.hbs
+++ b/lib/osf-components/addon/components/subjects/browse/item/template.hbs
@@ -5,7 +5,7 @@
     ...attributes
 >
     <label
-        data-test-subject={{@singleSubjectManager.subject.id}}
+        data-test-subject-browse-label={{@singleSubjectManager.subject.id}}
         local-class='ItemLabel {{if @singleSubjectManager.hasSelectedChildren 'with-selected-child'}}'
     >
         <Input
diff --git a/lib/osf-components/addon/components/subjects/display/template.hbs b/lib/osf-components/addon/components/subjects/display/template.hbs
index f0e74800261..a3f0af77458 100644
--- a/lib/osf-components/addon/components/subjects/display/template.hbs
+++ b/lib/osf-components/addon/components/subjects/display/template.hbs
@@ -3,7 +3,7 @@
 {{else}}
     <ul local-class='Subjects' data-analytics-scope='Display'>
         {{#each @subjects as |subject|}}
-            <li local-class='Subject'>
+            <li data-test-selected-subject={{subject.text}} local-class='Subject'>
                 {{subject.text}}
 
                 {{#if @removeSubject}}
@@ -21,7 +21,7 @@
                 {{/if}}
             </li>
         {{else}}
-            <span local-class='Placeholder'>
+            <span data-test-selected-subject-placeholder local-class='Placeholder'>
                 {{t 'osf-components.subjects.display.placeholder'}}
             </span>
         {{/each}}
diff --git a/lib/osf-components/addon/components/subjects/search/search-result/template.hbs b/lib/osf-components/addon/components/subjects/search/search-result/template.hbs
index 0ee818e8f78..a07cb98c1e7 100644
--- a/lib/osf-components/addon/components/subjects/search/search-result/template.hbs
+++ b/lib/osf-components/addon/components/subjects/search/search-result/template.hbs
@@ -1,6 +1,7 @@
 <li local-class='SearchResult' ...attributes>
     {{#let (unique-id 'search-result') as |inputId|}}
         <Input
+            data-test-subject-search-result-checkbox='{{this.subject.text}}'
             @id={{inputId}}
             @type='checkbox'
             @change={{@singleSubjectManager.toggleSelected}}
@@ -16,7 +17,11 @@
             {{/each}}
         </span>
 
-        <label local-class='Subject' for={{inputId}}>
+        <label
+            data-test-subject-search-result-label
+            local-class='Subject'
+            for={{inputId}}
+        >
             {{#if this.subject}}
                 {{this.subject.text}}
             {{else}}
diff --git a/lib/osf-components/addon/components/subjects/search/template.hbs b/lib/osf-components/addon/components/subjects/search/template.hbs
index 009bd66ba77..7457a46877d 100644
--- a/lib/osf-components/addon/components/subjects/search/template.hbs
+++ b/lib/osf-components/addon/components/subjects/search/template.hbs
@@ -5,6 +5,7 @@
         @fixedWidth={{true}}
     />
     <Input
+        data-test-subject-searchbox
         @name='search'
         @type='text'
         @value={{this.userQuery}}
diff --git a/lib/osf-components/addon/components/subjects/widget/styles.scss b/lib/osf-components/addon/components/subjects/widget/styles.scss
index 69615e7ab72..ce72b1bac90 100644
--- a/lib/osf-components/addon/components/subjects/widget/styles.scss
+++ b/lib/osf-components/addon/components/subjects/widget/styles.scss
@@ -1,3 +1,39 @@
-.Tabs :global(.nav-tabs) {
-    margin-bottom: 10px;
+.Tabs {
+    /* stylelint-disable selector-no-qualifying-type */
+    ul.TabList {
+        margin-bottom: 10px;
+        border-bottom: 1px solid #ddd;
+        box-sizing: border-box;
+        color: rgb(51, 51, 51);
+        display: block;
+        line-height: 20px;
+        list-style-image: none;
+        list-style-position: outside;
+        list-style-type: none;
+        height: 41px;
+        padding: 0;
+    }
+    /* stylelint-enable selector-no-qualifying-type */
+    .TabList {
+        li {
+            display: block;
+            position: relative;
+            margin-bottom: -1px;
+            float: left;
+            height: 41px;
+            padding: 10px 15px;
+        }
+
+        li:global(.ember-tabs__tab--selected) {
+            background-color: #f8f8f8;
+            border-bottom: 2px solid #204762;
+        }
+
+        li:hover {
+            border-color: transparent;
+            text-decoration: none;
+            background-color: #f8f8f8;
+            color: var(--primary-color);
+        }
+    }
 }
diff --git a/lib/osf-components/addon/components/subjects/widget/template.hbs b/lib/osf-components/addon/components/subjects/widget/template.hbs
index 4bd857ff3da..f43c712c6e5 100644
--- a/lib/osf-components/addon/components/subjects/widget/template.hbs
+++ b/lib/osf-components/addon/components/subjects/widget/template.hbs
@@ -3,24 +3,36 @@
     @removeSubject={{@subjectsManager.unselectSubject}}
 />
 
-<BsTab
+<AriaTabs
+    @defaultIndex={{0}} 
     local-class='Tabs'
     as |tab|
 >
-    <tab.pane
-        @title= {{t 'osf-components.subjects.browse.browse_all'}}
+    <tab.tabList
+        local-class='TabList'
+        as |tablist|
     >
+        <tablist.tab
+            data-test-subject-widget-browse-tab
+        >
+            {{t 'osf-components.subjects.browse.browse_all'}}
+        </tablist.tab>
+        <tablist.tab
+            data-test-subject-widget-search-tab
+        >
+            {{t 'osf-components.subjects.search.search_all'}}
+        </tablist.tab>
+    </tab.tabList>
+    <tab.tabPanel>
         <Subjects::Browse
             data-analytics-scope='Browse'
             @subjectsManager={{@subjectsManager}}
         />
-    </tab.pane>
-    <tab.pane
-        @title={{t 'osf-components.subjects.search.search_all'}}
-    >
+    </tab.tabPanel>
+    <tab.tabPanel>
         <Subjects::Search
             data-analytics-scope='Search'
             @subjectsManager={{@subjectsManager}}
         />
-    </tab.pane>
-</BsTab>
+    </tab.tabPanel>
+</AriaTabs>
diff --git a/lib/registries/addon/branded/new/styles.scss b/lib/registries/addon/branded/new/styles.scss
index 7a0e3837e73..bc06982cb2e 100644
--- a/lib/registries/addon/branded/new/styles.scss
+++ b/lib/registries/addon/branded/new/styles.scss
@@ -103,7 +103,7 @@
 }
 
 .IsChecked {
-    color: $color-osf-secondary;
+    color: $color-text-blue-heading;
     background-color: $color-bg-gray-blue-light;
     border: 1px solid $color-bg-gray-blue-light;
 }
diff --git a/lib/registries/addon/components/registries-discover-results-header/styles.scss b/lib/registries/addon/components/registries-discover-results-header/styles.scss
index c5e5dacb46f..a2bc4d82530 100644
--- a/lib/registries/addon/components/registries-discover-results-header/styles.scss
+++ b/lib/registries/addon/components/registries-discover-results-header/styles.scss
@@ -15,6 +15,8 @@
     composes: MediumButton from 'osf-components/components/button/styles';
     composes: SecondaryButton from 'osf-components/components/button/styles';
 
+    color: $color-text-black;
+
     // Recreate the browser focus state for buttons
     &:focus {
         outline: auto 2px Highlight;
diff --git a/lib/registries/addon/components/registries-discover-results-header/template.hbs b/lib/registries/addon/components/registries-discover-results-header/template.hbs
index 7d035716b83..38686f525bb 100644
--- a/lib/registries/addon/components/registries-discover-results-header/template.hbs
+++ b/lib/registries/addon/components/registries-discover-results-header/template.hbs
@@ -12,7 +12,7 @@
                 local-class='DropdownTrigger'
             >
                 {{t 'registries.discover.sort_by'}}: {{t @searchOptions.order.display}}
-                <span aria-label='{{t 'registries.discover.sort_by'}}' class='caret'></span>
+                <span role='button' aria-label='{{t 'registries.discover.sort_by'}}' class='caret'></span>
             </dd.trigger>
             <dd.content local-class='DropdownContent'>
                 {{#each @sortOptions as |option index|}}
diff --git a/lib/registries/addon/components/registries-header/template.hbs b/lib/registries/addon/components/registries-header/template.hbs
index 8dda47f3755..cdd27c801dd 100644
--- a/lib/registries/addon/components/registries-header/template.hbs
+++ b/lib/registries/addon/components/registries-header/template.hbs
@@ -33,6 +33,7 @@
                 <label local-class='SearchForm__HiddenLabel' for='search'>{{t 'registries.header.search_label'}}</label>
                 <Input
                     data-test-search-box={{true}}
+                    aria-label={{t 'registries.header.search_label'}}
                     id='search'
                     @value={{this.value}}
                     @class='form-control'
diff --git a/lib/registries/addon/components/registries-metadata/component.ts b/lib/registries/addon/components/registries-metadata/component.ts
index 1f6c8cfe068..8f910585b33 100644
--- a/lib/registries/addon/components/registries-metadata/component.ts
+++ b/lib/registries/addon/components/registries-metadata/component.ts
@@ -1,10 +1,14 @@
 import { tagName } from '@ember-decorators/component';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
+import { waitFor } from '@ember/test-waiters';
+import { tracked } from '@glimmer/tracking';
+import { task } from 'ember-concurrency';
 import config from 'ember-get-config';
 
 import { layout } from 'ember-osf-web/decorators/component';
 import Registration from 'ember-osf-web/models/registration';
+import RegistrationProviderModel from 'ember-osf-web/models/registration-provider';
 
 import styles from './styles';
 import template from './template';
@@ -22,9 +26,16 @@ export default class RegistriesMetadata extends Component {
     registration?: Registration;
     extendedFields?: boolean;
 
+    @tracked provider?: RegistrationProviderModel;
     // Private properties
     expandCitations = false;
 
+    @task({ on: 'didReceiveAttrs'})
+    @waitFor
+    async fetchProvider() {
+        this.provider = await this.registration?.provider;
+    }
+
     @computed('registration')
     get registeredFromId() {
         if (!this.registration) {
diff --git a/lib/registries/addon/components/registries-metadata/template.hbs b/lib/registries/addon/components/registries-metadata/template.hbs
index 6bb6fe4a306..3b6e0bd99b9 100644
--- a/lib/registries/addon/components/registries-metadata/template.hbs
+++ b/lib/registries/addon/components/registries-metadata/template.hbs
@@ -181,34 +181,36 @@
         </div>
 
         <div local-class='Field'>
-            <Subjects::Manager
-                @model={{this.registration}}
-                @provider={{this.registration.provider}}
-                @doesAutosave={{false}}
-                as |subjectsManager|
-            >
-                <EditableField::SubjectFieldManager
-                    @subjectsManager={{subjectsManager}}
-                    @node={{this.registration}}
-                    as |subjectFieldManager|
+            {{#if this.provider}}
+                <Subjects::Manager
+                    @model={{this.registration}}
+                    @provider={{this.provider}}
+                    @doesAutosave={{false}}
+                    as |subjectsManager|
                 >
-                    <EditableField
-                        data-analytics-scope='Subjects'
-                        @manager={{subjectFieldManager}}
-                        @title={{t 'registries.registration_metadata.subjects'}}
-                        @name='subjects'
-                        @fixedWidth={{true}}
-                        as |field|
+                    <EditableField::SubjectFieldManager
+                        @subjectsManager={{subjectsManager}}
+                        @node={{this.registration}}
+                        as |subjectFieldManager|
                     >
-                        <field.edit>
-                            <Subjects::Widget @subjectsManager={{subjectsManager}} />
-                        </field.edit>
-                        <field.display>
-                            <Subjects::Display @subjects={{subjectsManager.savedSubjects}} />
-                        </field.display>
-                    </EditableField>
-                </EditableField::SubjectFieldManager>
-            </Subjects::Manager>
+                        <EditableField
+                            data-analytics-scope='Subjects'
+                            @manager={{subjectFieldManager}}
+                            @title={{t 'registries.registration_metadata.subjects'}}
+                            @name='subjects'
+                            @fixedWidth={{true}}
+                            as |field|
+                        >
+                            <field.edit>
+                                <Subjects::Widget @subjectsManager={{subjectsManager}} />
+                            </field.edit>
+                            <field.display>
+                                <Subjects::Display @subjects={{subjectsManager.savedSubjects}} />
+                            </field.display>
+                        </EditableField>
+                    </EditableField::SubjectFieldManager>
+                </Subjects::Manager>
+            {{/if}}
         </div>
 
         <div local-class='Field'>
diff --git a/lib/registries/addon/components/registries-navbar/template.hbs b/lib/registries/addon/components/registries-navbar/template.hbs
index f35c1d06435..d0a403ea26f 100644
--- a/lib/registries/addon/components/registries-navbar/template.hbs
+++ b/lib/registries/addon/components/registries-navbar/template.hbs
@@ -168,6 +168,7 @@
                 <dropdown.toggle
                     data-analytics-name='Toggle'
                     local-class='Dropdown'
+                    aria-label={{t 'auth_dropdown.toggle_auth_dropdown'}}
                 >
                     {{#if this.session.isAuthenticated}}
                         <img
diff --git a/lib/registries/addon/components/registries-recent-list/styles.scss b/lib/registries/addon/components/registries-recent-list/styles.scss
index 6e30377e6b9..15f359afcbf 100644
--- a/lib/registries/addon/components/registries-recent-list/styles.scss
+++ b/lib/registries/addon/components/registries-recent-list/styles.scss
@@ -11,6 +11,10 @@
         margin-bottom: 0.5em;
         margin-top: 0.5em;
     }
+
+    a {
+        color: $color-link-dark;
+    }
 }
 
 .SeeMore {
diff --git a/lib/registries/addon/components/registries-registration-type-facet/component.ts b/lib/registries/addon/components/registries-registration-type-facet/component.ts
index f1b09e5f014..a4c55fd366e 100644
--- a/lib/registries/addon/components/registries-registration-type-facet/component.ts
+++ b/lib/registries/addon/components/registries-registration-type-facet/component.ts
@@ -6,25 +6,19 @@ import { inject as service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
 import { task } from 'ember-concurrency';
 import Features from 'ember-feature-flags/services/features';
-import appConfig from 'ember-get-config';
 import Intl from 'ember-intl/services/intl';
 import Toast from 'ember-toastr/services/toast';
 
 import { layout, requiredAction } from 'ember-osf-web/decorators/component';
-import ProviderModel from 'ember-osf-web/models/provider';
+import RegistrationProviderModel from 'ember-osf-web/models/registration-provider';
 import Analytics from 'ember-osf-web/services/analytics';
 import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';
 
+import registriesConfig from 'registries/config/environment';
 import { SearchOptions } from 'registries/services/search';
 import { ShareTermsFilter } from 'registries/services/share-search';
 import template from './template';
 
-const {
-    featureFlagNames: {
-        enableInactiveSchemas,
-    },
-} = appConfig;
-
 @layout(template)
 export default class RegistriesRegistrationTypeFacet extends Component {
     @service intl!: Intl;
@@ -34,20 +28,25 @@ export default class RegistriesRegistrationTypeFacet extends Component {
     @service features!: Features;
 
     searchOptions!: SearchOptions;
-    provider?: ProviderModel;
+    provider?: RegistrationProviderModel;
     @requiredAction onSearchOptionsUpdated!: (options: SearchOptions) => void;
 
     registrationTypes: EmberArray<string> = A([]);
 
-    @task({ on: 'init' })
+    @task({ on: 'didReceiveAttrs' })
     @waitFor
     async fetchRegistrationTypes() {
+        const { defaultProviderId } = registriesConfig;
+
         try {
-            const metaschemas = await this.store.query('registration-schema', {
+            if (!this.provider){
+                this.provider = await this.store.findRecord('registration-provider', defaultProviderId);
+            }
+            const metaschemas = await this.provider.queryHasMany('schemas', {
                 'page[size]': 100,
             });
             const metaschemaNames = metaschemas.mapBy('name');
-            if (!this.features.isEnabled(enableInactiveSchemas)) {
+            if (this.provider.id === defaultProviderId) {
                 metaschemaNames.push(
                     // Manually add 'Election Research Preacceptance Competition' to the list of possible
                     // facets. Metaschema was removed from the API as a possible registration type
diff --git a/lib/registries/addon/components/registries-services-list/styles.scss b/lib/registries/addon/components/registries-services-list/styles.scss
index 68a5dc47c6c..5bb4391a8ce 100644
--- a/lib/registries/addon/components/registries-services-list/styles.scss
+++ b/lib/registries/addon/components/registries-services-list/styles.scss
@@ -26,12 +26,8 @@
     background-repeat: no-repeat;
     background-position: center;
 
-    &.provider-ridie {
-        background-image: url('img/provider_logos/RIDIE.png');
-    }
-
     &.provider-egap {
-        background-image: url('img/provider_logos/EGAP_evidence_logo_white_0.jpg');
+        background-image: url('img/provider_logos/EGAP_evidence_logo_white_0.png');
     }
 
     &.provider-prereg {
diff --git a/lib/registries/addon/components/registries-services-list/template.hbs b/lib/registries/addon/components/registries-services-list/template.hbs
index 6b2ad3e81ea..003418d0d70 100644
--- a/lib/registries/addon/components/registries-services-list/template.hbs
+++ b/lib/registries/addon/components/registries-services-list/template.hbs
@@ -8,18 +8,13 @@
         </div>
     </div>
     <div class='row p-v-md'>
-        <div class='col-sm-4 text-center'>
-            <a href='http://ridie.3ieimpact.org/'>
-                <div local-class='ServicesList__ProviderLogo provider-ridie'></div>
-            </a>
-        </div>
-        <div class='col-sm-4 text-center'>
-            <a href='http://egap.org/content/registration'>
+        <div class='col-sm-6 text-center'>
+            <a href='http://egap.org/content/registration' aria-label={{t 'registries.index.services.egap'}}>
                 <div local-class='ServicesList__ProviderLogo provider-egap'></div>
             </a>
         </div>
-        <div class='col-sm-4 text-center'>
-            <a href='https://cos.io/prereg/'>
+        <div class='col-sm-6 text-center'>
+            <a href='https://cos.io/prereg/' aria-label={{t 'registries.index.services.prereg'}}>
                 <div local-class='ServicesList__ProviderLogo provider-prereg'></div>
             </a>
         </div>
diff --git a/lib/registries/addon/drafts/draft/metadata/template.hbs b/lib/registries/addon/drafts/draft/metadata/template.hbs
index 09c2967b4f4..d5688e1eedf 100644
--- a/lib/registries/addon/drafts/draft/metadata/template.hbs
+++ b/lib/registries/addon/drafts/draft/metadata/template.hbs
@@ -116,7 +116,7 @@
                         </p>
                     </legend>
                     <Subjects::Manager @model={{this.draftManager.draftRegistration}}
-                        @provider={{this.draftManager.draftRegistration.provider}} @doesAutosave={{true}}
+                        @provider={{this.draftManager.provider}} @doesAutosave={{true}}
                         @metadataChangeset={{this.draftManager.metadataChangeset}} as |subjectsManager|>
                         <Subjects::Widget local-class='SubjectsField' @subjectsManager={{subjectsManager}} />
                         <ValidationErrors @changeset={{this.draftManager.metadataChangeset}} @key='subjects'
diff --git a/lib/registries/addon/my-registrations/controller.ts b/lib/registries/addon/my-registrations/controller.ts
index 758d5924ecd..f1dbd06578c 100644
--- a/lib/registries/addon/my-registrations/controller.ts
+++ b/lib/registries/addon/my-registrations/controller.ts
@@ -12,7 +12,7 @@ export default class MyRegistrationsController extends Controller {
     @tracked tab = 'submitted';
 
     @action
-    changeTab(newTabId: string) {
-        this.tab = newTabId;
+    changeTab(newTabId: number) {
+        this.tab = newTabId === 1 ? 'submitted' : 'drafts';
     }
 }
diff --git a/lib/registries/addon/my-registrations/styles.scss b/lib/registries/addon/my-registrations/styles.scss
index cd78b717832..5fbc8686860 100644
--- a/lib/registries/addon/my-registrations/styles.scss
+++ b/lib/registries/addon/my-registrations/styles.scss
@@ -23,6 +23,14 @@
 .NavTabs {
     ul {
         margin-left: 15px;
+        margin-bottom: 10px;
+        line-height: 20px;
+        list-style-image: none;
+        list-style-position: outside;
+        list-style-type: none;
+        height: 41px;
+        padding: 0;
+        box-sizing: border-box;
     }
 
     .NavItem {
@@ -30,6 +38,7 @@
         color: #fff;
         background: none;
         padding: 10px 15px;
+        float: left;
 
         &:hover {
             border: none;
@@ -38,7 +47,7 @@
         }
     }
 
-    :global(.active) .NavItem {
+    :global(.ember-tabs__tab--selected) {
         border: none;
         color: $color-text-gray;
         background-color: #e4e4e4;
@@ -55,8 +64,6 @@
     }
 
     .TabPane {
-        display: none;
-
         &:global(.active) {
             display: block;
         }
diff --git a/lib/registries/addon/my-registrations/template.hbs b/lib/registries/addon/my-registrations/template.hbs
index 05ef429217b..9a28e86f72b 100644
--- a/lib/registries/addon/my-registrations/template.hbs
+++ b/lib/registries/addon/my-registrations/template.hbs
@@ -15,69 +15,47 @@
         </layout.heading>
         <layout.main>
             {{#if this.currentUser.user}}
-                <BsTab
+                <AriaTabs
                     local-class='NavTabs'
-                    @customTabs={{true}}
-                    @onChange={{this.changeTab}} 
-                    @activeId={{this.tab}}
+                    @onSelect={{this.changeTab}} 
+                    @defaultIndex={{if (eq this.tab 'submitted') 1 0}}
                     as |tab|
                 >
-                    <BsNav
-                        @type='tabs'
+                    <tab.tabList
                         as |nav|
                     >
-                        <nav.item
+                        <nav.tab
                             data-test-my-registrations-nav='drafts'
-                            @active={{bs-eq tab.activeId 'drafts'}}
+                            local-class='NavItem'
                         >
-                            <button
-                                data-test-my-registrations-nav-button='drafts'
-                                local-class='NavItem'
-                                type='button'
-                                role='tab'
-                                {{on 'click' (fn this.changeTab 'drafts')}}
-                            >
-                                {{t 'registries.my_registrations.drafts'}}
-                            </button>
-                        </nav.item>
-                        <nav.item
+                            {{t 'registries.my_registrations.drafts'}}
+                        </nav.tab>
+                        <nav.tab
                             data-test-my-registrations-nav='submitted'
-                            @active={{bs-eq tab.activeId 'submitted'}}
+                            local-class='NavItem'
                         >
-                            <button
-                                data-test-my-registrations-nav-button='submitted'
-                                local-class='NavItem'
-                                type='button'
-                                role='tab'
-                                {{on 'click' (fn this.changeTab 'submitted')}}
-                            >
-                                {{t 'registries.my_registrations.submitted'}}
-                            </button>
-                        </nav.item>
-                    </BsNav>
+                            {{t 'registries.my_registrations.submitted'}}
+                        </nav.tab>
+                    </tab.tabList>
                     <div
                         data-test-my-registrations-sort-description
                         local-class='SortDescription'
                     >
                         {{t 'registries.my_registrations.sorted'}}
                     </div>
-                    <tab.pane
+                    <tab.tabPanel
                         data-test-my-registrations-pane='drafts'
                         local-class='TabPane'
-                        @title={{t 'registries.my_registrations.drafts'}}
-                        @id='drafts'
                     >
                         <Registries::MyRegistrationsList::Drafts />
-                    </tab.pane>
-                    <tab.pane
+                    </tab.tabPanel>
+                    <tab.tabPanel
                         data-test-my-registrations-pane='submitted'
                         local-class='TabPane'
-                        @title={{t 'registries.my_registrations.submitted'}}
-                        @id='submitted'
                     >
                         <Registries::MyRegistrationsList::Registrations @user={{this.currentUser.user}} />
-                    </tab.pane>
-                </BsTab>
+                    </tab.tabPanel>
+                </AriaTabs>
             {{/if}}
         </layout.main>
     </OsfLayout>
diff --git a/lib/registries/addon/overview/-components/overview-topbar/template.hbs b/lib/registries/addon/overview/-components/overview-topbar/template.hbs
index 2ef7bd8df64..9f74d29024c 100644
--- a/lib/registries/addon/overview/-components/overview-topbar/template.hbs
+++ b/lib/registries/addon/overview/-components/overview-topbar/template.hbs
@@ -25,6 +25,7 @@
         <ResponsiveDropdown as |dd|>
             <dd.trigger
                 data-test-forks-dropdown-button
+                aria-label={{t 'registries.overview.tooltips.fork'}}
                 data-analytics-name='Expand fork dropdown'
                 local-class='Action'
             >
@@ -71,6 +72,11 @@
             @type='link'
             @onClick={{action (perform this.bookmark)}}
             local-class='ActionButton'
+            aria-label={{if
+                this.isBookmarked
+                (t 'registries.overview.tooltips.remove_bookmark')
+                (t 'registries.overview.tooltips.bookmark')
+            }}
         >
             <FaIcon
                 local-class='Icon'
@@ -101,6 +107,7 @@
                 data-test-social-sharing-button
                 data-analytics-name='Expand sharing menu'
                 local-class='Action'
+                aria-label={{t 'registries.overview.tooltips.share'}}
             >
                 <FaIcon
                     local-class='Icon'
diff --git a/lib/registries/addon/overview/template.hbs b/lib/registries/addon/overview/template.hbs
index 34021638942..11fe248054b 100644
--- a/lib/registries/addon/overview/template.hbs
+++ b/lib/registries/addon/overview/template.hbs
@@ -63,8 +63,15 @@
                         @models={{array this.registration.id}} @icon='home' @label={{t 'registries.overview.title'}} />
                     <leftNav.link data-analytics-name='Files' @href='/{{this.registration.id}}/files/' @icon='file-alt'
                         @label={{t 'registries.overview.external_links.files'}} />
-                    <leftNav.link data-analytics-name='Wiki' @href='/{{this.registration.id}}/wiki/'
-                        @icon='window-maximize' @label={{t 'registries.overview.external_links.wiki'}} />
+                    {{#if this.registration.wikiEnabled}}
+                        <leftNav.link
+                            data-test-wiki-link
+                            data-analytics-name='Wiki'
+                            @href='/{{this.registration.id}}/wiki/'
+                            @icon='window-maximize'
+                            @label={{t 'registries.overview.external_links.wiki'}}
+                        />
+                    {{/if}}
                     <leftNav.link data-analytics-name='Components' @route='registries.overview.children'
                         @models={{array this.registration.id}} @icon='puzzle-piece'
                         @label={{t 'registries.overview.components.title'}}
diff --git a/lib/registries/package.json b/lib/registries/package.json
index c9e4c9b8031..7f607c165ee 100644
--- a/lib/registries/package.json
+++ b/lib/registries/package.json
@@ -13,6 +13,7 @@
     "@glimmer/component": "*",
     "@glimmer/tracking": "*",
     "ember-angle-bracket-invocation-polyfill": "*",
+    "ember-aria-tabs": "*",
     "ember-basic-dropdown": "*",
     "ember-bootstrap": "*",
     "ember-changeset": "*",
diff --git a/lib/registries/public/assets/img/index-tool-bg.jpg b/lib/registries/public/assets/img/index-tool-bg.jpg
index b0cc43adefc..c3b0051e68d 100644
Binary files a/lib/registries/public/assets/img/index-tool-bg.jpg and b/lib/registries/public/assets/img/index-tool-bg.jpg differ
diff --git a/lib/registries/public/assets/img/provider_logos/EGAP_evidence_logo_white_0.jpg b/lib/registries/public/assets/img/provider_logos/EGAP_evidence_logo_white_0.jpg
deleted file mode 100755
index a0111ec341a..00000000000
Binary files a/lib/registries/public/assets/img/provider_logos/EGAP_evidence_logo_white_0.jpg and /dev/null differ
diff --git a/lib/registries/public/assets/img/provider_logos/EGAP_evidence_logo_white_0.png b/lib/registries/public/assets/img/provider_logos/EGAP_evidence_logo_white_0.png
new file mode 100644
index 00000000000..05659623fb7
Binary files /dev/null and b/lib/registries/public/assets/img/provider_logos/EGAP_evidence_logo_white_0.png differ
diff --git a/lib/registries/public/assets/img/provider_logos/RIDIE.png b/lib/registries/public/assets/img/provider_logos/RIDIE.png
deleted file mode 100755
index ad9dd43279e..00000000000
Binary files a/lib/registries/public/assets/img/provider_logos/RIDIE.png and /dev/null differ
diff --git a/lib/registries/public/assets/img/provider_logos/prereg.png b/lib/registries/public/assets/img/provider_logos/prereg.png
index 1187dc17e94..8237b43bdba 100644
Binary files a/lib/registries/public/assets/img/provider_logos/prereg.png and b/lib/registries/public/assets/img/provider_logos/prereg.png differ
diff --git a/mirage/config.ts b/mirage/config.ts
index 7f78dd0fa80..80e908a1f85 100644
--- a/mirage/config.ts
+++ b/mirage/config.ts
@@ -197,7 +197,7 @@ export default function(this: Server) {
     osfNestedResource(this, 'registration', 'comments', { only: ['index'] });
     this.get('/registrations/:guid/citation/:citationStyleID', getCitation);
     osfToManyRelationship(this, 'registration', 'subjects', {
-        only: ['related', 'self'],
+        only: ['related', 'self', 'update'],
     });
 
     this.get('/registrations/:parentID/files', nodeFileProviderList); // registration file providers list
diff --git a/mirage/factories/registration.ts b/mirage/factories/registration.ts
index 9bf593214c1..73c6fd2c92f 100644
--- a/mirage/factories/registration.ts
+++ b/mirage/factories/registration.ts
@@ -172,6 +172,7 @@ export default NodeFactory.extend<MirageRegistration & RegistrationTraits>({
     registeredFrom: association(),
     registeredBy: association(),
     reviewsState: RegistrationReviewStates.Accepted,
+    wikiEnabled: true,
 
     index(i: number) {
         return i;
diff --git a/package.json b/package.json
index fca7fde25e2..6a6bdb66299 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "21.8.0",
+  "version": "21.9.0",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <support@cos.io>",
@@ -112,6 +112,7 @@
     "ember-ajax": "^5.0.0",
     "ember-angle-bracket-invocation-polyfill": "^2.0.2",
     "ember-animated": "^0.9.0",
+    "ember-aria-tabs": "^4.0.0",
     "ember-auto-import": "^1.11.2",
     "ember-bootstrap": "^4.6.3",
     "ember-bootstrap-datepicker": "^2.0.9",
diff --git a/tests/acceptance/guid-node/registrations-test.ts b/tests/acceptance/guid-node/registrations-test.ts
index b7677c70982..28039c43f1e 100644
--- a/tests/acceptance/guid-node/registrations-test.ts
+++ b/tests/acceptance/guid-node/registrations-test.ts
@@ -42,7 +42,7 @@ module('Acceptance | guid-node/registrations', hooks => {
             'There have been no completed registrations of this project.',
         );
 
-        assert.dom('[data-test-registrations-container] a[href="#drafts"]').doesNotExist(
+        assert.dom('[data-test-drafts-tab]').doesNotExist(
             'Logged out users cannot access draft registrations tab',
         );
     });
@@ -91,11 +91,11 @@ module('Acceptance | guid-node/registrations', hooks => {
 
         assert.dom('[data-test-node-card]').exists({ count: 1 }, 'One registration card shown');
 
-        assert.dom('[data-test-registrations-container] a[href="#drafts"]').exists(
+        assert.dom('[data-test-drafts-tab]').exists(
             'read-permission contributors can see drafts tab',
         );
 
-        await untrackedClick('[data-test-registrations-container] a[href="#drafts"]');
+        await untrackedClick('[data-test-drafts-tab]');
 
         assert.dom('[data-test-registrations-pane]').isNotVisible();
 
@@ -139,7 +139,7 @@ module('Acceptance | guid-node/registrations', hooks => {
 
         assert.dom('[data-test-node-card]').exists({ count: 1 });
 
-        await untrackedClick('[data-test-registrations-container] a[href="#drafts"]');
+        await untrackedClick('[data-test-drafts-tab]');
 
         assert.dom('[data-test-registrations-pane]').isNotVisible();
         assert.dom('[data-test-draft-registrations-pane]').isVisible();
@@ -177,7 +177,7 @@ module('Acceptance | guid-node/registrations', hooks => {
 
         assert.dom('[data-test-new-registration-button]').exists();
 
-        await untrackedClick('[data-test-registrations-container] a[href="#drafts"]');
+        await untrackedClick('[data-test-drafts-tab]');
 
         assert.dom('[data-test-registrations-pane]').isNotVisible();
         assert.dom('[data-test-draft-registrations-pane]').isVisible();
@@ -227,7 +227,7 @@ module('Acceptance | guid-node/registrations', hooks => {
 
         assert.dom('[data-test-node-card-body]').includesText(registrationSchemaName);
 
-        await untrackedClick('[data-test-registrations-container] a[href="#drafts"]');
+        await untrackedClick('[data-test-drafts-tab]');
 
         assert.dom('[data-test-registrations-pane]').isNotVisible();
         assert.dom('[data-test-draft-registrations-pane]').isVisible();
@@ -272,7 +272,7 @@ module('Acceptance | guid-node/registrations', hooks => {
 
         assert.dom('[data-test-node-card]').includesText(node.title);
 
-        await untrackedClick('[data-test-registrations-container] a[href="#drafts"]');
+        await untrackedClick('[data-test-drafts-tab]');
 
         assert.dom('[data-test-registrations-pane]').isNotVisible();
         assert.dom('[data-test-draft-registrations-pane]').isVisible();
@@ -320,7 +320,7 @@ module('Acceptance | guid-node/registrations', hooks => {
 
         assert.dom('[data-test-new-registration-button]').exists({ count: 1 });
 
-        await untrackedClick('[data-test-registrations-container] a[href="#drafts"]');
+        await untrackedClick('[data-test-drafts-tab]');
 
         assert.dom('[data-test-draft-registrations-pane]').isVisible();
 
@@ -355,7 +355,7 @@ module('Acceptance | guid-node/registrations', hooks => {
 
         assert.dom('[data-test-new-registration-button]').exists({ count: 1 });
 
-        await untrackedClick('[data-test-registrations-container] a[href="#drafts"]');
+        await untrackedClick('[data-test-drafts-tab]');
 
         assert.dom('[data-test-draft-registrations-pane]').isVisible();
 
diff --git a/tests/engines/registries/acceptance/draft/draft-test.ts b/tests/engines/registries/acceptance/draft/draft-test.ts
index 5c01ac9665e..6f01cd5ec41 100644
--- a/tests/engines/registries/acceptance/draft/draft-test.ts
+++ b/tests/engines/registries/acceptance/draft/draft-test.ts
@@ -887,7 +887,7 @@ module('Registries | Acceptance | draft form', hooks => {
             .exists('error appears for unedited, required fields after returning to metadata page: license');
 
         // Choose a subject
-        await click('[data-test-subject="1"] > input');
+        await click('[data-test-subject-browse-label="1"] > input');
         assert.dom('[data-test-validation-errors="subjects"]')
             .doesNotExist('validation error for subjects gone when user makes a selection');
 
diff --git a/tests/engines/registries/acceptance/my-registrations-page-test.ts b/tests/engines/registries/acceptance/my-registrations-page-test.ts
index 37157610836..9c0155ffe29 100644
--- a/tests/engines/registries/acceptance/my-registrations-page-test.ts
+++ b/tests/engines/registries/acceptance/my-registrations-page-test.ts
@@ -26,18 +26,21 @@ module('Registries | Acceptance | my-registrations page', hooks => {
         await visit('/registries/my-registrations');
         assert.dom('[data-test-my-registrations-sort-description]').exists('Sort description shown');
         assert.notOk(currentURL().includes('tab'), 'Tab query param not visible on submitted');
-        assert.dom('[data-test-my-registrations-nav="submitted"]').hasClass('active', 'Submitted tab is active');
-        assert.dom('[data-test-my-registrations-nav="drafts"]').doesNotHaveClass('active', 'Draft tab is not active');
+        assert.dom('[data-test-my-registrations-nav="submitted"]')
+            .hasClass('ember-tabs__tab--selected', 'Submitted tab is active');
+        assert.dom('[data-test-my-registrations-nav="drafts"]')
+            .doesNotHaveClass('ember-tabs__tab--selected', 'Draft tab is not active');
         assert.dom('[data-test-my-registrations-pane="submitted"]').isVisible('Submitted pane is shown');
         assert.dom('[data-test-my-registrations-pane="drafts"]').isNotVisible('Drafts pane is not shown');
         assert.dom('[data-test-node-card]').exists({ count: 3 }, 'All submitted registrations shown');
         await percySnapshot(assert);
 
-        await click('[data-test-my-registrations-nav-button="drafts"]');
+        await click('[data-test-my-registrations-nav="drafts"]');
         assert.ok(currentURL().includes('tab=drafts'), 'Tab query param visible on drafts');
-        assert.dom('[data-test-my-registrations-nav="drafts"]').hasClass('active', 'Drafts tab is active');
-        assert.dom('[data-test-my-registrations-nav="submitted"]').doesNotHaveClass('active',
-            'Submitted tab is not active');
+        assert.dom('[data-test-my-registrations-nav="drafts"]')
+            .hasClass('ember-tabs__tab--selected', 'Drafts tab is active');
+        assert.dom('[data-test-my-registrations-nav="submitted"]')
+            .doesNotHaveClass('ember-tabs__tab--selected', 'Submitted tab is not active');
         assert.dom('[data-test-my-registrations-pane="drafts"]').isVisible('Drafts pane is shown');
         assert.dom('[data-test-my-registrations-pane="submitted"]').isNotVisible('Submitted pane is not shown');
         assert.dom('[data-test-draft-registration-card]').exists({ count: 2 }, 'All drafts shown');
diff --git a/tests/engines/registries/acceptance/overview/index-test.ts b/tests/engines/registries/acceptance/overview/index-test.ts
index e5d265e010b..8373cbfe22d 100644
--- a/tests/engines/registries/acceptance/overview/index-test.ts
+++ b/tests/engines/registries/acceptance/overview/index-test.ts
@@ -86,7 +86,7 @@ module('Registries | Acceptance | overview.index', hooks => {
             selector: '[data-analytics-name="Files"]',
             href: `/${this.registration.id}/files/`,
         }, {
-            selector: '[data-analytics-name="Wiki"]',
+            selector: '[data-test-wiki-link]',
             href: `/${this.registration.id}/wiki/`,
         }];
 
@@ -97,6 +97,20 @@ module('Registries | Acceptance | overview.index', hooks => {
         }
     });
 
+    test('wiki link hidden if wiki not enabled', async function(this: OverviewTestContext, assert: Assert){
+        this.set('registration', server.create('registration', {
+            archiving: false,
+            withdrawn: false,
+            wikiEnabled: false,
+            registrationSchema: server.schema.registrationSchemas.find('prereg_challenge'),
+            provider: server.create('registration-provider'),
+        }, 'withContributors', 'currentUserAdmin'));
+
+        await visit(`/${this.registration.id}`);
+
+        assert.dom('[data-test-wiki-link]').doesNotExist('Wiki link hidden because wiki disabled');
+    });
+
     test('withdrawn tombstone', async function(this: OverviewTestContext, assert: Assert) {
         this.set('registration', server.create('registration', {
             registrationSchema: server.schema.registrationSchemas.find('prereg_challenge'),
diff --git a/tests/engines/registries/acceptance/overview/overview-test.ts b/tests/engines/registries/acceptance/overview/overview-test.ts
index f28a8af7b65..cdbf16b008e 100644
--- a/tests/engines/registries/acceptance/overview/overview-test.ts
+++ b/tests/engines/registries/acceptance/overview/overview-test.ts
@@ -1,5 +1,5 @@
 import { capitalize } from '@ember/string';
-import { click as untrackedClick, fillIn } from '@ember/test-helpers';
+import { click as untrackedClick, fillIn, settled, triggerKeyEvent } from '@ember/test-helpers';
 import { ModelInstance } from 'ember-cli-mirage';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import config from 'ember-get-config';
@@ -249,7 +249,7 @@ module('Registries | Acceptance | overview.overview', hooks => {
         ) && displayText);
         await visit(`/${reg.id}/`);
 
-        assert.dom('[data-test-toggle-anchor-nav-button]').isVisible();
+        assert.dom('[data-test-toggle-anchor-nav-button] div').isVisible();
         assert.dom('[data-test-page-anchor]').isNotVisible();
 
         await click('[data-test-toggle-anchor-nav-button]');
@@ -453,6 +453,44 @@ module('Registries | Acceptance | overview.overview', hooks => {
         assert.dom('[data-test-editable-field="doi"]').doesNotExist('DOIs are only available for public registrations');
     });
 
+    test('Editable subjects', async assert => {
+        const subjects = [server.create('subject', { text: 'Candy and confection studies' }),
+            server.create('subject', { text: 'Soda and soft drink studies' })];
+        const provider = server.create('registration-provider');
+        provider.update({ subjects });
+        const reg = server.create('registration', {
+            currentUserPermissions: Object.values(Permission),
+            provider,
+        });
+
+        await visit(`/${reg.id}/`);
+
+        await click('[data-test-edit-button="subjects"]');
+        assert.dom('[data-test-subject-widget-browse-tab]').hasAttribute('aria-selected', 'true');
+        assert.dom('[data-test-selected-subject]').doesNotExist('No subjects selected');
+        assert.dom('[data-test-selected-subject-placeholder]')
+            .hasText(t('osf-components.subjects.display.placeholder'), 'Placeholder text shown');
+        assert.dom('[data-test-subject-browse-label]').exists({ count: 2 }, 'All toplevel subjects are listed');
+
+        await untrackedClick('[data-test-subject-browse-label="1"]');
+        assert.dom('[data-test-selected-subject="Candy and confection studies"]')
+            .containsText('Candy and confection studies', 'One subject selected');
+
+        await untrackedClick('[data-test-subject-widget-search-tab]');
+        assert.dom('[data-test-subject-widget-search-tab]').hasAttribute('aria-selected', 'true');
+        assert.dom('[data-test-subject-search-result-label]').doesNotExist('No search results');
+
+        await fillIn('[data-test-subject-searchbox]', 'Soda');
+        triggerKeyEvent('[data-test-subject-searchbox]', 'keyup', 'Shift');
+        await settled();
+        assert.dom('[data-test-subject-search-result-label]').exists('Search finds subjects');
+
+        await untrackedClick('[data-test-subject-search-result-checkbox="Soda and soft drink studies"]');
+        assert.dom('[data-test-selected-subject="Soda and soft drink studies"]').exists('Proper subject selected');
+        await click('[data-test-save-edits]');
+        assert.dom('[data-test-selected-subject]').exists({ count: 2 }, 'Subjects saved');
+    });
+
     test('Editable provider metadata', async assert => {
         server.create('user', 'loggedIn');
 
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 6819ba20f94..710da2fefdf 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -659,6 +659,7 @@ institutions:
     contact_us: 'Contact us'
     title: Institutions
     search_placeholder: 'Search institutions'
+    load_more: 'Load more institutions'
     dashboard:
         title: '{institutionName} Dashboard'
         last_update: 'Updated every 24 hours'
@@ -778,6 +779,7 @@ app_components:
                 add: Add
             add_contributor_success: 'Project contributor added!'
             add_contributor_error: 'Could not add contributor.'
+            perform_search: 'Perform search'
     project_metadata:
         field_title_label: 'Title:'
         field_title_placeholder: ""
@@ -1220,6 +1222,8 @@ registries:
                     linkText2: 'requirements and road map'
                     line3: '. Input welcome!'
                 contact: 'Contact us'
+            egap: 'EGAP'
+            prereg: 'Preregistration Challenge'
         advisory:
             heading: 'Advisory Group'
             paragraph: 'Our advisory group includes leaders in registrations across disciplines'
diff --git a/yarn.lock b/yarn.lock
index 0407830de5a..5e5ecb111bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4328,7 +4328,7 @@ babel-plugin-ember-modules-api-polyfill@^3.2.0:
   dependencies:
     ember-rfc176-data "^0.3.16"
 
-babel-plugin-ember-modules-api-polyfill@^3.5.0:
+babel-plugin-ember-modules-api-polyfill@^3.3.0, babel-plugin-ember-modules-api-polyfill@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
   integrity sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==
@@ -7929,6 +7929,15 @@ ember-animated@^0.9.0:
     ember-maybe-import-regenerator "^0.1.5"
     ember-named-arguments-polyfill "^1.0.0"
 
+ember-aria-tabs@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ember-aria-tabs/-/ember-aria-tabs-4.0.0.tgz#01f9aaf98468ff21e254fdfaff7747972228cadc"
+  integrity sha512-hqQEXdzUMRA0RD6oMYJfkZzWngZfcFgYFBwbL4WSudBgnPSz0DrJgMtwvys0qjcP0Gs/16Jr1VAUQW8Y//lyQw==
+  dependencies:
+    ember-cached-decorator-polyfill "^0.1.1"
+    ember-cli-babel "7.24.0"
+    ember-cli-htmlbars "^5.3.1"
+
 ember-asset-loader@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/ember-asset-loader/-/ember-asset-loader-0.6.1.tgz#2eb81221406164d19127eba5b3d10f908df89a17"
@@ -8061,7 +8070,7 @@ ember-bootstrap@^4.6.3:
     silent-error "^1.0.1"
     tracked-toolbox "^1.2.1"
 
-ember-cache-primitive-polyfill@^1.0.0:
+ember-cache-primitive-polyfill@^1.0.0, ember-cache-primitive-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ember-cache-primitive-polyfill/-/ember-cache-primitive-polyfill-1.0.1.tgz#a27075443bd87e5af286c1cd8a7df24e3b9f6715"
   integrity sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==
@@ -8071,6 +8080,16 @@ ember-cache-primitive-polyfill@^1.0.0:
     ember-compatibility-helpers "^1.2.1"
     silent-error "^1.1.1"
 
+ember-cached-decorator-polyfill@^0.1.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-0.1.4.tgz#f1e2c65cc78d0d9c4ac0e047e643af477eb85ace"
+  integrity sha512-JOK7kBCWsTVCzmCefK4nr9BACDJk0owt9oIUaVt6Q0UtQ4XeAHmoK5kQ/YtDcxQF1ZevHQFdGhsTR3JLaHNJgA==
+  dependencies:
+    "@glimmer/tracking" "^1.0.4"
+    ember-cache-primitive-polyfill "^1.0.1"
+    ember-cli-babel "^7.21.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+
 ember-changeset-validations@^3.14.2:
   version "3.14.2"
   resolved "https://registry.yarnpkg.com/ember-changeset-validations/-/ember-changeset-validations-3.14.2.tgz#bb2a326d03a11d1dc3347c35c455d2e091a88176"
@@ -8113,6 +8132,39 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
+ember-cli-babel@7.24.0:
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.24.0.tgz#d58670d0f214c63a46f44f86e7c407799d77fc45"
+  integrity sha512-IpqMqOS1VI2wVLIREdEXG9WG05YBulg20t0K27yl2aBjmShvLMRIodcNiKataTgf/dDiU0EWQBGl7VLBLBkFgQ==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-decorators" "^7.10.5"
+    "@babel/plugin-transform-modules-amd" "^7.10.5"
+    "@babel/plugin-transform-runtime" "^7.12.0"
+    "@babel/plugin-transform-typescript" "^7.12.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.12.0"
+    "@babel/runtime" "^7.12.0"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.3.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
 ember-cli-babel@7.5.0:
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.5.0.tgz#af654dcef23630391d2efe85aaa3bdf8b6ca17b7"