diff --git a/src/Orchard.Web/Core/Themes/Views/Shared/layout.ascx b/src/Orchard.Web/Core/Themes/Views/Shared/layout.ascx
index a64bc8652..844e6aeec 100644
--- a/src/Orchard.Web/Core/Themes/Views/Shared/layout.ascx
+++ b/src/Orchard.Web/Core/Themes/Views/Shared/layout.ascx
@@ -1,6 +1,7 @@
 ﻿<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %><%
+Html.RegisterStyle("site.css");
 Html.RegisterStyle("site.css"); %>
 <div class="page">
     <div id="header"><%
diff --git a/src/Orchard.Web/Packages/TinyMce/Views/Models/EditorTemplates/TinyMceTextEditor.ascx b/src/Orchard.Web/Packages/TinyMce/Views/Models/EditorTemplates/TinyMceTextEditor.ascx
index 133085c2f..aae53f40a 100644
--- a/src/Orchard.Web/Packages/TinyMce/Views/Models/EditorTemplates/TinyMceTextEditor.ascx
+++ b/src/Orchard.Web/Packages/TinyMce/Views/Models/EditorTemplates/TinyMceTextEditor.ascx
@@ -1,8 +1,18 @@
 ﻿<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
 <%@ Import Namespace="System.Web.Mvc.Html" %>
-<%-- todo: (heskew) need script include and init script to not be duplicated --%>
-<%--<script src="<%=ResolveUrl("~/Packages/TinyMce/scripts/tiny_mce.js") %>" type="text/javascript"></script>--%>
+<%@ Import Namespace="Orchard.Mvc.Html" %>
+<% Html.RegisterScript("tiny_mce.js"); %>
 <%=Html.TextArea("", Model, 25, 80, new { @class = "html" }) %>
-<%--<script type="text/javascript">
-    tinyMCE.init({ theme: "advanced", mode: "textareas", plugins: "fullscreen,autoresize", theme_advanced_toolbar_location: "top", theme_advanced_toolbar_align: "left", theme_advanced_buttons3_add: "fullscreen" });
-</script>--%>
\ No newline at end of file
+<script type="text/javascript">
+    tinyMCE.init({
+        theme: "advanced",
+        mode: "specific_textareas",
+        editor_selector: "html",
+        plugins: "fullscreen,autoresize,searchreplace",
+        theme_advanced_toolbar_location: "top",
+        theme_advanced_toolbar_align: "left",
+        theme_advanced_buttons1: "search,replace,|,cut,copy,paste,|,undo,redo,|,image,|,link,unlink,charmap,emoticon,codeblock,|,bold,italic,|,numlist,bullist,formatselect,|,code,fullscreen",
+        theme_advanced_buttons2: "",
+        theme_advanced_buttons3: ""
+    });
+</script>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Shared/document.aspx b/src/Orchard.Web/Themes/TheAdmin/Views/Shared/document.aspx
index b1b2c9887..13f8456b0 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Shared/document.aspx
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Shared/document.aspx
@@ -10,22 +10,6 @@
     <%-- todo: (heskew) this should come from the admin "page" (partial) 
          todo: (heskew) should have at the minimum something like, say, includeScript(scriptName[, releaseScriptName], scriptPath[, releaseScriptPath])
     --%><script src="<%=Page.ResolveClientUrl("~/Scripts/jquery-1.3.2.js") %>" type="text/javascript"></script>
-    <%-- todo: (heskew) this should come from the admin "page" (partial)
-         todo: (heskew) use the TinyMCE jQuery package instead?
-    --%><script type="text/javascript" src="<%=ResolveUrl("~/Packages/TinyMce/Scripts/tiny_mce.js") %>"></script>
-    <script type="text/javascript">
-        tinyMCE.init({
-            theme: "advanced",
-            mode: "specific_textareas",
-            editor_selector: "html",
-            plugins: "fullscreen,autoresize,searchreplace",
-            theme_advanced_toolbar_location: "top",
-            theme_advanced_toolbar_align: "left",
-            theme_advanced_buttons1: "search,replace,|,cut,copy,paste,|,undo,redo,|,image,|,link,unlink,charmap,emoticon,codeblock,|,bold,italic,|,numlist,bullist,formatselect,|,code,fullscreen",
-            theme_advanced_buttons2: "",
-            theme_advanced_buttons3: ""
-            });
-    </script>
 </head>
 <body><%
     Html.ZoneBody("body"); %>
diff --git a/src/Orchard/Mvc/Html/FileRegistrationContext.cs b/src/Orchard/Mvc/Html/FileRegistrationContext.cs
new file mode 100644
index 000000000..7c70342bd
--- /dev/null
+++ b/src/Orchard/Mvc/Html/FileRegistrationContext.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Web.Mvc;
+using System.Web.Routing;
+using System.Web.UI;
+
+namespace Orchard.Mvc.Html {
+    public class FileRegistrationContext : RequestContext {
+        public FileRegistrationContext(ViewContext viewContext, IViewDataContainer viewDataContainer, string fileName)
+            : base(viewContext.HttpContext, viewContext.RouteData) {
+            TemplateControl container = viewDataContainer as TemplateControl;
+
+            if (container != null)
+                ContainerVirtualPath = container.AppRelativeVirtualPath.Substring(0,
+                                                                                  container.AppRelativeVirtualPath.
+                                                                                      IndexOf("/Views",
+                                                                                              StringComparison.
+                                                                                                  InvariantCultureIgnoreCase));
+
+            FileName = fileName;
+        }
+
+        public TemplateControl Container { get; set; }
+        public string ContainerVirtualPath { get; set; }
+        public string FileName { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            FileRegistrationContext incoming = obj as FileRegistrationContext;
+
+            return incoming != null &&
+                   string.Equals(ContainerVirtualPath, incoming.ContainerVirtualPath,
+                                 StringComparison.InvariantCultureIgnoreCase) &&
+                   string.Equals(FileName, incoming.FileName, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        internal string GetFilePath(string containerRelativePath) {
+            return ContainerVirtualPath.Replace("~/", "/") + containerRelativePath + FileName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard/Mvc/Html/LayoutExtensions.cs b/src/Orchard/Mvc/Html/LayoutExtensions.cs
index 45cd5a605..c9b7a574c 100644
--- a/src/Orchard/Mvc/Html/LayoutExtensions.cs
+++ b/src/Orchard/Mvc/Html/LayoutExtensions.cs
@@ -56,15 +56,15 @@ namespace Orchard.Mvc.Html {
         }
 
         public static void RegisterStyle(this HtmlHelper html, string fileName) {
-            html.Resolve<IResourceManager>().RegisterStyle(fileName);
+            html.Resolve<IResourceManager>().RegisterStyle(fileName, html);
         }
 
         public static void RegisterScript(this HtmlHelper html, string fileName) {
-            html.Resolve<IResourceManager>().RegisterHeadScript(fileName);
+            html.Resolve<IResourceManager>().RegisterHeadScript(fileName, html);
         }
 
         public static void RegisterFootScript(this HtmlHelper html, string fileName) {
-            html.Resolve<IResourceManager>().RegisterFootScript(fileName);
+            html.Resolve<IResourceManager>().RegisterFootScript(fileName, html);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj
index 71c142c16..d75c4f1bc 100644
--- a/src/Orchard/Orchard.csproj
+++ b/src/Orchard/Orchard.csproj
@@ -125,6 +125,7 @@
     <Compile Include="Environment\IOrchardShellEvents.cs" />
     <Compile Include="Extensions\ExtensionDescriptor.cs" />
     <Compile Include="Extensions\ExtensionEntry.cs" />
+    <Compile Include="Mvc\Html\FileRegistrationContext.cs" />
     <Compile Include="Themes\ExtensionManagerExtensions.cs" />
     <Compile Include="Extensions\Helpers\PathHelpers.cs" />
     <Compile Include="Extensions\IExtensionManager.cs" />
diff --git a/src/Orchard/Themes/ExtensionManagerExtensions.cs b/src/Orchard/Themes/ExtensionManagerExtensions.cs
index f7028fa88..61e20ba88 100644
--- a/src/Orchard/Themes/ExtensionManagerExtensions.cs
+++ b/src/Orchard/Themes/ExtensionManagerExtensions.cs
@@ -4,11 +4,16 @@ using Orchard.Extensions;
 
 namespace Orchard.Themes {
     public static class ExtensionManagerExtensions {
-        public static string GetThemeLocation(this IExtensionManager extensionManager, ITheme theme) {
-            var themeDescriptor = extensionManager.AvailableExtensions()
-                .Single(x => x.ExtensionType == "Theme" && x.Name == theme.ThemeName);
+        public static ExtensionDescriptor GetExtensionDescriptor(this IExtensionManager extensionManager, string extensionType, string extensionName) {
+            return
+                extensionManager.AvailableExtensions().FirstOrDefault(
+                    ed => ed.ExtensionType == extensionType && ed.Name == extensionName);
+        }
 
-            return Path.Combine(themeDescriptor.Location, themeDescriptor.Name);
+        public static string GetThemeLocation(this IExtensionManager extensionManager, ITheme theme) {
+            ExtensionDescriptor descriptor = extensionManager.GetExtensionDescriptor("Theme", theme.ThemeName);
+            
+            return descriptor != null ? Path.Combine(descriptor.Location, descriptor.Name) : null;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/UI/Resources/IResourceManager.cs b/src/Orchard/UI/Resources/IResourceManager.cs
index db7652937..24d3b283b 100644
--- a/src/Orchard/UI/Resources/IResourceManager.cs
+++ b/src/Orchard/UI/Resources/IResourceManager.cs
@@ -4,12 +4,12 @@ using System.Web.Routing;
 namespace Orchard.UI.Resources {
     public interface IResourceManager : IDependency {
         void RegisterMeta(string name, string content);
-        void RegisterStyle(string fileName);
-        void RegisterHeadScript(string fileName);
-        void RegisterFootScript(string fileName);
+        void RegisterStyle(string fileName, HtmlHelper html);
+        void RegisterHeadScript(string fileName, HtmlHelper html);
+        void RegisterFootScript(string fileName, HtmlHelper html);
         MvcHtmlString GetMetas();
-        MvcHtmlString GetStyles(RequestContext requestContext);
-        MvcHtmlString GetHeadScripts(RequestContext requestContext);
-        MvcHtmlString GetFootScripts(RequestContext requestContext);
+        MvcHtmlString GetStyles();
+        MvcHtmlString GetHeadScripts();
+        MvcHtmlString GetFootScripts();
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/UI/Resources/ResourceFilter.cs b/src/Orchard/UI/Resources/ResourceFilter.cs
index 7f3a84000..11348f30b 100644
--- a/src/Orchard/UI/Resources/ResourceFilter.cs
+++ b/src/Orchard/UI/Resources/ResourceFilter.cs
@@ -15,9 +15,9 @@ namespace Orchard.UI.Resources {
 
             if (model != null) {
                 model.Zones.AddAction("head:metas", html => html.ViewContext.HttpContext.Response.Output.Write(_resourceManager.GetMetas()));
-                model.Zones.AddAction("head:styles", html => html.ViewContext.HttpContext.Response.Output.Write(_resourceManager.GetStyles(filterContext.RequestContext)));
-                model.Zones.AddAction("head:scripts", html => html.ViewContext.HttpContext.Response.Output.Write(_resourceManager.GetHeadScripts(filterContext.RequestContext)));
-                model.Zones.AddAction("body:after", html => html.ViewContext.HttpContext.Response.Output.Write(_resourceManager.GetFootScripts(filterContext.RequestContext)));
+                model.Zones.AddAction("head:styles", html => html.ViewContext.HttpContext.Response.Output.Write(_resourceManager.GetStyles()));
+                model.Zones.AddAction("head:scripts", html => html.ViewContext.HttpContext.Response.Output.Write(_resourceManager.GetHeadScripts()));
+                model.Zones.AddAction("body:after", html => html.ViewContext.HttpContext.Response.Output.Write(_resourceManager.GetFootScripts()));
             }
         }
 
diff --git a/src/Orchard/UI/Resources/ResourceManager.cs b/src/Orchard/UI/Resources/ResourceManager.cs
index f3b1afc60..fb31b7b6f 100644
--- a/src/Orchard/UI/Resources/ResourceManager.cs
+++ b/src/Orchard/UI/Resources/ResourceManager.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Orchard.Extensions;
+using Orchard.Mvc.Html;
 using Orchard.Themes;
 
 namespace Orchard.UI.Resources {
@@ -14,9 +15,9 @@ namespace Orchard.UI.Resources {
         private const string StyleFormat = "\r\n<link rel=\"stylesheet\" type=\"text/css\" href=\"{0}\" />";
         private const string ScriptFormat = "\r\n<script type=\"text/javascript\" src=\"{0}\"></script>";
         private readonly Dictionary<string, string> _metas;
-        private readonly List<string> _styles;
-        private readonly List<string> _headScripts;
-        private readonly List<string> _footScripts;
+        private readonly List<FileRegistrationContext> _styles;
+        private readonly List<FileRegistrationContext> _headScripts;
+        private readonly List<FileRegistrationContext> _footScripts;
 
         public ResourceManager(IThemeService themeService,
             IExtensionManager extensionManager) {
@@ -24,9 +25,9 @@ namespace Orchard.UI.Resources {
             _extensionManager = extensionManager;
             //TODO: (erikpo) Not sure if generator should be initialized here or somewhere else
             _metas = new Dictionary<string, string>(20) {{"generator", "Orchard"}};
-            _styles = new List<string>(10);
-            _headScripts = new List<string>(10);
-            _footScripts = new List<string>(5);
+            _styles = new List<FileRegistrationContext>(10);
+            _headScripts = new List<FileRegistrationContext>(10);
+            _footScripts = new List<FileRegistrationContext>(5);
         }
 
         public void RegisterMeta(string name, string content) {
@@ -34,19 +35,34 @@ namespace Orchard.UI.Resources {
                 _metas.Add(name, content);
         }
 
-        public void RegisterStyle(string fileName) {
-            if (!string.IsNullOrEmpty(fileName) && !_styles.Contains(fileName))
-                _styles.Add(fileName);
+        public void RegisterStyle(string fileName, HtmlHelper html) {
+            if (string.IsNullOrEmpty(fileName))
+                return;
+
+            FileRegistrationContext context = new FileRegistrationContext(html.ViewContext, html.ViewDataContainer, fileName);
+
+            if (!_styles.Contains(context))
+                _styles.Add(context);
         }
 
-        public void RegisterHeadScript(string fileName) {
-            if (!string.IsNullOrEmpty(fileName) && !_headScripts.Contains(fileName) && !_footScripts.Contains(fileName))
-                _headScripts.Add(fileName);
+        public void RegisterHeadScript(string fileName, HtmlHelper html) {
+            if (string.IsNullOrEmpty(fileName))
+                return;
+
+            FileRegistrationContext context = new FileRegistrationContext(html.ViewContext, html.ViewDataContainer, fileName);
+
+            if (!_headScripts.Contains(context))
+                _headScripts.Add(context);
         }
 
-        public void RegisterFootScript(string fileName) {
-            if (!string.IsNullOrEmpty(fileName) && !_headScripts.Contains(fileName) && !_footScripts.Contains(fileName))
-                _footScripts.Add(fileName);
+        public void RegisterFootScript(string fileName, HtmlHelper html) {
+            if (string.IsNullOrEmpty(fileName))
+                return;
+
+            FileRegistrationContext context = new FileRegistrationContext(html.ViewContext, html.ViewDataContainer, fileName);
+
+            if (!_footScripts.Contains(context))
+                _footScripts.Add(context);
         }
 
         public MvcHtmlString GetMetas() {
@@ -54,34 +70,36 @@ namespace Orchard.UI.Resources {
                 MvcHtmlString.Create(string.Join("\r\n",
                                                  _metas.Select(m => string.Format(MetaFormat, m.Key, m.Value)).ToArray()));
         }
-        public MvcHtmlString GetStyles(RequestContext requestContext) {
-            return GetFiles(_styles, StyleFormat, s => GetThemePath("/styles/" + s, requestContext));
+
+        public MvcHtmlString GetStyles() {
+            return GetFiles(_styles, StyleFormat, "/styles/");
         }
 
-        public MvcHtmlString GetHeadScripts(RequestContext requestContext) {
-            return GetFiles(_headScripts, ScriptFormat, s => GetThemePath("/scripts/" + s, requestContext));
+        public MvcHtmlString GetHeadScripts() {
+            return GetFiles(_headScripts, ScriptFormat, "/scripts/");
         }
 
-        public MvcHtmlString GetFootScripts(RequestContext requestContext) {
-            return GetFiles(_footScripts, ScriptFormat, s => GetThemePath("/scripts/" + s, requestContext));
+        public MvcHtmlString GetFootScripts() {
+            return GetFiles(_footScripts, ScriptFormat, "/scripts/");
         }
 
-        private static MvcHtmlString GetFiles(IEnumerable<string> files, string fileFormat, Func<string, string> getPath) {
+        private static MvcHtmlString GetFiles(IEnumerable<FileRegistrationContext> fileRegistrationContexts, string fileFormat, string containerRelativePath) {
             return
                 MvcHtmlString.Create(string.Join("\r\n",
-                                                 files.Select(s => string.Format(fileFormat, getPath(s))).ToArray()));
+                                                 fileRegistrationContexts.Select(c => string.Format(fileFormat, c.GetFilePath(containerRelativePath))).ToArray()));
         }
 
-        private string GetThemePath(string fileName, RequestContext requestContext) {
-            var requestTheme = _themeService.GetRequestTheme(requestContext); // <- todo: (erikpo) will need context eventually
+        //TODO: (erikpo) Old code that may be needed later
+        //private string GetThemePath(string fileName, RequestContext requestContext) {
+        //    var requestTheme = _themeService.GetRequestTheme(requestContext); // <- todo: (erikpo) will need context eventually
 
-            if (requestTheme == null)
-                return fileName;
+        //    if (requestTheme == null)
+        //        return fileName;
             
-            //todo: (erikpo) this might be the worst code ever so resolve for real
-            return  (_extensionManager.GetThemeLocation(requestTheme) + fileName)
-                .Replace("~", "")
-                .Replace("\\", "/");
-        }
+        //    //todo: (erikpo) this might be the worst code ever so resolve for real
+        //    return  (_extensionManager.GetThemeLocation(requestTheme) + fileName)
+        //        .Replace("~", "")
+        //        .Replace("\\", "/");
+        //}
     }
 }
\ No newline at end of file
