diff --git a/Engines/NScumm.Scumm/Actor.cs b/Engines/NScumm.Scumm/Actor.cs
index f4764d6..052b2b3 100644
--- a/Engines/NScumm.Scumm/Actor.cs
+++ b/Engines/NScumm.Scumm/Actor.cs
@@ -102,7 +102,7 @@ internal string DebuggerDisplay
         {
             get
             { 
-                return string.Format("Name: {0}, IsInCurrentRoom: {1}, Visible: {2}", Name != null ? System.Text.Encoding.UTF8.GetString(Name) : null, IsInCurrentRoom, IsVisible);
+				return string.Format("Name: {0}, IsInCurrentRoom: {1}, Visible: {2}", Name != null ? Name.GetText() : null, IsInCurrentRoom, IsVisible);
             }    
         }
 
diff --git a/Engines/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleDirCache.cs b/Engines/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleDirCache.cs
index 9e9edc4..09ffe0c 100644
--- a/Engines/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleDirCache.cs
+++ b/Engines/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleDirCache.cs
@@ -84,7 +84,7 @@ public int MatchFile(string filename)
 
                     if (tag == "LB23")
                     {
-                        _budleDirCache[freeSlot].BundleTable[i].Filename = Encoding.UTF8.GetString(file.ReadBytes(24));
+						_budleDirCache[freeSlot].BundleTable[i].Filename = file.ReadBytes(24).GetText();
                     }
                     else
                     {
@@ -96,7 +96,7 @@ public int MatchFile(string filename)
                             if ((c = file.ReadByte()) != 0)
                                 name.Add(c);
 
-                        _budleDirCache[freeSlot].BundleTable[i].Filename = Encoding.UTF8.GetString(name.ToArray());
+						_budleDirCache[freeSlot].BundleTable[i].Filename = name.ToArray().GetText();
                     }
                     _budleDirCache[freeSlot].BundleTable[i].Offset = (int)file.ReadUInt32BigEndian();
                     _budleDirCache[freeSlot].BundleTable[i].Size = (int)file.ReadUInt32BigEndian();
diff --git a/Engines/NScumm.Scumm/IO/MacResManager.cs b/Engines/NScumm.Scumm/IO/MacResManager.cs
index d1af591..fba0c85 100644
--- a/Engines/NScumm.Scumm/IO/MacResManager.cs
+++ b/Engines/NScumm.Scumm/IO/MacResManager.cs
@@ -340,7 +340,7 @@ void ReadMap()
                         _stream.Seek(_resLists[i][j].nameOffset + _mapOffset + _resMap.nameOffset, SeekOrigin.Begin);
 
                         byte len = br.ReadByte();
-                        _resLists[i][j].name = System.Text.Encoding.UTF8.GetString(br.ReadBytes(len));
+						_resLists[i][j].name = br.ReadBytes(len).GetText();
                     }
                 }
             }
diff --git a/Engines/NScumm.Scumm/IO/ResourceFile8.cs b/Engines/NScumm.Scumm/IO/ResourceFile8.cs
index 2b8c59c..289ef7a 100644
--- a/Engines/NScumm.Scumm/IO/ResourceFile8.cs
+++ b/Engines/NScumm.Scumm/IO/ResourceFile8.cs
@@ -292,7 +292,7 @@ protected override ObjectData ReadImageHeader()
         {
             // image header
             var name = _reader.ReadBytes(40);
-            var text = ResourceIndex8.DataToString(name);
+			var text = name.GetText();
             var id = ResourceIndex.ObjectIDMap[text];
             var od = new ObjectData((ushort)id);
 
diff --git a/Engines/NScumm.Scumm/IO/ResourceIndex7.cs b/Engines/NScumm.Scumm/IO/ResourceIndex7.cs
index 4de63ce..9da389c 100644
--- a/Engines/NScumm.Scumm/IO/ResourceIndex7.cs
+++ b/Engines/NScumm.Scumm/IO/ResourceIndex7.cs
@@ -108,7 +108,7 @@ protected override void LoadIndex(GameInfo game)
                                 AudioNames = new string[num];
                                 for (int i = 0; i < num; i++)
                                 {
-                                    AudioNames[i] = System.Text.Encoding.UTF8.GetString(br.ReadBytes(9));
+									AudioNames[i] = br.ReadBytes(9).GetText();
                                 }
                             }
                             break;
diff --git a/Engines/NScumm.Scumm/IO/ResourceIndex8.cs b/Engines/NScumm.Scumm/IO/ResourceIndex8.cs
index 780f110..41012fd 100644
--- a/Engines/NScumm.Scumm/IO/ResourceIndex8.cs
+++ b/Engines/NScumm.Scumm/IO/ResourceIndex8.cs
@@ -107,7 +107,7 @@ protected override void LoadIndex(GameInfo game)
                                 AudioNames = new string[num];
                                 for (int i = 0; i < num; i++)
                                 {
-                                    AudioNames[i] = System.Text.Encoding.UTF8.GetString(br.ReadBytes(9));
+									AudioNames[i] = br.ReadBytes(9).GetText();
                                 }
                             }
                             break;
@@ -157,7 +157,7 @@ protected override void ReadDirectoryOfObjects(BinaryReader br)
             for (var i = 0; i < num; i++)
             {
                 // Add to object name-to-id map
-                var name = DataToString(br.ReadBytes(40));
+				var name = br.ReadBytes(40).GetText();
                 ObjectIDMap[name] = i;
 
                 ObjectStateTable[i] = br.ReadByte();
@@ -167,18 +167,6 @@ protected override void ReadDirectoryOfObjects(BinaryReader br)
             }
         }
 
-        public static string DataToString(byte[] data)
-        {
-            var sb = new List<byte>();
-            int i = 0;
-            while (i < data.Length && data[i] != 0)
-            {
-                sb.Add(data[i]);
-                i++;
-            }
-            return System.Text.Encoding.UTF8.GetString(sb.ToArray());
-        }
-
         protected override Resource[] ReadResTypeList(BinaryReader br)
         {
             var numEntries = br.ReadInt32();
diff --git a/Engines/NScumm.Scumm/NScumm.Scumm.csproj b/Engines/NScumm.Scumm/NScumm.Scumm.csproj
index 3a299b2..6483461 100644
--- a/Engines/NScumm.Scumm/NScumm.Scumm.csproj
+++ b/Engines/NScumm.Scumm/NScumm.Scumm.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\NScumm.MonoGame\Platforms\WindowsGL\bin\Debug\plugins\</OutputPath>
+    <OutputPath>..\..\NScumm.MonoGame\Platforms\WindowsGL\bin\Debug\plugins\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -41,6 +41,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
@@ -306,7 +307,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\NScumm.Core\NScumm.Core.csproj">
-      <Project>{8e7a9e5b-d7eb-4da1-8ee7-a5d8de202372}</Project>
+      <Project>{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}</Project>
       <Name>NScumm.Core</Name>
       <Private>False</Private>
     </ProjectReference>
diff --git a/Engines/NScumm.Scumm/ObjectData.cs b/Engines/NScumm.Scumm/ObjectData.cs
index 2d0d38c..ca284b5 100644
--- a/Engines/NScumm.Scumm/ObjectData.cs
+++ b/Engines/NScumm.Scumm/ObjectData.cs
@@ -139,7 +139,7 @@ internal string DebuggerDisplay
         {
             get
             {
-                return Number != 0 ? string.Format("(Number: {0}, Name = {1})", Number, System.Text.Encoding.UTF8.GetString(Name)) : "Number 0";
+				return Number != 0 ? string.Format("(Number: {0}, Name = {1})", Number, Name.GetText()) : "Number 0";
             }
         }
     }
diff --git a/Engines/NScumm.Scumm/ScummEngine0.cs b/Engines/NScumm.Scumm/ScummEngine0.cs
index e797c81..19924c3 100644
--- a/Engines/NScumm.Scumm/ScummEngine0.cs
+++ b/Engines/NScumm.Scumm/ScummEngine0.cs
@@ -883,7 +883,7 @@ void DrawSentenceObject(int obj)
             if (temp != null)
             {
                 _sentenceBuf += " ";
-                _sentenceBuf += System.Text.Encoding.UTF8.GetString(temp);
+				_sentenceBuf += temp.GetText();
             }
         }
 
@@ -911,7 +911,7 @@ void DrawSentenceLine()
                     else
                     {
                         var a = Actors[actorId];
-                        actorName = System.Text.Encoding.UTF8.GetString(a.Name);
+						actorName = a.Name.GetText();
                     }
                     _sentenceBuf += string.Format("{0,-13}", actorName);
                 }
@@ -924,7 +924,7 @@ void DrawSentenceLine()
                 _activeVerb = VerbsV0.WalkTo;
 
             var verbName = Verbs[(int)_activeVerb].Text;
-            _sentenceBuf = System.Text.Encoding.UTF8.GetString(verbName);
+			_sentenceBuf = verbName.GetText();
 
             if (_activeObject != 0)
             {
diff --git a/Engines/NScumm.Scumm/ScummEngine2.cs b/Engines/NScumm.Scumm/ScummEngine2.cs
index 35264ac..6e60c1b 100644
--- a/Engines/NScumm.Scumm/ScummEngine2.cs
+++ b/Engines/NScumm.Scumm/ScummEngine2.cs
@@ -988,7 +988,7 @@ protected void SaveLoadGame()
                         {
                             // use name entered by the user
                             var firstSlot = StringIdSavename1;
-                            name = Encoding.UTF8.GetString(_strings[slot + firstSlot - 1]);
+							name = _strings[slot + firstSlot - 1].GetText();
                         }
 
                         if (SavePreparedSavegame(slot, name))
@@ -2477,7 +2477,7 @@ void DrawSentence()
                 return;
 
             if (Verbs[slot] != null && Verbs[slot].Text != null)
-                _sentenceBuf = Encoding.UTF8.GetString(Verbs[slot].Text);
+				_sentenceBuf = Verbs[slot].Text.GetText();
             else
                 return;
 
@@ -2487,7 +2487,7 @@ void DrawSentence()
                 if (temp != null)
                 {
                     _sentenceBuf += " ";
-                    _sentenceBuf += Encoding.UTF8.GetString(temp);
+					_sentenceBuf += temp.GetText();
                 }
 
                 //                 For V1 games, the engine must compute the preposition.
@@ -2515,7 +2515,7 @@ void DrawSentence()
                 if (temp != null)
                 {
                     _sentenceBuf += " ";
-                    _sentenceBuf += Encoding.UTF8.GetString(temp);
+					_sentenceBuf += temp.GetText();
                 }
             }
 
diff --git a/Engines/NScumm.Scumm/ScummEngine7_Misc.cs b/Engines/NScumm.Scumm/ScummEngine7_Misc.cs
index b13f03f..dc3e810 100644
--- a/Engines/NScumm.Scumm/ScummEngine7_Misc.cs
+++ b/Engines/NScumm.Scumm/ScummEngine7_Misc.cs
@@ -55,7 +55,7 @@ protected override void KernelSetFunctions()
                         // SMUSH movie playback
                         if (args[1] == 0 && !_skipVideo)
                         {
-                            var videoname = System.Text.Encoding.UTF8.GetString(GetStringAddressVar(VariableVideoName));
+						var videoname = GetStringAddressVar (VariableVideoName).GetText ();
                             // TODO: vs
                             // Correct incorrect smush filename in Macintosh FT demo
 //                            if ((_game.id == GID_FT) && (_game.features & GF_DEMO) && (_game.platform == Common::kPlatformMacintosh) &&
@@ -880,7 +880,7 @@ void PlaySpeech(byte[] ptr)
                 var count = Array.IndexOf(ptr, (byte)0);
                 if (count < 0)
                     count = ptr.Length - 1;
-                var pointer = System.Text.Encoding.UTF8.GetString(ptr, 0, count);
+				var pointer = ptr.GetText(0, count);
 
                 // Play speech
                 if (!Game.Features.HasFlag(GameFeatures.Demo) && Game.GameId == GameId.CurseOfMonkeyIsland) // CMI demo does not have .IMX for voice
diff --git a/Engines/NScumm.Scumm/ScummEngine_SaveLoad.cs b/Engines/NScumm.Scumm/ScummEngine_SaveLoad.cs
index 5428a3e..135f91c 100644
--- a/Engines/NScumm.Scumm/ScummEngine_SaveLoad.cs
+++ b/Engines/NScumm.Scumm/ScummEngine_SaveLoad.cs
@@ -1463,7 +1463,7 @@ static SaveGameHeader LoadSaveGameHeader(BinaryReader reader)
                 throw new NotSupportedException("Invalid version");
             }
 
-            hdr.Name = Encoding.UTF8.GetString(reader.ReadBytes(32));
+			hdr.Name = reader.ReadBytes(32).GetText();
 
             // Since version 52 a thumbnail is saved directly after the header.
             if (hdr.Version >= 52)
diff --git a/Engines/NScumm.Scumm/ScummEngine_String.cs b/Engines/NScumm.Scumm/ScummEngine_String.cs
index 57e5ed1..a9769fc 100644
--- a/Engines/NScumm.Scumm/ScummEngine_String.cs
+++ b/Engines/NScumm.Scumm/ScummEngine_String.cs
@@ -93,7 +93,7 @@ void DebugMessage(byte[] msg)
 
             if ((buffer[0] != 0xFF))
             {
-                Debug.WriteLine("DEBUG: {0}", Encoding.UTF8.GetString(buffer));
+				Debug.WriteLine("DEBUG: {0}", buffer.GetText());
                 return;
             }
 
diff --git a/Engines/NScumm.Sky/NScumm.Sky.csproj b/Engines/NScumm.Sky/NScumm.Sky.csproj
index 43379fc..54dbd14 100644
--- a/Engines/NScumm.Sky/NScumm.Sky.csproj
+++ b/Engines/NScumm.Sky/NScumm.Sky.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
@@ -41,11 +41,12 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
     <ProjectReference Include="..\..\NScumm.Core\NScumm.Core.csproj">
-      <Project>{8e7a9e5b-d7eb-4da1-8ee7-a5d8de202372}</Project>
+      <Project>{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}</Project>
       <Name>NScumm.Core</Name>
       <Private>False</Private>
     </ProjectReference>
diff --git a/Engines/NScumm.Sword1/NScumm.Sword1.csproj b/Engines/NScumm.Sword1/NScumm.Sword1.csproj
index bd96348..068b887 100644
--- a/Engines/NScumm.Sword1/NScumm.Sword1.csproj
+++ b/Engines/NScumm.Sword1/NScumm.Sword1.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
@@ -36,7 +36,7 @@
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
     <ProjectReference Include="..\..\NScumm.Core\NScumm.Core.csproj">
-      <Project>{8e7a9e5b-d7eb-4da1-8ee7-a5d8de202372}</Project>
+      <Project>{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}</Project>
       <Name>NScumm.Core</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/NScumm-Linux.sln b/NScumm-Linux.sln
index 93033a3..60cd3f8 100644
--- a/NScumm-Linux.sln
+++ b/NScumm-Linux.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio 2012
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Core", "NScumm.Core\NScumm.Core.csproj", "{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}"
@@ -37,6 +37,7 @@ Global
 		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x86.ActiveCfg = Release|Any CPU
 		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x86.Build.0 = Release|Any CPU
 		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|Any CPU.Build.0 = Debug|x86
 		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x86.ActiveCfg = Debug|x86
@@ -59,11 +60,9 @@ Global
 		{D42434C7-459D-461A-8B1D-1451F7FF4B13}.Release|x86.ActiveCfg = Release|Any CPU
 		{D42434C7-459D-461A-8B1D-1451F7FF4B13}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		BaseDirectory = .
 		Policies = $0
 		$0.DotNetNamingPolicy = $1
 		$1.DirectoryNamespaceAssociation = None
@@ -80,4 +79,7 @@ Global
 		$5.IncludeInstanceMembers = True
 		$5.IncludeStaticEntities = True
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/NScumm-WindowsGL.sln b/NScumm-WindowsGL.sln
index f585c06..6b0cc4e 100644
--- a/NScumm-WindowsGL.sln
+++ b/NScumm-WindowsGL.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio 2012
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Core", "NScumm.Core\NScumm.Core.csproj", "{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}"
@@ -14,22 +14,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.MonoGame", "NScumm.M
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engines", "Engines", "{9B771F1E-F987-4C8D-927F-827E00924949}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B84C5097-1512-40BB-92FE-E40B2912A214}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Scumm", "Engines\NScumm.Scumm\NScumm.Scumm.csproj", "{97342112-448A-4636-827F-8D47B226D86F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sky", "Engines\NScumm.Sky\NScumm.Sky.csproj", "{8740A0CD-2613-4354-9506-35035A735962}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sword1", "Engines\NScumm.Sword1\NScumm.Sword1.csproj", "{EF539A3F-0672-412C-B9D0-38DCD3622D99}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B84C5097-1512-40BB-92FE-E40B2912A214}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Dump", "Tools\NScumm.Dump\NScumm.Dump.csproj", "{D53EB07B-F186-4281-A225-2C3DC5850148}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5686D165-0E93-4D73-8CC0-F99ACEEF3CD5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Scumm.Tests", "Tests\NScumm.Core.Tests\NScumm.Scumm.Tests.csproj", "{254867D5-880B-44BE-BB13-72A98FE4C7A8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Dump.Tests", "Tests\NScumm.Dump.Tests\NScumm.Dump.Tests.csproj", "{388CB59D-3D62-4C0A-8182-C3A1ADF317F3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Dump", "Tools\NScumm.Dump\NScumm.Dump.csproj", "{D53EB07B-F186-4281-A225-2C3DC5850148}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Platform_Desktop", "Platforms\NScumm.Platform_Desktop\NScumm.Platform_Desktop.csproj", "{D42434C7-459D-461A-8B1D-1451F7FF4B13}"
 EndProject
 Global
@@ -45,94 +45,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|Any CPU.ActiveCfg = Debug .NET Native|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|Any CPU.Build.0 = Debug .NET Native|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|x64.ActiveCfg = Debug .NET Native|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|x64.Build.0 = Debug .NET Native|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|x86.ActiveCfg = Debug .NET Native|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|x86.Build.0 = Debug .NET Native|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|x64.Build.0 = Debug|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|x86.Build.0 = Debug|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x64.ActiveCfg = Release|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x64.Build.0 = Release|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x86.ActiveCfg = Release|Any CPU
-		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x86.Build.0 = Release|Any CPU
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|Any CPU.ActiveCfg = Release|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|Any CPU.Build.0 = Release|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|x64.ActiveCfg = Debug|x64
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|x64.Build.0 = Debug|x64
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|x86.ActiveCfg = Debug|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|x86.Build.0 = Debug|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x64.ActiveCfg = Debug|x64
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x64.Build.0 = Debug|x64
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x86.ActiveCfg = Debug|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x86.Build.0 = Debug|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|Any CPU.ActiveCfg = Release|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|x64.ActiveCfg = Release|x64
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|x64.Build.0 = Release|x64
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|x86.ActiveCfg = Release|x86
-		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|x86.Build.0 = Release|x86
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|Any CPU.ActiveCfg = Debug .NET Native|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|Any CPU.Build.0 = Debug .NET Native|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|x64.ActiveCfg = Debug .NET Native|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|x64.Build.0 = Debug .NET Native|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|x86.ActiveCfg = Debug .NET Native|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|x86.Build.0 = Debug .NET Native|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug|x64.Build.0 = Debug|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Debug|x86.Build.0 = Debug|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Release|x64.ActiveCfg = Release|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Release|x64.Build.0 = Release|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Release|x86.ActiveCfg = Release|Any CPU
-		{97342112-448A-4636-827F-8D47B226D86F}.Release|x86.Build.0 = Release|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|Any CPU.ActiveCfg = Debug .NET Native|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|Any CPU.Build.0 = Debug .NET Native|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|x64.ActiveCfg = Debug .NET Native|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|x64.Build.0 = Debug .NET Native|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|x86.ActiveCfg = Debug .NET Native|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|x86.Build.0 = Debug .NET Native|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug|x64.Build.0 = Debug|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Debug|x86.Build.0 = Debug|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Release|x64.ActiveCfg = Release|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Release|x64.Build.0 = Release|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Release|x86.ActiveCfg = Release|Any CPU
-		{8740A0CD-2613-4354-9506-35035A735962}.Release|x86.Build.0 = Release|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|Any CPU.Build.0 = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|x64.ActiveCfg = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|x64.Build.0 = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|x86.ActiveCfg = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|x86.Build.0 = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|x64.Build.0 = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|x86.Build.0 = Debug|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|x64.ActiveCfg = Release|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|x64.Build.0 = Release|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|x86.ActiveCfg = Release|Any CPU
-		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|x86.Build.0 = Release|Any CPU
 		{254867D5-880B-44BE-BB13-72A98FE4C7A8}.Debug .NET Native|Any CPU.ActiveCfg = Debug|Any CPU
 		{254867D5-880B-44BE-BB13-72A98FE4C7A8}.Debug .NET Native|Any CPU.Build.0 = Debug|Any CPU
 		{254867D5-880B-44BE-BB13-72A98FE4C7A8}.Debug .NET Native|x64.ActiveCfg = Debug|Any CPU
@@ -169,24 +81,77 @@ Global
 		{388CB59D-3D62-4C0A-8182-C3A1ADF317F3}.Release|x64.Build.0 = Release|Any CPU
 		{388CB59D-3D62-4C0A-8182-C3A1ADF317F3}.Release|x86.ActiveCfg = Release|Any CPU
 		{388CB59D-3D62-4C0A-8182-C3A1ADF317F3}.Release|x86.Build.0 = Release|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|Any CPU.Build.0 = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|x64.ActiveCfg = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|x64.Build.0 = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|x86.ActiveCfg = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|x86.Build.0 = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|x64.Build.0 = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|x86.Build.0 = Debug|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|x64.ActiveCfg = Release|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|x64.Build.0 = Release|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|x86.ActiveCfg = Release|Any CPU
-		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|x86.Build.0 = Release|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|Any CPU.ActiveCfg = Debug .NET Native|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|Any CPU.Build.0 = Debug .NET Native|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|x64.ActiveCfg = Debug .NET Native|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|x64.Build.0 = Debug .NET Native|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|x86.ActiveCfg = Debug .NET Native|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug .NET Native|x86.Build.0 = Debug .NET Native|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug|x64.Build.0 = Debug|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Debug|x86.Build.0 = Debug|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Release|x64.ActiveCfg = Release|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Release|x64.Build.0 = Release|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Release|x86.ActiveCfg = Release|Any CPU
+		{8740A0CD-2613-4354-9506-35035A735962}.Release|x86.Build.0 = Release|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|Any CPU.ActiveCfg = Debug .NET Native|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|Any CPU.Build.0 = Debug .NET Native|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|x64.ActiveCfg = Debug .NET Native|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|x64.Build.0 = Debug .NET Native|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|x86.ActiveCfg = Debug .NET Native|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug .NET Native|x86.Build.0 = Debug .NET Native|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|x64.Build.0 = Debug|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Debug|x86.Build.0 = Debug|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x64.ActiveCfg = Release|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x64.Build.0 = Release|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}.Release|x86.Build.0 = Release|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|Any CPU.ActiveCfg = Debug .NET Native|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|Any CPU.Build.0 = Debug .NET Native|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|x64.ActiveCfg = Debug .NET Native|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|x64.Build.0 = Debug .NET Native|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|x86.ActiveCfg = Debug .NET Native|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug .NET Native|x86.Build.0 = Debug .NET Native|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug|x64.Build.0 = Debug|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Debug|x86.Build.0 = Debug|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Release|x64.ActiveCfg = Release|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Release|x64.Build.0 = Release|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Release|x86.ActiveCfg = Release|Any CPU
+		{97342112-448A-4636-827F-8D47B226D86F}.Release|x86.Build.0 = Release|Any CPU
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|Any CPU.ActiveCfg = Release|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|Any CPU.Build.0 = Release|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|x64.ActiveCfg = Debug|x64
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|x64.Build.0 = Debug|x64
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|x86.ActiveCfg = Debug|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug .NET Native|x86.Build.0 = Debug|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|Any CPU.Build.0 = Debug|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x64.ActiveCfg = Debug|x64
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x64.Build.0 = Debug|x64
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x86.ActiveCfg = Debug|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Debug|x86.Build.0 = Debug|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|Any CPU.ActiveCfg = Release|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|x64.ActiveCfg = Release|x64
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|x64.Build.0 = Release|x64
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|x86.ActiveCfg = Release|x86
+		{B1F1416B-C52A-4CE5-AF06-C960F5165784}.Release|x86.Build.0 = Release|x86
 		{D42434C7-459D-461A-8B1D-1451F7FF4B13}.Debug .NET Native|Any CPU.ActiveCfg = Debug|Any CPU
 		{D42434C7-459D-461A-8B1D-1451F7FF4B13}.Debug .NET Native|Any CPU.Build.0 = Debug|Any CPU
 		{D42434C7-459D-461A-8B1D-1451F7FF4B13}.Debug .NET Native|x64.ActiveCfg = Debug|Any CPU
@@ -205,20 +170,52 @@ Global
 		{D42434C7-459D-461A-8B1D-1451F7FF4B13}.Release|x64.Build.0 = Release|Any CPU
 		{D42434C7-459D-461A-8B1D-1451F7FF4B13}.Release|x86.ActiveCfg = Release|Any CPU
 		{D42434C7-459D-461A-8B1D-1451F7FF4B13}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|Any CPU.ActiveCfg = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|Any CPU.Build.0 = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|x64.ActiveCfg = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|x64.Build.0 = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|x86.ActiveCfg = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug .NET Native|x86.Build.0 = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|x64.Build.0 = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Debug|x86.Build.0 = Debug|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|x64.ActiveCfg = Release|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|x64.Build.0 = Release|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|x86.ActiveCfg = Release|Any CPU
+		{D53EB07B-F186-4281-A225-2C3DC5850148}.Release|x86.Build.0 = Release|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|Any CPU.Build.0 = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|x64.ActiveCfg = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|x64.Build.0 = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|x86.ActiveCfg = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug .NET Native|x86.Build.0 = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Debug|x86.Build.0 = Debug|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|x64.Build.0 = Release|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF539A3F-0672-412C-B9D0-38DCD3622D99}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{97342112-448A-4636-827F-8D47B226D86F} = {9B771F1E-F987-4C8D-927F-827E00924949}
 		{8740A0CD-2613-4354-9506-35035A735962} = {9B771F1E-F987-4C8D-927F-827E00924949}
 		{EF539A3F-0672-412C-B9D0-38DCD3622D99} = {9B771F1E-F987-4C8D-927F-827E00924949}
+		{D53EB07B-F186-4281-A225-2C3DC5850148} = {B84C5097-1512-40BB-92FE-E40B2912A214}
 		{254867D5-880B-44BE-BB13-72A98FE4C7A8} = {5686D165-0E93-4D73-8CC0-F99ACEEF3CD5}
 		{388CB59D-3D62-4C0A-8182-C3A1ADF317F3} = {5686D165-0E93-4D73-8CC0-F99ACEEF3CD5}
-		{D53EB07B-F186-4281-A225-2C3DC5850148} = {B84C5097-1512-40BB-92FE-E40B2912A214}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		BaseDirectory = .
 		Policies = $0
 		$0.DotNetNamingPolicy = $1
 		$1.DirectoryNamespaceAssociation = None
@@ -235,4 +232,7 @@ Global
 		$5.IncludeInstanceMembers = True
 		$5.IncludeStaticEntities = True
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/NScumm.Core/NScumm.Core.csproj b/NScumm.Core/NScumm.Core.csproj
index e941875..42b6600 100644
--- a/NScumm.Core/NScumm.Core.csproj
+++ b/NScumm.Core/NScumm.Core.csproj
@@ -35,6 +35,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Audio\Decoders\XAStream.cs" />
diff --git a/NScumm.Core/ScummHelper.cs b/NScumm.Core/ScummHelper.cs
index bfdf60b..59a6444 100644
--- a/NScumm.Core/ScummHelper.cs
+++ b/NScumm.Core/ScummHelper.cs
@@ -587,10 +587,11 @@ public static string ReadTag(this BinaryReader reader)
             return System.Text.Encoding.UTF8.GetString(reader.ReadBytes(4), 0, 4);
         }
 
-        public static string GetText(this byte[] value, int startIndex = 0)
+		public static string GetText(this byte[] value, int startIndex = 0, int count = -1)
         {
             var data = new List<byte>();
-            for (int i = startIndex; i < value.Length && value[i] != 0; i++)
+			count = count < 0 ? value.Length : count;
+            for (int i = startIndex; i < count && value[i] != 0; i++)
             {
                 data.Add(value[i]);
             }
diff --git a/NScumm.MonoGame/Platforms/Linux/NScumm.MonoGame.csproj b/NScumm.MonoGame/Platforms/Linux/NScumm.MonoGame.csproj
index d44e7e0..1356cef 100644
--- a/NScumm.MonoGame/Platforms/Linux/NScumm.MonoGame.csproj
+++ b/NScumm.MonoGame/Platforms/Linux/NScumm.MonoGame.csproj
@@ -103,7 +103,7 @@
       <Name>NScumm.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Platforms\NScumm.Platform_Desktop\NScumm.Platform_Desktop.csproj">
-      <Project>{d42434c7-459d-461a-8b1d-1451f7ff4b13}</Project>
+      <Project>{D42434C7-459D-461A-8B1D-1451F7FF4B13}</Project>
       <Name>NScumm.Platform_Desktop</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/NScumm.MonoGame/Platforms/WindowsGL/NScumm.MonoGame.csproj b/NScumm.MonoGame/Platforms/WindowsGL/NScumm.MonoGame.csproj
index acc1e86..95944e8 100644
--- a/NScumm.MonoGame/Platforms/WindowsGL/NScumm.MonoGame.csproj
+++ b/NScumm.MonoGame/Platforms/WindowsGL/NScumm.MonoGame.csproj
@@ -19,7 +19,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <PlatformTarget>x86</PlatformTarget>
-    <Commandlineparameters>"D:\Games\m1\000.LFL"</Commandlineparameters>
+    <Commandlineparameters>/Users/valery/Games/ft/FT.LA0</Commandlineparameters>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -31,6 +31,7 @@
     <ConsolePause>false</ConsolePause>
     <PlatformTarget>x86</PlatformTarget>
     <Commandlineparameters>/home/scemino/Games/comi/COMI.LA0</Commandlineparameters>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>App.ico</ApplicationIcon>
@@ -45,6 +46,8 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -54,6 +57,8 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -136,7 +141,7 @@
       <Name>NScumm.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Platforms\NScumm.Platform_Desktop\NScumm.Platform_Desktop.csproj">
-      <Project>{d42434c7-459d-461a-8b1d-1451f7ff4b13}</Project>
+      <Project>{D42434C7-459D-461A-8B1D-1451F7FF4B13}</Project>
       <Name>NScumm.Platform_Desktop</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/NScumm.MonoGame/Platforms/WindowsGL/packages.config b/NScumm.MonoGame/Platforms/WindowsGL/packages.config
index bc49967..6c204d1 100644
--- a/NScumm.MonoGame/Platforms/WindowsGL/packages.config
+++ b/NScumm.MonoGame/Platforms/WindowsGL/packages.config
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FlacBox.Portable" version="1.0.1" targetFramework="net45" />
-  <package id="Mono.Options" version="1.1" targetFramework="net4" userInstalled="true" />
-  <package id="MonoGame.Framework.Linux" version="3.4.0.459" targetFramework="net45" userInstalled="true" />
-  <package id="MonoGame.Framework.WindowsGL" version="3.4.0.459" targetFramework="net45" userInstalled="true" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Mono.Options" version="1.1" targetFramework="net4" userInstalled="true" />
+  <package id="MonoGame.Framework.Linux" version="3.4.0.459" targetFramework="net45" userInstalled="true" />
+  <package id="MonoGame.Framework.WindowsGL" version="3.4.0.459" targetFramework="net45" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Platforms/NScumm.Platform_Desktop/AudioManager.cs b/Platforms/NScumm.Platform_Desktop/AudioManager.cs
index 1d0adb1..33ea043 100644
--- a/Platforms/NScumm.Platform_Desktop/AudioManager.cs
+++ b/Platforms/NScumm.Platform_Desktop/AudioManager.cs
@@ -23,7 +23,7 @@
 using System.IO;
 using System.Linq;
 using System;
-using FlacBox;
+using FlacBox;
 
 namespace NScumm.Platform_Desktop
 {
diff --git a/Platforms/NScumm.Platform_Desktop/FileStorage.cs b/Platforms/NScumm.Platform_Desktop/FileStorage.cs
index e8c3fc0..ddf5583 100644
--- a/Platforms/NScumm.Platform_Desktop/FileStorage.cs
+++ b/Platforms/NScumm.Platform_Desktop/FileStorage.cs
@@ -139,7 +139,8 @@ public XDocument LoadDocument(Stream stream)
 
         public Stream OpenContent(string path)
         {
-            var dir = new Uri(Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase)).AbsolutePath;
+			var exe=Environment.GetCommandLineArgs ()[0];
+            var dir = Path.GetDirectoryName(exe);
             var fullPath = ScummHelper.LocatePath(dir, path);
             return OpenFileRead(fullPath);
         }
diff --git a/Platforms/NScumm.Platform_Desktop/NScumm.Platform_Desktop.csproj b/Platforms/NScumm.Platform_Desktop/NScumm.Platform_Desktop.csproj
index 1d4f8b5..9b57920 100644
--- a/Platforms/NScumm.Platform_Desktop/NScumm.Platform_Desktop.csproj
+++ b/Platforms/NScumm.Platform_Desktop/NScumm.Platform_Desktop.csproj
@@ -28,13 +28,12 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FlacBox.Portable, Version=1.0.1.0, Culture=neutral, PublicKeyToken=4fc09ef1349866ee, processorArchitecture=MSIL">
-      <HintPath>..\packages\FlacBox.Portable.1.0.1\lib\portable-net4+sl5+wp8+win8\FlacBox.Portable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+    <Reference Include="FlacBox">
+      <HintPath>..\..\packages\FlacBox.1.0.1\lib\net35\FlacBox.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AudioManager.cs" />
diff --git a/Platforms/NScumm.Platform_Desktop/packages.config b/Platforms/NScumm.Platform_Desktop/packages.config
index 5939ec9..d081f4f 100644
--- a/Platforms/NScumm.Platform_Desktop/packages.config
+++ b/Platforms/NScumm.Platform_Desktop/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FlacBox.Portable" version="1.0.1" targetFramework="net45" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FlacBox" version="1.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Tests/NScumm.Core.Tests/NScumm.Scumm.Tests.csproj b/Tests/NScumm.Core.Tests/NScumm.Scumm.Tests.csproj
index 075cda3..6d74a98 100644
--- a/Tests/NScumm.Core.Tests/NScumm.Scumm.Tests.csproj
+++ b/Tests/NScumm.Core.Tests/NScumm.Scumm.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/Tools/NScumm.Dump/NScumm.Dump.csproj b/Tools/NScumm.Dump/NScumm.Dump.csproj
index a5827c8..284dca5 100644
--- a/Tools/NScumm.Dump/NScumm.Dump.csproj
+++ b/Tools/NScumm.Dump/NScumm.Dump.csproj
@@ -121,11 +121,11 @@
       <Name>NScumm.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Engines\NScumm.Scumm\NScumm.Scumm.csproj">
-      <Project>{97342112-448a-4636-827f-8d47b226d86f}</Project>
+      <Project>{97342112-448A-4636-827F-8D47B226D86F}</Project>
       <Name>NScumm.Scumm</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Platforms\NScumm.Platform_Desktop\NScumm.Platform_Desktop.csproj">
-      <Project>{d42434c7-459d-461a-8b1d-1451f7ff4b13}</Project>
+      <Project>{D42434C7-459D-461A-8B1D-1451F7FF4B13}</Project>
       <Name>NScumm.Platform_Desktop</Name>
     </ProjectReference>
   </ItemGroup>