diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2cce0ff8..22d77b79 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,7 +4,7 @@
   "editor.detectIndentation": true,
   "files.encoding": "utf8",
   "files.eol": "\n",
-  "files.insertFinalNewline": true,
+  // "files.insertFinalNewline": true,
   "scss.lint.important": "ignore",
   "scss.lint.universalSelector": "ignore",
   "[markdown]": {
diff --git a/assets/sass/pages/_notes.scss b/assets/sass/pages/_notes.scss
index a7452508..e4f5a413 100644
--- a/assets/sass/pages/_notes.scss
+++ b/assets/sass/pages/_notes.scss
@@ -192,7 +192,7 @@ body#notes {
           }
         }
 
-        twitter-widget {
+        iframe.twitter-tweet, twitter-widget {
           margin: 0 auto;
           display: block;
         }
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d7daa26f..62366a27 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,9 +1,9 @@
 {{ partial "header.html" . }}
 {{ partial "blog-header.html" . }}
     <main id="single">
-      <article itemscope itemtype="http://schema.org/Article" class="h-entry">
+      <article itemscope itemtype="http://schema.org/BlogPosting" class="h-entry">
         <div id="info">
-          <h1 itemprop="name" class="p-name"><a href="{{ .Permalink }}" itemprop="url" class="u-url no-underline">{{ .Title }}</a></h1>
+          <h1 itemprop="name headline" class="p-name"><a href="{{ .Permalink }}" itemprop="url" class="u-url no-underline">{{ .Title }}</a></h1>
           <div id="meta">
             by <span itemprop="author" itemscope itemtype="http://schema.org/Person" class="p-author"><a itemprop="url" rel="me author" href="{{ .Site.BaseURL }}" title="Jake Jarvis" class="h-card no-underline"><span itemprop="name" class="p-name">Jake Jarvis</span></a></span> &middot; 
             <a class="no-underline" href="{{ .Permalink }}" title="{{ .Date.Format "Mon, Jan 2 2006 3:04:05 PM MST" }}"><time itemprop="datePublished" content="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}" datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}" class="dt-published">{{ .Date.Format "January 2, 2006" }}</time></a> &middot; 
@@ -12,7 +12,7 @@
             <a class="no-underline" href="{{ .Permalink }}#commento">Comments</a>
             <div id="tags">
             {{ with .Params.tags }}{{ if ge (len .) 1 }}
-              {{ range . }}<span class="tag p-category"><!--<a href="{{ $.Site.BaseURL }}tags/{{ . | urlize }}">-->{{ . }}<!--</a>--></span>
+              {{ range . }}<span itemprop="keywords" class="tag p-category"><!--<a href="{{ $.Site.BaseURL }}tags/{{ . | urlize }}">-->{{ . }}<!--</a>--></span>
               {{ end }}
             {{ end }}{{ end }}
             </div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index fe0a166d..efea5e44 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -8,7 +8,6 @@
     <meta name="description" content="{{ if .Description }}{{ .Description }}{{ else }}{{ .Site.Params.description }}{{ end }}">
     <meta name="author" content="Jake Jarvis">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta property="og:title" content="{{ .Title }}">
     <meta property="og:site_name" content="{{ .Site.Title }}">
     <meta property="og:type" content="{{ if .IsHome }}website{{ else }}article{{ end }}">
@@ -18,30 +17,23 @@
     <meta property="og:image" content="{{ if .Params.image }}{{ .Permalink }}images/{{ .Params.image }}{{ else }}{{ "me.jpg" | absURL }}{{ end }}">
     <meta property="fb:admins" content="1329090853">
     <meta property="fb:app_id" content="3357248167622283">
-    <meta property="twitter:account_id" content="229769022">
     <meta name="twitter:card" content="summary">
+    <meta name="twitter:domain" content="jarv.is">
     <meta name="twitter:site" content="@jakejarvis">
     <meta name="twitter:creator" content="@jakejarvis">
-    <meta name="twitter:title" content="{{ .Title }}">
-    <meta name="twitter:url" content="{{ .Permalink }}">
-    <meta name="twitter:description" content="{{ if .Description }}{{ .Description }}{{ else }}{{ .Site.Params.description }}{{ end }}">
-    <meta name="twitter:image" content="{{ if .Params.image }}{{ .Permalink }}images/{{ .Params.image }}{{ else }}{{ "me.jpg" | absURL }}{{ end }}">
-    <meta name="google-site-verification" content="qQhmLTwjNWYgQ7W42nSTq63xIrTch13X_11mmxBE9zk">
-    <meta name="msvalidate.01" content="164551986DA47F7F6FC0D21A93FFFCA6">
-    <meta name="p:domain_verify" content="e8aefab89c04734260da89b6ff26fd5b">
-    <meta name="yandex-verification" content="7432e013ad0164ab">
+    <meta name="twitter:dnt" content="on">
+    <meta name="twitter:widgets:csp" content="on">
+    <link rel="canonical" href="{{ .Permalink }}">
+    <link rel="alternate" type="application/rss+xml" href="{{ "index.xml" | absURL }}" title="{{ .Site.Title }} (RSS)">
     {{ $style := resources.Get "sass/main.scss" | resources.ToCSS (dict "targetPath" "style.css" "outputStyle" "compact") }}<link rel="stylesheet" href="{{ $style.Permalink }}">
+    <link rel="apple-touch-icon" href="{{ "apple-touch-icon.png" | absURL }}">
+    <link rel="icon" href="{{ "favicon-192.png" | absURL }}" sizes="192x192">
+    <link rel="icon" href="{{ "favicon-48.png" | absURL }}" sizes="48x48">
+    <link rel="icon" href="{{ "favicon-32.png" | absURL }}" sizes="32x32">
+    <link rel="icon" href="{{ "favicon-16.png" | absURL }}" sizes="16x16">
+    <link rel="shortcut icon" href="{{ "favicon.ico" | absURL }}">
     <link rel="dns-prefetch" href="https://stats.jarv.is">
     <link rel="dns-prefetch" href="https://comments.jarv.is">
-    <link rel="canonical" href="{{ .Permalink }}">
-    <link rel="alternate" type="application/rss+xml" href="{{ "index.xml" | absURL }}" title="{{ .Site.Title }}">
-    <link rel="icon" type="image/png" href="{{ "favicon-128.png" | absURL }}" sizes="128x128">
-    <link rel="icon" type="image/png" href="{{ "favicon-96.png" | absURL }}" sizes="96x96">
-    <link rel="icon" type="image/png" href="{{ "favicon-64.png" | absURL }}" sizes="64x64">
-    <link rel="icon" type="image/png" href="{{ "favicon-48.png" | absURL }}" sizes="48x48">
-    <link rel="icon" type="image/png" href="{{ "favicon-32.png" | absURL }}" sizes="32x32">
-    <link rel="icon" type="image/png" href="{{ "favicon-16.png" | absURL }}" sizes="16x16">
-    <link rel="shortcut icon" href="{{ "favicon.ico" | absURL }}">
     <link rel="author" href="{{ "humans.txt" | absURL }}">
   </head>
   <body id="{{ .Type }}">
\ No newline at end of file
diff --git a/static/apple-touch-icon.png b/static/apple-touch-icon.png
new file mode 100644
index 00000000..7af4416f
Binary files /dev/null and b/static/apple-touch-icon.png differ
diff --git a/static/favicon-152.png b/static/favicon-152.png
new file mode 100644
index 00000000..548f3b20
Binary files /dev/null and b/static/favicon-152.png differ
diff --git a/static/favicon-180.png b/static/favicon-180.png
new file mode 100644
index 00000000..91505b1e
Binary files /dev/null and b/static/favicon-180.png differ
diff --git a/static/favicon-192.png b/static/favicon-192.png
new file mode 100644
index 00000000..0ba0efa0
Binary files /dev/null and b/static/favicon-192.png differ
diff --git a/static/favicon.ico b/static/favicon.ico
index 40207809..54381e39 100644
Binary files a/static/favicon.ico and b/static/favicon.ico differ