diff --git a/static/stylesheet/style.less b/static/stylesheet/style.less
index f5c82fb..67aa52a 100644
--- a/static/stylesheet/style.less
+++ b/static/stylesheet/style.less
@@ -581,7 +581,7 @@ div.admonition {
   }
 
   p, div {
-    border-radius: 4px;
+    border-radius: 0 0 4px 4px;
     padding: 1.25em 1.25em 0 1.25em;
     margin-top: -1.25em;
     margin-bottom: 0;
@@ -593,11 +593,6 @@ div.admonition {
 }
 
 div.admonition.attention {
-  p.admonition-title {
-    color: @admonition-attention-title-color;
-    background-color: @admonition-attention-title-bg-color;
-  }
-
   p, div {
     color: @admonition-attention-color;
     background-color: @admonition-attention-bg-color;
@@ -605,11 +600,6 @@ div.admonition.attention {
 }
 
 div.admonition.caution {
-  p.admonition-title {
-    color: @admonition-caution-title-color;
-    background-color: @admonition-caution-title-bg-color;
-  }
-
   p, div {
     color: @admonition-caution-color;
     background-color: @admonition-caution-bg-color;
@@ -617,11 +607,6 @@ div.admonition.caution {
 }
 
 div.admonition.danger {
-  p.admonition-title {
-    color: @admonition-danger-title-color;
-    background-color: @admonition-danger-title-bg-color;
-  }
-
   p, div {
     color: @admonition-danger-color;
     background-color: @admonition-danger-bg-color;
@@ -629,11 +614,6 @@ div.admonition.danger {
 }
 
 div.admonition.error {
-  p.admonition-title {
-    color: @admonition-error-title-color;
-    background-color: @admonition-error-title-bg-color;
-  }
-
   p, div {
     color: @admonition-error-color;
     background-color: @admonition-error-bg-color;
@@ -641,11 +621,6 @@ div.admonition.error {
 }
 
 div.admonition.hint {
-  p.admonition-title {
-    color: @admonition-hint-title-color;
-    background-color: @admonition-hint-title-bg-color;
-  }
-
   p, div {
     color: @admonition-hint-color;
     background-color: @admonition-hint-bg-color;
@@ -653,11 +628,6 @@ div.admonition.hint {
 }
 
 div.admonition.important {
-  p.admonition-title {
-    color: @admonition-important-title-color;
-    background-color: @admonition-important-title-bg-color;
-  }
-
   p, div {
     color: @admonition-important-color;
     background-color: @admonition-important-bg-color;
@@ -665,11 +635,6 @@ div.admonition.important {
 }
 
 div.admonition.note {
-  p.admonition-title {
-    color: @admonition-note-title-color;
-    background-color: @admonition-note-title-bg-color;
-  }
-
   p, div {
     color: @admonition-note-color;
     background-color: @admonition-note-bg-color;
@@ -677,13 +642,15 @@ div.admonition.note {
 }
 
 div.admonition.tip {
-  p.admonition-title {
-    color: @admonition-tip-title-color;
-    background-color: @admonition-tip-title-bg-color;
-  }
-
   p, div {
     color: @admonition-tip-color;
     background-color: @admonition-tip-bg-color;
   }
-}
\ No newline at end of file
+}
+
+div.admonition.warning {
+  p, div {
+    color: @admonition-warning-color;
+    background-color: @admonition-warning-bg-color;
+  }
+}
diff --git a/static/stylesheet/variables.less b/static/stylesheet/variables.less
index 33f1584..d779aa7 100644
--- a/static/stylesheet/variables.less
+++ b/static/stylesheet/variables.less
@@ -74,42 +74,29 @@
 @lastfm-bg-color: #d92323;
 
 // Admonition colors
-@admonition-attention-title-color: @white;
-@admonition-attention-title-bg-color: #f14668;
-@admonition-attention-color: #ff3860;
-@admonition-attention-bg-color: #feecf0;
+@admonition-attention-color: #856404;
+@admonition-attention-bg-color: #fff3cd;
 
-@admonition-caution-title-bg-color: #ffdd57;
-@admonition-caution-title-color: #4f451b;
-@admonition-caution-bg-color: #fffbeb;
-@admonition-caution-color: #947600;
+@admonition-caution-color: @admonition-attention-color;
+@admonition-caution-bg-color: @admonition-attention-bg-color;
 
-@admonition-danger-title-color: @white;
-@admonition-danger-title-bg-color: @admonition-attention-title-bg-color;
-@admonition-danger-color: @admonition-attention-color;
-@admonition-danger-bg-color: @admonition-attention-bg-color;
+@admonition-warning-color: @admonition-attention-color;
+@admonition-warning-bg-color: @admonition-attention-bg-color;
 
-@admonition-error-title-color: @white;
-@admonition-error-title-bg-color: @admonition-attention-title-bg-color;
-@admonition-error-color: @admonition-attention-color;
-@admonition-error-bg-color: @admonition-attention-bg-color;
+@admonition-danger-color: #721c24;
+@admonition-danger-bg-color: #f8d7da;
 
-@admonition-hint-title-color: @white;
-@admonition-hint-title-bg-color: #363636;
-@admonition-hint-color: #4a4a4a ;
-@admonition-hint-bg-color: #fafafa;
+@admonition-error-color: @admonition-danger-color;
+@admonition-error-bg-color: @admonition-danger-bg-color;
 
-@admonition-important-title-bg-color: @admonition-caution-title-bg-color;
-@admonition-important-title-color: @admonition-caution-title-color;
-@admonition-important-bg-color: @admonition-caution-bg-color;
-@admonition-important-color: @admonition-caution-color;
+@admonition-hint-color: #004085 ;
+@admonition-hint-bg-color: #cce5ff;
 
-@admonition-note-title-color: @white;
-@admonition-note-title-bg-color: #3298dc;
-@admonition-note-color: #1d72aa;
-@admonition-note-bg-color: #eef6fc;
-
-@admonition-tip-title-color: @admonition-note-title-color;
-@admonition-tip-title-bg-color: @admonition-note-title-bg-color;
 @admonition-tip-color: @admonition-note-color;
 @admonition-tip-bg-color: @admonition-note-bg-color;
+
+@admonition-important-color: #155724;
+@admonition-important-bg-color: #d4edda;
+
+@admonition-note-color: @admonition-important-color;
+@admonition-note-bg-color: @admonition-important-bg-color;