diff --git a/OracleHack b/OracleHack
index 5df74d2..813216c 160000
--- a/OracleHack
+++ b/OracleHack
@@ -1 +1 @@
-Subproject commit 5df74d2e5152af094818c1cbf71aae02cb766868
+Subproject commit 813216c9ea55227d3c651bdb80a2de543bbdd86a
diff --git a/OracleWin/MainWindow.xaml b/OracleWin/MainWindow.xaml
index 4e9190e..17e74c4 100644
--- a/OracleWin/MainWindow.xaml
+++ b/OracleWin/MainWindow.xaml
@@ -91,8 +91,8 @@
 			</GroupBox>
 			<GroupBox Header="Game Type" Height="79" HorizontalAlignment="Left" Margin="140,12,0,0" Name="groupBox2" VerticalAlignment="Top" Width="111">
 				<Grid>
-					<local:EnumRadioButton Content="Linked Quest" EnumBinding="{Binding Quest}" EnumValue="LinkedGame" Height="16" HorizontalAlignment="Left" Margin="6,8,0,0" x:Name="rdoLinked" VerticalAlignment="Top" IsChecked="True" />
-					<local:EnumRadioButton Content="Hero's Quest" EnumBinding="{Binding Quest}" EnumValue="HerosSecret" Height="16" HorizontalAlignment="Left" Margin="6,34,0,0" x:Name="rdoHero" VerticalAlignment="Top" />
+					<CheckBox Content="Linked Game" IsChecked="{Binding IsLinkedGame}" Height="16" HorizontalAlignment="Left" Margin="6,8,0,0" x:Name="chkLinked" VerticalAlignment="Top" />
+					<CheckBox Content="Hero's Quest" IsChecked="{Binding IsHeroQuest}" Height="16" HorizontalAlignment="Left" Margin="6,34,0,0" x:Name="chkHero" VerticalAlignment="Top" />
 				</Grid>
 			</GroupBox>
 			<TextBox Text="{Binding Hero}" Height="23" HorizontalAlignment="Left" Margin="52,111,0,0" Name="textBox1" VerticalAlignment="Top" Width="74" MaxLength="5" />
diff --git a/OracleWin/OracleWin.csproj b/OracleWin/OracleWin.csproj
index 686880e..8c29c17 100644
--- a/OracleWin/OracleWin.csproj
+++ b/OracleWin/OracleWin.csproj
@@ -20,17 +20,19 @@
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateEnabled>true</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
+    <ProductName>Oracle Hack</ProductName>
+    <PublisherName>Andrew Nagle</PublisherName>
     <WebPage>publish.htm</WebPage>
     <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>2.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -67,7 +69,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
@@ -236,6 +238,14 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <FileAssociation Include=".zora">
+      <Visible>False</Visible>
+      <Description>Zelda Oracle Game Info</Description>
+      <Progid>OracleHack</Progid>
+      <DefaultIcon>Farore.ico</DefaultIcon>
+    </FileAssociation>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OracleWin/Properties/AssemblyInfo.cs b/OracleWin/Properties/AssemblyInfo.cs
index ccd09b2..d4a8b1f 100644
--- a/OracleWin/Properties/AssemblyInfo.cs
+++ b/OracleWin/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("OracleWin")]
-[assembly: AssemblyCopyright("Copyright © Andrew \"Kabili\" Nagle 2013 - 2014")]
+[assembly: AssemblyCopyright("Copyright © Andrew \"Kabili\" Nagle 2013 - 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.*")]
-[assembly: AssemblyInformationalVersion("2.0")]
+[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyInformationalVersion("2.1")]
diff --git a/OracleWin/ViewSecretsWindow.xaml.cs b/OracleWin/ViewSecretsWindow.xaml.cs
index a619b91..b936885 100644
--- a/OracleWin/ViewSecretsWindow.xaml.cs
+++ b/OracleWin/ViewSecretsWindow.xaml.cs
@@ -36,7 +36,7 @@ private void SetSecrets()
 			uxGameSecret.SetSecret(_info.CreateGameSecret());
 			uxRingSecret.SetSecret(_info.CreateRingSecret());
 			
-			if (_info.Quest == Quest.LinkedGame)
+			if (_info.IsLinkedGame)
 			{
 				bool returnSecret = true;
 				uxMemSecret01.SetSecret(_info.CreateMemorySecret(Memory.ClockShopKingZora, returnSecret));