diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
index b211cd5634..c93081daba 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
@@ -5,13 +5,13 @@
     :appBarText="$tr('backToLoginButton')"
     backButton
   >
-    <VImg
-      height="200"
-      maxHeight="100"
-      contain
-      :lazy-src="require('shared/images/kolibri-logo.svg')"
-      :src="require('shared/images/kolibri-logo.svg')"
-    />
+    <div class="align-center d-flex justify-center mb-2">
+      <KLogo
+        altText="Kolibri Logo with background"
+        :showBackground="true"
+        :size="120"
+      />
+    </div>
     <h2 ref="top" class="mb-4 primary--text text-xs-center">
       {{ $tr('createAnAccountTitle') }}
     </h2>
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index 49833f60e2..c2ba1f5616 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
@@ -12,13 +12,13 @@
           class="pa-4"
           style="width: 300px;margin: 0 auto;"
         >
-          <VImg
-            height="200"
-            maxHeight="100"
-            contain
-            :lazy-src="require('shared/images/kolibri-logo.svg')"
-            :src="require('shared/images/kolibri-logo.svg')"
-          />
+          <div class="k-logo-container">
+            <KLogo
+              altText="Kolibri Logo with background"
+              :showBackground="true"
+              :size="120"
+            />
+          </div>
           <h2 class="primary--text py-2 text-xs-center">
             {{ $tr('kolibriStudio') }}
           </h2>
@@ -227,4 +227,9 @@
     width: 100%;
   }
 
+  .k-logo-container {
+    display: flex;
+    justify-content: center;
+  }
+
 </style>
diff --git a/contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue b/contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue
index 10f2b67efb..e6589334da 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue
@@ -161,7 +161,7 @@
 
     tr:hover td {
       /* stylelint-disable-next-line custom-property-pattern */
-      background-color: var(--v-greyBackground-base) !important;
+      background-color: var(--v-greyBackground-lighten1) !important;
     }
 
     /deep/ .v-table__overflow {
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue
index b4185d8a85..d9ee750c28 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue
@@ -52,7 +52,7 @@
       <template #progress>
         <VProgressLinear
           v-if="loading"
-          color="primary"
+          color="loading"
           indeterminate
           data-test="loading"
         />
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue
index 66953024d3..199d1f1ef4 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue
@@ -63,7 +63,7 @@
       :class="{ expanded: $vuetify.breakpoint.mdAndUp }"
     >
       <template #progress>
-        <VProgressLinear v-if="loading" color="primary" indeterminate />
+        <VProgressLinear v-if="loading" color="loading" indeterminate />
       </template>
 
       <template #headerCell="{ header }">
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
index 8ed1adce13..a335bc5baf 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
@@ -363,6 +363,7 @@
   }
 
   .copy-retry-btn {
+    padding-bottom: 2px;
     font-size: inherit;
   }
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
index ef85e548b0..d58e53b26e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
@@ -420,6 +420,7 @@
     align-items: center;
     align-self: center;
     min-width: max-content;
+    line-height: 1.6;
     pointer-events: auto;
     cursor: default;
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeValidator.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeValidator.vue
index d37b6022cb..c35742e8ba 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeValidator.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeValidator.vue
@@ -9,7 +9,7 @@
   <span v-else-if="error" class="mx-2">
     <VTooltip bottom lazy>
       <template #activator="{ on }">
-        <Icon color="red" v-on="on">
+        <Icon :color="$themePalette.red.v_1100" v-on="on">
           error
         </Icon>
       </template>
@@ -19,7 +19,7 @@
   <span v-else-if="warning" class="mx-2">
     <VTooltip bottom lazy>
       <template #activator="{ on }">
-        <Icon color="amber" v-on="on">
+        <Icon :color="$themePalette.yellow.v_1100" v-on="on">
           warning
         </Icon>
       </template>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
index a4c08c1c0f..f816b6d240 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
@@ -118,6 +118,7 @@
                         v-if="loading"
                         class="mx-3"
                         indeterminate
+                        color="loading"
                         size="15"
                         width="2"
                       />
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index 995072d190..6faeb52413 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -22,7 +22,7 @@
             <!-- Toolbar + extension -->
             <VToolbar
               dark
-              color="primary"
+              color="appBarDark"
               fixed
               flat
               :clipped-left="!$isRTL"
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue
index 09a43210b0..0638969eda 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue
@@ -2,7 +2,7 @@
 
   <div class="mx-2">
     <template v-if="hasChanges">
-      <VProgressCircular indeterminate size="16" width="2" color="secondary" />
+      <VProgressCircular indeterminate size="16" width="2" color="loading" />
       <span class="mx-2" style="vertical-align: middle;">
         {{ $tr('savingIndicator') }}
       </span>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
index 9a9621f8f5..279cbc317c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <VCard @click="handleClick">
+  <VCard hover @click="handleClick">
     <VCardTitle>
       <VLayout row wrap>
         <VFlex class="pt-2 px-4 thumbnail-column">
@@ -229,11 +229,6 @@
 
   .v-card {
     cursor: pointer;
-
-    &:hover {
-      /* stylelint-disable-next-line custom-property-pattern */
-      background-color: var(--v-greyBackground-base);
-    }
   }
 
   h3 {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue
index cb732cbcbd..c8e43c9bb6 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <VCard :to="channelRoute">
+  <VCard hover :to="channelRoute">
     <VCardTitle>
       <VLayout row wrap>
         <VFlex lg2 md4 sm5 xs12 class="px-3">
@@ -113,11 +113,6 @@
 
   .v-card {
     cursor: pointer;
-
-    &:hover {
-      /* stylelint-disable-next-line custom-property-pattern */
-      background-color: var(--v-greyBackground-base);
-    }
   }
 
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue
index 37cf667243..6741ffc6c2 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue
@@ -72,7 +72,7 @@
     mixins: [constantsTranslationMixin],
     data() {
       return {
-        languageFilter: '',
+        languageFilter: null,
         channels: [],
         pageCount: 0,
         loading: false,
@@ -110,6 +110,7 @@
       },
       languageFilter() {
         this.loadPage();
+        this.$emit('update-language', this.languageFilter);
       },
     },
     mounted() {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
index 4ee436398d..db73ee33f5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
@@ -48,6 +48,7 @@
         <!-- Search or Topics Browsing -->
         <ChannelList
           v-if="isBrowsing && !$route.params.channelId"
+          @update-language="updateLanguageQuery"
         />
         <ContentTreeList
           v-else-if="isBrowsing"
@@ -96,6 +97,7 @@
         searchTerm: '',
         topicNode: null,
         copyNode: null,
+        languageFromChannelList: null,
       };
     },
     computed: {
@@ -142,6 +144,9 @@
       handleBackToBrowse() {
         this.$router.push(this.backToBrowseRoute);
       },
+      updateLanguageQuery(language) {
+        this.languageFromChannelList = language;
+      },
       handleSearchTerm() {
         if (this.searchIsValid) {
           this.$router.push({
@@ -151,9 +156,11 @@
             },
             query: {
               ...this.$route.query,
+              ...(this.isBrowsing ? { languages: this.languageFromChannelList } : {}),
               last: this.$route.query.last || this.$route.path,
             },
           });
+          this.languageFromChannelList = null;
           this.clearNodes();
           this.$analytics.trackAction('import_modal', 'Search');
         }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 5566b290a0..a76b0494f6 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -73,7 +73,7 @@
               v-on="on"
             >
               {{ $formatNumber(errorsInChannel) }}
-              <Icon color="amber">
+              <Icon :color="$themePalette.yellow.v_1100">
                 warning
               </Icon>
             </div>
@@ -204,7 +204,7 @@
         <slot name="extension"></slot>
       </template>
     </ToolBar>
-    <MainNavigationDrawer v-model="drawer" />
+    <MainNavigationDrawer v-model="drawer" color="white" />
     <slot></slot>
 
     <PublishModal
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js
index d6327f65fe..af95347d20 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js
@@ -193,7 +193,7 @@ export function addClipboardNodeFromListener(context, obj) {
     .then(() =>
       context.dispatch(
         'contentNode/loadContentNodes',
-        { '[node_id+channel_id]__in': [obj.source_node_id, obj.source_channel_id] },
+        { '[node_id+channel_id]__in': [[obj.source_node_id, obj.source_channel_id]] },
         { root }
       )
     )
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue
index 8ad32a5ae3..6fb71d6b64 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue
@@ -19,68 +19,6 @@
         @click="clearFilters"
       />
     </div>
-    <div v-else>
-      <VLayout row wrap>
-        <VFlex
-          v-for="collection in collections"
-          :key="`public-collection-${collection.id}`"
-          xs12
-          class="py-2"
-        >
-          <VCard
-            tabindex="0"
-            class="pt-2"
-            data-test="collection"
-            @click="setCollection(collection.id)"
-            @keyup.enter="setCollection(collection.id)"
-          >
-            <VLayout>
-              <div class="px-2 text-xs-center">
-                <Icon style="font-size: 75px;">
-                  local_hospital
-                </Icon>
-              </div>
-              <VCardTitle primary-title class="pb-2 pt-2">
-
-                <!-- TODO: add 'notranslate' class once we figure out how to handle collections
-                          that have multiple channel languages inside -->
-                <h3 class="headline mb-0">
-                  {{ collection.name }}
-                </h3>
-                <p class="body-1 grey--text">
-                  {{ $tr('channelCount', { count: collection.count }) }}
-                </p>
-                <p v-if="collection.description">
-                  {{ collection.description }}
-                </p>
-              </VCardTitle>
-            </VLayout>
-            <VCardActions>
-              <VSpacer />
-              <IconButton
-                icon="copy"
-                :text="$tr('copyToken')"
-                @click.stop="displayToken = collection.token"
-              />
-            </VCardActions>
-          </VCard>
-        </VFlex>
-      </VLayout>
-
-      <KModal
-        v-if="displayToken"
-        :title="$tr('copyTitle')"
-        :text="$tr('copyTokenInstructions')"
-        :cancelText="$tr('close')"
-        @cancel="displayToken = null"
-      >
-        <div class="mb-3">
-          {{ $tr('copyTokenInstructions') }}
-        </div>
-        <CopyToken :token="displayToken" />
-      </KModal>
-
-    </div>
   </VContainer>
 
 </template>
@@ -90,10 +28,6 @@
   import flatten from 'lodash/flatten'; // Tests fail with native Array.flat() method
   import { catalogFilterMixin } from './mixins';
   import { constantsTranslationMixin } from 'shared/mixins';
-  import IconButton from 'shared/views/IconButton';
-  import CopyToken from 'shared/views/CopyToken';
-
-  const publicCollections = window.publicCollections || [];
 
   /*
     Returns the expected format for filters
@@ -108,16 +42,7 @@
 
   export default {
     name: 'CatalogFilterBar',
-    components: {
-      IconButton,
-      CopyToken,
-    },
     mixins: [constantsTranslationMixin, catalogFilterMixin],
-    data() {
-      return {
-        displayToken: null,
-      };
-    },
     computed: {
       currentFilters() {
         return flatten([
@@ -150,24 +75,10 @@
           createFilter(this.coach, this.$tr('coachContent'), this.resetCoach),
           createFilter(this.assessments, this.$tr('assessments'), this.resetAssessments),
           createFilter(this.subtitles, this.$tr('subtitles'), this.resetSubtitles),
-          createFilter(this.collection, this.getCollectionName(), this.resetCollection),
         ]).filter(Boolean);
       },
-      collections() {
-        return publicCollections;
-      },
     },
     methods: {
-      getCollectionName() {
-        const collection = this.collections.find(c => c.id === this.collection);
-        return collection && collection.name;
-      },
-      setCollection(collectionId) {
-        this.collection = collectionId;
-      },
-      resetCollection() {
-        this.setCollection(null);
-      },
       resetKeywords() {
         this.keywords = '';
       },
@@ -200,12 +111,6 @@
       subtitles: 'Subtitles',
       starred: 'Starred',
       clearAll: 'Clear all',
-      channelCount: '{count, plural,\n =1 {# channel}\n other {# channels}}',
-      copyToken: 'Copy collection token',
-      copyTitle: 'Copy collection token',
-      copyTokenInstructions:
-        'Paste this token into Kolibri to import the channels contained in this collection',
-      close: 'Close',
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
index 2576d4a54f..06822cd070 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
@@ -89,11 +89,11 @@
           :text="$tr('frequentlyAskedQuestionsLink')"
         />
       </VContainer>
-      <VFooter class="pb-3 pt-2 px-4" color="transparent" height="64">
+      <VFooter class="pb-3 pt-2 px-4" color="transparent" height="100">
         <div>
           <VImg
-            height="24"
-            width="78"
+            height="60"
+            width="90"
             class="mb-1 mr-2"
             contain
             :src="require('shared/images/le-logo.svg')"
@@ -231,7 +231,7 @@
 
   .filters {
     width: 100%;
-    height: calc(100% - 64px);
+    height: calc(100% - 100px);
     overflow: auto;
   }
 
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue
index ee22fd8a5a..7ce109f905 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue
@@ -3,7 +3,8 @@
   <div>
     <VCard
       class="channel my-3"
-      :class="{ hideHighlight, added }"
+      hover
+      :class="{ added }"
       data-test="channel-card"
       tabindex="0"
       :href="linkToChannelTree ? channelHref : null"
@@ -99,8 +100,6 @@
                 class="mr-1"
                 icon="info"
                 :text="$tr('details')"
-                @mouseenter.native="hideHighlight = true"
-                @mouseleave.native="hideHighlight = false"
               />
 
             </router-link>
@@ -112,16 +111,12 @@
               :text="$tr('copyToken')"
               data-test="token-button"
               @click.stop.prevent="tokenDialog = true"
-              @mouseenter.native="hideHighlight = true"
-              @mouseleave.native="hideHighlight = false"
             />
             <ChannelStar
               v-if="loggedIn"
               :channelId="channelId"
               :bookmark="channel.bookmark"
               class="mr-1"
-              @mouseenter.native="hideHighlight = true"
-              @mouseleave.native="hideHighlight = false"
             />
             <Menu v-if="showOptions">
               <template #activator="{ on }">
@@ -131,8 +126,6 @@
                   data-test="menu"
                   v-on="on"
                   @click.stop.prevent
-                  @mouseenter="hideHighlight = true"
-                  @mouseleave="hideHighlight = false"
                 >
                   <Icon>more_vert</Icon>
                 </VBtn>
@@ -152,7 +145,7 @@
                 <VListTile
                   v-if="allowEdit && channel.published"
                   data-test="token-listitem"
-                  @click="tokenDialog = true"
+                  @click.stop="tokenDialog = true"
                 >
                   <VListTileAction>
                     <Icon>content_copy</Icon>
@@ -264,7 +257,6 @@
       return {
         deleteDialog: false,
         tokenDialog: false,
-        hideHighlight: false,
         added: false,
       };
     },
@@ -356,17 +348,10 @@
           this.$store.dispatch('showSnackbarSimple', this.$tr('channelDeletedSnackbar'));
         });
       },
-      goToChannelRoute(e) {
-        // preventDefault whenever we have clicked a button
-        // that is a child of this card to avoid redirect
-        // overriding the action of the clicked button
-        if (this.hideHighlight) {
-          e.preventDefault();
-        } else {
-          this.linkToChannelTree
-            ? (window.location.href = this.channelHref)
-            : this.$router.push(this.channelDetailsLink).catch(() => {});
-        }
+      goToChannelRoute() {
+        this.linkToChannelTree
+          ? (window.location.href = this.channelHref)
+          : this.$router.push(this.channelDetailsLink).catch(() => {});
       },
       trackTokenCopy() {
         this.$analytics.trackAction('channel_list', 'Copy token', {
@@ -401,11 +386,6 @@
     width: 100%;
     cursor: pointer;
 
-    &:hover:not(.hideHighlight) {
-      /* stylelint-disable-next-line custom-property-pattern */
-      background-color: var(--v-greyBackground-base);
-    }
-
     &.added {
       /* stylelint-disable-next-line custom-property-pattern */
       background-color: var(--v-greenHighlightBackground-base);
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelStar.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelStar.vue
index 3e94d907d2..3149823715 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelStar.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelStar.vue
@@ -7,7 +7,7 @@
       :icon="bookmark ? 'star' : 'starBorder'"
       :text="starText"
       v-bind="$attrs"
-      @click="toggleStar"
+      @click.stop.prevent="toggleStar"
     />
   </div>
 
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/catalogFilterBar.spec.js b/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/catalogFilterBar.spec.js
index c04a3fff5f..7879e17ba5 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/catalogFilterBar.spec.js
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/catalogFilterBar.spec.js
@@ -35,16 +35,6 @@ describe('catalogFilterBar', () => {
     wrapper = makeWrapper();
   });
 
-  describe('public collections', () => {
-    it('should list collections if no filters are selected', () => {
-      expect(wrapper.find('[data-test="collection"]').exists()).toBe(true);
-    });
-    it('should filter by collection if one on click', () => {
-      wrapper.find('[data-test="collection"]').trigger('click');
-      expect(wrapper.vm.collection).toBe(collection.id);
-    });
-  });
-
   describe('removing filters', () => {
     beforeEach(() => {
       Object.entries(query).forEach(([key, val]) => {
@@ -75,15 +65,6 @@ describe('catalogFilterBar', () => {
       expect(wrapper.vm.$route.query.languages).toBeTruthy();
       expect(wrapper.vm.$route.query.keywords).toBeTruthy();
     });
-    it('removing collection filter should remove it from the query', () => {
-      wrapper.vm.resetCollection();
-      expect(wrapper.vm.$route.query.collection).toBeUndefined();
-
-      // Make sure other queries weren't affected
-      expect(wrapper.vm.$route.query.coach).toBeTruthy();
-      expect(wrapper.vm.$route.query.languages).toBeTruthy();
-      expect(wrapper.vm.$route.query.keywords).toBeTruthy();
-    });
     it('removing list-based filter should only remove that item from the query', () => {
       wrapper.vm.removeLanguage('en');
       expect(wrapper.vm.$route.query.languages).toBe('es');
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
index 16cdf100f7..4dee071859 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
@@ -3,7 +3,7 @@
   <VApp>
     <VToolbar
       v-if="libraryMode || isFAQPage"
-      color="primary"
+      color="appBarDark"
       dark
       :clipped-left="!$isRTL"
       :clipped-right="$isRTL"
@@ -12,11 +12,15 @@
       <VToolbarSideIcon
         :href="homeLink"
         exact
-        color="white"
+        color="appBarDark"
         class="ma-0"
         style="border-radius: 8px;"
       >
-        <KolibriLogo />
+        <KLogo
+          altText="Kolibri Logo with background"
+          :showBackground="true"
+          :size="36"
+        />
       </VToolbarSideIcon>
 
       <VToolbarTitle class="notranslate">
@@ -31,7 +35,7 @@
           :to="getChannelLink(listType)"
           @click="trackTabClick(listType)"
         >
-          <VBadge :value="invitationsByListCounts[listType]" color="secondary">
+          <VBadge :value="invitationsByListCounts[listType]" color="black">
             <template #badge>
               <span>{{ $formatNumber(invitationsByListCounts[listType]) }}</span>
             </template>
@@ -96,7 +100,6 @@
   import { ChannelListTypes } from 'shared/constants';
   import { constantsTranslationMixin, routerMixin } from 'shared/mixins';
   import GlobalSnackbar from 'shared/views/GlobalSnackbar';
-  import KolibriLogo from 'shared/views/KolibriLogo';
   import AppBar from 'shared/views/AppBar';
   import OfflineText from 'shared/views/OfflineText';
   import PolicyModals from 'shared/views/policies/PolicyModals';
@@ -123,7 +126,6 @@
       ChannelInvitation,
       ChannelListAppError,
       GlobalSnackbar,
-      KolibriLogo,
       PolicyModals,
       OfflineText,
     },
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSelectionList.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSelectionList.vue
index 05b5ca4eee..66ffe369a1 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSelectionList.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSelectionList.vue
@@ -18,7 +18,8 @@
           v-for="channel in listChannels"
           :key="channel.id"
           flat
-          class="px-3"
+          hover
+          class="list-card-hover px-3"
         >
           <Checkbox
             v-model="selectedChannels"
@@ -134,11 +135,11 @@
     /deep/ .v-input__control {
       width: 100% !important;
     }
+  }
 
-    &:hover {
-      /* stylelint-disable-next-line custom-property-pattern */
-      background-color: var(--v-channelHighlightDefault-base);
-    }
+  .list-card-hover {
+    margin: 16px;
+    box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.2);
   }
 
 </style>
diff --git a/contentcuration/contentcuration/frontend/settings/pages/Account/index.vue b/contentcuration/contentcuration/frontend/settings/pages/Account/index.vue
index 312ba24efd..dde15459ba 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/Account/index.vue
+++ b/contentcuration/contentcuration/frontend/settings/pages/Account/index.vue
@@ -100,7 +100,13 @@
         :text="$tr('deleteAccountLabel')"
         :appearanceOverrides="{
           backgroundColor: $themeTokens.error,
-          color: $themeTokens.textInverted
+          color: $themeTokens.textInverted,
+          ':hover': {
+            // Vuetify generates this based on theme colors, but oddly it doesn't make it
+            // available in the theme tokens
+            // TODO: Replace with KDS lighten/darken utilities
+            backgroundColor: 'var(--v-error-darken1)',
+          },
         }"
         @click="showDeleteConfirmation = true"
       />
diff --git a/contentcuration/contentcuration/frontend/settings/pages/Storage/RequestForm.vue b/contentcuration/contentcuration/frontend/settings/pages/Storage/RequestForm.vue
index faa01aac37..aaed431916 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/Storage/RequestForm.vue
+++ b/contentcuration/contentcuration/frontend/settings/pages/Storage/RequestForm.vue
@@ -142,7 +142,7 @@
       v-for="affiliation in affiliationOptions"
       :key="affiliation.value"
       v-model="org_or_personal"
-      :value="affiliation.value"
+      :buttonValue="affiliation.value"
       :invalid="errors.org_or_personal"
       :showInvalidText="errors.org_or_personal"
       :invalidText="$tr('fieldRequiredText')"
@@ -172,7 +172,7 @@
       v-for="orgType in organizationTypeOptions"
       :key="orgType.value"
       v-model="organization_type"
-      :value="orgType.value"
+      :buttonValue="orgType.value"
       :invalid="errors.organization_type"
       :showInvalidText="errors.organization_type"
       :invalidText="$tr('fieldRequiredText')"
@@ -199,7 +199,7 @@
       v-for="constraint in timeConstraintOptions"
       :key="constraint.value"
       v-model="time_constraint"
-      :value="constraint.value"
+      :buttonValue="constraint.value"
       :label="constraint.text"
     />
 
diff --git a/contentcuration/contentcuration/frontend/shared/app.js b/contentcuration/contentcuration/frontend/shared/app.js
index 1285ca6c07..e209676672 100644
--- a/contentcuration/contentcuration/frontend/shared/app.js
+++ b/contentcuration/contentcuration/frontend/shared/app.js
@@ -113,7 +113,7 @@ import { theme, icons } from 'shared/vuetify';
 
 import { i18nSetup } from 'shared/i18n';
 
-import './styles/vuetify.css';
+import './styles/vuetify.scss';
 import 'shared/styles/main.less';
 import Base from 'shared/Base.vue';
 import urls from 'shared/urls';
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
index b8fc305e93..542d0ca6aa 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
@@ -720,7 +720,7 @@ describe('ContentNode methods', () => {
       );
       expect(table.get).toHaveBeenCalledWith({ '[node_id+channel_id]': [node_id, channel_id] });
       expect(fetchCollection).toHaveBeenCalledWith({
-        _node_id_channel_id_: [node_id, channel_id],
+        '[node_id+channel_id]__in': [[node_id, channel_id]],
       });
     });
 
@@ -731,7 +731,7 @@ describe('ContentNode methods', () => {
       await expect(ContentNode.getByNodeIdChannelId(node_id, channel_id)).resolves.toBeFalsy();
       expect(table.get).toHaveBeenCalledWith({ '[node_id+channel_id]': [node_id, channel_id] });
       expect(fetchCollection).toHaveBeenCalledWith({
-        _node_id_channel_id_: [node_id, channel_id],
+        '[node_id+channel_id]__in': [[node_id, channel_id]],
       });
     });
   });
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index 89d99945f9..e23399479f 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -1644,7 +1644,9 @@ export const ContentNode = new TreeResource({
     const values = [nodeId, channelId];
     return this.table.get({ '[node_id+channel_id]': values }).then(node => {
       if (!node) {
-        return this.fetchCollection({ _node_id_channel_id_: values }).then(nodes => nodes[0]);
+        return this.fetchCollection({ '[node_id+channel_id]__in': [values] }).then(
+          nodes => nodes[0]
+        );
       }
       return node;
     });
diff --git a/contentcuration/contentcuration/frontend/shared/i18n/index.js b/contentcuration/contentcuration/frontend/shared/i18n/index.js
index 249b5ac561..f6a2ebf17f 100644
--- a/contentcuration/contentcuration/frontend/shared/i18n/index.js
+++ b/contentcuration/contentcuration/frontend/shared/i18n/index.js
@@ -1,15 +1,28 @@
 import Vue from 'vue';
 import has from 'lodash/has';
-import { languageDirections, defaultLanguage } from 'kolibri-design-system/lib/utils/i18n';
 import importVueIntlLocaleData from './vue-intl-locale-data';
 import importIntlLocale from './intl-locale-data';
 
-export {
-  languageDirections,
-  defaultLanguage,
-  languageValidator,
-  getContentLangDir,
-} from 'kolibri-design-system/lib/utils/i18n';
+const languageDirections = {
+  LTR: 'ltr',
+  RTL: 'rtl',
+};
+
+const defaultLanguage = {
+  id: 'en',
+  lang_name: 'English',
+  lang_direction: languageDirections.LTR,
+};
+
+const languageValidator = language => {
+  return ['id', 'lang_name', 'lang_direction'].reduce((valid, key) => valid && language[key], true);
+};
+
+const getContentLangDir = language => {
+  return (language || {}).lang_direction || languageDirections.LTR;
+};
+
+export { languageDirections, defaultLanguage, languageValidator, getContentLangDir };
 
 let _i18nReady = false;
 
diff --git a/contentcuration/contentcuration/frontend/shared/images/flightless-kolibri.jpg b/contentcuration/contentcuration/frontend/shared/images/flightless-kolibri.jpg
deleted file mode 100644
index 11dd9adcb0..0000000000
Binary files a/contentcuration/contentcuration/frontend/shared/images/flightless-kolibri.jpg and /dev/null differ
diff --git a/contentcuration/contentcuration/frontend/shared/images/kolibri-logo.svg b/contentcuration/contentcuration/frontend/shared/images/kolibri-logo.svg
deleted file mode 100644
index f26d5bdfc5..0000000000
--- a/contentcuration/contentcuration/frontend/shared/images/kolibri-logo.svg
+++ /dev/null
@@ -1,178 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.6 193.6">
-  <path fill="#99B1A3" d="M113.7 35.5l7.7 6.7L127 34z"/>
-  <path fill="#C7E1D1" d="M131.9 41.9L127 34l-5.6 8.2z"/>
-  <path fill="#87AFA6" d="M113.7 35.5l-9.8 11.2 17.5-4.5z"/>
-  <path fill="#B8C7C1" d="M101.6 59.6l19.8-17.4-17.5 4.5z"/>
-  <path fill="#ABDCD2" d="M132.9 60.7l-1-18.8-10.5.3z"/>
-  <path fill="#BDD6CE" d="M122.7 63.5l-1.3-21.3-19.8 17.4z"/>
-  <path fill="#A0D0C6" d="M132.9 60.7l-10.2 2.8-1.3-21.3z"/>
-  <path fill="#7C8886" d="M99.6 65.5l23.1-2-21.1-3.9z"/>
-  <path fill="#91AAAE" d="M122.7 63.5L92.8 76.3l6.8-10.8z"/>
-  <path fill="#7BAEA9" d="M118.5 81l-25.7-4.7 29.9-12.8z"/>
-  <path fill="#C8E8E1" d="M132.9 60.7L118.5 81l4.2-17.5z"/>
-  <path fill="#DBEFE5" d="M140.6 77.9L118.5 81l14.4-20.3z"/>
-  <path fill="#9BC8D1" d="M117.8 117.3l.7-36.3-25.7-4.7z"/>
-  <path fill="#A1AEBC" d="M93.8 112.6l24 4.7-25-41z"/>
-  <path fill="#C5E0DF" d="M140.6 77.9l-22.8 39.4.7-36.3z"/>
-  <path fill="#DAE7E7" d="M140.6 112.9l-22.8 4.4 22.8-39.4z"/>
-  <path fill="#B8BAC8" d="M117.7 128.9l22.9-16-22.8 4.4z"/>
-  <path fill="#8E9BAF" d="M93.8 112.6l23.9 16.3.1-11.6z"/>
-  <path fill="#8B7F96" d="M108.2 135.3l9.5-6.4-23.9-16.3z"/>
-  <path fill="#766C81" d="M126.9 135.3l-9.2-6.4-9.5 6.4z"/>
-  <path fill="#97A2B1" d="M126.9 135.3l-9.2-6.4 22.9-16z"/>
-  <path fill="#9F96AE" d="M118.6 141.9l8.3-6.6h-18.7z"/>
-  <path fill="#9792B5" d="M93.5 172.8l25.1-30.9-10.4-6.6z"/>
-  <path fill="#ABA0CB" d="M112.2 186.2l-18.7-13.3 25.1-31z"/>
-  <path fill="#C3B1D6" d="M124.2 186.1l-12 .1 6.4-44.3z"/>
-  <path fill="#DCC0DD" d="M142.6 173l-18.4 13.1-5.6-44.2z"/>
-  <path fill="#B8CEE7" d="M126.9 135.3l15.7 37.7-24-31.1z"/>
-  <path fill="#A4B398" d="M176.2 7.4l-34.8 16.8-.1 6.2z"/>
-  <path fill="#7E836C" d="M141.4 24.2l-.1 6.2-9.4 11.5z"/>
-  <path fill="#A2AA97" d="M127 34l14.4-9.8-9.5 17.7z"/>
-  <g>
-    <path fill="#7AA9AE" d="M149.8 68.7l9.2-8.8-2.9 12.4-6.3-3.6"/>
-    <path fill="#768E98" d="M168.1 67.9l-9.1-8-2.9 12.4z"/>
-    <path fill="#DAE6F3" d="M160.8 77.9l-4.7-5.6 12-4.4z"/>
-    <path fill="#7FA6B0" d="M173.3 77.2l-5.2-9.3-7.3 10z"/>
-    <path fill="#7B8B9B" d="M163 84.2l-2.2-6.3 12.5-.7z"/>
-    <path fill="#D9DFF1" d="M175.2 87.8l-1.9-10.6-10.3 7z"/>
-    <path fill="#83A3B1" d="M163.1 91l-.1-6.8 12.2 3.6z"/>
-    <path fill="#818A9F" d="M173.3 98.1l1.9-10.3-12.1 3.2z"/>
-    <path fill="#D8D8ED" d="M161.2 96.7l1.9-5.7 10.2 7.1z"/>
-    <path fill="#889DB2" d="M168.4 107.2l4.9-9.1-12.1-1.4z"/>
-    <path fill="#8289A0" d="M157.1 102.7l4.1-6 7.2 10.5z"/>
-    <path fill="#D7D2E9" d="M159 115.3l9.4-8.1-11.3-4.5z"/>
-    <path fill="#869FB3" d="M149.8 106.5l7.3-3.8 1.9 12.6z"/>
-    <g>
-      <path fill="#6B949B" d="M190.6 39.6l-6.2-3.8 9.3-8.9z"/>
-      <path fill="#56777D" d="M202.6 33.8l-8.9-6.9-3.1 12.7z"/>
-      <path fill="#94C7D0" d="M197.4 45.4l-6.8-5.8 12-5.8z"/>
-      <path fill="#70939D" d="M209.8 41.4l-7.2-7.6-5.2 11.6z"/>
-      <path fill="#5D7581" d="M203.3 52.4l-5.9-7 12.4-4z"/>
-      <path fill="#98C1D0" d="M216.1 49.7l-6.3-8.3-6.5 11z"/>
-      <path fill="#7490A1" d="M207.4 58.8l-4.1-6.4 12.8-2.7z"/>
-      <path fill="#637487" d="M220.6 58.3l-4.5-8.6-8.7 9.1z"/>
-      <path fill="#9BBACF" d="M211.1 67.1l-3.7-8.3 13.2-.5z"/>
-      <path fill="#7C8CA6" d="M224.3 68.6l-3.7-10.3-9.5 8.8z"/>
-      <path fill="#6D748F" d="M214 77.7l-2.9-10.6 13.2 1.5z"/>
-      <path fill="#A0B1D0" d="M226.4 79.8l-2.1-11.2-10.3 9.1z"/>
-      <path fill="#7A7296" d="M226.9 91.3l-.5-11.5-11.5 6z"/>
-      <path fill="#8389AA" d="M214 77.7l.9 8.1 11.5-6z"/>
-      <path fill="#A3ABCF" d="M214.4 95.8l.5-10 12 5.5z"/>
-      <path fill="#8C85AE" d="M225.8 101.5l1.1-10.2-12.5 4.5z"/>
-      <path fill="#7E729B" d="M212.6 104.6l1.8-8.8 11.4 5.7z"/>
-      <path fill="#A6A2CD" d="M223.5 110.4l2.3-8.9-13.2 3.1z"/>
-      <path fill="#8F84AE" d="M209.8 112.8l2.8-8.2 10.9 5.8z"/>
-      <path fill="#8571A0" d="M219.4 120.5l4.1-10.1-13.7 2.4z"/>
-      <path fill="#A79FCE" d="M206 119.9l3.8-7.1 9.6 7.7z"/>
-      <path fill="#957FB3" d="M214 129.8l5.4-9.3-13.4-.6z"/>
-      <path fill="#8670A1" d="M201.9 125.8l4.1-5.9 8 9.9z"/>
-      <path fill="#AA99C9" d="M207.8 137.3l6.2-7.5-12.1-4z"/>
-      <path fill="#9480B3" d="M196.4 131.5l5.5-5.7 5.9 11.5z"/>
-      <path fill="#8E70A7" d="M202.1 143.1l5.7-5.8-11.4-5.8z"/>
-      <path fill="#A99ACA" d="M191.3 135.9l5.1-4.4 5.7 11.6z"/>
-      <path fill="#987FB4" d="M194.2 148.6l7.9-5.5-10.6-7.2z"/>
-      <path fill="#866FA0" d="M185.3 140l6.2-4.1 2.7 12.7z"/>
-    </g>
-    <g>
-      <path fill="#8AB7C4" d="M182.9 46.9l-5.8-4.1-3 11.5z"/>
-      <path fill="#A5DDE9" d="M178.6 58.3l-4.5-4 8.8-7.4z"/>
-      <path fill="#6A909A" d="M189.8 53.3l-6.9-6.4-4.3 11.4z"/>
-      <path fill="#87BCC4" d="M183.1 63.2l-4.5-4.9 11.2-5z"/>
-      <path fill="#A7CCE5" d="M195.7 61.7l-5.9-8.4-6.7 9.9z"/>
-      <path fill="#708E9D" d="M187.4 70.4l-4.3-7.2 12.6-1.5z"/>
-      <path fill="#A7D5E7" d="M200.1 71.6l-4.4-9.9-8.3 8.7z"/>
-      <path fill="#8FB0C5" d="M190.1 78.4l-2.7-8 12.7 1.2z"/>
-      <path fill="#778AA0" d="M202.1 82l-12-3.6 10-6.8z"/>
-      <path fill="#A7CCE5" d="M191.1 88.1l-1-9.7 12 3.6z"/>
-      <path fill="#94A7C6" d="M201.8 94.3l-10.7-6.2 11-6.1z"/>
-      <path fill="#7E88A6" d="M189.7 97.2l1.4-9.1 10.7 6.2z"/>
-      <path fill="#AAC1E3" d="M199.2 104.6l-9.5-7.4 12.1-2.9z"/>
-      <path fill="#95A5C5" d="M186.8 104.3l2.9-7.1 9.5 7.4z"/>
-      <path fill="#8485A8" d="M194.7 113.8l4.5-9.2-12.4-.3z"/>
-      <path fill="#ABC0E3" d="M183.3 110.4l3.5-6.1 7.9 9.5z"/>
-      <path fill="#9A9FC7" d="M188.9 121.3l5.8-7.5-11.4-3.4z"/>
-      <path fill="#8585A9" d="M178.9 115.3l4.4-4.9 5.6 10.9z"/>
-      <path fill="#9A9FC7" d="M182.8 126.9l6.1-5.6-10-6z"/>
-      <path fill="#99A2C7" d="M173.3 119.8l5.6-4.5 3.9 11.6z"/>
-      <path fill="#AEB8DE" d="M176.2 131.4l6.6-4.5-9.5-7.1z"/>
-      <path fill="#ABBFE3" d="M167.2 123.2l6.1-3.4 2.9 11.6z"/>
-      <g>
-        <path fill="#6A909A" d="M174.1 54.3l-5.7-3.2 8.7-8.3z"/>
-      </g>
-    </g>
-  </g>
-  <g>
-    <path fill="#7AA9AE" d="M83 68.7l-9.1-8.8 2.8 12.4 6.3-3.6"/>
-    <path fill="#768E98" d="M64.8 67.9l9.1-8 2.8 12.4z"/>
-    <path fill="#DAE6F3" d="M72 77.9l4.7-5.6-11.9-4.4z"/>
-    <path fill="#7FA6B0" d="M59.6 77.2l5.2-9.3 7.2 10z"/>
-    <path fill="#7B8B9B" d="M69.8 84.2l2.2-6.3-12.4-.7z"/>
-    <path fill="#D9DFF1" d="M57.7 87.8l1.9-10.6 10.2 7z"/>
-    <path fill="#83A3B1" d="M69.8 91v-6.8l-12.1 3.6z"/>
-    <path fill="#818A9F" d="M59.5 98.1l-1.8-10.3L69.8 91z"/>
-    <path fill="#D8D8ED" d="M71.6 96.7L69.8 91l-10.3 7.1z"/>
-    <path fill="#889DB2" d="M64.4 107.2l-4.9-9.1 12.1-1.4z"/>
-    <path fill="#8289A0" d="M75.8 102.7l-4.2-6-7.2 10.5z"/>
-    <path fill="#D7D2E9" d="M73.8 115.3l-9.4-8.1 11.4-4.5z"/>
-    <path fill="#869FB3" d="M83.1 106.5l-7.3-3.8-2 12.6z"/>
-    <g>
-      <path fill="#6B949B" d="M42.3 39.6l6.1-3.8-9.2-8.9z"/>
-      <path fill="#56777D" d="M30.3 33.8l8.9-6.9 3.1 12.7z"/>
-      <path fill="#94C7D0" d="M35.5 45.4l6.8-5.8-12-5.8z"/>
-      <path fill="#70939D" d="M23 41.4l7.3-7.6 5.2 11.6z"/>
-      <path fill="#5D7581" d="M29.6 52.4l5.9-7-12.5-4z"/>
-      <path fill="#98C1D0" d="M16.8 49.7l6.2-8.3 6.6 11z"/>
-      <path fill="#7490A1" d="M25.5 58.8l4.1-6.4-12.8-2.7z"/>
-      <path fill="#637487" d="M12.2 58.3l4.6-8.6 8.7 9.1z"/>
-      <path fill="#9BBACF" d="M21.8 67.1l3.7-8.3-13.3-.5z"/>
-      <path fill="#7C8CA6" d="M8.5 68.6l3.7-10.3 9.6 8.8z"/>
-      <path fill="#6D748F" d="M18.9 77.7l2.9-10.6-13.3 1.5z"/>
-      <path fill="#A0B1D0" d="M6.4 79.8l2.1-11.2 10.4 9.1z"/>
-      <path fill="#7A7296" d="M6 91.3l.4-11.5 11.5 6z"/>
-      <path fill="#8389AA" d="M18.9 77.7l-1 8.1-11.5-6z"/>
-      <path fill="#A3ABCF" d="M18.4 95.8l-.5-10L6 91.3z"/>
-      <path fill="#8C85AE" d="M7.1 101.5L6 91.3l12.4 4.5z"/>
-      <path fill="#7E729B" d="M20.2 104.6l-1.8-8.8-11.3 5.7z"/>
-      <path fill="#A6A2CD" d="M9.3 110.4l-2.2-8.9 13.1 3.1z"/>
-      <path fill="#8F84AE" d="M23 112.8l-2.8-8.2-10.9 5.8z"/>
-      <path fill="#8571A0" d="M13.5 120.5l-4.2-10.1 13.7 2.4z"/>
-      <path fill="#A79FCE" d="M26.9 119.9l-3.9-7.1-9.5 7.7z"/>
-      <path fill="#957FB3" d="M18.9 129.8l-5.4-9.3 13.4-.6z"/>
-      <path fill="#8670A1" d="M31 125.8l-4.1-5.9-8 9.9z"/>
-      <path fill="#AA99C9" d="M25.1 137.3l-6.2-7.5 12.1-4z"/>
-      <path fill="#9480B3" d="M36.4 131.5l-5.4-5.7-5.9 11.5z"/>
-      <path fill="#8E70A7" d="M30.8 143.1l-5.7-5.8 11.3-5.8z"/>
-      <path fill="#A99ACA" d="M41.5 135.9l-5.1-4.4-5.6 11.6z"/>
-      <path fill="#987FB4" d="M38.6 148.6l-7.8-5.5 10.6-7.2z"/>
-      <path fill="#866FA0" d="M47.6 140l-6.2-4.1-2.8 12.7z"/>
-    </g>
-    <g>
-      <path fill="#8AB7C4" d="M50 46.9l5.7-4.1 3.1 11.5z"/>
-      <path fill="#A5DDE9" d="M54.2 58.3l4.6-4-8.8-7.4z"/>
-      <path fill="#6A909A" d="M43.1 53.3l6.9-6.4 4.2 11.4z"/>
-      <path fill="#87BCC4" d="M49.8 63.2l4.4-4.9-11.1-5z"/>
-      <path fill="#A7CCE5" d="M37.1 61.7l6-8.4 6.7 9.9z"/>
-      <path fill="#708E9D" d="M45.5 70.4l4.3-7.2-12.7-1.5z"/>
-      <path fill="#A7D5E7" d="M32.7 71.6l4.4-9.9 8.4 8.7z"/>
-      <path fill="#8FB0C5" d="M42.8 78.4l2.7-8-12.8 1.2z"/>
-      <path fill="#778AA0" d="M30.8 82l12-3.6-10.1-6.8z"/>
-      <path fill="#A7CCE5" d="M41.8 88.1l1-9.7-12 3.6z"/>
-      <path fill="#94A7C6" d="M31.1 94.3l10.7-6.2-11-6.1z"/>
-      <path fill="#7E88A6" d="M43.2 97.2l-1.4-9.1-10.7 6.2z"/>
-      <path fill="#AAC1E3" d="M33.6 104.6l9.6-7.4-12.1-2.9z"/>
-      <path fill="#95A5C5" d="M46.1 104.3l-2.9-7.1-9.6 7.4z"/>
-      <path fill="#8485A8" d="M38.2 113.8l-4.6-9.2 12.5-.3z"/>
-      <path fill="#ABC0E3" d="M49.6 110.4l-3.5-6.1-7.9 9.5z"/>
-      <path fill="#9A9FC7" d="M43.9 121.3l-5.7-7.5 11.4-3.4z"/>
-      <path fill="#8585A9" d="M53.9 115.3l-4.3-4.9-5.7 10.9z"/>
-      <path fill="#9A9FC7" d="M50.1 126.9l-6.2-5.6 10-6z"/>
-      <path fill="#99A2C7" d="M59.5 119.8l-5.6-4.5-3.8 11.6z"/>
-      <path fill="#AEB8DE" d="M56.7 131.4l-6.6-4.5 9.4-7.1z"/>
-      <path fill="#ABBFE3" d="M65.7 123.2l-6.2-3.4-2.8 11.6z"/>
-      <g>
-        <path fill="#6A909A" d="M58.8 54.3l5.7-3.2-8.8-8.3z"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/contentcuration/contentcuration/frontend/shared/images/kolibri_placeholder.png b/contentcuration/contentcuration/frontend/shared/images/kolibri_placeholder.png
index c12008541e..9bf559596d 100644
Binary files a/contentcuration/contentcuration/frontend/shared/images/kolibri_placeholder.png and b/contentcuration/contentcuration/frontend/shared/images/kolibri_placeholder.png differ
diff --git a/contentcuration/contentcuration/frontend/shared/images/le-logo.svg b/contentcuration/contentcuration/frontend/shared/images/le-logo.svg
index c668f073d2..20ba5a757d 100644
--- a/contentcuration/contentcuration/frontend/shared/images/le-logo.svg
+++ b/contentcuration/contentcuration/frontend/shared/images/le-logo.svg
@@ -1,30 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 279 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
-    <g transform="matrix(0.5,0,0,0.5,-0.0281353,0)">
-        <g id="g3" transform="matrix(1.8331,0,0,1.8331,-152.598,-122.658)">
-            <path id="path5" d="M207.1,108.2C207.1,108.6 207.1,109 207,109.3C207,109.6 206.9,109.9 206.8,110.1C206.7,110.3 206.6,110.4 206.5,110.5C206.4,110.6 206.3,110.6 206.1,110.6L192.8,110.6C192.3,110.6 191.9,110.5 191.6,110.2C191.3,109.9 191.1,109.4 191.1,108.8L191.1,82.5C191.1,82.4 191.1,82.2 191.2,82.1C191.3,82 191.5,81.9 191.7,81.8C191.9,81.7 192.2,81.7 192.6,81.6C193,81.6 193.5,81.5 194,81.5C194.6,81.5 195.1,81.5 195.4,81.6C195.8,81.6 196.1,81.7 196.3,81.8C196.5,81.9 196.7,82 196.8,82.1C196.9,82.2 196.9,82.4 196.9,82.5L196.9,105.8L206,105.8C206.1,105.8 206.3,105.8 206.4,105.9C206.5,106 206.6,106.1 206.7,106.3C206.8,106.5 206.8,106.7 206.9,107C207.1,107.4 207.1,107.8 207.1,108.2Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path7" d="M228.7,108.4C228.7,108.8 228.7,109.2 228.6,109.5C228.6,109.8 228.5,110 228.4,110.2C228.3,110.4 228.2,110.5 228.1,110.6C228,110.7 227.9,110.7 227.7,110.7L213.1,110.7C212.6,110.7 212.2,110.6 211.9,110.3C211.6,110 211.4,109.5 211.4,108.9L211.4,83.6C211.4,82.9 211.6,82.5 211.9,82.2C212.2,81.9 212.7,81.8 213.1,81.8L227.6,81.8C227.7,81.8 227.9,81.8 228,81.9C228.1,82 228.2,82.1 228.3,82.3C228.4,82.5 228.4,82.7 228.5,83C228.5,83.3 228.6,83.7 228.6,84.1C228.6,84.5 228.6,84.9 228.5,85.2C228.5,85.5 228.4,85.7 228.3,85.9C228.2,86.1 228.1,86.2 228,86.3C227.9,86.4 227.8,86.4 227.6,86.4L217.2,86.4L217.2,93.5L226,93.5C226.1,93.5 226.3,93.5 226.4,93.6C226.5,93.7 226.6,93.8 226.7,94C226.8,94.2 226.8,94.4 226.9,94.7C226.9,95 227,95.3 227,95.8C227,96.2 227,96.6 226.9,96.9C226.8,97.2 226.8,97.4 226.7,97.6C226.6,97.8 226.5,97.9 226.4,98C226.3,98.1 226.2,98.1 226,98.1L217.2,98.1L217.2,106.3L227.6,106.3C227.7,106.3 227.9,106.3 228,106.4C228.1,106.5 228.2,106.6 228.3,106.8C228.4,107 228.4,107.2 228.5,107.5C228.7,107.6 228.7,108 228.7,108.4Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path9" d="M258.1,108.5C258.3,109 258.4,109.5 258.4,109.8C258.4,110.1 258.4,110.3 258.2,110.5C258,110.7 257.7,110.8 257.3,110.8C256.9,110.8 256.3,110.9 255.6,110.9C254.8,110.9 254.2,110.9 253.8,110.9C253.4,110.9 253,110.8 252.8,110.8C252.6,110.7 252.4,110.6 252.3,110.5C252.2,110.4 252.1,110.2 252.1,110L250.1,104.2L239.2,104.2L237.4,109.9C237.3,110.1 237.3,110.3 237.2,110.4C237.1,110.5 236.9,110.7 236.7,110.7C236.5,110.7 236.2,110.8 235.8,110.9C235.4,110.9 234.9,110.9 234.2,110.9C233.5,110.9 233,110.9 232.6,110.8C232.2,110.7 231.9,110.6 231.8,110.5C231.6,110.3 231.6,110.1 231.6,109.8C231.6,109.5 231.8,109.1 231.9,108.5L240.8,82.8C240.9,82.5 241,82.3 241.1,82.2C241.2,82 241.4,81.9 241.7,81.8C242,81.7 242.3,81.7 242.8,81.6C243.3,81.5 243.9,81.6 244.6,81.6C245.5,81.6 246.2,81.6 246.7,81.6C247.2,81.6 247.6,81.7 247.9,81.8C248.2,81.9 248.4,82 248.5,82.2C248.6,82.4 248.7,82.6 248.8,82.9L258.1,108.5ZM244.8,87.2L240.7,99.5L248.9,99.5L244.8,87.2Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path11" d="M284.6,109.9C284.6,110.1 284.6,110.2 284.5,110.3C284.4,110.4 284.3,110.5 284.1,110.6C283.9,110.7 283.5,110.7 283.1,110.8L279.8,110.8C279.4,110.8 279.1,110.7 278.9,110.6C278.7,110.5 278.5,110.4 278.4,110.3C278.3,110.2 278.2,110 278.2,109.8L275.6,103.3C275.3,102.6 275,101.9 274.7,101.4C274.4,100.8 274.1,100.4 273.7,100C273.3,99.6 272.9,99.3 272.4,99.1C271.9,98.9 271.4,98.8 270.7,98.8L269,98.8L269,109.8C269,109.9 269,110.1 268.9,110.2C268.8,110.3 268.6,110.4 268.4,110.5C268.2,110.6 267.9,110.6 267.5,110.7C267.1,110.8 266.6,110.8 266.1,110.8C265.5,110.8 265.1,110.8 264.7,110.7C264.3,110.6 264,110.6 263.8,110.5C263.6,110.4 263.4,110.3 263.3,110.2C263.2,110.1 263.2,109.9 263.2,109.8L263.2,83.6C263.2,82.9 263.4,82.5 263.7,82.2C264,81.9 264.5,81.8 264.9,81.8L274.3,81.8C274.8,81.8 275.2,81.9 275.6,81.9C276.8,82.1 277.8,82.3 278.7,82.8C279.6,83.2 280.4,83.7 281.1,84.4C281.7,85.1 282.2,85.8 282.6,86.7C283,87.6 283.1,88.6 283.1,89.8C283.1,90.8 283,91.7 282.7,92.5C282.5,93.3 282.1,94 281.6,94.6C281.1,95.2 280.5,95.8 279.8,96.2C279.1,96.7 278.3,97 277.4,97.3C277.8,97.5 278.2,97.8 278.6,98.1C279,98.4 279.3,98.8 279.7,99.2C280.1,99.6 280.4,100.1 280.7,100.7C281,101.2 281.3,101.9 281.6,102.5L284,108.2C284.2,108.8 284.4,109.2 284.4,109.4C284.6,109.6 284.6,109.8 284.6,109.9ZM277,90.3C277,89.3 276.8,88.5 276.4,87.9C276,87.2 275.3,86.8 274.3,86.5C274,86.4 273.7,86.4 273.3,86.3C272.9,86.2 272.4,86.2 271.7,86.2L269,86.2L269,94.4L272,94.4C272.8,94.4 273.6,94.3 274.2,94.1C274.8,93.9 275.4,93.6 275.8,93.2C276.2,92.8 276.5,92.4 276.7,91.9C276.9,91.4 277,90.9 277,90.3Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path13" d="M312.709,108.6C312.709,108.9 312.609,109.2 312.509,109.5C312.409,109.8 312.209,110 312.009,110.2C311.809,110.4 311.609,110.5 311.309,110.6C311.009,110.7 310.709,110.7 310.509,110.7L308.009,110.7C307.509,110.7 307.009,110.6 306.609,110.5C306.209,110.4 305.909,110.2 305.509,109.9C305.109,109.6 304.909,109.2 304.609,108.8C304.309,108.3 304.009,107.7 303.609,107L296.409,93.4C296.009,92.6 295.609,91.7 295.109,90.8C294.709,89.9 294.309,89 293.909,88.1C294.009,89.2 294.009,90.2 294.009,91.3L294.009,109.8C294.009,109.9 294.009,110.1 293.909,110.2C293.809,110.3 293.709,110.4 293.509,110.5C293.309,110.6 293.009,110.6 292.709,110.7C292.409,110.7 291.909,110.8 291.409,110.8C290.909,110.8 290.409,110.8 290.109,110.7C289.809,110.6 289.509,110.6 289.309,110.5C289.109,110.4 289.009,110.3 288.909,110.2C288.809,110.1 288.809,109.9 288.809,109.8L288.809,83.8C288.809,83.1 289.009,82.6 289.409,82.2C289.809,81.8 290.309,81.7 290.909,81.7L294.109,81.7C294.709,81.7 295.109,81.7 295.509,81.8C295.909,81.9 296.209,82.1 296.509,82.3C296.809,82.5 297.109,82.8 297.409,83.2C297.709,83.6 297.909,84.1 298.209,84.7L303.809,95.3C304.109,95.9 304.509,96.6 304.809,97.2C305.109,97.8 305.409,98.4 305.709,99.1C306.009,99.7 306.309,100.3 306.609,100.9C306.909,101.5 307.209,102.1 307.409,102.7C307.409,101.7 307.309,100.6 307.309,99.4C307.309,98.2 307.309,97.2 307.309,96.2L307.309,82.6C307.309,82.5 307.309,82.3 307.409,82.2C307.509,82.1 307.609,82 307.809,81.9C308.009,81.8 308.309,81.7 308.609,81.7C308.909,81.7 309.409,81.6 309.909,81.6C310.409,81.6 310.809,81.6 311.209,81.7C311.509,81.7 311.809,81.8 312.009,81.9C312.209,82 312.309,82.1 312.409,82.2C312.509,82.3 312.509,82.5 312.509,82.6L312.509,108.6L312.709,108.6Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path15" d="M325.296,109.9C325.296,110 325.296,110.2 325.196,110.3C325.096,110.4 324.896,110.5 324.696,110.6C324.496,110.7 324.196,110.7 323.796,110.8C323.396,110.8 322.896,110.9 322.396,110.9C321.796,110.9 321.396,110.9 320.996,110.8C320.596,110.8 320.296,110.7 320.096,110.6C319.896,110.5 319.696,110.4 319.596,110.3C319.496,110.2 319.496,110 319.496,109.9L319.496,82.5C319.496,82.4 319.496,82.2 319.596,82.1C319.696,82 319.896,81.9 320.096,81.8C320.296,81.7 320.596,81.7 320.996,81.6C321.396,81.6 321.796,81.5 322.396,81.5C322.996,81.5 323.496,81.5 323.796,81.6C324.196,81.6 324.496,81.7 324.696,81.8C324.896,81.9 325.096,82 325.196,82.1C325.296,82.2 325.296,82.4 325.296,82.5L325.296,109.9Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path17" d="M356.575,108.409C356.575,108.709 356.475,109.009 356.375,109.309C356.275,109.609 356.075,109.809 355.875,110.009C355.675,110.209 355.475,110.309 355.175,110.409C354.875,110.509 354.575,110.509 354.375,110.509L351.875,110.509C351.375,110.509 350.875,110.409 350.475,110.309C350.075,110.209 349.775,110.009 349.375,109.709C349.075,109.409 348.775,109.009 348.475,108.609C348.175,108.109 347.875,107.509 347.475,106.809L340.275,93.209C339.875,92.409 339.475,91.509 338.975,90.609C338.575,89.709 338.175,88.809 337.775,87.909C337.875,89.009 337.875,90.009 337.875,91.109L337.875,109.609C337.875,109.709 337.875,109.909 337.775,110.009C337.675,110.109 337.575,110.209 337.375,110.309C337.175,110.409 336.875,110.409 336.575,110.509C336.275,110.609 335.775,110.609 335.275,110.609C334.775,110.609 334.275,110.609 333.975,110.509C333.675,110.409 333.375,110.409 333.175,110.309C332.975,110.209 332.875,110.109 332.775,110.009C332.675,109.909 332.675,109.709 332.675,109.609L332.675,83.609C332.675,82.909 332.875,82.409 333.275,82.009C333.675,81.609 334.175,81.509 334.775,81.509L337.975,81.509C338.575,81.509 338.975,81.509 339.375,81.609C339.775,81.709 340.075,81.909 340.375,82.109C340.675,82.309 340.975,82.609 341.275,83.009C341.575,83.409 341.775,83.909 342.075,84.509L347.675,95.109C347.975,95.709 348.375,96.409 348.675,97.009C348.975,97.609 349.275,98.209 349.575,98.909C349.875,99.509 350.175,100.109 350.475,100.709C350.775,101.309 351.075,101.909 351.275,102.509C351.275,101.509 351.175,100.409 351.175,99.209C351.175,98.109 351.175,97.009 351.175,96.009L351.175,82.409C351.175,82.309 351.175,82.109 351.275,82.009C351.375,81.909 351.475,81.809 351.675,81.709C351.875,81.609 352.175,81.509 352.475,81.509C352.775,81.509 353.275,81.409 353.775,81.409C354.275,81.409 354.675,81.409 355.075,81.509C355.475,81.609 355.675,81.609 355.875,81.709C356.075,81.809 356.175,81.909 356.275,82.009C356.375,82.109 356.375,82.309 356.375,82.409L356.375,108.409L356.575,108.409Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path19" d="M386.697,86.009C386.697,86.409 386.697,86.809 386.597,87.109C386.597,87.409 386.497,87.709 386.397,87.909C386.297,88.109 386.297,88.209 386.197,88.309C386.097,88.409 385.997,88.409 385.897,88.409C385.697,88.409 385.397,88.309 384.997,88.009C384.597,87.709 383.997,87.409 383.297,87.109C382.597,86.809 381.697,86.509 380.697,86.209C379.697,85.909 378.597,85.809 377.197,85.809C375.797,85.809 374.497,86.009 373.397,86.509C372.297,87.009 371.297,87.709 370.497,88.609C369.697,89.509 369.097,90.609 368.597,91.809C368.197,93.009 367.897,94.409 367.897,95.909C367.897,97.609 368.097,99.009 368.597,100.309C369.097,101.609 369.697,102.609 370.397,103.509C371.197,104.409 372.097,105.009 373.297,105.409C374.397,105.809 375.597,106.109 376.997,106.109C377.697,106.109 378.297,106.009 378.897,105.909C379.497,105.809 380.097,105.509 380.697,105.209L380.697,98.509L375.197,98.509C374.897,98.509 374.697,98.309 374.597,98.009C374.497,97.709 374.397,97.109 374.397,96.309C374.397,95.909 374.397,95.509 374.497,95.209C374.497,94.909 374.597,94.709 374.697,94.509C374.797,94.309 374.897,94.209 374.997,94.109C375.097,94.009 375.197,94.009 375.397,94.009L385.197,94.009C385.397,94.009 385.697,94.009 385.797,94.109C385.897,94.209 386.197,94.309 386.297,94.509C386.397,94.709 386.497,94.909 386.597,95.109C386.697,95.309 386.697,95.609 386.697,95.909L386.697,107.409C386.697,107.809 386.597,108.209 386.497,108.609C386.297,108.909 385.997,109.209 385.497,109.409C384.997,109.609 384.397,109.809 383.697,110.009C382.997,110.209 382.197,110.409 381.497,110.509C380.797,110.609 379.997,110.809 379.197,110.809C378.397,110.909 377.597,110.909 376.797,110.909C374.497,110.909 372.397,110.609 370.597,109.909C368.797,109.209 367.197,108.309 365.897,107.009C364.597,105.709 363.697,104.209 362.997,102.409C362.297,100.609 361.997,98.509 361.997,96.209C361.997,93.809 362.397,91.709 363.097,89.809C363.797,87.909 364.797,86.309 366.097,85.009C367.397,83.709 368.997,82.709 370.897,82.009C372.797,81.309 374.797,80.909 377.097,80.909C378.397,80.909 379.497,81.009 380.497,81.209C381.497,81.409 382.397,81.609 383.197,81.809C383.997,82.009 384.597,82.309 385.097,82.609C385.597,82.909 385.997,83.109 386.197,83.309C386.397,83.509 386.497,83.809 386.597,84.209C386.597,84.709 386.697,85.309 386.697,86.009Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-        </g>
-        <g id="g21" transform="matrix(1.84487,0,0,1.84487,-153.555,-151.6)">
-            <path id="path23" d="M207.595,156.4C207.595,156.8 207.595,157.2 207.495,157.5C207.495,157.8 207.395,158 207.295,158.2C207.195,158.4 207.095,158.5 206.995,158.6C206.895,158.7 206.795,158.7 206.595,158.7L191.995,158.7C191.495,158.7 191.095,158.6 190.795,158.3C190.495,158 190.295,157.5 190.295,156.9L190.295,131.6C190.295,130.9 190.495,130.5 190.795,130.2C191.095,129.9 191.595,129.8 191.995,129.8L206.495,129.8C206.595,129.8 206.795,129.8 206.895,129.9C206.995,130 207.095,130.1 207.195,130.3C207.295,130.5 207.295,130.7 207.395,131C207.395,131.3 207.495,131.7 207.495,132.1C207.495,132.5 207.495,132.9 207.395,133.2C207.395,133.5 207.295,133.7 207.195,133.9C207.095,134.1 206.995,134.2 206.895,134.3C206.795,134.4 206.695,134.4 206.495,134.4L196.295,134.4L196.295,141.5L205.095,141.5C205.195,141.5 205.395,141.5 205.495,141.6C205.595,141.7 205.695,141.8 205.795,142C205.895,142.2 205.895,142.4 205.995,142.7C205.995,143 206.095,143.3 206.095,143.8C206.095,144.2 206.095,144.6 205.995,144.9C205.895,145.2 205.895,145.4 205.795,145.6C205.695,145.8 205.595,145.9 205.495,146C205.395,146.1 205.295,146.1 205.095,146.1L196.295,146.1L196.295,154.3L206.695,154.3C206.795,154.3 206.995,154.3 207.095,154.4C207.195,154.5 207.295,154.6 207.395,154.8C207.495,155 207.495,155.2 207.595,155.5L207.595,156.4Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path25" d="M241.131,161.771C241.131,162.271 241.131,162.771 241.031,163.071C240.931,163.371 240.931,163.671 240.831,163.871C240.731,164.071 240.631,164.171 240.531,164.171C240.431,164.271 240.331,164.271 240.231,164.271C239.731,164.271 239.131,164.171 238.331,163.871C237.531,163.571 236.631,163.171 235.731,162.671C234.831,162.171 233.831,161.571 232.931,160.871C232.031,160.171 231.031,159.271 230.231,158.371C229.531,158.671 228.731,158.971 227.731,159.171C226.731,159.371 225.631,159.471 224.431,159.471C222.131,159.471 220.231,159.171 218.531,158.571C216.831,157.971 215.431,157.071 214.331,155.871C213.231,154.671 212.331,153.071 211.831,151.271C211.231,149.371 211.031,147.171 211.031,144.571C211.031,142.271 211.331,140.071 211.931,138.271C212.531,136.371 213.431,134.771 214.631,133.471C215.831,132.171 217.231,131.171 219.031,130.471C220.731,129.771 222.831,129.371 225.131,129.371C227.331,129.371 229.231,129.671 230.831,130.271C232.531,130.871 233.931,131.771 235.031,132.971C236.131,134.171 237.031,135.671 237.631,137.571C238.231,139.371 238.531,141.571 238.531,144.071C238.531,145.371 238.431,146.571 238.231,147.771C238.031,148.871 237.831,149.971 237.431,150.971C237.131,151.971 236.731,152.871 236.231,153.671C235.731,154.471 235.231,155.171 234.631,155.771C235.531,156.571 236.331,157.171 237.131,157.571C237.831,157.971 238.431,158.271 238.931,158.471C239.431,158.671 239.831,158.871 240.131,158.971C240.431,159.071 240.631,159.171 240.831,159.371C241.031,159.571 241.131,159.771 241.231,160.171C241.131,160.571 241.131,161.071 241.131,161.771ZM232.231,144.371C232.231,142.871 232.131,141.471 231.831,140.271C231.631,139.071 231.231,137.971 230.631,137.071C230.031,136.171 229.331,135.471 228.331,134.971C227.331,134.471 226.131,134.271 224.731,134.271C223.331,134.271 222.031,134.571 221.131,135.071C220.131,135.571 219.331,136.371 218.731,137.271C218.131,138.171 217.731,139.271 217.431,140.471C217.231,141.671 217.031,142.971 217.031,144.271C217.031,145.871 217.131,147.271 217.431,148.571C217.631,149.871 218.031,150.971 218.631,151.771C219.231,152.671 219.931,153.371 220.931,153.871C221.931,154.371 223.131,154.571 224.531,154.571C225.931,154.571 227.231,154.271 228.131,153.771C229.131,153.271 229.931,152.471 230.531,151.571C231.131,150.671 231.531,149.571 231.831,148.371C232.131,147.171 232.231,145.771 232.231,144.371Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path27" d="M267.766,147.873C267.766,149.673 267.466,151.273 266.966,152.673C266.466,154.073 265.666,155.273 264.666,156.273C263.666,157.273 262.366,157.973 260.866,158.473C259.366,158.973 257.666,159.273 255.666,159.273C253.866,159.273 252.166,159.073 250.766,158.573C249.366,158.073 248.066,157.473 247.066,156.473C246.066,155.573 245.266,154.373 244.766,152.973C244.266,151.573 243.966,149.973 243.966,148.073L243.966,130.473C243.966,130.373 243.966,130.173 244.066,130.073C244.166,129.973 244.266,129.873 244.566,129.773C244.766,129.673 245.066,129.673 245.466,129.573C245.866,129.473 246.366,129.473 246.866,129.473C247.466,129.473 247.866,129.473 248.266,129.573C248.666,129.573 248.966,129.673 249.166,129.773C249.366,129.873 249.566,129.973 249.666,130.073C249.766,130.173 249.766,130.373 249.766,130.473L249.766,147.573C249.766,148.773 249.866,149.673 250.166,150.573C250.466,151.373 250.866,152.073 251.366,152.673C251.866,153.273 252.566,153.673 253.266,153.873C253.966,154.173 254.866,154.273 255.766,154.273C256.666,154.273 257.566,154.173 258.266,153.873C258.966,153.573 259.666,153.173 260.166,152.673C260.666,152.173 261.066,151.473 261.366,150.673C261.666,149.873 261.766,148.973 261.766,147.973L261.766,130.473C261.766,130.373 261.766,130.173 261.866,130.073C261.966,129.973 262.066,129.873 262.366,129.773C262.566,129.673 262.866,129.673 263.266,129.573C263.666,129.573 264.166,129.473 264.666,129.473C265.266,129.473 265.666,129.473 266.066,129.573C266.466,129.673 266.766,129.673 266.966,129.773C267.166,129.873 267.366,129.973 267.466,130.073C267.566,130.173 267.566,130.373 267.566,130.473L267.767,147.873L267.766,147.873Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path29" d="M297.091,156.405C297.291,156.905 297.391,157.405 297.391,157.705C297.391,158.005 297.391,158.205 297.191,158.405C296.991,158.605 296.691,158.705 296.291,158.705C295.891,158.705 295.291,158.805 294.591,158.805C293.791,158.805 293.191,158.805 292.791,158.805C292.391,158.805 291.991,158.705 291.791,158.705C291.591,158.605 291.391,158.505 291.291,158.405C291.191,158.305 291.091,158.105 291.091,157.905L289.191,152.105L278.291,152.105L276.491,157.805C276.391,158.005 276.391,158.205 276.291,158.305C276.191,158.405 275.991,158.605 275.791,158.605C275.591,158.705 275.291,158.705 274.891,158.805C274.491,158.805 273.991,158.805 273.291,158.805C272.591,158.805 272.091,158.805 271.691,158.705C271.291,158.605 270.991,158.505 270.891,158.405C270.791,158.305 270.691,158.005 270.691,157.705C270.691,157.405 270.891,157.005 270.991,156.405L279.891,130.705C279.991,130.405 280.091,130.205 280.191,130.105C280.291,129.905 280.491,129.805 280.791,129.705C281.091,129.605 281.391,129.605 281.891,129.505L285.791,129.505C286.291,129.505 286.691,129.605 286.991,129.705C287.291,129.805 287.491,129.905 287.591,130.105C287.691,130.305 287.791,130.505 287.891,130.805L297.091,156.405ZM283.791,135.105L279.691,147.405L287.891,147.405L283.791,135.105Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path31" d="M317.711,156.2C317.711,156.6 317.711,157 317.611,157.3C317.611,157.6 317.511,157.9 317.411,158.1C317.311,158.3 317.211,158.4 317.111,158.5C317.011,158.6 316.911,158.6 316.711,158.6L303.411,158.6C302.911,158.6 302.511,158.5 302.211,158.2C301.911,157.9 301.711,157.4 301.711,156.8L301.711,130.5C301.711,130.4 301.711,130.2 301.811,130.1C301.911,130 302.111,129.9 302.311,129.8C302.511,129.7 302.811,129.7 303.211,129.6C303.611,129.5 304.111,129.5 304.611,129.5C305.211,129.5 305.711,129.5 306.011,129.6C306.411,129.6 306.711,129.7 306.911,129.8C307.111,129.9 307.311,130 307.411,130.1C307.511,130.2 307.511,130.4 307.511,130.5L307.511,153.8L316.611,153.8C316.711,153.8 316.911,153.8 317.011,153.9C317.111,154 317.211,154.1 317.311,154.3C317.411,154.5 317.411,154.7 317.511,155C317.711,155.4 317.711,155.8 317.711,156.2Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path33" d="M327.268,157.9C327.268,158 327.268,158.2 327.168,158.3C327.068,158.4 326.868,158.5 326.668,158.6C326.468,158.7 326.168,158.7 325.768,158.8C325.368,158.8 324.868,158.9 324.368,158.9C323.768,158.9 323.368,158.9 322.968,158.8C322.568,158.7 322.268,158.7 322.068,158.6C321.868,158.5 321.668,158.4 321.568,158.3C321.468,158.2 321.468,158 321.468,157.9L321.468,130.5C321.468,130.4 321.468,130.2 321.568,130.1C321.668,130 321.868,129.9 322.068,129.8C322.268,129.7 322.568,129.7 322.968,129.6C323.368,129.5 323.768,129.5 324.368,129.5C324.968,129.5 325.468,129.5 325.768,129.6C326.168,129.6 326.468,129.7 326.668,129.8C326.868,129.9 327.068,130 327.168,130.1C327.268,130.2 327.268,130.4 327.268,130.5L327.268,157.9Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path35" d="M353.543,131.958C353.543,132.358 353.543,132.758 353.443,133.058C353.443,133.358 353.343,133.658 353.243,133.758C353.143,133.958 353.043,134.058 352.943,134.158C352.843,134.258 352.743,134.258 352.543,134.258L345.243,134.258L345.243,157.658C345.243,157.758 345.243,157.958 345.143,158.058C345.043,158.158 344.843,158.258 344.643,158.358C344.443,158.458 344.143,158.458 343.743,158.558C343.343,158.658 342.843,158.658 342.343,158.658C341.743,158.658 341.343,158.658 340.943,158.558C340.543,158.458 340.243,158.458 340.043,158.358C339.843,158.258 339.643,158.158 339.543,158.058C339.443,157.958 339.443,157.758 339.443,157.658L339.443,134.258L332.143,134.258C331.943,134.258 331.843,134.258 331.743,134.158C331.643,134.058 331.543,133.958 331.443,133.758C331.343,133.558 331.343,133.358 331.243,133.058C331.243,132.758 331.143,132.358 331.143,131.958C331.143,131.558 331.143,131.158 331.243,130.858C331.243,130.558 331.343,130.258 331.443,130.058C331.543,129.858 331.643,129.758 331.743,129.658C331.843,129.558 331.943,129.558 332.143,129.558L352.543,129.558C352.643,129.558 352.843,129.558 352.943,129.658C353.043,129.758 353.143,129.858 353.243,130.058C353.343,130.258 353.343,130.458 353.443,130.858C353.543,131.158 353.543,131.558 353.543,131.958Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-            <path id="path37" d="M368.83,147.754L368.83,157.954C368.83,158.054 368.83,158.254 368.73,158.354C368.63,158.454 368.43,158.554 368.23,158.654C368.03,158.754 367.73,158.754 367.33,158.854C366.93,158.954 366.43,158.954 365.93,158.954C365.33,158.954 364.83,158.954 364.53,158.854C364.13,158.854 363.83,158.754 363.63,158.654C363.43,158.554 363.23,158.454 363.13,158.354C363.03,158.254 363.03,158.054 363.03,157.954L363.03,147.754L355.13,131.954C354.83,131.354 354.63,130.954 354.63,130.654C354.53,130.354 354.63,130.154 354.73,129.954C354.93,129.754 355.23,129.654 355.73,129.654C356.23,129.654 356.83,129.554 357.63,129.554C358.33,129.554 358.83,129.554 359.23,129.554C359.63,129.554 359.93,129.654 360.23,129.754C360.43,129.854 360.63,129.954 360.73,130.054C360.83,130.154 360.93,130.354 361.03,130.554L364.23,137.654C364.53,138.354 364.83,139.054 365.13,139.854C365.43,140.654 365.73,141.454 366.03,142.254C366.33,141.454 366.63,140.654 366.93,139.854C367.23,139.054 367.53,138.354 367.83,137.654L371.03,130.554C371.13,130.354 371.23,130.154 371.33,129.954C371.43,129.754 371.63,129.654 371.83,129.654C372.03,129.554 372.33,129.554 372.73,129.454C373.13,129.454 373.63,129.454 374.23,129.454C375.13,129.454 375.73,129.454 376.23,129.554C376.73,129.654 377.03,129.654 377.23,129.854C377.43,130.054 377.43,130.254 377.33,130.554C377.23,130.854 377.03,131.254 376.83,131.854L368.83,147.754Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-        </g>
-        <g id="g39" transform="matrix(1,0,0,1,-1,-0.5)">
-            <path id="path6" d="M122.6,16.5C128.9,11.2 135.1,5.7 141.4,0.5C146.1,6 147.7,14 145.1,20.8C144,24.1 141.9,27 139.3,29.2C131,36.3 122.6,43.3 114.4,50.6C112.8,52.1 113.9,54.8 115.9,55.2C117.6,55.5 118.7,54 119.9,53.1C129.5,44.7 139.3,36.6 148.8,28.2C153,24.7 157.2,21.1 161.3,17.5C165.6,22.3 167.3,29.2 165.9,35.4C164.8,39.7 162.7,43.9 159.2,46.6C150,54.5 140.7,62.3 131.5,70.2C130.4,71.1 129.8,72.7 130.7,73.9C131.5,75.4 133.7,75.8 134.9,74.5C148.3,63 161.8,51.6 175.2,40.1C179,44.5 181,50.6 180,56.4C179.4,61.6 176.4,66.4 172.3,69.7C156.9,82.8 141.5,96 126.1,109.1C121.5,113.5 114.8,115.7 108.5,114.6C103.6,113.9 99,111.3 95.8,107.6C84.7,94.6 73.5,81.3 62.2,68.2C63.4,66.9 64.8,65.8 66.2,64.7C85,48.6 103.8,32.6 122.6,16.5Z" style="fill:rgb(6,227,229);fill-rule:nonzero;"/>
-            <path id="path8" d="M13.8,50.6C24.3,45.7 37.8,48.4 45.5,57.1C62.3,76.8 79,96.4 95.8,116C99.6,120.2 105.2,122.8 110.9,122.8C116.2,122.9 121.4,120.9 125.3,117.3C141.5,103.4 157.8,89.7 173.9,75.8C177.7,80.4 179.7,86.5 178.7,92.4C177.9,97.5 175.2,102.2 171.2,105.3C152.7,121 134.3,136.8 115.8,152.5C110.9,156.6 104.6,158.7 98.3,158.9C90.2,158.8 82.1,155.2 76.9,148.9C53.4,121.4 29.9,93.8 6.3,66.2C4.5,64.2 2.9,62 1,60.1C5.1,56.8 8.8,52.8 13.8,50.6Z" style="fill:rgb(0,174,240);fill-rule:nonzero;"/>
-        </g>
-    </g>
+<svg width="456" height="305" viewBox="0 0 456 305" fill="none" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<path d="M252.66 107.23C251.07 127.3 255.09 149.09 269.33 163.32C275.5 169.5 283.23 173.89 291.15 177.56C340.48 200.37 408.59 200.76 443.52 154.42C462.88 128.74 454.69 89.29 441.62 61.85C430.35 38.2 410.87 18.28 386.83 7.88004C353.37 -6.58996 322.76 -0.729959 296.23 22.15C271.51 43.47 255.25 74.62 252.67 107.23H252.66Z" fill="#FFCB00"/>
+<path d="M385.53 143.59C383.86 143.59 382.16 143.49 380.42 143.3C375.32 142.73 371 140.63 367.79 137.23C360.54 141.14 352.02 144.01 343.99 143.11C337.34 142.36 331.9 138.95 328.19 133.24C322.18 138.04 316.05 141.49 310.41 142.68C301.83 144.49 295.16 140.84 291.63 132.42C289.02 126.2 287.75 118.8 287.75 109.81C287.75 72.51 318.1 42.16 355.4 42.16C384.26 42.16 406.98 57.23 417.75 83.51C424.27 99.43 422.52 118.24 413.4 130.33C406.87 138.98 397.1 143.59 385.52 143.59H385.53ZM373.98 133.47C375.91 135.06 378.32 136.02 381.19 136.34C392.61 137.61 401.81 134.07 407.82 126.11C415.5 115.92 416.89 99.87 411.28 86.16C401.64 62.64 381.28 49.15 355.41 49.15C321.97 49.15 294.76 76.36 294.76 109.8C294.76 117.73 295.88 124.43 298.09 129.7C300.33 135.04 303.69 136.93 308.97 135.82C313.91 134.78 319.52 131.38 325.1 126.63C319.93 110.57 325.8 86.42 333 73.31C337.69 64.78 345.22 60.38 352.19 62.1C358.52 63.67 362.55 69.76 362.7 78C362.93 91.04 349.31 113.71 333.53 128.57C333.54 128.59 333.56 128.62 333.57 128.64C336.19 133.14 339.85 135.59 344.76 136.14C350.85 136.82 357.76 134.55 363.9 131.33C363.88 131.3 363.87 131.26 363.85 131.23C359.99 122.43 361.27 110.48 366.89 102.82C370.67 97.67 375.81 95.17 381 95.95C385.43 96.62 389.13 99.75 390.65 104.13C392.88 110.56 390.35 118.32 383.7 125.42C381.62 127.64 378.19 130.6 373.96 133.47H373.98ZM379.19 102.82C376.89 102.82 374.51 104.29 372.55 106.97C368.6 112.36 367.52 121.31 369.99 127.72C373.66 125.26 376.7 122.68 378.61 120.64C383.35 115.58 385.39 110.26 384.06 106.43C383.39 104.49 381.86 103.16 379.98 102.88C379.72 102.84 379.46 102.82 379.19 102.82ZM349.2 68.75C346.33 68.75 342.39 70.77 339.14 76.69C335.29 83.7 332.09 93.84 330.78 103.15C329.82 110.02 329.87 116.19 330.9 121.24C344.22 107.74 355.89 88.44 355.71 78.14C355.62 73.22 353.63 69.68 350.52 68.91C350.11 68.81 349.67 68.76 349.2 68.76V68.75Z" fill="black"/>
+<path d="M8.78 137.25H1.45C1 137.25 0.630005 137.62 0.630005 138.07V199.33C0.630005 199.55 0.720005 199.76 0.870005 199.91L4.75 203.79C4.91 203.94 5.11 204.03 5.33 204.03H8.78C9.23 204.03 9.60001 203.66 9.60001 203.21V138.06C9.60001 137.61 9.23 137.24 8.78 137.24V137.25Z" fill="black"/>
+<path d="M60.38 184.49C60.55 183.33 60.63 182.09 60.63 180.7C60.63 168.73 54.19 156.66 39.81 156.66C26.79 156.66 17.33 166.77 17.33 180.7C17.33 194.63 27.12 204.74 40.1 204.74C47.92 204.74 54.49 201.19 58.6 194.76C58.72 194.57 58.76 194.34 58.69 194.11C58.62 193.88 58.46 193.68 58.25 193.58L51.56 190.35C51.2 190.18 50.77 190.3 50.53 190.64C48.12 194.05 44.52 195.85 40.1 195.85C33.67 195.85 28.92 191.96 27.4 185.44L27.34 185.2H59.55C59.96 185.2 60.32 184.9 60.38 184.5V184.49ZM50.97 176.33C50.74 176.62 50.39 176.79 50.01 176.79H28.69C28.31 176.79 27.94 176.61 27.71 176.3C27.49 176 27.41 175.63 27.51 175.28C29.24 169.09 33.72 165.55 39.8 165.55C47.44 165.55 50.22 170.87 51.2 175.34C51.28 175.69 51.2 176.05 50.96 176.33H50.97Z" fill="black"/>
+<path d="M95.63 204.05H102.78C103.23 204.05 103.6 203.68 103.6 203.23V173.66C103.6 162.63 97.49 156.56 86.4 156.56C79.42 156.56 70.35 159.92 67.77 169.37C67.72 169.57 67.75 169.79 67.86 169.97C67.98 170.17 68.18 170.31 68.41 170.35L74.9 171.71C75.31 171.79 75.69 171.55 75.84 171.15C77.31 167.04 80.82 164.67 85.71 164.47C85.95 164.45 86.2 164.44 86.46 164.44C88.79 164.44 91.63 165.19 93.28 166.96C94.32 168.08 94.74 169.49 94.51 171.04C94.1 173.84 90.55 174.65 86.06 175.67C84.96 175.92 83.82 176.18 82.64 176.48C73.65 178.84 66.68 181.4 65.58 190.87C65.16 194.58 66.36 198.19 68.87 200.77C71.81 203.78 76.29 205.19 81.49 204.73C88.73 204.05 92.72 200.56 94.45 198.54L94.8 198.14V203.22C94.8 203.67 95.17 204.04 95.62 204.04L95.63 204.05ZM82.8 196.72C82.43 196.75 82.02 196.77 81.59 196.77C79.06 196.77 75.8 196.12 75.35 192.84C75.08 191.11 75.38 186.84 84.1 184.61C90.28 183.07 94.51 181.89 94.55 181.87L94.8 181.8V184.11C94.8 191.6 87.7 196.32 82.79 196.72H82.8Z" fill="black"/>
+<path d="M137.62 156.8C136.49 156.63 135.62 156.55 134.81 156.55C130.22 156.55 126.08 158.32 122.83 161.67L122.61 161.89L121.08 157.86C120.96 157.54 120.65 157.33 120.31 157.33H114.42C113.97 157.33 113.6 157.7 113.6 158.15V203.22C113.6 203.67 113.97 204.04 114.42 204.04H121.67C122.12 204.04 122.49 203.67 122.49 203.22V177.95C122.49 170.06 126.34 165.54 133.05 165.54H137.35C137.79 165.54 138.16 165.18 138.17 164.73L138.31 157.63C138.31 157.22 138.02 156.86 137.62 156.8Z" fill="black"/>
+<path d="M174.91 204.05H182.16C182.61 204.05 182.98 203.68 182.98 203.23V177.66C182.98 164.31 176.71 156.65 165.78 156.65C161.19 156.65 157.05 158.42 153.8 161.77L153.58 162L152.07 157.88C151.95 157.56 151.64 157.34 151.3 157.34H145.39C144.94 157.34 144.57 157.71 144.57 158.16V203.23C144.57 203.68 144.94 204.05 145.39 204.05H152.64C153.09 204.05 153.46 203.68 153.46 203.23V177.96C153.46 170.07 157.31 165.55 164.01 165.55C170.71 165.55 174.08 170.29 174.08 178.55V203.24C174.08 203.69 174.45 204.06 174.9 204.06L174.91 204.05Z" fill="black"/>
+<path d="M280.38 226.04C286.84 226.04 292.27 224.01 296.09 220.17C300.58 215.65 302.86 208.75 302.86 199.65V158.16C302.86 157.71 302.49 157.34 302.04 157.34H296.24C295.9 157.34 295.59 157.56 295.47 157.88L293.75 162.59L293.53 162.36C290 158.63 285.08 156.65 279.31 156.65C266.54 156.65 257.61 166.54 257.61 180.69C257.61 194.84 266.53 204.73 279.31 204.73C285.08 204.73 290 202.76 293.53 199.02L293.87 198.66V200.52C293.87 210.77 288.59 217.13 280.09 217.13C275.53 217.13 271.12 214.98 268.57 211.52C268.39 211.28 268.14 211.16 267.88 211.16C267.73 211.16 267.58 211.2 267.45 211.29L261.34 215.26C261.15 215.38 261.01 215.59 260.97 215.81C260.93 216.03 260.97 216.24 261.1 216.42C265.29 222.34 272.69 226.02 280.39 226.02L280.38 226.04ZM280.48 195.84C271.43 195.84 267.38 188.23 267.38 180.69C267.38 171.49 272.52 165.54 280.48 165.54C288.44 165.54 293.48 171.49 293.48 180.69C293.48 188.23 289.46 195.84 280.48 195.84Z" fill="black"/>
+<path d="M242.92 204.05H250.17C250.62 204.05 250.99 203.68 250.99 203.23V177.66C250.99 164.31 244.72 156.65 233.79 156.65C229.2 156.65 225.06 158.42 221.81 161.77L221.59 162L220.08 157.88C219.96 157.56 219.65 157.34 219.31 157.34H213.4C212.95 157.34 212.58 157.71 212.58 158.16V203.23C212.58 203.68 212.95 204.05 213.4 204.05H220.65C221.1 204.05 221.47 203.68 221.47 203.23V177.96C221.47 170.07 225.32 165.55 232.02 165.55C238.72 165.55 242.09 170.29 242.09 178.55V203.24C242.09 203.69 242.46 204.06 242.91 204.06L242.92 204.05Z" fill="black"/>
+<path d="M202 140.11H194.57C194.117 140.11 193.75 140.477 193.75 140.93V148.34C193.75 148.793 194.117 149.16 194.57 149.16H202C202.453 149.16 202.82 148.793 202.82 148.34V140.93C202.82 140.477 202.453 140.11 202 140.11Z" fill="black"/>
+<path d="M198.1 203.81C198.25 203.96 198.47 204.05 198.68 204.05H202.02C202.47 204.05 202.84 203.68 202.84 203.23V158.16C202.84 157.71 202.47 157.34 202.02 157.34H194.77C194.32 157.34 193.95 157.71 193.95 158.16V199.33C193.95 199.55 194.04 199.76 194.19 199.91L198.09 203.81H198.1Z" fill="black"/>
+<path d="M86.22 303.38H93.57C94.02 303.38 94.39 303.01 94.39 302.56V236.18C94.39 235.73 94.02 235.36 93.57 235.36H87.75C87.4 235.36 87.09 235.58 86.98 235.9L85.28 240.61L85.06 240.38C81.47 236.58 76.55 234.58 70.84 234.58C58.07 234.58 49.15 244.51 49.15 258.72C49.15 272.93 58.07 282.76 70.84 282.76C76.62 282.76 81.53 280.79 85.06 277.06L85.4 276.7V302.56C85.4 303.01 85.77 303.38 86.22 303.38ZM71.91 273.87C64.01 273.87 58.91 267.92 58.91 258.72C58.91 251.18 62.93 243.57 71.91 243.57C80.89 243.57 85.01 251.18 85.01 258.72C85.01 267.92 79.87 273.87 71.91 273.87Z" fill="black"/>
+<path d="M139.57 282.08C140.02 282.08 140.39 281.71 140.39 281.26V236.19C140.39 235.74 140.02 235.37 139.57 235.37H132.32C131.87 235.37 131.5 235.74 131.5 236.19V261.46C131.5 269.35 127.65 273.87 120.95 273.87C114.25 273.87 110.88 269.13 110.88 260.87V236.18C110.88 235.73 110.51 235.36 110.06 235.36H102.81C102.36 235.36 101.99 235.73 101.99 236.18V261.75C101.99 275.1 108.26 282.76 119.19 282.76C123.78 282.76 127.92 280.99 131.17 277.64L131.39 277.41L132.9 281.53C133.02 281.85 133.33 282.07 133.67 282.07H139.58L139.57 282.08Z" fill="black"/>
+<path d="M43.05 262.51C43.22 261.35 43.3 260.11 43.3 258.71C43.3 246.74 36.86 234.67 22.48 234.67C9.46 234.67 0 244.78 0 258.71C0 272.64 9.79 282.75 22.77 282.75C30.59 282.75 37.16 279.2 41.27 272.77C41.39 272.58 41.43 272.35 41.36 272.12C41.29 271.89 41.13 271.7 40.92 271.59L34.23 268.36C33.87 268.19 33.44 268.31 33.2 268.65C30.79 272.06 27.19 273.86 22.77 273.86C16.34 273.86 11.59 269.97 10.07 263.45L10.01 263.21H42.22C42.63 263.21 42.99 262.91 43.05 262.51ZM33.64 254.35C33.41 254.64 33.06 254.81 32.68 254.81H11.36C10.98 254.81 10.61 254.63 10.38 254.32C10.15 254.02 10.08 253.65 10.18 253.3C11.91 247.12 16.39 243.57 22.48 243.57C30.12 243.57 32.9 248.89 33.88 253.36C33.96 253.71 33.88 254.07 33.64 254.35Z" fill="black"/>
+<path d="M177 282.08H184.15C184.6 282.08 184.97 281.71 184.97 281.26V251.69C184.97 240.66 178.86 234.59 167.77 234.59C160.79 234.59 151.72 237.95 149.14 247.4C149.09 247.6 149.12 247.82 149.23 248C149.35 248.2 149.55 248.34 149.78 248.39L156.27 249.75C156.67 249.83 157.06 249.6 157.21 249.19C158.68 245.08 162.19 242.71 167.08 242.51C167.32 242.49 167.57 242.48 167.83 242.48C170.16 242.48 173 243.23 174.65 245C175.69 246.12 176.11 247.53 175.88 249.08C175.47 251.88 171.92 252.69 167.44 253.7C166.34 253.95 165.2 254.21 164.01 254.51C155.02 256.87 148.05 259.43 146.95 268.9C146.53 272.61 147.73 276.22 150.24 278.8C153.18 281.81 157.67 283.22 162.86 282.76C170.11 282.08 174.09 278.59 175.82 276.57L176.17 276.17V281.26C176.17 281.71 176.54 282.08 176.99 282.08H177ZM164.17 274.75C163.8 274.78 163.39 274.8 162.96 274.8C160.43 274.8 157.17 274.15 156.72 270.87C156.45 269.14 156.75 264.87 165.47 262.64C171.65 261.09 175.88 259.92 175.92 259.91L176.17 259.84V262.15C176.17 269.64 169.07 274.36 164.16 274.76L164.17 274.75Z" fill="black"/>
+<path d="M201.91 215.28H194.58C194.13 215.28 193.76 215.65 193.76 216.1V277.36C193.76 277.58 193.85 277.79 194 277.94L197.88 281.82C198.03 281.97 198.25 282.06 198.46 282.06H201.91C202.36 282.06 202.73 281.69 202.73 281.24V216.09C202.73 215.64 202.36 215.27 201.91 215.27V215.28Z" fill="black"/>
+<path d="M220.85 218.14H213.42C212.967 218.14 212.6 218.507 212.6 218.96V226.37C212.6 226.823 212.967 227.19 213.42 227.19H220.85C221.303 227.19 221.67 226.823 221.67 226.37V218.96C221.67 218.507 221.303 218.14 220.85 218.14Z" fill="black"/>
+<path d="M216.95 281.84C217.11 281.99 217.31 282.08 217.53 282.08H220.88C221.33 282.08 221.7 281.71 221.7 281.26V238.22C221.7 237.77 221.33 237.4 220.88 237.4H213.63C213.18 237.4 212.81 237.77 212.81 238.22V277.36C212.81 277.58 212.9 277.79 213.05 277.94L216.95 281.84Z" fill="black"/>
+<path d="M256.47 274.21C256.31 274.05 256.11 273.96 255.88 273.96H249.44C248.79 273.96 248.21 273.86 247.74 273.66C245.54 272.81 244.69 270.87 244.69 266.74V246.63C244.69 245.96 245.23 245.42 245.9 245.42H253.53C253.98 245.42 254.35 245.05 254.35 244.6V238.23C254.35 237.78 253.98 237.41 253.53 237.41H245.9C245.23 237.41 244.69 236.87 244.69 236.2V228.42C244.69 227.97 244.32 227.6 243.87 227.6H236.62C236.17 227.6 235.8 227.97 235.8 228.42V236.2C235.8 236.87 235.26 237.41 234.59 237.41H230.27C229.82 237.41 229.45 237.78 229.45 238.23V244.6C229.45 245.05 229.82 245.42 230.27 245.42H234.59C235.26 245.42 235.8 245.96 235.8 246.63V267.13C235.8 275.7 238.38 280.34 244.17 282.19C245.32 282.55 246.59 282.73 247.94 282.73L248.14 282.75H255.87C256.1 282.75 256.31 282.66 256.46 282.5C256.61 282.34 256.69 282.14 256.69 281.92C256.64 279.81 256.69 276.55 256.71 274.79C256.71 274.57 256.63 274.36 256.48 274.21H256.47Z" fill="black"/>
+<path d="M263.02 304.03H266.72C276.77 303.81 281.03 294.59 285.55 282.56L302.19 240.78C302.23 240.68 302.25 240.58 302.25 240.48V238.31C302.25 237.86 301.88 237.49 301.43 237.49H294.5C294.16 237.49 293.86 237.69 293.74 238L281.84 267.4C281.65 267.86 281.21 268.16 280.72 268.16C280.72 268.16 280.7 268.16 280.69 268.16C280.18 268.15 279.74 267.83 279.57 267.35L269.28 238.04C269.16 237.71 268.85 237.49 268.5 237.49H261.49C261.04 237.49 260.67 237.86 260.67 238.31V240.5C260.67 240.59 260.69 240.69 260.72 240.78L275.87 282.95L275.84 283.02C272.27 292.18 269.99 294.97 266.11 294.97H263.02C262.57 294.97 262.2 295.34 262.2 295.79V303.22C262.2 303.67 262.57 304.04 263.02 304.04V304.03Z" fill="black"/>
 </svg>
diff --git a/contentcuration/contentcuration/frontend/shared/languageSwitcher/LanguageSwitcherModal.vue b/contentcuration/contentcuration/frontend/shared/languageSwitcher/LanguageSwitcherModal.vue
index 9eb3c03362..d3c8cfe83b 100644
--- a/contentcuration/contentcuration/frontend/shared/languageSwitcher/LanguageSwitcherModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/languageSwitcher/LanguageSwitcherModal.vue
@@ -19,7 +19,7 @@
           v-for="language in languageCol"
           :key="language.id"
           v-model="selectedLanguage"
-          :value="language.id"
+          :buttonValue="language.id"
           :label="language.lang_name"
           :title="language.english_name"
           class="language-name"
diff --git a/contentcuration/contentcuration/frontend/shared/layouts/ImmersiveModalLayout.vue b/contentcuration/contentcuration/frontend/shared/layouts/ImmersiveModalLayout.vue
index 89f53056a9..ef83b58e64 100644
--- a/contentcuration/contentcuration/frontend/shared/layouts/ImmersiveModalLayout.vue
+++ b/contentcuration/contentcuration/frontend/shared/layouts/ImmersiveModalLayout.vue
@@ -1,7 +1,7 @@
 <template>
 
   <VApp>
-    <VToolbar app dark color="primary">
+    <VToolbar app dark color="appBarDark">
       <VBtn v-if="backButton" flat :to="previousPage" exact>
         <Icon class="rtl-flip">
           arrow_back
diff --git a/contentcuration/contentcuration/frontend/shared/styles/vuetify.css b/contentcuration/contentcuration/frontend/shared/styles/vuetify.scss
similarity index 99%
rename from contentcuration/contentcuration/frontend/shared/styles/vuetify.css
rename to contentcuration/contentcuration/frontend/shared/styles/vuetify.scss
index e09117b03c..f10cadcd10 100644
--- a/contentcuration/contentcuration/frontend/shared/styles/vuetify.css
+++ b/contentcuration/contentcuration/frontend/shared/styles/vuetify.scss
@@ -1,4 +1,5 @@
 /* stylelint-disable */
+@import '~kolibri-design-system/lib/styles/definitions';
 
 /* Need a ! so that the following comment won't get removed during build process */
 
@@ -4541,9 +4542,8 @@ p {
   border-color: #424242;
 }
 .v-card {
+  @extend %dropshadow-2dp;
   text-decoration: none;
-  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14),
-    0 1px 5px 0 rgba(0, 0, 0, 0.12);
 }
 .v-card > :first-child:not(.v-btn):not(.v-chip) {
   border-top-left-radius: inherit;
@@ -4562,8 +4562,10 @@ p {
   transition-property: box-shadow;
 }
 .v-card--hover:hover {
-  box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14),
-    0 3px 14px 2px rgba(0, 0, 0, 0.12);
+  @extend %dropshadow-4dp;
+}
+.v-card--hover.v-card--flat:hover {
+  @extend %dropshadow-2dp;
 }
 .v-card__title {
   display: flex;
diff --git a/contentcuration/contentcuration/frontend/shared/utils/helpers.js b/contentcuration/contentcuration/frontend/shared/utils/helpers.js
index 59a33c817e..28b056cc3e 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/helpers.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/helpers.js
@@ -248,7 +248,7 @@ export async function generatePdf(
               context.fillRect(0, 0, canvas.width, canvas.height);
               const img = new Image();
               img.onload = function() {
-                context.drawImage(img, 0, 0);
+                context.drawImage(img, 0, 0, width, height);
                 doc.addImage(
                   canvas.toDataURL(),
                   'PNG',
diff --git a/contentcuration/contentcuration/frontend/shared/views/AppBar.vue b/contentcuration/contentcuration/frontend/shared/views/AppBar.vue
index f437e06e51..9563455463 100644
--- a/contentcuration/contentcuration/frontend/shared/views/AppBar.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/AppBar.vue
@@ -3,10 +3,9 @@
   <div>
     <VToolbar
       app
-      dark
       :clipped-left="!$isRTL"
       :clipped-right="$isRTL"
-      color="primary"
+      color="appBar"
       height="56"
       :tabs="Boolean($slots.tabs)"
     >
@@ -15,11 +14,14 @@
         v-else
         :href="homeLink"
         exact
-        color="white"
+        color="appBar"
         class="ma-0"
         style="border-radius: 8px;"
       >
-        <KolibriLogo />
+        <KLogo
+          altText="Kolibri Logo with background"
+          :size="36"
+        />
       </VToolbarSideIcon>
 
       <VToolbarTitle>
@@ -31,9 +33,17 @@
           <Menu>
             <template #activator="{ on }">
               <VBtn flat style="text-transform: none;" v-on="on">
-                <Icon>person</Icon>
+                <KIconButton
+                  disabled="true"
+                  icon="person"
+                  color="black"
+                />
                 <span class="mx-2 subheading">{{ user.first_name }}</span>
-                <Icon>arrow_drop_down</Icon>
+                <KIconButton
+                  disabled="true"
+                  icon="dropdown"
+                  color="black"
+                />
               </VBtn>
             </template>
             <VList>
@@ -124,7 +134,6 @@
 <script>
 
   import { mapActions, mapState, mapGetters } from 'vuex';
-  import KolibriLogo from './KolibriLogo';
   import Tabs from 'shared/views/Tabs';
   import MainNavigationDrawer from 'shared/views/MainNavigationDrawer';
   import LanguageSwitcherModal from 'shared/languageSwitcher/LanguageSwitcherModal';
@@ -132,7 +141,6 @@
   export default {
     name: 'AppBar',
     components: {
-      KolibriLogo,
       LanguageSwitcherModal,
       MainNavigationDrawer,
       Tabs,
diff --git a/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue b/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
index 14a4e3ee91..d37b2a92d0 100644
--- a/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
@@ -13,7 +13,7 @@
     <VCard style="overflow-y: auto;">
       <VToolbar
         :color="color"
-        dark
+        :dark="dark"
         fixed
         :extension-height="48"
         clipped-left
@@ -81,7 +81,11 @@
       },
       color: {
         type: String,
-        default: 'primary',
+        default: 'appBarDark',
+      },
+      dark: {
+        type: Boolean,
+        default: true,
       },
     },
     computed: {
diff --git a/contentcuration/contentcuration/frontend/shared/views/KolibriLogo.vue b/contentcuration/contentcuration/frontend/shared/views/KolibriLogo.vue
deleted file mode 100644
index 027f02561e..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/KolibriLogo.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-
-  <img
-    :height="`${height}px`"
-    width="auto"
-    :src="require('shared/images/kolibri-logo.svg')"
-  >
-
-</template>
-
-
-<script>
-
-  export default {
-    name: 'KolibriLogo',
-    props: {
-      height: {
-        type: Number,
-        default: 28,
-      },
-    },
-  };
-
-</script>
-
-
-<style lang="less" scoped>
-
-  img {
-    object-fit: contain;
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/LoadingText.vue b/contentcuration/contentcuration/frontend/shared/views/LoadingText.vue
index 6d65d0d400..070c1a22a0 100644
--- a/contentcuration/contentcuration/frontend/shared/views/LoadingText.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/LoadingText.vue
@@ -11,7 +11,7 @@
       <VProgressCircular
         :size="70"
         :width="7"
-        color="secondary"
+        color="loading"
         indeterminate
       />
     </VFlex>
diff --git a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
index 7f1843ccc5..c7e37daf97 100644
--- a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
@@ -8,9 +8,12 @@
       style="z-index: 1000;"
       :right="$isRTL"
     >
-      <VToolbar color="primary" dark>
+      <VToolbar :color="color">
         <VBtn flat icon :tabindex="handleclickTab" @click="drawer = false">
-          <Icon>clear</Icon>
+          <KIconButton
+            icon="clear"
+            color="black"
+          />
         </VBtn>
         <VToolbarTitle class="notranslate">
           Kolibri Studio
@@ -73,7 +76,11 @@
         </VListTile>
       </VList>
       <VContainer>
-        <KolibriLogo :height="75" />
+        <KLogo
+          altText="Kolibri logo"
+          :showBackground="true"
+          :size="88"
+        />
         <ActionLink
           :text="$tr('copyright', { year: new Date().getFullYear() })"
           href="https://learningequality.org/"
@@ -106,13 +113,11 @@
 <script>
 
   import { mapActions, mapState } from 'vuex';
-  import KolibriLogo from './KolibriLogo';
   import LanguageSwitcherModal from 'shared/languageSwitcher/LanguageSwitcherModal';
 
   export default {
     name: 'MainNavigationDrawer',
     components: {
-      KolibriLogo,
       LanguageSwitcherModal,
     },
     props: {
@@ -120,6 +125,10 @@
         type: Boolean,
         default: false,
       },
+      color: {
+        type: String,
+        default: 'appBar',
+      },
     },
     data() {
       return {
diff --git a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelCatalogFrontPage.vue b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelCatalogFrontPage.vue
index d2913adfe1..74a145f260 100644
--- a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelCatalogFrontPage.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelCatalogFrontPage.vue
@@ -2,7 +2,7 @@
 
   <div>
     <img
-      height="48"
+      height="99"
       width="148"
       :src="require('shared/images/le-logo.svg')"
     >
diff --git a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelDetailsModal.vue b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelDetailsModal.vue
index a67c060203..b86e7869eb 100644
--- a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelDetailsModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelDetailsModal.vue
@@ -2,7 +2,8 @@
 
   <FullscreenModal
     v-model="dialog"
-    color="black"
+    color="appBarDark"
+    :dark="true"
   >
     <template #header>
       <span class="notranslate">{{ channel ? channel.name : '' }}</span>
diff --git a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelModal.vue b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelModal.vue
index 50f66d3679..97646e7aca 100644
--- a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelModal.vue
@@ -20,7 +20,7 @@
     <VProgressLinear
       v-if="loading"
       indeterminate
-      color="primary"
+      color="loading"
       style="margin: 0;"
       height="5"
     />
diff --git a/contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue b/contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue
index 79e81962f5..8fcb5968be 100644
--- a/contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue
@@ -9,8 +9,8 @@
       wrap="soft"
       aria-hidden="true"
       :style="[dynamicHeightStyle, {
-        backgroundColor: $themePalette.grey.v_200,
-        border: $themePalette.grey.v_300,
+        backgroundColor: $themePalette.grey.v_50,
+        border: $themePalette.grey.v_100,
       }]"
     >
     </textarea>
diff --git a/contentcuration/contentcuration/frontend/shared/vuetify/theme.js b/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
index add22c47ef..47caf85a99 100644
--- a/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
+++ b/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
@@ -1,35 +1,34 @@
-import colors from 'vuetify/es5/util/colors';
-import { themeTokens } from 'kolibri-design-system/lib/styles/theme';
+import { themeBrand, themePalette, themeTokens } from 'kolibri-design-system/lib/styles/theme';
 
 export default function theme() {
+  const palette = themePalette();
+  const brand = themeBrand();
+  const tokens = themeTokens();
   return Object.assign(
     {
-      purple: '#996189',
-      primary: '#996189',
-      secondary: '#8DC5B6',
-      primaryBackground: colors.purple.lighten5,
-      backgroundColor: colors.grey.lighten5,
-      greyBackground: colors.grey.lighten3,
-      greyBorder: colors.grey.lighten1,
-      grey: colors.grey.darken1,
-      darkGrey: colors.grey.darken2,
-      greenSuccess: '#4db6ac',
-      topic: colors.grey.base,
-      video: '#283593',
-      image: '#283593', // IDK what this is supposed to be
-      audio: '#f06292',
-      document: '#ff3d00',
-      exercise: '#4db6ac',
-      h5p: '#ff8f00',
-      html5: '#ff8f00',
-      zim: '#ff8f00',
-      slideshow: '#4ece90',
-      channelHighlightDefault: colors.grey.lighten3,
-      draggableDropZone: '#dddddd',
-      draggableDropOverlay: '#996189',
-      greenHighlightBackground: '#E3F0ED',
-      roleVisibilityCoach: '#01a9f3',
+      loading: palette.black,
+      primaryBackground: brand.primary.v_200,
+      backgroundColor: palette.grey.v_50,
+      greyBackground: palette.grey.v_200,
+      greyBorder: palette.grey.v_400,
+      grey: palette.grey.v_600,
+      darkGrey: palette.grey.v_800,
+      greenSuccess: tokens.success,
+      topic: palette.grey.v_400,
+      video: tokens.watch,
+      audio: tokens.listen,
+      document: tokens.read,
+      exercise: tokens.practice,
+      h5p: tokens.explore,
+      html5: tokens.explore,
+      zim: tokens.explore,
+      slideshow: tokens.read,
+      channelHighlightDefault: palette.grey.v_200,
+      draggableDropZone: palette.grey.v_100,
+      draggableDropOverlay: brand.primary.v_400,
+      greenHighlightBackground: brand.secondary.v_200,
+      roleVisibilityCoach: palette.lightblue.v_1100,
     },
-    themeTokens()
+    tokens
   );
 }
diff --git a/contentcuration/contentcuration/static/img/kolibri-logo.png b/contentcuration/contentcuration/static/img/kolibri-logo.png
index 09b1ab2705..73412d1e52 100644
Binary files a/contentcuration/contentcuration/static/img/kolibri-logo.png and b/contentcuration/contentcuration/static/img/kolibri-logo.png differ
diff --git a/contentcuration/contentcuration/static/img/kolibri_placeholder.png b/contentcuration/contentcuration/static/img/kolibri_placeholder.png
index c12008541e..9bf559596d 100644
Binary files a/contentcuration/contentcuration/static/img/kolibri_placeholder.png and b/contentcuration/contentcuration/static/img/kolibri_placeholder.png differ
diff --git a/contentcuration/contentcuration/static/img/le-logo-web.png b/contentcuration/contentcuration/static/img/le-logo-web.png
index f58cfc662f..1acd9e204f 100644
Binary files a/contentcuration/contentcuration/static/img/le-logo-web.png and b/contentcuration/contentcuration/static/img/le-logo-web.png differ
diff --git a/contentcuration/contentcuration/static/img/logo.ico b/contentcuration/contentcuration/static/img/logo.ico
index 5752a1aee6..60bb82f49f 100644
Binary files a/contentcuration/contentcuration/static/img/logo.ico and b/contentcuration/contentcuration/static/img/logo.ico differ
diff --git a/contentcuration/contentcuration/templates/channel_list.html b/contentcuration/contentcuration/templates/channel_list.html
index 746e52f487..5f7cae13c7 100644
--- a/contentcuration/contentcuration/templates/channel_list.html
+++ b/contentcuration/contentcuration/templates/channel_list.html
@@ -31,7 +31,6 @@
 		var publicLanguages = JSON.parse({{ public_languages | safe }});
 		var publicLicenses = JSON.parse({{ public_licenses | safe }});
 		var publicKinds = JSON.parse({{ public_kinds | safe }});
-		var publicCollections = JSON.parse({{ public_collections | safe }});
 	</script>
 	{% render_bundle 'channel_list' 'js' %}
 
diff --git a/contentcuration/contentcuration/templates/channel_not_found.html b/contentcuration/contentcuration/templates/channel_not_found.html
index e671a9ce03..4321668f52 100644
--- a/contentcuration/contentcuration/templates/channel_not_found.html
+++ b/contentcuration/contentcuration/templates/channel_not_found.html
@@ -17,7 +17,7 @@
 {% block content %}
 <div class="message-page">
   <div class="pull-left message-img-wrapper">
-    <img class="message-logo" src="{% static 'img/kolibri_login.png' %}"/>
+    <img class="message-logo" src="{% static 'img/kolibri-logo.png' %}"/>
   </div>
   <div class="message-wrapper">
     <h2>{% translate "We're sorry, this channel was not found." %}</h2>
diff --git a/contentcuration/contentcuration/templates/registration/getting_started.html b/contentcuration/contentcuration/templates/registration/getting_started.html
index 19e88fe1fa..aca6cc9b3e 100644
--- a/contentcuration/contentcuration/templates/registration/getting_started.html
+++ b/contentcuration/contentcuration/templates/registration/getting_started.html
@@ -11,7 +11,7 @@
 <div class="login container-fluid">
 	<!-- Branding block -->
 	<div class="login-branding center-block text-center col-xs-7 container">
-			<div><img class="login-branding-kolibri-logo img-responsive" src="{% static 'img/kolibri_login.png' %}"/></div>
+			<div><img class="login-branding-kolibri-logo img-responsive" src="{% static 'img/kolibri-logo.png' %}"/></div>
 			<h1 class="login-branding-kolibri-title"><span dir="ltr">Kolibri Studio</span></h1>
 			<p class="login-branding-kolibri-subtitle">{% translate 'Content Curation Tools for Kolibri' %}</p>
 
diff --git a/contentcuration/contentcuration/templates/registration/password_reset_confirm.html b/contentcuration/contentcuration/templates/registration/password_reset_confirm.html
index 81c4523d4d..6adbb2d639 100644
--- a/contentcuration/contentcuration/templates/registration/password_reset_confirm.html
+++ b/contentcuration/contentcuration/templates/registration/password_reset_confirm.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="message-page">
 	<div class="pull-left message-img-wrapper">
-		<img class="message-logo" src="{% static 'img/kolibri_login.png' %}"/>
+		<img class="message-logo" src="{% static 'img/kolibri-logo.png' %}"/>
 	</div>
 	<div class="message-wrapper">
 		{% if validlink %}
diff --git a/contentcuration/contentcuration/templates/registration/password_reset_form.html b/contentcuration/contentcuration/templates/registration/password_reset_form.html
index edca3888d1..83d605cda5 100644
--- a/contentcuration/contentcuration/templates/registration/password_reset_form.html
+++ b/contentcuration/contentcuration/templates/registration/password_reset_form.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="message-page">
 	<div class="pull-left message-img-wrapper">
-		<img class="message-logo" src="{% static 'img/kolibri_login.png' %}"/>
+		<img class="message-logo" src="{% static 'img/kolibri-logo.png' %}"/>
 	</div>
 	<div class="message-wrapper">
 		<form method="post" action="/accounts/password/reset/">
diff --git a/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html b/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html
index 9347e39119..fdd1bee464 100644
--- a/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html
+++ b/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html
@@ -23,11 +23,15 @@
       }
 
       a {
-          text-decoration: none;
+          color: #4368f5;
+      }
+
+      a:hover {
+          color: #2547f3;
       }
 
       .message-header {
-          background-color: #915194;
+          background-color: #4368f5;
           color: white;
           margin-bottom: 40px;
       }
@@ -40,7 +44,7 @@
       }
 
       .message-content {
-          border: 3px solid #915194;
+          border: 3px solid #4368f5;
           background-color: white;
           margin: 0px auto;
           padding: 0px 20px 35px 20px;
diff --git a/contentcuration/contentcuration/templates/staging_not_found.html b/contentcuration/contentcuration/templates/staging_not_found.html
index d5e0b89ab8..ad55ead119 100644
--- a/contentcuration/contentcuration/templates/staging_not_found.html
+++ b/contentcuration/contentcuration/templates/staging_not_found.html
@@ -16,7 +16,7 @@
 {% block content %}
 <div class="message-page">
   <div class="pull-left message-img-wrapper">
-    <img class="message-logo" src="{% static 'img/kolibri_login.png' %}"/>
+    <img class="message-logo" src="{% static 'img/kolibri-logo.png' %}"/>
   </div>
   <div class="message-wrapper">
     <h2>{% translate "No updates to review." %}</h2>
diff --git a/contentcuration/contentcuration/templates/unauthorized.html b/contentcuration/contentcuration/templates/unauthorized.html
index 7ad502d65c..ce5251e8ef 100644
--- a/contentcuration/contentcuration/templates/unauthorized.html
+++ b/contentcuration/contentcuration/templates/unauthorized.html
@@ -16,7 +16,7 @@
 {% block content %}
 <div class="message-page">
   <div class="pull-left message-img-wrapper">
-    <img class="message-logo" src="{% static 'img/kolibri_login.png' %}"/>
+    <img class="message-logo" src="{% static 'img/kolibri-logo.png' %}"/>
   </div>
   <div class="message-wrapper">
     <h2>{% translate "You do not have access to this page." %}</h2>
diff --git a/contentcuration/contentcuration/views/base.py b/contentcuration/contentcuration/views/base.py
index 1f0eb999d4..f953e70e9b 100644
--- a/contentcuration/contentcuration/views/base.py
+++ b/contentcuration/contentcuration/views/base.py
@@ -263,23 +263,6 @@ def channel_list(request):
         kinds = list(public_kind_query)
         cache.set(PUBLIC_CHANNELS_CACHE_KEYS["kinds"], json_for_parse_from_data(kinds), None)
 
-    # Get public channel sets
-    collections = cache.get(PUBLIC_CHANNELS_CACHE_KEYS["collections"])
-    if collections is None:
-        public_channelset_query = ChannelSet.objects.filter(public=True).annotate(
-            count=SQCountDistinct(
-                Channel.objects.filter(
-                    secret_tokens=OuterRef("secret_token"),
-                    public=True,
-                    main_tree__published=True,
-                    deleted=False,
-                ).values_list("id", flat=True),
-                field="id",
-            )
-        )
-        cache.set(PUBLIC_CHANNELS_CACHE_KEYS["collections"], json_for_parse_from_serializer(
-            PublicChannelSetSerializer(public_channelset_query, many=True)), None)
-
     return render(
         request,
         "channel_list.html",
@@ -291,7 +274,6 @@ def channel_list(request):
             "public_languages": languages,
             "public_kinds": kinds,
             "public_licenses": licenses,
-            "public_collections": collections,
         },
     )
 
diff --git a/deploy/nginx.conf.jinja2 b/deploy/nginx.conf.jinja2
index 9f8aed7e7a..5dcc5862f9 100644
--- a/deploy/nginx.conf.jinja2
+++ b/deploy/nginx.conf.jinja2
@@ -19,41 +19,11 @@ http {
                       text/javascript
                       application/x-javascript
                       application/atom+xml;
+
     # Proxy upstream to the gunicorn process
     upstream studio {
         server 127.0.0.1:8081;
-    }
-
-    # Allow-list filter for content catalog paths
-    server {
-        listen 8080;
-        server_name catalog.learningequality.org;
-        location = / {
-            proxy_pass         http://studio;
-            proxy_redirect     off;
-            proxy_set_header   Host $host;
-        }
-        location /static/  {
-            autoindex on;
-            alias /app/contentworkshop_static/;
-            expires 4h;
-        }
-        location /content/ {
-            proxy_http_version 1.1;
-            proxy_pass         {{ $aws_s3_endpoint_url }}/{{ $aws_s3_bucket_name }}/;
-            proxy_set_header   Host $proxy_host;
-            proxy_set_header   Accept-Encoding Identity;
-            proxy_redirect     off;
-            gzip off;
-        }
-        location ~ ^/(api/catalog|stealthz|healthz|api/get_channel_details|jsreverse|i18n) {
-            proxy_pass         http://studio;
-            proxy_redirect     off;
-            proxy_set_header   Host $host;
-        }
-        location / {
-            deny all;
-        }
+        keepalive 5;
     }
 
     # Configuration for Nginx
@@ -80,17 +50,26 @@ http {
         # Proxy connections to django
         location / {
             proxy_pass         http://studio;
-            proxy_redirect     off;
             proxy_set_header   Host $host;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_read_timeout 100s;
+            proxy_redirect     off;
+            proxy_cache        off;
         }
 
         location /content/ {
+            limit_except GET HEAD OPTIONS {
+                deny all;
+            }
             proxy_http_version 1.1;
             proxy_pass         {{ $aws_s3_endpoint_url }}/{{ $aws_s3_bucket_name }}/;
             proxy_set_header   Host $proxy_host;
             proxy_set_header   Accept-Encoding Identity;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_redirect     off;
+            proxy_buffering    off;
+            proxy_cache        off;
+            proxy_read_timeout 100s;
             gzip off;
         }
 
diff --git a/jest_config/jest.conf.js b/jest_config/jest.conf.js
index 88a490ebb2..d7d1848fa8 100644
--- a/jest_config/jest.conf.js
+++ b/jest_config/jest.conf.js
@@ -7,7 +7,7 @@ module.exports = {
   moduleFileExtensions: ['js', 'json', 'vue'],
   modulePaths: [frontendDir],
   moduleNameMapper: {
-    '\\.(css|less|styl)$': 'identity-obj-proxy',
+    '\\.(css|scss|less|styl)$': 'identity-obj-proxy',
     '^frontend/(.*)': '<rootDir>/contentcuration/contentcuration/frontend/$1',
     '^static/(.*)': '<rootDir>/contentcuration/contentcuration/static/$1',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': path.resolve(
diff --git a/package.json b/package.json
index 497b3f54b1..a3403bc5af 100644
--- a/package.json
+++ b/package.json
@@ -71,8 +71,8 @@
     "jquery": "^2.2.4",
     "jspdf": "https://github.com/parallax/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e",
     "jszip": "^3.10.1",
-    "kolibri-constants": "^0.1.41",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#e9a2ff34716bb6412fe99f835ded5b17345bab94",
+    "kolibri-constants": "^0.2.0",
+    "kolibri-design-system": "^4.2.0",
     "lodash": "^4.17.21",
     "material-icons": "0.3.1",
     "mutex-js": "^1.1.5",
@@ -117,8 +117,8 @@
     "npm-run-all": "^4.1.3",
     "stylus": "^0.59.0",
     "stylus-loader": "^7.1.3",
-    "workbox-webpack-plugin": "^7.0.0",
-    "web-streams-polyfill": "^3.2.1"
+    "web-streams-polyfill": "^3.2.1",
+    "workbox-webpack-plugin": "^7.0.0"
   },
   "false": {},
   "peerDependencies": {},
diff --git a/yarn.lock b/yarn.lock
index 57bf596870..43b0b5fda5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3012,6 +3012,11 @@
   optionalDependencies:
     prettier "^1.18.2 || ^2.0.0"
 
+"@vue/composition-api@1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-1.7.2.tgz#0b656f3ec39fefc2cf40aaa8c12426bcfeae1b44"
+  integrity sha512-M8jm9J/laYrYT02665HkZ5l2fWTK4dcVg3BsDHm/pfz+MjDYwX+9FUaZyGwEyXEDonQYRCo0H7aLgdklcIELjw==
+
 "@vue/test-utils@1.0.0-beta.29":
   version "1.0.0-beta.29"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.29.tgz#c942cf25e891cf081b6a03332b4ae1ef430726f0"
@@ -3659,7 +3664,7 @@ autoprefixer@^9.6.1:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
-autosize@^3.0.20, autosize@^3.0.21:
+autosize@3.0.21:
   version "3.0.21"
   resolved "https://registry.yarnpkg.com/autosize/-/autosize-3.0.21.tgz#f182f40d17757d978a139a4c9ca40c4c0e448603"
   integrity sha512-xGFj5jTV4up6+fxRwtnAWiCIx/5N0tEnFn5rdhAkK1Lq2mliLMuGJgP5Bf4phck3sHGYrVKpYwugfJ61MSz9nA==
@@ -4824,10 +4829,10 @@ css-declaration-sorter@^6.3.1:
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad"
   integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==
 
-css-element-queries@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.2.3.tgz#e14940b1fcd4bf0da60ea4145d05742d7172e516"
-  integrity sha512-QK9uovYmKTsV2GXWQiMOByVNrLn2qz6m3P7vWpOR4IdD6I3iXoDw5qtgJEN3Xq7gIbdHVKvzHjdAtcl+4Arc4Q==
+css-element-queries@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.2.0.tgz#081373d7f30302adad46b7c29b83b85f8ef8f62c"
+  integrity sha512-4gaxpioSFueMcp9yj1TJFCLjfooGv38y6ZdwFUS3GuS+9NIVijdeiExXKwSIHoQDADfpgnaYSTzmJs+bV+Hehg==
 
 css-functions-list@^3.1.0:
   version "3.1.0"
@@ -5054,6 +5059,11 @@ data-urls@^3.0.2:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^11.0.0"
 
+date-fns@1.30.1:
+  version "1.30.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
+  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -5126,11 +5136,6 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^2.0.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
-  integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
-
 deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
@@ -6478,7 +6483,7 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-frame-throttle@^3.0.0:
+frame-throttle@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/frame-throttle/-/frame-throttle-3.0.0.tgz#a666e007c10af6239909cf73871be09a7ea1c6d1"
   integrity sha512-ENBi8VP95xoHf8JpxPwEaCdZneOrtxl0U2H5p2oS896u3NzriR9kRcylvJ+FcCW3qZfZFJ5TDeOT5LbENndBnQ==
@@ -6545,7 +6550,7 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-fuzzysearch@^1.0.3:
+fuzzysearch@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/fuzzysearch/-/fuzzysearch-1.0.3.tgz#dffc80f6d6b04223f2226aa79dd194231096d008"
   integrity sha512-s+kNWQuI3mo9OALw0HJ6YGmMbLqEufCh2nX/zzV5CrICQ/y4AwPxM+6TIiF9ItFCHXFCyM/BfCCmN57NTIJuPg==
@@ -8980,17 +8985,6 @@ jszip@^3.7.1:
     readable-stream "~2.3.6"
     setimmediate "^1.0.5"
 
-keen-ui@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/keen-ui/-/keen-ui-1.3.2.tgz#252cab973282d4cd477c45ac92015595d1b1fff1"
-  integrity sha512-WlyNRB8+ei47n87Om973HXUzLqL+Ili7hcNkG6gar/Jqfykpghgx+eSy2vyRq7oEBO2dGr0QgZ3A9eXq/eP14Q==
-  dependencies:
-    autosize "^3.0.20"
-    deepmerge "^2.0.1"
-    fuzzysearch "^1.0.3"
-    lodash.debounce "^4.0.8"
-    tippy.js "^4.2.1"
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -9030,25 +9024,29 @@ known-css-properties@^0.25.0:
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.25.0.tgz#6ebc4d4b412f602e5cfbeb4086bd544e34c0a776"
   integrity sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==
 
-kolibri-constants@^0.1.41:
-  version "0.1.42"
-  resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.1.42.tgz#2f62a8d8b8894e5cfbd47ee6564b31018818c93f"
-  integrity sha512-2hUxYnzUEfhLFJO9egVSwYW8/PKob9wLeDYfB74mtIzgQ4zy6huRj3574WetK9gREi+W1Jcm7HGPsfZIFzFvrA==
+kolibri-constants@^0.2.0:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.5.tgz#2b9df4c477119d0ade2d66bf8aef8a4172f0418f"
+  integrity sha512-ZoFZ83xgteZhFZtYjiOmITcZeSF+X42i12TOo87zmcdA78jj0dZbPYB+ttO855UxoKY8h4HHeDVZIUkE5TGa5g==
 
-"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#e9a2ff34716bb6412fe99f835ded5b17345bab94":
-  version "1.3.0"
-  resolved "https://github.com/learningequality/kolibri-design-system#e9a2ff34716bb6412fe99f835ded5b17345bab94"
+kolibri-design-system@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-4.2.0.tgz#7ef5355ecfd330893e4f9b37ec2bcad6b4cd9e56"
+  integrity sha512-50lkYsPIx0zfrbAwsEC5QPMJcpmZGmne8BhFVtgcWS4xEn6Uc6BefHQAxqZriomnLRd5otAP3XwFkrkycly0fA==
   dependencies:
+    "@vue/composition-api" "1.7.2"
     aphrodite "https://github.com/learningequality/aphrodite/"
-    autosize "^3.0.21"
-    css-element-queries "^1.2.0"
-    frame-throttle "^3.0.0"
-    fuzzysearch "^1.0.3"
-    keen-ui "^1.3.0"
-    lodash "^4.17.15"
-    popper.js "^1.14.6"
-    purecss "^0.6.2"
-    tippy.js "^4.2.1"
+    autosize "3.0.21"
+    css-element-queries "1.2.0"
+    date-fns "1.30.1"
+    frame-throttle "3.0.0"
+    fuzzysearch "1.0.3"
+    lodash "4.17.21"
+    popper.js "1.16.1"
+    purecss "2.2.0"
+    tippy.js "4.2.1"
+    vue-intl "3.1.0"
+    xstate "4.38.3"
 
 kolibri-tools@0.16.0-dev.3:
   version "0.16.0-dev.3"
@@ -10524,7 +10522,7 @@ pngjs@^3.0.0, pngjs@^3.3.3:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
-popper.js@^1.14.6, popper.js@^1.14.7:
+popper.js@1.16.1, popper.js@^1.14.7:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
@@ -11016,10 +11014,10 @@ pure-rand@^6.0.0:
   resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306"
   integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
 
-purecss@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/purecss/-/purecss-0.6.2.tgz#f0827d227e909543c5138f36d56c8c613f476b8c"
-  integrity sha512-6BZF+rr9UAy8xwWDW6mi//2TnImxqMAjfLTYCO80OzPcavSI3DMjnD4fY92383KB5FA+gEHO/ug46q/yeitu9w==
+purecss@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/purecss/-/purecss-2.2.0.tgz#71249802e1babd562b236cf5d0b75b16f158a421"
+  integrity sha512-jEPrAALLgE+InDARWdPDt0AkZ1Bi0yXxHj4BOwWImq06sGIDe5CagPyS6Z9WGyEgMuZonrrhinInJ80nAHTIUA==
 
 qs@6.10.3:
   version "6.10.3"
@@ -12257,7 +12255,16 @@ string-trim-spaces-only@^3.1.0:
   dependencies:
     "@babel/runtime" "^7.14.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12375,7 +12382,14 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -12844,10 +12858,10 @@ tinycolor2@^1.4.1:
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
   integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==
 
-tippy.js@^4.2.1:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.5.tgz#882bff8d92f09bb0546d2826d5668c0560006f54"
-  integrity sha512-NDq3efte8nGK6BOJ1dDN1/WelAwfmh3UtIYXXck6+SxLzbIQNZE/cmRSnwScZ/FyiKdIcvFHvYUgqmoGx8CcyA==
+tippy.js@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.2.1.tgz#9e4939d976465f77229b05a3cb233b5dc28cf850"
+  integrity sha512-xEE7zYNgQxCDdPcuT6T04f0frPh0wO7CcIqJKMFazU/NqusyjCgYSkLRosIHoiRkZMRzSPOudC8wRN5GjvAyOQ==
   dependencies:
     popper.js "^1.14.7"
 
@@ -13403,7 +13417,7 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
-vue-intl@^3.0.0:
+vue-intl@3.1.0, vue-intl@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/vue-intl/-/vue-intl-3.1.0.tgz#707f1f7406595c9b4afc6049254b333093be37be"
   integrity sha512-0v3S5gspuYnt6j1G+KLfPUsNnjRdbMOcYrWYoSd1gYk6rX8VuOyh7NLztPrSIJt+NLs/qzLOZXxI1LORukEiqA==
@@ -13980,8 +13994,7 @@ workbox-window@7.0.0, workbox-window@^7.0.0:
     "@types/trusted-types" "^2.0.2"
     workbox-core "7.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -13999,6 +14012,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -14106,6 +14128,11 @@ xmldom@^0.1.22:
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
   integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
 
+xstate@4.38.3:
+  version "4.38.3"
+  resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.38.3.tgz#4e15e7ad3aa0ca1eea2010548a5379966d8f1075"
+  integrity sha512-SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw==
+
 xtend@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"