diff --git a/Nuclex.Support (mono-3.5-unity).csproj b/Nuclex.Support (mono-3.5-unity).csproj
index 12d2d99..1f36480 100644
--- a/Nuclex.Support (mono-3.5-unity).csproj	
+++ b/Nuclex.Support (mono-3.5-unity).csproj	
@@ -168,7 +168,7 @@
     </Compile>
     <Compile Include="Source\Collections\Variegator.cs" />
     <Compile Include="Source\Collections\Variegator.Test.cs">
-      <DependentUpon>TransformingReadOnlyCollection.cs</DependentUpon>
+      <DependentUpon>Variegator.cs</DependentUpon>
     </Compile>
     <Compile Include="Source\Collections\WeakCollection.cs" />
     <Compile Include="Source\Collections\WeakCollection.Interfaces.cs">
@@ -177,6 +177,23 @@
     <Compile Include="Source\Collections\WeakCollection.Test.cs">
       <DependentUpon>WeakCollection.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Settings\ConfigurationFileStore.cs" />
+    <Compile Include="Source\Settings\ConfigurationFileStore.Parsing.cs">
+      <DependentUpon>ConfigurationFileStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\ConfigurationFileStore.Test.cs">
+      <DependentUpon>ConfigurationFileStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\ISettingsStore.cs" />
+    <Compile Include="Source\Settings\MemoryStore.cs" />
+    <Compile Include="Source\Settings\MemoryStore.Test.cs">
+      <DependentUpon>MemoryStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\OptionInfo.cs" />
+    <Compile Include="Source\Settings\WindowsRegistryStore.cs" />
+    <Compile Include="Source\Settings\WindowsRegistryStore.Test.cs">
+      <DependentUpon>WindowsRegistryStore.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\GarbagePolicy.cs" />
     <Compile Include="Source\IO\PartialStream.cs" />
     <Compile Include="Source\IO\PartialStream.Test.cs">
@@ -194,6 +211,7 @@
     <Compile Include="Source\Licensing\LicenseKey.Test.cs">
       <DependentUpon>LicenseKey.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Parsing\CommandLine.cs" />
     <Compile Include="Source\Parsing\CommandLine.Argument.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
@@ -203,10 +221,13 @@
     <Compile Include="Source\Parsing\CommandLine.Test.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Parsing\CommandLine.cs" />
     <Compile Include="Source\Parsing\CommandLine.Parser.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\ParallelBackgroundWorker.cs" />
+    <Compile Include="Source\ParallelBackgroundWorker.Test.cs">
+      <DependentUpon>ParallelBackgroundWorker.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\Parsing\ParserHelper.cs" />
     <Compile Include="Source\Parsing\ParserHelper.Test.cs">
       <DependentUpon>ParserHelper.cs</DependentUpon>
@@ -285,7 +306,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Documents\CommandLine.txt" />
     <Content Include="Documents\DoubleConverter.txt" />
     <Content Include="Documents\Nuclex.Support.txt" />
     <Content Include="Documents\Request Framework.txt" />
diff --git a/Nuclex.Support (xna-4.0-phone7).csproj b/Nuclex.Support (xna-4.0-phone7).csproj
index 1cc52ce..b14999e 100644
--- a/Nuclex.Support (xna-4.0-phone7).csproj	
+++ b/Nuclex.Support (xna-4.0-phone7).csproj	
@@ -228,6 +228,23 @@
     <Compile Include="Source\Collections\WeakCollection.Test.cs">
       <DependentUpon>WeakCollection.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Settings\ConfigurationFileStore.cs" />
+    <Compile Include="Source\Settings\ConfigurationFileStore.Parsing.cs">
+      <DependentUpon>ConfigurationFileStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\ConfigurationFileStore.Test.cs">
+      <DependentUpon>ConfigurationFileStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\ISettingsStore.cs" />
+    <Compile Include="Source\Settings\MemoryStore.cs" />
+    <Compile Include="Source\Settings\MemoryStore.Test.cs">
+      <DependentUpon>MemoryStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\OptionInfo.cs" />
+    <Compile Include="Source\Settings\WindowsRegistryStore.cs" />
+    <Compile Include="Source\Settings\WindowsRegistryStore.Test.cs">
+      <DependentUpon>WindowsRegistryStore.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\GarbagePolicy.cs" />
     <Compile Include="Source\IO\PartialStream.cs" />
     <Compile Include="Source\IO\PartialStream.Test.cs">
@@ -245,6 +262,7 @@
     <Compile Include="Source\Licensing\LicenseKey.Test.cs">
       <DependentUpon>LicenseKey.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Parsing\CommandLine.cs" />
     <Compile Include="Source\Parsing\CommandLine.Argument.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
@@ -254,10 +272,13 @@
     <Compile Include="Source\Parsing\CommandLine.Test.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Parsing\CommandLine.cs" />
     <Compile Include="Source\Parsing\CommandLine.Parser.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\ParallelBackgroundWorker.cs" />
+    <Compile Include="Source\ParallelBackgroundWorker.Test.cs">
+      <DependentUpon>ParallelBackgroundWorker.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\Parsing\ParserHelper.cs" />
     <Compile Include="Source\Parsing\ParserHelper.Test.cs">
       <DependentUpon>ParserHelper.cs</DependentUpon>
@@ -336,7 +357,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Documents\CommandLine.txt" />
     <Content Include="Documents\DoubleConverter.txt" />
     <Content Include="Documents\Nuclex.Support.txt" />
     <Content Include="Documents\Request Framework.txt" />
diff --git a/Nuclex.Support (xna-4.0-xbox360).csproj b/Nuclex.Support (xna-4.0-xbox360).csproj
index 7c6607f..e0a1456 100644
--- a/Nuclex.Support (xna-4.0-xbox360).csproj	
+++ b/Nuclex.Support (xna-4.0-xbox360).csproj	
@@ -239,6 +239,23 @@
     <Compile Include="Source\Collections\WeakCollection.Test.cs">
       <DependentUpon>WeakCollection.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Settings\ConfigurationFileStore.cs" />
+    <Compile Include="Source\Settings\ConfigurationFileStore.Parsing.cs">
+      <DependentUpon>ConfigurationFileStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\ConfigurationFileStore.Test.cs">
+      <DependentUpon>ConfigurationFileStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\ISettingsStore.cs" />
+    <Compile Include="Source\Settings\MemoryStore.cs" />
+    <Compile Include="Source\Settings\MemoryStore.Test.cs">
+      <DependentUpon>MemoryStore.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Settings\OptionInfo.cs" />
+    <Compile Include="Source\Settings\WindowsRegistryStore.cs" />
+    <Compile Include="Source\Settings\WindowsRegistryStore.Test.cs">
+      <DependentUpon>WindowsRegistryStore.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\GarbagePolicy.cs" />
     <Compile Include="Source\IO\PartialStream.cs" />
     <Compile Include="Source\IO\PartialStream.Test.cs">
@@ -256,6 +273,7 @@
     <Compile Include="Source\Licensing\LicenseKey.Test.cs">
       <DependentUpon>LicenseKey.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Parsing\CommandLine.cs" />
     <Compile Include="Source\Parsing\CommandLine.Argument.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
@@ -265,10 +283,13 @@
     <Compile Include="Source\Parsing\CommandLine.Test.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Parsing\CommandLine.cs" />
     <Compile Include="Source\Parsing\CommandLine.Parser.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\ParallelBackgroundWorker.cs" />
+    <Compile Include="Source\ParallelBackgroundWorker.Test.cs">
+      <DependentUpon>ParallelBackgroundWorker.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\Parsing\ParserHelper.cs" />
     <Compile Include="Source\Parsing\ParserHelper.Test.cs">
       <DependentUpon>ParserHelper.cs</DependentUpon>
@@ -347,7 +368,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Documents\CommandLine.txt" />
     <Content Include="Documents\DoubleConverter.txt" />
     <Content Include="Documents\Nuclex.Support.txt" />
     <Content Include="Documents\Request Framework.txt" />