xmloff: rename theme color names and color-table to theme-colors

For ODF it's not needed to abbreviate names and we prefer to use
full names. The theme color names in OOXML are abbreviated and the
same names were used also for ODF - this was changed now.

"color-table" used in "theme" element has reused the already
existing "color-table" element name in ODF, but they don't relate
to each other. The name was changed to "theme-colors", which makes
more sense anyway.

Change-Id: I61ec91895d301ad4343f2b977d5cbcf38e360b99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152252
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

8 files changed, 75 insertions, 75 deletions

diff --git a/oox/qa/unit/data/ReferenceShapeFill.fodp b/oox/qa/unit/data/ReferenceShapeFill.fodp
index 09a231c0344d..d3db08712ac9 100644
--- a/oox/qa/unit/data/ReferenceShapeFill.fodp
+++ b/oox/qa/unit/data/ReferenceShapeFill.fodp
@@ -350,28 +350,28 @@
    </style:graphic-properties>
    <style:paragraph-properties fo:margin-top="0.5cm" fo:margin-bottom="0cm" fo:line-height="90%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="28pt" fo:letter-spacing="normal" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-name-asian="Noto Sans CJK SC" style:font-family-asian="&apos;Noto Sans CJK SC&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="28pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="&apos;Droid Sans Devanagari&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="28pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color" fo:hyphenate="false">
-    <loext:char-complex-color loext:theme-type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dark1"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="Title_20_Slide-outline2" style:display-name="Title Slide-outline2" style:family="presentation" style:parent-style-name="Title_20_Slide-outline1">
    <style:graphic-properties style:writing-mode="lr-tb"/>
    <style:paragraph-properties fo:margin-top="0.4cm" fo:margin-bottom="0cm" fo:line-height="90%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="20pt" fo:letter-spacing="normal" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" fo:background-color="transparent" style:font-size-asian="20pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="20pt" style:font-style-complex="normal" style:font-weight-complex="normal" fo:hyphenate="false">
-    <loext:char-complex-color loext:theme-type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dark1"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="Title_20_Slide-outline3" style:display-name="Title Slide-outline3" style:family="presentation" style:parent-style-name="Title_20_Slide-outline2">
    <style:graphic-properties style:writing-mode="lr-tb"/>
    <style:paragraph-properties fo:margin-top="0.3cm" fo:margin-bottom="0cm" fo:line-height="90%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="18pt" fo:letter-spacing="normal" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" fo:background-color="transparent" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal" fo:hyphenate="false">
-    <loext:char-complex-color loext:theme-type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dark1"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="Title_20_Slide-outline4" style:display-name="Title Slide-outline4" style:family="presentation" style:parent-style-name="Title_20_Slide-outline3">
    <style:graphic-properties style:writing-mode="lr-tb"/>
    <style:paragraph-properties fo:margin-top="0.2cm" fo:margin-bottom="0cm" fo:line-height="90%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="18pt" fo:letter-spacing="normal" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" fo:background-color="transparent" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal" fo:hyphenate="false">
-    <loext:char-complex-color loext:theme-type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dark1"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="Title_20_Slide-outline5" style:display-name="Title Slide-outline5" style:family="presentation" style:parent-style-name="Title_20_Slide-outline4">
@@ -489,7 +489,7 @@
    </style:graphic-properties>
    <style:paragraph-properties fo:line-height="100%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="18pt" fo:letter-spacing="normal" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-name-asian="Noto Sans CJK SC" style:font-family-asian="&apos;Noto Sans CJK SC&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="&apos;Droid Sans Devanagari&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color" fo:hyphenate="false">
-    <loext:char-complex-color loext:theme-type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dark1"/>
    </style:text-properties>
   </style:style>
   <style:presentation-page-layout style:name="AL0T26">
@@ -585,7 +585,7 @@
   </style:style>
   <style:style style:name="T2" style:family="text">
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-size="18pt" fo:letter-spacing="normal" fo:language="en" fo:country="GB" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" fo:background-color="transparent" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal">
-    <loext:char-complex-color loext:theme-type="lt1"/>
+    <loext:char-complex-color loext:theme-type="light1"/>
    </style:text-properties>
   </style:style>
   <text:list-style style:name="L1">
@@ -753,20 +753,20 @@
   </style:handout-master>
   <style:master-page style:name="Title_20_Slide" style:display-name="Title Slide" style:page-layout-name="PM1" draw:style-name="dp1">
    <loext:theme loext:name="Office Theme">
-    <loext:color-table loext:name="Office">
-     <loext:color loext:name="dk1" loext:color="#000000"/>
-     <loext:color loext:name="lt1" loext:color="#ffffff"/>
-     <loext:color loext:name="dk2" loext:color="#44546a"/>
-     <loext:color loext:name="lt2" loext:color="#e7e6e6"/>
+    <loext:theme-colors loext:name="Office">
+     <loext:color loext:name="dark1" loext:color="#000000"/>
+     <loext:color loext:name="light1" loext:color="#ffffff"/>
+     <loext:color loext:name="dark2" loext:color="#44546a"/>
+     <loext:color loext:name="light2" loext:color="#e7e6e6"/>
      <loext:color loext:name="accent1" loext:color="#4472c4"/>
      <loext:color loext:name="accent2" loext:color="#ed7d31"/>
      <loext:color loext:name="accent3" loext:color="#a5a5a5"/>
      <loext:color loext:name="accent4" loext:color="#ffc000"/>
      <loext:color loext:name="accent5" loext:color="#5b9bd5"/>
      <loext:color loext:name="accent6" loext:color="#70ad47"/>
-     <loext:color loext:name="hlink" loext:color="#0563c1"/>
-     <loext:color loext:name="folHlink" loext:color="#954f72"/>
-    </loext:color-table>
+     <loext:color loext:name="hyperlink" loext:color="#0563c1"/>
+     <loext:color loext:name="followed-hyperlink" loext:color="#954f72"/>
+    </loext:theme-colors>
    </loext:theme>
    <presentation:notes style:page-layout-name="PM0">
     <draw:page-thumbnail presentation:style-name="Title_20_Slide-title" draw:layer="backgroundobjects" svg:width="19.798cm" svg:height="11.136cm" svg:x="0.6cm" svg:y="2.257cm" presentation:class="page"/>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt b/oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt
index 6f0da7b5c49b..8d2f8726d53b 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt
@@ -312,20 +312,20 @@
    <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
   </style:default-page-layout>
   <loext:theme loext:name="Office Theme">
-   <loext:color-table loext:name="Office">
-    <loext:color loext:name="dk1" loext:color="#000000"/>
-    <loext:color loext:name="lt1" loext:color="#ffffff"/>
-    <loext:color loext:name="dk2" loext:color="#1f497d"/>
-    <loext:color loext:name="lt2" loext:color="#eeece1"/>
+   <loext:theme-colors loext:name="Office">
+    <loext:color loext:name="dark1" loext:color="#000000"/>
+    <loext:color loext:name="light1" loext:color="#ffffff"/>
+    <loext:color loext:name="dark2" loext:color="#1f497d"/>
+    <loext:color loext:name="light2" loext:color="#eeece1"/>
     <loext:color loext:name="accent1" loext:color="#4f81bd"/>
     <loext:color loext:name="accent2" loext:color="#c0504d"/>
     <loext:color loext:name="accent3" loext:color="#9bbb59"/>
     <loext:color loext:name="accent4" loext:color="#8064a2"/>
     <loext:color loext:name="accent5" loext:color="#4bacc6"/>
     <loext:color loext:name="accent6" loext:color="#f79646"/>
-    <loext:color loext:name="hlink" loext:color="#0000ff"/>
-    <loext:color loext:name="folHlink" loext:color="#800080"/>
-   </loext:color-table>
+    <loext:color loext:name="hyperlink" loext:color="#0000ff"/>
+    <loext:color loext:name="followed-hyperlink" loext:color="#800080"/>
+   </loext:theme-colors>
   </loext:theme>
  </office:styles>
  <office:automatic-styles>
@@ -358,7 +358,7 @@
   </style:style>
   <style:style style:name="gr1" style:family="graphic">
    <style:graphic-properties draw:stroke="none" svg:stroke-width="0.199cm" svg:stroke-color="#b3a2c7" draw:marker-start="" draw:marker-start-width="0.559cm" draw:marker-start-center="false" draw:marker-end="" draw:marker-end-width="0.559cm" draw:marker-end-center="false" svg:stroke-opacity="100%" draw:stroke-linejoin="bevel" draw:fill="solid" draw:fill-color="#558ed5" draw:secondary-fill-color="#d4ea6b" draw:opacity="100%" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" draw:fit-to-size="false" style:shrink-to-fit="false" fo:min-height="2.993cm" fo:min-width="5.004cm" fo:padding-top="0.215cm" fo:padding-bottom="0.215cm" fo:padding-left="0.335cm" fo:padding-right="0.335cm" fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.071cm" draw:shadow-offset-y="0.071cm" draw:shadow-color="#808080" draw:shadow-opacity="100%" style:writing-mode="lr-tb" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph-content" style:horizontal-pos="from-left" style:horizontal-rel="paragraph-content" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false">
-    <loext:fill-complex-color loext:theme-type="dk2">
+    <loext:fill-complex-color loext:theme-type="dark2">
      <loext:transformation loext:type="lummod" loext:value="6000"/>
      <loext:transformation loext:type="lumoff" loext:value="4000"/>
     </loext:fill-complex-color>
@@ -367,7 +367,7 @@
   </style:style>
   <style:style style:name="gr2" style:family="graphic">
    <style:graphic-properties draw:stroke="none" svg:stroke-width="0.199cm" svg:stroke-color="#b3a2c7" draw:marker-start="" draw:marker-start-width="0.559cm" draw:marker-start-center="false" draw:marker-end="" draw:marker-end-width="0.559cm" draw:marker-end-center="false" svg:stroke-opacity="100%" draw:stroke-linejoin="bevel" draw:fill="solid" draw:fill-color="#948a54" draw:secondary-fill-color="#d4ea6b" draw:opacity="100%" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" draw:fit-to-size="false" style:shrink-to-fit="false" fo:min-height="2.993cm" fo:min-width="5.004cm" fo:padding-top="0.215cm" fo:padding-bottom="0.215cm" fo:padding-left="0.335cm" fo:padding-right="0.335cm" fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.071cm" draw:shadow-offset-y="0.071cm" draw:shadow-color="#808080" draw:shadow-opacity="100%" style:writing-mode="lr-tb" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph-content" style:horizontal-pos="from-left" style:horizontal-rel="paragraph-content" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false">
-    <loext:fill-complex-color loext:theme-type="lt2">
+    <loext:fill-complex-color loext:theme-type="light2">
      <loext:transformation loext:type="lummod" loext:value="5000"/>
     </loext:fill-complex-color>
    </style:graphic-properties>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt
index 3d8a5ff30ff8..fb792bd34e00 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt
@@ -315,20 +315,20 @@
    <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
   </style:default-page-layout>
   <loext:theme loext:name="Office Theme">
-   <loext:color-table loext:name="Office">
-    <loext:color loext:name="dk1" loext:color="#000000"/>
-    <loext:color loext:name="lt1" loext:color="#ffffff"/>
-    <loext:color loext:name="dk2" loext:color="#1f497d"/>
-    <loext:color loext:name="lt2" loext:color="#eeece1"/>
+   <loext:theme-colors loext:name="Office">
+    <loext:color loext:name="dark1" loext:color="#000000"/>
+    <loext:color loext:name="light1" loext:color="#ffffff"/>
+    <loext:color loext:name="dark2" loext:color="#1f497d"/>
+    <loext:color loext:name="light2" loext:color="#eeece1"/>
     <loext:color loext:name="accent1" loext:color="#4f81bd"/>
     <loext:color loext:name="accent2" loext:color="#c0504d"/>
     <loext:color loext:name="accent3" loext:color="#9bbb59"/>
     <loext:color loext:name="accent4" loext:color="#8064a2"/>
     <loext:color loext:name="accent5" loext:color="#4bacc6"/>
     <loext:color loext:name="accent6" loext:color="#f79646"/>
-    <loext:color loext:name="hlink" loext:color="#0000ff"/>
-    <loext:color loext:name="folHlink" loext:color="#800080"/>
-   </loext:color-table>
+    <loext:color loext:name="hyperlink" loext:color="#0000ff"/>
+    <loext:color loext:name="followed-hyperlink" loext:color="#800080"/>
+   </loext:theme-colors>
   </loext:theme>
  </office:styles>
  <office:automatic-styles>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_ellipticalGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_ellipticalGradient.fodt
index 59493782dea4..01eeed1fd923 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_ellipticalGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_ellipticalGradient.fodt
@@ -260,20 +260,20 @@
    <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
   </style:default-page-layout>
   <loext:theme loext:name="Office">
-   <loext:color-table loext:name="LibreOffice">
-    <loext:color loext:name="dk1" loext:color="#000000"/>
-    <loext:color loext:name="lt1" loext:color="#ffffff"/>
-    <loext:color loext:name="dk2" loext:color="#000000"/>
-    <loext:color loext:name="lt2" loext:color="#ffffff"/>
+   <loext:theme-colors loext:name="LibreOffice">
+    <loext:color loext:name="dark1" loext:color="#000000"/>
+    <loext:color loext:name="light1" loext:color="#ffffff"/>
+    <loext:color loext:name="dark2" loext:color="#000000"/>
+    <loext:color loext:name="light2" loext:color="#ffffff"/>
     <loext:color loext:name="accent1" loext:color="#18a303"/>
     <loext:color loext:name="accent2" loext:color="#0369a3"/>
     <loext:color loext:name="accent3" loext:color="#a33e03"/>
     <loext:color loext:name="accent4" loext:color="#8e03a3"/>
     <loext:color loext:name="accent5" loext:color="#c99c00"/>
     <loext:color loext:name="accent6" loext:color="#c9211e"/>
-    <loext:color loext:name="hlink" loext:color="#0000ee"/>
-    <loext:color loext:name="folHlink" loext:color="#551a8b"/>
-   </loext:color-table>
+    <loext:color loext:name="hyperlink" loext:color="#0000ee"/>
+    <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/>
+   </loext:theme-colors>
   </loext:theme>
  </office:styles>
  <office:automatic-styles>
@@ -725,4 +725,4 @@
     </draw:frame></text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_linearGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_linearGradient.fodt
index 49c43ff4b185..26673c2c9b96 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_linearGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_linearGradient.fodt
@@ -256,20 +256,20 @@
    <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
   </style:default-page-layout>
   <loext:theme loext:name="Office">
-   <loext:color-table loext:name="LibreOffice">
-    <loext:color loext:name="dk1" loext:color="#000000"/>
-    <loext:color loext:name="lt1" loext:color="#ffffff"/>
-    <loext:color loext:name="dk2" loext:color="#000000"/>
-    <loext:color loext:name="lt2" loext:color="#ffffff"/>
+   <loext:theme-colors loext:name="LibreOffice">
+    <loext:color loext:name="dark1" loext:color="#000000"/>
+    <loext:color loext:name="light1" loext:color="#ffffff"/>
+    <loext:color loext:name="dark2" loext:color="#000000"/>
+    <loext:color loext:name="light2" loext:color="#ffffff"/>
     <loext:color loext:name="accent1" loext:color="#18a303"/>
     <loext:color loext:name="accent2" loext:color="#0369a3"/>
     <loext:color loext:name="accent3" loext:color="#a33e03"/>
     <loext:color loext:name="accent4" loext:color="#8e03a3"/>
     <loext:color loext:name="accent5" loext:color="#c99c00"/>
     <loext:color loext:name="accent6" loext:color="#c9211e"/>
-    <loext:color loext:name="hlink" loext:color="#0000ee"/>
-    <loext:color loext:name="folHlink" loext:color="#551a8b"/>
-   </loext:color-table>
+    <loext:color loext:name="hyperlink" loext:color="#0000ee"/>
+    <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/>
+   </loext:theme-colors>
   </loext:theme>
  </office:styles>
  <office:automatic-styles>
@@ -413,4 +413,4 @@
     </draw:custom-shape>Dummy</text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_radialGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_radialGradient.fodt
index 30ccfbfa5a53..2979e9a89582 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_radialGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_radialGradient.fodt
@@ -260,20 +260,20 @@
    <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
   </style:default-page-layout>
   <loext:theme loext:name="Office">
-   <loext:color-table loext:name="LibreOffice">
-    <loext:color loext:name="dk1" loext:color="#000000"/>
-    <loext:color loext:name="lt1" loext:color="#ffffff"/>
-    <loext:color loext:name="dk2" loext:color="#000000"/>
-    <loext:color loext:name="lt2" loext:color="#ffffff"/>
+   <loext:theme-colors loext:name="LibreOffice">
+    <loext:color loext:name="dark1" loext:color="#000000"/>
+    <loext:color loext:name="light1" loext:color="#ffffff"/>
+    <loext:color loext:name="dark2" loext:color="#000000"/>
+    <loext:color loext:name="light2" loext:color="#ffffff"/>
     <loext:color loext:name="accent1" loext:color="#18a303"/>
     <loext:color loext:name="accent2" loext:color="#0369a3"/>
     <loext:color loext:name="accent3" loext:color="#a33e03"/>
     <loext:color loext:name="accent4" loext:color="#8e03a3"/>
     <loext:color loext:name="accent5" loext:color="#c99c00"/>
     <loext:color loext:name="accent6" loext:color="#c9211e"/>
-    <loext:color loext:name="hlink" loext:color="#0000ee"/>
-    <loext:color loext:name="folHlink" loext:color="#551a8b"/>
-   </loext:color-table>
+    <loext:color loext:name="hyperlink" loext:color="#0000ee"/>
+    <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/>
+   </loext:theme-colors>
   </loext:theme>
  </office:styles>
  <office:automatic-styles>
@@ -392,4 +392,4 @@
     </draw:custom-shape></text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt
index 26c32e0cafce..85f1f6f9de89 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt
@@ -319,20 +319,20 @@
    <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
   </style:default-page-layout>
   <loext:theme loext:name="Office Theme">
-   <loext:color-table loext:name="Office">
-    <loext:color loext:name="dk1" loext:color="#000000"/>
-    <loext:color loext:name="lt1" loext:color="#ffffff"/>
-    <loext:color loext:name="dk2" loext:color="#1f497d"/>
-    <loext:color loext:name="lt2" loext:color="#eeece1"/>
+   <loext:theme-colors loext:name="Office">
+    <loext:color loext:name="dark1" loext:color="#000000"/>
+    <loext:color loext:name="light1" loext:color="#ffffff"/>
+    <loext:color loext:name="dark2" loext:color="#1f497d"/>
+    <loext:color loext:name="light2" loext:color="#eeece1"/>
     <loext:color loext:name="accent1" loext:color="#4f81bd"/>
     <loext:color loext:name="accent2" loext:color="#c0504d"/>
     <loext:color loext:name="accent3" loext:color="#9bbb59"/>
     <loext:color loext:name="accent4" loext:color="#8064a2"/>
     <loext:color loext:name="accent5" loext:color="#4bacc6"/>
     <loext:color loext:name="accent6" loext:color="#f79646"/>
-    <loext:color loext:name="hlink" loext:color="#0000ff"/>
-    <loext:color loext:name="folHlink" loext:color="#800080"/>
-   </loext:color-table>
+    <loext:color loext:name="hyperlink" loext:color="#0000ff"/>
+    <loext:color loext:name="followed-hyperlink" loext:color="#800080"/>
+   </loext:theme-colors>
   </loext:theme>
  </office:styles>
  <office:automatic-styles>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt
index e1bd186e773d..ea343737ff6a 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt
@@ -319,20 +319,20 @@
    <style:page-layout-properties style:writing-mode="lr-tb" style:layout-grid-standard-mode="true"/>
   </style:default-page-layout>
   <loext:theme loext:name="Office Theme">
-   <loext:color-table loext:name="Office">
-    <loext:color loext:name="dk1" loext:color="#000000"/>
-    <loext:color loext:name="lt1" loext:color="#ffffff"/>
-    <loext:color loext:name="dk2" loext:color="#1f497d"/>
-    <loext:color loext:name="lt2" loext:color="#eeece1"/>
+   <loext:theme-colors loext:name="Office">
+    <loext:color loext:name="dark1" loext:color="#000000"/>
+    <loext:color loext:name="light1" loext:color="#ffffff"/>
+    <loext:color loext:name="dark2" loext:color="#1f497d"/>
+    <loext:color loext:name="light2" loext:color="#eeece1"/>
     <loext:color loext:name="accent1" loext:color="#4f81bd"/>
     <loext:color loext:name="accent2" loext:color="#c0504d"/>
     <loext:color loext:name="accent3" loext:color="#9bbb59"/>
     <loext:color loext:name="accent4" loext:color="#8064a2"/>
     <loext:color loext:name="accent5" loext:color="#4bacc6"/>
     <loext:color loext:name="accent6" loext:color="#f79646"/>
-    <loext:color loext:name="hlink" loext:color="#0000ff"/>
-    <loext:color loext:name="folHlink" loext:color="#800080"/>
-   </loext:color-table>
+    <loext:color loext:name="hyperlink" loext:color="#0000ff"/>
+    <loext:color loext:name="followed-hyperlink" loext:color="#800080"/>
+   </loext:theme-colors>
   </loext:theme>
  </office:styles>
  <office:automatic-styles>