diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcf463ba9..a56458aea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,7 @@ All notable changes to this project will be documented in this file.
   which ressembles Flash Pro UI. Easier moving objects,
   resizing, adding frames, adding objects to stage. Instance property editation.
   Undo / redo feature. WIP
-
-- Cache as bitmap background color support (rendering)
+- Cache as bitmap background color support (rendering, image and FLA export)
 
 ### Fixed
 - [#2344] Export to FLA CS4 and below with more than 255 library items,
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
index b73d4d6d3..ad141b5f1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
@@ -1316,6 +1316,9 @@ public class XFLConverter {
         if (!isVisible && flaVersion.ordinal() >= FLAVersion.CS5_5.ordinal()) {
             writer.writeAttribute("isVisible", false);
         }
+        if (backgroundColor != null) {
+            writer.writeAttribute("bits32", false);
+        }
         writer.writeStartElement("matrix");
         convertMatrix(matrix, writer);
         writer.writeEndElement();
@@ -2510,6 +2513,9 @@ public class XFLConverter {
                             } else {
                                 isVisible = true;
                             }
+                            if (po.getBackgroundColor() != null) {
+                                backGroundColor = po.getBackgroundColor();
+                            }
                         } else {
                             metadata = po.getAmfData();
                             matrix = po.getMatrix();
@@ -2521,6 +2527,7 @@ public class XFLConverter {
                             ratio = po.getRatio();
                             clipActions = po.getClipActions();
                             isVisible = po.isVisible();
+                            backGroundColor = po.getBackgroundColor();
                         }
                     }
                 }
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics.swf b/libsrc/ffdec_lib/testdata/graphics/graphics.swf
index 6aa77757b..8ec843f6d 100644
Binary files a/libsrc/ffdec_lib/testdata/graphics/graphics.swf and b/libsrc/ffdec_lib/testdata/graphics/graphics.swf differ
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics/DOMDocument.xml b/libsrc/ffdec_lib/testdata/graphics/graphics/DOMDocument.xml
index 38a85a1bf..a32101fcb 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/DOMDocument.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/DOMDocument.xml
@@ -1,7 +1,7 @@
 <DOMDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" width="500" currentTimeline="1" xflVersion="2.2" creatorInfo="Adobe Flash Professional CS6" platform="Windows" versionInfo="Saved by Adobe Flash Windows 12.0 build 481" majorVersion="12" buildNumber="481" timelineLabelWidth="236" viewAngle3D="50.6510299754819" nextSceneIdentifier="87" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false" autoSaveEnabled="true" autoSaveHasPrompted="true">
      <fonts>
-          <DOMFontItem name="MyFont" itemID="6546c026-00000d2d" font="TimesNewRomanPSMT" size="0" id="1" sourceLastImported="1615735628" embedRanges="1|2"/>
           <DOMFontItem name="Font 2" itemID="604e7a9e-00000444" font="TimesNewRomanPS-BoldMT" size="30" id="2" sourceLastImported="1615755934" embedRanges="1|2"/>
+          <DOMFontItem name="MyFont" itemID="6546c026-00000d2d" font="TimesNewRomanPSMT" size="0" id="1" sourceLastImported="1615735628" embedRanges="1|2"/>
      </fonts>
      <media>
           <DOMBitmapItem name="bitmapfill.png" itemID="604dcb84-00000229" sourceLastImported="1615711005" externalFileSize="1931" useImportedJPEGData="false" compressionType="lossless" originalCompressionType="lossless" quality="50" href="bitmapfill.png" bitmapDataHRef="M 2 1615711026.dat" frameRight="640" frameBottom="1280"/>
@@ -36,7 +36,7 @@
           <Include href="VideoSprite.xml" loadImmediate="false" itemID="60672f60-00000201" lastModified="1617375202"/>
      </symbols>
      <timelines>
-          <DOMTimeline name="Scene 1" currentFrame="65">
+          <DOMTimeline name="Scene 1" currentFrame="66">
                <layers>
                     <DOMLayer name="Scripts layer" color="#9933CC" autoNamed="false">
                          <frames>
@@ -64,7 +64,7 @@ stop();]]></script>
                     </DOMLayer>
                     <DOMLayer name="Prev next buttons" color="#4FFF4F" locked="true" autoNamed="false">
                          <frames>
-                              <DOMFrame index="0" duration="66" keyMode="9728">
+                              <DOMFrame index="0" duration="67" keyMode="9728">
                                    <elements>
                                         <DOMSymbolInstance libraryItemName="btnNext" symbolType="button">
                                              <matrix>
@@ -333,10 +333,10 @@ stop();]]></script>
                                              <edges>
                                                   <Edge fillStyle1="2" edges="
 !5000 2500|6500 2500!6500 2500|6500 5500!6500 5500|3500 5500!3500 5500|3500 4001"/>
-                                                  <Edge fillStyle1="1" edges="
-!3500 4001|2000 4001!2000 4001|2000 1001!2000 1001|5000 1001!5000 1001|5000 2500"/>
                                                   <Edge fillStyle0="1" fillStyle1="2" edges="
 !3500 4001|3500 2500!3500 2500|5000 2500"/>
+                                                  <Edge fillStyle0="1" edges="
+!5000 2500|5000 1001!5000 1001|2000 1001!2000 1001|2000 4001!2000 4001|3500 4001"/>
                                              </edges>
                                         </DOMShape>
                                    </elements>
@@ -865,10 +865,10 @@ stop();]]></script>
 !3980 1990|2980 1990!2980 1990|2980 990!2980 990|3980 990!3980 990|3980 1990"/>
                                                   <Edge strokeStyle="5" edges="
 !1960 990|1960 1990!1960 1990|960 1990!960 1990|960 990!960 990|1960 990"/>
-                                                  <Edge strokeStyle="7" edges="
-!1980 4990|980 4990!980 4990|980 3990!980 3990|1980 3990!1980 3990|1980 4990"/>
                                                   <Edge strokeStyle="6" edges="
 !2980 3990|3980 3990!3980 3990|3980 4990!3980 4990|2980 4990!2980 4990|2980 3990"/>
+                                                  <Edge strokeStyle="7" edges="
+!1980 4990|980 4990!980 4990|980 3990!980 3990|1980 3990!1980 3990|1980 4990"/>
                                                   <Edge strokeStyle="8" edges="
 !5980 3990|5980 4990!5980 4990|4980 4990!4980 4990|4980 3990!4980 3990|5980 3990"/>
                                                   <Edge cubics="!1960 990(;1960,990 1960,1990 1960,1990q1960 990 1960 1990);"/>
@@ -1467,18 +1467,18 @@ stop();]]></script>
                                                   </StrokeStyle>
                                              </strokes>
                                              <edges>
-                                                  <Edge strokeStyle="2" edges="
-!3500 1000|3500 2000!3500 2000|2500 2000!2500 2000|2500 1000"/>
                                                   <Edge strokeStyle="5" edges="
 !5000 1000|5000 2000!5000 2000|4000 2000!4000 2000|4000 1000"/>
+                                                  <Edge strokeStyle="2" edges="
+!3500 1000|3500 2000!3500 2000|2500 2000!2500 2000|2500 1000"/>
                                                   <Edge strokeStyle="1" edges="
 !2000 1000|2000 2000!2000 2000|1000 2000!1000 2000|1000 1000"/>
-                                                  <Edge strokeStyle="6" edges="
-!4647 3660/4942 4670!4942 4670/5019 3660"/>
-                                                  <Edge strokeStyle="3" edges="
-!2553 3660/2848 4670!2848 4670/2925 3660"/>
                                                   <Edge strokeStyle="4" edges="
 !1000 3660/1295 4670!1295 4670/1372 3660"/>
+                                                  <Edge strokeStyle="3" edges="
+!2553 3660/2848 4670!2848 4670/2925 3660"/>
+                                                  <Edge strokeStyle="6" edges="
+!4647 3660/4942 4670!4942 4670/5019 3660"/>
                                                   <Edge cubics="!5000 2000(;5000,2000 4000,2000 4000,2000q5000 2000 4000 2000);"/>
                                                   <Edge cubics="!4000 2000(4000,2000;4000,2000 4000,1000 4000,1000q4000 2000 4000 1000);"/>
                                                   <Edge cubics="!5000 1000(;5000,1000 5000,2000 5000,2000q5000 1000 5000 2000);"/>
@@ -2662,6 +2662,48 @@ stop();]]></script>
                                         </DOMStaticText>
                                    </elements>
                               </DOMFrame>
+                              <DOMFrame index="66" keyMode="9728">
+                                   <elements>
+                                        <DOMSymbolInstance libraryItemName="PinkCircle" cacheAsBitmap="true" centerPoint3DX="100" centerPoint3DY="125">
+                                             <matrix>
+                                                  <Matrix tx="75" ty="100"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="25" y="25"/>
+                                             </transformationPoint>
+                                        </DOMSymbolInstance>
+                                        <DOMSymbolInstance libraryItemName="PinkCircle" cacheAsBitmap="true" centerPoint3DX="200" centerPoint3DY="125" bits32="false">
+                                             <matrix>
+                                                  <Matrix tx="175" ty="100"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="25" y="25"/>
+                                             </transformationPoint>
+                                             <MatteColor color="#00FF00"/>
+                                        </DOMSymbolInstance>
+                                        <DOMSymbolInstance libraryItemName="PinkCircle" cacheAsBitmap="true" blendMode="subtract" centerPoint3DX="300" centerPoint3DY="125" bits32="false">
+                                             <matrix>
+                                                  <Matrix tx="275" ty="100"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="25" y="25"/>
+                                             </transformationPoint>
+                                             <MatteColor color="#00FF00"/>
+                                        </DOMSymbolInstance>
+                                        <DOMSymbolInstance libraryItemName="PinkCircle" cacheAsBitmap="true" blendMode="subtract" centerPoint3DX="400" centerPoint3DY="125" bits32="false">
+                                             <matrix>
+                                                  <Matrix tx="375" ty="100"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="25" y="25"/>
+                                             </transformationPoint>
+                                             <color>
+                                                  <Color redMultiplier="0.1015625" blueMultiplier="0.1015625" greenMultiplier="0.5" redOffset="100"/>
+                                             </color>
+                                             <MatteColor color="#00FF00"/>
+                                        </DOMSymbolInstance>
+                                   </elements>
+                              </DOMFrame>
                          </frames>
                     </DOMLayer>
                     <DOMLayer name="Texts inside layer" color="#FF800A" autoNamed="false">
@@ -4056,6 +4098,23 @@ stop();]]></script>
                                         </DOMStaticText>
                                    </elements>
                               </DOMFrame>
+                              <DOMFrame index="66" keyMode="9728">
+                                   <elements>
+                                        <DOMStaticText width="446" height="33.25" includeOutlines="true" isSelectable="false">
+                                             <matrix>
+                                                  <Matrix tx="22" ty="342"/>
+                                             </matrix>
+                                             <textRuns>
+                                                  <DOMTextRun>
+                                                       <characters>067 CacheAsBitmap + BGColor</characters>
+                                                       <textAttrs>
+                                                            <DOMTextAttrs aliasText="false" size="30" face="TimesNewRomanPSMT"/>
+                                                       </textAttrs>
+                                                  </DOMTextRun>
+                                             </textRuns>
+                                        </DOMStaticText>
+                                   </elements>
+                              </DOMFrame>
                          </frames>
                     </DOMLayer>
                </layers>
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml
index c6115f532..ed64c39a3 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml
@@ -28,83 +28,81 @@
                     </StrokeStyle>
                   </strokes>
                   <edges>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2747 364|2637 364!2637 364|2637 249"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2500 500|2500 750"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2500 750|2250 750!2250 750|2250 1000!2250 1000|2500 1000"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2500 1000|2500 1250"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2500 1250|2250 1250!2250 1250|2250 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2250 1500|2000 1500!2000 1500|1750 1500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1750 1500|1750 1250!1750 1250|1500 1250!1500 1250|1500 1000!1500 1000|1500 750!1500 750|1500 500"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!1500 500|1750 500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1750 500|1750 0"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!1750 0|1500 0!1500 0|1250 0"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1250 0|1250 500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1250 500|1250 750!1250 750|1000 750!1000 750|1000 1000!1000 1000|750 1000!750 1000|750 1250!750 1250|1000 1250!1000 1250|1250 1250!1250 1250|1250 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!1250 1500|1000 1500!1000 1500|750 1500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!750 1500|750 1250!750 1250|500 1250"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!500 1250|500 1500"/>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!500 1500|0 1500"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2747 364|2637 364!2637 364/2864 137!2637 364|2637 249"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2500 500|2500 750!2500 750|2500 1000!2500 1000|2500 1250!2500 1250|2500 1500!2500 1500|2250 1500!2250 1500|2000 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2000 1500|2000 2000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!2000 2000|1750 2000"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1750 2000|1750 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!1750 1500|1500 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1500 1500|1500 1250!1500 1250|1250 1250!1250 1250|1250 1000!1250 1000|1250 750!1250 750|1500 750!1500 750|1500 500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1500 500|1500 0"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!1500 0|1250 0!1250 0|1000 0!1000 0|750 0!750 0|500 0"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!500 0|500 500!500 500|0 500"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!0 500|0 750!0 750|0 1000!0 1000|0 1250!0 1250|0 1500"/>
                     <Edge fillStyle0="2" strokeStyle="1" edges="!0 1500|0 2000!0 2000|500 2000"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!500 2000|750 2000"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!750 2000|750 1500"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!3000 750|3000 500"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!3000 500|2500 500!2500 500|2500 0"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!2500 0|2250 0"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2250 0|2250 500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2250 500|2250 750"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2637 364/2864 137"/>
-                    <Edge fillStyle0="2" strokeStyle="1" edges="!3000 500|3000 0!3000 0|2500 0"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!3000 750|2500 750"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2500 750|2500 1000"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!2250 0|2000 0!2000 0|1750 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2000 500|2000 750!2000 750|1750 750!1750 750|1750 500"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!1750 500|2000 500!2000 500|2250 500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2000 0|2000 500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2250 1000|2000 1000!2000 1000|2000 1250!2000 1250|1750 1250!1750 1250|1750 1000!1750 1000|2000 1000!2000 1000|2000 750!2000 750|2250 750!2250 1000|2250 1250!2250 1250|2000 1250!2000 1250|2000 1500"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="!3000 750|3000 1000!3000 1000|3000 1250!3000 1250|3000 1500"/>
-                    <Edge fillStyle1="2" strokeStyle="1" edges="!3000 1500|3000 2000!3000 2000|2500 2000"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="!2500 2000|2250 2000!2250 2000|2000 2000!2000 2000|1750 2000!1750 2000|1500 2000!1500 2000|1250 2000!1250 2000|1000 2000!1000 2000|750 2000"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2637 1747|2637 1637!2637 1637|2752 1637"/>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!3000 1500|2500 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2500 1500|2250 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2250 1500|2250 2000!2500 1000|3000 1000!3000 1250|2500 1250"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2500 1250|2500 1500"/>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!2500 1500|2500 2000"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2637 1637/2865 1864"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2250 500|2500 500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1750 750|1750 1000!1750 1000|1500 1000!1500 1000|1250 1000!1250 1000|1000 1000!1000 1000|1000 1250!1000 1250|1000 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1000 1500|1000 2000"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!750 500|750 750!750 750|1000 750!1000 750|1000 500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!1000 500|750 500!750 500|500 500"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!500 500|0 500"/>
-                    <Edge fillStyle1="2" strokeStyle="1" edges="!0 500|0 0!0 0|500 0"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!500 0|500 500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!1500 500|1250 500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1500 750|1250 750!1250 750|1250 1000!1250 1000|1250 1250!1250 1250|1500 1250!1500 1250|1500 1500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!1500 1500|1750 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1750 1500|1750 2000!1500 0|1500 500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!1250 500|1000 500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1000 500|1000 0"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!1000 0|750 0"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!750 0|750 500"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!1250 0|1000 0"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="!500 0|750 0"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!249 365|364 365!364 365/137 137!364 365|364 255"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="!0 1500|0 1250!0 1250|0 1000!0 1000|0 750!0 750|0 500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!500 500|500 750"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!500 750|0 750"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!500 1000|750 1000!750 1000|750 750!750 750|500 750"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!500 750|500 1000!500 1000|500 1250"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!500 1250|0 1250"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!137 1865/365 1637!365 1637|255 1637!365 1637|365 1752"/>
+                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!500 2000|500 1500"/>
                     <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!500 1500|750 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!750 1500|750 2000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!750 2000|500 2000"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!3000 750|3000 500"/>
+                    <Edge fillStyle0="2" strokeStyle="1" edges="!3000 500|3000 0!3000 0|2500 0"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!2500 0|2250 0!2250 0|2000 0"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2000 0|2000 500"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2000 500|2250 500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2250 500|2250 750!2250 750|2250 1000!2250 1000|2250 1250!2250 1250|2250 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2250 1500|2250 2000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!2250 2000|2000 2000"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!3000 750|2500 750"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2500 750|2250 750!2250 750|2000 750!2000 750|2000 1000!2000 1000|1750 1000!1750 1000|1750 1250!1750 1250|2000 1250!2000 1250|2000 1000!2000 1000|2250 1000!2250 1000|2500 1000"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2500 1000|3000 1000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!3000 1000|3000 1250"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!3000 1250|2500 1250"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2500 1250|2250 1250!2250 1250|2000 1250"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!3000 500|2500 500!2500 500|2500 0"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!2000 0|1750 0!1750 0|1500 0"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2000 500|2000 750!2000 750|1750 750!1750 750|1500 750!1000 1500|1000 1250!1000 1250|1000 1000!1000 1000|1250 1000!1250 1000|1500 1000!1500 1000|1750 1000!1750 1000|1750 750!1750 750|1750 500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1750 500|1750 0"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!1000 500|1250 500!1250 500|1500 500!1500 500|1750 500!1750 500|2000 500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2250 0|2250 500"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2250 500|2500 500!2000 1500|1750 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2000 1250|2000 1500!1750 1500|1750 1250"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2637 1747|2637 1637!2637 1637/2865 1864!2637 1637|2752 1637"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!3000 1250|3000 1500"/>
+                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!3000 1500|2500 1500!2500 1500|2500 2000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!2500 2000|2250 2000!3000 750|3000 1000"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1250 750|1000 750!1000 750|1000 500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1000 500|1000 0"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1250 500|1250 750"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1250 0|1250 500"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!249 365|364 365!364 365|364 255!364 365/137 137"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!750 500|750 750!750 750|500 750"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!500 750|0 750"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!750 500|500 500!500 500|500 750!500 750|500 1000"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!500 1000|750 1000!750 1000|750 1250!750 1250|500 1250"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!500 1250|0 1250"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="!0 500|0 0!0 0|500 0"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!750 0|750 500"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!500 1000|500 1250!500 1250|500 1500"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!137 1865/365 1637!365 1637|365 1752!365 1637|255 1637"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!0 1000|500 1000"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!750 1500|750 1250!750 1250|1000 1250"/>
+                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!500 1500|0 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1500 1250|1500 1000"/>
                     <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!1250 1500|1500 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1000 1250|1250 1250!1250 1250|1250 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1250 1500|1250 2000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!1250 2000|1000 2000"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1000 2000|1000 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!1250 1500|1000 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1000 1000|750 1000!750 1000|750 750!750 750|1000 750!1000 750|1000 1000"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!1000 500|750 500"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!1000 1500|750 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1500 1000|1500 750"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!1500 2000|1250 2000!1000 2000|750 2000"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="!3000 1500|3000 2000!3000 2000|2500 2000"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1500 1500|1500 2000"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!500 1500|500 2000"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2000 2000|2000 1500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1500 750|1750 750"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1250 2000|1250 1500"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!1750 2000|1500 2000"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1750 1250|1500 1250"/>
                     <Edge cubics="!365 1637(;365,1637 365,1752 365,1752q365 1637 365 1752);"/>
                     <Edge cubics="!365 1637(;365,1637 255,1637 255,1637q365 1637 255 1637);"/>
                     <Edge cubics="!137 1865(;137,1865 365,1637 365,1637q137 1865 365 1637);"/>
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/Sprite1.xml b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/Sprite1.xml
index bfbd08dee..b8b5cd635 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/Sprite1.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/Sprite1.xml
@@ -25,8 +25,8 @@
                     </StrokeStyle>
                   </strokes>
                   <edges>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!3000 1132[2777 1000 2500 1000!2500 1000[2086 1000 1793 1293!1793 1293[1500 1586 1500 2000"/>
                     <Edge fillStyle0="1" strokeStyle="1" edges="!1500 2000[1500 2414 1793 2707!1793 2707[2086 3000 2500 3000!2500 3000[2914 3000 3207 2707!3207 2707[3500 2414 3500 2000!3500 2000[3500 1586 3207 1293!3207 1293[3110 1196 3000 1132"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!3000 1132[2777 1000 2500 1000!2500 1000[2086 1000 1793 1293!1793 1293[1500 1586 1500 2000"/>
                     <Edge fillStyle0="2" strokeStyle="1" edges="!3000 1132|3000 0!3000 0|0 0!0 0|0 2000!0 2000|1500 2000"/>
                   </edges>
                 </DOMShape>
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/grid.xml b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/grid.xml
index 3ac90df2b..345298121 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/grid.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/grid.xml
@@ -28,74 +28,98 @@
                     </StrokeStyle>
                   </strokes>
                   <edges>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!2009 4|2009 0"/>
-                    <Edge fillStyle1="1" edges="!2009 0|2010 0!2010 0|2010 4"/>
-                    <Edge fillStyle1="2" edges="!2010 4|2010 254"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2010 254|2009 254"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 254|2009 504"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2009 504|2010 504"/>
-                    <Edge fillStyle0="2" edges="!2010 504|2010 254"/>
                     <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!2010 4|2009 4"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!2009 4|1759 4"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 4|1759 254!1759 254|2009 254"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!2009 254|2009 4"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 4|2009 254"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2009 254|2010 254"/>
+                    <Edge fillStyle0="2" edges="!2010 254|2010 4"/>
+                    <Edge fillStyle1="1" edges="!2009 0|2010 0!2010 0|2010 4"/>
+                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!2009 4|2009 0"/>
+                    <Edge fillStyle0="2" edges="!2009 0|1759 0"/>
                     <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1759 0|1759 4"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!1759 4|1509 4"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1509 4|1509 254!1509 254|1759 254!1759 254|1759 504!1759 504|1509 504!1509 504|1259 504!1259 504|1259 254!1259 254|1259 4"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!1259 4|1509 4"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1509 4|1509 0"/>
-                    <Edge fillStyle0="2" edges="!1509 0|1259 0"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1259 0|1259 4"/>
-                    <Edge fillStyle0="2" edges="!2009 0|1759 0!1759 0|1509 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 504|1759 754!1759 754|1509 754!1509 754|1259 754!1259 754|1259 1004"/>
-                    <Edge fillStyle0="3" strokeStyle="1" edges="!1259 1004|1509 1004!1509 1004|1759 1004"/>
-                    <Edge fillStyle0="2" edges="!1759 1004|1759 1005!1759 1005|2009 1005!2009 1005|2009 1004"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 1004|1759 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 1004|1759 754!2009 754|1759 754"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 504|2009 754"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2009 754|2010 754"/>
-                    <Edge fillStyle1="2" edges="!2010 754|2010 1004"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!1759 4|2009 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 4|1759 254!1759 254|2009 254!1759 254|1759 504!1759 504|2009 504"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!2009 504|2009 254"/>
+                    <Edge fillStyle1="2" edges="!2010 254|2010 504!2010 504|2010 754!2010 754|2010 1004"/>
                     <Edge fillStyle1="2" strokeStyle="1" edges="!2010 1004|2009 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!2009 1004|2009 754"/>
-                    <Edge fillStyle1="2" edges="!2010 504|2010 754"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 504|2009 504!1259 254|1509 254!1509 254|1509 504!1009 4|1009 254!1009 254|1259 254"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1009 4|1009 0"/>
-                    <Edge fillStyle0="2" edges="!1009 0|759 0!759 0|509 0!509 0|259 0"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!259 0|259 4"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!259 4|509 4!509 4|759 4"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!759 4|759 254!759 254|759 504!759 504|509 504!509 504|509 754!509 754|259 754!259 754|259 504!259 504|9 504"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!9 504|0 504"/>
-                    <Edge fillStyle1="2" edges="!0 504|0 254!0 254|0 4"/>
-                    <Edge fillStyle1="1" edges="!0 4|0 0!0 0|9 0"/>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!9 0|9 4"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!9 4|259 4"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!509 754|759 754!759 754|1009 754!1009 754|1009 504!1009 504|1009 254!1009 254|759 254!759 254|509 254!509 254|509 4"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!509 4|509 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1509 504|1509 754!1509 754|1509 1004!1009 1004|1009 754!1009 754|1259 754!1259 754|1259 504"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!1259 4|1009 4"/>
-                    <Edge fillStyle0="2" edges="!1259 0|1009 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1259 504|1009 504!1009 504|759 504"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!759 0|759 4"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!759 4|1009 4"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!0 4|9 4"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!9 4|9 254!9 254|9 504!9 504|9 754"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!9 754|259 754!259 754|259 1004"/>
-                    <Edge fillStyle1="3" strokeStyle="1" edges="!259 1004|9 1004"/>
-                    <Edge fillStyle1="2" strokeStyle="1" edges="!9 1004|0 1004"/>
-                    <Edge fillStyle1="2" edges="!0 1004|0 754"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!0 754|9 754!0 254|9 254"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!9 254|259 254!259 254|259 4"/>
-                    <Edge fillStyle0="2" edges="!259 0|9 0!0 504|0 754"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!759 504|759 754!759 754|759 1004"/>
-                    <Edge fillStyle0="3" strokeStyle="1" edges="!759 1004|1009 1004"/>
-                    <Edge fillStyle0="2" edges="!1009 1004|1009 1005!1009 1005|1259 1005!1259 1005|1259 1004"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!1259 1004|1009 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!509 504|509 254!509 254|259 254!259 254|259 504!259 504|509 504"/>
+                    <Edge fillStyle1="2" edges="!2009 1004|2009 1005!2009 1005|1759 1005!1759 1005|1759 1004"/>
+                    <Edge fillStyle1="3" strokeStyle="1" edges="!1759 1004|1509 1004!1509 1004|1259 1004"/>
+                    <Edge fillStyle1="2" edges="!1259 1004|1259 1005!1259 1005|1009 1005!1009 1005|1009 1004"/>
+                    <Edge fillStyle1="3" strokeStyle="1" edges="!1009 1004|759 1004"/>
                     <Edge fillStyle1="2" edges="!759 1004|759 1005!759 1005|509 1005!509 1005|509 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!509 1004|759 1004"/>
-                    <Edge fillStyle1="3" strokeStyle="1" edges="!509 1004|259 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!509 1004|509 754"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!9 754|9 1004"/>
+                    <Edge fillStyle1="3" strokeStyle="1" edges="!509 1004|259 1004!259 1004|9 1004"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="!9 1004|0 1004"/>
+                    <Edge fillStyle1="2" edges="!0 1004|0 754!0 754|0 504!0 504|0 254!0 254|0 4"/>
+                    <Edge fillStyle1="1" edges="!0 4|0 0!0 0|9 0"/>
+                    <Edge fillStyle1="2" edges="!9 0|259 0!259 0|509 0!509 0|759 0!759 0|1009 0!1009 0|1259 0!1259 0|1509 0!1509 0|1759 0"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2009 754|2010 754"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 504|2009 754"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2009 754|1759 754!1759 754|1759 1004"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!1759 1004|2009 1004!2009 1004|2009 754"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 504|1759 754"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2009 504|2010 504"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1259 4|1259 254!1259 254|1509 254!1509 254|1509 4"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!1509 4|1259 4"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1509 4|1509 0!1259 0|1259 4!1009 4|1009 0"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1009 4|1009 254!1009 254|1259 254!1009 504|759 504!759 504|759 754!759 754|1009 754!1009 754|1009 504!1009 754|1259 754!1259 754|1259 504!1259 504|1009 504!1759 504|1509 504!1509 504|1509 754!1509 754|1759 754!1509 504|1259 504!1509
+ 1004|1509 754!1509 754|1259 754!1259 754|1259 1004"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="
+!1259 4|1009 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!1009 504|1009 254!1009 254|759 254!759 254|759 504!1759 254|1509 254!1509 254|1509 504!1259 504|1259 254"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!759 0|759 4"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="
+!759 4|1009 4"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!509 4|509 0"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!259 4|259 254!259 254|509 254!509 254|509 4"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="
+!509 4|259 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!759 254|509 254!509 254|509 504!509 504|759 504"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="
+!509 4|759 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!759 4|759 254"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!259 0|259 4"/>
+                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="
+!9 0|9 4"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="
+!9 4|259 4"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="
+!0 4|9 4"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!0 254|9 254"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="
+!9 254|9 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!9 254|259 254"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!0 754|9 754"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="
+!9 754|9 504"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!9 504|0 504"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!9 754|259 754!259 754|259 504!259 504|9 504!509 504|509 754!509 754|759 754!259 254|259 504!259 504|509 504"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="
+!9 254|9 504"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!509 1004|509 754!509 754|259 754!259 754|259 1004"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="
+!509 1004|759 1004"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!759 1004|759 754"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="
+!1259 1004|1009 1004"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="
+!9 754|9 1004"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!1009 1004|1009 754"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="
+!1759 4|1509 4"/>
                     <Edge cubics="!259 254(;259,254 509,254 509,254q259 254 509 254);"/>
                     <Edge cubics="!509 254(;509,254 759,254 759,254q509 254 759 254);"/>
                     <Edge cubics="!759 254(;759,254 1009,254 1009,254q759 254 1009 254)1009,254;"/>
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/graphics/graphics/META-INF/metadata.xml
index d8136706a..51a465f5a 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/META-INF/metadata.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/META-INF/metadata.xml
@@ -5,8 +5,8 @@
             xmlns:xmp="http://ns.adobe.com/xap/1.0/">
          <xmp:CreatorTool>Adobe Flash Professional CS6 - build 481</xmp:CreatorTool>
          <xmp:CreateDate>2021-03-14T08:29:20+01:00</xmp:CreateDate>
-         <xmp:MetadataDate>2023-11-26T09:37:30-08:00</xmp:MetadataDate>
-         <xmp:ModifyDate>2023-11-26T09:37:30-08:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2024-10-23T12:34:08-07:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2024-10-23T12:34:08-07:00</xmp:ModifyDate>
       </rdf:Description>
       <rdf:Description rdf:about=""
             xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -15,7 +15,7 @@
       <rdf:Description rdf:about=""
             xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
             xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
-         <xmpMM:InstanceID>xmp.iid:08941A39768CEE118671C1302BB7E893</xmpMM:InstanceID>
+         <xmpMM:InstanceID>xmp.iid:F8090D38FC8FEF119A09BEAA35197FE1</xmpMM:InstanceID>
          <xmpMM:DocumentID>xmp.did:D6D3FE199784EB1187FEAE6972EC5115</xmpMM:DocumentID>
          <xmpMM:OriginalDocumentID>xmp.did:D6D3FE199784EB1187FEAE6972EC5115</xmpMM:OriginalDocumentID>
          <xmpMM:History>
@@ -176,6 +176,12 @@
                   <stEvt:when>2021-03-14T08:29:20+01:00</stEvt:when>
                   <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
                </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>created</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:F8090D38FC8FEF119A09BEAA35197FE1</stEvt:instanceID>
+                  <stEvt:when>2021-03-14T08:29:20+01:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
+               </rdf:li>
             </rdf:Seq>
          </xmpMM:History>
       </rdf:Description>
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/graphics/graphics/bin/SymDepend.cache
index 718d5922e..2f1b001e6 100644
Binary files a/libsrc/ffdec_lib/testdata/graphics/graphics/bin/SymDepend.cache and b/libsrc/ffdec_lib/testdata/graphics/graphics/bin/SymDepend.cache differ