From 63de9e6691723bc6c2b12ef495f432f44d7a4c8d Mon Sep 17 00:00:00 2001
From: Morten Christensen <unknown@kiln.example.com>
Date: Thu, 21 Mar 2013 12:34:10 -0100
Subject: [PATCH] Refactoring package installer to use the new
 PackagingService. Refactoring ImportDocumentType dialog to import through the
 PackagingService. Making a few corrections to the ProppertyGroup and
 PropertyType classes to support bulk saving.

---
 src/Umbraco.Core/Models/ContentTypeBase.cs    |    2 +-
 .../Models/ContentTypeCompositionBase.cs      |    9 +-
 src/Umbraco.Core/Models/PropertyGroup.cs      |   20 +-
 src/Umbraco.Core/Models/PropertyType.cs       |    6 +-
 .../Factories/PropertyGroupFactory.cs         |    6 +-
 .../Repositories/ContentTypeBaseRepository.cs |   24 +-
 src/Umbraco.Core/Services/PackagingService.cs |   42 +-
 src/Umbraco.Core/TopologicalSorter.cs         |    2 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |    1 -
 .../Repositories/ContentTypeRepositoryTest.cs |    2 +-
 .../Importing/ImportResources.Designer.cs     |   54 +-
 .../Services/Importing/ImportResources.resx   |   10 +-
 .../Importing/InheritedDocTypes-Package.xml   |  445 ++++
 .../Services/Importing/PackageImportTests.cs  |  114 +-
 .../{package.xml => StandardMvc-Package.xml}  |    0
 .../Services/Importing/uBlogsy-Package.xml    | 2163 +++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |    4 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |    2 +-
 .../controls/ContentTypeControlNew.ascx.cs    |   22 +-
 .../dialogs/importDocumenttype.aspx.cs        |   55 +-
 .../businesslogic/Packager/Installer.cs       |  892 ++++---
 .../PackageInstance/InstalledPackage.cs       |   14 +-
 src/umbraco.cms/umbraco.cms.csproj            |    1 +
 23 files changed, 3389 insertions(+), 501 deletions(-)
 create mode 100644 src/Umbraco.Tests/Services/Importing/InheritedDocTypes-Package.xml
 rename src/Umbraco.Tests/Services/Importing/{package.xml => StandardMvc-Package.xml} (100%)
 create mode 100644 src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml

diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 0877354bba..35bc9bee3c 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -381,7 +381,7 @@ namespace Umbraco.Core.Models
                 oldPropertyGroup.PropertyTypes.RemoveItem(propertyTypeAlias);
             }
 
-            propertyType.PropertyGroupId = default(int);
+            propertyType.PropertyGroupId = new Lazy<int>(() => default(int));
             propertyType.ResetDirtyProperties();
 
             var propertyGroup = PropertyGroups.First(x => x.Name == propertyGroupName);
diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
index 72c0a6f72a..02a5e7d8f7 100644
--- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
@@ -140,8 +140,8 @@ namespace Umbraco.Core.Models
 
             if (CompositionPropertyGroups.Any(x => x.Name == groupName))
             {
-                var first = CompositionPropertyGroups.First(x => x.Name == groupName && x.ParentId.HasValue == false);
-                propertyGroup.ParentId = first.Id;
+                var firstGroup = CompositionPropertyGroups.First(x => x.Name == groupName && x.ParentId.HasValue == false);
+                propertyGroup.SetLazyParentId(new Lazy<int?>(() => firstGroup.Id));
             }
 
             if (PropertyGroups.Any())
@@ -166,7 +166,7 @@ namespace Umbraco.Core.Models
             {
                 if (PropertyGroups.Contains(propertyGroupName))
                 {
-                    propertyType.PropertyGroupId = PropertyGroups[propertyGroupName].Id;
+                    propertyType.PropertyGroupId = new Lazy<int>(() => PropertyGroups[propertyGroupName].Id);
                     PropertyGroups[propertyGroupName].PropertyTypes.Add(propertyType);
                 }
                 else
@@ -179,7 +179,8 @@ namespace Umbraco.Core.Models
                     {
                         var parentPropertyGroup = CompositionPropertyGroups.First(x => x.Name == propertyGroupName && x.ParentId.HasValue == false);
                         propertyGroup.SortOrder = parentPropertyGroup.SortOrder;
-                        propertyGroup.ParentId = parentPropertyGroup.Id;
+                        //propertyGroup.ParentId = parentPropertyGroup.Id;
+                        propertyGroup.SetLazyParentId(new Lazy<int?>(() => parentPropertyGroup.Id));
                     }
 
                     PropertyGroups.Add(propertyGroup);
diff --git a/src/Umbraco.Core/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs
index 8b1467ec48..d01d7cbbac 100644
--- a/src/Umbraco.Core/Models/PropertyGroup.cs
+++ b/src/Umbraco.Core/Models/PropertyGroup.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Models
     public class PropertyGroup : Entity, IEquatable<PropertyGroup>
     {
         private string _name;
-        private int? _parentId;
+        private Lazy<int?> _parentId;
         private int _sortOrder;
         private PropertyTypeCollection _propertyTypes;
 
@@ -60,10 +60,15 @@ namespace Umbraco.Core.Models
         [DataMember]
         public int? ParentId
         {
-            get { return _parentId; }
+            get
+            {
+                if (_parentId == null)
+                    return default(int?);
+                return _parentId.Value;
+            }
             set
             {
-                _parentId = value;
+                _parentId = new Lazy<int?>(() => value);
                 OnPropertyChanged(ParentIdSelector);
             }
         }
@@ -96,6 +101,15 @@ namespace Umbraco.Core.Models
             }
         }
 
+        /// <summary>
+        /// Sets the ParentId from the lazy integer id
+        /// </summary>
+        /// <param name="id">Id of the Parent</param>
+        internal void SetLazyParentId(Lazy<int?> id)
+        {
+            _parentId = id;
+        }
+
         public bool Equals(PropertyGroup other)
         {
             //Check whether the compared object is null. 
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 874e58ea6f..55bec87bf3 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Core.Models
         private string _alias;
         private string _description;
         private int _dataTypeDefinitionId;
-        private int _propertyGroupId;
+        private Lazy<int> _propertyGroupId;
         private Guid _dataTypeId;
         private DataTypeDatabaseType _dataTypeDatabaseType;
         private bool _mandatory;
@@ -61,7 +61,7 @@ namespace Umbraco.Core.Models
         private static readonly PropertyInfo HelpTextSelector = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.HelpText);
         private static readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<PropertyType, int>(x => x.SortOrder);
         private static readonly PropertyInfo ValidationRegExpSelector = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.ValidationRegExp);
-        private static readonly PropertyInfo PropertyGroupIdSelector = ExpressionHelper.GetPropertyInfo<PropertyType, int>(x => x.PropertyGroupId);
+        private static readonly PropertyInfo PropertyGroupIdSelector = ExpressionHelper.GetPropertyInfo<PropertyType, Lazy<int>>(x => x.PropertyGroupId);
 
         /// <summary>
         /// Gets of Sets the Name of the PropertyType
@@ -153,7 +153,7 @@ namespace Umbraco.Core.Models
         /// Gets or Sets the PropertyGroup's Id for which this PropertyType belongs
         /// </summary>
         [DataMember]
-        internal int PropertyGroupId
+        internal Lazy<int> PropertyGroupId
         {
             get { return _propertyGroupId; }
             set
diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
index 9449f2c375..3139fe5fa4 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
@@ -44,6 +45,7 @@ namespace Umbraco.Core.Persistence.Factories
                 var typeDtos = groupDto.PropertyTypeDtos.Where(x => x.Id > 0);
                 foreach (var typeDto in typeDtos)
                 {
+                    var tempGroupDto = groupDto;
                     var propertyType = new PropertyType(typeDto.DataTypeDto.ControlId,
                                                              typeDto.DataTypeDto.DbType.EnumParse<DataTypeDatabaseType>(true))
                                                 {
@@ -56,7 +58,7 @@ namespace Umbraco.Core.Persistence.Factories
                                                     Mandatory = typeDto.Mandatory,
                                                     SortOrder = typeDto.SortOrder,
                                                     ValidationRegExp = typeDto.ValidationRegExp,
-                                                    PropertyGroupId = groupDto.Id
+                                                    PropertyGroupId = new Lazy<int>(() => tempGroupDto.Id)
                                                 };
                     
                     propertyType.ResetDirtyProperties();
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
index 33c9020e44..93bd973fb0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
@@ -108,7 +108,12 @@ namespace Umbraco.Core.Persistence.Repositories
             //Insert collection of allowed content types
             foreach (var allowedContentType in entity.AllowedContentTypes)
             {
-                Database.Insert(new ContentTypeAllowedContentTypeDto { Id = entity.Id, AllowedId = allowedContentType.Id.Value, SortOrder = allowedContentType.SortOrder });
+                Database.Insert(new ContentTypeAllowedContentTypeDto
+                                    {
+                                        Id = entity.Id,
+                                        AllowedId = allowedContentType.Id.Value,
+                                        SortOrder = allowedContentType.SortOrder
+                                    });
             }
 
             var propertyFactory = new PropertyGroupFactory(nodeDto.NodeId);
@@ -125,14 +130,18 @@ namespace Umbraco.Core.Persistence.Repositories
                 foreach (var propertyType in propertyGroup.PropertyTypes)
                 {
                     if (propertyType.IsPropertyDirty("PropertyGroupId") == false)
-                        propertyType.PropertyGroupId = propertyGroup.Id;
+                    {
+                        var tempGroup = propertyGroup;
+                        propertyType.PropertyGroupId = new Lazy<int>(() => tempGroup.Id);
+                    }
                 }
             }
 
             //Insert PropertyTypes
             foreach (var propertyType in entity.PropertyTypes)
             {
-                var propertyTypeDto = propertyFactory.BuildPropertyTypeDto(propertyType.PropertyGroupId, propertyType);
+                var tabId = propertyType.PropertyGroupId != null ? propertyType.PropertyGroupId.Value : default(int);
+                var propertyTypeDto = propertyFactory.BuildPropertyTypeDto(tabId, propertyType);
                 int typePrimaryKey = Convert.ToInt32(Database.Insert(propertyTypeDto));
                 propertyType.Id = typePrimaryKey; //Set Id on new PropertyType
 
@@ -272,15 +281,18 @@ namespace Umbraco.Core.Persistence.Repositories
                 foreach (var propertyType in propertyGroup.PropertyTypes)
                 {
                     if (propertyType.IsPropertyDirty("PropertyGroupId") == false)
-                        propertyType.PropertyGroupId = propertyGroup.Id;
+                    {
+                        var tempGroup = propertyGroup;
+                        propertyType.PropertyGroupId = new Lazy<int>(() => tempGroup.Id);
+                    }
                 }
             }
 
             //Run through all PropertyTypes to insert or update entries
             foreach (var propertyType in entity.PropertyTypes)
             {
-                var propertyTypeDto = propertyGroupFactory.BuildPropertyTypeDto(propertyType.PropertyGroupId,
-                                                                                propertyType);
+                var tabId = propertyType.PropertyGroupId != null ? propertyType.PropertyGroupId.Value : default(int);
+                var propertyTypeDto = propertyGroupFactory.BuildPropertyTypeDto(tabId, propertyType);
                 int typePrimaryKey = propertyType.HasIdentity
                                          ? Database.Update(propertyTypeDto)
                                          : Convert.ToInt32(Database.Insert(propertyTypeDto));
diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs
index 571a883b2a..8d67e7ab1d 100644
--- a/src/Umbraco.Core/Services/PackagingService.cs
+++ b/src/Umbraco.Core/Services/PackagingService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -47,9 +46,10 @@ namespace Umbraco.Core.Services
         /// Imports and saves package xml as <see cref="IContent"/>
         /// </summary>
         /// <param name="element">Xml to import</param>
-        /// <param name="userId"></param>
+        /// <param name="parentId">Optional parent Id for the content being imported</param>
+        /// <param name="userId">Optional Id of the user performing the import</param>
         /// <returns>An enumrable list of generated content</returns>
-        public IEnumerable<IContent> ImportContent(XElement element, int userId = 0)
+        public IEnumerable<IContent> ImportContent(XElement element, int parentId = -1, int userId = 0)
         {
             var name = element.Name.LocalName;
             if (name.Equals("DocumentSet"))
@@ -59,7 +59,7 @@ namespace Umbraco.Core.Services
                             where (string)doc.Attribute("isDoc") == ""
                             select doc;
 
-                var contents = ParseDocumentRootXml(roots);
+                var contents = ParseDocumentRootXml(roots, parentId);
                 _contentService.Save(contents, userId);
 
                 return contents;
@@ -70,7 +70,7 @@ namespace Umbraco.Core.Services
             {
                 //This is a single doc import
                 var elements = new List<XElement> { element };
-                var contents = ParseDocumentRootXml(elements);
+                var contents = ParseDocumentRootXml(elements, parentId);
                 _contentService.Save(contents, userId);
 
                 return contents;
@@ -81,7 +81,7 @@ namespace Umbraco.Core.Services
                 "'DocumentSet' (for structured imports) nor is the first element a Document (for single document import).");
         }
 
-        private IEnumerable<IContent> ParseDocumentRootXml(IEnumerable<XElement> roots)
+        private IEnumerable<IContent> ParseDocumentRootXml(IEnumerable<XElement> roots, int parentId)
         {
             var contents = new List<IContent>();
             foreach (var root in roots)
@@ -97,7 +97,7 @@ namespace Umbraco.Core.Services
                     _importedContentTypes.Add(contentTypeAlias, contentType);
                 }
 
-                var content = CreateContentFromXml(root, _importedContentTypes[contentTypeAlias], null, -1, isLegacySchema);
+                var content = CreateContentFromXml(root, _importedContentTypes[contentTypeAlias], null, parentId, isLegacySchema);
                 contents.Add(content);
 
                 var children = from child in root.Elements()
@@ -264,6 +264,9 @@ namespace Umbraco.Core.Services
                                             Alias = infoElement.Element("Alias").Value
                                         };
 
+            if (parent != null)
+                contentType.AddContentType(parent);
+
             return UpdateContentTypeFromXml(documentType, contentType);
         }
 
@@ -311,17 +314,20 @@ namespace Umbraco.Core.Services
                 contentType.AllowedTemplates = allowedTemplates;
             }
 
-            var defaultTemplate = _fileService.GetTemplate(defaultTemplateElement.Value);
-            if (defaultTemplate != null)
+            if (string.IsNullOrEmpty(defaultTemplateElement.Value) == false)
             {
-                contentType.SetDefaultTemplate(defaultTemplate);
-            }
-            else
-            {
-                LogHelper.Warn<PackagingService>(
-                    string.Format(
-                        "Packager: Error handling default template. Default template with alias '{0}' could not be found.",
-                        defaultTemplateElement.Value));
+                var defaultTemplate = _fileService.GetTemplate(defaultTemplateElement.Value);
+                if (defaultTemplate != null)
+                {
+                    contentType.SetDefaultTemplate(defaultTemplate);
+                }
+                else
+                {
+                    LogHelper.Warn<PackagingService>(
+                        string.Format(
+                            "Packager: Error handling default template. Default template with alias '{0}' could not be found.",
+                            defaultTemplateElement.Value));
+                }
             }
         }
 
@@ -561,7 +567,7 @@ namespace Umbraco.Core.Services
                 fields.Add(field);
             }
             //Sort templates by dependencies to a potential master template
-            var sortedElements = TopologicalSorter.RetrieveMappedItems(fields);
+            var sortedElements = TopologicalSorter.GetSortedItems(fields);
             foreach (var templateElement in sortedElements)
             {
                 var templateName = templateElement.Element("Name").Value;
diff --git a/src/Umbraco.Core/TopologicalSorter.cs b/src/Umbraco.Core/TopologicalSorter.cs
index 6324e6e10b..56cdc73051 100644
--- a/src/Umbraco.Core/TopologicalSorter.cs
+++ b/src/Umbraco.Core/TopologicalSorter.cs
@@ -110,7 +110,7 @@ namespace Umbraco.Core
         #endregion
 
         #region Internal Staic methods
-        internal static IEnumerable<T> RetrieveMappedItems<T>(List<DependencyField<T>> fields) where T : class 
+        internal static IEnumerable<T> GetSortedItems<T>(List<DependencyField<T>> fields) where T : class 
         {
             int[] sortOrder = GetTopologicalSortOrder(fields);
             var list = new List<T>();
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 11fd35fb97..981b4cb41d 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -707,7 +707,6 @@
       <Name>umbraco.interfaces</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index 7fd9ed5127..ac718e7ee1 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -258,7 +258,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             Assert.That(updated.PropertyGroups.Count(), Is.EqualTo(2));
             Assert.That(updated.PropertyTypes.Count(), Is.EqualTo(5));
             Assert.That(updated.PropertyTypes.Any(x => x.Alias == "urlAlias"), Is.True);
-            Assert.AreEqual(updated.PropertyTypes.First(x => x.Alias == "urlAlias").PropertyGroupId, default(int));
+            Assert.AreEqual(updated.PropertyTypes.First(x => x.Alias == "urlAlias").PropertyGroupId.Value, default(int));
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
index c46ae43bb5..fe580b782b 100644
--- a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
+++ b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
@@ -60,6 +60,31 @@ namespace Umbraco.Tests.Services.Importing {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
+        ///&lt;umbPackage&gt;
+        ///  &lt;files /&gt;
+        ///  &lt;info&gt;
+        ///    &lt;package&gt;
+        ///      &lt;name&gt;DocTypeError&lt;/name&gt;
+        ///      &lt;version&gt;1&lt;/version&gt;
+        ///      &lt;license url=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;Personal license&lt;/license&gt;
+        ///      &lt;url&gt;http://www.iseli-webconsulting.de&lt;/url&gt;
+        ///      &lt;requirements&gt;
+        ///        &lt;major&gt;3&lt;/major&gt;
+        ///        &lt;minor&gt;0&lt;/minor&gt;
+        ///        &lt;patch&gt;0&lt;/patch&gt;
+        ///      &lt;/requirements&gt;
+        ///    &lt;/package&gt;
+        ///    &lt;author&gt;
+        ///      &lt;name&gt;Iseli Webconsulting&lt;/name&gt; [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string InheritedDocTypes_Package {
+            get {
+                return ResourceManager.GetString("InheritedDocTypes_Package", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
         ///&lt;umbPackage&gt;
@@ -81,9 +106,34 @@ namespace Umbraco.Tests.Services.Importing {
         ///    &lt;/file&gt;
         /// [rest of string was truncated]&quot;;.
         /// </summary>
-        internal static string package {
+        internal static string StandardMvc_Package {
             get {
-                return ResourceManager.GetString("package", resourceCulture);
+                return ResourceManager.GetString("StandardMvc_Package", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
+        ///&lt;umbPackage&gt;
+        ///  &lt;files&gt;
+        ///    &lt;file&gt;
+        ///      &lt;guid&gt;uBlogsy.BusinessLogic.dll&lt;/guid&gt;
+        ///      &lt;orgPath&gt;/bin&lt;/orgPath&gt;
+        ///      &lt;orgName&gt;uBlogsy.BusinessLogic.dll&lt;/orgName&gt;
+        ///    &lt;/file&gt;
+        ///    &lt;file&gt;
+        ///      &lt;guid&gt;uBlogsy.BusinessLogic.pdb&lt;/guid&gt;
+        ///      &lt;orgPath&gt;/bin&lt;/orgPath&gt;
+        ///      &lt;orgName&gt;uBlogsy.BusinessLogic.pdb&lt;/orgName&gt;
+        ///    &lt;/file&gt;
+        ///    &lt;file&gt;
+        ///      &lt;guid&gt;uBlogsy.Common.dll&lt;/guid&gt;
+        ///      &lt;orgPath&gt;/bin&lt;/orgPath&gt;
+        ///      &lt;orgName&gt;uBlogsy.Common.dll&lt;/orgNam [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string uBlogsy_Package {
+            get {
+                return ResourceManager.GetString("uBlogsy_Package", resourceCulture);
             }
         }
     }
diff --git a/src/Umbraco.Tests/Services/Importing/ImportResources.resx b/src/Umbraco.Tests/Services/Importing/ImportResources.resx
index d277ad5aaf..6fd3b9cf87 100644
--- a/src/Umbraco.Tests/Services/Importing/ImportResources.resx
+++ b/src/Umbraco.Tests/Services/Importing/ImportResources.resx
@@ -118,7 +118,13 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="package" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>package.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="InheritedDocTypes_Package" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>inheriteddoctypes-package.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="StandardMvc_Package" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>standardmvc-package.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="uBlogsy_Package" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>ublogsy-package.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Services/Importing/InheritedDocTypes-Package.xml b/src/Umbraco.Tests/Services/Importing/InheritedDocTypes-Package.xml
new file mode 100644
index 0000000000..29e1f62b6b
--- /dev/null
+++ b/src/Umbraco.Tests/Services/Importing/InheritedDocTypes-Package.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<umbPackage>
+  <files />
+  <info>
+    <package>
+      <name>DocTypeError</name>
+      <version>1</version>
+      <license url="http://www.opensource.org/licenses/mit-license.php">Personal license</license>
+      <url>http://www.iseli-webconsulting.de</url>
+      <requirements>
+        <major>3</major>
+        <minor>0</minor>
+        <patch>0</patch>
+      </requirements>
+    </package>
+    <author>
+      <name>Iseli Webconsulting</name>
+      <website>http://www.iseli-webconsulting.de</website>
+    </author>
+    <readme><![CDATA[Test package to reproduce the error for document type properties assigned to a tab inherited from a master document type.]]></readme>
+  </info>
+  <DocumentTypes>
+    <DocumentType>
+      <Info>
+        <Name>MR Basisseite</Name>
+        <Alias>MRBasePage</Alias>
+        <Icon>folder.gif</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>Basistyp für alle Seiten der MR-Racing Website.</Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Beschreibung</Name>
+          <Alias>description</Alias>
+          <Type>60b7dabf-99cd-41eb-b8e9-4d2e669bbde9</Type>
+          <Definition>1251c96c-185c-4e9b-93f4-b48205573cbd</Definition>
+          <Tab>Metadaten</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Eine kurze Beschreibung der aktuellen Seite für eine bessere Indexierung durch Suchmaschinen (max. 255 Zeichen).]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Keywords</Name>
+          <Alias>keywords</Alias>
+          <Type>60b7dabf-99cd-41eb-b8e9-4d2e669bbde9</Type>
+          <Definition>1251c96c-185c-4e9b-93f4-b48205573cbd</Definition>
+          <Tab>Metadaten</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Komma-separtierte Auflistung von Stichwörter für die Indexierung von Suchmaschinen. Beispiel: MR Racing, Tuning, Chiptuning, Autozubehör.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>In der Navigation ausblenden</Name>
+          <Alias>hideInNavigation</Alias>
+          <Type>38b352c1-e9f8-4fd8-9324-9a2eab06d97a</Type>
+          <Definition>92897bc6-a5f3-4ffe-ae27-f2e7e33dda49</Definition>
+          <Tab>
+          </Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Selektieren damit dieser Eintrag nicht in der Navigation erscheint.]]></Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>6</Id>
+          <Caption>Metadaten</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>MR Startseite</Name>
+        <Alias>MRStartPage</Alias>
+        <Icon>folder.gif</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>Die Startseite des Internetauftritts von MR Racing.</Description>
+        <AllowAtRoot>True</AllowAtRoot>
+        <Master>MRBasePage</Master>
+        <AllowedTemplates>
+          <Template>MRStartPage</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>MRStartPage</DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>MRContentPage</DocumentType>
+        <DocumentType>MRNewsSummary</DocumentType>
+      </Structure>
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Facebook App ID</Name>
+          <Alias>facebookAppID</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Facebook</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Hier bitte die ID Ihrer Facebook App eingeben damit der "Gefällt mir" Link sowie die Kommentar Felder geladen werden können.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Facebook Like URL</Name>
+          <Alias>facebookLikeUrl</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Facebook</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Hier bitte die URL angeben für welche der "Gefällt mir" Link von Facebook gilt.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Facebook Seite URL</Name>
+          <Alias>facebookSiteUrl</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Facebook</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Hier bitte die URL der Facebook Seite von MR Racing angeben für den Link in den Fussnoten.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Titel der Webseite</Name>
+          <Alias>websiteTitle</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Metadaten</Tab>
+          <Mandatory>True</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Angabe des globalen Webseiten-Titels für die Suchmaschinen.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Autor</Name>
+          <Alias>author</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Metadaten</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Angabe des Besitzers / des Autors der Webseiten-Inhalte.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Generator</Name>
+          <Alias>generator</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Metadaten</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Angabe des Verwaltungssystem welches die Inhaltsausgabe erstellt. zB. Umbraco v6.0.2]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Web-Autor</Name>
+          <Alias>webAuthor</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Metadaten</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Angabe des Erstellers / Programmierers der Webseite.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Titel</Name>
+          <Alias>titleBoxRight</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Angebot Rechts</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Der Titel des Angebots.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Newstitel</Name>
+          <Alias>newsTitle</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>News</Tab>
+          <Mandatory>True</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Titel der Box welche die Neuigkeiten auflistet.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Anzanl News</Name>
+          <Alias>numberOfNews</Alias>
+          <Type>1413afcb-d19a-4173-8e9a-68288d2a73b8</Type>
+          <Definition>2e6d3631-066e-44b8-aec4-96f09099b2b5</Definition>
+          <Tab>News</Tab>
+          <Mandatory>True</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Angabe wieviele News-Einträge inder News-Box visualisiert werden sollen. Standard sind 5.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Link</Name>
+          <Alias>linkBoxRight</Alias>
+          <Type>158aa029-24ed-4948-939e-c3da209e5fba</Type>
+          <Definition>a6857c73-d6e9-480c-b6e6-f15f6ad11125</Definition>
+          <Tab>Angebot Rechts</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Optionale Angabe eines Seite welcher als Link hinter die Box gelegt wird so dass ein Besucher per Klick zur passenden Seite weitergeleitet wird.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Bild</Name>
+          <Alias>imageBoxRight</Alias>
+          <Type>ead69342-f06d-4253-83ac-28000225583b</Type>
+          <Definition>93929b9a-93a2-4e2a-b239-d99334440a59</Definition>
+          <Tab>Angebot Rechts</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Optionales Bild für das Angebot.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Bildbreite</Name>
+          <Alias>imageWidthBoxRight</Alias>
+          <Type>1413afcb-d19a-4173-8e9a-68288d2a73b8</Type>
+          <Definition>2e6d3631-066e-44b8-aec4-96f09099b2b5</Definition>
+          <Tab>Angebot Rechts</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>^([6-9][0-9]|1[0-9]{2}|2[0-7][0-9]|280)$</Validation>
+          <Description><![CDATA[Optionale Angabe der Bildbreite. Das Bild muss mindestens 60 breit sein. Das Maxium ist 280. Standard ist 120.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Inhalt</Name>
+          <Alias>contentBoxRight</Alias>
+          <Type>60b7dabf-99cd-41eb-b8e9-4d2e669bbde9</Type>
+          <Definition>1251c96c-185c-4e9b-93f4-b48205573cbd</Definition>
+          <Tab>Angebot Rechts</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Der Textinhalt des Angebots.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Titel</Name>
+          <Alias>titleBoxMiddle</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Angebot Mitte</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Der Titel des Angebots.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Link</Name>
+          <Alias>linkBoxMiddle</Alias>
+          <Type>158aa029-24ed-4948-939e-c3da209e5fba</Type>
+          <Definition>a6857c73-d6e9-480c-b6e6-f15f6ad11125</Definition>
+          <Tab>Angebot Mitte</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Optionale Angabe eines Seite welcher als Link hinter die Box gelegt wird so dass ein Besucher per Klick zur passenden Seite weitergeleitet wird.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Bild</Name>
+          <Alias>imageBoxMiddle</Alias>
+          <Type>ead69342-f06d-4253-83ac-28000225583b</Type>
+          <Definition>93929b9a-93a2-4e2a-b239-d99334440a59</Definition>
+          <Tab>Angebot Mitte</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Optionales Bild für das Angebot.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Bildbreite</Name>
+          <Alias>imageWidthBoxMiddle</Alias>
+          <Type>1413afcb-d19a-4173-8e9a-68288d2a73b8</Type>
+          <Definition>2e6d3631-066e-44b8-aec4-96f09099b2b5</Definition>
+          <Tab>Angebot Mitte</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>^([6-9][0-9]|1[0-9]{2}|2[0-7][0-9]|280)$</Validation>
+          <Description><![CDATA[Optionale Angabe der Bildbreite. Das Bild muss mindestens 60 breit sein. Das Maxium ist 280. Standard ist 120.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Inhalt</Name>
+          <Alias>contentBoxMiddle</Alias>
+          <Type>60b7dabf-99cd-41eb-b8e9-4d2e669bbde9</Type>
+          <Definition>1251c96c-185c-4e9b-93f4-b48205573cbd</Definition>
+          <Tab>Angebot Mitte</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Der Textinhalt des Angebots.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Titel</Name>
+          <Alias>titleBoxLeft</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Angebot Links</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Der Titel des Angebots.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Link</Name>
+          <Alias>linkBoxLeft</Alias>
+          <Type>158aa029-24ed-4948-939e-c3da209e5fba</Type>
+          <Definition>a6857c73-d6e9-480c-b6e6-f15f6ad11125</Definition>
+          <Tab>Angebot Links</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Optionale Angabe eines Seite welcher als Link hinter die Box gelegt wird so dass ein Besucher per Klick zur passenden Seite weitergeleitet wird.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Bild</Name>
+          <Alias>imageBoxLeft</Alias>
+          <Type>ead69342-f06d-4253-83ac-28000225583b</Type>
+          <Definition>93929b9a-93a2-4e2a-b239-d99334440a59</Definition>
+          <Tab>Angebot Links</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Optionales Bild für das Angebot.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Bildbreite</Name>
+          <Alias>imageWidthBoxLeft</Alias>
+          <Type>1413afcb-d19a-4173-8e9a-68288d2a73b8</Type>
+          <Definition>2e6d3631-066e-44b8-aec4-96f09099b2b5</Definition>
+          <Tab>Angebot Links</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>^([6-9][0-9]|1[0-9]{2}|2[0-7][0-9]|280)$</Validation>
+          <Description><![CDATA[Optionale Angabe der Bildbreite. Das Bild muss mindestens 60 breit sein. Das Maxium ist 280. Standard ist 120.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Inhalt</Name>
+          <Alias>contentBoxLeft</Alias>
+          <Type>60b7dabf-99cd-41eb-b8e9-4d2e669bbde9</Type>
+          <Definition>1251c96c-185c-4e9b-93f4-b48205573cbd</Definition>
+          <Tab>Angebot Links</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Der Textinhalt des Angebots.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Inhaltstitel</Name>
+          <Alias>contentTitle</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Inhalt</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Der Titel des Inhaltsbereichs.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Inhaltstitel verbergen</Name>
+          <Alias>hideContentTitle</Alias>
+          <Type>38b352c1-e9f8-4fd8-9324-9a2eab06d97a</Type>
+          <Definition>92897bc6-a5f3-4ffe-ae27-f2e7e33dda49</Definition>
+          <Tab>Inhalt</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Selektieren um den Titelbalken für den Inhaltsbereich zu verbergen.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Inhaltspadding weglassen</Name>
+          <Alias>hideContentPadding</Alias>
+          <Type>38b352c1-e9f8-4fd8-9324-9a2eab06d97a</Type>
+          <Definition>92897bc6-a5f3-4ffe-ae27-f2e7e33dda49</Definition>
+          <Tab>Inhalt</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Selektieren um das Padding zwischen Inhalt und Rahmen im Inhaltsbereich auszuschalten.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Inhalt</Name>
+          <Alias>content</Alias>
+          <Type>5e9b75ae-face-41c8-b47e-5f4b0fd82f83</Type>
+          <Definition>ca90c950-0aff-4e72-b976-a30b1ac57dad</Definition>
+          <Tab>Inhalt</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>9</Id>
+          <Caption>Inhalt</Caption>
+        </Tab>
+        <Tab>
+          <Id>10</Id>
+          <Caption>Angebot Links</Caption>
+        </Tab>
+        <Tab>
+          <Id>11</Id>
+          <Caption>Angebot Mitte</Caption>
+        </Tab>
+        <Tab>
+          <Id>12</Id>
+          <Caption>Angebot Rechts</Caption>
+        </Tab>
+        <Tab>
+          <Id>13</Id>
+          <Caption>News</Caption>
+        </Tab>
+        <Tab>
+          <Id>14</Id>
+          <Caption>Facebook</Caption>
+        </Tab>
+        <Tab>
+          <Id>15</Id>
+          <Caption>Metadaten</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+  </DocumentTypes>
+  <Templates />
+  <Stylesheets />
+  <Macros />
+  <DictionaryItems />
+  <Languages />
+  <DataTypes />
+  <Actions>
+    <Action runat="install" undo="true" alias="AddServiceHostingEnvironment" multipleSiteBindingsEnabled="true" aspNetCompatibilityEnabled="true" />
+  </Actions>
+</umbPackage>
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
index 564bfc6d3e..287ebd0c94 100644
--- a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
+++ b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
@@ -19,11 +19,99 @@ namespace Umbraco.Tests.Services.Importing
             base.TearDown();
         }
 
+        [Test]
+        public void PackagingService_Can_Import_uBlogsy_ContentTypes_And_Verify_Structure()
+        {
+            // Arrange
+            string strXml = ImportResources.uBlogsy_Package;
+            var xml = XElement.Parse(strXml);
+            var dataTypeElement = xml.Descendants("DataTypes").First();
+            var templateElement = xml.Descendants("Templates").First();
+            var docTypeElement = xml.Descendants("DocumentTypes").First();
+            var packagingService = ServiceContext.PackagingService;
+
+            // Act
+            var dataTypes = packagingService.ImportDataTypeDefinitions(dataTypeElement);
+            var templates = packagingService.ImportTemplates(templateElement);
+            var contentTypes = packagingService.ImportContentTypes(docTypeElement);
+
+            var numberOfTemplates = (from doc in templateElement.Elements("Template") select doc).Count();
+            var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+            // Assert
+            Assert.That(dataTypes.Any(), Is.True);
+            Assert.That(templates.Any(), Is.True);
+            Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
+            Assert.That(contentTypes.Any(), Is.True);
+            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+
+            var uBlogsyBaseDocType = contentTypes.First(x => x.Alias == "uBlogsyBaseDocType");
+            Assert.That(uBlogsyBaseDocType.PropertyTypes.Count(), Is.EqualTo(5));
+            Assert.That(uBlogsyBaseDocType.PropertyGroups.Any(), Is.False);
+
+            var uBlogsyBasePage = contentTypes.First(x => x.Alias == "uBlogsyBasePage");
+            Assert.That(uBlogsyBasePage.ContentTypeCompositionExists("uBlogsyBaseDocType"), Is.True);
+            Assert.That(uBlogsyBasePage.PropertyTypes.Count(), Is.EqualTo(7));
+            Assert.That(uBlogsyBasePage.PropertyGroups.Count(), Is.EqualTo(3));
+            Assert.That(uBlogsyBasePage.PropertyGroups["Content"].PropertyTypes.Count(), Is.EqualTo(3));
+            Assert.That(uBlogsyBasePage.PropertyGroups["SEO"].PropertyTypes.Count(), Is.EqualTo(3));
+            Assert.That(uBlogsyBasePage.PropertyGroups["Navigation"].PropertyTypes.Count(), Is.EqualTo(1));
+            Assert.That(uBlogsyBasePage.CompositionPropertyTypes.Count(), Is.EqualTo(12));
+
+            var uBlogsyLanding = contentTypes.First(x => x.Alias == "uBlogsyLanding");
+            Assert.That(uBlogsyLanding.ContentTypeCompositionExists("uBlogsyBasePage"), Is.True);
+            Assert.That(uBlogsyLanding.ContentTypeCompositionExists("uBlogsyBaseDocType"), Is.True);
+            Assert.That(uBlogsyLanding.PropertyTypes.Count(), Is.EqualTo(5));
+            Assert.That(uBlogsyLanding.PropertyGroups.Count(), Is.EqualTo(2));
+            Assert.That(uBlogsyLanding.CompositionPropertyTypes.Count(), Is.EqualTo(17));
+            Assert.That(uBlogsyLanding.CompositionPropertyGroups.Count(), Is.EqualTo(5));
+        }
+
+        [Test]
+        public void PackagingService_Can_Import_Inherited_ContentTypes_And_Verify_PropertyGroups_And_PropertyTypes()
+        {
+            // Arrange
+            string strXml = ImportResources.InheritedDocTypes_Package;
+            var xml = XElement.Parse(strXml);
+            var dataTypeElement = xml.Descendants("DataTypes").First();
+            var templateElement = xml.Descendants("Templates").First();
+            var docTypeElement = xml.Descendants("DocumentTypes").First();
+            var packagingService = ServiceContext.PackagingService;
+
+            // Act
+            var dataTypes = packagingService.ImportDataTypeDefinitions(dataTypeElement);
+            var templates = packagingService.ImportTemplates(templateElement);
+            var contentTypes = packagingService.ImportContentTypes(docTypeElement);
+
+            var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+            // Assert
+            Assert.That(dataTypes.Any(), Is.False);
+            Assert.That(templates.Any(), Is.False);
+            Assert.That(contentTypes.Any(), Is.True);
+            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+
+            var mRBasePage = contentTypes.First(x => x.Alias == "MRBasePage");
+            Assert.That(mRBasePage.PropertyTypes.Count(), Is.EqualTo(3));
+            Assert.That(mRBasePage.PropertyGroups.Count(), Is.EqualTo(1));
+            Assert.That(mRBasePage.PropertyGroups["Metadaten"].PropertyTypes.Count(), Is.EqualTo(2));
+
+            var mRStartPage = contentTypes.First(x => x.Alias == "MRStartPage");
+            Assert.That(mRStartPage.ContentTypeCompositionExists("MRBasePage"), Is.True);
+            Assert.That(mRStartPage.PropertyTypes.Count(), Is.EqualTo(28));
+            Assert.That(mRStartPage.PropertyGroups.Count(), Is.EqualTo(7));
+
+            var propertyGroups = mRStartPage.CompositionPropertyGroups.Where(x => x.Name == "Metadaten");
+            var propertyTypes = propertyGroups.SelectMany(x => x.PropertyTypes);
+            Assert.That(propertyGroups.Count(), Is.EqualTo(2));
+            Assert.That(propertyTypes.Count(), Is.EqualTo(6));
+        }
+
         [Test]
         public void PackagingService_Can_Import_Template_Package_Xml()
         {
             // Arrange
-            string strXml = ImportResources.package;
+            string strXml = ImportResources.StandardMvc_Package;
             var xml = XElement.Parse(strXml);
             var element = xml.Descendants("Templates").First();
             var packagingService = ServiceContext.PackagingService;
@@ -39,34 +127,46 @@ namespace Umbraco.Tests.Services.Importing
         }
 
         [Test]
-        public void PackagingService_Can_Import_ContentType_Package_Xml()
+        public void PackagingService_Can_Import_StandardMvc_ContentTypes_Package_Xml()
         {
             // Arrange
-            string strXml = ImportResources.package;
+            string strXml = ImportResources.StandardMvc_Package;
             var xml = XElement.Parse(strXml);
-            var element = xml.Descendants("DocumentTypes").First();
             var dataTypeElement = xml.Descendants("DataTypes").First();
+            var templateElement = xml.Descendants("Templates").First();
+            var docTypeElement = xml.Descendants("DocumentTypes").First();
             var packagingService = ServiceContext.PackagingService;
 
             // Act
             var dataTypeDefinitions = packagingService.ImportDataTypeDefinitions(dataTypeElement);
-            var contentTypes = packagingService.ImportContentTypes(element);
-            var numberOfDocTypes = (from doc in element.Elements("DocumentType") select doc).Count();
+            var templates = packagingService.ImportTemplates(templateElement);
+            var contentTypes = packagingService.ImportContentTypes(docTypeElement);
+            var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
 
             // Assert
             Assert.That(dataTypeDefinitions, Is.Not.Null);
             Assert.That(dataTypeDefinitions.Any(), Is.True);
+            Assert.That(templates.Any(), Is.True);
             Assert.That(contentTypes, Is.Not.Null);
             Assert.That(contentTypes.Any(), Is.True);
             Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
             Assert.That(contentTypes.Count(x => x.ParentId == -1), Is.EqualTo(1));
+
+            var contentMaster = contentTypes.First(x => x.Alias == "ContentMaster");
+            Assert.That(contentMaster.PropertyTypes.Count(), Is.EqualTo(3));
+            Assert.That(contentMaster.PropertyGroups.Count(), Is.EqualTo(1));
+            Assert.That(contentMaster.PropertyGroups["SEO"].PropertyTypes.Count(), Is.EqualTo(3));
+            Assert.That(contentMaster.ContentTypeCompositionExists("Base"), Is.True);
+
+            var propertyGroupId = contentMaster.PropertyGroups["SEO"].Id;
+            Assert.That(contentMaster.PropertyGroups["SEO"].PropertyTypes.Any(x => x.PropertyGroupId.Value != propertyGroupId), Is.False);
         }
 
         [Test]
         public void PackagingService_Can_Import_Content_Package_Xml()
         {
             // Arrange
-            string strXml = ImportResources.package;
+            string strXml = ImportResources.StandardMvc_Package;
             var xml = XElement.Parse(strXml);
             var dataTypeElement = xml.Descendants("DataTypes").First();
             var docTypesElement = xml.Descendants("DocumentTypes").First();
diff --git a/src/Umbraco.Tests/Services/Importing/package.xml b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
similarity index 100%
rename from src/Umbraco.Tests/Services/Importing/package.xml
rename to src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
diff --git a/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml b/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml
new file mode 100644
index 0000000000..98e12465f5
--- /dev/null
+++ b/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml
@@ -0,0 +1,2163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<umbPackage>
+  <files>
+    <file>
+      <guid>uBlogsy.BusinessLogic.dll</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uBlogsy.BusinessLogic.dll</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy.BusinessLogic.pdb</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uBlogsy.BusinessLogic.pdb</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy.Common.dll</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uBlogsy.Common.dll</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy.Common.pdb</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uBlogsy.Common.pdb</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy.Mvc.Parts.dll</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uBlogsy.Mvc.Parts.dll</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy.Mvc.Parts.pdb</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uBlogsy.Mvc.Parts.pdb</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy.Web.dll</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uBlogsy.Web.dll</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy.Web.pdb</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uBlogsy.Web.pdb</orgName>
+    </file>
+    <file>
+      <guid>uDateFoldersy.dll</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uDateFoldersy.dll</orgName>
+    </file>
+    <file>
+      <guid>uDateFoldersy.pdb</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uDateFoldersy.pdb</orgName>
+    </file>
+    <file>
+      <guid>uLoremsy.dll</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uLoremsy.dll</orgName>
+    </file>
+    <file>
+      <guid>uLoremsy.pdb</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uLoremsy.pdb</orgName>
+    </file>
+    <file>
+      <guid>uHelpsy.dll</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uHelpsy.dll</orgName>
+    </file>
+    <file>
+      <guid>uHelpsy.pdb</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uHelpsy.pdb</orgName>
+    </file>
+    <file>
+      <guid>uTagsy.Web.dll</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uTagsy.Web.dll</orgName>
+    </file>
+    <file>
+      <guid>uTagsy.Web.pdb</guid>
+      <orgPath>/bin</orgPath>
+      <orgName>uTagsy.Web.pdb</orgName>
+    </file>
+    <file>
+      <guid>CreatePost.ascx</guid>
+      <orgPath>/usercontrols/uBlogsy/dashboard</orgPath>
+      <orgName>CreatePost.ascx</orgName>
+    </file>
+    <file>
+      <guid>RSSImport.ascx</guid>
+      <orgPath>/usercontrols/uBlogsy/dashboard</orgPath>
+      <orgName>RSSImport.ascx</orgName>
+    </file>
+    <file>
+      <guid>uTagsy.ascx</guid>
+      <orgPath>/usercontrols/uTagsy</orgPath>
+      <orgName>uTagsy.ascx</orgName>
+    </file>
+    <file>
+      <guid>uDateFoldersy.config</guid>
+      <orgPath>/config</orgPath>
+      <orgName>uDateFoldersy.config</orgName>
+    </file>
+    <file>
+      <guid>uTagsy.config</guid>
+      <orgPath>/config</orgPath>
+      <orgName>uTagsy.config</orgName>
+    </file>
+    <file>
+      <guid>uLoremsy.config</guid>
+      <orgPath>/config</orgPath>
+      <orgName>uLoremsy.config</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy.css</guid>
+      <orgPath>/css</orgPath>
+      <orgName>uBlogsy.css</orgName>
+    </file>
+    <file>
+      <guid>uBlogsy_feed-icon-14x14.png</guid>
+      <orgPath>/Images</orgPath>
+      <orgName>uBlogsy_feed-icon-14x14.png</orgName>
+    </file>
+    <file>
+      <guid>calendar_view_day.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>calendar_view_day.png</orgName>
+    </file>
+    <file>
+      <guid>date.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>date.png</orgName>
+    </file>
+    <file>
+      <guid>feed.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>feed.png</orgName>
+    </file>
+    <file>
+      <guid>folder_table.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>folder_table.png</orgName>
+    </file>
+    <file>
+      <guid>folder_user.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>folder_user.png</orgName>
+    </file>
+    <file>
+      <guid>house.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>house.png</orgName>
+    </file>
+    <file>
+      <guid>page_green.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>page_green.png</orgName>
+    </file>
+    <file>
+      <guid>page_white_cup.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>page_white_cup.png</orgName>
+    </file>
+    <file>
+      <guid>rss.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>rss.png</orgName>
+    </file>
+    <file>
+      <guid>tag.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>tag.png</orgName>
+    </file>
+    <file>
+      <guid>tag_blue.png</guid>
+      <orgPath>/Umbraco/Images/Umbraco</orgPath>
+      <orgName>tag_blue.png</orgName>
+    </file>
+    <file>
+      <guid>tag_blue_add.png</guid>
+      <orgPath>/Umbraco/Images/Umbraco</orgPath>
+      <orgName>tag_blue_add.png</orgName>
+    </file>
+    <file>
+      <guid>user.png</guid>
+      <orgPath>/umbraco/images/umbraco</orgPath>
+      <orgName>user.png</orgName>
+    </file>
+    <file>
+      <guid>_uBlogsyBase.cshtml</guid>
+      <orgPath>/Views</orgPath>
+      <orgName>_uBlogsyBase.cshtml</orgName>
+    </file>
+    <file>
+      <guid>_uBlogsyBaseSite.cshtml</guid>
+      <orgPath>/Views</orgPath>
+      <orgName>_uBlogsyBaseSite.cshtml</orgName>
+    </file>
+    <file>
+      <guid>_uBlogsyBaseBlog.cshtml</guid>
+      <orgPath>/Views</orgPath>
+      <orgName>_uBlogsyBaseBlog.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyMacroShowSomeLove.cshtml</guid>
+      <orgPath>/Views/MacroPartials/uBlogsy</orgPath>
+      <orgName>uBlogsyMacroShowSomeLove.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyGlobalBrowserTitle.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Global</orgPath>
+      <orgName>uBlogsyGlobalBrowserTitle.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyGlobalFooter.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Global</orgPath>
+      <orgName>uBlogsyGlobalFooter.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyGlobalHeader.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Global</orgPath>
+      <orgName>uBlogsyGlobalHeader.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyGlobalNavigation.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Global</orgPath>
+      <orgName>uBlogsyGlobalNavigation.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyGlobalSeoMeta.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Global</orgPath>
+      <orgName>uBlogsyGlobalSeoMeta.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyLandingListPosts.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Landing</orgPath>
+      <orgName>uBlogsyLandingListPosts.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyLandingShowPost.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Landing</orgPath>
+      <orgName>uBlogsyLandingShowPost.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyPostListAuthors.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Post</orgPath>
+      <orgName>uBlogsyPostListAuthors.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyPostListLabels.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Post</orgPath>
+      <orgName>uBlogsyPostListLabels.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyPostListRelatedPosts.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Post</orgPath>
+      <orgName>uBlogsyPostListRelatedPosts.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyPostListTags.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Post</orgPath>
+      <orgName>uBlogsyPostListTags.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyPostShowPost.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Post</orgPath>
+      <orgName>uBlogsyPostShowPost.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyShowImage.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Shared</orgPath>
+      <orgName>uBlogsyShowImage.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetListAuthors.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetListAuthors.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetListBlogRoll.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetListBlogRoll.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetListLabels.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetListLabels.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetListPostArchive.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetListPostArchive.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetListPosts.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetListPosts.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetListPostsForHome.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetListPostsForHome.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetListTags.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetListTags.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetSearch.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetSearch.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uBlogsyWidgetShowRSSLink.cshtml</guid>
+      <orgPath>/Views/Partials/uBlogsy/Widgets</orgPath>
+      <orgName>uBlogsyWidgetShowRSSLink.cshtml</orgName>
+    </file>
+    <file>
+      <guid>uDateFoldersyFolderRedirect.cshtml</guid>
+      <orgPath>/Views/Partials/uDateFoldersy</orgPath>
+      <orgName>uDateFoldersyFolderRedirect.cshtml</orgName>
+    </file>
+    <file>
+      <guid>Installer.ascx</guid>
+      <orgPath>/usercontrols/uBlogsy/dashboard</orgPath>
+      <orgName>Installer.ascx</orgName>
+    </file>
+  </files>
+  <info>
+    <package>
+      <name>uBlogsy</name>
+      <version>3.0</version>
+      <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
+      <url>http://our.umbraco.org/projects/starter-kits/ublogsy</url>
+      <requirements>
+        <major>3</major>
+        <minor>0</minor>
+        <patch>0</patch>
+      </requirements>
+    </package>
+    <author>
+      <name>Anthony Dang</name>
+      <website>http://anthonydotnet.blogspot.com</website>
+    </author>
+    <readme>
+      <![CDATA[uBlogsy is a blog package for Umbraco 4.7.1 and above.
+
+From version 3.0 Umbraco 6 MVC is supported.
+
+Enjoy!
+
+
+]]>
+    </readme>
+  </info>
+  <Documents>
+    <DocumentSet importMode="root">
+      <uBlogsySiteRoot id="1266" parentID="-1" level="1" creatorID="0" sortOrder="1" createDate="2013-02-21T18:38:53" updateDate="2013-03-18T22:35:23" nodeName="Sample Site Root" urlName="sample-site-root" path="-1,1266" isDoc="" nodeType="1263" creatorName="admin" writerName="admin" writerID="0" template="1264">
+        <uBlogsyContentTitle>My Site</uBlogsyContentTitle>
+        <uBlogsyContentSummary><![CDATA[]]></uBlogsyContentSummary>
+        <uBlogsyContentBody>
+          <![CDATA[<p>This is an example home page. </p>
+<p>From uBlogsy 3.0, the package is now a site (with basic pages) which has a blog (not a blog which has pages).</p>
+<p>Below on this page you will see a widget (/Views/uBlogsy/Widgets/uBlogsyWidgetListPostsForHome.cshtml) which lists latest news. The purpose of the widget is to list news for the home page. Your home page will typically be the parent of the uBlogsyLanding node, or a sibling.</p>
+<p>Take a look at /Views/uBlogsySiteHome.cshtml</p>
+<p> </p>
+<p> </p>]]>
+        </uBlogsyContentBody>
+        <uBlogsySeoKeywords />
+        <uBlogsySeoDescription><![CDATA[]]></uBlogsySeoDescription>
+        <umbracoNaviHide>0</umbracoNaviHide>
+        <umbracoRedirect />
+        <umbracoInternalRedirectId />
+        <umbracoUrlName />
+        <umbracoUrlAlias />
+        <uBlogsySeoTitle />
+        <uBlogsyNavigationTitle />
+        <uBlogsyLanding id="1071" parentID="1266" level="2" creatorID="0" sortOrder="0" createDate="2013-02-01T23:40:29" updateDate="2013-03-18T22:35:26" nodeName="Blog" urlName="blog" path="-1,1266,1071" isDoc="" nodeType="1066" creatorName="admin" writerName="admin" writerID="0" template="1051">
+          <uBlogsySeoTitle />
+          <uBlogsyGeneralDefaultAuthor><![CDATA[]]></uBlogsyGeneralDefaultAuthor>
+          <uBlogsyGeneralUseSummary>1</uBlogsyGeneralUseSummary>
+          <uBlogsyGeneralShowSocialMedia>1</uBlogsyGeneralShowSocialMedia>
+          <uBlogsyGeneralUseTitleAsNodeName>1</uBlogsyGeneralUseTitleAsNodeName>
+          <uBlogsyBlogLinks>
+            <![CDATA[http://feeds.feedburner.com/UmbracoBlog
+http://feeds.feedburner.com/midcodecrisis
+]]>
+          </uBlogsyBlogLinks>
+          <uBlogsyContentTitle>Blog</uBlogsyContentTitle>
+          <uBlogsyContentSummary><![CDATA[]]></uBlogsyContentSummary>
+          <uBlogsyContentBody>
+            <![CDATA[<h2>Show some love</h2>
+<p>Did you know that uBlogsy (a completely free open-source package) has taken many 100's of hours to create and mainatain?</p>
+<p>If you want to show some love, and support why not click the button below.</p>
+<?UMBRACO_MACRO macroAlias="uBlogsyShowSomeLove" />]]>
+          </uBlogsyContentBody>
+          <uBlogsySeoKeywords>Keywords</uBlogsySeoKeywords>
+          <uBlogsySeoDescription><![CDATA[Description]]></uBlogsySeoDescription>
+          <umbracoNaviHide>0</umbracoNaviHide>
+          <umbracoRedirect />
+          <umbracoInternalRedirectId />
+          <umbracoUrlName />
+          <umbracoUrlAlias />
+          <uBlogsyNavigationTitle>Blog</uBlogsyNavigationTitle>
+          <uBlogsyContainerAuthor id="1148" parentID="1071" level="3" creatorID="0" sortOrder="0" createDate="2013-02-10T16:08:14" updateDate="2013-03-18T22:35:26" nodeName="Authors" urlName="authors" path="-1,1266,1071,1148" isDoc="" nodeType="1147" creatorName="admin" writerName="admin" writerID="0" template="0">
+            <umbracoNaviHide>0</umbracoNaviHide>
+            <umbracoRedirect />
+            <umbracoInternalRedirectId />
+            <umbracoUrlName />
+            <umbracoUrlAlias />
+            <uBlogsyAuthor id="1109" parentID="1148" level="4" creatorID="0" sortOrder="0" createDate="2013-02-04T00:41:26" updateDate="2013-03-18T22:35:26" nodeName="Author 1" urlName="author-1" path="-1,1266,1071,1148,1109" isDoc="" nodeType="1107" creatorName="admin" writerName="admin" writerID="0" template="0">
+              <uBlogsyAuthorName>Author 1</uBlogsyAuthorName>
+              <umbracoNaviHide>0</umbracoNaviHide>
+              <umbracoRedirect />
+              <umbracoInternalRedirectId />
+              <umbracoUrlName />
+              <umbracoUrlAlias />
+              <uBlogsyAuthorGravatarEmail />
+            </uBlogsyAuthor>
+          </uBlogsyContainerAuthor>
+          <uTagsyTagContainer id="1145" parentID="1071" level="3" creatorID="0" sortOrder="1" createDate="2013-02-10T16:02:05" updateDate="2013-03-18T22:35:26" nodeName="Tags" urlName="tags" path="-1,1266,1071,1145" isDoc="" nodeType="1144" creatorName="admin" writerName="admin" writerID="0" template="0">
+            <uTagsyTag id="1159" parentID="1145" level="4" creatorID="0" sortOrder="0" createDate="2013-02-10T16:46:40" updateDate="2013-03-18T22:35:26" nodeName="Tag 1" urlName="tag-1" path="-1,1266,1071,1145,1159" isDoc="" nodeType="1143" creatorName="admin" writerName="admin" writerID="0" template="0">
+              <uTagsyTagName>Tag 1</uTagsyTagName>
+            </uTagsyTag>
+          </uTagsyTagContainer>
+          <uBlogsyContainerLabel id="1150" parentID="1071" level="3" creatorID="0" sortOrder="2" createDate="2013-02-10T16:12:05" updateDate="2013-03-18T22:35:27" nodeName="Labels (optional)" urlName="labels-(optional)" path="-1,1266,1071,1150" isDoc="" nodeType="1149" creatorName="admin" writerName="admin" writerID="0" template="0">
+            <umbracoNaviHide>0</umbracoNaviHide>
+            <umbracoRedirect />
+            <umbracoInternalRedirectId />
+            <umbracoUrlName />
+            <umbracoUrlAlias />
+            <uBlogsyLabel id="1157" parentID="1150" level="4" creatorID="0" sortOrder="0" createDate="2013-02-10T16:30:25" updateDate="2013-03-18T22:35:27" nodeName="Category 1" urlName="category-1" path="-1,1266,1071,1150,1157" isDoc="" nodeType="1151" creatorName="admin" writerName="admin" writerID="0" template="0">
+              <uBlogsyLabelName>Category 1</uBlogsyLabelName>
+              <umbracoNaviHide>0</umbracoNaviHide>
+              <umbracoRedirect />
+              <umbracoInternalRedirectId />
+              <umbracoUrlName />
+              <umbracoUrlAlias />
+            </uBlogsyLabel>
+          </uBlogsyContainerLabel>
+          <uBlogsyRSS id="1087" parentID="1071" level="3" creatorID="0" sortOrder="4" createDate="2013-02-01T23:40:43" updateDate="2013-03-18T22:35:28" nodeName="RSS" urlName="rss" path="-1,1266,1071,1087" isDoc="" nodeType="1069" creatorName="admin" writerName="admin" writerID="0" template="1054">
+            <umbracoNaviHide>0</umbracoNaviHide>
+            <umbracoRedirect />
+            <umbracoInternalRedirectId />
+            <umbracoUrlName />
+            <umbracoUrlAlias />
+            <uBlogsyRssTitle>My Blog</uBlogsyRssTitle>
+            <uBlogsyRssDescription><![CDATA[Blog Description]]></uBlogsyRssDescription>
+            <uBlogsyRssCopyright>Copyright @AnthonyDotNet</uBlogsyRssCopyright>
+          </uBlogsyRSS>
+        </uBlogsyLanding>
+        <uBlogsyPage id="1085" parentID="1266" level="2" creatorID="0" sortOrder="1" createDate="2013-02-01T23:40:42" updateDate="2013-03-18T22:35:29" nodeName="About" urlName="about" path="-1,1266,1085" isDoc="" nodeType="1067" creatorName="admin" writerName="admin" writerID="0" template="1052">
+          <uBlogsyContentTitle>About</uBlogsyContentTitle>
+          <uBlogsyContentSummary><![CDATA[]]></uBlogsyContentSummary>
+          <uBlogsyContentBody>
+            <![CDATA[<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nibh massa, ornare ac tempor in, elementum ut sem. Fusce nisl urna, auctor eu varius vel, mattis eu sapien. Sed venenatis facilisis ligula, vitae adipiscing nulla scelerisque eget. Nulla facilisi. Aliquam rutrum sollicitudin erat, non consectetur nunc rutrum sit amet. Proin sit amet elit eget metus fermentum laoreet eu non ipsum. Vivamus non est nibh, non congue turpis. Pellentesque tempus vehicula diam ut tincidunt. Fusce sem diam, vestibulum quis faucibus sit amet, tincidunt id mi. Donec scelerisque blandit suscipit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</p>
+<p>Duis eget elementum libero. Donec in erat erat, vel convallis diam. Nulla facilisi. Vivamus adipiscing pellentesque facilisis. Nullam convallis nunc ac metus facilisis dapibus. Suspendisse potenti. Phasellus dictum arcu ac velit hendrerit non facilisis erat dignissim. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed vitae ante non magna mollis varius at at nisi. Suspendisse sagittis dignissim mi vel adipiscing. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed porttitor viverra congue. Ut sollicitudin enim quis orci scelerisque quis fringilla lorem fringilla. Integer urna leo, aliquam vel sollicitudin eget, facilisis id orci. Ut mollis libero nunc. Integer tortor nisi, aliquet non fermentum ac, bibendum in eros. Mauris aliquet arcu quis enim tincidunt venenatis. Vestibulum tincidunt ullamcorper nulla id blandit. Nam vitae quam id nisi aliquet malesuada malesuada sed eros. Aenean faucibus tempus enim sed pretium.</p>
+<p>Cras malesuada magna ut elit condimentum mattis. Vestibulum eu risus ante, quis preti</p>]]>
+          </uBlogsyContentBody>
+          <uBlogsySeoKeywords />
+          <uBlogsySeoDescription><![CDATA[]]></uBlogsySeoDescription>
+          <umbracoNaviHide>0</umbracoNaviHide>
+          <umbracoRedirect />
+          <umbracoInternalRedirectId />
+          <umbracoUrlName />
+          <umbracoUrlAlias />
+          <uBlogsySeoTitle />
+          <uBlogsyNavigationTitle>About</uBlogsyNavigationTitle>
+        </uBlogsyPage>
+        <uBlogsyPage id="1241" parentID="1266" level="2" creatorID="0" sortOrder="2" createDate="2013-02-18T01:27:16" updateDate="2013-03-18T22:35:30" nodeName="Contact" urlName="contact" path="-1,1266,1241" isDoc="" nodeType="1067" creatorName="admin" writerName="admin" writerID="0" template="1052">
+          <uBlogsyContentTitle>Contact</uBlogsyContentTitle>
+          <uBlogsyContentSummary><![CDATA[]]></uBlogsyContentSummary>
+          <uBlogsyContentBody>
+            <![CDATA[<p>Get your free embedable form from one of these:</p>
+<p> </p>
+<p><a href="http://www.formsite.com/landing/embed.html">http://www.formsite.com/landing/embed.html</a></p>
+<p> </p>
+<p><a href="http://www.jotformeu.com/">http://www.jotformeu.com/</a></p>
+<p> </p>
+<p><a href="http://www.wufoo.com/">http://www.wufoo.com/</a></p>]]>
+          </uBlogsyContentBody>
+          <uBlogsySeoKeywords />
+          <uBlogsySeoDescription><![CDATA[]]></uBlogsySeoDescription>
+          <umbracoNaviHide>0</umbracoNaviHide>
+          <umbracoRedirect />
+          <umbracoInternalRedirectId />
+          <umbracoUrlName />
+          <umbracoUrlAlias />
+          <uBlogsySeoTitle />
+          <uBlogsyNavigationTitle>Contact</uBlogsyNavigationTitle>
+        </uBlogsyPage>
+      </uBlogsySiteRoot>
+    </DocumentSet>
+  </Documents>
+  <DocumentTypes>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] [Base]</Name>
+        <Alias>uBlogsyBaseDocType</Alias>
+        <Icon>folder.gif</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>This document type exists to allow sorting and categorisation of sub-document types. Do not create content nodes using this document type!</Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Hide from navigation</Name>
+          <Alias>umbracoNaviHide</Alias>
+          <Type>38b352c1-e9f8-4fd8-9324-9a2eab06d97a</Type>
+          <Definition>92897bc6-a5f3-4ffe-ae27-f2e7e33dda49</Definition>
+          <Tab>
+          </Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>302 Redirect</Name>
+          <Alias>umbracoRedirect</Alias>
+          <Type>158aa029-24ed-4948-939e-c3da209e5fba</Type>
+          <Definition>a6857c73-d6e9-480c-b6e6-f15f6ad11125</Definition>
+          <Tab>
+          </Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Invisible Redirect</Name>
+          <Alias>umbracoInternalRedirectId</Alias>
+          <Type>158aa029-24ed-4948-939e-c3da209e5fba</Type>
+          <Definition>a6857c73-d6e9-480c-b6e6-f15f6ad11125</Definition>
+          <Tab>
+          </Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Url Name Change</Name>
+          <Alias>umbracoUrlName</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>
+          </Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Url Alias</Name>
+          <Alias>umbracoUrlAlias</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>
+          </Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] [Base] Container</Name>
+        <Alias>uBlogsyBaseContainer</Alias>
+        <Icon>folder.gif</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBaseDocType</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] [Base] Page</Name>
+        <Alias>uBlogsyBasePage</Alias>
+        <Icon>folder.gif</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>This document type exists to allow sorting and categorisation of sub-document types. Do not create content nodes using this document type!</Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBaseDocType</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Title</Name>
+          <Alias>uBlogsyContentTitle</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Content</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Summary</Name>
+          <Alias>uBlogsyContentSummary</Alias>
+          <Type>67db8357-ef57-493e-91ac-936d305e0f2a</Type>
+          <Definition>c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3</Definition>
+          <Tab>Content</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Body</Name>
+          <Alias>uBlogsyContentBody</Alias>
+          <Type>5e9b75ae-face-41c8-b47e-5f4b0fd82f83</Type>
+          <Definition>ca90c950-0aff-4e72-b976-a30b1ac57dad</Definition>
+          <Tab>Content</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Seo Title</Name>
+          <Alias>uBlogsySeoTitle</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>SEO</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Navigation Title</Name>
+          <Alias>uBlogsyNavigationTitle</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Navigation</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Keywords</Name>
+          <Alias>uBlogsySeoKeywords</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>SEO</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Used for meta keywords. When this is empty, the title of the page is used.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Description</Name>
+          <Alias>uBlogsySeoDescription</Alias>
+          <Type>67db8357-ef57-493e-91ac-936d305e0f2a</Type>
+          <Definition>c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3</Definition>
+          <Tab>SEO</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Used for meta description. When this is empty, an exerpt of the body text of the page is used.]]></Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>6</Id>
+          <Caption>Content</Caption>
+        </Tab>
+        <Tab>
+          <Id>7</Id>
+          <Caption>SEO</Caption>
+        </Tab>
+        <Tab>
+          <Id>30</Id>
+          <Caption>Navigation</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Author</Name>
+        <Alias>uBlogsyAuthor</Alias>
+        <Icon>user.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBaseDocType</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Author Name</Name>
+          <Alias>uBlogsyAuthorName</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Author</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Gravatar Email</Name>
+          <Alias>uBlogsyAuthorGravatarEmail</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Author</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>20</Id>
+          <Caption>Author</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Container - Author</Name>
+        <Alias>uBlogsyContainerAuthor</Alias>
+        <Icon>folder_user.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBaseContainer</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>uBlogsyAuthor</DocumentType>
+      </Structure>
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Container - Email Template</Name>
+        <Alias>uBlogsyContainerEmailTemplate</Alias>
+        <Icon>folder_page_white.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBaseContainer</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Container - Label</Name>
+        <Alias>uBlogsyContainerLabel</Alias>
+        <Icon>folder_table.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBaseContainer</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>uBlogsyLabel</DocumentType>
+      </Structure>
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Label</Name>
+        <Alias>uBlogsyLabel</Alias>
+        <Icon>tag.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBaseDocType</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Label Name</Name>
+          <Alias>uBlogsyLabelName</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Category</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>22</Id>
+          <Caption>Category</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Landing</Name>
+        <Alias>uBlogsyLanding</Alias>
+        <Icon>feed.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>This is the root of your blog. It is required. There can be multiple of these. But they cannot be nested under eachother.</Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBasePage</Master>
+        <AllowedTemplates>
+          <Template>uBlogsyLanding</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>uBlogsyLanding</DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>uBlogsyPost</DocumentType>
+        <DocumentType>uBlogsyRSS</DocumentType>
+        <DocumentType>uTagsyTagContainer</DocumentType>
+        <DocumentType>uBlogsyContainerAuthor</DocumentType>
+        <DocumentType>uBlogsyContainerLabel</DocumentType>
+        <DocumentType>uBlogsyContainerEmailTemplate</DocumentType>
+        <DocumentType>uDateFoldersyFolderYear</DocumentType>
+      </Structure>
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Blog Roll Links</Name>
+          <Alias>uBlogsyBlogLinks</Alias>
+          <Type>67db8357-ef57-493e-91ac-936d305e0f2a</Type>
+          <Definition>c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3</Definition>
+          <Tab>Blog Roll</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description>
+            <![CDATA[A list of blogs you want to follow. Make sure it's one per line.
+
+e.g 
+http://feeds.feedburner.com/midcodecrisis
+http://feeds.feedburner.com/umbracoblog]]>
+          </Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Default Author</Name>
+          <Alias>uBlogsyGeneralDefaultAuthor</Alias>
+          <Type>7e062c13-7c41-4ad9-b389-41d88aeef87c</Type>
+          <Definition>ec090322-7f08-4c1a-92cd-682bff7dbdcf</Definition>
+          <Tab>General Settings</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[This author is used when none are defined in a post.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Use Summary On Landing</Name>
+          <Alias>uBlogsyGeneralUseSummary</Alias>
+          <Type>38b352c1-e9f8-4fd8-9324-9a2eab06d97a</Type>
+          <Definition>92897bc6-a5f3-4ffe-ae27-f2e7e33dda49</Definition>
+          <Tab>General Settings</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description>
+            <![CDATA[Select this to use post summaries on the main page, instead of whole posts.
+]]>
+          </Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Show Social Media Links</Name>
+          <Alias>uBlogsyGeneralShowSocialMedia</Alias>
+          <Type>38b352c1-e9f8-4fd8-9324-9a2eab06d97a</Type>
+          <Definition>92897bc6-a5f3-4ffe-ae27-f2e7e33dda49</Definition>
+          <Tab>General Settings</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Select this to show social media sharing links under each post.]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Use Title As Node Name</Name>
+          <Alias>uBlogsyGeneralUseTitleAsNodeName</Alias>
+          <Type>38b352c1-e9f8-4fd8-9324-9a2eab06d97a</Type>
+          <Definition>92897bc6-a5f3-4ffe-ae27-f2e7e33dda49</Definition>
+          <Tab>General Settings</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description>
+            <![CDATA[Deselect this if you want to have a post title which is different to your post's node name.
+
+eg. If you want your title to be "My title" but you want the post url to be /posts/2011/01/my-cool-title/ instead of /posts/2011/01/my-title/
+
+Selected by default.]]>
+          </Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>14</Id>
+          <Caption>General Settings</Caption>
+        </Tab>
+        <Tab>
+          <Id>15</Id>
+          <Caption>Blog Roll</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Page</Name>
+        <Alias>uBlogsyPage</Alias>
+        <Icon>page_white_cup.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>This document type is for simple pages.</Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBasePage</Master>
+        <AllowedTemplates>
+          <Template>uBlogsyPage</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>uBlogsyPage</DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Post</Name>
+        <Alias>uBlogsyPost</Alias>
+        <Icon>page_green.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>This document type is for your blog posts. Put these posts directly under the year folder or under a month folder.</Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBasePage</Master>
+        <AllowedTemplates>
+          <Template>uBlogsyPost</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>uBlogsyPost</DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Main Image</Name>
+          <Alias>uBlogsyPostImage</Alias>
+          <Type>ead69342-f06d-4253-83ac-28000225583b</Type>
+          <Definition>93929b9a-93a2-4e2a-b239-d99334440a59</Definition>
+          <Tab>Post Info</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Author</Name>
+          <Alias>uBlogsyPostAuthor</Alias>
+          <Type>7e062c13-7c41-4ad9-b389-41d88aeef87c</Type>
+          <Definition>ec090322-7f08-4c1a-92cd-682bff7dbdcf</Definition>
+          <Tab>Post Info</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[There can be multiple authors separated by ",".]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Post Date</Name>
+          <Alias>uBlogsyPostDate</Alias>
+          <Type>b6fb1622-afa5-4bbf-a3cc-d9672a442222</Type>
+          <Definition>e4d66c0f-b935-4200-81f0-025f7256b89a</Definition>
+          <Tab>Post Info</Tab>
+          <Mandatory>True</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Tags</Name>
+          <Alias>uBlogsyPostTags</Alias>
+          <Type>d15e1281-e456-4b24-aa86-1dda3e4299d5</Type>
+          <Definition>1dcab42b-3ade-46d0-b13a-83e2f2944d20</Definition>
+          <Tab>Post Info</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Remember to click save (or publish)!]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Categories</Name>
+          <Alias>uBlogsyPostLabels</Alias>
+          <Type>7e062c13-7c41-4ad9-b389-41d88aeef87c</Type>
+          <Definition>e9bc6389-9a8a-4f7b-b752-96e8b0e9fd51</Definition>
+          <Tab>Post Info</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Disable Comments</Name>
+          <Alias>uBlogsyPostDisableComments</Alias>
+          <Type>38b352c1-e9f8-4fd8-9324-9a2eab06d97a</Type>
+          <Definition>92897bc6-a5f3-4ffe-ae27-f2e7e33dda49</Definition>
+          <Tab>Post Info</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[Allows you to disable comments to this post. Note that comments that already exist will remain viewable.]]></Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>16</Id>
+          <Caption>Post Info</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] RSS</Name>
+        <Alias>uBlogsyRSS</Alias>
+        <Icon>rss.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>This document type exists only for an RSS feed. There should only be one of these.</Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uBlogsyBaseDocType</Master>
+        <AllowedTemplates>
+          <Template>uBlogsyRss</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>uBlogsyRss</DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Title</Name>
+          <Alias>uBlogsyRssTitle</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>RSS Feed</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[The title which is shown in your RSS feed]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Description</Name>
+          <Alias>uBlogsyRssDescription</Alias>
+          <Type>67db8357-ef57-493e-91ac-936d305e0f2a</Type>
+          <Definition>c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3</Definition>
+          <Tab>RSS Feed</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[The description of your RSS feed]]></Description>
+        </GenericProperty>
+        <GenericProperty>
+          <Name>Copyright</Name>
+          <Alias>uBlogsyRssCopyright</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>RSS Feed</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description>
+            <![CDATA[Copyright information which is shown in your RSS feed.
+
+e.g Mid-code Crisis
+]]>
+          </Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>29</Id>
+          <Caption>RSS Feed</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uBlogsy] Site Root</Name>
+        <Alias>uBlogsySiteRoot</Alias>
+        <Icon>house.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>True</AllowAtRoot>
+        <Master>uBlogsyBasePage</Master>
+        <AllowedTemplates>
+          <Template>uBlogsySiteHome</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>uBlogsySiteHome</DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>uBlogsyLanding</DocumentType>
+        <DocumentType>uBlogsyPage</DocumentType>
+      </Structure>
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uDateFoldersy] [Base]</Name>
+        <Alias>uDateFoldersyBase</Alias>
+        <Icon>folder.gif</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uDateFoldersy] Folder - Day</Name>
+        <Alias>uDateFoldersyFolderDay</Alias>
+        <Icon>calendar_view_day.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uDateFoldersyBase</Master>
+        <AllowedTemplates>
+          <Template>uDateFoldersyFolderRedirect</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>uDateFoldersyFolderRedirect</DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>uBlogsyPost</DocumentType>
+      </Structure>
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uDateFoldersy] Folder - Month</Name>
+        <Alias>uDateFoldersyFolderMonth</Alias>
+        <Icon>date.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uDateFoldersyBase</Master>
+        <AllowedTemplates>
+          <Template>uDateFoldersyFolderRedirect</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>uDateFoldersyFolderRedirect</DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>uBlogsyPost</DocumentType>
+      </Structure>
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uDateFoldersy] Folder - Year</Name>
+        <Alias>uDateFoldersyFolderYear</Alias>
+        <Icon>folder_table.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uDateFoldersyBase</Master>
+        <AllowedTemplates>
+          <Template>uDateFoldersyFolderRedirect</Template>
+        </AllowedTemplates>
+        <DefaultTemplate>uDateFoldersyFolderRedirect</DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>uBlogsyPost</DocumentType>
+      </Structure>
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uTagsy] [Base]</Name>
+        <Alias>uTagsyBaseDocType</Alias>
+        <Icon>folder.gif</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uTagsy] Tag</Name>
+        <Alias>uTagsyTag</Alias>
+        <Icon>tag_blue.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uTagsyBaseDocType</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure />
+      <GenericProperties>
+        <GenericProperty>
+          <Name>Tag Name</Name>
+          <Alias>uTagsyTagName</Alias>
+          <Type>ec15c1e5-9d90-422a-aa52-4f7622c63bea</Type>
+          <Definition>0cc0eba1-9960-42c9-bf9b-60e150b429ae</Definition>
+          <Tab>Tag</Tab>
+          <Mandatory>False</Mandatory>
+          <Validation>
+          </Validation>
+          <Description><![CDATA[]]></Description>
+        </GenericProperty>
+      </GenericProperties>
+      <Tabs>
+        <Tab>
+          <Id>21</Id>
+          <Caption>Tag</Caption>
+        </Tab>
+      </Tabs>
+    </DocumentType>
+    <DocumentType>
+      <Info>
+        <Name>[uTagsy] Tag Container</Name>
+        <Alias>uTagsyTagContainer</Alias>
+        <Icon>tag_blue_add.png</Icon>
+        <Thumbnail>folder.png</Thumbnail>
+        <Description>
+        </Description>
+        <AllowAtRoot>False</AllowAtRoot>
+        <Master>uTagsyBaseDocType</Master>
+        <AllowedTemplates />
+        <DefaultTemplate>
+        </DefaultTemplate>
+      </Info>
+      <Structure>
+        <DocumentType>uTagsyTag</DocumentType>
+      </Structure>
+      <GenericProperties />
+      <Tabs />
+    </DocumentType>
+  </DocumentTypes>
+  <Templates>
+    <Template>
+      <Name>[uBlogsy] [Base] Blog</Name>
+      <Alias>_uBlogsyBaseBlog</Alias>
+      <Master>_uBlogsyBaseSite</Master>
+      <Design>
+        <![CDATA[@*
+    Base Blog layout. Make this inherit from your base template
+*@
+
+@inherits UmbracoTemplatePage
+@{
+    Layout = "_uBlogsyBaseSite.cshtml";
+}
+
+@section uBlogsyHead
+{
+    @Html.Partial("uBlogsy/Global/uBlogsyGlobalBrowserTitle")
+
+    @*get meta title and description*@
+    @Html.Partial("uBlogsy/Global/uBlogsyGlobalSeoMeta")
+
+    <script src="http://code.jquery.com/jquery.min.js" type="text/javascript"></script>
+    <script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js"></script>
+    <link type="text/css" rel="Stylesheet" media="screen" href="/css/uBlogsy.css" />
+
+    @RenderSection("uBlogsyHead")
+}
+
+
+
+@section uBlogsyMain
+{
+    <div id="uBlogsy"> 
+        <div id="uBlogsy_main">
+               
+            <section id="uBlogsy_left_col">
+                @RenderSection("uBlogsyLeftCol")
+            </section>
+            <aside id="uBlogsy_right_col">
+                @*search*@
+                @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetSearch", Model, 600)
+
+                @*rss link*@
+                @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetShowRSSLink", Model, 600)
+
+                @*list of authors*@ @*@Umbraco.RenderMacro("uBlogsyListAuthors")*@
+                @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetListAuthors", Model, 0, false, false, new ViewDataDictionary(ViewData) { { "GravatarSize", 20 } })
+
+                @*list of labels*@
+                @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetListLabels", Model, 0)
+
+                @*the awesome tag cloud*@
+                @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetListTags", Model, 0, false, false, new ViewDataDictionary(ViewData) { { "ShowCount", true } })
+                  
+                @*list of latest posts*@
+                @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetListPosts", Model, 0, false, false, new ViewDataDictionary(ViewData) { { "ItemLimit", 5 } })
+
+                @*list of latest comments - install uCommentsy if you want to use comments *@
+                @try{
+                    @Html.CachedPartial("uCommentsy/Widgets/uCommentsyWidgetListComments", Model, 0, false, false, new ViewDataDictionary(ViewData) { { "ItemLimit", 5 } })
+                }catch (Exception){}
+                        
+                @*archive*@
+                @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetListPostArchive", Model, 600, false, false, new ViewDataDictionary(ViewData) { { "AltLayout", false } })
+
+                @*list blog roll *@
+                @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetListBlogRoll", Model, 600, false, false, new ViewDataDictionary(ViewData) { { "ItemLimit", 5 } })
+            </aside>
+        </div>
+        
+        @Html.CachedPartial("uBlogsy/Global/uBlogsyGlobalFooter", Model, 0)
+    </div>
+}
+
+]]>
+      </Design>
+    </Template>
+    <Template>
+      <Name>[uBlogsy] [Base] Site</Name>
+      <Alias>_uBlogsyBaseSite</Alias>
+      <Master>_uBlogsyBase</Master>
+      <Design>
+        <![CDATA[@*
+    Base Site layout. Make this inherit from your base template
+*@
+
+@inherits UmbracoTemplatePage
+@{
+    Layout = "_uBlogsyBase.cshtml";
+}
+
+@section uBlogsyMain
+{
+    <!doctype html public "-//w3c//dtd xhtml 1.0 transitional//en" "http://www.w3.org/tr/xhtml1/dtd/xhtml1-transitional.dtd">
+    <html lang="en-GB" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" dir="ltr">
+        <head>
+            <title>My Site</title>          
+            @RenderSection("uBlogsyHead")
+        </head>
+        <body>
+           
+            @*top navigation*@
+            @Html.CachedPartial("uBlogsy/Global/uBlogsyGlobalHeader", Model, 60, true)
+                
+            @*top navigation*@
+            @Html.CachedPartial("uBlogsy/Global/uBlogsyGlobalNavigation", Model, 60, true)
+            
+                    
+            @RenderSection("uBlogsyMain")
+            
+        </body>
+    </html>
+}]]>
+      </Design>
+    </Template>
+    <Template>
+      <Name>[uBlogsy] Base</Name>
+      <Alias>_uBlogsyBase</Alias>
+      <Design>
+        <![CDATA[@*
+    Base layout just to keep things a bit tidy in Umbraco back office.
+*@
+@inherits UmbracoTemplatePage
+@{
+    Layout = null;
+}
+
+@RenderSection("uBlogsyMain")
+	]]>
+      </Design>
+    </Template>
+    <Template>
+      <Name>[uBlogsy] Landing</Name>
+      <Alias>uBlogsyLanding</Alias>
+      <Master>_uBlogsyBaseBlog</Master>
+      <Design>
+        <![CDATA[@*
+    Landing layout.
+*@
+@inherits UmbracoTemplatePage
+@{
+    Layout = "_uBlogsyBaseBlog.cshtml";
+}
+
+@section uBlogsyHead{}
+
+
+@section uBlogsyLeftCol
+{
+    <div class="uBlogsy_content_body">
+        @if (Request.QueryString.Count == 0)
+        {
+            @Umbraco.Field("uBlogsyContentBody")
+        }
+    </div>
+  
+    @*list posts*@
+    <section class="uBlogsy_posts_container">
+		@Html.CachedPartial("uBlogsy/Landing/uBlogsyLandingListPosts", Model, 0, false, false, new ViewDataDictionary(ViewData) { { "ItemsPerPage", 20 } })		
+    </section>	
+}
+
+]]>
+      </Design>
+    </Template>
+    <Template>
+      <Name>[uBlogsy] Page</Name>
+      <Alias>uBlogsyPage</Alias>
+      <Master>_uBlogsyBaseSite</Master>
+      <Design>
+        <![CDATA[@*
+    Text page layout.
+*@
+@inherits UmbracoTemplatePage
+@{
+    Layout = "_uBlogsyBaseSite.cshtml";
+}
+
+@section uBlogsyHead{
+     <link type="text/css" rel="Stylesheet" media="screen" href="/css/uBlogsy.css" />
+}
+
+@section uBlogsyMain
+{
+    <div id="uBlogsy">
+        <div id="uBlogsy_main" style="width:80%;padding: 0 5%">
+            <h3>
+                <a href="@CurrentPage.Url()">@Umbraco.Field("uBlogsyContentTitle")</a>
+            </h3>
+            <div class="uBlogsy_content_body">
+                @Html.Raw(library.RenderMacroContent(Umbraco.Field("uBlogsyContentBody").ToString(), Model.Content.Id))
+            </div>
+        </div>
+    </div>
+}
+
+]]>
+      </Design>
+    </Template>
+    <Template>
+      <Name>[uBlogsy] Post</Name>
+      <Alias>uBlogsyPost</Alias>
+      <Master>_uBlogsyBaseBlog</Master>
+      <Design>
+        <![CDATA[@*
+    Blog post layout.
+*@
+@using uBlogsy.BusinessLogic
+@using System.Linq
+@using uBlogsy.Common.Extensions
+@inherits UmbracoTemplatePage
+@{
+    Layout = "_uBlogsyBaseBlog.cshtml";
+    
+    var tag = Request.QueryString["tag"];
+    var label = Request.QueryString["label"];
+    var author = Request.QueryString["author"];
+    var searchTerm = Request.QueryString["search"];
+    var commenter = Request.QueryString["commenter"];
+    int page = int.TryParse(Request.QueryString["page"], out page) ? page : 1;
+    var year = Request.QueryString["year"];
+    var month = Request.QueryString["month"];
+    var day = Request.QueryString["day"];
+    var prev = PostService.Instance.GetNextPost(Model.Content, tag, label, author, searchTerm, commenter, year, month, day);
+    var next = PostService.Instance.GetPreviousPost(Model.Content, tag, label, author, searchTerm, commenter, year, month, day);
+}
+	
+@section uBlogsyHead{}
+
+@section uBlogsyLeftCol{
+    @*render the post*@
+    <div class="uBlogsy_post_container">
+        @*pagination*@
+        <div class="uBlogsy_next_prev">
+            @if (prev != null)
+            {
+                var prevUrl = prev.Url.GetUrlWithQueryString(Request.QueryString, new[] { "action", "success" });
+                <a href="@prevUrl" class="uBlogsy_prev uBlogsy_font_style20" title="Older Posts">&lt; @Umbraco.GetDictionaryValue("uBlogsyDicPaginationOlder")</a>
+            }
+            
+            @if (next != null)
+            {
+                var nextUrl = next.Url.GetUrlWithQueryString(Request.QueryString, new[] { "action", "success" }); 
+                <a href="@nextUrl" class="uBlogsy_next uBlogsy_font_style20" title="Newer Posts">@Umbraco.GetDictionaryValue("uBlogsyDicPaginationNewer") &gt;</a>
+            }
+        </div>
+        
+        @Html.Partial("uBlogsy/Post/uBlogsyPostShowPost", new ViewDataDictionary(ViewData) { {"Node", Model.Content }, { "UseAddthis", true }, { "GravatarSize", 50 } })
+        
+       
+    </div>
+
+    @*list of related posts*@
+    @Html.Partial("uBlogsy/Post/uBlogsyPostListRelatedPosts", new ViewDataDictionary(ViewData) { { "Node", Model.Content }, { "ItemLimit", 5 }, { "MatchCount", 1 }, { "RelatedAlias", string.Empty } })
+        
+
+    @*list comments - install uCommentsy, then uncomment this line*@
+    @try
+    {
+        @Html.Partial("uCommentsy/uCommentsyListComments", new ViewDataDictionary(ViewData) { { "ItemLimit", -1 } })
+    }
+    catch (Exception) { }
+    
+    @*render contact form - install uCommentsy, then uncomment this line**@
+    @try
+    {
+        @Html.Action("Index", "uCommentsyContactFormSurface", new { CurrentPage })
+    }catch(Exception){}
+}
+
+]]>
+      </Design>
+    </Template>
+    <Template>
+      <Name>[uBlogsy] Rss</Name>
+      <Alias>uBlogsyRss</Alias>
+      <Master>_uBlogsyBase</Master>
+      <Design>
+        <![CDATA[@*
+    RSS layout.
+*@
+@using System.Text
+@using uBlogsy.BusinessLogic
+@using uBlogsy.Common.Extensions
+@using uHelpsy.Extensions
+@inherits UmbracoTemplatePage
+@{
+    Layout = null;
+
+    // get tag, label, or author from query string
+    var tag = Request.QueryString["tag"];
+    var label = Request.QueryString["label"];
+    var author = Request.QueryString["author"];
+    var searchTerm = Request.QueryString["search"];
+    var commenter = Request.QueryString["commenter"];
+    int page = int.TryParse(Request.QueryString["page"], out page) ? page : 1;
+    var year = Request.QueryString["year"];
+    var month = Request.QueryString["month"];
+    var day = Request.QueryString["day"];
+    int postCount;
+
+    var posts = PostService.Instance.GetPosts(Model.Content, tag, label, author, searchTerm, commenter, year, month, day, out postCount);
+
+    var lastPubDate = !posts.Any() ? DateTime.Now : DateTime.Parse(posts.First().GetValue("uBlogsyPostDate"));
+
+    var qs = Request.QueryString.ToString().Replace("+", "%20");
+
+    // get blog url
+    string blogUrl = Request.Url.AbsoluteUri
+                            .Replace(CurrentPage.Url(), string.Empty)
+                            .TrimEnd("/".ToCharArray());
+
+    if (!string.IsNullOrWhiteSpace(qs))
+    {
+        blogUrl = blogUrl.Replace(qs, string.Empty).Replace("?", string.Empty);
+    }
+
+    Response.Clear();
+    Response.ContentType = "text/xml";
+    Response.ContentEncoding = Encoding.UTF8;
+    @Html.Raw("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>")
+    <rss version="2.0">
+        <channel>
+            <title>@(Model.Content.GetPropertyValue("uBlogsyRssTitle"))</title>
+            <description>@(Model.Content.GetPropertyValue("uBlogsyRssDescription"))</description>
+            <copyright>@(Model.Content.GetPropertyValue("uBlogsyRssCopyright"))</copyright>
+            @*<image>@Model.Content.uBlogsyRssImage</image>*@
+            @Html.Raw(string.Format("<link>{0}</link>", blogUrl))
+            <lastBuildDate>@(lastPubDate.ToString("ddd, dd MMMM yyyy HH:mm:ss"))</lastBuildDate>
+            <pubDate>@(lastPubDate.ToString("ddd, dd MMMM yyyy HH:mm:ss"))</pubDate>
+            @ListPosts(blogUrl, posts)
+         </channel>
+    </rss>
+}
+
+
+@helper ListPosts(string blogUrl, IEnumerable<SearchResult> posts)
+{
+    foreach (var p in posts)
+    {
+        <item>
+            <title>@p.GetValue("uBlogsyContentTitle")</title>
+            <author>@p.GetValue("uBlogsyPostAuthor")</author>
+            <comments>@(blogUrl + p.Url())</comments>
+            <description>@(uBlogsy.Common.Extensions.StringExtensions.StripHtml(p.GetValue("uBlogsyContentBody")).Trim())</description>
+            @Html.Raw(string.Format("<link>{0}{1}</link>", blogUrl, p.Url()))
+            <guid>@(blogUrl + p.Url())</guid>
+            <pubDate>@(p.GetValue("uBlogsyPostDate").FormatDateTime("ddd, dd MMMM yyyy HH:mm:ss")) </pubDate>
+        </item>
+    }
+}]]>
+      </Design>
+    </Template>
+    <Template>
+      <Name>[uBlogsy] Site Home</Name>
+      <Alias>uBlogsySiteHome</Alias>
+      <Master>_uBlogsyBase</Master>
+      <Design>
+        <![CDATA[@*
+    Sample home layout template. Your home layout does NOT have to inherit from _uBlogsyBaseSite.
+*@
+
+@inherits UmbracoTemplatePage
+@{
+    Layout = "_uBlogsyBaseSite.cshtml";
+}
+
+@section uBlogsyHead
+{ 
+    <link type="text/css" rel="Stylesheet" media="screen" href="/css/uBlogsy.css" />
+}
+
+
+@section uBlogsyMain
+{
+    <div id="uBlogsy"> 
+        <div id="uBlogsy_main" style="width:80%;padding: 0 5%">
+            <h1>
+                @Umbraco.Field("uBlogsyContentTitle")
+            </h1>
+            
+            <section>
+                @Umbraco.Field("uBlogsyContentBody")
+            </section>
+            
+            @* list posts for home - this only works if the home page is a parent, or sibling of uBlogsyLanding *@
+            @Html.CachedPartial("uBlogsy/Widgets/uBlogsyWidgetListPostsForHome", Model, 0, false, true, new ViewDataDictionary(ViewData) { { "ItemLimit", 5 } })		
+        </div>
+    </div>
+}
+
+
+]]>
+      </Design>
+    </Template>
+    <Template>
+      <Name>[uDatefoldersy] Folder Redirect</Name>
+      <Alias>uDateFoldersyFolderRedirect</Alias>
+      <Design>
+        <![CDATA[@inherits Umbraco.Web.Mvc.UmbracoTemplatePage
+@{
+    Layout = null;
+}
+
+@RenderPage("~/Views/Partials/uDateFoldersy/uDateFoldersyFolderRedirect.cshtml")]]>
+      </Design>
+    </Template>
+  </Templates>
+  <Stylesheets>
+    <Stylesheet>
+      <Name>uBlogsy</Name>
+      <FileName>uBlogsy</FileName>
+      <Content>
+        <![CDATA[/* fonts - global */
+#uBlogsy p, 
+#uBlogsy label, 
+#uBlogsy input, 
+#uBlogsy textarea, 
+#uBlogsy a, 
+.uBlogsy_post_body
+{ font-family:Arial; }
+
+#uBlogsy,
+#uBlogsy p, 
+#uBlogsy label, 
+#uBlogsy input, 
+#uBlogsy textarea,
+.uBlogsy_post_body
+ {font-size:13px;  color:#505050;}
+
+
+#uBlogsy h1,
+#uBlogsy h2,
+#uBlogsy h3,
+#uBlogsy h4,
+#uBlogsy h5{font-family:Georgia,Serif;}
+
+
+
+/* fonts - reusable */
+.uBlogsy_font_style20{ font-family:Georgia,Serif; }
+.uBlogsy_font_style30{ font-family:Georgia,Serif; font-size: 11px; }
+.uBlogsy_font_style40{ font-family:Georgia,Serif; font-size: 10px; }
+.uBlogsy_font_style41{ color:#999999; font-family:Georgia,Serif; font-size: 10px; }
+.uBlogsy_font_style50{ font-size: 11px; }
+
+/* fonts - headers */
+.uBlogsy_head_style10{ color:#972323; font-family:Georgia,Serif; font-size:26px; }
+.uBlogsy_head_style20{ color:#505050; font-family:Georgia,Serif; font-size:14px; }
+
+
+
+
+.uBlogsy_post_body, .uBlogsy_content_body{line-height:20px;}
+.uBlogsy_post_body{ padding-top: 20px;}
+
+
+
+
+
+/* force browser to evaluate box model */
+#uBlogsy_header_container,
+#uBlogsy_main, 
+#uBlogsy_footer, 
+#uBlogsy_left_col,  
+#uBlogsy_right_col,
+.uBlogsy_post,
+.uBlogsy_tag_container  { overflow:hidden; }
+
+
+/* layout */
+#uBlogsy_main { width:100%; clear:both;}
+#uBlogsy_footer { width:100%; clear:both;}
+#uBlogsy_left_col { margin-left: 2%; width: 67%; float: left; display: inline; word-wrap: break-word; overflow: hidden;}
+#uBlogsy_right_col { margin-right: 2%; width: 25%; float: right; display: inline; word-wrap: break-word; overflow: hidden;}
+
+
+
+/* links */
+#uBlogsy a, #uBlogsy_nav a { color: #234B7B; text-decoration:none; }
+#uBlogsy a:hover, #uBlogsy_nav a:hover { text-decoration:underline; }
+#uBlogsy_right_col a:hover {color: #234B7B; }
+
+
+
+/* navigation */
+#uBlogsy_nav { list-style-type:none; display:block;  padding: 20px 0 30px 0px; margin: 0 0 0 2%;}
+#uBlogsy_nav .uBlogsy_nav_item { display:block; float:left; padding-right:30px; }
+#uBlogsy_nav .uBlogsy_nav_item.uBlogsy_current { font-weight:bold; }
+
+
+/* main header and footer */
+#uBlogsy_header h1 {  margin:5px; text-align:center; }
+#uBlogsy_footer{ margin:30px 0;}
+#uBlogsy_footer .uBlogsy_footer_text{margin:5px 0 0 0;}
+#uBlogsy_footer .uBlogsy_footer_details{float:right; margin:10px 0 0 0;}
+
+
+
+
+/**********************************************
+ left col
+***********************************************/
+/* left col - headers */
+#uBlogsy_left_col h2, 
+#uBlogsy_left_col h4 { text-transform:uppercase; }
+#uBlogsy_left_col h2{ margin-bottom: 0px;}
+
+
+/* left col - post, date and author*/
+#uBlogsy_left_col .uBlogsy_post { padding:10px 0 25px 0;width: 100%;}
+#uBlogsy_left_col .uBlogsy_post .uBlogsy_post_body p{ display: inline;}
+
+
+#uBlogsy_left_col .uBlogsy_author { padding-top:30px;}
+
+#uBlogsy_left_col .uBlogsy_gravatar{ width: 40px; height: 40px;}
+#uBlogsy_left_col .uBlogsy_author_thumb{display: block;float: left; overflow: hidden;padding-right: 10px;}
+
+/* left col - tags and labels */
+#uBlogsy_left_col .uBlogsy_tag_container h5, 
+#uBlogsy_left_col .uBlogsy_label_container h5{float: left; margin: 0px;padding-right: 10px;}
+
+#uBlogsy_left_col .uBlogsy_tag_container .uBlogsy_tags, 
+#uBlogsy_left_col .uBlogsy_label_container .uBlogsy_labels{ list-style-type:none; float:left; padding:0; margin:0;}
+
+#uBlogsy_left_col .uBlogsy_tag_container .uBlogsy_tags li, 
+#uBlogsy_left_col .uBlogsy_label_container .uBlogsy_labels li{ display:block; float:left; padding-right:10px;}
+#uBlogsy_left_col .uBlogsy_post_details{ padding-top: 20px;}
+#uBlogsy_left_col .uBlogsy_post_details_right{ width: 80%;float: left}
+
+/* left col - related */
+#uBlogsy_left_col .uBlogsy_related{ list-style-type: none;padding: 0;}
+
+#uBlogsy_left_col .uBlogsy_post_image{ float: left; margin: 0 20px 20px 0}
+
+
+/* home widget */
+#uBlogsy_widget_home{ background-color: #eee;overflow: hidden;padding-bottom: 10px;width: 500px;}
+#uBlogsy_widget_home h2 { margin: 20px 0 10px 20px; text-transform:uppercase;  }
+#uBlogsy_widget_home ul { list-style-type:none; margin:5px 0;  padding-left:20px; overflow:hidden; }
+#uBlogsy_widget_home li{ clear: both; line-height:20px;}
+#uBlogsy_widget_home .uBlogsy_post_list_image{ display: inline-block;float: left; padding: 0;margin: 0 5px 1px 0;overflow: hidden;height: 25px;width: 25px;border: 1px solid #555555;}
+
+
+/**********************************************
+ right col 
+***********************************************/
+/* right col - gravatar */
+#uBlogsy_right_col .uBlogsy_gravatar_small { float: left; margin-right: 5px;height: 20px;width: 20px;}
+
+/* right col - headers */
+#uBlogsy_right_col h2 { margin: 20px 0 0 0; text-transform:uppercase;  }
+#uBlogsy_right_col > div { padding-bottom:20px;}
+
+/* right col - lists */
+#uBlogsy_right_col li{ clear: both; line-height:20px;}
+#uBlogsy_right_col ul { list-style-type:none; margin:5px 0;  padding-left:0px; overflow:hidden; }
+
+/* right col - post archive */
+#uBlogsy_post_archive ul {  list-style-type:none; }
+#uBlogsy_post_archive ul ul { padding-left:15px; }
+
+#uBlogsy_post_archive .uBlogsy_post_items {display:none; margin-top:0;}
+#uBlogsy_post_archive .uBlogsy_months{display:none;}
+
+#uBlogsy_post_archive .uBlogsy_current{ font-weight: bold;}
+
+
+/* right col - post archive - alternate layout */
+#uBlogsy_right_col .uBlogsy_post_archive_alt .uBlogsy_year_first .uBlogsy_year_name{display:none; }
+#uBlogsy_right_col .uBlogsy_post_archive_alt .uBlogsy_year_first .uBlogsy_months{ padding-left:0px; margin-top: 0;}
+   
+   
+/* right col - rss logo */
+#uBlogsy_right_col .uBlogsy_feed { margin-left: 3px; padding: 0 0 0 19px; background: url("../images/uBlogsy_feed-icon-14x14.png") no-repeat 0 50%; height: 15px; display: block; float: left; overflow: hidden;}
+
+
+#uBlogsy_right_col .uBlogsy_post_list_image{ display: inline-block;float: left; padding: 0;margin: 0 5px 1px 0;overflow: hidden;height: 25px;width: 25px;border: 1px solid #555555;}
+
+
+/**********************************************
+ pagination 
+***********************************************/
+/* pagination - landing */
+#uBlogsy_pagination { display:block; float:right; overflow:hidden;}
+#uBlogsy_pagination li{ list-style-type:none; display:block; float:left; height: 20px; padding: 0 4px 0 0;}
+#uBlogsy_pagination li a { display:block; padding :3px 0 0 6px; }
+#uBlogsy_pagination li.uBlogsy_page_prev span, #uBlogsy_pagination li.uBlogsy_page_next span { display:block; padding :2px 0 0 5px; color:#CCC}
+#uBlogsy_pagination .uBlogsy_page_next, #uBlogsy_pagination .uBlogsy_page_prev{ width:40px;}
+#uBlogsy_pagination li.uBlogsy_current a{font-weight:bold;}
+#uBlogsy_pagination li.uBlogsy_current span{padding:2px 0 0 6px; display:block;}
+
+/* pagination - post */
+.uBlogsy_next_prev{padding-top:20px;overflow: hidden;clear: both;}
+#uBlogsy .uBlogsy_next_prev a { color:#505050; }
+.uBlogsy_prev {float:left;}
+.uBlogsy_next {float:right;}
+
+
+
+
+/**********************************************
+ forms
+***********************************************/
+/* forms */
+.uBlogsy_search input[type=submit] {  border: 1px solid #cccccc; }
+
+.uBlogsy_row{ overflow:hidden; position: relative; }
+
+.uBlogsy_row.uBlogsy_Subscribe{padding-bottom:10px;}
+.uBlogsy_row.uBlogsy_Subscribe input[type=checkbox] { float:left;}
+.uBlogsy_row .field-validation-error{ position: absolute; top: 0px;}
+.uBlogsy_row .field-validation-valid{ display: none;}
+
+/* forms - search */
+.uBlogsy_search input[type=text] {  border:1px solid #ccc; height:20px;  margin-bottom:10px; width:200px;}
+#uBlogsyBtnSearch:hover{ color:#234B7B;}
+
+
+
+
+
+/**********************************************
+ misc
+***********************************************/
+.uBlogsy_bottom_border {  border-bottom-color: #CCC; border-bottom-style: dotted; border-bottom-width: 1px; }
+
+/*add this*/
+#uBlogsy .addthis_toolbox { float:left;clear: both;margin-top: 30px;height: 30px;}
+#uBlogsy .addthis_toolbox a { display:block; float:right;}
+
+
+
+
+
+
+/**********************************************
+ tag cloud
+***********************************************/
+.uBlogsy_tag_cloud li { display:inline-block; padding-right:10px; }
+.uBlogsy_tag_cloud li span {color:#505050}
+.uBlogsy_tag_cloud1 { font-size: 10px;}
+.uBlogsy_tag_cloud2 { font-size: 10px;}
+.uBlogsy_tag_cloud3 { font-size: 11px;}
+.uBlogsy_tag_cloud4 { font-size: 11px;}
+.uBlogsy_tag_cloud5 { font-size: 12px;}
+.uBlogsy_tag_cloud6 { font-size: 12px;}
+.uBlogsy_tag_cloud7 { font-size: 13px;}
+.uBlogsy_tag_cloud8 { font-size: 13px;}
+.uBlogsy_tag_cloud9 { font-size: 14px;}
+.uBlogsy_tag_cloud10 { font-size: 14px;}
+.uBlogsy_tag_cloud11 { font-size: 15px;}
+.uBlogsy_tag_cloud12 { font-size: 15px;}
+.uBlogsy_tag_cloud13 { font-size: 16px;}
+.uBlogsy_tag_cloud14 { font-size: 16px;}
+.uBlogsy_tag_cloud15 { font-size: 17px;}
+.uBlogsy_tag_cloud16 { font-size: 17px;}
+.uBlogsy_tag_cloud17 { font-size: 18px;}
+.uBlogsy_tag_cloud18 { font-size: 18px;}
+.uBlogsy_tag_cloud19 { font-size: 19px;}
+.uBlogsy_tag_cloud20 { font-size: 19px;}
+.uBlogsy_tag_cloud21 { font-size: 20px;}
+.uBlogsy_tag_cloud22 { font-size: 20px;}
+.uBlogsy_tag_cloud23 { font-size: 21px;}
+.uBlogsy_tag_cloud24 { font-size: 21px;}
+.uBlogsy_tag_cloud25 { font-size: 22px;}
+.uBlogsy_tag_cloud26 { font-size: 22px;}
+.uBlogsy_tag_cloud27 { font-size: 23px;}
+.uBlogsy_tag_cloud28 { font-size: 23px;}
+.uBlogsy_tag_cloud29 { font-size: 24px;}
+.uBlogsy_tag_cloud30 { font-size: 24px;}
+.uBlogsy_tag_cloud31 { font-size: 25px;}
+.uBlogsy_tag_cloud32 { font-size: 25px;}
+.uBlogsy_tag_cloud33 { font-size: 26px;}
+.uBlogsy_tag_cloud34 { font-size: 26px;}
+.uBlogsy_tag_cloud35 { font-size: 27px;}
+.uBlogsy_tag_cloud36 { font-size: 27px;}
+.uBlogsy_tag_cloud37 { font-size: 28px;}
+.uBlogsy_tag_cloud38 { font-size: 28px;}
+.uBlogsy_tag_cloud39 { font-size: 29px;}
+.uBlogsy_tag_cloud40 { font-size: 29px;}
+.uBlogsy_tag_cloud40 { font-size: 30px;}
+.uBlogsy_tag_cloud41 { font-size: 31px;}
+.uBlogsy_tag_cloud42 { font-size: 31px;}
+.uBlogsy_tag_cloud43 { font-size: 32px;}
+.uBlogsy_tag_cloud44 { font-size: 32px;}
+.uBlogsy_tag_cloud45 { font-size: 33px;}
+.uBlogsy_tag_cloud46 { font-size: 33px;}
+.uBlogsy_tag_cloud47 { font-size: 34px;}
+.uBlogsy_tag_cloud48 { font-size: 34px;}
+.uBlogsy_tag_cloud49 { font-size: 35px;}
+.uBlogsy_tag_cloud50 { font-size: 35px;}
+.uBlogsy_tag_cloud50 { font-size: 36px;}
+.uBlogsy_tag_cloud51 { font-size: 36px;}
+.uBlogsy_tag_cloud52 { font-size: 37px;}
+.uBlogsy_tag_cloud53 { font-size: 37px;}
+.uBlogsy_tag_cloud54 { font-size: 38px;}
+.uBlogsy_tag_cloud55 { font-size: 38px;}
+.uBlogsy_tag_cloud56 { font-size: 39px;}
+.uBlogsy_tag_cloud57 { font-size: 39px;}
+.uBlogsy_tag_cloud58 { font-size: 40px;}
+.uBlogsy_tag_cloud59 { font-size: 40px;}
+.uBlogsy_tag_cloud60 { font-size: 41px;}
+.uBlogsy_tag_cloud71 { font-size: 41px;}
+.uBlogsy_tag_cloud72 { font-size: 42px;}
+.uBlogsy_tag_cloud73 { font-size: 42px;}
+.uBlogsy_tag_cloud74 { font-size: 43px;}
+.uBlogsy_tag_cloud75 { font-size: 43px;}
+.uBlogsy_tag_cloud76 { font-size: 44px;}
+.uBlogsy_tag_cloud77 { font-size: 44px;}
+.uBlogsy_tag_cloud78 { font-size: 45px;}
+.uBlogsy_tag_cloud79 { font-size: 45px;}
+.uBlogsy_tag_cloud80 { font-size: 46px;}
+.uBlogsy_tag_cloud81 { font-size: 46px;}
+.uBlogsy_tag_cloud82 { font-size: 47px;}
+.uBlogsy_tag_cloud83 { font-size: 47px;}
+.uBlogsy_tag_cloud84 { font-size: 48px;}
+.uBlogsy_tag_cloud85 { font-size: 48px;}
+.uBlogsy_tag_cloud86 { font-size: 49px;}
+.uBlogsy_tag_cloud87 { font-size: 49px;}
+.uBlogsy_tag_cloud88 { font-size: 50px;}
+.uBlogsy_tag_cloud89 { font-size: 50px;}
+.uBlogsy_tag_cloud90 { font-size: 51px;}
+.uBlogsy_tag_cloud91 { font-size: 51px;}
+.uBlogsy_tag_cloud92 { font-size: 52px;}
+.uBlogsy_tag_cloud93 { font-size: 52px;}
+.uBlogsy_tag_cloud94 { font-size: 53px;}
+.uBlogsy_tag_cloud95 { font-size: 53px;}
+.uBlogsy_tag_cloud96 { font-size: 54px;}
+.uBlogsy_tag_cloud97 { font-size: 54px;}
+.uBlogsy_tag_cloud98 { font-size: 55px;}
+.uBlogsy_tag_cloud99 { font-size: 55px;}
+.uBlogsy_tag_cloud100 { font-size: 56px;}
+
+
+
+]]>
+      </Content>
+    </Stylesheet>
+  </Stylesheets>
+  <Macros>
+    <macro>
+      <name>[uBlogsy] Show Some Love</name>
+      <alias>uBlogsyShowSomeLove</alias>
+      <scriptType>
+      </scriptType>
+      <scriptAssembly>
+      </scriptAssembly>
+      <xslt>
+      </xslt>
+      <useInEditor>True</useInEditor>
+      <refreshRate>0</refreshRate>
+      <scriptingFile>~/Views/MacroPartials/uBlogsy/uBlogsyMacroShowSomeLove.cshtml</scriptingFile>
+      <properties />
+    </macro>
+  </Macros>
+  <DictionaryItems>
+    <DictionaryItem Key="uBlogsy">
+      <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[]]></Value>
+      <DictionaryItem Key="uBlogsyDicArchive">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Archive]]></Value>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyDicAuthors">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Authors]]></Value>
+        <DictionaryItem Key="uBlogsyDicPostWrittenBy">
+          <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Written by]]></Value>
+          <DictionaryItem Key="uBlogsyDicPostWrittenAt">
+            <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[at]]></Value>
+          </DictionaryItem>
+        </DictionaryItem>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyDicCategories">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Categories]]></Value>
+        <DictionaryItem Key="uBlogsyDicCategoriesAll">
+          <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[All Categories]]></Value>
+        </DictionaryItem>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyDicPagination">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[]]></Value>
+        <DictionaryItem Key="uBlogsyDicPaginationNewer">
+          <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Newer]]></Value>
+        </DictionaryItem>
+        <DictionaryItem Key="uBlogsyDicPaginationOlder">
+          <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Older]]></Value>
+        </DictionaryItem>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyDicPostsLatest">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Latest Posts]]></Value>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyDicPostsRelated">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Related]]></Value>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyDicRssSubscribe">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Subscribe]]></Value>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyDicSearch">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Search]]></Value>
+        <DictionaryItem Key="uBlogsyDicSearchSubmit">
+          <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Submit]]></Value>
+        </DictionaryItem>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyDicTags">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Tags]]></Value>
+      </DictionaryItem>
+      <DictionaryItem Key="uBlogsyNavigation">
+        <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[]]></Value>
+        <DictionaryItem Key="uBlogsyNavigationHome">
+          <Value LanguageId="1" LanguageCultureAlias="en-US"><![CDATA[Home]]></Value>
+        </DictionaryItem>
+      </DictionaryItem>
+    </DictionaryItem>
+  </DictionaryItems>
+  <Languages />
+  <DataTypes>
+    <DataType Name="[uBlogsy] [MNTP] Author Picker" Id="7e062c13-7c41-4ad9-b389-41d88aeef87c" Definition="ec090322-7f08-4c1a-92cd-682bff7dbdcf">
+      <PreValues>
+        <PreValue Id="11" Value="content" />
+        <PreValue Id="12" Value="" />
+        <PreValue Id="13" Value="-1" />
+        <PreValue Id="14" Value="False" />
+        <PreValue Id="15" Value="1" />
+        <PreValue Id="16" Value="0" />
+        <PreValue Id="17" Value="0" />
+        <PreValue Id="18" Value="False" />
+        <PreValue Id="19" Value="1" />
+        <PreValue Id="20" Value="0" />
+        <PreValue Id="21" Value="$currentPage/ancestor-or-self::uBlogsyLanding//uBlogsyContainerAuthor" />
+        <PreValue Id="22" Value="100" />
+        <PreValue Id="23" Value="0" />
+      </PreValues>
+    </DataType>
+    <DataType Name="[uBlogsy] [MNTP] Label Picker" Id="7e062c13-7c41-4ad9-b389-41d88aeef87c" Definition="e9bc6389-9a8a-4f7b-b752-96e8b0e9fd51">
+      <PreValues>
+        <PreValue Id="32" Value="content" />
+        <PreValue Id="33" Value="" />
+        <PreValue Id="34" Value="-1" />
+        <PreValue Id="35" Value="False" />
+        <PreValue Id="36" Value="1" />
+        <PreValue Id="37" Value="0" />
+        <PreValue Id="38" Value="0" />
+        <PreValue Id="39" Value="False" />
+        <PreValue Id="40" Value="1" />
+        <PreValue Id="41" Value="0" />
+        <PreValue Id="42" Value="$currentPage/ancestor-or-self::uBlogsyLanding//uBlogsyContainerLabel" />
+        <PreValue Id="43" Value="70" />
+        <PreValue Id="44" Value="0" />
+      </PreValues>
+    </DataType>
+    <DataType Name="[uTagsy] Tag Editor" Id="d15e1281-e456-4b24-aa86-1dda3e4299d5" Definition="1dcab42b-3ade-46d0-b13a-83e2f2944d20">
+      <PreValues>
+        <PreValue Id="46" Value="~/usercontrols/uTagsy/uTagsy.ascx" />
+      </PreValues>
+    </DataType>
+  </DataTypes>
+  <control>/usercontrols/uBlogsy/dashboard/Installer.ascx</control>
+  <Actions>
+    <Action runat="install" undo="true" alias="addDashboardSection" dashboardAlias="uBlogsyDashboardSection">
+      <section>
+        <areas>
+          <area>default</area>
+          <area>content</area>
+        </areas>
+        <tab caption="Create Blog Post">
+          <control>/usercontrols/uBlogsy/dashboard/CreatePost.ascx</control>
+        </tab>
+        <tab caption="Blog RSS Import Tool">
+          <control>/usercontrols/uBlogsy/dashboard/RSSImport.ascx</control>
+        </tab>
+      </section>
+    </Action>
+  </Actions>
+</umbPackage>
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index d42783d63e..6bbf0acc3a 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -424,9 +424,11 @@
     <Content Include="Migrations\SqlScripts\SqlCe-SchemaAndData-4110.sql" />
     <Content Include="Migrations\SqlScripts\SqlCeTotal-480.sql" />
     <Content Include="Migrations\SqlScripts\SqlServerTotal-480.sql" />
-    <Content Include="Services\Importing\package.xml">
+    <Content Include="Services\Importing\InheritedDocTypes-Package.xml" />
+    <Content Include="Services\Importing\StandardMvc-Package.xml">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Services\Importing\uBlogsy-Package.xml" />
     <Content Include="TestHelpers\ExamineHelpers\media.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5ff48713ee..00f19cfbbf 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2331,7 +2331,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>61637</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:61639/VirtualDir</IISUrl>
+          <IISUrl>http://localhost:61639/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
index 5a0f75c688..97328a6363 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -651,40 +651,26 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
                 propertyType.DataTypeDefinitionId = dataTypeDefinition.Id;
                 propertyType.DataTypeId = dataTypeDefinition.ControlId;
 
-                if (propertyType.PropertyGroupId != gpw.GenricPropertyControl.Tab)
+                if (propertyType.PropertyGroupId.Value != gpw.GenricPropertyControl.Tab)
                 {
                     if (gpw.GenricPropertyControl.Tab == 0)
                     {
-                        propertyType.PropertyGroupId = 0;
+                        propertyType.PropertyGroupId = new Lazy<int>(() => 0);
                     }
                     else if (contentTypeItem.PropertyGroups.Any(x => x.Id == gpw.GenricPropertyControl.Tab))
                     {
-                        propertyType.PropertyGroupId = gpw.GenricPropertyControl.Tab;
+                        propertyType.PropertyGroupId = new Lazy<int>(() => gpw.GenricPropertyControl.Tab);
                     }
                     else if (contentTypeItem.PropertyGroups.Any(x => x.ParentId == gpw.GenricPropertyControl.Tab))
                     {
                         var propertyGroup = contentTypeItem.PropertyGroups.First(x => x.ParentId == gpw.GenricPropertyControl.Tab);
-                        propertyType.PropertyGroupId = propertyGroup.Id;
+                        propertyType.PropertyGroupId = new Lazy<int>(() => propertyGroup.Id);
                     }
                     else
                     {
                         var propertyGroup = contentTypeItem.CompositionPropertyGroups.First(x => x.Id == gpw.GenricPropertyControl.Tab);
                         contentTypeItem.AddPropertyGroup(propertyGroup.Name);
                         contentTypeItem.MovePropertyType(propertyType.Alias, propertyGroup.Name);
-
-                        //if (
-                        //    contentTypeItem.CompositionPropertyGroups.Any(
-                        //        x => x.ParentId == gpw.GenricPropertyControl.Tab))
-                        //{
-                        //    var propertyGroups = contentTypeItem.CompositionPropertyGroups.Where(x => x.ParentId == gpw.GenricPropertyControl.Tab);
-                        //    var propertyGroup = propertyGroups.First();
-                        //    propertyType.PropertyGroupId = propertyGroup.Id;
-                        //}
-                        //else
-                        //{
-                        //    var propertyGroup = contentTypeItem.CompositionPropertyGroups.First(x => x.Id == gpw.GenricPropertyControl.Tab);
-                        //    contentTypeItem.AddPropertyGroup(propertyGroup.Name);
-                        //}
                     }
                 }
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs
index bacb1354e9..18eccdaaf1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx.cs
@@ -1,17 +1,10 @@
 using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
+using System.Linq;
 using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
-
-using umbraco.cms.businesslogic.member;
-using umbraco.cms.businesslogic.web;
 using System.Xml;
+using System.Xml.Linq;
+using Umbraco.Core;
 using umbraco.IO;
 
 namespace umbraco.presentation.umbraco.dialogs
@@ -27,22 +20,22 @@ namespace umbraco.presentation.umbraco.dialogs
             CurrentApp = BusinessLogic.DefaultApps.settings.ToString();
 
 	    }
-		protected System.Web.UI.WebControls.Literal FeedBackMessage;
-		protected System.Web.UI.WebControls.Literal jsShowWindow;
-		protected System.Web.UI.WebControls.Panel Wizard;
-		protected System.Web.UI.HtmlControls.HtmlTable Table1;
-		protected System.Web.UI.HtmlControls.HtmlInputHidden tempFile;
-		protected System.Web.UI.HtmlControls.HtmlInputFile documentTypeFile;
-		protected System.Web.UI.WebControls.Button submit;
-		protected System.Web.UI.WebControls.Panel Confirm;
-		protected System.Web.UI.WebControls.Literal dtName;
-		protected System.Web.UI.WebControls.Literal dtAlias;
-		protected System.Web.UI.WebControls.Button import;
-		protected System.Web.UI.WebControls.Literal dtNameConfirm;
-		protected System.Web.UI.WebControls.Panel done;
+		protected Literal FeedBackMessage;
+		protected Literal jsShowWindow;
+		protected Panel Wizard;
+		protected HtmlTable Table1;
+		protected HtmlInputHidden tempFile;
+		protected HtmlInputFile documentTypeFile;
+		protected Button submit;
+		protected Panel Confirm;
+		protected Literal dtName;
+		protected Literal dtAlias;
+		protected Button import;
+		protected Literal dtNameConfirm;
+		protected Panel done;
 		private string tempFileName = "";
 
-		private void Page_Load(object sender, System.EventArgs e)
+		private void Page_Load(object sender, EventArgs e)
 		{
 			if (!IsPostBack) 
 			{
@@ -74,14 +67,20 @@ namespace umbraco.presentation.umbraco.dialogs
 		}
 		#endregion
 
-		private void import_Click(object sender, System.EventArgs e)
+		private void import_Click(object sender, EventArgs e)
 		{
-			XmlDocument xd = new XmlDocument();
+			/*XmlDocument xd = new XmlDocument();
 			xd.Load(tempFile.Value);
 			cms.businesslogic.packager.Installer.ImportDocumentType(xd.DocumentElement, base.getUser(), true);
-			dtNameConfirm.Text = xd.DocumentElement.SelectSingleNode("/DocumentType/Info/Name").FirstChild.Value;
+			dtNameConfirm.Text = xd.DocumentElement.SelectSingleNode("/DocumentType/Info/Name").FirstChild.Value;*/
 
-			Wizard.Visible = false;
+		    var element = XElement.Parse(tempFile.Value);
+		    var importContentTypes = ApplicationContext.Current.Services.PackagingService.ImportContentTypes(element);
+		    var contentType = importContentTypes.FirstOrDefault();
+		    if (contentType != null)
+		        dtNameConfirm.Text = contentType.Name;
+
+		    Wizard.Visible = false;
 			Confirm.Visible = false;
 			done.Visible = true;
 		}
diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index 6d60107b84..30e41b4bea 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -1,18 +1,12 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Data;
+using System.Globalization;
 using System.IO;
-using System.Web;
 using System.Xml;
-using System.Xml.XPath;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Linq;
-using ICSharpCode.SharpZipLib;
 using ICSharpCode.SharpZipLib.Zip;
-using ICSharpCode.SharpZipLib.Zip.Compression;
-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using umbraco.cms.businesslogic.web;
@@ -137,17 +131,18 @@ namespace umbraco.cms.businesslogic.packager
             _control = Control;
         }
 
+        #region Public Methods
+        
         /// <summary>
         /// Adds the macro to the package
         /// </summary>
         /// <param name="MacroToAdd">Macro to add</param>
-        public void AddMacro(businesslogic.macro.Macro MacroToAdd)
+        [Obsolete("This method does nothing but add the macro to an ArrayList that is never used, so don't call this method.")]
+        public void AddMacro(Macro MacroToAdd)
         {
             _macros.Add(MacroToAdd);
         }
-
-
-
+        
         /// <summary>
         /// Imports the specified package
         /// </summary>
@@ -168,7 +163,7 @@ namespace umbraco.cms.businesslogic.packager
                     {
                         try
                         {
-                            tempDir = unPack(fi.FullName);
+                            tempDir = UnPack(fi.FullName);
                             LoadConfig(tempDir);
                         }
                         catch (Exception unpackE)
@@ -184,8 +179,7 @@ namespace umbraco.cms.businesslogic.packager
                 return tempDir;
             }
         }
-
-
+        
         public int CreateManifest(string tempDir, string guid, string repoGuid)
         {
             //This is the new improved install rutine, which chops up the process into 3 steps, creating the manifest, moving files, and finally handling umb objects
@@ -245,9 +239,9 @@ namespace umbraco.cms.businesslogic.packager
                     //we enclose the whole file-moving to ensure that the entire installer doesn't crash
                     try
                     {
-                        String destPath = getFileName(basePath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgPath")));
-                        String sourceFile = getFileName(tempDir, xmlHelper.GetNodeValue(n.SelectSingleNode("guid")));
-                        String destFile = getFileName(destPath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgName")));
+                        String destPath = GetFileName(basePath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgPath")));
+                        String sourceFile = GetFileName(tempDir, xmlHelper.GetNodeValue(n.SelectSingleNode("guid")));
+                        String destFile = GetFileName(destPath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgName")));
 
                         // Create the destination directory if it doesn't exist
                         if (!Directory.Exists(destPath))
@@ -271,21 +265,40 @@ namespace umbraco.cms.businesslogic.packager
                 insPack.Save();
             }
         }
-
-
+        
         public void InstallBusinessLogic(int packageId, string tempDir)
         {
-
             using (DisposableTimer.DebugDuration<Installer>(
                 () => "Installing business logic for package id " + packageId + " into temp folder " + tempDir,
                 () => "Package business logic installation complete for package id " + packageId))
             {
                 //retrieve the manifest to continue installation
-                packager.InstalledPackage insPack = packager.InstalledPackage.GetById(packageId);
-                bool saveNeeded = false;
+                var insPack = InstalledPackage.GetById(packageId);
+                //bool saveNeeded = false;
 
-                //Install DataTypes
-                foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("//DataType"))
+                // Get current user, with a fallback
+                var currentUser = new User(0);
+                if (string.IsNullOrEmpty(BasePages.UmbracoEnsuredPage.umbracoUserContextID) == false)
+                {
+                    if (BasePages.UmbracoEnsuredPage.ValidateUserContextID(BasePages.UmbracoEnsuredPage.umbracoUserContextID))
+                    {
+                        currentUser = User.GetCurrent();
+                    }
+                }
+
+                //Xml as XElement which is used with the new PackagingService
+                var rootElement = _packageConfig.DocumentElement.GetXElement();
+                var packagingService = ApplicationContext.Current.Services.PackagingService;
+
+                #region DataTypes
+                var dataTypeElement = rootElement.Descendants("DataTypes").First();
+                var dataTypeDefinitions = packagingService.ImportDataTypeDefinitions(dataTypeElement, currentUser.Id);
+                foreach (var dataTypeDefinition in dataTypeDefinitions)
+                {
+                    insPack.Data.DataTypes.Add(dataTypeDefinition.Id.ToString(CultureInfo.InvariantCulture));
+                    //saveNeeded = true;
+                }
+                /*foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("//DataType"))
                 {
                     cms.businesslogic.datatype.DataTypeDefinition newDtd = cms.businesslogic.datatype.DataTypeDefinition.Import(n);
 
@@ -294,25 +307,27 @@ namespace umbraco.cms.businesslogic.packager
                         insPack.Data.DataTypes.Add(newDtd.Id.ToString());
                         saveNeeded = true;
                     }
-                }
+                }*/
 
-                if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                #endregion
 
-                //Install languages
+                #region Languages
                 foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("//Language"))
                 {
                     language.Language newLang = language.Language.Import(n);
 
                     if (newLang != null)
                     {
-                        insPack.Data.Languages.Add(newLang.id.ToString());
-                        saveNeeded = true;
+                        insPack.Data.Languages.Add(newLang.id.ToString(CultureInfo.InvariantCulture));
+                        //saveNeeded = true;
                     }
                 }
 
-                if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                #endregion
 
-                //Install dictionary items
+                #region Dictionary items
                 foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("./DictionaryItems/DictionaryItem"))
                 {
                     Dictionary.DictionaryItem newDi = Dictionary.DictionaryItem.Import(n);
@@ -320,41 +335,42 @@ namespace umbraco.cms.businesslogic.packager
                     if (newDi != null)
                     {
                         insPack.Data.DictionaryItems.Add(newDi.id.ToString());
-                        saveNeeded = true;
+                        //saveNeeded = true;
                     }
                 }
 
-                if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                #endregion
 
-                // Install macros
+                #region Macros
                 foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("//macro"))
                 {
-                    cms.businesslogic.macro.Macro m = cms.businesslogic.macro.Macro.Import(n);
+                    Macro m = Macro.Import(n);
 
                     if (m != null)
                     {
-                        insPack.Data.Macros.Add(m.Id.ToString());
-                        saveNeeded = true;
+                        insPack.Data.Macros.Add(m.Id.ToString(CultureInfo.InvariantCulture));
+                        //saveNeeded = true;
                     }
                 }
 
-                if (saveNeeded) { insPack.Save(); saveNeeded = false; }
-
-                // Get current user, with a fallback
-                User u = new User(0);
-                if (!string.IsNullOrEmpty(BasePages.UmbracoEnsuredPage.umbracoUserContextID))
+                //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                #endregion
+                
+                #region Templates
+                var templateElement = rootElement.Descendants("Templates").First();
+                var templates = packagingService.ImportTemplates(templateElement, currentUser.Id);
+                foreach (var template in templates)
                 {
-                    if (BasePages.UmbracoEnsuredPage.ValidateUserContextID(BasePages.UmbracoEnsuredPage.umbracoUserContextID))
-                    {
-                        u = User.GetCurrent();
-                    }
+                    insPack.Data.Templates.Add(template.Id.ToString(CultureInfo.InvariantCulture));
+                    //saveNeeded = true;
                 }
 
+                //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
 
-                // Add Templates
-                foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Templates/Template"))
+                /*foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Templates/Template"))
                 {
-                    var t = Template.Import(n, u);
+                    var t = Template.Import(n, currentUser);
 
                     insPack.Data.Templates.Add(t.Id.ToString());
 
@@ -371,13 +387,13 @@ namespace umbraco.cms.businesslogic.packager
                 foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Templates/Template"))
                 {
                     string master = xmlHelper.GetNodeValue(n.SelectSingleNode("Master"));
-                    template.Template t = template.Template.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Alias")));
+                    Template t = Template.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Alias")));
                     if (master.Trim() != "")
                     {
-                        template.Template masterTemplate = template.Template.GetByAlias(master);
+                        var masterTemplate = Template.GetByAlias(master);
                         if (masterTemplate != null)
                         {
-                            t.MasterTemplate = template.Template.GetByAlias(master).Id;
+                            t.MasterTemplate = Template.GetByAlias(master).Id;
                             //SD: This appears to always just save an empty template because the design isn't set yet
                             // this fixes an issue now that we have MVC because if there is an empty template and MVC is 
                             // the default, it will create a View not a master page and then the system will try to route via
@@ -395,12 +411,23 @@ namespace umbraco.cms.businesslogic.packager
                         t.ImportDesign(xmlHelper.GetNodeValue(n.SelectSingleNode("Design")));
                         t.SaveMasterPageFile(t.Design);
                     }
+                }*/
+                #endregion
+
+                #region DocumentTypes
+                var docTypeElement = rootElement.Descendants("DocumentTypes").First();
+                var contentTypes = packagingService.ImportContentTypes(docTypeElement, currentUser.Id);
+                foreach (var contentType in contentTypes)
+                {
+                    insPack.Data.Documenttypes.Add(contentType.Id.ToString(CultureInfo.InvariantCulture));
+                    //saveNeeded = true;
                 }
 
-                // Add documenttypes
-                foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("DocumentTypes/DocumentType"))
+                //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+
+                /*foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("DocumentTypes/DocumentType"))
                 {
-                    ImportDocumentType(n, u, false);
+                    ImportDocumentType(n, currentUser, false);
                     saveNeeded = true;
                 }
 
@@ -432,29 +459,36 @@ namespace umbraco.cms.businesslogic.packager
                     }
                 }
 
-                if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                if (saveNeeded) { insPack.Save(); saveNeeded = false; }*/
+                #endregion
 
-                // Stylesheets
+                #region Stylesheets
                 foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Stylesheets/Stylesheet"))
                 {
-                    StyleSheet s = StyleSheet.Import(n, u);
+                    StyleSheet s = StyleSheet.Import(n, currentUser);
 
                     insPack.Data.Stylesheets.Add(s.Id.ToString());
-                    saveNeeded = true;
+                    //saveNeeded = true;
                 }
 
-                if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                #endregion
 
-                // Documents
-                foreach (XmlElement n in _packageConfig.DocumentElement.SelectNodes("Documents/DocumentSet [@importMode = 'root']/*"))
+                #region Documents
+                var documentElement = rootElement.Descendants("DocumentSet").First();
+                var content = packagingService.ImportContent(documentElement, -1, currentUser.Id);
+                var firstContentItem = content.First();
+                insPack.Data.ContentNodeId = firstContentItem.Id.ToString(CultureInfo.InvariantCulture);
+
+                /*foreach (XmlElement n in _packageConfig.DocumentElement.SelectNodes("Documents/DocumentSet [@importMode = 'root']/*"))
                 {
-                    insPack.Data.ContentNodeId = cms.businesslogic.web.Document.Import(-1, u, n).ToString();
-                }
+                    insPack.Data.ContentNodeId = cms.businesslogic.web.Document.Import(-1, currentUser, n).ToString();
+                }*/
+                #endregion
 
-                //Package Actions
+                #region Package Actions
                 foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Actions/Action"))
                 {
-
                     if (n.Attributes["undo"] == null || n.Attributes["undo"].Value == "true")
                     {
                         insPack.Data.Actions += n.OuterXml;
@@ -464,7 +498,7 @@ namespace umbraco.cms.businesslogic.packager
                     {
                         try
                         {
-                            packager.PackageAction.RunPackageAction(insPack.Data.Name, n.Attributes["alias"].Value, n);
+                            PackageAction.RunPackageAction(insPack.Data.Name, n.Attributes["alias"].Value, n);
                         }
                         catch
                         {
@@ -472,6 +506,7 @@ namespace umbraco.cms.businesslogic.packager
                         }
                     }
                 }
+                #endregion
 
                 // Trigger update of Apps / Trees config.
                 // (These are ApplicationStartupHandlers so just instantiating them will trigger them)
@@ -499,30 +534,54 @@ namespace umbraco.cms.businesslogic.packager
         /// Invoking this method installs the entire current package
         /// </summary>
         /// <param name="tempDir">Temporary folder where the package's content are extracted to</param>
+        /// <param name="guid"></param>
+        /// <param name="repoGuid"></param>
         public void Install(string tempDir, string guid, string repoGuid)
         {
             //PPH added logging of installs, this adds all install info in the installedPackages config file.
-            string _packName = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/package/name"));
-            string _packAuthor = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/author/name"));
-            string _packAuthorUrl = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/author/website"));
-            string _packVersion = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/package/version"));
-            string _packReadme = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/readme"));
-            string _packLicense = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/package/license "));
+            string packName = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/package/name"));
+            string packAuthor = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/author/name"));
+            string packAuthorUrl = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/author/website"));
+            string packVersion = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/package/version"));
+            string packReadme = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/readme"));
+            string packLicense = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/package/license "));
 
 
             //Create a new package instance to record all the installed package adds - this is the same format as the created packages has.
             //save the package meta data
-            packager.InstalledPackage insPack = packager.InstalledPackage.MakeNew(_packName);
-            insPack.Data.Author = _packAuthor;
-            insPack.Data.AuthorUrl = _packAuthorUrl;
-            insPack.Data.Version = _packVersion;
-            insPack.Data.Readme = _packReadme;
-            insPack.Data.License = _packLicense;
+            var insPack = InstalledPackage.MakeNew(packName);
+            insPack.Data.Author = packAuthor;
+            insPack.Data.AuthorUrl = packAuthorUrl;
+            insPack.Data.Version = packVersion;
+            insPack.Data.Readme = packReadme;
+            insPack.Data.License = packLicense;
             insPack.Data.PackageGuid = guid; //the package unique key.
             insPack.Data.RepositoryGuid = repoGuid; //the repository unique key, if the package is a file install, the repository will not get logged.
 
+            // Get current user, with a fallback
+            var currentUser = new User(0);
+            if (string.IsNullOrEmpty(BasePages.UmbracoEnsuredPage.umbracoUserContextID) == false)
+            {
+                if (BasePages.UmbracoEnsuredPage.ValidateUserContextID(BasePages.UmbracoEnsuredPage.umbracoUserContextID))
+                {
+                    currentUser = User.GetCurrent();
+                }
+            }
 
-            //Install languages
+            //Xml as XElement which is used with the new PackagingService
+            var rootElement = _packageConfig.DocumentElement.GetXElement();
+            var packagingService = ApplicationContext.Current.Services.PackagingService;
+
+            #region DataTypes
+            var dataTypeElement = rootElement.Descendants("DataTypes").First();
+            var dataTypeDefinitions = packagingService.ImportDataTypeDefinitions(dataTypeElement, currentUser.Id);
+            foreach (var dataTypeDefinition in dataTypeDefinitions)
+            {
+                insPack.Data.DataTypes.Add(dataTypeDefinition.Id.ToString(CultureInfo.InvariantCulture));
+            }
+            #endregion
+
+            #region Install Languages
             foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("//Language"))
             {
                 language.Language newLang = language.Language.Import(n);
@@ -530,8 +589,9 @@ namespace umbraco.cms.businesslogic.packager
                 if (newLang != null)
                     insPack.Data.Languages.Add(newLang.id.ToString());
             }
+            #endregion
 
-            //Install dictionary items
+            #region Install Dictionary Items
             foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("./DictionaryItems/DictionaryItem"))
             {
                 Dictionary.DictionaryItem newDi = Dictionary.DictionaryItem.Import(n);
@@ -539,23 +599,25 @@ namespace umbraco.cms.businesslogic.packager
                 if (newDi != null)
                     insPack.Data.DictionaryItems.Add(newDi.id.ToString());
             }
+            #endregion
 
-            // Install macros
+            #region Install Macros
             foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("//macro"))
             {
-                cms.businesslogic.macro.Macro m = cms.businesslogic.macro.Macro.Import(n);
+                Macro m = Macro.Import(n);
 
                 if (m != null)
                     insPack.Data.Macros.Add(m.Id.ToString());
             }
+            #endregion
 
-            // Move files
+            #region Move files
             string basePath = System.Web.Hosting.HostingEnvironment.ApplicationPhysicalPath;
             foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("//file"))
             {
-                String destPath = getFileName(basePath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgPath")));
-                String sourceFile = getFileName(tempDir, xmlHelper.GetNodeValue(n.SelectSingleNode("guid")));
-                String destFile = getFileName(destPath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgName")));
+                String destPath = GetFileName(basePath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgPath")));
+                String sourceFile = GetFileName(tempDir, xmlHelper.GetNodeValue(n.SelectSingleNode("guid")));
+                String destFile = GetFileName(destPath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgName")));
 
                 // Create the destination directory if it doesn't exist
                 if (!Directory.Exists(destPath))
@@ -569,33 +631,36 @@ namespace umbraco.cms.businesslogic.packager
                 //PPH log file install
                 insPack.Data.Files.Add(xmlHelper.GetNodeValue(n.SelectSingleNode("orgPath")) + "/" + xmlHelper.GetNodeValue(n.SelectSingleNode("orgName")));
             }
+            #endregion
 
-
-            // Get current user
-            BusinessLogic.User u = User.GetCurrent();
-
-            // Add Templates
-            foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Templates/Template"))
+            #region Install Templates
+            var templateElement = rootElement.Descendants("Templates").First();
+            var templates = packagingService.ImportTemplates(templateElement, currentUser.Id);
+            foreach (var template in templates)
             {
-                template.Template t = template.Template.MakeNew(xmlHelper.GetNodeValue(n.SelectSingleNode("Name")), u);
+                insPack.Data.Templates.Add(template.Id.ToString(CultureInfo.InvariantCulture));
+            }
+            /*foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Templates/Template"))
+            {
+                Template t = Template.MakeNew(xmlHelper.GetNodeValue(n.SelectSingleNode("Name")), currentUser);
                 t.Alias = xmlHelper.GetNodeValue(n.SelectSingleNode("Alias"));
 
                 t.ImportDesign(xmlHelper.GetNodeValue(n.SelectSingleNode("Design")));
 
                 insPack.Data.Templates.Add(t.Id.ToString());
             }
-
+            
             // Add master templates
             foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Templates/Template"))
             {
                 string master = xmlHelper.GetNodeValue(n.SelectSingleNode("Master"));
-                template.Template t = template.Template.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Alias")));
+                Template t = Template.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Alias")));
                 if (master.Trim() != "")
                 {
-                    template.Template masterTemplate = template.Template.GetByAlias(master);
+                    Template masterTemplate = Template.GetByAlias(master);
                     if (masterTemplate != null)
                     {
-                        t.MasterTemplate = template.Template.GetByAlias(master).Id;
+                        t.MasterTemplate = Template.GetByAlias(master).Id;
                         if (UmbracoSettings.UseAspNetMasterPages)
                             t.SaveMasterPageFile(t.Design);
                     }
@@ -606,12 +671,19 @@ namespace umbraco.cms.businesslogic.packager
                     t.ImportDesign(xmlHelper.GetNodeValue(n.SelectSingleNode("Design")));
                     t.SaveMasterPageFile(t.Design);
                 }
-            }
+            }*/
+            #endregion
 
-            // Add documenttypes
-            foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("DocumentTypes/DocumentType"))
+            #region Install DocumentTypes
+            var docTypeElement = rootElement.Descendants("DocumentTypes").First();
+            var contentTypes = packagingService.ImportContentTypes(docTypeElement, currentUser.Id);
+            foreach (var contentType in contentTypes)
             {
-                ImportDocumentType(n, u, false);
+                insPack.Data.Documenttypes.Add(contentType.Id.ToString(CultureInfo.InvariantCulture));
+            }
+            /*foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("DocumentTypes/DocumentType"))
+            {
+                ImportDocumentType(n, currentUser, false);
             }
 
             // Add documenttype structure
@@ -634,13 +706,14 @@ namespace umbraco.cms.businesslogic.packager
                     //PPH we log the document type install here.
                     insPack.Data.Documenttypes.Add(dt.Id.ToString());
                 }
-            }
+            }*/
+            #endregion
 
-            // Stylesheets
+            #region Install Stylesheets
             foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Stylesheets/Stylesheet"))
             {
                 StyleSheet s = StyleSheet.MakeNew(
-                    u,
+                    currentUser,
                     xmlHelper.GetNodeValue(n.SelectSingleNode("Name")),
                     xmlHelper.GetNodeValue(n.SelectSingleNode("FileName")),
                     xmlHelper.GetNodeValue(n.SelectSingleNode("Content")));
@@ -650,7 +723,7 @@ namespace umbraco.cms.businesslogic.packager
                     StylesheetProperty sp = StylesheetProperty.MakeNew(
                         xmlHelper.GetNodeValue(prop.SelectSingleNode("Name")),
                         s,
-                        u);
+                        currentUser);
                     sp.Alias = xmlHelper.GetNodeValue(prop.SelectSingleNode("Alias"));
                     sp.value = xmlHelper.GetNodeValue(prop.SelectSingleNode("Value"));
                 }
@@ -659,20 +732,29 @@ namespace umbraco.cms.businesslogic.packager
 
                 insPack.Data.Stylesheets.Add(s.Id.ToString());
             }
+            #endregion
 
-            // Documents
-            foreach (XmlElement n in _packageConfig.DocumentElement.SelectNodes("Documents/DocumentSet [@importMode = 'root']/*"))
+            #region Install Documents
+            var documentElement = rootElement.Descendants("DocumentSet").First();
+            var content = packagingService.ImportContent(documentElement, -1, currentUser.Id);
+
+            var firstContentItem = content.First();
+            insPack.Data.ContentNodeId = firstContentItem.Id.ToString(CultureInfo.InvariantCulture);
+
+            /*foreach (XmlElement n in _packageConfig.DocumentElement.SelectNodes("Documents/DocumentSet [@importMode = 'root']/*"))
             {
-                cms.businesslogic.web.Document.Import(-1, u, n);
+                Document.Import(-1, currentUser, n);
 
                 //PPH todo log document install... 
-            }
+            }*/
+            #endregion
 
+            #region Install Actions
             foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("Actions/Action [@runat != 'uninstall']"))
             {
                 try
                 {
-                    packager.PackageAction.RunPackageAction(_packName, n.Attributes["alias"].Value, n);
+                    PackageAction.RunPackageAction(packName, n.Attributes["alias"].Value, n);
                 }
                 catch { }
             }
@@ -682,268 +764,11 @@ namespace umbraco.cms.businesslogic.packager
             {
                 insPack.Data.Actions += n.OuterXml;
             }
-
+            #endregion
 
             insPack.Save();
-
-
         }
-
-        public static void ImportDocumentType(XmlNode n, BusinessLogic.User u, bool ImportStructure)
-        {
-            DocumentType dt = DocumentType.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Alias")));
-            if (dt == null)
-            {
-                dt = DocumentType.MakeNew(u, xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Name")));
-                dt.Alias = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Alias"));
-
-
-                //Master content type
-                DocumentType mdt = DocumentType.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Master")));
-                if (mdt != null)
-                    dt.MasterContentType = mdt.Id;
-            }
-            else
-            {
-                dt.Text = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Name"));
-            }
-
-
-            // Info
-            dt.IconUrl = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Icon"));
-            dt.Thumbnail = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Thumbnail"));
-            dt.Description = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Description"));
-
-            // Allow at root (check for node due to legacy)
-            bool allowAtRoot = false;
-            string allowAtRootNode = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/AllowAtRoot"));
-            if (!String.IsNullOrEmpty(allowAtRootNode))
-            {
-                bool.TryParse(allowAtRootNode, out allowAtRoot);
-            }
-            dt.AllowAtRoot = allowAtRoot;
-            
-            // Templates	
-            ArrayList templates = new ArrayList();
-            foreach (XmlNode tem in n.SelectNodes("Info/AllowedTemplates/Template"))
-            {
-                template.Template t = template.Template.GetByAlias(xmlHelper.GetNodeValue(tem));
-                if (t != null)
-                    templates.Add(t);
-            }
-
-            try
-            {
-                template.Template[] at = new template.Template[templates.Count];
-                for (int i = 0; i < templates.Count; i++)
-                    at[i] = (template.Template)templates[i];
-                dt.allowedTemplates = at;
-            }
-            catch (Exception ee)
-            {
-	            LogHelper.Error<Installer>("Packager: Error handling allowed templates", ee);
-            }
-
-            // Default template
-            try
-            {
-                if (xmlHelper.GetNodeValue(n.SelectSingleNode("Info/DefaultTemplate")) != "")
-                    dt.DefaultTemplate = template.Template.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Info/DefaultTemplate"))).Id;
-            }
-            catch (Exception ee)
-            {
-				LogHelper.Error<Installer>("Packager: Error assigning default template", ee);
-            }
-
-            // Tabs
-            cms.businesslogic.ContentType.TabI[] tabs = dt.getVirtualTabs;
-            string tabNames = ";";
-            for (int t = 0; t < tabs.Length; t++)
-                tabNames += tabs[t].Caption + ";";
-
-
-            //So the Tab is added to the DocumentType and then to this Hashtable, but its never used anywhere - WHY?
-            Hashtable ht = new Hashtable();
-            foreach (XmlNode t in n.SelectNodes("Tabs/Tab"))
-            {
-                if (tabNames.IndexOf(";" + xmlHelper.GetNodeValue(t.SelectSingleNode("Caption")) + ";") == -1)
-                {
-                    ht.Add(int.Parse(xmlHelper.GetNodeValue(t.SelectSingleNode("Id"))),
-                        dt.AddVirtualTab(xmlHelper.GetNodeValue(t.SelectSingleNode("Caption"))));
-                }
-            }
-
-            dt.ClearVirtualTabs();
-            // Get all tabs in hashtable
-            Hashtable tabList = new Hashtable();
-            foreach (cms.businesslogic.ContentType.TabI t in dt.getVirtualTabs.ToList())
-            {
-                if (!tabList.ContainsKey(t.Caption))
-                    tabList.Add(t.Caption, t.Id);
-            }
-
-            // Generic Properties
-            datatype.controls.Factory f = new datatype.controls.Factory();
-            foreach (XmlNode gp in n.SelectNodes("GenericProperties/GenericProperty"))
-            {
-                int dfId = 0;
-                Guid dtId = new Guid(xmlHelper.GetNodeValue(gp.SelectSingleNode("Type")));
-
-                if (gp.SelectSingleNode("Definition") != null && !string.IsNullOrEmpty(xmlHelper.GetNodeValue(gp.SelectSingleNode("Definition"))))
-                {
-                    Guid dtdId = new Guid(xmlHelper.GetNodeValue(gp.SelectSingleNode("Definition")));
-                    if (CMSNode.IsNode(dtdId))
-                        dfId = new CMSNode(dtdId).Id;
-                }
-                if (dfId == 0)
-                {
-                    try
-                    {
-                        dfId = findDataTypeDefinitionFromType(ref dtId);
-                    }
-                    catch
-                    {
-                        throw new Exception(String.Format("Could not find datatype with id {0}.", dtId));
-                    }
-                }
-
-                // Fix for rich text editor backwards compatibility 
-                if (dfId == 0 && dtId == new Guid("a3776494-0574-4d93-b7de-efdfdec6f2d1"))
-                {
-                    dtId = new Guid("83722133-f80c-4273-bdb6-1befaa04a612");
-                    dfId = findDataTypeDefinitionFromType(ref dtId);
-                }
-
-                if (dfId != 0)
-                {
-                    PropertyType pt = dt.getPropertyType(xmlHelper.GetNodeValue(gp.SelectSingleNode("Alias")));
-                    if (pt == null)
-                    {
-                        dt.AddPropertyType(
-                            datatype.DataTypeDefinition.GetDataTypeDefinition(dfId),
-                            xmlHelper.GetNodeValue(gp.SelectSingleNode("Alias")),
-                            xmlHelper.GetNodeValue(gp.SelectSingleNode("Name"))
-                            );
-                        pt = dt.getPropertyType(xmlHelper.GetNodeValue(gp.SelectSingleNode("Alias")));
-                    }
-                    else
-                    {
-                        pt.DataTypeDefinition = datatype.DataTypeDefinition.GetDataTypeDefinition(dfId);
-                        pt.Name = xmlHelper.GetNodeValue(gp.SelectSingleNode("Name"));
-                    }
-
-                    pt.Mandatory = bool.Parse(xmlHelper.GetNodeValue(gp.SelectSingleNode("Mandatory")));
-                    pt.ValidationRegExp = xmlHelper.GetNodeValue(gp.SelectSingleNode("Validation"));
-                    pt.Description = xmlHelper.GetNodeValue(gp.SelectSingleNode("Description"));
-
-                    // tab
-                    try
-                    {
-                        if (tabList.ContainsKey(xmlHelper.GetNodeValue(gp.SelectSingleNode("Tab"))))
-                            pt.TabId = (int)tabList[xmlHelper.GetNodeValue(gp.SelectSingleNode("Tab"))];
-                    }
-                    catch (Exception ee)
-                    {
-						LogHelper.Error<Installer>("Packager: Error assigning property to tab", ee);
-                    }
-                }
-            }
-
-            if (ImportStructure)
-            {
-                if (dt != null)
-                {
-                    ArrayList allowed = new ArrayList();
-                    foreach (XmlNode structure in n.SelectNodes("Structure/DocumentType"))
-                    {
-                        DocumentType dtt = DocumentType.GetByAlias(xmlHelper.GetNodeValue(structure));
-                        if (dtt != null)
-                            allowed.Add(dtt.Id);
-                    }
-                    int[] adt = new int[allowed.Count];
-                    for (int i = 0; i < allowed.Count; i++)
-                        adt[i] = (int)allowed[i];
-                    dt.AllowedChildContentTypeIDs = adt;
-                }
-            }
-
-            // clear caching
-            foreach (DocumentType.TabI t in dt.getVirtualTabs.ToList())
-                DocumentType.FlushTabCache(t.Id, dt.Id);
-
-            dt.Save();
-        }
-
-        /// <summary>
-        /// Gets the name of the file in the specified path.
-        /// Corrects possible problems with slashes that would result from a simple concatenation.
-        /// Can also be used to concatenate paths.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="fileName">Name of the file.</param>
-        /// <returns>The name of the file in the specified path.</returns>
-        private static String getFileName(String path, string fileName)
-        {
-            // virtual dir support
-            fileName = IOHelper.FindFile(fileName);
-
-            if (path.Contains("[$"))
-            {
-                //this is experimental and undocumented...
-                path = path.Replace("[$UMBRACO]", IO.SystemDirectories.Umbraco);
-                path = path.Replace("[$UMBRACOCLIENT]", IO.SystemDirectories.Umbraco_client);
-                path = path.Replace("[$CONFIG]", IO.SystemDirectories.Config);
-                path = path.Replace("[$DATA]", IO.SystemDirectories.Data);
-            }
-
-            //to support virtual dirs we try to lookup the file... 
-            path = IOHelper.FindFile(path);
-
-
-
-            Debug.Assert(path != null && path.Length >= 1);
-            Debug.Assert(fileName != null && fileName.Length >= 1);
-
-            path = path.Replace('/', '\\');
-            fileName = fileName.Replace('/', '\\');
-
-            // Does filename start with a slash? Does path end with one?
-            bool fileNameStartsWithSlash = (fileName[0] == Path.DirectorySeparatorChar);
-            bool pathEndsWithSlash = (path[path.Length - 1] == Path.DirectorySeparatorChar);
-
-            // Path ends with a slash
-            if (pathEndsWithSlash)
-            {
-                if (!fileNameStartsWithSlash)
-                    // No double slash, just concatenate
-                    return path + fileName;
-                else
-                    // Double slash, exclude that of the file
-                    return path + fileName.Substring(1);
-            }
-            else
-            {
-                if (fileNameStartsWithSlash)
-                    // Required slash specified, just concatenate
-                    return path + fileName;
-                else
-                    // Required slash missing, add it
-                    return path + Path.DirectorySeparatorChar + fileName;
-            }
-        }
-
-        private static int findDataTypeDefinitionFromType(ref Guid dtId)
-        {
-            int dfId = 0;
-            foreach (datatype.DataTypeDefinition df in datatype.DataTypeDefinition.GetAll())
-                if (df.DataType.Id == dtId)
-                {
-                    dfId = df.Id;
-                    break;
-                }
-            return dfId;
-        }
-
+        
         /// <summary>
         /// Reads the configuration of the package from the configuration xmldocument
         /// </summary>
@@ -969,8 +794,8 @@ namespace umbraco.cms.businesslogic.packager
             foreach (XmlNode n in _packageConfig.DocumentElement.SelectNodes("//file"))
             {
                 bool badFile = false;
-                string destPath = getFileName(basePath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgPath")));
-                string destFile = getFileName(destPath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgName")));
+                string destPath = GetFileName(basePath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgPath")));
+                string destFile = GetFileName(destPath, xmlHelper.GetNodeValue(n.SelectSingleNode("orgName")));
 
                 if (destPath.ToLower().Contains(IOHelper.DirSepChar + "app_code"))
                     badFile = true;
@@ -1038,25 +863,317 @@ namespace umbraco.cms.businesslogic.packager
                 _readme = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/info/readme"));
             }
             catch { }
+
             try
             {
                 _control = xmlHelper.GetNodeValue(_packageConfig.DocumentElement.SelectSingleNode("/umbPackage/control"));
             }
             catch { }
         }
+        
+        /// <summary>
+        /// This uses the old method of fetching and only supports the packages.umbraco.org repository.
+        /// </summary>
+        /// <param name="Package"></param>
+        /// <returns></returns>
+        public string Fetch(Guid Package)
+        {
+            // Check for package directory
+            if (!Directory.Exists(IOHelper.MapPath(SystemDirectories.Packages)))
+                Directory.CreateDirectory(IOHelper.MapPath(SystemDirectories.Packages));
 
-        private string unPack(string ZipName)
+            var wc = new System.Net.WebClient();
+
+            wc.DownloadFile(
+                "http://" + UmbracoSettings.PackageServer + "/fetch?package=" + Package.ToString(),
+                IOHelper.MapPath(SystemDirectories.Packages + "/" + Package.ToString() + ".umb"));
+
+            return "packages\\" + Package.ToString() + ".umb";
+        }
+        
+        #endregion
+
+        #region Public Static Methods
+
+        [Obsolete("This method is empty, so calling it will have no effect whatsoever.")]
+        public static void updatePackageInfo(Guid Package, int VersionMajor, int VersionMinor, int VersionPatch, User User)
+        {
+            //Why does this even exist?
+        }
+
+        [Obsolete("Use ApplicationContext.Current.Services.PackagingService.ImportContentTypes instead")]
+        public static void ImportDocumentType(XmlNode n, User u, bool ImportStructure)
+        {
+            var element = n.GetXElement();
+            var contentTypes = ApplicationContext.Current.Services.PackagingService.ImportContentTypes(element, u.Id);
+            /*DocumentType dt = DocumentType.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Alias")));
+            if (dt == null)
+            {
+                dt = DocumentType.MakeNew(u, xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Name")));
+                dt.Alias = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Alias"));
+
+
+                //Master content type
+                DocumentType mdt = DocumentType.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Master")));
+                if (mdt != null)
+                    dt.MasterContentType = mdt.Id;
+            }
+            else
+            {
+                dt.Text = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Name"));
+            }
+
+
+            // Info
+            dt.IconUrl = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Icon"));
+            dt.Thumbnail = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Thumbnail"));
+            dt.Description = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/Description"));
+
+            // Allow at root (check for node due to legacy)
+            bool allowAtRoot = false;
+            string allowAtRootNode = xmlHelper.GetNodeValue(n.SelectSingleNode("Info/AllowAtRoot"));
+            if (!String.IsNullOrEmpty(allowAtRootNode))
+            {
+                bool.TryParse(allowAtRootNode, out allowAtRoot);
+            }
+            dt.AllowAtRoot = allowAtRoot;
+
+            // Templates	
+            ArrayList templates = new ArrayList();
+            foreach (XmlNode tem in n.SelectNodes("Info/AllowedTemplates/Template"))
+            {
+                template.Template t = template.Template.GetByAlias(xmlHelper.GetNodeValue(tem));
+                if (t != null)
+                    templates.Add(t);
+            }
+
+            try
+            {
+                template.Template[] at = new template.Template[templates.Count];
+                for (int i = 0; i < templates.Count; i++)
+                    at[i] = (template.Template)templates[i];
+                dt.allowedTemplates = at;
+            }
+            catch (Exception ee)
+            {
+                LogHelper.Error<Installer>("Packager: Error handling allowed templates", ee);
+            }
+
+            // Default template
+            try
+            {
+                if (xmlHelper.GetNodeValue(n.SelectSingleNode("Info/DefaultTemplate")) != "")
+                    dt.DefaultTemplate = template.Template.GetByAlias(xmlHelper.GetNodeValue(n.SelectSingleNode("Info/DefaultTemplate"))).Id;
+            }
+            catch (Exception ee)
+            {
+                LogHelper.Error<Installer>("Packager: Error assigning default template", ee);
+            }
+
+            // Tabs
+            cms.businesslogic.ContentType.TabI[] tabs = dt.getVirtualTabs;
+            string tabNames = ";";
+            for (int t = 0; t < tabs.Length; t++)
+                tabNames += tabs[t].Caption + ";";
+
+
+            //So the Tab is added to the DocumentType and then to this Hashtable, but its never used anywhere - WHY?
+            Hashtable ht = new Hashtable();
+            foreach (XmlNode t in n.SelectNodes("Tabs/Tab"))
+            {
+                if (tabNames.IndexOf(";" + xmlHelper.GetNodeValue(t.SelectSingleNode("Caption")) + ";") == -1)
+                {
+                    ht.Add(int.Parse(xmlHelper.GetNodeValue(t.SelectSingleNode("Id"))),
+                        dt.AddVirtualTab(xmlHelper.GetNodeValue(t.SelectSingleNode("Caption"))));
+                }
+            }
+
+            dt.ClearVirtualTabs();
+            // Get all tabs in hashtable
+            Hashtable tabList = new Hashtable();
+            foreach (cms.businesslogic.ContentType.TabI t in dt.getVirtualTabs.ToList())
+            {
+                if (!tabList.ContainsKey(t.Caption))
+                    tabList.Add(t.Caption, t.Id);
+            }
+
+            // Generic Properties
+            datatype.controls.Factory f = new datatype.controls.Factory();
+            foreach (XmlNode gp in n.SelectNodes("GenericProperties/GenericProperty"))
+            {
+                int dfId = 0;
+                Guid dtId = new Guid(xmlHelper.GetNodeValue(gp.SelectSingleNode("Type")));
+
+                if (gp.SelectSingleNode("Definition") != null && !string.IsNullOrEmpty(xmlHelper.GetNodeValue(gp.SelectSingleNode("Definition"))))
+                {
+                    Guid dtdId = new Guid(xmlHelper.GetNodeValue(gp.SelectSingleNode("Definition")));
+                    if (CMSNode.IsNode(dtdId))
+                        dfId = new CMSNode(dtdId).Id;
+                }
+                if (dfId == 0)
+                {
+                    try
+                    {
+                        dfId = FindDataTypeDefinitionFromType(ref dtId);
+                    }
+                    catch
+                    {
+                        throw new Exception(String.Format("Could not find datatype with id {0}.", dtId));
+                    }
+                }
+
+                // Fix for rich text editor backwards compatibility 
+                if (dfId == 0 && dtId == new Guid("a3776494-0574-4d93-b7de-efdfdec6f2d1"))
+                {
+                    dtId = new Guid("83722133-f80c-4273-bdb6-1befaa04a612");
+                    dfId = FindDataTypeDefinitionFromType(ref dtId);
+                }
+
+                if (dfId != 0)
+                {
+                    PropertyType pt = dt.getPropertyType(xmlHelper.GetNodeValue(gp.SelectSingleNode("Alias")));
+                    if (pt == null)
+                    {
+                        dt.AddPropertyType(
+                            datatype.DataTypeDefinition.GetDataTypeDefinition(dfId),
+                            xmlHelper.GetNodeValue(gp.SelectSingleNode("Alias")),
+                            xmlHelper.GetNodeValue(gp.SelectSingleNode("Name"))
+                            );
+                        pt = dt.getPropertyType(xmlHelper.GetNodeValue(gp.SelectSingleNode("Alias")));
+                    }
+                    else
+                    {
+                        pt.DataTypeDefinition = datatype.DataTypeDefinition.GetDataTypeDefinition(dfId);
+                        pt.Name = xmlHelper.GetNodeValue(gp.SelectSingleNode("Name"));
+                    }
+
+                    pt.Mandatory = bool.Parse(xmlHelper.GetNodeValue(gp.SelectSingleNode("Mandatory")));
+                    pt.ValidationRegExp = xmlHelper.GetNodeValue(gp.SelectSingleNode("Validation"));
+                    pt.Description = xmlHelper.GetNodeValue(gp.SelectSingleNode("Description"));
+
+                    // tab
+                    try
+                    {
+                        if (tabList.ContainsKey(xmlHelper.GetNodeValue(gp.SelectSingleNode("Tab"))))
+                            pt.TabId = (int)tabList[xmlHelper.GetNodeValue(gp.SelectSingleNode("Tab"))];
+                    }
+                    catch (Exception ee)
+                    {
+                        LogHelper.Error<Installer>("Packager: Error assigning property to tab", ee);
+                    }
+                }
+            }
+
+            if (ImportStructure)
+            {
+                if (dt != null)
+                {
+                    ArrayList allowed = new ArrayList();
+                    foreach (XmlNode structure in n.SelectNodes("Structure/DocumentType"))
+                    {
+                        DocumentType dtt = DocumentType.GetByAlias(xmlHelper.GetNodeValue(structure));
+                        if (dtt != null)
+                            allowed.Add(dtt.Id);
+                    }
+                    int[] adt = new int[allowed.Count];
+                    for (int i = 0; i < allowed.Count; i++)
+                        adt[i] = (int)allowed[i];
+                    dt.AllowedChildContentTypeIDs = adt;
+                }
+            }
+
+            // clear caching
+            foreach (DocumentType.TabI t in dt.getVirtualTabs.ToList())
+                DocumentType.FlushTabCache(t.Id, dt.Id);
+
+            dt.Save();*/
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Gets the name of the file in the specified path.
+        /// Corrects possible problems with slashes that would result from a simple concatenation.
+        /// Can also be used to concatenate paths.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="fileName">Name of the file.</param>
+        /// <returns>The name of the file in the specified path.</returns>
+        private static String GetFileName(String path, string fileName)
+        {
+            // virtual dir support
+            fileName = IOHelper.FindFile(fileName);
+
+            if (path.Contains("[$"))
+            {
+                //this is experimental and undocumented...
+                path = path.Replace("[$UMBRACO]", IO.SystemDirectories.Umbraco);
+                path = path.Replace("[$UMBRACOCLIENT]", IO.SystemDirectories.Umbraco_client);
+                path = path.Replace("[$CONFIG]", IO.SystemDirectories.Config);
+                path = path.Replace("[$DATA]", IO.SystemDirectories.Data);
+            }
+
+            //to support virtual dirs we try to lookup the file... 
+            path = IOHelper.FindFile(path);
+
+
+
+            Debug.Assert(path != null && path.Length >= 1);
+            Debug.Assert(fileName != null && fileName.Length >= 1);
+
+            path = path.Replace('/', '\\');
+            fileName = fileName.Replace('/', '\\');
+
+            // Does filename start with a slash? Does path end with one?
+            bool fileNameStartsWithSlash = (fileName[0] == Path.DirectorySeparatorChar);
+            bool pathEndsWithSlash = (path[path.Length - 1] == Path.DirectorySeparatorChar);
+
+            // Path ends with a slash
+            if (pathEndsWithSlash)
+            {
+                if (!fileNameStartsWithSlash)
+                    // No double slash, just concatenate
+                    return path + fileName;
+                else
+                    // Double slash, exclude that of the file
+                    return path + fileName.Substring(1);
+            }
+            else
+            {
+                if (fileNameStartsWithSlash)
+                    // Required slash specified, just concatenate
+                    return path + fileName;
+                else
+                    // Required slash missing, add it
+                    return path + Path.DirectorySeparatorChar + fileName;
+            }
+        }
+
+        private static int FindDataTypeDefinitionFromType(ref Guid dtId)
+        {
+            int dfId = 0;
+            foreach (datatype.DataTypeDefinition df in datatype.DataTypeDefinition.GetAll())
+                if (df.DataType.Id == dtId)
+                {
+                    dfId = df.Id;
+                    break;
+                }
+            return dfId;
+        }
+
+        private static string UnPack(string zipName)
         {
             // Unzip
             string tempDir = IOHelper.MapPath(SystemDirectories.Data) + Path.DirectorySeparatorChar + Guid.NewGuid().ToString();
             Directory.CreateDirectory(tempDir);
 
-            ZipInputStream s = new ZipInputStream(File.OpenRead(ZipName));
+            var s = new ZipInputStream(File.OpenRead(zipName));
 
             ZipEntry theEntry;
             while ((theEntry = s.GetNextEntry()) != null)
             {
-                string directoryName = Path.GetDirectoryName(theEntry.Name);
                 string fileName = Path.GetFileName(theEntry.Name);
 
                 if (fileName != String.Empty)
@@ -1085,34 +1202,13 @@ namespace umbraco.cms.businesslogic.packager
 
             // Clean up
             s.Close();
-            File.Delete(ZipName);
+            File.Delete(zipName);
 
             return tempDir;
 
         }
 
-        //this uses the old method of fetching and only supports the packages.umbraco.org repository.
-        public string Fetch(Guid Package)
-        {
-
-            // Check for package directory
-            if (!System.IO.Directory.Exists(IOHelper.MapPath(SystemDirectories.Packages)))
-                System.IO.Directory.CreateDirectory(IOHelper.MapPath(SystemDirectories.Packages));
-
-            System.Net.WebClient wc = new System.Net.WebClient();
-
-            wc.DownloadFile(
-                "http://" + UmbracoSettings.PackageServer + "/fetch?package=" + Package.ToString(),
-                IOHelper.MapPath(SystemDirectories.Packages + "/" + Package.ToString() + ".umb"));
-
-            return "packages\\" + Package.ToString() + ".umb";
-        }
-
-
-        public static void updatePackageInfo(Guid Package, int VersionMajor, int VersionMinor, int VersionPatch, User User)
-        {
-
-        }
+        #endregion
     }
 
     public class Package
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs
index 7a3ab5bf29..94c523aeab 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Web;
 using Umbraco.Core.Logging;
 using umbraco.IO;
 
 namespace umbraco.cms.businesslogic.packager {
-    public class InstalledPackage {
+    public class InstalledPackage
+    {
+
+        private int _saveHitCount = 0;
 
         public static InstalledPackage GetById(int id) {
             InstalledPackage pack = new InstalledPackage();
@@ -27,7 +28,12 @@ namespace umbraco.cms.businesslogic.packager {
             return pack;
         }
 
-        public void Save() {
+        public void Save()
+        {
+#if DEBUG
+            _saveHitCount++;
+            LogHelper.Info<InstalledPackage>("The InstalledPackage class save method has been hit " + _saveHitCount + " times.");
+#endif
             this.FireBeforeSave(EventArgs.Empty);
             data.Save(this.Data, IOHelper.MapPath(Settings.InstalledPackagesSettings));
             this.FireAfterSave(EventArgs.Empty);
diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj
index a8cb396ac6..29e453ebac 100644
--- a/src/umbraco.cms/umbraco.cms.csproj
+++ b/src/umbraco.cms/umbraco.cms.csproj
@@ -158,6 +158,7 @@
       <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
     </ProjectReference>
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Tidy.Net.1.0.0\lib\TidyNet.dll</HintPath>