diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt
index 469bf7a466..df03fe8381 100644
--- a/build/UmbracoVersion.txt
+++ b/build/UmbracoVersion.txt
@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.5.4
\ No newline at end of file
+7.5.5
\ No newline at end of file
diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
index 7e2bb88964..d7f4576137 100644
--- a/src/Umbraco.Core/Constants-Conventions.cs
+++ b/src/Umbraco.Core/Constants-Conventions.cs
@@ -122,6 +122,11 @@ namespace Umbraco.Core
 				/// MediaType alias for an image.
 				/// </summary>
 				public const string Image = "Image";
+
+                /// <summary>
+                /// MediaType alias indicating allowing auto-selection.
+                /// </summary>
+			    public const string AutoSelect = "umbracoAutoSelect";
 			}
             
 		    /// <summary>
diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
index 9570024b09..8b33599436 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
@@ -149,8 +149,8 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
         private void CreateCmsContentTypeData()
         {
             _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 532, NodeId = 1031, Alias = Constants.Conventions.MediaTypes.Folder, Icon = "icon-folder", Thumbnail = "icon-folder", IsContainer = false, AllowAtRoot = true });
-            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = Constants.Conventions.MediaTypes.Image, Icon = "icon-picture", Thumbnail = "icon-picture" });
-            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = Constants.Conventions.MediaTypes.File, Icon = "icon-document", Thumbnail = "icon-document" });
+            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 533, NodeId = 1032, Alias = Constants.Conventions.MediaTypes.Image, Icon = "icon-picture", Thumbnail = "icon-picture", AllowAtRoot = true });
+            _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 534, NodeId = 1033, Alias = Constants.Conventions.MediaTypes.File, Icon = "icon-document", Thumbnail = "icon-document", AllowAtRoot = true });
             _database.Insert("cmsContentType", "pk", false, new ContentTypeDto { PrimaryKey = 531, NodeId = 1044, Alias = Constants.Conventions.MemberTypes.DefaultAlias, Icon = "icon-user", Thumbnail = "icon-user" });
         }
 
diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveFive/UpdateAllowedMediaTypesAtRoot.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveFive/UpdateAllowedMediaTypesAtRoot.cs
new file mode 100644
index 0000000000..c9a0d509e6
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveFive/UpdateAllowedMediaTypesAtRoot.cs
@@ -0,0 +1,25 @@
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveFive
+{
+    /// <summary>
+    /// See: http://issues.umbraco.org/issue/U4-4196
+    /// </summary>
+    [Migration("7.5.5", 1, GlobalSettings.UmbracoMigrationName)]
+    public class UpdateAllowedMediaTypesAtRoot : MigrationBase
+    {
+        public UpdateAllowedMediaTypesAtRoot(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        { }
+
+        public override void Up()
+        {
+            Execute.Sql("UPDATE cmsContentType SET allowAtRoot = 1 WHERE nodeId = 1032 OR nodeId = 1033");
+        }
+
+        public override void Down()
+        { }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index 547f45e9a9..069c587b88 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -173,87 +173,52 @@ namespace Umbraco.Core.Persistence.Repositories
 
         #region Overrides of VersionableRepositoryBase<IContent>
 
-        public void RebuildXmlStructures(Func<IContent, XElement> serializer, int groupSize = 5000, IEnumerable<int> contentTypeIds = null)
+        public void RebuildXmlStructures(Func<IContent, XElement> serializer, int groupSize = 200, IEnumerable<int> contentTypeIds = null)
         {
+            // the previous way of doing this was to run it all in one big transaction,
+            // and to bulk-insert groups of xml rows - which works, until the transaction
+            // times out - and besides, because v7 transactions are ReadCommited, it does
+            // not bring much safety - so this reverts to updating each record individually,
+            // and it may be slower in the end, but should be more resilient.
 
-            //Ok, now we need to remove the data and re-insert it, we'll do this all in one transaction too.
-            using (var tr = Database.GetTransaction())
+            var baseId = 0;
+            var contentTypeIdsA = contentTypeIds == null ? new int[0] : contentTypeIds.ToArray();
+            while (true)
             {
-                //Remove all the data first, if anything fails after this it's no problem the transaction will be reverted
-                if (contentTypeIds == null)
-                {
-                    var subQuery = new Sql()
-                        .Select("id")
-                        .From<NodeDto>(SqlSyntax)
-                        .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                // get the next group of nodes
+                var query = GetBaseQuery(false);
+                if (contentTypeIdsA.Length > 0)
+                    query = query
+                        .WhereIn<ContentDto>(x => x.ContentTypeId, contentTypeIdsA, SqlSyntax);
+                query = query
+                    .Where<NodeDto>(x => x.NodeId > baseId && x.Trashed == false)
+                    .Where<DocumentDto>(x => x.Published)
+                    .OrderBy<NodeDto>(x => x.NodeId, SqlSyntax);
+                var xmlItems = ProcessQuery(SqlSyntax.SelectTop(query, groupSize))
+                    .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() })
+                    .ToList();
 
-                    var deleteSql = SqlSyntax.GetDeleteSubquery("cmsContentXml", "nodeId", subQuery);
-                    Database.Execute(deleteSql);
-                }
-                else
-                {
-                    var subQuery = new Sql()
-                        .Select("umbracoNode.id as nodeId")
-                        .From<ContentDto>(SqlSyntax)                        
-                        .InnerJoin<NodeDto>(SqlSyntax)
-                        .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
-                        .WhereIn<ContentDto>(dto => dto.ContentTypeId, contentTypeIds, SqlSyntax)
-                        .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                // no more nodes, break
+                if (xmlItems.Count == 0) break;
 
-                    var deleteSql = SqlSyntax.GetDeleteSubquery("cmsContentXml", "nodeId", subQuery);
-                    Database.Execute(deleteSql);
-                }
-
-                //now insert the data, again if something fails here, the whole transaction is reversed
-                if (contentTypeIds == null)
+                foreach (var xmlItem in xmlItems)
                 {
-                    var query = Query<IContent>.Builder.Where(x => x.Published == true);
-                    RebuildXmlStructuresProcessQuery(serializer, query, tr, groupSize);
-                }
-                else
-                {
-                    foreach (var contentTypeId in contentTypeIds)
+                    try
                     {
-                        //copy local
-                        var id = contentTypeId;
-                        var query = Query<IContent>.Builder.Where(x => x.Published == true && x.ContentTypeId == id && x.Trashed == false);
-                        RebuildXmlStructuresProcessQuery(serializer, query, tr, groupSize);
+                        // InsertOrUpdate tries to update first, which is good since it is what
+                        // should happen in most cases, then it tries to insert, and it should work
+                        // unless the node has been deleted, and we just report the exception
+                        Database.InsertOrUpdate(xmlItem);
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error<MediaRepository>("Could not rebuild XML for nodeId=" + xmlItem.NodeId, e);
                     }
                 }
-
-                tr.Complete();
+                baseId = xmlItems.Last().NodeId;
             }
         }
 
-        private void RebuildXmlStructuresProcessQuery(Func<IContent, XElement> serializer, IQuery<IContent> query, Transaction tr, int pageSize)
-        {
-            var pageIndex = 0;
-            var total = long.MinValue;
-            var processed = 0;
-            do
-            {
-                //NOTE: This is an important call, we cannot simply make a call to:
-                //  GetPagedResultsByQuery(query, pageIndex, pageSize, out total, "Path", Direction.Ascending);
-                // because that method is used to query 'latest' content items where in this case we don't necessarily
-                // want latest content items because a pulished content item might not actually be the latest.
-                // see: http://issues.umbraco.org/issue/U4-6322 & http://issues.umbraco.org/issue/U4-5982
-                var descendants = GetPagedResultsByQuery<DocumentDto, Content>(query, pageIndex, pageSize, out total,
-                    new Tuple<string, string>("cmsDocument", "nodeId"),
-                    ProcessQuery, "Path", Direction.Ascending, true);
-
-                var xmlItems = (from descendant in descendants
-                                let xml = serializer(descendant)
-                                select new ContentXmlDto { NodeId = descendant.Id, Xml = xml.ToDataString() });
-
-                //bulk insert it into the database
-                var count = Database.BulkInsertRecords(xmlItems, tr, SqlSyntax);
-
-                processed += count;
-
-                pageIndex++;
-            } while (processed < total);
-        }
-
         public override IContent GetByVersion(Guid versionId)
         {
             var sql = GetBaseQuery(false);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
index 907f9b62c5..64989f9269 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
@@ -38,5 +38,15 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <returns>An Enumerable list of <see cref="IMedia"/> objects</returns>
         IEnumerable<IMedia> GetPagedResultsByQuery(IQuery<IMedia> query, long pageIndex, int pageSize, out long totalRecords,
             string orderBy, Direction orderDirection, bool orderBySystemField, string filter = "");
+
+        /// <summary>
+        /// Gets paged media descendants as XML by path
+        /// </summary>
+        /// <param name="path">Path starts with</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records the query would return without paging</param>
+        /// <returns>A paged enumerable of XML entries of media items</returns>
+        IEnumerable<XElement> GetPagedXmlEntriesByPath(string path, long pageIndex, int pageSize, out long totalRecords);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
index 598c9e912d..38e5e46cde 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
@@ -163,80 +163,51 @@ namespace Umbraco.Core.Persistence.Repositories
             return media;
         }
 
-        public void RebuildXmlStructures(Func<IMedia, XElement> serializer, int groupSize = 5000, IEnumerable<int> contentTypeIds = null)
+        public void RebuildXmlStructures(Func<IMedia, XElement> serializer, int groupSize = 200, IEnumerable<int> contentTypeIds = null)
         {
+            // the previous way of doing this was to run it all in one big transaction,
+            // and to bulk-insert groups of xml rows - which works, until the transaction
+            // times out - and besides, because v7 transactions are ReadCommited, it does
+            // not bring much safety - so this reverts to updating each record individually,
+            // and it may be slower in the end, but should be more resilient.
 
-            //Ok, now we need to remove the data and re-insert it, we'll do this all in one transaction too.
-            using (var tr = Database.GetTransaction())
+            var baseId = 0;
+            var contentTypeIdsA = contentTypeIds == null ? new int[0] : contentTypeIds.ToArray();
+            while (true)
             {
-                //Remove all the data first, if anything fails after this it's no problem the transaction will be reverted
-                if (contentTypeIds == null)
-                {
-                    var subQuery = new Sql()
-                        .Select("id")
-                        .From<NodeDto>(SqlSyntax)
-                        .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);                    
+                // get the next group of nodes
+                var query = GetBaseQuery(false);
+                if (contentTypeIdsA.Length > 0)
+                    query = query
+                        .WhereIn<ContentDto>(x => x.ContentTypeId, contentTypeIdsA, SqlSyntax);
+                query = query
+                    .Where<NodeDto>(x => x.NodeId > baseId)
+                    .OrderBy<NodeDto>(x => x.NodeId, SqlSyntax);
+                var xmlItems = ProcessQuery(SqlSyntax.SelectTop(query, groupSize))
+                    .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() })
+                    .ToList();
 
-                    var deleteSql = SqlSyntax.GetDeleteSubquery("cmsContentXml", "nodeId", subQuery);
-                    Database.Execute(deleteSql);
-                }
-                else
-                {
-                    var subQuery = new Sql()
-                        .Select("umbracoNode.id as nodeId")
-                        .From<ContentDto>(SqlSyntax)
-                        .InnerJoin<NodeDto>(SqlSyntax)
-                        .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
-                        .WhereIn<ContentDto>(dto => dto.ContentTypeId, contentTypeIds, SqlSyntax)
-                        .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                // no more nodes, break
+                if (xmlItems.Count == 0) break;
 
-                    var deleteSql = SqlSyntax.GetDeleteSubquery("cmsContentXml", "nodeId", subQuery);
-                    Database.Execute(deleteSql);                    
-                }
-
-                //now insert the data, again if something fails here, the whole transaction is reversed
-                if (contentTypeIds == null)
+                foreach (var xmlItem in xmlItems)
                 {
-                    var query = Query<IMedia>.Builder;
-                    RebuildXmlStructuresProcessQuery(serializer, query, tr, groupSize);
-                }
-                else
-                {
-                    foreach (var contentTypeId in contentTypeIds)
+                    try
                     {
-                        //copy local
-                        var id = contentTypeId;
-                        var query = Query<IMedia>.Builder.Where(x => x.ContentTypeId == id && x.Trashed == false);
-                        RebuildXmlStructuresProcessQuery(serializer, query, tr, groupSize);
+                        // InsertOrUpdate tries to update first, which is good since it is what
+                        // should happen in most cases, then it tries to insert, and it should work
+                        // unless the node has been deleted, and we just report the exception
+                        Database.InsertOrUpdate(xmlItem);
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error<MediaRepository>("Could not rebuild XML for nodeId=" + xmlItem.NodeId, e);
                     }
                 }
-
-                tr.Complete();
+                baseId = xmlItems.Last().NodeId;
             }
         }
 
-        private void RebuildXmlStructuresProcessQuery(Func<IMedia, XElement> serializer, IQuery<IMedia> query, Transaction tr, int pageSize)
-        {
-            var pageIndex = 0;
-            var total = long.MinValue;
-            var processed = 0;
-            do
-            {
-                var descendants = GetPagedResultsByQuery(query, pageIndex, pageSize, out total, "Path", Direction.Ascending, true);
-
-                var xmlItems = (from descendant in descendants
-                                let xml = serializer(descendant)
-                                select new ContentXmlDto { NodeId = descendant.Id, Xml = xml.ToDataString() }).ToArray();
-
-                //bulk insert it into the database
-                Database.BulkInsertRecords(xmlItems, tr);
-
-                processed += xmlItems.Length;
-
-                pageIndex++;
-            } while (processed < total);
-        }
-
         public void AddOrUpdateContentXml(IMedia content, Func<IMedia, XElement> xml)
         {
             _contentXmlRepository.AddOrUpdate(new ContentXmlEntity<IMedia>(content, xml));
@@ -465,6 +436,30 @@ namespace Umbraco.Core.Persistence.Repositories
 
         }
 
+        /// <summary>
+        /// Gets paged media descendants as XML by path
+        /// </summary>
+        /// <param name="path">Path starts with</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records the query would return without paging</param>
+        /// <returns>A paged enumerable of XML entries of media items</returns>
+        public IEnumerable<XElement> GetPagedXmlEntriesByPath(string path, long pageIndex, int pageSize, out long totalRecords)
+        {
+            Sql query;
+            if (path == "-1")
+            {
+                query = new Sql().Select("nodeId, xml").From("cmsContentXml").Where("nodeId IN (SELECT id FROM umbracoNode WHERE nodeObjectType = @0)", Guid.Parse(Constants.ObjectTypes.Media)).OrderBy("nodeId");
+            }
+            else
+            {
+                query = new Sql().Select("nodeId, xml").From("cmsContentXml").Where("nodeId IN (SELECT id FROM umbracoNode WHERE path LIKE @0)", path.EnsureEndsWith(",%")).OrderBy("nodeId");
+            }
+            var pagedResult = Database.Page<ContentXmlDto>(pageIndex+1, pageSize, query);
+            totalRecords = pagedResult.TotalItems;
+            return pagedResult.Items.Select(dto => XElement.Parse(dto.Xml));
+        }
+
         private IEnumerable<IMedia> ProcessQuery(Sql sql)
         {
             //NOTE: This doesn't allow properties to be part of the query
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
index 216fc223db..66f803f9cd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
@@ -380,80 +380,51 @@ namespace Umbraco.Core.Persistence.Repositories
 
         #region Overrides of VersionableRepositoryBase<IMembershipUser>
 
-        public void RebuildXmlStructures(Func<IMember, XElement> serializer, int groupSize = 5000, IEnumerable<int> contentTypeIds = null)
+        public void RebuildXmlStructures(Func<IMember, XElement> serializer, int groupSize = 200, IEnumerable<int> contentTypeIds = null)
         {
+            // the previous way of doing this was to run it all in one big transaction,
+            // and to bulk-insert groups of xml rows - which works, until the transaction
+            // times out - and besides, because v7 transactions are ReadCommited, it does
+            // not bring much safety - so this reverts to updating each record individually,
+            // and it may be slower in the end, but should be more resilient.
 
-            //Ok, now we need to remove the data and re-insert it, we'll do this all in one transaction too.
-            using (var tr = Database.GetTransaction())
+            var baseId = 0;
+            var contentTypeIdsA = contentTypeIds == null ? new int[0] : contentTypeIds.ToArray();
+            while (true)
             {
-                //Remove all the data first, if anything fails after this it's no problem the transaction will be reverted
-                if (contentTypeIds == null)
-                {
-                    var subQuery = new Sql()
-                        .Select("id")
-                        .From<NodeDto>(SqlSyntax)
-                        .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                // get the next group of nodes
+                var query = GetBaseQuery(false);
+                if (contentTypeIdsA.Length > 0)
+                    query = query
+                        .WhereIn<ContentDto>(x => x.ContentTypeId, contentTypeIdsA, SqlSyntax);
+                query = query
+                    .Where<NodeDto>(x => x.NodeId > baseId)
+                    .OrderBy<NodeDto>(x => x.NodeId, SqlSyntax);
+                var xmlItems = ProcessQuery(SqlSyntax.SelectTop(query, groupSize))
+                    .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() })
+                    .ToList();
 
-                    var deleteSql = SqlSyntax.GetDeleteSubquery("cmsContentXml", "nodeId", subQuery);
-                    Database.Execute(deleteSql);
-                }
-                else
-                {
-                    var subQuery = new Sql()
-                        .Select("umbracoNode.id as nodeId")
-                        .From<ContentDto>(SqlSyntax)
-                        .InnerJoin<NodeDto>(SqlSyntax)
-                        .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
-                        .WhereIn<ContentDto>(dto => dto.ContentTypeId, contentTypeIds, SqlSyntax)
-                        .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                // no more nodes, break
+                if (xmlItems.Count == 0) break;
 
-                    var deleteSql = SqlSyntax.GetDeleteSubquery("cmsContentXml", "nodeId", subQuery);
-                    Database.Execute(deleteSql);                    
-                }
-
-                //now insert the data, again if something fails here, the whole transaction is reversed
-                if (contentTypeIds == null)
+                foreach (var xmlItem in xmlItems)
                 {
-                    var query = Query<IMember>.Builder;
-                    RebuildXmlStructuresProcessQuery(serializer, query, tr, groupSize);
-                }
-                else
-                {
-                    foreach (var contentTypeId in contentTypeIds)
+                    try
                     {
-                        //copy local
-                        var id = contentTypeId;
-                        var query = Query<IMember>.Builder.Where(x => x.ContentTypeId == id && x.Trashed == false);
-                        RebuildXmlStructuresProcessQuery(serializer, query, tr, groupSize);
+                        // InsertOrUpdate tries to update first, which is good since it is what
+                        // should happen in most cases, then it tries to insert, and it should work
+                        // unless the node has been deleted, and we just report the exception
+                        Database.InsertOrUpdate(xmlItem);
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error<MediaRepository>("Could not rebuild XML for nodeId=" + xmlItem.NodeId, e);
                     }
                 }
-
-                tr.Complete();
+                baseId = xmlItems.Last().NodeId;
             }
         }
 
-        private void RebuildXmlStructuresProcessQuery(Func<IMember, XElement> serializer, IQuery<IMember> query, Transaction tr, int pageSize)
-        {
-            var pageIndex = 0;
-            var total = long.MinValue;
-            var processed = 0;
-            do
-            {
-                var descendants = GetPagedResultsByQuery(query, pageIndex, pageSize, out total, "Path", Direction.Ascending, true);
-
-                var xmlItems = (from descendant in descendants
-                                let xml = serializer(descendant)
-                                select new ContentXmlDto { NodeId = descendant.Id, Xml = xml.ToDataString() }).ToArray();
-
-                //bulk insert it into the database
-                Database.BulkInsertRecords(xmlItems, tr);
-
-                processed += xmlItems.Length;
-
-                pageIndex++;
-            } while (processed < total);
-        }
-
         public override IMember GetByVersion(Guid versionId)
         {
             var sql = GetBaseQuery(false);
diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs
index 1c07c86086..257ee10d9c 100644
--- a/src/Umbraco.Core/Services/IMediaService.cs
+++ b/src/Umbraco.Core/Services/IMediaService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Xml.Linq;
 using Umbraco.Core.Configuration;
 using System.IO;
 using Umbraco.Core.Models;
@@ -58,6 +59,19 @@ namespace Umbraco.Core.Services
     /// </summary>
     public interface IMediaService : IService
     {
+        /// <summary>
+        /// Gets all XML entries found in the cmsContentXml table based on the given path
+        /// </summary>
+        /// <param name="path">Path starts with</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records the query would return without paging</param>
+        /// <returns>A paged enumerable of XML entries of media items</returns>
+        /// <remarks>
+        /// If -1 is passed, then this will return all media xml entries, otherwise will return all descendents from the path
+        /// </remarks>
+        IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords);
+
         /// <summary>
         /// Rebuilds all xml content in the cmsContentXml table for all media
         /// </summary>
diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
index b9026eb6c4..8bb22bc77f 100644
--- a/src/Umbraco.Core/Services/MediaService.cs
+++ b/src/Umbraco.Core/Services/MediaService.cs
@@ -1199,6 +1199,27 @@ namespace Umbraco.Core.Services
             return true;
         }
 
+        /// <summary>
+        /// Gets paged media descendants as XML by path
+        /// </summary>
+        /// <param name="path">Path starts with</param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records the query would return without paging</param>
+        /// <returns>A paged enumerable of XML entries of media items</returns>
+        public IEnumerable<XElement> GetPagedXmlEntries(string path, long pageIndex, int pageSize, out long totalRecords)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateMediaRepository(uow))
+            {
+                var contents = repository.GetPagedXmlEntriesByPath(path, pageIndex, pageSize, out totalRecords);
+                return contents;
+            }
+        }
+
         /// <summary>
         /// Rebuilds all xml content in the cmsContentXml table for all media
         /// </summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 4496cba278..ef1e6d7989 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -440,6 +440,7 @@
     <Compile Include="Persistence\Mappers\MigrationEntryMapper.cs" />
     <Compile Include="Persistence\Migrations\LocalMigrationContext.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionFourOneZero\AddPreviewXmlTable.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveFive\UpdateAllowedMediaTypesAtRoot.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\EnsureServersLockObject.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\RemoveStylesheetDataAndTablesAgain.cs" />
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
index abcb5b3d6a..311ea52071 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
@@ -101,7 +101,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 for (int i = 0; i < allCreated.Count; i++)
                 {
                     allCreated[i].Name = "blah" + i;
-                    //IMPORTANT testing note here: We need to changed the published state here so that 
+                    //IMPORTANT testing note here: We need to changed the published state here so that
                     // it doesn't automatically think this is simply publishing again - this forces the latest
                     // version to be Saved and not published
                     allCreated[i].ChangePublishedState(PublishedState.Saved);
@@ -109,7 +109,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
@@ -156,7 +156,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
@@ -221,7 +221,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
@@ -234,10 +234,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         /// <summary>
         /// This test ensures that when property values using special database fields are saved, the actual data in the
         /// object being stored is also transformed in the same way as the data being stored in the database is.
-        /// Before you would see that ex: a decimal value being saved as 100 or "100", would be that exact value in the 
+        /// Before you would see that ex: a decimal value being saved as 100 or "100", would be that exact value in the
         /// object, but the value saved to the database was actually 100.000000.
-        /// When querying the database for the value again - the value would then differ from what is in the object. 
-        /// This caused inconsistencies between saving+publishing and simply saving and then publishing, due to the former 
+        /// When querying the database for the value again - the value would then differ from what is in the object.
+        /// This caused inconsistencies between saving+publishing and simply saving and then publishing, due to the former
         /// sending the non-transformed data directly on to publishing.
         /// </summary>
         [Test]
@@ -269,10 +269,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage", propertyTypeCollection);
                 contentTypeRepository.AddOrUpdate(contentType);
                 unitOfWork.Commit();
-                
+
                 // Int and decimal values are passed in as strings as they would be from the backoffice UI
                 var textpage = MockedContent.CreateSimpleContentWithSpecialDatabaseTypes(contentType, "test@umbraco.org", -1, "100", "150", dateValue);
-                
+
                 // Act
                 repository.AddOrUpdate(textpage);
                 unitOfWork.Commit();
@@ -280,7 +280,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Assert
                 Assert.That(contentType.HasIdentity, Is.True);
                 Assert.That(textpage.HasIdentity, Is.True);
-                
+
                 var persistedTextpage = repository.Get(textpage.Id);
                 Assert.That(persistedTextpage.Name, Is.EqualTo(textpage.Name));
                 Assert.AreEqual(100m, persistedTextpage.GetValue(decimalPropertyAlias));
@@ -342,12 +342,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 contentTypeRepository.AddOrUpdate(contentType);
                 repository.AddOrUpdate(textpage);
                 unitOfWork.Commit();
-                
+
                 // Assert
                 Assert.That(contentType.HasIdentity, Is.True);
                 Assert.That(textpage.HasIdentity, Is.True);
 
-                
+
             }
         }
 
@@ -631,9 +631,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var query = Query<IContent>.Builder.Where(x => x.Name.Contains("Text"));
                 long totalRecords;
-                
+
                 try
-                {                    
+                {
                     DatabaseContext.Database.EnableSqlTrace = true;
                     DatabaseContext.Database.EnableSqlCount();
 
@@ -643,14 +643,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                     Assert.AreEqual(2, result.Count());
 
                     result = repository.GetPagedResultsByQuery(query, 1, 2, out totalRecords, "title", Direction.Ascending, false);
-                    
+
                     Assert.AreEqual(1, result.Count());
                 }
                 finally
-                {                
+                {
                     DatabaseContext.Database.EnableSqlTrace = false;
                     DatabaseContext.Database.DisableSqlCount();
-                }                
+                }
             }
         }
 
@@ -761,7 +761,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var query = Query<IContent>.Builder.Where(x => x.Level == 2);
                 var filterQuery = Query<IContent>.Builder.Where(x => x.Name.Contains("Page 2"));
-                
+
                 long totalRecords;
                 var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending, true, filterQuery);
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index a216eaaa45..1566441d5a 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
 using Moq;
@@ -59,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
@@ -69,6 +70,39 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void Rebuild_Some_Xml_Structures()
+        {
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+            MediaTypeRepository mediaTypeRepository;
+            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            {
+
+                var mediaType = mediaTypeRepository.Get(1032);
+
+                IMedia img50 = null;
+                for (var i = 0; i < 100; i++)
+                {
+                    var image = MockedMedia.CreateMediaImage(mediaType, -1);
+                    repository.AddOrUpdate(image);
+                    if (i == 50) img50 = image;
+                }
+                unitOfWork.Commit();
+
+                // assume this works (see other test)
+                repository.RebuildXmlStructures(media => new XElement("test"), 10);
+
+                //delete some xml
+                unitOfWork.Database.Execute("DELETE FROM cmsContentXml WHERE nodeId < " + img50.Id);
+                Assert.AreEqual(50, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
+
+                repository.RebuildXmlStructures(media => new XElement("test"), 10);
+
+                Assert.AreEqual(103, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
+            }
+        }
+
         [Test]
         public void Rebuild_All_Xml_Structures_For_Content_Type()
         {
@@ -99,7 +133,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
index bb13f055c9..e97fff03c8 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
             {
                 var memberType1 = CreateTestMemberType();
-                
+
                 for (var i = 0; i < 100; i++)
                 {
                     var member = MockedMember.CreateSimpleMember(memberType1, "blah" + i, "blah" + i + "@example.com", "blah", "blah" + i);
@@ -103,7 +103,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
@@ -216,7 +216,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var sut = repository.Get(member.Id);
 
                 Assert.That(sut, Is.Not.Null);
-                Assert.That(sut.HasIdentity, Is.True);      
+                Assert.That(sut.HasIdentity, Is.True);
                 Assert.That(sut.Properties.Any(x => x.HasIdentity == false || x.Id == 0), Is.False);
                 Assert.That(sut.Name, Is.EqualTo("Johnny Hefty"));
                 Assert.That(sut.Email, Is.EqualTo("johnny@example.com"));
@@ -350,7 +350,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     memberType = MockedContentTypes.CreateSimpleMemberType();
                     memberTypeRepository.AddOrUpdate(memberType);
-                    unitOfWork.Commit();    
+                    unitOfWork.Commit();
                 }
 
                 var member = MockedMember.CreateSimpleMember(memberType, name ?? "Johnny Hefty", email ?? "johnny@example.com", password ?? "123", username ?? "hefty", key);
diff --git a/src/Umbraco.Tests/PublishedContent/LegacyExamineBackedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/LegacyExamineBackedMediaTests.cs
index 8a83bea75a..5bf6a4edc5 100644
--- a/src/Umbraco.Tests/PublishedContent/LegacyExamineBackedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/LegacyExamineBackedMediaTests.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Tests.PublishedContent
 {
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
     public class LegacyExamineBackedMediaTests : ExamineBaseTest
     {
         public override void Initialize()
diff --git a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
index 6bd01c7f1c..3e7377f3b6 100644
--- a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
@@ -3,11 +3,13 @@ using System.Linq;
 using Examine;
 using Lucene.Net.Store;
 using NUnit.Framework;
+using Umbraco.Tests.TestHelpers;
 using UmbracoExamine;
 
 namespace Umbraco.Tests.UmbracoExamine
 {
-	[TestFixture]
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
+    [TestFixture]
 	public class EventsTest : ExamineBaseTest
 	{
 		[Test]
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index b303eed997..00e94ced63 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Xml.Linq;
 using Examine;
 using Examine.LuceneEngine.Config;
 using Examine.LuceneEngine.Providers;
@@ -7,10 +9,14 @@ using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Store;
 using Moq;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Services;
 using UmbracoExamine;
 using UmbracoExamine.Config;
@@ -34,7 +40,8 @@ namespace Umbraco.Tests.UmbracoExamine
                 IMediaService mediaService = null,
                 IDataTypeService dataTypeService = null,
                 IMemberService memberService = null,
-                IUserService userService = null)
+                IUserService userService = null,
+                IContentTypeService contentTypeService = null)
         {
             if (dataService == null)
             {
@@ -94,7 +101,8 @@ namespace Umbraco.Tests.UmbracoExamine
                 long longTotalRecs;
                 int intTotalRecs;
 
-                var allRecs = dataService.MediaService.GetLatestMediaByXpath("//node")
+                var mediaXml = dataService.MediaService.GetLatestMediaByXpath("//node");
+                var allRecs = mediaXml
                     .Root
                     .Elements()
                     .Select(x => Mock.Of<IMedia>(
@@ -114,20 +122,29 @@ namespace Umbraco.Tests.UmbracoExamine
                                 mt.Id == (int)x.Attribute("nodeType"))))
                     .ToArray();
 
+                // MOCK!
+                var mediaServiceMock = new Mock<IMediaService>();
+
+                mediaServiceMock
+                    .Setup(x => x.GetPagedDescendants(
+                            It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs, It.IsAny<string>(), It.IsAny<Direction>(), It.IsAny<bool>(), It.IsAny<string>())
+                    ).Returns(() => allRecs);
+
+                mediaServiceMock
+                    .Setup(x => x.GetPagedDescendants(
+                            It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs, It.IsAny<string>(), It.IsAny<Direction>(), It.IsAny<string>())
+                    ).Returns(() => allRecs);
+
+                mediaServiceMock
+                   .Setup(x => x.GetPagedDescendants(
+                           It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), out intTotalRecs, It.IsAny<string>(), It.IsAny<Direction>(), It.IsAny<string>())
+                   ).Returns(() => allRecs);
+
+                mediaServiceMock.Setup(service => service.GetPagedXmlEntries(It.IsAny<string>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs))
+                    .Returns(() => allRecs.Select(x => x.ToXml()));
+
+                mediaService = mediaServiceMock.Object;
 
-                mediaService = Mock.Of<IMediaService>(
-                    x => x.GetPagedDescendants(
-                        It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs, It.IsAny<string>(), It.IsAny<Direction>(), It.IsAny<bool>(), It.IsAny<string>()) 
-                        ==
-                        allRecs
-                        && x.GetPagedDescendants(
-                        It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs, It.IsAny<string>(), It.IsAny<Direction>(), It.IsAny<string>())
-                        ==
-                        allRecs
-                        && x.GetPagedDescendants(
-                        It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), out intTotalRecs, It.IsAny<string>(), It.IsAny<Direction>(), It.IsAny<string>())
-                        ==
-                        allRecs);
             }
             if (dataTypeService == null)
             {
@@ -139,6 +156,18 @@ namespace Umbraco.Tests.UmbracoExamine
                 memberService = Mock.Of<IMemberService>();
             }
 
+            if (contentTypeService == null)
+            {
+                var contentTypeServiceMock = new Mock<IContentTypeService>();
+                contentTypeServiceMock.Setup(x => x.GetAllMediaTypes())
+                    .Returns(new List<IMediaType>()
+                    {
+                        new MediaType(-1) {Alias = "Folder", Name = "Folder", Id = 1031, Icon = "icon-folder"},
+                        new MediaType(-1) {Alias = "Image", Name = "Image", Id = 1032, Icon = "icon-picture"}
+                    });
+                contentTypeService = contentTypeServiceMock.Object;
+            }
+
             if (analyzer == null)
             {
                 analyzer = new StandardAnalyzer(Version.LUCENE_29);
@@ -154,6 +183,7 @@ namespace Umbraco.Tests.UmbracoExamine
                                                   mediaService,
                                                   dataTypeService,
                                                   userService,
+                                                  contentTypeService,
                                               analyzer,
                                               false);
 
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
index 7c36dd2953..5d6812f94a 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
@@ -10,15 +10,17 @@ using Lucene.Net.Index;
 using Lucene.Net.Search;
 using Lucene.Net.Store;
 using NUnit.Framework;
+using Umbraco.Tests.TestHelpers;
 using UmbracoExamine;
 
 namespace Umbraco.Tests.UmbracoExamine
 {
 
-	/// <summary>
-	/// Tests the standard indexing capabilities
-	/// </summary>
-	[TestFixture, RequiresSTA]
+    /// <summary>
+    /// Tests the standard indexing capabilities
+    /// </summary>
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
+    [TestFixture, RequiresSTA]
     public class IndexTest : ExamineBaseTest
 	{
 
@@ -85,12 +87,11 @@ namespace Umbraco.Tests.UmbracoExamine
 			//RESET the parent id
 			existingCriteria = ((IndexCriteria)_indexer.IndexerData);
 			_indexer.IndexerData = new IndexCriteria(existingCriteria.StandardFields, existingCriteria.UserFields, existingCriteria.IncludeNodeTypes, existingCriteria.ExcludeNodeTypes,
-				null);			
+				null);
 
 			//now ensure it's deleted
 			var newResults = _searcher.Search(_searcher.CreateSearchCriteria().Id(2112).Compile());
 			Assert.AreEqual(1, newResults.Count());
-
 		}
 
 		[Test]
diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
index bcd9922e21..9b8b3d50d7 100644
--- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
@@ -8,9 +8,11 @@ using Examine.LuceneEngine.Providers;
 using Lucene.Net.Store;
 using NUnit.Framework;
 using Examine.LuceneEngine.SearchCriteria;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.UmbracoExamine
 {
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
     [TestFixture]
     public class SearchTests : ExamineBaseTest
     {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
index e0678c1065..6cafa05bc8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
@@ -10,212 +10,223 @@
 /*
 TODO
 .directive("umbFileDrop", function ($timeout, $upload, localizationService, umbRequestHelper){
-
-	return{
-		restrict: "A",
-		link: function(scope, element, attrs){
-
-			//load in the options model
-
-
-		}
-	}
+    return{
+        restrict: "A",
+        link: function(scope, element, attrs){
+            //load in the options model
+        }
+    }
 })
 */
 
 angular.module("umbraco.directives")
+    .directive('umbFileDropzone',
+        function($timeout, Upload, localizationService, umbRequestHelper) {
+            return {
+                restrict: 'E',
+                replace: true,
+                templateUrl: 'views/components/upload/umb-file-dropzone.html',
+                scope: {
+                    parentId: '@',
+                    contentTypeAlias: '@',
+                    propertyAlias: '@',
+                    accept: '@',
+                    maxFileSize: '@',
 
-.directive('umbFileDropzone', function ($timeout, Upload, localizationService, umbRequestHelper) {
-	return {
+                    compact: '@',
+                    hideDropzone: '@',
+                    acceptedMediatypes: '=',
 
-		restrict: 'E',
-		replace: true,
+                    filesQueued: '=',
+                    handleFile: '=',
+                    filesUploaded: '='
+                },
+                link: function(scope, element, attrs) {
+                    scope.queue = [];
+                    scope.done = [];
+                    scope.rejected = [];
+                    scope.currentFile = undefined;
 
-		templateUrl: 'views/components/upload/umb-file-dropzone.html',
+                    function _filterFile(file) {
+                        var ignoreFileNames = ['Thumbs.db'];
+                        var ignoreFileTypes = ['directory'];
 
-		scope: {
-			parentId: '@',
-			contentTypeAlias: '@',
-			propertyAlias: '@',
-			accept: '@',
-			maxFileSize: '@',
+                        // ignore files with names from the list
+                        // ignore files with types from the list
+                        // ignore files which starts with "."
+                        if (ignoreFileNames.indexOf(file.name) === -1 &&
+                            ignoreFileTypes.indexOf(file.type) === -1 &&
+                            file.name.indexOf(".") !== 0) {
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    }
 
-			compact: '@',
-			hideDropzone: '@',
+                    function _filesQueued(files, event) {
+                        //Push into the queue
+                        angular.forEach(files,
+                            function(file) {
 
-			filesQueued: '=',
-			handleFile: '=',
-			filesUploaded: '='
-		},
+                                if (_filterFile(file) === true) {
 
-		link: function(scope, element, attrs) {
+                                    if (file.$error) {
+                                        scope.rejected.push(file);
+                                    } else {
+                                        scope.queue.push(file);
+                                    }
+                                }
+                            });
 
-			scope.queue = [];
-			scope.done = [];
-			scope.rejected = [];
-			scope.currentFile = undefined;
+                        //when queue is done, kick the uploader
+                        if (!scope.working) {
+                            // Upload not allowed
+                            if (!scope.acceptedMediatypes || !scope.acceptedMediatypes.length) {
+                                files.map(function(file) {
+                                    file.uploadStatus = "error";
+                                    file.serverErrorMessage = "File type is not allowed here";
+                                    scope.rejected.push(file);
+                                });
+                                scope.queue = [];
+                            }
+                            // One allowed type
+                            if (scope.acceptedMediatypes && scope.acceptedMediatypes.length === 1) {
+                                // Standard setup - set alias to auto select to let the server best decide which media type to use
+                                if (scope.acceptedMediatypes[0].alias === 'Image') {
+                                    scope.contentTypeAlias = "umbracoAutoSelect";
+                                } else {
+                                    scope.contentTypeAlias = scope.acceptedMediatypes[0].alias;
+                                }
 
-			function _filterFile(file) {
+                                _processQueueItem();
+                            }
+                            // More than one, open dialog
+                            if (scope.acceptedMediatypes && scope.acceptedMediatypes.length > 1) {
+                                _chooseMediaType();
+                            }
+                        }
+                    }
 
-				var ignoreFileNames = ['Thumbs.db'];
-				var ignoreFileTypes = ['directory'];
+                    function _processQueueItem() {
+                        if (scope.queue.length > 0) {
+                            scope.currentFile = scope.queue.shift();
+                            _upload(scope.currentFile);
+                        } else if (scope.done.length > 0) {
+                            if (scope.filesUploaded) {
+                                //queue is empty, trigger the done action
+                                scope.filesUploaded(scope.done);
+                            }
 
-				// ignore files with names from the list
-				// ignore files with types from the list
-				// ignore files which starts with "."
-				if(ignoreFileNames.indexOf(file.name) === -1 &&
-					ignoreFileTypes.indexOf(file.type) === -1 &&
-					file.name.indexOf(".") !== 0) {
-					return true;
-				} else {
-					return false;
-				}
+                            //auto-clear the done queue after 3 secs
+                            var currentLength = scope.done.length;
+                            $timeout(function() {
+                                    scope.done.splice(0, currentLength);
+                                },
+                                3000);
+                        }
+                    }
 
-			}
+                    function _upload(file) {
 
-			function _filesQueued(files, event){
+                        scope.propertyAlias = scope.propertyAlias ? scope.propertyAlias : "umbracoFile";
+                        scope.contentTypeAlias = scope.contentTypeAlias ? scope.contentTypeAlias : "Image";
 
-				//Push into the queue
-				angular.forEach(files, function(file){
+                        Upload.upload({
+                                url: umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostAddFile"),
+                                fields: {
+                                    'currentFolder': scope.parentId,
+                                    'contentTypeAlias': scope.contentTypeAlias,
+                                    'propertyAlias': scope.propertyAlias,
+                                    'path': file.path
+                                },
+                                file: file
+                            })
+                            .progress(function(evt) {
+                                // calculate progress in percentage
+                                var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
+                                // set percentage property on file
+                                file.uploadProgress = progressPercentage;
+                                // set uploading status on file
+                                file.uploadStatus = "uploading";
+                            })
+                            .success(function(data, status, headers, config) {
+                                if (data.notifications && data.notifications.length > 0) {
+                                    // set error status on file
+                                    file.uploadStatus = "error";
+                                    // Throw message back to user with the cause of the error
+                                    file.serverErrorMessage = data.notifications[0].message;
+                                    // Put the file in the rejected pool
+                                    scope.rejected.push(file);
+                                } else {
+                                    // set done status on file
+                                    file.uploadStatus = "done";
+                                    // set date/time for when done - used for sorting
+                                    file.doneDate = new Date();
+                                    // Put the file in the done pool
+                                    scope.done.push(file);
+                                }
+                                scope.currentFile = undefined;
+                                //after processing, test if everthing is done
+                                _processQueueItem();
+                            })
+                            .error(function(evt, status, headers, config) {
+                                // set status done
+                                file.uploadStatus = "error";
+                                //if the service returns a detailed error
+                                if (evt.InnerException) {
+                                    file.serverErrorMessage = evt.InnerException.ExceptionMessage;
+                                    //Check if its the common "too large file" exception
+                                    if (evt.InnerException.StackTrace &&
+                                        evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
+                                        file.serverErrorMessage = "File too large to upload";
+                                    }
+                                } else if (evt.Message) {
+                                    file.serverErrorMessage = evt.Message;
+                                }
+                                // If file not found, server will return a 404 and display this message
+                                if (status === 404) {
+                                    file.serverErrorMessage = "File not found";
+                                }
+                                //after processing, test if everthing is done
+                                scope.rejected.push(file);
+                                scope.currentFile = undefined;
+                                _processQueueItem();
+                            });
+                    }
 
-					if(_filterFile(file) === true) {
+                    function _chooseMediaType() {
+                        scope.mediatypepickerOverlay = {
+                            view: "mediatypepicker",
+                            title: "Choose media type",
+                            acceptedMediatypes: scope.acceptedMediatypes,
+                            hideSubmitButton: true,
+                            show: true,
+                            submit: function(model) {
+                                scope.contentTypeAlias = model.selectedType.alias;
+                                scope.mediatypepickerOverlay.show = false;
+                                scope.mediatypepickerOverlay = null;
+                                _processQueueItem();
+                            },
+                            close: function(oldModel) {
 
-						if(file.$error) {
-							scope.rejected.push(file);
-						} else {
-							scope.queue.push(file);
-						}
+                                scope.queue.map(function(file) {
+                                    file.uploadStatus = "error";
+                                    file.serverErrorMessage = "Cannot upload this file, no mediatype selected";
+                                    scope.rejected.push(file);
+                                });
+                                scope.queue = [];
+                                scope.mediatypepickerOverlay.show = false;
+                                scope.mediatypepickerOverlay = null;
+                            }
+                        };
+                    }
 
-					}
-
-				});
-
-				//when queue is done, kick the uploader
-				if(!scope.working){
-					_processQueueItem();
-				}
-			}
-
-
-			function _processQueueItem(){
-
-				if(scope.queue.length > 0){
-					scope.currentFile = scope.queue.shift();
-					_upload(scope.currentFile);
-				}else if(scope.done.length > 0){
-
-					if(scope.filesUploaded){
-						//queue is empty, trigger the done action
-						scope.filesUploaded(scope.done);
-					}
-
-					//auto-clear the done queue after 3 secs
-					var currentLength = scope.done.length;
-					$timeout(function(){
-						scope.done.splice(0, currentLength);
-					}, 3000);
-				}
-			}
-
-			function _upload(file) {
-
-				scope.propertyAlias = scope.propertyAlias ? scope.propertyAlias : "umbracoFile";
-				scope.contentTypeAlias = scope.contentTypeAlias ? scope.contentTypeAlias : "Image";
-
-				Upload.upload({
-					url: umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostAddFile"),
-					fields: {
-						'currentFolder': scope.parentId,
-						'contentTypeAlias': scope.contentTypeAlias,
-						'propertyAlias': scope.propertyAlias,
-						'path': file.path
-					},
-					file: file
-				}).progress(function (evt) {
-
-					// calculate progress in percentage
-					var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
-
-					// set percentage property on file
-					file.uploadProgress = progressPercentage;
-
-					// set uploading status on file
-					file.uploadStatus = "uploading";
-
-				}).success(function (data, status, headers, config) {
-
-					if(data.notifications && data.notifications.length > 0) {
-
-						// set error status on file
-						file.uploadStatus = "error";
-
-						// Throw message back to user with the cause of the error
-						file.serverErrorMessage = data.notifications[0].message;
-
-						// Put the file in the rejected pool
-						scope.rejected.push(file);
-
-					} else {
-
-						// set done status on file
-						file.uploadStatus = "done";
-
-						// set date/time for when done - used for sorting
-						file.doneDate = new Date();
-
-						// Put the file in the done pool
-						scope.done.push(file);
-
-					}
-
-					scope.currentFile = undefined;
-
-					//after processing, test if everthing is done
-					_processQueueItem();
-
-				}).error( function (evt, status, headers, config) {
-
-					// set status done
-					file.uploadStatus = "error";
-
-					//if the service returns a detailed error
-					if (evt.InnerException) {
-					    file.serverErrorMessage = evt.InnerException.ExceptionMessage;
-
-					    //Check if its the common "too large file" exception
-					    if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
-					        file.serverErrorMessage = "File too large to upload";
-					    }
-
-					} else if (evt.Message) {
-					    file.serverErrorMessage = evt.Message;
-					}
-
-					// If file not found, server will return a 404 and display this message
-					if(status === 404 ) {
-						file.serverErrorMessage = "File not found";
-					}
-
-					//after processing, test if everthing is done
-					scope.rejected.push(file);
-					scope.currentFile = undefined;
-
-					_processQueueItem();
-				});
-			}
-
-
-			scope.handleFiles = function(files, event){
-				if(scope.filesQueued){
-					scope.filesQueued(files, event);
-				}
-
-				_filesQueued(files, event);
-
-			};
-
-			}
-
-
-		};
-	});
+                    scope.handleFiles = function(files, event) {
+                        if (scope.filesQueued) {
+                            scope.filesQueued(files, event);
+                        }
+                        _filesQueued(files, event);
+                    };
+                }
+            };
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js
new file mode 100644
index 0000000000..20e5e3799b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js
@@ -0,0 +1,58 @@
+/**
+ * @ngdoc service
+ * @name umbraco.services.mediaTypeHelper
+ * @description A helper service for the media types
+ **/
+function mediaTypeHelper(mediaTypeResource, $q) {
+
+    var mediaTypeHelperService = {
+
+        getAllowedImagetypes: function (mediaId){
+				
+            // Get All allowedTypes
+            return mediaTypeResource.getAllowedTypes(mediaId)
+                .then(function(types){
+                    
+                    var allowedQ = types.map(function(type){
+                        return mediaTypeResource.getById(type.id);
+                    });
+
+                    // Get full list
+                    return $q.all(allowedQ).then(function(fullTypes){
+
+                        // Find all the media types with an Image Cropper property editor
+                        var filteredTypes = mediaTypeHelperService.getTypeWithEditor(fullTypes, ['Umbraco.ImageCropper']);
+
+                        // If there is only one media type with an Image Cropper we will return this one
+                        if(filteredTypes.length === 1) {
+                            return filteredTypes;
+                        // If there is more than one Image cropper, custom media types have been added, and we return all media types with and Image cropper or UploadField
+                        } else {
+                            return mediaTypeHelperService.getTypeWithEditor(fullTypes, ['Umbraco.ImageCropper', 'Umbraco.UploadField']);
+                        }
+
+                    });
+            });
+		},
+
+        getTypeWithEditor: function (types, editors) {
+
+            return types.filter(function (mediatype) {
+                for (var i = 0; i < mediatype.groups.length; i++) {
+                    var group = mediatype.groups[i];
+                    for (var j = 0; j < group.properties.length; j++) {
+                        var property = group.properties[j];
+                        if( editors.indexOf(property.editor) !== -1 ) {
+                            return mediatype;
+                        }
+                    }
+                }
+            });
+
+        }
+
+    };
+
+    return mediaTypeHelperService;
+}
+angular.module('umbraco.services').factory('mediaTypeHelper', mediaTypeHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/less/helveticons.less b/src/Umbraco.Web.UI.Client/src/less/helveticons.less
index a3c2072d86..9a317e09fb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/helveticons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/helveticons.less
@@ -1569,6 +1569,7 @@ i.small{
 .icon-hd:before {
 	content: "\e1f9";
 }
+.icon-globe-europe-africa:before,
 .icon-globe-europe---africa:before {
 	content: "\e1fa";
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
index b29388be23..f337dbce18 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Dialogs.MediaPickerController",
-        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $cookies, $element, $timeout) {
+        function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService) {
 
             var dialogOptions = $scope.dialogOptions;
 
@@ -11,29 +11,34 @@ angular.module("umbraco")
             $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
             $scope.cropSize = dialogOptions.cropSize;
 
-
             //preload selected item
             $scope.target = undefined;
-            if(dialogOptions.currentTarget){
+            if (dialogOptions.currentTarget) {
                 $scope.target = dialogOptions.currentTarget;
             }
 
-            $scope.upload = function(v){
-               angular.element(".umb-file-dropzone-directive .file-select").click();
+            $scope.acceptedMediatypes = [];
+            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
+                .then(function(types) {
+                    $scope.acceptedMediatypes = types;
+                });
+
+            $scope.upload = function(v) {
+                angular.element(".umb-file-dropzone-directive .file-select").click();
             };
 
-            $scope.dragLeave = function(el, event){
+            $scope.dragLeave = function(el, event) {
                 $scope.activeDrag = false;
             };
 
-            $scope.dragEnter = function(el, event){
+            $scope.dragEnter = function(el, event) {
                 $scope.activeDrag = true;
             };
 
             $scope.submitFolder = function(e) {
                 if (e.keyCode === 13) {
                     e.preventDefault();
-                    
+
                     mediaResource
                         .addFolder($scope.newFolderName, $scope.currentFolder.id)
                         .then(function(data) {
@@ -52,21 +57,25 @@ angular.module("umbraco")
             };
 
             $scope.gotoFolder = function(folder) {
-
-                if(!folder){
-                    folder = {id: -1, name: "Media", icon: "icon-folder"};
+                if (!folder) {
+                    folder = { id: -1, name: "Media", icon: "icon-folder" };
                 }
 
                 if (folder.id > 0) {
                     entityResource.getAncestors(folder.id, "media")
                         .then(function(anc) {
                             // anc.splice(0,1);  
-                            $scope.path = _.filter(anc, function (f) {
-                                return f.path.indexOf($scope.startNodeId) !== -1;
-                            });
+                            $scope.path = _.filter(anc,
+                                function(f) {
+                                    return f.path.indexOf($scope.startNodeId) !== -1;
+                                });
                         });
-                }
-                else {
+
+                    mediaTypeHelper.getAllowedImagetypes(folder.id)
+                        .then(function(types) {
+                            $scope.acceptedMediatypes = types;
+                        });
+                } else {
                     $scope.path = [];
                 }
 
@@ -77,49 +86,49 @@ angular.module("umbraco")
                         $scope.images = data.items ? data.items : [];
                     });
 
-                $scope.currentFolder = folder;      
+                $scope.currentFolder = folder;
             };
-            
-          
+
+
             $scope.clickHandler = function(image, ev, select) {
                 ev.preventDefault();
-                
+
                 if (image.isFolder && !select) {
                     $scope.gotoFolder(image);
-                }else{
+                } else {
                     eventsService.emit("dialogs.mediaPicker.select", image);
-                    
+
                     //we have 3 options add to collection (if multi) show details, or submit it right back to the callback
                     if ($scope.multiPicker) {
                         $scope.select(image);
                         image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : "";
-                    }else if($scope.showDetails) {
-                        $scope.target= image;
+                    } else if ($scope.showDetails) {
+                        $scope.target = image;
                         $scope.target.url = mediaHelper.resolveFile(image);
-                    }else{
+                    } else {
                         $scope.submit(image);
                     }
                 }
             };
 
-            $scope.exitDetails = function(){
-                if(!$scope.currentFolder){
+            $scope.exitDetails = function() {
+                if (!$scope.currentFolder) {
                     $scope.gotoFolder();
                 }
 
                 $scope.target = undefined;
             };
 
-            $scope.onUploadComplete = function () {
+            $scope.onUploadComplete = function() {
                 $scope.gotoFolder($scope.currentFolder);
             };
 
-            $scope.onFilesQueue = function(){
+            $scope.onFilesQueue = function() {
                 $scope.activeDrag = false;
             };
 
             //default root item
-            if(!$scope.target){
-                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });  
+            if (!$scope.target) {
+                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
             }
         });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
index 540a19d64a..78d8e41127 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
@@ -116,8 +116,10 @@
   
 
         <div class="umb-panel-body with-footer">
-            
+                       
             <umb-file-dropzone 
+                ng-if="acceptedMediatypes.length > 0"
+                accepted-mediatypes="acceptedMediatypes"
                 hide-dropzone="{{!activeDrag && images.length > 0}}" 
                 parent-id="{{currentFolder.id}}"
                 files-uploaded="onUploadComplete"
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
index 2d8d38cf50..740791abf9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
@@ -259,7 +259,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
 	                }
 	            });
 	        } else {
-	            var a = dialogOptions.filter.toLowerCase().split(',');
+	            var a = dialogOptions.filter.toLowerCase().replace(/\s/g, '').split(',');
 	            angular.forEach(nodes, function (value, key) {
 
 	                var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
index aba5818e01..e063b7bab3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
@@ -18,18 +18,9 @@
     </umb-control-group>
 
     <umb-control-group label="@content_target">
-        <select class="umb-editor umb-dropdown" ng-model="model.target.target">
-            <option value=""></option>
-            <option value="_blank">
-                <localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize>
-            </option>
-            <option value="_top">
-                <localize key="defaultdialogs_openInFullBody">Opens the linked document in the full body of the window</localize>
-            </option>
-            <option value="_parent">
-                <localize key="defaultdialogs_openInParentFrame">Opens the linked document in the parent frame</localize>
-            </option>
-        </select>
+        <label class="checkbox no-indent">
+            <input type="checkbox" ng-model="model.target.target" ng-true-value="_blank" ng-false-value="" /> <localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize>
+        </label>
     </umb-control-group>
 
     <div class="umb-control-group">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index 774e14f50e..43c65d99ee 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -1,9 +1,9 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Overlays.MediaPickerController",
-        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore, localizationService) {
+        function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore, localizationService) {
 
-            if(!$scope.model.title) {
+            if (!$scope.model.title) {
                 $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
             }
 
@@ -16,60 +16,59 @@ angular.module("umbraco")
             $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
             $scope.cropSize = dialogOptions.cropSize;
             $scope.lastOpenedNode = $cookieStore.get("umbLastOpenedMediaNodeId");
-            if($scope.onlyImages){
-                $scope.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
-            }
-            else {
-                $scope.acceptedFileTypes = !mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles);
+            if ($scope.onlyImages) {
+                $scope.acceptedFileTypes = mediaHelper
+                    .formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+            } else {
+                $scope.acceptedFileTypes = !mediaHelper
+                    .formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles);
             }
             $scope.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
 
             $scope.model.selectedImages = [];
 
+            $scope.acceptedMediatypes = [];
+            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
+                .then(function(types) {
+                    $scope.acceptedMediatypes = types;
+                });
+
             //preload selected item
             $scope.target = undefined;
-            if(dialogOptions.currentTarget){
+            if (dialogOptions.currentTarget) {
                 $scope.target = dialogOptions.currentTarget;
             }
 
-            $scope.upload = function(v){
-               angular.element(".umb-file-dropzone-directive .file-select").click();
+            $scope.upload = function(v) {
+                angular.element(".umb-file-dropzone-directive .file-select").click();
             };
 
-            $scope.dragLeave = function(el, event){
+            $scope.dragLeave = function(el, event) {
                 $scope.activeDrag = false;
             };
 
-            $scope.dragEnter = function(el, event){
+            $scope.dragEnter = function(el, event) {
                 $scope.activeDrag = true;
             };
 
             $scope.submitFolder = function() {
+                if ($scope.newFolderName) {
+                    mediaResource
+                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
+                        .then(function(data) {
+                            //we've added a new folder so lets clear the tree cache for that specific item
+                            treeService.clearCache({
+                                cacheKey: "__media", //this is the main media tree cache key
+                                childrenOf: data.parentId //clear the children of the parent
+                            });
 
-               if ($scope.newFolderName) {
-
-                  mediaResource
-                     .addFolder($scope.newFolderName, $scope.currentFolder.id)
-                     .then(function(data) {
-
-                        //we've added a new folder so lets clear the tree cache for that specific item
-                        treeService.clearCache({
-                           cacheKey: "__media", //this is the main media tree cache key
-                           childrenOf: data.parentId //clear the children of the parent
+                            $scope.gotoFolder(data);
+                            $scope.showFolderInput = false;
+                            $scope.newFolderName = "";
                         });
-
-                        $scope.gotoFolder(data);
-
-                        $scope.showFolderInput = false;
-
-                        $scope.newFolderName = "";
-
-                     });
-
-               } else {
-                  $scope.showFolderInput = false;
-               }
-
+                } else {
+                    $scope.showFolderInput = false;
+                }
             };
 
             $scope.enterSubmitFolder = function(event) {
@@ -81,58 +80,61 @@ angular.module("umbraco")
 
             $scope.gotoFolder = function(folder) {
 
-                if(!$scope.multiPicker) {
+                if (!$scope.multiPicker) {
                     deselectAllImages($scope.model.selectedImages);
                 }
 
-                if(!folder){
-                    folder = {id: -1, name: "Media", icon: "icon-folder"};
+                if (!folder) {
+                    folder = { id: -1, name: "Media", icon: "icon-folder" };
                 }
 
                 if (folder.id > 0) {
                     entityResource.getAncestors(folder.id, "media")
                         .then(function(anc) {
                             // anc.splice(0,1);
-                            $scope.path = _.filter(anc, function (f) {
-                                return f.path.indexOf($scope.startNodeId) !== -1;
-                            });
+                            $scope.path = _.filter(anc,
+                                function(f) {
+                                    return f.path.indexOf($scope.startNodeId) !== -1;
+                                });
                         });
-                }
-                else {
+
+                    mediaTypeHelper.getAllowedImagetypes(folder.id)
+                        .then(function(types) {
+                            $scope.acceptedMediatypes = types;
+                        });
+                } else {
                     $scope.path = [];
                 }
 
                 //mediaResource.rootMedia()
                 mediaResource.getChildren(folder.id)
-                   .then(function(data) {
-                      $scope.searchTerm = "";
-                      $scope.images = data.items ? data.items : [];
+                    .then(function(data) {
+                        $scope.searchTerm = "";
+                        $scope.images = data.items ? data.items : [];
 
-                      // set already selected images to selected
-                      for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
+                        // set already selected images to selected
+                        for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
+                            var folderImage = $scope.images[folderImageIndex];
+                            var imageIsSelected = false;
 
-                         var folderImage = $scope.images[folderImageIndex];
-                         var imageIsSelected = false;
+                            for (var selectedImageIndex = 0;
+                                selectedImageIndex < $scope.model.selectedImages.length;
+                                selectedImageIndex++) {
+                                var selectedImage = $scope.model.selectedImages[selectedImageIndex];
 
-                         for (var selectedImageIndex = 0; selectedImageIndex < $scope.model.selectedImages.length; selectedImageIndex++) {
-                            var selectedImage = $scope.model.selectedImages[selectedImageIndex];
-
-                            if(folderImage.key === selectedImage.key) {
-                               imageIsSelected = true;
+                                if (folderImage.key === selectedImage.key) {
+                                    imageIsSelected = true;
+                                }
                             }
-                         }
-
-                         if(imageIsSelected) {
-                            folderImage.selected = true;
-                         }
-                      }
-
-                   });
-
+                            if (imageIsSelected) {
+                                folderImage.selected = true;
+                            }
+                        }
+                    });
                 $scope.currentFolder = folder;
 
                 // for some reason i cannot set cookies with cookieStore
-                document.cookie="umbLastOpenedMediaNodeId=" + folder.id;
+                document.cookie = "umbLastOpenedMediaNodeId=" + folder.id;
 
             };
 
@@ -144,52 +146,40 @@ angular.module("umbraco")
                         eventsService.emit("dialogs.mediaPicker.select", image);
                         selectImage(image);
                     }
-
                 } else {
-
                     eventsService.emit("dialogs.mediaPicker.select", image);
-
-                    if($scope.showDetails) {
+                    if ($scope.showDetails) {
                         $scope.target = image;
                         $scope.target.url = mediaHelper.resolveFile(image);
                         $scope.openDetailsDialog();
                     } else {
                         selectImage(image);
                     }
-
                 }
-
             };
 
             $scope.clickItemName = function(item) {
-                if(item.isFolder) {
+                if (item.isFolder) {
                     $scope.gotoFolder(item);
                 }
             };
 
             function selectImage(image) {
-
-                if(image.selected) {
-
-                    for(var i = 0; $scope.model.selectedImages.length > i; i++) {
-
+                if (image.selected) {
+                    for (var i = 0; $scope.model.selectedImages.length > i; i++) {
                         var imageInSelection = $scope.model.selectedImages[i];
-                        if(image.key === imageInSelection.key) {
+                        if (image.key === imageInSelection.key) {
                             image.selected = false;
                             $scope.model.selectedImages.splice(i, 1);
                         }
                     }
-
                 } else {
-
-                    if(!$scope.multiPicker) {
+                    if (!$scope.multiPicker) {
                         deselectAllImages($scope.model.selectedImages);
                     }
-
                     image.selected = true;
                     $scope.model.selectedImages.push(image);
                 }
-
             }
 
             function deselectAllImages(images) {
@@ -200,64 +190,53 @@ angular.module("umbraco")
                 images.length = 0;
             }
 
-            $scope.onUploadComplete = function () {
+            $scope.onUploadComplete = function() {
                 $scope.gotoFolder($scope.currentFolder);
             };
 
-            $scope.onFilesQueue = function(){
+            $scope.onFilesQueue = function() {
                 $scope.activeDrag = false;
             };
 
             //default root item
             if (!$scope.target) {
+                if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
+                    entityResource.getById($scope.lastOpenedNode, "media")
+                        .then(function(node) {
+                                // make sure that las opened node is on the same path as start node
+                                var nodePath = node.path.split(",");
 
-               if($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
-
-                  entityResource.getById($scope.lastOpenedNode, "media")
-                     .then(function(node){
-
-                        // make sure that las opened node is on the same path as start node
-                        var nodePath = node.path.split(",");
-
-                        if(nodePath.indexOf($scope.startNodeId.toString()) !== -1) {
-                           $scope.gotoFolder({id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder"});
-                        } else {
-                           $scope.gotoFolder({id: $scope.startNodeId, name: "Media", icon: "icon-folder"});
-                        }
-
-                    }, function (err) {
-                        $scope.gotoFolder({id: $scope.startNodeId, name: "Media", icon: "icon-folder"});
-                    });
-
-               } else {
-
-                  $scope.gotoFolder({id: $scope.startNodeId, name: "Media", icon: "icon-folder"});
-
-               }
-
+                                if (nodePath.indexOf($scope.startNodeId.toString()) !== -1) {
+                                    $scope
+                                        .gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
+                                } else {
+                                    $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                                }
+                            },
+                            function(err) {
+                                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                            });
+                } else {
+                    $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                }
             }
 
             $scope.openDetailsDialog = function() {
 
-               $scope.mediaPickerDetailsOverlay = {};
-               $scope.mediaPickerDetailsOverlay.show = true;
+                $scope.mediaPickerDetailsOverlay = {};
+                $scope.mediaPickerDetailsOverlay.show = true;
 
-               $scope.mediaPickerDetailsOverlay.submit = function(model) {
+                $scope.mediaPickerDetailsOverlay.submit = function(model) {
+                    $scope.model.selectedImages.push($scope.target);
+                    $scope.model.submit($scope.model);
 
-                  $scope.model.selectedImages.push($scope.target);
-                  $scope.model.submit($scope.model);
-
-                  $scope.mediaPickerDetailsOverlay.show = false;
-                  $scope.mediaPickerDetailsOverlay = null;
-
-               };
-
-               $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
-                  $scope.mediaPickerDetailsOverlay.show = false;
-                  $scope.mediaPickerDetailsOverlay = null;
-               };
+                    $scope.mediaPickerDetailsOverlay.show = false;
+                    $scope.mediaPickerDetailsOverlay = null;
+                };
 
+                $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
+                    $scope.mediaPickerDetailsOverlay.show = false;
+                    $scope.mediaPickerDetailsOverlay = null;
+                };
             };
-
-
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
index 51f05fea00..993ede9587 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
@@ -63,6 +63,8 @@
       </div>
 
       <umb-file-dropzone
+         ng-if="acceptedMediatypes.length > 0"
+         accepted-mediatypes="acceptedMediatypes"
          parent-id="{{currentFolder.id}}"
          files-uploaded="onUploadComplete"
          files-queued="onFilesQueue"
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediapicktypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediapicktypepicker.controller.js
new file mode 100644
index 0000000000..8ca8fff18b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediapicktypepicker.controller.js
@@ -0,0 +1,10 @@
+angular.module("umbraco").controller("Umbraco.Overlays.MediaTypePickerController",
+	function ($scope) {
+
+		$scope.select = function(mediatype){
+			$scope.model.selectedType = mediatype;
+			$scope.model.submit($scope.model);
+			$scope.model.show = false;
+		}
+	    
+	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
new file mode 100644
index 0000000000..bd37800717
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
@@ -0,0 +1,15 @@
+<div ng-controller="Umbraco.Overlays.MediaTypePickerController">
+
+  	<ul class="umb-card-grid">
+      <li
+	  	ng-repeat="mediatype in model.acceptedMediatypes | orderBy:'name'"
+        ng-click="select(mediatype)"
+        class="-three-in-row">
+        <a class="umb-card-grid-item" href="" title="{{mediatype.name}}">
+            <i class="{{ mediatype.icon }}"></i>
+            {{ mediatype.name }}
+        </a>
+      </li>
+    </ul>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
index e74bfd20a4..8e87a2daff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
@@ -326,7 +326,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
 	                }
 	            });
 	        } else {
-	            var a = dialogOptions.filter.toLowerCase().split(',');
+	            var a = dialogOptions.filter.toLowerCase().replace(/\s/g, '').split(',');
 	            angular.forEach(nodes, function (value, key) {
 
 	                var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
index 6a05d234f0..6b05593e11 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
@@ -98,4 +98,11 @@
 
 </ng-form>
 
+<umb-overlay
+		ng-if="mediatypepickerOverlay.show"
+		model="mediatypepickerOverlay"
+        view="mediatypepickerOverlay.view"
+		position="right">        
+</umb-overlay>
+
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index 3f2bfcdd3b..371e156513 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -51,13 +51,14 @@
                 </div>
 
                 <umb-pane>
-                    <umb-control-group label="Relate to original">
-                        <input type="checkbox" ng-model="$parent.$parent.relateToOriginal" />
+                    <umb-control-group  localize="label" label="@defaultdialogs_relateToOriginalLabel">
+                        <input type="checkbox" ng-model="$parent.$parent.relateToOriginal"/>
                     </umb-control-group>
+               
                 </umb-pane>
 
                 <umb-pane>
-                    <umb-control-group label="Include descendants">
+                    <umb-control-group localize="label" label="@defaultdialogs_includeDescendants"> 
                         <input type="checkbox" ng-model="$parent.$parent.recursive" />
                     </umb-control-group>
                 </umb-pane>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index b64511ec22..6bf3ca817a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -3,9 +3,11 @@
         <div class="umb-pane">
 
             <p class="abstract" ng-hide="success">
-                Choose where to move <strong>{{currentNode.name}}</strong>&nbsp;to in the tree structure below
+                <localize key="actions_chooseWhereToMove">Choose where to move</localize>
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>                
             </p>
-            
+
             <div class="umb-loader-wrapper" ng-show="busy">
                 <div class="umb-loader"></div>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html
index 73a6399b67..3782898312 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html
@@ -1,44 +1,44 @@
-<div class="umb-dashboard-grid" ng-controller="Umbraco.Dashboard.StartUpDynamicContentController as vm">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <div class="row clearfix" ng-if="vm.dashboard">
-        <!-- Sections -->
-        <div class="grid-section" ng-repeat="section in vm.dashboard.sections">
-            <div class="{{'span' + section.grid + ' column dash-section'}}">
-
-                <!-- rows -->
-                <div class="row clearfix dash-row" ng-repeat="row in section.rows">
-                    <div class="dash-inner-row">
-
-                        <!-- areas -->
-                        <div ng-repeat="area in row.areas"
-                             class="{{'span' + area.grid + ' column dash-area'}}">
-                            <div class="dash-inner-area">
-
-                                <!-- Controls -->
-                                <div ng-repeat="control in area.controls" class="dash-control dash-control-{{control.alias}}">
-                                    <div class="dash-inner-control">
-                                        <div ng-bind-html-unsafe="control.html"></div>
-                                    </div>
-                                </div>
-                                <!-- Controls end -->
-                            </div>
-                        </div>
-                        <!-- Area end -->
-                    </div>
-                </div>
-            </div>
-            <!-- Section end -->
-
-        </div>
-    </div>
-    <!-- grid container end -->
-
-
-    <!-- Default content in case we cannot fetch content from the outside -->
-    <div style="max-width: 1200px" ng-if="vm.showDefault">
-        <h3><strong>Welcome to The Friendly CMS</strong></h3>
+<div class="umb-dashboard-grid" ng-controller="Umbraco.Dashboard.StartUpDynamicContentController as vm">
+
+    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
+
+    <div class="row clearfix" ng-if="vm.dashboard">
+        <!-- Sections -->
+        <div class="grid-section" ng-repeat="section in vm.dashboard.sections">
+            <div class="{{'span' + section.grid + ' column dash-section'}}">
+
+                <!-- rows -->
+                <div class="row clearfix dash-row" ng-repeat="row in section.rows">
+                    <div class="dash-inner-row">
+
+                        <!-- areas -->
+                        <div ng-repeat="area in row.areas"
+                             class="{{'span' + area.grid + ' column dash-area'}}">
+                            <div class="dash-inner-area">
+
+                                <!-- Controls -->
+                                <div ng-repeat="control in area.controls" class="dash-control dash-control-{{control.alias}}">
+                                    <div class="dash-inner-control">
+                                        <div ng-bind-html-unsafe="control.html"></div>
+                                    </div>
+                                </div>
+                                <!-- Controls end -->
+                            </div>
+                        </div>
+                        <!-- Area end -->
+                    </div>
+                </div>
+            </div>
+            <!-- Section end -->
+
+        </div>
+    </div>
+    <!-- grid container end -->
+
+
+    <!-- Default content in case we cannot fetch content from the outside -->
+    <div style="max-width: 1200px" ng-if="vm.showDefault">
+        <h3><strong>Welcome to The Friendly CMS</strong></h3>
         <p style="font-size: 16px; line-height: 1.5; margin-bottom: 30px; max-width: 760px;">
             <span>Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</span>
         </p>
@@ -50,46 +50,46 @@
             <li>Watch <a href="https://umbraco.tv" class="btn-link-underline">our tutorial videos</a> (some are free, some require a subscription)</li>
             <li>Find out about <a href="https://umbraco.com/products-and-support" target="_blank" class="btn-link-underline">our productivity boosting tools and commercial support</a></li>
             <li>Find out about <a href="https://umbraco.com/products/training" target="_blank" class="btn-link-underline">real-life training and certification opportunities</a></li>
-        </ul>            
-
-        <div class="row">
-            <div class="span4">
-                <a href="http://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv" target="_blank" class="nounderline">
-                    <img src="views/dashboard/default/umbracotv.png" alt="Umbraco.TV - Hours of Umbraco Video Tutorials" style="margin: 10px 0 10px 0" />
-                </a>
-
-
-                <a href="http://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=tv" target="_blank" class="btn-link -underline">
-                    <h4> <strong>Umbraco.TV - Learn from the source!</strong> </h4>
-                </a>
-
-                <p style="line-height: 1.5;">
-                    Umbraco.TV will help you go from zero to Umbraco
-                    hero at a pace that suits you. Our easy to follow
-                    online training videos will give you the fundamental
-                    knowledge to start building awesome Umbraco websites.
-                </p>
-            </div>
-
-            <div class="span4 offset1">
-
-                <a href="http://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our" target="_blank" class="nounderline">
-                    <img src="views/dashboard/default/ourumbraco.png" alt="Our Umbraco" style="margin: 10px 0 10px 0" />
-                </a>
-
-                <a href="http://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=our" target="_blank" class="btn-link -underline">
-                    <h4><strong>Our Umbraco - The Friendliest Community</strong></h4>
-                </a>
-
-                <p style="line-height: 1.5;">
-                    Our Umbraco - the official community site is your one
-                    stop for everything Umbraco. Whether you need a
-                    question answered or looking for cool plugins, the
-                    worlds best community is just a click away.
-                </p>
-
-            </div>
-        </div>
-    </div> 
-
+        </ul>            
+
+        <div class="row">
+            <div class="span4">
+                <a href="https://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv" target="_blank" class="nounderline">
+                    <img src="views/dashboard/default/umbracotv.png" alt="Umbraco.TV - Hours of Umbraco Video Tutorials" style="margin: 10px 0 10px 0" />
+                </a>
+
+
+                <a href="https://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=tv" target="_blank" class="btn-link -underline">
+                    <h4> <strong>Umbraco.TV - Learn from the source!</strong> </h4>
+                </a>
+
+                <p style="line-height: 1.5;">
+                    Umbraco.TV will help you go from zero to Umbraco
+                    hero at a pace that suits you. Our easy to follow
+                    online training videos will give you the fundamental
+                    knowledge to start building awesome Umbraco websites.
+                </p>
+            </div>
+
+            <div class="span4 offset1">
+
+                <a href="https://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our" target="_blank" class="nounderline">
+                    <img src="views/dashboard/default/ourumbraco.png" alt="Our Umbraco" style="margin: 10px 0 10px 0" />
+                </a>
+
+                <a href="https://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=our" target="_blank" class="btn-link -underline">
+                    <h4><strong>Our Umbraco - The Friendliest Community</strong></h4>
+                </a>
+
+                <p style="line-height: 1.5;">
+                    Our Umbraco - the official community site is your one
+                    stop for everything Umbraco. Whether you need a
+                    question answered or looking for cool plugins, the
+                    worlds best community is just a click away.
+                </p>
+
+            </div>
+        </div>
+    </div> 
+
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html
index 95c30dfc40..3f71340ee3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html
@@ -3,8 +3,10 @@
 	<div class="umb-pane">
 
 		<p class="abstract" ng-hide="success">
-			Choose where to move <strong>{{currentNode.name}}</strong> to in the tree structure below
-		</p>
+            <localize key="actions_chooseWhereToMove">Choose where to move</localize>
+            <strong>{{currentNode.name}}</strong>
+            <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
+        </p>
 
 		<div class="alert alert-error" ng-show="error" ng-cloak>
 			<h4>{{error.errorMsg}}</h4>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
index 4360996b55..16c5efe799 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
@@ -39,7 +39,8 @@
    on-drag-enter="vm.dragEnter()">
 
       <umb-file-dropzone
-         ng-if="!vm.isRecycleBin"
+         ng-if="!vm.isRecycleBin && vm.acceptedMediatypes.length > 0"
+         accepted-mediatypes="vm.acceptedMediatypes"
          parent-id="{{vm.nodeId}}"
          files-uploaded="vm.onUploadComplete"
          accept="{{vm.acceptedFileTypes}}"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index 24c00ebe1d..be1c5856ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -9,7 +9,7 @@
 (function() {
    "use strict";
 
-   function ListViewGridLayoutController($scope, $routeParams, mediaHelper, mediaResource, $location, listViewHelper) {
+   function ListViewGridLayoutController($scope, $routeParams, mediaHelper, mediaResource, $location, listViewHelper, mediaTypeHelper) {
 
       var vm = this;
 
@@ -21,6 +21,7 @@
       vm.mediaDetailsTooltip = {};
       vm.itemsWithoutFolders = [];
       vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
+      vm.acceptedMediatypes = [];
 
       vm.dragEnter = dragEnter;
       vm.dragLeave = dragLeave;
@@ -35,6 +36,13 @@
 
       function activate() {
           vm.itemsWithoutFolders = filterOutFolders($scope.items);
+
+          if($scope.entityType === 'media') {
+            mediaTypeHelper.getAllowedImagetypes(vm.nodeId).then(function (types) {
+                vm.acceptedMediatypes = types;
+            });
+          }
+
       }
 
       function filterOutFolders(items) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
index 29a9875df8..ca1c2124d4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
@@ -9,7 +9,8 @@
         on-drag-enter="vm.dragEnter()">
 
         <umb-file-dropzone
-           ng-if="!vm.isRecycleBin"
+           ng-if="!vm.isRecycleBin && vm.acceptedMediatypes.length > 0"
+           accepted-mediatypes="vm.acceptedMediatypes"
            parent-id="{{vm.nodeId}}"
            files-uploaded="vm.onUploadComplete"
            accept="{{vm.acceptedFileTypes}}"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
index f3039f9faf..15c2042477 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
@@ -1,7 +1,7 @@
 (function () {
    "use strict";
 
-   function ListViewListLayoutController($scope, listViewHelper, $location, mediaHelper) {
+   function ListViewListLayoutController($scope, listViewHelper, $location, mediaHelper, mediaTypeHelper) {
 
       var vm = this;
 
@@ -11,6 +11,7 @@
       vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
       vm.activeDrag = false;
       vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
+      vm.acceptedMediatypes = [];
 
       vm.selectItem = selectItem;
       vm.clickItem = clickItem;
@@ -23,39 +24,49 @@
       vm.onFilesQueue = onFilesQueue;
       vm.onUploadComplete = onUploadComplete;
 
+      function activate() {
+
+        if ($scope.entityType === 'media') {
+          mediaTypeHelper.getAllowedImagetypes(vm.nodeId).then(function (types) {
+            vm.acceptedMediatypes = types;
+          });
+        }
+
+      }
+
       function selectAll($event) {
          listViewHelper.selectAllItems($scope.items, $scope.selection, $event);
-         }
+      }
 
       function isSelectedAll() {
          return listViewHelper.isSelectedAll($scope.items, $scope.selection);
-         }
+      }
 
       function selectItem(selectedItem, $index, $event) {
          listViewHelper.selectHandler(selectedItem, $index, $scope.items, $scope.selection, $event);
-         }
+      }
 
       function clickItem(item) {
          // if item.id is 2147483647 (int.MaxValue) use item.key
          $location.path($scope.entityType + '/' +$scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id));
-         }
+      }
 
       function isSortDirection(col, direction) {
          return listViewHelper.setSortingDirection(col, direction, $scope.options);
-         }
+      }
 
       function sort(field, allow, isSystem) {
          if (allow) {
             $scope.options.orderBySystemField = isSystem;
             listViewHelper.setSorting(field, allow, $scope.options);
             $scope.getContent($scope.contentId);
-            }
-            }
+          }
+      }
 
-               // Dropzone upload functions
+      // Dropzone upload functions
       function dragEnter(el, event) {
          vm.activeDrag = true;
-   }
+      }
 
       function dragLeave(el, event) {
          vm.activeDrag = false;
@@ -63,11 +74,13 @@
 
       function onFilesQueue() {
          vm.activeDrag = false;
-         }
+      }
 
       function onUploadComplete() { 
          $scope.getContent($scope.contentId);
-   }
+      }
+
+      activate();
 
    }
 
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index ffb0a9d96b..b0452fb631 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -30,6 +30,9 @@
     <key alias="refreshNode">Genindlæs elementer</key>
     <key alias="republish">Genudgiv hele sitet</key>
     <key alias="restore" version="7.3.0">Gendan</key>
+    <key alias="SetPermissionsForThePage">Sæt rettigheder for siden %0%</key>
+     <key alias="chooseWhereToMove">Hvor vil du flytte</key>
+    <key alias="toInTheTreeStructureBelow">hen til i træstrukturen?</key>
     <key alias="rights">Rettigheder</key>
     <key alias="rollback">Fortryd ændringer</key>
     <key alias="sendtopublish">Send til udgivelse</key>
@@ -202,12 +205,12 @@
   </area>
   <area alias="bulk">
     <key alias="done">Færdig</key>
-    
+
     <key alias="deletedItem">Slettede %0% element</key>
     <key alias="deletedItems">Slettede %0% elementer</key>
     <key alias="deletedItemOfItem">Slettede %0% ud af %1% element</key>
     <key alias="deletedItemOfItems">Slettede %0% ud af %1% elementer</key>
-    
+
     <key alias="publishedItem">Udgav %0% element</key>
     <key alias="publishedItems">Udgav %0% elementer</key>
     <key alias="publishedItemOfItem">Udgav %0% ud af %1% element</key>
@@ -274,17 +277,11 @@
     <key alias="treepicker">Vælg</key>
     <key alias="viewCacheItem">Se cache element</key>
     <key alias="createFolder">Opret mappe...</key>
-
     <key alias="relateToOriginalLabel">Relatér til original</key>
-
+    <key alias="includeDescendants">Inkludér undersider</key>
     <key alias="linkToPage">Link til side</key>
-
-    <key alias="openInNewWindow">Åbner det linket dokument i et nyt vindue eller fane</key>
-    <key alias="openInFullBody">Åbner det linket dokument i fuld visning af vinduet</key>
-    <key alias="openInParentFrame">Åbner det linket dokument i "parent frame"</key>
-
+    <key alias="openInNewWindow">Åben linket i et nyt vindue eller fane</key>
     <key alias="linkToMedia">Link til medie</key>
-
     <key alias="selectMedia">Vælg medie</key>
     <key alias="selectIcon">Vælg ikon</key>
     <key alias="selectItem">Vælg item</key>
@@ -293,20 +290,18 @@
     <key alias="selectContent">Vælg indhold</key>
     <key alias="selectMember">Vælg medlem</key>
     <key alias="selectMemberGroup">Vælg medlemsgruppe</key>
-    
     <key alias="noMacroParams">Der er ingen parametre for denne makro</key>
-
     <key alias="linkYour">Link dit</key>
-    <key alias="unLinkYour">Fjern link fra dit</key>    
-    
+    <key alias="unLinkYour">Fjern link fra dit</key>
     <key alias="account">konto</key>
-    
     <key alias="selectEditor">Vælg editor</key>
   </area>
   <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[
+    <key alias="description">
+      <![CDATA[
       Rediger de forskellige sprogversioner for ordbogselementet '%0%' herunder.<br />Du tilføjer flere sprog under 'sprog' i menuen til venstre </key>
-      ]]></key>
+      ]]>
+    </key>
     <key alias="displayName">Kulturnavn</key>
     <key alias="changeKey">Rediger navnet på ordbogselementet.</key>
     <key alias="changeKeyError">
@@ -327,17 +322,17 @@
     <key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
   </area>
   <area alias="editcontenttype">
-	<key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
+    <key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
     <key alias="allowAtRootDesc" version="7.2">Kun dokumenttyper med denne indstilling aktiveret oprettes i rodniveau under Inhold og Mediearkiv</key>
     <key alias="allowedchildnodetypes">Tilladte typer</key>
-	<key alias="contenttypecompositions">Sammensætning af dokumenttyper</key>
+    <key alias="contenttypecompositions">Sammensætning af dokumenttyper</key>
     <key alias="create">Opret</key>
     <key alias="deletetab">Slet fane</key>
     <key alias="description">Beskrivelse</key>
     <key alias="newtab">Ny fane</key>
     <key alias="tab">Fane</key>
     <key alias="thumbnail">Thumbnail</key>
-	<key alias="hasListView">Aktiver listevisning</key>
+    <key alias="hasListView">Aktiver listevisning</key>
     <key alias="hasListViewDesc" version="7.2">Viser undersider i en søgbar liste, undersider vises ikke i indholdstræet</key>
     <key alias="currentListView" version="7.2">Nuværende listevisning</key>
     <key alias="currentListViewDesc" version="7.2">Den aktive listevisningsdatatype</key>
@@ -372,7 +367,7 @@
   </area>
   <area alias="errors">
     <key alias="receivedErrorFromServer">Der skete en fejl på severen</key>
-	  <key alias="dissallowedMediaType">Denne filttype er blevet deaktiveret af administratoren</key>
+    <key alias="dissallowedMediaType">Denne filttype er blevet deaktiveret af administratoren</key>
     <key alias="codemirroriewarning">OBS! Selvom CodeMirror er slået til i konfigurationen, så er den deaktiveret i Internet Explorer fordi den ikke er stabil nok.</key>
     <key alias="contentTypeAliasAndNameNotNull">Du skal udfylde både Alias &amp; Navn på den nye egenskabstype!</key>
     <key alias="filePermissionsError">Der mangler læse/skrive rettigheder til bestemte filer og mapper</key>
@@ -388,7 +383,7 @@
     <key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
     <key alias="xsltErrorHeader">Fejl i XSLT kode</key>
     <key alias="xsltErrorText">Din XSLT er ikke opdateret, da det indeholdt en fejl</key>
-	<key alias="missingPropertyEditorErrorMessage">Der er et problem med den datatype, der bruges til denn egenskab. Kontroller konfigurationen og prøv igen.</key>
+    <key alias="missingPropertyEditorErrorMessage">Der er et problem med den datatype, der bruges til denn egenskab. Kontroller konfigurationen og prøv igen.</key>
   </area>
   <area alias="general">
     <key alias="about">Om</key>
@@ -474,7 +469,8 @@
     <key alias="showPageOnSend">Hvilken side skal vises efter at formularen er sendt</key>
     <key alias="size">Størrelse</key>
     <key alias="sort">Sortér</key>
-    <key alias="submit">Indsend</key> <!-- TODO: Translate this -->
+    <key alias="submit">Indsend</key>
+    <!-- TODO: Translate this -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Skriv for at søge...</key>
     <key alias="up">Op</key>
@@ -513,22 +509,22 @@
   </area>
 
   <area alias="shortcuts">
-      <key alias="addTab">Tilføj fane</key>
-      <key alias="addProperty">Tilføj egenskab</key>
-      <key alias="addEditor">Tilføj editor</key>
-      <key alias="addTemplate">Tilføj skabelon</key>
-      <key alias="addChildNode">Tilføj child node</key>
-      <key alias="addChild">Tilføj child</key>
+    <key alias="addTab">Tilføj fane</key>
+    <key alias="addProperty">Tilføj egenskab</key>
+    <key alias="addEditor">Tilføj editor</key>
+    <key alias="addTemplate">Tilføj skabelon</key>
+    <key alias="addChildNode">Tilføj child node</key>
+    <key alias="addChild">Tilføj child</key>
 
-      <key alias="editDataType">Rediger datatype</key>
+    <key alias="editDataType">Rediger datatype</key>
 
-      <key alias="navigateSections">Naviger sektioner</key>
+    <key alias="navigateSections">Naviger sektioner</key>
 
-      <key alias="shortcut">Genveje</key>
-      <key alias="showShortcuts">Vis genveje</key>
+    <key alias="shortcut">Genveje</key>
+    <key alias="showShortcuts">Vis genveje</key>
 
-      <key alias="toggleListView">Brug listevisning</key>
-      <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
+    <key alias="toggleListView">Brug listevisning</key>
+    <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
   </area>
 
   <area alias="graphicheadline">
@@ -546,13 +542,17 @@
     <key alias="databaseErrorWebConfig">Kunne ikke gemme web.config filen. Du bedes venligst manuelt ændre database forbindelses strengen.</key>
     <key alias="databaseFound">Din database er blevet fundet og identificeret som</key>
     <key alias="databaseHeader">Database konfiguration</key>
-    <key alias="databaseInstall"><![CDATA[
+    <key alias="databaseInstall">
+      <![CDATA[
       Klik på <strong>installér</strong> knappen for at installere Umbraco %0% databasen
-    ]]></key>
+    ]]>
+    </key>
     <key alias="databaseInstall"><![CDATA[Tryk på <strong>installér</strong> knappen for at installere Umbraco %0% databasen]]></key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% er nu blevet kopieret til din database. Tryk på <string>Næste</strong> for at fortsætte.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.</p>
-<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mere information om at redigere web.config her.</a></p>]]></key>
+    <key alias="databaseNotFound">
+      <![CDATA[<p>Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.</p>
+<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mere information om at redigere web.config her.</a></p>]]>
+    </key>
     <key alias="databaseText"><![CDATA[For at afslutte dette skridt er du nødt til at have nogle informationer om din database parat ("database forbindelsesstrengen").<br/>Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]></key>
     <key alias="databaseUpgrade"><![CDATA[<p>Tryk på <strong>Opgradér</strong> knappen for at opgradere din database til Umbraco %0%</p><p>Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!</p>]]></key>
     <key alias="databaseUpgradeDone"><![CDATA[Din database er blevet opgraderet til den endelige version %0%.<br/>Tryk på <strong>Næste</strong> for at fortsætte.]]></key>
@@ -598,8 +598,10 @@
     <key alias="theEndFurtherHelp"><![CDATA[<h3>Yderligere hjælpe og informationer</h3> Få hjælp fra vores prisvindende fællesskab, gennemse dokumentationen eller se nogle gratis videoer om hvordan du opsætter et simpelt site, hvordan du bruger pakker og en 'quick guide' til Umbraco terminologier]]></key>
     <key alias="theEndHeader">Umbraco %0% er installeret og klar til brug</key>
     <key alias="theEndInstallFailed"><![CDATA[For at afslutte installationen er du nødt til manuelt at rette <strong>/web.config filen</strong> og opdatére 'AppSetting' feltet <strong>UmbracoConfigurationStatus</strong> i bunden til <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[Du kan <strong>komme igang med det samme</strong> ved at klikke på "Start Umbraco" knappen nedenfor.<br/>Hvis du er <strong>ny med Umbraco</strong>, kan du finde masser af ressourcer på vores 'getting started' sider.
-]]></key>
+    <key alias="theEndInstallSuccess">
+      <![CDATA[Du kan <strong>komme igang med det samme</strong> ved at klikke på "Start Umbraco" knappen nedenfor.<br/>Hvis du er <strong>ny med Umbraco</strong>, kan du finde masser af ressourcer på vores 'getting started' sider.
+]]>
+    </key>
     <key alias="theEndOpenUmbraco"><![CDATA[<h3>Start Umbraco</h3>For at administrere dit website skal du blot åbne Umbraco administrationen og begynde at tilføje indhold, opdatere skabelonerne og stylesheets'ene eller tilføje ny funktionalitet.]]></key>
     <key alias="Unavailable">Forbindelse til databasen fejlede.</key>
     <key alias="Version3">Umbraco Version 3</key>
@@ -674,12 +676,15 @@ Gå til http://%4%/#/content/content/edit/%5% for at redigere.
 Ha' en dejlig dag!
 
 Mange hilsner fra Umbraco robotten
-		]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p>
+		]]>
+    </key>
+    <key alias="mailBodyHtml">
+      <![CDATA[<p>Hej %0%</p>
     <p>Dette er en automatisk mail for at informere dig om at opgaven <strong>'%1%'</strong>
     er blevet udførtpå siden <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> af brugeren <strong>'%3%'</strong> </p>
     <div style="margin: 8px 0; padding: 8px; display: block;"> <br />
-    <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]></key>
+    <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]>
+    </key>
     <key alias="mailSubject">[%0%] Notificering om %1% udført på %2%</key>
     <key alias="notifications">Notificeringer</key>
   </area>
@@ -700,8 +705,10 @@ Mange hilsner fra Umbraco robotten
     <key alias="packageUninstalledHeader">Pakken blev fjernet</key>
     <key alias="packageUninstalledText">Pakken er på succefuld vis blevet fjernet</key>
     <key alias="packageUninstallHeader">Afinstallér pakke</key>
-    <key alias="packageUninstallText"><![CDATA[Du kan fjerne markeringen på elementer du ikke ønsker at fjerne, på dette tidspunkt, nedenfor. Når du klikker 'bekræft' vil alle afkrydsede elemenet blive fjernet <br/>
-<span style="color: Red; font-weight: bold;">Bemærk:</span> at dokumenter og medier som afhænger af denne pakke vil muligvis holde op med at virke, så vær forsigtig. Hvis i tvivl, kontakt personen som har udviklet pakken.]]></key>
+    <key alias="packageUninstallText">
+      <![CDATA[Du kan fjerne markeringen på elementer du ikke ønsker at fjerne, på dette tidspunkt, nedenfor. Når du klikker 'bekræft' vil alle afkrydsede elemenet blive fjernet <br/>
+<span style="color: Red; font-weight: bold;">Bemærk:</span> at dokumenter og medier som afhænger af denne pakke vil muligvis holde op med at virke, så vær forsigtig. Hvis i tvivl, kontakt personen som har udviklet pakken.]]>
+    </key>
     <key alias="packageUpgradeDownload">Download opdatering fra opbevaringsbasen</key>
     <key alias="packageUpgradeHeader">Opdatér pakke</key>
     <key alias="packageUpgradeInstructions">Opdateringsinstrukser</key>
@@ -734,6 +741,19 @@ Mange hilsner fra Umbraco robotten
     <key alias="paSimpleHelp">Hvis du blot ønsker at opsætte simpel beskyttelse ved hjælp af et enkelt login og kodeord</key>
   </area>
   <area alias="publish">
+    <key alias="contentPublishedFailedAwaitingRelease">Udgivelsen kunne ikke udgives da publiceringsdato er sat</key>
+    <key alias="contentPublishedFailedExpired">
+      <![CDATA[
+      %0% Udgivelsen kunne ikke blive publiceret da publiceringsdatoen er overskredet
+     ]]>
+    </key>
+    <key alias="contentPublishedFailedInvalid">
+      <![CDATA[
+    %0% kunne ikke publiceres da følgende egenskaber :  %1%  ikke overholdte valderingsreglerne.
+    ]]>
+    </key>
+    <key alias="editContentPublishedFailedByParent">Udgivelsen fejlede fordi en overordnet side ikke er publiceret</key>
+
     <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
     <key alias="includeUnpublished">Medtag ikke-udgivede undersider</key>
     <key alias="inProgress">Publicerer - vent venligst...</key>
@@ -807,58 +827,58 @@ Mange hilsner fra Umbraco robotten
 
   <area alias="contentTypeEditor">
 
-      <key alias="compositions">Kompositioner</key>
-      <key alias="noTabs">Du har ikke tilføjet nogle faner</key>
-      <key alias="addNewTab">Tilføj ny fane</key>
-      <key alias="addAnotherTab">Tilføj endnu en fane</key>
-      <key alias="inheritedFrom">Nedarvet fra</key>
-      <key alias="addProperty">Tilføj property</key>
-      <key alias="requiredLabel">Påkrævet label</key>
+    <key alias="compositions">Kompositioner</key>
+    <key alias="noTabs">Du har ikke tilføjet nogle faner</key>
+    <key alias="addNewTab">Tilføj ny fane</key>
+    <key alias="addAnotherTab">Tilføj endnu en fane</key>
+    <key alias="inheritedFrom">Nedarvet fra</key>
+    <key alias="addProperty">Tilføj property</key>
+    <key alias="requiredLabel">Påkrævet label</key>
 
-      <key alias="enableListViewHeading">Aktiver listevisning</key>
-      <key alias="enableListViewDescription">Konfigurer indholdet til at blive vist i en sorterbar og søgbar liste, dens børn vil ikke blive vist i træet</key>
+    <key alias="enableListViewHeading">Aktiver listevisning</key>
+    <key alias="enableListViewDescription">Konfigurer indholdet til at blive vist i en sorterbar og søgbar liste, dens børn vil ikke blive vist i træet</key>
 
-      <key alias="allowedTemplatesHeading">Tilladte skabeloner</key>
-      <key alias="allowedTemplatesDescription">Vælg hvilke skabeloner der er tilladt at bruge på dette indhold</key>
+    <key alias="allowedTemplatesHeading">Tilladte skabeloner</key>
+    <key alias="allowedTemplatesDescription">Vælg hvilke skabeloner der er tilladt at bruge på dette indhold</key>
 
-      <key alias="allowAsRootHeading">Tillad på rodniveau</key>
-      <key alias="allowAsRootDescription">Kun dokumenttyper med denne indstilling aktiveret oprettes i rodniveau under inhold og mediearkiv</key>
-      <key alias="allowAsRootCheckbox">Ja – indhold af denne type er tilladt i roden</key>
+    <key alias="allowAsRootHeading">Tillad på rodniveau</key>
+    <key alias="allowAsRootDescription">Kun dokumenttyper med denne indstilling aktiveret oprettes i rodniveau under inhold og mediearkiv</key>
+    <key alias="allowAsRootCheckbox">Ja – indhold af denne type er tilladt i roden</key>
 
-      <key alias="childNodesHeading">Tilladte typer</key>
-      <key alias="childNodesDescription">Tillad at oprette indhold af en specifik type under denne</key>
+    <key alias="childNodesHeading">Tilladte typer</key>
+    <key alias="childNodesDescription">Tillad at oprette indhold af en specifik type under denne</key>
 
-      <key alias="chooseChildNode">Vælg child node</key>
+    <key alias="chooseChildNode">Vælg child node</key>
 
-      <key alias="compositionsDescription">Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens.</key>
-      <key alias="compositionInUse">Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition</key>
-      <key alias="noAvailableCompositions">Der er ingen indholdstyper tilgængelige at bruge som komposition</key>
+    <key alias="compositionsDescription">Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens.</key>
+    <key alias="compositionInUse">Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition</key>
+    <key alias="noAvailableCompositions">Der er ingen indholdstyper tilgængelige at bruge som komposition</key>
 
-      <key alias="availableEditors">Tilgængelige editors</key>
-      <key alias="reuse">Genbrug</key>
-      <key alias="editorSettings">Editor indstillinger</key>
+    <key alias="availableEditors">Tilgængelige editors</key>
+    <key alias="reuse">Genbrug</key>
+    <key alias="editorSettings">Editor indstillinger</key>
 
-      <key alias="configuration">Konfiguration</key>
+    <key alias="configuration">Konfiguration</key>
 
-      <key alias="yesDelete">Ja, slet</key>
+    <key alias="yesDelete">Ja, slet</key>
 
-      <key alias="movedUnderneath">blev flyttet til</key>
-      <key alias="folderToMove">Vælg hvor</key>
-      <key alias="structureBelow">skal flyttes til</key>
+    <key alias="movedUnderneath">blev flyttet til</key>
+    <key alias="folderToMove">Vælg hvor</key>
+    <key alias="structureBelow">skal flyttes til</key>
 
-      <key alias="allDocumentTypes">Alle dokumenttyper</key>
-      <key alias="allDocuments">Alle dokumenter</key>
-      <key alias="allMediaItems">Alle medier</key>
+    <key alias="allDocumentTypes">Alle dokumenttyper</key>
+    <key alias="allDocuments">Alle dokumenter</key>
+    <key alias="allMediaItems">Alle medier</key>
 
-      <key alias="usingThisDocument">som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
-      <key alias="usingThisMedia">som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
-      <key alias="usingThisMember">som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="usingThisDocument">som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="usingThisMedia">som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="usingThisMember">som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
 
-      <key alias="andAllDocuments">og alle dokumenter, som benytter denne type</key>
-      <key alias="andAllMediaItems">og alle medier, som benytter denne type</key>
-      <key alias="andAllMembers">og alle medlemmer, som benytter denne type</key>
+    <key alias="andAllDocuments">og alle dokumenter, som benytter denne type</key>
+    <key alias="andAllMediaItems">og alle medier, som benytter denne type</key>
+    <key alias="andAllMembers">og alle medlemmer, som benytter denne type</key>
 
-      <key alias="thisEditorUpdateSettings">der bruger denne editor vil blive opdateret med de nye indstillinger</key>
+    <key alias="thisEditorUpdateSettings">der bruger denne editor vil blive opdateret med de nye indstillinger</key>
   </area>
 
   <area alias="rollback">
@@ -922,8 +942,6 @@ Mange hilsner fra Umbraco robotten
   <area alias="speechBubbles">
     <key alias="operationCancelledHeader">Annulleret</key>
     <key alias="operationCancelledText">Handlingen blev annulleret af et 3. part tilføjelsesprogram</key>
-    <key alias="contentPublishedFailedByEvent">Udgivelsen blev standset af et 3. parts modul</key>
-    <key alias="contentPublishedFailedAwaitingRelease">Udgivelsen kunne ikke udgives da publiceringsdato er sat</key>
     <key alias="contentTypeDublicatePropertyType">Property type eksisterer allerede</key>
     <key alias="contentTypePropertyTypeCreated">Egenskabstype oprettet</key>
     <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Navn: %0% <br /> DataType: %1%]]></key>
@@ -937,7 +955,6 @@ Mange hilsner fra Umbraco robotten
     <key alias="cssSavedText">Stylesheet gemt uden fejl</key>
     <key alias="dataTypeSaved">Datatype gemt</key>
     <key alias="dictionaryItemSaved">Ordbogsnøgle gemt</key>
-    <key alias="editContentPublishedFailedByParent">Udgivelsen fejlede fordi en overordnet side ikke er publiceret</key>
     <key alias="editContentPublishedHeader">Indhold publiceret</key>
     <key alias="editContentPublishedText">og nu synligt for besøgende</key>
     <key alias="editContentSavedHeader">Indhold gemt</key>
@@ -1139,11 +1156,28 @@ Mange hilsner fra Umbraco robotten
     <key alias="sessionExpires">Session udløber</key>
   </area>
   <area alias="validation">
-      <key alias="validation">Validation</key>
-      <key alias="validateAsEmail">Valider som email</key>
-      <key alias="validateAsNumber">Valider som tal</key>
-      <key alias="validateAsUrl">Valider som Url</key>
-      <key alias="enterCustomValidation">...eller indtast din egen validering</key>
-      <key alias="fieldIsMandatory">Feltet er påkrævet</key>
+    <key alias="validation">Validation</key>
+    <key alias="validateAsEmail">Valider som email</key>
+    <key alias="validateAsNumber">Valider som tal</key>
+    <key alias="validateAsUrl">Valider som Url</key>
+    <key alias="enterCustomValidation">...eller indtast din egen validering</key>
+    <key alias="fieldIsMandatory">Feltet er påkrævet</key>
+  </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Slå URL tracker fra</key>
+    <key alias="enableUrlTracker">Slå URL tracker til</key>
+    <key alias="originalUrl">Original URL</key>
+    <key alias="redirectedTo">Viderestillet til</key>
+    <key alias="noRedirects">Der er ikke lavet nogen viderestillinger</key>
+    <key alias="noRedirectsDescription">Når en udgivet side bliver omdøbt eller flyttet, vil en viderestilling automatisk blive lavet til den nye side.</key>
+    <key alias="removeButton">Fjern</key>
+    <key alias="confirmRemove">Er du sikker på at du vil fjerne viderestillingen fra '%0%' til '%1%'?</key>
+    <key alias="redirectRemoved">Viderestillings URL fjernet.</key>
+    <key alias="redirectRemoveError">Fejl under fjernelse af viderestillings URL.</key>
+    <key alias="confirmDisable">Er du sikker på at du vil slå URL trackeren fra?</key>
+    <key alias="disabledConfirm">URL tracker er nu slået fra.</key>
+    <key alias="disableError">Der opstod en fejl under forsøget på at slå URL trackeren fra, der findes mere information i logfilen.</key>
+    <key alias="enabledConfirm">URL tracker er nu slået fra.</key>
+    <key alias="enableError">Der opstod en fejl under forsøget på at slå URL trackeren til, der findes mere information i logfilen.</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 67515e96a5..bdc2647563 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -28,6 +28,9 @@
     <key alias="refreshNode">Reload</key>
     <key alias="republish">Republish entire site</key>
     <key alias="restore" version="7.3.0">Restore</key>
+    <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
+    <key alias="chooseWhereToMove">Choose where to move</key>
+    <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
     <key alias="rights">Permissions</key>
     <key alias="rollback">Rollback</key>
     <key alias="sendtopublish">Send To Publish</key>
@@ -286,18 +289,12 @@
     <key alias="treepicker">Pick item</key>
     <key alias="viewCacheItem">View Cache Item</key>
     <key alias="createFolder">Create folder...</key>
-
     <key alias="relateToOriginalLabel">Relate to original</key>
+    <key alias="includeDescendants">Include descendants</key>
     <key alias="theFriendliestCommunity">The friendliest community</key>
-
     <key alias="linkToPage">Link to page</key>
-
     <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
-    <key alias="openInFullBody">Opens the linked document in the full body of the window</key>
-    <key alias="openInParentFrame">Opens the linked document in the parent frame</key>
-
     <key alias="linkToMedia">Link to media</key>
-
     <key alias="selectMedia">Select media</key>
     <key alias="selectIcon">Select icon</key>
     <key alias="selectItem">Select item</key>
@@ -307,19 +304,14 @@
     <key alias="selectMember">Select member</key>
     <key alias="selectMemberGroup">Select member group</key>
     <key alias="noIconsFound">No icons were found</key>
-
     <key alias="noMacroParams">There are no parameters for this macro</key>
-
     <key alias="externalLoginProviders">External login providers</key>
     <key alias="exceptionDetail">Exception Details</key>
     <key alias="stacktrace">Stacktrace</key>
     <key alias="innerException">Inner Exception</key>
-
     <key alias="linkYour">Link your</key>
     <key alias="unLinkYour">Un-Link your</key>
-
     <key alias="account">account</key>
-
     <key alias="selectEditor">Select editor</key>
   </area>
   <area alias="dictionaryItem">
@@ -1341,7 +1333,7 @@ To manage your website, simply open the Umbraco back office and start adding con
 	  <key alias="customErrorsCheckRectifySuccessMessage">Custom errors successfully set to '%0%'.</key>
 
 	  <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
-	  <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely when there's any errors in macros. Rectifying this will set the value to '%1%'.</key>
+	  <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
 	  <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>
 
 	  <!-- The following keys get these tokens passed in:
@@ -1359,8 +1351,8 @@ To manage your website, simply open the Umbraco back office and start adding con
 	  <key alias="configurationServiceError">There was an error, check log for full error: %0%.</key>
 
 	  <key alias="xmlDataIntegrityCheckMembers">Members - Total XML: %0%, Total: %1%, Total invalid: %2%</key>
-	  <key alias="xmlDataIntegrityCheckMedia">Media - Total XML: %0%, Total: %1%, Total invalid %2%</key>
-	  <key alias="xmlDataIntegrityCheckContent">Content - Total XML: %0%, Total published: %1%, Total invalid %2%</key>
+	  <key alias="xmlDataIntegrityCheckMedia">Media - Total XML: %0%, Total: %1%, Total invalid: %2%</key>
+	  <key alias="xmlDataIntegrityCheckContent">Content - Total XML: %0%, Total published: %1%, Total invalid: %2%</key>
 
 	  <key alias="httpsCheckValidCertificate">Your site certificate was marked as valid.</key>
 	  <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 6c976947bb..7544cacc0c 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -27,6 +27,9 @@
     <key alias="unpublish">Unpublish</key>
     <key alias="refreshNode">Reload</key>
     <key alias="republish">Republish entire site</key>
+    <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
+    <key alias="chooseWhereToMove">Choose where to move</key>
+    <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
     <key alias="restore" version="7.3.0">Restore</key>
     <key alias="rights">Permissions</key>
     <key alias="rollback">Rollback</key>
@@ -288,18 +291,12 @@
     <key alias="treepicker">Pick item</key>
     <key alias="viewCacheItem">View Cache Item</key>
     <key alias="createFolder">Create folder...</key>
-
     <key alias="relateToOriginalLabel">Relate to original</key>
+    <key alias="includeDescendants">Include descendants</key>
     <key alias="theFriendliestCommunity">The friendliest community</key>
-
     <key alias="linkToPage">Link to page</key>
-
     <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
-    <key alias="openInFullBody">Opens the linked document in the full body of the window</key>
-    <key alias="openInParentFrame">Opens the linked document in the parent frame</key>
-
     <key alias="linkToMedia">Link to media</key>
-
     <key alias="selectMedia">Select media</key>
     <key alias="selectIcon">Select icon</key>
     <key alias="selectItem">Select item</key>
@@ -308,19 +305,14 @@
     <key alias="selectContent">Select content</key>
     <key alias="selectMember">Select member</key>
     <key alias="selectMemberGroup">Select member group</key>
-
     <key alias="noMacroParams">There are no parameters for this macro</key>
-
     <key alias="externalLoginProviders">External login providers</key>
     <key alias="exceptionDetail">Exception Details</key>
     <key alias="stacktrace">Stacktrace</key>
     <key alias="innerException">Inner Exception</key>
-
     <key alias="linkYour">Link your</key>
     <key alias="unLinkYour">Un-Link your</key>
-
     <key alias="account">account</key>
-
     <key alias="selectEditor">Select editor</key>
   </area>
   <area alias="dictionaryItem">
@@ -1346,7 +1338,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="customErrorsCheckRectifySuccessMessage">Custom errors successfully set to '%0%'.</key>
 
     <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
-    <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely when there's any errors in macros. Rectifying this will set the value to '%1%'.</key>
+    <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
     <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>
 
     <!-- The following keys get these tokens passed in:
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index 40e18ce298..39cafeef7f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -287,41 +287,29 @@
     <key alias="thumbnailimageclickfororiginal">Cliquez sur l'image pour la voir en taille réelle</key>
     <key alias="treepicker">Sélectionner un élément</key>
     <key alias="viewCacheItem">Voir l'élément de cache</key>
-	<key alias="createFolder">Créer un répertoire...</key>
-
-	<key alias="relateToOriginalLabel">Lier à l'original</key>
-	<key alias="theFriendliestCommunity">La communauté la plus amicale</key>
-
-	<key alias="linkToPage">Lier à la page</key>
-
-	<key alias="openInNewWindow">Ouvre le document lié dans une nouvelle fenêtre ou un nouvel onglet</key>
-	<key alias="openInFullBody">Ouvre le document lié dans l'entièreté de la fenêtre</key>
-	<key alias="openInParentFrame">Ouvre le document lié dans le conteneur parent</key>
-
-	<key alias="linkToMedia">Lier à un media</key>
-
-	<key alias="selectMedia">Sélectionner le media</key>
-	<key alias="selectIcon">Sélectionner l'icône</key>
-	<key alias="selectItem">Sélectionner l'élément</key>
-	<key alias="selectLink">Sélectionner le lien</key>
-	<key alias="selectMacro">Sélectionner la macro</key>
-	<key alias="selectContent">Sélectionner le contenu</key>
-	<key alias="selectMember">Sélectionner le membre</key>
-	<key alias="selectMemberGroup">Sélectionner le groupe de membres</key>
-
-	<key alias="noMacroParams">Il n'y a pas de paramètres pour cette macro</key>
-
-	<key alias="externalLoginProviders">Fournisseurs externes d'identification</key>
-	<key alias="exceptionDetail">Détails de l'exception</key>
-	<key alias="stacktrace">Trace d'exécution</key>
-	<key alias="innerException">Exception interne</key>
-
-	<key alias="linkYour">Liez votre</key>
-	<key alias="unLinkYour">Enlevez votre</key>
-
-	<key alias="account">compte</key>
-
-	<key alias="selectEditor">Sélectionner un éditeur</key>
+    <key alias="createFolder">Créer un répertoire...</key>
+    <key alias="relateToOriginalLabel">Lier à l'original</key>
+    <key alias="theFriendliestCommunity">La communauté la plus amicale</key>
+    <key alias="linkToPage">Lier à la page</key>
+    <key alias="openInNewWindow">Ouvre le document lié dans une nouvelle fenêtre ou un nouvel onglet</key>
+    <key alias="linkToMedia">Lier à un media</key>
+    <key alias="selectMedia">Sélectionner le media</key>
+    <key alias="selectIcon">Sélectionner l'icône</key>
+    <key alias="selectItem">Sélectionner l'élément</key>
+    <key alias="selectLink">Sélectionner le lien</key>
+    <key alias="selectMacro">Sélectionner la macro</key>
+    <key alias="selectContent">Sélectionner le contenu</key>
+    <key alias="selectMember">Sélectionner le membre</key>
+    <key alias="selectMemberGroup">Sélectionner le groupe de membres</key>
+    <key alias="noMacroParams">Il n'y a pas de paramètres pour cette macro</key>
+    <key alias="externalLoginProviders">Fournisseurs externes d'identification</key>
+    <key alias="exceptionDetail">Détails de l'exception</key>
+    <key alias="stacktrace">Trace d'exécution</key>
+    <key alias="innerException">Exception interne</key>
+    <key alias="linkYour">Liez votre</key>
+    <key alias="unLinkYour">Enlevez votre</key>
+    <key alias="account">compte</key>
+    <key alias="selectEditor">Sélectionner un éditeur</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description"><![CDATA[
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
index beced6eb79..d01caaa315 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
@@ -275,19 +275,12 @@
     <key alias="thumbnailimageclickfororiginal">クリックすると画像がフルサイズで表示されます</key>
     <key alias="treepicker">項目の選択</key>
     <key alias="viewCacheItem">キャッシュされている項目の表示</key>
-	<key alias="createFolder">フォルダーの作成...</key>
-
+    <key alias="createFolder">フォルダーの作成...</key>
     <key alias="relateToOriginalLabel">オリジナルに関連付ける</key>
     <key alias="theFriendliestCommunity">フレンドリーなコミュニティ</key>
-
     <key alias="linkToPage">ページへリンク</key>
-
     <key alias="openInNewWindow">リンク ドキュメントを新しいウィンドウまたはタブで開く</key>
-    <key alias="openInFullBody">リンク ドキュメントをウィンドウ全文表示で開く</key>
-    <key alias="openInParentFrame">親フレームでリンク ドキュメントを開く</key>
-
     <key alias="linkToMedia">メディアへリンク</key>
-
     <key alias="selectMedia">メディアの選択</key>
     <key alias="selectIcon">アイコンの選択</key>
     <key alias="selectItem">アイテムの選択</key>
@@ -296,19 +289,14 @@
     <key alias="selectContent">コンテンツの選択</key>
     <key alias="selectMember">メンバーの選択</key>
     <key alias="selectMemberGroup">メンバー グループの選択</key>
-
     <key alias="noMacroParams">このマクロのパラメーターはありません</key>
-
     <key alias="externalLoginProviders">外部ログイン プロバイダー</key>
     <key alias="exceptionDetail">例外の詳細</key>
     <key alias="stacktrace">スタックトレース</key>
     <key alias="innerException">Inner Exception</key>
-
     <key alias="linkYour">次をリンク:</key>
     <key alias="unLinkYour">次をリンク解除:</key>
-
     <key alias="account">アカウント</key>
-
     <key alias="selectEditor">エディターの選択</key>
   </area>
   <area alias="dictionaryItem">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index 97dcf9ef38..312e863c36 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -15,8 +15,8 @@
     <key alias="disable">Deaktywuj</key>
     <key alias="emptyTrashcan">Opróżnij kosz</key>
     <key alias="exportDocumentType">Eksportuj typ dokumentu</key>
-    <key alias="exportDocumentTypeAsCode">TRANSLATE ME: 'Export to .NET'</key>
-    <key alias="exportDocumentTypeAsCode-Full">TRANSLATE ME: 'Export to .NET'</key>
+    <key alias="exportDocumentTypeAsCode">Ekspo .NET'</key>
+    <key alias="exportDocumentTypeAsCode-Full">Eksportuj do .NET'</key>
     <key alias="importDocumentType">Importuj typ dokumentu</key>
     <key alias="importPackage">Importuj zbiór</key>
     <key alias="liveEdit">Edytuj na stronie</key>
@@ -118,7 +118,7 @@
   </area>
   <area alias="dashboard">
     <key alias="browser">Przeglądaj swoją stronę</key>
-    <key alias="dontShowAgain">TRANSLATE ME: '- Hide'</key>
+    <key alias="dontShowAgain">- Ukryj</key>
     <key alias="nothinghappens">Jeśli Umbraco się nie otwiera, prawdopodbnie musisz zezwolić tej stronie na otwieranie wyskakujących okienek</key>
     <key alias="openinnew">zostało otwarte w nowym oknie</key>
     <key alias="restart">Restartuj</key>
@@ -168,7 +168,7 @@
     <key alias="confirmEmptyTrashcan">Proszę zaznaczyć, aby potwierdzić usunięcie %0% elementów.</key>
     <key alias="confirmlogout">Jesteś pewny?</key>
     <key alias="confirmSure">Jesteś pewny?</key>
-    <key alias="cut">TRANSLATE ME: 'Cut'</key>
+    <key alias="cut">Wytnij</key>
     <key alias="editdictionary">Edytuj element słownika</key>
     <key alias="editlanguage">Edytuj język</key>
     <key alias="insertAnchor">Wstaw link wewnętrzny</key>
@@ -183,7 +183,7 @@
     <key alias="linkinternal">Link wewnętrzny:</key>
     <key alias="linklocaltip">Kiedy używasz odnośników lokalnych, wstaw znak "#" na początku linku</key>
     <key alias="linknewwindow">Otworzyć w nowym oknie?</key>
-    <key alias="macroContainerSettings">TRANSLATE ME: 'Macro Settings'</key>
+    <key alias="macroContainerSettings">Ustawienia Makra</key>
     <key alias="macroDoesNotHaveProperties">To makro nie posiada żadnych właściwości, które można edytować</key>
     <key alias="paste">Wklej</key>
     <key alias="permissionsEdit">Edytuj Uprawnienia dla</key>
@@ -192,7 +192,7 @@
     <key alias="recycleBinWarning">Usunięcie elementów z kosza powoduje ich trwałe i nieodwracalne skasowanie</key>
     <key alias="regexSearchError"><![CDATA[Serwis <a target='_blank' href='http://regexlib.com'>regexlib.com</a> aktulanie nie jest dostępny, na co nie mamy wpływu. Bardzo przepraszamy za te utrudnienia.]]></key>
     <key alias="regexSearchHelp">Przeszukaj dla wyrażeń regularnych aby dodać regułę sprawdzającą do formularza. Np. 'email' 'url'</key>
-    <key alias="removeMacro">TRANSLATE ME: 'Remove Macro'</key>
+    <key alias="removeMacro">Usuń Makro</key>
     <key alias="requiredField">Pole wymagane</key>
     <key alias="sitereindexed">Strona została przeindeksowana</key>
     <key alias="siterepublished">Cache strony zostało odświeżone. Cała opublikowana zawartość jest teraz aktualna. Natomiast cała nieopublikowana zawartość ciągle nie jest widoczna</key>
@@ -222,7 +222,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
   <area alias="editdatatype">
     <key alias="addPrevalue">Dodaj wartość</key>
     <key alias="dataBaseDatatype">Typ bazydanych</key>
-    <key alias="guid">TRANSLATE ME: 'Data Editor GUID'</key>
+    <key alias="guid">Edytor GUID</key>
     <key alias="renderControl">Renderuj kontrolkę</key>
     <key alias="rteButtons">Przyciski</key>
     <key alias="rteEnableAdvancedSettings">Włącz ustawienia zaawansowane dla</key>
@@ -235,7 +235,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
   <area alias="errorHandling">
     <key alias="errorButDataWasSaved">Dane zostały zapisane, lecz wystąpiły błędy które musisz poprawić przed publikacją strony:</key>
     <key alias="errorChangingProviderPassword">Bieżący dostawca Membership nie obsługuje zmiany hasła (EnablePasswordRetrieval musi mieć wartość true)</key>
-    <key alias="errorExistsWithoutTab">TRANSLATE ME: '%0% already exists'</key>
+    <key alias="errorExistsWithoutTab">%0% już istnieje</key>
     <key alias="errorHeader">Wystąpiły błędy:</key>
     <key alias="errorHeaderWithoutTab">Wystąpiły błędy:</key>
     <key alias="errorInPasswordFormat">Hasło powinno mieć minimum %0% znaków, i zawierać co najmniej %1% niealfanumeryczny znak</key>
@@ -308,7 +308,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="language">Język</key>
     <key alias="layout">układ</key>
     <key alias="loading">Ładowanie</key>
-    <key alias="locked">TRANSLATE ME: 'Locked'</key>
+    <key alias="locked">Zablokowany</key>
     <key alias="login">Zaloguj</key>
     <key alias="logoff">Wyloguj</key>
     <key alias="logout">Wyloguj</key>
@@ -332,7 +332,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="recycleBin">Kosz</key>
     <key alias="remaining">Pozostało</key>
     <key alias="rename">Zmień nazwę</key>
-    <key alias="renew">TRANSLATE ME: 'Renew'</key>
+    <key alias="renew">Odnów</key>
     <key alias="retry">Ponów próbę</key>
     <key alias="rights">Uprawnienia</key>
     <key alias="search">Szukaj</key>
@@ -341,7 +341,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="showPageOnSend">Pokaż stronę "wyślij"</key>
     <key alias="size">Rozmiar</key>
     <key alias="sort">Sortuj</key>
-    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
+    <key alias="submit">Zatwierdź</key>
     <key alias="type">Typ</key>
     <key alias="typeToSearch">Szukaj</key>
     <key alias="up">W górę</key>
@@ -356,8 +356,8 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="welcome">Witaj...</key>
     <key alias="width">Szerokość</key>
     <key alias="yes">Tak</key>
-    <key alias="reorder">Reorder</key>
-    <key alias="reorderDone">I am done reordering</key>
+    <key alias="reorder">Zmień kolejność</key>
+    <key alias="reorderDone">Kolejność została zmieniona</key>
   </area>
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Kolor tła</key>
@@ -786,7 +786,7 @@ Miłego dnia!]]></key>
   <area alias="user">
     <key alias="administrators">Administrator</key>
     <key alias="categoryField">Pole kategorii</key>
-    <key alias="changePassword">TRANSLATE ME: 'Change Your Password'</key>
+    <key alias="changePassword">Zmień hasło!</key>
     <key alias="changePasswordDescription">TRANSLATE ME: 'You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button'</key>
     <key alias="contentChannel">Zawartość</key>
     <key alias="descriptionField">Opis</key>
@@ -800,10 +800,10 @@ Miłego dnia!]]></key>
     <key alias="modules">Sekcje</key>
     <key alias="noConsole">Wyłącz dostęp do Umbraco</key>
     <key alias="password">Hasło</key>
-    <key alias="passwordChanged">TRANSLATE ME: 'Your password has been changed!'</key>
-    <key alias="passwordConfirm">TRANSLATE ME: 'Please confirm the new password'</key>
-    <key alias="passwordEnterNew">TRANSLATE ME: 'Enter your new password'</key>
-    <key alias="passwordIsBlank">TRANSLATE ME: 'Your new password cannot be blank!'</key>
+    <key alias="passwordChanged">Twoje hasło zostało zmienione!</key>
+    <key alias="passwordConfirm">Proszę potwierdź nowe hasło!</key>
+    <key alias="passwordEnterNew">Wprowadź nowe hasło</key>
+    <key alias="passwordIsBlank">Nowe hasło nie może byc puste!</key>
     <key alias="passwordIsDifferent">TRANSLATE ME: 'There was a difference between the new password and the confirmed password. Please try again!'</key>
     <key alias="passwordMismatch">TRANSLATE ME: 'The confirmed password doesn't match the new password!'</key>
     <key alias="permissionReplaceChildren">Zastąp prawa dostępu dla węzłów potomnych</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index 75c5630678..255bf62d5d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -340,18 +340,11 @@
     <key alias="treepicker">Выберите элемент</key>
     <key alias="viewCacheItem">Просмотр элемента кэша</key>
     <key alias="createFolder">Создать папку...</key>
-
     <key alias="relateToOriginalLabel">Связать с оригиналом</key>
     <key alias="theFriendliestCommunity">Самое дружелюбное сообщество</key>
-
     <key alias="linkToPage">Ссылка на страницу</key>
-
     <key alias="openInNewWindow">Открывает документ по ссылке в новом окне или вкладке браузера</key>
-    <key alias="openInFullBody">Открывает документ по ссылке в полноэкранном режиме</key>
-    <key alias="openInParentFrame">Открывает документ по ссылке в родительском фрейме</key>
-
     <key alias="linkToMedia">Ссылка на медиа-файл</key>
-
     <key alias="selectMedia">Выбрать медиа</key>
     <key alias="selectIcon">Выбрать значок</key>
     <key alias="selectItem">Выбрать элемент</key>
@@ -360,19 +353,14 @@
     <key alias="selectContent">Выбрать содержимое</key>
     <key alias="selectMember">Выбрать участника</key>
     <key alias="selectMemberGroup">Выбрать группу участников</key>
-
     <key alias="noMacroParams">Это макрос без параметров</key>
-
     <key alias="externalLoginProviders">Провайдеры аутентификации</key>
     <key alias="exceptionDetail">Подробное сообщение об ошибке</key>
     <key alias="stacktrace">Трассировка стека</key>
     <key alias="innerException">Внутренняя ошибка</key>
-
     <key alias="linkYour">Связать</key>
     <key alias="unLinkYour">Разорвать связь</key>
-
     <key alias="account">учетную запись</key>
-
     <key alias="selectEditor">Выбрать редактор</key>
   </area>
   <area alias="dictionaryItem">
@@ -380,6 +368,12 @@
 		Ниже Вы можете указать различные переводы данной статьи словаря '<em>%0%</em>'<br/>Добавить другие языки можно, воспользовавшись пунктом 'Языки' в меню слева
 		]]></key>
     <key alias="displayName">Название языка (культуры)</key>
+    <key alias="changeKey">Редактировать элемент (ключ) словаря</key>
+    <key alias="changeKeyError">
+      <![CDATA[
+      Ключ '%0%' уже существует в словаре.
+   ]]>
+    </key>
   </area>
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Допустим как корневой</key>
@@ -655,7 +649,7 @@
     <key alias="xmlDataIntegrityCheckMedia">Медиа - всего в XML: %0%, всего: %1%Б с ошибками: %2%</key>
     <key alias="xmlDataIntegrityCheckContent">Содержимое - всего в XML: %0%, всего опубликовано: %1%, с ошибками: %2%</key>
 
-    <key alias="httpsCheckValidCertificate">Сертификат Вашего сайта отмечен как проверенный.</key>
+    <key alias="httpsCheckValidCertificate">Сертификат Вашего веб-сайта отмечен как проверенный.</key>
     <key alias="httpsCheckInvalidCertificate">Ошибка проверки сертификата: '%0%'</key>
     <key alias="httpsCheckInvalidUrl">Ошибка проверки адреса URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">Сейчас Вы %0% просматриваете сайт, используя протокол HTTPS.</key>
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
index 46b7a15e48..4c9017e159 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
@@ -281,7 +281,7 @@ Umbraco.Application.Actions = function() {
         actionRePublish: function() {
             /// <summary></summary>
 
-            UmbClientMgr.openModalWindow('dialogs/republish.aspx?rnd=' + this._utils.generateRandom(), 'Republishing entire site', true, 450, 210);
+            UmbClientMgr.openModalWindow('dialogs/republish.aspx?rnd=' + this._utils.generateRandom(), uiKeys['actions_republish'], true, 450, 210);
         },
 
         actionAssignDomain: function() {
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 08140f9c66..6604aee507 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -531,8 +531,17 @@ namespace Umbraco.Web.Editors
                 {
                     var mediaType = Constants.Conventions.MediaTypes.File;
 
-                    if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.Contains(ext))
-                        mediaType = Constants.Conventions.MediaTypes.Image;
+                    if (result.FormData["contentTypeAlias"] == Constants.Conventions.MediaTypes.AutoSelect)
+                    {
+                        if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.Contains(ext))
+                        {
+                            mediaType = Constants.Conventions.MediaTypes.Image;
+                        }
+                    }
+                    else
+                    {
+                        mediaType = result.FormData["contentTypeAlias"];
+                    }
 
                     //TODO: make the media item name "nice" since file names could be pretty ugly, we have
                     // string extensions to do much of this but we'll need:
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
index 83275450e4..cf279bf3f8 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Security
     [HealthCheck(
         "92ABBAA2-0586-4089-8AE2-9A843439D577",
         "Excessive Headers",
-        Description = "Checks to see if your site is revealing information in it's headers that gives away unnecessary details about the technology used to build and host it.",
+        Description = "Checks to see if your site is revealing information in its headers that gives away unnecessary details about the technology used to build and host it.",
         Group = "Security")]
     public class ExcessiveHeadersCheck : HealthCheck
     {
diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
index b7a6ac1f4a..e179159e7c 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -6,7 +6,6 @@ using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
 using AutoMapper;
-using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Mapping;
@@ -29,38 +28,18 @@ namespace Umbraco.Web.Models.Mapping
 
             //FROM IContent TO ContentItemDisplay
             config.CreateMap<IContent, ContentItemDisplay>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IContent>()))
-                .ForMember(
-                    dto => dto.Updater,
-                    expression => expression.ResolveUsing(new CreatorResolver()))
-                .ForMember(
-                    dto => dto.Icon,
-                    expression => expression.MapFrom(content => content.ContentType.Icon))
-                .ForMember(
-                    dto => dto.ContentTypeAlias,
-                    expression => expression.MapFrom(content => content.ContentType.Alias))
-                .ForMember(
-                    dto => dto.ContentTypeName,
-                    expression => expression.MapFrom(content => content.ContentType.Name))
-                .ForMember(
-                    dto => dto.IsContainer,
-                    expression => expression.MapFrom(content => content.ContentType.IsContainer))
-                .ForMember(display => display.IsChildOfListView, expression => expression.Ignore())                
-                .ForMember(
-                    dto => dto.Trashed,
-                    expression => expression.MapFrom(content => content.Trashed))
-                .ForMember(
-                    dto => dto.PublishDate,
-                    expression => expression.MapFrom(content => GetPublishedDate(content, applicationContext)))
-                .ForMember(
-                    dto => dto.TemplateAlias, expression => expression.MapFrom(content => content.Template.Alias))
-                .ForMember(
-                    dto => dto.HasPublishedVersion,
-                    expression => expression.MapFrom(content => content.HasPublishedVersion))
-                .ForMember(
-                    dto => dto.Urls,
+                .ForMember(display => display.Owner, expression => expression.ResolveUsing(new OwnerResolver<IContent>()))
+                .ForMember(display => display.Updater, expression => expression.ResolveUsing(new CreatorResolver()))
+                .ForMember(display => display.Icon, expression => expression.MapFrom(content => content.ContentType.Icon))
+                .ForMember(display => display.ContentTypeAlias, expression => expression.MapFrom(content => content.ContentType.Alias))
+                .ForMember(display => display.ContentTypeName, expression => expression.MapFrom(content => content.ContentType.Name))
+                .ForMember(display => display.IsContainer, expression => expression.MapFrom(content => content.ContentType.IsContainer))
+                .ForMember(display => display.IsChildOfListView, expression => expression.Ignore())
+                .ForMember(display => display.Trashed, expression => expression.MapFrom(content => content.Trashed))
+                .ForMember(display => display.PublishDate, expression => expression.MapFrom(content => GetPublishedDate(content, applicationContext)))
+                .ForMember(display => display.TemplateAlias, expression => expression.MapFrom(content => content.Template.Alias))
+                .ForMember(display => display.HasPublishedVersion, expression => expression.MapFrom(content => content.HasPublishedVersion))
+                .ForMember(display => display.Urls,
                     expression => expression.MapFrom(content =>
                         UmbracoContext.Current == null
                             ? new[] {"Cannot generate urls without a current Umbraco Context"}
@@ -74,47 +53,28 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(display => display.Tabs, expression => expression.ResolveUsing(new TabsAndPropertiesResolver(applicationContext.Services.TextService)))
                 .ForMember(display => display.AllowedActions, expression => expression.ResolveUsing(
                     new ActionButtonsResolver(new Lazy<IUserService>(() => applicationContext.Services.UserService))))
-                .AfterMap((media, display) => AfterMap(media, display, applicationContext.Services.DataTypeService, applicationContext.Services.TextService,
+                .AfterMap((content, display) => AfterMap(content, display, applicationContext.Services.DataTypeService, applicationContext.Services.TextService,
                     applicationContext.Services.ContentTypeService));
 
             //FROM IContent TO ContentItemBasic<ContentPropertyBasic, IContent>
             config.CreateMap<IContent, ContentItemBasic<ContentPropertyBasic, IContent>>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IContent>()))
-                .ForMember(
-                    dto => dto.Updater,
-                    expression => expression.ResolveUsing(new CreatorResolver()))
-                .ForMember(
-                    dto => dto.Icon,
-                    expression => expression.MapFrom(content => content.ContentType.Icon))
-                .ForMember(
-                    dto => dto.Trashed,
-                    expression => expression.MapFrom(content => content.Trashed))
-                .ForMember(
-                    dto => dto.HasPublishedVersion,
-                    expression => expression.MapFrom(content => content.HasPublishedVersion))
-                .ForMember(
-                    dto => dto.ContentTypeAlias,
-                    expression => expression.MapFrom(content => content.ContentType.Alias))
-                .ForMember(display => display.Alias, expression => expression.Ignore());
+                .ForMember(dto => dto.Owner, expression => expression.ResolveUsing(new OwnerResolver<IContent>()))
+                .ForMember(dto => dto.Updater, expression => expression.ResolveUsing(new CreatorResolver()))
+                .ForMember(dto => dto.Icon, expression => expression.MapFrom(content => content.ContentType.Icon))
+                .ForMember(dto => dto.Trashed, expression => expression.MapFrom(content => content.Trashed))
+                .ForMember(dto => dto.HasPublishedVersion, expression => expression.MapFrom(content => content.HasPublishedVersion))
+                .ForMember(dto => dto.ContentTypeAlias, expression => expression.MapFrom(content => content.ContentType.Alias))
+                .ForMember(dto => dto.Alias, expression => expression.Ignore());
 
             //FROM IContent TO ContentItemDto<IContent>
             config.CreateMap<IContent, ContentItemDto<IContent>>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IContent>()))
-                .ForMember(
-                    dto => dto.HasPublishedVersion,
-                    expression => expression.MapFrom(content => content.HasPublishedVersion))
-                .ForMember(display => display.Updater, expression => expression.Ignore())
-                .ForMember(display => display.Icon, expression => expression.Ignore())
-                .ForMember(display => display.Alias, expression => expression.Ignore());
-
-
+                .ForMember(dto => dto.Owner, expression => expression.ResolveUsing(new OwnerResolver<IContent>()))
+                .ForMember(dto => dto.HasPublishedVersion, expression => expression.MapFrom(content => content.HasPublishedVersion))
+                .ForMember(dto => dto.Updater, expression => expression.Ignore())
+                .ForMember(dto => dto.Icon, expression => expression.Ignore())
+                .ForMember(dto => dto.Alias, expression => expression.Ignore());
         }
 
-
         /// <summary>
         /// Maps the generic tab with custom properties for content
         /// </summary>
@@ -123,7 +83,7 @@ namespace Umbraco.Web.Models.Mapping
         /// <param name="dataTypeService"></param>
         /// <param name="localizedText"></param>
         /// <param name="contentTypeService"></param>
-        private static void AfterMap(IContent content, ContentItemDisplay display, IDataTypeService dataTypeService, 
+        private static void AfterMap(IContent content, ContentItemDisplay display, IDataTypeService dataTypeService,
             ILocalizedTextService localizedText, IContentTypeService contentTypeService)
         {
             //map the IsChildOfListView (this is actually if it is a descendant of a list view!)
@@ -151,7 +111,6 @@ namespace Umbraco.Web.Models.Mapping
                     display.IsChildOfListView = ancesctorListView != null;
                 }
             }
-            
 
             //map the tree node url
             if (HttpContext.Current != null)
@@ -160,9 +119,9 @@ namespace Umbraco.Web.Models.Mapping
                 var url = urlHelper.GetUmbracoApiService<ContentTreeController>(controller => controller.GetTreeNode(display.Id.ToString(), null));
                 display.TreeNodeUrl = url;
             }
-            
+
             //fill in the template config to be passed to the template drop down.
-            var templateItemConfig = new Dictionary<string, string> { { "", "Choose..." } };
+            var templateItemConfig = new Dictionary<string, string> {{"", "Choose..."}};
             foreach (var t in content.ContentType.AllowedTemplates
                 .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false))
             {
@@ -173,7 +132,7 @@ namespace Umbraco.Web.Models.Mapping
             {
                 TabsAndPropertiesResolver.AddListView(display, "content", dataTypeService, localizedText);
             }
-            
+
             var properties = new List<ContentPropertyDisplay>
             {
                 new ContentPropertyDisplay
@@ -183,26 +142,26 @@ namespace Umbraco.Web.Models.Mapping
                     Value = localizedText.UmbracoDictionaryTranslate(display.ContentTypeName),
                     View = PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View
                 },
-                 new ContentPropertyDisplay
+                new ContentPropertyDisplay
                 {
                     Alias = string.Format("{0}releasedate", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
                     Label = localizedText.Localize("content/releaseDate"),
                     Value = display.ReleaseDate.HasValue ? display.ReleaseDate.Value.ToIsoString() : null,
                     //Not editible for people without publish permission (U4-287)
-                    View =  display.AllowedActions.Contains(ActionPublish.Instance.Letter) ? "datepicker"  : PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View,
+                    View = display.AllowedActions.Contains(ActionPublish.Instance.Letter) ? "datepicker" : PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View,
                     Config = new Dictionary<string, object>
                     {
                         {"offsetTime", "1"}
                     }
                     //TODO: Fix up hard coded datepicker
-                } ,
+                },
                 new ContentPropertyDisplay
                 {
                     Alias = string.Format("{0}expiredate", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
                     Label = localizedText.Localize("content/unpublishDate"),
                     Value = display.ExpireDate.HasValue ? display.ExpireDate.Value.ToIsoString() : null,
                     //Not editible for people without publish permission (U4-287)
-                    View = display.AllowedActions.Contains(ActionPublish.Instance.Letter) ? "datepicker"  : PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View,
+                    View = display.AllowedActions.Contains(ActionPublish.Instance.Letter) ? "datepicker" : PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View,
                     Config = new Dictionary<string, object>
                     {
                         {"offsetTime", "1"}
@@ -246,21 +205,21 @@ namespace Umbraco.Web.Models.Mapping
                         var docTypeLink = string.Format("#/settings/documenttypes/edit/{0}", currentDocumentTypeId);
 
                         //Replace the doc type property
-                        var docTypeProp = genericProperties.First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix));
-                        docTypeProp.Value = new List<object>
+                        var docTypeProperty = genericProperties.First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix));
+                        docTypeProperty.Value = new List<object>
                         {
                             new
                             {
                                 linkText = currentDocumentTypeName,
                                 url = docTypeLink,
-                                target = "_self", icon = "icon-item-arrangement"
+                                target = "_self",
+                                icon = "icon-item-arrangement"
                             }
                         };
                         //TODO: Hard coding this because the templatepicker doesn't necessarily need to be a resolvable (real) property editor
-                        docTypeProp.View = "urllist";
+                        docTypeProperty.View = "urllist";
                     }
                 });
-
         }
 
         /// <summary>
@@ -305,13 +264,13 @@ namespace Umbraco.Web.Models.Mapping
                 var svc = _userService.Value;
 
                 var permissions = svc.GetPermissions(
-                    //TODO: This is certainly not ideal usage here - perhaps the best way to deal with this in the future is
-                    // with the IUmbracoContextAccessor. In the meantime, if used outside of a web app this will throw a null
-                    // refrence exception :(
-                    UmbracoContext.Current.Security.CurrentUser,
-                    // Here we need to do a special check since this could be new content, in which case we need to get the permissions
-                    // from the parent, not the existing one otherwise permissions would be coming from the root since Id is 0.
-                    source.HasIdentity ? source.Id : source.ParentId)
+                        //TODO: This is certainly not ideal usage here - perhaps the best way to deal with this in the future is
+                        // with the IUmbracoContextAccessor. In the meantime, if used outside of a web app this will throw a null
+                        // refrence exception :(
+                        UmbracoContext.Current.Security.CurrentUser,
+                        // Here we need to do a special check since this could be new content, in which case we need to get the permissions
+                        // from the parent, not the existing one otherwise permissions would be coming from the root since Id is 0.
+                        source.HasIdentity ? source.Id : source.ParentId)
                     .FirstOrDefault();
 
                 return permissions == null
@@ -319,6 +278,5 @@ namespace Umbraco.Web.Models.Mapping
                     : permissions.AssignedPermissions.Where(x => x.Length == 1).Select(x => x.ToUpperInvariant()[0]);
             }
         }
-
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
index d13da67e1f..c3f9412401 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
 using AutoMapper;
-using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
@@ -29,22 +25,12 @@ namespace Umbraco.Web.Models.Mapping
         {
             //FROM IMedia TO MediaItemDisplay
             config.CreateMap<IMedia, MediaItemDisplay>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IMedia>()))
-                .ForMember(
-                    dto => dto.Icon,
-                    expression => expression.MapFrom(content => content.ContentType.Icon))
-                .ForMember(
-                    dto => dto.ContentTypeAlias,
-                    expression => expression.MapFrom(content => content.ContentType.Alias))
+                .ForMember(display => display.Owner, expression => expression.ResolveUsing(new OwnerResolver<IMedia>()))
+                .ForMember(display => display.Icon, expression => expression.MapFrom(content => content.ContentType.Icon))
+                .ForMember(display => display.ContentTypeAlias, expression => expression.MapFrom(content => content.ContentType.Alias))
                 .ForMember(display => display.IsChildOfListView, expression => expression.Ignore())
-                .ForMember(
-                    dto => dto.Trashed,
-                    expression => expression.MapFrom(content => content.Trashed))
-                .ForMember(
-                    dto => dto.ContentTypeName,
-                    expression => expression.MapFrom(content => content.ContentType.Name))
+                .ForMember(display => display.Trashed, expression => expression.MapFrom(content => content.Trashed))
+                .ForMember(display => display.ContentTypeName, expression => expression.MapFrom(content => content.ContentType.Name))
                 .ForMember(display => display.Properties, expression => expression.Ignore())
                 .ForMember(display => display.TreeNodeUrl, expression => expression.Ignore())
                 .ForMember(display => display.Notifications, expression => expression.Ignore())
@@ -53,39 +39,29 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(display => display.Updater, expression => expression.Ignore())
                 .ForMember(display => display.Alias, expression => expression.Ignore())
                 .ForMember(display => display.IsContainer, expression => expression.Ignore())
-                .ForMember(member => member.HasPublishedVersion, expression => expression.Ignore())
+                .ForMember(display => display.HasPublishedVersion, expression => expression.Ignore())
                 .ForMember(display => display.Tabs, expression => expression.ResolveUsing(new TabsAndPropertiesResolver(applicationContext.Services.TextService)))
                 .AfterMap((media, display) => AfterMap(media, display, applicationContext.Services.DataTypeService, applicationContext.Services.TextService, applicationContext.ProfilingLogger.Logger));
 
             //FROM IMedia TO ContentItemBasic<ContentPropertyBasic, IMedia>
             config.CreateMap<IMedia, ContentItemBasic<ContentPropertyBasic, IMedia>>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IMedia>()))
-                .ForMember(
-                    dto => dto.Icon,
-                    expression => expression.MapFrom(content => content.ContentType.Icon))
-                .ForMember(
-                    dto => dto.Trashed,
-                    expression => expression.MapFrom(content => content.Trashed))
-                .ForMember(
-                    dto => dto.ContentTypeAlias,
-                    expression => expression.MapFrom(content => content.ContentType.Alias))
-                .ForMember(x => x.Published, expression => expression.Ignore())
-                .ForMember(x => x.Updater, expression => expression.Ignore())
-                .ForMember(x => x.Alias, expression => expression.Ignore())
-                .ForMember(member => member.HasPublishedVersion, expression => expression.Ignore());
+                .ForMember(dto => dto.Owner, expression => expression.ResolveUsing(new OwnerResolver<IMedia>()))
+                .ForMember(dto => dto.Icon, expression => expression.MapFrom(content => content.ContentType.Icon))
+                .ForMember(dto => dto.Trashed, expression => expression.MapFrom(content => content.Trashed))
+                .ForMember(dto => dto.ContentTypeAlias, expression => expression.MapFrom(content => content.ContentType.Alias))
+                .ForMember(dto => dto.Published, expression => expression.Ignore())
+                .ForMember(dto => dto.Updater, expression => expression.Ignore())
+                .ForMember(dto => dto.Alias, expression => expression.Ignore())
+                .ForMember(dto => dto.HasPublishedVersion, expression => expression.Ignore());
 
             //FROM IMedia TO ContentItemDto<IMedia>
             config.CreateMap<IMedia, ContentItemDto<IMedia>>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IMedia>()))
-                .ForMember(x => x.Published, expression => expression.Ignore())
-                .ForMember(x => x.Updater, expression => expression.Ignore())
-                .ForMember(x => x.Icon, expression => expression.Ignore())
-                .ForMember(x => x.Alias, expression => expression.Ignore())
-                .ForMember(member => member.HasPublishedVersion, expression => expression.Ignore());
+                .ForMember(dto => dto.Owner, expression => expression.ResolveUsing(new OwnerResolver<IMedia>()))
+                .ForMember(dto => dto.Published, expression => expression.Ignore())
+                .ForMember(dto => dto.Updater, expression => expression.Ignore())
+                .ForMember(dto => dto.Icon, expression => expression.Ignore())
+                .ForMember(dto => dto.Alias, expression => expression.Ignore())
+                .ForMember(dto => dto.HasPublishedVersion, expression => expression.Ignore());
         }
 
         private static void AfterMap(IMedia media, MediaItemDisplay display, IDataTypeService dataTypeService, ILocalizedTextService localizedText, ILogger logger)
@@ -155,8 +131,28 @@ namespace Umbraco.Web.Models.Mapping
                 genericProperties.Add(link);
             }
 
-            TabsAndPropertiesResolver.MapGenericProperties(media, display, localizedText, genericProperties);
-        }
+            TabsAndPropertiesResolver.MapGenericProperties(media, display, localizedText, genericProperties, properties =>
+            {
+                if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
+                    && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
+                {
+                    var mediaTypeLink = string.Format("#/settings/mediatypes/edit/{0}", media.ContentTypeId);
 
+                    //Replace the doctype property
+                    var docTypeProperty = properties.First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix));
+                    docTypeProperty.Value = new List<object>
+                    {
+                        new
+                        {
+                            linkText = media.ContentType.Name,
+                            url = mediaTypeLink,
+                            target = "_self",
+                            icon = "icon-item-arrangement"
+                        }
+                    };
+                    docTypeProperty.View = "urllist";
+                }
+            });
+        }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
index 050fe3c726..edb44d36ce 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
@@ -11,7 +11,6 @@ using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
-using umbraco;
 using System.Linq;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Security;
@@ -29,10 +28,10 @@ namespace Umbraco.Web.Models.Mapping
             //FROM MembershipUser TO MediaItemDisplay - used when using a non-umbraco membership provider
             config.CreateMap<MembershipUser, MemberDisplay>()
                 .ConvertUsing(user =>
-                    {
-                        var member = Mapper.Map<MembershipUser, IMember>(user);
-                        return Mapper.Map<IMember, MemberDisplay>(member);
-                    });
+                {
+                    var member = Mapper.Map<MembershipUser, IMember>(user);
+                    return Mapper.Map<IMember, MemberDisplay>(member);
+                });
 
             //FROM MembershipUser TO IMember - used when using a non-umbraco membership provider
             config.CreateMap<MembershipUser, IMember>()
@@ -62,23 +61,13 @@ namespace Umbraco.Web.Models.Mapping
 
             //FROM IMember TO MediaItemDisplay
             config.CreateMap<IMember, MemberDisplay>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IMember>()))
-                .ForMember(
-                    dto => dto.Icon,
-                    expression => expression.MapFrom(content => content.ContentType.Icon))
-                .ForMember(
-                    dto => dto.ContentTypeAlias,
-                    expression => expression.MapFrom(content => content.ContentType.Alias))
-                .ForMember(
-                    dto => dto.ContentTypeName,
-                    expression => expression.MapFrom(content => content.ContentType.Name))
+                .ForMember(display => display.Owner, expression => expression.ResolveUsing(new OwnerResolver<IMember>()))
+                .ForMember(display => display.Icon, expression => expression.MapFrom(content => content.ContentType.Icon))
+                .ForMember(display => display.ContentTypeAlias, expression => expression.MapFrom(content => content.ContentType.Alias))
+                .ForMember(display => display.ContentTypeName, expression => expression.MapFrom(content => content.ContentType.Name))
                 .ForMember(display => display.Properties, expression => expression.Ignore())
-                .ForMember(display => display.Tabs,
-                    expression => expression.ResolveUsing(new MemberTabsAndPropertiesResolver(applicationContext.Services.TextService)))
-                .ForMember(display => display.MemberProviderFieldMapping,
-                    expression => expression.ResolveUsing(new MemberProviderFieldMappingResolver()))
+                .ForMember(display => display.Tabs, expression => expression.ResolveUsing(new MemberTabsAndPropertiesResolver(applicationContext.Services.TextService)))
+                .ForMember(display => display.MemberProviderFieldMapping, expression => expression.ResolveUsing(new MemberProviderFieldMappingResolver()))
                 .ForMember(display => display.MembershipScenario,
                     expression => expression.ResolveUsing(new MembershipScenarioMappingResolver(new Lazy<IMemberTypeService>(() => applicationContext.Services.MemberTypeService))))
                 .ForMember(display => display.Notifications, expression => expression.Ignore())
@@ -90,31 +79,21 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(display => display.Trashed, expression => expression.Ignore())
                 .ForMember(display => display.IsContainer, expression => expression.Ignore())
                 .ForMember(display => display.TreeNodeUrl, expression => expression.Ignore())
-                .ForMember(member => member.HasPublishedVersion, expression => expression.Ignore())
+                .ForMember(display => display.HasPublishedVersion, expression => expression.Ignore())
                 .AfterMap((member, display) => MapGenericCustomProperties(applicationContext.Services.MemberService, member, display, applicationContext.Services.TextService));
 
             //FROM IMember TO MemberBasic
             config.CreateMap<IMember, MemberBasic>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IMember>()))
-                .ForMember(
-                    dto => dto.Icon,
-                    expression => expression.MapFrom(content => content.ContentType.Icon))
-                .ForMember(
-                    dto => dto.ContentTypeAlias,
-                    expression => expression.MapFrom(content => content.ContentType.Alias))
-                .ForMember(
-                    dto => dto.Email,
-                    expression => expression.MapFrom(content => content.Email))
-                .ForMember(
-                    dto => dto.Username,
-                    expression => expression.MapFrom(content => content.Username))
-                .ForMember(display => display.Trashed, expression => expression.Ignore())
-                .ForMember(x => x.Published, expression => expression.Ignore())
-                .ForMember(x => x.Updater, expression => expression.Ignore())
-                .ForMember(x => x.Alias, expression => expression.Ignore())
-                .ForMember(member => member.HasPublishedVersion, expression => expression.Ignore());
+                .ForMember(dto => dto.Owner, expression => expression.ResolveUsing(new OwnerResolver<IMember>()))
+                .ForMember(dto => dto.Icon, expression => expression.MapFrom(content => content.ContentType.Icon))
+                .ForMember(dto => dto.ContentTypeAlias, expression => expression.MapFrom(content => content.ContentType.Alias))
+                .ForMember(dto => dto.Email, expression => expression.MapFrom(content => content.Email))
+                .ForMember(dto => dto.Username, expression => expression.MapFrom(content => content.Username))
+                .ForMember(dto => dto.Trashed, expression => expression.Ignore())
+                .ForMember(dto => dto.Published, expression => expression.Ignore())
+                .ForMember(dto => dto.Updater, expression => expression.Ignore())
+                .ForMember(dto => dto.Alias, expression => expression.Ignore())
+                .ForMember(dto => dto.HasPublishedVersion, expression => expression.Ignore());
 
             //FROM MembershipUser TO MemberBasic
             config.CreateMap<MembershipUser, MemberBasic>()
@@ -123,41 +102,31 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(member => member.CreateDate, expression => expression.MapFrom(user => user.CreationDate))
                 .ForMember(member => member.UpdateDate, expression => expression.MapFrom(user => user.LastActivityDate))
                 .ForMember(member => member.Key, expression => expression.MapFrom(user => user.ProviderUserKey.TryConvertTo<Guid>().Result.ToString("N")))
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.UseValue(new UserBasic {Name = "Admin", UserId = 0}))
-                .ForMember(
-                    dto => dto.Icon,
-                    expression => expression.UseValue("icon-user"))
+                .ForMember(member => member.Owner, expression => expression.UseValue(new UserBasic {Name = "Admin", UserId = 0}))
+                .ForMember(member => member.Icon, expression => expression.UseValue("icon-user"))
                 .ForMember(member => member.Name, expression => expression.MapFrom(user => user.UserName))
-                .ForMember(
-                    dto => dto.Email,
-                    expression => expression.MapFrom(content => content.Email))
-                .ForMember(
-                    dto => dto.Username,
-                    expression => expression.MapFrom(content => content.UserName))
+                .ForMember(member => member.Email, expression => expression.MapFrom(content => content.Email))
+                .ForMember(member => member.Username, expression => expression.MapFrom(content => content.UserName))
                 .ForMember(member => member.Properties, expression => expression.Ignore())
                 .ForMember(member => member.ParentId, expression => expression.Ignore())
                 .ForMember(member => member.Path, expression => expression.Ignore())
                 .ForMember(member => member.SortOrder, expression => expression.Ignore())
                 .ForMember(member => member.AdditionalData, expression => expression.Ignore())
-                .ForMember(x => x.Published, expression => expression.Ignore())
-                .ForMember(x => x.Updater, expression => expression.Ignore())
-                .ForMember(dto => dto.Trashed, expression => expression.Ignore())
-                .ForMember(x => x.Alias, expression => expression.Ignore())
-                .ForMember(x => x.ContentTypeAlias, expression => expression.Ignore())
+                .ForMember(member => member.Published, expression => expression.Ignore())
+                .ForMember(member => member.Updater, expression => expression.Ignore())
+                .ForMember(member => member.Trashed, expression => expression.Ignore())
+                .ForMember(member => member.Alias, expression => expression.Ignore())
+                .ForMember(member => member.ContentTypeAlias, expression => expression.Ignore())
                 .ForMember(member => member.HasPublishedVersion, expression => expression.Ignore());
 
             //FROM IMember TO ContentItemDto<IMember>
             config.CreateMap<IMember, ContentItemDto<IMember>>()
-                .ForMember(
-                    dto => dto.Owner,
-                    expression => expression.ResolveUsing(new OwnerResolver<IMember>()))
-                .ForMember(x => x.Published, expression => expression.Ignore())
-                .ForMember(x => x.Updater, expression => expression.Ignore())
-                .ForMember(x => x.Icon, expression => expression.Ignore())
-                .ForMember(x => x.Alias, expression => expression.Ignore())
-                .ForMember(member => member.HasPublishedVersion, expression => expression.Ignore())
+                .ForMember(dto => dto.Owner, expression => expression.ResolveUsing(new OwnerResolver<IMember>()))
+                .ForMember(dto => dto.Published, expression => expression.Ignore())
+                .ForMember(dto => dto.Updater, expression => expression.Ignore())
+                .ForMember(dto => dto.Icon, expression => expression.Ignore())
+                .ForMember(dto => dto.Alias, expression => expression.Ignore())
+                .ForMember(dto => dto.HasPublishedVersion, expression => expression.Ignore())
                 //do no map the custom member properties (currently anyways, they were never there in 6.x)
                 .ForMember(dto => dto.Properties, expression => expression.ResolveUsing(new MemberDtoPropertiesValueResolver()));
         }
@@ -232,8 +201,28 @@ namespace Umbraco.Web.Models.Mapping
                 }
             };
 
+            TabsAndPropertiesResolver.MapGenericProperties(member, display, localizedText, genericProperties, properties =>
+            {
+                if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
+                    && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
+                {
+                    var memberTypeLink = string.Format("#/member/memberTypes/edit/{0}", member.ContentTypeId);
 
-            TabsAndPropertiesResolver.MapGenericProperties(member, display, localizedText, genericProperties);
+                    //Replace the doctype property
+                    var docTypeProperty = properties.First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix));
+                    docTypeProperty.Value = new List<object>
+                    {
+                        new
+                        {
+                            linkText = member.ContentType.Name,
+                            url = memberTypeLink,
+                            target = "_self",
+                            icon = "icon-item-arrangement"
+                        }
+                    };
+                    docTypeProperty.View = "urllist";
+                }
+            });
 
             //check if there's an approval field
             var provider = membersProvider as global::umbraco.providers.members.UmbracoMembershipProvider;
@@ -246,7 +235,6 @@ namespace Umbraco.Web.Models.Mapping
                     prop.Value = 1;
                 }
             }
-
         }
 
         /// <summary>
@@ -255,6 +243,7 @@ namespace Umbraco.Web.Models.Mapping
         /// <param name="memberService"></param>
         /// <param name="member"></param>
         /// <param name="display"></param>
+        /// <param name="localizedText"></param>
         /// <returns></returns>
         /// <remarks>
         /// If the membership provider installed is the umbraco membership provider, then we will allow changing the username, however if
@@ -264,11 +253,11 @@ namespace Umbraco.Web.Models.Mapping
         internal static ContentPropertyDisplay GetLoginProperty(IMemberService memberService, IMember member, MemberDisplay display, ILocalizedTextService localizedText)
         {
             var prop = new ContentPropertyDisplay
-                {
-                    Alias = string.Format("{0}login", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
-                    Label = localizedText.Localize("login"),
-                    Value = display.Username
-                };
+            {
+                Alias = string.Format("{0}login", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
+                Label = localizedText.Localize("login"),
+                Value = display.Username
+            };
 
             var scenario = memberService.GetMembershipScenario();
 
@@ -321,8 +310,8 @@ namespace Umbraco.Web.Models.Mapping
                 var exclude = defaultProps.Select(x => x.Value.Alias).ToArray();
 
                 return source.Properties
-                             .Where(x => exclude.Contains(x.Alias) == false)
-                             .Select(Mapper.Map<Property, ContentPropertyDto>);
+                    .Where(x => exclude.Contains(x.Alias) == false)
+                    .Select(Mapper.Map<Property, ContentPropertyDto>);
             }
         }
 
@@ -375,7 +364,7 @@ namespace Umbraco.Web.Models.Mapping
                 }
                 else
                 {
-                    var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)provider;
+                    var umbracoProvider = (IUmbracoMemberTypeMembershipProvider) provider;
 
                     //This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier
                     // if we just had all of the membeship provider fields on the member table :(
@@ -389,8 +378,6 @@ namespace Umbraco.Web.Models.Mapping
 
                     return result;
                 }
-
-
             }
         }
 
@@ -413,8 +400,8 @@ namespace Umbraco.Web.Models.Mapping
                 }
                 var memberType = _memberTypeService.Value.Get(Constants.Conventions.MemberTypes.DefaultAlias);
                 return memberType != null
-                           ? MembershipScenario.CustomProviderWithUmbracoLink
-                           : MembershipScenario.StandaloneCustomProvider;
+                    ? MembershipScenario.CustomProviderWithUmbracoLink
+                    : MembershipScenario.StandaloneCustomProvider;
             }
         }
 
@@ -438,7 +425,7 @@ namespace Umbraco.Web.Models.Mapping
                 }
                 else
                 {
-                    var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)provider;
+                    var umbracoProvider = (IUmbracoMemberTypeMembershipProvider) provider;
 
                     return new Dictionary<string, string>
                     {
@@ -447,10 +434,7 @@ namespace Umbraco.Web.Models.Mapping
                         {Constants.Conventions.Member.Comments, umbracoProvider.CommentPropertyTypeAlias}
                     };
                 }
-
-
             }
         }
-
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
index 41f4ae232a..1d142158e3 100644
--- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
+++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
@@ -254,7 +254,7 @@ namespace Umbraco.Web.Trees
                     return Attempt.Succeed(
                         new LegacyUrlAction(
                             "dialogs/republish.aspx?rnd=" + DateTime.UtcNow.Ticks,
-                            "Republishing entire site"));
+                            ui.GetText("actions", "republish")));
                 case "UmbClientMgr.appActions().actionAssignDomain()":
                     return Attempt.Succeed(
                         new LegacyUrlAction(
@@ -415,4 +415,4 @@ namespace Umbraco.Web.Trees
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs
index 1634fd370f..3808547db1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs
@@ -34,7 +34,7 @@ namespace umbraco.dialogs
         protected void Page_Load(object sender, EventArgs e)
         {
             Button1.Text = ui.Text("update");
-            pane_form.Text = "Set permissions for the page " + _node.Text;
+            pane_form.Text = ui.Text("actions", "SetPermissionsForThePage",_node.Text); 
         }
 
         override protected void OnInit(EventArgs e)
diff --git a/src/UmbracoExamine/UmbracoContentIndexer.cs b/src/UmbracoExamine/UmbracoContentIndexer.cs
index 4fcf51deae..301491c975 100644
--- a/src/UmbracoExamine/UmbracoContentIndexer.cs
+++ b/src/UmbracoExamine/UmbracoContentIndexer.cs
@@ -1,20 +1,12 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
-using System.Security;
-using System.Text;
-using System.Web;
 using System.Xml.Linq;
 using Examine;
-using Examine.Config;
-using Examine.Providers;
 using Lucene.Net.Documents;
-using Lucene.Net.Index;
 using Umbraco.Core;
-using umbraco.cms.businesslogic;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Services;
@@ -22,12 +14,9 @@ using UmbracoExamine.DataServices;
 using Examine.LuceneEngine;
 using Examine.LuceneEngine.Config;
 using UmbracoExamine.Config;
-using Examine.LuceneEngine.Providers;
 using Lucene.Net.Analysis;
-using umbraco.BasePages;
 using Umbraco.Core.Persistence.Querying;
 using IContentService = Umbraco.Core.Services.IContentService;
-using UmbracoExamine.LocalStorage;
 using IMediaService = Umbraco.Core.Services.IMediaService;
 
 
@@ -42,6 +31,7 @@ namespace UmbracoExamine
         private readonly IMediaService _mediaService;
         private readonly IDataTypeService _dataTypeService;
         private readonly IUserService _userService;
+        private readonly IContentTypeService _contentTypeService;
 
         #region Constructors
 
@@ -55,6 +45,7 @@ namespace UmbracoExamine
             _mediaService = ApplicationContext.Current.Services.MediaService;
             _dataTypeService = ApplicationContext.Current.Services.DataTypeService;
             _userService = ApplicationContext.Current.Services.UserService;
+            _contentTypeService = ApplicationContext.Current.Services.ContentTypeService;
         }
 
         /// <summary>
@@ -73,6 +64,7 @@ namespace UmbracoExamine
             _mediaService = ApplicationContext.Current.Services.MediaService;
             _dataTypeService = ApplicationContext.Current.Services.DataTypeService;
             _userService = ApplicationContext.Current.Services.UserService;
+            _contentTypeService = ApplicationContext.Current.Services.ContentTypeService;
         }
 
         /// <summary>
@@ -91,6 +83,7 @@ namespace UmbracoExamine
             _mediaService = ApplicationContext.Current.Services.MediaService;
             _dataTypeService = ApplicationContext.Current.Services.DataTypeService;
             _userService = ApplicationContext.Current.Services.UserService;
+            _contentTypeService = ApplicationContext.Current.Services.ContentTypeService;
         }
 
         /// <summary>
@@ -105,6 +98,7 @@ namespace UmbracoExamine
         /// <param name="userService"></param>
         /// <param name="analyzer"></param>
         /// <param name="async"></param>
+        [Obsolete("Use the overload that specifies the Umbraco services")]
         public UmbracoContentIndexer(IIndexCriteria indexerData, Lucene.Net.Store.Directory luceneDirectory, IDataService dataService, 
             IContentService contentService, 
             IMediaService mediaService,
@@ -117,13 +111,43 @@ namespace UmbracoExamine
             _mediaService = mediaService;
             _dataTypeService = dataTypeService;
             _userService = userService;
+            _contentTypeService = ApplicationContext.Current.Services.ContentTypeService;
+        }
+
+        /// <summary>
+        /// Constructor to allow for creating an indexer at runtime
+        /// </summary>
+        /// <param name="indexerData"></param>
+        /// <param name="luceneDirectory"></param>
+        /// <param name="dataService"></param>
+        /// <param name="contentService"></param>
+        /// <param name="mediaService"></param>
+        /// <param name="dataTypeService"></param>
+        /// <param name="userService"></param>
+        /// <param name="contentTypeService"></param>
+        /// <param name="analyzer"></param>
+        /// <param name="async"></param>
+        public UmbracoContentIndexer(IIndexCriteria indexerData, Lucene.Net.Store.Directory luceneDirectory, IDataService dataService,
+            IContentService contentService,
+            IMediaService mediaService,
+            IDataTypeService dataTypeService,
+            IUserService userService,
+            IContentTypeService contentTypeService,
+            Analyzer analyzer, bool async)
+            : base(indexerData, luceneDirectory, dataService, analyzer, async)
+        {
+            _contentService = contentService;
+            _mediaService = mediaService;
+            _dataTypeService = dataTypeService;
+            _userService = userService;
+            _contentTypeService = contentTypeService;
         }
 
         #endregion
 
         #region Constants & Fields
 
-        
+
 
         /// <summary>
         /// Used to store the path of a content object
@@ -206,13 +230,8 @@ namespace UmbracoExamine
                 SupportProtectedContent = supportProtected;
             else
                 SupportProtectedContent = false;
-
-
+            
             base.Initialize(name, config);
-
-            
-
-            
         }
 
         #endregion
@@ -285,10 +304,7 @@ namespace UmbracoExamine
         #endregion
 
         #region Public methods
-
         
-
-
         /// <summary>
         /// Overridden for logging
         /// </summary>
@@ -308,7 +324,6 @@ namespace UmbracoExamine
             {
                 DataService.LogService.AddErrorLog(-1, string.Format("ReIndexNode cannot proceed, the format of the XElement is invalid, the xml has no 'id' attribute. {0}", node));
             }
-
         }
 
         /// <summary>
@@ -355,8 +370,6 @@ namespace UmbracoExamine
             switch (type)
             {
                 case IndexTypes.Content:
-
-
                     var contentParentId = -1;
                     if (IndexerData.ParentNodeId.HasValue && IndexerData.ParentNodeId.Value > 0)
                     {
@@ -391,69 +404,62 @@ namespace UmbracoExamine
                         {
                             content = descendants.ToArray();
                         }
-
                         AddNodesToIndex(GetSerializedContent(content), type);
                         pageIndex++;
-
-
                     } while (content.Length == pageSize);
 
                     break;
                 case IndexTypes.Media:
-
                     var mediaParentId = -1;
+
                     if (IndexerData.ParentNodeId.HasValue && IndexerData.ParentNodeId.Value > 0)
                     {
                         mediaParentId = IndexerData.ParentNodeId.Value;
                     }
-                    IMedia[] media;
                     
+                    XElement[] mediaXElements;
+                    
+                    var mediaTypes = _contentTypeService.GetAllMediaTypes().ToArray();
+                    var icons = mediaTypes.ToDictionary(x => x.Id, y => y.Icon);
+
                     do
                     {
                         long total;
-                        var descendants = _mediaService.GetPagedDescendants(mediaParentId, pageIndex, pageSize, out total);
+                        if (mediaParentId == -1)
+                        {
+                            mediaXElements = _mediaService.GetPagedXmlEntries("-1", pageIndex, pageSize, out total).ToArray();
+                        }
+                        else
+                        {
+                            //Get the parent
+                            var parent = _mediaService.GetById(mediaParentId);
+                            if (parent == null)
+                                mediaXElements = new XElement[0];
+                            else
+                                mediaXElements = _mediaService.GetPagedXmlEntries(parent.Path, pageIndex, pageSize, out total).ToArray();
+                        }
 
                         //if specific types are declared we need to post filter them
                         //TODO: Update the service layer to join the cmsContentType table so we can query by content type too
                         if (IndexerData.IncludeNodeTypes.Any())
                         {
-                            media = descendants.Where(x => IndexerData.IncludeNodeTypes.Contains(x.ContentType.Alias)).ToArray();
-                        }
-                        else
-                        {
-                            media = descendants.ToArray();
+                            var includeNodeTypeIds = mediaTypes.Where(x => IndexerData.IncludeNodeTypes.Contains(x.Alias)).Select(x => x.Id);
+                            mediaXElements = mediaXElements.Where(elm => includeNodeTypeIds.Contains(elm.AttributeValue<int>("nodeType"))).ToArray();
                         }
                         
-                        AddNodesToIndex(GetSerializedMedia(media), type);
+                        foreach (var element in mediaXElements)
+                        {
+                            element.Add(new XAttribute("icon", icons[element.AttributeValue<int>("nodeType")]));
+                        }
+
+                        AddNodesToIndex(mediaXElements, type);
                         pageIndex++;
-                    } while (media.Length == pageSize);
+                    } while (mediaXElements.Length == pageSize);
 
                     break;
             }
         }
 
-        private IEnumerable<XElement> GetSerializedMedia(IEnumerable<IMedia> media)
-        {
-            var serializer = new EntityXmlSerializer();
-            foreach (var m in media)
-            {
-                var xml = serializer.Serialize(
-                    _mediaService,
-                    _dataTypeService,
-                    _userService,
-                    m);
-
-                //add a custom 'icon' attribute
-                if (m.ContentType.Icon.IsNullOrWhiteSpace() == false)
-                {
-                    xml.Add(new XAttribute("icon", m.ContentType.Icon));    
-                }
-                
-
-                yield return xml;
-            }
-        }
-
         private IEnumerable<XElement> GetSerializedContent(IEnumerable<IContent> content)
         {
             var serializer = new EntityXmlSerializer();
@@ -510,7 +516,6 @@ namespace UmbracoExamine
 
         protected override void OnGatheringNodeData(IndexingNodeDataEventArgs e)
         {
-
             //strip html of all users fields if we detect it has HTML in it. 
             //if that is the case, we'll create a duplicate 'raw' copy of it so that we can return
             //the value of the field 'as-is'.
@@ -546,7 +551,6 @@ namespace UmbracoExamine
             var icon = (string)e.Node.Attribute("icon");
             if (!e.Fields.ContainsKey(IconFieldName))
                 e.Fields.Add(IconFieldName, icon);  
-            
         }
 
         /// <summary>
@@ -584,7 +588,6 @@ namespace UmbracoExamine
             }
 
             return fields;
-
         }
 
         /// <summary>
@@ -605,7 +608,6 @@ namespace UmbracoExamine
             {
                 return base.GetIndexerData(indexSet);
             }
-
         }
 
         /// <summary>
@@ -635,10 +637,9 @@ namespace UmbracoExamine
             {
                 return false;
             }
-
             return base.ValidateDocument(node);
         }
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index bc1c062631..1f17da3922 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -396,7 +396,7 @@ namespace umbraco.cms.businesslogic.packager
                     if (languageItemsElement != null)
                     {
                         var insertedLanguages = packagingService.ImportLanguages(languageItemsElement);
-                        insPack.Data.Languages.AddRange(insertedLanguages.Select(l => l.Id.ToString()));
+                        insPack.Data.Languages.AddRange(insertedLanguages.Select(l => l.Id.ToString(CultureInfo.InvariantCulture)));
                     }
 
                     #endregion
@@ -406,24 +406,17 @@ namespace umbraco.cms.businesslogic.packager
                     if (dictionaryItemsElement != null)
                     {
                         var insertedDictionaryItems = packagingService.ImportDictionaryItems(dictionaryItemsElement);
-                        insPack.Data.DictionaryItems.AddRange(insertedDictionaryItems.Select(d => d.Id.ToString()));
+                        insPack.Data.DictionaryItems.AddRange(insertedDictionaryItems.Select(d => d.Id.ToString(CultureInfo.InvariantCulture)));
                     }
                     #endregion
 
                     #region Macros
-                    foreach (XmlNode n in Config.DocumentElement.SelectNodes("//macro"))
+                    var macroItemsElement = rootElement.Descendants("Macros").FirstOrDefault();
+                    if (macroItemsElement != null)
                     {
-                        //TODO: Fix this, this should not use the legacy API
-                        Macro m = Macro.Import(n);
-
-                        if (m != null)
-                        {
-                            insPack.Data.Macros.Add(m.Id.ToString(CultureInfo.InvariantCulture));
-                            //saveNeeded = true;
-                        }
+                        var insertedMacros = packagingService.ImportMacros(macroItemsElement);
+                        insPack.Data.Macros.AddRange(insertedMacros.Select(m => m.Id.ToString(CultureInfo.InvariantCulture)));
                     }
-
-                    //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
                     #endregion
 
                     #region Templates
@@ -461,7 +454,7 @@ namespace umbraco.cms.businesslogic.packager
                     {
                         StyleSheet s = StyleSheet.Import(n, currentUser);
 
-                        insPack.Data.Stylesheets.Add(s.Id.ToString());
+                        insPack.Data.Stylesheets.Add(s.Id.ToString(CultureInfo.InvariantCulture));
                         //saveNeeded = true;
                     }
 
diff --git a/src/umbraco.cms/businesslogic/macro/Macro.cs b/src/umbraco.cms/businesslogic/macro/Macro.cs
index 4ff30c404f..4031f54150 100644
--- a/src/umbraco.cms/businesslogic/macro/Macro.cs
+++ b/src/umbraco.cms/businesslogic/macro/Macro.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Data;
-using System.Globalization;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
-using System.Runtime.CompilerServices;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.IO;
@@ -185,23 +182,26 @@ namespace umbraco.cms.businesslogic.macro
 	                }).ToArray();
 	        }
 	    }
-        
-		/// <summary>
-		/// Macro initializer
-		/// </summary>
-		public Macro()
+
+        /// <summary>
+        /// Macro initializer
+        /// </summary>
+        [Obsolete("This should no longer be used, use the IMacroService and related models instead")]
+        public Macro()
 		{
 		}
 
-		/// <summary>
-		/// Macro initializer
-		/// </summary>
-		/// <param name="Id">The id of the macro</param>
-		public Macro(int Id)
+        /// <summary>
+        /// Macro initializer
+        /// </summary>
+        /// <param name="Id">The id of the macro</param>
+        [Obsolete("This should no longer be used, use the IMacroService and related models instead")]
+        public Macro(int Id)
 		{
             Setup(Id);
 		}
 
+        [Obsolete("This should no longer be used, use the IMacroService and related models instead")]
         internal Macro(IMacro macro)
         {
             MacroEntity = macro;
@@ -211,15 +211,17 @@ namespace umbraco.cms.businesslogic.macro
         /// Initializes a new instance of the <see cref="Macro"/> class.
         /// </summary>
         /// <param name="alias">The alias.</param>
+        [Obsolete("This should no longer be used, use the IMacroService and related models instead")]
         public Macro(string alias)
         {
             Setup(alias);
         }
 
-	    /// <summary>
-	    /// Used to persist object changes to the database. In Version3.0 it's just a stub for future compatibility
-	    /// </summary>
-	    public virtual void Save()
+        /// <summary>
+        /// Used to persist object changes to the database. In Version3.0 it's just a stub for future compatibility
+        /// </summary>
+        [Obsolete("This should no longer be used, use the IMacroService and related models instead")]
+        public virtual void Save()
 	    {
 	        //event
 	        var e = new SaveEventArgs();
@@ -250,8 +252,7 @@ namespace umbraco.cms.businesslogic.macro
 		    }
 		}
 
-        //TODO: Fix this, this should wrap a new API!
-
+        [Obsolete("This is no longer used, use the IMacroService and related models instead")]
         public static Macro Import(XmlNode n)
         {
             var alias = XmlHelper.GetNodeValue(n.SelectSingleNode("alias"));