diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 7b3d6999a..f8d6e24ee 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -600,7 +600,6 @@
         <e p="ext2FS.cs" t="Include" />
         <e p="extFS.cs" t="Include" />
         <e p="obj" t="ExcludeRecursive" />
-        <e p="packages.config" t="Include" />
       </e>
       <e p="DiscImageChef.Filters" t="IncludeRecursive">
         <e p="AppleDouble.cs" t="Include" />
diff --git a/DiscImageChef.Filesystems/AppleDOS/Info.cs b/DiscImageChef.Filesystems/AppleDOS/Info.cs
index 503d32d5b..ee19978fe 100644
--- a/DiscImageChef.Filesystems/AppleDOS/Info.cs
+++ b/DiscImageChef.Filesystems/AppleDOS/Info.cs
@@ -66,8 +66,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
                                    Encoding encoding)
         {
-            // TODO: Until Apple ][ encoding is implemented
-            Encoding = new LisaRoman();
+            Encoding = encoding ?? new Apple2();
             information = "";
             StringBuilder sb = new StringBuilder();
 
diff --git a/DiscImageChef.Filesystems/AppleDOS/Super.cs b/DiscImageChef.Filesystems/AppleDOS/Super.cs
index 3a0893618..352a6d922 100644
--- a/DiscImageChef.Filesystems/AppleDOS/Super.cs
+++ b/DiscImageChef.Filesystems/AppleDOS/Super.cs
@@ -50,8 +50,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
         {
             device = imagePlugin;
             start = partition.Start;
-            // TODO: Until Apple ][ encoding is implemented
-            Encoding = new LisaRoman();
+            Encoding = encoding ?? new Apple2();
 
             if(device.Info.Sectors != 455 && device.Info.Sectors != 560)
             {
diff --git a/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj b/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj
index 9d118f84b..443fef825 100644
--- a/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj
+++ b/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj
@@ -31,11 +31,11 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Claunia.Encoding, Version=1.0.6569.33160, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Claunia.Encoding.1.3.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <Reference Include="Claunia.Encoding">
-      <HintPath>..\packages\Claunia.Encoding.1.2.9.1\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="IReadOnlyFilesystem.cs" />
@@ -215,9 +215,6 @@
     </EmbeddedResource>
     <EmbeddedResource Include="CPM\cpmdefs.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
diff --git a/DiscImageChef.Filesystems/ProDOS.cs b/DiscImageChef.Filesystems/ProDOS.cs
index 837c996c0..a454a6af3 100644
--- a/DiscImageChef.Filesystems/ProDOS.cs
+++ b/DiscImageChef.Filesystems/ProDOS.cs
@@ -153,8 +153,7 @@ namespace DiscImageChef.Filesystems
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
                                    Encoding encoding)
         {
-            // TODO: Until Apple ][ encoding is implemented
-            Encoding = new LisaRoman();
+            Encoding = encoding ?? new Apple2gs();
             StringBuilder sbInformation = new StringBuilder();
 
             // Blocks 0 and 1 are boot code
diff --git a/DiscImageChef.Filesystems/UCSDPascal/Info.cs b/DiscImageChef.Filesystems/UCSDPascal/Info.cs
index 1654f31bc..973568f8f 100644
--- a/DiscImageChef.Filesystems/UCSDPascal/Info.cs
+++ b/DiscImageChef.Filesystems/UCSDPascal/Info.cs
@@ -32,9 +32,11 @@
 
 using System;
 using System.Text;
+using Claunia.Encoding;
 using DiscImageChef.CommonTypes;
 using DiscImageChef.DiscImages;
 using Schemas;
+using Encoding = System.Text.Encoding;
 
 namespace DiscImageChef.Filesystems.UCSDPascal
 {
@@ -86,6 +88,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
                                    Encoding encoding)
         {
+            Encoding = encoding ?? new Apple2();
             StringBuilder sbInformation = new StringBuilder();
             information = "";
 
diff --git a/DiscImageChef.Filesystems/UCSDPascal/Super.cs b/DiscImageChef.Filesystems/UCSDPascal/Super.cs
index c7f799c0c..fe5c01092 100644
--- a/DiscImageChef.Filesystems/UCSDPascal/Super.cs
+++ b/DiscImageChef.Filesystems/UCSDPascal/Super.cs
@@ -46,8 +46,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
         public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, bool debug)
         {
             device = imagePlugin;
-            // TODO: Until Apple ][ encoding is implemented
-            Encoding = new LisaRoman();
+            Encoding = encoding ?? new Apple2();
             this.debug = debug;
             if(device.Info.Sectors < 3) return Errno.InvalidArgument;
 
diff --git a/DiscImageChef.Filesystems/packages.config b/DiscImageChef.Filesystems/packages.config
index 4a1b16f17..2f05339b6 100644
--- a/DiscImageChef.Filesystems/packages.config
+++ b/DiscImageChef.Filesystems/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-    <package id="Claunia.Encoding" version="1.2.9.1" targetFramework="net40" />
+  <package id="Claunia.Encoding" version="1.3.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj
index 737c3968e..803b696c4 100644
--- a/DiscImageChef/DiscImageChef.csproj
+++ b/DiscImageChef/DiscImageChef.csproj
@@ -34,6 +34,9 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Claunia.Encoding, Version=1.0.6569.33160, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Claunia.Encoding.1.3.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
+    </Reference>
     <Reference Include="SharpCompress, Version=0.19.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96">
       <HintPath>..\packages\SharpCompress.0.19.2\lib\net35\SharpCompress.dll</HintPath>
     </Reference>
@@ -43,9 +46,6 @@
       <HintPath>..\packages\CommandLineParser.2.1.1-beta\lib\net40\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
-    <Reference Include="Claunia.Encoding">
-      <HintPath>..\packages\Claunia.Encoding.1.2.9.1\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
diff --git a/DiscImageChef/packages.config b/DiscImageChef/packages.config
index 3cb0221d7..de5672f9d 100644
--- a/DiscImageChef/packages.config
+++ b/DiscImageChef/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-    <package id="Claunia.Encoding" version="1.2.9.1" targetFramework="net40" />
-    <package id="CommandLineParser" version="2.1.1-beta" targetFramework="net40" />
-    <package id="SharpCompress" version="0.19.2" targetFramework="net40" />
+  <package id="Claunia.Encoding" version="1.3.0" targetFramework="net40" />
+  <package id="CommandLineParser" version="2.1.1-beta" targetFramework="net40" />
+  <package id="SharpCompress" version="0.19.2" targetFramework="net40" />
 </packages>
\ No newline at end of file