diff --git a/NzbDrone.6.0.ReSharper b/NzbDrone.6.0.ReSharper
index c918885f0..fc6b1c5c3 100644
--- a/NzbDrone.6.0.ReSharper
+++ b/NzbDrone.6.0.ReSharper
@@ -32,6 +32,9 @@
         <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
       </Naming2>
     </CSharp>
+    <HTML>
+      <FormatSettings />
+    </HTML>
     <JavaScript>
       <FormatSettings />
       <Naming2>
diff --git a/NzbDrone.Core/Providers/EpisodeProvider.cs b/NzbDrone.Core/Providers/EpisodeProvider.cs
index 05f3d33ab..945908caf 100644
Binary files a/NzbDrone.Core/Providers/EpisodeProvider.cs and b/NzbDrone.Core/Providers/EpisodeProvider.cs differ
diff --git a/NzbDrone.Web/Content/XbmcNotification.png b/NzbDrone.Web/Content/Images/XbmcNotification.png
similarity index 100%
rename from NzbDrone.Web/Content/XbmcNotification.png
rename to NzbDrone.Web/Content/Images/XbmcNotification.png
diff --git a/NzbDrone.Web/Content/ajax-loader.gif b/NzbDrone.Web/Content/Images/ajax-loader.gif
similarity index 100%
rename from NzbDrone.Web/Content/ajax-loader.gif
rename to NzbDrone.Web/Content/Images/ajax-loader.gif
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 339a2ef4c..7bc6e4fb1 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -582,7 +582,7 @@
     <Content Include="Content\2011.1.315\Windows7\slider-vs-right.gif" />
     <Content Include="Content\2011.1.315\Windows7\sprite-vertical.png" />
     <Content Include="Content\2011.1.315\Windows7\sprite.png" />
-    <Content Include="Content\ajax-loader.gif" />
+    <Content Include="Content\Images\ajax-loader.gif" />
     <Content Include="Content\ie.css" />
     <Content Include="Content\Images\arrow.png" />
     <Content Include="Content\Images\favicon.ico" />
@@ -633,7 +633,7 @@
     <Content Include="Content\jquery.jgrowl.css" />
     <Content Include="Content\notibar.css" />
     <Content Include="Content\style.css" />
-    <Content Include="Content\XbmcNotification.png" />
+    <Content Include="Content\Images\XbmcNotification.png" />
     <Content Include="favicon.ico" />
     <Content Include="Global.asax" />
     <Content Include="Scripts\2011.1.315\jquery-1.5.1.min.js" />
@@ -711,7 +711,7 @@
     <Content Include="Views\Settings\Quality.cshtml" />
     <Content Include="Views\AddSeries\RootDir.cshtml" />
     <Content Include="Views\Settings\SubMenu.cshtml" />
-    <Content Include="Views\Shared\SiteLayout.cshtml" />
+    <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Shared\Footer.cshtml" />
     <Content Include="Views\Settings\Index.cshtml" />
     <Content Include="Views\_ViewStart.cshtml" />
diff --git a/NzbDrone.Web/Views/Shared/SiteLayout.cshtml b/NzbDrone.Web/Views/Shared/_Layout.cshtml
similarity index 100%
rename from NzbDrone.Web/Views/Shared/SiteLayout.cshtml
rename to NzbDrone.Web/Views/Shared/_Layout.cshtml
diff --git a/NzbDrone.Web/Views/_ViewStart.cshtml b/NzbDrone.Web/Views/_ViewStart.cshtml
index bf880d908..2de62418c 100644
--- a/NzbDrone.Web/Views/_ViewStart.cshtml
+++ b/NzbDrone.Web/Views/_ViewStart.cshtml
@@ -1,3 +1,3 @@
 ﻿@{
-    Layout = "~/Views/Shared/SiteLayout.cshtml";
+    Layout = "~/Views/Shared/_Layout.cshtml";
 }
diff --git a/packages/repositories.config b/packages/repositories.config
index 40652d947..dab1f97f3 100644
--- a/packages/repositories.config
+++ b/packages/repositories.config
@@ -3,4 +3,5 @@
   <repository path="..\NzbDrone.Web\packages.config" />
   <repository path="..\NzbDrone.Core.Test\packages.config" />
   <repository path="..\NzbDrone.Core\packages.config" />
+  <repository path="..\NzbDrone.Site\packages.config" />
 </repositories>
\ No newline at end of file
