diff --git a/static/assets/css/overrides.css b/static/assets/css/overrides.css
index f066466..0569f34 100644
--- a/static/assets/css/overrides.css
+++ b/static/assets/css/overrides.css
@@ -20,15 +20,6 @@
     }
 }
 
-@font-face {
-  font-family: 'Kode Mono Variable';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400 700;
-  src: url(https://cdn.jsdelivr.net/fontsource/fonts/kode-mono:vf@latest/latin-wght-normal.woff2) format('woff2-variations');
-  unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
-}
-
 @font-face {
   font-family: 'Fira Mono';
   font-style: normal;
@@ -47,6 +38,15 @@
     unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
 }
 
+@font-face {
+  font-family: 'Maven Pro';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400 900;
+  src: url(https://cdn.jsdelivr.net/fontsource/fonts/maven-pro:vf@latest/latin-wght-normal.woff2) format('woff2-variations');
+  unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
+}
+
 html {
     font-family: "Libre Baskerville";
 }
@@ -69,3 +69,26 @@ pre span
 {
     font-family: "Fira Mono";
 }
+
+article.poema {
+    border: none;
+    line-height: 1.8em;
+}
+
+.poema time {
+    font-size: 0.8em;
+    filter: opacity(0.5);
+}
+
+.poesia time {
+    font-family: "Maven Pro";
+    font-size: 0.8em;
+}
+
+.poesia ul {
+    list-style-type: none;
+}
+
+.poesia li {
+    margin-bottom: 0.25em;
+}
diff --git a/templates/poema.html b/templates/poema.html
index e9e101a..7461546 100644
--- a/templates/poema.html
+++ b/templates/poema.html
@@ -1,13 +1,11 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h1 class="title">
-  {{ page.title }}
-</h1>
-<p class="subtitle">
-    <strong>
+<article class="poema">
+    <h1 class="title">{{ page.title }}</h1>
+    <time>
         {{ page.date | date(format="%A, %e de %B de %Y", locale="pt_BR") }}
-    </strong>
-</p>
-{{ page.content | safe }}
+    </time>
+    {{ page.content | safe }}
+</article>
 {% endblock content %}
diff --git a/templates/poesia.html b/templates/poesia.html
index f4540be..df3c36b 100644
--- a/templates/poesia.html
+++ b/templates/poesia.html
@@ -1,20 +1,22 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h1 class="title">
-  {{ section.title }}
-</h1>
-<ul>
-  {% for page in section.pages %}
-  <li>
-      <span class="mono">
-      {{ page.date | date(format="%d/%m/%y", locale="pt_BR")  }}
-      &mdash;
-      </span>
-      <a href="{{ page.permalink | safe }}">
-          {{ page.title | default(value="Sem título") }}
-      </a>
-  </li>
-  {% endfor %}
-</ul>
+<div class="poesia">
+    <h1 class="title">
+        {{ section.title }}
+    </h1>
+    <ul>
+        {% for page in section.pages %}
+        <li>
+            <time>
+                {{ page.date | date(format="%d/%m/%y", locale="pt_BR")  }}
+            </time>
+            &mdash;
+            <a href="{{ page.permalink | safe }}">
+                {{ page.title | default(value="Sem título") }}
+            </a>
+        </li>
+        {% endfor %}
+    </ul>
+</div>
 {% endblock content %}