diff --git a/plugins/field-grid-dropdown/src/grid.ts b/plugins/field-grid-dropdown/src/grid.ts
index 38388ff5c1..4d8a92f10a 100644
--- a/plugins/field-grid-dropdown/src/grid.ts
+++ b/plugins/field-grid-dropdown/src/grid.ts
@@ -307,6 +307,7 @@ export class Grid {
  * @param obj The object to test.
  * @returns True iff the object conforms to ImageProperties.
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isImageProperties(obj: any): obj is ImageProperties {
   return (
     obj &&
diff --git a/plugins/theme-deuteranopia/src/index.ts b/plugins/theme-deuteranopia/src/index.ts
index eeea417dc2..5ea8f7ba3c 100644
--- a/plugins/theme-deuteranopia/src/index.ts
+++ b/plugins/theme-deuteranopia/src/index.ts
@@ -8,50 +8,52 @@
  * @fileoverview Deuteranopia theme.
  */
 
+/* eslint-disable @typescript-eslint/naming-convention */
+
 import * as Blockly from 'blockly/core';
 
 const defaultBlockStyles = {
-  colour_blocks: { // eslint-disable-line camelcase
+  colour_blocks: {
     colourPrimary: '#f2a72c',
     colourSecondary: '#f1c172',
     colourTertiary: '#da921c',
   },
-  list_blocks: { // eslint-disable-line camelcase
+  list_blocks: {
     colourPrimary: '#7d65ab',
     colourSecondary: '#a88be0',
     colourTertiary: '#66518e',
   },
-  logic_blocks: { // eslint-disable-line camelcase
+  logic_blocks: {
     colourPrimary: '#9fd2f1',
     colourSecondary: '#c0e0f4',
     colourTertiary: '#74bae5',
   },
-  loop_blocks: { // eslint-disable-line camelcase
+  loop_blocks: {
     colourPrimary: '#795a07',
     colourSecondary: '#ac8726',
     colourTertiary: '#c4a03f',
   },
-  math_blocks: { // eslint-disable-line camelcase
+  math_blocks: {
     colourPrimary: '#e6da39',
     colourSecondary: '#f3ec8e',
     colourTertiary: '#f2eeb7',
   },
-  procedure_blocks: { // eslint-disable-line camelcase
+  procedure_blocks: {
     colourPrimary: '#590721',
     colourSecondary: '#8c475d',
     colourTertiary: '#885464',
   },
-  text_blocks: { // eslint-disable-line camelcase
+  text_blocks: {
     colourPrimary: '#058863',
     colourSecondary: '#5ecfaf',
     colourTertiary: '#04684c',
   },
-  variable_blocks: { // eslint-disable-line camelcase
+  variable_blocks: {
     colourPrimary: '#47025a',
     colourSecondary: '#820fa1',
     colourTertiary: '#8e579d',
   },
-  variable_dynamic_blocks: { // eslint-disable-line camelcase
+  variable_dynamic_blocks: {
     colourPrimary: '#47025a',
     colourSecondary: '#820fa1',
     colourTertiary: '#8e579d',
@@ -59,31 +61,31 @@ const defaultBlockStyles = {
 };
 
 const categoryStyles = {
-  colour_category: { // eslint-disable-line camelcase
+  colour_category: {
     colour: '#f2a72c',
   },
-  list_category: { // eslint-disable-line camelcase
+  list_category: {
     colour: '#7d65ab',
   },
-  logic_category: { // eslint-disable-line camelcase
+  logic_category: {
     colour: '#9fd2f1',
   },
-  loop_category: { // eslint-disable-line camelcase
+  loop_category: {
     colour: '#795a07',
   },
-  math_category: { // eslint-disable-line camelcase
+  math_category: {
     colour: '#e6da39',
   },
-  procedure_category: { // eslint-disable-line camelcase
+  procedure_category: {
     colour: '#590721',
   },
-  text_category: { // eslint-disable-line camelcase
+  text_category: {
     colour: '#058863',
   },
-  variable_category: { // eslint-disable-line camelcase
+  variable_category: {
     colour: '#47025a',
   },
-  variable_dynamic_category: { // eslint-disable-line camelcase
+  variable_dynamic_category: {
     colour: '#47025a',
   },
 };
diff --git a/plugins/theme-hackermode/src/index.ts b/plugins/theme-hackermode/src/index.ts
index cfaceb0905..42313c67a6 100644
--- a/plugins/theme-hackermode/src/index.ts
+++ b/plugins/theme-hackermode/src/index.ts
@@ -9,50 +9,52 @@
  * Black background and blocks with lime green text to simulate a hacker screen.
  */
 
+/* eslint-disable @typescript-eslint/naming-convention */
+
 import * as Blockly from 'blockly/core';
 
 const defaultBlockStyles = {
-  colour_blocks: { // eslint-disable-line camelcase
+  colour_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
   },
-  list_blocks: {  // eslint-disable-line camelcase
+  list_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
   },
-  logic_blocks: {  // eslint-disable-line camelcase
+  logic_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
   },
-  loop_blocks: {  // eslint-disable-line camelcase
+  loop_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
   },
-  math_blocks: {  // eslint-disable-line camelcase
+  math_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
   },
-  procedure_blocks: {  // eslint-disable-line camelcase
+  procedure_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
   },
-  text_blocks: {  // eslint-disable-line camelcase
+  text_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
   },
-  variable_blocks: {  // eslint-disable-line camelcase
+  variable_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
   },
-  variable_dynamic_blocks: {  // eslint-disable-line camelcase
+  variable_dynamic_blocks: {
     colourPrimary: '#0c0d0d',
     colourSecondary: '#0c0d0d',
     colourTertiary: '#edf2f2',
@@ -60,31 +62,31 @@ const defaultBlockStyles = {
 };
 
 const categoryStyles = {
-  colour_category: {  // eslint-disable-line camelcase
+  colour_category: {
     colour: '#0c0d0d',
   },
-  list_category: {  // eslint-disable-line camelcase
+  list_category: {
     colour: '#0c0d0d',
   },
-  logic_category: {  // eslint-disable-line camelcase
+  logic_category: {
     colour: '#0c0d0d',
   },
-  loop_category: {  // eslint-disable-line camelcase
+  loop_category: {
     colour: '#0c0d0d',
   },
-  math_category: {  // eslint-disable-line camelcase
+  math_category: {
     colour: '#0c0d0d',
   },
-  procedure_category: {  // eslint-disable-line camelcase
+  procedure_category: {
     colour: '#0c0d0d',
   },
-  text_category: {  // eslint-disable-line camelcase
+  text_category: {
     colour: '#0c0d0d',
   },
-  variable_category: {  // eslint-disable-line camelcase
+  variable_category: {
     colour: '#0c0d0d',
   },
-  variable_dynamic_category: {  // eslint-disable-line camelcase
+  variable_dynamic_category: {
     colour: '#0c0d0d',
   },
 };
diff --git a/plugins/theme-highcontrast/src/index.ts b/plugins/theme-highcontrast/src/index.ts
index 6e1221601e..4c19c39aaf 100644
--- a/plugins/theme-highcontrast/src/index.ts
+++ b/plugins/theme-highcontrast/src/index.ts
@@ -10,55 +10,57 @@
  * Darker colours to contrast the white font.
  */
 
+/* eslint-disable @typescript-eslint/naming-convention */
+
 import * as Blockly from 'blockly/core';
 
 const defaultBlockStyles = {
-  colour_blocks: { // eslint-disable-line camelcase
+  colour_blocks: {
     colourPrimary: '#a52714',
     colourSecondary: '#FB9B8C',
     colourTertiary: '#FBE1DD',
   },
-  list_blocks: { // eslint-disable-line camelcase
+  list_blocks: {
     colourPrimary: '#4a148c',
     colourSecondary: '#AD7BE9',
     colourTertiary: '#CDB6E9',
   },
-  logic_blocks: { // eslint-disable-line camelcase
+  logic_blocks: {
     colourPrimary: '#01579b',
     colourSecondary: '#64C7FF',
     colourTertiary: '#C5EAFF',
   },
-  loop_blocks: { // eslint-disable-line camelcase
+  loop_blocks: {
     colourPrimary: '#33691e',
     colourSecondary: '#9AFF78',
     colourTertiary: '#E1FFD7',
   },
-  math_blocks: { // eslint-disable-line camelcase
+  math_blocks: {
     colourPrimary: '#1a237e',
     colourSecondary: '#8A9EFF',
     colourTertiary: '#DCE2FF',
   },
-  procedure_blocks: { // eslint-disable-line camelcase
+  procedure_blocks: {
     colourPrimary: '#006064',
     colourSecondary: '#77E6EE',
     colourTertiary: '#CFECEE',
   },
-  text_blocks: { // eslint-disable-line camelcase
+  text_blocks: {
     colourPrimary: '#004d40',
     colourSecondary: '#5ae27c',
     colourTertiary: '#D2FFDD',
   },
-  variable_blocks: { // eslint-disable-line camelcase
+  variable_blocks: {
     colourPrimary: '#880e4f',
     colourSecondary: '#FF73BE',
     colourTertiary: '#FFD4EB',
   },
-  variableDynamic_blocks: { // eslint-disable-line camelcase
+  variableDynamic_blocks: {
     colourPrimary: '#880e4f',
     colourSecondary: '#FF73BE',
     colourTertiary: '#FFD4EB',
   },
-  hat_blocks: { // eslint-disable-line camelcase
+  hat_blocks: {
     colourPrimary: '#880e4f',
     colourSecondary: '#FF73BE',
     colourTertiary: '#FFD4EB',
@@ -67,15 +69,15 @@ const defaultBlockStyles = {
 };
 
 const categoryStyles = {
-  colour_category: {colour: '#a52714'}, // eslint-disable-line camelcase
-  list_category: {colour: '#4a148c'}, // eslint-disable-line camelcase
-  logic_category: {colour: '#01579b'}, // eslint-disable-line camelcase
-  loop_category: {colour: '#33691e'}, // eslint-disable-line camelcase
-  math_category: {colour: '#1a237e'}, // eslint-disable-line camelcase
-  procedure_category: {colour: '#006064'}, // eslint-disable-line camelcase
-  text_category: {colour: '#004d40'}, // eslint-disable-line camelcase
-  variable_category: {colour: '#880e4f'}, // eslint-disable-line camelcase
-  variable_dynamic_category: {colour: '#880e4f'}, // eslint-disable-line camelcase
+  colour_category: {colour: '#a52714'},
+  list_category: {colour: '#4a148c'},
+  logic_category: {colour: '#01579b'},
+  loop_category: {colour: '#33691e'},
+  math_category: {colour: '#1a237e'},
+  procedure_category: {colour: '#006064'},
+  text_category: {colour: '#004d40'},
+  variable_category: {colour: '#880e4f'},
+  variable_dynamic_category: {colour: '#880e4f'},
 };
 
 /**
diff --git a/plugins/theme-modern/src/index.ts b/plugins/theme-modern/src/index.ts
index c8be42757e..13d1e2f77f 100644
--- a/plugins/theme-modern/src/index.ts
+++ b/plugins/theme-modern/src/index.ts
@@ -8,58 +8,60 @@
  * @fileoverview Modern theme.
  */
 
+/* eslint-disable @typescript-eslint/naming-convention */
+
 import * as Blockly from 'blockly/core';
 
 export default Blockly.Theme.defineTheme('modern', {
   name: 'modern',
   base: Blockly.Themes.Classic,
   blockStyles: {
-    colour_blocks: { // eslint-disable-line camelcase
+    colour_blocks: {
       colourPrimary: '#a5745b',
       colourSecondary: '#dbc7bd',
       colourTertiary: '#845d49',
     },
-    list_blocks: { // eslint-disable-line camelcase
+    list_blocks: {
       colourPrimary: '#745ba5',
       colourSecondary: '#c7bddb',
       colourTertiary: '#5d4984',
     },
-    logic_blocks: { // eslint-disable-line camelcase
+    logic_blocks: {
       colourPrimary: '#5b80a5',
       colourSecondary: '#bdccdb',
       colourTertiary: '#496684',
     },
-    loop_blocks: { // eslint-disable-line camelcase
+    loop_blocks: {
       colourPrimary: '#5ba55b',
       colourSecondary: '#bddbbd',
       colourTertiary: '#498449',
     },
-    math_blocks: { // eslint-disable-line camelcase
+    math_blocks: {
       colourPrimary: '#5b67a5',
       colourSecondary: '#bdc2db',
       colourTertiary: '#495284',
     },
-    procedure_blocks: { // eslint-disable-line camelcase
+    procedure_blocks: {
       colourPrimary: '#995ba5',
       colourSecondary: '#d6bddb',
       colourTertiary: '#7a4984',
     },
-    text_blocks: { // eslint-disable-line camelcase
+    text_blocks: {
       colourPrimary: '#5ba58c',
       colourSecondary: '#bddbd1',
       colourTertiary: '#498470',
     },
-    variable_blocks: { // eslint-disable-line camelcase
+    variable_blocks: {
       colourPrimary: '#a55b99',
       colourSecondary: '#dbbdd6',
       colourTertiary: '#84497a',
     },
-    variableDynamic_blocks: { // eslint-disable-line camelcase
+    variableDynamic_blocks: {
       colourPrimary: '#a55b99',
       colourSecondary: '#dbbdd6',
       colourTertiary: '#84497a',
     },
-    hat_blocks: { // eslint-disable-line camelcase
+    hat_blocks: {
       colourPrimary: '#a55b99',
       colourSecondary: '#dbbdd6',
       colourTertiary: '#84497a',
@@ -67,31 +69,31 @@ export default Blockly.Theme.defineTheme('modern', {
     },
   },
   categoryStyles: {
-    colour_category: { // eslint-disable-line camelcase
+    colour_category: {
       colour: '#a5745b',
     },
-    list_category: { // eslint-disable-line camelcase
+    list_category: {
       colour: '#745ba5',
     },
-    logic_category: { // eslint-disable-line camelcase
+    logic_category: {
       colour: '#5b80a5',
     },
-    loop_category: { // eslint-disable-line camelcase
+    loop_category: {
       colour: '#5ba55b',
     },
-    math_category: { // eslint-disable-line camelcase
+    math_category: {
       colour: '#5b67a5',
     },
-    procedure_category: { // eslint-disable-line camelcase
+    procedure_category: {
       colour: '#995ba5',
     },
-    text_category: { // eslint-disable-line camelcase
+    text_category: {
       colour: '#5ba58c',
     },
-    variable_category: { // eslint-disable-line camelcase
+    variable_category: {
       colour: '#a55b99',
     },
-    variable_dynamic_category: { // eslint-disable-line camelcase
+    variable_dynamic_category: {
       colour: '#a55b99',
     },
   },
diff --git a/plugins/theme-tritanopia/src/index.ts b/plugins/theme-tritanopia/src/index.ts
index 733eecfaa2..0528fff7b9 100644
--- a/plugins/theme-tritanopia/src/index.ts
+++ b/plugins/theme-tritanopia/src/index.ts
@@ -8,50 +8,52 @@
  * @fileoverview Tritanopia theme.
  */
 
+/* eslint-disable @typescript-eslint/naming-convention */
+
 import * as Blockly from 'blockly/core';
 
 const defaultBlockStyles = {
-  colour_blocks: { // eslint-disable-line camelcase
+  colour_blocks: {
     colourPrimary: '#05427f',
     colourSecondary: '#2974c0',
     colourTertiary: '#2d74bb',
   },
-  list_blocks: { // eslint-disable-line camelcase
+  list_blocks: {
     colourPrimary: '#b69ce8',
     colourSecondary: '#ccbaef',
     colourTertiary: '#9176c5',
   },
-  logic_blocks: { // eslint-disable-line camelcase
+  logic_blocks: {
     colourPrimary: '#9fd2f1',
     colourSecondary: '#c0e0f4',
     colourTertiary: '#74bae5',
   },
-  loop_blocks: { // eslint-disable-line camelcase
+  loop_blocks: {
     colourPrimary: '#aa1846',
     colourSecondary: '#d36185',
     colourTertiary: '#7c1636',
   },
-  math_blocks: { // eslint-disable-line camelcase
+  math_blocks: {
     colourPrimary: '#e6da39',
     colourSecondary: '#f3ec8e',
     colourTertiary: '#f2eeb7',
   },
-  procedure_blocks: { // eslint-disable-line camelcase
+  procedure_blocks: {
     colourPrimary: '#590721',
     colourSecondary: '#8c475d',
     colourTertiary: '#885464',
   },
-  text_blocks: { // eslint-disable-line camelcase
+  text_blocks: {
     colourPrimary: '#058863',
     colourSecondary: '#5ecfaf',
     colourTertiary: '#04684c',
   },
-  variable_blocks: { // eslint-disable-line camelcase
+  variable_blocks: {
     colourPrimary: '#4b2d84',
     colourSecondary: '#816ea7',
     colourTertiary: '#83759e',
   },
-  variableDynamic_blocks: { // eslint-disable-line camelcase
+  variableDynamic_blocks: {
     colourPrimary: '#4b2d84',
     colourSecondary: '#816ea7',
     colourTertiary: '#83759e',
@@ -59,31 +61,31 @@ const defaultBlockStyles = {
 };
 
 const categoryStyles = {
-  colour_category: { // eslint-disable-line camelcase
+  colour_category: {
     colour: '#05427f',
   },
-  list_category: { // eslint-disable-line camelcase
+  list_category: {
     colour: '#b69ce8',
   },
-  logic_category: { // eslint-disable-line camelcase
+  logic_category: {
     colour: '#9fd2f1',
   },
-  loop_category: { // eslint-disable-line camelcase
+  loop_category: {
     colour: '#aa1846',
   },
-  math_category: { // eslint-disable-line camelcase
+  math_category: {
     colour: '#e6da39',
   },
-  procedure_category: { // eslint-disable-line camelcase
+  procedure_category: {
     colour: '#590721',
   },
-  text_category: { // eslint-disable-line camelcase
+  text_category: {
     colour: '#058863',
   },
-  variable_category: { // eslint-disable-line camelcase
+  variable_category: {
     colour: '#4b2d84',
   },
-  variable_dynamic_category: { // eslint-disable-line camelcase
+  variable_dynamic_category: {
     colour: '#4b2d84',
   },
 };
diff --git a/scripts/gh-predeploy.js b/scripts/gh-predeploy.js
index 4e4a25de78..f08504c1d6 100644
--- a/scripts/gh-predeploy.js
+++ b/scripts/gh-predeploy.js
@@ -517,7 +517,6 @@ function getExampleFolders() {
  *
  * This is treated separately from other examples because it doesn't
  * get the same page chrome added to it.
- *
  * @returns {Function | undefined} Gulp task.
  */
 function prepareDeveloperTools() {