diff --git a/src/Fubu/Fubu.csproj b/src/Fubu/Fubu.csproj
index f2d6e38a33..c0de902383 100644
--- a/src/Fubu/Fubu.csproj
+++ b/src/Fubu/Fubu.csproj
@@ -36,16 +36,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="Bottles.Deployers.Iis">
-      <HintPath>..\packages\Bottles.Deployers.IIS.0.9.1.156\lib\Bottles.Deployers.Iis.dll</HintPath>
+      <HintPath>..\packages\Bottles.Deployers.IIS.0.9.1.137\lib\Bottles.Deployers.Iis.dll</HintPath>
     </Reference>
     <Reference Include="Bottles.Deployment">
-      <HintPath>..\packages\Bottles.Deployment.0.9.1.156\lib\Bottles.Deployment.dll</HintPath>
+      <HintPath>..\packages\Bottles.Deployment.0.9.1.137\lib\Bottles.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
@@ -76,18 +76,10 @@
     </Compile>
     <Compile Include="CreateDeploymentCommand.cs" />
     <Compile Include="IncludeWebContentCommand.cs" />
-    <Compile Include="IProcess.cs" />
-    <Compile Include="IProcessFactory.cs" />
-    <Compile Include="IKeywordReplacer.cs" />
     <Compile Include="InstallPackageCommand.cs" />
     <Compile Include="InstallPackageInput.cs" />
-    <Compile Include="KeywordReplacer.cs" />
-    <Compile Include="NewCommand.cs" />
-    <Compile Include="NewCommandInput.cs" />
     <Compile Include="PackagesCommand.cs" />
     <Compile Include="PackagesInput.cs" />
-    <Compile Include="ProcessFactory.cs" />
-    <Compile Include="ProcessWrapper.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RestartCommand.cs" />
@@ -105,9 +97,6 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
-    <None Include="fubu">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Fubu/packages.config b/src/Fubu/packages.config
index 5dd5fea685..f7410a5408 100644
--- a/src/Fubu/packages.config
+++ b/src/Fubu/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
-  <package id="Bottles.Deployers.IIS" version="0.9.1.156" />
-  <package id="Bottles.Deployment" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
+  <package id="Bottles.Deployers.IIS" version="0.9.1.137" />
+  <package id="Bottles.Deployment" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
   <package id="DotNetZip" version="1.9.1.8" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="structuremap" version="2.6.3" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuKayak/FubuKayak.csproj b/src/FubuKayak/FubuKayak.csproj
index ad867e1b01..2841d96f3f 100644
--- a/src/FubuKayak/FubuKayak.csproj
+++ b/src/FubuKayak/FubuKayak.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="Gate">
       <HintPath>..\packages\Gate.0.1.4\lib\Gate.dll</HintPath>
diff --git a/src/FubuKayak/packages.config b/src/FubuKayak/packages.config
index 0f98a8b271..b192060737 100644
--- a/src/FubuKayak/packages.config
+++ b/src/FubuKayak/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="Gate" version="0.1.4" />
   <package id="Gate.Kayak" version="0.1.4" />
   <package id="HtmlTags" version="1.0.0.23" />
diff --git a/src/FubuMVC.Core/FubuMVC.Core.csproj b/src/FubuMVC.Core/FubuMVC.Core.csproj
index a70500b025..8fe3cd6759 100755
--- a/src/FubuMVC.Core/FubuMVC.Core.csproj
+++ b/src/FubuMVC.Core/FubuMVC.Core.csproj
@@ -23,8 +23,6 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <NoWarn>1591,1570</NoWarn>
-    <DocumentationFile>bin\Debug\FubuMVC.Core.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -37,16 +35,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="Bottles.Deployment">
-      <HintPath>..\packages\Bottles.Deployment.0.9.1.156\lib\Bottles.Deployment.dll</HintPath>
+      <HintPath>..\packages\Bottles.Deployment.0.9.1.137\lib\Bottles.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuLocalization">
-      <HintPath>..\packages\FubuLocalization.0.9.2.96\lib\FubuLocalization.dll</HintPath>
+      <HintPath>..\packages\FubuLocalization.0.9.2.85\lib\FubuLocalization.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
@@ -91,10 +89,6 @@
     <Compile Include="Assets\Caching\AssetFileWatchingActivator.cs" />
     <Compile Include="Assets\Caching\IAssetFileChangeListener.cs" />
     <Compile Include="Assets\Caching\IAssetFileWatcher.cs" />
-    <Compile Include="Assets\Diagnostics\AssetLog.cs" />
-    <Compile Include="Assets\Diagnostics\AssetLogEntry.cs" />
-    <Compile Include="Assets\Diagnostics\AssetLogsCache.cs" />
-    <Compile Include="Assets\Diagnostics\AssetRegistrationDiagnostics.cs" />
     <Compile Include="Assets\Content\ITransformerPolicyLibrary.cs" />
     <Compile Include="Assets\Content\IContentPlanCache.cs" />
     <Compile Include="Assets\Http\AssetEtagInvocationFilter.cs" />
@@ -199,8 +193,7 @@
     <Compile Include="Caching\SetContentType.cs" />
     <Compile Include="Caching\WriteFileRecord.cs" />
     <Compile Include="Caching\WriteStream.cs" />
-    <Compile Include="Caching\WriteTextOutput.cs" />
-    <Compile Include="Continuations\IRedirectable.cs" />
+    <Compile Include="Caching\WriteText.cs" />
     <Compile Include="Diagnostics\Assets\BasicAssetDiagnostics.cs" />
     <Compile Include="Http\AspNet\AspNetAggregateDictionary.cs" />
     <Compile Include="Http\AspNet\AspNetHttpWriter.cs" />
@@ -231,6 +224,10 @@
     <Compile Include="Http\RequestDataSource.cs" />
     <Compile Include="Http\RequestHeaders.cs" />
     <Compile Include="Http\StreamingDataExtensions.cs" />
+    <Compile Include="Localization\BasicLocalizationSupport.cs" />
+    <Compile Include="Localization\LabelBuilder.cs" />
+    <Compile Include="Localization\RegisterXmlDirectoryLocalizationStorage.cs" />
+    <Compile Include="Localization\SpinUpLocalizationCaches.cs" />
     <Compile Include="Packaging\ContentOnlyPackageInfo.cs" />
     <Compile Include="Registration\BehaviorAggregator.cs" />
     <Compile Include="Registration\Conventions\ConnegAttachmentPolicy.cs" />
diff --git a/src/FubuMVC.Core/FubuRegistry.Expressions.cs b/src/FubuMVC.Core/FubuRegistry.Expressions.cs
index 50cbd00aca..84ccdcb079 100755
--- a/src/FubuMVC.Core/FubuRegistry.Expressions.cs
+++ b/src/FubuMVC.Core/FubuRegistry.Expressions.cs
@@ -172,6 +172,20 @@ public void Import<T>() where T : IFubuRegistryExtension, new()
             _importedTypes.Add(typeof(T));
         }
 
+        /// <summary>
+        /// Imports the declarations of an IFubuRegistryExtension
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        public void Import<T>(Action<T> configuration) where T : IFubuRegistryExtension, new()
+        {
+            var extension = new T();
+            configuration(extension);
+
+            extension.Configure(this);
+
+            _importedTypes.Add(typeof(T));
+        }
+
         private readonly IList<Type> _importedTypes = new List<Type>();
 
         /// <summary>
diff --git a/src/FubuMVC.Core/Localization/BasicLocalizationSupport.cs b/src/FubuMVC.Core/Localization/BasicLocalizationSupport.cs
new file mode 100644
index 0000000000..743ffe407c
--- /dev/null
+++ b/src/FubuMVC.Core/Localization/BasicLocalizationSupport.cs
@@ -0,0 +1,72 @@
+using System.Globalization;
+using Bottles;
+using FubuCore;
+using FubuLocalization;
+using FubuLocalization.Basic;
+using FubuMVC.Core.Registration.ObjectGraph;
+
+namespace FubuMVC.Core.Localization
+{
+    public class BasicLocalizationSupport : IFubuRegistryExtension
+    {
+        private readonly FubuPackageRegistry _internalRegistry = new FubuPackageRegistry();
+        private bool _useTheDefaultStorageMechanism = true;
+        private ObjectDef _localizationLoader;
+
+        public BasicLocalizationSupport()
+        {
+            _internalRegistry.Services(x =>
+            {
+                x.SetServiceIfNone(new CultureInfo("en-US"));
+                x.SetServiceIfNone<ILocalizationCache, LocalizationCache>();
+                x.SetServiceIfNone<ILocalizationMissingHandler, LocalizationMissingHandler>();
+                x.SetServiceIfNone<ILocalizationProviderFactory, LocalizationProviderFactory>();
+            });
+
+            _internalRegistry.HtmlConvention(x => x.Labels.Builder<LabelBuilder>());
+            
+        }
+
+        public CultureInfo DefaultCulture
+        {
+            set
+            {
+                _internalRegistry.Services(x => x.ReplaceService(value));
+            }
+        }
+
+        void IFubuRegistryExtension.Configure(FubuRegistry registry)
+        {
+            _internalRegistry.As<IFubuRegistryExtension>().Configure(registry);
+
+            registry.Services(x =>
+            {
+                if (_useTheDefaultStorageMechanism)
+                {
+                    x.AddService<IActivator, RegisterXmlDirectoryLocalizationStorage>();
+                }
+
+                if (_localizationLoader != null)
+                {
+                    x.AddService(typeof (IActivator), _localizationLoader);
+                }
+
+                x.AddService<IActivator, SpinUpLocalizationCaches>();
+            });
+
+            
+        }
+
+        public void LoadLocalizationWith<T>() where T : IActivator
+        {
+            _localizationLoader = ObjectDef.ForType<T>();
+            _useTheDefaultStorageMechanism = false;
+        }
+
+        public void LocalizationStorageIs<T>() where T : ILocalizationStorage
+        {
+            _internalRegistry.Services(x => x.ReplaceService<ILocalizationStorage, T>());
+            _useTheDefaultStorageMechanism = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FubuMVC.Core/Localization/LabelBuilder.cs b/src/FubuMVC.Core/Localization/LabelBuilder.cs
new file mode 100644
index 0000000000..45d1ec99c8
--- /dev/null
+++ b/src/FubuMVC.Core/Localization/LabelBuilder.cs
@@ -0,0 +1,20 @@
+using FubuLocalization;
+using FubuMVC.Core.UI.Configuration;
+using HtmlTags;
+
+namespace FubuMVC.Core.Localization
+{
+    public class LabelBuilder : ElementBuilder
+    {
+        protected override bool matches(AccessorDef def)
+        {
+            return true;
+        }
+
+        public override HtmlTag Build(ElementRequest request)
+        {
+            string header = LocalizationManager.GetHeader(request.Accessor.InnerProperty);
+            return new HtmlTag("label").Attr("for", request.ElementId).Text(header);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FubuMVC.Core/Localization/RegisterXmlDirectoryLocalizationStorage.cs b/src/FubuMVC.Core/Localization/RegisterXmlDirectoryLocalizationStorage.cs
new file mode 100644
index 0000000000..b678b54797
--- /dev/null
+++ b/src/FubuMVC.Core/Localization/RegisterXmlDirectoryLocalizationStorage.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using Bottles;
+using Bottles.Diagnostics;
+using FubuLocalization.Basic;
+using FubuMVC.Core.Bootstrapping;
+using FubuMVC.Core.Packaging;
+using FubuMVC.Core.Registration.ObjectGraph;
+
+namespace FubuMVC.Core.Localization
+{
+    public class RegisterXmlDirectoryLocalizationStorage : IActivator
+    {
+        private readonly IContainerFacility _facility;
+
+        public RegisterXmlDirectoryLocalizationStorage(IContainerFacility facility)
+        {
+            _facility = facility;
+        }
+
+        public void Activate(IEnumerable<IPackageInfo> packages, IPackageLog log)
+        {
+            var list = new List<string>();
+            log.Trace("Setting up the {0} with directories", typeof(XmlDirectoryLocalizationStorage).Name);
+            
+            list.Add(FubuMvcPackageFacility.GetApplicationPath());
+
+            packages.Each(pak => pak.ForFolder(BottleFiles.WebContentFolder, list.Add));
+
+            var storage = new XmlDirectoryLocalizationStorage(list);
+
+            _facility.Register(typeof(ILocalizationStorage), ObjectDef.ForValue(storage));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FubuMVC.Core/Localization/SpinUpLocalizationCaches.cs b/src/FubuMVC.Core/Localization/SpinUpLocalizationCaches.cs
new file mode 100644
index 0000000000..59a9604408
--- /dev/null
+++ b/src/FubuMVC.Core/Localization/SpinUpLocalizationCaches.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Bottles;
+using Bottles.Diagnostics;
+using FubuLocalization.Basic;
+
+namespace FubuMVC.Core.Localization
+{
+    public class SpinUpLocalizationCaches : IActivator
+    {
+        private readonly ILocalizationProviderFactory _factory;
+
+        public SpinUpLocalizationCaches(ILocalizationProviderFactory factory)
+        {
+            _factory = factory;
+        }
+
+        public void Activate(IEnumerable<IPackageInfo> packages, IPackageLog log)
+        {
+            _factory.LoadAll(text => log.Trace(text));
+            _factory.ApplyToLocalizationManager();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FubuMVC.Core/packages.config b/src/FubuMVC.Core/packages.config
index e456657271..20ba007e12 100644
--- a/src/FubuMVC.Core/packages.config
+++ b/src/FubuMVC.Core/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
-  <package id="Bottles.Deployment" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
+  <package id="Bottles.Deployment" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
   <package id="DotNetZip" version="1.9.1.8" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuLocalization" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuLocalization" version="0.9.2.85" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="structuremap" version="2.6.3" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuMVC.Deployers/FubuMVC.Deployers.csproj b/src/FubuMVC.Deployers/FubuMVC.Deployers.csproj
index 1dd65a4abe..93af78902a 100644
--- a/src/FubuMVC.Deployers/FubuMVC.Deployers.csproj
+++ b/src/FubuMVC.Deployers/FubuMVC.Deployers.csproj
@@ -32,16 +32,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="Bottles.Deployers.Iis">
-      <HintPath>..\packages\Bottles.Deployers.IIS.0.9.1.156\lib\Bottles.Deployers.Iis.dll</HintPath>
+      <HintPath>..\packages\Bottles.Deployers.IIS.0.9.1.137\lib\Bottles.Deployers.Iis.dll</HintPath>
     </Reference>
     <Reference Include="Bottles.Deployment">
-      <HintPath>..\packages\Bottles.Deployment.0.9.1.156\lib\Bottles.Deployment.dll</HintPath>
+      <HintPath>..\packages\Bottles.Deployment.0.9.1.137\lib\Bottles.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
diff --git a/src/FubuMVC.Deployers/packages.config b/src/FubuMVC.Deployers/packages.config
index 5dd5fea685..f7410a5408 100644
--- a/src/FubuMVC.Deployers/packages.config
+++ b/src/FubuMVC.Deployers/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
-  <package id="Bottles.Deployers.IIS" version="0.9.1.156" />
-  <package id="Bottles.Deployment" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
+  <package id="Bottles.Deployers.IIS" version="0.9.1.137" />
+  <package id="Bottles.Deployment" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
   <package id="DotNetZip" version="1.9.1.8" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="structuremap" version="2.6.3" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuMVC.Diagnostics.Tests/FubuMVC.Diagnostics.Tests.csproj b/src/FubuMVC.Diagnostics.Tests/FubuMVC.Diagnostics.Tests.csproj
index 379375ee60..f30ce40ae0 100644
--- a/src/FubuMVC.Diagnostics.Tests/FubuMVC.Diagnostics.Tests.csproj
+++ b/src/FubuMVC.Diagnostics.Tests/FubuMVC.Diagnostics.Tests.csproj
@@ -32,13 +32,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuTestingSupport">
-      <HintPath>..\packages\FubuTestingSupport.0.9.2.96\lib\FubuTestingSupport.dll</HintPath>
+      <HintPath>..\packages\FubuTestingSupport.0.9.2.85\lib\FubuTestingSupport.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
@@ -78,7 +78,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\ActionCallExtensionsTester.cs" />
-    <Compile Include="Configuration\RemoveBasicDiagnosticsTester.cs" />
     <Compile Include="DiagnosticsCallWithAttribute.cs" />
     <Compile Include="Configuration\Policies\DiagnosticsEndpointUrlPolicyTester.cs" />
     <Compile Include="Configuration\Policies\DiagnosticsUrlAttributePolicyTester.cs" />
diff --git a/src/FubuMVC.Diagnostics.Tests/packages.config b/src/FubuMVC.Diagnostics.Tests/packages.config
index c37e52c097..3847e018ca 100644
--- a/src/FubuMVC.Diagnostics.Tests/packages.config
+++ b/src/FubuMVC.Diagnostics.Tests/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
   <package id="DotNetZip" version="1.9.1.8" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuTestingSupport" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuTestingSupport" version="0.9.2.85" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="NUnit" version="2.5.10.11092" />
   <package id="RhinoMocks" version="3.6" />
diff --git a/src/FubuMVC.Diagnostics/FubuMVC.Diagnostics.csproj b/src/FubuMVC.Diagnostics/FubuMVC.Diagnostics.csproj
index 3a4acf8ba0..24289fda5f 100644
--- a/src/FubuMVC.Diagnostics/FubuMVC.Diagnostics.csproj
+++ b/src/FubuMVC.Diagnostics/FubuMVC.Diagnostics.csproj
@@ -34,10 +34,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
diff --git a/src/FubuMVC.Diagnostics/packages.config b/src/FubuMVC.Diagnostics/packages.config
index b782dcfc05..1d4117116c 100644
--- a/src/FubuMVC.Diagnostics/packages.config
+++ b/src/FubuMVC.Diagnostics/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="Newtonsoft.Json" version="4.0.3" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuMVC.GettingStarted/FubuMVC.GettingStarted.csproj b/src/FubuMVC.GettingStarted/FubuMVC.GettingStarted.csproj
index 5d94bae3e1..132f921f82 100644
--- a/src/FubuMVC.GettingStarted/FubuMVC.GettingStarted.csproj
+++ b/src/FubuMVC.GettingStarted/FubuMVC.GettingStarted.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation">
       <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
diff --git a/src/FubuMVC.GettingStarted/packages.config b/src/FubuMVC.GettingStarted/packages.config
index f101c399ee..8e3be22b73 100644
--- a/src/FubuMVC.GettingStarted/packages.config
+++ b/src/FubuMVC.GettingStarted/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuMVC.HelloSpark/FubuMVC.HelloSpark.csproj b/src/FubuMVC.HelloSpark/FubuMVC.HelloSpark.csproj
index c913fdd544..3751932551 100644
--- a/src/FubuMVC.HelloSpark/FubuMVC.HelloSpark.csproj
+++ b/src/FubuMVC.HelloSpark/FubuMVC.HelloSpark.csproj
@@ -34,10 +34,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
diff --git a/src/FubuMVC.HelloSpark/packages.config b/src/FubuMVC.HelloSpark/packages.config
index 9daa5016a1..90e39d3aa5 100644
--- a/src/FubuMVC.HelloSpark/packages.config
+++ b/src/FubuMVC.HelloSpark/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="Spark" version="1.6" />
   <package id="structuremap" version="2.6.3" />
diff --git a/src/FubuMVC.HelloWorld/FubuMVC.HelloWorld.csproj b/src/FubuMVC.HelloWorld/FubuMVC.HelloWorld.csproj
index 618a54e943..3c9e904917 100644
--- a/src/FubuMVC.HelloWorld/FubuMVC.HelloWorld.csproj
+++ b/src/FubuMVC.HelloWorld/FubuMVC.HelloWorld.csproj
@@ -36,10 +36,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
diff --git a/src/FubuMVC.HelloWorld/packages.config b/src/FubuMVC.HelloWorld/packages.config
index e1ff7036d3..c96ce216f3 100644
--- a/src/FubuMVC.HelloWorld/packages.config
+++ b/src/FubuMVC.HelloWorld/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="structuremap" version="2.6.3" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuMVC.OwinHost.Testing/FubuMVC.OwinHost.Testing.csproj b/src/FubuMVC.OwinHost.Testing/FubuMVC.OwinHost.Testing.csproj
index f3a86bc780..847a880bc7 100644
--- a/src/FubuMVC.OwinHost.Testing/FubuMVC.OwinHost.Testing.csproj
+++ b/src/FubuMVC.OwinHost.Testing/FubuMVC.OwinHost.Testing.csproj
@@ -32,10 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuTestingSupport">
-      <HintPath>..\packages\FubuTestingSupport.0.9.2.96\lib\FubuTestingSupport.dll</HintPath>
+      <HintPath>..\packages\FubuTestingSupport.0.9.2.85\lib\FubuTestingSupport.dll</HintPath>
     </Reference>
     <Reference Include="Gate">
       <HintPath>..\packages\Gate.0.1.4\lib\Gate.dll</HintPath>
diff --git a/src/FubuMVC.OwinHost.Testing/packages.config b/src/FubuMVC.OwinHost.Testing/packages.config
index 2cfa5cabd5..123a66d1d2 100644
--- a/src/FubuMVC.OwinHost.Testing/packages.config
+++ b/src/FubuMVC.OwinHost.Testing/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuTestingSupport" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuTestingSupport" version="0.9.2.85" />
   <package id="Gate" version="0.1.4" />
   <package id="NUnit" version="2.5.10.11092" />
   <package id="RhinoMocks" version="3.6" />
diff --git a/src/FubuMVC.OwinHost/FubuMVC.OwinHost.csproj b/src/FubuMVC.OwinHost/FubuMVC.OwinHost.csproj
index 555f12fc51..ce500d47f5 100644
--- a/src/FubuMVC.OwinHost/FubuMVC.OwinHost.csproj
+++ b/src/FubuMVC.OwinHost/FubuMVC.OwinHost.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="Gate">
       <HintPath>..\packages\Gate.0.1.4\lib\Gate.dll</HintPath>
diff --git a/src/FubuMVC.OwinHost/packages.config b/src/FubuMVC.OwinHost/packages.config
index 8b0edd8082..cc17d696bd 100644
--- a/src/FubuMVC.OwinHost/packages.config
+++ b/src/FubuMVC.OwinHost/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="Gate" version="0.1.4" />
   <package id="Gate.Kayak" version="0.1.4" />
   <package id="Kayak" version="0.7.2" />
diff --git a/src/FubuMVC.Spark.Tests/FubuMVC.Spark.Tests.csproj b/src/FubuMVC.Spark.Tests/FubuMVC.Spark.Tests.csproj
index b1d82a0b2a..56863c949a 100644
--- a/src/FubuMVC.Spark.Tests/FubuMVC.Spark.Tests.csproj
+++ b/src/FubuMVC.Spark.Tests/FubuMVC.Spark.Tests.csproj
@@ -32,16 +32,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuLocalization">
-      <HintPath>..\packages\FubuLocalization.0.9.2.96\lib\FubuLocalization.dll</HintPath>
+      <HintPath>..\packages\FubuLocalization.0.9.2.85\lib\FubuLocalization.dll</HintPath>
     </Reference>
     <Reference Include="FubuTestingSupport">
-      <HintPath>..\packages\FubuTestingSupport.0.9.2.96\lib\FubuTestingSupport.dll</HintPath>
+      <HintPath>..\packages\FubuTestingSupport.0.9.2.85\lib\FubuTestingSupport.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
diff --git a/src/FubuMVC.Spark.Tests/packages.config b/src/FubuMVC.Spark.Tests/packages.config
index 52b90ee7e6..7f21cf09ce 100644
--- a/src/FubuMVC.Spark.Tests/packages.config
+++ b/src/FubuMVC.Spark.Tests/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuLocalization" version="0.9.2.96" />
-  <package id="FubuTestingSupport" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuLocalization" version="0.9.2.85" />
+  <package id="FubuTestingSupport" version="0.9.2.85" />
   <package id="NUnit" version="2.5.10.11092" />
   <package id="RhinoMocks" version="3.6" />
   <package id="Spark" version="1.6" />
diff --git a/src/FubuMVC.Spark/FubuMVC.Spark.csproj b/src/FubuMVC.Spark/FubuMVC.Spark.csproj
index 0b243d1edb..17215b40f0 100644
--- a/src/FubuMVC.Spark/FubuMVC.Spark.csproj
+++ b/src/FubuMVC.Spark/FubuMVC.Spark.csproj
@@ -32,10 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
diff --git a/src/FubuMVC.Spark/packages.config b/src/FubuMVC.Spark/packages.config
index 1018cf700e..650772b319 100644
--- a/src/FubuMVC.Spark/packages.config
+++ b/src/FubuMVC.Spark/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="Spark" version="1.6" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuMVC.StructureMap/FubuMVC.StructureMap.csproj b/src/FubuMVC.StructureMap/FubuMVC.StructureMap.csproj
index cd64bef281..a548b402cf 100755
--- a/src/FubuMVC.StructureMap/FubuMVC.StructureMap.csproj
+++ b/src/FubuMVC.StructureMap/FubuMVC.StructureMap.csproj
@@ -36,10 +36,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
@@ -69,7 +69,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Bootstrap\BasicFubuStructureMapRegistry.cs" />
     <Compile Include="SettingsScanner.cs" />
-    <Compile Include="SingletonSpinupActivator.cs" />
     <Compile Include="StructureMapContainerFacility.cs" />
     <Compile Include="StructureMapFubuRegistry.cs" />
     <Compile Include="StructureMapPageHarness.cs" />
diff --git a/src/FubuMVC.StructureMap/packages.config b/src/FubuMVC.StructureMap/packages.config
index e1ff7036d3..c96ce216f3 100644
--- a/src/FubuMVC.StructureMap/packages.config
+++ b/src/FubuMVC.StructureMap/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="structuremap" version="2.6.3" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuMVC.Tests/FubuMVC.Tests.csproj b/src/FubuMVC.Tests/FubuMVC.Tests.csproj
index b79242a776..d73ec5a422 100644
--- a/src/FubuMVC.Tests/FubuMVC.Tests.csproj
+++ b/src/FubuMVC.Tests/FubuMVC.Tests.csproj
@@ -34,22 +34,22 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="Bottles.Deployers.Iis">
-      <HintPath>..\packages\Bottles.Deployers.IIS.0.9.1.156\lib\Bottles.Deployers.Iis.dll</HintPath>
+      <HintPath>..\packages\Bottles.Deployers.IIS.0.9.1.137\lib\Bottles.Deployers.Iis.dll</HintPath>
     </Reference>
     <Reference Include="Bottles.Deployment">
-      <HintPath>..\packages\Bottles.Deployment.0.9.1.156\lib\Bottles.Deployment.dll</HintPath>
+      <HintPath>..\packages\Bottles.Deployment.0.9.1.137\lib\Bottles.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuLocalization">
-      <HintPath>..\packages\FubuLocalization.0.9.2.96\lib\FubuLocalization.dll</HintPath>
+      <HintPath>..\packages\FubuLocalization.0.9.2.85\lib\FubuLocalization.dll</HintPath>
     </Reference>
     <Reference Include="FubuTestingSupport">
-      <HintPath>..\packages\FubuTestingSupport.0.9.2.96\lib\FubuTestingSupport.dll</HintPath>
+      <HintPath>..\packages\FubuTestingSupport.0.9.2.85\lib\FubuTestingSupport.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
@@ -171,12 +171,9 @@
     <Compile Include="Behaviors\RenderStatusCodeBehaviorTester.cs" />
     <Compile Include="Caching\OuputCachingNodeTester.cs" />
     <Compile Include="Caching\OutputCachingBehaviorTester.cs" />
-    <Compile Include="Commands\NewCommandTester.cs" />
     <Compile Include="Commands\PackagesCommandTester.cs" />
     <Compile Include="Commands\usage_graph_smoke_tester.cs" />
-    <Compile Include="AppSettings\AppSettingsProviderIntegratedTester.cs" />
     <Compile Include="ConnegAttributeTester.cs" />
-    <Compile Include="Continuations\RedirectToMethodsTester.cs" />
     <Compile Include="FubuApplicationTester.cs" />
     <Compile Include="Http\AspNet\AspNetModelBindingTester.cs" />
     <Compile Include="Http\AspNet\ASPNetObjectConversionFamilyTester.cs" />
@@ -192,6 +189,10 @@
     <Compile Include="Http\MimeTypeListTester.cs" />
     <Compile Include="Http\MimetypeRequestConditionalTester.cs" />
     <Compile Include="Http\RequestHeadersIntegratedTester.cs" />
+    <Compile Include="Localization\LabelBuilderTester.cs" />
+    <Compile Include="Localization\LocalizationBootstrappingTester.cs" />
+    <Compile Include="Localization\RegisterXmlDirectoryLocalizationStorageTester.cs" />
+    <Compile Include="Localization\SpinUpLocalizationCachesTester.cs" />
     <Compile Include="Packaging\ContentOnlyPackageInfoTester.cs" />
     <Compile Include="Registration\BehaviorAggregatorTester.cs" />
     <Compile Include="Registration\Conventions\JsonAttributeTesting.cs" />
@@ -228,7 +229,6 @@
     <Compile Include="Diagnostics\Tracing\DiagnosticBehaviorTester.cs" />
     <Compile Include="Diagnostics\Tracing\RecordingBindingLoggerTester.cs" />
     <Compile Include="FubuRegistryImportingTester.cs" />
-    <Compile Include="KeywordReplacerTester.cs" />
     <Compile Include="Packaging\PackageFilesIntegrationTester.cs" />
     <Compile Include="Packaging\PackageManifestReaderIntegratedTester.cs" />
     <Compile Include="Packaging\ZipFilePackageLoaderTester.cs" />
@@ -255,8 +255,6 @@
     <Compile Include="Resources\Projections\SimpleValueSource.cs" />
     <Compile Include="Resources\Media\Xml\XmlAttCentricMediaNodeTester.cs" />
     <Compile Include="Resources\Media\Xml\XmlNodeCentricMediaNodeTester.cs" />
-    <Compile Include="ProcessFactoryTester.cs" />
-    <Compile Include="ProcessWrapperTester.cs" />
     <Compile Include="Registration\attaching_behaviors_to_action_calls.cs" />
     <Compile Include="Registration\BehaviorNodeTester.cs" />
     <Compile Include="Registration\Conventions\AllowRoleAttributeTester.cs" />
@@ -361,8 +359,8 @@
     <Compile Include="Behaviors\RenderJsonBehaviorTester.cs" />
     <Compile Include="Behaviors\BehaviorTestContext.cs" />
     <Compile Include="Behaviors\RenderTextBehaviorTester.cs" />
-    <Compile Include="AppSettings\AppSettingsRequestDataTester.cs" />
-    <Compile Include="AppSettings\FakeSettings.cs" />
+    <Compile Include="Configuration\AppSettingsRequestDataTester.cs" />
+    <Compile Include="Configuration\FakeSettings.cs" />
     <Compile Include="Continuations\ContinuationHandlerTester.cs" />
     <Compile Include="Continuations\FubuContinuationTester.cs" />
     <Compile Include="Diagnostics\ActionColumnTester.cs" />
diff --git a/src/FubuMVC.Tests/Localization/LabelBuilderTester.cs b/src/FubuMVC.Tests/Localization/LabelBuilderTester.cs
new file mode 100644
index 0000000000..e00851910d
--- /dev/null
+++ b/src/FubuMVC.Tests/Localization/LabelBuilderTester.cs
@@ -0,0 +1,53 @@
+using FubuLocalization;
+using FubuMVC.Core.Localization;
+using FubuMVC.Core.UI.Configuration;
+using HtmlTags;
+using NUnit.Framework;
+using FubuTestingSupport;
+
+namespace FubuMVC.Tests.Localization
+{
+    [TestFixture]
+    public class when_building_a_label_tag_with_localization
+    {
+        private string theLocalizedHeaderForTheProperty;
+        private ElementRequest theElementRequest;
+        private HtmlTag theLabelTag;
+
+        [SetUp]
+        public void SetUp()
+        {
+            theLocalizedHeaderForTheProperty = LocalizationManager.GetHeader<LabelTarget>(x => x.Name);
+
+            theElementRequest = ElementRequest.For<LabelTarget>(new LabelTarget(), x => x.Name);
+            theElementRequest.ElementId = "Name";
+
+            theLabelTag = new LabelBuilder().Build(theElementRequest);
+        }
+
+        [Test]
+        public void should_be_a_label()
+        {
+            theLabelTag.TagName().ShouldEqual("label");
+        }
+
+        [Test]
+        public void should_use_the_named_tag_convention_for_the_property_as_the_for_attribute()
+        {
+            theLabelTag.Attr("for").ShouldEqual(theElementRequest.ElementId);
+        }
+
+        [Test]
+        public void should_use_localized_header_for_the_property_as_the_text()
+        {
+            theLabelTag.Text().ShouldEqual(theLocalizedHeaderForTheProperty);
+        }
+
+        public class LabelTarget
+        {
+            public string Name { get; set; }
+            public string Title { get; set; }
+            public string SomeTitle { get; set;}
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FubuMVC.Tests/Localization/LocalizationBootstrappingTester.cs b/src/FubuMVC.Tests/Localization/LocalizationBootstrappingTester.cs
new file mode 100644
index 0000000000..433932cdc3
--- /dev/null
+++ b/src/FubuMVC.Tests/Localization/LocalizationBootstrappingTester.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Bottles;
+using Bottles.Diagnostics;
+using FubuLocalization;
+using FubuLocalization.Basic;
+using FubuMVC.Core;
+using FubuMVC.Core.Localization;
+using FubuMVC.Core.Registration;
+using NUnit.Framework;
+using System.Linq;
+using FubuTestingSupport;
+
+namespace FubuMVC.Tests.Localization
+{
+    [TestFixture]
+    public class LocalizationBootstrappingTester
+    {
+        private BehaviorGraph graphWithBasicLocalizationAsIs;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var registry = new FubuRegistry();
+            registry.Import<BasicLocalizationSupport>();
+
+            graphWithBasicLocalizationAsIs = registry.BuildGraph();
+        }
+
+        [Test]
+        public void registers_us_english_as_the_default_culture()
+        {
+            graphWithBasicLocalizationAsIs.Services.DefaultServiceFor(typeof (CultureInfo))
+                .Value.ShouldEqual(new CultureInfo("en-US"));
+        }
+
+        [Test]
+        public void register_a_non_default_culture_info()
+        {
+            var registry = new FubuRegistry();
+            registry.Import<BasicLocalizationSupport>(x => x.DefaultCulture = new CultureInfo("en-CA"));
+
+            registry.BuildGraph().Services.DefaultServiceFor(typeof (CultureInfo))
+                .Value.ShouldEqual(new CultureInfo("en-CA"));
+        }
+
+        [Test]
+        public void localization_cache_is_registered()
+        {
+            graphWithBasicLocalizationAsIs.Services.DefaultServiceFor<ILocalizationCache>()
+                .Type.ShouldEqual(typeof (LocalizationCache));
+        }
+
+        [Test]
+        public void localization_missing_handler_is_registered()
+        {
+            graphWithBasicLocalizationAsIs.Services.DefaultServiceFor<ILocalizationMissingHandler>()
+                .Type.ShouldEqual(typeof(LocalizationMissingHandler));
+        }
+
+        [Test]
+        public void localization_provider_registry_is_registered()
+        {
+            graphWithBasicLocalizationAsIs.Services.DefaultServiceFor<ILocalizationProviderFactory>()
+                .Type.ShouldEqual(typeof(LocalizationProviderFactory));
+        }
+
+        [Test]
+        public void if_using_the_basic_storage_registers_both_activators()
+        {
+            var list = graphWithBasicLocalizationAsIs.Services.ServicesFor<IActivator>().Select(x => x.Type).ToList();
+
+            list.ShouldContain(typeof(RegisterXmlDirectoryLocalizationStorage));
+            list.ShouldContain(typeof(SpinUpLocalizationCaches));
+
+            list.IndexOf(typeof (RegisterXmlDirectoryLocalizationStorage))
+                .ShouldBeLessThan(list.IndexOf(typeof (SpinUpLocalizationCaches)));
+        }
+
+        [Test]
+        public void override_the_storage_mechanism_loader()
+        {
+            var registry = new FubuRegistry();
+            registry.Import<BasicLocalizationSupport>(x =>
+            {
+                x.LoadLocalizationWith<StubLocalizationActivator>();
+            });
+            var graph = registry.BuildGraph();
+
+
+            var list = graph.Services.ServicesFor<IActivator>().Select(x => x.Type).ToList();
+
+            list.ShouldNotContain(typeof(RegisterXmlDirectoryLocalizationStorage));
+            list.ShouldContain(typeof(StubLocalizationActivator));
+            list.ShouldContain(typeof(SpinUpLocalizationCaches));
+
+            list.IndexOf(typeof(StubLocalizationActivator))
+                .ShouldBeLessThan(list.IndexOf(typeof(SpinUpLocalizationCaches)));
+        }
+
+        [Test]
+        public void override_the_storage_mechanism()
+        {
+            var registry = new FubuRegistry();
+            registry.Import<BasicLocalizationSupport>(x =>
+            {
+                x.LocalizationStorageIs<InMemoryLocalizationStorage>();
+            });
+            var graph = registry.BuildGraph();
+
+
+            var list = graph.Services.ServicesFor<IActivator>().Select(x => x.Type).ToList();
+
+            list.ShouldNotContain(typeof(RegisterXmlDirectoryLocalizationStorage));
+            list.ShouldContain(typeof(SpinUpLocalizationCaches));
+
+            graph.Services.DefaultServiceFor<ILocalizationStorage>().Type.ShouldEqual(
+                typeof (InMemoryLocalizationStorage));
+        }
+
+        public class StubLocalizationActivator : IActivator
+        {
+            public void Activate(IEnumerable<IPackageInfo> packages, IPackageLog log)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FubuMVC.Tests/Localization/RegisterXmlDirectoryLocalizationStorageTester.cs b/src/FubuMVC.Tests/Localization/RegisterXmlDirectoryLocalizationStorageTester.cs
new file mode 100644
index 0000000000..bbb4a643cb
--- /dev/null
+++ b/src/FubuMVC.Tests/Localization/RegisterXmlDirectoryLocalizationStorageTester.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using Bottles;
+using Bottles.Diagnostics;
+using Bottles.Environment;
+using FubuLocalization.Basic;
+using FubuMVC.Core.Bootstrapping;
+using FubuMVC.Core.Localization;
+using FubuMVC.Core.Packaging;
+using FubuMVC.Core.Registration.ObjectGraph;
+using FubuMVC.Core.Runtime;
+using FubuTestingSupport;
+using NUnit.Framework;
+
+namespace FubuMVC.Tests.Localization
+{
+    [TestFixture]
+    public class RegisterXmlDirectoryLocalizationStorageTester : InteractionContext<RegisterXmlDirectoryLocalizationStorage>
+    {
+        private IPackageInfo[] thePackages;
+        private StubContainerFacility theFacility;
+
+        protected override void beforeEach()
+        {
+            thePackages = new IPackageInfo[]{
+                new ContentOnlyPackageInfo("dir1", "Dir1"),
+                new ContentOnlyPackageInfo("dir2", "Dir2"),
+                new ContentOnlyPackageInfo("dir3", "Dir3"),
+            };
+
+            theFacility = new StubContainerFacility();
+            Services.Inject<IContainerFacility>(theFacility);
+
+            ClassUnderTest.Activate(thePackages, new PackageLog());
+        }
+
+        [Test]
+        public void should_register_an_xml_directory_storage_that_points_to_the_application_directory_and_the_package_directories()
+        {
+            var theStorage = theFacility.LocalizationStorageObjectDefThatWasRegistered.Value.ShouldBeOfType
+                <XmlDirectoryLocalizationStorage>();
+        
+            theStorage.Directories.ShouldHaveTheSameElementsAs(FubuMvcPackageFacility.GetApplicationPath(), "dir1", "dir2", "dir3");
+        }
+    }
+
+    public class StubContainerFacility : IContainerFacility
+    {
+        public IBehaviorFactory BuildFactory()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Register(Type serviceType, ObjectDef def)
+        {
+            serviceType.ShouldEqual(typeof (ILocalizationStorage));
+            LocalizationStorageObjectDefThatWasRegistered = def;
+        }
+
+        public ObjectDef LocalizationStorageObjectDefThatWasRegistered { get; set; }
+
+        public void Inject(Type abstraction, Type concretion)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<IActivator> GetAllActivators()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<IInstaller> GetAllInstallers()
+        {
+            throw new NotImplementedException();
+        }
+
+        public T Get<T>()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<T> GetAll<T>()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FubuMVC.Tests/Localization/SpinUpLocalizationCachesTester.cs b/src/FubuMVC.Tests/Localization/SpinUpLocalizationCachesTester.cs
new file mode 100644
index 0000000000..163ec60aca
--- /dev/null
+++ b/src/FubuMVC.Tests/Localization/SpinUpLocalizationCachesTester.cs
@@ -0,0 +1,37 @@
+using System;
+using Bottles;
+using Bottles.Diagnostics;
+using FubuLocalization.Basic;
+using FubuMVC.Core.Localization;
+using FubuTestingSupport;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Is = Rhino.Mocks.Constraints.Is;
+
+namespace FubuMVC.Tests.Localization
+{
+    [TestFixture]
+    public class SpinUpLocalizationCachesTester : InteractionContext<SpinUpLocalizationCaches>
+    {
+        private List<IPackageInfo> thePackages;
+
+        protected override void beforeEach()
+        {
+            thePackages = new List<IPackageInfo>();
+            ClassUnderTest.Activate(thePackages, MockFor<IPackageLog>());
+        }
+
+        [Test]
+        public void should_load_the_caches()
+        {
+            MockFor<ILocalizationProviderFactory>().AssertWasCalled(x => x.LoadAll(null), x => x.Constraints(Is.NotNull()));
+        }
+
+        [Test]
+        public void should_apply_the_factory_to_localization_manager()
+        {
+            MockFor<ILocalizationProviderFactory>().AssertWasCalled(x => x.ApplyToLocalizationManager());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FubuMVC.Tests/packages.config b/src/FubuMVC.Tests/packages.config
index caeb69529d..344a92cbee 100644
--- a/src/FubuMVC.Tests/packages.config
+++ b/src/FubuMVC.Tests/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
-  <package id="Bottles.Deployers.IIS" version="0.9.1.156" />
-  <package id="Bottles.Deployment" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
+  <package id="Bottles.Deployers.IIS" version="0.9.1.137" />
+  <package id="Bottles.Deployment" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuLocalization" version="0.9.2.96" />
-  <package id="FubuTestingSupport" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuLocalization" version="0.9.2.85" />
+  <package id="FubuTestingSupport" version="0.9.2.85" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="NUnit" version="2.5.10.11092" />
   <package id="RhinoMocks" version="3.6" />
diff --git a/src/FubuMVC.WebForms.Testing/FubuMVC.WebForms.Testing.csproj b/src/FubuMVC.WebForms.Testing/FubuMVC.WebForms.Testing.csproj
index 3b4cc1fdc6..f905103da1 100644
--- a/src/FubuMVC.WebForms.Testing/FubuMVC.WebForms.Testing.csproj
+++ b/src/FubuMVC.WebForms.Testing/FubuMVC.WebForms.Testing.csproj
@@ -32,13 +32,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuLocalization">
-      <HintPath>..\packages\FubuLocalization.0.9.2.96\lib\FubuLocalization.dll</HintPath>
+      <HintPath>..\packages\FubuLocalization.0.9.2.85\lib\FubuLocalization.dll</HintPath>
     </Reference>
     <Reference Include="FubuTestingSupport">
-      <HintPath>..\packages\FubuTestingSupport.0.9.2.96\lib\FubuTestingSupport.dll</HintPath>
+      <HintPath>..\packages\FubuTestingSupport.0.9.2.85\lib\FubuTestingSupport.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation">
       <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
diff --git a/src/FubuMVC.WebForms.Testing/packages.config b/src/FubuMVC.WebForms.Testing/packages.config
index 50601f7669..44558440b3 100644
--- a/src/FubuMVC.WebForms.Testing/packages.config
+++ b/src/FubuMVC.WebForms.Testing/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuLocalization" version="0.9.2.96" />
-  <package id="FubuTestingSupport" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuLocalization" version="0.9.2.85" />
+  <package id="FubuTestingSupport" version="0.9.2.85" />
   <package id="NUnit" version="2.5.10.11092" />
   <package id="RhinoMocks" version="3.6" />
   <package id="structuremap" version="2.6.3" />
diff --git a/src/FubuMVC.WebForms/FubuMVC.WebForms.csproj b/src/FubuMVC.WebForms/FubuMVC.WebForms.csproj
index 05b4740079..bfd95bbcdd 100644
--- a/src/FubuMVC.WebForms/FubuMVC.WebForms.csproj
+++ b/src/FubuMVC.WebForms/FubuMVC.WebForms.csproj
@@ -32,10 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuLocalization">
-      <HintPath>..\packages\FubuLocalization.0.9.2.96\lib\FubuLocalization.dll</HintPath>
+      <HintPath>..\packages\FubuLocalization.0.9.2.85\lib\FubuLocalization.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
diff --git a/src/FubuMVC.WebForms/packages.config b/src/FubuMVC.WebForms/packages.config
index 3bb5614791..1d26336dbb 100644
--- a/src/FubuMVC.WebForms/packages.config
+++ b/src/FubuMVC.WebForms/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuLocalization" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuLocalization" version="0.9.2.85" />
   <package id="HtmlTags" version="1.0.0.23" />
 </packages>
\ No newline at end of file
diff --git a/src/FubuTestApplication/FubuTestApplication.csproj b/src/FubuTestApplication/FubuTestApplication.csproj
index 4b4dd5d500..3a11c7f037 100644
--- a/src/FubuTestApplication/FubuTestApplication.csproj
+++ b/src/FubuTestApplication/FubuTestApplication.csproj
@@ -34,10 +34,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
diff --git a/src/FubuTestApplication/packages.config b/src/FubuTestApplication/packages.config
index e1ff7036d3..c96ce216f3 100644
--- a/src/FubuTestApplication/packages.config
+++ b/src/FubuTestApplication/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="structuremap" version="2.6.3" />
 </packages>
\ No newline at end of file
diff --git a/src/QuickStart/QuickStart.csproj b/src/QuickStart/QuickStart.csproj
index 926b72e080..a9ca181893 100644
--- a/src/QuickStart/QuickStart.csproj
+++ b/src/QuickStart/QuickStart.csproj
@@ -34,22 +34,22 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuLocalization">
-      <HintPath>..\packages\FubuLocalization.0.9.2.96\lib\FubuLocalization.dll</HintPath>
+      <HintPath>..\packages\FubuLocalization.0.9.2.85\lib\FubuLocalization.dll</HintPath>
     </Reference>
     <Reference Include="FubuMVC.Core">
-      <HintPath>..\packages\FubuMVC.References.0.9.1.637\lib\net40\FubuMVC.Core.dll</HintPath>
+      <HintPath>..\packages\FubuMVC.References.0.9.1.600\lib\net40\FubuMVC.Core.dll</HintPath>
     </Reference>
     <Reference Include="FubuMVC.Spark">
-      <HintPath>..\packages\FubuMVC.Spark.0.9.1.637\lib\net40\FubuMVC.Spark.dll</HintPath>
+      <HintPath>..\packages\FubuMVC.Spark.0.9.1.600\lib\net40\FubuMVC.Spark.dll</HintPath>
     </Reference>
     <Reference Include="FubuMVC.StructureMap">
-      <HintPath>..\packages\FubuMVC.References.0.9.1.637\lib\net40\FubuMVC.StructureMap.dll</HintPath>
+      <HintPath>..\packages\FubuMVC.References.0.9.1.600\lib\net40\FubuMVC.StructureMap.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
@@ -61,7 +61,7 @@
       <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure">
-      <HintPath>..\packages\FubuMVC.0.9.1.637\lib\Microsoft.Web.Infrastructure.dll</HintPath>
+      <HintPath>..\packages\FubuMVC.0.9.1.600\lib\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="Spark">
       <HintPath>..\packages\Spark.1.6\lib\NET40\Spark.dll</HintPath>
diff --git a/src/QuickStart/packages.config b/src/QuickStart/packages.config
index df445d1442..10578ac5af 100644
--- a/src/QuickStart/packages.config
+++ b/src/QuickStart/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuLocalization" version="0.9.2.96" />
-  <package id="FubuMVC" version="0.9.1.637" />
-  <package id="FubuMVC.References" version="0.9.1.637" />
-  <package id="FubuMVC.Spark" version="0.9.1.637" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuLocalization" version="0.9.2.85" />
+  <package id="FubuMVC" version="0.9.1.600" />
+  <package id="FubuMVC.References" version="0.9.1.600" />
+  <package id="FubuMVC.Spark" version="0.9.1.600" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="Spark" version="1.6" />
   <package id="structuremap" version="2.6.3" />
diff --git a/src/Serenity.Testing/Serenity.Testing.csproj b/src/Serenity.Testing/Serenity.Testing.csproj
index e82f3d695c..efedc3a258 100644
--- a/src/Serenity.Testing/Serenity.Testing.csproj
+++ b/src/Serenity.Testing/Serenity.Testing.csproj
@@ -32,16 +32,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core">
       <HintPath>..\packages\Castle.Core.2.5.2\lib\NET35\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuTestingSupport">
-      <HintPath>..\packages\FubuTestingSupport.0.9.2.96\lib\FubuTestingSupport.dll</HintPath>
+      <HintPath>..\packages\FubuTestingSupport.0.9.2.85\lib\FubuTestingSupport.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
@@ -68,7 +68,7 @@
       <HintPath>..\packages\RhinoMocks.3.6\lib\Rhino.Mocks.dll</HintPath>
     </Reference>
     <Reference Include="Selenium.WebDriverBackedSelenium">
-      <HintPath>..\packages\Selenium.WebDriverBackedSelenium.2.12.0\lib\net40\Selenium.WebDriverBackedSelenium.dll</HintPath>
+      <HintPath>..\packages\Selenium.WebDriverBackedSelenium.2.11.0\lib\net40\Selenium.WebDriverBackedSelenium.dll</HintPath>
     </Reference>
     <Reference Include="StoryTeller">
       <HintPath>..\packages\Storyteller.1.0.2.471\lib\net40\StoryTeller.dll</HintPath>
@@ -89,10 +89,10 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WebDriver">
-      <HintPath>..\packages\Selenium.WebDriver.2.12.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\packages\Selenium.WebDriver.2.11.0\lib\net40\WebDriver.dll</HintPath>
     </Reference>
     <Reference Include="WebDriver.Support">
-      <HintPath>..\packages\Selenium.Support.2.12.0\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>..\packages\Selenium.Support.2.11.0\lib\net40\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Serenity.Testing/packages.config b/src/Serenity.Testing/packages.config
index 40d8c6f8a2..3c79e71e4c 100644
--- a/src/Serenity.Testing/packages.config
+++ b/src/Serenity.Testing/packages.config
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="Castle.Core" version="2.5.2" />
   <package id="CommonServiceLocator" version="1.0" />
   <package id="DotNetZip" version="1.9.1.8" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuTestingSupport" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuTestingSupport" version="0.9.2.85" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="Newtonsoft.Json" version="4.0.3" />
   <package id="NUnit" version="2.5.10.11092" />
   <package id="RhinoMocks" version="3.6" />
-  <package id="Selenium.Support" version="2.12.0" />
-  <package id="Selenium.WebDriver" version="2.12.0" />
-  <package id="Selenium.WebDriverBackedSelenium" version="2.12.0" />
+  <package id="Selenium.Support" version="2.11.0" />
+  <package id="Selenium.WebDriver" version="2.11.0" />
+  <package id="Selenium.WebDriverBackedSelenium" version="2.11.0" />
   <package id="Storyteller" version="1.0.2.471" />
   <package id="structuremap" version="2.6.3" />
   <package id="structuremap.automocking" version="2.6.3" />
diff --git a/src/Serenity/Serenity.csproj b/src/Serenity/Serenity.csproj
index 0fd0cfb16f..bfc9cbfc7e 100644
--- a/src/Serenity/Serenity.csproj
+++ b/src/Serenity/Serenity.csproj
@@ -32,13 +32,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core">
       <HintPath>..\packages\Castle.Core.2.5.2\lib\NET35\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="Gate">
       <HintPath>..\packages\Gate.0.1.4\lib\Gate.dll</HintPath>
@@ -62,7 +62,7 @@
       <HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Selenium.WebDriverBackedSelenium">
-      <HintPath>..\packages\Selenium.WebDriverBackedSelenium.2.12.0\lib\net40\Selenium.WebDriverBackedSelenium.dll</HintPath>
+      <HintPath>..\packages\Selenium.WebDriverBackedSelenium.2.11.0\lib\net40\Selenium.WebDriverBackedSelenium.dll</HintPath>
     </Reference>
     <Reference Include="StoryTeller">
       <HintPath>..\packages\Storyteller.1.0.2.471\lib\net40\StoryTeller.dll</HintPath>
@@ -82,10 +82,10 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WebDriver">
-      <HintPath>..\packages\Selenium.WebDriver.2.12.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\packages\Selenium.WebDriver.2.11.0\lib\net40\WebDriver.dll</HintPath>
     </Reference>
     <Reference Include="WebDriver.Support">
-      <HintPath>..\packages\Selenium.Support.2.12.0\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>..\packages\Selenium.Support.2.11.0\lib\net40\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Serenity/packages.config b/src/Serenity/packages.config
index 33b1ab7eb9..2e290e9dcf 100644
--- a/src/Serenity/packages.config
+++ b/src/Serenity/packages.config
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="Castle.Core" version="2.5.2" />
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="DotNetZip" version="1.9.1.8" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="DotNetZip" version="1.9.1.8" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="Gate" version="0.1.4" />
-  <package id="Gate.Kayak" version="0.1.4" />
+  <package id="Gate.Kayak" version="0.1.4" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="jQuery" version="1.7" />
   <package id="Kayak" version="0.7.2" />
   <package id="Newtonsoft.Json" version="4.0.3" />
-  <package id="Selenium.Support" version="2.12.0" />
-  <package id="Selenium.WebDriver" version="2.12.0" />
-  <package id="Selenium.WebDriverBackedSelenium" version="2.12.0" />
+  <package id="Selenium.Support" version="2.11.0" />
+  <package id="Selenium.WebDriver" version="2.11.0" />
+  <package id="Selenium.WebDriverBackedSelenium" version="2.11.0" />
   <package id="Storyteller" version="1.0.2.471" />
   <package id="structuremap" version="2.6.3" />
 </packages>
\ No newline at end of file
diff --git a/src/SerenityRunner/SerenityRunner.csproj b/src/SerenityRunner/SerenityRunner.csproj
index 7040c41605..6f59aabe81 100644
--- a/src/SerenityRunner/SerenityRunner.csproj
+++ b/src/SerenityRunner/SerenityRunner.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.89\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation">
       <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
diff --git a/src/SerenityRunner/packages.config b/src/SerenityRunner/packages.config
index f024b7e1dc..8e3be22b73 100644
--- a/src/SerenityRunner/packages.config
+++ b/src/SerenityRunner/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.89" />
+  <package id="FubuCore" version="0.9.2.93" />
 </packages>
\ No newline at end of file
diff --git a/src/StoryTellerTesting/IntegrationTesting.csproj b/src/StoryTellerTesting/IntegrationTesting.csproj
index 880d4de461..65fe259dca 100644
--- a/src/StoryTellerTesting/IntegrationTesting.csproj
+++ b/src/StoryTellerTesting/IntegrationTesting.csproj
@@ -36,16 +36,16 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Bottles">
-      <HintPath>..\packages\Bottles.0.9.1.156\lib\Bottles.dll</HintPath>
+      <HintPath>..\packages\Bottles.0.9.1.137\lib\Bottles.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=2.5.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.2.5.2\lib\NET35\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuTestingSupport">
-      <HintPath>..\packages\FubuTestingSupport.0.9.2.96\lib\FubuTestingSupport.dll</HintPath>
+      <HintPath>..\packages\FubuTestingSupport.0.9.2.85\lib\FubuTestingSupport.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags">
       <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
@@ -92,10 +92,10 @@
       <HintPath>..\..\lib\watin\WatiN.Core.dll</HintPath>
     </Reference>
     <Reference Include="WebDriver">
-      <HintPath>..\packages\Selenium.WebDriver.2.12.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\packages\Selenium.WebDriver.2.11.0\lib\net40\WebDriver.dll</HintPath>
     </Reference>
     <Reference Include="WebDriver.Support">
-      <HintPath>..\packages\Selenium.Support.2.12.0\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>..\packages\Selenium.Support.2.11.0\lib\net40\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/StoryTellerTesting/packages.config b/src/StoryTellerTesting/packages.config
index 02de580725..c64c899121 100644
--- a/src/StoryTellerTesting/packages.config
+++ b/src/StoryTellerTesting/packages.config
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bottles" version="0.9.1.156" />
+  <package id="Bottles" version="0.9.1.137" />
   <package id="Castle.Core" version="2.5.2" />
   <package id="CommonServiceLocator" version="1.0" />
   <package id="DotNetZip" version="1.9.1.8" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuTestingSupport" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuTestingSupport" version="0.9.2.85" />
   <package id="HtmlTags" version="1.0.0.23" />
   <package id="Newtonsoft.Json" version="4.0.3" />
   <package id="NUnit" version="2.5.10.11092" />
   <package id="RhinoMocks" version="3.6" />
-  <package id="Selenium.Support" version="2.12.0" />
-  <package id="Selenium.WebDriver" version="2.12.0" />
+  <package id="Selenium.Support" version="2.11.0" />
+  <package id="Selenium.WebDriver" version="2.11.0" />
   <package id="Storyteller" version="1.0.2.471" />
   <package id="structuremap" version="2.6.3" />
   <package id="structuremap.automocking" version="2.6.3" />
diff --git a/src/TestPackage1/TestPackage1.csproj b/src/TestPackage1/TestPackage1.csproj
index 96802fd17e..0069e0adb7 100644
--- a/src/TestPackage1/TestPackage1.csproj
+++ b/src/TestPackage1/TestPackage1.csproj
@@ -34,10 +34,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="FubuLocalization">
-      <HintPath>..\packages\FubuLocalization.0.9.2.96\lib\FubuLocalization.dll</HintPath>
+      <HintPath>..\packages\FubuLocalization.0.9.2.85\lib\FubuLocalization.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Practices.ServiceLocation">
diff --git a/src/TestPackage1/packages.config b/src/TestPackage1/packages.config
index ffa8c040e3..e4139977c0 100644
--- a/src/TestPackage1/packages.config
+++ b/src/TestPackage1/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
-  <package id="FubuLocalization" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
+  <package id="FubuLocalization" version="0.9.2.85" />
 </packages>
\ No newline at end of file
diff --git a/src/TestPackage2/TestPackage2.csproj b/src/TestPackage2/TestPackage2.csproj
index 52cb2439e2..6cfdeaa80b 100644
--- a/src/TestPackage2/TestPackage2.csproj
+++ b/src/TestPackage2/TestPackage2.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Practices.ServiceLocation">
diff --git a/src/TestPackage2/packages.config b/src/TestPackage2/packages.config
index f101c399ee..8e3be22b73 100644
--- a/src/TestPackage2/packages.config
+++ b/src/TestPackage2/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
 </packages>
\ No newline at end of file
diff --git a/src/TestPackage4/TestPackage4.csproj b/src/TestPackage4/TestPackage4.csproj
index f495ea8ab9..2b90e3ecfb 100644
--- a/src/TestPackage4/TestPackage4.csproj
+++ b/src/TestPackage4/TestPackage4.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FubuCore">
-      <HintPath>..\packages\FubuCore.0.9.2.96\lib\FubuCore.dll</HintPath>
+      <HintPath>..\packages\FubuCore.0.9.2.93\lib\FubuCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Practices.ServiceLocation">
diff --git a/src/TestPackage4/packages.config b/src/TestPackage4/packages.config
index 970ff78a7a..4479cc4319 100644
--- a/src/TestPackage4/packages.config
+++ b/src/TestPackage4/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
-  <package id="FubuCore" version="0.9.2.96" />
+  <package id="FubuCore" version="0.9.2.93" />
   <package id="Spark" version="1.6" />
 </packages>
\ No newline at end of file