diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics.swf b/libsrc/ffdec_lib/testdata/graphics/graphics.swf
index ef0ba9d19..67437e317 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 dda084ee5..263bff12d 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/DOMDocument.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/DOMDocument.xml
@@ -1,11 +1,11 @@
-<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="83" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false" autoSaveEnabled="true" autoSaveHasPrompted="true">
+<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="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"/>
-          <DOMBitmapItem name="bitmapfill_smooth.png" itemID="60608683-0000020b" sourceExternalFilepath="./LIBRARY/bitmapfill_smooth.png" sourceLastImported="1616938546" externalFileSize="1931" allowSmoothing="true" useImportedJPEGData="false" compressionType="lossless" originalCompressionType="lossless" quality="50" href="bitmapfill_smooth.png" bitmapDataHRef="M 5 1616938529.dat" frameRight="640" frameBottom="1280"/>
+          <DOMBitmapItem name="bitmapfill_smooth.png" itemID="60608683-0000020b" sourceExternalFilepath="./LIBRARY/bitmapfill_smooth.png" sourceLastImported="1678292098" externalFileSize="1931" allowSmoothing="true" useImportedJPEGData="false" compressionType="lossless" originalCompressionType="lossless" quality="50" href="bitmapfill_smooth.png" bitmapDataHRef="M 5 1616938529.dat" frameRight="640" frameBottom="1280"/>
           <DOMVideoItem name="Cute Cat - 3092.flv" itemID="60671758-000001ff" sourceExternalFilepath="C:/Dropbox/Programovani/JavaSE/FFDec/libsrc/ffdec_lib/testdata/graphics/Cute Cat - 3092.flv" sourceLastImported="1617368859" videoDataHRef="M 6 1617368920.dat" videoType="h263 media" fps="24" channels="0" width="640" height="360" length="29.25"/>
           <DOMBitmapItem name="pony.jpg" itemID="604de7c7-000002d8" sourceLastImported="1615718230" externalFileSize="222138" quality="50" href="pony.jpg" bitmapDataHRef="M 4 1615718240.dat" frameRight="16000" frameBottom="10680" isJPEG="true"/>
      </media>
@@ -36,7 +36,7 @@
           <Include href="VideoSprite.xml" loadImmediate="false" itemID="60672f60-00000201" lastModified="1617375202"/>
      </symbols>
      <timelines>
-          <DOMTimeline name="Scene 1">
+          <DOMTimeline name="Scene 1" currentFrame="64">
                <layers>
                     <DOMLayer name="Scripts layer" color="#9933CC" autoNamed="false">
                          <frames>
@@ -50,7 +50,7 @@
                     </DOMLayer>
                     <DOMLayer name="Prev next buttons" color="#4FFF4F" locked="true" autoNamed="false">
                          <frames>
-                              <DOMFrame index="0" duration="61" keyMode="9728">
+                              <DOMFrame index="0" duration="65" keyMode="9728">
                                    <elements>
                                         <DOMSymbolInstance libraryItemName="btnNext" symbolType="button">
                                              <matrix>
@@ -166,6 +166,66 @@
                               </DOMFrame>
                          </frames>
                     </DOMLayer>
+                    <DOMLayer name="Graphics layer 2" color="#4FFF4F" autoNamed="false">
+                         <frames>
+                              <DOMFrame index="0" duration="61" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
+                              <DOMFrame index="61" duration="3" tweenType="shape" keyMode="17922">
+                                   <MorphShape>
+                                        <morphSegments>
+                                             <MorphSegment startPointA="#17.7, #3.E8" startPointB="#17.7, #3.E8" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="1">
+                                                  <MorphCurves controlPointA="#1D.4C, #3.E8" anchorPointA="#23.28, #3.E8" controlPointB="#1D.4C, #3.E8" anchorPointB="#23.28, #3.E8" isLine="true"/>
+                                                  <MorphCurves controlPointA="#23.28, #9.C4" anchorPointA="#23.28, #F.A" controlPointB="#23.28, #9.C4" anchorPointB="#23.28, #F.A" isLine="true"/>
+                                                  <MorphCurves controlPointA="#1D.4C, #F.A" anchorPointA="#17.7, #F.A" controlPointB="#1D.4C, #F.A" anchorPointB="#17.7, #F.A" isLine="true"/>
+                                                  <MorphCurves controlPointA="#17.7, #9.C4" anchorPointA="#17.7, #3.E8" controlPointB="#17.7, #9.C4" anchorPointB="#17.7, #3.E8" isLine="true"/>
+                                             </MorphSegment>
+                                        </morphSegments>
+                                        <morphHintsList/>
+                                   </MorphShape>
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <RadialGradient focalPointRatio="0.737254901960784">
+                                                            <matrix>
+                                                                 <Matrix a="0.0821990966796875" b="0.081695556640625" c="-0.081695556640625" d="0.0821990966796875" tx="372" ty="119"/>
+                                                            </matrix>
+                                                            <GradientEntry color="#00FF00" ratio="0"/>
+                                                            <GradientEntry ratio="1"/>
+                                                       </RadialGradient>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="
+!9000 4000|6000 4000!6000 4000|6000 1000!6000 1000|9000 1000!9000 1000|9000 4000"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="64" keyMode="9728">
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <RadialGradient focalPointRatio="0.356862745098039">
+                                                            <matrix>
+                                                                 <Matrix a="-0.0341949462890625" b="0.127716064453125" c="-0.127716064453125" d="-0.0341949462890625" tx="372" ty="119"/>
+                                                            </matrix>
+                                                            <GradientEntry color="#00FFDB" ratio="0"/>
+                                                            <GradientEntry ratio="1"/>
+                                                       </RadialGradient>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="
+!9000 4000|6000 4000!6000 4000|6000 1000!6000 1000|9000 1000!9000 1000|9000 4000"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
                     <DOMLayer name="Graphics layer" color="#4FFF4F" current="true" isSelected="true" autoNamed="false">
                          <frames>
                               <DOMFrame index="0" keyMode="9728">
@@ -246,10 +306,10 @@
                                              <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>
@@ -778,10 +838,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);"/>
@@ -1380,18 +1440,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);"/>
@@ -2362,6 +2422,59 @@
                                         </DOMShape>
                                    </elements>
                               </DOMFrame>
+                              <DOMFrame index="61" duration="3" tweenType="shape" keyMode="17922">
+                                   <MorphShape>
+                                        <morphSegments>
+                                             <MorphSegment startPointA="#3.E8, #3.E8" startPointB="#3.E8, #3.E8" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="1">
+                                                  <MorphCurves controlPointA="#9.C4, #3.E8" anchorPointA="#F.A, #3.E8" controlPointB="#9.C4, #3.E8" anchorPointB="#F.A, #3.E8" isLine="true"/>
+                                                  <MorphCurves controlPointA="#F.A, #9.C4" anchorPointA="#F.A, #F.A" controlPointB="#F.A, #9.C4" anchorPointB="#F.A, #F.A" isLine="true"/>
+                                                  <MorphCurves controlPointA="#9.C4, #F.A" anchorPointA="#3.E8, #F.A" controlPointB="#9.C4, #F.A" anchorPointB="#3.E8, #F.A" isLine="true"/>
+                                                  <MorphCurves controlPointA="#3.E8, #9.C4" anchorPointA="#3.E8, #3.E8" controlPointB="#3.E8, #9.C4" anchorPointB="#3.E8, #3.E8" isLine="true"/>
+                                             </MorphSegment>
+                                        </morphSegments>
+                                        <morphHintsList/>
+                                   </MorphShape>
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <RadialGradient>
+                                                            <matrix>
+                                                                 <Matrix a="0.12945556640625" d="0.12945556640625" tx="125" ty="125"/>
+                                                            </matrix>
+                                                            <GradientEntry color="#FF3809" ratio="0"/>
+                                                            <GradientEntry ratio="1"/>
+                                                       </RadialGradient>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="
+!4000 1000|4000 4000!4000 4000|1000 4000!1000 4000|1000 1000!1000 1000|4000 1000"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="64" keyMode="9728">
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <RadialGradient>
+                                                            <matrix>
+                                                                 <Matrix a="0.12945556640625" d="0.12945556640625" tx="125" ty="125"/>
+                                                            </matrix>
+                                                            <GradientEntry color="#FFFC00" ratio="0"/>
+                                                            <GradientEntry color="#F75151" ratio="1"/>
+                                                       </RadialGradient>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="
+!4000 4000|1000 4000!1000 4000|1000 1000!1000 1000|4000 1000!4000 1000|4000 4000"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
                          </frames>
                     </DOMLayer>
                     <DOMLayer name="Texts inside layer" color="#FF800A" autoNamed="false">
@@ -3628,7 +3741,7 @@
                                              </matrix>
                                              <textRuns>
                                                   <DOMTextRun>
-                                                       <characters>061 Bitmap smoothing</characters>
+                                                       <characters>056 Bitmap smoothing</characters>
                                                        <textAttrs>
                                                             <DOMTextAttrs aliasText="false" size="30" face="TimesNewRomanPSMT"/>
                                                        </textAttrs>
@@ -3645,7 +3758,7 @@
                                              </matrix>
                                              <textRuns>
                                                   <DOMTextRun>
-                                                       <characters>062 Video</characters>
+                                                       <characters>057 Video</characters>
                                                        <textAttrs>
                                                             <DOMTextAttrs aliasText="false" size="30" face="TimesNewRomanPSMT"/>
                                                        </textAttrs>
@@ -3656,13 +3769,13 @@
                               </DOMFrame>
                               <DOMFrame index="57" keyMode="9728">
                                    <elements>
-                                        <DOMStaticText width="446" height="33.25" includeOutlines="true" isSelectable="false">
+                                        <DOMStaticText selected="true" width="446" height="33.25" includeOutlines="true" isSelectable="false">
                                              <matrix>
                                                   <Matrix tx="22" ty="342"/>
                                              </matrix>
                                              <textRuns>
                                                   <DOMTextRun>
-                                                       <characters>063 Multiline text</characters>
+                                                       <characters>058 Multiline text</characters>
                                                        <textAttrs>
                                                             <DOMTextAttrs aliasText="false" size="30" face="TimesNewRomanPSMT"/>
                                                        </textAttrs>
@@ -3673,13 +3786,13 @@
                               </DOMFrame>
                               <DOMFrame index="58" keyMode="9728">
                                    <elements>
-                                        <DOMStaticText width="446" height="33.25" includeOutlines="true" isSelectable="false">
+                                        <DOMStaticText selected="true" width="446" height="33.25" includeOutlines="true" isSelectable="false">
                                              <matrix>
                                                   <Matrix tx="22" ty="342"/>
                                              </matrix>
                                              <textRuns>
                                                   <DOMTextRun>
-                                                       <characters>064 Rotated stroke normal scaling</characters>
+                                                       <characters>059 Rotated stroke normal scaling</characters>
                                                        <textAttrs>
                                                             <DOMTextAttrs aliasText="false" size="30" face="TimesNewRomanPSMT"/>
                                                        </textAttrs>
@@ -3690,13 +3803,13 @@
                               </DOMFrame>
                               <DOMFrame index="59" keyMode="9728">
                                    <elements>
-                                        <DOMStaticText width="446" height="33.25" includeOutlines="true" isSelectable="false">
+                                        <DOMStaticText selected="true" width="446" height="33.25" includeOutlines="true" isSelectable="false">
                                              <matrix>
                                                   <Matrix tx="22" ty="342"/>
                                              </matrix>
                                              <textRuns>
                                                   <DOMTextRun>
-                                                       <characters>065 Rotated vertical/horiz. scaling</characters>
+                                                       <characters>060 Rotated vertical/horiz. scaling</characters>
                                                        <textAttrs>
                                                             <DOMTextAttrs aliasText="false" size="30" face="TimesNewRomanPSMT"/>
                                                        </textAttrs>
@@ -3713,7 +3826,24 @@
                                              </matrix>
                                              <textRuns>
                                                   <DOMTextRun>
-                                                       <characters>066 Antialiasing</characters>
+                                                       <characters>061 Antialiasing</characters>
+                                                       <textAttrs>
+                                                            <DOMTextAttrs aliasText="false" size="30" face="TimesNewRomanPSMT"/>
+                                                       </textAttrs>
+                                                  </DOMTextRun>
+                                             </textRuns>
+                                        </DOMStaticText>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="61" duration="4" keyMode="9728">
+                                   <elements>
+                                        <DOMStaticText width="446" height="33.25" includeOutlines="true" isSelectable="false">
+                                             <matrix>
+                                                  <Matrix tx="22" ty="342"/>
+                                             </matrix>
+                                             <textRuns>
+                                                  <DOMTextRun>
+                                                       <characters>062-065 radial/focal tween</characters>
                                                        <textAttrs>
                                                             <DOMTextAttrs aliasText="false" size="30" face="TimesNewRomanPSMT"/>
                                                        </textAttrs>
@@ -3729,6 +3859,10 @@
      </timelines>
      <PrinterSettings/>
      <publishHistory>
+          <PublishItem publishSize="1583" publishTime="1678292643"/>
+          <PublishItem publishSize="1574" publishTime="1678292643"/>
+          <PublishItem publishSize="1575" publishTime="1678292643"/>
+          <PublishItem publishSize="1575" publishTime="1678292642"/>
           <PublishItem publishSize="1431142" publishTime="1671978132" publishDebug="true"/>
           <PublishItem publishSize="3657857" publishTime="1668349897"/>
           <PublishItem publishSize="3657883" publishTime="1666634735"/>
@@ -3745,9 +3879,5 @@
           <PublishItem publishSize="1609" publishTime="1666586837"/>
           <PublishItem publishSize="1609" publishTime="1666586837"/>
           <PublishItem publishSize="1592" publishTime="1637176557"/>
-          <PublishItem publishSize="1586" publishTime="1637176556"/>
-          <PublishItem publishSize="1586" publishTime="1637176556"/>
-          <PublishItem publishSize="1586" publishTime="1637176556"/>
-          <PublishItem publishSize="3655062" publishTime="1617375217"/>
      </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 6cc07dc5d..86422612b 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/ScaledRect.xml
@@ -28,128 +28,146 @@
                     </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="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"/>
                     <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="1" fillStyle1="3" strokeStyle="1" edges="!2500 750|2500 1000!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"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2000 1500|2000 1250!2000 1250|1750 1250!1750 1250|1750 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1750 1500|1750 2000"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!1750 2000|2000 2000"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!2000 2000|2000 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!2000 1500|1750 1500!1750 1500|1500 1500!1500 1500|1250 1500"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1250 1500|1250 2000"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!1250 2000|1500 2000"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1500 2000|1500 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!2250 750|2000 750!2000 750|1750 750!1750 750|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="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="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 fillStyle1="1" strokeStyle="1" edges="!500 0|750 0"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2637 364/2864 137"/>
+                    <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!2000 1250|1750 1250!1750 1250|1500 1250!1500 1250|1500 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1500 1500|1500 2000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!1500 2000|1250 2000"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1250 2000|1250 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="!1250 1500|1500 1500!1500 1500|1750 1500!1750 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="3" fillStyle1="3" strokeStyle="1" edges="!1750 1500|1750 1250"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!3000 1000|3000 750!3000 750|3000 500"/>
                     <Edge fillStyle0="2" strokeStyle="1" edges="!3000 500|3000 0!3000 0|2500 0"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!2250 0|2000 0!2000 0|1750 0"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="!1750 500|2000 500"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2000 500|2000 750!2000 750|2000 1000!2000 1000|2250 1000!2250 1000|2250 1250!2250 1250|2000 1250!2000 1250|2000 1000!2000 1000|1750 1000!1750 1000|1750 750!1750 750|1500 750!1500 750|1500 1000!1500 1000|1750 1000!1750 1000|1750 1250
-!1750 1250|1500 1250!1500 1250|1500 1000"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!2000 0|2000 500"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!2000 500|2250 500!2250 500|2500 500"/>
-                    <Edge fillStyle1="1" strokeStyle="1" edges="
-!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"/>
-                    <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!3000 1250|2500 1250"/>
-                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
-!2500 1250|2500 1500"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
-!2637 1637/2865 1864"/>
+                    <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="3" fillStyle1="3" strokeStyle="1" edges="!2000 500|2000 750!2000 750|1750 750!1750 750|1500 750!1500 750|1250 750!1250 750|1000 750!1000 750|1000 500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="!1000 500|1000 0"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!1000 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|1250 1000!1250 1000|1000 1000!1000 1000|750 1000!750 1000|750 750!750 750|1000 750!1000 750|1000 1000!1000 1000|1000 1250!1000 1250|1250 1250!1250 1250|1500 1250!1500 1250|1500 1000!1500 1000|1750 1000!1750
+ 1000|1750 750!1750 750|1750 500"/>
                     <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
-!1750 500|1500 500!1500 500|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|750 1500"/>
+!1750 500|1500 500"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!750 1500|750 2000"/>
+!1500 500|1500 0"/>
                     <Edge fillStyle0="1" strokeStyle="1" edges="
-!750 2000|1000 2000"/>
+!1500 0|1250 0"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!1000 2000|1000 1500"/>
+!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"/>
+                    <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="1" fillStyle1="3" strokeStyle="1" edges="
-!1000 1500|750 1500!750 1500|500 1500"/>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="
-!500 1500|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"/>
+!1750 500|2000 500!2000 500|2250 500"/>
                     <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!1500 500|1500 750!1500 750|1250 750"/>
+!2250 500|2250 750!2250 750|2250 1000!2250 1000|2250 1250!2250 1250|2250 1500"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!1500 0|1500 500"/>
+!2250 1500|2250 2000"/>
                     <Edge fillStyle1="1" strokeStyle="1" edges="
-!1000 0|1250 0"/>
+!2250 2000|2000 2000"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!2250 0|2250 500"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
+!2250 500|2500 500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!1750 500|1750 0"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!2000 1500|2000 1250!2000 1250|2000 1000!2000 1000|2250 1000!2250 1000|2500 1000"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
+!2500 1000|2500 1250!2500 1250|2500 1500!2500 1500|2250 1500!2250 1500|2000 1500"/>
                     <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
-!249 365|364 365!364 365/137 137!364 365|364 255"/>
+!2637 1747|2637 1637!2637 1637/2865 1864!2637 1637|2752 1637"/>
                     <Edge fillStyle1="1" strokeStyle="1" edges="
-!0 1500|0 1250!0 1250|0 1000!0 1000|0 750!0 750|0 500"/>
+!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"/>
                     <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
-!500 500|500 750"/>
+!1500 500|1250 500!1250 500|1000 500!1000 500|750 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 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"/>
-                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
-!500 1000|0 1000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="
+!0 750|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="
-!500 1000|500 1250!500 1250|500 1500"/>
+!500 500|500 750!500 750|500 1000"/>
                     <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!500 1250|750 1250!750 1250|1000 1250!1000 1250|1250 1250!1250 1250|1250 1000!1250 1000|1000 1000"/>
+!500 1000|750 1000!750 1000|750 1250!750 1250|1000 1250!1000 1250|1000 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
+!1000 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 fillStyle1="2" strokeStyle="1" edges="
+!500 2000|0 2000!0 2000|0 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="
+!0 1500|500 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
+!500 1500|750 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!1500 500|1500 750!1500 750|1500 1000!1500 1000|1250 1000"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="
+!500 0|750 0"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!750 0|750 500"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
+!750 500|500 500"/>
                     <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="
-!137 1865/365 1637!365 1637|255 1637!365 1637|365 1752"/>
+!249 365|364 365!364 365|364 255!364 365/137 137"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="
+!500 500|0 500"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
+!500 1250|750 1250!750 1250|750 1500"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
+!500 1000|500 1250"/>
                     <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
 !500 1250|0 1250"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="
+!0 1250|0 1000"/>
+                    <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!365 1637|255 1637"/>
+                    <Edge fillStyle0="3" fillStyle1="1" strokeStyle="1" edges="
+!500 1250|500 1500"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="
+!0 1500|0 1250"/>
                     <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="
-!1250 750|1250 1000!1250 1000|1500 1000!1250 1500|1250 1250!1250 1250|1500 1250!1500 1250|1500 1500!1000 1000|1000 1250!1000 1250|1000 1500"/>
+!1250 1500|1250 1250!1250 1250|1250 1000"/>
                     <Edge fillStyle0="1" fillStyle1="3" strokeStyle="1" edges="
 !1250 1500|1000 1500"/>
                     <Edge fillStyle1="1" strokeStyle="1" edges="
+!0 1000|0 750"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="
+!1000 0|750 0"/>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="
 !1250 2000|1000 2000"/>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="
-!500 2000|500 1500"/>
+                    <Edge fillStyle0="1" fillStyle1="1" strokeStyle="1" edges="
+!1000 2000|1000 1500"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="
+!750 2000|1000 2000"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="
+!3000 1500|3000 2000!3000 2000|2500 2000"/>
                     <Edge fillStyle1="1" strokeStyle="1" edges="
 !1750 2000|1500 2000"/>
                     <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="
-!2500 1500|2500 2000"/>
+!500 2000|500 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 bfbd08dee..04ecc3790 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 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="2" strokeStyle="1" edges="!3000 1132|3000 0!3000 0|0 0!0 0|0 2000!0 2000|1500 2000"/>
+                    <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 fillStyle1="2" strokeStyle="1" edges="!1500 2000|0 2000!0 2000|0 0!0 0|3000 0!3000 0|3000 1132"/>
                   </edges>
                 </DOMShape>
               </elements>
diff --git a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/grid.xml b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/grid.xml
index 24f4801a2..6c67e0d9d 100644
--- a/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/grid.xml
+++ b/libsrc/ffdec_lib/testdata/graphics/graphics/LIBRARY/grid.xml
@@ -28,74 +28,71 @@
                     </StrokeStyle>
                   </strokes>
                   <edges>
-                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!2010 4|2009 4"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 4|2009 254!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="2" strokeStyle="1" edges="!2010 254|2009 254"/>
                     <Edge fillStyle0="1" edges="!2010 4|2010 0!2010 0|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!1509 4|1259 4!1259 4|1009 4"/>
-                    <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!759 4|1009 4"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1009 4|1009 254!1009 254|1259 254!1259 254|1259 504!1259 504|1259 754!1259 754|1509 754!1509 754|1509 504!1509 504|1759 504!1759 504|1759 754!1759 754|1759 1004"/>
-                    <Edge fillStyle1="3" strokeStyle="1" edges="!1759 1004|1509 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1509 1004|1509 754"/>
                     <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!2009 0|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="2" edges="!2010 254|2010 4"/>
-                    <Edge fillStyle1="2" edges="!2010 504|2010 754"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2010 754|2009 754"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 754|2009 1004"/>
-                    <Edge fillStyle1="2" edges="!2009 1004|2009 1005!2009 1005|1759 1005!1759 1005|1759 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!1759 1004|2009 1004"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 4|2009 254"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2009 254|1759 254!1759 254|1759 4"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!1759 4|2009 4"/>
+                    <Edge fillStyle0="2" fillStyle1="1" strokeStyle="1" edges="!2010 4|2009 4"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1759 0|1759 4!2010 254|2009 254"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 254|2009 504!2009 504|2009 754!2009 754|2009 1004"/>
                     <Edge fillStyle0="2" strokeStyle="1" edges="!2009 1004|2010 1004"/>
                     <Edge fillStyle0="2" edges="!2010 1004|2010 754"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 504|2009 504"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!2009 504|2009 754"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!2009 754|1759 754!1509 504|1509 254!1509 254|1759 254!1759 254|1759 504"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1259 4|1259 0"/>
-                    <Edge fillStyle0="2" edges="!1259 0|1009 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1259 4|1259 254!1259 254|1509 254!1509 254|1509 4"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1509 4|1509 0"/>
-                    <Edge fillStyle0="2" edges="!1509 0|1259 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1259 1004|1259 754!1259 754|1009 754!1009 754|1009 504!1009 504|1009 254!1509 504|1259 504!1259 504|1009 504!1009 504|759 504!759 504|759 754!759 754|509 754!509 754|509 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"/>
-                    <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 fillStyle1="2" edges="!0 504|0 254!0 254|0 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"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!259 4|259 254!259 254|509 254!509 254|759 254!759 254|759 4"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!759 4|759 0"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!509 4|509 254!509 254|509 504!509 504|259 504!259 504|259 254"/>
-                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!509 0|509 4"/>
-                    <Edge fillStyle0="1" edges="!9 0|0 0!0 0|0 4"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2010 754|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"/>
+                    <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 fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1259 1004|1259 754!1259 754|1509 754!1509 754|1759 754"/>
+                    <Edge fillStyle0="2" edges="!2010 754|2010 504!2010 504|2010 254!2010 254|2010 4!2009 0|1759 0!1759 0|1509 0!1509 0|1259 0!1259 0|1009 0!1009 0|759 0"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!759 0|759 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!759 4|759 254!759 254|509 254!509 254|259 254!259 254|259 4"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!259 4|509 4"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!509 4|509 0"/>
+                    <Edge fillStyle0="2" edges="!509 0|259 0!259 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="2" strokeStyle="1" edges="!9 4|9 254"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!9 254|259 254!259 254|259 504!259 504|509 504!509 504|509 254!509 254|509 4"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!509 4|759 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 254|1759 504!1759 504|2009 504"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!2009 504|2010 504"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1759 504|1759 754"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1509 4|1509 0"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!509 1004|509 754!509 754|759 754!759 754|759 504!759 504|1009 504!1009 504|1259 504!1259 504|1509 504!1509 504|1509 254!1509 254|1509 4"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!1509 4|1259 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1259 4|1259 254!1259 254|1259 504!1009 504|1009 254!1009 254|1259 254!1259 254|1509 254!1509 254|1759 254"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!1259 4|1259 0!1009 4|1009 0"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1009 4|1009 254!1009 254|759 254!1009 1004|1009 754!1009 754|1009 504!1259 504|1259 754!1259 754|1009 754!1009 754|759 754!1509 1004|1509 754!1509 754|1509 504"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!1259 4|1009 4"/>
+                    <Edge fillStyle0="2" edges="!759 0|509 0"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!259 0|259 4"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!259 4|9 4"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!0 4|9 4"/>
+                    <Edge fillStyle0="1" edges="!9 0|0 0!0 0|0 4"/>
                     <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!0 254|9 254"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!9 254|259 254"/>
-                    <Edge fillStyle0="2" edges="!259 0|9 0"/>
-                    <Edge fillStyle1="2" edges="!0 754|0 504"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!259 504|259 754!259 754|9 754"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!9 254|9 504"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!9 504|0 504"/>
+                    <Edge fillStyle0="2" edges="!0 504|0 754"/>
+                    <Edge fillStyle0="2" fillStyle1="2" strokeStyle="1" edges="!0 754|9 754"/>
                     <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!9 754|9 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!9 504|259 504!1009 254|759 254!759 254|759 504!759 504|509 504!509 504|509 754!509 754|259 754"/>
-                    <Edge fillStyle0="2" edges="!509 1004|509 1005!509 1005|759 1005!759 1005|759 1004"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="!9 1004|0 1004"/>
+                    <Edge fillStyle1="2" edges="!0 1004|0 754!0 254|0 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!9 504|259 504!259 504|259 754!259 754|259 1004"/>
+                    <Edge fillStyle1="3" strokeStyle="1" edges="!259 1004|9 1004"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!509 754|259 754!259 754|9 754"/>
+                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!9 754|9 504"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!509 504|509 754!759 504|509 504!759 254|759 504"/>
+                    <Edge fillStyle1="2" edges="!0 504|0 254"/>
                     <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!759 1004|509 1004"/>
-                    <Edge fillStyle1="3" strokeStyle="1" edges="!1509 1004|1259 1004"/>
-                    <Edge fillStyle1="2" edges="!1259 1004|1259 1005!1259 1005|1009 1005!1009 1005|1009 1004"/>
+                    <Edge fillStyle0="2" edges="!509 1004|509 1005!509 1005|759 1005!759 1005|759 1004"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!759 1004|759 754"/>
+                    <Edge fillStyle1="3" strokeStyle="1" edges="!509 1004|259 1004"/>
                     <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!1009 1004|1259 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!259 754|259 1004!1009 1004|1009 754!1009 754|759 754"/>
-                    <Edge fillStyle0="3" strokeStyle="1" edges="!759 1004|1009 1004"/>
-                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!759 754|759 1004!1759 754|1509 754"/>
-                    <Edge fillStyle1="2" edges="!1509 0|1759 0"/>
+                    <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 fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!759 4|1009 4"/>
+                    <Edge fillStyle0="3" fillStyle1="3" strokeStyle="1" edges="!1509 504|1759 504"/>
+                    <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 8f906a6f5..e6a0cfd06 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>2022-12-25T06:21:28-08:00</xmp:MetadataDate>
-         <xmp:ModifyDate>2022-12-25T06:21:28-08:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2023-03-08T08:18:28-08:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2023-03-08T08:18:28-08: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:23E4449F4B7EED119DEE8735AA8CEAC4</xmpMM:InstanceID>
+         <xmpMM:InstanceID>xmp.iid:0E9D111EF4B5ED11B7A6DD84E1B1550C</xmpMM:InstanceID>
          <xmpMM:DocumentID>xmp.did:D6D3FE199784EB1187FEAE6972EC5115</xmpMM:DocumentID>
          <xmpMM:OriginalDocumentID>xmp.did:D6D3FE199784EB1187FEAE6972EC5115</xmpMM:OriginalDocumentID>
          <xmpMM:History>
@@ -146,6 +146,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:0E9D111EF4B5ED11B7A6DD84E1B1550C</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 945e29d82..659b9d9ff 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
diff --git a/libsrc/ffdec_lib/testdata/scenes/Main.as b/libsrc/ffdec_lib/testdata/scenes/Main.as
new file mode 100644
index 000000000..993bbb04b
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/scenes/Main.as
@@ -0,0 +1,14 @@
+package  {
+	
+	import flash.display.MovieClip;
+	
+	
+	public class Main extends MovieClip {
+		
+		
+		public function Main() {
+			
+		}
+	}
+	
+}
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes.html b/libsrc/ffdec_lib/testdata/scenes/scenes.html
new file mode 100644
index 000000000..d21cff16b
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/scenes/scenes.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+	<head>
+		<title>scenes</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<style type="text/css" media="screen">
+		html, body { height:100%; background-color: #ffffff;}
+		body { margin:0; padding:0; overflow:hidden; }
+		#flashContent { width:100%; height:100%; }
+		</style>
+	</head>
+	<body>
+		<div id="flashContent">
+			<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="550" height="400" id="scenes" align="middle">
+				<param name="movie" value="scenes.swf" />
+				<param name="quality" value="high" />
+				<param name="bgcolor" value="#ffffff" />
+				<param name="play" value="true" />
+				<param name="loop" value="true" />
+				<param name="wmode" value="window" />
+				<param name="scale" value="showall" />
+				<param name="menu" value="true" />
+				<param name="devicefont" value="false" />
+				<param name="salign" value="" />
+				<param name="allowScriptAccess" value="sameDomain" />
+				<!--[if !IE]>-->
+				<object type="application/x-shockwave-flash" data="scenes.swf" width="550" height="400">
+					<param name="movie" value="scenes.swf" />
+					<param name="quality" value="high" />
+					<param name="bgcolor" value="#ffffff" />
+					<param name="play" value="true" />
+					<param name="loop" value="true" />
+					<param name="wmode" value="window" />
+					<param name="scale" value="showall" />
+					<param name="menu" value="true" />
+					<param name="devicefont" value="false" />
+					<param name="salign" value="" />
+					<param name="allowScriptAccess" value="sameDomain" />
+				<!--<![endif]-->
+					<a href="http://www.adobe.com/go/getflash">
+						<img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
+					</a>
+				<!--[if !IE]>-->
+				</object>
+				<!--<![endif]-->
+			</object>
+		</div>
+	</body>
+</html>
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes.swd b/libsrc/ffdec_lib/testdata/scenes/scenes.swd
new file mode 100644
index 000000000..20616c362
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/scenes/scenes.swd differ
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes.swf b/libsrc/ffdec_lib/testdata/scenes/scenes.swf
new file mode 100644
index 000000000..e8f530b37
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/scenes/scenes.swf differ
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes/DOMDocument.xml b/libsrc/ffdec_lib/testdata/scenes/scenes/DOMDocument.xml
new file mode 100644
index 000000000..b9002d813
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/scenes/scenes/DOMDocument.xml
@@ -0,0 +1,100 @@
+<DOMDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" 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" nextSceneIdentifier="3" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false" autoSaveEnabled="true" autoSaveHasPrompted="true">
+     <symbols>
+          <Include href="Circle.xml" loadImmediate="false" itemID="640b7469-0000023d" lastModified="1678472297"/>
+          <Include href="Rect.xml" loadImmediate="false" itemID="640b7414-00000237" lastModified="1678472212"/>
+     </symbols>
+     <timelines>
+          <DOMTimeline name="My first scene" currentFrame="9">
+               <layers>
+                    <DOMLayer name="Layer 2" color="#9933CC" current="true" isSelected="true" autoNamed="false">
+                         <frames>
+                              <DOMFrame index="0" duration="9" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
+                              <DOMFrame index="9" duration="11" name="S1 MiddleFrame" labelType="name" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
+                    <DOMLayer name="Layer 1" color="#4FFF4F">
+                         <frames>
+                              <DOMFrame index="0" duration="19" tweenType="motion" motionTweenSnap="true" keyMode="22017">
+                                   <elements>
+                                        <DOMSymbolInstance libraryItemName="Rect" selected="true" centerPoint3DX="145.5" centerPoint3DY="169">
+                                             <matrix>
+                                                  <Matrix tx="78" ty="109"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="67.5" y="60"/>
+                                             </transformationPoint>
+                                        </DOMSymbolInstance>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="19" keyMode="9728">
+                                   <elements>
+                                        <DOMSymbolInstance libraryItemName="Rect" centerPoint3DX="402.5" centerPoint3DY="262">
+                                             <matrix>
+                                                  <Matrix tx="335" ty="202"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="67.5" y="60"/>
+                                             </transformationPoint>
+                                        </DOMSymbolInstance>
+                                   </elements>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
+               </layers>
+          </DOMTimeline>
+          <DOMTimeline name="My second scene" currentFrame="9">
+               <layers>
+                    <DOMLayer name="Layer 2" color="#9933CC" current="true" isSelected="true">
+                         <frames>
+                              <DOMFrame index="0" duration="9" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
+                              <DOMFrame index="9" duration="11" name="S2 MiddleFrame" labelType="name" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
+                    <DOMLayer name="Layer 1" color="#4FFF4F">
+                         <frames>
+                              <DOMFrame index="0" duration="19" tweenType="motion" motionTweenSnap="true" keyMode="22017">
+                                   <elements>
+                                        <DOMSymbolInstance libraryItemName="Circle" selected="true" centerPoint3DX="141.75" centerPoint3DY="306.75">
+                                             <matrix>
+                                                  <Matrix tx="74" ty="239"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="67.75" y="67.75"/>
+                                             </transformationPoint>
+                                        </DOMSymbolInstance>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="19" keyMode="9728">
+                                   <elements>
+                                        <DOMSymbolInstance libraryItemName="Circle" selected="true" centerPoint3DX="415.75" centerPoint3DY="107.75">
+                                             <matrix>
+                                                  <Matrix tx="348" ty="40"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="67.75" y="67.75"/>
+                                             </transformationPoint>
+                                        </DOMSymbolInstance>
+                                   </elements>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
+               </layers>
+          </DOMTimeline>
+     </timelines>
+     <PrinterSettings/>
+     <publishHistory>
+          <PublishItem publishSize="1256" publishTime="1678473688" publishDebug="true"/>
+          <PublishItem publishSize="1315" publishTime="1678473622" publishDebug="true"/>
+          <PublishItem publishSize="1000" publishTime="1678473077" publishDebug="true"/>
+          <PublishItem publishSize="999" publishTime="1678472885" publishDebug="true"/>
+          <PublishItem publishSize="947" publishTime="1678472416"/>
+     </publishHistory>
+</DOMDocument>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes/LIBRARY/Circle.xml b/libsrc/ffdec_lib/testdata/scenes/scenes/LIBRARY/Circle.xml
new file mode 100644
index 000000000..8acb52c82
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/scenes/scenes/LIBRARY/Circle.xml
@@ -0,0 +1,26 @@
+<DOMSymbolItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" name="Circle" itemID="640b7469-0000023d" lastModified="1678472297">
+  <timeline>
+    <DOMTimeline name="Circle">
+      <layers>
+        <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
+          <frames>
+            <DOMFrame index="0" keyMode="9728">
+              <elements>
+                <DOMShape>
+                  <fills>
+                    <FillStyle index="1">
+                      <SolidColor color="#00FF00"/>
+                    </FillStyle>
+                  </fills>
+                  <edges>
+                    <Edge fillStyle1="1" edges="!2710 1355S2[2710 1916 2313 2313!2313 2313[1916 2710 1355 2710!1355 2710[794 2710 397 2313!397 2313[0 1916 0 1355!0 1355[0 794 397 397!397 397[794 0 1355 0!1355 0[1916 0 2313 397!2313 397[2710 794 2710 1355"/>
+                  </edges>
+                </DOMShape>
+              </elements>
+            </DOMFrame>
+          </frames>
+        </DOMLayer>
+      </layers>
+    </DOMTimeline>
+  </timeline>
+</DOMSymbolItem>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes/LIBRARY/Rect.xml b/libsrc/ffdec_lib/testdata/scenes/scenes/LIBRARY/Rect.xml
new file mode 100644
index 000000000..901e44c50
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/scenes/scenes/LIBRARY/Rect.xml
@@ -0,0 +1,26 @@
+<DOMSymbolItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" name="Rect" itemID="640b7414-00000237" lastModified="1678472212">
+  <timeline>
+    <DOMTimeline name="Rect">
+      <layers>
+        <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
+          <frames>
+            <DOMFrame index="0" keyMode="9728">
+              <elements>
+                <DOMShape>
+                  <fills>
+                    <FillStyle index="1">
+                      <SolidColor color="#FF318B"/>
+                    </FillStyle>
+                  </fills>
+                  <edges>
+                    <Edge fillStyle1="1" edges="!2700 0S2|2700 2400!2700 2400|0 2400!0 2400|0 0!0 0|2700 0"/>
+                  </edges>
+                </DOMShape>
+              </elements>
+            </DOMFrame>
+          </frames>
+        </DOMLayer>
+      </layers>
+    </DOMTimeline>
+  </timeline>
+</DOMSymbolItem>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/scenes/scenes/META-INF/metadata.xml
new file mode 100644
index 000000000..79bc1d7ce
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/scenes/scenes/META-INF/metadata.xml
@@ -0,0 +1,55 @@
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+         <xmp:CreatorTool>Adobe Flash Professional CS6 - build 481</xmp:CreatorTool>
+         <xmp:CreateDate>2023-03-10T10:15:53-08:00</xmp:CreateDate>
+         <xmp:MetadataDate>2023-03-10T10:16:12-08:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2023-03-10T10:16:12-08:00</xmp:ModifyDate>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/">
+         <dc:format>application/vnd.adobe.fla</dc:format>
+      </rdf:Description>
+      <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:9F42FDA3CDBDED11B7A6DD84E1B1550C</xmpMM:InstanceID>
+         <xmpMM:DocumentID>xmp.did:9F42FDA3CDBDED11B7A6DD84E1B1550C</xmpMM:DocumentID>
+         <xmpMM:OriginalDocumentID>xmp.did:9F42FDA3CDBDED11B7A6DD84E1B1550C</xmpMM:OriginalDocumentID>
+         <xmpMM:History>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>created</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:9F42FDA3CDBDED11B7A6DD84E1B1550C</stEvt:instanceID>
+                  <stEvt:when>2023-03-10T10:15:53-08:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpMM:History>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes/MobileSettings.xml b/libsrc/ffdec_lib/testdata/scenes/scenes/MobileSettings.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes/PublishSettings.xml b/libsrc/ffdec_lib/testdata/scenes/scenes/PublishSettings.xml
new file mode 100644
index 000000000..69cf82013
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/scenes/scenes/PublishSettings.xml
@@ -0,0 +1,206 @@
+<flash_profiles>
+<flash_profile version="1.0" name="Default" current="true">
+  <PublishFormatProperties enabled="true">
+    <defaultNames>1</defaultNames>
+    <flash>1</flash>
+    <projectorWin>0</projectorWin>
+    <projectorMac>0</projectorMac>
+    <html>1</html>
+    <gif>0</gif>
+    <jpeg>0</jpeg>
+    <png>0</png>
+    <qt>0</qt>
+    <rnwk>0</rnwk>
+    <swc>0</swc>
+    <flashDefaultName>1</flashDefaultName>
+    <projectorWinDefaultName>1</projectorWinDefaultName>
+    <projectorMacDefaultName>1</projectorMacDefaultName>
+    <htmlDefaultName>1</htmlDefaultName>
+    <gifDefaultName>1</gifDefaultName>
+    <jpegDefaultName>1</jpegDefaultName>
+    <pngDefaultName>1</pngDefaultName>
+    <qtDefaultName>1</qtDefaultName>
+    <rnwkDefaultName>1</rnwkDefaultName>
+    <swcDefaultName>1</swcDefaultName>
+    <flashFileName>scenes.swf</flashFileName>
+    <projectorWinFileName>scenes.exe</projectorWinFileName>
+    <projectorMacFileName>scenes.app</projectorMacFileName>
+    <htmlFileName>scenes.html</htmlFileName>
+    <gifFileName>scenes.gif</gifFileName>
+    <jpegFileName>scenes.jpg</jpegFileName>
+    <pngFileName>scenes.png</pngFileName>
+    <qtFileName>scenes.mov</qtFileName>
+    <rnwkFileName>scenes.smil</rnwkFileName>
+    <swcFileName>scenes.swc</swcFileName>
+  </PublishFormatProperties>
+  <PublishHtmlProperties enabled="true">
+    <VersionDetectionIfAvailable>0</VersionDetectionIfAvailable>
+    <VersionInfo>12,0,0,0;11,2,0,0;11,1,0,0;10,3,0,0;10,2,153,0;10,1,52,0;9,0,124,0;8,0,24,0;7,0,14,0;6,0,79,0;5,0,58,0;4,0,32,0;3,0,8,0;2,0,1,12;1,0,0,1;</VersionInfo>
+    <UsingDefaultContentFilename>1</UsingDefaultContentFilename>
+    <UsingDefaultAlternateFilename>1</UsingDefaultAlternateFilename>
+    <ContentFilename>scenes.xfl_content.html</ContentFilename>
+    <AlternateFilename>scenes.xfl_alternate.html</AlternateFilename>
+    <UsingOwnAlternateFile>0</UsingOwnAlternateFile>
+    <OwnAlternateFilename></OwnAlternateFilename>
+    <Width>550</Width>
+    <Height>400</Height>
+    <Align>0</Align>
+    <Units>0</Units>
+    <Loop>1</Loop>
+    <StartPaused>0</StartPaused>
+    <Scale>0</Scale>
+    <HorizontalAlignment>1</HorizontalAlignment>
+    <VerticalAlignment>1</VerticalAlignment>
+    <Quality>4</Quality>
+    <DeblockingFilter>0</DeblockingFilter>
+    <WindowMode>0</WindowMode>
+    <DisplayMenu>1</DisplayMenu>
+    <DeviceFont>0</DeviceFont>
+    <TemplateFileName>C:\Users\MyUser\AppData\Local\Adobe\Flash CS6\en_US\Configuration\HTML\Default.html</TemplateFileName>
+    <showTagWarnMsg>1</showTagWarnMsg>
+  </PublishHtmlProperties>
+  <PublishFlashProperties enabled="true">
+    <TopDown></TopDown>
+    <FireFox></FireFox>
+    <Report>0</Report>
+    <Protect>0</Protect>
+    <OmitTraceActions>0</OmitTraceActions>
+    <Quality>80</Quality>
+    <DeblockingFilter>0</DeblockingFilter>
+    <StreamFormat>0</StreamFormat>
+    <StreamCompress>7</StreamCompress>
+    <EventFormat>0</EventFormat>
+    <EventCompress>7</EventCompress>
+    <OverrideSounds>0</OverrideSounds>
+    <Version>15</Version>
+    <ExternalPlayer>FlashPlayer11.2</ExternalPlayer>
+    <ActionScriptVersion>3</ActionScriptVersion>
+    <PackageExportFrame>1</PackageExportFrame>
+    <PackagePaths></PackagePaths>
+    <AS3PackagePaths>.</AS3PackagePaths>
+    <AS3ConfigConst>CONFIG::FLASH_AUTHORING=&quot;true&quot;;</AS3ConfigConst>
+    <DebuggingPermitted>1</DebuggingPermitted>
+    <DebuggingPassword></DebuggingPassword>
+    <CompressMovie>0</CompressMovie>
+    <CompressionType>0</CompressionType>
+    <InvisibleLayer>1</InvisibleLayer>
+    <DeviceSound>0</DeviceSound>
+    <StreamUse8kSampleRate>0</StreamUse8kSampleRate>
+    <EventUse8kSampleRate>0</EventUse8kSampleRate>
+    <UseNetwork>0</UseNetwork>
+    <DocumentClass>Main</DocumentClass>
+    <AS3Strict>2</AS3Strict>
+    <AS3Coach>4</AS3Coach>
+    <AS3AutoDeclare>4096</AS3AutoDeclare>
+    <AS3Dialect>AS3</AS3Dialect>
+    <AS3ExportFrame>1</AS3ExportFrame>
+    <AS3Optimize>1</AS3Optimize>
+    <ExportSwc>0</ExportSwc>
+    <ScriptStuckDelay>15</ScriptStuckDelay>
+    <IncludeXMP>1</IncludeXMP>
+    <HardwareAcceleration>0</HardwareAcceleration>
+    <AS3Flags>4102</AS3Flags>
+    <DefaultLibraryLinkage>rsl</DefaultLibraryLinkage>
+    <RSLPreloaderMethod>wrap</RSLPreloaderMethod>
+    <RSLPreloaderSWF>$(AppConfig)/ActionScript 3.0/rsls/loader_animation.swf</RSLPreloaderSWF>
+    <LibraryPath>
+      <library-path-entry>
+        <swc-path>$(AppConfig)/ActionScript 3.0/libs</swc-path>
+        <linkage>merge</linkage>
+      </library-path-entry>
+      <library-path-entry>
+        <swc-path>$(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc</swc-path>
+        <linkage usesDefault="true">rsl</linkage>
+        <rsl-url>http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz</rsl-url>
+        <policy-file-url>http://fpdownload.adobe.com/pub/swz/crossdomain.xml</policy-file-url>
+        <rsl-url>textLayout_2.0.0.232.swz</rsl-url>
+      </library-path-entry>
+    </LibraryPath>
+    <LibraryVersions>
+      <library-version>
+        <swc-path>$(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc</swc-path>
+        <feature name="tlfText" majorVersion="2" minorVersion="0" build="232"/>
+        <rsl-url>http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz</rsl-url>
+        <policy-file-url>http://fpdownload.adobe.com/pub/swz/crossdomain.xml</policy-file-url>
+        <rsl-url>textLayout_2.0.0.232.swz</rsl-url>
+      </library-version>
+    </LibraryVersions>
+  </PublishFlashProperties>
+  <PublishJpegProperties enabled="true">
+    <Width>550</Width>
+    <Height>400</Height>
+    <Progressive>0</Progressive>
+    <DPI>4718592</DPI>
+    <Size>0</Size>
+    <Quality>80</Quality>
+    <MatchMovieDim>1</MatchMovieDim>
+  </PublishJpegProperties>
+  <PublishRNWKProperties enabled="true">
+    <exportFlash>1</exportFlash>
+    <flashBitRate>0</flashBitRate>
+    <exportAudio>1</exportAudio>
+    <audioFormat>0</audioFormat>
+    <singleRateAudio>0</singleRateAudio>
+    <realVideoRate>100000</realVideoRate>
+    <speed28K>1</speed28K>
+    <speed56K>1</speed56K>
+    <speedSingleISDN>0</speedSingleISDN>
+    <speedDualISDN>0</speedDualISDN>
+    <speedCorporateLAN>0</speedCorporateLAN>
+    <speed256K>0</speed256K>
+    <speed384K>0</speed384K>
+    <speed512K>0</speed512K>
+    <exportSMIL>1</exportSMIL>
+  </PublishRNWKProperties>
+  <PublishGifProperties enabled="true">
+    <Width>550</Width>
+    <Height>400</Height>
+    <Animated>0</Animated>
+    <MatchMovieDim>1</MatchMovieDim>
+    <Loop>1</Loop>
+    <LoopCount>0</LoopCount>
+    <OptimizeColors>1</OptimizeColors>
+    <Interlace>0</Interlace>
+    <Smooth>1</Smooth>
+    <DitherSolids>0</DitherSolids>
+    <RemoveGradients>0</RemoveGradients>
+    <TransparentOption></TransparentOption>
+    <TransparentAlpha>128</TransparentAlpha>
+    <DitherOption></DitherOption>
+    <PaletteOption></PaletteOption>
+    <MaxColors>255</MaxColors>
+    <PaletteName></PaletteName>
+  </PublishGifProperties>
+  <PublishPNGProperties enabled="true">
+    <Width>550</Width>
+    <Height>400</Height>
+    <OptimizeColors>1</OptimizeColors>
+    <Interlace>0</Interlace>
+    <Transparent>0</Transparent>
+    <Smooth>1</Smooth>
+    <DitherSolids>0</DitherSolids>
+    <RemoveGradients>0</RemoveGradients>
+    <MatchMovieDim>1</MatchMovieDim>
+    <DitherOption></DitherOption>
+    <FilterOption></FilterOption>
+    <PaletteOption></PaletteOption>
+    <BitDepth>24-bit with Alpha</BitDepth>
+    <MaxColors>255</MaxColors>
+    <PaletteName></PaletteName>
+  </PublishPNGProperties>
+  <PublishQTProperties enabled="true">
+    <Width>550</Width>
+    <Height>400</Height>
+    <MatchMovieDim>1</MatchMovieDim>
+    <UseQTSoundCompression>0</UseQTSoundCompression>
+    <AlphaOption></AlphaOption>
+    <LayerOption></LayerOption>
+    <QTSndSettings>00000000</QTSndSettings>
+    <ControllerOption>0</ControllerOption>
+    <Looping>0</Looping>
+    <PausedAtStart>0</PausedAtStart>
+    <PlayEveryFrame>0</PlayEveryFrame>
+    <Flatten>1</Flatten>
+  </PublishQTProperties>
+</flash_profile>
+</flash_profiles>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/scenes/scenes/bin/SymDepend.cache
new file mode 100644
index 000000000..f8b0b40df
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/scenes/scenes/bin/SymDepend.cache differ
diff --git a/libsrc/ffdec_lib/testdata/scenes/scenes/scenes.xfl b/libsrc/ffdec_lib/testdata/scenes/scenes/scenes.xfl
new file mode 100644
index 000000000..860a820ec
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/scenes/scenes/scenes.xfl
@@ -0,0 +1 @@
+PROXY-CS5
\ No newline at end of file