diff --git a/src/main/java/com/elovirta/dita/markdown/renderer/TopicRenderer.java b/src/main/java/com/elovirta/dita/markdown/renderer/TopicRenderer.java
index fb5d66c..104640d 100644
--- a/src/main/java/com/elovirta/dita/markdown/renderer/TopicRenderer.java
+++ b/src/main/java/com/elovirta/dita/markdown/renderer/TopicRenderer.java
@@ -285,7 +285,7 @@ private void render(final AbbreviationBlock node, final NodeRendererContext cont
   private void render(final AdmonitionBlock node, final NodeRendererContext context, final SaxWriter html) {
     final String type = node.getInfo().toString();
     final AttributesBuilder atts = new AttributesBuilder(NOTE_ATTS);
-    switch (type) {
+    switch (type.toLowerCase()) {
       case "note":
       case "tip":
       case "fastpath":
@@ -298,7 +298,7 @@ private void render(final AdmonitionBlock node, final NodeRendererContext contex
       case "danger":
       case "warning":
       case "trouble":
-        atts.add("type", type);
+        atts.add("type", type.toLowerCase());
         break;
       default:
         atts.add("type", "other").add("othertype", type);
diff --git a/src/main/resources/dita2markdownImpl.xsl b/src/main/resources/dita2markdownImpl.xsl
index 265f6b0..9aacea5 100644
--- a/src/main/resources/dita2markdownImpl.xsl
+++ b/src/main/resources/dita2markdownImpl.xsl
@@ -489,12 +489,14 @@
       <xsl:call-template name="setidaname"/>
       <!-- Normal flags go before the generated title; revision flags only go on the content. -->
       <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]/prop" mode="ditaval-outputflag"/>
-      <xsl:call-template name="getVariable">
-        <xsl:with-param name="id" select="'Caution'"/>
-      </xsl:call-template>
-      <xsl:call-template name="getVariable">
-        <xsl:with-param name="id" select="'ColonSymbol'"/>
-      </xsl:call-template>
+      <strong>
+        <xsl:call-template name="getVariable">
+          <xsl:with-param name="id" select="'Caution'"/>
+        </xsl:call-template>
+        <xsl:call-template name="getVariable">
+          <xsl:with-param name="id" select="'ColonSymbol'"/>
+        </xsl:call-template>
+      </strong>
     </div>
     <div>
       <xsl:call-template name="commonattributes">
@@ -514,9 +516,11 @@
      <xsl:call-template name="setidaname"/>
      <!-- Normal flags go before the generated title; revision flags only go on the content. -->
      <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]/prop" mode="ditaval-outputflag"/>
-     <xsl:call-template name="getVariable">
-       <xsl:with-param name="id" select="'Danger'"/>
-     </xsl:call-template>
+     <strong>
+       <xsl:call-template name="getVariable">
+         <xsl:with-param name="id" select="'Danger'"/>
+       </xsl:call-template>
+     </strong>
    </div>
    <div>
      <xsl:call-template name="commonattributes">
diff --git a/src/test/resources/dita/admonition.dita b/src/test/resources/dita/admonition.dita
index 8600b18..3a98695 100644
--- a/src/test/resources/dita/admonition.dita
+++ b/src/test/resources/dita/admonition.dita
@@ -64,6 +64,9 @@
     <note class="- topic/note " type="trouble">
       <p class="- topic/p ">block content</p>
     </note>
+    <note class="- topic/note " type="caution">
+      <p class="- topic/p ">Uppercase type</p>
+    </note>
     <ol class="- topic/ol ">
       <li class="- topic/li ">
         List item
diff --git a/src/test/resources/markdown/admonition.md b/src/test/resources/markdown/admonition.md
index b40f5cb..beb5cff 100644
--- a/src/test/resources/markdown/admonition.md
+++ b/src/test/resources/markdown/admonition.md
@@ -64,6 +64,9 @@ Open by default
 !!! trouble ""
     block content
 
+!!! CAUTION
+    Uppercase type
+
 1. List item
    !!! note
    block content
diff --git a/src/test/resources/output/ast/admonition.xml b/src/test/resources/output/ast/admonition.xml
index f333803..96e1b1d 100644
--- a/src/test/resources/output/ast/admonition.xml
+++ b/src/test/resources/output/ast/admonition.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><pandoc><div><header id="admonition" level="1">Admonition</header><div><para>Block-Styled Side Content</para><div class="note"><para><strong>qualifier:</strong></para><para>Optional Title</para><para>block content</para><para>block content</para></div><para>No-Heading Content</para><div class="note"><para><strong>qualifier:</strong></para><para>block content</para></div><div class="note"><para><strong>qualifier:</strong></para><para>block content</para></div><para>Collapsible Block-Styled Side Content:</para><para>Collapsed by default</para><div class="note"><para><strong>qualifier:</strong></para><para>Optional Title</para><para>block content</para></div><para>Open by default</para><div class="note"><para><strong>qualifier:</strong></para><para>Optional Title</para><para>block content</para></div><div class="note"><para><strong>Note:</strong></para><para>block content</para></div><div class="tip"><para><strong>Tip:</strong></para><para>block content</para></div><div class="fastpath"><para><strong>Fastpath:</strong></para><para>block content</para></div><div class="restriction"><para><strong>Restriction:</strong></para><para>block content</para></div><div class="important"><para><strong>Important:</strong></para><para>block content</para></div><div class="remember"><para><strong>Remember:</strong></para><para>block content</para></div><div class="attention"><para><strong>Attention:</strong></para><para>block content</para></div><div class="cautiontitle"><para>Caution:</para></div><div class="caution"><para>block content</para></div><div class="note"><para><strong>Note:</strong></para><para>block content</para></div><div class="dangertitle"><para>Danger</para></div><div class="danger"><para>block content</para></div><div class="warning"><para><strong>Warning:</strong></para><para>block content</para></div><div class="trouble"><para><strong>Trouble:</strong></para><para>block content</para></div><orderedlist><li><plain>List item</plain><div class="note"><para><strong>Note:</strong></para><para>block content</para></div></li></orderedlist></div></div></pandoc>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><pandoc><div><header id="admonition" level="1">Admonition</header><div><para>Block-Styled Side Content</para><div class="note"><para><strong>qualifier:</strong></para><para>Optional Title</para><para>block content</para><para>block content</para></div><para>No-Heading Content</para><div class="note"><para><strong>qualifier:</strong></para><para>block content</para></div><div class="note"><para><strong>qualifier:</strong></para><para>block content</para></div><para>Collapsible Block-Styled Side Content:</para><para>Collapsed by default</para><div class="note"><para><strong>qualifier:</strong></para><para>Optional Title</para><para>block content</para></div><para>Open by default</para><div class="note"><para><strong>qualifier:</strong></para><para>Optional Title</para><para>block content</para></div><div class="note"><para><strong>Note:</strong></para><para>block content</para></div><div class="tip"><para><strong>Tip:</strong></para><para>block content</para></div><div class="fastpath"><para><strong>Fastpath:</strong></para><para>block content</para></div><div class="restriction"><para><strong>Restriction:</strong></para><para>block content</para></div><div class="important"><para><strong>Important:</strong></para><para>block content</para></div><div class="remember"><para><strong>Remember:</strong></para><para>block content</para></div><div class="attention"><para><strong>Attention:</strong></para><para>block content</para></div><div class="cautiontitle"><para><strong>Caution:</strong></para></div><div class="caution"><para>block content</para></div><div class="note"><para><strong>Note:</strong></para><para>block content</para></div><div class="dangertitle"><para><strong>Danger</strong></para></div><div class="danger"><para>block content</para></div><div class="warning"><para><strong>Warning:</strong></para><para>block content</para></div><div class="trouble"><para><strong>Trouble:</strong></para><para>block content</para></div><div class="cautiontitle"><para><strong>Caution:</strong></para></div><div class="caution"><para>Uppercase type</para></div><orderedlist><li><plain>List item</plain><div class="note"><para><strong>Note:</strong></para><para>block content</para></div></li></orderedlist></div></div></pandoc>
\ No newline at end of file
diff --git a/src/test/resources/output/ast/note.xml b/src/test/resources/output/ast/note.xml
index f234a3d..21f54fb 100644
--- a/src/test/resources/output/ast/note.xml
+++ b/src/test/resources/output/ast/note.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><pandoc><div><header id="note" level="1">Note</header><div><div class="note"><para><strong>Note:</strong> Note</para></div><div class="cautiontitle"><para>Caution:</para></div><div class="caution"><para>Caution</para></div><div class="dangertitle"><para>Danger</para></div><div class="danger"><para>Danger</para></div><div class="note"><para><strong>Note:</strong> Note</para></div><div class="note"><para><strong>Note:</strong> Notice</para></div><div class="trouble"><para><strong>Trouble:</strong> Trouble</para></div><div class="warning"><para><strong>Warning:</strong> Warning</para></div></div></div></pandoc>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><pandoc><div><header id="note" level="1">Note</header><div><div class="note"><para><strong>Note:</strong> Note</para></div><div class="cautiontitle"><para><strong>Caution:</strong></para></div><div class="caution"><para>Caution</para></div><div class="dangertitle"><para><strong>Danger</strong></para></div><div class="danger"><para>Danger</para></div><div class="note"><para><strong>Note:</strong> Note</para></div><div class="note"><para><strong>Note:</strong> Notice</para></div><div class="trouble"><para><strong>Trouble:</strong> Trouble</para></div><div class="warning"><para><strong>Warning:</strong> Warning</para></div></div></div></pandoc>
\ No newline at end of file
diff --git a/src/test/resources/output/markdown/admonition.md b/src/test/resources/output/markdown/admonition.md
index 158354d..63e74f2 100644
--- a/src/test/resources/output/markdown/admonition.md
+++ b/src/test/resources/output/markdown/admonition.md
@@ -66,7 +66,7 @@ block content
 
 block content
 
-Caution:
+**Caution:**
 
 block content
 
@@ -74,7 +74,7 @@ block content
 
 block content
 
-Danger
+**Danger**
 
 block content
 
@@ -86,6 +86,10 @@ block content
 
 block content
 
+**Caution:**
+
+Uppercase type
+
 1.  List item
 
     **Note:**
diff --git a/src/test/resources/output/markdown/note.md b/src/test/resources/output/markdown/note.md
index 6a75137..0588083 100644
--- a/src/test/resources/output/markdown/note.md
+++ b/src/test/resources/output/markdown/note.md
@@ -2,11 +2,11 @@
 
 **Note:** Note
 
-Caution:
+**Caution:**
 
 Caution
 
-Danger
+**Danger**
 
 Danger