diff --git a/docs/AspNetCore/Bundling-Minification.md b/docs/AspNetCore/Bundling-Minification.md
index 35eb9f5fb3..414af4d762 100644
--- a/docs/AspNetCore/Bundling-Minification.md
+++ b/docs/AspNetCore/Bundling-Minification.md
@@ -243,10 +243,11 @@ namespace MyCompany.MyProject
 }
 ````
 
-##### Themes
+#### Themes
 
-Themes (TODO: link) also uses the standard package contributors to add library resources to page layouts.
+Themes uses the standard package contributors to add library resources to page layouts. Themes may also define some standard/global bundles, so any module can contribute to those standard/global bundles. See the [theming documentation](Theming.md) for more.
 
 ### See Also
 
-* [Client Side Package Management](Client-Side-Package-Management.md)
\ No newline at end of file
+* [Client Side Package Management](Client-Side-Package-Management.md)
+* [Theming](Theming.md)
\ No newline at end of file
diff --git a/docs/AspNetCore/Client-Side-Package-Management.md b/docs/AspNetCore/Client-Side-Package-Management.md
index a920848f37..20fb378ab1 100644
--- a/docs/AspNetCore/Client-Side-Package-Management.md
+++ b/docs/AspNetCore/Client-Side-Package-Management.md
@@ -112,4 +112,5 @@ When you run the gulp, all related packages will copy their own resources into t
 
 #### See Also
 
-* [Bundling & Minification](Bundling-Minification.md)
\ No newline at end of file
+* [Bundling & Minification](Bundling-Minification.md)
+* [Theming](Theming.md)
\ No newline at end of file
diff --git a/docs/AspNetCore/Tag-Helpers.md b/docs/AspNetCore/Tag-Helpers.md
new file mode 100644
index 0000000000..4949a3ec63
--- /dev/null
+++ b/docs/AspNetCore/Tag-Helpers.md
@@ -0,0 +1,3 @@
+# Tag Helpers
+
+TODO
\ No newline at end of file
diff --git a/docs/AspNetCore/Theming.md b/docs/AspNetCore/Theming.md
new file mode 100644
index 0000000000..470ef1a458
--- /dev/null
+++ b/docs/AspNetCore/Theming.md
@@ -0,0 +1,3 @@
+# Theming
+
+TODO
\ No newline at end of file
diff --git a/docs/Index.md b/docs/Index.md
index e39b8872e6..e5009a9946 100644
--- a/docs/Index.md
+++ b/docs/Index.md
@@ -50,8 +50,8 @@
   * User Interface
     * [Client Side Package Management](AspNetCore/Client-Side-Package-Management.md)
     * [Bundling & Minification](AspNetCore/Bundling-Minification.md)
-    * Tag Helpers
-    * Themes
+    * [Tag Helpers](Tag-Helpers.md)
+    * [Theming](AspNetCore/Theming.md)
 * Data Access
   * [Entity Framework Core Integration](Entity-Framework-Core.md)
   * [MongoDB Integration](MongoDB.md)
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs
index dc3cc27d4c..3fb6e721c9 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs
@@ -120,7 +120,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
 
         protected virtual void SaveBundleResult(string bundleRelativePath, BundleResult bundleResult)
         {
-            //TODO: Optimize?
             var fileName = bundleRelativePath.Substring(bundleRelativePath.IndexOf('/') + 1);
 
             _dynamicFileProvider.AddOrUpdate(
@@ -130,12 +129,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
                     fileName
                     )
                 );
-
-            //TODO: Saving to file option?
-
-            //var bundleFilePath = Path.Combine(_hostingEnvironment.WebRootPath, bundleRelativePath);
-            //DirectoryHelper.CreateIfNotExists(Path.GetDirectoryName(bundleFilePath));
-            //File.WriteAllText(bundleFilePath, bundleResult.Content, Encoding.UTF8);
         }
 
         public virtual void CreateStyleBundle(string bundleName, Action<BundleConfiguration> configureAction)