diff --git a/FileTail.cs b/FileTail.cs
deleted file mode 100644
index fa7fce4..0000000
--- a/FileTail.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace PreviewToy
-{
-    class FileTail
-    {
-    }
-}
diff --git a/PreviewHandler.cs b/PreviewHandler.cs
index f2e5999..c7c2d59 100644
--- a/PreviewHandler.cs
+++ b/PreviewHandler.cs
@@ -56,11 +56,13 @@ namespace PreviewToy
             previews = new Dictionary<IntPtr, Preview>();
 
             xml_bad_to_ok_chars = new Dictionary<string, string>();
-            xml_bad_to_ok_chars.Add("<", "&lt");
-            xml_bad_to_ok_chars.Add("&", "&amp");
-            xml_bad_to_ok_chars.Add(">", "&gt");
-            xml_bad_to_ok_chars.Add("\"", "&quot");
-            xml_bad_to_ok_chars.Add("'", "&apos");
+            xml_bad_to_ok_chars["<"] = "---lt---";
+            xml_bad_to_ok_chars["&"] = "---amp---";
+            xml_bad_to_ok_chars[">"] = "---gt---";
+            xml_bad_to_ok_chars["\""] = "---quot---";
+            xml_bad_to_ok_chars["\'"] = "---apos---";
+            xml_bad_to_ok_chars[","] = "---comma---";
+            xml_bad_to_ok_chars["."] = "---dot---";
 
             unique_layouts = new Dictionary<String, Dictionary<String, Point>>();
             flat_layout = new Dictionary<String, Point>();
@@ -205,7 +207,7 @@ namespace PreviewToy
         {
             foreach(var kv in xml_bad_to_ok_chars)
             {
-                entry.Replace(kv.Key, kv.Value);
+                entry = entry.Replace(kv.Key, kv.Value);
             }
             return entry;
         }
@@ -214,14 +216,15 @@ namespace PreviewToy
         {
             foreach (var kv in xml_bad_to_ok_chars)
             {
-                entry.Replace(kv.Value, kv.Key);
+                entry = entry.Replace(kv.Value, kv.Key);
             }
             return entry;
         }
 
         private XElement MakeXElement(string input)
         {
-            return new XElement(remove_nonconform_xml_characters(input).Replace(" ", "_"));
+            string clean = remove_nonconform_xml_characters(input).Replace(" ", "_");
+            return new XElement(clean);
         }
 
         private string ParseXElement(XElement input)
diff --git a/preview toy.csproj b/preview toy.csproj
index 738632a..0d8de26 100644
--- a/preview toy.csproj	
+++ b/preview toy.csproj	
@@ -28,7 +28,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.12.0.0</ApplicationVersion>
+    <ApplicationVersion>1.13.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -93,7 +93,6 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FileTail.cs" />
     <Compile Include="PreviewHandler.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -129,7 +128,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="preview toy_TemporaryKey.pfx" />
     <None Include="Properties\DataSources\PreviewToyMain.datasource" />
     <None Include="Properties\Settings.settings">
diff --git a/preview toy.v11.suo b/preview toy.v11.suo
index ee89207..3278dbc 100644
Binary files a/preview toy.v11.suo and b/preview toy.v11.suo differ