diff --git a/assets/css/style.scss b/assets/css/style.scss
index d2d3965..030d00a 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -59,9 +59,10 @@ header {
 		margin-top: 0;
 		margin-bottom: 0;
 	}
-	h1 a {
-		text-decoration: none;
-	}
+}
+
+h1 a, h2 a {
+	text-decoration: none;
 }
 
 img {
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 48a0641..c062ecc 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,5 +1,9 @@
 <article class="h-entry border-bottom">
-	{{ with .Title }}<h2 class="p-name">{{ . }}</h2>{{ end }}
+	{{ if .Title }}
+	<h2 class="p-name">
+		<a class="u-url" href="{{ .RelPermalink }}">{{ .Title }}</a>
+	</h2>
+	{{ end }}
 	{{ if not .Params.nometa }}
 	{{ partialCached "summary_meta" . .Permalink }}
 	{{ end }}
diff --git a/layouts/partials/oldcontentwarning.html b/layouts/partials/oldcontentwarning.html
index e575557..fa9907a 100644
--- a/layouts/partials/oldcontentwarning.html
+++ b/layouts/partials/oldcontentwarning.html
@@ -1,7 +1,7 @@
 {{ if .Param "oldcontentwarning" }}
 {{ if .Date }}
 {{ if (.Date.AddDate 1 0 0).Before now }}
-<p class="border-top border-bottom"><b>{{ ":warning:" | emojify }} {{ T "oldcontent" }}</b></p>
+<strong class="fake-p border-top border-bottom">{{ ":warning:" | emojify }} {{ T "oldcontent" }}</strong>
 {{ end }}
 {{ end }}
 {{ end }}
\ No newline at end of file