diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2760829952..2b27a65289 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,8 +2,8 @@ name: Build docs site
 
 on:
   push:
-    # zActions is used to build and preview mkdocs changes.
-    branches: [ 11.x, 12.x, 13.x, zActions ]
+    # 99.x is used to build and preview mkdocs changes.
+    branches: [ 11.x, 12.x, 13.x, 99.x ]
     tags: ["11.*", "12.*", "13.*"]
 
 jobs:
diff --git a/docs/overrides/partials/.gitkeep b/docs/overrides/partials/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/overrides/partials/tabsBAK.html b/docs/overrides/partials/tabsBAK.html
deleted file mode 100644
index 43faa63e09..0000000000
--- a/docs/overrides/partials/tabsBAK.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  **
-  MW: Renamed because the Nav is only showing the API link. For now, no API link is added.
-      Also I updated this partial without testing 1/2025.
-  **
--->
-
-{% import "partials/tabs-item.html" as item with context %}
-
-<!-- Navigation tabs -->
-<nav
-        class="md-tabs"
-        aria-label="{{ lang.t('tabs') }}"
-        data-md-component="tabs"
->
-  <div class="md-grid">
-    <ul class="md-tabs__list">
-      {% for nav_item in nav %}
-      {{ item.render(nav_item) }}
-      {% endfor %}
-
-      <!-- MW: Add link built outside of mkdocs -->
-      <!-- This can now be done in 'nav' without an override but I'd have to hard code the domain https://github.com/squidfunk/mkdocs-material/issues/2072 and https://github.com/squidfunk/mkdocs-material/issues/1884 -->
-      <li class="md-tabs__item">
-        <a href="/api" class="md-tabs__link">API</a>
-      </li>
-      <!-- End Add -->
-    </ul>
-  </div>
-</nav>
diff --git a/mkdocs_base.yml b/mkdocs_base.yml
index 3df1cb1603..d5bf9c4c3a 100644
--- a/mkdocs_base.yml
+++ b/mkdocs_base.yml
@@ -51,6 +51,7 @@ extra:
 # Concerned about surveillance and spam so not enabling disqus for now.
 #  disqus: drush
 markdown_extensions:
+  - attr_list
   - toc:
       permalink: true
   - admonition: {  }
@@ -70,6 +71,9 @@ markdown_extensions:
   - pymdownx.superfences: { }
   - pymdownx.tabbed:
       alternate_style: true
+  - pymdownx.emoji:
+      emoji_index: '!!python/name:material.extensions.emoji.twemoji'
+      emoji_generator: '!!python/name:material.extensions.emoji.to_svg'
 nav:
   - Home: index.md
   - Use:
diff --git a/src/Commands/core/MkCommands.php b/src/Commands/core/MkCommands.php
index 1c6e3693ea..bf1ff35b6b 100644
--- a/src/Commands/core/MkCommands.php
+++ b/src/Commands/core/MkCommands.php
@@ -237,8 +237,8 @@ protected function writeYml(array $nav_commands, array $nav_generators, array $m
         $yaml_nav = Yaml::dump($base, PHP_INT_MAX, 2);
 
         // Remove invalid quotes that Symfony YAML adds/needs. https://github.com/symfony/symfony/blob/6.1/src/Symfony/Component/Yaml/Inline.php#L624
-        $yaml_nav = str_replace("'!!python/name:materialx.emoji.twemoji'", '!!python/name:materialx.emoji.twemoji', $yaml_nav);
-        $yaml_nav = str_replace("'!!python/name:materialx.emoji.to_svg'", '!!python/name:materialx.emoji.to_svg', $yaml_nav);
+        $yaml_nav = str_replace("'!!python/name:material.extensions.emoji.twemoji'", '!!python/name:material.extensions.emoji.twemoji', $yaml_nav);
+        $yaml_nav = str_replace("'!!python/name:material.extensions.emoji.to_svg'", '!!python/name:material.extensions.emoji.to_svg', $yaml_nav);
 
         file_put_contents(Path::join($dest, 'mkdocs.yml'), $yaml_nav);
     }