diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index e97b9317d8..0499157427 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -381,14 +381,26 @@ namespace umbraco.cms.businesslogic.packager
 
                     //Perhaps it would have been a good idea to put the following into methods eh?!?
 
-                    #region DataTypes
-                    var dataTypeElement = rootElement.Descendants("DataTypes").FirstOrDefault();
-                    if (dataTypeElement != null)
+                    #region Stylesheets
+                    foreach (XmlNode n in Config.DocumentElement.SelectNodes("Stylesheets/Stylesheet"))
                     {
-                        var dataTypeDefinitions = packagingService.ImportDataTypeDefinitions(dataTypeElement, currentUser.Id);
-                        foreach (var dataTypeDefinition in dataTypeDefinitions)
+                        StyleSheet s = StyleSheet.Import(n, currentUser);
+
+                        insPack.Data.Stylesheets.Add(s.Id.ToString(CultureInfo.InvariantCulture));
+                        //saveNeeded = true;
+                    }
+
+                    //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                    #endregion
+
+                    #region Templates
+                    var templateElement = rootElement.Descendants("Templates").FirstOrDefault();
+                    if (templateElement != null)
+                    {
+                        var templates = packagingService.ImportTemplates(templateElement, currentUser.Id);
+                        foreach (var template in templates)
                         {
-                            insPack.Data.DataTypes.Add(dataTypeDefinition.Id.ToString(CultureInfo.InvariantCulture));
+                            insPack.Data.Templates.Add(template.Id.ToString(CultureInfo.InvariantCulture));
                         }
                     }
                     #endregion
@@ -412,6 +424,18 @@ namespace umbraco.cms.businesslogic.packager
                     }
                     #endregion
 
+                    #region DataTypes
+                    var dataTypeElement = rootElement.Descendants("DataTypes").FirstOrDefault();
+                    if (dataTypeElement != null)
+                    {
+                        var dataTypeDefinitions = packagingService.ImportDataTypeDefinitions(dataTypeElement, currentUser.Id);
+                        foreach (var dataTypeDefinition in dataTypeDefinitions)
+                        {
+                            insPack.Data.DataTypes.Add(dataTypeDefinition.Id.ToString(CultureInfo.InvariantCulture));
+                        }
+                    }
+                    #endregion
+
                     #region Macros
                     var macroItemsElement = rootElement.Descendants("Macros").FirstOrDefault();
                     if (macroItemsElement != null)
@@ -421,18 +445,6 @@ namespace umbraco.cms.businesslogic.packager
                     }
                     #endregion
 
-                    #region Templates
-                    var templateElement = rootElement.Descendants("Templates").FirstOrDefault();
-                    if (templateElement != null)
-                    {
-                        var templates = packagingService.ImportTemplates(templateElement, currentUser.Id);
-                        foreach (var template in templates)
-                        {
-                            insPack.Data.Templates.Add(template.Id.ToString(CultureInfo.InvariantCulture));
-                        }
-                    }
-                    #endregion
-
                     #region DocumentTypes
                     //Check whether the root element is a doc type rather then a complete package
                     var docTypeElement = rootElement.Name.LocalName.Equals("DocumentType") ||
@@ -451,18 +463,6 @@ namespace umbraco.cms.businesslogic.packager
                     }
                     #endregion
 
-                    #region Stylesheets
-                    foreach (XmlNode n in Config.DocumentElement.SelectNodes("Stylesheets/Stylesheet"))
-                    {
-                        StyleSheet s = StyleSheet.Import(n, currentUser);
-
-                        insPack.Data.Stylesheets.Add(s.Id.ToString(CultureInfo.InvariantCulture));
-                        //saveNeeded = true;
-                    }
-
-                    //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
-                    #endregion
-
                     #region Documents
                     var documentElement = rootElement.Descendants("DocumentSet").FirstOrDefault();
                     if (documentElement != null)