diff --git a/CHANGELOG.md b/CHANGELOG.md
index 375800f14..2be177648 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,8 +71,9 @@ All notable changes to this project will be documented in this file.
 - [#2136] FLA Export - optimized Shape fixer speed, repeated shape on timeline not exported twice
 - [#2139] FLA Export - labels layer not counted as layer index causing masked layer parentindex wrong
 - [#2138] Nested clipping (masks) display
-- [#2138] Missing morphshapes (incorrect holes calculation)
-- [#2138] Mask layer was visible when did not contain a masked layer
+- [#2138] FLA Export - Missing morphshapes (incorrect holes calculation)
+- [#2138] FLA Export - Mask layer was visible when did not contain a masked layer
+- FLA Export - frame numbering problem
 
 ### Changed
 - [#2120] Exported assets no longer take names from assigned classes if there is more than 1 assigned class
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
index 5b70003b4..f67402233 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
@@ -1877,7 +1877,7 @@ public class XFLConverter {
                                                 symbolStr.writeEndElement();
                                             }
                                             symbolStr.writeStartElement("DOMFrame", new String[]{
-                                                "index", Integer.toString(frame - 1),
+                                                "index", Integer.toString(frame),
                                                 "keyMode", Integer.toString(KEY_MODE_NORMAL)});
                                             symbolStr.writeStartElement("elements");
                                             symbolStr.writeCharactersRaw(recCharWriter.toString());
@@ -2548,7 +2548,7 @@ public class XFLConverter {
         boolean lastIn = true;
         XFLXmlWriter writer2 = new XFLXmlWriter();
         prevStr += "<frames>";
-        int frame = -1;
+        int frame = -1;        
         String lastElements = "";
         CharacterTag lastCharacter = null;
         MATRIX lastMatrix = null;
@@ -2572,7 +2572,9 @@ public class XFLConverter {
         MorphShapeTag shapeTweener = null;
         List<Integer> morphShapeRatios = new ArrayList<>();
         int lastTweenRatio = -1;
-
+        MorphShapeTag standaloneShapeTweener = null;
+        MATRIX standaloneShapeTweenerMatrix = null;
+        
         //Add ShowFrameTag to the end when there is one last missing
         List<Tag> timTags = timelineTags.toArrayList();
         boolean needsFrameAdd = false;
@@ -2589,8 +2591,7 @@ public class XFLConverter {
             timTags.add(new ShowFrameTag(swf));
         }
 
-        MorphShapeTag standaloneShapeTweener = null;
-        MATRIX standaloneShapeTweenerMatrix = null;
+        
         for (Tag t : timTags) {
             if (t instanceof PlaceObjectTypeTag) {
                 PlaceObjectTypeTag po = (PlaceObjectTypeTag) t;
@@ -2658,22 +2659,10 @@ public class XFLConverter {
                             ratio = po.getRatio();
                             clipActions = po.getClipActions();
                         }
-
                     }
                 }
             }
-
-            /*if (t instanceof ShowFrameTag) {
-                if (t == timTags.get(timTags.size() - 1)) {
-                    if (shapeTween && character != null && (character instanceof MorphShapeTag)) {
-                        MorphShapeTag m = (MorphShapeTag) character;
-                        shapeTweener = m;
-                        shapeTween = false;
-                        lastTweenRatio = ratio;
-                        character = null;
-                    }
-                }
-            }*/
+            
             if (t instanceof RemoveTag) {
                 RemoveTag rt = (RemoveTag) t;
                 if (rt.getDepth() == depth) {
@@ -2699,137 +2688,121 @@ public class XFLConverter {
             }
 
             if (t instanceof ShowFrameTag) {
-                /*if (prevWasShapeTween) {
-                    prevWasShapeTween = false;
-                    continue;
-                }*/
-
-                boolean shapeTweenNow = false;
-                if (frame + 1 >= startFrame && (onlyFrames == null || onlyFrames.contains(frame + 1))) {
-
-                    XFLXmlWriter elementsWriter = new XFLXmlWriter();
-
-                    if (frame + 1 <= endFrame) {
-                        lastIn = true;
-                        if (shapeTweener != null) {
-                            MorphShapeTag m = shapeTweener;
-                            XFLXmlWriter addLastWriter = new XFLXmlWriter();
-                            SHAPEWITHSTYLE endShape = m.getShapeAtRatio(65535); //lastTweenRatio);
-                            convertShape(swf, characters, matrix, m.getShapeNum() == 1 ? 3 : 4, endShape.shapeRecords, m.getFillStyles().getFillStylesAt(65535), m.getLineStyles().getLineStylesAt(m.getShapeNum(), 65535), true, false, addLastWriter);
-                            Integer ease = Easing.getEaseFromShapeRatios(morphShapeRatios);
-                            Integer acceleration = null;
-                            if (ease != null) {
-                                acceleration  = -ease;
-                            }
-                            convertFrame(scene, true, null, null, frame - duration, duration, "", lastElements, files, writer2, acceleration);
-                            duration = 1;
-                            lastElements = addLastWriter.toString();
-                            lastCharacter = m;
-                            lastMatrix = matrix;
-                            shapeTweener = null;
-                            shapeTweenNow = true;
-                            morphShapeRatios.clear();
-                        }
-                        if (!shapeTweenNow) {
-                            if (character instanceof ShapeTag && standaloneShapeTweener != null) {
-                                convertSymbolInstance(instanceName, standaloneShapeTweenerMatrix, colorTransForm, cacheAsBitmap, blendMode, filters, isVisible, backGroundColor, clipActions, metadata, standaloneShapeTweener, characters, tags, flaVersion, elementsWriter);
-                                standaloneShapeTweener = null;
-                            } else if ((character instanceof ShapeTag) && (nonLibraryShapes.contains(characterId))) { // || shapeTweener != null)) {
-                                if (lastCharacter == character && Objects.equals(matrix, lastMatrix)) {
-                                    elementsWriter.writeCharactersRaw(lastElements);
-                                } else {
-                                    ShapeTag shape = (ShapeTag) character;
-                                    statusStack.pushStatus(character.toString());                                            
-                                    convertShape(swf, characters, matrix, shape.getShapeNum(), shape.getShapes().shapeRecords, shape.getShapes().fillStyles, shape.getShapes().lineStyles, false, false, elementsWriter);
-                                    statusStack.popStatus();
-                                }
-                                lastCharacter = character;
-                                lastMatrix = matrix;
-                                shapeTween = false;
-                                shapeTweener = null;
-                            } else if (character != null) {
-                                if (character instanceof MorphShapeTag) {
-                                    MorphShapeTag m = (MorphShapeTag) character;
-                                    if (multiUsageMorphShapes.contains(m.getCharacterId())) {
-                                        shapeTween = false;
-                                        shapeTweener = null;
-                                        standaloneShapeTweener = m;
-                                        standaloneShapeTweenerMatrix = matrix;
-                                        convertSymbolInstance(instanceName, matrix, colorTransForm, cacheAsBitmap, blendMode, filters, isVisible, backGroundColor, clipActions, metadata, character, characters, tags, flaVersion, elementsWriter);
-                                    } else {                                        
-                                        morphShapeRatios.add(ratio == -1 ? 0 : ratio);
-                                        if (lastCharacter == m && Objects.equals(matrix, lastMatrix)) {
-                                            elementsWriter.writeCharactersRaw(lastElements);
-                                        } else {       
-                                            statusStack.pushStatus(m.toString());
-                                            convertShape(swf, characters, matrix, m.getShapeNum() == 1 ? 3 : 4, m.getStartEdges().shapeRecords, m.getFillStyles().getStartFillStyles(), m.getLineStyles().getStartLineStyles(m.getShapeNum()), true, false, elementsWriter);
-                                            statusStack.popStatus();
-                                        }
-                                       
-                                        lastCharacter = m;
-                                        lastMatrix = matrix;
-                                        shapeTween = true;
-                                    }
-                                } else {
-                                    shapeTween = false;
-                                    if (character instanceof TextTag) {
-                                        statusStack.pushStatus(character.toString());
-                                        convertText(instanceName, (TextTag) character, matrix, filters, clipActions, elementsWriter);
-                                        statusStack.popStatus();
-                                    } else if (character instanceof DefineVideoStreamTag) {
-                                        convertVideoInstance(instanceName, matrix, (DefineVideoStreamTag) character, clipActions, elementsWriter);
-                                    } else if (character instanceof ImageTag) {
-                                        convertImageInstance(instanceName, matrix, (ImageTag) character, clipActions, elementsWriter);
-                                    } else {
-                                        convertSymbolInstance(instanceName, matrix, colorTransForm, cacheAsBitmap, blendMode, filters, isVisible, backGroundColor, clipActions, metadata, character, characters, tags, flaVersion, elementsWriter);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if (!shapeTweenNow) {
-                        frame++;
-                        String elements = elementsWriter.toString();
-                        if (!elements.equals(lastElements) && frame > 0) {
-                            convertFrame(scene, false, null, null, frame - duration, duration, "", lastElements, files, writer2, null);
-                            duration = 1;
-                        } else if (frame == 0) {
-                            duration = 1;
-                        } else {
-                            duration++;
-                        }
-
-                        lastElements = elements;
-                        lastCharacter = character;
-                        lastMatrix = matrix;
-                        if (frame > endFrame) {
-                            if (lastIn) {
-                                lastElements = "";
-                                lastIn = false;
-                                lastCharacter = null;
-                                lastMatrix = null;
-                            }
-                        }
-                    }
-                } else {
+                frame++;
+                if (frame < startFrame || frame > endFrame || (onlyFrames != null && !onlyFrames.contains(frame))) {                    
                     if (lastIn) {
                         lastElements = "";
                         lastIn = false;
                         lastCharacter = null;
                         lastMatrix = null;
                     }
-                    frame++;
                     if (frame == 0) {
                         duration = 1;
                     } else {
                         duration++;
                     }
+                    continue;
                 }
+                lastIn = true;
+                
+                XFLXmlWriter elementsWriter = new XFLXmlWriter();
+                
+                if (shapeTweener != null) {
+                    MorphShapeTag m = shapeTweener;
+                    XFLXmlWriter addLastWriter = new XFLXmlWriter();
+                    
+                    if ((character instanceof MorphShapeTag) && (!multiUsageMorphShapes.contains(character.getCharacterId()))) {
+                        MorphShapeTag m2 = (MorphShapeTag) character;
+                        statusStack.pushStatus(m2.toString());
+                        convertShape(swf, characters, matrix, m2.getShapeNum() == 1 ? 3 : 4, m2.getStartEdges().shapeRecords, m2.getFillStyles().getStartFillStyles(), m2.getLineStyles().getStartLineStyles(m2.getShapeNum()), true, false, addLastWriter);
+                        statusStack.popStatus();
+                        shapeTween = true;
+                    } else {
+                        SHAPEWITHSTYLE endShape = m.getShapeAtRatio(65535); //lastTweenRatio);                    
+                        convertShape(swf, characters, matrix, m.getShapeNum() == 1 ? 3 : 4, endShape.shapeRecords, m.getFillStyles().getFillStylesAt(65535), m.getLineStyles().getLineStylesAt(m.getShapeNum(), 65535), true, false, addLastWriter);
+                    }
+                    
+                    Integer ease = Easing.getEaseFromShapeRatios(morphShapeRatios);
+                    Integer acceleration = null;
+                    if (ease != null) {
+                        acceleration  = -ease;
+                    }
+                    convertFrame(scene, true, null, null, frame - duration, duration, "", lastElements, files, writer2, acceleration);
+                    duration = 1;
+                    lastElements = addLastWriter.toString();
+                    lastMatrix = matrix;
+                    lastCharacter = character;
+                    shapeTweener = null;
+                    morphShapeRatios.clear();    
+                    continue;
+                }
+                
+                if (character instanceof ShapeTag && standaloneShapeTweener != null) {
+                    convertSymbolInstance(instanceName, standaloneShapeTweenerMatrix, colorTransForm, cacheAsBitmap, blendMode, filters, isVisible, backGroundColor, clipActions, metadata, standaloneShapeTweener, characters, tags, flaVersion, elementsWriter);
+                    standaloneShapeTweener = null;
+                } else if ((character instanceof ShapeTag) && (nonLibraryShapes.contains(characterId))) {
+                    if (lastCharacter == character && Objects.equals(matrix, lastMatrix)) {
+                        elementsWriter.writeCharactersRaw(lastElements);
+                    } else {
+                        ShapeTag shape = (ShapeTag) character;
+                        statusStack.pushStatus(character.toString());                                            
+                        convertShape(swf, characters, matrix, shape.getShapeNum(), shape.getShapes().shapeRecords, shape.getShapes().fillStyles, shape.getShapes().lineStyles, false, false, elementsWriter);
+                        statusStack.popStatus();
+                    }
+                    shapeTween = false;
+                    shapeTweener = null;
+                } else if (character instanceof MorphShapeTag) {
+                    MorphShapeTag m = (MorphShapeTag) character;
+                    if (multiUsageMorphShapes.contains(m.getCharacterId())) {
+                        shapeTween = false;
+                        shapeTweener = null;
+                        standaloneShapeTweener = m;
+                        standaloneShapeTweenerMatrix = matrix;
+                        convertSymbolInstance(instanceName, matrix, colorTransForm, cacheAsBitmap, blendMode, filters, isVisible, backGroundColor, clipActions, metadata, character, characters, tags, flaVersion, elementsWriter);
+                    } else {                                        
+                        morphShapeRatios.add(ratio == -1 ? 0 : ratio);
+                        if (lastCharacter == m && Objects.equals(matrix, lastMatrix)) {
+                            elementsWriter.writeCharactersRaw(lastElements);
+                        } else {       
+                            statusStack.pushStatus(m.toString());
+                            convertShape(swf, characters, matrix, m.getShapeNum() == 1 ? 3 : 4, m.getStartEdges().shapeRecords, m.getFillStyles().getStartFillStyles(), m.getLineStyles().getStartLineStyles(m.getShapeNum()), true, false, elementsWriter);
+                            statusStack.popStatus();
+                        }
+                        shapeTween = true;
+                    }
+                } else {
+                    shapeTween = false;
+                    if (character instanceof TextTag) {
+                        statusStack.pushStatus(character.toString());
+                        convertText(instanceName, (TextTag) character, matrix, filters, clipActions, elementsWriter);
+                        statusStack.popStatus();
+                    } else if (character instanceof DefineVideoStreamTag) {
+                        convertVideoInstance(instanceName, matrix, (DefineVideoStreamTag) character, clipActions, elementsWriter);
+                    } else if (character instanceof ImageTag) {
+                        convertImageInstance(instanceName, matrix, (ImageTag) character, clipActions, elementsWriter);
+                    } else if (character != null) {
+                        convertSymbolInstance(instanceName, matrix, colorTransForm, cacheAsBitmap, blendMode, filters, isVisible, backGroundColor, clipActions, metadata, character, characters, tags, flaVersion, elementsWriter);
+                    }
+                }                
+                
+                String elements = elementsWriter.toString();
+                if (!elements.equals(lastElements) && frame > 0) {
+                    convertFrame(scene, false, null, null, frame - duration, duration, "", lastElements, files, writer2, null);
+                    duration = 1;
+                } else if (frame == 0) {
+                    duration = 1;
+                } else {
+                    duration++;
+                }
+                lastElements = elements;
+                lastCharacter = character;
+                lastMatrix = matrix;                        
             }
         }
+                
         if (!lastElements.isEmpty() || writer2.length() > 0) {
             frame++;
-            convertFrame(scene, false, null, null, (frame - duration < 0 ? 0 : frame - duration), duration, "", lastElements, files, writer2, null);
+            convertFrame(scene, false, null, null, frame - duration, duration, "", lastElements, files, writer2, null);
         }
         afterStr = "</frames>" + afterStr;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/shapefixer/MorphShapeFixer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/shapefixer/MorphShapeFixer.java
index 5e13e9666..bc7995998 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/shapefixer/MorphShapeFixer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/shapefixer/MorphShapeFixer.java
@@ -27,6 +27,7 @@ import java.awt.Rectangle;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -266,12 +267,23 @@ public class MorphShapeFixer extends ShapeFixer {
                     px = r.getX() + r.getWidth() * Math.random();
                     py = r.getY() + r.getHeight() * Math.random();
                 } while (!region.contains(px, py));*/
+                
+                
                 PathIterator pi = region.getPathIterator(null);
                 if (!pi.isDone()) {
                     double[] points = new double[6];
                     int type = pi.currentSegment(points);
-                    if (type == PathIterator.SEG_MOVETO) {
-                        if (!path.contains(points[0], points[1])) {
+                    if (type == PathIterator.SEG_MOVETO) {                            
+                        double x = points[0];
+                        double y = points[1];
+                        Rectangle2D bounds = region.getBounds2D();
+                        double centerX = bounds.getCenterX();
+                        double centerY = bounds.getCenterY();
+
+                        double p = Math.sqrt((centerX - x) * (centerX - x) + (centerY - y) * (centerY - y));
+                        double x1 = (centerX - x) * 0.1 / p;
+                        double y1 = (centerY - y) * 0.1 / p;
+                        if (!path.contains(x + x1, y + y1)) {                        
                             closedHolesI.add(i);
                         }
                     }
diff --git a/libsrc/ffdec_lib/testdata/morphshape_ease/exp/morphshape_ease/DOMDocument.xml b/libsrc/ffdec_lib/testdata/morphshape_ease/exp/morphshape_ease/DOMDocument.xml
deleted file mode 100644
index f6c5bd73f..000000000
--- a/libsrc/ffdec_lib/testdata/morphshape_ease/exp/morphshape_ease/DOMDocument.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<DOMDocument xmlns="http://ns.adobe.com/xfl/2008/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" currentTimeline="1" xflVersion="2.2" creatorInfo="JPEXS Free Flash Decompiler" platform="Windows" versionInfo="Saved by JPEXS Free Flash Decompiler v.0.0.0" majorVersion="0.0.0" buildNumber="" nextSceneIdentifier="2" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false" autoSaveHasPrompted="true" backgroundColor="#ffffff" frameRate="24">
-     <symbols/>
-     <timelines>
-          <DOMTimeline name="Scene 1">
-               <layers>
-                    <DOMLayer name="Layer 1 (depth 1)" color="#b93cfd" current="true" isSelected="true">
-                         <frames>
-                              <DOMFrame index="-1" duration="99" tweenType="shape" keyMode="17922" acceleration="78">
-                                   <elements>
-                                        <DOMShape isFloating="true">
-                                             <fills>
-                                                  <FillStyle index="1">
-                                                       <SolidColor color="#009966" alpha="1.0"/>
-                                                  </FillStyle>
-                                             </fills>
-                                             <strokes>
-                                                  <StrokeStyle index="1">
-                                                       <SolidStroke scaleMode="normal" weight="0.0">
-                                                            <fill>
-                                                                 <SolidColor color="#000000" alpha="0.0"/>
-                                                            </fill>
-                                                       </SolidStroke>
-                                                  </StrokeStyle>
-                                             </strokes>
-                                             <edges>
-                                                  <Edge fillStyle0="0" fillStyle1="1" strokeStyle="1" edges="! 1040 5980| 2080 5980| 2080 7020| 1040 7020| 1040 5980"/>
-                                             </edges>
-                                        </DOMShape>
-                                   </elements>
-                              </DOMFrame>
-                              <DOMFrame index="98" keyMode="9728">
-                                   <elements>
-                                        <DOMShape isFloating="true">
-                                             <fills>
-                                                  <FillStyle index="1">
-                                                       <SolidColor color="#009967" alpha="1.0"/>
-                                                  </FillStyle>
-                                             </fills>
-                                             <strokes>
-                                                  <StrokeStyle index="1">
-                                                       <SolidStroke scaleMode="normal" weight="0.0">
-                                                            <fill>
-                                                                 <SolidColor color="#000001" alpha="0.0"/>
-                                                            </fill>
-                                                       </SolidStroke>
-                                                  </StrokeStyle>
-                                             </strokes>
-                                             <edges>
-                                                  <Edge fillStyle0="0" fillStyle1="1" strokeStyle="1" edges="! 8719 5880| 9759 5880| 9759 6920| 8719 6920| 8719 5880"/>
-                                             </edges>
-                                        </DOMShape>
-                                   </elements>
-                              </DOMFrame>
-                         </frames>
-                    </DOMLayer>
-               </layers>
-          </DOMTimeline>
-     </timelines>
-</DOMDocument>
diff --git a/libsrc/ffdec_lib/testdata/morphshape_ease/exp/morphshape_ease/PublishSettings.xml b/libsrc/ffdec_lib/testdata/morphshape_ease/exp/morphshape_ease/PublishSettings.xml
deleted file mode 100644
index 40c6cbef7..000000000
--- a/libsrc/ffdec_lib/testdata/morphshape_ease/exp/morphshape_ease/PublishSettings.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<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>morphshape_ease.swf</flashFileName>
-      <projectorWinFileName>morphshape_ease.exe</projectorWinFileName>
-      <projectorMacFileName>morphshape_ease.app</projectorMacFileName>
-      <htmlFileName>morphshape_ease.html</htmlFileName>
-      <gifFileName>morphshape_ease.gif</gifFileName>
-      <jpegFileName>morphshape_ease.jpg</jpegFileName>
-      <pngFileName>morphshape_ease.png</pngFileName>
-      <qtFileName>1</qtFileName>
-      <rnwkFileName>morphshape_ease.smil</rnwkFileName>
-      <swcFileName>morphshape_ease.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>morphshape_ease_content.html</ContentFilename>
-      <AlternateFilename>morphshape_ease_alternate.html</AlternateFilename>
-      <UsingOwnAlternateFile>0</UsingOwnAlternateFile>
-      <OwnAlternateFilename></OwnAlternateFilename>
-      <Width>550.0</Width>
-      <Height>400.0</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></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>2</ActionScriptVersion>
-      <PackageExportFrame>1</PackageExportFrame>
-      <PackagePaths></PackagePaths>
-      <AS3PackagePaths>.</AS3PackagePaths>
-      <AS3ConfigConst>CONFIG::FLASH_AUTHORING=&quot;true&quot;;</AS3ConfigConst>
-      <DebuggingPermitted>0</DebuggingPermitted>
-      <DebuggingPassword></DebuggingPassword>
-      <CompressMovie>1</CompressMovie>
-      <CompressionType>0</CompressionType>
-      <InvisibleLayer>1</InvisibleLayer>
-      <DeviceSound>0</DeviceSound>
-      <StreamUse8kSampleRate>0</StreamUse8kSampleRate>
-      <EventUse8kSampleRate>0</EventUse8kSampleRate>
-      <UseNetwork>0</UseNetwork>
-      <DocumentClass></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.0</Width>
-      <Height>400.0</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.0</Width>
-      <Height>400.0</Height>
-      <Animated>0</Animated>
-      <MatchMovieDim>1</MatchMovieDim>
-      <Loop>1</Loop>
-      <LoopCount></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.0</Width>
-      <Height>400.0</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.0</Width>
-      <Height>400.0</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/morphshape_ease/morphshape_ease/DOMDocument.xml b/libsrc/ffdec_lib/testdata/morphshape_ease/morphshape_ease/DOMDocument.xml
new file mode 100644
index 000000000..a1f15ede5
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/morphshape_ease/morphshape_ease/DOMDocument.xml
@@ -0,0 +1,62 @@
+<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="2" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false" autoSaveEnabled="true" autoSaveHasPrompted="true">
+     <symbols>
+          <Include href="Symbol 1.xml" loadImmediate="false" itemID="6574407b-000010d3" lastModified="1702117499"/>
+          <Include href="Tween 1.xml" itemIcon="1" loadImmediate="false" itemID="6574404e-000010c9" lastModified="1702117454"/>
+          <Include href="Tween 2.xml" itemIcon="1" loadImmediate="false" itemID="6574404e-000010cb" lastModified="1702117454"/>
+     </symbols>
+     <timelines>
+          <DOMTimeline name="Scene 1" currentFrame="13">
+               <layers>
+                    <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
+                         <frames>
+                              <DOMFrame index="0" duration="99" tweenType="shape" keyMode="17922" acceleration="-92">
+                                   <MorphShape>
+                                        <morphSegments>
+                                             <MorphSegment startPointA="#4.1, #17.5C" startPointB="#22.0F, #16.F8" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="0">
+                                                  <MorphCurves controlPointA="#6.18, #17.5C" anchorPointA="#8.2, #17.5C" controlPointB="#24.17, #16.F8" anchorPointB="#26.1F, #16.F8" isLine="true"/>
+                                                  <MorphCurves controlPointA="#8.2, #19.64" anchorPointA="#8.2, #1B.6C" controlPointB="#26.1F, 25" anchorPointB="#26.1F, #1B.08" isLine="true"/>
+                                                  <MorphCurves controlPointA="#6.18, #1B.6C" anchorPointA="#4.1, #1B.6C" controlPointB="#24.17, #1B.08" anchorPointB="#22.0F, #1B.08" isLine="true"/>
+                                                  <MorphCurves controlPointA="#4.1, #19.64" anchorPointA="#4.1, #17.5C" controlPointB="#22.0F, 25" anchorPointB="#22.0F, #16.F8" isLine="true"/>
+                                             </MorphSegment>
+                                        </morphSegments>
+                                        <morphHintsList/>
+                                   </MorphShape>
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <SolidColor color="#009966"/>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="!1040 5980S2|2080 5980!2080 5980|2080 7020!2080 7020|1040 7020!1040 7020|1040 5980"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="99" keyMode="9728">
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <SolidColor color="#009966"/>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="!8719 5880|9759 5880!9759 5880|9759 6920!9759 6920|8719 6920!8719 6920|8719 5880"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
+               </layers>
+          </DOMTimeline>
+     </timelines>
+     <PrinterSettings/>
+     <publishHistory>
+          <PublishItem publishSize="1002" publishTime="1702127499"/>
+          <PublishItem publishSize="1012" publishTime="1702127363"/>
+          <PublishItem publishSize="995" publishTime="1702125229"/>
+     </publishHistory>
+</DOMDocument>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline.html b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline.html
new file mode 100644
index 000000000..97cdf7583
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline.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>morphshape_timeline</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="morphshape_timeline" align="middle">
+				<param name="movie" value="morphshape_timeline.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="morphshape_timeline.swf" width="550" height="400">
+					<param name="movie" value="morphshape_timeline.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/morphshape_timeline/morphshape_timeline.swf b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline.swf
new file mode 100644
index 000000000..a77b381fc
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline.swf differ
diff --git a/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/DOMDocument.xml b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/DOMDocument.xml
new file mode 100644
index 000000000..336da3be4
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/DOMDocument.xml
@@ -0,0 +1,148 @@
+<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="2" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false">
+     <timelines>
+          <DOMTimeline name="Scene 1" currentFrame="60">
+               <layers>
+                    <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
+                         <frames>
+                              <DOMFrame index="0" duration="19" tweenType="shape" keyMode="17922">
+                                   <MorphShape>
+                                        <morphSegments>
+                                             <MorphSegment startPointA="#A.77, #D.34" startPointB="#14.77, #11.6C" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="1">
+                                                  <MorphCurves controlPointA="#10.7B, #D.34" anchorPointA="#16.7F, #D.34" controlPointB="#1A.7B, #11.6C" anchorPointB="#20.7F, #11.6C" isLine="true"/>
+                                                  <MorphCurves controlPointA="#16.7F, #11.12" anchorPointA="#16.7F, #14.F" controlPointB="#20.7F, #15.4A" anchorPointB="#20.7F, #19.28" isLine="true"/>
+                                                  <MorphCurves controlPointA="#10.7B, #14.F" anchorPointA="#A.77, #14.F" controlPointB="#1A.7B, #19.28" anchorPointB="#14.77, #19.28" isLine="true"/>
+                                                  <MorphCurves controlPointA="#A.77, #11.12" anchorPointA="#A.77, #D.34" controlPointB="#14.77, #15.4A" anchorPointB="#14.77, #11.6C" isLine="true"/>
+                                             </MorphSegment>
+                                        </morphSegments>
+                                        <morphHintsList/>
+                                   </MorphShape>
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <SolidColor color="#009900"/>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="!5759 3380S2|5759 5360!5759 5360|2679 5360!2679 5360|2679 3380!2679 3380|5759 3380"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="19" duration="20" tweenType="shape" keyMode="17922">
+                                   <MorphShape>
+                                        <morphSegments>
+                                             <MorphSegment startPointA="#14.77, #11.6C" startPointB="#8.FB, #7.1C" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="1">
+                                                  <MorphCurves controlPointA="#1A.7B, #11.6C" anchorPointA="#20.7F, #11.6C" controlPointB="#D.8D, #7.C6" anchorPointB="#12.1F, #8.7" isLine="true"/>
+                                                  <MorphCurves controlPointA="#20.7F, #15.4A" anchorPointA="#20.7F, #19.28" controlPointB="#13.91, #B.A4" anchorPointB="#15.03, #E.D8" isLine="true"/>
+                                                  <MorphCurves controlPointA="#1A.7B, #19.28" anchorPointA="#14.77, #19.28" controlPointB="#E.FF, #E.D8" anchorPointB="#8.FB, #E.D8" isLine="true"/>
+                                                  <MorphCurves controlPointA="#14.77, #15.4A" anchorPointA="#14.77, #11.6C" controlPointB="#8.FB, #A.FA" anchorPointB="#8.FB, #7.1C" isLine="true"/>
+                                             </MorphSegment>
+                                        </morphSegments>
+                                        <morphHintsList/>
+                                   </MorphShape>
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <SolidColor color="#FF0000"/>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="!8319 6440|5239 6440!5239 6440|5239 4460!5239 4460|8319 4460!8319 4460|8319 6440"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="39" duration="10" keyMode="9728">
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <SolidColor color="#0000FF"/>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="!5379 3800S2|2299 3800!2299 3800|2299 1820!2299 1820|4639 2160!4639 2160|5379 3800"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="49" duration="10" tweenType="shape" keyMode="17922">
+                                   <MorphShape>
+                                        <morphSegments>
+                                             <MorphSegment startPointA="#8.FB, #7.1C" startPointB="#F.EF, #10.36" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="1">
+                                                  <MorphCurves controlPointA="#B.44, #7.71" anchorPointA="#D.8D, #7.C6" controlPointB="#F.EF, #E.2" anchorPointB="#11.48, #C.A6"/>
+                                                  <MorphCurves controlPointA="#F.B9, #8.17" anchorPointA="#11.E5, #8.68" controlPointB="#12.A2, #B.2C" anchorPointB="#14.8B, #B.2C"/>
+                                                  <MorphCurves controlPointA="#12.02, #8.6C" anchorPointA="#12.1F, #8.7" controlPointB="#14.A4, #B.2C" anchorPointB="#14.BD, #B.2D"/>
+                                                  <MorphCurves controlPointA="#12.F9, #A.53" anchorPointA="#13.D3, #C.36" controlPointB="#16.86, #B.3F" anchorPointB="#17.CD, #C.A6"/>
+                                                  <MorphCurves controlPointA="#14.6B, #D.87" anchorPointA="#15.03, #E.D8" controlPointB="#18.A7, #D.94" anchorPointB="#18.F8, #E.C"/>
+                                                  <MorphCurves controlPointA="#14.23, #E.D8" anchorPointA="#13.43, #E.D8" controlPointB="#19.27, #F.7" anchorPointB="#19.27, #10.36"/>
+                                                  <MorphCurves controlPointA="#10.EF, #E.D8" anchorPointA="#E.9B, #E.D8" controlPointB="#19.27, #12.4C" anchorPointB="#17.CD, #13.C6"/>
+                                                  <MorphCurves controlPointA="#C.6A, #E.D8" anchorPointA="#A.39, #E.D8" controlPointB="#16.74, 21.25" anchorPointB="#14.8B, 21.25"/>
+                                                  <MorphCurves controlPointA="#9.9A, #E.D8" anchorPointA="#8.FB, #E.D8" controlPointB="20, 21.25" anchorPointB="#13.81, #15.22"/>
+                                                  <MorphCurves controlPointA="#8.FB, #D.49" anchorPointA="#8.FB, #B.BA" controlPointB="18.25, #14.D5" anchorPointB="#11.48, #13.C6"/>
+                                                  <MorphCurves controlPointA="#8.FB, #9.6C" anchorPointA="#8.FB, #7.1E" controlPointB="#F.EF, #12.4C" anchorPointB="#F.EF, #10.36"/>
+                                                  <MorphCurves controlPointA="#8.FB, #7.1E" anchorPointA="#8.FB, #7.1C" controlPointB="#F.EF, #10.36" anchorPointB="#F.EF, #10.36" isLine="true"/>
+                                             </MorphSegment>
+                                        </morphSegments>
+                                        <morphHintsList/>
+                                   </MorphShape>
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <SolidColor color="#0000FF"/>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="!5379 3800S2|2299 3800!2299 3800|2299 1820!2299 1820|4639 2160!4639 2160|5379 3800"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="59" keyMode="9728">
+                                   <elements>
+                                        <DOMShape>
+                                             <fills>
+                                                  <FillStyle index="1">
+                                                       <SolidColor color="#FF0000"/>
+                                                  </FillStyle>
+                                             </fills>
+                                             <edges>
+                                                  <Edge fillStyle1="1" edges="!6093 3238[6439 3616 6439 4150!6439 4150[6439 4684 6093 5062!6093 5062[5748 5440 5259 5440!5259 5440[4770 5440 4424 5062!4424 5062[4079 4684 4079 4150!4079 4150[4079 3616 4424 3238!4424 3238[4770 2860 5259 2860!5259 2860[5748 2860 6093
+ 3238"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="60" keyMode="9728">
+                                   <elements>
+                                        <DOMShape>
+                                             <strokes>
+                                                  <StrokeStyle index="1">
+                                                       <SolidStroke scaleMode="normal" weight="5">
+                                                            <fill>
+                                                                 <SolidColor color="#FF0000"/>
+                                                            </fill>
+                                                       </SolidStroke>
+                                                  </StrokeStyle>
+                                             </strokes>
+                                             <edges>
+                                                  <Edge strokeStyle="1" edges="
+!3879 5420|5546 4276.5!5546 4276.5|3779 2900!5546 4276.5|7699 2800!5546 4276.5|7039 5440"/>
+                                             </edges>
+                                        </DOMShape>
+                                   </elements>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
+               </layers>
+          </DOMTimeline>
+     </timelines>
+     <PrinterSettings/>
+     <publishHistory>
+          <PublishItem publishSize="1202" publishTime="1702154444"/>
+          <PublishItem publishSize="960" publishTime="1702145798"/>
+     </publishHistory>
+</DOMDocument>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/META-INF/metadata.xml
new file mode 100644
index 000000000..8246fb6eb
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/META-INF/metadata.xml
@@ -0,0 +1,68 @@
+<?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-12-09T10:14:52-08:00</xmp:CreateDate>
+         <xmp:MetadataDate>2023-12-09T12:45:21-08:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2023-12-09T12:45:21-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#"
+            xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#">
+         <xmpMM:InstanceID>xmp.iid:C88F451FCC96EE119313910734F6A093</xmpMM:InstanceID>
+         <xmpMM:DocumentID>xmp.did:C88F451FCC96EE119313910734F6A093</xmpMM:DocumentID>
+         <xmpMM:OriginalDocumentID>xmp.did:FF0A2AA52D76EE119313910734F6A093</xmpMM:OriginalDocumentID>
+         <xmpMM:History>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>created</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:FF0A2AA52D76EE119313910734F6A093</stEvt:instanceID>
+                  <stEvt:when>2023-12-09T10:14:52-08:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:C88F451FCC96EE119313910734F6A093</stEvt:instanceID>
+                  <stEvt:when>2023-12-09T12:45:21-08:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
+                  <stEvt:changed>/</stEvt:changed>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpMM:History>
+         <xmpMM:DerivedFrom rdf:parseType="Resource">
+            <stRef:instanceID>xmp.iid:FF0A2AA52D76EE119313910734F6A093</stRef:instanceID>
+            <stRef:documentID>xmp.did:FF0A2AA52D76EE119313910734F6A093</stRef:documentID>
+            <stRef:originalDocumentID>xmp.did:FF0A2AA52D76EE119313910734F6A093</stRef:originalDocumentID>
+         </xmpMM:DerivedFrom>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/MobileSettings.xml b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/MobileSettings.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/PublishSettings.xml b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/PublishSettings.xml
new file mode 100644
index 000000000..1e03326ec
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/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>testtimes.swf</flashFileName>
+    <projectorWinFileName>testtimes.exe</projectorWinFileName>
+    <projectorMacFileName>testtimes.app</projectorMacFileName>
+    <htmlFileName>testtimes.html</htmlFileName>
+    <gifFileName>testtimes.gif</gifFileName>
+    <jpegFileName>testtimes.jpg</jpegFileName>
+    <pngFileName>testtimes.png</pngFileName>
+    <qtFileName>testtimes.mov</qtFileName>
+    <rnwkFileName>testtimes.smil</rnwkFileName>
+    <swcFileName>testtimes.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>testtimes.xfl_content.html</ContentFilename>
+    <AlternateFilename>testtimes.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>2</ActionScriptVersion>
+    <PackageExportFrame>1</PackageExportFrame>
+    <PackagePaths></PackagePaths>
+    <AS3PackagePaths>.</AS3PackagePaths>
+    <AS3ConfigConst>CONFIG::FLASH_AUTHORING=&quot;true&quot;;</AS3ConfigConst>
+    <DebuggingPermitted>0</DebuggingPermitted>
+    <DebuggingPassword></DebuggingPassword>
+    <CompressMovie>1</CompressMovie>
+    <CompressionType>0</CompressionType>
+    <InvisibleLayer>1</InvisibleLayer>
+    <DeviceSound>0</DeviceSound>
+    <StreamUse8kSampleRate>0</StreamUse8kSampleRate>
+    <EventUse8kSampleRate>0</EventUse8kSampleRate>
+    <UseNetwork>0</UseNetwork>
+    <DocumentClass></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></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/morphshape_timeline/morphshape_timeline/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/bin/SymDepend.cache
new file mode 100644
index 000000000..420aca5c8
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/bin/SymDepend.cache differ
diff --git a/libsrc/ffdec_lib/testdata/morphshape_ease/exp/morphshape_ease/morphshape_ease.xfl b/libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/morphshape_timeline.xfl
similarity index 100%
rename from libsrc/ffdec_lib/testdata/morphshape_ease/exp/morphshape_ease/morphshape_ease.xfl
rename to libsrc/ffdec_lib/testdata/morphshape_timeline/morphshape_timeline/morphshape_timeline.xfl