diff --git a/examples/backpack-demo/index.js b/examples/backpack-demo/index.js
index 99a5dd64cf..18183987b7 100644
--- a/examples/backpack-demo/index.js
+++ b/examples/backpack-demo/index.js
@@ -135,10 +135,6 @@ const toolbox = {
           kind: 'block',
           type: 'text',
         },
-        {
-          kind: 'block',
-          type: 'text_multiline',
-        },
         {
           'kind': 'label',
           'text': 'Input/Output:',
diff --git a/examples/custom-renderer-codelab/src/toolbox.js b/examples/custom-renderer-codelab/src/toolbox.js
index 0da9795cbb..7d88fba326 100644
--- a/examples/custom-renderer-codelab/src/toolbox.js
+++ b/examples/custom-renderer-codelab/src/toolbox.js
@@ -328,10 +328,6 @@ export const toolbox = {
           kind: 'block',
           type: 'text',
         },
-        {
-          kind: 'block',
-          type: 'text_multiline',
-        },
         {
           kind: 'block',
           type: 'text_join',
@@ -495,28 +491,6 @@ export const toolbox = {
             },
           },
         },
-        {
-          kind: 'block',
-          type: 'add_text',
-          inputs: {
-            TEXT: {
-              shadow: {
-                type: 'text',
-                fields: {
-                  TEXT: 'abc',
-                },
-              },
-            },
-            COLOR: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#aa00cc',
-                },
-              },
-            },
-          },
-        },
       ],
     },
     {
@@ -622,84 +596,6 @@ export const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      name: 'Color',
-      categorystyle: 'colour_category',
-      contents: [
-        {
-          kind: 'block',
-          type: 'colour_picker',
-        },
-        {
-          kind: 'block',
-          type: 'colour_random',
-        },
-        {
-          kind: 'block',
-          type: 'colour_rgb',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          kind: 'block',
-          type: 'colour_blend',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
-    {
-      kind: 'sep',
-    },
     {
       kind: 'category',
       name: 'Variables',
diff --git a/examples/custom-toolbox-codelab/complete-code/index.html b/examples/custom-toolbox-codelab/complete-code/index.html
index 3635b1fb28..ddd57a89a9 100644
--- a/examples/custom-toolbox-codelab/complete-code/index.html
+++ b/examples/custom-toolbox-codelab/complete-code/index.html
@@ -193,7 +193,6 @@ <h1>Toolbox Customization Codelab</h1>
       </category>
       <category name="Text" categorystyle="text_category">
         <block type="text"></block>
-        <block type="text_multiline"></block>
         <block type="text_join"></block>
         <block type="text_append">
           <value name="TEXT">
@@ -346,44 +345,6 @@ <h1>Toolbox Customization Codelab</h1>
         <block type="lists_sort"></block>
         <block type="lists_reverse"></block>
       </category>
-      <category name="Colour" categorystyle="colour_category">
-        <block type="colour_picker"></block>
-        <block type="colour_random"></block>
-        <block type="colour_rgb">
-          <value name="RED">
-            <shadow type="math_number">
-              <field name="NUM">100</field>
-            </shadow>
-          </value>
-          <value name="GREEN">
-            <shadow type="math_number">
-              <field name="NUM">50</field>
-            </shadow>
-          </value>
-          <value name="BLUE">
-            <shadow type="math_number">
-              <field name="NUM">0</field>
-            </shadow>
-          </value>
-        </block>
-        <block type="colour_blend">
-          <value name="COLOUR1">
-            <shadow type="colour_picker">
-              <field name="COLOUR">#ff0000</field>
-            </shadow>
-          </value>
-          <value name="COLOUR2">
-            <shadow type="colour_picker">
-              <field name="COLOUR">#3333ff</field>
-            </shadow>
-          </value>
-          <value name="RATIO">
-            <shadow type="math_number">
-              <field name="NUM">0.5</field>
-            </shadow>
-          </value>
-        </block>
-      </category>
       <sep></sep>
       <category
         name="Variables"
diff --git a/examples/custom-toolbox-codelab/starter-code/index.html b/examples/custom-toolbox-codelab/starter-code/index.html
index ae5262dee4..6e1d8f8dc8 100644
--- a/examples/custom-toolbox-codelab/starter-code/index.html
+++ b/examples/custom-toolbox-codelab/starter-code/index.html
@@ -183,7 +183,6 @@ <h1>Toolbox Customization Codelab</h1>
       </category>
       <category name="Text" categorystyle="text_category">
         <block type="text"></block>
-        <block type="text_multiline"></block>
         <block type="text_join"></block>
         <block type="text_append">
           <value name="TEXT">
@@ -336,44 +335,6 @@ <h1>Toolbox Customization Codelab</h1>
         <block type="lists_sort"></block>
         <block type="lists_reverse"></block>
       </category>
-      <category name="Colour" categorystyle="colour_category">
-        <block type="colour_picker"></block>
-        <block type="colour_random"></block>
-        <block type="colour_rgb">
-          <value name="RED">
-            <shadow type="math_number">
-              <field name="NUM">100</field>
-            </shadow>
-          </value>
-          <value name="GREEN">
-            <shadow type="math_number">
-              <field name="NUM">50</field>
-            </shadow>
-          </value>
-          <value name="BLUE">
-            <shadow type="math_number">
-              <field name="NUM">0</field>
-            </shadow>
-          </value>
-        </block>
-        <block type="colour_blend">
-          <value name="COLOUR1">
-            <shadow type="colour_picker">
-              <field name="COLOUR">#ff0000</field>
-            </shadow>
-          </value>
-          <value name="COLOUR2">
-            <shadow type="colour_picker">
-              <field name="COLOUR">#3333ff</field>
-            </shadow>
-          </value>
-          <value name="RATIO">
-            <shadow type="math_number">
-              <field name="NUM">0.5</field>
-            </shadow>
-          </value>
-        </block>
-      </category>
       <sep></sep>
       <category
         name="Variables"
diff --git a/examples/keyboard-navigation-codelab/src/toolbox.js b/examples/keyboard-navigation-codelab/src/toolbox.js
index 0da9795cbb..6d0be8e8d9 100644
--- a/examples/keyboard-navigation-codelab/src/toolbox.js
+++ b/examples/keyboard-navigation-codelab/src/toolbox.js
@@ -328,10 +328,6 @@ export const toolbox = {
           kind: 'block',
           type: 'text',
         },
-        {
-          kind: 'block',
-          type: 'text_multiline',
-        },
         {
           kind: 'block',
           type: 'text_join',
@@ -495,28 +491,6 @@ export const toolbox = {
             },
           },
         },
-        {
-          kind: 'block',
-          type: 'add_text',
-          inputs: {
-            TEXT: {
-              shadow: {
-                type: 'text',
-                fields: {
-                  TEXT: 'abc',
-                },
-              },
-            },
-            COLOR: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#aa00cc',
-                },
-              },
-            },
-          },
-        },
       ],
     },
     {
@@ -622,81 +596,6 @@ export const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      name: 'Color',
-      categorystyle: 'colour_category',
-      contents: [
-        {
-          kind: 'block',
-          type: 'colour_picker',
-        },
-        {
-          kind: 'block',
-          type: 'colour_random',
-        },
-        {
-          kind: 'block',
-          type: 'colour_rgb',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          kind: 'block',
-          type: 'colour_blend',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/examples/rtl-demo/index.html b/examples/rtl-demo/index.html
index 4e7561fcbe..11b71b54b4 100644
--- a/examples/rtl-demo/index.html
+++ b/examples/rtl-demo/index.html
@@ -335,25 +335,6 @@
                 },
               ],
             },
-            {
-              kind: 'category',
-              name: 'لون',
-              colour: '%{BKY_COLOUR_HUE}',
-              contents: [
-                {
-                  kind: 'block',
-                  type: 'colour_picker',
-                },
-                {
-                  kind: 'block',
-                  type: 'colour_rgb',
-                },
-                {
-                  kind: 'block',
-                  type: 'colour_blend',
-                },
-              ],
-            },
             {
               kind: 'sep',
             },
diff --git a/examples/sample-app-ts/src/toolbox.ts b/examples/sample-app-ts/src/toolbox.ts
index 0da9795cbb..6d0be8e8d9 100644
--- a/examples/sample-app-ts/src/toolbox.ts
+++ b/examples/sample-app-ts/src/toolbox.ts
@@ -328,10 +328,6 @@ export const toolbox = {
           kind: 'block',
           type: 'text',
         },
-        {
-          kind: 'block',
-          type: 'text_multiline',
-        },
         {
           kind: 'block',
           type: 'text_join',
@@ -495,28 +491,6 @@ export const toolbox = {
             },
           },
         },
-        {
-          kind: 'block',
-          type: 'add_text',
-          inputs: {
-            TEXT: {
-              shadow: {
-                type: 'text',
-                fields: {
-                  TEXT: 'abc',
-                },
-              },
-            },
-            COLOR: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#aa00cc',
-                },
-              },
-            },
-          },
-        },
       ],
     },
     {
@@ -622,81 +596,6 @@ export const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      name: 'Color',
-      categorystyle: 'colour_category',
-      contents: [
-        {
-          kind: 'block',
-          type: 'colour_picker',
-        },
-        {
-          kind: 'block',
-          type: 'colour_random',
-        },
-        {
-          kind: 'block',
-          type: 'colour_rgb',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          kind: 'block',
-          type: 'colour_blend',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/examples/sample-app/src/toolbox.js b/examples/sample-app/src/toolbox.js
index 0da9795cbb..6d0be8e8d9 100644
--- a/examples/sample-app/src/toolbox.js
+++ b/examples/sample-app/src/toolbox.js
@@ -328,10 +328,6 @@ export const toolbox = {
           kind: 'block',
           type: 'text',
         },
-        {
-          kind: 'block',
-          type: 'text_multiline',
-        },
         {
           kind: 'block',
           type: 'text_join',
@@ -495,28 +491,6 @@ export const toolbox = {
             },
           },
         },
-        {
-          kind: 'block',
-          type: 'add_text',
-          inputs: {
-            TEXT: {
-              shadow: {
-                type: 'text',
-                fields: {
-                  TEXT: 'abc',
-                },
-              },
-            },
-            COLOR: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#aa00cc',
-                },
-              },
-            },
-          },
-        },
       ],
     },
     {
@@ -622,81 +596,6 @@ export const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      name: 'Color',
-      categorystyle: 'colour_category',
-      contents: [
-        {
-          kind: 'block',
-          type: 'colour_picker',
-        },
-        {
-          kind: 'block',
-          type: 'colour_random',
-        },
-        {
-          kind: 'block',
-          type: 'colour_rgb',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          kind: 'block',
-          type: 'colour_blend',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/plugins/block-test/src/fields/defaults.js b/plugins/block-test/src/fields/defaults.js
index 732802a6c8..bbd99da01f 100644
--- a/plugins/block-test/src/fields/defaults.js
+++ b/plugins/block-test/src/fields/defaults.js
@@ -58,19 +58,6 @@ Blockly.defineBlocksWithJsonArray([
     helpUrl: '',
     output: 'String',
   },
-  {
-    type: 'test_fields_multilinetext',
-    message0: 'code %1',
-    args0: [
-      {
-        type: 'field_multilinetext',
-        name: 'CODE',
-        text: 'default1\ndefault2',
-      },
-    ],
-    style: 'math_blocks',
-    tooltip: 'test tooltip',
-  },
   {
     type: 'test_fields_checkbox',
     message0: 'checkbox %1',
@@ -85,50 +72,6 @@ Blockly.defineBlocksWithJsonArray([
     tooltip: '',
     helpUrl: '',
   },
-  {
-    type: 'test_fields_colour',
-    message0: 'colour %1',
-    args0: [
-      {
-        type: 'field_colour',
-        name: 'COLOUR',
-        colour: '#ff0000',
-      },
-    ],
-    style: 'math_blocks',
-    tooltip: '',
-    helpUrl: '',
-  },
-  {
-    type: 'test_fields_colour_options',
-    message0: 'colour options %1',
-    args0: [
-      {
-        type: 'field_colour',
-        name: 'COLOUR',
-        colour: '#ff4040',
-        colourOptions: [
-          '#ff4040',
-          '#ff8080',
-          '#ffc0c0',
-          '#4040ff',
-          '#8080ff',
-          '#c0c0ff',
-        ],
-        colourTitles: [
-          'dark pink',
-          'pink',
-          'light pink',
-          'dark blue',
-          'blue',
-          'light blue',
-        ],
-        columns: 3,
-      },
-    ],
-    style: 'math_blocks',
-    tooltip: 'test tooltip',
-  },
   {
     type: 'test_fields_variable',
     message0: 'variable %1',
@@ -230,14 +173,6 @@ export const category = {
       kind: 'BLOCK',
       type: 'test_fields_checkbox',
     },
-    {
-      kind: 'BLOCK',
-      type: 'test_fields_colour',
-    },
-    {
-      kind: 'BLOCK',
-      type: 'test_fields_colour_options',
-    },
     {
       kind: 'BLOCK',
       type: 'test_fields_text_input',
@@ -246,10 +181,6 @@ export const category = {
       kind: 'BLOCK',
       type: 'test_fields_only_text_input',
     },
-    {
-      kind: 'BLOCK',
-      type: 'test_fields_multilinetext',
-    },
     {
       kind: 'BLOCK',
       type: 'test_fields_variable',
diff --git a/plugins/block-test/src/fields/validators.js b/plugins/block-test/src/fields/validators.js
index 7b0f0edf4a..e67c7661ad 100644
--- a/plugins/block-test/src/fields/validators.js
+++ b/plugins/block-test/src/fields/validators.js
@@ -217,111 +217,6 @@ Blockly.Blocks['test_validators_checkbox_not_match_null'] = {
   },
 };
 
-Blockly.Blocks['test_validators_colour_null'] = {
-  init: function () {
-    const colourField = new Blockly.FieldColour('#ff0000', this.validate);
-    colourField.setColours([
-      '#ffffff',
-      '#ffdcdc',
-      '#ffb4b4',
-      '#ff8c8c',
-      '#ff6464',
-      '#ff3c3c',
-      '#ff1414',
-      '#00ffff',
-      '#00dcdc',
-      '#00b4b4',
-      '#008c8c',
-      '#006464',
-      '#003c3c',
-      '#001414',
-    ]);
-
-    this.appendDummyInput()
-      .appendField('always null')
-      .appendField(colourField, 'INPUT');
-    this.setColour(230);
-    this.setCommentText(
-      'All input validates to null (invalid). This means' +
-        ' the field value should not change.',
-    );
-  },
-
-  validate: function (newValue) {
-    return null;
-  },
-};
-Blockly.Blocks['test_validators_colour_force_red'] = {
-  init: function () {
-    const colourField = new Blockly.FieldColour('#ff0000', this.validate);
-    colourField.setColours([
-      '#ffffff',
-      '#ffdcdc',
-      '#ffb4b4',
-      '#ff8c8c',
-      '#ff6464',
-      '#ff3c3c',
-      '#ff1414',
-      '#00ffff',
-      '#00dcdc',
-      '#00b4b4',
-      '#008c8c',
-      '#006464',
-      '#003c3c',
-      '#001414',
-    ]);
-
-    this.appendDummyInput()
-      .appendField('force full red')
-      .appendField(colourField, 'INPUT');
-    this.setColour(230);
-    this.setCommentText(
-      'The input will have its red value replaced with' + ' full red.',
-    );
-  },
-
-  validate: function (newValue) {
-    return '#ff' + newValue.substr(3, 4);
-  },
-};
-Blockly.Blocks['test_validators_colour_red_null'] = {
-  init: function () {
-    const colourField = new Blockly.FieldColour('#ff0000', this.validate);
-    colourField.setColours([
-      '#ffffff',
-      '#ffdcdc',
-      '#ffb4b4',
-      '#ff8c8c',
-      '#ff6464',
-      '#ff3c3c',
-      '#ff1414',
-      '#00ffff',
-      '#00dcdc',
-      '#00b4b4',
-      '#008c8c',
-      '#006464',
-      '#003c3c',
-      '#001414',
-    ]);
-
-    this.appendDummyInput()
-      .appendField('not red -> null')
-      .appendField(colourField, 'INPUT');
-    this.setColour(230);
-    this.setCommentText(
-      'If the input does not have full red, the input will validate to' +
-        ' null (invalid). Otherwise it will return the input value',
-    );
-  },
-
-  validate: function (newValue) {
-    if (newValue.substr(1, 2) != 'ff') {
-      return null;
-    }
-    return newValue;
-  },
-};
-
 Blockly.Blocks['test_validators_dropdown_null'] = {
   init: function () {
     this.appendDummyInput()
@@ -627,26 +522,6 @@ export const category = {
       kind: 'SEP',
       gap: '12',
     },
-    {
-      kind: 'BLOCK',
-      type: 'test_validators_colour_null',
-    },
-    {
-      kind: 'SEP',
-      gap: '12',
-    },
-    {
-      kind: 'BLOCK',
-      type: 'test_validators_colour_force_red',
-    },
-    {
-      kind: 'SEP',
-      gap: '12',
-    },
-    {
-      kind: 'BLOCK',
-      type: 'test_validators_colour_red_null',
-    },
     {
       kind: 'LABEL',
       text: 'Dropdowns',
diff --git a/plugins/block-test/src/mutators.js b/plugins/block-test/src/mutators.js
index 48e8123e69..76316f9cc6 100644
--- a/plugins/block-test/src/mutators.js
+++ b/plugins/block-test/src/mutators.js
@@ -14,13 +14,13 @@ import * as Blockly from 'blockly/core';
 
 Blockly.defineBlocksWithJsonArray([
   {
-    type: 'test_mutator_colorChange',
-    message0: 'colour %1',
+    type: 'test_mutator_textChange',
+    message0: 'mutator text: %1',
     args0: [
       {
-        type: 'field_colour',
-        name: 'COLOUR',
-        colour: '#ff0000',
+        type: 'field_input',
+        name: 'MUTATOR_TEXT',
+        text: 'a label',
       },
     ],
     style: 'colour_blocks',
@@ -41,7 +41,7 @@ const COLOR_CHANGE_MUTATOR = {
    */
   mutationToDom: function () {
     const container = Blockly.utils.xml.createElement('mutation');
-    container.setAttribute('colour', this.getColour());
+    container.setAttribute('arbitrary', this.getFieldValue('LABEL'));
     return container;
   },
   /**
@@ -50,23 +50,23 @@ const COLOR_CHANGE_MUTATOR = {
    * @this {Blockly.Block}
    */
   domToMutation: function (xmlElement) {
-    this.setColour(xmlElement.getAttribute('colour'));
+    this.setFieldValue(xmlElement.getAttribute('arbitrary'), 'LABEL');
   },
   /**
    * Returns the state of this block as a json serializable object.
-   * @returns {{colour: string}} The state of this block.
+   * @returns {{arbitrary: string}} The state of this block.
    * @this {Blockly.Block}
    */
   saveExtraState: function () {
-    return {colour: this.getColour()};
+    return {arbitrary: this.getFieldValue('LABEL')};
   },
   /**
    * Applies the state to this block.
-   * @param {{color: string}} state The state to apply.
+   * @param {{arbitrary: string}} state The state to apply.
    * @this {Blockly.Block}
    */
   loadExtraState: function (state) {
-    this.setColour(state['colour']);
+    this.setFieldValue(state['arbitrary'], 'LABEL');
   },
   /**
    * Populate the mutator's dialog with this block's components.
@@ -76,10 +76,12 @@ const COLOR_CHANGE_MUTATOR = {
    */
   decompose: function (workspace) {
     const containerBlock = Blockly.serialization.blocks.append(
-      {type: 'test_mutator_colorChange'},
+      {type: 'test_mutator_textChange'},
       workspace,
     );
-    containerBlock.getField('COLOUR').setValue(this.getColour());
+    containerBlock
+      .getField('MUTATOR_TEXT')
+      .setValue(this.getFieldValue('LABEL'));
     return containerBlock;
   },
   /**
@@ -88,7 +90,7 @@ const COLOR_CHANGE_MUTATOR = {
    * @this {Blockly.Block}
    */
   compose: function (containerBlock) {
-    this.setColour(containerBlock.getFieldValue('COLOUR'));
+    this.setFieldValue(containerBlock.getFieldValue('MUTATOR_TEXT'), 'LABEL');
   },
 };
 
@@ -100,12 +102,12 @@ for (let i = 0; i < n; i++) {
 
 const defineBlocks = blocksIds.map((t) => ({
   type: t,
-  message0: 'colour %1',
+  message0: 'mutator text: %1',
   args0: [
     {
-      type: 'field_colour',
-      name: 'COLOUR',
-      colour: '#ff0000',
+      type: 'field_input',
+      name: 'MUTATOR_TEXT',
+      text: 'a label',
     },
   ],
   style: 'colour_blocks',
@@ -114,7 +116,14 @@ const defineBlocks = blocksIds.map((t) => ({
 Blockly.defineBlocksWithJsonArray([
   {
     type: 'test_mutators_many',
-    message0: 'test many blocks mutator',
+    message0: 'test many blocks mutator %1',
+    args0: [
+      {
+        type: 'field_label',
+        name: 'LABEL',
+        text: 'changeable label',
+      },
+    ],
     mutator: 'test_many_blocks_mutator',
     colour: '#000000',
   },
@@ -132,7 +141,14 @@ Blockly.Extensions.registerMutator(
 Blockly.defineBlocksWithJsonArray([
   {
     type: 'test_mutators_noflyout',
-    message0: 'noflyout mutator',
+    message0: 'noflyout mutator %1',
+    args0: [
+      {
+        type: 'field_label',
+        name: 'LABEL',
+        text: 'changeable label',
+      },
+    ],
     mutator: 'test_noflyout_mutator',
     colour: '#000000',
   },
@@ -149,7 +165,14 @@ Blockly.Extensions.registerMutator(
 Blockly.defineBlocksWithJsonArray([
   {
     type: 'test_mutators_changeableFlyout',
-    message0: 'changeable flyout mutator',
+    message0: 'changeable flyout mutator %1',
+    args0: [
+      {
+        type: 'field_label',
+        name: 'LABEL',
+        text: 'changeable label',
+      },
+    ],
     mutator: 'test_changeableFlyout_mutator',
     colour: '#000000',
   },
diff --git a/plugins/dev-tools/src/toolboxCategories.js b/plugins/dev-tools/src/toolboxCategories.js
index 6da9ce7781..62eb490178 100644
--- a/plugins/dev-tools/src/toolboxCategories.js
+++ b/plugins/dev-tools/src/toolboxCategories.js
@@ -367,13 +367,6 @@ export default {
             TEXT: '',
           },
         },
-        {
-          type: 'text_multiline',
-          kind: 'block',
-          fields: {
-            TEXT: '',
-          },
-        },
         {
           type: 'text_join',
           kind: 'block',
@@ -771,84 +764,6 @@ export default {
         },
       ],
     },
-    {
-      kind: 'category',
-      categorystyle: 'colour_category',
-      name: 'Colour',
-      contents: [
-        {
-          type: 'colour_picker',
-          kind: 'block',
-          fields: {
-            COLOUR: '#ff0000',
-          },
-        },
-        {
-          type: 'colour_random',
-          kind: 'block',
-        },
-        {
-          type: 'colour_rgb',
-          kind: 'block',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          type: 'colour_blend',
-          kind: 'block',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/plugins/shadow-block-converter/test/index.ts b/plugins/shadow-block-converter/test/index.ts
index 13cf0aa7c9..876360d9f7 100644
--- a/plugins/shadow-block-converter/test/index.ts
+++ b/plugins/shadow-block-converter/test/index.ts
@@ -25,28 +25,6 @@ const toolbox: Blockly.utils.toolbox.ToolboxDefinition = {
         },
       },
     },
-    {
-      kind: 'block',
-      type: 'colour_blend',
-      inputs: {
-        COLOUR1: {
-          shadow: {type: 'colour_picker', fields: {COLOUR: '#ff0000'}},
-          block: undefined,
-        },
-        COLOUR2: {
-          shadow: {type: 'colour_picker', fields: {COLOUR: '#3333ff'}},
-          block: undefined,
-        },
-        RATIO: {
-          shadow: {type: 'math_number', fields: {NUM: 0.5}},
-          block: undefined,
-        },
-      },
-    },
-    {
-      kind: 'block',
-      type: 'colour_picker',
-    },
     {
       kind: 'block',
       type: 'text_print',
diff --git a/plugins/strict-connection-checker/src/toolboxCategories.js b/plugins/strict-connection-checker/src/toolboxCategories.js
index 90e1880b14..5ce25a88b1 100644
--- a/plugins/strict-connection-checker/src/toolboxCategories.js
+++ b/plugins/strict-connection-checker/src/toolboxCategories.js
@@ -367,13 +367,6 @@ export default {
             TEXT: '',
           },
         },
-        {
-          type: 'text_multiline',
-          kind: 'block',
-          fields: {
-            TEXT: '',
-          },
-        },
         {
           type: 'text_join',
           kind: 'block',
@@ -642,84 +635,6 @@ export default {
         },
       ],
     },
-    {
-      kind: 'category',
-      categorystyle: 'colour_category',
-      name: 'Colour',
-      contents: [
-        {
-          type: 'colour_picker',
-          kind: 'block',
-          fields: {
-            COLOUR: '#ff0000',
-          },
-        },
-        {
-          type: 'colour_random',
-          kind: 'block',
-        },
-        {
-          type: 'colour_rgb',
-          kind: 'block',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          type: 'colour_blend',
-          kind: 'block',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/plugins/theme-dark/test/index.js b/plugins/theme-dark/test/index.js
index 575c2d8a68..c3f824bbad 100644
--- a/plugins/theme-dark/test/index.js
+++ b/plugins/theme-dark/test/index.js
@@ -380,13 +380,6 @@ const toolbox = {
             TEXT: '',
           },
         },
-        {
-          type: 'text_multiline',
-          kind: 'block',
-          fields: {
-            TEXT: '',
-          },
-        },
         {
           type: 'text_join',
           kind: 'block',
@@ -780,84 +773,6 @@ const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      categorystyle: 'colour_category',
-      name: 'Colour',
-      contents: [
-        {
-          type: 'colour_picker',
-          kind: 'block',
-          fields: {
-            COLOUR: '#ff0000',
-          },
-        },
-        {
-          type: 'colour_random',
-          kind: 'block',
-        },
-        {
-          type: 'colour_rgb',
-          kind: 'block',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          type: 'colour_blend',
-          kind: 'block',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/plugins/theme-deuteranopia/test/index.js b/plugins/theme-deuteranopia/test/index.js
index 6dbc15f55c..5244caf43a 100644
--- a/plugins/theme-deuteranopia/test/index.js
+++ b/plugins/theme-deuteranopia/test/index.js
@@ -380,13 +380,6 @@ const toolbox = {
             TEXT: '',
           },
         },
-        {
-          type: 'text_multiline',
-          kind: 'block',
-          fields: {
-            TEXT: '',
-          },
-        },
         {
           type: 'text_join',
           kind: 'block',
@@ -780,84 +773,6 @@ const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      categorystyle: 'colour_category',
-      name: 'Colour',
-      contents: [
-        {
-          type: 'colour_picker',
-          kind: 'block',
-          fields: {
-            COLOUR: '#ff0000',
-          },
-        },
-        {
-          type: 'colour_random',
-          kind: 'block',
-        },
-        {
-          type: 'colour_rgb',
-          kind: 'block',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          type: 'colour_blend',
-          kind: 'block',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/plugins/theme-highcontrast/test/index.js b/plugins/theme-highcontrast/test/index.js
index 1c2a919db9..aca4e423f1 100644
--- a/plugins/theme-highcontrast/test/index.js
+++ b/plugins/theme-highcontrast/test/index.js
@@ -380,13 +380,6 @@ const toolbox = {
             TEXT: '',
           },
         },
-        {
-          type: 'text_multiline',
-          kind: 'block',
-          fields: {
-            TEXT: '',
-          },
-        },
         {
           type: 'text_join',
           kind: 'block',
@@ -780,84 +773,6 @@ const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      categorystyle: 'colour_category',
-      name: 'Colour',
-      contents: [
-        {
-          type: 'colour_picker',
-          kind: 'block',
-          fields: {
-            COLOUR: '#ff0000',
-          },
-        },
-        {
-          type: 'colour_random',
-          kind: 'block',
-        },
-        {
-          type: 'colour_rgb',
-          kind: 'block',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          type: 'colour_blend',
-          kind: 'block',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/plugins/theme-modern/test/index.js b/plugins/theme-modern/test/index.js
index 6b1824f203..db9844e955 100644
--- a/plugins/theme-modern/test/index.js
+++ b/plugins/theme-modern/test/index.js
@@ -380,13 +380,6 @@ const toolbox = {
             TEXT: '',
           },
         },
-        {
-          type: 'text_multiline',
-          kind: 'block',
-          fields: {
-            TEXT: '',
-          },
-        },
         {
           type: 'text_join',
           kind: 'block',
@@ -780,84 +773,6 @@ const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      categorystyle: 'colour_category',
-      name: 'Colour',
-      contents: [
-        {
-          type: 'colour_picker',
-          kind: 'block',
-          fields: {
-            COLOUR: '#ff0000',
-          },
-        },
-        {
-          type: 'colour_random',
-          kind: 'block',
-        },
-        {
-          type: 'colour_rgb',
-          kind: 'block',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          type: 'colour_blend',
-          kind: 'block',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },
diff --git a/plugins/theme-tritanopia/test/index.js b/plugins/theme-tritanopia/test/index.js
index 3e6fc496cf..a5ac03c718 100644
--- a/plugins/theme-tritanopia/test/index.js
+++ b/plugins/theme-tritanopia/test/index.js
@@ -380,13 +380,6 @@ const toolbox = {
             TEXT: '',
           },
         },
-        {
-          type: 'text_multiline',
-          kind: 'block',
-          fields: {
-            TEXT: '',
-          },
-        },
         {
           type: 'text_join',
           kind: 'block',
@@ -780,84 +773,6 @@ const toolbox = {
         },
       ],
     },
-    {
-      kind: 'category',
-      categorystyle: 'colour_category',
-      name: 'Colour',
-      contents: [
-        {
-          type: 'colour_picker',
-          kind: 'block',
-          fields: {
-            COLOUR: '#ff0000',
-          },
-        },
-        {
-          type: 'colour_random',
-          kind: 'block',
-        },
-        {
-          type: 'colour_rgb',
-          kind: 'block',
-          inputs: {
-            RED: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 100,
-                },
-              },
-            },
-            GREEN: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 50,
-                },
-              },
-            },
-            BLUE: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0,
-                },
-              },
-            },
-          },
-        },
-        {
-          type: 'colour_blend',
-          kind: 'block',
-          inputs: {
-            COLOUR1: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#ff0000',
-                },
-              },
-            },
-            COLOUR2: {
-              shadow: {
-                type: 'colour_picker',
-                fields: {
-                  COLOUR: '#3333ff',
-                },
-              },
-            },
-            RATIO: {
-              shadow: {
-                type: 'math_number',
-                fields: {
-                  NUM: 0.5,
-                },
-              },
-            },
-          },
-        },
-      ],
-    },
     {
       kind: 'sep',
     },