diff --git a/Shared/Resources/Sepia.nnwtheme/stylesheet.css b/Shared/Resources/Sepia.nnwtheme/stylesheet.css
index b0c81d1d0..3f88f177d 100644
--- a/Shared/Resources/Sepia.nnwtheme/stylesheet.css
+++ b/Shared/Resources/Sepia.nnwtheme/stylesheet.css
@@ -3,24 +3,26 @@
 body {
 	margin-left: auto;
 	margin-right: auto;
-	
 	word-wrap: break-word;
 	max-width: 44em;
-	background-color: #FBF0D9;
-	color: #704214;
+	background-color: rgb(248, 241, 227);
+	color: rgb(79, 50, 28);
 }
 
+a {
+	text-decoration: none;
+}
 a:hover {
-	text-decoration: underline;
+	text-shadow: 0 1px rgba(255, 255, 255, 2);
+	opacity: 0.8;
 }
 
 .feedlink {
-	font-weight: bold;
 }
-
-.headerTable {
-	width: 100%;
-	height: 68px;
+#nnwImageIcon {
+	width: 32px;
+	height: 32px;
+	margin-right: 0.2em;
 }
 
 .systemMessage {
@@ -37,34 +39,48 @@ a:hover {
 	--header-color: rgba(0, 0, 0, 0.5);
 	--body-code-color: #704214;
 	--system-message-color: #704214;
-	--feedlink-color: rgba(255, 0, 0, 0.6);
+	--feedlink-color: #704214;
 	--article-title-color: #704214;
 	--article-date-color: rgba(0, 0, 0, 0.5);
 	--table-cell-border-color: lightgray;
-	--primary-accent-color: #43350E;
-	--secondary-accent-color: #43350E;
+	--primary-accent-color: #43350e;
+	--secondary-accent-color: #43350e;
 	--block-quote-border-color: rgba(0, 0, 0, 0.3);
 }
 
-body a, body a:visited, body a * {
+body a,
+body a:visited,
+body a * {
 	color: var(--secondary-accent-color);
 }
 
-
-body .headerTable {
+body > header {
 	border-bottom: 1px solid var(--header-table-border-color);
-	color: var(--header-color);
+	padding-bottom: 0.5rem;
 }
 
-body .header {
+body > header a,
+body > header a:link,
+body > header a:visited {
 	color: var(--header-color);
 }
-
-body .header a:link, .header a:visited {
+body > header .headerTable {
+	width: 100%;
+}
+body > header .headerTable td,
+body > header .headerTable th {
 	color: var(--header-color);
+	padding: 0.2em;
+	border: none;
+	font-family: sans-serif;
+	font-size: 0.9rem;
+}
+body > header .headerTable td.avatar {
+	width: 33%;
 }
 
-body code, body pre {
+body code,
+body pre {
 	color: var(--body-code-color);
 }
 
@@ -72,15 +88,11 @@ body > .systemMessage {
 	color: var(--system-message-color);
 }
 
-.headerContainer a:link, .headerContainer a:visited {
-	text-decoration: none;
+.headerContainer a:link,
+.headerContainer a:visited {
 	color: var(--feedlink-color);
 }
 
-.headerContainer a:hover {
-	text-decoration: underline;
-}
-
 .avatar img {
 	border-radius: 4px;
 }
@@ -97,44 +109,35 @@ body > .systemMessage {
 	text-align: start;
 }
 
-.articleTitle a:link, .articleTitle a:visited {
+.articleTitle a:link,
+.articleTitle a:visited {
 	text-decoration: none;
 	color: var(--article-title-color);
 	margin-top: 26px;
 }
 
-.articleTitle a:hover {
-	text-decoration: underline;
-}
-
 .articleDateline {
 	margin-bottom: 5px;
 	font-weight: bold;
 }
 
-.articleDateline a:link, .articleDateline a:visited {
+.articleDateline a:link,
+.articleDateline a:visited {
 	text-decoration: none;
 	color: var(--article-date-color);
 }
 
-.articleDateline a:hover {
-	text-decoration: underline;
-}
-
 .articleDatelineTitle {
 	margin-bottom: 5px;
 	font-weight: bold;
 }
 
-.articleDatelineTitle a:link, .articleDatelineTitle a:visited {
+.articleDatelineTitle a:link,
+.articleDatelineTitle a:visited {
 	text-decoration: none;
 	color: var(--article-title-color);
 }
 
-.articleDatelineTitle a:hover {
-	text-decoration: underline;
-}
-
 .externalLink {
 	margin-bottom: 5px;
 	font-style: italic;
@@ -144,14 +147,11 @@ body > .systemMessage {
 	text-overflow: ellipsis;
 }
 
-.externalLink a:link, .externalLink a:visited {
+.externalLink a:link,
+.externalLink a:visited {
 	text-decoration: none;
 }
 
-.externalLink a:hover {
-	text-decoration: underline;
-}
-
 .articleBody {
 	margin-top: 20px;
 	line-height: 1.6em;
@@ -177,17 +177,14 @@ pre {
 	line-height: 1.4286em;
 }
 
-code, pre {
+code,
+pre {
 	font-family: "SF Mono", Menlo, "Courier New", Courier, monospace;
-	font-size: 1em;
+	font-size: 0.85rem;
+	letter-spacing: -0.027em;
 	-webkit-hyphens: none;
 }
 
-pre code {
-	letter-spacing: -.027em;
-	font-size: 0.9375em;
-}
-
 .nnw-overflow {
 	overflow-x: auto;
 }
@@ -209,7 +206,8 @@ pre code {
 	border: none;
 }
 
-.nnw-overflow td, .nnw-overflow th {
+.nnw-overflow td,
+.nnw-overflow th {
 	-webkit-hyphens: none;
 	word-break: normal;
 	border: 1px solid var(--table-cell-border-color);
@@ -222,7 +220,10 @@ pre code {
 	border-right: none;
 }
 
-.nnw-overflow :matches(thead, tbody, tfoot):last-child > tr:last-child :matches(td, th) {
+.nnw-overflow
+	:matches(thead, tbody, tfoot):last-child
+	> tr:last-child
+	:matches(td, th) {
 	border-bottom: none;
 }
 
@@ -235,16 +236,16 @@ pre code {
 	border-width: 0;
 }
 
-img, figure, video, div, object {
+img,
+figure,
+video,
+div,
+object {
 	max-width: 100%;
 	height: auto !important;
 	margin: 0 auto;
 }
 
-video {
-	width: 100% !important;
-}
-
 iframe {
 	max-width: 100%;
 	margin: 0 auto;
@@ -340,12 +341,12 @@ blockquote {
 }
 
 .newsfoot-footnote-popover-arrow {
-	background: #FBF0D9;
+	background: #fbf0d9;
 	border: 1px solid #ccc;
 }
 
 .newsfoot-footnote-popover-inner {
-	background: #FBF0D9;
+	background: #fbf0d9;
 }
 
 body a.footnote,
@@ -364,7 +365,6 @@ a.footnote:hover,
 
 /* iOS Specific */
 @supports (-webkit-touch-callout: none) {
-	
 	body {
 		margin-top: 3px;
 		margin-bottom: 20px;
@@ -374,7 +374,7 @@ a.footnote:hover,
 		word-break: break-word;
 		-webkit-hyphens: auto;
 		-webkit-text-size-adjust: none;
-		font: Georgia;
+		font-family: Charter, Georgia, sans-serif;
 		font-size: [[font-size]]px;
 	}
 
@@ -386,18 +386,16 @@ a.footnote:hover,
 	.nnw-overflow table {
 		border: 1px solid var(--secondary-accent-color);
 	}
-
 }
 
 /* macOS Specific */
 @supports not (-webkit-touch-callout: none) {
-	
 	body {
 		margin-top: 20px;
 		margin-bottom: 64px;
 		padding-left: 48px;
 		padding-right: 48px;
-		font-family: Georgia;
+		font-family: Charter, Georgia, sans-serif;
 	}
 
 	.smallText {
@@ -428,5 +426,4 @@ a.footnote:hover,
 	.nnw-overflow table {
 		border: 1px solid var(--primary-accent-color);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/Shared/Resources/Sepia.nnwtheme/template.html b/Shared/Resources/Sepia.nnwtheme/template.html
index 2b6461013..d77e90199 100644
--- a/Shared/Resources/Sepia.nnwtheme/template.html
+++ b/Shared/Resources/Sepia.nnwtheme/template.html
@@ -1,8 +1,8 @@
 <header class="headerContainer">
-	<table cellpadding=0 cellspacing=0 border=0 class="headerTable">
+	<table class="headerTable"> 
 	<tr>
-		<td class="header leftAlign"><a class="feedlink" href="[[feed_link]]">[[feed_link_title]]</a><br />[[byline]]</td>
-		<td class="header rightAlign avatar"><img id="nnwImageIcon" src="[[avatar_src]]" height=48 width=48 /></td>
+		<td class="leftAlign"><a class="feedlink" href="[[feed_link]]">[[feed_link_title]]</a><br />[[byline]]</td>
+		<td class="rightAlign avatar"><img id="nnwImageIcon" src="[[avatar_src]]" /></td>
 	</tr>
 	</table>
 </header>