diff --git a/Tests/ttLib/tables/C_O_L_R_test.py b/Tests/ttLib/tables/C_O_L_R_test.py
index 5da6f5939..35075ced5 100644
--- a/Tests/ttLib/tables/C_O_L_R_test.py
+++ b/Tests/ttLib/tables/C_O_L_R_test.py
@@ -104,13 +104,14 @@ COLR_V1_SAMPLE = (
     (b"\x00\x01", "Version (1)"),
     (b"\x00\x01", "BaseGlyphRecordCount (1)"),
     (
-        b"\x00\x00\x00\x1a",
-        "Offset to BaseGlyphRecordArray from beginning of table (26)",
+        b"\x00\x00\x00\x1e",
+        "Offset to BaseGlyphRecordArray from beginning of table (30)",
     ),
-    (b"\x00\x00\x00 ", "Offset to LayerRecordArray from beginning of table (32)"),
+    (b"\x00\x00\x00\x24", "Offset to LayerRecordArray from beginning of table (36)"),
     (b"\x00\x03", "LayerRecordCount (3)"),
-    (b"\x00\x00\x00,", "Offset to BaseGlyphList from beginning of table (44)"),
-    (b"\x00\x00\x00\xab", "Offset to LayerList from beginning of table (171)"),
+    (b"\x00\x00\x00\x30", "Offset to BaseGlyphList from beginning of table (48)"),
+    (b"\x00\x00\x00\x9b", "Offset to LayerList from beginning of table (155)"),
+    (b"\x00\x00\x00\x00", "Offset to DeltaSetIndexMap (NULL)"),
     (b"\x00\x00\x00\x00", "Offset to VarStore (NULL)"),
     (b"\x00\x06", "BaseGlyphRecord[0].BaseGlyph (6)"),
     (b"\x00\x00", "BaseGlyphRecord[0].FirstLayerIndex (0)"),
@@ -135,8 +136,8 @@ COLR_V1_SAMPLE = (
     ),
     (b"\x00\x0f", "BaseGlyphList.BaseGlyphPaintRecord[2].BaseGlyph (15)"),
     (
-        b"\x00\x00\x00\x5e",
-        "Offset to Paint table from beginning of BaseGlyphList (94)",
+        b"\x00\x00\x00\x4a",
+        "Offset to Paint table from beginning of BaseGlyphList (74)",
     ),
     # BaseGlyphPaintRecord[0]
     (b"\x01", "BaseGlyphPaintRecord[0].Paint.Format (1)"),
@@ -152,12 +153,13 @@ COLR_V1_SAMPLE = (
     (b"\x00\x00\x0a", "Offset to VarAffine2x3 from beginning of PaintVarTransform (10)"),
     (b"\x0b", "BaseGlyphPaintRecord[1].Paint.BackdropPaint.Format (11)"),
     (b"\x00\x0a", "BaseGlyphPaintRecord[1].Paint.BackdropPaint.Glyph (10)"),
-    (b"\x00\x01\x00\x00\xff\xff\xff\xff", "VarAffine2x3.xx (1.0)"),
-    (b"\x00\x00\x00\x00\xff\xff\xff\xff", "VarAffine2x3.xy (0.0)"),
-    (b"\x00\x00\x00\x00\xff\xff\xff\xff", "VarAffine2x3.yx (0.0)"),
-    (b"\x00\x01\x00\x00\xff\xff\xff\xff", "VarAffine2x3.yy (1.0)"),
-    (b"\x01\x2c\x00\x00\xff\xff\xff\xff", "VarAffine2x3.dx (300.0)"),
-    (b"\x00\x00\x00\x00\xff\xff\xff\xff", "VarAffine2x3.dy (0.0)"),
+    (b"\x00\x01\x00\x00", "VarAffine2x3.xx (1.0)"),
+    (b"\x00\x00\x00\x00", "VarAffine2x3.xy (0.0)"),
+    (b"\x00\x00\x00\x00", "VarAffine2x3.yx (0.0)"),
+    (b"\x00\x01\x00\x00", "VarAffine2x3.yy (1.0)"),
+    (b"\x01\x2c\x00\x00", "VarAffine2x3.dx (300.0)"),
+    (b"\x00\x00\x00\x00", "VarAffine2x3.dy (0.0)"),
+    (b"\xff\xff\xff\xff", "VarIndexBase (0xFFFFFFF)"),
     (b"\x0a", "BaseGlyphPaintRecord[1].Paint.SourcePaint.Format (10)"),
     (b"\x00\x00\x06", "Offset to Paint subtable from beginning of PaintGlyph (6)"),
     (b"\x00\x0b", "BaseGlyphPaintRecord[1].Paint.SourcePaint.Glyph (11)"),
@@ -170,11 +172,11 @@ COLR_V1_SAMPLE = (
     (b"\x00", "ColorLine.Extend (0; pad)"),
     (b"\x00\x02", "ColorLine.StopCount (2)"),
     (b"\x00\x00", "ColorLine.ColorStop[0].StopOffset (0.0)"),
-    (b"\x00\x03", "ColorLine.ColorStop[0].Color.PaletteIndex (3)"),
-    (b"@\x00", "ColorLine.ColorStop[0].Color.Alpha (1.0)"),
+    (b"\x00\x03", "ColorLine.ColorStop[0].PaletteIndex (3)"),
+    (b"@\x00", "ColorLine.ColorStop[0].Alpha (1.0)"),
     (b"@\x00", "ColorLine.ColorStop[1].StopOffset (1.0)"),
-    (b"\x00\x05", "ColorLine.ColorStop[1].Color.PaletteIndex (5)"),
-    (b"@\x00", "ColorLine.ColorStop[1].Color.Alpha (1.0)"),
+    (b"\x00\x05", "ColorLine.ColorStop[1].PaletteIndex (5)"),
+    (b"@\x00", "ColorLine.ColorStop[1].Alpha (1.0)"),
     # LayerList
     (b"\x00\x00\x00\x04", "LayerList.LayerCount (4)"),
     (
@@ -190,8 +192,8 @@ COLR_V1_SAMPLE = (
         "Third Offset to Paint table from beginning of LayerList (78)",
     ),
     (
-        b"\x00\x00\x00\xba",
-        "Fourth Offset to Paint table from beginning of LayerList (186)",
+        b"\x00\x00\x00\x9e",
+        "Fourth Offset to Paint table from beginning of LayerList (158)",
     ),
     # BaseGlyphPaintRecord[2]
     (b"\x0a", "BaseGlyphPaintRecord[2].Paint.Format (10)"),
@@ -199,9 +201,9 @@ COLR_V1_SAMPLE = (
     (b"\x00\x0b", "BaseGlyphPaintRecord[2].Paint.Glyph (11)"),
     # PaintVarSolid
     (b"\x03", "LayerList.Paint[0].Paint.Format (3)"),
-    (b"\x00\x02", "Paint.Color.PaletteIndex (2)"),
-    (b" \x00", "Paint.Color.Alpha.value (0.5)"),
-    (b"\xff\xff\xff\xff", "Paint.Color.Alpha.varIdx (0xFFFFFFFF)"),
+    (b"\x00\x02", "Paint.PaletteIndex (2)"),
+    (b" \x00", "Paint.Alpha.value (0.5)"),
+    (b"\xff\xff\xff\xff", "VarIndexBase (0xFFFFFFFF)"),
     # PaintGlyph glyph00012
     (b"\x0a", "LayerList.Paint[1].Format (10)"),
     (b"\x00\x00\x06", "Offset to Paint subtable from beginning of PaintGlyph (6)"),
@@ -217,37 +219,40 @@ COLR_V1_SAMPLE = (
     (b"\x01", "ColorLine.Extend (1; repeat)"),
     (b"\x00\x03", "ColorLine.StopCount (3)"),
     (b"\x00\x00", "ColorLine.ColorStop[0].StopOffset (0.0)"),
-    (b"\x00\x03", "ColorLine.ColorStop[0].Color.PaletteIndex (3)"),
-    (b"@\x00", "ColorLine.ColorStop[0].Color.Alpha (1.0)"),
+    (b"\x00\x03", "ColorLine.ColorStop[0].PaletteIndex (3)"),
+    (b"@\x00", "ColorLine.ColorStop[0].Alpha (1.0)"),
     (b" \x00", "ColorLine.ColorStop[1].StopOffset (0.5)"),
-    (b"\x00\x04", "ColorLine.ColorStop[1].Color.PaletteIndex (4)"),
-    (b"@\x00", "ColorLine.ColorStop[1].Color.Alpha (1.0)"),
+    (b"\x00\x04", "ColorLine.ColorStop[1].PaletteIndex (4)"),
+    (b"@\x00", "ColorLine.ColorStop[1].Alpha (1.0)"),
     (b"@\x00", "ColorLine.ColorStop[2].StopOffset (1.0)"),
-    (b"\x00\x05", "ColorLine.ColorStop[2].Color.PaletteIndex (5)"),
-    (b"@\x00", "ColorLine.ColorStop[2].Color.Alpha (1.0)"),
+    (b"\x00\x05", "ColorLine.ColorStop[2].PaletteIndex (5)"),
+    (b"@\x00", "ColorLine.ColorStop[2].Alpha (1.0)"),
     # PaintGlyph glyph00013
     (b"\x0a", "LayerList.Paint[2].Format (10)"),
     (b"\x00\x00\x06", "Offset to Paint subtable from beginning of PaintGlyph (6)"),
     (b"\x00\x0d", "LayerList.Paint[2].Glyph (13)"),
     (b"\x0c", "LayerList.Paint[2].Paint.Format (12)"),
     (b"\x00\x00\x07", "Offset to Paint subtable from beginning of PaintTransform (7)"),
-    (b"\x00\x00\x4e", "Offset to Affine2x3 subtable from beginning of PaintTransform (78)"),
+    (b"\x00\x00\x32", "Offset to Affine2x3 subtable from beginning of PaintTransform (50)"),
     (b"\x07", "LayerList.Paint[2].Paint.Paint.Format (7)"),
-    (b"\x00\x00(", "Offset to ColorLine from beginning of PaintVarRadialGradient (40)"),
-    (b"\x00\x07\xff\xff\xff\xff", "Paint.x0.value (7)"),
-    (b"\x00\x08\xff\xff\xff\xff", "Paint.y0.value (8)"),
-    (b"\x00\t\xff\xff\xff\xff", "Paint.r0.value (9)"),
-    (b"\x00\n\xff\xff\xff\xff", "Paint.x1.value (10)"),
-    (b"\x00\x0b\xff\xff\xff\xff", "Paint.y1.value (11)"),
-    (b"\x00\x0c\xff\xff\xff\xff", "Paint.r1.value (12)"),
+    (b"\x00\x00\x14", "Offset to ColorLine from beginning of PaintVarRadialGradient (20)"),
+    (b"\x00\x07", "Paint.x0.value (7)"),
+    (b"\x00\x08", "Paint.y0.value (8)"),
+    (b"\x00\t", "Paint.r0.value (9)"),
+    (b"\x00\n", "Paint.x1.value (10)"),
+    (b"\x00\x0b", "Paint.y1.value (11)"),
+    (b"\x00\x0c", "Paint.r1.value (12)"),
+    (b"\xff\xff\xff\xff", "VarIndexBase (0xFFFFFFFF)"),
     (b"\x00", "ColorLine.Extend (0; pad)"),
     (b"\x00\x02", "ColorLine.StopCount (2)"),
-    (b"\x00\x00\xff\xff\xff\xff", "ColorLine.ColorStop[0].StopOffset.value (0.0)"),
-    (b"\x00\x06", "ColorLine.ColorStop[0].Color.PaletteIndex (6)"),
-    (b"@\x00\xff\xff\xff\xff", "ColorLine.ColorStop[0].Color.Alpha.value (1.0)"),
-    (b"@\x00\xff\xff\xff\xff", "ColorLine.ColorStop[1].StopOffset.value (1.0)"),
-    (b"\x00\x07", "ColorLine.ColorStop[1].Color.PaletteIndex (7)"),
-    (b"\x19\x9a\xff\xff\xff\xff", "ColorLine.ColorStop[1].Color.Alpha.value (0.4)"),
+    (b"\x00\x00", "ColorLine.ColorStop[0].StopOffset.value (0.0)"),
+    (b"\x00\x06", "ColorLine.ColorStop[0].PaletteIndex (6)"),
+    (b"@\x00", "ColorLine.ColorStop[0].Alpha.value (1.0)"),
+    (b"\xff\xff\xff\xff", "VarIndexBase (0xFFFFFFFF)"),
+    (b"@\x00", "ColorLine.ColorStop[1].StopOffset.value (1.0)"),
+    (b"\x00\x07", "ColorLine.ColorStop[1].PaletteIndex (7)"),
+    (b"\x19\x9a", "ColorLine.ColorStop[1].Alpha.value (0.4)"),
+    (b"\xff\xff\xff\xff", "VarIndexBase (0xFFFFFFFF)"),
 
     (b"\xff\xf3\x00\x00", "Affine2x3.xx (-13)"),
     (b"\x00\x0e\x00\x00", "Affine2x3.xy (14)"),
@@ -288,8 +293,8 @@ COLR_V1_SAMPLE = (
 
     # PaintSolid
     (b"\x02", "LayerList.Paint[0].Paint.Paint.Paint.Paint.Format (2)"),
-    (b"\x00\x02", "Paint.Color.PaletteIndex (2)"),
-    (b" \x00", "Paint.Color.Alpha (0.5)"),
+    (b"\x00\x02", "Paint.PaletteIndex (2)"),
+    (b" \x00", "Paint.Alpha (0.5)"),
 )
 
 COLR_V1_DATA = b"".join(t[0] for t in COLR_V1_SAMPLE)
@@ -346,6 +351,7 @@ COLR_V1_XML = [
     '          <yy value="1.0"/>',
     '          <dx value="300.0"/>',
     '          <dy value="0.0"/>',
+    '          <VarIndexBase value="4294967295"/>',
     "        </Transform>",
     "      </BackdropPaint>",
     "    </Paint>",
@@ -359,17 +365,13 @@ COLR_V1_XML = [
     "          <!-- StopCount=2 -->",
     '          <ColorStop index="0">',
     '            <StopOffset value="0.0"/>',
-    "            <Color>",
-    '              <PaletteIndex value="3"/>',
-    '              <Alpha value="1.0"/>',
-    "            </Color>",
+    '            <PaletteIndex value="3"/>',
+    '            <Alpha value="1.0"/>',
     "          </ColorStop>",
     '          <ColorStop index="1">',
     '            <StopOffset value="1.0"/>',
-    "            <Color>",
-    '              <PaletteIndex value="5"/>',
-    '              <Alpha value="1.0"/>',
-    "            </Color>",
+    '            <PaletteIndex value="5"/>',
+    '            <Alpha value="1.0"/>',
     "          </ColorStop>",
     "        </ColorLine>",
     '        <centerX value="259"/>',
@@ -385,10 +387,9 @@ COLR_V1_XML = [
     "  <!-- LayerCount=4 -->",
     '  <Paint index="0" Format="10"><!-- PaintGlyph -->',
     '    <Paint Format="3"><!-- PaintVarSolid -->',
-    "      <Color>",
-    '        <PaletteIndex value="2"/>',
-    '        <Alpha value="0.5"/>',
-    "      </Color>",
+    '      <PaletteIndex value="2"/>',
+    '      <Alpha value="0.5"/>',
+    '      <VarIndexBase value="4294967295"/>',
     "    </Paint>",
     '    <Glyph value="glyph00011"/>',
     "  </Paint>",
@@ -399,24 +400,18 @@ COLR_V1_XML = [
     "        <!-- StopCount=3 -->",
     '        <ColorStop index="0">',
     '          <StopOffset value="0.0"/>',
-    "          <Color>",
-    '            <PaletteIndex value="3"/>',
-    '            <Alpha value="1.0"/>',
-    "          </Color>",
+    '          <PaletteIndex value="3"/>',
+    '          <Alpha value="1.0"/>',
     "        </ColorStop>",
     '        <ColorStop index="1">',
     '          <StopOffset value="0.5"/>',
-    "          <Color>",
-    '            <PaletteIndex value="4"/>',
-    '            <Alpha value="1.0"/>',
-    "          </Color>",
+    '          <PaletteIndex value="4"/>',
+    '          <Alpha value="1.0"/>',
     "        </ColorStop>",
     '        <ColorStop index="2">',
     '          <StopOffset value="1.0"/>',
-    "          <Color>",
-    '            <PaletteIndex value="5"/>',
-    '            <Alpha value="1.0"/>',
-    "          </Color>",
+    '          <PaletteIndex value="5"/>',
+    '          <Alpha value="1.0"/>',
     "        </ColorStop>",
     "      </ColorLine>",
     '      <x0 value="1"/>',
@@ -436,17 +431,15 @@ COLR_V1_XML = [
     "          <!-- StopCount=2 -->",
     '          <ColorStop index="0">',
     '            <StopOffset value="0.0"/>',
-    "            <Color>",
-    '              <PaletteIndex value="6"/>',
-    '              <Alpha value="1.0"/>',
-    "            </Color>",
+    '            <PaletteIndex value="6"/>',
+    '            <Alpha value="1.0"/>',
+    '            <VarIndexBase value="4294967295"/>',
     "          </ColorStop>",
     '          <ColorStop index="1">',
     '            <StopOffset value="1.0"/>',
-    "            <Color>",
-    '              <PaletteIndex value="7"/>',
-    '              <Alpha value="0.4"/>',
-    "            </Color>",
+    '            <PaletteIndex value="7"/>',
+    '            <Alpha value="0.4"/>',
+    '            <VarIndexBase value="4294967295"/>',
     "          </ColorStop>",
     "        </ColorLine>",
     '        <x0 value="7"/>',
@@ -455,6 +448,7 @@ COLR_V1_XML = [
     '        <x1 value="10"/>',
     '        <y1 value="11"/>',
     '        <r1 value="12"/>',
+    '        <VarIndexBase value="4294967295"/>',
     "      </Paint>",
     "      <Transform>",
     '        <xx value="-13.0"/>',
@@ -472,10 +466,8 @@ COLR_V1_XML = [
     '      <Paint Format="28"><!-- PaintSkew -->',
     '        <Paint Format="10"><!-- PaintGlyph -->',
     '          <Paint Format="2"><!-- PaintSolid -->',
-    "            <Color>",
-    '              <PaletteIndex value="2"/>',
-    '              <Alpha value="0.5"/>',
-    "            </Color>",
+    '            <PaletteIndex value="2"/>',
+    '            <Alpha value="0.5"/>',
     "          </Paint>",
     '          <Glyph value="glyph00011"/>',
     "        </Paint>",