diff --git a/.hgsubstate b/.hgsubstate
index a4e5f9c6f..ea7cd657b 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,4 +1,4 @@
 d0cf85644ff34b0630a12eed746a66a8d88eb5cf src/Orchard.Web/Modules/Orchard.Forms
 314b3af9e01cc57aa1ec980e32dfdb78b41d646a src/Orchard.Web/Modules/Orchard.Rules
 65057c6a5cd71f7994ba9bcbeece50dbb737620e src/Orchard.Web/Modules/Orchard.TaskLease
-ac727b18ea5b7c311f572b8054e0d0e6d5a48f85 src/Orchard.Web/Modules/Orchard.Tokens
+f1258c7b291f4aa5ae0e03260f32c7d89cc6a728 src/Orchard.Web/Modules/Orchard.Tokens
diff --git a/Orchard.proj b/Orchard.proj
index 396137df6..72100214a 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -39,7 +39,7 @@
     <CallTarget Targets="Clean"/>
     <CallTarget Targets="Compile"/>
     <CallTarget Targets="Test"/>
-    <CallTarget Targets="Package"/>
+    <CallTarget Targets="Package"/> 
   </Target>
 
   <Target Name="FullBuild">
@@ -60,8 +60,8 @@
 
   <Target Name="Package">
     <CallTarget Targets="Package-Stage"/>
-    <CallTarget Targets="Package-MsDeploy"/>
-    <CallTarget Targets="Package-Zip"/>
+<!--    <CallTarget Targets="Package-MsDeploy"/>
+    <CallTarget Targets="Package-Zip"/>-->
   </Target>
 
   <Target Name="Profiling">
@@ -162,7 +162,7 @@
       <Stage-Themes Include="$(ThemesSrcFolder)\**\*" Exclude="@(Stage-Bin-Exclude);$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\bin\**;$(ThemesSrcFolder)\obj\**;$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\Properties\**" />
       <Stage-Themes-Binaries Include="$(ThemesSrcFolder)\*\**\bin\*" />
 
-      <Stage-Module-Exclude Include="@(Stage-Web);@(Stage-Core);@(Stage-Themes);$(WebSitesFolder)\PackageIndexReferenceImplementation\**\*"/>
+      <Stage-Module-Exclude Include="@(Stage-Web);@(Stage-Core);@(Stage-Themes);$(WebSitesFolder)\Themes\**\*;$(WebSitesFolder)\PackageIndexReferenceImplementation\**\*"/>
 
       <Stage-Modules Include="$(WebSitesFolder)\**\*" Exclude="@(Stage-Bin-Exclude);@(Stage-Module-Exclude)" />
       <Stage-Modules-Binaries Include="$(WebSitesFolder)\**\bin\**\*"  Exclude="@(Stage-Module-Exclude)"/>