diff --git a/TsRandomizer.ItemTracker/TsRandomizer.ItemTracker.csproj b/TsRandomizer.ItemTracker/TsRandomizer.ItemTracker.csproj
index 9e8eeb4f..211b86d3 100644
--- a/TsRandomizer.ItemTracker/TsRandomizer.ItemTracker.csproj
+++ b/TsRandomizer.ItemTracker/TsRandomizer.ItemTracker.csproj
@@ -100,7 +100,8 @@
   <ItemGroup>
     <Reference Include="FNA, Version=19.5.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Timespinner\FNA.dll</HintPath>
+      <HintPath Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\Timespinner\FNA.dll')">C:\Program Files (x86)\Steam\steamapps\common\Timespinner\FNA.dll</HintPath>
+      <HintPath Condition="Exists('$(HOME)/.local/share/Steam/steamapps/common/Timespinner/FNA.dll')">$(HOME)/.local/share/Steam/steamapps/common/Timespinner/FNA.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -109,13 +110,15 @@
     <Reference Include="System.Xml" />
     <Reference Include="Timespinner, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Timespinner\Timespinner.exe</HintPath>
+      <HintPath Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\Timespinner\Timespinner.exe')">C:\Program Files (x86)\Steam\steamapps\common\Timespinner\Timespinner.exe</HintPath>
+      <HintPath Condition="Exists('$(HOME)/.local/share/Steam/steamapps/common/Timespinner/Timespinner.exe')">$(HOME)/.local/share/Steam/steamapps/common/Timespinner/Timespinner.exe</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="TsRandomizer, Version=1.26.5.0, Culture=neutral, processorArchitecture=x86">
+    <!-- <Reference Include="TsRandomizer, Version=1.26.5.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Timespinner\TsRandomizer.exe</HintPath>
-    </Reference>
+    </Reference> -->
+    <ProjectReference Include="..\TsRandomizer\TsRandomizer.csproj"></ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BackgroundProvider.cs" />
diff --git a/TsRandomizer/TsRandomizer.csproj b/TsRandomizer/TsRandomizer.csproj
index 995ae1d3..fc9744c3 100644
--- a/TsRandomizer/TsRandomizer.csproj
+++ b/TsRandomizer/TsRandomizer.csproj
@@ -105,9 +105,9 @@
       <HintPath>..\packages\Archipelago.MultiClient.Net.6.5.0\lib\net45\Archipelago.MultiClient.Net.dll</HintPath>
     </Reference>
     <Reference Include="FNA">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Timespinner\FNA.dll</HintPath>
-      <HintPath>~/.local/share/Steam/steamapps/common/Timespinner/FNA.dll</HintPath>
-      <HintPath>..\..\..\TestVersions\DRMFreeVersion\FNA.dll</HintPath>
+      <HintPath Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\Timespinner\FNA.dll')">C:\Program Files (x86)\Steam\steamapps\common\Timespinner\FNA.dll</HintPath>
+      <HintPath Condition="Exists('..\..\..\TestVersions\DRMFreeVersion\FNA.dll')">..\..\..\TestVersions\DRMFreeVersion\FNA.dll</HintPath>
+      <HintPath Condition="Exists('$(HOME)/.local/share/Steam/steamapps/common/Timespinner/FNA.dll')">$(HOME)/.local/share/Steam/steamapps/common/Timespinner/FNA.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -120,7 +120,8 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Timespinner">
-      <HintPath>..\..\..\TestVersions\DRMFreeVersion\Timespinner.exe</HintPath>
+      <HintPath Condition="Exists('..\..\..\TestVersions\DRMFreeVersion\Timespinner.exe')">..\..\..\TestVersions\DRMFreeVersion\Timespinner.exe</HintPath>
+      <HintPath Condition="Exists('$(HOME)/.local/share/Steam/steamapps/common/Timespinner/Timespinner.exe')">$(HOME)/.local/share/Steam/steamapps/common/Timespinner/Timespinner.exe</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>