diff --git a/src/Umbraco.Core/Cache/CacheKeys.cs b/src/Umbraco.Core/Cache/CacheKeys.cs
index 7f448bba81..c370b13303 100644
--- a/src/Umbraco.Core/Cache/CacheKeys.cs
+++ b/src/Umbraco.Core/Cache/CacheKeys.cs
@@ -50,7 +50,9 @@ namespace Umbraco.Core.Cache
 
         public const string DomainCacheKey = "UmbracoDomainList";
 
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
         public const string StylesheetCacheKey = "UmbracoStylesheet";
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
         public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty";
 
         public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
diff --git a/src/Umbraco.Core/Models/StylesheetProperty.cs b/src/Umbraco.Core/Models/StylesheetProperty.cs
index 6053f75bd6..d3d9232dc6 100644
--- a/src/Umbraco.Core/Models/StylesheetProperty.cs
+++ b/src/Umbraco.Core/Models/StylesheetProperty.cs
@@ -23,5 +23,9 @@ namespace Umbraco.Core.Models
         public string Alias { get; set; }
         public string Value { get; set; }
         public bool IsPartOfAtRule { get; set; }
+
+        ////This should never be used, it's here because we still have stylesheets based on DB ids and 
+        //// we need to wrap the legacy classes
+        //internal int Id { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index b214f3969b..e0485d14ab 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 --> 
-<clientDependency version="151446521" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="331084054" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs
index 3a8b58005b..4496d78ab6 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Web;
 using System.Xml;
@@ -61,7 +62,7 @@ namespace umbraco
 
         public override void Render(ref XmlTree tree)
         {            
-            foreach (StyleSheet n in StyleSheet.GetAll())
+            foreach (StyleSheet n in StyleSheet.GetAll().Where(x => x.Id > 0))
             {
                 XmlTreeNode xNode = XmlTreeNode.Create(this);
                 xNode.NodeID = n.Id.ToString(CultureInfo.InvariantCulture);
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs
index 5a6061e5f1..a375aba8f5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs
@@ -42,7 +42,8 @@ namespace umbraco.presentation.webservices
                 string returnValue;
                 var stylesheet = new StyleSheet(fileID)
                     {
-                        Content = fileContents, Text = fileName
+                        Content = fileContents, 
+                        Text = fileName
                     };
 
                 try
diff --git a/src/umbraco.cms/businesslogic/Dictionary.cs b/src/umbraco.cms/businesslogic/Dictionary.cs
index 1652e98695..04633a2177 100644
--- a/src/umbraco.cms/businesslogic/Dictionary.cs
+++ b/src/umbraco.cms/businesslogic/Dictionary.cs
@@ -20,10 +20,6 @@ namespace umbraco.cms.businesslogic
     [Obsolete("Obsolete, Umbraco.Core.Services.ILocalizationService")]
     public class Dictionary
     {
-
-        //private static volatile bool _cacheIsEnsured = false;
-        //private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim();
-        //private static readonly ConcurrentDictionary<string, DictionaryItem> DictionaryItems = new ConcurrentDictionary<string, DictionaryItem>();
         private static readonly Guid TopLevelParent = new Guid(Constants.Conventions.Localization.DictionaryItemRootId);
 
         [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database")]
@@ -32,48 +28,6 @@ namespace umbraco.cms.businesslogic
             get { return Application.SqlHelper; }
         }
         
-        ///// <summary>
-        ///// Reads all items from the database and stores in local cache
-        ///// </summary>
-        //private static void EnsureCache()
-        //{
-        //    using (var lck = new UpgradeableReadLock(Locker))
-        //    {
-        //        if (_cacheIsEnsured) return;
-
-        //        lck.UpgradeToWriteLock();
-
-        //        using (var dr = SqlHelper.ExecuteReader("Select pk, id, [key], parent from cmsDictionary"))
-        //        {
-        //            while (dr.Read())
-        //            {
-        //                //create new dictionaryitem object and put in cache
-        //                var item = new DictionaryItem(dr.GetInt("pk"),
-        //                                              dr.GetString("key"),
-        //                                              dr.GetGuid("id"),
-        //                                              dr.GetGuid("parent"));
-
-        //                DictionaryItems.TryAdd(item.key, item);
-        //            }
-        //        }
-
-        //        _cacheIsEnsured = true;
-        //    }
-        //}
-
-        ///// <summary>
-        ///// Used by the cache refreshers to clear the cache on distributed servers
-        ///// </summary>
-        //internal static void ClearCache()
-        //{
-        //    using (new WriteLock(Locker))
-        //    {
-        //        DictionaryItems.Clear();
-        //        //ensure the flag is reset so that EnsureCache will re-cache everything
-        //        _cacheIsEnsured = false;
-        //    }
-        //}
-
         /// <summary>
         /// Retrieve a list of toplevel DictionaryItems
         /// </summary>
@@ -84,12 +38,6 @@ namespace umbraco.cms.businesslogic
                 return ApplicationContext.Current.Services.LocalizationService.GetRootDictionaryItems()
                     .Select(x => new DictionaryItem(x))
                     .ToArray();
-
-                //EnsureCache();
-
-                //return DictionaryItems.Values
-                //    .Where(x => x.ParentId == TopLevelParent).OrderBy(item => item.key)
-                //    .ToArray();
             }
         }
 
diff --git a/src/umbraco.cms/businesslogic/language/Language.cs b/src/umbraco.cms/businesslogic/language/Language.cs
index 5e2e3ebeed..c00fbbc85b 100644
--- a/src/umbraco.cms/businesslogic/language/Language.cs
+++ b/src/umbraco.cms/businesslogic/language/Language.cs
@@ -80,7 +80,10 @@ namespace umbraco.cms.businesslogic.language
             if (culture != null)
             {
                 //insert it
-                var lang = new Umbraco.Core.Models.Language(cultureCode);
+                var lang = new Umbraco.Core.Models.Language(cultureCode)
+                {
+                    CultureName = culture.DisplayName
+                };
                 ApplicationContext.Current.Services.LocalizationService.Save(lang);
                 var ct = new Language { _lang = lang };
                 ct.OnNew(new NewEventArgs());
diff --git a/src/umbraco.cms/businesslogic/template/Template.cs b/src/umbraco.cms/businesslogic/template/Template.cs
index 815626d193..d2c8ae0d0d 100644
--- a/src/umbraco.cms/businesslogic/template/Template.cs
+++ b/src/umbraco.cms/businesslogic/template/Template.cs
@@ -31,25 +31,15 @@ namespace umbraco.cms.businesslogic.template
 
         private readonly ViewHelper _viewHelper = new ViewHelper(new PhysicalFileSystem(SystemDirectories.MvcViews));
         private readonly MasterPageHelper _masterPageHelper = new MasterPageHelper(new PhysicalFileSystem(SystemDirectories.Masterpages));
-        internal ITemplate TemplateEntity;
-        //private string _OutputContentType;
-        //private string _design;
-        //private string _alias;
-        //private string _oldAlias;
+        internal ITemplate TemplateEntity;        
         private int? _mastertemplate;
-        //private bool _hasChildrenInitialized = false;
-        //private bool _hasChildren;
-
+        
         #endregion
 
         #region Static members
 
         public static readonly string UmbracoMasterTemplate = SystemDirectories.Umbraco + "/masterpages/default.master";
-        private static Hashtable _templateAliases = new Hashtable();
-        //private static volatile bool _templateAliasesInitialized = false;
-        //private static readonly object TemplateLoaderLocker = new object();
-        //private static readonly Guid ObjectType = new Guid(Constants.ObjectTypes.Template);
-        //private static readonly char[] NewLineChars = Environment.NewLine.ToCharArray();
+        private static Hashtable _templateAliases = new Hashtable();      
 
         #endregion
 
@@ -88,7 +78,7 @@ namespace umbraco.cms.businesslogic.template
         #region Constructors
 
         internal Template(ITemplate template)
-            : base(template.Id, true)
+            : base(template)
         {
             TemplateEntity = template;
         }
diff --git a/src/umbraco.cms/businesslogic/web/StyleSheet.cs b/src/umbraco.cms/businesslogic/web/StyleSheet.cs
index 293dc32eaa..9c0f0dd868 100644
--- a/src/umbraco.cms/businesslogic/web/StyleSheet.cs
+++ b/src/umbraco.cms/businesslogic/web/StyleSheet.cs
@@ -4,46 +4,53 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml;
+using umbraco.BusinessLogic.console;
 using Umbraco.Core.Cache;
 using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.cache;
+using Umbraco.Core.Models;
 using umbraco.DataLayer;
 using Umbraco.Core;
+using File = System.IO.File;
 
 namespace umbraco.cms.businesslogic.web
 {
     /// <summary>
     /// Summary description for StyleSheet.
     /// </summary>
+    [Obsolete("Use Umbraco.Core.Services.IFileService instead")]
     public class StyleSheet : CMSNode
     {
+        private Stylesheet _stylesheetItem;
 
-        private string _filename = "";
-        private string _content = "";
-        private StylesheetProperty[] _properties;
+        //private string _filename = "";
+        //private string _content = "";
+        //private StylesheetProperty[] _properties;
         public static Guid ModuleObjectType = new Guid(Constants.ObjectTypes.Stylesheet);
 
         public string Filename
         {
-            get { return _filename; }
+            get { return System.IO.Path.GetFileNameWithoutExtension(_stylesheetItem.Path); }
             set
             {
+                //NOTE: This has zero affect
 
-                //move old file
-                _filename = value;
-                SqlHelper.ExecuteNonQuery(string.Format("update cmsStylesheet set filename = '{0}' where nodeId = {1}", _filename, Id));
-                InvalidateCache();
+                ////move old file
+                //_filename = value;
+                //SqlHelper.ExecuteNonQuery(string.Format("update cmsStylesheet set filename = '{0}' where nodeId = {1}", _filename, Id));
+                //InvalidateCache();
             }
         }
 
         public string Content
         {
-            get { return _content; }
+            get { return _stylesheetItem.Content; }
             set
             {
-                _content = value;
-                SqlHelper.ExecuteNonQuery("update cmsStylesheet set content = @content where nodeId = @id", SqlHelper.CreateParameter("@content", this.Content), SqlHelper.CreateParameter("@id", this.Id));
-                InvalidateCache();
+                _stylesheetItem.Content = value;
+                //_content = value;
+                //SqlHelper.ExecuteNonQuery("update cmsStylesheet set content = @content where nodeId = @id", SqlHelper.CreateParameter("@content", this.Content), SqlHelper.CreateParameter("@id", this.Id));
+                //InvalidateCache();
             }
         }
 
@@ -51,39 +58,100 @@ namespace umbraco.cms.businesslogic.web
         {
             get
             {
-                if (_properties == null)
+                //if (_properties == null)
+                //{
+                //    var tmp = this.ChildrenOfAllObjectTypes;
+                //    var retVal = new StylesheetProperty[tmp.Length];
+                //    for (var i = 0; i < tmp.Length; i++)
+                //    {
+                //        //So this will go get cached properties but yet the above call to ChildrenOfAllObjectTypes is not cached :/
+                //        retVal[i] = StylesheetProperty.GetStyleSheetProperty(tmp[i].Id);
+                //    }
+                //    _properties = retVal;
+                //}
+                //return _properties;
+
+                var tmp = this.ChildrenOfAllObjectTypes;
+                var retVal = new StylesheetProperty[tmp.Length];
+                for (var i = 0; i < tmp.Length; i++)
                 {
-                    var tmp = this.ChildrenOfAllObjectTypes;
-                    var retVal = new StylesheetProperty[tmp.Length];
-                    for (var i = 0; i < tmp.Length; i++)
-                    {
-                        //So this will go get cached properties but yet the above call to ChildrenOfAllObjectTypes is not cached :/
-                        retVal[i] = StylesheetProperty.GetStyleSheetProperty(tmp[i].Id);
-                    }
-                    _properties = retVal;
+                    //So this will go get cached properties but yet the above call to ChildrenOfAllObjectTypes is not cached :/
+                    retVal[i] = StylesheetProperty.GetStyleSheetProperty(tmp[i].Id);
                 }
-                return _properties;
+                return retVal;
             }
         }
 
         //static bool isInitialized = false;
 
+        internal StyleSheet(Stylesheet stylesheet)
+            : base(stylesheet)
+        {
+            if (stylesheet == null) throw new ArgumentNullException("stylesheet");
+            _stylesheetItem = stylesheet;
+        }
+
         public StyleSheet(Guid id)
             : base(id)
         {
-            SetupStyleSheet(true, true);
+            //SetupStyleSheet(true, true);
         }
 
         public StyleSheet(int id)
             : base(id)
         {
-            SetupStyleSheet(true, true);
+            //SetupStyleSheet(true, true);
         }
 
+        [Obsolete("This constructors parameters: setupStyleProperties, loadContentFromFile don't do anything")]
         public StyleSheet(int id, bool setupStyleProperties, bool loadContentFromFile)
             : base(id)
         {
-            SetupStyleSheet(loadContentFromFile, setupStyleProperties);
+            //SetupStyleSheet(loadContentFromFile, setupStyleProperties);
+        }
+
+        /// <summary>
+        /// Sort order does nothing for Stylesheets
+        /// </summary>
+        [Obsolete("Sort order does nothing for Stylesheets")]
+        public override int sortOrder
+        {
+            get { return 0; }
+            set { /* do nothing; */}
+        }
+
+        /// <summary>
+        /// Sort order does nothing for Stylesheets
+        /// </summary>
+        [Obsolete("Sort order does nothing for Stylesheets")]
+        public override int Level
+        {
+            get { return 1; }
+            set { /* do nothing; */}
+        }
+
+        /// <summary>
+        /// Gets or sets the create date time.
+        /// </summary>
+        /// <value>The create date time.</value>
+        public override DateTime CreateDateTime
+        {
+            get { return _stylesheetItem.CreateDate; }
+            set { _stylesheetItem.CreateDate = value; }
+        }
+        
+        /// <summary>
+        /// Human readable name/label
+        /// </summary>
+        public override string Text
+        {
+            get { return _stylesheetItem.Name; }
+            set
+            {
+                var currFileName = System.IO.Path.GetFileName(_stylesheetItem.Path);
+                var newFilePath = _stylesheetItem.Path.TrimEnd(currFileName) + value;
+                _stylesheetItem.Path = newFilePath;
+            }
         }
 
         /// <summary>
@@ -95,100 +163,124 @@ namespace umbraco.cms.businesslogic.web
             FireBeforeSave(e);
             if (!e.Cancel)
             {
-                base.Save();
+                ApplicationContext.Current.Services.FileService.SaveStylesheet(_stylesheetItem);
+
                 FireAfterSave(e);
             }
         }
 
-        private void SetupStyleSheet(bool loadFileData, bool updateStyleProperties)
+        /// <summary>
+        /// Sets up the internal data of the CMSNode, used by the various constructors
+        /// </summary>
+        protected override void setupNode()
         {
-            // Get stylesheet data
-            using (var dr = SqlHelper.ExecuteReader("select filename, content from cmsStylesheet where nodeid = " + Id))
-            {
-                if (dr.Read())
-                {
-                    if (!dr.IsNull("filename"))
-                        _filename = dr.GetString("filename");
-                    // Get Content from db or file 
-                    if (!loadFileData)
-                    {
-                        if (!dr.IsNull("content"))
-                            _content = dr.GetString("content");
-                    }
-                    else if (File.Exists(IOHelper.MapPath(String.Format("{0}/{1}.css", SystemDirectories.Css, this.Text))))
-                    {
-                        var propertiesContent = String.Empty;
+            var found = ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<string>(
+                "SELECT TOP 1 filename FROM cmsStylesheet WHERE nodeid=" + Id);
+            if (found.IsNullOrWhiteSpace()) throw new ArgumentException(string.Format("No stylesheet exists with id '{0}'", Id));
 
-                        using (var re = File.OpenText(IOHelper.MapPath(String.Format("{0}/{1}.css", SystemDirectories.Css, this.Text))))
-                        {
-                            string input = null;
-                            _content = string.Empty;
-                            // NH: Updates the reader to support properties
-                            var readingProperties = false;
-
-                            while ((input = re.ReadLine()) != null && true)
-                            {
-                                if (input.Contains("EDITOR PROPERTIES"))
-                                {
-                                    readingProperties = true;
-                                }
-                                else
-                                    if (readingProperties)
-                                    {
-                                        propertiesContent += input.Replace("\n", "") + "\n";
-                                    }
-                                    else
-                                    {
-                                        _content += input.Replace("\n", "") + "\n";
-                                    }
-                            }
-                        }
-
-                        // update properties
-                        if (updateStyleProperties)
-                        {
-                            if (propertiesContent != String.Empty)
-                            {
-                                ParseProperties(propertiesContent);
-                            }
-                        }
-                    }
-                }
-            }
+            _stylesheetItem = ApplicationContext.Current.Services.FileService.GetStylesheetByName(found + ".css");
+            if (_stylesheetItem == null) throw new ArgumentException(string.Format("No stylesheet exists with name '{0}.css'", found));
         }
 
-        private void ParseProperties(string propertiesContent)
-        {
-            var m = Regex.Matches(propertiesContent, "([^{]*){([^}]*)}", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+        //private void SetupStyleSheet(bool loadFileData, bool updateStyleProperties)
+        //{
+        //    // Get stylesheet data
+        //    using (var dr = SqlHelper.ExecuteReader("select filename, content from cmsStylesheet where nodeid = " + Id))
+        //    {
+        //        if (dr.Read())
+        //        {
+        //            if (!dr.IsNull("filename"))
+        //                _filename = dr.GetString("filename");
+        //            // Get Content from db or file 
+        //            if (!loadFileData)
+        //            {
+        //                if (!dr.IsNull("content"))
+        //                    _content = dr.GetString("content");
+        //            }
+        //            else if (File.Exists(IOHelper.MapPath(String.Format("{0}/{1}.css", SystemDirectories.Css, this.Text))))
+        //            {
+        //                var propertiesContent = String.Empty;
 
-            foreach (Match match in m)
-            {
-                var groups = match.Groups;
-                var cssClass = groups[1].Value.Replace("\n", "").Replace("\r", "").Trim().Trim(Environment.NewLine.ToCharArray());
-                var cssCode = groups[2].Value.Trim(Environment.NewLine.ToCharArray());
-                foreach (StylesheetProperty sp in this.Properties)
-                    if (sp.Alias == cssClass && sp.value != cssCode) // check before setting to avoid invalidating cache unecessarily
-                        sp.value = cssCode;
-            }
-        }
+        //                using (var re = File.OpenText(IOHelper.MapPath(String.Format("{0}/{1}.css", SystemDirectories.Css, this.Text))))
+        //                {
+        //                    string input = null;
+        //                    _content = string.Empty;
+        //                    // NH: Updates the reader to support properties
+        //                    var readingProperties = false;
+
+        //                    while ((input = re.ReadLine()) != null && true)
+        //                    {
+        //                        if (input.Contains("EDITOR PROPERTIES"))
+        //                        {
+        //                            readingProperties = true;
+        //                        }
+        //                        else
+        //                            if (readingProperties)
+        //                            {
+        //                                propertiesContent += input.Replace("\n", "") + "\n";
+        //                            }
+        //                            else
+        //                            {
+        //                                _content += input.Replace("\n", "") + "\n";
+        //                            }
+        //                    }
+        //                }
+
+        //                // update properties
+        //                if (updateStyleProperties)
+        //                {
+        //                    if (propertiesContent != String.Empty)
+        //                    {
+        //                        ParseProperties(propertiesContent);
+        //                    }
+        //                }
+        //            }
+        //        }
+        //    }
+        //}
+
+        //private void ParseProperties(string propertiesContent)
+        //{
+        //    var m = Regex.Matches(propertiesContent, "([^{]*){([^}]*)}", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+
+        //    foreach (Match match in m)
+        //    {
+        //        var groups = match.Groups;
+        //        var cssClass = groups[1].Value.Replace("\n", "").Replace("\r", "").Trim().Trim(Environment.NewLine.ToCharArray());
+        //        var cssCode = groups[2].Value.Trim(Environment.NewLine.ToCharArray());
+        //        foreach (StylesheetProperty sp in this.Properties)
+        //            if (sp.Alias == cssClass && sp.value != cssCode) // check before setting to avoid invalidating cache unecessarily
+        //                sp.value = cssCode;
+        //    }
+        //}
 
         public static StyleSheet MakeNew(BusinessLogic.User user, string Text, string FileName, string Content)
         {
 
+            if (FileName.IsNullOrWhiteSpace())
+            {
+                FileName = Text;
+            }
+
             // validate if node ends with css, if it does we'll remove it as we append it later
             if (Text.ToLowerInvariant().EndsWith(".css"))
             {
                 Text = Text.Substring(0, Text.Length - 4);
             }
 
-            // Create the umbraco node
-            var newNode = CMSNode.MakeNew(-1, ModuleObjectType, user.Id, 1, Text, Guid.NewGuid());
+            var newSheet = new Stylesheet(FileName)
+            {
+                Content = Content
+            };
+            ApplicationContext.Current.Services.FileService.SaveStylesheet(newSheet);
 
-            // Create the stylesheet data
-            SqlHelper.ExecuteNonQuery(string.Format("insert into cmsStylesheet (nodeId, filename, content) values ('{0}','{1}',@content)", newNode.Id, FileName), SqlHelper.CreateParameter("@content", Content));
+            //// Create the umbraco node
+            //var newNode = CMSNode.MakeNew(-1, ModuleObjectType, user.Id, 1, Text, Guid.NewGuid());
 
-            // save to file to avoid file coherency issues
-            var newCss = new StyleSheet(newNode.Id, false, false);
+            //// Create the stylesheet data
+            //SqlHelper.ExecuteNonQuery(string.Format("insert into cmsStylesheet (nodeId, filename, content) values ('{0}','{1}',@content)", newNode.Id, FileName), SqlHelper.CreateParameter("@content", Content));
+
+            var newCss = new StyleSheet(newSheet);
             var e = new NewEventArgs();
             newCss.OnNew(e);
 
@@ -197,50 +289,54 @@ namespace umbraco.cms.businesslogic.web
 
         public static StyleSheet[] GetAll()
         {
+            var retval = ApplicationContext.Current.Services.FileService.GetStylesheets()
+                .OrderBy(x => x.Alias)
+                .Select(x => new StyleSheet(x))
+                .ToArray();
 
-            var dbStylesheets = new ArrayList();
+            //var dbStylesheets = new ArrayList();
 
-            var topNodeIds = CMSNode.TopMostNodeIds(ModuleObjectType);
-            //StyleSheet[] retval = new StyleSheet[topNodeIds.Length];
-            for (int i = 0; i < topNodeIds.Length; i++)
-            {
-                //retval[i] = new StyleSheet(topNodeIds[i]);
-                dbStylesheets.Add(new StyleSheet(topNodeIds[i]).Text.ToLower());
-            }
+            //var topNodeIds = CMSNode.TopMostNodeIds(ModuleObjectType);
+            ////StyleSheet[] retval = new StyleSheet[topNodeIds.Length];
+            //for (int i = 0; i < topNodeIds.Length; i++)
+            //{
+            //    //retval[i] = new StyleSheet(topNodeIds[i]);
+            //    dbStylesheets.Add(new StyleSheet(topNodeIds[i]).Text.ToLower());
+            //}
 
-            var fileStylesheets = new ArrayList();
-            var fileListing = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Css + "/"));
+            //var fileStylesheets = new ArrayList();
+            //var fileListing = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Css + "/"));
 
-            foreach (var file in fileListing.GetFiles("*.css"))
-            {
-                if (!dbStylesheets.Contains(file.Name.Replace(file.Extension, "").ToLower()))
-                {
-                    fileStylesheets.Add(file.Name.Replace(file.Extension, ""));
-                }
-            }
+            //foreach (var file in fileListing.GetFiles("*.css"))
+            //{
+            //    if (!dbStylesheets.Contains(file.Name.Replace(file.Extension, "").ToLower()))
+            //    {
+            //        fileStylesheets.Add(file.Name.Replace(file.Extension, ""));
+            //    }
+            //}
 
-            var retval = new StyleSheet[dbStylesheets.Count + fileStylesheets.Count];
-            for (int i = 0; i < topNodeIds.Length; i++)
-            {
-                retval[i] = new StyleSheet(topNodeIds[i]);
+            //var retval = new StyleSheet[dbStylesheets.Count + fileStylesheets.Count];
+            //for (int i = 0; i < topNodeIds.Length; i++)
+            //{
+            //    retval[i] = new StyleSheet(topNodeIds[i]);
 
-            }
+            //}
 
-            for (int i = 0; i < fileStylesheets.Count; i++)
-            {
+            //for (int i = 0; i < fileStylesheets.Count; i++)
+            //{
 
-                string content = string.Empty;
+            //    string content = string.Empty;
 
-                using (StreamReader re = File.OpenText(IOHelper.MapPath(string.Format("{0}/{1}.css", SystemDirectories.Css, fileStylesheets[i]))))
-                {
-                    content = re.ReadToEnd();
-                }
+            //    using (StreamReader re = File.OpenText(IOHelper.MapPath(string.Format("{0}/{1}.css", SystemDirectories.Css, fileStylesheets[i]))))
+            //    {
+            //        content = re.ReadToEnd();
+            //    }
 
-                retval[dbStylesheets.Count + i] = StyleSheet.MakeNew(new umbraco.BusinessLogic.User(0), fileStylesheets[i].ToString(), fileStylesheets[i].ToString(), content);
-            }
+            //    retval[dbStylesheets.Count + i] = StyleSheet.MakeNew(new umbraco.BusinessLogic.User(0), fileStylesheets[i].ToString(), fileStylesheets[i].ToString(), content);
+            //}
 
 
-            Array.Sort(retval, 0, retval.Length, new StyleSheetComparer());
+            //Array.Sort(retval, 0, retval.Length, new StyleSheetComparer());
 
             return retval;
         }
@@ -257,13 +353,15 @@ namespace umbraco.cms.businesslogic.web
             
             if (!e.Cancel)
             {
-                File.Delete(IOHelper.MapPath(String.Format("{0}/{1}.css", SystemDirectories.Css, this.Text)));
-                foreach (var p in Properties.Where(p => p != null))
-                {
-                    p.delete();
-                }
-                SqlHelper.ExecuteNonQuery("delete from cmsStylesheet where nodeId = @nodeId", SqlHelper.CreateParameter("@nodeId", this.Id));
-                base.delete();
+                ApplicationContext.Current.Services.FileService.DeleteStylesheet(_stylesheetItem.Path);
+
+                //File.Delete(IOHelper.MapPath(String.Format("{0}/{1}.css", SystemDirectories.Css, this.Text)));
+                //foreach (var p in Properties.Where(p => p != null))
+                //{
+                //    p.delete();
+                //}
+                //SqlHelper.ExecuteNonQuery("delete from cmsStylesheet where nodeId = @nodeId", SqlHelper.CreateParameter("@nodeId", this.Id));
+                //base.delete();
 
                 FireAfterDelete(e);
             }
@@ -272,23 +370,25 @@ namespace umbraco.cms.businesslogic.web
 
         public void saveCssToFile()
         {
-            if (this.Text.Contains('/'))
-            {
-                var dir = string.Format("{0}/{1}", IOHelper.MapPath(SystemDirectories.Css), this.Text.Substring(0, this.Text.LastIndexOf('/')));
-                if (!Directory.Exists(dir))
-                    Directory.CreateDirectory(dir);
-            }
+            ApplicationContext.Current.Services.FileService.SaveStylesheet(_stylesheetItem);
 
-            using (StreamWriter SW = File.CreateText(IOHelper.MapPath(string.Format("{0}/{1}.css", SystemDirectories.Css, this.Text))))
-            {
-                string tmpCss = this.Content ;
-                tmpCss += "/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */\n";
-                foreach (StylesheetProperty p in this.Properties)
-                {
-                    tmpCss += p + "\n";
-                }
-                SW.Write(tmpCss);
-            }
+            //if (this.Text.Contains('/'))
+            //{
+            //    var dir = string.Format("{0}/{1}", IOHelper.MapPath(SystemDirectories.Css), this.Text.Substring(0, this.Text.LastIndexOf('/')));
+            //    if (!Directory.Exists(dir))
+            //        Directory.CreateDirectory(dir);
+            //}
+
+            //using (StreamWriter SW = File.CreateText(IOHelper.MapPath(string.Format("{0}/{1}.css", SystemDirectories.Css, this.Text))))
+            //{
+            //    string tmpCss = this.Content ;
+            //    tmpCss += "/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */\n";
+            //    foreach (StylesheetProperty p in this.Properties)
+            //    {
+            //        tmpCss += p + "\n";
+            //    }
+            //    SW.Write(tmpCss);
+            //}
         }
 
         public XmlNode ToXml(XmlDocument xd)
@@ -317,128 +417,45 @@ namespace umbraco.cms.businesslogic.web
 
         public static StyleSheet GetStyleSheet(int id, bool setupStyleProperties, bool loadContentFromFile)
         {
-            return ApplicationContext.Current.ApplicationCache.GetCacheItem(
-                GetCacheKey(id),
-                TimeSpan.FromMinutes(30), () =>
-                    {
-                        try
-                        {
-                            return new StyleSheet(id, setupStyleProperties, loadContentFromFile);
-                        }
-                        catch
-                        {
-                            return null;
-                        }
-                    });
+            var found = ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<string>(
+                "SELECT TOP 1 filename FROM cmsStylesheet WHERE nodeid=" + id);
+            if (found.IsNullOrWhiteSpace()) return null;
+
+            var s = ApplicationContext.Current.Services.FileService.GetStylesheetByName(found);
+            if (s == null) return null;
+
+            return new StyleSheet(s);
+
+            //return ApplicationContext.Current.ApplicationCache.GetCacheItem(
+            //    GetCacheKey(id),
+            //    TimeSpan.FromMinutes(30), () =>
+            //        {
+            //            try
+            //            {
+            //                return new StyleSheet(id, setupStyleProperties, loadContentFromFile);
+            //            }
+            //            catch
+            //            {
+            //                return null;
+            //            }
+            //        });
         }
 
         [Obsolete("Stylesheet cache is automatically invalidated by Umbraco when a stylesheet is saved or deleted")]
         public void InvalidateCache()
-        {
-            ApplicationContext.Current.ApplicationCache.ClearCacheItem(GetCacheKey(Id));
+        {            
         }
 
-        private static string GetCacheKey(int id)
-        {
-            return CacheKeys.StylesheetCacheKey + id;
-        }
-
-        //EVENTS
-        /// <summary>
-        /// The save event handler
-        /// </summary>
-        public delegate void SaveEventHandler(StyleSheet sender, SaveEventArgs e);
-        /// <summary>
-        /// The new event handler
-        /// </summary>
-        public delegate void NewEventHandler(StyleSheet sender, NewEventArgs e);
-        /// <summary>
-        /// The delete event handler
-        /// </summary>
-        public delegate void DeleteEventHandler(StyleSheet sender, DeleteEventArgs e);
-
-
-        /// <summary>
-        /// Occurs when [before save].
-        /// </summary>
-        public static event SaveEventHandler BeforeSave;
-        /// <summary>
-        /// Raises the <see cref="E:BeforeSave"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireBeforeSave(SaveEventArgs e)
-        {
-            if (BeforeSave != null)
-                BeforeSave(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [after save].
-        /// </summary>
-        public static event SaveEventHandler AfterSave;
-        /// <summary>
-        /// Raises the <see cref="E:AfterSave"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireAfterSave(SaveEventArgs e)
-        {
-            if (AfterSave != null)
-                AfterSave(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [new].
-        /// </summary>
-        public static event NewEventHandler New;
-        /// <summary>
-        /// Raises the <see cref="E:New"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void OnNew(NewEventArgs e)
-        {
-            if (New != null)
-                New(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [before delete].
-        /// </summary>
-        public static event DeleteEventHandler BeforeDelete;
-        /// <summary>
-        /// Raises the <see cref="E:BeforeDelete"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireBeforeDelete(DeleteEventArgs e)
-        {
-            if (BeforeDelete != null)
-                BeforeDelete(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [after delete].
-        /// </summary>
-        public static event DeleteEventHandler AfterDelete;
-        /// <summary>
-        /// Raises the <see cref="E:AfterDelete"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireAfterDelete(DeleteEventArgs e)
-        {
-            if (AfterDelete != null)
-                AfterDelete(this, e);
-        }
+        //private static string GetCacheKey(int id)
+        //{
+        //    return CacheKeys.StylesheetCacheKey + id;
+        //}
 
         public static StyleSheet GetByName(string name)
         {
-            try
-            {
-                int id = SqlHelper.ExecuteScalar<int>("SELECT id FROM umbracoNode WHERE text = @text AND nodeObjectType = @objType ", SqlHelper.CreateParameter("@text", name), SqlHelper.CreateParameter("@objType", StyleSheet.ModuleObjectType));
-                return new StyleSheet(id);
-            }
-            catch
-            {
-                return null;
-            }
+            var found = ApplicationContext.Current.Services.FileService.GetStylesheetByName(name.EndsWith(".css") ? name : name + ".css");
+            if (found == null) return null;
+            return new StyleSheet(found);
         }
 
         public static StyleSheet Import(XmlNode n, umbraco.BusinessLogic.User u)
@@ -477,9 +494,97 @@ namespace umbraco.cms.businesslogic.web
 
             return s;
         }
+
+
+        //EVENTS
+        /// <summary>
+        /// The save event handler
+        /// </summary>
+        public delegate void SaveEventHandler(StyleSheet sender, SaveEventArgs e);
+        /// <summary>
+        /// The new event handler
+        /// </summary>
+        public delegate void NewEventHandler(StyleSheet sender, NewEventArgs e);
+        /// <summary>
+        /// The delete event handler
+        /// </summary>
+        public delegate void DeleteEventHandler(StyleSheet sender, DeleteEventArgs e);
+
+
+        /// <summary>
+        /// Occurs when [before save].
+        /// </summary>
+        public new static event SaveEventHandler BeforeSave;
+        /// <summary>
+        /// Raises the <see cref="E:BeforeSave"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+        protected new virtual void FireBeforeSave(SaveEventArgs e)
+        {
+            if (BeforeSave != null)
+                BeforeSave(this, e);
+        }
+
+        /// <summary>
+        /// Occurs when [after save].
+        /// </summary>
+        public new static event SaveEventHandler AfterSave;
+        /// <summary>
+        /// Raises the <see cref="E:AfterSave"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+        protected override void FireAfterSave(SaveEventArgs e)
+        {
+            if (AfterSave != null)
+                AfterSave(this, e);
+        }
+
+        /// <summary>
+        /// Occurs when [new].
+        /// </summary>
+        public static event NewEventHandler New;
+        /// <summary>
+        /// Raises the <see cref="E:New"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+        protected virtual void OnNew(NewEventArgs e)
+        {
+            if (New != null)
+                New(this, e);
+        }
+
+        /// <summary>
+        /// Occurs when [before delete].
+        /// </summary>
+        public new static event DeleteEventHandler BeforeDelete;
+        /// <summary>
+        /// Raises the <see cref="E:BeforeDelete"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+        protected override void FireBeforeDelete(DeleteEventArgs e)
+        {
+            if (BeforeDelete != null)
+                BeforeDelete(this, e);
+        }
+
+        /// <summary>
+        /// Occurs when [after delete].
+        /// </summary>
+        public new static event DeleteEventHandler AfterDelete;
+        /// <summary>
+        /// Raises the <see cref="E:AfterDelete"/> event.
+        /// </summary>
+        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+        protected override void FireAfterDelete(DeleteEventArgs e)
+        {
+            if (AfterDelete != null)
+                AfterDelete(this, e);
+        }
+
+        
     }
 
-
+    [Obsolete("This is no longer used and will be removed from the codebase in future versions")]
     public class StyleSheetComparer : IComparer
     {
         public StyleSheetComparer()
diff --git a/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs b/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs
index 230b03fa1d..a6f2178842 100644
--- a/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs
+++ b/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs
@@ -11,8 +11,17 @@ namespace umbraco.cms.businesslogic.web
         private string _alias;
         private string _value;
 
+        private Umbraco.Core.Models.StylesheetProperty _stylesheetProperty;
+
         private static readonly Guid ModuleObjectType = new Guid("5555da4f-a123-42b2-4488-dcdfb25e4111");
-        
+
+        internal StylesheetProperty(Umbraco.Core.Models.StylesheetProperty stylesheetProperty)
+            : base(int.MaxValue, true)
+        {
+            if (stylesheetProperty == null) throw new ArgumentNullException("stylesheetProperty");
+            _stylesheetProperty = stylesheetProperty;
+        }
+
         public StylesheetProperty(int id) : base(id)
         {
             InitProperty();