diff --git a/lib/gnujpdf.jar b/lib/gnujpdf.jar
index abfe78561..523361000 100644
Binary files a/lib/gnujpdf.jar and b/lib/gnujpdf.jar differ
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/DualGraphics2D.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/DualGraphics2D.java
index d4e00150b..b1bda2060 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/DualGraphics2D.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/DualGraphics2D.java
@@ -325,9 +325,6 @@ public class DualGraphics2D extends Graphics2D {
     @Override
     public void setClip(Shape clip) {
         first.setClip(clip);
-        if (clip == null) {
-            clip = new Rectangle2D.Double(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE); //?
-        }
         second.setClip(clip);
     }
 
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics.swf b/libsrc/ffdec_lib/testdata/graphics/graphics.swf
index d9ced5380..5c8c10d9d 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 2aabe781e..f011aa50b 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" viewAngle3D="50.6510299754819" nextSceneIdentifier="21" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false">
+<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" viewAngle3D="50.6510299754819" nextSceneIdentifier="25" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false">
      <fonts>
-          <DOMFontItem name="Font 2" itemID="604e7a9e-00000444" font="TimesNewRomanPS-BoldMT" size="30" id="2" sourceLastImported="1615755934" embedRanges="1|2"/>
           <DOMFontItem name="Font 1" itemID="604e2b4c-00000400" 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"/>
      </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"/>
@@ -29,7 +29,7 @@
           <Include href="Tween 2.xml" itemIcon="1" loadImmediate="false" itemID="604dcf92-00000243" lastModified="1615712146"/>
      </symbols>
      <timelines>
-          <DOMTimeline name="Scene 1" currentFrame="50">
+          <DOMTimeline name="Scene 1" currentFrame="51">
                <layers>
                     <DOMLayer name="Scripts layer" color="#9933CC" autoNamed="false">
                          <frames>
@@ -45,7 +45,7 @@
                          <frames>
                               <DOMFrame index="0" duration="54" keyMode="9728">
                                    <elements>
-                                        <DOMSymbolInstance libraryItemName="btnNext" selected="true" symbolType="button">
+                                        <DOMSymbolInstance libraryItemName="btnNext" symbolType="button">
                                              <matrix>
                                                   <Matrix tx="450"/>
                                              </matrix>
@@ -72,6 +72,46 @@
                               </DOMFrame>
                          </frames>
                     </DOMLayer>
+                    <DOMLayer name="Mask layer2" color="#9933CC" locked="true" autoNamed="false" layerType="mask">
+                         <frames>
+                              <DOMFrame index="0" duration="51" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
+                              <DOMFrame index="51" keyMode="9728">
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <SolidColor/>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="!7950 4500|5950 4500!5950 4500|5950 2500!5950 2500|7950 2500!7950 2500|7950 4500"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
+                    <DOMLayer name="Masked layer 2" color="#4FFF4F" parentLayerIndex="2" locked="true" current="true" isSelected="true" autoNamed="false">
+                         <frames>
+                              <DOMFrame index="0" duration="51" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
+                              <DOMFrame index="51" keyMode="9728">
+                                   <elements>
+                                        <DOMSymbolInstance libraryItemName="Sprite1" selected="true" centerPoint3DX="362.5" centerPoint3DY="175">
+                                             <matrix>
+                                                  <Matrix tx="275" ty="100"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="87.5" y="75"/>
+                                             </transformationPoint>
+                                        </DOMSymbolInstance>
+                                   </elements>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
                     <DOMLayer name="Mask layer" color="#9933CC" locked="true" autoNamed="false" layerType="mask">
                          <frames>
                               <DOMFrame index="0" duration="51" keyMode="9728">
@@ -79,34 +119,34 @@
                               </DOMFrame>
                               <DOMFrame index="51" keyMode="9728">
                                    <elements>
-                                        <DOMShape selected="true" isFloating="true">
-                                             <matrix>
-                                                  <Matrix a="1.03092956542969" d="1.01626586914063" tx="-14.65" ty="-4.1"/>
-                                             </matrix>
+                                        <DOMShape>
                                              <fills>
                                                   <FillStyle index="1">
                                                        <SolidColor/>
                                                   </FillStyle>
                                              </fills>
                                              <edges>
-                                                  <Edge fillStyle1="1" edges="!4649 2540S2[5051 2540 5335 2900!5335 2900[5619 3260 5619 3770!5619 3770[5619 4280 5335 4640!5335 4640[5051 5000 4649 5000!4649 5000[4247 5000 3963 4640!3963 4640[3679 4280 3679 3770!3679 3770[3679 3260 3963 2900!3963 2900[4247 2540 4649
- 2540"/>
+                                                  <Edge fillStyle1="1" edges="!3207 2865[3500 3231 3500 3749!3500 3749[3500 4268 3207 4633!3207 4633[2914 4999 2500 4999!2500 4999[2085 4999 1793 4633!1793 4633[1500 4268 1500 3749!1500 3749[1500 3231 1793 2865!1793 2865[2085 2499 2500 2499!2500 2499[2914 2499 3207
+ 2865"/>
                                              </edges>
                                         </DOMShape>
                                    </elements>
                               </DOMFrame>
+                              <DOMFrame index="52" duration="2" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
                          </frames>
                     </DOMLayer>
-                    <DOMLayer name="Masked layer" color="#4FFF4F" parentLayerIndex="2" locked="true" autoNamed="false">
+                    <DOMLayer name="Masked layer" color="#4FFF4F" parentLayerIndex="4" locked="true" autoNamed="false">
                          <frames>
                               <DOMFrame index="0" duration="51" keyMode="9728">
                                    <elements/>
                               </DOMFrame>
                               <DOMFrame index="51" keyMode="9728">
                                    <elements>
-                                        <DOMSymbolInstance libraryItemName="Sprite1" centerPoint3DX="237.5" centerPoint3DY="175">
+                                        <DOMSymbolInstance libraryItemName="Sprite1" centerPoint3DX="137.5" centerPoint3DY="175">
                                              <matrix>
-                                                  <Matrix tx="150" ty="100"/>
+                                                  <Matrix tx="50" ty="100"/>
                                              </matrix>
                                              <transformationPoint>
                                                   <Point x="87.5" y="75"/>
@@ -114,6 +154,9 @@
                                         </DOMSymbolInstance>
                                    </elements>
                               </DOMFrame>
+                              <DOMFrame index="52" duration="2" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
                          </frames>
                     </DOMLayer>
                     <DOMLayer name="Graphics layer" color="#4FFF4F" autoNamed="false">
@@ -728,10 +771,10 @@
 !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="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="6" edges="
+!2980 3990|3980 3990!3980 3990|3980 4990!3980 4990|2980 4990!2980 4990|2980 3990"/>
                                                   <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);"/>
@@ -1250,7 +1293,7 @@
                                         </DOMStaticText>
                                         <DOMSymbolInstance libraryItemName="Stroke 1" symbolType="graphic" loop="loop">
                                              <matrix>
-                                                  <Matrix a="1.33747863769531" d="0.488235473632813" tx="16" ty="193"/>
+                                                  <Matrix a="1.33746337890625" d="0.488235473632813" tx="16" ty="193"/>
                                              </matrix>
                                              <transformationPoint>
                                                   <Point/>
@@ -1330,18 +1373,18 @@
                                                   </StrokeStyle>
                                              </strokes>
                                              <edges>
-                                                  <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="5" edges="
+!5000 1000|5000 2000!5000 2000|4000 2000!4000 2000|4000 1000"/>
                                                   <Edge strokeStyle="1" edges="
 !2000 1000|2000 2000!2000 2000|1000 2000!1000 2000|1000 1000"/>
-                                                  <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 strokeStyle="3" edges="
+!2553 3660/2848 4670!2848 4670/2925 3660"/>
+                                                  <Edge strokeStyle="4" edges="
+!1000 3660/1295 4670!1295 4670/1372 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);"/>
@@ -1947,7 +1990,7 @@
                                                   <FillStyle index="1">
                                                        <LinearGradient interpolationMethod="linearRGB">
                                                             <matrix>
-                                                                 <Matrix a="0.244140625" d="0.06103515625" tx="250" ty="100"/>
+                                                                 <Matrix a="0.244140625" d="0.0610198974609375" tx="250" ty="100"/>
                                                             </matrix>
                                                             <GradientEntry color="#FF0000" ratio="0"/>
                                                             <GradientEntry color="#00FF00" ratio="0.250980392156863"/>
@@ -1997,7 +2040,7 @@
                               </DOMFrame>
                          </frames>
                     </DOMLayer>
-                    <DOMLayer name="Texts inside layer" color="#FF800A" current="true" isSelected="true" autoNamed="false">
+                    <DOMLayer name="Texts inside layer" color="#FF800A" autoNamed="false">
                          <frames>
                               <DOMFrame index="0" duration="16" keyMode="9728">
                                    <elements/>
@@ -3243,6 +3286,16 @@
      </timelines>
      <PrinterSettings/>
      <publishHistory>
+          <PublishItem publishSize="108381" publishTime="1615971629"/>
+          <PublishItem publishSize="1483" publishTime="1615971614"/>
+          <PublishItem publishSize="1483" publishTime="1615971614"/>
+          <PublishItem publishSize="1483" publishTime="1615971614"/>
+          <PublishItem publishSize="1483" publishTime="1615971614"/>
+          <PublishItem publishSize="108489" publishTime="1615970100"/>
+          <PublishItem publishSize="108320" publishTime="1615968777"/>
+          <PublishItem publishSize="108352" publishTime="1615967837"/>
+          <PublishItem publishSize="108339" publishTime="1615967290"/>
+          <PublishItem publishSize="108324" publishTime="1615966926"/>
           <PublishItem publishSize="108418" publishTime="1615756125"/>
           <PublishItem publishSize="108418" publishTime="1615756115"/>
           <PublishItem publishSize="100326" publishTime="1615755435"/>
@@ -3253,15 +3306,5 @@
           <PublishItem publishSize="100331" publishTime="1615755001"/>
           <PublishItem publishSize="100352" publishTime="1615753742"/>
           <PublishItem publishSize="100333" publishTime="1615752295"/>
-          <PublishItem publishSize="100334" publishTime="1615752260"/>
-          <PublishItem publishSize="100313" publishTime="1615750221"/>
-          <PublishItem publishSize="100247" publishTime="1615749769"/>
-          <PublishItem publishSize="100245" publishTime="1615749071"/>
-          <PublishItem publishSize="100042" publishTime="1615748561"/>
-          <PublishItem publishSize="100051" publishTime="1615745804"/>
-          <PublishItem publishSize="100035" publishTime="1615739201"/>
-          <PublishItem publishSize="99679" publishTime="1615738567"/>
-          <PublishItem publishSize="99681" publishTime="1615735902"/>
-          <PublishItem publishSize="99678" publishTime="1615735809"/>
      </publishHistory>
 </DOMDocument>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml
index 82fb77c77..5a916f2a8 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml
@@ -28,142 +28,150 @@
                     </StrokeStyle>
                   </strokes>
                   <edges>
-                    <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"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2500 750|2250 750!2250 750|2250 500"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2250 500|2500 500"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!2500 500|2500 0"/>
-                    <Edge fillStyle1="2" strokeStyle="1" edges="!2500 0|3000 0!3000 0|3000 500"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!3000 500|2500 500"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!3000 1500|3000 1250!3000 1250|3000 1000!3000 1000|3000 750!3000 750|3000 500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2500 750|3000 750"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="!1750 0|2000 0"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2747 364|2637 364!2637 364|2637 249"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2000 500|2250 500!2250 500|2500 500!2500 500|2500 750!2500 750|2500 1000"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2500 1000|3000 1000"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!3000 1000|3000 750"/>
+                    <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|2250 1000!2250 1000|2500 1000"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2500 1000|2500 1250!2500 1250|2500 1500"/>
+                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!2500 1500|2500 2000"/>
+                    <Edge fillStyle0="2" strokeStyle="1" edges="!2500 2000|3000 2000!3000 2000|3000 1500"/>
+                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!3000 1500|2500 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!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="!1750 500|1750 750!1750 750|1750 1000!1750 1000|1500 1000!1500 1000|1500 750!1500 750|1750 750!1750 750|2000 750!2000 750|2000 1000!2000 1000|2250 1000!2250 1000|2250 1250!2250 1250|2000 1250!2000 1250|2000 1000!2250 750|2000 750!2000
- 750|2000 500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
-!2000 500|1750 500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!1750 0|1750 500!2250 0|2250 500"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="
-!2000 0|2250 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!2000 1000|1750 1000!1750 1000|1750 1250!1750 1250|1500 1250!1500 1250|1500 1000!1750 1500|1750 1250!1750 1250|2000 1250!2000 1250|2000 1500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
-!2000 1500|2250 1500!2250 1500|2500 1500"/>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="
-!2500 1500|2500 2000"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="
-!2500 2000|2250 2000"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!2250 2000|2250 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!2000 500|1750 500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1750 500|1750 750!1750 750|2000 750!2000 750|2000 500"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2637 364/2864 137"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="!2500 0|3000 0!3000 0|3000 500"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!1750 0|2000 0"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2000 750|2250 750!2250 750|2250 500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2250 500|2250 0!1750 0|1750 500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2250 1000|2250 1250!2250 1250|2500 1250"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2500 1250|3000 1250"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!3000 1250|3000 1000"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1500 500|1500 750!1500 750|1750 750!1750 750|1750 1000!1750 1000|1750 1250!1750 1250|2000 1250!2000 1250|2000 1000!2000 1000|2250 1000!2000 750|2000 1000!2000 1000|1750 1000!1750 1000|1500 1000!1500 1000|1250 1000!1250 1000|1000 1000
+!1000 1000|1000 750!1000 750|1000 500"/>
                     <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!2000 1500|1750 1500!1750 1500|1500 1500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!1500 1500|1500 1250!2250 1250|2250 1500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
-!2500 1500|2500 1250!2500 1250|2500 1000"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!2500 1000|2250 1000!2250 1000|2250 750"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
-!2637 1747|2637 1637!2637 1637/2865 1864!2637 1637|2752 1637"/>
+!1000 500|1250 500!1250 500|1500 500"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!2500 1250|3000 1250!3000 1000|2500 1000"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="
-!2500 1500|3000 1500"/>
-                    <Edge fillStyle1="2" strokeStyle="1" edges="
-!3000 1500|3000 2000!3000 2000|2500 2000"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!2500 750|2500 1000"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!2250 1250|2500 1250"/>
+!1500 500|1500 0"/>
                     <Edge fillStyle0="1" strokeStyle="1" edges="
-!2500 0|2250 0"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="
-!1250 0|1500 0"/>
+!1500 0|1250 0!1250 0|1000 0"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!1500 0|1500 500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
-!1500 500|1250 500!1250 500|1000 500"/>
+!1000 0|1000 500"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
+!2000 1500|1750 1500"/>
                     <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!1000 500|1000 750!1000 750|1000 1000!1000 1000|1250 1000!1250 1000|1500 1000!1500 750|1500 500!1500 750|1250 750!1250 750|1250 500"/>
+!1750 1500|1750 1250!1750 1250|1500 1250!1500 1250|1250 1250!1250 1250|1250 1000!1250 1000|1250 750!1250 750|1000 750!1000 750|750 750!750 750|750 1000!750 1000|1000 1000!2250 1250|2250 1500"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!1250 500|1250 0!1000 0|1000 500"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="
-!1000 0|1250 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!1000 1000|750 1000!750 1000|750 750!750 750|1000 750!1000 750|1250 750!1250 750|1250 1000"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="
-!500 0|750 0"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!750 0|750 500"/>
+!2250 1500|2250 2000"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="
+!2250 2000|2500 2000"/>
                     <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
-!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"/>
+!2000 1500|2250 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!2250 1250|2000 1250!2000 1250|2000 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!2000 1500|2000 2000"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="
+!2000 2000|2250 2000"/>
                     <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
-!364 255|364 365!364 365/137 137!364 365|249 365"/>
+!2637 1747|2637 1637!2637 1637|2752 1637"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="
+!3000 1500|3000 1250"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!2637 1637/2865 1864"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
+!2250 1500|2500 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!1500 1500|1500 1250!1500 1250|1500 1000!1500 1000|1500 750!1500 750|1250 750!1250 750|1250 500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!1250 500|1250 0"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="
+!500 0|750 0!750 0|1000 0"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!364 255|364 365!364 365|249 365!364 365/137 137"/>
                     <Edge fillStyle1="1" strokeStyle="1" edges="
 !0 750|0 500"/>
-                    <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 fillStyle1="2" strokeStyle="1" edges="
+!0 500|0 0!0 0|500 0"/>
                     <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!500 750|500 500"/>
+!500 1000|500 750!500 750|500 500"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="
+!500 500|0 500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!750 750|500 750!750 500|750 750"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
+!750 500|500 500"/>
                     <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="
 !500 500|500 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!500 1000|750 1000!750 1000|750 1250!750 1250|1000 1250!1000 1250|1250 1250!1250 1250|1250 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!500 750|0 750!750 0|750 500"/>
                     <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!1250 1500|1000 1500"/>
+!750 500|1000 500"/>
                     <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!1000 1500|1000 1250!1000 1250|1000 1000"/>
+!500 1000|750 1000!750 1000|750 1250!750 1250|750 1500"/>
                     <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!500 1250|500 1000!500 1000|500 750"/>
+!750 1500|500 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="
+!500 1500|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" fillStyle1="3" strokeStyle="1" edges="
+!500 1250|500 1000"/>
                     <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!500 1250|750 1250"/>
+!500 1250|750 1250!750 1250|1000 1250!1000 1250|1000 1000"/>
                     <Edge fillStyle1="1" strokeStyle="1" edges="
-!0 1250|0 1000"/>
+!0 1250|0 1000!0 1000|0 750"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
+!137 1865/365 1637!365 1637|255 1637!365 1637|365 1752"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="
+!0 1500|0 1250"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!0 1250|500 1250"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
+!500 1250|500 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="
+!0 1500|500 1500"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
 !0 1000|500 1000"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
-!137 1865/365 1637!365 1637|365 1752!255 1637|365 1637"/>
                     <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!750 1500|500 1500!500 1500|500 1250"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!500 1250|0 1250"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="
-!0 1500|500 1500!500 1500|500 2000"/>
-                    <Edge fillStyle1="2" strokeStyle="1" edges="
-!500 2000|0 2000!0 2000|0 1500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!750 1250|750 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!750 1500|750 2000"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="
-!750 2000|500 2000!0 1500|0 1250"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!1250 1000|1250 1250!1250 1250|1500 1250"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!1500 1500|1250 1500!750 500|1000 500"/>
-                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
-!750 1500|1000 1500"/>
+!1500 1500|1250 1500!1250 1500|1000 1500"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
 !1000 1500|1000 2000"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="
-!1000 2000|750 2000!0 1000|0 750!750 0|1000 0"/>
                     <Edge fillStyle0="1" strokeStyle="1" edges="
-!1000 2000|1250 2000!1250 2000|1500 2000!1500 2000|1750 2000!1750 2000|2000 2000!2000 2000|2250 2000"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!1500 500|1750 500"/>
+!1000 2000|1250 2000"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!1500 2000|1500 1500!1250 1500|1250 2000!2000 2000|2000 1500!1750 1500|1750 2000"/>
+!1250 2000|1250 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!1000 1500|1000 1250!1000 1250|1250 1250!1250 1250|1250 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
+!750 1500|1000 1500"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="
+!1250 2000|1500 2000"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!1500 2000|1500 1500"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="
+!500 2000|0 2000!0 2000|0 1500"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="
+!1000 2000|750 2000"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="
+!1750 2000|2000 2000"/>
                     <Edge fillStyle1="1" strokeStyle="1" edges="
 !1500 0|1750 0"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!1750 1500|1750 2000"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
+!1500 500|1750 500"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="
+!1500 2000|1750 2000"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
+!1750 1500|1500 1500"/>
                     <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 9fba238e8..f332042fd 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/Sprite1.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/Sprite1.xml
@@ -25,9 +25,9 @@
                     </StrokeStyle>
                   </strokes>
                   <edges>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="!3000 1132[3110 1196 3207 1293!3207 1293[3500 1586 3500 2000!3500 2000[3500 2414 3207 2707!3207 2707[2914 3000 2500 3000!2500 3000[2086 3000 1793 2707!1793 2707[1500 2414 1500 2000"/>
-                    <Edge fillStyle1="2" strokeStyle="1" edges="!1500 2000|0 2000!0 2000|0 0!0 0|3000 0!3000 0|3000 1132"/>
                     <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!1500 2000[1500 1586 1793 1293!1793 1293[2086 1000 2500 1000!2500 1000[2777 1000 3000 1132"/>
+                    <Edge fillStyle0="2" strokeStyle="1" edges="!3000 1132|3000 0!3000 0|0 0!0 0|0 2000!0 2000|1500 2000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!3000 1132[3110 1196 3207 1293!3207 1293[3500 1586 3500 2000!3500 2000[3500 2414 3207 2707!3207 2707[2914 3000 2500 3000!2500 3000[2086 3000 1793 2707!1793 2707[1500 2414 1500 2000"/>
                   </edges>
                 </DOMShape>
               </elements>
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 79cd327a2..a78f16d8c 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>2021-03-14T15:26:35+01:00</xmp:MetadataDate>
-         <xmp:ModifyDate>2021-03-14T15:26:35+01:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2021-03-17T08:42:06+01:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2021-03-17T08:42:06+01: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:9AB83803BD84EB1195D2C2F7D10C199F</xmpMM:InstanceID>
+         <xmpMM:InstanceID>xmp.iid:B7397545F486EB11AFC39B563C137DD5</xmpMM:InstanceID>
          <xmpMM:DocumentID>xmp.did:D6D3FE199784EB1187FEAE6972EC5115</xmpMM:DocumentID>
          <xmpMM:OriginalDocumentID>xmp.did:D6D3FE199784EB1187FEAE6972EC5115</xmpMM:OriginalDocumentID>
          <xmpMM:History>
@@ -50,6 +50,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:B7397545F486EB11AFC39B563C137DD5</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 e10b1f1a4..1078bbf61 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