diff --git a/NuGet.config b/NuGet.config
index c56aa187..1145f3f0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <!--
   Used to specify the default Sources for list, install and update.
diff --git a/Unicorn.sln b/Unicorn.sln
index cfb78cfe..01e2565f 100644
--- a/Unicorn.sln
+++ b/Unicorn.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unicorn", "src\Unicorn\Unicorn.csproj", "{82C4441B-E11E-4601-B6B7-C5AD71B2AB70}"
 EndProject
@@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unicorn.Users", "src\Unicor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unicorn.Roles.Tests", "src\Unicorn.Roles.Tests\Unicorn.Roles.Tests.csproj", "{7731968E-8A3E-4F36-860D-CE614C3D9114}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configy", "..\Configy\src\Configy\Configy.csproj", "{BB66D7F7-6E33-4AC6-B978-E1F4E757F4A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -57,6 +59,10 @@ Global
 		{7731968E-8A3E-4F36-860D-CE614C3D9114}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7731968E-8A3E-4F36-860D-CE614C3D9114}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7731968E-8A3E-4F36-860D-CE614C3D9114}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB66D7F7-6E33-4AC6-B978-E1F4E757F4A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB66D7F7-6E33-4AC6-B978-E1F4E757F4A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB66D7F7-6E33-4AC6-B978-E1F4E757F4A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB66D7F7-6E33-4AC6-B978-E1F4E757F4A5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Unicorn.Roles/Unicorn.Roles.csproj b/src/Unicorn.Roles/Unicorn.Roles.csproj
index 370fbc3c..9cb71637 100644
--- a/src/Unicorn.Roles/Unicorn.Roles.csproj
+++ b/src/Unicorn.Roles/Unicorn.Roles.csproj
@@ -72,6 +72,10 @@
     <Compile Include="RolePredicates\ConfigurationRolePredicate.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Configy\src\Configy\Configy.csproj">
+      <Project>{bb66d7f7-6e33-4ac6-b978-e1f4e757f4a5}</Project>
+      <Name>Configy</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Rainbow\src\Rainbow.Storage.Yaml\Rainbow.Storage.Yaml.csproj">
       <Project>{371181c9-45dc-4885-8894-43ffc235d124}</Project>
       <Name>Rainbow.Storage.Yaml</Name>
diff --git a/src/Unicorn.Tests/Configuration/XmlConfigurationProviderTests.cs b/src/Unicorn.Tests/Configuration/ConfigyConfigurationProviderTests.cs
similarity index 76%
rename from src/Unicorn.Tests/Configuration/XmlConfigurationProviderTests.cs
rename to src/Unicorn.Tests/Configuration/ConfigyConfigurationProviderTests.cs
index bb386add..2930c53d 100644
--- a/src/Unicorn.Tests/Configuration/XmlConfigurationProviderTests.cs
+++ b/src/Unicorn.Tests/Configuration/ConfigyConfigurationProviderTests.cs
@@ -3,12 +3,12 @@
 
 namespace Unicorn.Tests.Configuration
 {
-	public class XmlConfigurationProviderTests
+	public class ConfigyConfigurationProviderTests
 	{
 		[Fact]
 		public void ShouldLoadExpectedConfigurations()
 		{
-			var testProvider = new TestXmlConfigurationProvider();
+			var testProvider = new TestConfigyConfigurationProvider();
 			
 			Assert.NotEmpty(testProvider.Configurations);
 			Assert.Equal("Default Configuration", testProvider.Configurations[0].Name);
@@ -18,7 +18,7 @@ public void ShouldLoadExpectedConfigurations()
 		[Fact]
 		public void ShouldResolveExpectedDefaultDependency()
 		{
-			var testProvider = new TestXmlConfigurationProvider();
+			var testProvider = new TestConfigyConfigurationProvider();
 
 			Assert.IsType(typeof(DefaultSerializationLoaderLogger), testProvider.Configurations[0].Resolve<ISerializationLoaderLogger>());
 		}
@@ -26,7 +26,7 @@ public void ShouldResolveExpectedDefaultDependency()
 		[Fact]
 		public void ShouldResolveExpectedOverriddenDependency()
 		{
-			var testProvider = new TestXmlConfigurationProvider();
+			var testProvider = new TestConfigyConfigurationProvider();
 
 			Assert.IsType(typeof(DebugSerializationLoaderLogger), testProvider.Configurations[1].Resolve<ISerializationLoaderLogger>());
 		}
diff --git a/src/Unicorn.Tests/Configuration/MicroConfigurationTests.cs b/src/Unicorn.Tests/Configuration/MicroConfigurationTests.cs
deleted file mode 100644
index add4ee5f..00000000
--- a/src/Unicorn.Tests/Configuration/MicroConfigurationTests.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using Xunit;
-using Unicorn.Configuration;
-
-namespace Unicorn.Tests.Configuration
-{
-	public class MicroConfigurationTests
-	{
-		[Fact]
-		public void ResolvesType()
-		{
-			var micro = new MicroConfiguration("Test", null, null, null);
-
-			micro.Register(typeof(ITest), () => new Test(), true);
-
-			var instance = micro.Resolve<ITest>();
-
-			Assert.NotNull(instance);
-		}
-
-		[Fact]
-		public void ResolvesType_AsInstance()
-		{
-			var micro = new MicroConfiguration("Test", null, null, null);
-
-			micro.Register(typeof(IInstance), () => new TestInstance(), false);
-			
-			var instance = micro.Resolve<IInstance>();
-
-			Assert.NotNull(instance);
-
-			var instance2 = micro.Resolve<IInstance>();
-
-			Assert.NotEqual(instance.InstanceGuid, instance2.InstanceGuid);
-		}
-
-		[Fact]
-		public void ResolvesType_AsSingleton()
-		{
-			var micro = new MicroConfiguration("Test", null, null, null);
-
-			micro.Register(typeof(IInstance), () => new TestInstance(), true);
-			
-			var instance = micro.Resolve<IInstance>();
-
-			Assert.NotNull(instance);
-
-			var instance2 = micro.Resolve<IInstance>();
-
-			Assert.Equal(instance.InstanceGuid, instance2.InstanceGuid);
-		}
-
-		public interface IInstance
-		{
-			Guid InstanceGuid { get; }
-		}
-
-		public class TestInstance : IInstance
-		{
-			public TestInstance()
-			{
-				InstanceGuid = Guid.NewGuid();
-			}
-
-			public Guid InstanceGuid { get; private set; }
-		}
-	}
-}
diff --git a/src/Unicorn.Tests/Configuration/TestXmlConfigurationProvider.cs b/src/Unicorn.Tests/Configuration/TestConfigyConfigurationProvider.cs
similarity index 89%
rename from src/Unicorn.Tests/Configuration/TestXmlConfigurationProvider.cs
rename to src/Unicorn.Tests/Configuration/TestConfigyConfigurationProvider.cs
index fc972c40..5c827a87 100644
--- a/src/Unicorn.Tests/Configuration/TestXmlConfigurationProvider.cs
+++ b/src/Unicorn.Tests/Configuration/TestConfigyConfigurationProvider.cs
@@ -5,7 +5,7 @@
 
 namespace Unicorn.Tests.Configuration
 {
-	internal class TestXmlConfigurationProvider : XmlConfigurationProvider
+	internal class TestConfigyConfigurationProvider : ConfigyConfigurationProvider
 	{
 		protected override XmlNode GetConfigurationNode()
 		{
diff --git a/src/Unicorn.Tests/Configuration/XmlConfigurationTypeActivatorTests.cs b/src/Unicorn.Tests/Configuration/XmlConfigurationTypeActivatorTests.cs
deleted file mode 100644
index 33d9ec31..00000000
--- a/src/Unicorn.Tests/Configuration/XmlConfigurationTypeActivatorTests.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System.Collections.Generic;
-using Xunit;
-using Unicorn.Configuration;
-
-namespace Unicorn.Tests.Configuration
-{
-	public class XmlConfigurationTypeActivatorTests
-	{
-		[Fact]
-		public void Activator_ResolvesType_WithDependency()
-		{
-			var micro = new MicroConfiguration("Test", null, null, null);
-
-			micro.Register(typeof(ITest), () => new Test(), true);
-
-			var instance = (IDependency)micro.Activate(typeof(TestDependencyParameter), new KeyValuePair<string, object>[] { });
-
-			Assert.NotNull(instance);
-
-			Assert.NotNull(instance.TestInstance);
-		}
-
-		[Fact]
-		public void Activator_ResolvesType_WithDependency_AndParameter()
-		{
-			var micro = new MicroConfiguration("Test", null, null, null);
-
-			micro.Register(typeof(ITest), () => new Test(), true);
-
-			var instance = (IDependency)micro.Activate(typeof(TestDependencyParameterStatic), new[] { new KeyValuePair<string, object>("value", "hello") });
-
-			Assert.NotNull(instance);
-
-			Assert.Equal("hello", ((TestDependencyParameterStatic)instance).Value);
-		}
-	}
-
-	public interface ITest
-	{
-		string TestString { get; }
-	}
-
-	public class Test : ITest
-	{
-		public string TestString { get; set; }
-	}
-
-	public interface IDependency
-	{
-		ITest TestInstance { get; }
-	}
-
-	public class TestDependencyParameter : IDependency
-	{
-		public TestDependencyParameter(ITest dependency)
-		{
-			TestInstance = dependency;
-		}
-
-		public ITest TestInstance { get; private set; }
-	}
-
-	public class TestDependencyParameterStatic : IDependency
-	{
-		public TestDependencyParameterStatic(ITest depdendency, string value)
-		{
-			TestInstance = depdendency;
-			Value = value;
-		}
-
-		public ITest TestInstance { get; private set; }
-		public string Value { get; set; }
-	}
-}
diff --git a/src/Unicorn.Tests/Unicorn.Tests.csproj b/src/Unicorn.Tests/Unicorn.Tests.csproj
index b26bf43e..e37e05ef 100644
--- a/src/Unicorn.Tests/Unicorn.Tests.csproj
+++ b/src/Unicorn.Tests/Unicorn.Tests.csproj
@@ -150,16 +150,14 @@
     <Compile Include="Configuration\Dependencies\ConfigurationDependencyResolverTests.Explicit.cs" />
     <Compile Include="Configuration\Dependencies\DepTestHelper.cs" />
     <Compile Include="Configuration\Dependencies\InterconfigurationDependencyResolverTests.cs" />
-    <Compile Include="Configuration\MicroConfigurationTests.cs" />
     <None Include="app.config" />
     <Compile Include="ControlPanel\Security\SitecoreDatabaseChallengeStoreTests.cs" />
     <Compile Include="Data\DataProvider\ItemChangeApplyingItemDataTests.cs" />
     <Compile Include="Data\DataProvider\UnicornDataProviderTests.AddVersion.cs" />
     <Compile Include="Data\DataProvider\UnicornDataProviderTests.SaveItem.cs" />
     <Compile Include="Evaluator\SerializedAsMasterEvaluatorTests.cs" />
-    <Compile Include="Configuration\TestXmlConfigurationProvider.cs" />
-    <Compile Include="Configuration\XmlConfigurationProviderTests.cs" />
-    <Compile Include="Configuration\XmlConfigurationTypeActivatorTests.cs" />
+    <Compile Include="Configuration\TestConfigyConfigurationProvider.cs" />
+    <Compile Include="Configuration\ConfigyConfigurationProviderTests.cs" />
     <Compile Include="Content.cs" />
     <Compile Include="ControlPanel\Headings\HeadingServiceTests.cs" />
     <Compile Include="Data\DataProvider\DataProviderConfigurationTests.cs" />
@@ -187,6 +185,10 @@
     <EmbeddedResource Include="Configuration\TestXmlConfiguration.xml" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Configy\src\Configy\Configy.csproj">
+      <Project>{bb66d7f7-6e33-4ac6-b978-e1f4e757f4a5}</Project>
+      <Name>Configy</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Rainbow\src\Rainbow.Storage.Sc\Rainbow.Storage.Sc.csproj">
       <Project>{956afe8b-51cd-4d61-b8c1-bffdc749fd82}</Project>
       <Name>Rainbow.Storage.Sc</Name>
diff --git a/src/Unicorn.Users/Events/UnicornConfigurationUsersEventHandler.cs b/src/Unicorn.Users/Events/UnicornConfigurationUsersEventHandler.cs
index a84749bc..ace8d1e6 100644
--- a/src/Unicorn.Users/Events/UnicornConfigurationUsersEventHandler.cs
+++ b/src/Unicorn.Users/Events/UnicornConfigurationUsersEventHandler.cs
@@ -21,7 +21,6 @@ public UnicornConfigurationUsersEventHandler(IConfiguration configuration)
 			_dataStore = configuration.Resolve<IUserDataStore>();
 		}
 
-
 		public virtual void UserAlteredOrCreated(string userName)
 		{
 			var user = User.FromName(userName, false);
diff --git a/src/Unicorn.Users/Unicorn.Users.csproj b/src/Unicorn.Users/Unicorn.Users.csproj
index 343d2c55..a6e57c88 100644
--- a/src/Unicorn.Users/Unicorn.Users.csproj
+++ b/src/Unicorn.Users/Unicorn.Users.csproj
@@ -87,6 +87,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Configy\src\Configy\Configy.csproj">
+      <Project>{bb66d7f7-6e33-4ac6-b978-e1f4e757f4a5}</Project>
+      <Name>Configy</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Rainbow\src\Rainbow.Storage.Yaml\Rainbow.Storage.Yaml.csproj">
       <Project>{371181c9-45dc-4885-8894-43ffc235d124}</Project>
       <Name>Rainbow.Storage.Yaml</Name>
diff --git a/src/Unicorn/Configuration/ConfigyConfigurationProvider.cs b/src/Unicorn/Configuration/ConfigyConfigurationProvider.cs
new file mode 100644
index 00000000..d9302f1a
--- /dev/null
+++ b/src/Unicorn/Configuration/ConfigyConfigurationProvider.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
+using Configy;
+using Configy.Containers;
+using Configy.Parsing;
+using Rainbow.Storage;
+using Sitecore.Configuration;
+using Sitecore.Diagnostics;
+using Unicorn.Data;
+using Unicorn.Evaluators;
+using Unicorn.Loader;
+using Unicorn.Logging;
+using Unicorn.Predicates;
+
+namespace Unicorn.Configuration
+{
+	/// <summary>
+	/// Reads Unicorn dependency configurations from XML (e.g. Sitecore web.config section sitecore/unicorn)
+	/// </summary>
+	public class ConfigyConfigurationProvider : XmlContainerBuilder, IConfigurationProvider
+	{
+		private IConfiguration[] _configurations;
+
+		public ConfigyConfigurationProvider() : base(new PipelineBasedVariablesReplacer())
+		{
+		}
+
+		public IConfiguration[] Configurations
+		{
+			get
+			{
+				if (_configurations == null) LoadConfigurations();
+				return _configurations;
+			}
+		}
+
+
+		protected virtual XmlNode GetConfigurationNode()
+		{
+			return Factory.GetConfigNode("/sitecore/unicorn");
+		}
+
+		protected virtual void LoadConfigurations()
+		{
+			var configNode = GetConfigurationNode();
+
+			Assert.IsNotNull(configNode, "Root Unicorn config node not found. Missing Unicorn.config?");
+
+			var defaultsNode = configNode["defaults"];
+
+			Assert.IsNotNull(defaultsNode, "Unicorn <defaults> node not found. It should be under <unicorn> config section.");
+
+			var configurationNodes = configNode.SelectNodes("./configurations/configuration");
+
+			// no configs let's get outta here
+			if (configurationNodes == null || configurationNodes.Count == 0)
+			{
+				_configurations = new IConfiguration[0];
+				return;
+			}
+
+			var parser = new XmlContainerParser(configNode["configurations"], configNode["defaults"], new XmlInheritanceEngine());
+
+			var definitions = parser.GetContainers();
+
+			var configurations = GetContainers(definitions).ToArray();
+
+			foreach (var configuration in configurations)
+			{
+				// Assert that expected dependencies exist - and in the case of data stores are specifically singletons (WEIRD things happen otherwise)
+				configuration.AssertSingleton(typeof(ISourceDataStore));
+				configuration.AssertSingleton(typeof(ITargetDataStore));
+				configuration.Assert(typeof(IEvaluator));
+				configuration.Assert(typeof(IPredicate));
+				configuration.Assert(typeof(ILogger));
+				configuration.Assert(typeof(ISerializationLoaderLogger));
+				configuration.Assert(typeof(IConsistencyChecker));
+				configuration.Assert(typeof(IDeserializeFailureRetryer));
+
+				// register the configuration with itself. how meta!
+				configuration.Register(typeof(IConfiguration), () => new ReadOnlyConfiguration((IConfiguration)configuration), true);
+			}
+
+			_configurations = configurations
+				.Cast<IConfiguration>()
+				.Select(config => (IConfiguration)new ReadOnlyConfiguration(config))
+				.ToArray();
+		}
+
+		protected override IContainer CreateContainer(ContainerDefinition definition)
+		{
+			var description = GetAttributeValue(definition.Definition, "description");
+
+			var attributeValue = GetAttributeValue(definition.Definition, "dependencies");
+			var dependencies = !string.IsNullOrEmpty(attributeValue) ? attributeValue.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries) : null;
+
+			var ignoredAttributeValue = GetAttributeValue(definition.Definition, "ignoredImplicitDependencies");
+			var ignoredDependencies = !string.IsNullOrEmpty(ignoredAttributeValue) ? ignoredAttributeValue.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries) : null;
+
+			return new MicroConfiguration(definition.Name, description, definition.Extends, dependencies, ignoredDependencies);
+		}
+
+		protected override void RegisterConfigTypeInterface(IContainer container, Type interfaceType, TypeRegistration implementationRegistration, KeyValuePair<string, object>[] unmappedAttributes, XmlElement dependency)
+		{
+			if (interfaceType != typeof(IDataStore))
+			{
+				base.RegisterConfigTypeInterface(container, interfaceType, implementationRegistration, unmappedAttributes, dependency);
+				return;
+			}
+
+			// IDataStore registrations get special treatment. The implementation must be disambiguated into Source and Target data stores, 
+			// which we do by wrapping it in a ConfigurationDataStore factory and manually registering the apropos interface.
+			if ("sourceDataStore".Equals(dependency.Name, StringComparison.OrdinalIgnoreCase))
+			{
+				Func<object> wrapperFactory = () => new ConfigurationDataStore(new Lazy<IDataStore>(() => (IDataStore)container.Activate(implementationRegistration.Type, unmappedAttributes)));
+
+				container.Register(typeof(ISourceDataStore), wrapperFactory, implementationRegistration.SingleInstance);
+
+				return;
+			}
+
+			if ("targetDataStore".Equals(dependency.Name, StringComparison.OrdinalIgnoreCase))
+			{
+				Func<object> wrapperFactory = () => new ConfigurationDataStore(new Lazy<IDataStore>(() => (IDataStore)container.Activate(implementationRegistration.Type, unmappedAttributes)));
+
+				container.Register(typeof(ITargetDataStore), wrapperFactory, implementationRegistration.SingleInstance);
+			}
+		}
+	}
+}
diff --git a/src/Unicorn/Configuration/IConfiguration.cs b/src/Unicorn/Configuration/IConfiguration.cs
index 48046b5e..dfb0e5ce 100644
--- a/src/Unicorn/Configuration/IConfiguration.cs
+++ b/src/Unicorn/Configuration/IConfiguration.cs
@@ -1,18 +1,12 @@
-using System;
-using System.Collections.Generic;
+using Configy.Containers;
 
 namespace Unicorn.Configuration
 {
 	/// <summary>
 	/// Represents a Unicorn configuration. A configuration is basically an instance of a DI container.
 	/// </summary>
-	public interface IConfiguration
+	public interface IConfiguration : IContainer
 	{
-		/// <summary>
-		/// The name of this configuration, used for display purposes
-		/// </summary>
-		string Name { get; }
-
 		/// <summary>
 		/// A description of what this configuration is for. Displayed in control panel if present.
 		/// </summary>
@@ -27,30 +21,5 @@ public interface IConfiguration
 		/// A list of configuration names on which this configuration depends
 		/// </summary>
 		string[] IgnoredImplicitDependencies { get; }
-
-		/// <summary>
-		/// Resolves an instance of a type from a generic parameter. This should be an explicitly registered type.
-		/// </summary>
-		T Resolve<T>() where T : class;
-
-		/// <summary>
-		/// Resolves an instance of a type from a Type instance
-		/// </summary>
-		/// <param name="type"></param>
-		/// <returns></returns>
-		object Resolve(Type type);
-
-		/// <summary>
-		/// Registers an instance of a dependency type.
-		/// </summary>
-		/// <param name="type">Type to register the instance for</param>
-		/// <param name="factory">Factory method to create the instance when it is needed</param>
-		/// <param name="singleInstance">If true, it's a singleton. If false, new instance is created each time. Singleton is preferable for performance.</param>
-		void Register(Type type, Func<object> factory, bool singleInstance);
-
-		/// <summary>
-		/// Activates a type, using constructor injection for any registered dependencies
-		/// </summary>
-		object Activate(Type type, KeyValuePair<string, object>[] unmappedConstructorParameters);
 	}
 }
diff --git a/src/Unicorn/Configuration/MicroConfiguration.cs b/src/Unicorn/Configuration/MicroConfiguration.cs
index 18233729..f18243c9 100644
--- a/src/Unicorn/Configuration/MicroConfiguration.cs
+++ b/src/Unicorn/Configuration/MicroConfiguration.cs
@@ -1,138 +1,18 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using Sitecore.StringExtensions;
+using Configy.Containers;
 
 namespace Unicorn.Configuration
 {
-	public class MicroConfiguration : IConfiguration
+	public class MicroConfiguration : MicroContainer, IConfiguration
 	{
-		private readonly ConcurrentDictionary<Type, Lazy<object>> _singletons = new ConcurrentDictionary<Type, Lazy<object>>();
-		private readonly ConcurrentDictionary<Type, Func<object>> _transients = new ConcurrentDictionary<Type, Func<object>>();
-
-		public MicroConfiguration(string name, string description, string[] dependencies, string[] ignoredDependencies)
+		public MicroConfiguration(string name, string description, string extends, string[] dependencies, string[] ignoredDependencies) : base(name, extends)
 		{
-			Name = name;
 			Description = description;
 			Dependencies = dependencies ?? new string[0];
 			IgnoredImplicitDependencies = ignoredDependencies ?? new string[0];
 		}
 
-		public string Name { get; }
 		public string Description { get; }
 		public string[] Dependencies { get; set; }
 		public string[] IgnoredImplicitDependencies { get; set; }
-
-		/// <summary>
-		/// Resolves a registered type with its dependencies. Note: to activate unregistered types and inject dependencies use Activate() instead.
-		/// </summary>
-		/// <typeparam name="T">Type to resolve</typeparam>
-		/// <returns></returns>
-		public virtual T Resolve<T>() where T : class
-		{
-			var typeOfT = typeof(T);
-
-			var result = Resolve(typeOfT);
-
-			if (result == null)
-			{
-				if(typeOfT.IsClass)
-					return (T)Activate(typeOfT, new KeyValuePair<string, object>[] { });
-
-				return null;
-			}
-
-			return (T)result;
-		}
-
-		public virtual object Resolve(Type type)
-		{
-			Lazy<object> value;
-			if (_singletons.TryGetValue(type, out value))
-			{
-				return value.Value;
-			}
-
-			Func<object> factory;
-			if (_transients.TryGetValue(type, out factory))
-			{
-				return factory();
-			}
-
-			return null;
-		}
-
-		public virtual void Register(Type type, Func<object> factory, bool singleInstance)
-		{
-			if (singleInstance)
-			{
-				_singletons.TryAdd(type, new Lazy<object>(factory));
-			}
-			else
-			{
-				_transients.TryAdd(type, factory);
-			}
-		}
-
-		/// <summary>
-		/// Creates an instance of an object, injecting any registered dependencies in the configuration into its constructor.
-		/// </summary>
-		/// <param name="type">Type to resolve</param>
-		/// <param name="unmappedConstructorParameters">Constructor parameters that are not expected to be in the configuration</param>
-		public virtual object Activate(Type type, KeyValuePair<string, object>[] unmappedConstructorParameters)
-		{
-			var constructors = type.GetConstructors();
-			if (constructors.Length > 1) throw new MicroResolutionException("Cannot construct {0} because it has > 1 constructor.".FormatWith(type.FullName));
-			if (constructors.Length == 0) throw new MicroResolutionException("Cannot construct {0} because it has no constructor!".FormatWith(type.FullName));
-
-			var constructor = constructors.First();
-
-			var ctorParams = constructor.GetParameters();
-
-			object[] args = new object[ctorParams.Length];
-
-			for (int parameterIndex = 0; parameterIndex < ctorParams.Length; parameterIndex++)
-			{
-				var currentParam = ctorParams[parameterIndex];
-
-				if (unmappedConstructorParameters.Any(kv => kv.Key.Equals(currentParam.Name, StringComparison.Ordinal)))
-				{
-					args[parameterIndex] = unmappedConstructorParameters.First(kv => kv.Key.Equals(currentParam.Name, StringComparison.Ordinal)).Value;
-				}
-				else
-				{
-					args[parameterIndex] = Resolve(currentParam.ParameterType);
-					if (args[parameterIndex] == null)
-					{
-						try
-						{
-							args[parameterIndex] = Activate(currentParam.ParameterType, new KeyValuePair<string, object>[] { });
-						}
-						catch (Exception ex)
-						{
-							throw new MicroResolutionException("Cannot activate {0}, constructor param '{1}' ({2}). The type '{2}' is probably not registered, or may need to be an explicit unmapped parameter (as an XML attribute on the type registration). Inner message: {3}".FormatWith(type.FullName, currentParam.Name, currentParam.ParameterType.Name, ex.Message));
-						}
-					}
-				}
-			}
-
-			var lambdaParams = Expression.Parameter(typeof(object[]), "parameters");
-			var newParams = new Expression[ctorParams.Length];
-
-			for (int i = 0; i < ctorParams.Length; i++)
-			{
-				var paramsParameter = Expression.ArrayIndex(lambdaParams, Expression.Constant(i));
-
-				newParams[i] = Expression.Convert(paramsParameter, ctorParams[i].ParameterType);
-			}
-
-			var newExpression = Expression.New(constructor, newParams);
-
-			var constructionLambda = Expression.Lambda(typeof(Func<object[], object>), newExpression, lambdaParams);
-
-			return ((Func<object[], object>)constructionLambda.Compile()).Invoke(args);
-		}
 	}
 }
diff --git a/src/Unicorn/Configuration/MicroResolutionException.cs b/src/Unicorn/Configuration/MicroResolutionException.cs
deleted file mode 100644
index c8d2222d..00000000
--- a/src/Unicorn/Configuration/MicroResolutionException.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Unicorn.Configuration
-{
-	[Serializable]
-	public class MicroResolutionException : Exception
-	{
-		public MicroResolutionException()
-		{
-		}
-
-		public MicroResolutionException(string message) : base(message)
-		{
-		}
-
-		public MicroResolutionException(string message, Exception inner) : base(message, inner)
-		{
-		}
-
-		protected MicroResolutionException(
-			SerializationInfo info,
-			StreamingContext context) : base(info, context)
-		{
-		}
-	}
-}
diff --git a/src/Unicorn/Configuration/PipelineBasedVariablesReplacer.cs b/src/Unicorn/Configuration/PipelineBasedVariablesReplacer.cs
new file mode 100644
index 00000000..6fa7f4f7
--- /dev/null
+++ b/src/Unicorn/Configuration/PipelineBasedVariablesReplacer.cs
@@ -0,0 +1,19 @@
+using System;
+using Configy.Parsing;
+using Sitecore.Pipelines;
+using Unicorn.Pipelines.UnicornExpandConfigurationVariables;
+
+namespace Unicorn.Configuration
+{
+	public class PipelineBasedVariablesReplacer : IContainerDefinitionVariablesReplacer
+	{
+		public virtual void ReplaceVariables(ContainerDefinition definition)
+		{
+			if (definition.Name == null) throw new ArgumentException("Configuration without a name was used. Add a name attribute to all configurations.", nameof(definition));
+
+			var args = new UnicornExpandConfigurationVariablesPipelineArgs(definition);
+
+			CorePipeline.Run("unicornExpandConfigurationVariables", args);
+		}
+	}
+}
diff --git a/src/Unicorn/Configuration/ReadOnlyConfiguration.cs b/src/Unicorn/Configuration/ReadOnlyConfiguration.cs
index 63bcda2a..031ec3bb 100644
--- a/src/Unicorn/Configuration/ReadOnlyConfiguration.cs
+++ b/src/Unicorn/Configuration/ReadOnlyConfiguration.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Sitecore.Diagnostics;
 
 namespace Unicorn.Configuration
 {
@@ -13,13 +12,14 @@ internal class ReadOnlyConfiguration : IConfiguration
 
 		public ReadOnlyConfiguration(IConfiguration innerConfiguration)
 		{
-			Assert.ArgumentNotNull(innerConfiguration, "innerConfiguration");
+			Sitecore.Diagnostics.Assert.ArgumentNotNull(innerConfiguration, "innerConfiguration");
 
 			_innerConfiguration = innerConfiguration;
 		}
 
 		public string Name => _innerConfiguration.Name;
 		public string Description => _innerConfiguration.Description;
+		public string Extends => _innerConfiguration.Extends;
 		public string[] Dependencies => _innerConfiguration.Dependencies;
 		public string[] IgnoredImplicitDependencies => _innerConfiguration.IgnoredImplicitDependencies;
 
@@ -42,5 +42,20 @@ public object Activate(Type type, KeyValuePair<string, object>[] unmappedConstru
 		{
 			return _innerConfiguration.Activate(type, unmappedConstructorParameters);
 		}
+
+		public void Assert(Type type)
+		{
+			_innerConfiguration.Assert(type);
+		}
+
+		public void AssertSingleton(Type type)
+		{
+			_innerConfiguration.AssertSingleton(type);
+		}
+
+		public void AssertTransient(Type type)
+		{
+			_innerConfiguration.AssertTransient(type);
+		}
 	}
 }
diff --git a/src/Unicorn/Configuration/XmlConfigurationProvider.cs b/src/Unicorn/Configuration/XmlConfigurationProvider.cs
deleted file mode 100644
index bde7fd49..00000000
--- a/src/Unicorn/Configuration/XmlConfigurationProvider.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Configuration;
-using System.Linq;
-using System.Xml;
-using Rainbow.Storage;
-using Sitecore.Configuration;
-using Sitecore.Diagnostics;
-using Sitecore.StringExtensions;
-using Unicorn.Data;
-using Unicorn.Evaluators;
-using Unicorn.Loader;
-using Unicorn.Logging;
-using Unicorn.Predicates;
-
-namespace Unicorn.Configuration
-{
-	/// <summary>
-	/// Reads Unicorn dependency configurations from XML (e.g. Sitecore web.config section sitecore/unicorn)
-	/// </summary>
-	public class XmlConfigurationProvider : IConfigurationProvider
-	{
-		private IConfiguration[] _configurations;
-
-		public IConfiguration[] Configurations
-		{
-			get
-			{
-				if (_configurations == null) LoadConfigurations();
-				return _configurations;
-			}
-		}
-
-
-		protected virtual XmlNode GetConfigurationNode()
-		{
-			return Factory.GetConfigNode("/sitecore/unicorn");
-		}
-
-		protected virtual void LoadConfigurations()
-		{
-			var configNode = GetConfigurationNode();
-
-			Assert.IsNotNull(configNode, "Root Unicorn config node not found. Missing Unicorn.config?");
-
-			var defaultsNode = configNode["defaults"];
-
-			Assert.IsNotNull(defaultsNode, "Unicorn <defaults> node not found. It should be under <unicorn> config section.");
-
-			var configurationNodes = configNode.SelectNodes("./configurations/configuration");
-
-			// no configs let's get outta here
-			if (configurationNodes == null || configurationNodes.Count == 0)
-			{
-				_configurations = new IConfiguration[0];
-				return;
-			}
-
-			var configurations = new Collection<IConfiguration>();
-			var nameChecker = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-			foreach (XmlElement element in configurationNodes)
-			{
-				var configuration = LoadConfiguration(element, defaultsNode);
-
-				if (nameChecker.Contains(configuration.Name)) throw new InvalidOperationException("The Unicorn configuration '" + configuration.Name + "' is defined twice. Configurations should have unique names.");
-				nameChecker.Add(configuration.Name);
-
-				configurations.Add(configuration);
-			}
-
-			_configurations = configurations.ToArray();
-		}
-
-		protected virtual IConfiguration LoadConfiguration(XmlElement configuration, XmlElement defaults)
-		{
-			var name = GetAttributeValue(configuration, "name");
-
-			Assert.IsNotNullOrEmpty(name, "Configuration node had empty or missing name attribute.");
-
-			var description = GetAttributeValue(configuration, "description");
-
-			var attributeValue = GetAttributeValue(configuration, "dependencies");
-			var dependencies = !string.IsNullOrEmpty(attributeValue) ? attributeValue.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries) : null;
-
-			var ignoredAttributeValue = GetAttributeValue(configuration, "ignoredImplicitDependencies");
-			var ignoredDependencies = !string.IsNullOrEmpty(ignoredAttributeValue) ? ignoredAttributeValue.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries) : null;
-
-			var registry = new MicroConfiguration(name, description, dependencies, ignoredDependencies);
-
-			// these are config types we absolutely must have instances of to use Unicorn - an exception will throw if they don't exist
-			var configMapping = new Dictionary<string, Action<XmlElement, XmlElement, string, IConfiguration>>
-			{
-				{"sourceDataStore", RegisterExpectedConfigType<ISourceDataStore>},
-				{"evaluator", RegisterExpectedConfigType<IEvaluator>},
-				{"predicate", RegisterExpectedConfigType<IPredicate>},
-				{"targetDataStore", RegisterExpectedConfigType<ITargetDataStore>},
-				{"logger", RegisterExpectedConfigType<ILogger>},
-				{"loaderLogger", RegisterExpectedConfigType<ISerializationLoaderLogger>},
-				{"loaderConsistencyChecker", RegisterExpectedConfigType<IConsistencyChecker>},
-				{"loaderDeserializeFailureRetryer", RegisterExpectedConfigType<IDeserializeFailureRetryer>}
-			};
-
-			foreach (var explicitMapping in configMapping)
-			{
-				explicitMapping.Value(configuration, defaults, explicitMapping.Key, registry);
-			}
-
-			// now we get a list of any nodes that are NOT on the explicit map list.
-			// these nodes are ad-hoc DI registrations where we'll register any interfaces they implement with the container
-			// for example loggers and other non-essential mappings get loaded here. As usual, specific config overrides defaults.
-			var configurationAdHocRegisterNodes = configuration.ChildNodes.OfType<XmlElement>().Where(x => !configMapping.ContainsKey(x.Name)).ToArray();
-			// ReSharper disable once SimplifyLinqExpression
-			var defaultAdHocRegisterNodes = defaults.ChildNodes.OfType<XmlElement>().Where(node => !configMapping.ContainsKey(node.Name) && !configurationAdHocRegisterNodes.Any(x => x.Name == node.Name)).ToArray();
-			// note that the default nodes remove dupes from the local configuration in the statement above.
-
-			foreach (XmlElement adHocElement in configurationAdHocRegisterNodes.Concat(defaultAdHocRegisterNodes))
-			{
-				RegisterGenericConfigTypeByInterfaces(configuration, defaults, adHocElement.Name, registry);
-			}
-
-			// register the configuration with itself. how meta!
-			registry.Register(typeof(IConfiguration), () => new ReadOnlyConfiguration(registry), true);
-
-			return new ReadOnlyConfiguration(registry);
-		}
-
-		/// <summary>
-		/// Registers an ad-hoc DI entry with the configuration, using its interfaces as the registrations
-		/// </summary>
-		protected virtual void RegisterGenericConfigTypeByInterfaces(XmlElement configuration, XmlElement defaults, string elementName, IConfiguration registry)
-		{
-			var type = GetConfigType(configuration, defaults, elementName);
-
-			var interfaces = type.Type.GetInterfaces();
-
-			var attributes = GetUnmappedAttributes(configuration, defaults, elementName);
-
-			foreach (var @interface in interfaces)
-			{
-				registry.Register(@interface, () => registry.Activate(type.Type, attributes), type.SingleInstance);
-			}
-		}
-
-		/// <summary>
-		/// Registers an expected DI entry with the configuration. If the type is incorrect, or does not exist, an exception is thrown.
-		/// </summary>
-		protected virtual void RegisterExpectedConfigType<TResultType>(XmlElement configuration, XmlElement defaults, string elementName, IConfiguration registry)
-			where TResultType : class
-		{
-			var type = GetConfigType(configuration, defaults, elementName);
-			var attributes = GetUnmappedAttributes(configuration, defaults, elementName);
-			var resultType = typeof(TResultType);
-
-			if (resultType == typeof(ISourceDataStore))
-			{
-				Func<IDataStore> factory = () => (IDataStore)registry.Activate(type.Type, attributes);
-				Func<object> wrapperFactory = () => new ConfigurationDataStore(new Lazy<IDataStore>(factory));
-
-				if (!type.SingleInstance)
-				{
-					Log.Warn($"[Unicorn] The sourceDataStore on configuration {registry.Name} is set to transient lifecycle (singleInstance=false or missing). This will be ignored and the dependency will use singleton lifecycle to prevent unusual behaviors and performance issues.", this);
-				}
-
-				registry.Register(resultType, wrapperFactory, true);
-				return;
-			}
-
-			if (resultType == typeof(ITargetDataStore))
-			{
-				Func<IDataStore> factory = () => (IDataStore)registry.Activate(type.Type, attributes);
-				Func<object> wrapperFactory = () => new ConfigurationDataStore(new Lazy<IDataStore>(factory));
-
-				if (!type.SingleInstance)
-				{
-					Log.Warn($"[Unicorn] The targetDataStore on configuration {registry.Name} is set to transient lifecycle (singleInstance=false or missing). This will be ignored and the dependency will use singleton lifecycle to prevent unusual behaviors and performance issues.", this);
-				}
-
-				registry.Register(resultType, wrapperFactory, true);
-				return;
-			}
-
-			if (!resultType.IsAssignableFrom(type.Type))
-				throw new InvalidOperationException("Invalid type for Unicorn config node '{0}' (expected '{1}' implementation)".FormatWith(elementName, typeof(TResultType).FullName));
-
-			RegisterGenericConfigTypeByInterfaces(configuration, defaults, elementName, registry);
-		}
-
-		/// <summary>
-		/// Resolves an attribute of an XML element into a C# Type, using the Assembly Qualified Name
-		/// </summary>
-		protected virtual TypeRegistration GetConfigType(XmlElement configuration, XmlElement defaults, string elementName)
-		{
-			var typeNode = configuration[elementName] ?? defaults[elementName];
-
-			Assert.IsNotNull(typeNode, "Could not find a valid value for Unicorn config node " + elementName);
-
-			var typeString = GetAttributeValue(typeNode, "type");
-
-			var isSingleInstance = "true".Equals(GetAttributeValue(typeNode, "singleInstance"));
-
-			Assert.IsNotNullOrEmpty(typeString, $"Missing value for Unicorn config node '{elementName}', 'type' attribute (type expected).");
-
-			var type = Type.GetType(typeString, false);
-
-			Assert.IsNotNull(type, $"Invalid type {typeString} for Unicorn config node '{elementName}', attribute 'type'");
-
-			return new TypeRegistration { Type = type, SingleInstance = isSingleInstance };
-		}
-
-		/// <summary>
-		/// Gets unmapped (i.e. not 'type') attributes or body of a dependency declaration. These are passed as possible constructor parameters to the object.
-		/// </summary>
-		protected virtual KeyValuePair<string, object>[] GetUnmappedAttributes(XmlElement configuration, XmlElement defaults, string elementName)
-		{
-			var typeNode = configuration[elementName] ?? defaults[elementName];
-
-			Assert.IsNotNull(typeNode, "Could not find a valid value for Unicorn config node " + elementName);
-
-			// ReSharper disable once PossibleNullReferenceException
-			var attributes = typeNode.Attributes.Cast<XmlAttribute>()
-				.Where(attr => attr.Name != "type" && attr.Name != "singleInstance")
-				.Select(attr =>
-				{
-					bool boolean;
-					if (bool.TryParse(attr.InnerText, out boolean)) return new KeyValuePair<string, object>(attr.Name, boolean);
-
-					int integer;
-					if(int.TryParse(attr.InnerText, out integer)) return new KeyValuePair<string, object>(attr.Name, integer);
-
-					var value = attr.InnerText.Replace("$(configurationName)", GetAttributeValue(configuration, "name"));
-
-					return new KeyValuePair<string, object>(attr.Name, value);
-				});
-
-			// we pass it the XML element as 'configNode'
-			attributes = attributes.Concat(new[] { new KeyValuePair<string, object>("configNode", typeNode) });
-
-			return attributes.ToArray();
-		}
-
-		/// <summary>
-		/// Gets an XML attribute value, returning null if it does not exist and its inner text otherwise.
-		/// </summary>
-		protected virtual string GetAttributeValue(XmlNode node, string attribute)
-		{
-			if (node == null || node.Attributes == null) return null;
-
-			var attributeItem = node.Attributes[attribute];
-
-			if (attributeItem == null) return null;
-
-			return attributeItem.InnerText;
-		}
-
-		protected class TypeRegistration
-		{
-			public Type Type { get; set; }
-			public bool SingleInstance { get; set; }
-		}
-	}
-}
diff --git a/src/Unicorn/Pipelines/README.txt b/src/Unicorn/Pipelines/README.txt
index aab01764..25ce12f0 100644
--- a/src/Unicorn/Pipelines/README.txt
+++ b/src/Unicorn/Pipelines/README.txt
@@ -1,3 +1,6 @@
-UnicornSyncBegin - Occurs when a configuration begins syncing
+UnicornOperationStart - Occurs when a sync or reserialize operation begins - which can be multiple configurations
+UnicornSyncBegin - Occurs when a configuration begins syncing
 UnicornSyncComplete - Occurs when a configuration completes syncing
-UnicornSyncEnd - Occurs when a sync operation - which can be multiple configurations - completes
\ No newline at end of file
+UnicornReserializeComplete - Occurs when a configuration has been reserialized successfully
+UnicornSyncEnd - Occurs when a sync operation - which can be multiple configurations - completes
+UnicornExpandConfigurationVariables - Occurs when loading configurations XML, used to replace variable expressions in config definitions
\ No newline at end of file
diff --git a/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/HelixConventionVariablesReplacer.cs b/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/HelixConventionVariablesReplacer.cs
new file mode 100644
index 00000000..5922f440
--- /dev/null
+++ b/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/HelixConventionVariablesReplacer.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using Configy.Parsing;
+
+namespace Unicorn.Pipelines.UnicornExpandConfigurationVariables
+{
+	/// <summary>
+	/// Enables the use of $(layer) and $(module) in configurations, as long as you name the configurations to Helix conventions (e.g. Layer.Module)
+	/// This can allow you to use a single base configuration that defines your storage and predicate conventions so you don't have to restate them all day.
+	/// </summary>
+	public class HelixConventionVariablesReplacer : ContainerDefinitionVariablesReplacer, IUnicornExpandConfigurationVariablesProcessor
+	{
+		public void Process(UnicornExpandConfigurationVariablesPipelineArgs args)
+		{
+			ReplaceVariables(args.Configuration);
+		}
+
+		public override void ReplaceVariables(ContainerDefinition definition)
+		{
+			if (definition.Name == null) throw new ArgumentException("Configuration without a name was used. Add a name attribute to all configurations.", nameof(definition));
+
+			var variables = GetVariables(definition.Name);
+
+			ApplyVariables(definition.Definition, variables);
+		}
+
+		public virtual Dictionary<string, string> GetVariables(string name)
+		{
+			var pieces = name.Split('.');
+
+			if (pieces.Length < 2) return new Dictionary<string, string>();
+
+			return new Dictionary<string, string>
+			{
+				{"layer", pieces[0]},
+				{"module", pieces[1]}
+			};
+		}
+	}
+}
diff --git a/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/IUnicornExpandConfigurationVariablesProcessor.cs b/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/IUnicornExpandConfigurationVariablesProcessor.cs
new file mode 100644
index 00000000..5ba767cd
--- /dev/null
+++ b/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/IUnicornExpandConfigurationVariablesProcessor.cs
@@ -0,0 +1,9 @@
+using Unicorn.Pipelines.UnicornReserializeComplete;
+
+namespace Unicorn.Pipelines.UnicornExpandConfigurationVariables
+{
+	public interface IUnicornExpandConfigurationVariablesProcessor
+	{
+		void Process(UnicornExpandConfigurationVariablesPipelineArgs args);
+	}
+}
diff --git a/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/UnicornExpandConfigurationVariablesPipelineArgs.cs b/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/UnicornExpandConfigurationVariablesPipelineArgs.cs
new file mode 100644
index 00000000..080bd839
--- /dev/null
+++ b/src/Unicorn/Pipelines/UnicornExpandConfigurationVariables/UnicornExpandConfigurationVariablesPipelineArgs.cs
@@ -0,0 +1,18 @@
+using Configy.Parsing;
+using Sitecore.Diagnostics;
+using Sitecore.Pipelines;
+
+namespace Unicorn.Pipelines.UnicornExpandConfigurationVariables
+{
+	public class UnicornExpandConfigurationVariablesPipelineArgs : PipelineArgs
+	{
+		public UnicornExpandConfigurationVariablesPipelineArgs(ContainerDefinition configuration)
+		{
+			Assert.ArgumentNotNull(configuration, "configuration");
+
+			Configuration = configuration;
+		}
+
+		public ContainerDefinition Configuration { get; }
+	}
+}
diff --git a/src/Unicorn/Standard Config Files/Unicorn.Configs.Default.example b/src/Unicorn/Standard Config Files/Unicorn.Configs.Default.example
index 90322feb..e5927914 100644
--- a/src/Unicorn/Standard Config Files/Unicorn.Configs.Default.example	
+++ b/src/Unicorn/Standard Config Files/Unicorn.Configs.Default.example	
@@ -20,8 +20,13 @@
 					The most common candidates for serialization are layout items and template items, but Unicorn can serialize any type of item or field including media.
 					
 					BEHAVIORS
-					Configurations can override the default dependencies defined in Unicorn.config's <defaults> to apply
-					custom behaviors to specific configurations. They behave like an inherited IoC container.
+					Configurations can override the default dependency types defined in Unicorn.config's <defaults> to apply
+					custom behaviors to specific configurations. 
+					
+					If no 'type' attribute is specified, the default dependency type is inherited (e.g. Unicorn.Predicates.SerializationPresetPredicate for a predicate).
+					Attributes set on a type-less dependency are added or replace those on the base type (e.g. setting transparent sync to on/off without specifying a type).
+					Child elements of a type-less dependency are appended to any defined on the base (e.g. you can add includes to a predicate using this).
+					Specifying a type attribute completely overwrites any definitions made in a parent configuration.
 					
 					DEPENDENCIES
 					Configurations may also depend on each other. Add a comma-delimited list of configuration names to depend on to the 'dependencies' attribute on the configuration.
@@ -32,9 +37,12 @@
 					Favor using several configurations over a single monolithic one.
 					Favor using more includes and fewer excludes in your predicates.
 					Start with minimal configurations and add includes as you need to serialize new things.
+					If you're using a convention-based system like Helix, you can create a base configuration that encodes your conventions using variables,
+						for example <include path="/sitecore/templates/$(layer)/$(module)" /> on the predicate. The base configuration will have 'abstract="true"' on the root element, and
+						inheritors will have 'extends="AbstractConfigName"' on their root element.
 				-->
-				<configuration name="My Site" description="Write something here about why this configuration exists and what it's for. Or remove the attribute; it's optional.">
-					<predicate type="Unicorn.Predicates.SerializationPresetPredicate, Unicorn" singleInstance="true">
+				<configuration name="Feature.Sample" description="Write something here about why this configuration exists and what it's for. Or remove the attribute; it's optional.">
+					<predicate>
 						<!--
 							PREDICATE
 							
@@ -46,6 +54,7 @@
 							NOTE: after changing what is included or excluded, you should reserialize all items, or at least the added items for additions.
 							NOTE: the "name" attribute controls the folder name the items will go into. If unspecified, the last path segment is used. Names must be unique across the configuration.
 							NOTE: You cannot use excludes with Transparent Sync. See https://github.com/kamsar/Unicorn/wiki/The-Transparent-Sync-Guide
+							NOTE: If your configuration is named in Helix format (Layer.Module), you can use $(layer) and $(module) here as variables.
 						-->
 						<include name="Layouts" database="master" path="/sitecore/layout/Layouts/YourSite" />
 						<include name="Templates" database="master" path="/sitecore/templates/YourSite" />
@@ -64,7 +73,7 @@
 						Transparent Sync (preferred) updates the state of Sitecore instantly as soon as changes to files occur. It is optimal for development purposes, but has a few limitations.
 						See the guide to help decide: https://github.com/kamsar/Unicorn/wiki/The-Transparent-Sync-Guide
 					-->
-					<dataProviderConfiguration enableTransparentSync="false" type="Unicorn.Data.DataProvider.DefaultUnicornDataProviderConfiguration, Unicorn" singleInstance="true" />
+					<dataProviderConfiguration enableTransparentSync="false" />
 
 					<!-- 
 						SYNC CONFIGURATION
@@ -76,8 +85,9 @@
 							Updating the index is important for content that relies on indexing, which may include most user-facing content items. Most of the time templates and renderings don't need indexing.
 						
 						NOTE: UpdateLinkDatabase and UpdateSearchIndex also apply to items that are reloaded from disk when using Transparent Sync, as well as normal Sync.
+						NOTE: Updating the links and search indexes will cause significant performance degradation during syncing.
 					-->
-					<syncConfiguration updateLinkDatabase="false" updateSearchIndex="false" type="Unicorn.Loader.DefaultSyncConfiguration, Unicorn" singleInstance="true" />
+					<syncConfiguration updateLinkDatabase="false" updateSearchIndex="false" />
 				</configuration>
 			</configurations>
 		</unicorn>
diff --git a/src/Unicorn/Standard Config Files/Unicorn.Configs.NewItemsOnly.example b/src/Unicorn/Standard Config Files/Unicorn.Configs.NewItemsOnly.example
index 42ad120f..fe7c7832 100644
--- a/src/Unicorn/Standard Config Files/Unicorn.Configs.NewItemsOnly.example	
+++ b/src/Unicorn/Standard Config Files/Unicorn.Configs.NewItemsOnly.example	
@@ -29,9 +29,9 @@
 						In other words transparent sync always acts like SerializedAsMasterEvaluator because disk is LITERALLY the master.
 						See https://github.com/kamsar/Unicorn/wiki/The-Transparent-Sync-Guide
 					-->
-					<dataProviderConfiguration enableTransparentSync="false" type="Unicorn.Data.DataProvider.DefaultUnicornDataProviderConfiguration, Unicorn" />
+					<dataProviderConfiguration enableTransparentSync="false" />
 
-					<predicate type="Unicorn.Predicates.SerializationPresetPredicate, Unicorn" singleInstance="true">
+					<predicate>
 						<include database="master" path="/sitecore/content/global-settings" />
 					</predicate>
 				</configuration>
diff --git a/src/Unicorn/Standard Config Files/Unicorn.config b/src/Unicorn/Standard Config Files/Unicorn.config
index a422386c..508b643d 100644
--- a/src/Unicorn/Standard Config Files/Unicorn.config	
+++ b/src/Unicorn/Standard Config Files/Unicorn.config	
@@ -97,8 +97,8 @@
 					<fieldComparer type="Rainbow.Diff.Fields.CheckboxComparison, Rainbow" />
 				</itemComparer>
 
-				<!-- There is no default predicate, because this must be configured for each configuration. -->
-				<predicate type="null"/>
+				<!-- The default predicate is set here so that configurations need not specify its class name to use it. -->
+				<predicate type="Unicorn.Predicates.SerializationPresetPredicate, Unicorn" singleInstance="true" />
 
 				<!--
 					The field filter can be used to ignore fields when comparing or serializing (i.e. don't write them to disk).
@@ -146,7 +146,7 @@
 				The configuration provider wires up how the configuration(s) Unicorn is running are parsed.
 				The default provider reads values from this config section.
 			-->
-			<configurationProvider type="Unicorn.Configuration.XmlConfigurationProvider, Unicorn"/>
+			<configurationProvider type="Unicorn.Configuration.ConfigyConfigurationProvider, Unicorn"/>
 		</unicorn>
 
 		<settings>
@@ -185,6 +185,12 @@
 			<!-- Run after a configuration completes reserialization. Handlers should implement IUnicornReserializeCompleteProcessor -->
 			<unicornReserializeComplete>
 			</unicornReserializeComplete>
+		
+			<!-- Expands variables in configuration XML - e.g. Helix conventions -->
+			<unicornExpandConfigurationVariables>
+				<!-- Expands variables of the format $(layer) or $(module) based on configuration naming conventions. Useful for setting defaults by convention e.g. in abstract configurations -->
+				<processor type="Unicorn.Pipelines.UnicornExpandConfigurationVariables.HelixConventionVariablesReplacer, Unicorn" />
+			</unicornExpandConfigurationVariables>
 		</pipelines>
 
 		<processors>
diff --git a/src/Unicorn/Unicorn.csproj b/src/Unicorn/Unicorn.csproj
index 9531938e..b18135e3 100644
--- a/src/Unicorn/Unicorn.csproj
+++ b/src/Unicorn/Unicorn.csproj
@@ -83,6 +83,7 @@
     <Compile Include="Configuration\Dependencies\ConfigurationDependencyResolver.cs" />
     <Compile Include="Configuration\Dependencies\ExplicitConfigurationDependency.cs" />
     <Compile Include="Configuration\Dependencies\IConfigurationDependency.cs" />
+    <Compile Include="Configuration\PipelineBasedVariablesReplacer.cs" />
     <Compile Include="ControlPanel\Controls\BatchProcessingControls.cs" />
     <Compile Include="ControlPanel\Controls\ConfigurationInfo.cs" />
     <Compile Include="ControlPanel\Controls\GlobalWarnings.cs" />
@@ -152,6 +153,9 @@
     <Compile Include="Logging\LogTransaction.cs" />
     <Compile Include="OperationType.cs" />
     <Compile Include="Pipelines\SaveUi\TransparentSyncAwareCheckRevision.cs" />
+    <Compile Include="Pipelines\UnicornExpandConfigurationVariables\HelixConventionVariablesReplacer.cs" />
+    <Compile Include="Pipelines\UnicornExpandConfigurationVariables\IUnicornExpandConfigurationVariablesProcessor.cs" />
+    <Compile Include="Pipelines\UnicornExpandConfigurationVariables\UnicornExpandConfigurationVariablesPipelineArgs.cs" />
     <Compile Include="Pipelines\UnicornReserializeComplete\IUnicornReserializeCompleteProcessor.cs" />
     <Compile Include="Pipelines\UnicornReserializeComplete\UnicornReserializeCompletePipelineArgs.cs" />
     <Compile Include="Pipelines\UnicornSyncComplete\DictionaryCacheClearer.cs" />
@@ -182,7 +186,6 @@
     <Compile Include="UI\Commands\UnicornDumpItemCommand.cs" />
     <Compile Include="Configuration\ConfigurationUtility.cs" />
     <Compile Include="Configuration\MicroConfiguration.cs" />
-    <Compile Include="Configuration\MicroResolutionException.cs" />
     <Compile Include="ControlPanel\Controls\AccessDenied.cs" />
     <Compile Include="ControlPanel\CheckIfFilterDisablerIsActive.cs" />
     <Compile Include="ControlPanel\Controls\ConfigurationDetails.cs" />
@@ -199,7 +202,7 @@
     <Compile Include="ControlPanel\Responses\WebConsoleResponse.cs" />
     <Compile Include="Data\ConfigurationDataStore.cs" />
     <Compile Include="Data\ISerializableItemExtensions.cs" />
-    <Compile Include="Configuration\XmlConfigurationProvider.cs" />
+    <Compile Include="Configuration\ConfigyConfigurationProvider.cs" />
     <Compile Include="Configuration\IConfigurationProvider.cs" />
     <Compile Include="Data\ISourceDataStore.cs" />
     <Compile Include="Data\ITargetDataStore.cs" />
@@ -296,6 +299,10 @@
     <None Include="Unicorn.nuspec" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Configy\src\Configy\Configy.csproj">
+      <Project>{bb66d7f7-6e33-4ac6-b978-e1f4e757f4a5}</Project>
+      <Name>Configy</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Rainbow\src\Rainbow.Storage.Sc\Rainbow.Storage.Sc.csproj">
       <Project>{956afe8b-51cd-4d61-b8c1-bffdc749fd82}</Project>
       <Name>Rainbow.Storage.Sc</Name>