diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 2120c916..00000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/img/favicon.png b/public/img/favicon.png
new file mode 100644
index 00000000..3a827054
Binary files /dev/null and b/public/img/favicon.png differ
diff --git a/public/img/plaincat.svg b/public/img/plaincat.svg
new file mode 100644
index 00000000..ae61f206
--- /dev/null
+++ b/public/img/plaincat.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 154 145"
+   width="154.0pt"
+   height="145.0pt"
+   id="svg93"
+   sodipodi:docname="plaincat.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs97" />
+  <sodipodi:namedview
+     id="namedview95"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="pt"
+     showgrid="false"
+     inkscape:zoom="3.0181034"
+     inkscape:cx="205.59269"
+     inkscape:cy="114.8072"
+     inkscape:window-width="2490"
+     inkscape:window-height="1376"
+     inkscape:window-x="70"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg93" />
+  <path
+     d="m 112.83494,2.7962244 c 5.31573,0.7723715 8.39385,4.7591726 11.41519,8.7686886 5.72463,6.621952 9.90454,14.629628 13.80046,22.501003 4.67967,11.914969 11.11988,24.409214 12.68735,37.141988 1.71512,11.108521 2.95318,23.886729 -1.79463,34.438686 -3.63468,8.01904 -9.87046,12.18757 -15.77683,18.28703 -4.14582,3.78235 -9.30253,6.53108 -14.62962,8.21213 -6.29256,2.12403 -12.66463,4.15717 -19.127567,5.64513 -11.222101,1.88549 -21.637759,4.54336 -33.143824,2.74873 C 55.804377,138.65412 44.082501,136.08711 34.9617,130.41927 26.976741,123.54744 21.081729,114.92641 16.810968,105.33992 11.858702,98.27499 9.7346813,90.301385 6.9745879,82.236918 5.9296149,79.033847 4.430306,76.364621 4.0554777,72.957099 3.3739738,66.903069 2.7265442,60.826322 2.1472659,54.749574 2.1359072,45.617415 3.4421245,36.689709 5.3276193,27.773359 c 1.8400614,-0.601995 3.2939376,-1.385725 5.2362257,-0.522488 7.68964,3.509749 11.312973,10.801847 18.582352,14.675063 2.737376,1.601535 5.327093,3.316654 7.825942,5.270299 4.35027,-1.090405 8.382503,-2.862317 12.460173,-4.668304 C 59.030164,38.950031 68.90062,35.974128 78.725641,33.11181 84.64337,31.442124 90.629249,31.328541 96.717356,31.487559 100.05673,23.6389 103.24844,15.847033 107.1898,8.202825 c 1.36302,-2.1353791 2.74874,-5.247583 5.64514,-5.4066006 z"
+     fill="#000000"
+     id="path79"
+     style="stroke-width:1.13584" />
+  <path
+     d="m 114.47053,13.893387 c 8.18942,9.20031 14.28888,20.513282 18.52557,32.042065 2.77146,6.167613 5.31574,12.335228 7.22395,18.832236 -1.91957,2.044514 -3.81642,4.009517 -6.31527,5.338451 -1.59019,1.044973 -3.91866,1.919571 -4.49793,3.884576 -0.31804,1.953645 0.94274,3.305297 2.6465,4.009517 3.43025,-0.567922 6.74689,-1.942288 10.09763,-2.907752 0.19309,2.646508 0.49977,5.383883 0.32938,8.04175 -2.55563,2.964545 -7.82593,3.49839 -9.79094,6.746895 0.1931,4.622871 6.89456,3.70284 9.89318,2.532925 -0.11359,2.146738 -0.10221,4.372985 -0.53385,6.48565 -3.06677,9.16623 -9.46154,14.66369 -16.42425,20.87675 -3.89594,2.95318 -8.32572,4.49793 -12.94858,5.89501 4.14581,-3.94137 7.25802,-8.50744 7.86001,-14.34566 0.22717,-5.25894 0.38619,-10.54061 -4.60015,-13.6528 l -0.26125,-0.49978 -0.72692,-1.13584 c -3.05542,-2.41934 -6.5311,-4.532003 -10.2453,-5.747353 -3.37346,-0.942748 -7.178507,-0.670146 -10.65418,-0.726938 -0.726938,-4.759172 -1.544742,-9.450194 -3.112204,-14.016273 -1.385725,-3.907293 -1.226707,-8.973141 -3.487031,-12.437455 -2.192171,-1.999079 -5.679202,-2.816885 -8.450653,-3.736915 -3.884575,3.305296 -2.055871,10.25664 -0.795089,14.470609 2.703301,6.019956 6.315275,11.710516 9.711438,17.367003 -3.055412,2.737375 -6.91727,4.759172 -8.325713,8.734612 -1.431158,4.00952 -5.270299,8.4393 -4.248043,12.74413 0.511128,3.00999 1.124483,6.15627 2.373908,8.95042 2.555641,3.74828 5.985879,7.03087 9.427477,9.96134 -5.06585,0.24987 -10.120341,0.19308 -15.197548,0.19308 -5.997239,0.11359 -11.846818,-2.01044 -17.480587,-3.89593 2.907751,-2.04451 6.201689,-2.51021 7.223946,-6.20169 0.318035,-2.93047 -2.158098,-3.53246 -4.509287,-3.79371 -4.407063,0.6815 -9.064008,4.47521 -13.425637,4.69102 -3.509747,-1.73783 -6.292557,-5.27031 -9.086724,-7.96224 4.441136,-1.19262 8.734615,-2.62379 12.698698,-5.02041 1.499309,-0.88596 2.521566,-2.22626 3.248505,-3.78236 -0.193094,-3.20307 -3.21443,-4.05495 -5.929089,-3.60061 -5.065849,1.18129 -9.995398,3.02134 -14.993096,4.48657 C 26.874515,103.7611 26.13622,100.1832 24.352949,96.650738 22.56968,92.98197 20.50245,89.574447 19.355251,85.621722 17.265305,78.624944 14.823247,72.286953 14.153101,64.960781 13.142203,56.884955 12.88096,49.229388 13.414804,41.09677 c 5.145359,1.908212 9.086725,6.565159 13.61873,9.745513 2.498849,1.669685 5.33845,5.156716 8.586956,4.168535 7.825941,-1.306217 14.198007,-4.668305 21.739989,-6.724177 9.938605,-2.816885 20.058946,-4.838681 29.940757,-7.894093 4.85004,-1.70376 10.211207,-0.272602 14.902234,-1.98772 2.9759,-2.464776 4.30483,-6.656026 5.75871,-10.108982 2.05588,-4.838681 4.15716,-9.700079 6.50835,-14.402459 z"
+     fill="#f59c32"
+     id="path81"
+     style="stroke-width:1.13584" />
+  <path
+     d="m 78.998242,59.372446 c 2.771451,0.92003 6.258482,1.737836 8.450653,3.736915 2.260324,3.464314 2.101306,8.530162 3.487031,12.437455 1.567462,4.566079 2.385266,9.257101 3.112204,14.016273 3.475673,0.05679 7.28072,-0.21581 10.65418,0.726938 3.7142,1.21535 7.18988,3.328013 10.2453,5.747353 l 0.72692,1.13584 c -4.17989,1.10177 -8.75732,2.21488 -12.93722,0.4657 -3.452953,-1.101765 -5.917732,-3.770995 -8.655105,-6.019959 -1.238065,5.327096 -2.578359,11.029019 -6.12218,15.436079 -3.100846,3.56653 -9.631929,1.59017 -12.096702,5.33844 0.954105,1.19264 1.828703,2.57837 2.998618,3.56655 3.225788,0.42026 6.769611,-0.43162 10.029473,-0.62472 2.317114,3.33937 5.417959,5.98589 9.166239,7.57607 4.543357,1.8287 10.267997,-0.36348 12.539677,-4.66832 1.27213,-3.91865 0.28395,-8.14397 -0.90867,-11.94904 3.82777,-2.11266 6.86047,-3.54383 6.24712,-8.62102 4.98634,3.11219 4.82732,8.39386 4.60015,13.6528 -0.60199,5.83822 -3.7142,10.40429 -7.86001,14.34566 -8.12126,2.57836 -16.99218,5.98589 -25.5337,5.9291 -3.441598,-2.93047 -6.871836,-6.21306 -9.427477,-9.96134 -1.249425,-2.79415 -1.86278,-5.94043 -2.373908,-8.95042 -1.022256,-4.30483 2.816885,-8.73461 4.248043,-12.74413 1.408443,-3.97544 5.270301,-5.997237 8.325713,-8.734612 C 84.518428,85.553571 80.906454,79.863011 78.203153,73.843055 76.942371,69.629086 75.113667,62.677742 78.998242,59.372446 Z"
+     fill="#ffffff"
+     id="path83"
+     style="stroke-width:1.13584" />
+  <path
+     d="m 99.625105,68.833998 c 5.156715,-1.783269 7.905455,4.395703 7.178515,8.450654 -1.5561,5.111283 -10.461091,5.190792 -11.721875,-0.181735 -1.20399,-3.941367 0.885956,-6.951344 4.54336,-8.268919 z"
+     fill="#000000"
+     id="path85"
+     style="stroke-width:1.13584" />
+  <path
+     d="m 67.957871,78.272834 c 1.987722,-0.556563 4.327553,-0.715581 6.201689,0.283959 3.657407,1.476593 5.020416,7.314814 2.158099,10.120341 -2.998621,3.782348 -9.098084,3.589256 -11.540141,-0.726938 -1.033616,-3.464314 -0.36347,-7.939526 3.180353,-9.677362 z"
+     fill="#000000"
+     id="path87"
+     style="stroke-width:1.13584" />
+  <path
+     d="m 94.082205,91.618961 c 2.737373,2.248964 5.202152,4.918194 8.655105,6.019959 4.1799,1.74918 8.75733,0.63607 12.93722,-0.4657 l 0.26125,0.49978 c 0.61335,5.07719 -2.41935,6.50836 -6.24712,8.62102 1.19262,3.80507 2.1808,8.03039 0.90867,11.94904 -2.27168,4.30484 -7.99632,6.49702 -12.539677,4.66832 -3.74828,-1.59018 -6.849125,-4.2367 -9.166239,-7.57607 -3.259862,0.1931 -6.803685,1.04498 -10.029473,0.62472 -1.169915,-0.98818 -2.044513,-2.37391 -2.998618,-3.56655 2.464773,-3.74827 8.995856,-1.77191 12.096702,-5.33844 3.543821,-4.40706 4.884115,-10.108983 6.12218,-15.436079 z"
+     fill="#000000"
+     id="path89"
+     style="stroke-width:1.13584" />
+  <path
+     d="m 99.238919,103.39763 c 1.999081,1.0904 4.225331,1.81734 5.213511,4.03224 1.49931,3.07812 0.88596,7.92816 -2.94183,8.9277 -3.078124,0.28397 -5.508823,-3.18035 -7.632845,-4.98633 2.055871,-2.49887 3.691476,-5.22488 5.361164,-7.97361 z"
+     fill="#ea1d3c"
+     id="path91"
+     style="stroke-width:1.13584" />
+</svg>
diff --git a/views/_meta.erb b/views/_meta.erb
new file mode 100644
index 00000000..0586b496
--- /dev/null
+++ b/views/_meta.erb
@@ -0,0 +1,13 @@
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description"        content="Create and surf awesome websites for free.">
+
+<link rel="canonical" href="https://neocities.org<%= request.fullpath %>">
+
+<meta property="og:title"       content="Neocities">
+<meta property="og:type"        content="website">
+<meta property="og:image"       content="https://neocities.org/img/neocities-front-screenshot.jpg">
+<meta property="og:description" content="Create and surf awesome websites for free.">
+
+<link rel="icon" type="image/x-icon" href="/img/favicon.png">
+
+<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1">
\ No newline at end of file
diff --git a/views/index_layout.erb b/views/index_layout.erb
index 2a613c13..053133ce 100644
--- a/views/index_layout.erb
+++ b/views/index_layout.erb
@@ -1,34 +1,11 @@
 <!doctype html>
 <html lang="en">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <!-- <link rel="manifest" href="/manifest.json"> -->
-
   <title>Neocities: Create your own free website!</title>
-  <meta itemprop="name"         content="Neocities" />
-  <meta itemprop="description"  content="Free web hosting and tools that allow anyone to create a website. Join our community today!" />
-  <meta name="description"      content="Free web hosting and tools that allow anyone to create a website. Join our community today!" />
-  <meta name="keywords"         content="free website, free web hosting, html, css, learn to code, free hosting, build a website, create a web page, static hosting, how to make a website" />
 
-  <link rel="canonical" href="//neocities.org" />
+  <%== erb :'_meta' %>
 
-  <meta property="og:title"       content="Neocities"/>
-  <meta property="og:site_name"   content="Neocities | neocities.org"/>
-  <meta property="og:type"        content="website"/>
-  <meta property="og:image"       content="/img/neocities-front-screenshot.jpg"/>
-  <meta property="og:url"         content="https://www.neocities.org"/>
-  <meta property="og:description" content="Free web hosting and tools that allow anyone to create a website. Join our community today!"/>
-
-  <link rel="shortcut icon" type="image/ico"  href="/favicon.ico?v=4" />
-  <link rel="apple-touch-icon-precomposed"    href="#apple-icon-144.png" />
-  <link rel="apple-touch-startup-image"       href="#startup.png" />
-
-  <!-- Mobile Meta -->
-  <meta name="HandheldFriendly" content="True" />
-  <meta name="MobileOptimized"  content="320" />
-  <meta name="viewport"         content="width=device-width, minimum-scale=1, initial-scale=1" />
-
-  <link href="/css/neo.css" rel="stylesheet" type="text/css" media="all"/>
+  <link href="/css/neo.css" rel="stylesheet" type="text/css" media="all">
 
   <!--[if lt IE 9]>
     <script type="text/javascript" src="/js/html5.min.js"></script>
@@ -39,4 +16,4 @@
 
 <%== yield %>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/views/layout.erb b/views/layout.erb
index ac39ad90..267ba104 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -2,21 +2,8 @@
 <html lang="en">
   <head>
     <title><%= title %></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <!-- <link rel="manifest" href="/manifest.json"> -->
-    <meta itemprop="name"           content="Neocities.org">
-    <meta itemprop="description"    content="Free web hosting and tools that allow anyone to create a website. Join our community today!">
-    <meta name="description"        content="Free web hosting and tools that allow anyone to create a website. Join our community today!">
-    <meta name="keywords"           content="free website, html, css, learn to code, free hosting, build a website, create a web page">
-    <meta property="og:title"       content="Neocities">
-    <meta property="og:site_name"   content="Neocities | neocities.org">
-    <meta property="og:type"        content="website">
-    <meta property="og:image"       content="/img/cat-larger.png">
-    <meta property="og:url"         content="https://www.neocities.org">
-    <meta property="og:description" content="Neocities is the new Geocities. Create your own free home page, and do whatever you want with it.">
-    <meta name="referrer"           content="no-referrer-when-downgrade">
-    
-    <link rel="canonical" href="https://neocities.org<%= request.fullpath %>" />
+
+    <%== erb :'_meta' %>
 
     <% if meta_robots %>
       <meta name="robots" content="<%= meta_robots %>">
@@ -24,13 +11,6 @@
 
     <link href="/css/neo.css" rel="stylesheet" type="text/css" media="all">
 
-    <link href="/favicon.ico?v=4" rel="shortcut icon" type="image/ico">
-
-    <!-- Mobile Meta -->
-    <meta name="HandheldFriendly" content="True">
-    <meta name="MobileOptimized"  content="320">
-    <meta name="viewport"         content="width=device-width, minimum-scale=1, initial-scale=1">
-
     <% if @dont_browser_cache %>
       <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
       <meta http-equiv="Pragma" content="no-cache">