diff --git a/ArcFormats/Hypatia/ArcKogado.cs b/ArcFormats/Hypatia/ArcKogado.cs
index fbf160e9..ca695779 100644
--- a/ArcFormats/Hypatia/ArcKogado.cs
+++ b/ArcFormats/Hypatia/ArcKogado.cs
@@ -1,8 +1,8 @@
 //! \file       ArcKogado.cs
 //! \date       Sun Aug 24 22:01:05 2014
-//! \brief      Kogado game engine archive implementation.
+//! \brief      Hypatia game engine archive implementation.
 //
-// Copyright (C) 2014 by morkt
+// Copyright (C) 2014-2018 by morkt
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to
@@ -28,15 +28,15 @@ using System.IO;
 using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
-using System.Security.Cryptography;
 using System.Diagnostics;
 using System.Text;
+using GameRes.Formats.Kogado;
 using GameRes.Formats.Strings;
 using GameRes.Utility;
 
-namespace GameRes.Formats.Kogado
+namespace GameRes.Formats.Hypatia
 {
-    public class KogadoEntry : PackedEntry
+    public class HypEntry : PackedEntry
     {
         // 0 : Not compressed
         // 1 : Mariel compression
@@ -51,7 +51,7 @@ namespace GameRes.Formats.Kogado
     [Export(typeof(ArchiveFormat))]
     public class PakOpener : ArchiveFormat
     {
-        public override string         Tag { get { return "KOGADO"; } }
+        public override string         Tag { get { return "PAK/HyPack"; } }
         public override string Description { get { return arcStrings.KogadoDescription; } }
         public override uint     Signature { get { return 0x61507948; } } // 'HyPa'
         public override bool  IsHierarchic { get { return false; } }
@@ -60,6 +60,11 @@ namespace GameRes.Formats.Kogado
         public PakOpener ()
         {
             Extensions = new string[] { "pak", "dat" };
+            ContainedFormats = new[] {
+                "PNG", "BMP", "JPEG", "WBM/HYPATIA",
+                "OGG", "WAV", "ADP/HYPATIA",
+                "TXT", "SCR"
+            };
         }
 
         public override ArcFile TryOpen (ArcView file)
@@ -96,7 +101,7 @@ namespace GameRes.Formats.Kogado
                     name = i.ToString ("D5");
                 if (0 != ext.Length)
                     name += '.'+ext;
-                var entry = FormatCatalog.Instance.Create<KogadoEntry> (name);
+                var entry = Create<HypEntry> (name);
                 entry.Offset        = data_offset + file.View.ReadUInt32 (index_offset + 0x18);
                 if (version >= 0x200)
                 {
@@ -124,7 +129,7 @@ namespace GameRes.Formats.Kogado
         public override Stream OpenEntry (ArcFile arc, Entry entry)
         {
             var input = arc.File.CreateStream (entry.Offset, entry.Size);
-            var packed_entry = entry as KogadoEntry;
+            var packed_entry = entry as HypEntry;
             if (null == packed_entry || !packed_entry.IsPacked)
                 return input;
             if (packed_entry.CompressionType > 3)
@@ -167,7 +172,7 @@ namespace GameRes.Formats.Kogado
             }
         }
 
-        internal class OutputEntry : KogadoEntry
+        internal class OutputEntry : HypEntry
         {
             public byte[] IndexName;
             public byte[] IndexExt;
@@ -289,56 +294,6 @@ namespace GameRes.Formats.Kogado
         }
     }
 
-    public sealed class Crc16 : ICheckSum
-    {
-        private ushort m_value = 0xffff;
-
-        public uint Value { get { return m_value; } }
-
-        public void Update (byte[] buf, int pos, int len)
-        {
-            for (int i = 0; i < len; ++i)
-            {
-                m_value = (ushort)(Crc16Table[(m_value^buf[pos+i]) & 0xff] ^ (m_value >> 8));
-            }
-        }
-
-        private static readonly ushort[] Crc16Table = {
-            0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
-            0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
-            0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
-            0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
-            0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
-            0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
-            0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
-            0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
-            0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
-            0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
-            0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
-            0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
-            0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
-            0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
-            0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
-            0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
-            0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
-            0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
-            0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
-            0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
-            0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
-            0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
-            0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
-            0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
-            0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
-            0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
-            0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
-            0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
-            0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
-            0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
-            0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
-            0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78,
-        };
-    }
-
     internal class MarielEncoder
     {
         public void Unpack (IBinaryStream input, byte[] dest, int dest_size)
@@ -398,7 +353,25 @@ namespace GameRes.Formats.Kogado
     [Export(typeof(ResourceAlias))]
     [ExportMetadata("Extension", "SND")]
     [ExportMetadata("Target", "OGG")]
-    public class SndFormat : ResourceAlias
-    {
-    }
+    public class SndFormat : ResourceAlias { }
+
+    [Export(typeof(ResourceAlias))]
+    [ExportMetadata("Extension", "WPN")]
+    [ExportMetadata("Target", "TXT")]
+    public class WpnFormat : ResourceAlias { }
+
+    [Export(typeof(ResourceAlias))]
+    [ExportMetadata("Extension", "WPS")]
+    [ExportMetadata("Target", "SCR")]
+    public class WpsFormat : ResourceAlias { }
+
+    [Export(typeof(ResourceAlias))]
+    [ExportMetadata("Extension", "TBL")]
+    [ExportMetadata("Target", "SCR")]
+    public class TblFormat : ResourceAlias { }
+
+    [Export(typeof(ResourceAlias))]
+    [ExportMetadata("Extension", "BGM")]
+    [ExportMetadata("Target", "WAV")]
+    public class BgmFormat : ResourceAlias { }
 }