diff --git a/.gitignore b/.gitignore
index bdde85b..54b99e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,4 +68,5 @@ $RECYCLE.BIN/
 
 node_modules
 
-out
\ No newline at end of file
+out
+.gstack/
diff --git a/.lefthook.yml b/.lefthook.yml
index d5e4b64..b6692ee 100644
--- a/.lefthook.yml
+++ b/.lefthook.yml
@@ -9,5 +9,5 @@ pre-commit:
   commands:
     prettier:
       glob: '*.{css,dita*,json,md,xml,xsl,yml}'
-      run: prettier --write {staged_files}
+      run: npx prettier --write {staged_files}
       stage_fixed: true
diff --git a/cfg/fo/attrs/bootstrap-attr.xsl b/cfg/fo/attrs/bootstrap-attr.xsl
index a8b5c42..3579fa0 100644
--- a/cfg/fo/attrs/bootstrap-attr.xsl
+++ b/cfg/fo/attrs/bootstrap-attr.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -9,6 +13,67 @@
   <xsl:import href="default-values.xsl"/>
   <xsl:import href="settings-map.xsl"/>
 
+  <xsl:template name="get-context-theme-color">
+    <xsl:variable name="rawTheme">
+      <xsl:choose>
+        <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]/@theme">
+          <xsl:value-of select="ancestor::*[contains(@class, ' topic/note ')][1]/@theme"/>
+        </xsl:when>
+        <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]">
+          <xsl:variable name="type" select="(ancestor::*[contains(@class, ' topic/note ')][1]/@type, 'note')[1]"/>
+          <xsl:choose>
+            <xsl:when test="$type = 'note' or $type = 'notice' or $type = 'remember'">info</xsl:when>
+            <xsl:when test="$type = 'tip' or $type = 'fastpath'">success</xsl:when>
+            <xsl:when test="$type = 'important'">primary</xsl:when>
+            <xsl:when
+              test="$type = 'warning' or $type = 'caution' or $type = 'restriction' or $type = 'trouble'"
+            >warning</xsl:when>
+            <xsl:when test="$type = 'danger'">danger</xsl:when>
+            <xsl:otherwise>secondary</xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+        <xsl:when test="ancestor::*[contains(@class, ' bootstrap-d/alert ') or tokenize(@outputclass, ' ') = 'alert']">
+          <xsl:variable
+            name="node"
+            select="ancestor::*[contains(@class, ' bootstrap-d/alert ') or tokenize(@outputclass, ' ') = 'alert'][1]"
+          />
+          <xsl:value-of
+            select="($node/@theme, substring-after(tokenize($node/@outputclass, ' ')[starts-with(., 'alert-')][1], 'alert-'), 'secondary')[1]"
+          />
+        </xsl:when>
+        <xsl:when
+          test="ancestor::*[contains(@class, ' bootstrap-d/card ') or tokenize(@outputclass, ' ') = 'card']"
+        ><xsl:value-of
+            select="ancestor::*[contains(@class, ' bootstrap-d/card ') or tokenize(@outputclass, ' ') = 'card'][1]/@theme"
+          /></xsl:when>
+        <xsl:when
+          test="ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')]"
+        >
+          <xsl:variable
+            name="contextNode"
+            select="ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')][1]"
+          />
+          <xsl:variable name="contextColor">
+            <xsl:call-template name="get-theme-color">
+              <xsl:with-param name="node" select="$contextNode"/>
+            </xsl:call-template>
+          </xsl:variable>
+          <xsl:if test="$contextColor != ''">
+            <xsl:variable name="contextSuffix">
+              <xsl:call-template name="get-theme-suffix">
+                <xsl:with-param name="node" select="$contextNode"/>
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of
+              select="concat($contextColor, if ($contextSuffix != '') then concat('-', $contextSuffix) else '')"
+            />
+          </xsl:if>
+        </xsl:when>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:value-of select="$rawTheme"/>
+  </xsl:template>
+
   <!-- Standard Bootstrap Text Colors -->
   <xsl:attribute-set name="__color__primary">
     <xsl:attribute name="color"><xsl:value-of select="$bootstrap-primary"/></xsl:attribute>
@@ -28,125 +93,68 @@
   <xsl:attribute-set name="__color__info">
     <xsl:attribute name="color"><xsl:value-of select="$bootstrap-info"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__color__light">
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-light"/></xsl:attribute>
+  <xsl:attribute-set name="__color__accent">
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-accent"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__color__dark">
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-dark"/></xsl:attribute>
+  <xsl:attribute-set name="__color__inverse">
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-inverse"/></xsl:attribute>
   </xsl:attribute-set>
   <xsl:attribute-set name="common.link">
     <xsl:attribute name="color">
       <xsl:choose>
-        <xsl:when test="@color and local-name() = 'xref'">
-          <xsl:variable name="explicitVar" select="concat('bootstrap-', @color)"/>
+        <xsl:when test="@theme and local-name() = 'xref'">
+          <xsl:variable
+            name="baseColor"
+            select="if (contains(@theme, '-')) then substring-before(@theme, '-') else @theme"
+          />
+          <xsl:variable name="explicitVar" select="concat('bootstrap-', $baseColor)"/>
           <xsl:choose>
             <xsl:when test="$bootstrap-settings/entry[@name = $explicitVar]">
               <xsl:value-of select="$bootstrap-settings/entry[@name = $explicitVar]"/>
             </xsl:when>
-            <xsl:otherwise><xsl:value-of select="@color"/></xsl:otherwise>
+            <xsl:otherwise><xsl:value-of select="$baseColor"/></xsl:otherwise>
           </xsl:choose>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:variable name="theme">
-        <xsl:choose>
-          <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]/@color"><xsl:value-of
-                  select="ancestor::*[contains(@class, ' topic/note ')]/@color"
-                /></xsl:when>
-          <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]">
-            <xsl:variable name="type" select="(ancestor::*[contains(@class, ' topic/note ')]/@type, 'note')[1]"/>
-            <xsl:choose>
-              <xsl:when test="$type = 'note' or $type = 'notice' or $type = 'remember'">info</xsl:when>
-              <xsl:when test="$type = 'tip' or $type = 'fastpath'">success</xsl:when>
-              <xsl:when test="$type = 'important'">primary</xsl:when>
-              <xsl:when
-                    test="$type = 'warning' or $type = 'caution' or $type = 'restriction' or $type = 'trouble'"
-                  >warning</xsl:when>
-              <xsl:when test="$type = 'danger'">danger</xsl:when>
-              <xsl:otherwise>secondary</xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:when
-                test="ancestor::*[contains(@class, ' bootstrap-d/alert ') or tokenize(@outputclass, ' ') = 'alert']"
-              >
-            <xsl:variable
-                  name="node"
-                  select="ancestor::*[contains(@class, ' bootstrap-d/alert ') or tokenize(@outputclass, ' ') = 'alert'][1]"
-                />
-            <xsl:value-of
-                  select="($node/@color, substring-after(tokenize($node/@outputclass, ' ')[starts-with(., 'alert-')][1], 'alert-'), 'secondary')[1]"
-                />
-          </xsl:when>
-          <xsl:when
-                test="ancestor::*[contains(@class, ' bootstrap-d/card ') or tokenize(@outputclass, ' ') = 'card']"
-              ><xsl:value-of
-                  select="ancestor::*[contains(@class, ' bootstrap-d/card ') or tokenize(@outputclass, ' ') = 'card']/@color"
-                /></xsl:when>
-          <xsl:when
-                test="ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')]"
-              ><xsl:value-of
-                  select="ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')][1]/@color"
-                /></xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$theme != ''">
-          <xsl:variable name="subtleVar" select="concat('bootstrap-', $theme, '-subtle-text')"/>
-          <xsl:value-of select="$bootstrap-settings/entry[@name = $subtleVar]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$bootstrap-link"/>
-        </xsl:otherwise>
-      </xsl:choose>
+          <xsl:variable name="contextTheme"><xsl:call-template name="get-context-theme-color"/></xsl:variable>
+          <xsl:variable
+            name="contextColor"
+            select="if (contains($contextTheme, '-')) then substring-before($contextTheme, '-') else $contextTheme"
+          />
+          <xsl:variable
+            name="contextSuffix"
+            select="if (contains($contextTheme, '-')) then substring-after($contextTheme, '-') else ''"
+          />
+          <xsl:choose>
+            <xsl:when test="$contextColor = '' or contains($contextSuffix, 'border')">
+              <xsl:value-of select="$bootstrap-link"/>
+            </xsl:when>
+            <xsl:when test="contains($contextSuffix, 'subtle')">
+              <xsl:variable name="subtleVar" select="concat('bootstrap-', $contextColor, '-subtle-text')"/>
+              <xsl:value-of select="$bootstrap-settings/entry[@name = $subtleVar]"/>
+            </xsl:when>
+            <xsl:when test="contains($contextSuffix, 'muted')">
+              <xsl:call-template name="getBootstrapAttrValue">
+                <xsl:with-param name="attrSet" select="concat('__muted__', $contextColor)"/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+              <!-- No suffix, or -contrast: solid background, so use its contrast text color -->
+              <xsl:call-template name="getBootstrapAttrValue">
+                <xsl:with-param name="attrSet" select="concat('__bg__', $contextColor)"/>
+              </xsl:call-template>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:attribute>
     <xsl:attribute name="text-decoration">
       <xsl:choose>
-        <xsl:when test="@color and local-name() = 'xref'"><xsl:value-of
+        <xsl:when test="@theme and local-name() = 'xref'"><xsl:value-of
             select="$bootstrap-alert-link-text-decoration"
           /></xsl:when>
         <xsl:otherwise>
-          <xsl:variable name="theme">
-            <xsl:choose>
-              <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]/@color"><xsl:value-of
-                  select="ancestor::*[contains(@class, ' topic/note ')]/@color"
-                /></xsl:when>
-              <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]">
-                <xsl:variable name="type" select="(ancestor::*[contains(@class, ' topic/note ')]/@type, 'note')[1]"/>
-                <xsl:choose>
-                  <xsl:when test="$type = 'note' or $type = 'notice' or $type = 'remember'">info</xsl:when>
-                  <xsl:when test="$type = 'tip' or $type = 'fastpath'">success</xsl:when>
-                  <xsl:when test="$type = 'important'">primary</xsl:when>
-                  <xsl:when
-                    test="$type = 'warning' or $type = 'caution' or $type = 'restriction' or $type = 'trouble'"
-                  >warning</xsl:when>
-                  <xsl:when test="$type = 'danger'">danger</xsl:when>
-                  <xsl:otherwise>secondary</xsl:otherwise>
-                </xsl:choose>
-              </xsl:when>
-              <xsl:when
-                test="ancestor::*[contains(@class, ' bootstrap-d/alert ') or tokenize(@outputclass, ' ') = 'alert']"
-              >
-                <xsl:variable
-                  name="node"
-                  select="ancestor::*[contains(@class, ' bootstrap-d/alert ') or tokenize(@outputclass, ' ') = 'alert'][1]"
-                />
-                <xsl:value-of
-                  select="($node/@color, substring-after(tokenize($node/@outputclass, ' ')[starts-with(., 'alert-')][1], 'alert-'), 'secondary')[1]"
-                />
-              </xsl:when>
-              <xsl:when
-                test="ancestor::*[contains(@class, ' bootstrap-d/card ') or tokenize(@outputclass, ' ') = 'card']"
-              ><xsl:value-of
-                  select="ancestor::*[contains(@class, ' bootstrap-d/card ') or tokenize(@outputclass, ' ') = 'card']/@color"
-                /></xsl:when>
-              <xsl:when
-                test="ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')]"
-              ><xsl:value-of
-                  select="ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')][1]/@color"
-                /></xsl:when>
-            </xsl:choose>
-          </xsl:variable>
+          <xsl:variable name="theme"><xsl:call-template name="get-context-theme-color"/></xsl:variable>
           <xsl:choose>
             <xsl:when test="$theme != ''"><xsl:value-of select="$bootstrap-alert-link-text-decoration"/></xsl:when>
             <xsl:otherwise><xsl:value-of select="$bootstrap-link-text-decoration"/></xsl:otherwise>
@@ -189,13 +197,13 @@
     <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-info"/></xsl:attribute>
     <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-info-color"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__bg__light">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-light"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-light-color"/></xsl:attribute>
+  <xsl:attribute-set name="__bg__accent">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-accent"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-accent-color"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__bg__dark">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-dark"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-dark-color"/></xsl:attribute>
+  <xsl:attribute-set name="__bg__inverse">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-inverse"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-inverse-color"/></xsl:attribute>
   </xsl:attribute-set>
   <!-- Subtle Background Colors (for Alerts, Callouts, etc.) -->
   <xsl:attribute-set name="__bg__primary-subtle">
@@ -222,13 +230,47 @@
     <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-info-subtle"/></xsl:attribute>
     <xsl:attribute name="color"><xsl:value-of select="$bootstrap-info-subtle-text"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__bg__light-subtle">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-light-subtle"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-light-subtle-text"/></xsl:attribute>
+  <xsl:attribute-set name="__bg__accent-subtle">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-accent-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-accent-subtle-text"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__bg__dark-subtle">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-dark-subtle"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-dark-subtle-text"/></xsl:attribute>
+  <xsl:attribute-set name="__bg__inverse-subtle">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-inverse-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-inverse-subtle-text"/></xsl:attribute>
+  </xsl:attribute-set>
+
+  <!-- Muted: subtle background paired with the plain theme color, since PDF has no muted tokens of its own -->
+  <xsl:attribute-set name="__muted__primary">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-primary-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-primary"/></xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="__muted__secondary">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-secondary-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-secondary"/></xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="__muted__success">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-success-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-success"/></xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="__muted__danger">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-danger-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-danger"/></xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="__muted__warning">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-warning-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-warning"/></xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="__muted__info">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-info-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-info"/></xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="__muted__accent">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-accent-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-accent"/></xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="__muted__inverse">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-inverse-subtle"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-inverse"/></xsl:attribute>
   </xsl:attribute-set>
 
   <!-- Component-Specific Backgrounds: Tables -->
@@ -256,13 +298,13 @@
     <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-table-danger-bg"/></xsl:attribute>
     <xsl:attribute name="color"><xsl:value-of select="$bootstrap-table-danger-color"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__table__light">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-table-light-bg"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-table-light-color"/></xsl:attribute>
+  <xsl:attribute-set name="__table__accent">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-table-accent-bg"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-table-accent-color"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__table__dark">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-table-dark-bg"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-table-dark-color"/></xsl:attribute>
+  <xsl:attribute-set name="__table__inverse">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-table-inverse-bg"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-table-inverse-color"/></xsl:attribute>
   </xsl:attribute-set>
 
   <!-- Component-Specific Backgrounds: Buttons -->
@@ -296,15 +338,15 @@
     <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-danger-color"/></xsl:attribute>
     <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-btn-danger-bg"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__btn__light">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-btn-light-bg"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-light-color"/></xsl:attribute>
-    <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-btn-light-bg"/></xsl:attribute>
+  <xsl:attribute-set name="__btn__accent">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-btn-accent-bg"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-accent-color"/></xsl:attribute>
+    <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-btn-accent-bg"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__btn__dark">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-btn-dark-bg"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-dark-color"/></xsl:attribute>
-    <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-btn-dark-bg"/></xsl:attribute>
+  <xsl:attribute-set name="__btn__inverse">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-btn-inverse-bg"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-btn-inverse-color"/></xsl:attribute>
+    <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-btn-inverse-bg"/></xsl:attribute>
   </xsl:attribute-set>
 
   <!-- Component-Specific Backgrounds: Badges -->
@@ -332,13 +374,13 @@
     <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-badge-danger-bg"/></xsl:attribute>
     <xsl:attribute name="color"><xsl:value-of select="$bootstrap-badge-danger-color"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__badge__light">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-badge-light-bg"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-badge-light-color"/></xsl:attribute>
+  <xsl:attribute-set name="__badge__accent">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-badge-accent-bg"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-badge-accent-color"/></xsl:attribute>
   </xsl:attribute-set>
-  <xsl:attribute-set name="__badge__dark">
-    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-badge-dark-bg"/></xsl:attribute>
-    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-badge-dark-color"/></xsl:attribute>
+  <xsl:attribute-set name="__badge__inverse">
+    <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-badge-inverse-bg"/></xsl:attribute>
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-badge-inverse-color"/></xsl:attribute>
   </xsl:attribute-set>
 
   <!-- Standard Bootstrap Spacing (Padding) -->
@@ -732,11 +774,11 @@
   <xsl:attribute-set name="border-info"><xsl:attribute name="border-color"><xsl:value-of
         select="$bootstrap-info"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="border-light"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-light"
+  <xsl:attribute-set name="border-accent"><xsl:attribute name="border-color"><xsl:value-of
+        select="$bootstrap-accent"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="border-dark"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-dark"
+  <xsl:attribute-set name="border-inverse"><xsl:attribute name="border-color"><xsl:value-of
+        select="$bootstrap-inverse"
       /></xsl:attribute></xsl:attribute-set>
   <!-- Border Thickness -->
   <xsl:attribute-set name="border-1"><xsl:attribute name="border-width">1pt</xsl:attribute></xsl:attribute-set>
@@ -746,28 +788,28 @@
   <xsl:attribute-set name="border-5"><xsl:attribute name="border-width">5pt</xsl:attribute></xsl:attribute-set>
 
   <xsl:attribute-set name="border-primary-subtle"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-primary-subtle"
+        select="$bootstrap-primary-subtle-text"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="border-secondary-subtle"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-secondary-subtle"
+        select="$bootstrap-secondary-subtle-text"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="border-success-subtle"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-success-subtle"
+        select="$bootstrap-success-subtle-text"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="border-danger-subtle"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-danger-subtle"
+        select="$bootstrap-danger-subtle-text"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="border-warning-subtle"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-warning-subtle"
+        select="$bootstrap-warning-subtle-text"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="border-info-subtle"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-info-subtle"
+        select="$bootstrap-info-subtle-text"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="border-light-subtle"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-light-subtle"
+  <xsl:attribute-set name="border-accent-subtle"><xsl:attribute name="border-color"><xsl:value-of
+        select="$bootstrap-accent-subtle-text"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="border-dark-subtle"><xsl:attribute name="border-color"><xsl:value-of
-        select="$bootstrap-dark-subtle"
+  <xsl:attribute-set name="border-inverse-subtle"><xsl:attribute name="border-color"><xsl:value-of
+        select="$bootstrap-inverse-subtle-text"
       /></xsl:attribute></xsl:attribute-set>
 
   <!-- Rounded Corners (Approximate Bootstrap values) -->
@@ -802,47 +844,79 @@
         select="$bootstrap-rounded-pill"
       /></xsl:attribute></xsl:attribute-set>
 
+  <xsl:attribute-set name="section.title">
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-heading-color"/></xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="example.title">
+    <xsl:attribute name="color"><xsl:value-of select="$bootstrap-heading-color"/></xsl:attribute>
+  </xsl:attribute-set>
+
   <!-- Heading utilities (h1-h6 aliases) -->
   <xsl:attribute-set name="h1"><xsl:attribute name="font-size"><xsl:value-of
         select="$bootstrap-h1-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight">bold</xsl:attribute><xsl:attribute
-      name="margin-top"
-    ><xsl:value-of select="$bootstrap-h1-margin-top"/></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
+      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
+        select="$bootstrap-heading-font-weight"
+      /></xsl:attribute><xsl:attribute name="color"><xsl:value-of
+        select="$bootstrap-heading-color"
+      /></xsl:attribute><xsl:attribute name="margin-top"><xsl:value-of
+        select="$bootstrap-h1-margin-top"
+      /></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
         select="$bootstrap-h1-margin-bottom"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="h2"><xsl:attribute name="font-size"><xsl:value-of
         select="$bootstrap-h2-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight">bold</xsl:attribute><xsl:attribute
-      name="margin-top"
-    ><xsl:value-of select="$bootstrap-h2-margin-top"/></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
+      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
+        select="$bootstrap-heading-font-weight"
+      /></xsl:attribute><xsl:attribute name="color"><xsl:value-of
+        select="$bootstrap-heading-color"
+      /></xsl:attribute><xsl:attribute name="margin-top"><xsl:value-of
+        select="$bootstrap-h2-margin-top"
+      /></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
         select="$bootstrap-h2-margin-bottom"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="h3"><xsl:attribute name="font-size"><xsl:value-of
         select="$bootstrap-h3-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight">bold</xsl:attribute><xsl:attribute
-      name="margin-top"
-    ><xsl:value-of select="$bootstrap-h3-margin-top"/></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
+      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
+        select="$bootstrap-heading-font-weight"
+      /></xsl:attribute><xsl:attribute name="color"><xsl:value-of
+        select="$bootstrap-heading-color"
+      /></xsl:attribute><xsl:attribute name="margin-top"><xsl:value-of
+        select="$bootstrap-h3-margin-top"
+      /></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
         select="$bootstrap-h3-margin-bottom"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="h4"><xsl:attribute name="font-size"><xsl:value-of
         select="$bootstrap-h4-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight">bold</xsl:attribute><xsl:attribute
-      name="margin-top"
-    ><xsl:value-of select="$bootstrap-h4-margin-top"/></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
+      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
+        select="$bootstrap-heading-font-weight"
+      /></xsl:attribute><xsl:attribute name="color"><xsl:value-of
+        select="$bootstrap-heading-color"
+      /></xsl:attribute><xsl:attribute name="margin-top"><xsl:value-of
+        select="$bootstrap-h4-margin-top"
+      /></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
         select="$bootstrap-h4-margin-bottom"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="h5"><xsl:attribute name="font-size"><xsl:value-of
         select="$bootstrap-h5-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight">bold</xsl:attribute><xsl:attribute
-      name="margin-top"
-    ><xsl:value-of select="$bootstrap-h5-margin-top"/></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
+      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
+        select="$bootstrap-heading-font-weight"
+      /></xsl:attribute><xsl:attribute name="color"><xsl:value-of
+        select="$bootstrap-heading-color"
+      /></xsl:attribute><xsl:attribute name="margin-top"><xsl:value-of
+        select="$bootstrap-h5-margin-top"
+      /></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
         select="$bootstrap-h5-margin-bottom"
       /></xsl:attribute></xsl:attribute-set>
   <xsl:attribute-set name="h6"><xsl:attribute name="font-size"><xsl:value-of
         select="$bootstrap-h6-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight">bold</xsl:attribute><xsl:attribute
-      name="margin-top"
-    ><xsl:value-of select="$bootstrap-h6-margin-top"/></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
+      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
+        select="$bootstrap-heading-font-weight"
+      /></xsl:attribute><xsl:attribute name="color"><xsl:value-of
+        select="$bootstrap-heading-color"
+      /></xsl:attribute><xsl:attribute name="margin-top"><xsl:value-of
+        select="$bootstrap-h6-margin-top"
+      /></xsl:attribute><xsl:attribute name="margin-bottom"><xsl:value-of
         select="$bootstrap-h6-margin-bottom"
       /></xsl:attribute></xsl:attribute-set>
 
@@ -875,49 +949,49 @@
   </xsl:attribute-set>
 
 
-  <!-- Display utilities (display-1 to display-6) -->
-  <xsl:attribute-set name="display-1"><xsl:attribute name="font-size"><xsl:value-of
-        select="$bootstrap-display-1-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
-        select="$bootstrap-display-font-weight"
-      /></xsl:attribute><xsl:attribute name="line-height"><xsl:value-of
-        select="$bootstrap-display-line-height"
+  <!-- Font-size utilities (fs-*), combined with fw-* for weight, e.g. outputclass="fw-light fs-6xl" -->
+  <xsl:attribute-set name="fs-xs"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-xs"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="display-2"><xsl:attribute name="font-size"><xsl:value-of
-        select="$bootstrap-display-2-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
-        select="$bootstrap-display-font-weight"
-      /></xsl:attribute><xsl:attribute name="line-height"><xsl:value-of
-        select="$bootstrap-display-line-height"
+  <xsl:attribute-set name="fs-sm"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-sm"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="display-3"><xsl:attribute name="font-size"><xsl:value-of
-        select="$bootstrap-display-3-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
-        select="$bootstrap-display-font-weight"
-      /></xsl:attribute><xsl:attribute name="line-height"><xsl:value-of
-        select="$bootstrap-display-line-height"
+  <xsl:attribute-set name="fs-base"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-base"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="display-4"><xsl:attribute name="font-size"><xsl:value-of
-        select="$bootstrap-display-4-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
-        select="$bootstrap-display-font-weight"
-      /></xsl:attribute><xsl:attribute name="line-height"><xsl:value-of
-        select="$bootstrap-display-line-height"
+  <xsl:attribute-set name="fs-md"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-md"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="display-5"><xsl:attribute name="font-size"><xsl:value-of
-        select="$bootstrap-display-5-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
-        select="$bootstrap-display-font-weight"
-      /></xsl:attribute><xsl:attribute name="line-height"><xsl:value-of
-        select="$bootstrap-display-line-height"
+  <xsl:attribute-set name="fs-lg"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-lg"
       /></xsl:attribute></xsl:attribute-set>
-  <xsl:attribute-set name="display-6"><xsl:attribute name="font-size"><xsl:value-of
-        select="$bootstrap-display-6-font-size"
-      /></xsl:attribute><xsl:attribute name="font-weight"><xsl:value-of
-        select="$bootstrap-display-font-weight"
-      /></xsl:attribute><xsl:attribute name="line-height"><xsl:value-of
-        select="$bootstrap-display-line-height"
+  <xsl:attribute-set name="fs-xl"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-xl"
+      /></xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fs-2xl"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-2xl"
+      /></xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fs-3xl"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-3xl"
       /></xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fs-4xl"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-4xl"
+      /></xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fs-5xl"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-5xl"
+      /></xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fs-6xl"><xsl:attribute name="font-size"><xsl:value-of
+        select="$bootstrap-fs-6xl"
+      /></xsl:attribute></xsl:attribute-set>
+
+  <!-- Font-weight utilities (fw-*); lighter/bolder are relative XSL-FO keywords, matching CSS -->
+  <xsl:attribute-set name="fw-lighter"><xsl:attribute name="font-weight">lighter</xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fw-light"><xsl:attribute name="font-weight">300</xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fw-normal"><xsl:attribute name="font-weight">400</xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fw-medium"><xsl:attribute name="font-weight">500</xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fw-semibold"><xsl:attribute name="font-weight">600</xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fw-bold"><xsl:attribute name="font-weight">700</xsl:attribute></xsl:attribute-set>
+  <xsl:attribute-set name="fw-bolder"><xsl:attribute name="font-weight">bolder</xsl:attribute></xsl:attribute-set>
 
   <!-- Table Striping -->
   <xsl:attribute-set name="table-striped">
diff --git a/cfg/fo/attrs/default-values.xsl b/cfg/fo/attrs/default-values.xsl
index 298b7f6..00fc837 100644
--- a/cfg/fo/attrs/default-values.xsl
+++ b/cfg/fo/attrs/default-values.xsl
@@ -1,92 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	This file is part of the DITA-OT Bootstrap Print Plug-in project.
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
 	See the accompanying LICENSE file for applicable licenses.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
 
   <!-- Core Theme Colors -->
-  <xsl:variable name="bootstrap-primary">#0d6efd</xsl:variable>
-  <xsl:variable name="bootstrap-secondary">#6c757d</xsl:variable>
-  <xsl:variable name="bootstrap-success">#198754</xsl:variable>
-  <xsl:variable name="bootstrap-danger">#dc3545</xsl:variable>
-  <xsl:variable name="bootstrap-warning">#ffc107</xsl:variable>
-  <xsl:variable name="bootstrap-info">#0dcaf0</xsl:variable>
-  <xsl:variable name="bootstrap-light">#f8f9fa</xsl:variable>
-  <xsl:variable name="bootstrap-dark">#212529</xsl:variable>
+  <xsl:variable name="bootstrap-primary">#0087fe</xsl:variable>
+  <xsl:variable name="bootstrap-secondary">#636c74</xsl:variable>
+  <xsl:variable name="bootstrap-success">#00b15a</xsl:variable>
+  <xsl:variable name="bootstrap-danger">#e62845</xsl:variable>
+  <xsl:variable name="bootstrap-warning">#ffc900</xsl:variable>
+  <xsl:variable name="bootstrap-info">#00b4f8</xsl:variable>
+  <xsl:variable name="bootstrap-accent">#7740ff</xsl:variable>
+  <xsl:variable name="bootstrap-inverse">#2c2f32</xsl:variable>
   <xsl:variable name="bootstrap-link">#0d6efd</xsl:variable>
+  <xsl:variable name="bootstrap-heading-color" select="$bootstrap-body-color"/>
+  <xsl:variable name="bootstrap-heading-font-weight">bold</xsl:variable>
 
   <!-- Subtle Colors -->
-  <xsl:variable name="bootstrap-primary-subtle">#e0f2ff</xsl:variable>
-  <xsl:variable name="bootstrap-primary-subtle-text">#084298</xsl:variable>
-  <xsl:variable name="bootstrap-secondary-subtle">#e2e3e5</xsl:variable>
-  <xsl:variable name="bootstrap-secondary-subtle-text">#41464b</xsl:variable>
-  <xsl:variable name="bootstrap-success-subtle">#d1e7dd</xsl:variable>
-  <xsl:variable name="bootstrap-success-subtle-text">#0f5132</xsl:variable>
-  <xsl:variable name="bootstrap-danger-subtle">#f8d7da</xsl:variable>
-  <xsl:variable name="bootstrap-danger-subtle-text">#842029</xsl:variable>
-  <xsl:variable name="bootstrap-warning-subtle">#fff3cd</xsl:variable>
-  <xsl:variable name="bootstrap-warning-subtle-text">#332701</xsl:variable>
-  <xsl:variable name="bootstrap-info-subtle">#cff4fc</xsl:variable>
-  <xsl:variable name="bootstrap-info-subtle-text">#032830</xsl:variable>
-  <xsl:variable name="bootstrap-light-subtle">#fefefe</xsl:variable>
-  <xsl:variable name="bootstrap-light-subtle-text">#141619</xsl:variable>
-  <xsl:variable name="bootstrap-dark-subtle">#ced4da</xsl:variable>
-  <xsl:variable name="bootstrap-dark-subtle-text">#141619</xsl:variable>
+  <xsl:variable name="bootstrap-primary-subtle">#dfe5ff</xsl:variable>
+  <xsl:variable name="bootstrap-primary-subtle-text">#21457c</xsl:variable>
+  <xsl:variable name="bootstrap-accordion-active-bg" select="$bootstrap-primary-subtle"/>
+  <xsl:variable name="bootstrap-accordion-active-color" select="$bootstrap-primary-subtle-text"/>
+  <xsl:variable name="bootstrap-secondary-subtle">#f1f2f3</xsl:variable>
+  <xsl:variable name="bootstrap-secondary-subtle-text">#3e4347</xsl:variable>
+  <xsl:variable name="bootstrap-success-subtle">#d8f0dd</xsl:variable>
+  <xsl:variable name="bootstrap-success-subtle-text">#1a5931</xsl:variable>
+  <xsl:variable name="bootstrap-danger-subtle">#ffd9d7</xsl:variable>
+  <xsl:variable name="bootstrap-danger-subtle-text">#732026</xsl:variable>
+  <xsl:variable name="bootstrap-warning-subtle">#fff4d5</xsl:variable>
+  <xsl:variable name="bootstrap-warning-subtle-text">#7e6317</xsl:variable>
+  <xsl:variable name="bootstrap-info-subtle">#def0fe</xsl:variable>
+  <xsl:variable name="bootstrap-info-subtle-text">#215a79</xsl:variable>
+  <xsl:variable name="bootstrap-accent-subtle">#ead9ff</xsl:variable>
+  <xsl:variable name="bootstrap-accent-subtle-text">#41267c</xsl:variable>
+  <xsl:variable name="bootstrap-inverse-subtle">#e3e5e7</xsl:variable>
+  <xsl:variable name="bootstrap-inverse-subtle-text">#131415</xsl:variable>
 
   <!-- Component-specific: Tables -->
-  <xsl:variable name="bootstrap-table-primary-bg">#cfe2ff</xsl:variable>
-  <xsl:variable name="bootstrap-table-primary-color">#052c65</xsl:variable>
-  <xsl:variable name="bootstrap-table-secondary-bg">#e2e3e5</xsl:variable>
-  <xsl:variable name="bootstrap-table-secondary-color">#41464b</xsl:variable>
-  <xsl:variable name="bootstrap-table-success-bg">#d1e7dd</xsl:variable>
-  <xsl:variable name="bootstrap-table-success-color">#0f5132</xsl:variable>
-  <xsl:variable name="bootstrap-table-info-bg">#cff4fc</xsl:variable>
-  <xsl:variable name="bootstrap-table-info-color">#032830</xsl:variable>
-  <xsl:variable name="bootstrap-table-warning-bg">#fff3cd</xsl:variable>
-  <xsl:variable name="bootstrap-table-warning-color">#332701</xsl:variable>
-  <xsl:variable name="bootstrap-table-danger-bg">#f8d7da</xsl:variable>
-  <xsl:variable name="bootstrap-table-danger-color">#842029</xsl:variable>
-  <xsl:variable name="bootstrap-table-light-bg">#f8f9fa</xsl:variable>
-  <xsl:variable name="bootstrap-table-light-color">#212529</xsl:variable>
-  <xsl:variable name="bootstrap-table-dark-bg">#212529</xsl:variable>
-  <xsl:variable name="bootstrap-table-dark-color">#ffffff</xsl:variable>
+  <xsl:variable name="bootstrap-table-primary-bg">#dfe5ff</xsl:variable>
+  <xsl:variable name="bootstrap-table-primary-color">#21457c</xsl:variable>
+  <xsl:variable name="bootstrap-table-secondary-bg">#f1f2f3</xsl:variable>
+  <xsl:variable name="bootstrap-table-secondary-color">#3e4347</xsl:variable>
+  <xsl:variable name="bootstrap-table-success-bg">#d8f0dd</xsl:variable>
+  <xsl:variable name="bootstrap-table-success-color">#1a5931</xsl:variable>
+  <xsl:variable name="bootstrap-table-info-bg">#def0fe</xsl:variable>
+  <xsl:variable name="bootstrap-table-info-color">#215a79</xsl:variable>
+  <xsl:variable name="bootstrap-table-warning-bg">#fff4d5</xsl:variable>
+  <xsl:variable name="bootstrap-table-warning-color">#7e6317</xsl:variable>
+  <xsl:variable name="bootstrap-table-danger-bg">#ffd9d7</xsl:variable>
+  <xsl:variable name="bootstrap-table-danger-color">#732026</xsl:variable>
+  <xsl:variable name="bootstrap-table-accent-bg">#ead9ff</xsl:variable>
+  <xsl:variable name="bootstrap-table-accent-color">#41267c</xsl:variable>
+  <xsl:variable name="bootstrap-table-inverse-bg">#2c2f32</xsl:variable>
+  <xsl:variable name="bootstrap-table-inverse-color">#ffffff</xsl:variable>
 
   <!-- Component-specific: Buttons -->
-  <xsl:variable name="bootstrap-btn-primary-bg">#0d6efd</xsl:variable>
+  <xsl:variable name="bootstrap-btn-primary-bg">#0087fe</xsl:variable>
   <xsl:variable name="bootstrap-btn-primary-color">#ffffff</xsl:variable>
-  <xsl:variable name="bootstrap-btn-secondary-bg">#6c757d</xsl:variable>
+  <xsl:variable name="bootstrap-btn-secondary-bg">#636c74</xsl:variable>
   <xsl:variable name="bootstrap-btn-secondary-color">#ffffff</xsl:variable>
-  <xsl:variable name="bootstrap-btn-success-bg">#198754</xsl:variable>
+  <xsl:variable name="bootstrap-btn-success-bg">#00b15a</xsl:variable>
   <xsl:variable name="bootstrap-btn-success-color">#ffffff</xsl:variable>
-  <xsl:variable name="bootstrap-btn-info-bg">#0dcaf0</xsl:variable>
-  <xsl:variable name="bootstrap-btn-info-color">#000000</xsl:variable>
-  <xsl:variable name="bootstrap-btn-warning-bg">#ffc107</xsl:variable>
-  <xsl:variable name="bootstrap-btn-warning-color">#000000</xsl:variable>
-  <xsl:variable name="bootstrap-btn-danger-bg">#dc3545</xsl:variable>
+  <xsl:variable name="bootstrap-btn-info-bg">#00b4f8</xsl:variable>
+  <xsl:variable name="bootstrap-btn-info-color">#2c2f32</xsl:variable>
+  <xsl:variable name="bootstrap-btn-warning-bg">#ffc900</xsl:variable>
+  <xsl:variable name="bootstrap-btn-warning-color">#2c2f32</xsl:variable>
+  <xsl:variable name="bootstrap-btn-danger-bg">#e62845</xsl:variable>
   <xsl:variable name="bootstrap-btn-danger-color">#ffffff</xsl:variable>
-  <xsl:variable name="bootstrap-btn-light-bg">#f8f9fa</xsl:variable>
-  <xsl:variable name="bootstrap-btn-light-color">#000000</xsl:variable>
-  <xsl:variable name="bootstrap-btn-dark-bg">#212529</xsl:variable>
-  <xsl:variable name="bootstrap-btn-dark-color">#ffffff</xsl:variable>
+  <xsl:variable name="bootstrap-btn-accent-bg">#7740ff</xsl:variable>
+  <xsl:variable name="bootstrap-btn-accent-color">#ffffff</xsl:variable>
+  <xsl:variable name="bootstrap-btn-inverse-bg">#2c2f32</xsl:variable>
+  <xsl:variable name="bootstrap-btn-inverse-color">#ffffff</xsl:variable>
 
   <!-- Component-specific: Badges -->
-  <xsl:variable name="bootstrap-badge-primary-bg">#0d6efd</xsl:variable>
+  <xsl:variable name="bootstrap-badge-default-bg">#f1f2f3</xsl:variable>
+  <xsl:variable name="bootstrap-badge-primary-bg">#0087fe</xsl:variable>
   <xsl:variable name="bootstrap-badge-primary-color">#ffffff</xsl:variable>
-  <xsl:variable name="bootstrap-badge-secondary-bg">#6c757d</xsl:variable>
+  <xsl:variable name="bootstrap-badge-secondary-bg">#636c74</xsl:variable>
   <xsl:variable name="bootstrap-badge-secondary-color">#ffffff</xsl:variable>
-  <xsl:variable name="bootstrap-badge-success-bg">#198754</xsl:variable>
+  <xsl:variable name="bootstrap-badge-success-bg">#00b15a</xsl:variable>
   <xsl:variable name="bootstrap-badge-success-color">#ffffff</xsl:variable>
-  <xsl:variable name="bootstrap-badge-info-bg">#0dcaf0</xsl:variable>
-  <xsl:variable name="bootstrap-badge-info-color">#000000</xsl:variable>
-  <xsl:variable name="bootstrap-badge-warning-bg">#ffc107</xsl:variable>
-  <xsl:variable name="bootstrap-badge-warning-color">#000000</xsl:variable>
-  <xsl:variable name="bootstrap-badge-danger-bg">#dc3545</xsl:variable>
+  <xsl:variable name="bootstrap-badge-info-bg">#00b4f8</xsl:variable>
+  <xsl:variable name="bootstrap-badge-info-color">#2c2f32</xsl:variable>
+  <xsl:variable name="bootstrap-badge-warning-bg">#ffc900</xsl:variable>
+  <xsl:variable name="bootstrap-badge-warning-color">#2c2f32</xsl:variable>
+  <xsl:variable name="bootstrap-badge-danger-bg">#e62845</xsl:variable>
   <xsl:variable name="bootstrap-badge-danger-color">#ffffff</xsl:variable>
-  <xsl:variable name="bootstrap-badge-light-bg">#f8f9fa</xsl:variable>
-  <xsl:variable name="bootstrap-badge-light-color">#000000</xsl:variable>
-  <xsl:variable name="bootstrap-badge-dark-bg">#212529</xsl:variable>
-  <xsl:variable name="bootstrap-badge-dark-color">#ffffff</xsl:variable>
+  <xsl:variable name="bootstrap-badge-accent-bg">#7740ff</xsl:variable>
+  <xsl:variable name="bootstrap-badge-accent-color">#ffffff</xsl:variable>
+  <xsl:variable name="bootstrap-badge-inverse-bg">#2c2f32</xsl:variable>
+  <xsl:variable name="bootstrap-badge-inverse-color">#ffffff</xsl:variable>
 
   <!-- Component-specific: Notes -->
   <xsl:variable name="bootstrap-note-border-width">6pt</xsl:variable>
@@ -103,7 +108,10 @@
   <xsl:variable name="bootstrap-spacing-5">36pt</xsl:variable>
 
   <xsl:variable name="bootstrap-border-color">#dee2e6</xsl:variable>
+  <xsl:variable name="bootstrap-card-border-color" select="$bootstrap-border-color"/>
+  <xsl:variable name="bootstrap-card-background-color" select="$bootstrap-secondary-subtle"/>
   <xsl:variable name="bootstrap-border-width">1pt</xsl:variable>
+  <xsl:variable name="bootstrap-blockquote-border-width">3pt</xsl:variable>
 
   <xsl:variable name="bootstrap-rounded">6pt</xsl:variable>
   <xsl:variable name="bootstrap-rounded-0">0</xsl:variable>
@@ -139,14 +147,17 @@
   <xsl:variable name="bootstrap-h6-margin-top">6pt</xsl:variable>
   <xsl:variable name="bootstrap-h6-margin-bottom">3pt</xsl:variable>
 
-  <xsl:variable name="bootstrap-display-1-font-size">60pt</xsl:variable>
-  <xsl:variable name="bootstrap-display-2-font-size">52pt</xsl:variable>
-  <xsl:variable name="bootstrap-display-3-font-size">44pt</xsl:variable>
-  <xsl:variable name="bootstrap-display-4-font-size">36pt</xsl:variable>
-  <xsl:variable name="bootstrap-display-5-font-size">28pt</xsl:variable>
-  <xsl:variable name="bootstrap-display-6-font-size">24pt</xsl:variable>
-  <xsl:variable name="bootstrap-display-font-weight">300</xsl:variable>
-  <xsl:variable name="bootstrap-display-line-height">1.2</xsl:variable>
+  <xsl:variable name="bootstrap-fs-xs">9pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-sm">10.5pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-base">12pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-md" select="$bootstrap-fs-base"/>
+  <xsl:variable name="bootstrap-fs-lg">15pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-xl">20.4pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-2xl">24pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-3xl">30pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-4xl">36pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-5xl">48pt</xsl:variable>
+  <xsl:variable name="bootstrap-fs-6xl">60pt</xsl:variable>
 
   <xsl:variable name="bootstrap-body-color">#212529</xsl:variable>
   <xsl:variable name="bootstrap-body-bg">#ffffff</xsl:variable>
@@ -156,7 +167,9 @@
 
   <!-- PrismJS Decorator defaults -->
   <xsl:variable name="prismjs.text.color" select="$bootstrap-body-color"/>
-  <xsl:variable name="prismjs.background.color" select="$bootstrap-secondary-subtle"/>
+  <xsl:variable name="prismjs.background.color">transparent</xsl:variable>
+  <xsl:variable name="prismjs.border.color" select="$bootstrap-card-border-color"/>
   <xsl:variable name="prismjs.border.width" select="$bootstrap-border-width"/>
+  <xsl:variable name="prismjs.card.background.color" select="$bootstrap-card-background-color"/>
 
 </xsl:stylesheet>
diff --git a/cfg/fo/attrs/dita-ot.xsl b/cfg/fo/attrs/dita-ot.xsl
index 208ee0a..28bb403 100644
--- a/cfg/fo/attrs/dita-ot.xsl
+++ b/cfg/fo/attrs/dita-ot.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
   <!-- Empty placeholder for bootstrap themes -->
 </xsl:stylesheet>
diff --git a/cfg/fo/attrs/settings-map.xsl b/cfg/fo/attrs/settings-map.xsl
index 3a9a15e..00db864 100644
--- a/cfg/fo/attrs/settings-map.xsl
+++ b/cfg/fo/attrs/settings-map.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	This file is part of the DITA-OT Bootstrap Print Plug-in project.
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
 	See the accompanying LICENSE file for applicable licenses.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
@@ -13,9 +13,11 @@
     <entry name="bootstrap-danger"><xsl:value-of select="$bootstrap-danger"/></entry>
     <entry name="bootstrap-warning"><xsl:value-of select="$bootstrap-warning"/></entry>
     <entry name="bootstrap-info"><xsl:value-of select="$bootstrap-info"/></entry>
-    <entry name="bootstrap-light"><xsl:value-of select="$bootstrap-light"/></entry>
-    <entry name="bootstrap-dark"><xsl:value-of select="$bootstrap-dark"/></entry>
+    <entry name="bootstrap-accent"><xsl:value-of select="$bootstrap-accent"/></entry>
+    <entry name="bootstrap-inverse"><xsl:value-of select="$bootstrap-inverse"/></entry>
     <entry name="bootstrap-link"><xsl:value-of select="$bootstrap-link"/></entry>
+    <entry name="bootstrap-heading-color"><xsl:value-of select="$bootstrap-heading-color"/></entry>
+    <entry name="bootstrap-heading-font-weight"><xsl:value-of select="$bootstrap-heading-font-weight"/></entry>
 
     <entry name="bootstrap-primary-subtle"><xsl:value-of select="$bootstrap-primary-subtle"/></entry>
     <entry name="bootstrap-primary-subtle-text"><xsl:value-of select="$bootstrap-primary-subtle-text"/></entry>
@@ -29,10 +31,10 @@
     <entry name="bootstrap-warning-subtle-text"><xsl:value-of select="$bootstrap-warning-subtle-text"/></entry>
     <entry name="bootstrap-info-subtle"><xsl:value-of select="$bootstrap-info-subtle"/></entry>
     <entry name="bootstrap-info-subtle-text"><xsl:value-of select="$bootstrap-info-subtle-text"/></entry>
-    <entry name="bootstrap-light-subtle"><xsl:value-of select="$bootstrap-light-subtle"/></entry>
-    <entry name="bootstrap-light-subtle-text"><xsl:value-of select="$bootstrap-light-subtle-text"/></entry>
-    <entry name="bootstrap-dark-subtle"><xsl:value-of select="$bootstrap-dark-subtle"/></entry>
-    <entry name="bootstrap-dark-subtle-text"><xsl:value-of select="$bootstrap-dark-subtle-text"/></entry>
+    <entry name="bootstrap-accent-subtle"><xsl:value-of select="$bootstrap-accent-subtle"/></entry>
+    <entry name="bootstrap-accent-subtle-text"><xsl:value-of select="$bootstrap-accent-subtle-text"/></entry>
+    <entry name="bootstrap-inverse-subtle"><xsl:value-of select="$bootstrap-inverse-subtle"/></entry>
+    <entry name="bootstrap-inverse-subtle-text"><xsl:value-of select="$bootstrap-inverse-subtle-text"/></entry>
 
     <!-- Component-specific: Tables -->
     <entry name="bootstrap-table-primary-bg"><xsl:value-of select="$bootstrap-table-primary-bg"/></entry>
@@ -47,10 +49,10 @@
     <entry name="bootstrap-table-warning-color"><xsl:value-of select="$bootstrap-table-warning-color"/></entry>
     <entry name="bootstrap-table-danger-bg"><xsl:value-of select="$bootstrap-table-danger-bg"/></entry>
     <entry name="bootstrap-table-danger-color"><xsl:value-of select="$bootstrap-table-danger-color"/></entry>
-    <entry name="bootstrap-table-light-bg"><xsl:value-of select="$bootstrap-table-light-bg"/></entry>
-    <entry name="bootstrap-table-light-color"><xsl:value-of select="$bootstrap-table-light-color"/></entry>
-    <entry name="bootstrap-table-dark-bg"><xsl:value-of select="$bootstrap-table-dark-bg"/></entry>
-    <entry name="bootstrap-table-dark-color"><xsl:value-of select="$bootstrap-table-dark-color"/></entry>
+    <entry name="bootstrap-table-accent-bg"><xsl:value-of select="$bootstrap-table-accent-bg"/></entry>
+    <entry name="bootstrap-table-accent-color"><xsl:value-of select="$bootstrap-table-accent-color"/></entry>
+    <entry name="bootstrap-table-inverse-bg"><xsl:value-of select="$bootstrap-table-inverse-bg"/></entry>
+    <entry name="bootstrap-table-inverse-color"><xsl:value-of select="$bootstrap-table-inverse-color"/></entry>
 
     <!-- Component-specific: Buttons -->
     <entry name="bootstrap-btn-primary-bg"><xsl:value-of select="$bootstrap-btn-primary-bg"/></entry>
@@ -65,10 +67,10 @@
     <entry name="bootstrap-btn-warning-color"><xsl:value-of select="$bootstrap-btn-warning-color"/></entry>
     <entry name="bootstrap-btn-danger-bg"><xsl:value-of select="$bootstrap-btn-danger-bg"/></entry>
     <entry name="bootstrap-btn-danger-color"><xsl:value-of select="$bootstrap-btn-danger-color"/></entry>
-    <entry name="bootstrap-btn-light-bg"><xsl:value-of select="$bootstrap-btn-light-bg"/></entry>
-    <entry name="bootstrap-btn-light-color"><xsl:value-of select="$bootstrap-btn-light-color"/></entry>
-    <entry name="bootstrap-btn-dark-bg"><xsl:value-of select="$bootstrap-btn-dark-bg"/></entry>
-    <entry name="bootstrap-btn-dark-color"><xsl:value-of select="$bootstrap-btn-dark-color"/></entry>
+    <entry name="bootstrap-btn-accent-bg"><xsl:value-of select="$bootstrap-btn-accent-bg"/></entry>
+    <entry name="bootstrap-btn-accent-color"><xsl:value-of select="$bootstrap-btn-accent-color"/></entry>
+    <entry name="bootstrap-btn-inverse-bg"><xsl:value-of select="$bootstrap-btn-inverse-bg"/></entry>
+    <entry name="bootstrap-btn-inverse-color"><xsl:value-of select="$bootstrap-btn-inverse-color"/></entry>
 
     <!-- Component-specific: Badges -->
     <entry name="bootstrap-badge-primary-bg"><xsl:value-of select="$bootstrap-badge-primary-bg"/></entry>
@@ -83,10 +85,10 @@
     <entry name="bootstrap-badge-warning-color"><xsl:value-of select="$bootstrap-badge-warning-color"/></entry>
     <entry name="bootstrap-badge-danger-bg"><xsl:value-of select="$bootstrap-badge-danger-bg"/></entry>
     <entry name="bootstrap-badge-danger-color"><xsl:value-of select="$bootstrap-badge-danger-color"/></entry>
-    <entry name="bootstrap-badge-light-bg"><xsl:value-of select="$bootstrap-badge-light-bg"/></entry>
-    <entry name="bootstrap-badge-light-color"><xsl:value-of select="$bootstrap-badge-light-color"/></entry>
-    <entry name="bootstrap-badge-dark-bg"><xsl:value-of select="$bootstrap-badge-dark-bg"/></entry>
-    <entry name="bootstrap-badge-dark-color"><xsl:value-of select="$bootstrap-badge-dark-color"/></entry>
+    <entry name="bootstrap-badge-accent-bg"><xsl:value-of select="$bootstrap-badge-accent-bg"/></entry>
+    <entry name="bootstrap-badge-accent-color"><xsl:value-of select="$bootstrap-badge-accent-color"/></entry>
+    <entry name="bootstrap-badge-inverse-bg"><xsl:value-of select="$bootstrap-badge-inverse-bg"/></entry>
+    <entry name="bootstrap-badge-inverse-color"><xsl:value-of select="$bootstrap-badge-inverse-color"/></entry>
 
     <entry name="bootstrap-spacing-0"><xsl:value-of select="$bootstrap-spacing-0"/></entry>
     <entry name="bootstrap-spacing-1"><xsl:value-of select="$bootstrap-spacing-1"/></entry>
@@ -127,14 +129,17 @@
     <entry name="bootstrap-h6-margin-top"><xsl:value-of select="$bootstrap-h6-margin-top"/></entry>
     <entry name="bootstrap-h6-margin-bottom"><xsl:value-of select="$bootstrap-h6-margin-bottom"/></entry>
 
-    <entry name="bootstrap-display-1-font-size"><xsl:value-of select="$bootstrap-display-1-font-size"/></entry>
-    <entry name="bootstrap-display-2-font-size"><xsl:value-of select="$bootstrap-display-2-font-size"/></entry>
-    <entry name="bootstrap-display-3-font-size"><xsl:value-of select="$bootstrap-display-3-font-size"/></entry>
-    <entry name="bootstrap-display-4-font-size"><xsl:value-of select="$bootstrap-display-4-font-size"/></entry>
-    <entry name="bootstrap-display-5-font-size"><xsl:value-of select="$bootstrap-display-5-font-size"/></entry>
-    <entry name="bootstrap-display-6-font-size"><xsl:value-of select="$bootstrap-display-6-font-size"/></entry>
-    <entry name="bootstrap-display-font-weight"><xsl:value-of select="$bootstrap-display-font-weight"/></entry>
-    <entry name="bootstrap-display-line-height"><xsl:value-of select="$bootstrap-display-line-height"/></entry>
+    <entry name="bootstrap-fs-xs"><xsl:value-of select="$bootstrap-fs-xs"/></entry>
+    <entry name="bootstrap-fs-sm"><xsl:value-of select="$bootstrap-fs-sm"/></entry>
+    <entry name="bootstrap-fs-base"><xsl:value-of select="$bootstrap-fs-base"/></entry>
+    <entry name="bootstrap-fs-md"><xsl:value-of select="$bootstrap-fs-md"/></entry>
+    <entry name="bootstrap-fs-lg"><xsl:value-of select="$bootstrap-fs-lg"/></entry>
+    <entry name="bootstrap-fs-xl"><xsl:value-of select="$bootstrap-fs-xl"/></entry>
+    <entry name="bootstrap-fs-2xl"><xsl:value-of select="$bootstrap-fs-2xl"/></entry>
+    <entry name="bootstrap-fs-3xl"><xsl:value-of select="$bootstrap-fs-3xl"/></entry>
+    <entry name="bootstrap-fs-4xl"><xsl:value-of select="$bootstrap-fs-4xl"/></entry>
+    <entry name="bootstrap-fs-5xl"><xsl:value-of select="$bootstrap-fs-5xl"/></entry>
+    <entry name="bootstrap-fs-6xl"><xsl:value-of select="$bootstrap-fs-6xl"/></entry>
 
     <entry name="bootstrap-table-striped-color"><xsl:value-of select="$bootstrap-table-striped-color"/></entry>
     <entry name="bootstrap-lead-font-size"><xsl:value-of select="$bootstrap-lead-font-size"/></entry>
@@ -143,6 +148,7 @@
     <!-- PrismJS Decorator -->
     <entry name="prismjs.text.color"><xsl:value-of select="$prismjs.text.color"/></entry>
     <entry name="prismjs.background.color"><xsl:value-of select="$prismjs.background.color"/></entry>
+    <entry name="prismjs.border.color"><xsl:value-of select="$prismjs.border.color"/></entry>
     <entry name="prismjs.border.width"><xsl:value-of select="$prismjs.border.width"/></entry>
   </xsl:variable>
 
diff --git a/xsl/fo/accordion.xsl b/xsl/fo/accordion.xsl
index ed20e7d..a87b82c 100644
--- a/xsl/fo/accordion.xsl
+++ b/xsl/fo/accordion.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -8,7 +12,7 @@
 
   <!-- Matches accordion specialized elements or bodydiv with accordion outputclass -->
   <xsl:template
-    match="*[contains(@class, ' bootstrap-d/accordion ') or (contains(@class, ' topic/bodydiv ') and tokenize(@outputclass, ' ') = 'accordion')]"
+    match="*[contains(@class, ' bootstrap-d/accordion ') or (contains(@class, ' topic/bodydiv ') and (tokenize(@outputclass, ' ') = ('accordion', 'accordion-flush') or contains(@outputclass, 'accordion')))]"
     priority="5"
   >
     <fo:block>
@@ -24,27 +28,77 @@
 
       <!-- Border and rounding for the accordion container if not flushed -->
       <xsl:variable name="is-flush" select="@flush = 'yes' or tokenize(@outputclass, ' ') = 'accordion-flush'"/>
-      
-      <fo:block>
-         <xsl:if test="not($is-flush)">
-            <xsl:attribute name="border">
-              <xsl:value-of select="concat($bootstrap-border-width, ' solid ', $bootstrap-border-color)"/>
-            </xsl:attribute>
-            <xsl:if test="@rounded">
-               <xsl:call-template name="processBootstrapRounded">
-                  <xsl:with-param name="attrValue" select="@rounded"/>
-               </xsl:call-template>
-            </xsl:if>
-         </xsl:if>
-         
-         <xsl:apply-templates select="*[contains(@class, ' topic/section ')]" mode="accordion"/>
-      </fo:block>
+
+      <xsl:variable name="accordion-radius">
+        <xsl:if test="not($is-flush)">
+          <xsl:call-template name="get-accordion-radius">
+            <xsl:with-param name="node" select="."/>
+          </xsl:call-template>
+        </xsl:if>
+      </xsl:variable>
+
+      <!-- table-cell wrapper: gives the masked container correct ancestor-padding inset
+           while keeping its own start-indent/end-indent at a literal 0pt (like card.xsl) -->
+      <!-- keep-together: fragmenting across a page break drops the border/mask entirely -->
+      <fo:table table-layout="fixed" width="100%" keep-together.within-page="always">
+         <fo:table-column column-width="proportional-column-width(1)"/>
+         <fo:table-body>
+            <fo:table-row>
+               <fo:table-cell>
+                  <fo:block-container position="relative">
+                     <xsl:attribute name="start-indent">0pt</xsl:attribute>
+                     <xsl:attribute name="end-indent">0pt</xsl:attribute>
+                     <xsl:if test="not($is-flush)">
+                        <xsl:attribute name="border">
+                          <xsl:value-of select="concat($bootstrap-border-width, ' solid ', $bootstrap-border-color)"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="overflow">hidden</xsl:attribute>
+                        <xsl:if test="$accordion-radius != ''">
+                          <xsl:attribute name="fox:border-radius" select="$accordion-radius"/>
+                        </xsl:if>
+                     </xsl:if>
+
+                     <xsl:apply-templates select="*[contains(@class, ' topic/section ')]" mode="accordion"/>
+                     <xsl:if test="not($is-flush) and $accordion-radius != ''">
+                        <xsl:call-template name="corner-mask">
+                           <xsl:with-param name="corner" select="'tl'"/>
+                           <xsl:with-param name="radius" select="$accordion-radius"/>
+                        </xsl:call-template>
+                        <xsl:call-template name="corner-mask">
+                           <xsl:with-param name="corner" select="'tr'"/>
+                           <xsl:with-param name="radius" select="$accordion-radius"/>
+                        </xsl:call-template>
+                     </xsl:if>
+                  </fo:block-container>
+               </fo:table-cell>
+            </fo:table-row>
+         </fo:table-body>
+      </fo:table>
     </fo:block>
   </xsl:template>
 
+  <!-- Corner radius for the accordion's outer frame; themes can override (see sketchy) -->
+  <xsl:template name="get-accordion-radius">
+    <xsl:param name="node" select="."/>
+    <xsl:variable name="radius-probe">
+      <fo:block-container>
+        <xsl:call-template name="processBootstrapRounded">
+          <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="attrValue" select="($node/@rounded, 'yes')[1]"/>
+        </xsl:call-template>
+      </fo:block-container>
+    </xsl:variable>
+    <xsl:variable name="radius-raw" select="normalize-space($radius-probe/*/@fox:border-radius)"/>
+    <xsl:value-of select="$radius-raw"/>
+  </xsl:template>
+
   <!-- Matches accordion items -->
   <xsl:template match="*[contains(@class, ' topic/section ')]" mode="accordion">
-    <xsl:variable name="parent-color" select="../@color"/>
+    <xsl:variable name="parent-color">
+      <xsl:call-template name="get-theme-color">
+        <xsl:with-param name="node" select=".."/>
+      </xsl:call-template>
+    </xsl:variable>
     
     <fo:table table-layout="fixed" width="100%">
       <xsl:attribute name="border-bottom">
@@ -64,19 +118,17 @@
           <fo:table-cell padding="10pt 15pt">
             <xsl:call-template name="processBootstrapDirection"/>
             <xsl:choose>
-               <xsl:when test="$parent-color">
+               <xsl:when test="string($parent-color) != ''">
                   <xsl:call-template name="processBootstrapAttrSetReflection">
-                     <xsl:with-param name="attrSet" select="concat('__bg__', $parent-color)"/>
+                     <xsl:with-param name="attrSet" select="concat('__bg__', $parent-color, '-subtle')"/>
                   </xsl:call-template>
                </xsl:when>
                 <xsl:otherwise>
-                  <!-- Default background matches Bootstrap 5 primary-subtle -->
-                  <xsl:call-template name="processBootstrapAttrSetReflection">
-                    <xsl:with-param name="attrSet" select="'__bg__primary-subtle'"/>
-                  </xsl:call-template>
+                  <xsl:attribute name="background-color" select="$bootstrap-accordion-active-bg"/>
+                  <xsl:attribute name="color" select="$bootstrap-accordion-active-color"/>
                 </xsl:otherwise>
             </xsl:choose>
-            <fo:block font-weight="bold">
+            <fo:block font-weight="{$bootstrap-heading-font-weight}">
                <xsl:apply-templates select="*[contains(@class, ' topic/title ')]" mode="accordion-header"/>
             </fo:block>
           </fo:table-cell>
@@ -86,11 +138,6 @@
         <fo:table-row>
           <fo:table-cell padding="10pt 15pt">
             <xsl:call-template name="processBootstrapDirection"/>
-            <xsl:if test="$parent-color">
-               <xsl:call-template name="processBootstrapAttrSetReflection">
-                  <xsl:with-param name="attrSet" select="concat('__bg__', $parent-color, '-subtle')"/>
-               </xsl:call-template>
-            </xsl:if>
             <fo:block>
                <xsl:apply-templates select="node() except *[contains(@class, ' topic/title ')]"/>
             </fo:block>
diff --git a/xsl/fo/alert.xsl b/xsl/fo/alert.xsl
index 2375ca1..4f51ff1 100644
--- a/xsl/fo/alert.xsl
+++ b/xsl/fo/alert.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -8,28 +12,58 @@
 
   <!-- Alert Support -->
   <xsl:template
-    match="*[contains(@class, ' bootstrap-d/alert ') or (exists(tokenize(@outputclass, ' ')[starts-with(., 'alert-')]) and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]"
+    match="*[contains(@class, ' bootstrap-d/alert ') or (exists(tokenize(@outputclass, ' ')[. = 'alert' or starts-with(., 'alert-')]) and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')) and not(tokenize(@outputclass, ' ') = ('accordion', 'accordion-flush', 'card', 'carousel', 'drawer', 'offcanvas')))]"
     priority="5"
   >
     <fo:block xsl:use-attribute-sets="section">
       <xsl:call-template name="commonattributes"/>
-      
+      <xsl:variable name="explicitThemeColor">
+        <xsl:call-template name="get-theme-color"/>
+      </xsl:variable>
+      <xsl:variable name="themeSuffix">
+        <xsl:if test="$explicitThemeColor != ''">
+          <xsl:call-template name="get-theme-suffix"/>
+        </xsl:if>
+      </xsl:variable>
       <xsl:variable name="theme">
         <xsl:choose>
-          <xsl:when test="@color"><xsl:value-of select="@color"/></xsl:when>
+          <xsl:when test="$explicitThemeColor != ''"><xsl:value-of select="$explicitThemeColor"/></xsl:when>
           <xsl:when test="exists(tokenize(@outputclass, ' ')[starts-with(., 'alert-')])">
             <xsl:value-of select="substring-after(tokenize(@outputclass, ' ')[starts-with(., 'alert-')][1], 'alert-')"/>
           </xsl:when>
           <xsl:otherwise>secondary</xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
-      
+      <xsl:variable name="suffixTokens" select="if ($themeSuffix != '') then tokenize($themeSuffix, '-') else ()"/>
+      <xsl:variable name="isMuted" select="$suffixTokens = 'muted'"/>
+      <xsl:variable name="isSubtle" select="$themeSuffix = '' or $suffixTokens = 'subtle'"/>
+      <!-- '-border' on its own sets only a border color, no background. -->
+      <xsl:variable name="isBorderOnly" select="$themeSuffix = 'border'"/>
+
       <!-- 1. Background & Spacing Defaults -->
-      <xsl:call-template name="bootstrap.decoration">
-          <xsl:with-param name="variant" select="'subtle'"/>
-          <xsl:with-param name="theme" select="$theme"/>
-          <xsl:with-param name="defaultRounded" select="true()"/>
-      </xsl:call-template>
+      <xsl:choose>
+        <xsl:when test="$isMuted">
+          <xsl:call-template name="bootstrap.decoration">
+              <xsl:with-param name="theme" select="$theme"/>
+              <xsl:with-param name="prefix" select="'__muted__'"/>
+              <xsl:with-param name="defaultRounded" select="true()"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:when test="$isBorderOnly">
+          <xsl:call-template name="bootstrap.decoration">
+              <xsl:with-param name="theme" select="$theme"/>
+              <xsl:with-param name="skipBackground" select="true()"/>
+              <xsl:with-param name="defaultRounded" select="true()"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="bootstrap.decoration">
+              <xsl:with-param name="variant" select="if ($isSubtle) then 'subtle' else ''"/>
+              <xsl:with-param name="theme" select="$theme"/>
+              <xsl:with-param name="defaultRounded" select="true()"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
 
       <!-- 2. Set default padding (p-3) if not overridden -->
       <xsl:if test="not(@padding or exists(tokenize(@outputclass, ' ')[starts-with(., 'p-')]))">
@@ -45,28 +79,46 @@
       </xsl:if>
       <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
 
+      <xsl:variable name="ancestorStartPad">
+        <xsl:call-template name="get-ancestor-padding-indent">
+          <xsl:with-param name="side" select="'start'"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:variable name="ancestorEndPad">
+        <xsl:call-template name="get-ancestor-padding-indent">
+          <xsl:with-param name="side" select="'end'"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:if test="number($ancestorStartPad) > 0">
+        <xsl:attribute name="start-indent" select="concat($ancestorStartPad, 'pt + from-parent(start-indent)')"/>
+      </xsl:if>
+      <xsl:if test="number($ancestorEndPad) > 0">
+        <xsl:attribute name="end-indent" select="concat($ancestorEndPad, 'pt + from-parent(end-indent)')"/>
+      </xsl:if>
+
+      <xsl:variable name="widthVal">
+        <xsl:choose>
+          <xsl:when test="@width != ''"><xsl:value-of select="@width"/></xsl:when>
+          <xsl:when test="exists(tokenize(@outputclass, ' ')[starts-with(., 'w-')])">
+            <xsl:value-of select="substring-after(tokenize(@outputclass, ' ')[starts-with(., 'w-')][1], 'w-')"/>
+          </xsl:when>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="totalPad" select="number($ancestorStartPad) + number($ancestorEndPad)"/>
+      <xsl:if test="$widthVal = ('25', '50', '75', '100') and $totalPad > 0">
+        <xsl:attribute name="width" select="concat($widthVal, '% - ', $totalPad, 'pt')"/>
+        <xsl:attribute name="inline-progression-dimension" select="concat($widthVal, '% - ', $totalPad, 'pt')"/>
+      </xsl:if>
+
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
 
   <xsl:template
-    match="*[contains(@class, ' bootstrap-d/alert ') or exists(tokenize(@outputclass, ' ')[starts-with(., 'alert-')]) or tokenize(@outputclass, ' ') = 'alert']/*[contains(@class, ' topic/title ')]"
+    match="*[not(contains(@class, ' topic/note ')) and (contains(@class, ' bootstrap-d/alert ') or (exists(tokenize(@outputclass, ' ')[starts-with(., 'alert-') or starts-with(., 'theme-')]) and not(tokenize(@outputclass, ' ') = ('accordion', 'accordion-flush', 'card', 'carousel', 'drawer', 'offcanvas'))) or tokenize(@outputclass, ' ') = 'alert')]/*[contains(@class, ' topic/title ')]"
     priority="10"
   >
-    <xsl:variable name="ctx" select=".."/>
-    <xsl:variable name="theme">
-      <xsl:choose>
-        <xsl:when test="$ctx/@color"><xsl:value-of select="$ctx/@color"/></xsl:when>
-        <xsl:when test="exists(tokenize($ctx/@outputclass, ' ')[starts-with(., 'alert-')])">
-          <xsl:value-of
-            select="substring-after(tokenize($ctx/@outputclass, ' ')[starts-with(., 'alert-')][1], 'alert-')"
-          />
-        </xsl:when>
-        <xsl:otherwise>secondary</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    
-    <fo:block font-weight="bold" font-size="12pt" space-after="4pt">
+    <fo:block font-weight="{$bootstrap-heading-font-weight}" font-size="12pt" space-after="4pt">
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
diff --git a/xsl/fo/badge.xsl b/xsl/fo/badge.xsl
index 3e20c63..e492daf 100644
--- a/xsl/fo/badge.xsl
+++ b/xsl/fo/badge.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -8,27 +12,72 @@
   <!-- Badge Support -->
   <xsl:template
     match="*[contains(@class, ' bootstrap-d/badge ') or (contains(@class,' topic/ph ') and contains(@outputclass, 'badge'))]"
-    priority="100"
+    priority="5"
   >
     <fo:inline>
       <xsl:call-template name="commonattributes"/>
-      
+
+      <!-- @theme may carry a style suffix (e.g. 'primary-outline', 'primary-subtle') since
+           badge has no separate @style attribute in the schema. -->
+      <xsl:variable
+        name="themeValue"
+        select="(@theme, substring-after(tokenize(@outputclass, ' ')[starts-with(., 'theme-')][1], 'theme-'))[1]"
+      />
+
+      <!-- Style variant: none | solid (default) | outline | subtle -->
+      <xsl:variable
+        name="style"
+        select="(@style,
+          if (ends-with($themeValue, '-outline')) then 'outline'
+          else if (ends-with($themeValue, '-subtle')) then 'subtle'
+          else (),
+          if (exists(tokenize(@outputclass, ' ')[. = 'badge-outline'])) then 'outline'
+          else if (exists(tokenize(@outputclass, ' ')[. = 'badge-subtle'])) then 'subtle'
+          else (),
+          'solid')[1]"
+      />
+
       <!-- Specialized Bootstrap Styling -->
       <xsl:variable
-        name="theme"
-        select="(@color, 
-          substring-after(tokenize(@outputclass, ' ')[starts-with(., 'badge-')][1], 'badge-'),
+        name="explicitTheme"
+        select="(
+          if ($themeValue != '') then (if (contains($themeValue, '-')) then substring-before($themeValue, '-') else $themeValue) else (),
           substring-after(tokenize(@outputclass, ' ')[starts-with(., 'bg-')][1], 'bg-'),
-          substring-after(tokenize(@outputclass, ' ')[starts-with(., 'text-bg-')][1], 'text-bg-'),
-          'primary')[1]"
+          substring-after(tokenize(@outputclass, ' ')[starts-with(., 'text-bg-')][1], 'text-bg-'))[1]"
+      />
+      <xsl:variable
+        name="theme"
+        select="if ($style = 'none') then '' else if ($explicitTheme != '') then $explicitTheme else 'primary'"
       />
-      
-      <!-- 1. Background & Spacing via Unified Hub -->
-      <xsl:call-template name="bootstrap.decoration">
-          <xsl:with-param name="theme" select="$theme"/>
-          <xsl:with-param name="prefix" select="'__badge__'"/>
-      </xsl:call-template>
-      
+
+      <!-- 1. Background, border & Spacing via Unified Hub -->
+      <xsl:choose>
+        <xsl:when test="$theme = ''"/>
+        <xsl:when test="$style = 'outline'">
+          <xsl:call-template name="processBootstrapAttrSetReflection">
+            <xsl:with-param name="attrSet" select="concat('__color__', $theme)"/>
+          </xsl:call-template>
+          <xsl:call-template name="processBootstrapBorderColor">
+            <xsl:with-param name="attrValue" select="$theme"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:when test="$style = 'subtle'">
+          <xsl:call-template name="bootstrap.decoration">
+              <xsl:with-param name="theme" select="concat($theme, '-subtle')"/>
+              <xsl:with-param name="prefix" select="'__bg__'"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:when test="$explicitTheme = ''">
+          <xsl:attribute name="background-color" select="$bootstrap-badge-default-bg"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="bootstrap.decoration">
+              <xsl:with-param name="theme" select="$theme"/>
+              <xsl:with-param name="prefix" select="'__badge__'"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
+
       <!-- 2. Set tighter default padding (1pt 3pt) if not overridden -->
       <xsl:if test="not(@padding or exists(tokenize(@outputclass, ' ')[starts-with(., 'p-')]))">
         <xsl:attribute name="padding">1pt 3pt</xsl:attribute>
@@ -37,7 +86,7 @@
       <!-- 3. Badge-specific defaults (weights and alignment) -->
       <xsl:attribute name="font-weight">bold</xsl:attribute>
       <xsl:attribute name="vertical-align">baseline</xsl:attribute>
-      
+
       <!-- 4. Default Rounding (tighter badge look) if not overridden -->
       <xsl:if test="not(@rounded or exists(tokenize(@outputclass, ' ')[starts-with(., 'rounded-')]))">
         <xsl:call-template name="processBootstrapRounded">
diff --git a/xsl/fo/button.xsl b/xsl/fo/button.xsl
index f834598..e3834d4 100644
--- a/xsl/fo/button.xsl
+++ b/xsl/fo/button.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -103,33 +107,34 @@
       select="ancestor::*[contains(@class, ' bootstrap-d/button-group ') or tokenize(@outputclass, ' ') = 'btn-group'][1]/@vertical = 'yes'"
     />
     <xsl:variable name="element" select="if ($is-vertical) then 'fo:block' else 'fo:inline'"/>
+    <xsl:variable
+      name="is-external"
+      select="boolean(@href) and ((@scope = 'external') or not(empty(@format) or @format = 'dita'))"
+    />
+    <xsl:variable
+      name="internal-dest-id"
+      select="if (@href and not($is-external)) then opentopic-func:getDestinationId(@href) else ''"
+    />
+    <xsl:variable name="has-destination" select="$is-external or ($internal-dest-id != '')"/>
 
-    <fo:basic-link xsl:use-attribute-sets="xref">
-      <!-- Link Destination -->
-      <xsl:choose>
-        <xsl:when test="(@scope = 'external') or not(empty(@format) or @format = 'dita')">
-          <xsl:attribute name="external-destination">url('<xsl:value-of select="@href"/>')</xsl:attribute>
-        </xsl:when>
-        <xsl:when test="@href">
-          <xsl:attribute name="internal-destination">
-             <xsl:value-of select="opentopic-func:getDestinationId(@href)"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-
+    <xsl:variable name="button-content" as="node()*">
       <xsl:element name="{$element}">
         <xsl:call-template name="commonattributes"/>
-        
-        <!-- Specialized Bootstrap Styling -->
-        <xsl:variable name="theme">
+        <xsl:variable name="rawTheme">
           <xsl:choose>
-            <xsl:when test="@color"><xsl:value-of select="@color"/></xsl:when>
+            <xsl:when test="@style = 'none'"/>
+            <xsl:when test="@theme"><xsl:value-of select="@theme"/></xsl:when>
+            <xsl:when test="exists(tokenize(@outputclass, ' ')[starts-with(., 'theme-')])">
+              <xsl:value-of
+                select="substring-after(tokenize(@outputclass, ' ')[starts-with(., 'theme-')][1], 'theme-')"
+              />
+            </xsl:when>
             <xsl:when
-              test="exists(tokenize(@outputclass, ' ')[starts-with(., 'btn-') and not(. = ('btn-lg', 'btn-sm', 'btn-toolbar', 'btn-group'))])"
+              test="exists(tokenize(@outputclass, ' ')[starts-with(., 'btn-') and not(. = ('btn-lg', 'btn-sm', 'btn-xs', 'btn-toolbar', 'btn-group', 'btn-solid', 'btn-outline', 'btn-subtle', 'btn-text', 'btn-link', 'btn-styled'))])"
             >
               <xsl:variable
                 name="token"
-                select="tokenize(@outputclass, ' ')[starts-with(., 'btn-') and not(. = ('btn-lg', 'btn-sm', 'btn-toolbar', 'btn-group'))][1]"
+                select="tokenize(@outputclass, ' ')[starts-with(., 'btn-') and not(. = ('btn-lg', 'btn-sm', 'btn-xs', 'btn-toolbar', 'btn-group', 'btn-solid', 'btn-outline', 'btn-subtle', 'btn-text', 'btn-link', 'btn-styled'))][1]"
               />
               <xsl:value-of
                 select="substring-after($token, if (contains($token, 'outline-')) then 'btn-outline-' else 'btn-')"
@@ -139,23 +144,50 @@
           </xsl:choose>
         </xsl:variable>
 
+        <xsl:variable
+          name="theme"
+          select="if (contains($rawTheme, '-')) then substring-before($rawTheme, '-') else $rawTheme"
+        />
+        <xsl:variable
+          name="themeSuffix"
+          select="if (contains($rawTheme, '-')) then substring-after($rawTheme, '-') else ''"
+        />
+
         <xsl:variable name="size">
           <xsl:choose>
             <xsl:when test="@size"><xsl:value-of select="@size"/></xsl:when>
             <xsl:when test="tokenize(@outputclass, ' ') = 'btn-lg'">large</xsl:when>
             <xsl:when test="tokenize(@outputclass, ' ') = 'btn-sm'">small</xsl:when>
+            <xsl:when test="tokenize(@outputclass, ' ') = 'btn-xs'">xs</xsl:when>
             <xsl:otherwise>default</xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
 
+        <!-- Style variant: none | solid (default) | outline | subtle | text. -->
         <xsl:variable
           name="is-outline"
-          select="@outline = 'yes' or exists(tokenize(@outputclass, ' ')[starts-with(., 'btn-outline-')])"
+          select="@style = 'outline' or $themeSuffix = 'outline' or $themeSuffix = 'outline-styled' or exists(tokenize(@outputclass, ' ')[. = 'btn-outline' or starts-with(., 'btn-outline-')])"
+        />
+        <xsl:variable
+          name="is-subtle"
+          select="@style = 'subtle' or $themeSuffix = 'subtle' or $themeSuffix = 'subtle-styled' or exists(tokenize(@outputclass, ' ')[. = 'btn-subtle'])"
+        />
+        <xsl:variable
+          name="is-text"
+          select="@style = 'text' or $themeSuffix = 'text' or exists(tokenize(@outputclass, ' ')[. = 'btn-text'])"
         />
+        <xsl:variable name="is-none" select="@style = 'none'"/>
 
         <!-- Background & Text Colors -->
         <xsl:choose>
-          <xsl:when test="$is-outline">
+          <xsl:when test="$is-none or $theme = ''"/>
+          <xsl:when test="$is-subtle">
+            <xsl:call-template name="bootstrap.decoration">
+                <xsl:with-param name="theme" select="concat($theme, '-subtle')"/>
+                <xsl:with-param name="prefix" select="'__bg__'"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:when test="$is-outline or $is-text">
             <xsl:call-template name="processBootstrapAttrSetReflection">
               <xsl:with-param name="attrSet" select="concat('__color__', $theme)"/>
             </xsl:call-template>
@@ -166,29 +198,32 @@
             </xsl:call-template>
           </xsl:otherwise>
         </xsl:choose>
-        
-        <!-- Borders -->
-        <xsl:attribute name="border-style">solid</xsl:attribute>
-        <xsl:attribute name="border-width">
-           <xsl:choose>
-             <!-- Outline buttons require a border to be visible; enforce 1pt if theme globally suppresses borders -->
-             <xsl:when
-              test="$is-outline and normalize-space($bootstrap-border-width) = ('0', '0pt', '0px', 'none', '')"
-            >1pt</xsl:when>
-             <xsl:otherwise><xsl:value-of select="$bootstrap-border-width"/></xsl:otherwise>
-           </xsl:choose>
-        </xsl:attribute>
-        <xsl:call-template name="processBootstrapBorderColor">
-          <xsl:with-param name="attrValue" select="$theme"/>
-        </xsl:call-template>
-        <xsl:if test="@bordercolor">
-          <xsl:call-template name="processBootstrapBorderColor">
-            <xsl:with-param name="attrValue" select="@bordercolor"/>
-          </xsl:call-template>
+
+        <!-- Borders: text, subtle, and bare ("none") buttons have no border, matching the HTML look -->
+        <xsl:if test="not($is-text or $is-subtle or $is-none)">
+          <xsl:attribute name="border-style">solid</xsl:attribute>
+          <xsl:attribute name="border-width">
+             <xsl:choose>
+               <!-- Outline buttons require a border to be visible; enforce 1pt if theme globally suppresses borders -->
+               <xsl:when
+                test="$is-outline and normalize-space($bootstrap-border-width) = ('0', '0pt', '0px', 'none', '')"
+              >1pt</xsl:when>
+               <xsl:otherwise><xsl:value-of select="$bootstrap-border-width"/></xsl:otherwise>
+             </xsl:choose>
+          </xsl:attribute>
+          <xsl:if test="$theme != ''">
+            <xsl:call-template name="processBootstrapBorderColor">
+              <xsl:with-param name="attrValue" select="$theme"/>
+            </xsl:call-template>
+          </xsl:if>
         </xsl:if>
         
         <!-- Size-dependent Padding & Font Size -->
         <xsl:choose>
+          <xsl:when test="$size = 'xs'">
+            <xsl:attribute name="font-size">7.5pt</xsl:attribute>
+            <xsl:attribute name="padding">1pt 3pt</xsl:attribute>
+          </xsl:when>
           <xsl:when test="$size = 'small'">
             <xsl:attribute name="font-size">9pt</xsl:attribute>
             <xsl:attribute name="padding">1.5pt 4pt</xsl:attribute>
@@ -200,8 +235,8 @@
           <xsl:otherwise>
             <xsl:attribute name="font-size">11pt</xsl:attribute>
             <xsl:choose>
-               <xsl:when test="contains(@outputclass, 'btn-floating')">
-                  <xsl:attribute name="padding">6pt</xsl:attribute>
+               <xsl:when test="contains(@outputclass, 'btn-icon')">
+                  <xsl:attribute name="padding">7.5pt 4pt 4.5pt 2pt</xsl:attribute>
                </xsl:when>
                <xsl:otherwise>
                   <xsl:attribute name="padding">3pt 8pt</xsl:attribute>
@@ -220,7 +255,7 @@
         
         <!-- Rounding (Default to '2' (4pt) instead of 'yes' (6pt)) -->
         <xsl:call-template name="processBootstrapRounded">
-          <xsl:with-param name="attrValue" select="(@rounded, if ($size = 'small') then '1' else '2')[1]"/>
+          <xsl:with-param name="attrValue" select="(@rounded, if ($size = ('xs', 'small')) then '1' else '2')[1]"/>
         </xsl:call-template>
         
         <!-- Legacy / Spacing utility support -->
@@ -233,7 +268,7 @@
           <xsl:with-param name="attrValue" select="@outputclass"/>
         </xsl:call-template>
 
-        <xsl:call-template name="bootstrap.decoration"/>
+        <xsl:call-template name="processBootstrapDirection"/>
 
         <!-- Button Group Position Awareness  -->
         <xsl:variable
@@ -330,17 +365,38 @@
           </xsl:choose>
         </fo:inline>
       </xsl:element>
-    </fo:basic-link>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="$has-destination">
+        <fo:basic-link xsl:use-attribute-sets="xref">
+          <!-- Link Destination -->
+          <xsl:choose>
+            <xsl:when test="$is-external">
+              <xsl:attribute name="external-destination">url('<xsl:value-of select="@href"/>')</xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="internal-destination" select="$internal-dest-id"/>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:sequence select="$button-content"/>
+        </fo:basic-link>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:sequence select="$button-content"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
-  <!-- Support for Bootstrap link utility classes (e.g., link-primary) or @color -->
   <xsl:template
-    match="*[contains(@class, ' topic/xref ') and (@color or exists(tokenize(@outputclass, ' ')[starts-with(., 'link-') or . = 'link-underline']))]"
+    match="*[contains(@class, ' topic/xref ') and (@theme or exists(tokenize(@outputclass, ' ')[starts-with(., 'link-') or . = 'link-underline']))]"
     priority="10"
   >
     <xsl:variable name="theme">
       <xsl:choose>
-        <xsl:when test="@color"><xsl:value-of select="@color"/></xsl:when>
+        <xsl:when test="@theme">
+          <xsl:value-of select="if (contains(@theme, '-')) then substring-before(@theme, '-') else @theme"/>
+        </xsl:when>
         <xsl:when test="exists(tokenize(@outputclass, ' ')[starts-with(., 'link-') and not(. = 'link-underline')])">
            <xsl:value-of
             select="substring-after(tokenize(@outputclass, ' ')[starts-with(., 'link-') and not(. = 'link-underline')][1], 'link-')"
@@ -360,26 +416,36 @@
        </xsl:choose>
     </xsl:variable>
 
-    <fo:basic-link xsl:use-attribute-sets="xref">
+    <xsl:variable
+      name="is-external"
+      select="boolean(@href) and ((@scope = 'external') or not(empty(@format) or @format = 'dita'))"
+    />
+    <xsl:variable
+      name="internal-dest-id"
+      select="if (@href and not($is-external)) then opentopic-func:getDestinationId(@href) else ''"
+    />
+    <xsl:variable name="has-destination" select="$is-external or ($internal-dest-id != '')"/>
+
+    <xsl:element name="{if ($has-destination) then 'fo:basic-link' else 'fo:inline'}" use-attribute-sets="xref">
       <xsl:call-template name="commonattributes"/>
       <xsl:if test="$color != ''">
          <xsl:attribute name="color"><xsl:value-of select="$color"/></xsl:attribute>
       </xsl:if>
-      
+
       <xsl:if test="tokenize(@outputclass, ' ') = 'link-underline'">
          <xsl:attribute name="text-decoration">underline</xsl:attribute>
       </xsl:if>
 
-      <xsl:choose>
-        <xsl:when test="(@scope = 'external') or not(empty(@format) or @format = 'dita')">
-          <xsl:attribute name="external-destination">url('<xsl:value-of select="@href"/>')</xsl:attribute>
-        </xsl:when>
-        <xsl:when test="@href">
-          <xsl:attribute name="internal-destination">
-             <xsl:value-of select="opentopic-func:getDestinationId(@href)"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
+      <xsl:if test="$has-destination">
+        <xsl:choose>
+          <xsl:when test="$is-external">
+            <xsl:attribute name="external-destination">url('<xsl:value-of select="@href"/>')</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="internal-destination" select="$internal-dest-id"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
 
       <xsl:choose>
         <!-- If link has explicit child text or icons, use those, but suppress metadata -->
@@ -391,7 +457,7 @@
           <xsl:apply-templates select="." mode="insert-text"/>
         </xsl:otherwise>
       </xsl:choose>
-    </fo:basic-link>
+    </xsl:element>
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/xsl/fo/card.xsl b/xsl/fo/card.xsl
index 0c206a9..99af10c 100644
--- a/xsl/fo/card.xsl
+++ b/xsl/fo/card.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -10,13 +14,11 @@
   version="2.0"
 >
 
-  <!-- Match both specialized card elements and sections/divs with @outputclass='card' -->
-  <!-- Aggressive priority="100" to override any other plugin or base templates. -->
   <xsl:template
-    match="*[contains(@class, ' bootstrap-d/card ') or (tokenize(@outputclass, ' ') = 'card' and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]"
+    match="*[self::card or contains(@class, ' bootstrap-d/card ') or (tokenize(@outputclass, ' ') = 'card' and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]"
     priority="5"
   >
-    
+
     <fo:block>
       <xsl:call-template name="processBootstrapDirection"/>
       <xsl:variable name="direction">
@@ -38,11 +40,9 @@
       </xsl:variable>
       <xsl:variable name="gap-pct" select="100 - number($card-pct)"/>
 
-      <!-- Positioning Table Wrapper: Using Natural FO Flow -->
-      <!-- The table writing-mode matches the component's direction, forcing Column 1 to the correct side. -->
       <fo:table table-layout="fixed" width="100%" space-before="10pt" space-after="10pt">
         <xsl:call-template name="processBootstrapDirection"/>
-        
+
         <xsl:choose>
           <!-- Fixed width Card (e.g. 70%) with a Gap (e.g. 30%) -->
           <xsl:when test="$card-pct &lt; 100">
@@ -60,14 +60,19 @@
              <!-- Column 1: Always contains the Card content -->
              <!-- In RTL, Column 1 is on the Right. In LTR, Column 1 is on the Left. -->
              <fo:table-cell>
+                <xsl:variable name="effective-shadow">
+                   <xsl:call-template name="get-effective-shadow-value"/>
+                </xsl:variable>
                 <xsl:choose>
-                   <xsl:when test="@shadow and @shadow != 'none'">
+                   <xsl:when
+                  test="$effective-shadow != '' and $effective-shadow != 'none' and $effective-shadow != 'no'"
+                >
                       <xsl:variable name="card-content">
                          <xsl:call-template name="renderCardInternal"/>
                       </xsl:variable>
                       <xsl:call-template name="apply-shadow-wrapper">
                          <xsl:with-param name="inner" select="$card-content"/>
-                         <xsl:with-param name="shadow-val" select="@shadow"/>
+                         <xsl:with-param name="shadow-val" select="$effective-shadow"/>
                          <xsl:with-param name="margin-val" select="''"/>
                          <xsl:with-param name="reset-indent" select="true()"/>
                       </xsl:call-template>
@@ -77,7 +82,7 @@
                    </xsl:otherwise>
                 </xsl:choose>
              </fo:table-cell>
-             
+
              <!-- Column 2: Always contains the empty Gap (if any) -->
              <xsl:if test="$card-pct &lt; 100">
                <fo:table-cell>
@@ -90,60 +95,160 @@
     </fo:block>
   </xsl:template>
 
+  <xsl:template name="corner-mask">
+    <xsl:param name="corner"/>
+    <xsl:param name="radius"/>
+    <xsl:variable name="is-top" select="$corner = 'tl' or $corner = 'tr'"/>
+    <xsl:variable name="is-left" select="$corner = 'tl' or $corner = 'bl'"/>
+    <xsl:variable name="radius-num" select="number(substring-before(concat($radius, 'pt'), 'pt'))"/>
+    <xsl:variable name="border-num" select="number(substring-before(concat($bootstrap-border-width, 'pt'), 'pt'))"/>
+    <xsl:variable name="inset" select="concat($radius-num - $border-num - 1.05, 'pt')"/>
+    <fo:block-container position="absolute" width="{$radius}" height="{$radius}" overflow="hidden">
+      <xsl:attribute name="top">
+        <xsl:choose>
+          <xsl:when test="$is-top"><xsl:value-of select="concat('-', (2 * $border-num) + 0.95, 'pt')"/></xsl:when>
+          <xsl:otherwise>0pt</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <xsl:choose>
+        <xsl:when test="$is-left">
+          <xsl:attribute name="left">
+            <xsl:choose>
+              <xsl:when test="$is-top"><xsl:value-of select="concat('-', $border-num + 0.45, 'pt')"/></xsl:when>
+              <xsl:otherwise><xsl:value-of select="concat('-', $bootstrap-border-width)"/></xsl:otherwise>
+            </xsl:choose>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="left">
+            <xsl:choose>
+              <xsl:when test="$is-top"><xsl:value-of
+                  select="concat('100% - ', $radius-num - $border-num - 0.45, 'pt')"
+                /></xsl:when>
+              <xsl:otherwise><xsl:value-of select="concat('100% - ', $inset)"/></xsl:otherwise>
+            </xsl:choose>
+          </xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+      <fo:block>
+        <fo:instream-foreign-object>
+          <svg:svg
+            xmlns:svg="http://www.w3.org/2000/svg"
+            width="{$radius}"
+            height="{$radius}"
+            viewBox="0 0 1 1"
+            preserveAspectRatio="none"
+          >
+            <xsl:variable name="cx" select="if ($is-left) then 1 else 0"/>
+            <xsl:variable name="oy" select="if ($is-top) then 0 else 1"/>
+            <xsl:variable name="t" select="0.585786"/>
+            <xsl:variable name="edge-x" select="(1 - $cx) + $t * ((2 * $cx) - 1)"/>
+            <xsl:variable name="edge-y" select="$oy + $t * (1 - (2 * $oy))"/>
+            <svg:path
+              fill="white"
+              d="{concat('M', 1 - $cx, ',', $oy, ' L', $edge-x, ',', $oy, ' L', 1 - $cx, ',', $edge-y, ' Z')}"
+            />
+          </svg:svg>
+        </fo:instream-foreign-object>
+      </fo:block>
+    </fo:block-container>
+  </xsl:template>
+
   <xsl:template name="renderCardInternal">
-      <fo:table xsl:use-attribute-sets="section">
+      <xsl:variable name="radius-probe">
+        <fo:block-container><xsl:call-template name="bootstrap.decoration"/></fo:block-container>
+      </xsl:variable>
+      <xsl:variable name="card-radius-raw" select="normalize-space($radius-probe/*/@fox:border-radius)"/>
+      <xsl:variable name="card-radius" select="$card-radius-raw"/>
+
+      <fo:block-container xsl:use-attribute-sets="section" position="relative">
         <xsl:call-template name="commonattributes"/>
-        
+
         <!-- Start-aligned within its cell -->
         <xsl:attribute name="start-indent">0pt</xsl:attribute>
         <xsl:attribute name="end-indent">0pt</xsl:attribute>
-        
-        <!-- Frame Border: Uses @color theme if present, falls back to light gray -->
+
+        <!-- Frame Border: Uses @theme if present, falls back to light gray -->
         <xsl:attribute name="border">
           <xsl:value-of select="concat($bootstrap-border-width, ' solid')"/>
         </xsl:attribute>
-        <xsl:variable name="theme" select="@color"/>
+        <xsl:variable name="theme">
+          <xsl:call-template name="get-theme-color"/>
+        </xsl:variable>
         <xsl:choose>
-          <xsl:when test="$theme">
+          <xsl:when test="$theme != ''">
             <xsl:call-template name="processBootstrapBorderColor">
               <xsl:with-param name="attrValue" select="$theme"/>
             </xsl:call-template>
           </xsl:when>
           <xsl:otherwise>
+            <xsl:attribute name="border-style">solid</xsl:attribute>
+            <xsl:attribute name="border-width"><xsl:value-of select="$bootstrap-border-width"/></xsl:attribute>
             <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-border-color"/></xsl:attribute>
           </xsl:otherwise>
         </xsl:choose>
         <!-- Ensure the entire card stays on one page -->
         <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
+        <xsl:variable name="effective-shadow">
+          <xsl:call-template name="get-effective-shadow-value"/>
+        </xsl:variable>
+        <xsl:if test="$effective-shadow != '' and $effective-shadow != 'none' and $effective-shadow != 'no'">
+          <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-body-bg"/></xsl:attribute>
+        </xsl:if>
+        <xsl:attribute name="overflow">hidden</xsl:attribute>
         <xsl:call-template name="bootstrap.decoration"/>
+        <xsl:if test="$card-radius != ''">
+          <xsl:attribute name="fox:border-radius" select="$card-radius"/>
+        </xsl:if>
 
+      <fo:table table-layout="fixed" width="100%">
         <fo:table-column column-width="proportional-column-width(1)"/>
         <fo:table-body>
-          
+
           <!-- Element Selection -->
-          <xsl:variable name="all-images" select="*[contains(@class, ' topic/image ')]"/>
+          <xsl:variable name="all-images" select="*[self::image or contains(@class, ' topic/image ')]"/>
           <xsl:variable
-          name="top-images"
-          select="$all-images[contains(@outputclass, 'card-img-top')] | ($all-images[1][not(contains(@outputclass, 'card-img-bottom'))])"
-        />
+            name="top-images"
+            select="$all-images[contains(@outputclass, 'card-img-top')] | ($all-images[1][not(contains(@outputclass, 'card-img-bottom'))])"
+          />
           <xsl:variable
-          name="header"
-          select="*[contains(@class, ' bootstrap-d/card-header ') or contains(@outputclass, 'card-header')]"
-        />
+            name="header"
+            select="*[self::card-header or contains(@class, ' bootstrap-d/card-header ') or contains(@outputclass, 'card-header')]"
+          />
           <xsl:variable
-          name="footer"
-          select="*[contains(@class, ' bootstrap-d/card-footer ') or contains(@outputclass, 'card-footer')]"
-        />
-          <xsl:variable name="title" select="*[contains(@class, ' topic/title ')]"/>
+            name="footer"
+            select="*[self::card-footer or contains(@class, ' bootstrap-d/card-footer ') or contains(@outputclass, 'card-footer')]"
+          />
+          <xsl:variable name="title" select="*[self::title or contains(@class, ' topic/title ')]"/>
 
           <!-- 1. Card Header Row -->
           <xsl:if test="$header">
             <fo:table-row>
               <fo:table-cell padding="8pt 15pt">
-                 <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-light"/></xsl:attribute>
-                 <xsl:attribute name="border-bottom">
-                    <xsl:value-of select="concat($bootstrap-border-width, ' solid ', $bootstrap-border-color)"/>
-                 </xsl:attribute>
+                 <xsl:choose>
+                    <xsl:when test="$theme != ''">
+                       <xsl:call-template name="processBootstrapAttrSetReflection">
+                          <xsl:with-param name="attrSet" select="concat('__bg__', $theme)"/>
+                       </xsl:call-template>
+                       <xsl:attribute name="border-bottom">
+                          <xsl:value-of select="concat($bootstrap-border-width, ' solid')"/>
+                       </xsl:attribute>
+                       <xsl:attribute name="border-bottom-color">
+                          <xsl:call-template name="getBootstrapAttrValue">
+                             <xsl:with-param name="attrSet" select="concat('border-', $theme)"/>
+                             <xsl:with-param name="attrName" select="'border-color'"/>
+                          </xsl:call-template>
+                       </xsl:attribute>
+                    </xsl:when>
+                    <xsl:otherwise>
+                       <xsl:call-template name="processBootstrapAttrSetReflection">
+                          <xsl:with-param name="attrSet" select="'__bg__secondary'"/>
+                       </xsl:call-template>
+                       <xsl:attribute name="border-bottom">
+                          <xsl:value-of select="concat($bootstrap-border-width, ' solid ', $bootstrap-border-color)"/>
+                       </xsl:attribute>
+                    </xsl:otherwise>
+                 </xsl:choose>
                  <xsl:call-template name="processBootstrapDirection"/>
                  <fo:block>
                     <xsl:call-template name="processBootstrapDirection"/>
@@ -169,11 +274,6 @@
             <fo:table-row>
               <fo:table-cell padding="10pt 15pt 0 15pt">
                  <xsl:call-template name="processBootstrapDirection"/>
-                 <xsl:if test="$theme">
-                    <xsl:call-template name="processBootstrapAttrSetReflection">
-                       <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
-                    </xsl:call-template>
-                 </xsl:if>
                  <fo:block>
                     <xsl:call-template name="processBootstrapDirection"/>
                         <xsl:apply-templates select="$title"/>
@@ -185,22 +285,17 @@
           <fo:table-row>
             <fo:table-cell padding="10pt 15pt">
                <xsl:call-template name="processBootstrapDirection"/>
-               <xsl:if test="$theme">
-                  <xsl:call-template name="processBootstrapAttrSetReflection">
-                     <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
-                  </xsl:call-template>
-               </xsl:if>
                <fo:block>
                   <xsl:call-template name="processBootstrapDirection"/>
                   <xsl:apply-templates
-                select="node() except (
+                  select="node() except (
                      $title |
                      $top-images |
                      $header |
                      $footer |
                      processing-instruction('ditaot')
                   )"
-              />
+                />
                </fo:block>
             </fo:table-cell>
           </fo:table-row>
@@ -209,41 +304,101 @@
           <xsl:if test="$footer">
             <fo:table-row>
               <fo:table-cell padding="8pt 15pt">
-                 <xsl:attribute name="background-color"><xsl:value-of select="$bootstrap-light"/></xsl:attribute>
-                 <xsl:attribute name="border-top">
-                    <xsl:value-of select="concat($bootstrap-border-width, ' solid ', $bootstrap-border-color)"/>
-                 </xsl:attribute>
+                 <xsl:choose>
+                    <xsl:when test="$theme != ''">
+                       <xsl:call-template name="processBootstrapAttrSetReflection">
+                          <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
+                       </xsl:call-template>
+                       <xsl:attribute name="border-top">
+                          <xsl:value-of select="concat($bootstrap-border-width, ' solid')"/>
+                       </xsl:attribute>
+                       <xsl:attribute name="border-top-color">
+                          <xsl:call-template name="getBootstrapAttrValue">
+                             <xsl:with-param name="attrSet" select="concat('border-', $theme)"/>
+                             <xsl:with-param name="attrName" select="'border-color'"/>
+                          </xsl:call-template>
+                       </xsl:attribute>
+                    </xsl:when>
+                    <xsl:otherwise>
+                       <xsl:call-template name="processBootstrapAttrSetReflection">
+                          <xsl:with-param name="attrSet" select="'__bg__secondary-subtle'"/>
+                       </xsl:call-template>
+                       <xsl:attribute name="border-top">
+                          <xsl:value-of select="concat($bootstrap-border-width, ' solid ', $bootstrap-border-color)"/>
+                       </xsl:attribute>
+                    </xsl:otherwise>
+                 </xsl:choose>
                  <xsl:call-template name="processBootstrapDirection"/>
                  <fo:block>
                     <xsl:call-template name="processBootstrapDirection"/>
                     <xsl:apply-templates select="$footer"/>
-                 </fo:block>
+                   </fo:block>
               </fo:table-cell>
             </fo:table-row>
           </xsl:if>
 
         </fo:table-body>
       </fo:table>
+
+      <!-- Corner masks -->
+      <xsl:if test="$card-radius != ''">
+        <xsl:variable
+          name="has-top-content"
+          select="boolean(
+          *[self::card-header or contains(@class, ' bootstrap-d/card-header ') or contains(@outputclass, 'card-header')]
+          | *[self::image or contains(@class, ' topic/image ')]
+        )"
+        />
+        <xsl:variable
+          name="has-footer"
+          select="boolean(*[self::card-footer or contains(@class, ' bootstrap-d/card-footer ') or contains(@outputclass, 'card-footer')])"
+        />
+        <xsl:if test="$has-top-content">
+          <xsl:call-template name="corner-mask">
+            <xsl:with-param name="corner" select="'tl'"/>
+            <xsl:with-param name="radius" select="$card-radius"/>
+          </xsl:call-template>
+          <xsl:call-template name="corner-mask">
+            <xsl:with-param name="corner" select="'tr'"/>
+            <xsl:with-param name="radius" select="$card-radius"/>
+          </xsl:call-template>
+        </xsl:if>
+        <xsl:if test="$has-footer">
+          <xsl:variable name="strip-radius-num" select="number(substring-before(concat($card-radius, 'pt'), 'pt'))"/>
+          <xsl:variable
+            name="strip-border-num"
+            select="number(substring-before(concat($bootstrap-border-width, 'pt'), 'pt'))"
+          />
+          <fo:block-container
+            height="{$card-radius}"
+            margin-top="-{$strip-radius-num - (2 * $strip-border-num) - 2}pt"
+            position="relative"
+          >
+            <xsl:call-template name="corner-mask">
+              <xsl:with-param name="corner" select="'bl'"/>
+              <xsl:with-param name="radius" select="$card-radius"/>
+            </xsl:call-template>
+            <xsl:call-template name="corner-mask">
+              <xsl:with-param name="corner" select="'br'"/>
+              <xsl:with-param name="radius" select="$card-radius"/>
+            </xsl:call-template>
+          </fo:block-container>
+        </xsl:if>
+      </xsl:if>
+      </fo:block-container>
   </xsl:template>
 
   <!-- Card Title specialized rendering (Removes extra section margins) -->
   <xsl:template
-    match="*[contains(@class, ' bootstrap-d/card ') or (tokenize(@outputclass, ' ') = 'card' and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]/*[contains(@class, ' topic/title ')]"
+    match="*[self::card or contains(@class, ' bootstrap-d/card ') or (tokenize(@outputclass, ' ') = 'card' and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]/*[self::title or contains(@class, ' topic/title ')]"
     priority="5"
   >
-    <xsl:variable name="theme" select="../@color"/>
-    <xsl:variable name="title-color">
-      <xsl:if test="$theme">
-         <xsl:call-template name="getBootstrapAttrValue">
-           <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
-         </xsl:call-template>
-      </xsl:if>
-    </xsl:variable>
-
-    <fo:block font-size="14pt" font-weight="bold" margin-bottom="8pt">
-       <xsl:if test="$theme">
-          <xsl:attribute name="color"><xsl:value-of select="$title-color"/></xsl:attribute>
-       </xsl:if>
+    <fo:block
+      font-size="14pt"
+      font-weight="{$bootstrap-heading-font-weight}"
+      color="{$bootstrap-heading-color}"
+      margin-bottom="8pt"
+    >
        <xsl:call-template name="processBootstrapDirection"/>
        <xsl:apply-templates/>
     </fo:block>
@@ -251,7 +406,7 @@
 
   <!-- Card Images (Ensure 100% width scaling within the row) -->
   <xsl:template
-    match="*[contains(@class, ' bootstrap-d/card ') or (tokenize(@outputclass, ' ') = 'card' and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]//*[contains(@class, ' topic/image ')]"
+    match="*[self::card or contains(@class, ' bootstrap-d/card ') or (tokenize(@outputclass, ' ') = 'card' and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]//*[self::image or contains(@class, ' topic/image ')]"
     priority="5"
   >
     <fo:block text-align="center">
@@ -284,13 +439,47 @@
 
   <!-- Card Header/Footer internal blocks -->
   <xsl:template
-    match="*[contains(@class, ' bootstrap-d/card-header ') or contains(@outputclass, 'card-header')]"
+    match="*[self::card-header or self::card-footer or contains(@class, ' bootstrap-d/card-header ') or contains(@class, ' bootstrap-d/card-footer ') or contains(@outputclass, 'card-header') or contains(@outputclass, 'card-footer')]"
     priority="5"
   >
-     <fo:block font-weight="bold">
+     <fo:block font-weight="{$bootstrap-heading-font-weight}">
         <xsl:call-template name="processBootstrapDirection"/>
         <xsl:apply-templates/>
      </fo:block>
   </xsl:template>
 
+  <!-- Card bootstrapDecoration override (forces transparent background for the card body) -->
+  <xsl:template
+    match="*[self::card or contains(@class, ' bootstrap-d/card ') or (tokenize(@outputclass, ' ') = 'card' and (contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]"
+    mode="bootstrapDecoration"
+    priority="5"
+  >
+      <xsl:param name="variant" select="''"/>
+      <xsl:param name="theme" select="''"/>
+      <xsl:param name="prefix" select="''"/>
+      <xsl:param name="defaultRounded" select="false()"/>
+
+      <xsl:call-template name="processBootstrapSpacing">
+          <xsl:with-param name="node" select="."/>
+          <xsl:with-param name="prefix" select="'p'"/>
+      </xsl:call-template>
+      <xsl:call-template name="processBootstrapSpacing">
+          <xsl:with-param name="node" select="."/>
+          <xsl:with-param name="prefix" select="'m'"/>
+      </xsl:call-template>
+      <xsl:call-template name="processBootstrapWidth">
+          <xsl:with-param name="node" select="."/>
+      </xsl:call-template>
+      <xsl:call-template name="processBootstrapBorder">
+          <xsl:with-param name="attrValue" select="@border"/>
+      </xsl:call-template>
+      <xsl:call-template name="processBootstrapRounded">
+          <xsl:with-param name="node" select="."/>
+          <xsl:with-param name="isDefault" select="true()"/>
+      </xsl:call-template>
+      <xsl:call-template name="processBootstrapOutputClass">
+          <xsl:with-param name="attrValue" select="@outputclass"/>
+      </xsl:call-template>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/xsl/fo/carousel.xsl b/xsl/fo/carousel.xsl
index 30358c4..b9ca967 100644
--- a/xsl/fo/carousel.xsl
+++ b/xsl/fo/carousel.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -10,7 +14,6 @@
   version="2.0"
 >
 
-  <!-- Matches carousel specialized elements or bodydiv/ol with carousel outputclass -->
   <xsl:template
     match="*[contains(@class, ' bootstrap-d/carousel ') or (contains(@class, ' topic/ol ') and (tokenize(@outputclass, ' ') = 'carousel' or tokenize(@outputclass, ' ') = 'carousel-fade'))]"
     priority="5"
@@ -25,7 +28,13 @@
       <xsl:call-template name="processBootstrapWidth">
         <xsl:with-param name="attrValue" select="@width"/>
       </xsl:call-template>
-      <xsl:variable name="colCount" select="if (@cols) then xs:integer(@cols) else 3"/>
+      <xsl:variable
+        name="colCount"
+        select="
+          if (@cols) then xs:integer(@cols)
+          else if (contains(@otherprops, 'cols(')) then xs:integer(substring-before(substring-after(@otherprops, 'cols('), ')'))
+          else 3"
+      />
 
       <!-- Identify all item-level content to be flattened into the grid -->
       <xsl:variable
@@ -72,11 +81,16 @@
                     </xsl:choose>
                   </xsl:attribute>
                   
-                  <!-- Border color logic: carousel/@color or default grey -->
+                  <!-- Border color logic: carousel/@theme or default grey -->
                   <xsl:variable
-                    name="theme"
-                    select="ancestor::*[contains(@class, ' bootstrap-d/carousel ')][1]/@color"
+                    name="carousel"
+                    select="ancestor::*[contains(@class, ' bootstrap-d/carousel ') or contains(@outputclass, 'carousel')][1]"
                   />
+                  <xsl:variable name="theme">
+                    <xsl:call-template name="get-theme-color">
+                      <xsl:with-param name="node" select="$carousel"/>
+                    </xsl:call-template>
+                  </xsl:variable>
                   <xsl:choose>
                     <xsl:when test="$theme">
                        <xsl:call-template name="processBootstrapBorderColor">
diff --git a/xsl/fo/figure.xsl b/xsl/fo/figure.xsl
index a750d10..20ae93d 100644
--- a/xsl/fo/figure.xsl
+++ b/xsl/fo/figure.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -14,16 +18,16 @@
   <xsl:template match="*[contains(@class, ' topic/fig ')]" priority="5">
     <fo:block xsl:use-attribute-sets="fig">
       <xsl:call-template name="commonattributes"/>
-      
+
       <!-- Standard Bootstrap-like Figure spacing (approx 1rem / 16pt) -->
       <xsl:attribute name="margin-top">16pt</xsl:attribute>
       <xsl:attribute name="margin-bottom">16pt</xsl:attribute>
-      
+
       <!-- Apply Figure specific outputclass utilities if present -->
       <xsl:call-template name="processBootstrapOutputClass">
         <xsl:with-param name="attrValue" select="@outputclass"/>
       </xsl:call-template>
-      
+
       <xsl:call-template name="processBootstrapWidth">
         <xsl:with-param name="attrValue" select="@width"/>
       </xsl:call-template>
@@ -33,7 +37,28 @@
       <xsl:call-template name="processBootstrapFrame">
         <xsl:with-param name="attrValue" select="@frame"/>
       </xsl:call-template>
-      
+
+      <xsl:attribute name="text-align">
+        <xsl:choose>
+          <xsl:when test="contains(@outputclass, 'text-end')">right</xsl:when>
+          <xsl:when test="contains(@outputclass, 'text-center')">center</xsl:when>
+          <xsl:otherwise>left</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+
+      <!-- A <fig> wrapping an <lq> -->
+      <xsl:variable name="lqChild" select="*[contains(@class, ' topic/lq ')][1]"/>
+      <xsl:if test="$lqChild">
+        <xsl:variable name="lqThemeColor">
+          <xsl:call-template name="get-theme-color">
+            <xsl:with-param name="node" select="$lqChild"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:if test="$lqThemeColor = ''">
+          <xsl:call-template name="apply-default-blockquote-border"/>
+        </xsl:if>
+      </xsl:if>
+
       <!-- Layout order: Image/Content first, Title (caption) below -->
       <xsl:apply-templates select="node() except *[contains(@class, ' topic/title ')]"/>
       <xsl:apply-templates select="*[contains(@class, ' topic/title ')]"/>
@@ -70,28 +95,127 @@
     </fo:block>
   </xsl:template>
 
-  <!-- Figure Title (Caption) -->
+  <!-- Figure Title (Caption): a <fig> wrapping an <lq> is a blockquote
+       attribution -->
   <xsl:template match="*[contains(@class, ' topic/fig ')]/*[contains(@class, ' topic/title ')]" priority="5">
+    <xsl:variable name="isBlockquoteFooter" select="exists(../*[contains(@class, ' topic/lq ')])"/>
     <fo:block xsl:use-attribute-sets="fig.title">
       <xsl:call-template name="commonattributes"/>
       <xsl:call-template name="processBootstrapDirection"/>
-      
-      <!-- Standard Bootstrap Figure Caption styling -->
-      <xsl:attribute name="font-size">0.9em</xsl:attribute>
-      <xsl:attribute name="color"><xsl:value-of select="$bootstrap-secondary-subtle-text"/></xsl:attribute>
-      <xsl:attribute name="margin-top">8pt</xsl:attribute>
-      
-      <!-- Alignment: Default left, custom right via text-end -->
-      <xsl:attribute name="text-align">
-        <xsl:choose>
-          <xsl:when test="contains(@outputclass, 'text-end')">right</xsl:when>
-          <xsl:when test="contains(@outputclass, 'text-center')">center</xsl:when>
-          <xsl:otherwise>left</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
 
+      <xsl:choose>
+        <xsl:when test="$isBlockquoteFooter">
+          <xsl:attribute name="font-size">10.5pt</xsl:attribute>
+          <xsl:attribute name="color"><xsl:value-of select="$bootstrap-secondary"/></xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="font-size">0.9em</xsl:attribute>
+          <xsl:attribute name="color"><xsl:value-of select="$bootstrap-secondary-subtle-text"/></xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:attribute name="margin-top">8pt</xsl:attribute>
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
 
+  <!-- Only render the first image within a picture element -->
+  <xsl:template
+    match="*[contains(@class, ' bootstrap-d/picture ') or tokenize(@outputclass, ' ') = 'd-picture']"
+    priority="6"
+  >
+    <fo:block>
+      <xsl:call-template name="commonattributes"/>
+      <xsl:apply-templates select="*[contains(@class, ' topic/image ')][1]"/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Thumbnail Support -->
+  <xsl:template match="*[contains(@class, ' bootstrap-d/thumbnail ')]" priority="6">
+    <xsl:variable name="resolved-href">
+      <xsl:choose>
+        <xsl:when test="@scope = 'external' or opentopic-func:isAbsolute(@href)">
+          <xsl:value-of select="@href"/>
+        </xsl:when>
+        <xsl:when test="exists(key('jobFile', @href, $job))">
+          <xsl:value-of select="key('jobFile', @href, $job)/@src"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="concat($input.dir.url, @href)"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="theme" select="if (contains(@theme, '-')) then substring-before(@theme, '-') else @theme"/>
+    <xsl:choose>
+      <xsl:when test="@placement = 'break'">
+        <fo:block margin-top="{$bootstrap-spacing-3}" margin-bottom="{$bootstrap-spacing-3}" text-align="center">
+          <fo:external-graphic
+            src="url('{$resolved-href}')"
+            content-width="scale-to-fit"
+            scaling="uniform"
+            padding="{$bootstrap-spacing-1}"
+            vertical-align="middle"
+          >
+            <xsl:call-template name="processBootstrapRounded">
+              <xsl:with-param name="attrValue" select="(@rounded, '2')[1]"/>
+            </xsl:call-template>
+            <xsl:attribute name="border">
+              <xsl:value-of select="concat($bootstrap-border-width, ' solid')"/>
+            </xsl:attribute>
+            <xsl:choose>
+              <xsl:when test="$theme">
+                <xsl:call-template name="processBootstrapBorderColor">
+                  <xsl:with-param name="attrValue" select="$theme"/>
+                </xsl:call-template>
+                <xsl:call-template name="processBootstrapAttrSetReflection">
+                  <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
+                </xsl:call-template>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-border-color"/></xsl:attribute>
+                <xsl:attribute name="background-color">#ffffff</xsl:attribute>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="commonattributes"/>
+            <xsl:if test="@height"><xsl:attribute name="height" select="@height"/></xsl:if>
+            <xsl:if test="@width"><xsl:attribute name="width" select="@width"/></xsl:if>
+          </fo:external-graphic>
+        </fo:block>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:external-graphic
+          src="url('{$resolved-href}')"
+          content-width="scale-to-fit"
+          scaling="uniform"
+          padding="{$bootstrap-spacing-1}"
+          vertical-align="middle"
+        >
+          <xsl:call-template name="processBootstrapRounded">
+            <xsl:with-param name="attrValue" select="(@rounded, '2')[1]"/>
+          </xsl:call-template>
+          <xsl:attribute name="border">
+            <xsl:value-of select="concat($bootstrap-border-width, ' solid')"/>
+          </xsl:attribute>
+          <xsl:choose>
+            <xsl:when test="$theme">
+              <xsl:call-template name="processBootstrapBorderColor">
+                <xsl:with-param name="attrValue" select="$theme"/>
+              </xsl:call-template>
+              <xsl:call-template name="processBootstrapAttrSetReflection">
+                <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-border-color"/></xsl:attribute>
+              <xsl:attribute name="background-color">#ffffff</xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:call-template name="commonattributes"/>
+          <xsl:if test="@height"><xsl:attribute name="height" select="@height"/></xsl:if>
+          <xsl:if test="@width"><xsl:attribute name="width" select="@width"/></xsl:if>
+        </fo:external-graphic>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/xsl/fo/grid.xsl b/xsl/fo/grid.xsl
index 9cb2d6d..9fda0a3 100644
--- a/xsl/fo/grid.xsl
+++ b/xsl/fo/grid.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -45,7 +49,7 @@
   <!-- Grid Column Handling -->
   <xsl:template
     match="*[contains(@class, ' bootstrap-d/grid-col ') or 
-           (exists(tokenize(@outputclass, ' ')[starts-with(., 'col')]) and (contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]"
+           (exists(tokenize(@outputclass, ' ')[starts-with(., 'col') or contains(., ':col')]) and (contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')))]"
     priority="5"
     mode="grid-row-children"
   >
@@ -53,16 +57,23 @@
       <xsl:call-template name="commonattributes"/>
       <xsl:call-template name="processBootstrapDirection"/>
       
-      <!-- Spanning logic: Use @colspan if defined, else assign equally among siblings -->
+      <!-- Spanning logic: Use @colspan if defined, else parse from outputclass, else assign equally among siblings -->
       <xsl:variable
         name="col-count"
-        select="count(../*[contains(@class, ' bootstrap-d/grid-col ') or exists(tokenize(@outputclass, ' ')[starts-with(., 'col')])])"
+        select="count(../*[contains(@class, ' bootstrap-d/grid-col ') or exists(tokenize(@outputclass, ' ')[starts-with(., 'col') or contains(., ':col')])])"
+      />
+      <xsl:variable
+        name="parsed-span"
+        select="(for $t in tokenize(@outputclass, '\s+') return if (matches($t, '^(.*:)?col(-[a-z]+)?-[0-9]+$')) then replace($t, '^.*col(?:-[a-z]+)?-([0-9]+)$', '$1') else ())[1]"
       />
       <xsl:attribute name="number-columns-spanned">
         <xsl:choose>
           <xsl:when test="@colspan">
             <xsl:value-of select="@colspan"/>
           </xsl:when>
+          <xsl:when test="normalize-space($parsed-span)">
+            <xsl:value-of select="$parsed-span"/>
+          </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="12 idiv $col-count"/>
           </xsl:otherwise>
@@ -74,6 +85,15 @@
       <xsl:attribute name="padding-right">12pt</xsl:attribute>
       <fo:block start-indent="0pt">
         <xsl:call-template name="processBootstrapDirection"/>
+        <!-- @padding/@margin (e.g. p-3, mb-2) stack on top of the structural column gutter above -->
+        <xsl:call-template name="processBootstrapSpacing">
+          <xsl:with-param name="attrValue" select="@padding"/>
+          <xsl:with-param name="prefix" select="'p'"/>
+        </xsl:call-template>
+        <xsl:call-template name="processBootstrapSpacing">
+          <xsl:with-param name="attrValue" select="@margin"/>
+          <xsl:with-param name="prefix" select="'m'"/>
+        </xsl:call-template>
         <xsl:apply-templates/>
       </fo:block>
     </fo:table-cell>
diff --git a/xsl/fo/icon.xsl b/xsl/fo/icon.xsl
index d649397..6f75767 100644
--- a/xsl/fo/icon.xsl
+++ b/xsl/fo/icon.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -33,14 +37,22 @@
           contains(@class, ' bootstrap-d/alert ') or 
           contains(@class, ' topic/note ') or 
           contains(@class, ' topic/xref ') or
-          @color or
-          exists(tokenize(@outputclass, ' ')[starts-with(., 'btn') or starts-with(., 'alert') or starts-with(., 'badge') or starts-with(., 'link-')])
+          @theme or
+          exists(tokenize(@outputclass, ' ')[starts-with(., 'btn') or starts-with(., 'alert') or starts-with(., 'badge') or starts-with(., 'link-') or starts-with(., 'theme-')])
         ][1]"
       />
-      
+
+      <xsl:variable name="theme-container-color">
+        <xsl:call-template name="get-theme-color">
+          <xsl:with-param name="node" select="$theme-container"/>
+        </xsl:call-template>
+      </xsl:variable>
+
       <xsl:variable name="theme">
         <xsl:choose>
-          <xsl:when test="$theme-container/@color"><xsl:value-of select="$theme-container/@color"/></xsl:when>
+          <xsl:when test="$theme-container-color != ''">
+            <xsl:value-of select="$theme-container-color"/>
+          </xsl:when>
           <xsl:when
             test="exists(tokenize($theme-container/@outputclass, ' ')[starts-with(., 'btn-') and not(. = ('btn-lg', 'btn-sm', 'btn-toolbar', 'btn-group'))])"
           >
@@ -161,11 +173,16 @@
              <xsl:variable name="has-preceding" select="preceding-sibling::node()[normalize-space() != '']"/>
              <xsl:variable name="has-following" select="following-sibling::node()[normalize-space() != '']"/>
              <xsl:choose>
+                <xsl:when test="parent::*[contains(@outputclass, 'btn-icon')] or contains(@outputclass, 'btn-icon')">
+                  <!-- btn-icon: No padding -->    
+                </xsl:when>
                 <xsl:when test="@padding"><xsl:value-of select="@padding"/></xsl:when>
                 <xsl:when test="$has-preceding and $has-following">x2</xsl:when>
                 <xsl:when test="$has-following">e2</xsl:when>
                 <xsl:when test="$has-preceding">s2</xsl:when>
-                <xsl:otherwise><!-- Solo icon: No padding --></xsl:otherwise>
+                <xsl:otherwise>
+                  <!-- Solo icon: No padding -->    
+                </xsl:otherwise>
              </xsl:choose>
           </xsl:with-param>
           <xsl:with-param name="prefix" select="'p'"/>
diff --git a/xsl/fo/list-group.xsl b/xsl/fo/list-group.xsl
index c4d86be..dff624b 100644
--- a/xsl/fo/list-group.xsl
+++ b/xsl/fo/list-group.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -51,10 +55,17 @@
     priority="5"
   >
     <fo:table-row>
-      <xsl:variable name="theme" select="../@color"/>
-      <xsl:variable name="itemTheme" select="tokenize(@outputclass, ' ')[starts-with(., 'list-group-item-')]"/>
+      <xsl:variable name="theme">
+        <xsl:call-template name="get-theme-color">
+          <xsl:with-param name="node" select=".."/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:variable
+        name="itemTheme"
+        select="(tokenize(@outputclass, ' ')[starts-with(., 'list-group-item-') or starts-with(., 'theme-')])[1]"
+      />
       
-      <!-- Apply text color from parent @color if present -->
+      <!-- Apply text color from parent @theme if present -->
       <xsl:if test="$theme">
          <xsl:call-template name="processBootstrapAttrSetReflection">
             <xsl:with-param name="attrSet" select="concat('__color__', $theme)"/>
@@ -67,7 +78,10 @@
         </xsl:attribute>
         <!-- Apply text color from item specific class if present -->
         <xsl:if test="exists($itemTheme)">
-             <xsl:variable name="colorName" select="substring-after($itemTheme[1], 'list-group-item-')"/>
+             <xsl:variable
+            name="colorName"
+            select="if (starts-with($itemTheme, 'theme-')) then substring-after($itemTheme, 'theme-') else substring-after($itemTheme, 'list-group-item-')"
+          />
              <xsl:if test="$colorName != '' and $colorName != 'action'">
                  <xsl:call-template name="processBootstrapAttrSetReflection">
                     <xsl:with-param name="attrSet" select="concat('__color__', $colorName)"/>
diff --git a/xsl/fo/lists.xsl b/xsl/fo/lists.xsl
new file mode 100644
index 0000000..0170e73
--- /dev/null
+++ b/xsl/fo/lists.xsl
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  version="2.0"
+>
+
+  <!-- Mirrors org.dita.pdf2/xsl/fo/lists.xsl: overrides for the base DITA list
+       elements (ul, ol, li). Bootstrap's list-group is a separate specialized
+       element and lives in list-group.xsl. -->
+
+  <!-- Unstyled List Support (ul and ol) -->
+  <xsl:template
+    match="*[contains(@class, ' topic/ul ') or contains(@class, ' topic/ol ')][tokenize(@outputclass, ' ') = 'list-unstyled']"
+  >
+    <fo:block margin-bottom="12pt">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="processBootstrapDirection"/>
+      <xsl:apply-templates select="*[contains(@class, ' topic/li ')]" mode="list-unstyled"/>
+    </fo:block>
+  </xsl:template>
+
+  <xsl:template match="*[contains(@class, ' topic/li ')]" mode="list-unstyled">
+    <fo:block margin-left="0pt" margin-bottom="3pt">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Inline List Support (ul and ol) -->
+  <xsl:template
+    match="*[contains(@class, ' topic/ul ') or contains(@class, ' topic/ol ')][tokenize(@outputclass, ' ') = 'list-inline']"
+  >
+    <fo:block margin-bottom="12pt">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="processBootstrapDirection"/>
+      <xsl:apply-templates select="*[contains(@class, ' topic/li ')]" mode="list-inline"/>
+    </fo:block>
+  </xsl:template>
+
+  <xsl:template match="*[contains(@class, ' topic/li ')]" mode="list-inline">
+    <fo:inline padding-right="8pt">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/xsl/fo/note.xsl b/xsl/fo/note.xsl
deleted file mode 100644
index 6a0d024..0000000
--- a/xsl/fo/note.xsl
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:fo="http://www.w3.org/1999/XSL/Format"
-  xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"
-  version="2.0"
->
-
-  <!-- Note Support (Styled as Bootstrap Alerts) -->
-  <xsl:template match="*[contains(@class, ' topic/note ')]" priority="5">
-    <fo:block xsl:use-attribute-sets="section">
-      <xsl:call-template name="commonattributes"/>
-      
-      <!-- Map DITA Note Type or @color to Bootstrap Theme -->
-      <xsl:variable name="theme">
-        <xsl:choose>
-          <xsl:when test="@color"><xsl:value-of select="@color"/></xsl:when>
-          <xsl:when test="exists(tokenize(@outputclass, ' ')[starts-with(., 'alert-')])">
-            <xsl:value-of select="substring-after(tokenize(@outputclass, ' ')[starts-with(., 'alert-')][1], 'alert-')"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="getNoteTheme">
-              <xsl:with-param name="type" select="(@type, 'note')[1]"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      
-      <!-- Determine text color for the icon and border from the theme-subtle attribute set -->
-      <xsl:variable name="icon-color">
-        <xsl:call-template name="getBootstrapAttrValue">
-          <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <!-- 1. Unified Decoration (subtle variant) -->
-      <xsl:call-template name="bootstrap.decoration">
-          <xsl:with-param name="variant" select="'subtle'"/>
-          <xsl:with-param name="theme" select="$theme"/>
-          <xsl:with-param name="defaultRounded" select="true()"/>
-      </xsl:call-template>
-
-      <xsl:variable name="direction">
-        <xsl:choose>
-            <xsl:when test="@dir"><xsl:value-of select="@dir"/></xsl:when>
-            <xsl:when test="ancestor::*[@dir]"><xsl:value-of select="ancestor::*[@dir][1]/@dir"/></xsl:when>
-            <xsl:otherwise><xsl:value-of select="$writing-mode"/></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$direction = 'rtl' or $direction = 'rl'">
-          <xsl:attribute name="border-right-width"><xsl:value-of select="$bootstrap-note-border-width"/></xsl:attribute>
-          <xsl:attribute name="border-right-style">solid</xsl:attribute>
-          <xsl:attribute name="border-right-color"><xsl:value-of select="$icon-color"/></xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="border-left-width"><xsl:value-of select="$bootstrap-note-border-width"/></xsl:attribute>
-          <xsl:attribute name="border-left-style">solid</xsl:attribute>
-          <xsl:attribute name="border-left-color"><xsl:value-of select="$icon-color"/></xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <!-- 3. Spacing Defaults (if not overridden by attributes) -->
-      <xsl:if test="not(@padding or exists(tokenize(@outputclass, ' ')[starts-with(., 'p-')]))">
-        <xsl:attribute name="padding">12pt</xsl:attribute>
-      </xsl:if>
-      <xsl:if test="not(@margin or exists(tokenize(@outputclass, ' ')[starts-with(., 'm-')]))">
-        <xsl:attribute name="margin-top">10pt</xsl:attribute>
-        <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
-      </xsl:if>
-      
-      <!-- Ensure the note stays on one page -->
-      <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
-
-      <!-- Note Title / Icon Prefix -->
-      <fo:inline font-weight="bold" color="{$icon-color}">
-        <xsl:variable name="type" select="(@type, 'note')[1]"/>
-        <xsl:variable
-          name="explicit-icon"
-          select="(@icon, substring-before(substring-after(@otherprops, 'icon('), ')'))[1]"
-        />
-
-        <xsl:if
-          test="$BOOTSTRAP_ICONS_INCLUDE = 'yes' and ($explicit-icon != '' or ($type != 'othertype' and $type != 'other'))"
-        >
-          <xsl:variable name="icon-name">
-            <xsl:choose>
-              <xsl:when test="$explicit-icon != ''">
-                <xsl:variable
-                  name="raw"
-                  select="(tokenize($explicit-icon, ' ')[starts-with(., 'bi-')], tokenize($explicit-icon, ' ')[not(. = ('bi', 'icon')) and not(contains(., '('))])[1]"
-                />
-                <xsl:value-of select="if (starts-with($raw, 'bi-')) then $raw else concat('bi-', $raw)"/>
-              </xsl:when>
-              <xsl:when test="$type = 'tip'">bi-lightbulb</xsl:when>
-              <xsl:when test="$type = 'fastpath'">bi-shield-check</xsl:when>
-              <xsl:when test="$type = 'remember'">bi-clipboard-check</xsl:when>
-              <xsl:when test="$type = 'restriction'">bi-slash-circle</xsl:when>
-              <xsl:when test="$type = 'important'">bi-exclamation-circle-fill</xsl:when>
-              <xsl:when test="$type = 'attention'">bi-exclamation-triangle</xsl:when>
-              <xsl:when test="$type = 'caution'">bi-exclamation-triangle</xsl:when>
-              <xsl:when test="$type = 'warning'">bi-exclamation-triangle</xsl:when>
-              <xsl:when test="$type = 'trouble'">bi-exclamation-triangle</xsl:when>
-              <xsl:when test="$type = 'danger'">bi-exclamation-triangle</xsl:when>
-              <xsl:when test="$type = 'notice'">bi-info-circle-fill</xsl:when>
-              <xsl:when test="$type = 'note'">bi-pencil</xsl:when>
-              <xsl:otherwise>bi-info-circle</xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-          
-          <xsl:variable name="temp-icon">
-            <icon class="+ topic/ph bootstrap-d/icon " outputclass="{$icon-name}" padding="e2"/>
-          </xsl:variable>
-          <xsl:apply-templates select="$temp-icon/*">
-             <xsl:with-param name="color" select="$icon-color"/>
-          </xsl:apply-templates>
-        </xsl:if>
-        
-        <xsl:variable name="type" select="(@type, 'note')[1]"/>
-        <xsl:variable name="label">
-           <xsl:choose>
-              <xsl:when test="($type = 'other' or $type = 'othertype') and @othertype">
-                 <xsl:value-of select="@othertype"/>
-              </xsl:when>
-              <xsl:otherwise>
-                 <xsl:call-template name="getVariable">
-                    <xsl:with-param name="id" select="concat(upper-case(substring($type, 1, 1)), substring($type, 2))"/>
-                 </xsl:call-template>
-              </xsl:otherwise>
-           </xsl:choose>
-        </xsl:variable>
-        <xsl:value-of select="$label"/>
-        <xsl:call-template name="getVariable">
-           <xsl:with-param name="id" select="'ColonSymbol'"/>
-        </xsl:call-template>
-      </fo:inline>
-      <xsl:text>&#160;</xsl:text>
-
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/xsl/fo/pagination.xsl b/xsl/fo/pagination.xsl
new file mode 100644
index 0000000..b404e80
--- /dev/null
+++ b/xsl/fo/pagination.xsl
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"
+  xmlns:opentopic-func="http://www.idiominc.com/opentopic/exsl/function"
+  exclude-result-prefixes="opentopic-func fox"
+  version="2.0"
+>
+
+  <!-- Pagination Support. -->
+  <xsl:template match="*[contains(@class, ' bootstrap-d/pagination ')]" priority="5">
+    <fo:block>
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="processBootstrapSpacing">
+        <xsl:with-param name="attrValue" select="@margin"/>
+        <xsl:with-param name="prefix" select="'m'"/>
+      </xsl:call-template>
+      <xsl:apply-templates select="*[contains(@class, ' topic/ol ')]"/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Suppress <title> -->
+  <xsl:template
+    match="*[contains(@class, ' bootstrap-d/pagination ')]/*[contains(@class, ' topic/title ')]"
+    priority="5"
+  />
+
+  <xsl:template
+    match="*[contains(@class, ' topic/ol ')][parent::*[contains(@class, ' bootstrap-d/pagination ')] or tokenize(@outputclass, ' ') = 'pagination']"
+    priority="5"
+  >
+    <xsl:variable name="pagContainer" select="parent::*[contains(@class, ' bootstrap-d/pagination ')]"/>
+    
+    <xsl:variable name="parentTheme" select="$pagContainer/@theme"/>
+    <xsl:variable name="themeColor">
+      <xsl:choose>
+        <xsl:when test="$parentTheme">
+          <xsl:value-of
+            select="if (contains($parentTheme, '-')) then substring-before($parentTheme, '-') else $parentTheme"
+          />
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="get-theme-color"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="alignOutputclass" select="(@outputclass, $pagContainer/@outputclass)[1]"/>
+    <xsl:variable
+      name="textAlign"
+      select="
+        if (tokenize($alignOutputclass, ' ') = 'justify-content-center') then 'center'
+        else if (tokenize($alignOutputclass, ' ') = 'justify-content-end') then 'right'
+        else 'left'"
+    />
+
+    <xsl:variable
+      name="size"
+      select="
+        ($pagContainer/@size,
+         if (tokenize(@outputclass, ' ') = 'pagination-lg') then 'large'
+         else if (tokenize(@outputclass, ' ') = 'pagination-sm') then 'small'
+         else ())[1]"
+    />
+
+    <fo:block text-align="{$textAlign}" margin-bottom="{$bootstrap-spacing-3}">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:for-each select="*[contains(@class, ' topic/li ')]">
+        <xsl:call-template name="renderPaginationItem">
+          <xsl:with-param name="themeColor" select="$themeColor"/>
+          <xsl:with-param name="size" select="$size"/>
+          <xsl:with-param name="isFirst" select="position() = 1"/>
+          <xsl:with-param name="isLast" select="position() = last()"/>
+        </xsl:call-template>
+      </xsl:for-each>
+    </fo:block>
+  </xsl:template>
+
+  <!-- One page-item/page-link segment. -->
+  <xsl:template name="renderPaginationItem">
+    <xsl:param name="themeColor" select="''"/>
+    <xsl:param name="size" select="''"/>
+    <xsl:param name="isFirst" select="false()"/>
+    <xsl:param name="isLast" select="false()"/>
+
+    <xsl:variable name="xref" select="*[contains(@class, ' topic/xref ')][1]"/>
+
+    <!-- Link-colored text (themed or the default link color), matching the
+         HTML reference: theming only recolors the text, not the border. -->
+    <xsl:variable name="color">
+      <xsl:choose>
+        <xsl:when test="$themeColor != ''">
+          <xsl:call-template name="getBootstrapAttrValue">
+            <xsl:with-param name="attrSet" select="concat('__color__', $themeColor)"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise><xsl:value-of select="$bootstrap-link"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="padding">
+      <xsl:choose>
+        <xsl:when test="$size = 'large'">6pt 12pt</xsl:when>
+        <xsl:when test="$size = 'small'">3pt 7.5pt</xsl:when>
+        <xsl:otherwise>4.5pt 9pt</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="radius">
+      <xsl:choose>
+        <xsl:when test="$size = 'large'">9pt</xsl:when>
+        <xsl:otherwise>6pt</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <!-- Only wrap in fo:basic-link when a destination actually resolves - FOP
+         rejects fo:basic-link outright if internal-destination/
+         external-destination end up empty (e.g. a placeholder href="#" that
+         doesn't resolve to a real key/topic id, as used throughout the
+         pagination samples), which would otherwise abort the whole build. -->
+    <xsl:variable
+      name="is-external"
+      select="boolean($xref) and (($xref/@scope = 'external') or not(empty($xref/@format) or $xref/@format = 'dita'))"
+    />
+    <xsl:variable
+      name="internal-dest-id"
+      select="if (boolean($xref) and not($is-external) and $xref/@href) then opentopic-func:getDestinationId($xref/@href) else ''"
+    />
+    <xsl:variable
+      name="has-destination"
+      select="boolean($xref) and (($is-external and $xref/@href) or ($internal-dest-id != ''))"
+    />
+
+    <xsl:element name="{if ($has-destination) then 'fo:basic-link' else 'fo:inline'}">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:attribute name="padding"><xsl:value-of select="$padding"/></xsl:attribute>
+      <xsl:attribute name="border-style">solid</xsl:attribute>
+      <xsl:attribute name="border-width"><xsl:value-of select="$bootstrap-border-width"/></xsl:attribute>
+      <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-border-color"/></xsl:attribute>
+      <xsl:attribute name="color"><xsl:value-of select="$color"/></xsl:attribute>
+      <xsl:if test="$size = 'small'">
+        <xsl:attribute name="font-size">10.5pt</xsl:attribute>
+      </xsl:if>
+
+      <xsl:if test="$isFirst">
+        <xsl:attribute name="fox:border-before-start-radius"><xsl:value-of select="$radius"/></xsl:attribute>
+        <xsl:attribute name="fox:border-after-start-radius"><xsl:value-of select="$radius"/></xsl:attribute>
+      </xsl:if>
+      <xsl:if test="$isLast">
+        <xsl:attribute name="fox:border-before-end-radius"><xsl:value-of select="$radius"/></xsl:attribute>
+        <xsl:attribute name="fox:border-after-end-radius"><xsl:value-of select="$radius"/></xsl:attribute>
+      </xsl:if>
+
+      <xsl:if test="$has-destination">
+        <xsl:choose>
+          <xsl:when test="$is-external">
+            <xsl:attribute name="external-destination">url('<xsl:value-of select="$xref/@href"/>')</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="internal-destination" select="$internal-dest-id"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+
+      <xsl:choose>
+        <xsl:when test="$xref">
+          <xsl:apply-templates select="$xref/node()" mode="bootstrap-label"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="node()" mode="bootstrap-label"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:element>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/xsl/fo/tables.xsl b/xsl/fo/tables.xsl
index e2a4fe0..19a8c97 100644
--- a/xsl/fo/tables.xsl
+++ b/xsl/fo/tables.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -12,13 +16,13 @@
     Table Support for Bootstrap Print
     
     Theming Hierarchy: Entry > Row > thead > Table
-    
-    When <table color="primary"> is set:
+
+    When <table theme="primary"> is set:
     - thead row takes primary color (like badge)
     - tbody rows take primary-subtle color (like alert)
     - borders (if present) also take primary color
     
-    When <thead color="xxx"> is set:
+    When <thead theme="xxx"> is set:
     - thead row takes the specified color, overriding table color.
     
     When <table striped="yes"> is set:
@@ -34,8 +38,8 @@
   <xsl:template match="*[contains(@class, ' topic/table ')]" priority="5">
     <xsl:variable
       name="hasDecoration"
-      select="@color or @padding or @width or @margin or @shadow or 
-                                               exists(tokenize(@outputclass, ' ')[starts-with(., 'table-') or starts-with(., 'w-') or starts-with(., 'p-') or starts-with(., 'm-') or . = 'shadow-sm' or . = 'shadow' or . = 'shadow-lg' or . = 'shadow-none'])"
+      select="@theme or @padding or @width or @margin or @shadow or
+                                               exists(tokenize(@outputclass, ' ')[starts-with(., 'theme-') or starts-with(., 'table-') or starts-with(., 'w-') or starts-with(., 'p-') or starts-with(., 'm-') or . = 'shadow-sm' or . = 'shadow' or . = 'shadow-lg' or . = 'shadow-none'])"
     />
     <xsl:choose>
       <xsl:when test="$hasDecoration">
@@ -77,7 +81,9 @@
       <xsl:variable name="thead" select="parent::*"/>
       <xsl:variable
         name="theme"
-        select="(@color, $thead/@color, substring-after(tokenize($thead/@outputclass, ' ')[starts-with(., 'table-')][1], 'table-'))[1]"
+        select="(@theme, $thead/@theme,
+                 substring-after(tokenize($thead/@outputclass, ' ')[starts-with(., 'theme-')][1], 'theme-'),
+                 substring-after(tokenize($thead/@outputclass, ' ')[starts-with(., 'table-')][1], 'table-'))[1]"
       />
       
       <xsl:call-template name="bootstrap.decoration">
@@ -96,16 +102,18 @@
       <xsl:variable name="tbody" select="parent::*"/>
       <xsl:variable name="table" select="ancestor::*[contains(@class, ' topic/table ')][1]"/>
       
-      <xsl:variable name="tableTheme" select="$table/@color"/>
+      <xsl:variable name="tableTheme" select="$table/@theme"/>
       <xsl:variable
         name="striped"
         select="$table/@striped = 'yes' or tokenize($table/@outputclass, ' ') = 'table-striped'"
       />
-      
+
       <!-- Inherit theme from tbody if not set on row -->
       <xsl:variable
         name="rowTheme"
-        select="(@color, substring-after(tokenize($tbody/@outputclass, ' ')[starts-with(., 'table-')][1], 'table-'))[1]"
+        select="(@theme,
+                 substring-after(tokenize($tbody/@outputclass, ' ')[starts-with(., 'theme-')][1], 'theme-'),
+                 substring-after(tokenize($tbody/@outputclass, ' ')[starts-with(., 'table-')][1], 'table-'))[1]"
       />
       
       <xsl:variable name="rowIndex" select="count(preceding-sibling::*[contains(@class, ' topic/row ')]) + 1"/>
@@ -142,7 +150,9 @@
       <xsl:variable name="tfoot" select="parent::*"/>
       <xsl:variable
         name="theme"
-        select="(@color, $tfoot/@color, substring-after(tokenize($tfoot/@outputclass, ' ')[starts-with(., 'table-')][1], 'table-'))[1]"
+        select="(@theme, $tfoot/@theme,
+                 substring-after(tokenize($tfoot/@outputclass, ' ')[starts-with(., 'theme-')][1], 'theme-'),
+                 substring-after(tokenize($tfoot/@outputclass, ' ')[starts-with(., 'table-')][1], 'table-'))[1]"
       />
 
       <xsl:call-template name="bootstrap.decoration">
@@ -164,7 +174,7 @@
       select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]"
     />
     <xsl:variable name="table" select="ancestor::*[contains(@class, ' topic/table ')][1]"/>
-    <xsl:variable name="tableTheme" select="$table/@color"/>
+    <xsl:variable name="tableTheme" select="$table/@theme"/>
     <xsl:variable
       name="stripedCols"
       select="$table/@striped-columns = 'yes' or tokenize($table/@outputclass, ' ') = 'table-striped-columns'"
@@ -227,7 +237,7 @@
       <!-- Entry-specific background overrides -->
       <xsl:choose>
         <!-- Column Striping (applied if cell has no theme color) -->
-        <xsl:when test="$isColoredCol and not(@color)">
+        <xsl:when test="$isColoredCol and not(@theme)">
            <xsl:choose>
             <xsl:when test="$tableTheme">
               <xsl:call-template name="processBootstrapAttrSetReflection">
diff --git a/xsl/fo/topic.xsl b/xsl/fo/topic.xsl
index 6d6db64..36d12a8 100644
--- a/xsl/fo/topic.xsl
+++ b/xsl/fo/topic.xsl
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  exclude-result-prefixes="xs"
+  xmlns:opentopic-func="http://www.idiominc.com/opentopic/exsl/function"
+  exclude-result-prefixes="xs opentopic-func"
   version="2.0"
 >
 
@@ -12,14 +17,18 @@
     <xsl:choose>
       <!-- Tabbed dialog sections and navigation panes where titles act as labels -->
       <xsl:when
-        test="ancestor::*[contains(@class, ' bootstrap-d/tabbed-dialog ')] or 
+        test="ancestor::*[contains(@class, ' bootstrap-d/tabbed-dialog ')] or
                       ancestor::*[tokenize(@outputclass, ' ') = ('nav-tabs', 'nav-pills', 'nav-pills-vertical')]"
       >
         <fo:block xsl:use-attribute-sets="section.title">
           <xsl:attribute name="color">
             <xsl:choose>
-              <xsl:when test="@color">
-                <xsl:value-of select="$bootstrap-settings/entry[@name = concat('bootstrap-', @color)]"/>
+              <xsl:when test="@theme">
+                <xsl:variable
+                  name="themeColor"
+                  select="if (contains(@theme, '-')) then substring-before(@theme, '-') else @theme"
+                />
+                <xsl:value-of select="$bootstrap-settings/entry[@name = concat('bootstrap-', $themeColor)]"/>
               </xsl:when>
               <xsl:otherwise>
                 <xsl:value-of select="$bootstrap-body-color"/>
@@ -32,9 +41,40 @@
       </xsl:when>
 
       <xsl:otherwise>
+        <!-- Match the color the section itself resolves for its own @theme background -->
+        <xsl:variable name="themeColor">
+          <xsl:call-template name="get-theme-color">
+            <xsl:with-param name="node" select=".."/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="themeSuffix">
+          <xsl:if test="$themeColor != ''">
+            <xsl:call-template name="get-theme-suffix">
+              <xsl:with-param name="node" select=".."/>
+            </xsl:call-template>
+          </xsl:if>
+        </xsl:variable>
+        <xsl:variable
+          name="attrSetName"
+          select="
+            if ($themeColor = '' or contains($themeSuffix, 'border')) then ''
+            else if (contains($themeSuffix, 'subtle')) then concat('__bg__', $themeColor, '-subtle')
+            else if (contains($themeSuffix, 'muted')) then concat('__muted__', $themeColor)
+            else concat('__bg__', $themeColor)"
+        />
+        <xsl:variable name="titleColor">
+          <xsl:if test="$attrSetName != ''">
+            <xsl:call-template name="getBootstrapAttrValue">
+              <xsl:with-param name="attrSet" select="$attrSetName"/>
+            </xsl:call-template>
+          </xsl:if>
+        </xsl:variable>
         <fo:block xsl:use-attribute-sets="section.title">
           <xsl:attribute name="font-size"><xsl:value-of select="$bootstrap-h6-font-size"/></xsl:attribute>
           <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+          <xsl:if test="$titleColor != ''">
+            <xsl:attribute name="color"><xsl:value-of select="$titleColor"/></xsl:attribute>
+          </xsl:if>
           <xsl:call-template name="commonattributes"/>
           <xsl:apply-templates/>
         </fo:block>
@@ -43,6 +83,66 @@
     </xsl:choose>
   </xsl:template>
 
+  <!-- Titles within colored components (note/alert) -->
+  <xsl:template
+    match="*[contains(@class, ' topic/title ')][ancestor::*[contains(@class, ' topic/note ')] or ancestor::*[contains(@class, ' bootstrap-d/alert ')]]"
+    priority="6"
+  >
+      <xsl:variable name="theme">
+        <xsl:choose>
+          <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]/@theme">
+            <xsl:variable name="noteTheme" select="ancestor::*[contains(@class, ' topic/note ')]/@theme"/>
+            <xsl:value-of
+            select="if (contains($noteTheme, '-')) then substring-before($noteTheme, '-') else $noteTheme"
+          />
+          </xsl:when>
+          <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]">
+            <xsl:call-template name="getNoteTheme">
+               <xsl:with-param name="type" select="(ancestor::*[contains(@class, ' topic/note ')]/@type, 'note')[1]"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:when test="ancestor::*[contains(@class, ' bootstrap-d/alert ')]">
+            <xsl:variable
+            name="alertTheme"
+            select="(ancestor::*[contains(@class, ' bootstrap-d/alert ')]/@theme, 'secondary')[1]"
+          />
+            <xsl:value-of
+            select="if (contains($alertTheme, '-')) then substring-before($alertTheme, '-') else $alertTheme"
+          />
+          </xsl:when>
+        </xsl:choose>
+      </xsl:variable>
+
+      <xsl:variable name="subtleColor">
+         <xsl:if test="$theme != ''">
+            <xsl:call-template name="getBootstrapAttrValue">
+               <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
+            </xsl:call-template>
+         </xsl:if>
+      </xsl:variable>
+
+      <xsl:choose>
+         <xsl:when test="parent::*[contains(@class, ' topic/example ')]">
+            <fo:block xsl:use-attribute-sets="example.title">
+               <xsl:if test="$subtleColor != ''"><xsl:attribute name="color"><xsl:value-of
+                select="$subtleColor"
+              /></xsl:attribute></xsl:if>
+               <xsl:call-template name="commonattributes"/>
+               <xsl:apply-templates/>
+            </fo:block>
+         </xsl:when>
+         <xsl:otherwise>
+            <fo:block xsl:use-attribute-sets="section.title">
+               <xsl:if test="$subtleColor != ''"><xsl:attribute name="color"><xsl:value-of
+                select="$subtleColor"
+              /></xsl:attribute></xsl:if>
+               <xsl:call-template name="commonattributes"/>
+               <xsl:apply-templates/>
+            </fo:block>
+         </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>
+
   <xsl:template match="*[contains(@class, ' topic/shortdesc ')]">
     <fo:block xsl:use-attribute-sets="topic__shortdesc">
       <xsl:if test="parent::*[contains(@class,' topic/abstract ')]">
@@ -56,6 +156,330 @@
     </fo:block>
   </xsl:template>
 
+  <!-- Baseline Section and Div Support -->
+  <xsl:template
+    match="*[contains(@class, ' topic/section ') or
+                         contains(@class, ' topic/div ') or
+                         contains(@class, ' topic/bodydiv ')]"
+    priority="-1"
+  >
+    <fo:block>
+      <xsl:if test="contains(@class, ' topic/section ')">
+         <xsl:call-template name="get-attributes">
+            <xsl:with-param name="element" as="element()">
+               <placeholder xsl:use-attribute-sets="section"/>
+            </xsl:with-param>
+         </xsl:call-template>
+      </xsl:if>
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="bootstrap.decoration"/>
+
+      <xsl:variable name="ancestorStartPad">
+        <xsl:call-template name="get-ancestor-padding-indent">
+          <xsl:with-param name="side" select="'start'"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:variable name="ancestorEndPad">
+        <xsl:call-template name="get-ancestor-padding-indent">
+          <xsl:with-param name="side" select="'end'"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:if test="number($ancestorStartPad) > 0">
+        <xsl:attribute name="start-indent" select="concat($ancestorStartPad, 'pt + from-parent(start-indent)')"/>
+      </xsl:if>
+      <xsl:if test="number($ancestorEndPad) > 0">
+        <xsl:attribute name="end-indent" select="concat($ancestorEndPad, 'pt + from-parent(end-indent)')"/>
+      </xsl:if>
+
+      <xsl:variable name="widthVal">
+        <xsl:choose>
+          <xsl:when test="@width != ''"><xsl:value-of select="@width"/></xsl:when>
+          <xsl:when test="exists(tokenize(@outputclass, ' ')[starts-with(., 'w-')])">
+            <xsl:value-of select="substring-after(tokenize(@outputclass, ' ')[starts-with(., 'w-')][1], 'w-')"/>
+          </xsl:when>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="totalPad" select="number($ancestorStartPad) + number($ancestorEndPad)"/>
+      <xsl:if test="$widthVal = ('25', '50', '75', '100') and $totalPad > 0">
+        <xsl:attribute name="width" select="concat($widthVal, '% - ', $totalPad, 'pt')"/>
+        <xsl:attribute name="inline-progression-dimension" select="concat($widthVal, '% - ', $totalPad, 'pt')"/>
+      </xsl:if>
+
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Inline Ph Support (Explicitly excludes syntax tokens to allow PrismJS overrides).  -->
+  <xsl:template
+    match="*[contains(@class, ' topic/ph ')
+             and not(contains(@outputclass, 'token'))
+             and not(contains(@class, ' pr-d/codeph '))
+             and not(contains(@class, ' hi-d/'))]"
+  >
+    <fo:inline>
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="bootstrap.decoration"/>
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+
+  <!-- Paragraph Support (Low priority to allow specialized overrides) -->
+  <xsl:template match="*[contains(@class, ' topic/p ')]" priority="-1">
+    <fo:block xsl:use-attribute-sets="p">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="bootstrap.decoration"/>
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Blockquote (lq) Support. -->
+  <xsl:template match="*[contains(@class, ' topic/lq ')]">
+    <fo:block margin-bottom="{$bootstrap-spacing-3}">
+      <xsl:call-template name="get-attributes">
+        <xsl:with-param name="element" as="element()">
+           <placeholder xsl:use-attribute-sets="lq_simple"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="bootstrap.decoration"/>
+
+      <xsl:variable name="themeColor">
+        <xsl:call-template name="get-theme-color"/>
+      </xsl:variable>
+
+      <xsl:if test="$themeColor = '' and not(parent::*[contains(@class, ' topic/fig ')])">
+        <xsl:call-template name="apply-default-blockquote-border"/>
+      </xsl:if>
+
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Text/Paragraphs within Blockquote (lq) -->
+  <xsl:template match="*[contains(@class, ' topic/lq ')]/*[contains(@class, ' topic/p ')]" priority="5">
+    <fo:block xsl:use-attribute-sets="p" line-height="1.5">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="processBootstrapDirection"/>
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Pre Support -->
+  <xsl:template
+    match="*[contains(@class, ' topic/pre ') and not(contains(@outputclass, 'language-') or contains(@class, ' pr-d/codeblock '))]"
+  >
+    <fo:block xsl:use-attribute-sets="pre">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:call-template name="bootstrap.decoration"/>
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Note Support (Styled as Bootstrap Alerts) -->
+  <xsl:template match="*[contains(@class, ' topic/note ')]" priority="5">
+    <fo:block xsl:use-attribute-sets="section">
+      <xsl:call-template name="commonattributes"/>
+      <xsl:variable name="explicitThemeColor">
+        <xsl:call-template name="get-theme-color"/>
+      </xsl:variable>
+      <xsl:variable name="themeSuffix">
+        <xsl:if test="$explicitThemeColor != ''">
+          <xsl:call-template name="get-theme-suffix"/>
+        </xsl:if>
+      </xsl:variable>
+      <xsl:variable name="theme">
+        <xsl:choose>
+          <xsl:when test="$explicitThemeColor != ''"><xsl:value-of select="$explicitThemeColor"/></xsl:when>
+          <xsl:when test="exists(tokenize(@outputclass, ' ')[starts-with(., 'alert-')])">
+            <xsl:value-of select="substring-after(tokenize(@outputclass, ' ')[starts-with(., 'alert-')][1], 'alert-')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="getNoteTheme">
+              <xsl:with-param name="type" select="(@type, 'note')[1]"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="suffixTokens" select="if ($themeSuffix != '') then tokenize($themeSuffix, '-') else ()"/>
+      <xsl:variable name="isMuted" select="$suffixTokens = 'muted'"/>
+      <xsl:variable name="isSubtle" select="$themeSuffix = '' or $suffixTokens = 'subtle'"/>
+      <xsl:variable name="isBorderOnly" select="$themeSuffix = 'border'"/>
+      <xsl:variable
+        name="attrSetName"
+        select="
+        if ($isMuted) then concat('__muted__', $theme)
+        else if ($isBorderOnly) then concat('border-', $theme)
+        else if ($isSubtle) then concat('__bg__', $theme, '-subtle')
+        else concat('__bg__', $theme)"
+      />
+      <xsl:variable name="icon-color-raw">
+        <xsl:call-template name="getBootstrapAttrValue">
+          <xsl:with-param name="attrSet" select="$attrSetName"/>
+          <xsl:with-param name="attrName" select="if ($isBorderOnly) then 'border-color' else 'color'"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:variable
+        name="icon-color-is-white"
+        select="normalize-space(lower-case($icon-color-raw)) = ('#fff', '#ffffff', 'white')"
+      />
+      <xsl:variable name="icon-color">
+        <xsl:choose>
+          <xsl:when test="$icon-color-is-white">
+            <xsl:call-template name="getBootstrapAttrValue">
+              <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
+              <xsl:with-param name="attrName" select="'background-color'"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$icon-color-raw"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+
+      <!-- 1. Unified Decoration -->
+      <xsl:choose>
+        <xsl:when test="$isMuted">
+          <xsl:call-template name="bootstrap.decoration">
+              <xsl:with-param name="theme" select="$theme"/>
+              <xsl:with-param name="prefix" select="'__muted__'"/>
+              <xsl:with-param name="defaultRounded" select="true()"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:when test="$isBorderOnly">
+          <xsl:call-template name="bootstrap.decoration">
+              <xsl:with-param name="theme" select="$theme"/>
+              <xsl:with-param name="skipBackground" select="true()"/>
+              <xsl:with-param name="defaultRounded" select="true()"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="bootstrap.decoration">
+              <xsl:with-param name="variant" select="if ($isSubtle) then 'subtle' else ''"/>
+              <xsl:with-param name="theme" select="$theme"/>
+              <xsl:with-param name="defaultRounded" select="true()"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
+
+      <xsl:variable name="direction">
+        <xsl:choose>
+            <xsl:when test="@dir"><xsl:value-of select="@dir"/></xsl:when>
+            <xsl:when test="ancestor::*[@dir]"><xsl:value-of select="ancestor::*[@dir][1]/@dir"/></xsl:when>
+            <xsl:otherwise><xsl:value-of select="$writing-mode"/></xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+
+      <xsl:choose>
+        <xsl:when test="$direction = 'rtl' or $direction = 'rl'">
+          <xsl:attribute name="border-right-width"><xsl:value-of select="$bootstrap-note-border-width"/></xsl:attribute>
+          <xsl:attribute name="border-right-style">solid</xsl:attribute>
+          <xsl:attribute name="border-right-color"><xsl:value-of select="$icon-color"/></xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="border-left-width"><xsl:value-of select="$bootstrap-note-border-width"/></xsl:attribute>
+          <xsl:attribute name="border-left-style">solid</xsl:attribute>
+          <xsl:attribute name="border-left-color"><xsl:value-of select="$icon-color"/></xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+
+      <!-- 3. Spacing Defaults (if not overridden by attributes) -->
+      <xsl:if test="not(@padding or exists(tokenize(@outputclass, ' ')[starts-with(., 'p-')]))">
+        <xsl:attribute name="padding">12pt</xsl:attribute>
+      </xsl:if>
+      <xsl:if test="not(@margin or exists(tokenize(@outputclass, ' ')[starts-with(., 'm-')]))">
+        <xsl:attribute name="margin-top">10pt</xsl:attribute>
+        <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+      </xsl:if>
+
+      <!-- 4. Ancestor Indent Compensation -->
+      <xsl:variable name="ancestorStartPad">
+        <xsl:call-template name="get-ancestor-padding-indent">
+          <xsl:with-param name="side" select="'start'"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:variable name="ancestorEndPad">
+        <xsl:call-template name="get-ancestor-padding-indent">
+          <xsl:with-param name="side" select="'end'"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:if test="number($ancestorStartPad) > 0">
+        <xsl:attribute name="start-indent" select="concat($ancestorStartPad, 'pt + from-parent(start-indent)')"/>
+      </xsl:if>
+      <xsl:if test="number($ancestorEndPad) > 0">
+        <xsl:attribute name="end-indent" select="concat($ancestorEndPad, 'pt + from-parent(end-indent)')"/>
+      </xsl:if>
+
+      <!-- Ensure the note stays on one page -->
+      <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
+
+      <!-- Note Title / Icon Prefix -->
+      <fo:inline font-weight="bold" color="{$icon-color}">
+        <xsl:variable name="type" select="(@type, 'note')[1]"/>
+        <xsl:variable
+          name="explicit-icon"
+          select="(@icon, substring-before(substring-after(@otherprops, 'icon('), ')'))[1]"
+        />
+
+        <xsl:if
+          test="$BOOTSTRAP_ICONS_INCLUDE = 'yes' and ($explicit-icon != '' or ($type != 'othertype' and $type != 'other'))"
+        >
+          <xsl:variable name="icon-name">
+            <xsl:choose>
+              <xsl:when test="$explicit-icon != ''">
+                <xsl:variable
+                  name="raw"
+                  select="(tokenize($explicit-icon, ' ')[starts-with(., 'bi-')], tokenize($explicit-icon, ' ')[not(. = ('bi', 'icon')) and not(contains(., '('))])[1]"
+                />
+                <xsl:value-of select="if (starts-with($raw, 'bi-')) then $raw else concat('bi-', $raw)"/>
+              </xsl:when>
+              <xsl:when test="$type = 'tip'">bi-lightbulb</xsl:when>
+              <xsl:when test="$type = 'fastpath'">bi-shield-check</xsl:when>
+              <xsl:when test="$type = 'remember'">bi-clipboard-check</xsl:when>
+              <xsl:when test="$type = 'restriction'">bi-slash-circle</xsl:when>
+              <xsl:when test="$type = 'important'">bi-exclamation-circle-fill</xsl:when>
+              <xsl:when test="$type = 'attention'">bi-exclamation-triangle</xsl:when>
+              <xsl:when test="$type = 'caution'">bi-exclamation-triangle</xsl:when>
+              <xsl:when test="$type = 'warning'">bi-exclamation-triangle</xsl:when>
+              <xsl:when test="$type = 'trouble'">bi-exclamation-triangle</xsl:when>
+              <xsl:when test="$type = 'danger'">bi-exclamation-triangle</xsl:when>
+              <xsl:when test="$type = 'notice'">bi-info-circle-fill</xsl:when>
+              <xsl:when test="$type = 'note'">bi-pencil</xsl:when>
+              <xsl:otherwise>bi-info-circle</xsl:otherwise>
+            </xsl:choose>
+          </xsl:variable>
+
+          <xsl:variable name="temp-icon">
+            <icon class="+ topic/ph bootstrap-d/icon " outputclass="{$icon-name}" padding="e2"/>
+          </xsl:variable>
+          <xsl:apply-templates select="$temp-icon/*">
+             <xsl:with-param name="color" select="$icon-color"/>
+          </xsl:apply-templates>
+        </xsl:if>
+
+        <xsl:variable name="type" select="(@type, 'note')[1]"/>
+        <xsl:variable name="label">
+           <xsl:choose>
+              <xsl:when test="($type = 'other' or $type = 'othertype') and @othertype">
+                 <xsl:value-of select="@othertype"/>
+              </xsl:when>
+              <xsl:otherwise>
+                 <xsl:call-template name="getVariable">
+                    <xsl:with-param name="id" select="concat(upper-case(substring($type, 1, 1)), substring($type, 2))"/>
+                 </xsl:call-template>
+              </xsl:otherwise>
+           </xsl:choose>
+        </xsl:variable>
+        <xsl:value-of select="$label"/>
+        <xsl:call-template name="getVariable">
+           <xsl:with-param name="id" select="'ColonSymbol'"/>
+        </xsl:call-template>
+      </fo:inline>
+      <xsl:text>&#160;</xsl:text>
+
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
   <!-- Override to prevent duplicate ID generation on inline elements in dt/pt -->
   <xsl:template match="@id" priority="2">
     <xsl:param name="bootstrap-suppress-id" select="false()" tunnel="yes" as="xs:boolean"/>
@@ -70,4 +494,14 @@
     </xsl:next-match>
   </xsl:template>
 
+  <xsl:template
+    match="*[contains(@class, ' topic/xref ')][@href][not(@scope = 'external')][empty(@format) or @format = 'dita'][opentopic-func:getDestinationId(@href) = ''][not(contains(@class, ' bootstrap-d/button ') or exists(tokenize(@outputclass, ' ')[starts-with(., 'btn')]) or @theme or exists(tokenize(@outputclass, ' ')[starts-with(., 'link-') or . = 'link-underline']))]"
+    priority="25"
+  >
+    <fo:inline>
+      <xsl:call-template name="commonattributes"/>
+      <xsl:apply-templates select="*[not(contains(@class, ' topic/desc '))] | text()"/>
+    </fo:inline>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/xsl/fo/utility-classes.xsl b/xsl/fo/utility-classes.xsl
index 9ed491a..3fffdfa 100644
--- a/xsl/fo/utility-classes.xsl
+++ b/xsl/fo/utility-classes.xsl
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
   xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:opentopic-func="http://www.idiominc.com/opentopic/exsl/function"
-  xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-  exclude-result-prefixes="xs opentopic-func dita-ot"
+  exclude-result-prefixes="xs"
   version="2.0"
 >
 
   <xsl:param name="BOOTSTRAP_ICONS_INCLUDE" select="'yes'"/>
-  
+
   <!-- Helper Template to retrieve settings from the $bootstrap-settings map with a fallback -->
   <xsl:template name="getBootstrapSetting">
     <xsl:param name="name"/>
@@ -38,6 +40,110 @@
     </xsl:choose>
   </xsl:template>
 
+  <!-- The 8 Bootstrap theme color names (bootstrap-color-values in the shared DTD). -->
+  <xsl:variable
+    name="bootstrap-theme-color-names"
+    select="('primary', 'secondary', 'success', 'danger', 'warning', 'info', 'accent', 'inverse')"
+    as="xs:string*"
+  />
+
+  <xsl:template name="get-outputclass-theme-color">
+    <xsl:param name="outputclass" select="''"/>
+    <xsl:variable
+      name="match"
+      select="
+        (for $t in tokenize($outputclass, ' ')[starts-with(., 'theme-')]
+         return substring-after($t, 'theme-'))[. = $bootstrap-theme-color-names][1]"
+    />
+    <xsl:value-of select="$match"/>
+  </xsl:template>
+
+  <xsl:template name="get-outputclass-theme-suffix">
+    <xsl:param name="outputclass" select="''"/>
+    <xsl:variable
+      name="modifiers"
+      select="
+        (for $t in tokenize($outputclass, ' ')[starts-with(., 'theme-')]
+         return substring-after($t, 'theme-'))[. = ('contrast', 'subtle', 'muted', 'border')]"
+    />
+    <xsl:value-of
+      select="
+        if (exists($modifiers[. = 'subtle']) and exists($modifiers[. = 'border'])) then 'subtle-border'
+        else if (exists($modifiers[. = 'subtle'])) then 'subtle'
+        else if (exists($modifiers[. = 'border'])) then 'border'
+        else if (exists($modifiers[. = 'muted'])) then 'muted'
+        else if (exists($modifiers[. = 'contrast'])) then 'contrast'
+        else ''"
+    />
+  </xsl:template>
+
+  <xsl:template name="get-theme-color">
+    <xsl:param name="node" select="."/>
+    <xsl:choose>
+      <xsl:when test="$node/@theme">
+        <xsl:value-of
+          select="if (contains($node/@theme, '-')) then substring-before($node/@theme, '-') else $node/@theme"
+        />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="get-outputclass-theme-color">
+          <xsl:with-param name="outputclass" select="$node/@outputclass"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="get-theme-suffix">
+    <xsl:param name="node" select="."/>
+    <xsl:choose>
+      <xsl:when test="$node/@theme">
+        <xsl:value-of select="if (contains($node/@theme, '-')) then substring-after($node/@theme, '-') else ''"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="get-outputclass-theme-suffix">
+          <xsl:with-param name="outputclass" select="$node/@outputclass"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="apply-default-blockquote-border">
+    <xsl:param name="node" select="."/>
+    <xsl:variable name="direction">
+      <xsl:choose>
+        <xsl:when test="$node/@dir"><xsl:value-of select="$node/@dir"/></xsl:when>
+        <xsl:when test="$node/ancestor::*[@dir]"><xsl:value-of select="$node/ancestor::*[@dir][1]/@dir"/></xsl:when>
+        <xsl:otherwise><xsl:value-of select="$writing-mode"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable
+      name="skipPadding"
+      select="$node/@padding or exists(tokenize($node/@outputclass, ' ')[starts-with(., 'p-')])"
+    />
+    <xsl:choose>
+      <xsl:when test="$direction = 'rtl' or $direction = 'rl'">
+        <xsl:attribute name="border-right-width"><xsl:value-of
+            select="$bootstrap-blockquote-border-width"
+          /></xsl:attribute>
+        <xsl:attribute name="border-right-style">solid</xsl:attribute>
+        <xsl:attribute name="border-right-color"><xsl:value-of select="$bootstrap-border-color"/></xsl:attribute>
+        <xsl:if test="not($skipPadding)">
+          <xsl:attribute name="padding-right"><xsl:value-of select="$bootstrap-spacing-3"/></xsl:attribute>
+        </xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:attribute name="border-left-width"><xsl:value-of
+            select="$bootstrap-blockquote-border-width"
+          /></xsl:attribute>
+        <xsl:attribute name="border-left-style">solid</xsl:attribute>
+        <xsl:attribute name="border-left-color"><xsl:value-of select="$bootstrap-border-color"/></xsl:attribute>
+        <xsl:if test="not($skipPadding)">
+          <xsl:attribute name="padding-left"><xsl:value-of select="$bootstrap-spacing-3"/></xsl:attribute>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <!-- Retrieve the computed value of a specific attribute from an attribute-set -->
   <xsl:template name="getBootstrapAttrValue">
     <xsl:param name="attrSet"/>
@@ -195,7 +301,7 @@
     </xsl:if>
   </xsl:template>
 
-  <!-- Process @frame attribute for Figures -->
+  <!-- Process @frame attribute for Figures (and codeblocks) -->
   <xsl:template name="processBootstrapFrame">
     <xsl:param name="attrValue"/>
     <xsl:if test="$attrValue">
@@ -212,13 +318,73 @@
         <xsl:call-template name="processBootstrapBorder">
           <xsl:with-param name="attrValue" select="$processedValue"/>
         </xsl:call-template>
-        <!-- Effectively an additional padded border - using p-3 / 12pt -->
-        <xsl:attribute name="padding"><xsl:value-of select="$bootstrap-spacing-3"/></xsl:attribute>
+        <xsl:variable name="padAttrSets">
+          <xsl:choose>
+            <xsl:when test="$attrValue = 'all'">p-3</xsl:when>
+            <xsl:when test="$attrValue = 'sides'">ps-3 pe-3</xsl:when>
+            <xsl:when test="$attrValue = 'top'">pt-3</xsl:when>
+            <xsl:when test="$attrValue = 'bottom'">pb-3</xsl:when>
+            <xsl:when test="$attrValue = 'topbot'">pt-3 pb-3</xsl:when>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:for-each select="tokenize($padAttrSets, ' ')">
+          <xsl:call-template name="processBootstrapAttrSetReflection">
+            <xsl:with-param name="attrSet">
+              <xsl:choose>
+                <xsl:when test="$writing-mode = 'rl' and starts-with(., 'ps-')"><xsl:value-of
+                    select="concat('pe-', substring-after(., '-'))"
+                  /></xsl:when>
+                <xsl:when test="$writing-mode = 'rl' and starts-with(., 'pe-')"><xsl:value-of
+                    select="concat('ps-', substring-after(., '-'))"
+                  /></xsl:when>
+                <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+              </xsl:choose>
+            </xsl:with-param>
+          </xsl:call-template>
+        </xsl:for-each>
       </xsl:if>
     </xsl:if>
   </xsl:template>
 
-  <!-- Process @bordercolor attribute -->
+  <xsl:template name="setFrame" as="attribute()*">
+    <xsl:if test="not(contains(@class, ' pr-d/codeblock '))">
+      <xsl:variable name="container" as="element()*">
+        <xsl:choose>
+          <xsl:when test="@frame = 'top'">
+            <element xsl:use-attribute-sets="__border__top"/>
+          </xsl:when>
+          <xsl:when test="@frame = 'bot'">
+            <element xsl:use-attribute-sets="__border__bot"/>
+          </xsl:when>
+          <xsl:when test="@frame = 'topbot'">
+            <element xsl:use-attribute-sets="__border__topbot"/>
+          </xsl:when>
+          <xsl:when test="@frame = 'sides'">
+            <element xsl:use-attribute-sets="__border__sides"/>
+          </xsl:when>
+          <xsl:when test="@frame = 'all'">
+            <element xsl:use-attribute-sets="__border__all"/>
+          </xsl:when>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:sequence select="$container/@*"/>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:attribute-set name="common.border__top">
+    <xsl:attribute name="border-before-color" select="$bootstrap-border-color"/>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="common.border__bottom">
+    <xsl:attribute name="border-after-color" select="$bootstrap-border-color"/>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="common.border__right">
+    <xsl:attribute name="border-end-color" select="$bootstrap-border-color"/>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="common.border__left">
+    <xsl:attribute name="border-start-color" select="$bootstrap-border-color"/>
+  </xsl:attribute-set>
+
+  <!-- Apply a border color from an explicit color name (e.g. a '-border' @theme suffix) -->
   <xsl:template name="processBootstrapBorderColor">
     <xsl:param name="attrValue"/>
     <xsl:param name="theme" select="''"/>
@@ -334,7 +500,6 @@
 
   <xsl:template name="processBootstrapBackground">
     <xsl:param name="node" select="."/>
-    <xsl:param name="color" select="$node/@color"/>
     <xsl:param name="outputclass" select="$node/@outputclass"/>
     <xsl:param name="variant" select="''"/> <!-- e.g. 'subtle' -->
     <xsl:param name="theme" select="''"/>
@@ -347,7 +512,6 @@
     <xsl:variable name="resolvedTheme">
         <xsl:choose>
             <xsl:when test="$theme != ''"><xsl:value-of select="$theme"/></xsl:when>
-            <xsl:when test="$color != ''"><xsl:value-of select="$color"/></xsl:when>
             <xsl:when test="exists(tokenize($outputclass, ' ')[starts-with(., 'text-bg-')])">
                 <xsl:value-of
             select="substring-after(tokenize($outputclass, ' ')[starts-with(., 'text-bg-')][1], 'text-bg-')"
@@ -471,6 +635,61 @@
     </xsl:if>
   </xsl:template>
 
+  <!-- Resolve the padding a single container applies to its own content -->
+  <xsl:template name="get-container-side-padding">
+    <xsl:param name="node"/>
+    <xsl:param name="side" select="'start'"/>
+    <xsl:variable name="attrName" select="if ($side = 'start') then 'padding-left' else 'padding-right'"/>
+    <xsl:variable name="rtf">
+      <tmp>
+        <xsl:call-template name="processBootstrapSpacing">
+          <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="prefix" select="'p'"/>
+        </xsl:call-template>
+        <xsl:if
+          test="$side = 'start'
+                and contains($node/@class, ' topic/lq ')
+                and not($node/@padding)
+                and not(exists(tokenize($node/@outputclass, ' ')[starts-with(., 'p-')]))"
+        >
+          <xsl:attribute name="{$attrName}"><xsl:value-of select="$bootstrap-spacing-3"/></xsl:attribute>
+        </xsl:if>
+      </tmp>
+    </xsl:variable>
+    <xsl:variable name="resolved" select="($rtf/tmp/@*[local-name() = $attrName], $rtf/tmp/@padding)[1]"/>
+    <xsl:value-of select="if ($resolved) then $resolved else '0'"/>
+  </xsl:template>
+
+  <!-- Sum ancestor padding on the given side; grid columns excluded since FOP constrains their width natively -->
+  <xsl:template name="get-ancestor-padding-indent">
+    <xsl:param name="node" select="."/>
+    <xsl:param name="side" select="'start'"/>
+    <xsl:variable
+      name="containers"
+      select="
+        $node/ancestor::*[
+          (@padding or
+           exists(tokenize(@outputclass, ' ')[starts-with(., 'p-') or starts-with(., 'ps-') or starts-with(., 'pe-') or starts-with(., 'px-')]) or
+           contains(@class, ' topic/lq '))
+          and not(contains(@class, ' bootstrap-d/grid-col '))
+          and not(exists(tokenize(@outputclass, ' ')[starts-with(., 'col') or contains(., ':col')]))
+        ]"
+    />
+    <xsl:variable name="values" as="xs:double*">
+      <xsl:for-each select="$containers">
+        <xsl:variable name="raw">
+          <xsl:call-template name="get-container-side-padding">
+            <xsl:with-param name="node" select="."/>
+            <xsl:with-param name="side" select="$side"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="num" select="number(replace(normalize-space($raw), '[^0-9.\-].*$', ''))"/>
+        <xsl:sequence select="if ($num != $num) then 0 else $num"/>
+      </xsl:for-each>
+    </xsl:variable>
+    <xsl:value-of select="format-number(sum(($values, 0)), '0.######')"/>
+  </xsl:template>
+
   <!-- Process @outputclass attribute for Bootstrap classes -->
   <xsl:template name="processBootstrapOutputClass">
     <xsl:param name="attrValue"/>
@@ -498,7 +717,8 @@
                         starts-with($token, 'px-') or starts-with($token, 'py-') or starts-with($token, 'pt-') or starts-with($token, 'pb-') or starts-with($token, 'ps-') or starts-with($token, 'pe-') or
                         starts-with($token, 'mx-') or starts-with($token, 'my-') or starts-with($token, 'mt-') or starts-with($token, 'mb-') or starts-with($token, 'ms-') or starts-with($token, 'me-') or
                         $token = 'h1' or $token = 'h2' or $token = 'h3' or $token = 'h4' or $token = 'h5' or $token = 'h6' or
-                        starts-with($token, 'display-') or $token = 'lead'"
+                        $token = 'lead' or
+                        starts-with($token, 'fw-') or starts-with($token, 'fs-')"
           >
             <xsl:call-template name="processBootstrapAttrSetReflection">
               <xsl:with-param name="attrSet">
@@ -546,331 +766,22 @@
     </xsl:if>
   </xsl:template>
 
-  <!-- Titles within colored components -->
-  <xsl:template
-    match="*[contains(@class, ' topic/title ')][ancestor::*[contains(@class, ' topic/note ')] or ancestor::*[contains(@class, ' bootstrap-d/alert ')] or ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')][@color]]"
-    priority="6"
-  >
-      <xsl:variable name="theme">
-        <xsl:choose>
-          <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]/@color"><xsl:value-of
-            select="ancestor::*[contains(@class, ' topic/note ')]/@color"
-          /></xsl:when>
-          <xsl:when test="ancestor::*[contains(@class, ' topic/note ')]">
-            <xsl:call-template name="getNoteTheme">
-               <xsl:with-param name="type" select="(ancestor::*[contains(@class, ' topic/note ')]/@type, 'note')[1]"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="ancestor::*[contains(@class, ' bootstrap-d/alert ')]"><xsl:value-of
-            select="(ancestor::*[contains(@class, ' bootstrap-d/alert ')]/@color, 'secondary')[1]"
-          /></xsl:when>
-          <xsl:when
-          test="ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')]"
-        ><xsl:value-of
-            select="ancestor::*[contains(@class, ' topic/section ') or contains(@class, ' topic/div ') or contains(@class, ' topic/bodydiv ')][1]/@color"
-          /></xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="subtleColor">
-         <xsl:if test="$theme != ''">
-            <xsl:call-template name="getBootstrapAttrValue">
-               <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
-            </xsl:call-template>
-         </xsl:if>
-      </xsl:variable>
-
-      <xsl:choose>
-         <xsl:when test="parent::*[contains(@class, ' topic/example ')]">
-            <fo:block xsl:use-attribute-sets="example.title">
-               <xsl:if test="$subtleColor != ''"><xsl:attribute name="color"><xsl:value-of
-                select="$subtleColor"
-              /></xsl:attribute></xsl:if>
-               <xsl:call-template name="commonattributes"/>
-               <xsl:apply-templates/>
-            </fo:block>
-         </xsl:when>
-         <xsl:otherwise>
-            <fo:block xsl:use-attribute-sets="section.title">
-               <xsl:if test="$subtleColor != ''"><xsl:attribute name="color"><xsl:value-of
-                select="$subtleColor"
-              /></xsl:attribute></xsl:if>
-               <xsl:call-template name="commonattributes"/>
-               <xsl:apply-templates/>
-            </fo:block>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <!-- Baseline Section and Div Support -->
-  <xsl:template
-    match="*[contains(@class, ' topic/section ') or 
-                         contains(@class, ' topic/div ') or 
-                         contains(@class, ' topic/bodydiv ')]"
-    priority="-1"
-  >
-    <fo:block>
-      <xsl:if test="contains(@class, ' topic/section ')">
-         <xsl:call-template name="get-attributes">
-            <xsl:with-param name="element" as="element()">
-               <placeholder xsl:use-attribute-sets="section"/>
-            </xsl:with-param>
-         </xsl:call-template>
-      </xsl:if>
-      <xsl:call-template name="commonattributes"/>
-      <xsl:call-template name="bootstrap.decoration"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <!-- Inline Ph Support (Explicitly excludes syntax tokens to allow PrismJS overrides) -->
-  <xsl:template match="*[contains(@class, ' topic/ph ') and not(contains(@outputclass, 'token'))]">
-    <fo:inline>
-      <xsl:call-template name="commonattributes"/>
-      <xsl:call-template name="bootstrap.decoration"/>
-      <xsl:apply-templates/>
-    </fo:inline>
-  </xsl:template>
-
-  <!-- Paragraph Support (Low priority to allow specialized overrides) -->
-  <xsl:template match="*[contains(@class, ' topic/p ')]" priority="-1">
-    <fo:block xsl:use-attribute-sets="p">
-      <xsl:call-template name="commonattributes"/>
-      <xsl:call-template name="bootstrap.decoration"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <!-- Blockquote (lq) Support -->
-  <xsl:template match="*[contains(@class, ' topic/lq ')]">
-    <fo:block margin-bottom="12pt">
-      <xsl:call-template name="get-attributes">
-        <xsl:with-param name="element" as="element()">
-           <placeholder xsl:use-attribute-sets="lq"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="commonattributes"/>
-      <xsl:call-template name="bootstrap.decoration"/>
-      
-      <xsl:variable
-        name="theme"
-        select="(@color, substring-after(tokenize(@outputclass, ' ')[starts-with(., 'bg-')][1], 'bg-'))[1]"
-      />
-      <xsl:if test="not(@outputclass) and not($theme)">
-        <xsl:attribute name="font-size">15pt</xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <!-- Pre Support (Explicitly excludes syntax highlighting to allow PrismJS overrides) -->
-  <xsl:template
-    match="*[contains(@class, ' topic/pre ') and not(contains(@outputclass, 'language-') or contains(@class, ' pr-d/codeblock '))]"
-  >
-    <fo:block xsl:use-attribute-sets="pre">
-      <xsl:call-template name="commonattributes"/>
-      <xsl:call-template name="bootstrap.decoration"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <!-- Text/Paragraphs within Blockquote (lq) -->
-  <xsl:template match="*[contains(@class, ' topic/lq ')]/*[contains(@class, ' topic/p ')]" priority="5">
-    <fo:block xsl:use-attribute-sets="p">
-      <xsl:call-template name="commonattributes"/>
-      
-      <!-- Default large font for lq/p unless an override is present -->
-      <xsl:if test="not(@outputclass) and not(parent::*/@outputclass)">
-        <xsl:attribute name="font-size">15pt</xsl:attribute>
-      </xsl:if>
-
-      <xsl:call-template name="processBootstrapSpacing">
-        <xsl:with-param name="attrValue" select="@padding"/>
-        <xsl:with-param name="prefix" select="'p'"/>
-      </xsl:call-template>
-      <xsl:call-template name="processBootstrapSpacing">
-        <xsl:with-param name="attrValue" select="@margin"/>
-        <xsl:with-param name="prefix" select="'m'"/>
-      </xsl:call-template>
-      <xsl:call-template name="processBootstrapBorder">
-        <xsl:with-param name="attrValue" select="@border"/>
-      </xsl:call-template>
-      <xsl:call-template name="processBootstrapWidth">
-        <xsl:with-param name="attrValue" select="@width"/>
-      </xsl:call-template>
-      <xsl:call-template name="processBootstrapBorderColor">
-        <xsl:with-param name="attrValue" select="@bordercolor"/>
-      </xsl:call-template>
-      <xsl:call-template name="processBootstrapRounded">
-        <xsl:with-param name="attrValue" select="@rounded"/>
-      </xsl:call-template>
-      <xsl:call-template name="processBootstrapOutputClass">
-        <xsl:with-param name="attrValue" select="@outputclass"/>
-      </xsl:call-template>
-      <xsl:call-template name="processBootstrapDirection"/>
-      <xsl:attribute name="line-height">1.5</xsl:attribute>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <!-- Unstyled List Support (ul and ol) -->
-  <xsl:template
-    match="*[contains(@class, ' topic/ul ') or contains(@class, ' topic/ol ')][tokenize(@outputclass, ' ') = 'list-unstyled']"
-  >
-    <fo:block margin-bottom="12pt">
-      <xsl:call-template name="commonattributes"/>
-      <xsl:call-template name="processBootstrapDirection"/>
-      <xsl:apply-templates select="*[contains(@class, ' topic/li ')]" mode="list-unstyled"/>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="*[contains(@class, ' topic/li ')]" mode="list-unstyled">
-    <fo:block margin-left="0pt" margin-bottom="3pt">
-      <xsl:call-template name="commonattributes"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <!-- Inline List Support (ul and ol) -->
-  <xsl:template
-    match="*[contains(@class, ' topic/ul ') or contains(@class, ' topic/ol ')][tokenize(@outputclass, ' ') = 'list-inline']"
-  >
-    <fo:block margin-bottom="12pt">
-      <xsl:call-template name="commonattributes"/>
-      <xsl:call-template name="processBootstrapDirection"/>
-      <xsl:apply-templates select="*[contains(@class, ' topic/li ')]" mode="list-inline"/>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="*[contains(@class, ' topic/li ')]" mode="list-inline">
-    <fo:inline padding-right="8pt">
-      <xsl:call-template name="commonattributes"/>
-      <xsl:apply-templates/>
-    </fo:inline>
-  </xsl:template>
-
   <!-- Suppress any elements used for dark/light mode switching in print -->
   <xsl:template
     match="*[tokenize(normalize-space(@outputclass), ' ') = 'd-light' or tokenize(normalize-space(@outputclass), ' ') = 'd-dark']"
     priority="10"
   />
 
-  <!-- Only render the first image within a picture element -->
-  <xsl:template
-    match="*[contains(@class, ' bootstrap-d/picture ') or tokenize(@outputclass, ' ') = 'd-picture']"
-    priority="6"
-  >
-    <fo:block>
-      <xsl:call-template name="commonattributes"/>
-      <xsl:apply-templates select="*[contains(@class, ' topic/image ')][1]"/>
-    </fo:block>
-  </xsl:template>
-
-  <!-- Thumbnail Support -->
-  <xsl:template match="*[contains(@class, ' bootstrap-d/thumbnail ')]" priority="6">
-    <xsl:variable name="resolved-href">
-      <xsl:choose>
-        <xsl:when test="@scope = 'external' or opentopic-func:isAbsolute(@href)">
-          <xsl:value-of select="@href"/>
-        </xsl:when>
-        <xsl:when test="exists(key('jobFile', @href, $job))">
-          <xsl:value-of select="key('jobFile', @href, $job)/@src"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat($input.dir.url, @href)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="theme" select="@color"/>
-    <xsl:choose>
-      <xsl:when test="@placement = 'break'">
-        <fo:block margin-top="{$bootstrap-spacing-3}" margin-bottom="{$bootstrap-spacing-3}" text-align="center">
-          <fo:external-graphic
-            src="url('{$resolved-href}')"
-            content-width="scale-to-fit"
-            scaling="uniform"
-            padding="{$bootstrap-spacing-1}"
-            vertical-align="middle"
-          >
-            <xsl:call-template name="processBootstrapRounded">
-              <xsl:with-param name="attrValue" select="(@rounded, '2')[1]"/>
-            </xsl:call-template>
-            <xsl:attribute name="border">
-              <xsl:value-of select="concat($bootstrap-border-width, ' solid')"/>
-            </xsl:attribute>
-            <xsl:choose>
-              <xsl:when test="$theme">
-                <xsl:call-template name="processBootstrapBorderColor">
-                  <xsl:with-param name="attrValue" select="$theme"/>
-                </xsl:call-template>
-                <xsl:call-template name="processBootstrapAttrSetReflection">
-                  <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-border-color"/></xsl:attribute>
-                <xsl:attribute name="background-color">#ffffff</xsl:attribute>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:call-template name="commonattributes"/>
-            <xsl:if test="@height"><xsl:attribute name="height" select="@height"/></xsl:if>
-            <xsl:if test="@width"><xsl:attribute name="width" select="@width"/></xsl:if>
-          </fo:external-graphic>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:external-graphic
-          src="url('{$resolved-href}')"
-          content-width="scale-to-fit"
-          scaling="uniform"
-          padding="{$bootstrap-spacing-1}"
-          vertical-align="middle"
-        >
-          <xsl:call-template name="processBootstrapRounded">
-            <xsl:with-param name="attrValue" select="(@rounded, '2')[1]"/>
-          </xsl:call-template>
-          <xsl:attribute name="border">
-            <xsl:value-of select="concat($bootstrap-border-width, ' solid')"/>
-          </xsl:attribute>
-          <xsl:choose>
-            <xsl:when test="$theme">
-              <xsl:call-template name="processBootstrapBorderColor">
-                <xsl:with-param name="attrValue" select="$theme"/>
-              </xsl:call-template>
-              <xsl:call-template name="processBootstrapAttrSetReflection">
-                <xsl:with-param name="attrSet" select="concat('__bg__', $theme, '-subtle')"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="border-color"><xsl:value-of select="$bootstrap-border-color"/></xsl:attribute>
-              <xsl:attribute name="background-color">#ffffff</xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:call-template name="commonattributes"/>
-          <xsl:if test="@height"><xsl:attribute name="height" select="@height"/></xsl:if>
-          <xsl:if test="@width"><xsl:attribute name="width" select="@width"/></xsl:if>
-        </fo:external-graphic>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
   <xsl:template match="*" mode="prismDecoration">
-      <xsl:call-template name="processBootstrapAttrSetReflection">
-          <xsl:with-param name="attrSet" select="'__bg__secondary-subtle'"/>
-      </xsl:call-template>
-      <xsl:call-template name="processBootstrapBorderColor">
-          <xsl:with-param name="attrValue" select="'secondary'"/>
-      </xsl:call-template>
       <!-- Overrides from settings-map if present -->
       <xsl:variable name="textColor">
           <xsl:call-template name="getBootstrapSetting">
               <xsl:with-param name="name" select="'prismjs.text.color'"/>
           </xsl:call-template>
       </xsl:variable>
-      <xsl:variable name="bgColor">
+      <xsl:variable name="borderColor">
           <xsl:call-template name="getBootstrapSetting">
-              <xsl:with-param name="name" select="'prismjs.background.color'"/>
+              <xsl:with-param name="name" select="'prismjs.border.color'"/>
           </xsl:call-template>
       </xsl:variable>
       <xsl:variable name="borderWidth">
@@ -879,7 +790,7 @@
           </xsl:call-template>
       </xsl:variable>
       <xsl:if test="$textColor != ''"><xsl:attribute name="color" select="$textColor"/></xsl:if>
-      <xsl:if test="$bgColor != ''"><xsl:attribute name="background-color" select="$bgColor"/></xsl:if>
+      <xsl:if test="$borderColor != ''"><xsl:attribute name="border-color" select="$borderColor"/></xsl:if>
       <xsl:if test="$borderWidth != ''">
           <xsl:attribute name="border-width" select="$borderWidth"/>
           <xsl:if test="normalize-space($borderWidth) != ('0', '0pt', '0px', '0in', '0mm', '0cm', '0.0pt', '0.0px')">
@@ -900,11 +811,14 @@
       <xsl:param name="theme" select="''"/>
       <xsl:param name="prefix" select="''"/>
       <xsl:param name="defaultRounded" select="false()"/>
+      <!-- Set when a caller resolved a '-border'-only theme (border color, no background) -->
+      <xsl:param name="skipBackground" select="false()"/>
       <xsl:apply-templates select="$node" mode="bootstrapDecoration">
           <xsl:with-param name="variant" select="$variant"/>
           <xsl:with-param name="theme" select="$theme"/>
           <xsl:with-param name="prefix" select="$prefix"/>
           <xsl:with-param name="defaultRounded" select="$defaultRounded"/>
+          <xsl:with-param name="skipBackground" select="$skipBackground"/>
       </xsl:apply-templates>
   </xsl:template>
 
@@ -913,12 +827,55 @@
       <xsl:param name="theme" select="''"/>
       <xsl:param name="prefix" select="''"/>
       <xsl:param name="defaultRounded" select="false()"/>
-      <xsl:call-template name="processBootstrapBackground">
-          <xsl:with-param name="node" select="."/>
-          <xsl:with-param name="variant" select="$variant"/>
-          <xsl:with-param name="theme" select="$theme"/>
-          <xsl:with-param name="prefix" select="$prefix"/>
-      </xsl:call-template>
+      <xsl:param name="skipBackground" select="false()"/>
+
+      <xsl:variable
+      name="isTableContext"
+      select="contains(@class, ' topic/table ') or contains(@class, ' topic/row ') or contains(@class, ' topic/entry ')"
+    />
+      <xsl:variable name="ownColor">
+        <xsl:if test="$theme = ''">
+          <xsl:call-template name="get-theme-color"/>
+        </xsl:if>
+      </xsl:variable>
+      <xsl:variable name="ownSuffixParts">
+        <xsl:if test="$theme = '' and $ownColor != ''">
+          <xsl:call-template name="get-theme-suffix"/>
+        </xsl:if>
+      </xsl:variable>
+      <xsl:variable
+      name="ownSuffixTokens"
+      select="if ($ownSuffixParts != '') then tokenize($ownSuffixParts, '-') else ()"
+    />
+      <xsl:variable name="ownIsMuted" select="$ownSuffixTokens = 'muted'"/>
+      <xsl:variable name="ownIsSubtle" select="$ownSuffixTokens = 'subtle'"/>
+      <xsl:variable name="ownIsBorder" select="$ownSuffixTokens = 'border'"/>
+      <xsl:variable name="ownIsBare" select="$ownColor != '' and $ownSuffixParts = '' and not($isTableContext)"/>
+
+      <xsl:variable name="ownIsBorderOnly" select="$ownSuffixParts = 'border'"/>
+
+      <xsl:if test="not($skipBackground)">
+        <xsl:choose>
+          <xsl:when test="$theme = '' and $ownIsMuted and $ownColor != ''">
+            <xsl:call-template name="processBootstrapAttrSetReflection">
+              <xsl:with-param name="attrSet" select="concat('__muted__', $ownColor)"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:when test="$theme = '' and ($ownIsBare or $ownIsBorderOnly)"/>
+          <xsl:otherwise>
+            <xsl:call-template name="processBootstrapBackground">
+                <xsl:with-param name="node" select="."/>
+                <xsl:with-param
+              name="variant"
+              select="if ($theme != '') then $variant else (if ($ownIsSubtle) then 'subtle' else '')"
+            />
+                <xsl:with-param name="theme" select="if ($theme != '') then $theme else $ownColor"/>
+                <xsl:with-param name="prefix" select="$prefix"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+
       <xsl:call-template name="processBootstrapSpacing">
           <xsl:with-param name="node" select="."/>
           <xsl:with-param name="prefix" select="'p'"/>
@@ -933,18 +890,17 @@
       <xsl:call-template name="processBootstrapBorder">
           <xsl:with-param name="attrValue" select="@border"/>
       </xsl:call-template>
-      <xsl:variable
-      name="isTableContext"
-      select="contains(@class, ' topic/table ') or contains(@class, ' topic/row ') or contains(@class, ' topic/entry ')"
-    />
       <xsl:variable
       name="hasExplicitBorder"
-      select="@border or @bordercolor or exists(tokenize(@outputclass, ' ')[starts-with(., 'border-')])"
+      select="@border or $ownIsBorder or exists(tokenize(@outputclass, ' ')[starts-with(., 'border-')])"
     />
 
       <xsl:if test="not($isTableContext) or $hasExplicitBorder">
         <xsl:call-template name="processBootstrapBorderColor">
-            <xsl:with-param name="attrValue" select="@bordercolor"/>
+            <xsl:with-param
+          name="attrValue"
+          select="if ($theme = '' and $ownIsBorder and $ownColor != '') then (if ($ownIsSubtle) then concat($ownColor, '-subtle') else $ownColor) else ()"
+        />
             <xsl:with-param name="theme" select="$theme"/>
         </xsl:call-template>
       </xsl:if>
@@ -961,24 +917,44 @@
   <!-- Remove borders -->
   <xsl:template name="bootstrapBorderless">
     <xsl:if
-      test="not(@outline = 'yes' or @border or @bordercolor or contains(@outputclass, 'border') or contains(@class, ' bootstrap-d/card '))"
+      test="not(@style = 'outline' or @border or @bordercolor or contains(@outputclass, 'border') or contains(@class, ' bootstrap-d/card '))"
     >
       <xsl:attribute name="border-width">0pt</xsl:attribute>
       <xsl:attribute name="border-style">none</xsl:attribute>
     </xsl:if>
   </xsl:template>
 
+  <xsl:template name="get-effective-shadow-value">
+    <xsl:param name="node" select="."/>
+    <xsl:variable
+      name="ocToken"
+      select="tokenize($node/@outputclass, ' ')[. = 'shadow' or starts-with(., 'shadow-')][1]"
+    />
+    <xsl:choose>
+      <xsl:when test="$node/@shadow"><xsl:value-of select="$node/@shadow"/></xsl:when>
+      <xsl:when test="$ocToken = 'shadow'">yes</xsl:when>
+      <xsl:when test="$ocToken != ''"><xsl:value-of select="substring-after($ocToken, 'shadow-')"/></xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
   <!-- Global Shadow Wrapper for shadow styling -->
   <xsl:template
-    match="*[@shadow][not(@shadow = 'none') and not(@shadow = 'no')][not(contains(@class, ' bootstrap-d/card ') or tokenize(@outputclass, ' ') = 'card')]"
+    match="
+      *[(@shadow and @shadow != 'none' and @shadow != 'no') or
+        exists(tokenize(@outputclass, ' ')[(. = 'shadow' or starts-with(., 'shadow-')) and . != 'shadow-none'])]
+       [not(contains(@class, ' bootstrap-d/card ') or tokenize(@outputclass, ' ') = 'card')]"
     priority="10"
   >
     <xsl:variable name="inner">
       <xsl:next-match/>
     </xsl:variable>
+    <xsl:variable name="shadow-val">
+      <xsl:call-template name="get-effective-shadow-value"/>
+    </xsl:variable>
 
     <xsl:call-template name="apply-shadow-wrapper">
       <xsl:with-param name="inner" select="$inner"/>
+      <xsl:with-param name="shadow-val" select="$shadow-val"/>
     </xsl:call-template>
   </xsl:template>
 
@@ -1014,14 +990,8 @@
           </xsl:choose>
         </xsl:variable>
 
-        <!-- Read the actual border-radius computed by the inner element's own template.
-             This covers @rounded on the element itself, defaults applied by alert/note
-             templates, and flat themes that set border-radius to 0. -->
         <xsl:variable name="inner-border-radius" select="$inner/*[1]/@fox:border-radius"/>
 
-        <!-- Outer Boundary Restraint: perfectly inherits required structural dimensions and layout-padding.
-             start-indent/end-indent reset to 0pt only when reset-indent=true() (e.g. card context inside
-             a table-cell) to prevent inherited body indent from shifting shadow layers. -->
         <fo:block>
           <xsl:if test="$reset-indent">
             <xsl:attribute name="start-indent">0pt</xsl:attribute>
@@ -1041,13 +1011,8 @@
             <xsl:with-param name="prefix" select="'m'"/>
           </xsl:call-template>
 
-          <!-- Expansion Sub-Wrapper: Expands outwards by the shadow-offset via negative structural margins.
-               Bottom is halved relative to right for a more natural drop-shadow perspective. -->
           <fo:block margin-right="-{$shadow-offset}" margin-bottom="-{$shadow-offset-bottom}">
-            <!-- Diffuse Shadow: layered nested blocks, light at the edge → dark near content.
-                 sm (3pt right / 1.5pt bottom):  2 layers
-                 md (6pt right / 3pt bottom):    6 layers, 1pt right steps
-                 lg (12pt right / 6pt bottom):   8 layers, finer steps -->
+            <!-- Diffuse Shadow: layered nested blocks -->
             <xsl:choose>
 
               <!-- sm: 2 diffuse layers -->
@@ -1215,23 +1180,82 @@
     priority="10"
   />
 
-  <!-- Intercept block-level code elements to force a new LTR reference area for FOP -->
-  <xsl:template match="*[contains(@class, ' pr-d/codeblock ')]" priority="1000">
+  <xsl:template match="*[contains(@class, ' pr-d/codeblock ')]" priority="10">
+    <xsl:variable name="ancestorStartPad">
+      <xsl:call-template name="get-ancestor-padding-indent">
+        <xsl:with-param name="side" select="'start'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="ancestorEndPad">
+      <xsl:call-template name="get-ancestor-padding-indent">
+        <xsl:with-param name="side" select="'end'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
     <xsl:choose>
-      <xsl:when test="$writing-mode = 'rl' and not(@dir)">
-        <fo:block-container writing-mode="lr-tb">
-          <!-- Force indent to 0 on the container so we don't double-inherit the RTL right-indent -->
-          <xsl:attribute name="start-indent">0pt</xsl:attribute>
-          <xsl:attribute name="end-indent">0pt</xsl:attribute>
-          <xsl:next-match/>
-        </fo:block-container>
+      <xsl:when test="@frame">
+        <fo:block>
+          <xsl:call-template name="processBootstrapFrame">
+            <xsl:with-param name="attrValue" select="@frame"/>
+          </xsl:call-template>
+          <xsl:if test="number($ancestorStartPad) > 0">
+            <xsl:attribute name="start-indent" select="concat($ancestorStartPad, 'pt + from-parent(start-indent)')"/>
+          </xsl:if>
+          <xsl:if test="number($ancestorEndPad) > 0">
+            <xsl:attribute name="end-indent" select="concat($ancestorEndPad, 'pt + from-parent(end-indent)')"/>
+          </xsl:if>
+          <fo:block>
+            <xsl:attribute name="background-color"><xsl:value-of
+                select="$prismjs.card.background.color"
+              /></xsl:attribute>
+            <xsl:apply-templates select="." mode="prismDecoration"/>
+            <xsl:choose>
+              <xsl:when test="$writing-mode = 'rl' and not(@dir)">
+                <fo:block-container writing-mode="lr-tb">
+                  <!-- Force indent to 0 on the container so we don't double-inherit the RTL right-indent -->
+                  <xsl:attribute name="start-indent">0pt</xsl:attribute>
+                  <xsl:attribute name="end-indent">0pt</xsl:attribute>
+                  <xsl:next-match/>
+                </fo:block-container>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:next-match/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </fo:block>
+        </fo:block>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:next-match/>
+        <fo:block>
+          <xsl:attribute name="background-color"><xsl:value-of select="$prismjs.card.background.color"/></xsl:attribute>
+          <xsl:apply-templates select="." mode="prismDecoration"/>
+          <xsl:if test="number($ancestorStartPad) > 0">
+            <xsl:attribute name="start-indent" select="concat($ancestorStartPad, 'pt + from-parent(start-indent)')"/>
+          </xsl:if>
+          <xsl:if test="number($ancestorEndPad) > 0">
+            <xsl:attribute name="end-indent" select="concat($ancestorEndPad, 'pt + from-parent(end-indent)')"/>
+          </xsl:if>
+          <xsl:choose>
+            <xsl:when test="$writing-mode = 'rl' and not(@dir)">
+              <fo:block-container writing-mode="lr-tb">
+                <!-- Force indent to 0 on the container so we don't double-inherit the RTL right-indent -->
+                <xsl:attribute name="start-indent">0pt</xsl:attribute>
+                <xsl:attribute name="end-indent">0pt</xsl:attribute>
+                <xsl:next-match/>
+              </fo:block-container>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:next-match/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </fo:block>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
+  <!-- Overrides standard prism processing -->
+  <xsl:template name="prismjs.border"/>
+
   <!-- Override commonattributes to ensure codeblocks, codeph, and PrismJS tokens are rendered LTR in RTL documents -->
   <xsl:template
     match="*[contains(@class, ' pr-d/') or contains(@class, ' sw-d/') or contains(@class, ' xml-d/') or (contains(@class,' topic/ph ') and contains(@outputclass, 'token'))]"
diff --git a/xsl/xslfo.xsl b/xsl/xslfo.xsl
index 9a9d87d..a177c11 100644
--- a/xsl/xslfo.xsl
+++ b/xsl/xslfo.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	This file is part of the DITA Bootstrap PDF plug-in for DITA Open Toolkit.
+	See the accompanying LICENSE file for applicable licenses.
+-->
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -10,23 +14,26 @@
 
   <!-- Core Attribute Sets and Utility Functions -->
   <xsl:import href="../cfg/fo/attrs/bootstrap-attr.xsl"/>
-  
-  <!-- Shared Utilities (Refactored logic) -->
+
+  <!-- Shared Utilities (mirrors org.dita.pdf2/xsl/fo/commons.xsl) -->
   <xsl:include href="fo/utility-classes.xsl"/>
 
-  <!-- Component Specific Modules -->
+  <!-- Base DITA Topic Overrides (mirrors org.dita.pdf2/xsl/fo/{topic,lists}.xsl) -->
+  <xsl:include href="fo/topic.xsl"/>
+  <xsl:include href="fo/lists.xsl"/>
+  <xsl:include href="fo/tables.xsl"/>
+  <xsl:include href="fo/figure.xsl"/>
+
+  <!-- Bootstrap-d Specialized Component Modules -->
   <xsl:include href="fo/accordion.xsl"/>
   <xsl:include href="fo/alert.xsl"/>
   <xsl:include href="fo/button.xsl"/>
   <xsl:include href="fo/badge.xsl"/>
   <xsl:include href="fo/card.xsl"/>
   <xsl:include href="fo/carousel.xsl"/>
-  <xsl:include href="fo/figure.xsl"/>
   <xsl:include href="fo/grid.xsl"/>
   <xsl:include href="fo/icon.xsl"/>
   <xsl:include href="fo/list-group.xsl"/>
-  <xsl:include href="fo/note.xsl"/>
-  <xsl:include href="fo/tables.xsl"/>
-  <xsl:include href="fo/topic.xsl"/>
+  <xsl:include href="fo/pagination.xsl"/>
 
 </xsl:stylesheet>