diff --git a/modules/ROOT/partials/module-loading/admon-bundling-plugin-langs.adoc b/modules/ROOT/partials/module-loading/admon-bundling-plugin-langs.adoc
index acec22b1e4..6a7f7e9b10 100644
--- a/modules/ROOT/partials/module-loading/admon-bundling-plugin-langs.adoc
+++ b/modules/ROOT/partials/module-loading/admon-bundling-plugin-langs.adoc
@@ -1,9 +1,9 @@
-Plugin language files (such as `+./plugins/plugincode/langs/sv_SE.js+`) are required where the editor user interface is localized using the xref:ui-localization.adoc#language[language option]. Please refer to xref:bundling-plugins.adoc#plugin-language-files[plugin-language-files]
+Plugin language files (such as `+./plugins/plugincode/langs/sv_SE.js+`) are required where the editor user interface is localized using the xref:ui-localization.adoc#language[language option].
 
 The below plugins require these xref:bundling-plugins.adoc#plugin-language-files[plugin-language-files]
 
-* Enhanced Tables (+advtable+)
 * Accessibility Checker (+a11ychecker+)
+* Enhanced Tables (+advtable+)
 * Comments (+tinycomments+)
 * ExportWord (+exportword+)
 * Footnotes (+footnotes+)
diff --git a/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc b/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc
index b78e8ca870..e639d49fc5 100644
--- a/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc
+++ b/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc
@@ -11,25 +11,53 @@ include::partial$plugin-files/plugin-file-bundling-message.adoc[]
 include::partial$plugin-files/plugin-file-index.js.adoc[]
 
 [NOTE]
-====
 include::partial$module-loading/admon-bundling-plugin-langs.adoc[]
-====
 
-[[accessibility-checker]]
+'''
+
+include::partial$plugin-files/plugin-file-bundling-also-requires.adoc[]
+
+[[a11ychecker]]
 === Accessibility Checker (`+a11ychecker+`)
 
 include::partial$plugin-files/plugin-file-list-a11ychecker.adoc[]
 
-[[comments]]
+[[tinycomments]]
 === Comments (`+tinycomments+`)
 
 include::partial$plugin-files/plugin-file-list-tinycomments.adoc[]
 
+[[advcode]]
+=== Enhanced Code Editor (`+advcode+`)
+
+include::partial$plugin-files/plugin-file-list-advcode.adoc[]
+
+[[linkchecker]]
+=== Link Checker (`+linkchecker+`)
+
+include::partial$plugin-files/plugin-file-list-linkchecker.adoc[]
+
+[[mediaembed]]
+=== Media Embed (`+mediaembed+`)
+
+include::partial$plugin-files/plugin-file-list-mediaembed.adoc[]
+
+[[mentions]]
+=== Mentions (`+mentions+`)
+
+include::partial$plugin-files/plugin-file-list-mentions.adoc[]
+
+[[pageembed]]
+=== Pageembed (`+pageembed+`)
+
+include::partial$plugin-files/plugin-file-list-pageembed.adoc[]
+
 [[powerpaste]]
 === PowerPaste (`+powerpaste+`)
 
 include::partial$plugin-files/plugin-file-list-powerpaste.adoc[]
 
+'''
 
 [[community-plugins]]
 == Community plugins
@@ -38,11 +66,16 @@ include::partial$plugin-files/plugin-file-bundling-message.adoc[]
 
 include::partial$plugin-files/plugin-file-index.js.adoc[]
 
+'''
+
+include::partial$plugin-files/plugin-file-bundling-also-requires.adoc[]
+
 [[emoticons]]
 === Emoticons (`+emoticons+`)
 
 include::partial$plugin-files/plugin-file-list-emoticons.adoc[]
 
+'''
 
 [[plugin-language-files]]
 == Plugin language files
diff --git a/modules/ROOT/partials/plugin-files/plugin-file-bundling-also-requires.adoc b/modules/ROOT/partials/plugin-files/plugin-file-bundling-also-requires.adoc
new file mode 100644
index 0000000000..62a92166dd
--- /dev/null
+++ b/modules/ROOT/partials/plugin-files/plugin-file-bundling-also-requires.adoc
@@ -0,0 +1,2 @@
+[TIP]
+The below plugin/s also require the files outlined under each plugin section when bundling {productname} in addition to the xref:bundling-plugins.adoc#base-index-js-file[base `index.js`] file.
\ No newline at end of file
diff --git a/modules/ROOT/partials/plugin-files/plugin-file-index.js.adoc b/modules/ROOT/partials/plugin-files/plugin-file-index.js.adoc
index c7d76d6c3c..f61a8ae76c 100644
--- a/modules/ROOT/partials/plugin-files/plugin-file-index.js.adoc
+++ b/modules/ROOT/partials/plugin-files/plugin-file-index.js.adoc
@@ -1,4 +1,4 @@
-
+[[base-index-js-file]]
 .Base index.js required file for each plugin.
 [source, js]
 ----
diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc
index 9e7c646d1a..7dacb5280b 100644
--- a/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc
+++ b/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc
@@ -1,17 +1,11 @@
-.Base js file
-[source, js]
-----
-./plugins/advcode/plugin.js
-----
-
-.css or bundled css
+.Requires css or bundled css
 [source, js]
 ----
 ./plugins/advcode/codemirror.min.css //or
 ./plugins/advcode/codemirror_css.js // bundling requires v6.8.0 or later.
 ----
 
-.other js files
+.other js files required
 [source, js]
 ----
 ./plugins/advcode/codemirror.min.js
diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc
index 8dce71103c..6f83d6b233 100644
--- a/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc
+++ b/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc
@@ -1,10 +1,4 @@
-.Base js file
-[source, js]
-----
-./plugins/linkchecker/plugin.js
-----
-
-.css or bundled css
+.Requires css or bundled css
 [source, js]
 ----
 ./plugins/linkchecker/content.min.css //or
diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc
index f1364d71a1..b9977079b1 100644
--- a/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc
+++ b/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc
@@ -1,10 +1,4 @@
-.Base js file
-[source, js]
-----
-./plugins/mediaembed/plugin.js
-----
-
-.css or bundled css
+.Requires css or bundled css
 [source, js]
 ----
 ./plugins/mediaembed/content.min.css //or
diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc
index 0d76a3595a..4002834fc0 100644
--- a/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc
+++ b/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc
@@ -1,10 +1,4 @@
-.Base js file
-[source, js]
-----
-./plugins/mentions/plugin.js
-----
-
-.css or bundled css
+.Requries css or bundled css
 [source, js]
 ----
 ./plugins/mentions/css/mentions.css //or
diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc
index 635a839e6d..3a9464cce3 100644
--- a/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc
+++ b/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc
@@ -1,10 +1,4 @@
-.Base js file
-[source, js]
-----
-./plugins/pageembed/plugin.js
-----
-
-.css or bundled css
+.Requires css or bundled css
 [source, js]
 ----
 ./plugins/pageembed/css/empa30.css //or