diff --git a/.deepsource.toml b/.deepsource.toml
new file mode 100644
index 0000000000..133b3d6963
--- /dev/null
+++ b/.deepsource.toml
@@ -0,0 +1,15 @@
+version = 1
+
+[[analyzers]]
+name = "javascript"
+enabled = true
+
+  [analyzers.meta]
+  plugins = ["vue"]
+
+[[analyzers]]
+name = "python"
+enabled = true
+
+  [analyzers.meta]
+  runtime_version = "3.x.x"
diff --git a/.github/workflows/frontendlint.yml b/.github/workflows/frontendlint.yml
index 589dc66380..51e2759020 100644
--- a/.github/workflows/frontendlint.yml
+++ b/.github/workflows/frontendlint.yml
@@ -38,4 +38,22 @@ jobs:
         yarn --frozen-lockfile
         npm rebuild node-sass
     - name: Run tests
-      run: yarn run lint-all
+      run: yarn run lint-all:fix
+    - name: Check for modified files
+      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository
+      id: git-check
+      run: echo ::set-output name=modified::$(git diff-index --name-only HEAD)
+    - uses: tibdex/github-app-token@v1
+      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository && steps.git-check.outputs.modified != ''
+      id: generate-token
+      with:
+        app_id: ${{ secrets.CODE_FIX_APP_ID }}
+        private_key: ${{ secrets.CODE_FIX_APP_PRIVATE_KEY }}
+    - name: Push changes
+      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository && steps.git-check.outputs.modified != ''
+      run: |
+        git config --global user.name 'Learning Equality'
+        git config --global user.email 'dev@learningequality.org'
+        git remote set-url origin https://x-access-token:${{ steps.generate-token.outputs.token }}@github.com/${{ github.repository }}
+        git commit -am "Frontend linting of ${{ steps.git-check.outputs.modified }}"
+        git push
diff --git a/contentcuration/contentcuration/db/models/manager.py b/contentcuration/contentcuration/db/models/manager.py
index 602ea24b75..12488dce9f 100644
--- a/contentcuration/contentcuration/db/models/manager.py
+++ b/contentcuration/contentcuration/db/models/manager.py
@@ -394,35 +394,34 @@ def _copy(
             if progress_tracker:
                 progress_tracker.increment(len(copied_nodes))
             return copied_nodes
-        else:
-            node_copy = self._shallow_copy(
-                node,
-                target,
-                position,
+        node_copy = self._shallow_copy(
+            node,
+            target,
+            position,
+            source_channel_id,
+            pk,
+            mods,
+            can_edit_source_channel,
+        )
+        if progress_tracker:
+            progress_tracker.increment()
+        children = node.get_children().order_by("lft")
+        if excluded_descendants:
+            children = children.exclude(node_id__in=excluded_descendants.keys())
+        for child in children:
+            self._copy(
+                child,
+                node_copy,
+                "last-child",
                 source_channel_id,
-                pk,
-                mods,
+                None,
+                None,
+                excluded_descendants,
                 can_edit_source_channel,
+                batch_size,
+                progress_tracker=progress_tracker,
             )
-            if progress_tracker:
-                progress_tracker.increment()
-            children = node.get_children().order_by("lft")
-            if excluded_descendants:
-                children = children.exclude(node_id__in=excluded_descendants.keys())
-            for child in children:
-                self._copy(
-                    child,
-                    node_copy,
-                    "last-child",
-                    source_channel_id,
-                    None,
-                    None,
-                    excluded_descendants,
-                    can_edit_source_channel,
-                    batch_size,
-                    progress_tracker=progress_tracker,
-                )
-            return [node_copy]
+        return [node_copy]
 
     def _copy_tags(self, source_copy_id_map):
         from contentcuration.models import ContentTag
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
index 6e590d4142..aab2c0be9e 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
@@ -20,7 +20,9 @@
         <Banner :value="!valid" error class="mb-4">
           {{ registrationFailed ? $tr('registrationFailed') : $tr('errorsMessage') }}
         </Banner>
-
+        <Banner :value="offline" error class="mb-4">
+          {{ $tr('registrationFailedOffline') }}
+        </Banner>
         <!-- Basic information -->
         <h1 class="font-weight-bold my-2 subheading">
           {{ $tr('basicInformationHeader') }}
@@ -157,7 +159,7 @@
         <p class="mb-4">
           {{ $tr('contactMessage') }}
         </p>
-        <VBtn color="primary" large type="submit">
+        <VBtn color="primary" large :disabled="offline" type="submit">
           {{ $tr('finishButton') }}
         </VBtn>
       </VForm>
@@ -171,7 +173,7 @@
 
 <script>
 
-  import { mapActions, mapGetters } from 'vuex';
+  import { mapActions, mapGetters, mapState } from 'vuex';
   import { uses, sources } from '../constants';
   import TextField from 'shared/views/form/TextField';
   import EmailField from 'shared/views/form/EmailField';
@@ -222,6 +224,9 @@
       };
     },
     computed: {
+      ...mapState({
+        offline: state => !state.connection.online,
+      }),
       ...mapGetters('policies', ['getPolicyAcceptedData']),
       passwordConfirmRules() {
         return [value => (this.form.password1 === value ? true : this.$tr('passwordMatchMessage'))];
@@ -410,7 +415,9 @@
               this.$router.push({ name: 'ActivationSent' });
             })
             .catch(error => {
-              if (error.response.status === 403) {
+              if (error.message === 'Network Error') {
+                this.$refs.top.scrollIntoView({ behavior: 'smooth' });
+              } else if (error.response.status === 403) {
                 this.emailErrors = [this.$tr('emailExistsMessage')];
               } else if (error.response.status === 405) {
                 this.$router.push({ name: 'AccountNotActivated' });
@@ -431,6 +438,8 @@
       fieldRequiredMessage: 'Field is required',
       errorsMessage: 'Please fix the errors below',
       registrationFailed: 'There was an error registering your account. Please try again',
+      registrationFailedOffline:
+        'You seem to be offline. Please connect to the internet to create an account.',
 
       // Basic information strings
       basicInformationHeader: 'Basic information',
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index 5ec186d1a2..c15a96fca1 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
@@ -6,6 +6,9 @@
       justify-center
       class="main pt-5"
     >
+      <h3 class="corner">
+        <OfflineText indicator />
+      </h3>
       <div>
         <!-- Sign in -->
         <VCard class="pa-4" style="width: 300px;margin: 0 auto;">
@@ -20,6 +23,7 @@
             {{ $tr('kolibriStudio') }}
           </h2>
           <Banner :value="loginFailed" :text="$tr('loginFailed')" error />
+          <Banner :value="offline" :text="$tr('loginFailedOffline')" error />
           <Banner
             :value="Boolean(nextParam)"
             :text="$tr('loginToProceed')"
@@ -32,7 +36,7 @@
             <p>
               <ActionLink :to="{ name: 'ForgotPassword' }" :text="$tr('forgotPasswordLink')" />
             </p>
-            <VBtn block color="primary" large type="submit" :disabled="busy">
+            <VBtn block color="primary" large type="submit" :disabled="offline || busy">
               {{ $tr('signInButton') }}
             </VBtn>
             <VBtn block flat color="primary" class="mt-2" :to="{ name: 'Create' }">
@@ -79,13 +83,14 @@
 
 <script>
 
-  import { mapActions } from 'vuex';
+  import { mapActions, mapState } from 'vuex';
   import EmailField from 'shared/views/form/EmailField';
   import PasswordField from 'shared/views/form/PasswordField';
   import Banner from 'shared/views/Banner';
   import PolicyModals from 'shared/views/policies/PolicyModals';
   import { policies } from 'shared/constants';
   import LanguageSwitcherList from 'shared/languageSwitcher/LanguageSwitcherList';
+  import OfflineText from 'shared/views/OfflineText';
 
   export default {
     name: 'Main',
@@ -95,6 +100,7 @@
       LanguageSwitcherList,
       PasswordField,
       PolicyModals,
+      OfflineText,
     },
     data() {
       return {
@@ -102,9 +108,13 @@
         password: '',
         loginFailed: false,
         busy: false,
+        loginFailedOffline: false,
       };
     },
     computed: {
+      ...mapState({
+        offline: state => !state.connection.online,
+      }),
       nextParam() {
         const params = new URLSearchParams(window.location.search.substring(1));
         return params.get('next');
@@ -128,14 +138,19 @@
           };
           return this.login(credentials)
             .then(() => {
+              this.loginFailedOffline = false;
+              this.loginFailed = false;
               window.location.assign(this.nextParam || window.Urls.channels());
             })
             .catch(err => {
               this.busy = false;
-              if (err.response.status === 405) {
+              if (err.message === 'Network Error') {
+                this.loginFailedOffline = true;
+              } else if (err.response.status === 405) {
                 this.$router.push({ name: 'AccountNotActivated' });
+              } else {
+                this.loginFailed = true;
               }
-              this.loginFailed = true;
             });
         }
         return Promise.resolve();
@@ -153,6 +168,8 @@
       TOSLink: 'Terms of service',
       copyright: '© {year} Learning Equality',
       loginToProceed: 'You must sign in to view that page',
+      loginFailedOffline:
+        'You seem to be offline. Please connect to the internet before signing in.',
     },
   };
 
@@ -174,4 +191,10 @@
     content: '•';
   }
 
+  .corner {
+    position: absolute;
+    top: 1em;
+    left: 1em;
+  }
+
 </style>
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js
index 60d73418a6..dc9f24df06 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js
+++ b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js
@@ -3,6 +3,16 @@ import router from '../../router';
 import { uses, sources } from '../../constants';
 import Create from '../Create';
 
+const connectionStateMocks = {
+  $store: {
+    state: {
+      connection: {
+        offline: true,
+      },
+    },
+  },
+};
+
 const defaultData = {
   first_name: 'Test',
   last_name: 'User',
@@ -34,6 +44,7 @@ function makeWrapper(formData) {
       },
     },
     stubs: ['PolicyModals'],
+    mocks: connectionStateMocks,
   });
   wrapper.setData({
     form: {
@@ -87,7 +98,7 @@ describe('create', () => {
   });
   it('should automatically fill the email if provided in the query param', () => {
     router.push({ name: 'Create', query: { email: 'newtest@test.com' } });
-    let wrapper = mount(Create, { router, stubs: ['PolicyModals'] });
+    let wrapper = mount(Create, { router, stubs: ['PolicyModals'], mocks: connectionStateMocks });
     expect(wrapper.vm.form.email).toBe('newtest@test.com');
   });
   describe('validation', () => {
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/main.spec.js b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/main.spec.js
index 880e7a0aa1..dc57ccf210 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/main.spec.js
+++ b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/main.spec.js
@@ -8,6 +8,15 @@ function makeWrapper() {
   let wrapper = mount(Main, {
     router,
     stubs: ['GlobalSnackbar', 'PolicyModals'],
+    mocks: {
+      $store: {
+        state: {
+          connection: {
+            online: true,
+          },
+        },
+      },
+    },
   });
   wrapper.setMethods({
     login: data => {
diff --git a/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js b/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js
index cfc4ca55d4..715e7ce2df 100644
--- a/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js
+++ b/contentcuration/contentcuration/frontend/shared/leUtils/ContentKinds.js
@@ -8,6 +8,7 @@ const ContentKinds = new Set([
   'slideshow',
   'topic',
   'video',
+  'zim',
 ]);
 
 export default ContentKinds;
@@ -23,4 +24,5 @@ export const ContentKindsNames = {
   SLIDESHOW: 'slideshow',
   TOPIC: 'topic',
   VIDEO: 'video',
+  ZIM: 'zim',
 };
diff --git a/contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js b/contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js
index 76da1e6f7a..b7e165b0e2 100644
--- a/contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js
+++ b/contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js
@@ -16,6 +16,22 @@ const FormatPresetsMap = new Map([
       associated_mimetypes: ['.mp3'],
     },
   ],
+  [
+    'audio_dependency',
+    {
+      id: 'audio_dependency',
+      readable_name: 'Audio',
+      multi_language: false,
+      supplementary: false,
+      thumbnail: false,
+      subtitle: false,
+      display: false,
+      order: 3,
+      kind_id: 'audio',
+      allowed_formats: ['mp3'],
+      associated_mimetypes: ['.mp3'],
+    },
+  ],
   [
     'audio_thumbnail',
     {
@@ -125,7 +141,7 @@ const FormatPresetsMap = new Map([
       order: 4,
       kind_id: 'exercise',
       allowed_formats: ['svg', 'json', 'graphie'],
-      associated_mimetypes: ['.graphie', 'image/svg', 'application/json'],
+      associated_mimetypes: ['image/svg', '.graphie', 'application/json'],
     },
   ],
   [
@@ -141,7 +157,7 @@ const FormatPresetsMap = new Map([
       order: 3,
       kind_id: 'exercise',
       allowed_formats: ['png', 'jpg', 'jpeg', 'gif', 'svg'],
-      associated_mimetypes: ['image/jpeg', 'image/png', 'image/gif', 'image/svg'],
+      associated_mimetypes: ['image/svg', 'image/gif', 'image/jpeg', 'image/png'],
     },
   ],
   [
@@ -214,7 +230,7 @@ const FormatPresetsMap = new Map([
       id: 'html5_dependency',
       readable_name: 'HTML5 Zip Dependency',
       multi_language: false,
-      supplementary: true,
+      supplementary: false,
       thumbnail: false,
       subtitle: false,
       display: false,
@@ -272,6 +288,38 @@ const FormatPresetsMap = new Map([
       associated_mimetypes: ['video/webm', 'video/mp4'],
     },
   ],
+  [
+    'qti',
+    {
+      id: 'qti',
+      readable_name: 'QTI',
+      multi_language: false,
+      supplementary: false,
+      thumbnail: false,
+      subtitle: false,
+      display: false,
+      order: 1,
+      kind_id: 'exercise',
+      allowed_formats: ['zip'],
+      associated_mimetypes: ['.zip'],
+    },
+  ],
+  [
+    'qti_thumbnail',
+    {
+      id: 'qti_thumbnail',
+      readable_name: 'QTI Thumbnail',
+      multi_language: false,
+      supplementary: true,
+      thumbnail: true,
+      subtitle: false,
+      display: true,
+      order: 2,
+      kind_id: 'exercise',
+      allowed_formats: ['png', 'jpg', 'jpeg'],
+      associated_mimetypes: ['image/jpeg', 'image/png'],
+    },
+  ],
   [
     'slideshow_image',
     {
@@ -342,7 +390,7 @@ const FormatPresetsMap = new Map([
       id: 'video_dependency',
       readable_name: 'Video Dependency',
       multi_language: false,
-      supplementary: true,
+      supplementary: false,
       thumbnail: false,
       subtitle: false,
       display: false,
@@ -384,6 +432,38 @@ const FormatPresetsMap = new Map([
       associated_mimetypes: ['image/jpeg', 'image/png'],
     },
   ],
+  [
+    'zim',
+    {
+      id: 'zim',
+      readable_name: 'Zim',
+      multi_language: false,
+      supplementary: false,
+      thumbnail: false,
+      subtitle: false,
+      display: false,
+      order: 1,
+      kind_id: 'zim',
+      allowed_formats: ['zim'],
+      associated_mimetypes: ['.zim'],
+    },
+  ],
+  [
+    'zim_thumbnail',
+    {
+      id: 'zim_thumbnail',
+      readable_name: 'Zim Thumbnail',
+      multi_language: false,
+      supplementary: true,
+      thumbnail: true,
+      subtitle: false,
+      display: true,
+      order: 2,
+      kind_id: 'zim',
+      allowed_formats: ['png', 'jpg', 'jpeg'],
+      associated_mimetypes: ['image/jpeg', 'image/png'],
+    },
+  ],
 ]);
 
 export default FormatPresetsMap;
@@ -392,6 +472,7 @@ export const FormatPresetsList = Array.from(FormatPresetsMap.values());
 
 export const FormatPresetsNames = {
   AUDIO: 'audio',
+  AUDIO_DEPENDENCY: 'audio_dependency',
   AUDIO_THUMBNAIL: 'audio_thumbnail',
   CHANNEL_THUMBNAIL: 'channel_thumbnail',
   DOCUMENT: 'document',
@@ -408,6 +489,8 @@ export const FormatPresetsNames = {
   HTML5_THUMBNAIL: 'html5_thumbnail',
   HTML5_ZIP: 'html5_zip',
   LOW_RES_VIDEO: 'low_res_video',
+  QTI: 'qti',
+  QTI_THUMBNAIL: 'qti_thumbnail',
   SLIDESHOW_IMAGE: 'slideshow_image',
   SLIDESHOW_MANIFEST: 'slideshow_manifest',
   SLIDESHOW_THUMBNAIL: 'slideshow_thumbnail',
@@ -415,4 +498,6 @@ export const FormatPresetsNames = {
   VIDEO_DEPENDENCY: 'video_dependency',
   VIDEO_SUBTITLE: 'video_subtitle',
   VIDEO_THUMBNAIL: 'video_thumbnail',
+  ZIM: 'zim',
+  ZIM_THUMBNAIL: 'zim_thumbnail',
 };
diff --git a/contentcuration/contentcuration/frontend/shared/leUtils/Licenses.js b/contentcuration/contentcuration/frontend/shared/leUtils/Licenses.js
index d0580ca210..3e47089c50 100644
--- a/contentcuration/contentcuration/frontend/shared/leUtils/Licenses.js
+++ b/contentcuration/contentcuration/frontend/shared/leUtils/Licenses.js
@@ -7,8 +7,7 @@ const LicensesMap = new Map([
       license_name: 'CC BY',
       exists: true,
       license_url: 'https://creativecommons.org/licenses/by/4.0/',
-      license_description:
-        'The Attribution License lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials.',
+      license_description: '',
       copyright_holder_required: true,
       is_custom: false,
     },
@@ -20,8 +19,7 @@ const LicensesMap = new Map([
       license_name: 'CC BY-SA',
       exists: true,
       license_url: 'https://creativecommons.org/licenses/by-sa/4.0/',
-      license_description:
-        'The Attribution-ShareAlike License lets others remix, tweak, and build upon your work even for commercial purposes, as long as they credit you and license their new creations under the identical terms. This license is often compared to "copyleft" free and open source software licenses. All new works based on yours will carry the same license, so any derivatives will also allow commercial use. This is the license used by Wikipedia, and is recommended for materials that would benefit from incorporating content from Wikipedia and similarly licensed projects.',
+      license_description: '',
       copyright_holder_required: true,
       is_custom: false,
     },
@@ -33,8 +31,7 @@ const LicensesMap = new Map([
       license_name: 'CC BY-ND',
       exists: true,
       license_url: 'https://creativecommons.org/licenses/by-nd/4.0/',
-      license_description:
-        'The Attribution-NoDerivs License allows for redistribution, commercial and non-commercial, as long as it is passed along unchanged and in whole, with credit to you.',
+      license_description: '',
       copyright_holder_required: true,
       is_custom: false,
     },
@@ -46,8 +43,7 @@ const LicensesMap = new Map([
       license_name: 'CC BY-NC',
       exists: true,
       license_url: 'https://creativecommons.org/licenses/by-nc/4.0/',
-      license_description:
-        "The Attribution-NonCommercial License lets others remix, tweak, and build upon your work non-commercially, and although their new works must also acknowledge you and be non-commercial, they don't have to license their derivative works on the same terms.",
+      license_description: '',
       copyright_holder_required: true,
       is_custom: false,
     },
@@ -59,8 +55,7 @@ const LicensesMap = new Map([
       license_name: 'CC BY-NC-SA',
       exists: true,
       license_url: 'https://creativecommons.org/licenses/by-nc-sa/4.0/',
-      license_description:
-        'The Attribution-NonCommercial-ShareAlike License lets others remix, tweak, and build upon your work non-commercially, as long as they credit you and license their new creations under the identical terms.',
+      license_description: '',
       copyright_holder_required: true,
       is_custom: false,
     },
@@ -72,8 +67,7 @@ const LicensesMap = new Map([
       license_name: 'CC BY-NC-ND',
       exists: true,
       license_url: 'https://creativecommons.org/licenses/by-nc-nd/4.0/',
-      license_description:
-        "The Attribution-NonCommercial-NoDerivs License is the most restrictive of our six main licenses, only allowing others to download your works and share them with others as long as they credit you, but they can't change them in any way or use them commercially.",
+      license_description: '',
       copyright_holder_required: true,
       is_custom: false,
     },
@@ -85,8 +79,7 @@ const LicensesMap = new Map([
       license_name: 'All Rights Reserved',
       exists: true,
       license_url: 'http://www.allrights-reserved.com/',
-      license_description:
-        'The All Rights Reserved License indicates that the copyright holder reserves, or holds for their own use, all the rights provided by copyright law under one specific copyright treaty.',
+      license_description: '',
       copyright_holder_required: true,
       is_custom: false,
     },
@@ -98,8 +91,7 @@ const LicensesMap = new Map([
       license_name: 'Public Domain',
       exists: true,
       license_url: 'https://creativecommons.org/publicdomain/mark/1.0/',
-      license_description:
-        'Public Domain work has been identified as being free of known restrictions under copyright law, including all related and neighboring rights.',
+      license_description: '',
       copyright_holder_required: false,
       is_custom: false,
     },
@@ -111,8 +103,7 @@ const LicensesMap = new Map([
       license_name: 'Special Permissions',
       exists: false,
       license_url: '',
-      license_description:
-        'Special Permissions is a custom license to use when the current licenses do not apply to the content. The owner of this license is responsible for creating a description of what this license entails.',
+      license_description: '',
       copyright_holder_required: true,
       is_custom: true,
     },
diff --git a/contentcuration/contentcuration/frontend/shared/views/OfflineText.vue b/contentcuration/contentcuration/frontend/shared/views/OfflineText.vue
index 2dbcb8b8e2..0c23df89c8 100644
--- a/contentcuration/contentcuration/frontend/shared/views/OfflineText.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/OfflineText.vue
@@ -13,7 +13,7 @@
             </span>
           </div>
         </template>
-        <span>{{ $tr('offlineText') }}</span>
+        <span>{{ offlineText || $tr('offlineText') }}</span>
       </VTooltip>
       <ToolBar
         v-else-if="toolbar"
@@ -29,13 +29,13 @@
         <Icon class="mx-3">
           cloud_off
         </Icon>
-        <span>{{ $tr('offlineText') }}</span>
+        <span>{{ offlineText || $tr('offlineText') }}</span>
       </ToolBar>
       <div v-else>
         <Icon class="mx-3">
           cloud_off
         </Icon>
-        <span>{{ $tr('offlineText') }}</span>
+        <span>{{ offlineText || $tr('offlineText') }}</span>
       </div>
     </template>
   </VFadeTransition>
@@ -65,6 +65,10 @@
         type: Number,
         default: 0,
       },
+      offlineText: {
+        type: String,
+        default: null,
+      },
     },
     computed: {
       ...mapState({
diff --git a/contentcuration/contentcuration/migrations/0130_auto_20210706_2005.py b/contentcuration/contentcuration/migrations/0130_auto_20210706_2005.py
new file mode 100644
index 0000000000..ac3a7a19d3
--- /dev/null
+++ b/contentcuration/contentcuration/migrations/0130_auto_20210706_2005.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.2.3 on 2021-07-06 20:05
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentcuration', '0129_auto_20210519_2213'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentkind',
+            name='kind',
+            field=models.CharField(choices=[('topic', 'Topic'), ('video', 'Video'), ('audio', 'Audio'), ('exercise', 'Exercise'), ('document', 'Document'), ('html5', 'HTML5 App'), ('slideshow', 'Slideshow'), ('h5p', 'H5P'), ('zim', 'Zim')], max_length=200, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='fileformat',
+            name='extension',
+            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('webm', 'WEBM Video'), ('vtt', 'VTT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), ('png', 'PNG Image'), ('gif', 'GIF Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('graphie', 'Graphie Exercise'), ('zip', 'HTML5 Zip'), ('h5p', 'H5P'), ('zim', 'ZIM'), ('epub', 'ePub Document')], max_length=40, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='formatpreset',
+            name='id',
+            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('video_dependency', 'Video (dependency)'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('audio_dependency', 'audio (dependency)'), ('document', 'Document'), ('epub', 'ePub Document'), ('document_thumbnail', 'Thumbnail'), ('exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('topic_thumbnail', 'Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_dependency', 'HTML5 Dependency (Zip format)'), ('html5_thumbnail', 'HTML5 Thumbnail'), ('h5p', 'H5P Zip'), ('h5p_thumbnail', 'H5P Thumbnail'), ('zim', 'Zim'), ('zim_thumbnail', 'Zim Thumbnail'), ('qti', 'QTI Zip'), ('qti_thumbnail', 'QTI Thumbnail'), ('slideshow_image', 'Slideshow Image'), ('slideshow_thumbnail', 'Slideshow Thumbnail'), ('slideshow_manifest', 'Slideshow Manifest')], max_length=150, primary_key=True, serialize=False),
+        ),
+    ]
diff --git a/contentcuration/contentcuration/models.py b/contentcuration/contentcuration/models.py
index 688caaf163..3b718da5b5 100644
--- a/contentcuration/contentcuration/models.py
+++ b/contentcuration/contentcuration/models.py
@@ -1294,7 +1294,7 @@ def get_tree_data(self, levels=float('inf')):
             if levels > 0:
                 node_data["children"] = [c.get_tree_data(levels=levels - 1) for c in children]
             return node_data
-        elif self.kind_id == content_kinds.EXERCISE:
+        if self.kind_id == content_kinds.EXERCISE:
             return {
                 "title": self.title,
                 "kind": self.kind_id,
@@ -1302,14 +1302,13 @@ def get_tree_data(self, levels=float('inf')):
                 "node_id": self.node_id,
                 "studio_id": self.id,
             }
-        else:
-            return {
-                "title": self.title,
-                "kind": self.kind_id,
-                "file_size": self.files.values('file_size').aggregate(size=Sum('file_size'))['size'],
-                "node_id": self.node_id,
-                "studio_id": self.id,
-            }
+        return {
+            "title": self.title,
+            "kind": self.kind_id,
+            "file_size": self.files.values('file_size').aggregate(size=Sum('file_size'))['size'],
+            "node_id": self.node_id,
+            "studio_id": self.id,
+        }
 
     def get_original_node(self):
         original_node = self.original_node or self
@@ -1387,8 +1386,7 @@ def get_nodes_with_title(cls, title, limit_to_children_of=None):
         if limit_to_children_of:
             root = cls.objects.get(id=limit_to_children_of)
             return root.get_descendants().filter(title=title)
-        else:
-            return cls.objects.filter(title=title)
+        return cls.objects.filter(title=title)
 
     def get_details(self, channel_id=None):
         """
diff --git a/contentcuration/contentcuration/permissions.py b/contentcuration/contentcuration/permissions.py
index 56eccc0724..2ced0097a7 100644
--- a/contentcuration/contentcuration/permissions.py
+++ b/contentcuration/contentcuration/permissions.py
@@ -33,12 +33,12 @@ class CustomPermission(permissions.BasePermission):
     def has_object_permission(self, request, view, obj):  # noqa: C901
         if request.method in permissions.SAFE_METHODS or request.user.is_admin:
             return True
-        elif isinstance(obj, User) and obj.pk == request.user.pk:
+        if isinstance(obj, User) and obj.pk == request.user.pk:
             return True
-        elif isinstance(obj, Invitation):
+        if isinstance(obj, Invitation):
             if obj.channel.pending_editors.filter(pk=obj.pk).exists() or \
-               obj.channel.pending_editors.filter(pk=obj.pk).exists() or \
-               user_can_view(request.user, obj.channel):
+                       obj.channel.pending_editors.filter(pk=obj.pk).exists() or \
+                       user_can_view(request.user, obj.channel):
                 return True
         elif isinstance(obj, ChannelSet):
             return request.user.is_admin or obj.editors.filter(pk=request.user.pk).exists()
diff --git a/contentcuration/contentcuration/serializers.py b/contentcuration/contentcuration/serializers.py
index a308caadf6..067f131f83 100644
--- a/contentcuration/contentcuration/serializers.py
+++ b/contentcuration/contentcuration/serializers.py
@@ -73,7 +73,7 @@ def get_thumbnail_encoding(self, channel):
         """
         if channel.icon_encoding:
             return channel.icon_encoding
-        elif channel.thumbnail_encoding:
+        if channel.thumbnail_encoding:
             base64 = channel.thumbnail_encoding.get('base64')
             if base64:
                 return base64
diff --git a/contentcuration/contentcuration/tasks.py b/contentcuration/contentcuration/tasks.py
index 0fc3905b24..602aebadf8 100644
--- a/contentcuration/contentcuration/tasks.py
+++ b/contentcuration/contentcuration/tasks.py
@@ -12,8 +12,8 @@
 from django.db import IntegrityError
 from django.db.utils import OperationalError
 from django.template.loader import render_to_string
-from django.utils.translation import override
 from django.utils.translation import gettext as _
+from django.utils.translation import override
 
 from contentcuration.celery import app
 from contentcuration.models import Channel
@@ -51,10 +51,13 @@ def delete_node_task(
     channel_id,
     node_id,
 ):
-    node = ContentNode.objects.get(id=node_id)
-
     deleted = False
     attempts = 0
+    try:
+        node = ContentNode.objects.get(id=node_id)
+    except ContentNode.DoesNotExist:
+        deleted = True
+
     try:
         while not deleted and attempts < 10:
             try:
diff --git a/contentcuration/contentcuration/tests/test_asynctask.py b/contentcuration/contentcuration/tests/test_asynctask.py
index 15097fe3a1..46ce9b5b83 100644
--- a/contentcuration/contentcuration/tests/test_asynctask.py
+++ b/contentcuration/contentcuration/tests/test_asynctask.py
@@ -154,6 +154,39 @@ def test_duplicate_nodes_task(self):
                 assert child.original_source_node_id in node_ids
                 assert child.source_node_id in node_ids
 
+    def test_delete_nodes_task(self):
+        node_id = "00000000000000000000000000000002"
+
+        task_args = {
+            "user_id": self.user.pk,
+            "channel_id": self.channel.pk,
+            "node_id": node_id,
+        }
+        create_async_task(
+            "delete-node", self.user, apply_async=False, **task_args
+        )
+
+        try:
+            ContentNode.objects.get(
+                id=node_id
+            )
+            self.fail("Node still exists after deletion task")
+        except ContentNode.DoesNotExist:
+            pass
+
+    def test_delete_nodes_task_no_node(self):
+        node_id = uuid.uuid4().hex
+
+        task_args = {
+            "user_id": self.user.pk,
+            "channel_id": self.channel.pk,
+            "node_id": node_id,
+        }
+        _, task_info = create_async_task(
+            "delete-node", self.user, apply_async=False, **task_args
+        )
+        self.assertFalse("error" in task_info.metadata)
+
     def test_get_or_create_task(self):
         expected_task = Task.objects.create(
             task_type="progress-test",
diff --git a/contentcuration/contentcuration/tests/test_sushibar_endpoints.py b/contentcuration/contentcuration/tests/test_sushibar_endpoints.py
index d7bcb6f157..6c88fbc29d 100644
--- a/contentcuration/contentcuration/tests/test_sushibar_endpoints.py
+++ b/contentcuration/contentcuration/tests/test_sushibar_endpoints.py
@@ -26,16 +26,21 @@ def _getattr(obj, attr):
     return functools.reduce(_getattr, [obj] + attr.split("."))
 
 
-def _get_node_attr(node, attr, attr_map={}):
+def _get_node_attr(node, attr, attr_map=None):
+    if attr_map is None:
+        attr_map = {}
     if attr in attr_map:
         attr = attr_map[attr]
     if isinstance(node, cc.ContentNode):
         return rgetattr(node, attr)
-    else:
-        return node[attr]
+    return node[attr]
 
 
-def compare_node_attrs(nodeA, nodeB, attrs, mapA={}, mapB={}):
+def compare_node_attrs(nodeA, nodeB, attrs, mapA=None, mapB=None):
+    if mapA is None:
+        mapA = {}
+    if mapB is None:
+        mapB = {}
     diff = []
     for attr in attrs:
         attrA = _get_node_attr(nodeA, attr, mapA)
@@ -48,12 +53,11 @@ def compare_node_attrs(nodeA, nodeB, attrs, mapA={}, mapB={}):
 def _get_children_list(node):
     if isinstance(node, cc.ContentNode):
         return list(node.children.all())
-    else:
-        return node.get("children", [])
+    return node.get("children", [])
 
 
 def compare_trees_children(
-    nodeA, nodeB, attrs=["title"], mapA={}, mapB={}, recursive=True
+    nodeA, nodeB, attrs=None, mapA=None, mapB=None, recursive=True
 ):
     """
     Check children of nodeA and nodeB are identical.
@@ -63,6 +67,12 @@ def compare_trees_children(
       - mapB: map of attribues in attr to nodeB attributes
       - recursive (bool): check just one level of children, or all levels of children?
     """
+    if attrs is None:
+        attrs = ["title"]
+    if mapA is None:
+        mapA = {}
+    if mapB is None:
+        mapB = {}
     diff = []
     childrenA = _get_children_list(nodeA)
     childrenB = _get_children_list(nodeB)
@@ -70,7 +80,7 @@ def compare_trees_children(
         return []
     if childrenA and not childrenB or not childrenA and childrenB:
         return ["different children"]
-    elif childrenA and childrenB:
+    if childrenA and childrenB:
         children_pairs = list(zip(childrenA, childrenB))
         for children_pair in children_pairs:
             childA, childB = children_pair
diff --git a/contentcuration/contentcuration/utils/cache.py b/contentcuration/contentcuration/utils/cache.py
index f83722b1e8..412ad3d731 100644
--- a/contentcuration/contentcuration/utils/cache.py
+++ b/contentcuration/contentcuration/utils/cache.py
@@ -93,7 +93,7 @@ def delete_cache_keys(key_pattern):
     """
     if hasattr(django_cache, "delete_pattern"):
         return django_cache.delete_pattern(key_pattern)
-    elif django_cache.has_key(key_pattern):  # noqa: W601
+    if django_cache.has_key(key_pattern):  # noqa: W601
         django_cache.delete(key_pattern)
         return 1
     return 0
diff --git a/contentcuration/contentcuration/utils/csv_writer.py b/contentcuration/contentcuration/utils/csv_writer.py
index 07dfe4797d..536bf9dd58 100644
--- a/contentcuration/contentcuration/utils/csv_writer.py
+++ b/contentcuration/contentcuration/utils/csv_writer.py
@@ -110,12 +110,11 @@ def _format_question(question):
 def _creation_date(path_to_file):
     if platform.system() == 'Windows':
         return os.path.getctime(path_to_file)
-    else:
-        stat = os.stat(path_to_file)
-        try:
-            return stat.st_birthtime
-        except AttributeError:
-            return stat.st_mtime
+    stat = os.stat(path_to_file)
+    try:
+        return stat.st_birthtime
+    except AttributeError:
+        return stat.st_mtime
 
 # Formatting helpers
 
diff --git a/contentcuration/contentcuration/utils/format.py b/contentcuration/contentcuration/utils/format.py
index 5a1a5c9502..e6425954c4 100644
--- a/contentcuration/contentcuration/utils/format.py
+++ b/contentcuration/contentcuration/utils/format.py
@@ -13,11 +13,11 @@ def format_size(value):
 
     if B < KB:
         return '{0}'.format(B), _('B')
-    elif KB <= B < MB:
+    if KB <= B < MB:
         return '{0:.2f}'.format(old_div(B, KB)), _('KB')
-    elif MB <= B < GB:
+    if MB <= B < GB:
         return '{0:.2f}'.format(old_div(B, MB)), _('MB')
-    elif GB <= B < TB:
+    if GB <= B < TB:
         return '{0:.2f}'.format(old_div(B, GB)), _('GB')
-    elif TB <= B:
+    if TB <= B:
         return '{0:.2f}'.format(old_div(B, TB)), _('TB')
diff --git a/contentcuration/contentcuration/utils/gcs_storage.py b/contentcuration/contentcuration/utils/gcs_storage.py
index f18e3936fc..6b7ab3a6b1 100644
--- a/contentcuration/contentcuration/utils/gcs_storage.py
+++ b/contentcuration/contentcuration/utils/gcs_storage.py
@@ -28,8 +28,7 @@ def __init__(self, client=None):
     def _create_default_client(self, service_account_credentials_path=settings.GCS_STORAGE_SERVICE_ACCOUNT_KEY_PATH):
         if service_account_credentials_path:
             return Client.from_service_account_json(service_account_credentials_path)
-        else:
-            return Client()
+        return Client()
 
     def open(self, name, mode="rb", blob_object=None):
         """
diff --git a/contentcuration/contentcuration/utils/pagination.py b/contentcuration/contentcuration/utils/pagination.py
index 9865f54025..0c67b560fe 100644
--- a/contentcuration/contentcuration/utils/pagination.py
+++ b/contentcuration/contentcuration/utils/pagination.py
@@ -26,7 +26,7 @@ def __init__(self, object_list, *args, **kwargs):
             raise TypeError("ValuesViewsetPaginator is only intended for use with Querysets")
         self.queryset = object_list
         object_list = object_list.values_list("pk", flat=True).distinct()
-        return super(ValuesViewsetPaginator, self).__init__(object_list, *args, **kwargs)
+        super(ValuesViewsetPaginator, self).__init__(object_list, *args, **kwargs)
 
     def _get_page(self, object_list, *args, **kwargs):
         pks = list(object_list)
diff --git a/contentcuration/contentcuration/utils/secretmanagement.py b/contentcuration/contentcuration/utils/secretmanagement.py
index 63b775fdcd..912c803681 100644
--- a/contentcuration/contentcuration/utils/secretmanagement.py
+++ b/contentcuration/contentcuration/utils/secretmanagement.py
@@ -47,7 +47,7 @@ def get_secret(secret_name, secret_storage=None):
 
     if secret_storage in [None, "", ENV_VARS]:
         return os.getenv(secret_name)
-    elif secret_storage == "KMS_GCS":
+    if secret_storage == "KMS_GCS":
         env = os.getenv("SECRET_STORAGE_ENVIRONMENT") or SECRET_STORAGE_DEFAULT_ENVIRONMENT
         project_id = os.getenv("SECRET_STORAGE_GCP_PROJECT_ID")
         kms_location = (
@@ -61,11 +61,10 @@ def get_secret(secret_name, secret_storage=None):
         ciphertext = get_encrypted_secret(secret_name, project_id, env)
 
         return decrypt_secret(ciphertext, project_id, kms_location, env, secret_name)
-    else:
-        logging.warning(
-            "Invalid SECRET_STORAGE value! Defaulting to reading environment variables for now."
-        )
-        return os.getenv(secret_name)
+    logging.warning(
+        "Invalid SECRET_STORAGE value! Defaulting to reading environment variables for now."
+    )
+    return os.getenv(secret_name)
 
 
 def decrypt_secret(ciphertext, project_id, loc, env, secret_name):
diff --git a/contentcuration/contentcuration/utils/storage_common.py b/contentcuration/contentcuration/utils/storage_common.py
index 967077c0c2..b41b018511 100644
--- a/contentcuration/contentcuration/utils/storage_common.py
+++ b/contentcuration/contentcuration/utils/storage_common.py
@@ -31,8 +31,7 @@ def determine_content_type(filename):
 
     if not typ:
         return "application/octet-stream"
-    else:
-        return typ
+    return typ
 
 
 def get_presigned_upload_url(
diff --git a/contentcuration/contentcuration/views/base.py b/contentcuration/contentcuration/views/base.py
index 28b31494c9..96554c13e2 100644
--- a/contentcuration/contentcuration/views/base.py
+++ b/contentcuration/contentcuration/views/base.py
@@ -91,10 +91,9 @@ def current_user_for_context(user):
 def base(request):
     if settings.LIBRARY_MODE:
         return channel_list(request)
-    elif request.user.is_authenticated:
+    if request.user.is_authenticated:
         return redirect(reverse_lazy("channels"))
-    else:
-        return redirect(reverse_lazy("accounts"))
+    return redirect(reverse_lazy("accounts"))
 
 
 """ HEALTH CHECKS """
@@ -104,8 +103,7 @@ def health(request):
     c = Channel.objects.first()
     if c:
         return HttpResponse(c.name)
-    else:
-        return HttpResponse("No channels created yet!")
+    return HttpResponse("No channels created yet!")
 
 
 def stealth(request):
diff --git a/contentcuration/contentcuration/views/internal.py b/contentcuration/contentcuration/views/internal.py
index 54097c5d08..cdfa4232ba 100644
--- a/contentcuration/contentcuration/views/internal.py
+++ b/contentcuration/contentcuration/views/internal.py
@@ -457,11 +457,11 @@ def get_status(channel_id):
     obj = Channel.objects.filter(pk=channel_id).first()
     if not obj:
         return "active"
-    elif obj.deleted:
+    if obj.deleted:
         return "deleted"
-    elif obj.staging_tree:
+    if obj.staging_tree:
         return "staged"
-    elif obj.main_tree.get_descendants().filter(changed=True).exists():
+    if obj.main_tree.get_descendants().filter(changed=True).exists():
         return "unpublished"
     return "active"
 
diff --git a/contentcuration/contentcuration/views/public.py b/contentcuration/contentcuration/views/public.py
index 0a0bc77c4c..63bc6aef5c 100644
--- a/contentcuration/contentcuration/views/public.py
+++ b/contentcuration/contentcuration/views/public.py
@@ -21,8 +21,7 @@
 def _get_channel_list(version, params, identifier=None):
     if version == "v1":
         return _get_channel_list_v1(params, identifier=identifier)
-    else:
-        raise LookupError()
+    raise LookupError()
 
 
 def _get_channel_list_v1(params, identifier=None):
diff --git a/contentcuration/contentcuration/views/users.py b/contentcuration/contentcuration/views/users.py
index ebf85be6e9..e4bf5bebbf 100644
--- a/contentcuration/contentcuration/views/users.py
+++ b/contentcuration/contentcuration/views/users.py
@@ -128,7 +128,7 @@ def login(request):
     if not user:
         return HttpResponseForbidden()
     # User is not activated
-    elif not user.is_active and user.check_password(password):
+    if not user.is_active and user.check_password(password):
         return HttpResponseBadRequest(status=405, reason="Account hasn't been activated")
 
     user = authenticate(username=user.email, password=password)
@@ -176,7 +176,7 @@ def post(self, request):
                 self.send_activation_email(inactive_user)
                 return HttpResponse()
 
-            elif form._errors["email"]:
+            if form._errors["email"]:
                 return HttpResponseBadRequest(
                     status=405, reason="Account hasn't been activated"
                 )
@@ -233,8 +233,7 @@ def activate(self, *args, **kwargs):
             if username != user.email:
                 logger.warning("Attempted to activate alternate-cased username with already active user")
                 return False
-            else:
-                return user
+            return user
 
         user = super(UserActivationView, self).activate(*args, **kwargs)
 
diff --git a/contentcuration/contentcuration/viewsets/base.py b/contentcuration/contentcuration/viewsets/base.py
index c044043eb1..424869d2dd 100644
--- a/contentcuration/contentcuration/viewsets/base.py
+++ b/contentcuration/contentcuration/viewsets/base.py
@@ -59,9 +59,8 @@ def get_value(self, data, attr):
         id_field = self.fields[attr]
         if isinstance(data, dict):
             return id_field.get_value(data)
-        else:
-            # Otherwise should be a model instance
-            return id_field.get_attribute(data)
+        # Otherwise should be a model instance
+        return id_field.get_attribute(data)
 
     def id_value_lookup(self, data):
         """
@@ -73,14 +72,13 @@ def id_value_lookup(self, data):
 
         if isinstance(id_attr, str):
             return str(self.get_value(data, id_attr))
-        else:
-            # Could alternatively have coerced the list of values to a string
-            # but this seemed more explicit in terms of the intended format.
-            id_values = (self.get_value(data, attr) for attr in id_attr)
+        # Could alternatively have coerced the list of values to a string
+        # but this seemed more explicit in terms of the intended format.
+        id_values = (self.get_value(data, attr) for attr in id_attr)
 
-            # For the combined index, use any related objects' primary key
-            combined_index = (idx.pk if hasattr(idx, 'pk') else idx for idx in id_values)
-            return tuple(combined_index)
+        # For the combined index, use any related objects' primary key
+        combined_index = (idx.pk if hasattr(idx, 'pk') else idx for idx in id_values)
+        return tuple(combined_index)
 
     def set_id_values(self, data, obj):
         """
@@ -349,7 +347,7 @@ def create(self, validated_data):
 
 class ValuesViewsetOrderingFilter(OrderingFilter):
 
-    def get_default_valid_fields(self, queryset, view, context={}):
+    def get_default_valid_fields(self, queryset, view, context=None):
         """
         The original implementation of this makes the assumption that the DRF serializer for the class
         encodes all the serialization behaviour for the viewset:
@@ -362,6 +360,8 @@ def get_default_valid_fields(self, queryset, view, context={}):
         value is requried for ordering, it should be defined in the get_queryset method of the viewset, and not
         the annotate_queryset method, which is executed after filtering.
         """
+        if context is None:
+            context = {}
         default_fields = set()
         # All the fields that we have field maps defined for - this only allows for simple mapped fields
         # where the field is essentially a rename, as we have no good way of doing ordering on a field that
@@ -436,7 +436,6 @@ def __init__(self, *args, **kwargs):
         if not isinstance(self.field_map, dict):
             raise TypeError("field_map must be defined as a dict")
         self._field_map = self.field_map.copy()
-        return viewset
 
     @classmethod
     def id_attr(cls):
@@ -461,12 +460,11 @@ def values_from_key(cls, key):
                 # Singular value
                 # Just return the single id_attr and the original key
                 return [(id_attr, key)]
-            else:
-                # Multiple values in the key, zip together the id_attr and the key
-                # to create key, value pairs for a dict
-                # Order in the key matters, and must match the "update_lookup_field"
-                # property of the serializer.
-                return [(attr, value) for attr, value in zip(id_attr, key)]
+            # Multiple values in the key, zip together the id_attr and the key
+            # to create key, value pairs for a dict
+            # Order in the key matters, and must match the "update_lookup_field"
+            # property of the serializer.
+            return [(attr, value) for attr, value in zip(id_attr, key)]
         return []
 
     @classmethod
@@ -480,15 +478,14 @@ def filter_queryset_from_keys(cls, queryset, keys):
             if isinstance(id_attr, str):
                 # In the case of single valued keys, this is just an __in lookup
                 return queryset.filter(**{"{}__in".format(id_attr): keys})
-            else:
-                # If id_attr is multivalued we need to do an ORed lookup for each
-                # set of values represented by a key.
-                # This is probably not as performant as the simple __in query
-                # improvements welcome!
-                query = Q()
-                for key in keys:
-                    query |= Q(**{attr: value for attr, value in zip(id_attr, key)})
-                return queryset.filter(query)
+            # If id_attr is multivalued we need to do an ORed lookup for each
+            # set of values represented by a key.
+            # This is probably not as performant as the simple __in query
+            # improvements welcome!
+            query = Q()
+            for key in keys:
+                query |= Q(**{attr: value for attr, value in zip(id_attr, key)})
+            return queryset.filter(query)
         return queryset.none()
 
     def get_serializer_class(self):
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index e4b9e97c62..766756e98d 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -332,10 +332,9 @@ def get_thumbnail_url(item):
 def _format_url(url):
     if not url:
         return ""
-    elif url.startswith("http"):
+    if url.startswith("http"):
         return url
-    else:
-        return "//{}".format(url)
+    return "//{}".format(url)
 
 
 def format_source_url(item):
diff --git a/contentcuration/contentcuration/viewsets/sync/endpoint.py b/contentcuration/contentcuration/viewsets/sync/endpoint.py
index 30d06e181f..4e26a665e1 100644
--- a/contentcuration/contentcuration/viewsets/sync/endpoint.py
+++ b/contentcuration/contentcuration/viewsets/sync/endpoint.py
@@ -223,8 +223,7 @@ def sync(request):
     if not errors:
         if changes_to_return:
             return Response({"changes": changes_to_return})
-        else:
-            return Response({})
+        return Response({})
     elif len(errors) < len(data) or len(changes_to_return):
         # If there are some errors, but not all, or all errors and some changes return a mixed response
         return Response(
diff --git a/contentcuration/kolibri_content/migrations/0015_auto_20210707_1606.py b/contentcuration/kolibri_content/migrations/0015_auto_20210707_1606.py
new file mode 100644
index 0000000000..d04e46899b
--- /dev/null
+++ b/contentcuration/kolibri_content/migrations/0015_auto_20210707_1606.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.2.4 on 2021-07-07 16:06
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('content', '0014_auto_20210603_1536'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentnode',
+            name='kind',
+            field=models.CharField(blank=True, choices=[('topic', 'Topic'), ('video', 'Video'), ('audio', 'Audio'), ('exercise', 'Exercise'), ('document', 'Document'), ('html5', 'HTML5 App'), ('slideshow', 'Slideshow'), ('h5p', 'H5P'), ('zim', 'Zim')], max_length=200),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='extension',
+            field=models.CharField(blank=True, choices=[('mp4', 'MP4 Video'), ('webm', 'WEBM Video'), ('vtt', 'VTT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), ('png', 'PNG Image'), ('gif', 'GIF Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('graphie', 'Graphie Exercise'), ('zip', 'HTML5 Zip'), ('h5p', 'H5P'), ('zim', 'ZIM'), ('epub', 'ePub Document')], max_length=40),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='preset',
+            field=models.CharField(blank=True, choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('video_dependency', 'Video (dependency)'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('audio_dependency', 'audio (dependency)'), ('document', 'Document'), ('epub', 'ePub Document'), ('document_thumbnail', 'Thumbnail'), ('exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('topic_thumbnail', 'Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_dependency', 'HTML5 Dependency (Zip format)'), ('html5_thumbnail', 'HTML5 Thumbnail'), ('h5p', 'H5P Zip'), ('h5p_thumbnail', 'H5P Thumbnail'), ('zim', 'Zim'), ('zim_thumbnail', 'Zim Thumbnail'), ('qti', 'QTI Zip'), ('qti_thumbnail', 'QTI Thumbnail'), ('slideshow_image', 'Slideshow Image'), ('slideshow_thumbnail', 'Slideshow Thumbnail'), ('slideshow_manifest', 'Slideshow Manifest')], max_length=150),
+        ),
+        migrations.AlterField(
+            model_name='localfile',
+            name='extension',
+            field=models.CharField(blank=True, choices=[('mp4', 'MP4 Video'), ('webm', 'WEBM Video'), ('vtt', 'VTT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), ('png', 'PNG Image'), ('gif', 'GIF Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('graphie', 'Graphie Exercise'), ('zip', 'HTML5 Zip'), ('h5p', 'H5P'), ('zim', 'ZIM'), ('epub', 'ePub Document')], max_length=40),
+        ),
+    ]
diff --git a/contentcuration/kolibri_content/router.py b/contentcuration/kolibri_content/router.py
index 665ac66a57..5a9a13f646 100644
--- a/contentcuration/kolibri_content/router.py
+++ b/contentcuration/kolibri_content/router.py
@@ -41,8 +41,7 @@ def get_active_content_database(return_none_if_not_set=False):
     if not alias:
         if return_none_if_not_set:
             return None
-        else:
-            raise TypeError()
+        raise TypeError()
 
     # retrieve the database connection to make sure it's been properly initialized
     get_content_database_connection(alias)
diff --git a/package.json b/package.json
index bc8b219587..b4eae3ad47 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "devserver": "npm-run-all --parallel build:dev runserver",
     "localprodserver": "npm-run-all build gunicornserver",
     "devserver:hot": "npm-run-all --parallel build:dev:hot runserver",
+    "devserver-hot": "yarn run devserver:hot",
     "devshell": "cd contentcuration && python manage.py shell --settings=contentcuration.dev_settings",
     "celery:dashboard": "cd contentcuration && celery -A contentcuration flower",
     "celery": "(cd contentcuration && DJANGO_SETTINGS_MODULE=contentcuration.dev_settings celery -A contentcuration worker --without-mingle --without-gossip -l info) || true",
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 780dcddf56..0d03c993d8 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -86,7 +86,7 @@ django-debug-toolbar==1.9.1
     # via
     #   -r requirements-dev.in
     #   django-debug-panel
-django==3.2.3
+django==3.2.4
     # via
     #   -c requirements.txt
     #   django-debug-toolbar
@@ -143,7 +143,7 @@ importlib-metadata==1.7.0
     #   pre-commit
     #   pytest
     #   virtualenv
-importlib-resources==5.1.3
+importlib-resources==5.2.0
     # via
     #   pre-commit
     #   virtualenv
@@ -357,9 +357,7 @@ traitlets==4.3.3
 typed-ast==1.4.3
     # via astroid
 typing-extensions==3.10.0.0
-    # via
-    #   -c requirements.txt
-    #   asgiref
+    # via asgiref
 ujson==4.0.2
     # via
     #   python-jsonrpc-server
diff --git a/requirements.in b/requirements.in
index 7183a20c00..abae5cd8a8 100644
--- a/requirements.in
+++ b/requirements.in
@@ -6,7 +6,7 @@ djangorestframework==3.12.4
 psycopg2-binary==2.8.6
 django-js-reverse==0.9.1
 django-registration==3.1.2
-le-utils>=0.1.30
+le-utils==0.1.31
 gunicorn==19.6.0
 django-postmark==0.1.6
 jsonfield==3.1.0
@@ -18,7 +18,7 @@ minio==3.0.3
 pathlib
 progressbar2==3.38.0
 python-postmark==0.5.0
-Django==3.2.3
+Django==3.2.4
 django-webpack-loader==0.7.0
 google-cloud-error-reporting
 google-cloud-storage
@@ -42,7 +42,7 @@ sentry-sdk
 raven
 django-bulk-update
 html5lib==1.1
-pillow==8.1.1
+pillow==8.2.0
 python-dateutil>=2.8.1
 jsonschema>=3.2.0
 importlib-metadata==1.7.0
diff --git a/requirements.txt b/requirements.txt
index 37a32fe7aa..19715970f9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -69,7 +69,7 @@ django-s3-storage==0.13.4
     # via -r requirements.in
 django-webpack-loader==0.7.0
     # via -r requirements.in
-django==3.2.3
+django==3.2.4
     # via
     #   -r requirements.in
     #   django-bulk-update
@@ -152,7 +152,10 @@ httplib2==0.19.1
 idna==2.10
     # via requests
 importlib-metadata==1.7.0
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   jsonschema
+    #   kombu
 jmespath==0.10.0
     # via
     #   boto3
@@ -163,7 +166,7 @@ jsonschema==3.2.0
     # via -r requirements.in
 kombu==4.6.11
     # via celery
-le-utils==0.1.30
+le-utils==0.1.31
     # via -r requirements.in
 minio==3.0.3
     # via -r requirements.in
@@ -177,7 +180,7 @@ packaging==20.9
     # via google-api-core
 pathlib==1.0.1
     # via -r requirements.in
-pillow==8.1.1
+pillow==8.2.0
     # via -r requirements.in
 progressbar2==3.38.0
     # via -r requirements.in
@@ -271,6 +274,8 @@ six==1.16.0
     #   python-utils
 sqlparse==0.4.1
     # via django
+typing-extensions==3.10.0.0
+    # via asgiref
 uritemplate==3.0.1
     # via google-api-python-client
 urllib3==1.26.4