diff --git a/server/templates/home.hbs b/server/templates/home.hbs
index 0b4ab2d02c42b7c1c9a082a2e6b0aabdfd21f471..184c6b65539fd6c8415c25c09d3a0ca5efc0345f 100644
--- a/server/templates/home.hbs
+++ b/server/templates/home.hbs
@@ -1,19 +1,19 @@
 {{#> layout }}
 
-<div class="max-w-screen-lg p-10 mx-auto text-main font-extralight lg:p-20">
+<div class="max-w-screen-lg p-10 mx-auto font-thin text-main lg:p-20">
     <article class="max-w-xl">
         <h1 class="mb-10 text-4xl leading-tight text-white font-display font-extralight">Introducing Zed&mdash;A lightning fast code editor written in Rust.</h1>
-        <p class="text-lg leading-relaxed">
+        <p class= leading-relaxed">
             Level up your development process with:
-            <ul class="mt-4 ml-8 text-lg leading-loose list-disc">
+            <ul class="mt-4 ml-8 leading-loose list-disc">
                 <li>a <a href="/tech#rust>" class="underline">lightning fast</a> code editor</li>
                 <li>real time collaboration on any work tree</li>
                 <li>powerful code annotation tools</li>
                 <li>the ability to rewind time to any point</li>
             </ul>
         </p>
-        <p class="mt-5 text-lg leading-relaxed">Early access to Zed will open up mid-2022 for small teams and individuals in our <a class="underline" href="/community">community</a>.</p>
-        <a href="/story" class="inline-block pt-6 pl-10 pr-10 mt-10 mb-10 text-lg underline border border-white pb-7">Read our story.</a>
+        <p class="mt-5 leading-relaxed">Early access to Zed will open up mid-2022 for small teams and individuals in our <a class="underline" href="/community">community</a>.</p>
+        <a href="/story" class="inline-block pt-6 pl-10 pr-10 mt-10 mb-10 underline border border-white pb-7">Read our story.</a>
     </article>
 </div>
 
diff --git a/server/templates/releases.hbs b/server/templates/releases.hbs
index 8bff38cfe8bf3910e7748624715692fefc22ed35..afa0ee5bb14f9d5633b383682969a000430cc223 100644
--- a/server/templates/releases.hbs
+++ b/server/templates/releases.hbs
@@ -1,9 +1,9 @@
 {{#> layout }}
 
-<div class="max-w-screen-lg mx-auto text-main font-extralight p-20">
+<div class="max-w-screen-lg p-10 mx-auto font-thin text-main lg:p-20">
     {{#if current_user}}
 
-    <h1 class="font-display font-extralight mb-10">Releases</h1>
+    <h1 class="mb-10 font-display font-extralight">Releases</h1>
     <p class="mt-5 leading-7">Zed is currently only available on OS X.</p>
     <p class="mt-5 leading-7">We are frequently shipping new versions, check back reguarly to get the most recent version. If you run into an issue you think we might not know about use the "new issue" links by the appropriate version to let us know about it.</p>
     {{#if releases}}
@@ -11,8 +11,8 @@
     <ul class="mt-10 leading-7">
         {{#each releases}}
         <li id="release-{{name}}" class="mb-5">
-            <a class="text-lg underline leading-7 hover:text-gray-300" href="/releases/{{tag_name}}/{{assets.0.name}}">Zed {{name}}</a></h2>
-            <p class="text-gray-400 mt-2">
+            <a class="text-lg leading-7 underline hover:text-gray-300" href="/releases/{{tag_name}}/{{assets.0.name}}">Zed {{name}}</a></h2>
+            <p class="mt-2 text-gray-400">
                 <a class="hover:text-white" href="https://github.com/zed-industries/zed/releases/tag/{{tag_name}}">Release Notes</a>
                  · 
                 <a class="hover:text-white" href="https://github.com/zed-industries/zed/issues/new?labels=defect&title={{name}}+New+issue">New issue</a>
@@ -25,9 +25,9 @@
 
     {{else}}
 
-    <h1 class="font-display font-extralight mb-10">Hold it!</h1>
-    <p class="mt-5 leading-7">You can't access this without <a href=" /sign_in" class="underline mt-5 leading-7 hover:text-white">logging in</a>.</p>
-    <p class="mt-5 leading-7">Try <a href="/community" class="underline mt-5 leading-7 hover:text-white">joining our community</a> to get access to updates & releases.</p>
+    <h1 class="mb-10 font-display font-extralight">Hold it!</h1>
+    <p class="mt-5 leading-7">You can't access this without <a href=" /sign_in" class="mt-5 leading-7 underline hover:text-white">logging in</a>.</p>
+    <p class="mt-5 leading-7">Try <a href="/community" class="mt-5 leading-7 underline hover:text-white">joining our community</a> to get access to updates & releases.</p>
     
     {{/if}}
 </div>
diff --git a/server/templates/story.hbs b/server/templates/story.hbs
index ac2ad09befa2666e04a4d10b5eb81e0a8f25c827..6c05cc698cbd7efcb5cfcd8f3384a0694af04bfd 100644
--- a/server/templates/story.hbs
+++ b/server/templates/story.hbs
@@ -1,17 +1,17 @@
 {{#> layout }}
 
-<div class="max-w-screen-lg mx-auto font-thin p-20">
-    <h1 class="text-white text-4xl font-display font-extralight mb-10">Our Story</h1>
+<div class="max-w-screen-lg p-20 mx-auto font-thin">
+    <h1 class="mb-10 text-4xl text-white font-display font-extralight">Our Story</h1>
     <p class="mt-5 leading-7">We’re the team behind GitHub’s Atom text editor, and we’re building something new:</p>
     <p class="mt-5 leading-7">Zed is a fully-native desktop code editor focused on high performance, clean design, and seamless collaboration.</p>
     <p class="mt-5 leading-7">We’re in early development, but we’d like to build a small community of developers who care deeply about their tools and are willing to give us feedback.</p>    
 
-    <h2 class="text-white font-display font-extralight mt-20">We started Zed for ourselves&mdash;To bring joy back to writing code every day.</h1>
+    <h2 class="mt-20 text-white font-display font-extralight">We started Zed for ourselves&mdash;To bring joy back to writing code every day.</h2>
     <p class="mt-5 leading-7">Modern text editors have forgotten the core tentants of software – speed and reliability first, features second.</p>
     <p class="mt-5 leading-7">While we are building Zed from the ground up built for collaboration, we are putting in the time to ensure every feature we build is performant and rock solid.</p>
     <p class="mt-5 leading-7">New software tends to overpromise and underdeliver&mdash;Our goal with Zed is to start small and impress with a singular focus on developer experience.</p>
 
-    <div class="mt-20 leading-7 flex flex-row">
+    <div class="flex flex-row mt-20 leading-7">
         <div class="flex-initial mr-40">
             <h4 class="font-display">Nathan Sobo</h4>
             <p class="text-sm text-gray-500">Co-founder</p>
@@ -23,7 +23,7 @@
         <div class="flex-1"></div>
     </div>
     
-    <div class="mt-10 opacity-30 hover:opacity-100 cursor-pointer">
+    <div class="mt-10 cursor-pointer opacity-30 hover:opacity-100">
         <a href="mailto:hi@zed.dev">
             <svg width="180" height="45" viewBox="0 0 180 45" fill="none" xmlns="http://www.w3.org/2000/svg">
             <path d="M26.1837 12.7355L31.4584 6.93335H0.99707V33.043M26.1837 12.7355H6.79922V27.2409M26.1837 12.7355L20.909 18.5377M20.909 18.5377H12.6014V22.2335M20.909 18.5377L12.997 27.2409M12.997 27.2409H21.3046V23.545M12.997 27.2409L7.72229 33.043M7.72229 33.043L2.44761 38.8452H32.9089V12.7355M7.72229 33.043H27.1068V18.5377" stroke="white" stroke-width="1.99449" stroke-linejoin="bevel"/>
diff --git a/server/templates/team.hbs b/server/templates/team.hbs
index 1f571a3f697a3f6a8ef15dc2a2f576297b0d11f7..ea2e9cd322320a5bd45eb3a61144e3e8e872f7c4 100644
--- a/server/templates/team.hbs
+++ b/server/templates/team.hbs
@@ -1,32 +1,32 @@
 {{#> layout }}
 
-<div class="max-w-screen-lg mx-auto font-thin p-20">
-    <h1 class="text-white text-4xl font-display font-extralight mb-10">The Team</h1>
+<div class="max-w-screen-lg p-10 mx-auto font-thin text-main lg:p-20">
+    <h1 class="mb-10 text-4xl text-white font-display font-extralight">The Team</h1>
     <div class="text-sm">
-        <article class="bg-black mb-10">
+        <article class="mb-10 bg-black">
             <div class="content">
-                <h3 class="font-display font-extralight mb-2">Nathan Sobo</h3>
+                <h3 class="mb-2 font-display font-extralight">Nathan Sobo</h3>
                 <div class="text-columns-2">
-                    <p class="leading-7 mt-3 mb-3">Nathan joined GitHub in late 2011 to build the <a href="https://atom.io" class="underline">Atom text editor</a>, and he led the Atom team until 2018.</p>
+                    <p class="mt-3 mb-3 leading-7">Nathan joined GitHub in late 2011 to build the <a href="https://atom.io" class="underline">Atom text editor</a>, and he led the Atom team until 2018.</p>
                 
-                    <p class="leading-7 mt-3 mb-3">He also co-led development of <a href="https://teletype.atom.io" class="underline">Teletype for Atom</a>, pioneering one of the first production uses of conflict-free replicated data types for collaborative text editing.</p>
+                    <p class="mt-3 mb-3 leading-7">He also co-led development of <a href="https://teletype.atom.io" class="underline">Teletype for Atom</a>, pioneering one of the first production uses of conflict-free replicated data types for collaborative text editing.</p>
                     
-                    <p class="leading-7 mt-3 mb-3">He's been dreaming about building the world’s best text editor since he graduated from college, and is excited to finally have the knowledge, tools, and resources to achieve this vision.</p>
+                    <p class="mt-3 mb-3 leading-7">He's been dreaming about building the world’s best text editor since he graduated from college, and is excited to finally have the knowledge, tools, and resources to achieve this vision.</p>
 
-                    <p class="lowercase leading-7 mt-3 mb-3"><a class="opacity-50 hover:opacity-80" href="https://github.com/nathansobo">Github</a> · <a class="opacity-50 hover:opacity-80" href="https://twitter.com/nathansobo">Twitter</a></p>
+                    <p class="mt-3 mb-3 leading-7 lowercase"><a class="opacity-50 hover:opacity-80" href="https://github.com/nathansobo">Github</a> · <a class="opacity-50 hover:opacity-80" href="https://twitter.com/nathansobo">Twitter</a></p>
                 </div>
             </div>
         </article>
 
-        <article class="bg-black mb-10">
+        <article class="mb-10 bg-black">
             <div class="content">
-                <h3 class="font-display font-extralight mb-2">Antonio Scandurra</h3>
+                <h3 class="mb-2 font-display font-extralight">Antonio Scandurra</h3>
                 <div class="text-columns-2">
-                    <p class="leading-7 mt-3 mb-3">Antonio joined the Atom team in 2014 while still in university after his outstanding open source contributions caught the attention of the team.</p>
+                    <p class="mt-3 mb-3 leading-7">Antonio joined the Atom team in 2014 while still in university after his outstanding open source contributions caught the attention of the team.</p>
             
-                    <p class="leading-7 mt-3 mb-3">He later joined Nathan in architecting <a href="https://teletype.atom.io" class="underline">Teletype for Atom</a> and researching the foundations of what has turned into Zed.</p>
+                    <p class="mt-3 mb-3 leading-7">He later joined Nathan in architecting <a href="https://teletype.atom.io" class="underline">Teletype for Atom</a> and researching the foundations of what has turned into Zed.</p>
                     
-                    <p class="leading-7 mt-3 mb-3">For the last two years, he’s become an expert in distributed systems and conflict-free replicated data types through the development of a real-time, distributed, conflict-free database implemented in Rust for <a href="https://ditto.live" class="underline">Ditto</a>.</p>
+                    <p class="mt-3 mb-3 leading-7">For the last two years, he’s become an expert in distributed systems and conflict-free replicated data types through the development of a real-time, distributed, conflict-free database implemented in Rust for <a href="https://ditto.live" class="underline">Ditto</a>.</p>
                 </div>
             </div>
         </article>
diff --git a/server/templates/updates.hbs b/server/templates/updates.hbs
index 9382ff2281f6271242a661c7516d2d683b11061a..7e72cfe7c4720fcece62ccf6963648078ad9aca1 100644
--- a/server/templates/updates.hbs
+++ b/server/templates/updates.hbs
@@ -1,16 +1,15 @@
 {{#> layout }}
 
 
-<div class="max-w-screen-lg mx-auto text-main font-extralight p-20">
+<div class="max-w-screen-lg p-10 mx-auto font-thin text-main lg:p-20">
     {{#if current_user}}
     
     {{#if releases}}
-    {{!-- <h1 class="font-display font-extralight mb-10">Updates</h1> --}}
     
     {{#each releases}}
     <article id="{{name}}" class="mb-20">
-        <h1 class="font-display font-extralight mb-2">{{name}}</h1>
-        <a class="underline text-sm opacity-50 hover:opacity-80" href="/releases/{{tag_name}}/{{assets.0.name}}">Download</a>
+        <h1 class="mb-2 font-display font-extralight">{{name}}</h1>
+        <a class="text-sm underline opacity-50 hover:opacity-80" href="/releases/{{tag_name}}/{{assets.0.name}}">Download</a>
         <div class="mt-10 type-prose">
             {{{body}}}
         </div>
@@ -23,9 +22,9 @@
 
     {{else}}
 
-    <h1 class="font-display font-extralight mb-10">Hold it!</h1>
-    <p class="mt-5 leading-7">You can't access this without <a href=" /sign_in" class="underline mt-5 leading-7">logging in</a>.</p>
-    <p class="mt-5 leading-7">Try <a href="/community" class="underline mt-5 leading-7">joining our community</a> to get access to updates & releases.</p>
+    <h1 class="mb-10 font-display font-extralight">Hold it!</h1>
+    <p class="mt-5 leading-7">You can't access this without <a href=" /sign_in" class="mt-5 leading-7 underline">logging in</a>.</p>
+    <p class="mt-5 leading-7">Try <a href="/community" class="mt-5 leading-7 underline">joining our community</a> to get access to updates & releases.</p>
     {{/if}}
 </div>