From 9c86616dcd08e8a20a5cc6524516fea223bb4ca9 Mon Sep 17 00:00:00 2001
From: korenkonder <admin@kujikita.com>
Date: Mon, 25 May 2020 14:23:28 +0300
Subject: [PATCH] Release v0.4.9.3

AET
---
 KKdBaseLib/Attributes.cs           |   9 +
 KKdBaseLib/Auth2D.cs               |  20 +-
 KKdBaseLib/Extensions.cs           |  59 +++-
 KKdBaseLib/F2/Header.cs            |   4 +-
 KKdBaseLib/F2/POF.cs               |  24 +-
 KKdBaseLib/Format.cs               |  12 +-
 KKdBaseLib/KKdBaseLib.csproj       |   4 +-
 KKdBaseLib/Mat4.cs                 |   3 -
 KKdMainLib/A3DA.cs                 |   2 +-
 KKdMainLib/AddParam.cs             |   4 +-
 KKdMainLib/Aet.cs                  | 541 ++++++++++++++---------------
 KKdMainLib/DEX.cs                  |  10 +-
 KKdMainLib/Extensions.cs           |  36 +-
 KKdMainLib/IO/Extensions.cs        |  33 +-
 KKdMainLib/IO/Stream.cs            |  48 ++-
 KKdMainLib/KKdMainLib.csproj       |   4 +-
 KKdMainLib/STR.cs                  |   2 +-
 PD_Tool/Program.cs                 |   4 +-
 PD_Tool/Properties/AssemblyInfo.cs |   4 +-
 PD_Tool/classes/A3D.cs             |  24 +-
 PD_Tool/classes/ADP.cs             |   8 +-
 PD_Tool/classes/DEX.cs             |  24 +-
 22 files changed, 488 insertions(+), 391 deletions(-)
 create mode 100644 KKdBaseLib/Attributes.cs

diff --git a/KKdBaseLib/Attributes.cs b/KKdBaseLib/Attributes.cs
new file mode 100644
index 0000000..fdfb6ff
--- /dev/null
+++ b/KKdBaseLib/Attributes.cs
@@ -0,0 +1,9 @@
+namespace KKdBaseLib
+{
+    public class HeadData : System.Attribute { }
+    public class Padding  : System.Attribute { }
+    public class Binary   : System.Attribute { }
+    public class Offset   : System.Attribute { }
+    public class Count    : System.Attribute { }
+    public class Flags    : System.Attribute { }
+}
diff --git a/KKdBaseLib/Auth2D.cs b/KKdBaseLib/Auth2D.cs
index dbd3d69..b7e2124 100644
--- a/KKdBaseLib/Auth2D.cs
+++ b/KKdBaseLib/Auth2D.cs
@@ -17,9 +17,9 @@ namespace KKdBaseLib.Auth2D
         public uint Width;
         public uint Height;
         public Pointer<Vec2<CountPointer<KFT2>>> Camera;
-        public CountPointer<Composition> Compositions;
-        public CountPointer<Video      > Videos;
-        public CountPointer<Audio      > Audios;
+        public CountPointer<Composition> Composition;
+        public CountPointer<Video      > Video;
+        public CountPointer<Audio      > Audio;
     }
 
     public struct Composition
@@ -47,9 +47,9 @@ namespace KKdBaseLib.Auth2D
         public AetLayerFlags   Flags;
         public AetLayerQuality Quality;
         public AetLayerType    Type;
-        public int VideoItemOffset;
+        public int VidItmOff; //VideoItemOffset
         public int ParentLayer;
-        public CountPointer<Marker> Markers;
+        public CountPointer<Marker> Marker;
         public Pointer<VideoData> Video;
         public Pointer<AudioData> Audio;
 
@@ -210,15 +210,15 @@ namespace KKdBaseLib.Auth2D
         public ushort Width;
         public ushort Height;
         public float Frames;
-        public CountPointer<Source> Sources;
+        public CountPointer<Identifier> Identifiers;
 
-        public override string ToString() => $"Width: {Width}; Height: {Height}; Color: {Color.ToString("X2")}";
-
-        public struct Source
+        public override string ToString() => $"Width: {Width}; Height: {Height}; Color: {Color:X2)}";
+    
+        public struct Identifier
         {
             public Pointer<string> Name;
             public uint ID;
-
+        
             public override string ToString() => $"ID: {ID}; Name: {Name}";
         }
     }
diff --git a/KKdBaseLib/Extensions.cs b/KKdBaseLib/Extensions.cs
index 340e6b8..0def7df 100644
--- a/KKdBaseLib/Extensions.cs
+++ b/KKdBaseLib/Extensions.cs
@@ -26,7 +26,6 @@ namespace KKdBaseLib
         public static    int Sign   (this double val) =>     Math.Sign   (val);
         public static double Sqrt   (this double d  ) =>     Math.Sqrt   (d  );
 
-
         public static double Atan2(this double y   , double x      ) => Math.Atan2(y   , x      );
         public static double Log  (this double val , double newBase) => Math.Log  (val , newBase);
         public static double Max  (this double val1, double val2   ) => Math.Max  (val1, val2   );
@@ -55,7 +54,6 @@ namespace KKdBaseLib
         public static float Round  (this float d  ) => (float)     Math.Round  (d  ) ;
         public static float Sqrt   (this float d  ) => (float)     Math.Sqrt   (d  ) ;
 
-
         public static float Atan2(this float y   , float x      ) => (float)Math.Atan2(y   , x      );
         public static float Log  (this float val , float newBase) => (float)Math.Log  (val , newBase);
         public static float Max  (this float val1, float val2   ) =>        Math.Max  (val1, val2   );
@@ -89,10 +87,29 @@ namespace KKdBaseLib
         public static byte[] E(this byte[] le, byte len, bool isBE)
         { if (isBE) { for (byte i = 0; i < len; i++) buf[i] = le[i];
                 for (byte i = 0; i < len; i++) le[len - i - 1] = buf[i]; } return le; }
+
+        public static  short E(this  short le)
+        { for (byte i = 0; i < 2; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 2; i++) { le = (short)((int)le | buf[i]); if (i < 1) le <<= 8; } return le; }
+        public static ushort E(this ushort le)
+        { for (byte i = 0; i < 2; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 2; i++) { le |= buf[i]; if (i < 1) le <<= 8; } return le; }
+        public static    int E(this    int le)
+        { for (byte i = 0; i < 4; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 4; i++) { le |= buf[i]; if (i < 3) le <<= 8; } return le; }
+        public static   uint E(this   uint le)
+        { for (byte i = 0; i < 4; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 4; i++) { le |= buf[i]; if (i < 3) le <<= 8; } return le; }
+        public static   long E(this   long le)
+        { for (byte i = 0; i < 8; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 8; i++) { le |= buf[i]; if (i < 7) le <<= 8; } return le; }
+        public static  ulong E(this  ulong le)
+        { for (byte i = 0; i < 8; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 8; i++) { le |= buf[i]; if (i < 7) le <<= 8; } return le; }
+
         public static  short E(this  short le, bool isBE)
         { if (isBE) { for (byte i = 0; i < 2; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
-                for (byte i = 0; i < 2; i++) { le = (short)((int)le |
-                        buf[i]); if (i < 1) le <<= 8; } } return le; }
+                for (byte i = 0; i < 2; i++) { le = (short)((int)le | buf[i]); if (i < 1) le <<= 8; } } return le; }
         public static ushort E(this ushort le, bool isBE)
         { if (isBE) { for (byte i = 0; i < 2; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
                 for (byte i = 0; i < 2; i++) { le |= buf[i]; if (i < 1) le <<= 8; } } return le; }
@@ -289,5 +306,39 @@ namespace KKdBaseLib
         public static bool ToF64(this string s, out double? val)
         { val = null; if (s.Length < 1) return false; ulong d = 0; if (s[0] == '-') d = 0x8000000000000000;
           bool b = double.TryParse(s.Replace(".", NDS), out double t); if (b) val = (d | t.ToU64()).ToF64(); return b; }
+
+        public static T[] ReverseEndian<T>(this T[] a)
+        {
+            if (a == null || a.Length < 1) return a;
+
+            int length = a.Length;
+            T[] b = new T[length];
+            for (int i = 0; i < length; i++)
+                b[i] = (T)ReverseEndian(a[i]);
+            return b;
+        }
+
+        public static object ReverseEndian(this object a)
+        {
+            object c = default;
+            System.Reflection.FieldInfo[] d = a.GetType().GetFields();
+            foreach (System.Reflection.FieldInfo field in d)
+            {
+                object e = field.GetValue(a);
+                Type t = field.FieldType;
+                     if (t == typeof( short)) e = (( short)e).E();
+                else if (t == typeof(ushort)) e = ((ushort)e).E();
+                else if (t == typeof(   int)) e = ((   int)e).E();
+                else if (t == typeof(  uint)) e = ((  uint)e).E();
+                else if (t == typeof(  long)) e = ((  long)e).E();
+                else if (t == typeof( ulong)) e = (( ulong)e).E();
+                else if (t == typeof( float)) e = (( float)e).ToI32().E().ToF32();
+                else if (t == typeof(double)) e = ((double)e).ToI64().E().ToF64();
+                else if (t == typeof(  Half)) e = (Half)((ushort)(Half)e).E();
+                else e = ReverseEndian(e);
+                field.SetValue(a, e);
+            }
+            return c;
+        }
     }
 }
diff --git a/KKdBaseLib/F2/Header.cs b/KKdBaseLib/F2/Header.cs
index 826eff7..c969886 100644
--- a/KKdBaseLib/F2/Header.cs
+++ b/KKdBaseLib/F2/Header.cs
@@ -13,9 +13,9 @@ namespace KKdBaseLib.F2
         public int SectionSignature;
 
         public Format Format;
-        public bool NotUseDataSizeAsSectionSize;
+        public bool UseBigEndian;
+        public bool UseSectionSize;
 
-        public bool IsBE => Format == Format.F2BE;
         public bool IsX  => Format == Format.X || Format == Format.XHD;
 
         public override string ToString() => Signature.ToString(false);
diff --git a/KKdBaseLib/F2/POF.cs b/KKdBaseLib/F2/POF.cs
index 5f25174..99bbf02 100644
--- a/KKdBaseLib/F2/POF.cs
+++ b/KKdBaseLib/F2/POF.cs
@@ -16,24 +16,28 @@ namespace KKdBaseLib.F2
             Offsets = KKdList<long>.New;
             fixed (byte* ptr = data)
             {
-                int i = 0, offset = 0, v = 0;
+                long offset = 0;
+                int i = 0, j = 0, v = 0;
                 byte bitShift = (byte)(shiftX ? 3 : 2);
 
                 int length = *(int*)ptr - 4;
-                byte* localPtr = ptr + 4;
+                byte* l = ptr + 4;
+                Offsets.Capacity = length;
                 while (length > i)
                 {
-                    v = *ptr & 0x3F;
-                    Val = (Value)(*ptr & 0xC0);
-                    localPtr++; i++;
-                         if (Val == Value.Int32  )
-                    { v = (v << 24) | (ptr[0] << 16) | (ptr[1] << 8) | ptr[2]; localPtr += 3; i += 3; }
-                    else if (Val == Value.Int16  )
-                    { v = (v <<  8) |  ptr[0];                                 localPtr += 1; i += 3; }
-                    else if (Val == Value.Invalid) break;
+                    v = *l & 0x3F;
+                    Val = (Value)(*l & 0xC0);
+                         if (Val == Value.Int32)
+                    { v = (v << 24) | (l[1] << 16) | (l[2] << 8) | l[3]; l += 4; i += 4; }
+                    else if (Val == Value.Int16)
+                    { v = (v <<  8) |  l[1];                             l += 2; i += 2; }
+                    else if (Val == Value.Int8 ) {                       l ++  ; i ++  ; }
+                    else break;
+                    j++;
                     offset += v;
                     Offsets.Add(offset << bitShift);
                 }
+                Offsets.Capacity = j;
             }
         }
 
diff --git a/KKdBaseLib/Format.cs b/KKdBaseLib/Format.cs
index 7c69f27..38b56d0 100644
--- a/KKdBaseLib/Format.cs
+++ b/KKdBaseLib/Format.cs
@@ -9,11 +9,11 @@ namespace KKdBaseLib
         DTe  =  4,
         F    =  5,
         AFT  =  6,
-        F2LE =  7,
-        F2BE =  8,
-        MGF  =  9,
-        X    = 10,
-        XHD  = 11,
-        FT   = 12,
+        F2   =  7,
+        MGF  =  8,
+        X    =  9,
+        XHD  = 10,
+        FT   = 11,
+        M39  = 12,
     }
 }
diff --git a/KKdBaseLib/KKdBaseLib.csproj b/KKdBaseLib/KKdBaseLib.csproj
index 1a4ed79..0188dc1 100644
--- a/KKdBaseLib/KKdBaseLib.csproj
+++ b/KKdBaseLib/KKdBaseLib.csproj
@@ -6,12 +6,12 @@
     <Configuration></Configuration>
     <Copyright>korenkonder © 2019-2020</Copyright>
     <Description>A base library</Description>
-    <FileVersion>0.4.9.2</FileVersion>
+    <FileVersion>0.4.9.3</FileVersion>
     <PackageId>KKdBaseLib</PackageId>
     <Product>KKdBaseLib</Product>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Title>KKdBaseLib</Title>
-    <Version>0.4.9.2</Version>
+    <Version>0.4.9.3</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/KKdBaseLib/Mat4.cs b/KKdBaseLib/Mat4.cs
index 90595ae..ab978fa 100644
--- a/KKdBaseLib/Mat4.cs
+++ b/KKdBaseLib/Mat4.cs
@@ -45,9 +45,6 @@ namespace KKdBaseLib
         public Mat4(Quat q, Vec4 t)
         { Row0 = Row1 = Row2 = Row3 = default; FromQuat(q); Row3 = t; }
 
-        public Mat4(QuatTrans qt)
-        { Row0 = Row1 = Row2 = Row3 = default; FromQuat(qt.Quat); Row3 = new Vec4(qt.Trans, 1.0f); }
-
         private void FromQuat(Quat q)
         {
             float qx = q.X;
diff --git a/KKdMainLib/A3DA.cs b/KKdMainLib/A3DA.cs
index 17dca52..8282113 100644
--- a/KKdMainLib/A3DA.cs
+++ b/KKdMainLib/A3DA.cs
@@ -1489,7 +1489,7 @@ namespace KKdMainLib
                 _IO.WEOFC(0);
                 _IO.O   = 0;
                 _IO.P = 0;
-                Header header = new Header { Signature = 0x41443341, Format = Format.F2LE,
+                Header header = new Header { Signature = 0x41443341, Format = Format.F2,
                     DataSize = A3DCEnd, SectionSize = A3DCEnd, InnerSignature = 0x01131010 };
                 _IO.W(header, true);
             }
diff --git a/KKdMainLib/AddParam.cs b/KKdMainLib/AddParam.cs
index 4e51ee7..b52de86 100644
--- a/KKdMainLib/AddParam.cs
+++ b/KKdMainLib/AddParam.cs
@@ -10,7 +10,7 @@ namespace KKdMainLib
 
         public HeaderData Header;
 
-        public void MotHeadReader(string file)
+        public void AddParamReader(string file)
         {
             Header = new HeaderData();
 
@@ -36,7 +36,7 @@ namespace KKdMainLib
             data = null;
         }
 
-        public void MotHeadWriter(string file)
+        public void AddParamWriter(string file)
         {
             if (Header.Data == null || Header.Data.LongLength < 1) return;
 
diff --git a/KKdMainLib/Aet.cs b/KKdMainLib/Aet.cs
index 8ce1183..8008877 100644
--- a/KKdMainLib/Aet.cs
+++ b/KKdMainLib/Aet.cs
@@ -59,16 +59,16 @@ namespace KKdMainLib
             ref Scene aet = ref aetData.V;
 
             aet.Name = _IO.RPS();
-            aet.StartFrame = _IO.RF32();
-            aet.EndFrame   = _IO.RF32();
-            aet.FrameRate  = _IO.RF32();
-            aet.BackColor  = _IO.RU32();
-            aet.Width      = _IO.RU32();
-            aet.Height     = _IO.RU32();
+            aet.StartFrame   = _IO.RF32();
+            aet.EndFrame     = _IO.RF32();
+            aet.FrameRate    = _IO.RF32();
+            aet.BackColor    = _IO.RU32();
+            aet.Width        = _IO.RU32();
+            aet.Height       = _IO.RU32();
             aet.Camera       = _IO.RP<Vec2<CountPointer<KFT2>>>();
-            aet.Compositions = _IO.ReadCountPointer<Composition>();
-            aet.Videos       = _IO.ReadCountPointer<Video      >();
-            aet.Audios       = _IO.ReadCountPointer<Audio      >();
+            aet.Composition = _IO.ReadCountPointer<Composition>();
+            aet.Video        = _IO.ReadCountPointer<Video      >();
+            aet.Audio        = _IO.ReadCountPointer<Audio      >();
 
             if (aet.Camera.O > 0)
             {
@@ -79,63 +79,63 @@ namespace KKdMainLib
                 RKF(ref aet.Camera.V.Y);
             }
 
-            if (aet.Audios.O > 0)
+            if (aet.Audio.O > 0)
             {
-                _IO.P = aet.Audios.O;
-                for (i = 0; i < aet.Audios.C; i++)
+                _IO.P = aet.Audio.O;
+                for (i = 0; i < aet.Audio.C; i++)
                 {
-                    ref Audio aif = ref aet.Audios.E[i];
+                    ref Audio aif = ref aet.Audio.E[i];
                     aif.O = _IO.P;
                     aif.SoundID = _IO.RU32();
                 }
             }
 
-            _IO.P = aet.Compositions.O;
-            for (i = 0; i < aet.Compositions.C; i++)
-                aet.Compositions[i] = new Composition() { P = _IO.P, C = _IO.RI32(), O = _IO.RI32()};
+            _IO.P = aet.Composition.O;
+            for (i = 0; i < aet.Composition.C; i++)
+                aet.Composition[i] = new Composition() { P = _IO.P, C = _IO.RI32(), O = _IO.RI32()};
 
             i1 = 0;
-            RAL(ref aet.Compositions.E[aet.Compositions.C - 1]);
-            for (i = 0; i < aet.Compositions.C - 1; i++)
-                RAL(ref aet.Compositions.E[i]);
+            RAL(ref aet.Composition.E[aet.Composition.C - 1]);
+            for (i = 0; i < aet.Composition.C - 1; i++)
+                RAL(ref aet.Composition.E[i]);
 
-            _IO.P = aet.Videos.O;
-            for (i = 0; i < aet.Videos.C; i++)
-                aet.Videos[i] = new Video { O = _IO.P, Color = _IO.RU32(), Width = _IO.RU16(),
-                    Height = _IO.RU16(), Frames = _IO.RF32(), Sources = _IO.ReadCountPointer<Video.Source>() };
+            _IO.P = aet.Video.O;
+            for (i = 0; i < aet.Video.C; i++)
+                aet.Video[i] = new Video { O = _IO.P, Color = _IO.RU32(), Width = _IO.RU16(),
+                    Height = _IO.RU16(), Frames = _IO.RF32(), Identifiers = _IO.ReadCountPointer<Video.Identifier>() };
 
-            for (i = 0; i < aet.Videos.C; i++)
+            for (i = 0; i < aet.Video.C; i++)
             {
-                _IO.P = aet.Videos[i].Sources.O;
-                for (i0 = 0; i0 < aet.Videos[i].Sources.C; i0++)
-                    aet.Videos.E[i].Sources[i0] = new Video.Source { Name = _IO.RPS(), ID = _IO.RU32() };
+                _IO.P = aet.Video[i].Identifiers.O;
+                for (i0 = 0; i0 < aet.Video[i].Identifiers.C; i0++)
+                    aet.Video.E[i].Identifiers[i0] = new Video.Identifier { Name = _IO.RPS(), ID = _IO.RU32() };
             }
 
-            for (i = 0; i < aet.Compositions.C; i++)
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                for (i0 = 0; i0 < aet.Compositions[i].C; i0++)
+                for (i0 = 0; i0 < aet.Composition[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions[i].E[i0];
+                    ref Layer obj = ref aet.Composition[i].E[i0];
                     obj.DataID = -1;
-                    int dataOffset = obj.VideoItemOffset;
+                    int dataOffset = obj.VidItmOff;
                     if (dataOffset > 0)
                              if (obj.Type == Layer.AetLayerType.Video      )
-                            for (i1 = 0; i1 < aet.Videos      .C; i1++)
-                            { if (aet.Videos      [i1].O == dataOffset) { obj.DataID = i1; break; } }
+                            for (i1 = 0; i1 < aet.Video      .C; i1++)
+                            { if (aet.Video      [i1].O == dataOffset) { obj.DataID = i1; break; } }
                         else if (obj.Type == Layer.AetLayerType.Audio      )
-                            for (i1 = 0; i1 < aet.Audios      .C; i1++)
-                            { if (aet.Audios      [i1].O == dataOffset) { obj.DataID = i1; break; } }
+                            for (i1 = 0; i1 < aet.Audio      .C; i1++)
+                            { if (aet.Audio      [i1].O == dataOffset) { obj.DataID = i1; break; } }
                         else if (obj.Type == Layer.AetLayerType.Composition)
-                            for (i1 = 0; i1 < aet.Compositions.C; i1++)
-                            { if (aet.Compositions[i1].P == dataOffset) { obj.DataID = i1; break; } }
+                            for (i1 = 0; i1 < aet.Composition.C; i1++)
+                            { if (aet.Composition[i1].P == dataOffset) { obj.DataID = i1; break; } }
 
                     ref int parentLayer = ref obj.ParentLayer;
                     if (parentLayer > 0)
-                        for (i1 = 0; i1 < aet.Compositions.C; i1++)
+                        for (i1 = 0; i1 < aet.Composition.C; i1++)
                         {
-                            for (i2 = 0; i2 < aet.Compositions[i1].C; i2++)
-                                if (aet.Compositions[i1].E[i2].Offset == parentLayer)
-                                { obj.ParentLayer = aet.Compositions[i1].E[i2].ID; break; }
+                            for (i2 = 0; i2 < aet.Composition[i1].C; i2++)
+                                if (aet.Composition[i1].E[i2].Offset == parentLayer)
+                                { obj.ParentLayer = aet.Composition[i1].E[i2].ID; break; }
                             if (parentLayer != obj.ParentLayer) break;
                         }
                     if (parentLayer == obj.ParentLayer) obj.ParentLayer = -1;
@@ -147,51 +147,51 @@ namespace KKdMainLib
         {
             ref Scene aet = ref aetData.V;
 
-            for (i = 0; i < aet.Videos.C; i++)
+            for (i = 0; i < aet.Video.C; i++)
             {
-                ref Video region = ref aet.Videos.E[i];
-                if (region.Sources.C == 0) { region.Sources.O = 0; continue; }
-                if (region.Sources.C > 1) _IO.A(0x20);
-                region.Sources.O = _IO.P;
-                for (i0 = 0; i0 < region.Sources.C; i0++) _IO.W(0L);
+                ref Video region = ref aet.Video.E[i];
+                if (region.Identifiers.C == 0) { region.Identifiers.O = 0; continue; }
+                if (region.Identifiers.C > 1) _IO.A(0x20);
+                region.Identifiers.O = _IO.P;
+                for (i0 = 0; i0 < region.Identifiers.C; i0++) _IO.W(0L);
             }
 
             _IO.A(0x20);
-            aet.Videos.O = _IO.P;
-            for (i = 0; i < aet.Videos.C; i++)
+            aet.Video.O = _IO.P;
+            for (i = 0; i < aet.Video.C; i++)
             {
-                ref Video region = ref aet.Videos.E[i];
+                ref Video region = ref aet.Video.E[i];
                 region.O = _IO.P;
                 _IO.W(region.Color  );
                 _IO.W(region.Width  );
                 _IO.W(region.Height );
                 _IO.W(region.Frames );
-                _IO.W(region.Sources);
+                _IO.W(region.Identifiers);
             }
 
             _IO.A(0x20);
-            aet.Compositions.O = _IO.P;
-            for (i = 0; i < aet.Compositions.C; i++)
+            aet.Composition.O = _IO.P;
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                aet.Compositions.E[i].O = _IO.P;
+                aet.Composition.E[i].O = _IO.P;
                 _IO.W(0L);
             }
 
-            for (i = 0; i < aet.Compositions.C; i++)
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                if (aet.Compositions.E[i].C < 1) continue;
+                if (aet.Composition.E[i].C < 1) continue;
 
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
-                    ref VideoData data = ref obj.Video.V;
-                    ref VideoData.Video3DData persp = ref data.Video3D.V;
-                    ref AudioData extraData = ref obj.Audio.V;
-                    if (obj.Markers.C > 0)
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
+                    ref VideoData video = ref obj.Video.V;
+                    ref VideoData.Video3DData persp = ref video.Video3D.V;
+                    ref AudioData audio = ref obj.Audio.V;
+                    if (obj.Marker.C > 0)
                     {
-                        if (obj.Markers.C > 3) _IO.A(0x20);
-                        obj.Markers.O = _IO.P;
-                        for (i1 = 0; i1 < obj.Markers.C; i1++)
+                        if (obj.Marker.C > 3) _IO.A(0x20);
+                        obj.Marker.O = _IO.P;
+                        for (i1 = 0; i1 < obj.Marker.C; i1++)
                             _IO.W(0L);
                     }
 
@@ -209,30 +209,30 @@ namespace KKdMainLib
 
                     if (obj.Video.O > 0)
                     {
-                         W(ref data.  AnchorX);
-                         W(ref data.  AnchorY);
-                         W(ref data.PositionX);
-                         W(ref data.PositionY);
-                         W(ref data.Rotation );
-                         W(ref data.   ScaleX);
-                         W(ref data.   ScaleY);
-                         W(ref data. Opacity );
+                         W(ref video.  AnchorX);
+                         W(ref video.  AnchorY);
+                         W(ref video.PositionX);
+                         W(ref video.PositionY);
+                         W(ref video.Rotation );
+                         W(ref video.   ScaleX);
+                         W(ref video.   ScaleY);
+                         W(ref video. Opacity );
                     }
 
                     if (obj.Video.V.Video3D.O > 0)
                     {
                         _IO.A(0x20);
-                        data.Video3D.O = _IO.P;
+                        video.Video3D.O = _IO.P;
                         _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L);
                         _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L);
                     }
 
                     if (obj.Audio.O > 0)
                     {
-                        W(ref extraData.VolumeL);
-                        W(ref extraData.VolumeR);
-                        W(ref extraData.   PanL);
-                        W(ref extraData.   PanR);
+                        W(ref audio.VolumeL);
+                        W(ref audio.VolumeR);
+                        W(ref audio.   PanL);
+                        W(ref audio.   PanR);
                     }
 
                     if (obj.Video.O > 0)
@@ -252,10 +252,10 @@ namespace KKdMainLib
                 }
 
                 _IO.A(0x20);
-                aet.Compositions.E[i].E[0].Offset = _IO.P;
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+                aet.Composition.E[i].E[0].Offset = _IO.P;
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
                     obj.Offset = _IO.P;
                     _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L);
                 }
@@ -287,25 +287,25 @@ namespace KKdMainLib
                 System.Collections.Generic.Dictionary<string, int> usedValues =
                     new System.Collections.Generic.Dictionary<string, int>();
 
-                for (i = 0; i < aet.Videos.C; i++)
+                for (i = 0; i < aet.Video.C; i++)
                 {
-                    ref Video region = ref aet.Videos.E[i];
-                    for (i0 = 0; i0 < region.Sources.C; i0++)
-                        WPS(ref usedValues, ref region.Sources.E[i0].Name);
+                    ref Video region = ref aet.Video.E[i];
+                    for (i0 = 0; i0 < region.Identifiers.C; i0++)
+                        WPS(ref usedValues, ref region.Identifiers.E[i0].Name);
                 }
 
                 //_IO.Align(0x4);
-                for (i = 0; i < aet.Compositions.C; i++)
+                for (i = 0; i < aet.Composition.C; i++)
                 {
-                    for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+                    for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                     {
-                        ref Layer obj = ref aet.Compositions.E[i].E[i0];
-                        for (i1 = 0; i1 < obj.Markers.C; i1++)
-                            WPS(ref usedValues, ref obj.Markers.E[i1].Name);
+                        ref Layer obj = ref aet.Composition.E[i].E[i0];
+                        for (i1 = 0; i1 < obj.Marker.C; i1++)
+                            WPS(ref usedValues, ref obj.Marker.E[i1].Name);
                     }
 
-                    for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
-                        WPS(ref usedValues, ref aet.Compositions.E[i].E[i0].Name);
+                    for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
+                        WPS(ref usedValues, ref aet.Composition.E[i].E[i0].Name);
                 }
 
                 //_IO.Align(0x4);
@@ -314,27 +314,27 @@ namespace KKdMainLib
                 _IO.SL(_IO.P);
             }
 
-            aet.Audios.O = 0;
-            if (aet.Audios.C > 0)
+            aet.Audio.O = 0;
+            if (aet.Audio.C > 0)
             {
                 _IO.A(0x10);
-                aet.Audios.O = _IO.P;
-                for (i = 0; i < aet.Audios.C; i++)
+                aet.Audio.O = _IO.P;
+                for (i = 0; i < aet.Audio.C; i++)
                 {
-                    aet.Audios.E[i].O = _IO.P;
-                    _IO.W(aet.Audios[i].SoundID);
+                    aet.Audio.E[i].O = _IO.P;
+                    _IO.W(aet.Audio[i].SoundID);
                 }
             }
 
-            for (i = 0; i < aet.Compositions.C; i++)
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+            for (i = 0; i < aet.Composition.C; i++)
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
-                         if (obj.Type == Layer.AetLayerType.Video      ) obj.VideoItemOffset = aet.Videos      [obj.DataID].O;
-                    else if (obj.Type == Layer.AetLayerType.Audio      ) obj.VideoItemOffset = aet.Audios      [obj.DataID].O;
-                    else if (obj.Type == Layer.AetLayerType.Composition) obj.VideoItemOffset = aet.Compositions[obj.DataID].O;
-                    else obj.VideoItemOffset = 0;
-                    if (obj.VideoItemOffset == 0)
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
+                         if (obj.Type == Layer.AetLayerType.Video      ) obj.VidItmOff = aet.Video      [obj.DataID].O;
+                    else if (obj.Type == Layer.AetLayerType.Audio      ) obj.VidItmOff = aet.Audio      [obj.DataID].O;
+                    else if (obj.Type == Layer.AetLayerType.Composition) obj.VidItmOff = aet.Composition[obj.DataID].O;
+                    else obj.VidItmOff = 0;
+                    if (obj.VidItmOff == 0)
                     {
 
                     }
@@ -346,20 +346,20 @@ namespace KKdMainLib
 
             _IO.F();
 
-            for (i = 0; i < aet.Compositions.C; i++)
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                if (aet.Compositions.E[i].C < 1) continue;
+                if (aet.Composition.E[i].C < 1) continue;
 
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
-                    ref VideoData data = ref obj.Video.V;
-                    ref VideoData.Video3DData persp = ref data.Video3D.V;
-                    ref AudioData extraData = ref obj.Audio.V;
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
+                    ref VideoData video = ref obj.Video.V;
+                    ref VideoData.Video3DData persp = ref video.Video3D.V;
+                    ref AudioData audio = ref obj.Audio.V;
 
                     if (obj.Video.V.Video3D.O > 0)
                     {
-                        _IO.P = data.Video3D.O;
+                        _IO.P = video.Video3D.O;
                         W(ref _IO, ref persp.   AnchorZ);
                         W(ref _IO, ref persp. PositionZ);
                         W(ref _IO, ref persp.DirectionX);
@@ -373,29 +373,29 @@ namespace KKdMainLib
                     if (obj.Video.O > 0)
                     {
                         _IO.P = obj.Video.O;
-                        _IO.W((byte)data.TransferMode.BlendMode );
-                        _IO.W((byte)data.TransferMode.Flags     );
-                        _IO.W((byte)data.TransferMode.TrackMatte);
+                        _IO.W((byte)video.TransferMode.BlendMode );
+                        _IO.W((byte)video.TransferMode.Flags     );
+                        _IO.W((byte)video.TransferMode.TrackMatte);
                         _IO.W((byte)0);
 
-                        W(ref _IO, ref data.  AnchorX);
-                        W(ref _IO, ref data.  AnchorY);
-                        W(ref _IO, ref data.PositionX);
-                        W(ref _IO, ref data.PositionY);
-                        W(ref _IO, ref data.Rotation );
-                        W(ref _IO, ref data.   ScaleX);
-                        W(ref _IO, ref data.   ScaleY);
-                        W(ref _IO, ref data. Opacity );
-                        _IO.W(data.Video3D.O);
+                        W(ref _IO, ref video.  AnchorX);
+                        W(ref _IO, ref video.  AnchorY);
+                        W(ref _IO, ref video.PositionX);
+                        W(ref _IO, ref video.PositionY);
+                        W(ref _IO, ref video.Rotation );
+                        W(ref _IO, ref video.   ScaleX);
+                        W(ref _IO, ref video.   ScaleY);
+                        W(ref _IO, ref video. Opacity );
+                        _IO.W(video.Video3D.O);
                     }
 
                     if (obj.Audio.O > 0)
                     {
                         _IO.P = obj.Audio.O;
-                        W(ref _IO, ref extraData.VolumeL);
-                        W(ref _IO, ref extraData.VolumeR);
-                        W(ref _IO, ref extraData.   PanL);
-                        W(ref _IO, ref extraData.   PanR);
+                        W(ref _IO, ref audio.VolumeL);
+                        W(ref _IO, ref audio.VolumeR);
+                        W(ref _IO, ref audio.   PanL);
+                        W(ref _IO, ref audio.   PanR);
                     }
 
                     void W(ref Stream _IO, ref CountPointer<KFT2> keys)
@@ -414,10 +414,10 @@ namespace KKdMainLib
 
             _IO.F();
 
-            for (i = 0; i < aet.Compositions.C; i++)
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+            for (i = 0; i < aet.Composition.C; i++)
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
 
                     _IO.P = obj.Offset;
                     _IO.W(obj.Name.O);
@@ -428,23 +428,23 @@ namespace KKdMainLib
                     _IO.W((ushort)obj.Flags  );
                     _IO.W((  byte)obj.Quality);
                     _IO.W((  byte)obj.Type   );
-                    _IO.W(obj.VideoItemOffset);
+                    _IO.W(obj.VidItmOff);
 
                     if (obj.ParentLayer > -1)
                     {
                         bool Found = false;
-                        for (i1 = 0; i1 < aet.Compositions.C; i1++)
-                            for (i2 = 0; i2 < aet.Compositions.E[i1].C; i2++)
-                                if (aet.Compositions[i1].E[i2].ID == obj.ParentLayer)
-                                { Found = true; _IO.W(aet.Compositions.E[i1].E[i2].Offset); break; }
+                        for (i1 = 0; i1 < aet.Composition.C; i1++)
+                            for (i2 = 0; i2 < aet.Composition.E[i1].C; i2++)
+                                if (aet.Composition[i1].E[i2].ID == obj.ParentLayer)
+                                { Found = true; _IO.W(aet.Composition.E[i1].E[i2].Offset); break; }
                         if (!Found) _IO.W(0);
                     }
                     else _IO.W(0);
-                    _IO.W(obj.Markers);
+                    _IO.W(obj.Marker);
                     _IO.W(obj.Video.O);
                     _IO.W(obj.Audio.O);
 
-                    ref CountPointer<Marker> Marker = ref obj.Markers;
+                    ref CountPointer<Marker> Marker = ref obj.Marker;
                     _IO.P = Marker.O;
                     for (i1 = 0; i1 < Marker.C; i1++)
                     {
@@ -455,25 +455,25 @@ namespace KKdMainLib
 
             _IO.F();
 
-            for (i = 0; i < aet.Videos.C; i++)
+            for (i = 0; i < aet.Video.C; i++)
             {
-                ref Video region = ref aet.Videos.E[i];
-                if (region.Sources.C == 0) continue;
-                _IO.P = region.Sources.O;
-                for (i0 = 0; i0 < region.Sources.C; i0++)
+                ref Video region = ref aet.Video.E[i];
+                if (region.Identifiers.C == 0) continue;
+                _IO.P = region.Identifiers.O;
+                for (i0 = 0; i0 < region.Identifiers.C; i0++)
                 {
-                    _IO.W(region.Sources[i0].Name.O);
-                    _IO.W(region.Sources[i0].ID);
+                    _IO.W(region.Identifiers[i0].Name.O);
+                    _IO.W(region.Identifiers[i0].ID);
                 }
             }
 
-            _IO.P = aet.Compositions.O;
-            for (i = 0; i < aet.Compositions.C; i++)
+            _IO.P = aet.Composition.O;
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                if (aet.Compositions[i].C > 0)
+                if (aet.Composition[i].C > 0)
                 {
-                    _IO.W(aet.Compositions[i].C);
-                    _IO.W(aet.Compositions[i].E[0].Offset);
+                    _IO.W(aet.Composition[i].C);
+                    _IO.W(aet.Composition[i].E[0].Offset);
                 }
                 else _IO.W(0L);
             }
@@ -487,9 +487,9 @@ namespace KKdMainLib
             _IO.W(aet.Width);
             _IO.W(aet.Height);
             _IO.W(aet.Camera.O);
-            _IO.W(aet.Compositions);
-            _IO.W(aet.Videos);
-            _IO.W(aet.Audios);
+            _IO.W(aet.Composition);
+            _IO.W(aet.Video);
+            _IO.W(aet.Audio);
             _IO.W(0L);
         }
 
@@ -508,43 +508,43 @@ namespace KKdMainLib
                 obj.Flags   = (Layer.AetLayerFlags  )_IO.RU16();
                 obj.Quality = (Layer.AetLayerQuality)_IO.RU8 ();
                 obj.Type    = (Layer.AetLayerType   )_IO.RU8 ();
-                obj.VideoItemOffset  = _IO.RI32();
+                obj.VidItmOff  = _IO.RI32();
                 obj.ParentLayer = _IO.RI32();
-                obj.Markers = _IO.ReadCountPointer<Marker>();
+                obj.Marker = _IO.ReadCountPointer<Marker>();
                 obj.Video = _IO.RP<VideoData>();
                 obj.Audio = _IO.RP<AudioData>();
 
                 if (obj.Video.O > 0)
                 {
-                    ref VideoData data = ref obj.Video.V;
+                    ref VideoData video = ref obj.Video.V;
                     _IO.P = obj.Video.O;
-                    data.TransferMode.BlendMode  = (VideoData.VideoTransferMode.TransferBlendMode )_IO.RU8();
-                    data.TransferMode.Flags      = (VideoData.VideoTransferMode.TransferFlags     )_IO.RU8();
-                    data.TransferMode.TrackMatte = (VideoData.VideoTransferMode.TransferTrackMatte)_IO.RU8();
-                    data.Padding = _IO.RU8();
-                    data.  AnchorX = _IO.ReadCountPointer<KFT2>();
-                    data.  AnchorY = _IO.ReadCountPointer<KFT2>();
-                    data.PositionX = _IO.ReadCountPointer<KFT2>();
-                    data.PositionY = _IO.ReadCountPointer<KFT2>();
-                    data.Rotation  = _IO.ReadCountPointer<KFT2>();
-                    data.   ScaleX = _IO.ReadCountPointer<KFT2>();
-                    data.   ScaleY = _IO.ReadCountPointer<KFT2>();
-                    data.Opacity   = _IO.ReadCountPointer<KFT2>();
-                    data.Video3D = _IO.RP<VideoData.Video3DData>();
+                    video.TransferMode.BlendMode  = (VideoData.VideoTransferMode.TransferBlendMode )_IO.RU8();
+                    video.TransferMode.Flags      = (VideoData.VideoTransferMode.TransferFlags     )_IO.RU8();
+                    video.TransferMode.TrackMatte = (VideoData.VideoTransferMode.TransferTrackMatte)_IO.RU8();
+                    video.Padding = _IO.RU8();
+                    video.  AnchorX = _IO.ReadCountPointer<KFT2>();
+                    video.  AnchorY = _IO.ReadCountPointer<KFT2>();
+                    video.PositionX = _IO.ReadCountPointer<KFT2>();
+                    video.PositionY = _IO.ReadCountPointer<KFT2>();
+                    video.Rotation  = _IO.ReadCountPointer<KFT2>();
+                    video.   ScaleX = _IO.ReadCountPointer<KFT2>();
+                    video.   ScaleY = _IO.ReadCountPointer<KFT2>();
+                    video.Opacity   = _IO.ReadCountPointer<KFT2>();
+                    video.Video3D = _IO.RP<VideoData.Video3DData>();
 
-                    RKF(ref data.  AnchorX);
-                    RKF(ref data.  AnchorY);
-                    RKF(ref data.PositionX);
-                    RKF(ref data.PositionY);
-                    RKF(ref data.Rotation );
-                    RKF(ref data.   ScaleX);
-                    RKF(ref data.   ScaleY);
-                    RKF(ref data. Opacity );
+                    RKF(ref video.  AnchorX);
+                    RKF(ref video.  AnchorY);
+                    RKF(ref video.PositionX);
+                    RKF(ref video.PositionY);
+                    RKF(ref video.Rotation );
+                    RKF(ref video.   ScaleX);
+                    RKF(ref video.   ScaleY);
+                    RKF(ref video. Opacity );
 
-                    if (data.Video3D.O > 0)
+                    if (video.Video3D.O > 0)
                     {
-                        ref VideoData.Video3DData Persp = ref data.Video3D.V;
-                        _IO.P = data.Video3D.O;
+                        ref VideoData.Video3DData Persp = ref video.Video3D.V;
+                        _IO.P = video.Video3D.O;
                         Persp.AnchorZ       = _IO.ReadCountPointer<KFT2>();
                         Persp.PositionZ       = _IO.ReadCountPointer<KFT2>();
                         Persp.DirectionX = _IO.ReadCountPointer<KFT2>();
@@ -567,22 +567,22 @@ namespace KKdMainLib
 
                 if (obj.Audio.O > 0)
                 {
-                    ref AudioData extraData = ref obj.Audio.V;
+                    ref AudioData audio = ref obj.Audio.V;
                     _IO.P = obj.Audio.O;
-                    extraData.VolumeL = _IO.ReadCountPointer<KFT2>();
-                    extraData.VolumeR = _IO.ReadCountPointer<KFT2>();
-                    extraData.   PanL = _IO.ReadCountPointer<KFT2>();
-                    extraData.   PanR = _IO.ReadCountPointer<KFT2>();
+                    audio.VolumeL = _IO.ReadCountPointer<KFT2>();
+                    audio.VolumeR = _IO.ReadCountPointer<KFT2>();
+                    audio.   PanL = _IO.ReadCountPointer<KFT2>();
+                    audio.   PanR = _IO.ReadCountPointer<KFT2>();
 
-                    RKF(ref extraData.VolumeL);
-                    RKF(ref extraData.VolumeR);
-                    RKF(ref extraData.   PanL);
-                    RKF(ref extraData.   PanR);
+                    RKF(ref audio.VolumeL);
+                    RKF(ref audio.VolumeR);
+                    RKF(ref audio.   PanL);
+                    RKF(ref audio.   PanR);
                 }
 
-                _IO.P = obj.Markers.O;
-                for (i2 = 0; i2 < obj.Markers.C; i2++)
-                    obj.Markers[i2] = new Marker() { Frame = _IO.RF32(), Name = _IO.RPSSJIS() };
+                _IO.P = obj.Marker.O;
+                for (i2 = 0; i2 < obj.Marker.C; i2++)
+                    obj.Marker[i2] = new Marker() { Frame = _IO.RF32(), Name = _IO.RPSSJIS() };
             }
         }
 
@@ -671,62 +671,60 @@ namespace KKdMainLib
                 aet.Camera.V.Y = RKF(temp, "Y");
             }
 
-            if ((temp = msgPack["SoundEffect", true]).NotNull)
+            if ((temp = msgPack["Audio", true]).NotNull)
             {
-                aet.Audios.C = temp.Array.Length;
-                for (i = 0; i < aet.Audios.C; i++)
-                    aet.Audios.E[i] = new Audio { SoundID = temp[i].RU32("Unk") };
+                aet.Audio.C = temp.Array.Length;
+                for (i = 0; i < aet.Audio.C; i++)
+                    aet.Audio.E[i] = new Audio { SoundID = temp[i].RU32("SoundID") };
             }
 
-            if ((temp = msgPack["Surface", true]).NotNull)
+            if ((temp = msgPack["Video", true]).NotNull)
             {
-                aet.Videos.C = temp.Array.Length;
-                for (i = 0; i < aet.Videos.C; i++)
+                aet.Video.C = temp.Array.Length;
+                for (i = 0; i < aet.Video.C; i++)
                 {
-                    ref Video region = ref aet.Videos.E[i];
+                    ref Video region = ref aet.Video.E[i];
                     region = default;
                     region.Color  = temp[i].RU32("Color" );
                     region.Width  = temp[i].RU16("Width" );
                     region.Height = temp[i].RU16("Height");
                     region.Frames = temp[i].RF32("Frames");
-
-                    MsgPack sprite;
-                    if ((sprite = temp[i]["Sprite", true]).NotNull)
-                    {
-                        region.Sources.C = sprite.Array.Length;
-                        for (i0 = 0; i0 < region.Sources.C; i0++)
-                            region.Sources[i0] = new Video.Source() { Name = new Pointer<string>()
-                                { V = sprite[i0].RS("Name") }, ID = sprite[i0].RU32("ID") };
-                    }
-                    sprite.Dispose();
+                    
+                    using (MsgPack identifiers = temp[i]["Identifiers", true])
+                        if (identifiers.NotNull)
+                        {
+                            region.Identifiers.C = identifiers.Array.Length;
+                            for (i0 = 0; i0 < region.Identifiers.C; i0++)
+                                region.Identifiers[i0] = new Video.Identifier() { Name = new Pointer<string>()
+                                    { V = identifiers[i0].RS("Name") }, ID = identifiers[i0].RU32("ID") };
+                        }
                 }
             }
 
             if ((temp = msgPack["Composition", true]).NotNull)
             {
-                aet.Compositions.C = temp.Array.Length + 1;
-                for (i = 0; i < aet.Compositions.C - 1; i++)
+                aet.Composition.C = temp.Array.Length + 1;
+                for (i = 0; i < aet.Composition.C - 1; i++)
                 {
-                    ref Composition layer = ref aet.Compositions.E[i];
-                    layer = default;
-                    MsgPack @object;
-                    if ((@object = temp[i]["Object", true]).NotNull)
-                    {
-                        layer.C = @object.Array.Length;
-                        for (i0 = 0; i0 < layer.C; i0++)
-                            RAO(ref layer.E[i0], @object[i0]);
-                    }
-                    @object.Dispose();
+                    ref Composition l = ref aet.Composition.E[i];
+                    l = default;
+                    using (MsgPack layer = temp[i]["Layer", true])
+                        if (layer.NotNull)
+                        {
+                            l.C = layer.Array.Length;
+                            for (i0 = 0; i0 < l.C; i0++)
+                                RL(ref l.E[i0], layer[i0]);
+                        }
                 }
             }
-            else aet.Compositions.C = 1;
+            else aet.Composition.C = 1;
 
             if ((temp = msgPack["Root", true]).NotNull)
             {
-                i = aet.Compositions.C - 1;
-                aet.Compositions.E[i].C = temp.Array.Length;
-                for (i0 = 0; i0 < aet.Compositions[i].C; i0++)
-                    RAO(ref aet.Compositions.E[i].E[i0], temp[i0]);
+                i = aet.Composition.C - 1;
+                aet.Composition.E[i].C = temp.Array.Length;
+                for (i0 = 0; i0 < aet.Composition[i].C; i0++)
+                    RL(ref aet.Composition.E[i].E[i0], temp[i0]);
             }
             temp.Dispose();
         }
@@ -747,24 +745,24 @@ namespace KKdMainLib
                                                .Add(WMP(ref aet.Camera.V.Y, "Y")));
 
 
-            i = aet.Compositions.C - 1;
-            MsgPack rootLayer = new MsgPack(aet.Compositions[i].C, "Root");
-            for (i0 = 0; i0 < aet.Compositions[i].C; i0++)
-                rootLayer[i0] = WMP(ref aet.Compositions[i].E[i0]);
+            i = aet.Composition.C - 1;
+            MsgPack rootLayer = new MsgPack(aet.Composition[i].C, "Root");
+            for (i0 = 0; i0 < aet.Composition[i].C; i0++)
+                rootLayer[i0] = WL(ref aet.Composition[i].E[i0]);
             msgPack.Add(rootLayer);
 
-            if (aet.Compositions[i].C > 1)
+            if (aet.Composition[i].C > 1)
             {
-                MsgPack compositions = new MsgPack(aet.Compositions.C - 1, "Composition");
-                for (i = 0; i < aet.Compositions.C - 1; i++)
+                MsgPack compositions = new MsgPack(aet.Composition.C - 1, "Composition");
+                for (i = 0; i < aet.Composition.C - 1; i++)
                 {
-                    ref Composition composition = ref aet.Compositions.E[i];
+                    ref Composition composition = ref aet.Composition.E[i];
                     MsgPack compos = MsgPack.New.Add("ID", i);
                     if (composition.C > 0)
                     {
                         MsgPack objects = new MsgPack(composition.C, "Layer");
                         for (i0 = 0; i0 < composition.C; i0++)
-                            objects[i0] = WMP(ref composition.E[i0]);
+                            objects[i0] = WL(ref composition.E[i0]);
                         compos.Add(objects);
                     }
                     compositions[i] = compos;
@@ -772,35 +770,34 @@ namespace KKdMainLib
                 msgPack.Add(compositions);
             }
 
-            MsgPack videos = new MsgPack(aet.Videos.C, "Video");
-            for (i = 0; i < aet.Videos.C; i++)
+            MsgPack video = new MsgPack(aet.Video.C, "Video");
+            for (i = 0; i < aet.Video.C; i++)
             {
-                ref Video video = ref aet.Videos.E[i];
-                MsgPack entry = MsgPack.New.Add("ID", i).Add("Width", video.Width)
-                    .Add("Height", video.Height).Add("Color", video.Color);
+                ref Video v = ref aet.Video.E[i];
+                MsgPack entry = MsgPack.New.Add("ID", i).Add("Width", v.Width)
+                    .Add("Height", v.Height).Add("Color", v.Color);
 
-                if (video.Sources.C > 0)
+                if (v.Identifiers.C > 0)
                 {
-                    entry.Add("Frames", video.Frames);
-                    MsgPack source = new MsgPack(video.Sources.C, "Source");
-                    for (i0 = 0; i0 < video.Sources.C; i0++)
-                        source[i0] = MsgPack.New.Add("Name", video.Sources[i0]
-                            .Name.V).Add("ID", video.Sources[i0].ID);
-                    entry.Add(source);
+                    entry.Add("Frames", v.Frames);
+                    MsgPack identifiers = new MsgPack(v.Identifiers.C, "Identifiers");
+                    for (i0 = 0; i0 < v.Identifiers.C; i0++)
+                        identifiers[i0] = MsgPack.New.Add("Name", v.Identifiers[i0].Name.V).Add("ID", v.Identifiers[i0].ID);
+                    entry.Add(identifiers);
                 }
-                videos[i] = entry;
+                video[i] = entry;
             }
-            msgPack.Add(videos);
+            msgPack.Add(video);
 
-            MsgPack audios = new MsgPack(aet.Audios.C, "Audios");
-            for (i = 0; i < aet.Audios.C; i++)
-                audios[i] = MsgPack.New.Add("ID", i).Add("SoundID", aet.Audios[i].SoundID);
-            msgPack.Add(audios);
+            MsgPack audio = new MsgPack(aet.Audio.C, "Audio");
+            for (i = 0; i < aet.Audio.C; i++)
+                audio[i] = MsgPack.New.Add("ID", i).Add("SoundID", aet.Audio[i].SoundID);
+            msgPack.Add(audio);
 
             return msgPack;
         }
 
-        private Layer RAO(ref Layer layer, MsgPack msg)
+        private Layer RL(ref Layer layer, MsgPack msg)
         {
             uint i;
             layer = default;
@@ -817,13 +814,13 @@ namespace KKdMainLib
             layer.ParentLayer = msg.RnI32("ParentLayer") ?? -1;
 
             MsgPack temp;
-            if ((temp = msg["Markers", true]).NotNull)
+            if ((temp = msg["Marker", true]).NotNull)
             {
-                layer.Markers.C = temp.Array.Length;
-                for (i = 0; i < layer.Markers.C; i++)
+                layer.Marker.C = temp.Array.Length;
+                for (i = 0; i < layer.Marker.C; i++)
                 {
-                    layer.Markers.E[i].Frame   = temp[i].RF32("Frame");
-                    layer.Markers.E[i]. Name.V = temp[i].RS  ( "Name");
+                    layer.Marker.E[i].Frame   = temp[i].RF32("Frame");
+                    layer.Marker.E[i]. Name.V = temp[i].RS  ( "Name");
                 }
             }
 
@@ -861,7 +858,7 @@ namespace KKdMainLib
                 video3D.Dispose();
             }
 
-            if ((temp = msg["Audio"]).NotNull)
+            if ((temp = msg["AudioData"]).NotNull)
             {
                 layer.Audio.O = 1;
                 ref AudioData data = ref layer.Audio.V;
@@ -899,7 +896,7 @@ namespace KKdMainLib
             return kf;
         }
 
-        private MsgPack WMP(ref Layer layer, string name = null)
+        private MsgPack WL(ref Layer layer, string name = null)
         {
             int i;
             MsgPack layerData = new MsgPack(name).Add("ID", layer.ID).Add("Name", layer.Name.V)
@@ -911,13 +908,13 @@ namespace KKdMainLib
             if (layer.DataID      > -1) layerData.Add("DataID"     , layer.DataID     );
             if (layer.ParentLayer > -1) layerData.Add("ParentLayer", layer.ParentLayer);
 
-            if (layer.Markers.C > 0)
+            if (layer.Marker.C > 0)
             {
-                MsgPack markers = new MsgPack(layer.Markers.C, "Markers");
-                for (i = 0; i < layer.Markers.C; i++)
-                    markers[i] = MsgPack.New.Add("Frame", layer.Markers[i].Frame  )
-                                            .Add( "Name", layer.Markers[i]. Name.V);
-                layerData.Add(markers);
+                MsgPack Marker = new MsgPack(layer.Marker.C, "Marker");
+                for (i = 0; i < layer.Marker.C; i++)
+                    Marker[i] = MsgPack.New.Add("Frame", layer.Marker[i].Frame  )
+                                            .Add( "Name", layer.Marker[i]. Name.V);
+                layerData.Add(Marker);
             }
 
             if (layer.Video.O > 0)
@@ -928,8 +925,8 @@ namespace KKdMainLib
                     .Add("Flags"     , (byte)video.TransferMode.Flags)
                     .Add("TrackMatte", video.TransferMode.TrackMatte.ToString());
 
-                VideoData.Add(WMP(ref video.AnchorX  ,   "OriginX"));
-                VideoData.Add(WMP(ref video.AnchorY  ,   "OriginY"));
+                VideoData.Add(WMP(ref video.AnchorX  ,   "AnchorX"));
+                VideoData.Add(WMP(ref video.AnchorY  ,   "AnchorY"));
                 VideoData.Add(WMP(ref video.PositionX, "PositionX"));
                 VideoData.Add(WMP(ref video.PositionY, "PositionY"));
                 VideoData.Add(WMP(ref video.Rotation , "Rotation" ));
diff --git a/KKdMainLib/DEX.cs b/KKdMainLib/DEX.cs
index edf8706..d016d0e 100644
--- a/KKdMainLib/DEX.cs
+++ b/KKdMainLib/DEX.cs
@@ -75,15 +75,15 @@ namespace KKdMainLib
             _IO.C();
         }
 
-        public void DEXWriter(string filepath, Format Format)
+        public void DEXWriter(string filepath, Format format)
         {
             if (Dex == null || Dex.Length < 1) return;
 
             header = new Header();
-            _IO = File.OpenWriter(filepath + (Format > Format.F && Format < Format.FT ? ".dex" : ".bin"), true);
-            header.Format = _IO.Format = Format;
+            _IO = File.OpenWriter(filepath + (format > Format.F && format < Format.FT ? ".dex" : ".bin"), true);
+            header.Format = _IO.Format = format;
 
-            _IO.O = Format > Format.F ? 0x20 : 0;
+            _IO.O = format > Format.F ? 0x20 : 0;
             _IO.W(0x64);
             _IO.W(Dex.Length);
 
@@ -147,7 +147,7 @@ namespace KKdMainLib
             _IO.P = Position0 - (header.IsX ? 8 : 4);
             _IO.W(namesPosition);
 
-            if (Format > Format.F)
+            if (format > Format.F)
             {
                 int offset = _IO.L;
                 _IO.O = 0;
diff --git a/KKdMainLib/Extensions.cs b/KKdMainLib/Extensions.cs
index 840bb33..9adbaf4 100644
--- a/KKdMainLib/Extensions.cs
+++ b/KKdMainLib/Extensions.cs
@@ -16,13 +16,12 @@ namespace KKdMainLib
 
         public static Header ReadHeader(this Stream stream, bool readSectionSignature = true)
         {
-            Header header = new Header { Format = Format.F2LE, Signature = stream.RI32(),
+            Header header = new Header { Format = Format.F2, Signature = stream.RI32(),
                 DataSize = stream.RI32(), Length = stream.RI32(), Flags = stream.RI32(),
-                Depth = stream.RI32(), SectionSize = stream.RI32(),
-                Mode = stream.RI32() };
+                Depth = stream.RI32(), SectionSize = stream.RI32(), Mode = stream.RI32() };
             stream.RI32();
-            if ((header.Flags & 0x08000000) == 0x08000000) header.Format = Format.F2BE;
-            header.NotUseDataSizeAsSectionSize = (header.Flags & 0x10000000) != 0x10000000;
+            header.UseBigEndian   = (header.Flags & 0x08000000) != 0;
+            header.UseSectionSize = (header.Flags & 0x10000000) != 0;
             if (header.Length == 0x40)
             {
                 stream.RI64();
@@ -39,8 +38,8 @@ namespace KKdMainLib
         public static void W(this Stream stream, Header header, bool extended = false)
         {
             header.Length = (header.Format < Format.X && extended) ? 0x40 : 0x20;
-            header.Flags = (!header.NotUseDataSizeAsSectionSize ? 0x10000000 : 0) |
-                            (header.Format == Format.F2BE ? 0x08000000 : 0);
+            header.Flags = (header.UseSectionSize ? 0x10000000 : 0) |
+                           (header.UseBigEndian   ? 0x08000000 : 0);
 
             stream.W(header.Signature);
             stream.W(header.DataSize);
@@ -52,9 +51,7 @@ namespace KKdMainLib
             stream.W(0x00);
             if (header.Length == 0x40)
             {
-                stream.W(header.Format < Format.MGF ? (int)((header.SectionSignature ^
-                    (header.DataSize * (long)header.Signature)) - header.Depth + header.SectionSize) : 0);
-                stream.W(0x00);
+                stream.W(0x00L);
                 stream.W(0x00L);
                 stream.W(header.InnerSignature);
                 stream.W(0x00);
@@ -71,7 +68,7 @@ namespace KKdMainLib
         public static void W(this Stream stream, POF pof, bool shiftX = false, int depth = 0)
         {
             byte[] data = pof.Write(shiftX);
-            Header header = new Header { Depth = depth, Format = Format.F2LE,
+            Header header = new Header { Depth = depth, Format = Format.F2,
                 Length = 0x20, Signature = shiftX ? 0x31464F50 : 0x30464F50 };
             header.DataSize = header.SectionSize = data.Length;
             stream.W(header);
@@ -84,7 +81,7 @@ namespace KKdMainLib
         public static void W(this Stream stream, ENRS enrs, int depth = 0)
         {
             byte[] data = enrs.Write();
-            Header header = new Header { Depth = depth, Format = Format.F2LE,
+            Header header = new Header { Depth = depth, Format = Format.F2,
                 Length = 0x20, Signature = 0x53524E45 };
             header.DataSize = header.SectionSize = data.Length;
             stream.W(header);
@@ -105,8 +102,9 @@ namespace KKdMainLib
 
         public static Struct RSt(this Stream stream, Header header)
         {
+            int l = header.UseSectionSize ? header.SectionSize : header.DataSize;
             Struct @struct = new Struct { Header = header, DataOffset =
-                stream.P, Data = stream.RBy(header.SectionSize) };
+                stream.P, Data = stream.RBy(l) };
             int depth = header.Depth;
 
             int lastSig = 0, sig;
@@ -117,19 +115,19 @@ namespace KKdMainLib
             {
                 header = stream.ReadHeader(false);
                 sig = header.Signature;
-                position += header.Length + header.SectionSize;
+                l = header.UseSectionSize ? header.SectionSize : header.DataSize;
+                position += header.Length + l;
                 if (sig == 0x43464F45 && header.Depth == depth + 1) break;
                 else if (sig == 0x53524E45 || (sig & 0xF0FFFFFF) == 0x30464F50)
                 {
-                    byte[] Data = stream.RBy(header.SectionSize);
+                    byte[] Data = stream.RBy(l);
                     if (sig == 0x53524E45) @struct.ENRS.Read(Data);
                     else                   @struct.POF .Read(Data, sig == 0x31464F50);
                 }
                 else if (header.Depth == 0 && sig == 0x43505854)
-                { subStructs.Add(new Struct { Header = header, DataOffset =
-                    stream.P, Data = stream.RBy(header.SectionSize) }); }
-                else if (header.Depth <= depth) { stream.PI64 -= header.Length; break; }
-                else subStructs.Add(stream.RSt(header));
+                    subStructs.Add(new Struct { Header = header, DataOffset = stream.P, Data = stream.RBy(l) });
+                else if (header.Depth > depth) subStructs.Add(stream.RSt(header));
+                else { stream.PI64 -= header.Length; break; }
                 lastSig = sig;
             }
 
diff --git a/KKdMainLib/IO/Extensions.cs b/KKdMainLib/IO/Extensions.cs
index 95d0fa3..307d04e 100644
--- a/KKdMainLib/IO/Extensions.cs
+++ b/KKdMainLib/IO/Extensions.cs
@@ -64,10 +64,10 @@ namespace KKdMainLib.IO
             return true;
         }
 
-        public static long RIX(this Stream stream           ) => stream.IsX ?
-            stream.RI64() : stream.RU32E(  );
-        public static long RIX(this Stream stream, bool isBE) => stream.IsX ?
-            stream.RI64() : stream.RU32E(isBE);
+        public static long RIX(this Stream stream           ) =>
+            stream.IsX ? stream.RI64() : stream.RI32E(  );
+        public static long RIX(this Stream stream, bool isBE) =>
+            stream.IsX ? stream.RI64() : stream.RI32E(isBE);
 
         public static void WX(this Stream stream, long val, ref POF pof)
         {   if (stream.IsX) stream.W (     val);
@@ -95,14 +95,29 @@ namespace KKdMainLib.IO
             return arr;
         }
 
-        public static string RSaO(this Stream stream, long offset = -1, long length = -1)
+        public static string RSaO(this Stream stream)
+        {
+            long Position = stream.PI64 + (stream.IsX ? 8 : 4);
+            stream.PI64 = stream.RIX();
+            string s = stream.NTUTF8();
+            stream.PI64 = Position;
+            return s;
+        }
+
+        public static string RSaO(this Stream stream, long offset)
         {
-            string s = null;
             long Position = stream.PI64;
-            if (offset == -1) { Position += stream.IsX ? 8 : 4; offset = stream.RIX(); }
             stream.PI64 = offset;
-            if (length == -1) s = stream.NTUTF8();
-            else              s = stream.RSUTF8(length);
+            string s = stream.NTUTF8();
+            stream.PI64 = Position;
+            return s;
+        }
+
+        public static string RSaO(this Stream stream, long offset, long length)
+        {
+            long Position = stream.PI64;
+            stream.PI64 = offset;
+            string s = stream.RSUTF8(length);
             stream.PI64 = Position;
             return s;
         }
diff --git a/KKdMainLib/IO/Stream.cs b/KKdMainLib/IO/Stream.cs
index e4b00ba..8dc1094 100644
--- a/KKdMainLib/IO/Stream.cs
+++ b/KKdMainLib/IO/Stream.cs
@@ -19,10 +19,8 @@ namespace KKdMainLib.IO
         private Format format = Format.NULL;
 
         public Format Format
-        {   get =>       format;
-            set {        format = value;
-                  IsBE = format == Format.F2BE;
-                  IsX  = format == Format.X || format == Format.XHD; } }
+        {   get => format;
+            set {  format = value; IsX  = format == Format.X || format == Format.XHD; } }
 
         public ENRSDict ENRSDict;
 
@@ -303,36 +301,64 @@ namespace KKdMainLib.IO
         public void WE(Quat val           ) { cW(); b.GBy(val); b.E(16, IsBE); s.Write(b, 0, 16); }
         public void WE(Quat val, bool isBE) { cW(); b.GBy(val); b.E(16, isBE); s.Write(b, 0, 16); }
 
+        public T RT<T>(long offset = -1) where T : unmanaged
+        {
+            cR();
+            int sizeOfT = sizeof(T);
+            if (offset > -1) s.Position = offset;
+            byte[] buf = new byte[sizeOfT];
+            fixed (byte* ptr = buf)
+            {
+                cR(); s.Read(buf, 0, sizeOfT);
+                return *(T*)ptr;
+            }
+        }
+
+        public void WT<T>(T val, long offset = -1) where T : unmanaged
+        {
+            cR();
+            int sizeOfT = sizeof(T);
+            if (offset > -1) s.Position = offset;
+            byte[] buf = new byte[sizeOfT];
+            fixed (byte* ptr = buf)
+            {
+                *(T*)ptr = val;
+                s.Write(buf, 0, sizeOfT);
+            }
+        }
+
         public T[] RA<T>(long length, long offset = -1) where T : unmanaged
         {
             cR();
             int sizeOfT = sizeof(T);
             if (offset > -1) s.Position = offset;
-            T[] arr = new T[length];
+            T[] array = new T[length];
             byte[] buf = new byte[sizeOfT];
             fixed (byte* ptr = buf)
                 for (i = 0; i < length; i++)
                 {
                     cR(); s.Read(buf, 0, sizeOfT);
-                    arr[i] = *(T*)ptr;
+                    array[i] = *(T*)ptr;
                 }
-            return arr;
+
+            if (IsBE) array = array.ReverseEndian();
+            return array;
         }
 
-        public T[] WA<T>(T[] array, long length, long offset = -1) where T : unmanaged
+        public void WA<T>(T[] array, long length, long offset = -1) where T : unmanaged
         {
+            if (IsBE) array = array.ReverseEndian();
+
             cW();
             int sizeOfT = sizeof(T);
             if (offset > -1) s.Position = offset;
-            T[] arr = new T[length];
             byte[] buf = new byte[sizeOfT];
             fixed (byte* ptr = buf)
                 for (i = 0; i < length; i++)
                 {
-                    *(T*)ptr = arr[i];
+                    *(T*)ptr = array[i];
                     s.Write(buf, 0, sizeOfT);
                 }
-            return arr;
         }
 
         public char RC(bool utf8 = true)
diff --git a/KKdMainLib/KKdMainLib.csproj b/KKdMainLib/KKdMainLib.csproj
index da51514..f1f1e8b 100644
--- a/KKdMainLib/KKdMainLib.csproj
+++ b/KKdMainLib/KKdMainLib.csproj
@@ -6,12 +6,12 @@
     <Configuration></Configuration>
     <Copyright>korenkonder © 2018-2020</Copyright>
     <Description>A simple library for working with Project Diva AC/DT/F/AFT/F2/X/FT/M39 files</Description>
-    <FileVersion>0.4.9.2</FileVersion>
+    <FileVersion>0.4.9.3</FileVersion>
     <PackageId>KKdMainLib</PackageId>
     <Product>KKdMainLib</Product>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Title>KKdMainLib</Title>
-    <Version>0.4.9.2</Version>
+    <Version>0.4.9.3</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/KKdMainLib/STR.cs b/KKdMainLib/STR.cs
index 46769a2..fcf5683 100644
--- a/KKdMainLib/STR.cs
+++ b/KKdMainLib/STR.cs
@@ -64,7 +64,7 @@ namespace KKdMainLib
 
         public void STRWriter(string filepath)
         {
-            if (Strings == null || Strings.Length == 0 || header.Format > Format.F2BE) return;
+            if (Strings == null || Strings.Length == 0 || header.Format > Format.F2) return;
             uint offset = 0;
             uint currentOffset = 0;
             _IO = File.OpenWriter(filepath + (header.Format > Format.AFT &&
diff --git a/PD_Tool/Program.cs b/PD_Tool/Program.cs
index 52d722e..8c72090 100644
--- a/PD_Tool/Program.cs
+++ b/PD_Tool/Program.cs
@@ -46,7 +46,7 @@ namespace PD_Tool
 
         private static void MainMenu()
         {
-            Console.Title = "PD_Tool v0.4.9.2";
+            Console.Title = "PD_Tool v0.4.9.3";
             Console.Clear();
 
             ConsoleDesign(true);
@@ -169,7 +169,7 @@ namespace PD_Tool
                 if (choose.Length == 1)
                 {
                     Console.Clear();
-                    Console.Title = "X Converting Tools";
+                    Console.Title = "X/XHD Converting Tools";
                     ConsoleDesign(true);
                     ConsoleDesign("               Choose converter:");
                     ConsoleDesign(false);
diff --git a/PD_Tool/Properties/AssemblyInfo.cs b/PD_Tool/Properties/AssemblyInfo.cs
index 6e1afb7..6949e36 100644
--- a/PD_Tool/Properties/AssemblyInfo.cs
+++ b/PD_Tool/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("7B5D5A3A-A6F8-4813-C97D-ACFC98F7397E")]
-[assembly: AssemblyVersion("0.4.9.2")]
-[assembly: AssemblyFileVersion("0.4.9.2")]
+[assembly: AssemblyVersion("0.4.9.3")]
+[assembly: AssemblyFileVersion("0.4.9.3")]
diff --git a/PD_Tool/classes/A3D.cs b/PD_Tool/classes/A3D.cs
index 8d48b35..3db8e81 100644
--- a/PD_Tool/classes/A3D.cs
+++ b/PD_Tool/classes/A3D.cs
@@ -28,22 +28,22 @@ namespace PD_Tool
                 Program.ConsoleDesign(false);
                 Program.ConsoleDesign("1. A3DA [DT/AC/F]");
                 Program.ConsoleDesign("2. A3DC [DT/AC/F]");
-                Program.ConsoleDesign("3. A3DA [AFT/FT] ");
-                Program.ConsoleDesign("4. A3DC [AFT/FT] ");
-                Program.ConsoleDesign("5. A3DC [F2]     ");
-                Program.ConsoleDesign("6. A3DC [MGF]    ");
-                Program.ConsoleDesign("7. A3DC [X]      ");
+                Program.ConsoleDesign("3. A3DA [AFT/FT/M39]");
+                Program.ConsoleDesign("4. A3DC [AFT/FT/M39]");
+                Program.ConsoleDesign("5. A3DC [F2]");
+                Program.ConsoleDesign("6. A3DC [MGF]");
+                Program.ConsoleDesign("7. A3DC [X]");
                 Program.ConsoleDesign(false);
                 Program.ConsoleDesign(true);
                 Console.WriteLine();
                 choose = Console.ReadLine().ToUpper();
-                     if (choose == "1") format = Format.DT  ;
-                else if (choose == "2") format = Format.F   ;
-                else if (choose == "3") format = Format.AFT ;
-                else if (choose == "4") format = Format.AFT ;
-                else if (choose == "5") format = Format.F2LE;
-                else if (choose == "6") format = Format.MGF ;
-                else if (choose == "7") format = Format.X   ;
+                     if (choose == "1") format = Format.DT ;
+                else if (choose == "2") format = Format.F  ;
+                else if (choose == "3") format = Format.AFT;
+                else if (choose == "4") format = Format.AFT;
+                else if (choose == "5") format = Format.F2;
+                else if (choose == "6") format = Format.MGF;
+                else if (choose == "7") format = Format.X  ;
                 else return;
             }
 
diff --git a/PD_Tool/classes/ADP.cs b/PD_Tool/classes/ADP.cs
index b53ebf8..cfbfbd7 100644
--- a/PD_Tool/classes/ADP.cs
+++ b/PD_Tool/classes/ADP.cs
@@ -24,13 +24,13 @@ namespace PD_Tool
                 Console.Title = "Add Param Converter: " + Path.GetFileNameWithoutExtension(file);
                 if (ext == ".adp")
                 {
-                    adp.MotHeadReader(filepath);
-                    adp.MsgPackWriter(filepath, json);
+                    adp.AddParamReader(filepath);
+                    adp. MsgPackWriter(filepath, json);
                 }
                 else if (ext == ".mp" || ext == ".json")
                 {
-                    adp.MsgPackReader(filepath, ext == ".json");
-                    adp.MotHeadWriter(filepath);
+                    adp. MsgPackReader(filepath, ext == ".json");
+                    adp.AddParamWriter(filepath);
                 }
                 adp.Dispose();
             }
diff --git a/PD_Tool/classes/DEX.cs b/PD_Tool/classes/DEX.cs
index 4fe7bcf..aa4ecb0 100644
--- a/PD_Tool/classes/DEX.cs
+++ b/PD_Tool/classes/DEX.cs
@@ -24,9 +24,9 @@ namespace PD_Tool
             Program.ConsoleDesign(true);
             Program.ConsoleDesign("        Choose type of exporting file:");
             Program.ConsoleDesign(false);
-            Program.ConsoleDesign("1. F/FT PS3/PS4/PSVita");
-            Program.ConsoleDesign("2. F2   PS3/PSVita");
-            Program.ConsoleDesign("3. X    PS4/PSVita");
+            Program.ConsoleDesign("1. F/AFT/FT/M39 PS3/PS4/PSV/AC/NSW");
+            Program.ConsoleDesign("2. F2           PS3/PSV");
+            Program.ConsoleDesign("3. X            PS4/PSV");
             if ( mp   && !json) Program.ConsoleDesign("9. MessagePack");
             if (_json &&  json) Program.ConsoleDesign("9. JSON");
             Program.ConsoleDesign(false);
@@ -35,27 +35,27 @@ namespace PD_Tool
             choose = Console.ReadLine().ToUpper();
 
             Format format = Format.NULL;
-                 if (choose == "1") format = Format.F   ;
-            else if (choose == "2") format = Format.F2LE;
-            else if (choose == "3") format = Format.X   ;
+                 if (choose == "1") format = Format.F ;
+            else if (choose == "2") format = Format.F2;
+            else if (choose == "3") format = Format.X ;
             else if (choose == "9" && mp && _json) format = Format.NULL;
             else return;
 
             string filepath, ext;
-            KKdDEX DEX;
+            KKdDEX dex;
             foreach (string file in fileNames)
-                using (DEX = new KKdDEX())
+                using (dex = new KKdDEX())
                 {
                     ext      = Path.GetExtension(file);
                     filepath = file.Replace(ext, "");
                     ext = ext.ToLower();
 
                     Console.Title = "DEX Converter: " + Path.GetFileNameWithoutExtension(file);
-                    if (ext == ".bin" || ext == ".dex") DEX.    DEXReader(filepath, ext );
-                    else                                DEX.MsgPackReader(filepath, json);
+                    if (ext == ".bin" || ext == ".dex") dex.    DEXReader(filepath, ext );
+                    else                                dex.MsgPackReader(filepath, json);
 
-                    if (format > Format.NULL) DEX.    DEXWriter(filepath, format);
-                    else                      DEX.MsgPackWriter(filepath, json);
+                    if (format > Format.NULL) dex.    DEXWriter(filepath, format);
+                    else                      dex.MsgPackWriter(filepath, json);
                 }
         }
     }