diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 0000000000..c13e7050c0
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,16 @@
+# release.yml
+
+changelog:
+  categories:
+    - title: ✨ Enhancements
+      labels:
+        - enhancement
+    - title: 🐛 Bug Fixes
+      labels:
+        - bug
+    - title: 📚 Documentation
+      labels:
+        - documentation
+    - title: 🛠 Other Changes
+      labels:
+        - "*"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c0d8e86c9e..ecfbbd9b47 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -53,6 +53,8 @@ jobs:
         RDOC_USE_PRISM_PARSER: true
     - if: ${{ matrix.ruby == 'head' && startsWith(matrix.os, 'ubuntu') }}
       run: bundle exec rake rdoc
+    - if: ${{ matrix.ruby == 'head' && startsWith(matrix.os, 'ubuntu') }}
+      run: bundle exec rake install
   lint:
     runs-on: ubuntu-latest
     steps:
diff --git a/ExampleMarkdown.md b/ExampleMarkdown.md
index 2a883c5c84..fd4359f355 100644
--- a/ExampleMarkdown.md
+++ b/ExampleMarkdown.md
@@ -1,3 +1,5 @@
+# Example Markdown
+
 This document contains example output to show RDoc styling.  This file was
 created from a Markdown file.
 
diff --git a/ExampleRDoc.rdoc b/ExampleRDoc.rdoc
index 79c2432ae2..b5dd68c19c 100644
--- a/ExampleRDoc.rdoc
+++ b/ExampleRDoc.rdoc
@@ -1,3 +1,5 @@
+= Example \RDoc
+
 This document contains example output to show RDoc styling.  This file was
 created from a RDoc Markup file.
 
diff --git a/History.rdoc b/History.rdoc
index d20211f031..deb8c77787 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,4 +1,6 @@
-=== 5.1.0 / 2017-02-24
+= History
+
+== 5.1.0 / 2017-02-24
 
 * Bug fixes
   * Fix an issue that rdoc fails when running on Windows with RUBYOPT=-U.
@@ -8,7 +10,7 @@
   * Parse ruby 2.1 <visibility> def. PR #436 by Akira Matsuda.
   * Suppress warnings in eval. PR #440 by Nobuyoshi Nakada.
 
-=== 5.0.0 / 2016-11-05
+== 5.0.0 / 2016-11-05
 
 * Major enhancements
   * Cleanup deprecated code targeted Ruby 1.8
@@ -25,19 +27,19 @@
   * Improve class name expansion/resolution in ri.  PR #400 by NARUSE, Yui
   * Improve performance of document generation. PR #397 by Yusuke Endoh.
 
-=== 4.3.0 / 2016-11-04
+== 4.3.0 / 2016-11-04
 
 * Minor enhancements
   * Removed json dependency for Ruby 2.4.0
   * End to support Ruby 1.8.x
 
-=== 4.2.2 / 2016-02-09
+== 4.2.2 / 2016-02-09
 
 * Bug fixes
   * Include lib/rdoc/generator/pot/* in built gem
 
 
-=== 4.2.1 / 2015-12-22
+== 4.2.1 / 2015-12-22
 
 * Bug fixes
   * Fixed infinite loop with CR #339 by @nobu
@@ -47,7 +49,7 @@
   * Fix for valid syntax `class C end` parsing #368 by @nobu
 
 
-=== 4.2.0 / 2014-12-06
+== 4.2.0 / 2014-12-06
 
 * Major enhancements
   * RDoc can now produce translation files for use with gettext.  See
@@ -116,12 +118,12 @@
     #312 by Scott Thompson.
   * Fixed RegExp matching stack overflow on Ruby 1.8.7.  Issue #327 by sshao.
 
-=== 4.1.2 / 2014-09-05
+== 4.1.2 / 2014-09-05
 
 * Bug fixes
   * Updated vendored jQuery to 1.6.4.  Bug ruby/ruby#711 by @neuralme
 
-=== 4.1.1 / 2014-01-09
+== 4.1.1 / 2014-01-09
 
 * Bug fixes
   * Fixed reporting of undocumented method parameters when including when
@@ -132,7 +134,7 @@
   * Removed duplicated condition in superclass fixup.  Pull request #282 by
     Benoit Daloze.
 
-=== 4.1.0 / 2013-12-26
+== 4.1.0 / 2013-12-26
 
 * Notable changes
   * Improved accessibility of HTML output.  Accessibility review was provided
@@ -222,7 +224,7 @@
   * Regexp options are no longer stripped in HTML output.  Bug #259 by Zachary
     Scott, Pull request #265 by Rein Henrichs
 
-=== 4.0.1 / 2013-03-27
+== 4.0.1 / 2013-03-27
 
 * Bug fixes
   * RDoc::Options parser should rescue from OptionParser::ParseError.
@@ -252,7 +254,7 @@
   * The C parser now de-duplicates call-seq if the same C function is used for
     multiple method names.  Bug #203 by Pete Higgins
 
-=== 4.0.0 / 2013-02-24
+== 4.0.0 / 2013-02-24
 
 RDoc 4.0 includes several new features and several breaking changes.  The
 changes should not affect users of `rdoc` or `ri`.
@@ -380,7 +382,7 @@ Changes since RDoc 3.12.1:
   * RDoc now ignores methods defined on constants instead of creating a fake
     module.  Bug #163 by Zachary Scott.
   * Fixed ChangeLog parsing for FFI gem.  Bug #165 by Zachary Scott.
-  * RDoc now links \#=== methods.  Bug #164 by Zachary Scott.
+  * RDoc now links \#== methods.  Bug #164 by Zachary Scott.
   * Allow [] following argument names for TomDoc.  Bug #167 by Ellis Berner.
   * Fixed the RDoc servlet for home and site directories.  Bug #170 by Thomas
     Leitner.
@@ -455,7 +457,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Templates now use the correct encoding when generating pages.  Issue #183
     by Vít Ondruch
 
-=== 4.0.0.rc.2 / 2013-02-05
+== 4.0.0.rc.2 / 2013-02-05
 
 * Minor enhancements
   * Added current heading and page-top links to HTML headings.
@@ -476,7 +478,7 @@ Changes since RDoc 4.0.0.rc.2:
   * RDoc now ignores methods defined on constants instead of creating a fake
     module.  Bug #163 by Zachary Scott.
   * Fixed ChangeLog parsing for FFI gem.  Bug #165 by Zachary Scott.
-  * RDoc now links \#=== methods.  Bug #164 by Zachary Scott.
+  * RDoc now links \#== methods.  Bug #164 by Zachary Scott.
   * Allow [] following argument names for TomDoc.  Bug #167 by Ellis Berner.
   * Fixed the RDoc servlet for home and site directories.  Bug #170 by Thomas
     Leitner.
@@ -487,7 +489,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Fixed deletion of attribute ri data when a class was loaded then saved.
     Issue #171 by Thomas Leitner.
 
-=== 4.0.0.preview2.1 / 2012-12-14
+== 4.0.0.preview2.1 / 2012-12-14
 
 * Minor enhancements
   * Added --page-dir option to give pretty names for a FAQ, guides, or other
@@ -510,7 +512,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Incremental ri builds of C files now work.  C variable names from previous
     runs are now saved between runs.
 
-=== 4.0.0.preview2 / 2012-12-01
+== 4.0.0.preview2 / 2012-12-01
 
 * Breaking changes
   * The default output encoding for RDoc is now UTF-8.  Previously RDoc used
@@ -658,7 +660,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Fixed class << ::Foo writing documentation to /Foo.html
   * Fixed class ::A referencing itself from inside its own namespace.
 
-=== 3.12.2 / 2013-02-24
+== 3.12.2 / 2013-02-24
 
 * Bug fixes
   * Fixed bug in syntax-highlighting that would corrupt regular expressions.
@@ -672,7 +674,7 @@ Changes since RDoc 4.0.0.rc.2:
     end.  When a HEREDOC is not followed by a line end RDoc is not currently
     smart enough to restore the source correctly.  Bug #162 by Zachary Scott.
 
-=== 3.12.1 / 2013-02-05
+== 3.12.1 / 2013-02-05
 
 * Bug fixes
   * Fixed an XSS exploit in darkfish.js.  This could lead to cookie disclosure
@@ -680,7 +682,7 @@ Changes since RDoc 4.0.0.rc.2:
     details including a patch you can apply to generated RDoc documentation.
   * Ensured that rd parser files are generated before checking the manifest.
 
-=== 3.12 / 2011-12-15
+== 3.12 / 2011-12-15
 
 * Minor enhancements
   * Added DEVELOPERS document which contains an overview of how RDoc works and
@@ -711,13 +713,13 @@ Changes since RDoc 4.0.0.rc.2:
   * In rdoc, backspace and ansi formatters, whitespace between label or note
     and the colon is now stripped.
 
-=== 3.11 / 2011-10-17
+== 3.11 / 2011-10-17
 
 * Bug fixes
   * Avoid parsing TAGS files included in gems.  Issue #81 by Santiago
     Pastorino.
 
-=== 3.10 / 2011-10-08
+== 3.10 / 2011-10-08
 
 * Major enhancements
   * RDoc HTML output has been improved:
@@ -822,19 +824,19 @@ Changes since RDoc 4.0.0.rc.2:
     parsed.  Unless your project includes nonexistent modules this avoids
     worst-case behavior (<tt>O(n!)</tt>) of RDoc::Include#module.
 
-=== 3.9.5 / 2013-02-05
+== 3.9.5 / 2013-02-05
 
 * Bug fixes
   * Fixed an XSS exploit in darkfish.js.  This could lead to cookie disclosure
     to third parties.  See CVE-2013-0256.rdoc for full details including a
     patch you can apply to generated RDoc documentation.
 
-=== 3.9.4 / 2011-08-26
+== 3.9.4 / 2011-08-26
 
 * Bug fixes
   * Applied typo and grammar fixes from Luke Gruber.  Ruby bug #5203
 
-=== 3.9.3 / 2011-08-23
+== 3.9.3 / 2011-08-23
 
 * Bug fixes
   * Add US-ASCII magic comments to work with <tt>ruby -Ku</tt>.  Issue #63 by
@@ -844,14 +846,14 @@ Changes since RDoc 4.0.0.rc.2:
   * Markup defined by RDoc::Markup#add_special inside a <tt><tt></tt> is no
     longer converted.
 
-=== 3.9.2 / 2011-08-11
+== 3.9.2 / 2011-08-11
 
 * Bug fix
   * Loosened TIDYLINK regexp to allow any content in the link section like:
     <tt>{foo}[rdoc-ref:SomeClass]</tt>
   * In HTML output headings are capped at <tt><h6></tt> again
 
-=== 3.9.1 / 2011-07-31
+== 3.9.1 / 2011-07-31
 
 * Bug fixes
   * Fix RDoc::Markup parser for a header followed by a non-text token.  Issue
@@ -859,7 +861,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Fix RDoc::Markup::ToHtmlCrossref#gen_url for non-<tt>rdoc-ref</tt> links.
   * Fix bug report URL when rdoc crashes.
 
-=== 3.9 / 2011-07-30
+== 3.9 / 2011-07-30
 
 * Minor enhancements
   * RDoc::Parser::C now supports :doc: and :nodoc: for class comments
@@ -879,7 +881,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Remove tokenizer restriction on header lengths for verbatim sections.
     Issue #49 by trans
 
-=== 3.8 / 2011-06-29
+== 3.8 / 2011-06-29
 
 * Minor enhancements
   * RDoc::Parser::C can now discover methods on ENV and ARGF.
@@ -888,7 +890,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Updating Object in an ri data store with new data now removes methods,
     includes, constants and aliases.
 
-=== 3.7 / 2011-06-27
+== 3.7 / 2011-06-27
 
 * Minor enhancements
   * New directive :category: which allows methods to be grouped into sections
@@ -933,7 +935,7 @@ Changes since RDoc 4.0.0.rc.2:
   * ri data generation for method aliases no longer duplicates the class in
     #full_name
 
-=== 3.6.1 / 2011-05-15
+== 3.6.1 / 2011-05-15
 
 * Bug fixes
   * Fix infinite loop created when re-encountering BasicObject.
@@ -941,7 +943,7 @@ Changes since RDoc 4.0.0.rc.2:
   * rb_path2class() can now be used to discover the parent class in
     rb_define_class_under.
 
-=== 3.6 / 2011-05-13
+== 3.6 / 2011-05-13
 
 * Major Enhancements
   * Interactive ri is now the default when no names are given.
@@ -966,7 +968,7 @@ Changes since RDoc 4.0.0.rc.2:
   * The doc directive now forces documentation even when the method is marked
     private or protected.
 
-=== 3.5.3 / 2010-02-06
+== 3.5.3 / 2010-02-06
 
 * Bug fixes
   * When including a file perform a lossy force-transcoding to the output
@@ -978,7 +980,7 @@ Changes since RDoc 4.0.0.rc.2:
     Bug #4376.
   * When Darkfish fails the file being generated is now reported.
 
-=== 3.5.2 / 2010-02-04
+== 3.5.2 / 2010-02-04
 
 * Deprecations
   * RDoc::Context::Section#sequence is now deprecated.  Use
@@ -995,14 +997,14 @@ Changes since RDoc 4.0.0.rc.2:
   * Fixed post-install message for Ruby 1.9.2 users.
   * Set required ruby version to >= 1.8.7.
 
-=== 3.5.1 / 2010-01-30
+== 3.5.1 / 2010-01-30
 
 * Bug fixes
   * Fixed some typos.  Pull request #13 by R.T. Lechow.
   * Ensure an RDoc::Stats is created in #parse_files.  Fixes documentation for
     railties which has no files.  Reported by Aaron Patterson
 
-=== 3.5 / 2010-01-29
+== 3.5 / 2010-01-29
 
 * Minor enhancements
   * RDoc::Parser::C looks for rb_scan_args and fills in RDoc::AnyMethod#params
@@ -1025,7 +1027,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Relaxed RDoc::Parser::Ruby#remove_private_comments to consume more dashes
     as older versions once did.  Bug #7 by Claus Folke Brobak.
 
-=== 3.4 / 2010-01-06
+== 3.4 / 2010-01-06
 
 * Minor enhancements
   * RDoc::RDoc#document may now be called with an RDoc::Options instance.
@@ -1033,7 +1035,7 @@ Changes since RDoc 4.0.0.rc.2:
   * Added skips to Encoding tests running on 1.8.
   * Fixed warnings
 
-=== 3.3 / 2010-01-03
+== 3.3 / 2010-01-03
 
 * Minor enhancements
   * The coverage report can now report undocumented method parameters
@@ -1060,7 +1062,7 @@ Changes since RDoc 4.0.0.rc.2:
     parser.  RubyForge bug #28370 by Erik Hollensbe.
   * ri no longer displays all methods in the inheritance chain.
 
-=== 3.2 / 2010-12-29
+== 3.2 / 2010-12-29
 
 * Minor enhancements
   * RDoc generator authors may now suppress updating the output dir (creating
@@ -1070,7 +1072,7 @@ Changes since RDoc 4.0.0.rc.2:
   * RDoc's gitignore now ignores .DS_Store files.  Pull Request #3 by Shane
     Becker.
 
-=== 3.1 / 2010-12-28
+== 3.1 / 2010-12-28
 
 RDoc has moved to github.  Releases after 3.1 reference github unless
 otherwise noted.
@@ -1108,12 +1110,12 @@ otherwise noted.
   * RDoc::Parser::Ruby now parses negative numbers correctly.  RubyForge patch
     #28544 by Eito Katagiri.
 
-=== 3.0.1 / 2010-12-19
+== 3.0.1 / 2010-12-19
 
 * Bug fix
   * RDoc no longer has a Perl parser.
 
-=== 3.0 / 2010-12-19
+== 3.0 / 2010-12-19
 
 Special thanks to Thierry Lambert for massive improvements to RDoc.
 
@@ -1208,7 +1210,7 @@ Special thanks to Thierry Lambert for massive improvements to RDoc.
   * Methods added to true, false and nil are now documented.
   * Remove warning for methods defined on globals.
 
-=== 2.5.11 / 2010-08-20
+== 2.5.11 / 2010-08-20
 
 * Minor Enhancements
   * Alias comments are now discovered by the C parser.  Reported by Jeremy
@@ -1216,7 +1218,7 @@ Special thanks to Thierry Lambert for massive improvements to RDoc.
   * Removed --all option which is unused in RDoc.  Use the nodoc or
     stopdoc/startdoc directives to suppress documentation instead.
 
-=== 2.5.10 / 2010-08-17
+== 2.5.10 / 2010-08-17
 
 * Minor Enhancements
   * Support rb_singleton_class().  Reported by Jeremy Evans.
@@ -1234,14 +1236,14 @@ Special thanks to Thierry Lambert for massive improvements to RDoc.
     Evans.
   * RDoc now understands singleton aliases.  Reported by Jeremy Evans.
 
-=== 2.5.9 / 2010-07-06
+== 2.5.9 / 2010-07-06
 
 * Bug Fixes
   * Look up pager correctly.
   * Fixed handling of bullets in verbatim sections.  Partial patch by
     Juha-Jarmo Heinonen.
 
-=== 2.5.8 / 2010-04-27
+== 2.5.8 / 2010-04-27
 
 *NOTE*:
 
@@ -1266,7 +1268,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * ri no longer complains about nonexistent pagers.
   * Fixed failing test
 
-=== 2.5.7 / 2010-04-22
+== 2.5.7 / 2010-04-22
 
 * Minor Enhancements
   * Unrecognized RDoc directives can now be registered by a plugin for
@@ -1277,7 +1279,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * rdoc -p no longer means --pipe if files are also given.
   * RDoc now knows about BasicObject by default.  Ruby Bug #1318 by Ambrus Zsbán
 
-=== 2.5.6 / 2010-04-22
+== 2.5.6 / 2010-04-22
 
 * Minor Enhancements
   * Unrecognized RDoc directives are added as metadata to the object they get
@@ -1293,7 +1295,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
     options.
   * Fixed link size on Darkfish file pages
 
-=== 2.5.5 / 2010-04-19
+== 2.5.5 / 2010-04-19
 
 * 1 Minor Enhancement
   * Use #binread in RDoc::Markup::PreProcess.  Patch from ruby trunk.
@@ -1305,7 +1307,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * Fixed handling of ignored invalid options to continue after the invalid
     option.
 
-=== 2.5.4 / 2010-04-18
+== 2.5.4 / 2010-04-18
 
 * 2 Minor Enhancements
   * Methods will now be cross-referenced when preceded with ::.  Ruby Bug
@@ -1316,7 +1318,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * RDoc::Parser::Ruby now handles <code>while begin a; b end # ...</code>.
     Ruby Bug #3160 by Yusuke Endoh.
 
-=== 2.5.3 / 2010-04-10
+== 2.5.3 / 2010-04-10
 
 * 1 Minor Enhancement
   * RDoc::Parser::Simple and the include directive remove coding: comment from
@@ -1326,7 +1328,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
     #3121 by Yusuke Endoh.
   * Compare times as Integers as created.rid doesn't store fractional times.
 
-=== 2.5.2 / 2010-04-09
+== 2.5.2 / 2010-04-09
 
 * 1 Minor Enhancement
   * Imported various changes by Nobu from ruby trunk.
@@ -1334,7 +1336,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * RDoc parses files without extensions as text files again.
   * RDoc::Parser::Ruby parses %{ strings correctly again.
 
-=== 2.5.1 / 2010-04-06
+== 2.5.1 / 2010-04-06
 
 * 1 Minor Enhancement
   * RDoc::Parser::C now supports the include directive for classes and
@@ -1348,7 +1350,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * RDoc::Task's rerdoc task no longer deletes the doc directory twice.
   * rdoc --force-update now works correctly.  Patch by Nobu Nokada
 
-=== 2.5 / 2010-03-31
+== 2.5 / 2010-03-31
 
 * 9 Major Enhancements
   * Darkfish now has a "Home" button
@@ -1404,13 +1406,13 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
     Filed Selenium bug #27789.
   * Alias comments are no longer hidden.  Reported by Adam Avilla.
 
-=== 2.4.3 / 2009-04-01
+== 2.4.3 / 2009-04-01
 
 * 2 Bug Fixes
   * Corrected patch for file links
   * Corrected display of file popup
 
-=== 2.4.2 / 2009-03-25
+== 2.4.2 / 2009-03-25
 
 * 2 Minor Enhancements
   * Added --pipe for turning RDoc on stdin into HTML
@@ -1435,7 +1437,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * Added back --promiscuous which didn't do anything you cared about.  Why
     did you enable it?  Nobody looked at that page!  Oh, it warns, too.
 
-=== 2.4.1 / 2009-02-26
+== 2.4.1 / 2009-02-26
 
 * 1 Minor Enhancements
   * Added :attr:, :attr_reader:, :attr_writer:, :attr_accessor: directives.
@@ -1446,7 +1448,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * Restore --inline-source that warns
   * Fixed links to files in Darkfish output
 
-=== 2.4.0 / 2009-02-24
+== 2.4.0 / 2009-02-24
 
 * 9 Minor Enhancements
   * `ri -f html` is now XHTML-happy
@@ -1473,7 +1475,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * RDoc doesn't crash with def (blah).foo() end
   * RDoc doesn't crash with #define functions
 
-=== 2.3.0 / 2009-01-28
+== 2.3.0 / 2009-01-28
 
 * 3 Major Enhancements
   * Michael Granger's Darkfish generator is now the default for HTML output
@@ -1508,7 +1510,7 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
   * C file RDoc is no longer included in token stream
   * Scan all gem paths to match gem name for ri output
 
-=== 2.2.1 / 2008-09-24
+== 2.2.1 / 2008-09-24
 This version provides some minor fixes and enhancements to 2.2.0 intended
 to polish RDoc for Ruby 1.9.1.
 
@@ -1540,7 +1542,7 @@ to polish RDoc for Ruby 1.9.1.
   * Fixed missing display of constant values in ri.
   * Fixed display of constants in ri's html output.
 
-=== 2.2.0 / 2008-09-19
+== 2.2.0 / 2008-09-19
 This version includes some significant enhancements to ri.  See RI.txt for
 documentation about ri.
 
@@ -1621,7 +1623,7 @@ documentation about ri.
   * Fixed the horizontal rule markup (---) so that it correctly adds a
     horizontal rule rather than suppressing all text that follows.
 
-=== 2.1.0 / 2008-07-20
+== 2.1.0 / 2008-07-20
 
 * 3 Major Enhancements:
   * RDoc now knows about meta-programmed methods, see RDoc::Parser::Ruby
@@ -1651,7 +1653,7 @@ documentation about ri.
     described in the documentation
   * RDoc now correctly sets superclasses if they were originally unknown
 
-=== 2.0.0 / 2008-04-10
+== 2.0.0 / 2008-04-10
 
 * 3 Major Enhancements:
   * Renamespaced everything RDoc under the RDoc module.
diff --git a/LICENSE.rdoc b/LICENSE.rdoc
index 683585ac8b..c61bb93398 100644
--- a/LICENSE.rdoc
+++ b/LICENSE.rdoc
@@ -1,3 +1,5 @@
+= License
+
 RDoc is copyrighted free software.
 
 You can redistribute it and/or modify it under either the terms of the GPL
diff --git a/TODO.rdoc b/TODO.rdoc
index 9b4215ca47..da919118d9 100644
--- a/TODO.rdoc
+++ b/TODO.rdoc
@@ -1,9 +1,10 @@
+= TODO
 This file contains some things that might happen in RDoc, or might not.
 Forward Looking Statements applies.
 
-=== RDoc::VERSION.succ
+== RDoc::VERSION.succ
 
-Blockers:
+=== Blockers:
 
 * Update LICENSE to match ruby's switch
 * The alias keyword should not be bidirectional
@@ -13,7 +14,7 @@ Blockers:
 * Fix consumption of , after link like: RDoc[rdoc-ref:RDoc], <- comma here
 * Remove support for links like Matrix[*rows]
 
-Nice to have:
+=== Nice to have:
 
 * Parse only changed files (like in ruby)
 * Page of Glory (or Shame) in HTML output showing documentation coverage
@@ -26,9 +27,9 @@ Nice to have:
 * Global variable support
 * Provide the code_object to directive handlers
 
-=== More Future
+== More Future
 
-API changes to RDoc
+=== API changes to RDoc
 
 * RDoc::TopLevel#add_method should automatically create the appropriate method
   class rather than requiring one be passed in.
@@ -36,7 +37,7 @@ API changes to RDoc
 * Add versions to RDoc::Markup syntax tree marshal format
 * Comments can no longer be Strings
 
-=== Crazy Ideas
+== Crazy Ideas
 
 * Auto-normalize heading levels to look OK.  It's weird to see an <h1> in
   the middle of a method section.
@@ -46,7 +47,7 @@ API changes to RDoc
   * Rename Context to Container
   * Rename NormalClass to Class
 
-=== Accessibility
+== Accessibility
 
 Page title in right hand side
 
diff --git a/lib/rdoc/code_object.rb b/lib/rdoc/code_object.rb
index aeb4b4762e..83997c2580 100644
--- a/lib/rdoc/code_object.rb
+++ b/lib/rdoc/code_object.rb
@@ -96,6 +96,11 @@ class RDoc::CodeObject
 
   attr_accessor :viewer
 
+  ##
+  # When mixed-in to a class, this points to the Context in which it was originally defined.
+
+  attr_accessor :mixin_from
+
   ##
   # Creates a new CodeObject that will document itself and its children
 
@@ -111,6 +116,7 @@ def initialize
     @full_name        = nil
     @store            = nil
     @track_visibility = true
+    @mixin_from       = nil
 
     initialize_visibility
   end
diff --git a/lib/rdoc/code_object/class_module.rb b/lib/rdoc/code_object/class_module.rb
index c69e14b5e4..a99acb8956 100644
--- a/lib/rdoc/code_object/class_module.rb
+++ b/lib/rdoc/code_object/class_module.rb
@@ -223,6 +223,7 @@ def comment= comment # :nodoc:
   def complete min_visibility
     update_aliases
     remove_nodoc_children
+    embed_mixins
     update_includes
     remove_invisible min_visibility
   end
@@ -798,4 +799,43 @@ def update_extends
     extends.uniq!
   end
 
+  def embed_mixins
+    return unless options.embed_mixins
+
+    includes.each do |include|
+      next if String === include.module
+      include.module.method_list.each do |code_object|
+        add_method(prepare_to_embed(code_object))
+      end
+      include.module.constants.each do |code_object|
+        add_constant(prepare_to_embed(code_object))
+      end
+      include.module.attributes.each do |code_object|
+        add_attribute(prepare_to_embed(code_object))
+      end
+    end
+
+    extends.each do |ext|
+      next if String === ext.module
+      ext.module.method_list.each do |code_object|
+        add_method(prepare_to_embed(code_object, true))
+      end
+      ext.module.attributes.each do |code_object|
+        add_attribute(prepare_to_embed(code_object, true))
+      end
+    end
+  end
+
+  private
+
+  def prepare_to_embed(code_object, singleton=false)
+    code_object = code_object.dup
+    code_object.mixin_from = code_object.parent
+    code_object.singleton = true if singleton
+    set_current_section(code_object.section.title, code_object.section.comment)
+    # add_method and add_attribute will reassign self's visibility back to the method/attribute
+    # so we need to sync self's visibility with the object's to properly retain that information
+    self.visibility = code_object.visibility
+    code_object
+  end
 end
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 96bb4fb66f..5709fabf81 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -780,4 +780,19 @@ def template_for file, page = true, klass = ERB
     template
   end
 
+  # Returns an excerpt of the content for usage in meta description tags
+  def excerpt(content)
+    text = content.is_a?(RDoc::Comment) ? content.text : content
+
+    # Match from a capital letter to the first period, discarding any links, so
+    # that we don't end up matching badges in the README
+    first_paragraph_match = text.match(/[A-Z][^\.:\/]+\./)
+    return text[0...150].gsub(/\n/, " ").squeeze(" ") unless first_paragraph_match
+
+    extracted_text = first_paragraph_match[0]
+    second_paragraph = first_paragraph_match.post_match.match(/[A-Z][^\.:\/]+\./)
+    extracted_text << " " << second_paragraph[0] if second_paragraph
+
+    extracted_text[0...150].gsub(/\n/, " ").squeeze(" ")
+  end
 end
diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
index 69649ad3b5..9e6fb4f94c 100644
--- a/lib/rdoc/generator/template/darkfish/_head.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_head.rhtml
@@ -3,6 +3,28 @@
 
 <title><%= h @title %></title>
 
+<%- if defined?(klass) -%>
+  <meta name="keywords" content="ruby,<%= h "#{klass.type},#{klass.full_name}" %>">
+
+  <%- if klass.comment.empty? -%>
+    <meta name="description" content="Documentation for the <%= h "#{klass.full_name} #{klass.type}" %>">
+  <%- else -%>
+    <meta name="description" content="<%= h "#{klass.type} #{klass.full_name}: #{excerpt(klass.comment)}" %>">
+  <%- end -%>
+<%- elsif defined?(file) -%>
+  <meta name="keywords" content="ruby,documentation,<%= h file.page_name %>">
+  <meta name="description" content="<%= h "#{file.page_name}: #{excerpt(file.comment)}" %>">
+<%- elsif @title -%>
+  <meta name="keywords" content="ruby,documentation,<%= h @title %>">
+
+  <%- if @options.main_page and
+      main_page = @files.find { |f| f.full_name == @options.main_page } then %>
+    <meta name="description" content="<%= h "#{@title}: #{excerpt(main_page.comment)}" %>">
+  <%- else -%>
+    <meta name="description" content="Documentation for <%= h @title %>">
+  <%- end -%>
+<%- end -%>
+
 <script type="text/javascript">
   var rdoc_rel_prefix = "<%= h asset_rel_prefix %>/";
   var index_rel_prefix = "<%= h rel_prefix %>/";
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
index 6c64ba6c98..0bec9fc9ce 100644
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ b/lib/rdoc/generator/template/darkfish/class.rhtml
@@ -18,7 +18,7 @@
 </nav>
 
 <main role="main" aria-labelledby="<%=h klass.aref %>">
-  <h1 id="<%=h klass.aref %>" class="<%= klass.type %>">
+  <h1 id="<%=h klass.aref %>" class="anchor-link <%= klass.type %>">
     <%= klass.type %> <%= klass.full_name %>
   </h1>
 
@@ -27,7 +27,7 @@
   </section>
 
   <%- klass.each_section do |section, constants, attributes| -%>
-  <section id="<%= section.aref %>" class="documentation-section">
+  <section id="<%= section.aref %>" class="documentation-section anchor-link">
     <%- if section.title then -%>
     <header class="documentation-section-title">
       <h2>
@@ -54,7 +54,13 @@
       <%- constants.each do |const| -%>
         <dt id="<%= const.name %>"><%= const.name %>
         <%- if const.comment then -%>
-        <dd><%= const.description.strip %>
+        <dd>
+          <%- if const.mixin_from then -%>
+            <div class="mixin-from">
+              Included from <a href="<%= klass.aref_to(const.mixin_from.path)%>"><%= const.mixin_from.full_name %></a>
+            </div>
+          <%- end -%>
+          <%= const.description.strip %>
         <%- else -%>
         <dd class="missing-docs">(Not documented)
         <%- end -%>
@@ -70,13 +76,20 @@
       </header>
 
       <%- attributes.each do |attrib| -%>
-      <div id="<%= attrib.aref %>" class="method-detail">
+      <div id="<%= attrib.aref %>" class="method-detail anchor-link">
         <div class="method-heading attribute-method-heading">
-          <span class="method-name"><%= h attrib.name %></span><span
-            class="attribute-access-type">[<%= attrib.rw %>]</span>
+          <a href="#<%= attrib.aref %>" title="Link to this attribute">
+            <span class="method-name"><%= h attrib.name %></span>
+            <span class="attribute-access-type">[<%= attrib.rw %>]</span>
+          </a>
         </div>
 
         <div class="method-description">
+        <%- if attrib.mixin_from then -%>
+          <div class="mixin-from">
+            <%= attrib.singleton ? "Extended" : "Included" %> from <a href="<%= klass.aref_to(attrib.mixin_from.path)%>"><%= attrib.mixin_from.full_name %></a>
+          </div>
+        <%- end -%>
         <%- if attrib.comment then -%>
         <%= attrib.description.strip %>
         <%- else -%>
@@ -92,44 +105,62 @@
        next if visibilities.empty?
        visibilities.each do |visibility, methods|
          next if methods.empty? %>
-     <section id="<%= visibility %>-<%= type %>-<%= section.aref %>-method-details" class="method-section">
+     <section id="<%= visibility %>-<%= type %>-<%= section.aref %>-method-details" class="method-section anchor-link">
        <header>
          <h3><%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods</h3>
        </header>
 
     <%- methods.each do |method| -%>
-      <div id="<%= method.aref %>" class="method-detail <%= method.is_alias_for ? "method-alias" : '' %>">
+      <div id="<%= method.aref %>" class="method-detail anchor-link <%= method.is_alias_for ? "method-alias" : '' %>">
         <div class="method-header">
           <%- if (call_seq = method.call_seq) then -%>
-          <%-   call_seq.strip.split("\n").each_with_index do |call_seq, i| -%>
-          <div class="method-heading">
-            <span class="method-callseq">
-              <%= h(call_seq.strip.
-                    gsub( /^\w+\./m, '')).
-                    gsub(/(.*)[-=]&gt;/, '\1&rarr;') %>
-            </span>
-            <%- if i == 0 and method.token_stream then -%>
-            <span class="method-click-advice">click to toggle source</span>
+            <%- call_seq.strip.split("\n").each_with_index do |call_seq, i| -%>
+              <div class="method-heading">
+                <a href="#<%= method.aref %>" title="Link to this method">
+                  <span class="method-callseq">
+                    <%= h(call_seq.strip.
+                        gsub( /^\w+\./m, '')).
+                        gsub(/(.*)[-=]&gt;/, '\1&rarr;') %>
+                  </span>
+                </a>
+              </div>
             <%- end -%>
-          </div>
-          <%-   end -%>
           <%- elsif method.has_call_seq? then -%>
-          <div class="method-heading">
-            <span class="method-name"><%= h method.name %></span>
-          </div>
+            <div class="method-heading">
+              <a href="#<%= method.aref %>" title="Link to this method">
+                <span class="method-name"><%= h method.name %></span>
+              </a>
+            </div>
           <%- else -%>
-          <div class="method-heading">
-            <span class="method-name"><%= h method.name %></span><span
-              class="method-args"><%= h method.param_seq %></span>
-            <%- if method.token_stream then -%>
-            <span class="method-click-advice">click to toggle source</span>
-            <%- end -%>
-          </div>
+            <div class="method-heading">
+              <a href="#<%= method.aref %>" title="Link to this method">
+                <span class="method-name"><%= h method.name %></span>
+                <span class="method-args"><%= h method.param_seq %></span>
+              </a>
+            </div>
           <%- end -%>
         </div>
 
+        <%- if method.token_stream -%>
+          <div class="method-controls">
+            <details class="method-source-toggle">
+              <summary>Source</summary>
+            </details>
+          </div>
+        <%- end -%>
+
         <%- unless method.skip_description? then -%>
         <div class="method-description">
+          <%- if method.token_stream then -%>
+          <div class="method-source-code" id="<%= method.html_name %>-source">
+            <pre><%= method.markup_code %></pre>
+          </div>
+          <%- end -%>
+          <%- if method.mixin_from then -%>
+            <div class="mixin-from">
+              <%= method.singleton ? "Extended" : "Included" %> from <a href="<%= klass.aref_to(method.mixin_from.path)%>"><%= method.mixin_from.full_name %></a>
+            </div>
+          <%- end -%>
           <%- if method.comment then -%>
           <%= method.description.strip %>
           <%- else -%>
@@ -144,12 +175,6 @@
               %>
             </div>
           <%- end -%>
-
-          <%- if method.token_stream then -%>
-          <div class="method-source-code" id="<%= method.html_name %>-source">
-            <pre><%= method.markup_code %></pre>
-          </div>
-          <%- end -%>
         </div>
         <%- end -%>
 
diff --git a/lib/rdoc/generator/template/darkfish/css/rdoc.css b/lib/rdoc/generator/template/darkfish/css/rdoc.css
index 0032ac172a..2bdffed564 100644
--- a/lib/rdoc/generator/template/darkfish/css/rdoc.css
+++ b/lib/rdoc/generator/template/darkfish/css/rdoc.css
@@ -1,5 +1,5 @@
 /*
- * "Darkfish" Rdoc CSS
+ * "Darkfish" RDoc CSS
  * $Id: rdoc.css 54 2009-01-27 01:09:48Z deveiant $
  *
  * Author: Michael Granger <ged@FaerieMUD.org>
@@ -7,21 +7,22 @@
  */
 
 /* vim: ft=css et sw=2 ts=2 sts=2 */
-/* Base Green is: #6C8C22 */
 
 /* 1. Variables and Root Styles */
 :root {
   --sidebar-width: 300px;
-  --primary-color: #2c8c5e;  /* A more muted green */
-  --secondary-color: #246b4b;  /* A darker, muted green */
-  --text-color: #333;
-  --background-color: #f8f9fa;
-  --code-block-background-color: #f0f4f8;
-  --code-block-border-color: #d1d5da;
-  --link-color: #246b4b;  /* A muted teal-green color */
-  --link-hover-color: #25a28a;  /* A slightly brighter teal-green */
-  --border-color: #e0e0e0;
-  --sidebar-text-color: #2c3e50;  /* Dark blue-gray for contrast */
+  --highlight-color: #cc342d; /* Reddish color for accents and headings */
+  --secondary-highlight-color: #c83045; /* Darker reddish color for secondary highlights */
+  --text-color: #505050; /* Dark bluish-grey for text */
+  --background-color: #fefefe; /* Near white background */
+  --code-block-background-color: #f6f6f3; /* Slightly darker grey for code blocks */
+  --link-color: #42405F; /* Dark bluish-grey for links */
+  --link-hover-color: var(--highlight-color); /* Reddish color on hover */
+  --border-color: #e0e0e0;; /* General border color */
+  --source-code-toggle-color: var(--secondary-highlight-color);
+  --scrollbar-thumb-hover-background: #505050; /* Hover color for scrollbar thumb */
+  --table-header-background-color: #eceaed;
+  --table-td-background-color: #f5f4f6;
 
   /* Font family variables */
   --font-primary: 'Lato', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
@@ -83,22 +84,26 @@ h4:target,
 h5:target,
 h6:target {
   margin-left: -10px;
-  border-left: 10px solid #f1edba;
+  border-left: 10px solid var(--border-color);
+  scroll-margin-top: 1rem;
+}
+
+main .anchor-link:target {
+  scroll-margin-top: 1rem;
 }
 
 /* 4. Links */
-:link,
-:visited {
+a {
   color: var(--link-color);
-  text-decoration: none;
   transition: color 0.3s ease;
-  font-weight: 600;  /* Make links bolder */
 }
 
-:link:hover,
-:visited:hover {
+a:hover {
+  color: var(--link-hover-color);
+}
+
+a code:hover {
   color: var(--link-hover-color);
-  text-decoration: underline;
 }
 
 /* 5. Code and Pre */
@@ -106,16 +111,23 @@ code,
 pre {
   font-family: var(--font-code);
   background-color: var(--code-block-background-color);
-  border: 1px solid var(--code-block-border-color);
+  border: 1px solid var(--border-color);
   border-radius: 6px;
   padding: 16px;
   overflow-x: auto;
-  font-size: 15px;  /* Increased from 14px */
-  line-height: 1.5;  /* Slightly increased for better readability with larger font */
-  margin: 1em 0;  /* Add some vertical margin */
+  font-size: 15px;
+  line-height: 1.5;
+  margin: 1em 0;
 }
 
-/* 6. Tables */
+code {
+  background-color: var(--code-block-background-color);
+  padding: 0.1em 0.3em;
+  border-radius: 3px;
+  font-size: 85%;
+}
+
+/* Tables */
 table {
   margin: 0;
   border-spacing: 0;
@@ -124,15 +136,15 @@ table {
 
 table tr th, table tr td {
   padding: 0.2em 0.4em;
-  border: 1px solid #ccc;
+  border: 1px solid var(--border-color);
 }
 
 table tr th {
-  background-color: #eceaed;
+  background-color: var(--table-header-background-color);
 }
 
 table tr:nth-child(even) td {
-  background-color: #f5f4f6;
+  background-color: var(--table-td-background-color);
 }
 
 /* 7. Navigation and Sidebar */
@@ -145,12 +157,12 @@ nav {
   bottom: 0;
   left: 0;
   width: var(--sidebar-width);
-  background: var(--background-color);
+  background: var(--background-color); /* It needs an explicit background for toggling narrow screens */
   overflow-y: auto;
   z-index: 10;
   display: flex;
   flex-direction: column;
-  color: var(--sidebar-text-color);
+  color: var(--text-color);
 }
 
 nav[hidden] {
@@ -159,7 +171,11 @@ nav[hidden] {
 
 nav footer {
   padding: 1em;
-  border-top: 1px solid #ccc;
+  border-top: 1px solid var(--border-color);
+}
+
+nav footer a {
+  color: var(--secondary-highlight-color);
 }
 
 nav .nav-section {
@@ -167,20 +183,20 @@ nav .nav-section {
   padding: 0 1em;
 }
 
-nav h2 {
+nav h2, nav h3 {
   margin: 0 0 0.5em;
   padding: 0.5em 0;
-  font-size: 1.2em;
-  color: var(--text-color);
+  color: var(--highlight-color);
   border-bottom: 1px solid var(--border-color);
 }
 
+nav h2 {
+  font-size: 1.2em;
+}
+
 nav h3,
 #table-of-contents-navigation {
-  margin: 0;
-  padding: 0.5em 0;
   font-size: 1em;
-  color: var(--text-color);
 }
 
 nav ul,
@@ -213,6 +229,7 @@ nav a {
 }
 
 nav a:hover {
+  color: var(--link-hover-color);
   text-decoration: underline;
 }
 
@@ -223,6 +240,7 @@ nav a:hover {
   position: fixed;
   top: 10px;
   left: 20px;
+  cursor: pointer;
 }
 
 #navigation-toggle[aria-expanded="true"] {
@@ -240,6 +258,10 @@ nav ul li details > summary {
   position: relative; /* So that the open/close triangle can position itself absolutely inside */
 }
 
+nav ul li details > summary::-webkit-details-marker {
+  display: none;  /* Removes the default marker, in Safari 18. */
+}
+
 nav ul li details > summary::after {
   content: '▶';  /* Unicode right-pointing triangle */
   position: absolute;
@@ -272,6 +294,13 @@ main {
   }
 }
 
+main h1[class] {
+  margin-top: 0;
+  margin-bottom: 1em;
+  font-size: 2.5em;
+  color: var(--highlight-color);
+}
+
 main h1,
 main h2,
 main h3,
@@ -279,6 +308,7 @@ main h4,
 main h5,
 main h6 {
   font-family: var(--font-heading);
+  color: var(--highlight-color);
 }
 
 @media (min-width: 1024px) {
@@ -287,12 +317,7 @@ main h6 {
   }
 }
 
-#validator-badges {
-  margin: 1em 1em 2em;
-  font-size: smaller;
-}
-
-/* 9. Search */
+/* Search */
 #search-section {
   padding: 1em;
   background-color: var(--background-color);
@@ -307,26 +332,25 @@ main h6 {
 
 #search-field {
   width: 100%;
-  padding: 0.5em 1em 0.5em 2em;
+  padding: 0.5em 1em 0.5em 2.5em;
   border: 1px solid var(--border-color);
   border-radius: 20px;
   font-size: 14px;
   outline: none;
   transition: border-color 0.3s ease;
-  background-color: var(--background-color);
+  color: var(--text-color);
 }
 
 #search-field:focus {
-  border-color: var(--primary-color);
+  border-color: var(--highlight-color);
 }
 
 #search-field::placeholder {
   color: var(--text-color);
-  opacity: 0.6;
 }
 
 #search-field-wrapper::before {
-  content: "\1F50D";  /* Unicode for magnifying glass */
+  content: "\1F50D";
   position: absolute;
   left: 0.75em;
   top: 50%;
@@ -336,166 +360,110 @@ main h6 {
   opacity: 0.6;
 }
 
-/* 10. Utility Classes */
-.hide { display: none !important; }
-.initially-hidden { display: none; }
-
-/* 11. Media Queries */
-@media (min-width: 1024px) {
-  /* Styles for larger screens */
-}
-
-/* 12. Print Styles */
-@media print {
-  /* Print-specific styles */
-}
-
-/* 13. Syntax Highlighting */
-.ruby-constant   { color: #0366d6; }  /* Bright blue for constants */
-.ruby-keyword    { color: #d73a49; }  /* Red for keywords */
-.ruby-ivar       { color: #e36209; }  /* Orange for instance variables */
-.ruby-operator   { color: #005cc5; }  /* Dark blue for operators */
-.ruby-identifier { color: #24292e; }  /* Dark gray for identifiers */
-.ruby-node       { color: #22863a; }  /* Green for interpolation */
-.ruby-comment    { color: #6a737d; }  /* Gray for comments */
-.ruby-regexp     { color: #032f62; }  /* Navy for regular expressions */
-.ruby-value      { color: #005cc5; }  /* Dark blue for numeric values */
-.ruby-string     { color: #22863a; }  /* Green for strings */
-
-code {
-  background-color: #f0f4f8;  /* Match pre background */
-  padding: 0.2em 0.4em;
-  border-radius: 3px;
-  font-size: 85%;
+/* Search Results */
+#search-results {
+  font-family: var(--font-primary);
+  font-weight: 300;
 }
 
-em {
-  text-decoration-color: rgba(52, 48, 64, 0.25);
-  text-decoration-line: underline;
-  text-decoration-style: dotted;
+#search-results .search-match {
+  font-family: var(--font-heading);
+  font-weight: normal;
 }
 
-strong,
-em {
-  background-color: rgba(158, 178, 255, 0.1);
+#search-results .search-selected {
+  background: var(--code-block-background-color);
+  border-bottom: 1px solid transparent;
 }
 
-/* 14. Specific Component Styles */
-.table-of-contents ul {
-  margin: 1em;
+#search-results li {
   list-style: none;
+  border-bottom: 1px solid var(--border-color);
+  margin-bottom: 0.5em;
 }
 
-.table-of-contents ul ul {
-  margin-top: 0.25em;
-}
-
-.table-of-contents ul :link,
-.table-of-contents ul :visited {
-  font-size: 16px;
-}
-
-.table-of-contents li {
-  margin-bottom: 0.25em;
-}
-
-.table-of-contents li .toc-toggle {
-  width: 16px;
-  height: 16px;
-  background: url(../images/add.png) no-repeat;
-}
-
-.table-of-contents li .toc-toggle.open {
-  background: url(../images/delete.png) no-repeat;
-}
-
-main {
-  color: #333;
+#search-results li:last-child {
+  border-bottom: none;
+  margin-bottom: 0;
 }
 
-main > h1:first-child,
-main > h2:first-child,
-main > h3:first-child,
-main > h4:first-child,
-main > h5:first-child,
-main > h6:first-child {
-  margin-top: 0px;
+#search-results li p {
+  padding: 0;
+  margin: 0.5em;
 }
 
-main sup {
-  vertical-align: super;
-  font-size: 0.8em;
+#search-results .search-namespace {
+  font-weight: bold;
 }
 
-/* The heading with the class name */
-main h1[class] {
-  margin-top: 0;
-  margin-bottom: 1em;
-  font-size: 2.5em;
-  color: var(--primary-color);
+#search-results li em {
+  background-color: rgba(224, 108, 117, 0.1);
+  font-style: normal;
 }
 
-main h1 {
-  margin: 1.5em 0 0.5em;
-  font-size: 2.2em;
-  color: var(--secondary-color);
+#search-results pre {
+  margin: 0.5em;
+  font-family: var(--font-code);
 }
 
-main h2 {
-  margin: 1.3em 0 0.5em;
-  font-size: 1.8em;
-  color: var(--secondary-color);
-}
+/* Syntax Highlighting - Gruvbox Light Scheme */
 
-main h3 {
-  margin: 1.2em 0 0.5em;
-  font-size: 1.5em;
-  color: var(--secondary-color);
-}
+.ruby-constant   { color: #AF3A03; }  /* Dark Orange */
+.ruby-keyword    { color: #9D0006; }  /* Dark Red */
+.ruby-ivar       { color: #B57614; }  /* Brown */
+.ruby-operator   { color: #427B58; }  /* Dark Teal */
+.ruby-identifier { color: #076678; }  /* Deep Teal */
+.ruby-node       { color: #8F3F71; }  /* Plum */
+.ruby-comment    { color: #928374; font-style: italic; }  /* Gray */
+.ruby-regexp     { color: #8F3F71; }  /* Plum */
+.ruby-value      { color: #AF3A03; }  /* Dark Orange */
+.ruby-string     { color: #79740E; }  /* Olive */
 
-main h4 {
-  margin: 1.1em 0 0.5em;
-  font-size: 1.3em;
-  color: var(--secondary-color);
+/* Emphasis */
+em {
+  text-decoration-color: rgba(52, 48, 64, 0.25);
+  text-decoration-line: underline;
+  text-decoration-style: dotted;
 }
 
-main h5, main h6 {
-  margin: 1em 0 0.5em;
-  font-size: 1.1em;
-  color: var(--secondary-color);
+strong,
+em {
+  color: var(--highlight-color);
+  background-color: rgba(255, 111, 97, 0.1); /* Light red background for emphasis */
 }
 
+/* Paragraphs */
 main p {
   line-height: 1.5em;
   font-weight: 400;
 }
 
+/* Preformatted Text */
 main pre {
   margin: 1.2em 0.5em;
   padding: 1em;
   font-size: 0.8em;
 }
 
+/* Horizontal Rules */
 main hr {
   margin: 1.5em 1em;
-  border: 2px solid #ddd;
+  border: 2px solid var(--border-color);
 }
 
+/* Blockquotes */
 main blockquote {
   margin: 0 2em 1.2em 1.2em;
   padding-left: 0.5em;
-  border-left: 2px solid #ddd;
-}
-
-main ol,
-main ul {
-  margin: 1em 2em;
+  border-left: 2px solid var(--border-color);
 }
 
+/* Lists */
 main li > p {
-  margin-bottom: 0.5em;
+  margin: 0.5em;
 }
 
+/* Definition Lists */
 main dl {
   margin: 1em 0.5em;
 }
@@ -511,79 +479,59 @@ main dd {
   margin: 0 1em 1em 0.5em;
 }
 
+/* Headers within Main */
 main header h2 {
   margin-top: 2em;
   border-width: 0;
-  border-top: 4px solid #bbb;
+  border-top: 4px solid var(--border-color);
   font-size: 130%;
 }
 
 main header h3 {
   margin: 2em 0 1.5em;
   border-width: 0;
-  border-top: 3px solid #bbb;
+  border-top: 3px solid var(--border-color);
   font-size: 120%;
 }
 
-.documentation-section-title {
-  position: relative;
-}
-.documentation-section-title .section-click-top {
-  position: absolute;
-  top: 6px;
-  left: 12px;
-  font-size: 10px;
-  color: #9b9877;
-  visibility: hidden;
-  padding-left: 0.5px;
-}
-
-.documentation-section-title:hover .section-click-top {
-  visibility: visible;
-}
-
-.constants-list > dl {
-  margin: 1em 0 2em;
-  border: 0;
-}
+/* Utility Classes */
+.hide { display: none !important; }
+.initially-hidden { display: none; }
 
-.constants-list > dl dt {
-  margin-bottom: 0.75em;
-  padding-left: 0;
-  font-family: var(--font-code);
-  font-size: 110%;
+/* Media Queries */
+@media (min-width: 1024px) {
+  /* Styles for larger screens */
+  .table-of-contents main {
+    margin-left: 20em;
+  }
 }
 
-.constants-list > dl dt a {
-  color: inherit;
+@media print {
+  /* Print-specific styles */
 }
 
-.constants-list > dl dd {
-  margin: 0 0 2em 0;
-  padding: 0;
-  color: #666;
+/* Table of Contents */
+.table-of-contents ul {
+  margin: 1em;
+  list-style: none;
 }
 
-.documentation-section h2 {
-  position: relative;
+.table-of-contents ul ul {
+  margin-top: 0.25em;
 }
 
-.documentation-section h2 a {
-  position: absolute;
-  top: 8px;
-  right: 10px;
-  font-size: 12px;
-  color: #9b9877;
-  visibility: hidden;
+.table-of-contents ul :link,
+.table-of-contents ul :visited {
+  font-size: 16px;
 }
 
-.documentation-section h2:hover a {
-  visibility: visible;
+.table-of-contents li {
+  margin-bottom: 0.25em;
 }
 
-/* @group Method Details */
-
+/* Method Details */
 main .method-source-code {
+  visibility: hidden;
   max-height: 0;
   overflow: auto;
   transition-duration: 200ms;
@@ -592,7 +540,12 @@ main .method-source-code {
   transition-timing-function: ease-in-out;
 }
 
+main .method-source-code pre {
+  border-color: var(--source-code-toggle-color);
+}
+
 main .method-source-code.active-menu {
+  visibility: visible;
   max-height: 100vh;
 }
 
@@ -603,12 +556,15 @@ main .method-description .method-calls-super {
 
 main .method-detail {
   margin-bottom: 2.5em;
-  cursor: pointer;
 }
 
 main .method-detail:target {
   margin-left: -10px;
-  border-left: 10px solid #f1edba;
+  border-left: 10px solid var(--border-color);
+}
+
+main .method-header {
+  display: inline-block;
 }
 
 main .method-heading {
@@ -616,29 +572,25 @@ main .method-heading {
   font-family: var(--font-code);
   font-size: 110%;
   font-weight: bold;
-  color: var(--text-color);
 }
-main .method-heading :link,
-main .method-heading :visited {
-  color: inherit;
-}
-main .method-click-advice {
+
+main .method-heading::after {
+  content: '¶';
   position: absolute;
-  top: 2px;
-  right: 5px;
-  font-size: 12px;
-  color: #9b9877;
   visibility: hidden;
-  padding-right: 20px;
-  line-height: 20px;
-  background: url(../images/zoom.png) no-repeat right top;
+  color: var(--highlight-color);
+  font-size: 0.5em;
 }
-main .method-header:hover .method-click-advice {
+
+main .method-heading:hover::after {
   visibility: visible;
 }
 
-main .method-alias .method-heading {
-  color: #666;
+main .method-controls {
+  line-height: 20px;
+  float: right;
+  color: var(--source-code-toggle-color);
+  cursor: pointer;
 }
 
 main .method-description,
@@ -652,6 +604,17 @@ main .aliases {
   font-style: italic;
   cursor: default;
 }
+
+main .aliases a {
+  color: var(--secondary-highlight-color);
+}
+
+main .mixin-from {
+  font-size: 80%;
+  font-style: italic;
+  margin-bottom: 0.75em;
+}
+
 main .method-description ul {
   margin-left: 1.5em;
 }
@@ -660,60 +623,12 @@ main #attribute-method-details .method-detail:hover {
   background-color: transparent;
   cursor: default;
 }
+
 main .attribute-access-type {
   text-transform: uppercase;
-  padding: 0 1em;
-}
-/* @end */
-
-/* @end */
-
-/* @group search results */
-#search-results {
-  font-family: var(--font-primary);
-  font-weight: 300;
-}
-
-#search-results .search-match {
-  font-family: var(--font-heading);
-  font-weight: normal;
-}
-
-#search-results .search-selected {
-  background: #e8e8e8;
-  border-bottom: 1px solid transparent;
-}
-
-#search-results li {
-  list-style: none;
-  border-bottom: 1px solid #aaa;
-  margin-bottom: 0.5em;
-}
-
-#search-results li:last-child {
-  border-bottom: none;
-  margin-bottom: 0;
-}
-
-#search-results li p {
-  padding: 0;
-  margin: 0.5em;
-}
-
-#search-results .search-namespace {
-  font-weight: bold;
-}
-
-#search-results li em {
-  background: yellow;
-  font-style: normal;
-}
-
-#search-results pre {
-  margin: 0.5em;
-  font-family: var(--font-code);
 }
 
+/* Responsive Adjustments */
 @media (max-width: 480px) {
   nav {
     width: 100%;
@@ -739,6 +654,9 @@ main .attribute-access-type {
     overflow-x: auto;
     white-space: nowrap;
   }
-}
-/* @end */
 
+  main .method-controls {
+    margin-top: 10px;
+    float: none;
+  }
+}
diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
index bea0a5f1cb..aeb8526344 100644
--- a/lib/rdoc/generator/template/darkfish/js/darkfish.js
+++ b/lib/rdoc/generator/template/darkfish/js/darkfish.js
@@ -34,7 +34,7 @@ function showSource( e ) {
 };
 
 function hookSourceViews() {
-  document.querySelectorAll('.method-heading').forEach(function (codeObject) {
+  document.querySelectorAll('.method-source-toggle').forEach(function (codeObject) {
     codeObject.addEventListener('click', showSource);
   });
 };
diff --git a/lib/rdoc/markup/to_rdoc.rb b/lib/rdoc/markup/to_rdoc.rb
index 88234f5096..90763ccfdb 100644
--- a/lib/rdoc/markup/to_rdoc.rb
+++ b/lib/rdoc/markup/to_rdoc.rb
@@ -249,8 +249,8 @@ def accept_verbatim verbatim
   # Adds +table+ to the output
 
   def accept_table header, body, aligns
-    widths = header.zip(body) do |h, b|
-      [h.size, b.size].max
+    widths = header.zip(*body).map do |cols|
+      cols.map(&:size).max
     end
     aligns = aligns.map do |a|
       case a
@@ -262,12 +262,12 @@ def accept_table header, body, aligns
         :rjust
       end
     end
-    @res << header.zip(widths, aligns) do |h, w, a|
+    @res << header.zip(widths, aligns).map do |h, w, a|
       h.__send__(a, w)
     end.join("|").rstrip << "\n"
     @res << widths.map {|w| "-" * w }.join("|") << "\n"
     body.each do |row|
-      @res << row.zip(widths, aligns) do |t, w, a|
+      @res << row.zip(widths, aligns).map do |t, w, a|
         t.__send__(a, w)
       end.join("|").rstrip << "\n"
     end
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 2631d57364..a607a76d56 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -344,6 +344,11 @@ class RDoc::Options
   # Indicates if files of test suites should be skipped
   attr_accessor :skip_tests
 
+  ##
+  # Embed mixin methods, attributes, and constants into class documentation. Set via
+  # +--[no-]embed-mixins+ (Default is +false+.)
+  attr_accessor :embed_mixins
+
   def initialize loaded_options = nil # :nodoc:
     init_ivars
     override loaded_options if loaded_options
@@ -351,6 +356,7 @@ def initialize loaded_options = nil # :nodoc:
 
   def init_ivars # :nodoc:
     @dry_run = false
+    @embed_mixins = false
     @exclude = %w[
       ~\z \.orig\z \.rej\z \.bak\z
       \.gemspec\z
@@ -401,6 +407,7 @@ def init_with map # :nodoc:
     @encoding = encoding ? Encoding.find(encoding) : encoding
 
     @charset        = map['charset']
+    @embed_mixins   = map['embed_mixins']
     @exclude        = map['exclude']
     @generator_name = map['generator_name']
     @hyperlink_all  = map['hyperlink_all']
@@ -432,6 +439,7 @@ def override map # :nodoc:
     end
 
     @charset        = map['charset']        if map.has_key?('charset')
+    @embed_mixins   = map['embed_mixins']   if map.has_key?('embed_mixins')
     @exclude        = map['exclude']        if map.has_key?('exclude')
     @generator_name = map['generator_name'] if map.has_key?('generator_name')
     @hyperlink_all  = map['hyperlink_all']  if map.has_key?('hyperlink_all')
@@ -460,11 +468,12 @@ def override map # :nodoc:
   def == other # :nodoc:
     self.class === other and
       @encoding       == other.encoding       and
+      @embed_mixins   == other.embed_mixins   and
       @generator_name == other.generator_name and
       @hyperlink_all  == other.hyperlink_all  and
       @line_numbers   == other.line_numbers   and
       @locale         == other.locale         and
-      @locale_dir     == other.locale_dir and
+      @locale_dir     == other.locale_dir     and
       @main_page      == other.main_page      and
       @markup         == other.markup         and
       @op_dir         == other.op_dir         and
@@ -842,6 +851,14 @@ def parse argv
 
       opt.separator nil
 
+      opt.on("--[no-]embed-mixins",
+             "Embed mixin methods, attributes, and constants",
+             "into class documentation. (default false)") do |value|
+        @embed_mixins = value
+      end
+
+      opt.separator nil
+
       markup_formats = RDoc::Text::MARKUP_FORMAT.keys.sort
 
       opt.on("--markup=MARKUP", markup_formats,
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index 47108ceee3..88ae55b409 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -520,6 +520,7 @@ def generate
       Dir.chdir @options.op_dir do
         unless @options.quiet then
           $stderr.puts "\nGenerating #{@generator.class.name.sub(/^.*::/, '')} format into #{Dir.pwd}..."
+          $stderr.puts "\nYou can visit the home page at: \e]8;;file://#{Dir.pwd}/index.html\e\\file://#{Dir.pwd}/index.html\e]8;;\e\\"
         end
 
         @generator.generate
diff --git a/rdoc.gemspec b/rdoc.gemspec
index a4a6e26543..0f2f150a03 100644
--- a/rdoc.gemspec
+++ b/rdoc.gemspec
@@ -46,27 +46,27 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
     "LEGAL.rdoc",
     "LICENSE.rdoc",
     "README.rdoc",
-    "RI.rdoc",
+    "RI.md",
     "TODO.rdoc",
     "exe/rdoc",
     "exe/ri",
     "lib/rdoc.rb",
-    "lib/rdoc/alias.rb",
-    "lib/rdoc/anon_class.rb",
-    "lib/rdoc/any_method.rb",
-    "lib/rdoc/attr.rb",
-    "lib/rdoc/class_module.rb",
+    "lib/rdoc/code_object/alias.rb",
+    "lib/rdoc/code_object/anon_class.rb",
+    "lib/rdoc/code_object/any_method.rb",
+    "lib/rdoc/code_object/attr.rb",
+    "lib/rdoc/code_object/class_module.rb",
     "lib/rdoc/code_object.rb",
     "lib/rdoc/code_objects.rb",
     "lib/rdoc/comment.rb",
-    "lib/rdoc/constant.rb",
-    "lib/rdoc/context.rb",
-    "lib/rdoc/context/section.rb",
+    "lib/rdoc/code_object/constant.rb",
+    "lib/rdoc/code_object/context.rb",
+    "lib/rdoc/code_object/context/section.rb",
     "lib/rdoc/cross_reference.rb",
     "lib/rdoc/encoding.rb",
     "lib/rdoc/erb_partial.rb",
     "lib/rdoc/erbio.rb",
-    "lib/rdoc/extend.rb",
+    "lib/rdoc/code_object/extend.rb",
     "lib/rdoc/generator.rb",
     "lib/rdoc/generator/darkfish.rb",
     "lib/rdoc/generator/json_index.rb",
@@ -136,11 +136,11 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
     "lib/rdoc/generator/template/json_index/.document",
     "lib/rdoc/generator/template/json_index/js/navigation.js",
     "lib/rdoc/generator/template/json_index/js/searcher.js",
-    "lib/rdoc/ghost_method.rb",
+    "lib/rdoc/code_object/ghost_method.rb",
     "lib/rdoc/i18n.rb",
     "lib/rdoc/i18n/locale.rb",
     "lib/rdoc/i18n/text.rb",
-    "lib/rdoc/include.rb",
+    "lib/rdoc/code_object/include.rb",
     "lib/rdoc/known_classes.rb",
     "lib/rdoc/markdown.kpeg",
     "lib/rdoc/markdown/entities.rb",
@@ -180,11 +180,11 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
     "lib/rdoc/markup/to_test.rb",
     "lib/rdoc/markup/to_tt_only.rb",
     "lib/rdoc/markup/verbatim.rb",
-    "lib/rdoc/meta_method.rb",
-    "lib/rdoc/method_attr.rb",
-    "lib/rdoc/mixin.rb",
-    "lib/rdoc/normal_class.rb",
-    "lib/rdoc/normal_module.rb",
+    "lib/rdoc/code_object/meta_method.rb",
+    "lib/rdoc/code_object/method_attr.rb",
+    "lib/rdoc/code_object/mixin.rb",
+    "lib/rdoc/code_object/normal_class.rb",
+    "lib/rdoc/code_object/normal_module.rb",
     "lib/rdoc/options.rb",
     "lib/rdoc/parser.rb",
     "lib/rdoc/parser/c.rb",
@@ -201,7 +201,7 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
     "lib/rdoc/rd/inline.rb",
     "lib/rdoc/rd/inline_parser.ry",
     "lib/rdoc/rdoc.rb",
-    "lib/rdoc/require.rb",
+    "lib/rdoc/code_object/require.rb",
     "lib/rdoc/ri.rb",
     "lib/rdoc/ri/driver.rb",
     "lib/rdoc/ri/formatter.rb",
@@ -210,7 +210,7 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
     "lib/rdoc/ri/task.rb",
     "lib/rdoc/rubygems_hook.rb",
     "lib/rdoc/servlet.rb",
-    "lib/rdoc/single_class.rb",
+    "lib/rdoc/code_object/single_class.rb",
     "lib/rdoc/stats.rb",
     "lib/rdoc/stats/normal.rb",
     "lib/rdoc/stats/quiet.rb",
@@ -220,7 +220,7 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
     "lib/rdoc/text.rb",
     "lib/rdoc/token_stream.rb",
     "lib/rdoc/tom_doc.rb",
-    "lib/rdoc/top_level.rb",
+    "lib/rdoc/code_object/top_level.rb",
     "lib/rdoc/version.rb",
     "lib/rubygems_plugin.rb",
     "man/ri.1",
diff --git a/test/rdoc/support/text_formatter_test_case.rb b/test/rdoc/support/text_formatter_test_case.rb
index e359028a29..9b3d7ed626 100644
--- a/test/rdoc/support/text_formatter_test_case.rb
+++ b/test/rdoc/support/text_formatter_test_case.rb
@@ -99,6 +99,23 @@ def test_accept_paragraph_wrap
         accept_paragraph_wrap
       end
 
+      ##
+      # Test case that calls <tt>@to.accept_table</tt>
+
+      def test_accept_table_align
+        header = ['AA', 'BB', 'CCCCC']
+        body = [
+          ['', 'bbb', 'c'],
+          ['aaaa', 'b', ''],
+          ['a', '', 'cc']
+        ]
+        aligns = [nil, :left, :right]
+        @to.start_accepting
+        @to.accept_table header, body, aligns
+
+        accept_table_align
+      end
+
       ##
       # Test case that calls <tt>@to.attributes</tt> with an escaped
       # cross-reference.  If this test doesn't pass something may be very
diff --git a/test/rdoc/test_rdoc_class_module.rb b/test/rdoc/test_rdoc_class_module.rb
index 27d37cb7dd..d70a3ea033 100644
--- a/test/rdoc/test_rdoc_class_module.rb
+++ b/test/rdoc/test_rdoc_class_module.rb
@@ -1500,4 +1500,140 @@ def test_update_extends_with_colons
     assert_equal [a, c], @c1.extends
   end
 
+  class TestRDocClassModuleMixins < XrefTestCase
+    def setup
+      super
+
+      klass_tl = @store.add_file("klass.rb")
+      @klass = klass_tl.add_class(RDoc::NormalClass, "Klass")
+
+      incmod_tl = @store.add_file("incmod.rb")
+      @incmod = incmod_tl.add_module(RDoc::NormalModule, "Incmod")
+
+      incmod_const = @incmod.add_constant(RDoc::Constant.new("INCMOD_CONST_WITHOUT_A_SECTION", nil, ""))
+      incmod_const = @incmod.add_constant(RDoc::Constant.new("INCMOD_CONST", nil, ""))
+      incmod_const.section = @incmod.add_section("Incmod const section")
+
+      incmod_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_method_without_a_section"))
+      incmod_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_method"))
+      incmod_method.section = @incmod.add_section("Incmod method section")
+
+      incmod_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_attr_without_a_section", "RW", ""))
+      incmod_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_attr", "RW", ""))
+      incmod_attr.section = @incmod.add_section("Incmod attr section")
+
+      incmod_private_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_private_method"))
+      incmod_private_method.visibility = :private
+
+      incmod_private_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_private_attr", "RW", ""))
+      incmod_private_attr.visibility = :private
+
+      extmod_tl = @store.add_file("extmod.rb")
+      @extmod = extmod_tl.add_module(RDoc::NormalModule, "Extmod")
+
+      extmod_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_method_without_a_section"))
+      extmod_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_method"))
+      extmod_method.section = @extmod.add_section("Extmod method section")
+
+      extmod_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_attr_without_a_section", "RW", "", true))
+      extmod_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_attr", "RW", "", true))
+      extmod_attr.section = @extmod.add_section("Extmod attr section")
+
+      extmod_private_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_private_method"))
+      extmod_private_method.visibility = :private
+
+      extmod_private_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_private_attr", "RW", "", true))
+      extmod_private_attr.visibility = :private
+
+      @klass.add_include(RDoc::Include.new("Incmod", nil))
+      @klass.add_extend(RDoc::Include.new("Extmod", nil))
+
+      @klass.add_include(RDoc::Include.new("ExternalInclude", nil))
+      @klass.add_extend(RDoc::Include.new("ExternalExtend", nil))
+    end
+
+    def test_embed_mixin_when_false_does_not_embed_anything
+      assert_false(@klass.options.embed_mixins)
+      @klass.complete(:protected)
+
+      refute_includes(@klass.constants.map(&:name), "INCMOD_CONST")
+      refute_includes(@klass.method_list.map(&:name), "incmod_method")
+      refute_includes(@klass.method_list.map(&:name), "extmod_method")
+      refute_includes(@klass.attributes.map(&:name), "incmod_attr")
+      refute_includes(@klass.attributes.map(&:name), "extmod_attr")
+    end
+
+    def test_embed_mixin_when_true_embeds_methods_and_constants
+      @klass.options.embed_mixins = true
+      @klass.complete(:protected)
+
+      # assert on presence and identity of methods and constants
+      constant = @klass.constants.find { |c| c.name == "INCMOD_CONST" }
+      assert(constant, "constant from included mixin should be present")
+      assert_equal(@incmod, constant.mixin_from)
+
+      instance_method = @klass.method_list.find { |m| m.name == "incmod_method" }
+      assert(instance_method, "instance method from included mixin should be present")
+      refute(instance_method.singleton)
+      assert_equal(@incmod, instance_method.mixin_from)
+
+      instance_attr = @klass.attributes.find { |a| a.name == "incmod_attr" }
+      assert(instance_attr, "instance attr from included mixin should be present")
+      refute(instance_attr.singleton)
+      assert_equal(@incmod, instance_attr.mixin_from)
+
+      refute(@klass.method_list.find { |m| m.name == "incmod_private_method" })
+      refute(@klass.attributes.find { |m| m.name == "incmod_private_attr" })
+
+      class_method = @klass.method_list.find { |m| m.name == "extmod_method" }
+      assert(class_method, "class method from extended mixin should be present")
+      assert(class_method.singleton)
+      assert_equal(@extmod, class_method.mixin_from)
+
+      class_attr = @klass.attributes.find { |a| a.name == "extmod_attr" }
+      assert(class_attr, "class attr from extended mixin should be present")
+      assert(class_attr.singleton)
+      assert_equal(@extmod, class_attr.mixin_from)
+
+      refute(@klass.method_list.find { |m| m.name == "extmod_private_method" })
+      refute(@klass.attributes.find { |m| m.name == "extmod_private_attr" })
+
+      # assert that sections are also imported
+      constant_section = @klass.sections.find { |s| s.title == "Incmod const section" }
+      assert(constant_section, "constant from included mixin should have a section")
+      assert_equal(constant_section, constant.section)
+
+      instance_method_section = @klass.sections.find { |s| s.title == "Incmod method section" }
+      assert(instance_method_section, "instance method from included mixin should have a section")
+      assert_equal(instance_method_section, instance_method.section)
+
+      instance_attr_section = @klass.sections.find { |s| s.title == "Incmod attr section" }
+      assert(instance_attr_section, "instance attr from included mixin should have a section")
+      assert_equal(instance_attr_section, instance_attr.section)
+
+      class_method_section = @klass.sections.find { |s| s.title == "Extmod method section" }
+      assert(class_method_section, "class method from extended mixin should have a section")
+      assert_equal(class_method_section, class_method.section)
+
+      class_attr_section = @klass.sections.find { |s| s.title == "Extmod attr section" }
+      assert(class_attr_section, "class attr from extended mixin should have a section")
+      assert_equal(class_attr_section, class_attr.section)
+
+      # and check that code objects without a section still have no section
+      constant = @klass.constants.find { |c| c.name == "INCMOD_CONST_WITHOUT_A_SECTION" }
+      assert_nil(constant.section.title)
+
+      instance_method = @klass.method_list.find { |c| c.name == "incmod_method_without_a_section" }
+      assert_nil(instance_method.section.title)
+
+      instance_attr = @klass.attributes.find { |c| c.name == "incmod_attr_without_a_section" }
+      assert_nil(instance_attr.section.title)
+
+      class_method = @klass.method_list.find { |c| c.name == "extmod_method_without_a_section" }
+      assert_nil(class_method.section.title)
+
+      class_attr = @klass.attributes.find { |c| c.name == "extmod_attr_without_a_section" }
+      assert_nil(class_attr.section.title)
+    end
+  end
 end
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb
index 899e697de6..f6c0a1e1cf 100644
--- a/test/rdoc/test_rdoc_generator_darkfish.rb
+++ b/test/rdoc/test_rdoc_generator_darkfish.rb
@@ -322,6 +322,51 @@ def test_title_escape
     assert_main_title(File.binread('index.html'), title)
   end
 
+  def test_meta_tags_for_index
+    @options.title = "My awesome Ruby project"
+    @g.generate
+
+    content = File.binread("index.html")
+
+    assert_include(content, '<meta name="keywords" content="ruby,documentation,My awesome Ruby project">')
+    assert_include(content, '<meta name="description" content="Documentation for My awesome Ruby project">')
+  end
+
+  def test_meta_tags_for_classes
+    top_level = @store.add_file("file.rb")
+    top_level.add_class(@klass.class, @klass.name)
+    inner = @klass.add_class(RDoc::NormalClass, "Inner")
+    inner.add_comment("This is a normal class. It is fully documented.", top_level)
+
+    @g.generate
+
+    content = File.binread("Klass/Inner.html")
+    assert_include(content, '<meta name="keywords" content="ruby,class,Klass::Inner">')
+    assert_include(
+      content,
+      '<meta name="description" content="class Klass::Inner: This is a normal class. It is fully documented.">',
+    )
+  end
+
+  def test_meta_tags_for_pages
+    top_level = @store.add_file("CONTRIBUTING.rdoc", parser: RDoc::Parser::Simple)
+    top_level.comment = <<~RDOC
+      = Contributing
+
+      Here are the instructions for contributing. Begin by installing Ruby.
+    RDOC
+
+    @g.generate
+
+    content = File.binread("CONTRIBUTING_rdoc.html")
+    assert_include(content, '<meta name="keywords" content="ruby,documentation,CONTRIBUTING">')
+    assert_include(
+      content,
+      "<meta name=\"description\" content=\"CONTRIBUTING: Contributing Here are the instructions for contributing." \
+      " Begin by installing Ruby.\">",
+    )
+  end
+
   ##
   # Asserts that +filename+ has a link count greater than 1 if hard links to
   # @tmpdir are supported.
diff --git a/test/rdoc/test_rdoc_markup_to_ansi.rb b/test/rdoc/test_rdoc_markup_to_ansi.rb
index 81372c64d2..893040cb44 100644
--- a/test/rdoc/test_rdoc_markup_to_ansi.rb
+++ b/test/rdoc/test_rdoc_markup_to_ansi.rb
@@ -348,6 +348,17 @@ def list_verbatim
     assert_equal expected, @to.end_accepting
   end
 
+  def accept_table_align
+    expected = "\e[0m" + <<-EXPECTED
+ AA |BB |CCCCC
+----|---|-----
+    |bbb|    c
+aaaa|b  |
+ a  |   |   cc
+    EXPECTED
+    assert_equal expected, @to.end_accepting
+  end
+
   # functional test
   def test_convert_list_note
     note_list = <<-NOTE_LIST
diff --git a/test/rdoc/test_rdoc_markup_to_bs.rb b/test/rdoc/test_rdoc_markup_to_bs.rb
index 7ebde481e6..93baa6b59f 100644
--- a/test/rdoc/test_rdoc_markup_to_bs.rb
+++ b/test/rdoc/test_rdoc_markup_to_bs.rb
@@ -349,4 +349,15 @@ def list_verbatim
     assert_equal expected, @to.end_accepting
   end
 
+  def accept_table_align
+    expected = <<-EXPECTED
+ AA |BB |CCCCC
+----|---|-----
+    |bbb|    c
+aaaa|b  |
+ a  |   |   cc
+    EXPECTED
+    assert_equal expected, @to.end_accepting
+  end
+
 end
diff --git a/test/rdoc/test_rdoc_markup_to_markdown.rb b/test/rdoc/test_rdoc_markup_to_markdown.rb
index 92ed37bc50..1b24eb8ef0 100644
--- a/test/rdoc/test_rdoc_markup_to_markdown.rb
+++ b/test/rdoc/test_rdoc_markup_to_markdown.rb
@@ -346,6 +346,17 @@ def list_verbatim
     assert_equal expected, @to.end_accepting
   end
 
+  def accept_table_align
+    expected = <<-EXPECTED
+ AA |BB |CCCCC
+----|---|-----
+    |bbb|    c
+aaaa|b  |
+ a  |   |   cc
+    EXPECTED
+    assert_equal expected, @to.end_accepting
+  end
+
   def test_convert_RDOCLINK
     result = @to.convert 'rdoc-garbage:C'
 
diff --git a/test/rdoc/test_rdoc_markup_to_rdoc.rb b/test/rdoc/test_rdoc_markup_to_rdoc.rb
index 50f4b6dc8b..c6f1aeae10 100644
--- a/test/rdoc/test_rdoc_markup_to_rdoc.rb
+++ b/test/rdoc/test_rdoc_markup_to_rdoc.rb
@@ -346,6 +346,17 @@ def list_verbatim
     assert_equal expected, @to.end_accepting
   end
 
+  def accept_table_align
+    expected = <<-EXPECTED
+ AA |BB |CCCCC
+----|---|-----
+    |bbb|    c
+aaaa|b  |
+ a  |   |   cc
+    EXPECTED
+    assert_equal expected, @to.end_accepting
+  end
+
   # functional test
   def test_convert_list_note
     note_list = <<-NOTE_LIST
diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
index 5e8b1ae3d8..1fc56b2d5e 100644
--- a/test/rdoc/test_rdoc_options.rb
+++ b/test/rdoc/test_rdoc_options.rb
@@ -65,6 +65,7 @@ def test_to_yaml
     expected = {
       'charset'              => 'UTF-8',
       'encoding'             => encoding,
+      'embed_mixins'         => false,
       'exclude'              => %w[~\z \.orig\z \.rej\z \.bak\z \.gemspec\z],
       'hyperlink_all'        => false,
       'line_numbers'         => false,
@@ -589,6 +590,20 @@ def test_parse_root
     assert_includes @options.rdoc_include, @options.root.to_s
   end
 
+  def test_parse_embed_mixins
+    assert_false(@options.embed_mixins)
+
+    out, err = capture_output { @options.parse(["--embed-mixins"]) }
+    assert_empty(out)
+    assert_empty(err)
+    assert_true(@options.embed_mixins)
+
+    out, err = capture_output { @options.parse(["--no-embed-mixins"]) }
+    assert_empty(out)
+    assert_empty(err)
+    assert_false(@options.embed_mixins)
+  end
+
   def test_parse_tab_width
     @options.parse %w[--tab-width=1]
     assert_equal 1, @options.tab_width
diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb
index 39e6e67759..3263e6173e 100644
--- a/test/rdoc/test_rdoc_ri_driver.rb
+++ b/test/rdoc/test_rdoc_ri_driver.rb
@@ -54,10 +54,10 @@ def test_self_dump
       RDoc::RI::Driver.dump @store1.cache_path
     end
 
-    assert_match %r%:class_methods%,    out
-    assert_match %r%:modules%,          out
-    assert_match %r%:instance_methods%, out
-    assert_match %r%:ancestors%,        out
+    assert_match %r%:class_methods|class_methods:%,       out
+    assert_match %r%:modules|modules:%,                   out
+    assert_match %r%:instance_methods|instance_methods:%, out
+    assert_match %r%:ancestors|ancestors:%,               out
   end
 
   def test_add_also_in_empty