diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f6c2fcf4f..253a40310 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -46,11 +46,11 @@ To get started, you first need to have Go installed. GtS is currently using Go 1
 
 Once you've got go installed, clone this repository into your Go path. Normally, this should be `~/go/src/github.com/superseriousbusiness/gotosocial`.
 
-Once that's done, you can try building the project: `./scripts/build.sh`. This will build the `gotosocial` binary.
+Once that's done, you can try building the project: `./scripts/build.sh`. This will build the `gotosocial` binary. For automatic re-compiling during development, you can use [nodemon](https://www.npmjs.com/package/nodemon): `nodemon -e go --signal SIGTERM --exec "go run ./cmd/gotosocial --host localhost testrig start || exit 1"`
 
 If there are no errors, great, you're good to go!
 
-To work with the stylesheet for templates, you need [Node.js](https://nodejs.org/en/download/), then run `yarn install` in `web/source/`. Recompiling the bundle.css is `node build.js` but can be automated with [nodemon](https://www.npmjs.com/package/nodemon) on file change: `nodemon -w style.css build.js`.
+To work with the stylesheet for templates, you need [Node.js](https://nodejs.org/en/download/), then run `yarn install` in `web/gotosocial-styling/`. Recompiling the bundles is done with `BUILD_DIR=../assets node index.js` but can be automatically live-reloaded with `BUILD_DIR=../assets NODE_ENV=development node index.js`. 
 
 ### Golang forking quirks
 
diff --git a/Dockerfile b/Dockerfile
index c38f2a610..df2988368 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,10 +33,10 @@ FROM node:16.9.0-alpine3.14 AS web_builder
 RUN apk update && apk upgrade --no-cache
 
 COPY web /web
-WORKDIR /web/source
+WORKDIR /web/gotosocial-styling
 
 RUN yarn install
-RUN node build.js
+RUN BUILD_DIR=../assets node index.js
 
 # STEP THREE: bundle the admin webapp
 FROM node:16.9.0-alpine3.14 AS admin_builder
diff --git a/internal/router/template.go b/internal/router/template.go
index e7bdc3edf..2beee63c0 100644
--- a/internal/router/template.go
+++ b/internal/router/template.go
@@ -23,8 +23,10 @@
 	"html/template"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 )
 
@@ -41,12 +43,51 @@ func loadTemplates(cfg *config.Config, engine *gin.Engine) error {
 	return nil
 }
 
+func oddOrEven(n int) string {
+	if n%2 == 0 {
+		return "even"
+	} else {
+		return "odd"
+	}
+}
+
 func noescape(str string) template.HTML {
 	return template.HTML(str)
 }
 
+func timestamp(stamp string) string {
+	t, _ := time.Parse(time.RFC3339, stamp)
+	return t.Format("January 2, 2006, 15:04:05")
+}
+
+type IconWithLabel struct {
+	faIcon string
+	label  string
+}
+
+func visibilityIcon(visibility model.Visibility) template.HTML {
+	var icon IconWithLabel
+
+	if visibility == model.VisibilityPublic {
+		icon = IconWithLabel{"globe", "public"}
+	} else if visibility == model.VisibilityUnlisted {
+		icon = IconWithLabel{"unlock", "unlisted"}
+	} else if visibility == model.VisibilityPrivate {
+		icon = IconWithLabel{"lock", "private"}
+	} else if visibility == model.VisibilityMutualsOnly {
+		icon = IconWithLabel{"handshake-o", "mutuals only"}
+	} else if visibility == model.VisibilityDirect {
+		icon = IconWithLabel{"envelope", "direct"}
+	}
+
+	return template.HTML(fmt.Sprintf(`<i aria-label="Visiblity: %v" class="fa fa-%v"></i>`, icon.label, icon.faIcon))
+}
+
 func loadTemplateFunctions(engine *gin.Engine) {
 	engine.SetFuncMap(template.FuncMap{
-		"noescape": noescape,
+		"noescape":       noescape,
+		"oddOrEven":      oddOrEven,
+		"visibilityIcon": visibilityIcon,
+		"timestamp":      timestamp,
 	})
 }
diff --git a/internal/web/base.go b/internal/web/base.go
index eabde676c..2759c3f9e 100644
--- a/internal/web/base.go
+++ b/internal/web/base.go
@@ -57,13 +57,8 @@ func (m *Module) baseHandler(c *gin.Context) {
 		return
 	}
 
-	// FIXME: fill in more variables?
 	c.HTML(http.StatusOK, "index.tmpl", gin.H{
-		"instance":      instance,
-		"countUsers":    3,
-		"countStatuses": 42069,
-		"version":       "1.0.0",
-		"adminUsername": "@admin",
+		"instance": instance,
 	})
 }
 
@@ -101,6 +96,9 @@ func (m *Module) Route(s router.Router) error {
 	// serve front-page
 	s.AttachHandler(http.MethodGet, "/", m.baseHandler)
 
+	// serve statuses
+	s.AttachHandler(http.MethodGet, "/:user/statuses/:id", m.threadTemplateHandler)
+
 	// 404 handler
 	s.AttachNoRouteHandler(m.NotFoundHandler)
 
diff --git a/internal/web/thread.go b/internal/web/thread.go
new file mode 100644
index 000000000..69c9674ff
--- /dev/null
+++ b/internal/web/thread.go
@@ -0,0 +1,83 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package web
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/superseriousbusiness/gotosocial/internal/oauth"
+)
+
+type statusLink struct {
+	User string `uri:"user" binding:"required"`
+	ID   string `uri:"id"   binding:"required"`
+}
+
+func (m *Module) threadTemplateHandler(c *gin.Context) {
+	l := m.log.WithField("func", "threadTemplateGET")
+	l.Trace("rendering thread template")
+
+	ctx := c.Request.Context()
+
+	var uriParts statusLink
+
+	if err := c.ShouldBindUri(&uriParts); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
+		return
+	}
+
+	authed, err := oauth.Authed(c, false, false, false, false)
+	if err != nil {
+		l.Errorf("error authing status GET request: %s", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
+		return
+	}
+
+	instance, err := m.processor.InstanceGet(ctx, m.config.Host)
+	if err != nil {
+		l.Debugf("error getting instance from processor: %s", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "internal server error"})
+		return
+	}
+
+	status, err := m.processor.StatusGet(ctx, authed, uriParts.ID)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
+		return
+	}
+
+	if uriParts.User[:1] != "@" || uriParts.User[1:] != status.Account.Username {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
+		return
+	}
+
+	context, err := m.processor.StatusGetContext(ctx, authed, uriParts.ID)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
+		return
+	}
+
+	c.HTML(http.StatusOK, "thread.tmpl", gin.H{
+		"instance":    instance,
+		"status":      status,
+		"context":     context,
+		"stylesheets": []string{"/assets/Fork-Awesome/css/fork-awesome.min.css", "/assets/status.css"},
+	})
+}
diff --git a/web/assets/Fork-Awesome b/web/assets/Fork-Awesome
new file mode 160000
index 000000000..5c126c4fb
--- /dev/null
+++ b/web/assets/Fork-Awesome
@@ -0,0 +1 @@
+Subproject commit 5c126c4fb5ce9c78d24148afc514f9c4ccbe4051
diff --git a/web/assets/bundle.css b/web/assets/base.css
similarity index 79%
rename from web/assets/bundle.css
rename to web/assets/base.css
index 7d4eae172..b28cf2533 100644
--- a/web/assets/bundle.css
+++ b/web/assets/base.css
@@ -1,46 +1,71 @@
 html, body {
 	padding: 0;
 	margin: 0;
-	background: #525c66;
+	background: rgb(70, 79, 88);
 	color: #fafaff;
 	font-family: sans-serif;
 }
 
 body {
 	display: grid;
-	grid-template-columns: 1fr 50% 1fr;
-	grid-template-columns: 1fr 90ch 1fr;
-	line-height: 1.5em;
 
+	grid-template-rows: auto 1fr auto;
 	min-height: 100vh;
-	grid-auto-rows: auto;
-	grid-auto-flow: dense;
+	line-height: 1.5em;
 }
 
-body > * {
+main {
+	background: #525c66;
+	display: grid;
+	padding-top: 2rem;
+	grid-template-columns: 1fr 50% 1fr;
+	grid-template-columns: auto min(92%, 90ch) auto;
+}
+
+main .left {
+		grid-column: 1;
+	}
+
+main .right {
+		grid-column: 3;
+	}
+
+main.lightgray {
+		background: #525c66;
+	}
+
+main > * {
 		align-self: start;
 		grid-column: 2;
 	}
 
-body header, body footer, body .fullWidth {
-		grid-column: 1/4;
-		grid-column: 1/-1;
-	}
-
-body .left {
-		grid-column: 1;
-	}
-
-body .right {
-		grid-column: 3;
-	}
-
 header {
 	background: rgb(70, 79, 88);
-	padding: 2rem;
-	margin-bottom: 4rem;
+	padding: 2rem 0;
+	padding-bottom: 0;
+	display: flex;
+	flex-wrap: wrap;
 }
 
+header img {
+		height: 4rem;
+		padding-left: 2rem;
+		padding-bottom: 2rem;
+	}
+
+header div {
+		height: 100%;
+		margin: 0 2rem;
+		margin-top: -2rem;
+		flex-grow: 1;
+		align-self: center;
+		display: flex;
+	}
+
+header div h1 {
+			align-self: center;
+		}
+
 h1 {
 	/* color: $acc1; */
 	margin: 0;
@@ -160,26 +185,21 @@ footer a {
 	}
 
 @media screen and (orientation: portrait) {
-	body {
+	main {
 		grid-template-columns: 1fr 92% 1fr;
 	}
 
-		body footer, body .left, body .right {
-			grid-column: 2;
-		}
-
 	header {
 		text-align: center;
 	}
 
 	footer {
-		padding: 0;
 		margin-top: 2rem;
 		grid-template-columns: 1fr;
 	}
 
 		footer div {
-			margin: 1rem 0;
+			margin: 0.3rem 0;
 		}
 
 	section.apps .applist {
diff --git a/web/assets/colors.css b/web/assets/colors.css
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/web/assets/colors.css
@@ -0,0 +1 @@
+
diff --git a/web/assets/logo.png b/web/assets/logo.png
new file mode 100644
index 000000000..d6d485df1
Binary files /dev/null and b/web/assets/logo.png differ
diff --git a/web/assets/status.css b/web/assets/status.css
new file mode 100644
index 000000000..9dd788a9e
--- /dev/null
+++ b/web/assets/status.css
@@ -0,0 +1,230 @@
+main {
+	background: transparent;
+	grid-auto-rows: auto;
+}
+
+.thread {
+	display: flex;
+	flex-direction: column;
+}
+
+.toot {
+	position: relative;
+	background: rgb(75, 84, 93);
+	padding: 2rem;
+	/* padding-bottom: 0; */
+	display: grid;
+	grid-template-columns: 3.2rem auto 1fr;
+	column-gap: 0.5rem;
+	margin-bottom: 0.2rem;
+}
+
+.toot a {
+		position: relative;
+		z-index: 1;
+		color: inherit;
+		text-decoration: none;
+	}
+
+.toot .avatar {
+		grid-row: span 2;
+	}
+
+.toot .avatar img {
+			height: 3.2rem;
+			width: 3.2rem;
+			object-fit: cover;
+		}
+
+.toot .displayname {
+		font-weight: bold;
+		font-size: 1.2rem;
+		align-self: start;
+	}
+
+.toot .username {
+		color: #b0b0b5;
+		justify-self: start;
+	}
+
+.toot input.spoiler:checked ~ .content {
+		display: none;
+	}
+
+.toot .spoiler label {
+			background: #de8957;
+			border-radius: 0.3rem;
+			padding: 0.3rem;
+			margin-left: 0.4rem;
+			position: relative;
+			z-index: 2;
+			cursor: pointer;
+		}
+
+.toot .text {
+		margin: 0;
+		grid-column: span 2;
+	}
+
+.toot .text a {
+			color: #de8957;
+			text-decoration: underline;
+		}
+
+.toot .media {
+		margin-top: 0.6rem;
+		border-radius: 0.2rem;
+		grid-column: span 3;
+		display: grid;
+		grid-template-columns: 50% 50%;
+		grid-auto-rows: 10rem;
+		overflow: hidden;
+		gap: 0.3rem;
+	}
+
+.toot .media a {
+			position: relative;
+		}
+
+.toot .media .no-image-desc {
+			display: flex;
+			position: absolute;
+			bottom: 0.1rem;
+			right: 0.4rem;
+			color: white;
+			background: #5897df;
+			padding: 0.2rem 0.4rem;
+			border-radius: 100%;
+			z-index: 3;
+		}
+
+.toot .media .no-image-desc i.fa {
+				display: block;
+				line-height: 1.3rem;
+			}
+
+.toot .media .no-image-desc span {
+				margin-left: 0.3rem;
+				display: none;
+			}
+
+.toot .media .no-image-desc:hover span {
+					display: block;
+				}
+
+.toot .media .no-image-desc:hover {
+				border-radius: 0.2rem;
+}
+
+.toot .media img {
+			width: 100%;
+			height: 100%;
+			object-fit: cover;
+		}
+
+.toot .media.single a {
+			grid-column: span 2;
+		}
+
+.toot .media.odd a:first-child, .toot .media.double a {
+			grid-row: span 2;
+		}
+
+.toot .info {
+		display: none;
+	}
+
+.toot .info div {
+			position: relative;
+			padding-right: 1.3rem;
+		}
+
+.toot .info .stats {
+			display: flex;
+		}
+
+.toot .info {
+
+		color: #b0b0b5;
+		grid-column: span 3;
+		margin-top: 0.5rem;
+		flex-wrap: wrap;
+}
+
+.toot .info div.stats::after {
+			display: none;
+		}
+
+.toot .info div::after {
+			display: block;
+			background: #b0b0b5;
+			height: 0.25rem;
+			width: 0.25rem;
+			content: "";
+			position: absolute;
+			top: calc((1.5rem - 0.25rem) / 2);
+			right: 0.55rem;
+			border-radius: 1rem;
+		}
+
+.toot .info div:last-child::after {
+				display: none;
+			}
+
+.toot .info div:last-child {
+			margin-right: 0;
+}
+
+.toot .toot-link {
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		overflow: hidden;
+		text-indent: 100%;
+		white-space: nowrap;
+
+		position: absolute;
+		z-index: 0;
+	}
+
+.toot {}
+
+.toot:first-child {
+		/* top left, top right */
+		border-radius: 0.3rem 0.3rem 0 0;
+	}
+
+.toot:last-child {
+		/* bottom left, bottom right */
+		border-radius: 0 0 0.3rem 0.3rem;
+		padding-bottom: 1.5rem;
+	}
+
+.toot.expanded {
+		background: #525c66;
+		padding-bottom: 1.5rem;
+	}
+
+.toot.expanded .displayname {
+			grid-column: span 2;
+		}
+
+.toot.expanded .text {
+			grid-column: span 3;
+			grid-row: span 1;
+			margin-top: 0.3rem;
+		}
+
+.toot.expanded .info {
+			display: flex;
+		}
+
+.toot.expanded .media {
+			grid-auto-rows: 1fr;
+			max-height: 120rem;
+		}
+
+footer + div { /* something weird from the devstack.. */
+	display: none;
+}
\ No newline at end of file
diff --git a/web/gotosocial-styling/.eslintrc.js b/web/gotosocial-styling/.eslintrc.js
new file mode 100644
index 000000000..376c92936
--- /dev/null
+++ b/web/gotosocial-styling/.eslintrc.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = {
+	"extends": "@f0x52/eslint-config"
+};
diff --git a/web/gotosocial-styling/.gitignore b/web/gotosocial-styling/.gitignore
new file mode 100644
index 000000000..ee48c081f
--- /dev/null
+++ b/web/gotosocial-styling/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+yarn-error.log
+build/*
diff --git a/web/gotosocial-styling/LICENSE b/web/gotosocial-styling/LICENSE
new file mode 100644
index 000000000..be3f7b28e
--- /dev/null
+++ b/web/gotosocial-styling/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
diff --git a/web/gotosocial-styling/README.md b/web/gotosocial-styling/README.md
new file mode 100644
index 000000000..71314e838
--- /dev/null
+++ b/web/gotosocial-styling/README.md
@@ -0,0 +1,18 @@
+# GoToSocial Styling
+
+Common package for the PostCSS styling of GoToSocial (related) pages.
+
+## Bundle
+Source in `src/style.css` is bundled by running `node index.js`. Output appears in `build/bundle.css`, and can be required from other packages with `require("gotosocial-styling/build/bundle.css")`.
+
+## Development
+You can run `NODE_ENV=development node index.js` to start a livereloading setup that automatically re-bundles on file changes in `src/`.
+
+## License, donations
+[AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.html). If you want to support my work, you can:  
+<a href="https://liberapay.com/f0x/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a>
+
+
+## Changelog
+### v0.0.1 (August 29th, 2021)
+initial release
diff --git a/web/gotosocial-styling/colors.css b/web/gotosocial-styling/colors.css
new file mode 100644
index 000000000..8dfcd4a09
--- /dev/null
+++ b/web/gotosocial-styling/colors.css
@@ -0,0 +1,9 @@
+$bg: #525c66;
+$fg: #fafaff;
+$fg_dark: #b0b0b5;
+
+$bg_accent: color($bg lightness(-5%));
+
+$acc1: #de8957; // sloth light orange
+$acc2: #c76d33; // sloth dark orange
+$blue: #5897df;
diff --git a/web/gotosocial-styling/index.js b/web/gotosocial-styling/index.js
new file mode 100644
index 000000000..88d9398b2
--- /dev/null
+++ b/web/gotosocial-styling/index.js
@@ -0,0 +1,71 @@
+"use strict";
+
+const Promise = require("bluebird");
+const fs = require("fs").promises;
+const postcss = require('postcss');
+const {parse} = require("postcss-scss");
+
+/*
+	Bundle all postCSS files under the `templates/` directory separately, each prepended with the (variable) contents of ./colors.css
+	Outputs in plain CSS are in `build/`, split by template
+*/
+
+const postcssPlugins = ["postcss-strip-inline-comments", "postcss-nested", "postcss-simple-vars", "postcss-color-function"].map((plugin) => require(plugin)());
+
+function getTemplates() {
+	return fs.readdir(`${__dirname}/templates`).then((templates) => {
+		return templates.map((a) => {
+			return [a, `${__dirname}/templates/${a}`];
+		});
+	});
+}
+
+getTemplates();
+
+function bundle([template, path]) {
+	return Promise.try(() => {
+		return Promise.all([
+			fs.readFile(`${__dirname}/colors.css`, "utf-8"),
+			fs.readFile(path, "utf-8")
+		]);
+	}).then(([colors, style]) => {
+		return parse(colors + "\n" + style);
+	}).then((ast) => {
+		return postcss(postcssPlugins).process(ast, {
+			from: template,
+			to: template
+		});
+	}).then((bundle) => {
+		return fs.writeFile(`${buildDir}/${template}`, bundle.css);
+	}).then(() => {
+		console.log(`Finished writing CSS to ${buildDir}/${template}`);
+	});
+}
+
+let buildDir = process.env.BUILD_DIR;
+if (buildDir == undefined) {
+	buildDir = `${__dirname}/build`;
+}
+console.log("bundling to", buildDir);
+
+function bundleAll() {
+	return getTemplates().then((templates) => {
+		return Promise.map(templates, bundle);
+	});
+}
+
+if (process.env.NODE_ENV != "development") {
+	bundleAll();
+} else {
+	const chokidar = require("chokidar");
+	console.log("Watching for changes");
+	chokidar.watch(`${__dirname}/templates`).on("all", (_, path) => {
+		if (path.endsWith(".css")) {
+			bundle([path.split("/").slice(-1)[0], path]);
+		}
+	});
+	chokidar.watch(`${__dirname}/colors.css`).on("all", () => {
+		console.log("colors.css updated, rebuilding all templates");
+		bundleAll();
+	});
+}
\ No newline at end of file
diff --git a/web/gotosocial-styling/package.json b/web/gotosocial-styling/package.json
new file mode 100644
index 000000000..ae3d73e93
--- /dev/null
+++ b/web/gotosocial-styling/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "gotosocial-styling",
+  "version": "0.0.1",
+  "description": "PostCSS source for the https://github.com/superseriousbusiness/gotosocial common styling",
+  "repository": "https://github.com/superseriousbusiness/gotosocial-styling",
+  "author": "f0x",
+  "license": "AGPL-3.0",
+  "dependencies": {
+    "bluebird": "^3.7.2",
+    "postcss": "^8.3.5",
+    "postcss-color-function": "^4.1.0",
+    "postcss-nested": "^4.2.1",
+    "postcss-scss": "^4.0.0",
+    "postcss-simple-vars": "^5.0.2",
+    "postcss-strip-inline-comments": "^0.1.5"
+  },
+  "devDependencies": {
+    "chokidar": "^3.5.2"
+  }
+}
diff --git a/web/source/style.css b/web/gotosocial-styling/templates/base.css
similarity index 80%
rename from web/source/style.css
rename to web/gotosocial-styling/templates/base.css
index 992e538b0..8b2f14fbe 100644
--- a/web/source/style.css
+++ b/web/gotosocial-styling/templates/base.css
@@ -1,38 +1,25 @@
-$bg: #525c66;
-$fg: #fafaff;
-
-$bg_accent: color($bg lightness(-5%));
-
-$acc1: #de8957; // sloth light orange
-$acc2: #c76d33; // sloth dark orange
-
 html, body {
 	padding: 0;
 	margin: 0;
-	background: $bg;
+	background: $bg_accent;
 	color: $fg;
 	font-family: sans-serif;
 }
 
 body {
 	display: grid;
-	grid-template-columns: 1fr 50% 1fr;
-	grid-template-columns: 1fr 90ch 1fr;
-	line-height: 1.5em;
 
+	grid-template-rows: auto 1fr auto;
 	min-height: 100vh;
-	grid-auto-rows: auto;
-	grid-auto-flow: dense;
+	line-height: 1.5em;
+}
 
-	& > * {
-		align-self: start;
-		grid-column: 2;
-	}
-
-	header, footer, .fullWidth {
-		grid-column: 1/4;
-		grid-column: 1/-1;
-	}
+main {
+	background: $bg;
+	display: grid;
+	padding-top: 2rem;
+	grid-template-columns: 1fr 50% 1fr;
+	grid-template-columns: auto min(92%, 90ch) auto;
 
 	.left {
 		grid-column: 1;
@@ -41,12 +28,42 @@ body {
 	.right {
 		grid-column: 3;
 	}
+
+	&.lightgray {
+		background: $bg;
+	}
+
+	& > * {
+		align-self: start;
+		grid-column: 2;
+	}
 }
 
 header {
 	background: $bg_accent;
-	padding: 2rem;
-	margin-bottom: 4rem;
+	padding: 2rem 0;
+	padding-bottom: 0;
+	display: flex;
+	flex-wrap: wrap;
+
+	img {
+		height: 4rem;
+		padding-left: 2rem;
+		padding-bottom: 2rem;
+	}
+
+	div {
+		height: 100%;
+		margin: 0 2rem;
+		margin-top: -2rem;
+		flex-grow: 1;
+		align-self: center;
+		display: flex;
+
+		h1 {
+			align-self: center;
+		}
+	}
 }
 
 h1 {
@@ -168,12 +185,8 @@ footer {
 }
 
 @media screen and (orientation: portrait) {
-	body {
+	main {
 		grid-template-columns: 1fr 92% 1fr;
-
-		footer, .left, .right {
-			grid-column: 2;
-		}
 	}
 
 	header {
@@ -181,12 +194,11 @@ footer {
 	}
 
 	footer {
-		padding: 0;
 		margin-top: 2rem;
 		grid-template-columns: 1fr;
 
 		div {
-			margin: 1rem 0;
+			margin: 0.3rem 0;
 		}
 	}
 
diff --git a/web/gotosocial-styling/templates/status.css b/web/gotosocial-styling/templates/status.css
new file mode 100644
index 000000000..b71a7c9f7
--- /dev/null
+++ b/web/gotosocial-styling/templates/status.css
@@ -0,0 +1,227 @@
+main {
+	background: transparent;
+	grid-auto-rows: auto;
+}
+
+.thread {
+	display: flex;
+	flex-direction: column;
+}
+
+.toot {
+	position: relative;
+	background: color($bg lightness(-3%));
+	padding: 2rem;
+	/* padding-bottom: 0; */
+	display: grid;
+	grid-template-columns: 3.2rem auto 1fr;
+	column-gap: 0.5rem;
+	margin-bottom: 0.2rem;
+
+	a {
+		position: relative;
+		z-index: 1;
+		color: inherit;
+		text-decoration: none;
+	}
+
+	.avatar {
+		grid-row: span 2;
+
+		img {
+			height: 3.2rem;
+			width: 3.2rem;
+			object-fit: cover;
+		}
+	}
+
+	.displayname {
+		font-weight: bold;
+		font-size: 1.2rem;
+		align-self: start;
+	}
+
+	.username {
+		color: $fg_dark;
+		justify-self: start;
+	}
+
+	input.spoiler:checked ~ .content {
+		display: none;
+	}
+
+	.spoiler {
+		label {
+			background: $acc1;
+			border-radius: 0.3rem;
+			padding: 0.3rem;
+			margin-left: 0.4rem;
+			position: relative;
+			z-index: 2;
+			cursor: pointer;
+		}
+	}
+
+	.text {
+		margin: 0;
+		grid-column: span 2;
+
+		a {
+			color: $acc1;
+			text-decoration: underline;
+		}
+	}
+
+	.media {
+		margin-top: 0.6rem;
+		border-radius: 0.2rem;
+		grid-column: span 3;
+		display: grid;
+		grid-template-columns: 50% 50%;
+		grid-auto-rows: 10rem;
+		overflow: hidden;
+		gap: 0.3rem;
+
+		a {
+			position: relative;
+		}
+
+		.no-image-desc {
+			display: flex;
+			position: absolute;
+			bottom: 0.1rem;
+			right: 0.4rem;
+			color: white;
+			background: $blue;
+			padding: 0.2rem 0.4rem;
+			border-radius: 100%;
+			z-index: 3;
+
+			i.fa {
+				display: block;
+				line-height: 1.3rem;
+			}
+
+			span {
+				margin-left: 0.3rem;
+				display: none;
+			}
+
+			&:hover {
+				span {
+					display: block;
+				}
+				border-radius: 0.2rem;
+			}
+		}
+
+		img {
+			width: 100%;
+			height: 100%;
+			object-fit: cover;
+		}
+
+		&.single a {
+			grid-column: span 2;
+		}
+
+		&.odd a:first-child, &.double a {
+			grid-row: span 2;
+		}
+	}
+
+	.info {
+		display: none;
+
+		div {
+			position: relative;
+			padding-right: 1.3rem;
+		}
+
+		.stats {
+			display: flex;
+		}
+
+		color: #b0b0b5;
+		grid-column: span 3;
+		margin-top: 0.5rem;
+		flex-wrap: wrap;
+
+		div.stats::after {
+			display: none;
+		}
+
+		div::after {
+			$size: 0.25rem;
+			display: block;
+			background: $fg_dark;
+			height: $size;
+			width: $size;
+			content: "";
+			position: absolute;
+			top: calc((1.5rem - $size) / 2);
+			right: 0.55rem;
+			border-radius: 1rem;
+		}
+
+		div:last-child {
+			&::after {
+				display: none;
+			}
+			margin-right: 0;
+		}
+	}
+
+	.toot-link {
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		overflow: hidden;
+		text-indent: 100%;
+		white-space: nowrap;
+
+		position: absolute;
+		z-index: 0;
+	}
+
+	$border-radius: 0.3rem;
+	&:first-child {
+		/* top left, top right */
+		border-radius: $border-radius $border-radius 0 0;
+	}
+
+	&:last-child {
+		/* bottom left, bottom right */
+		border-radius: 0 0 $border-radius $border-radius;
+		padding-bottom: 1.5rem;
+	}
+
+	&.expanded {
+		background: $bg;
+		padding-bottom: 1.5rem;
+
+		.displayname {
+			grid-column: span 2;
+		}
+
+		.text {
+			grid-column: span 3;
+			grid-row: span 1;
+			margin-top: 0.3rem;
+		}
+
+		.info {
+			display: flex;
+		}
+
+		.media {
+			grid-auto-rows: 1fr;
+			max-height: 120rem;
+		}
+	}
+}
+
+footer + div { /* something weird from the devstack.. */
+	display: none;
+}
\ No newline at end of file
diff --git a/web/source/yarn.lock b/web/gotosocial-styling/yarn.lock
similarity index 68%
rename from web/source/yarn.lock
rename to web/gotosocial-styling/yarn.lock
index 0ae871aa9..f61a02a53 100644
--- a/web/source/yarn.lock
+++ b/web/gotosocial-styling/yarn.lock
@@ -19,11 +19,36 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 balanced-match@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
   integrity sha1-tQS9BYabOSWd0MXvw12EMXbczEo=
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -44,6 +69,21 @@ chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chokidar@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -83,9 +123,9 @@ color@^0.11.0:
     color-string "^0.3.0"
 
 colorette@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+  integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
 
 css-color-function@~1.3.3:
   version "1.3.3"
@@ -114,6 +154,25 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -131,6 +190,30 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 js-base64@^2.1.9:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
@@ -142,9 +225,19 @@ ms@^2.1.1:
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 nanoid@^3.1.23:
-  version "3.1.23"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
-  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+picomatch@^2.0.4, picomatch@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
 postcss-color-function@^4.1.0:
   version "4.1.0"
@@ -230,14 +323,21 @@ postcss@^7.0.14, postcss@^7.0.32:
     supports-color "^6.1.0"
 
 postcss@^8.3.5:
-  version "8.3.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
-  integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==
+  version "8.3.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea"
+  integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==
   dependencies:
     colorette "^1.2.2"
     nanoid "^3.1.23"
     source-map-js "^0.6.2"
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 rgb@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/rgb/-/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
@@ -291,6 +391,13 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
diff --git a/web/source/build.js b/web/source/build.js
deleted file mode 100644
index e32fa6da5..000000000
--- a/web/source/build.js
+++ /dev/null
@@ -1,23 +0,0 @@
-"use strict";
-
-const fs = require("fs").promises;
-const postcss = require('postcss');
-const {parse} = require("postcss-scss");
-
-const postcssPlugins = ["postcss-strip-inline-comments", "postcss-nested", "postcss-simple-vars", "postcss-color-function"].map((plugin) => require(plugin)());
-
-let inputFile = `${__dirname}/style.css`;
-let outputFile = `${__dirname}/../assets/bundle.css`;
-
-fs.readFile(inputFile, "utf-8").then((input) => {
-	return parse(input);
-}).then((ast) => {
-	return postcss(postcssPlugins).process(ast, {
-		from: "style.css",
-		to: "bundle.css"
-	});
-}).then((bundle) => {
-	return fs.writeFile(outputFile, bundle.css);
-}).then(() => {
-	console.log("Finished writing CSS bundle");
-});
diff --git a/web/source/package.json b/web/source/package.json
deleted file mode 100644
index d58091118..000000000
--- a/web/source/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-   "license": "AGPL-3.0",
-   "dependencies": {
-      "postcss": "^8.3.5",
-      "postcss-color-function": "^4.1.0",
-      "postcss-scss": "^4.0.0",
-      "postcss-nested": "^4.2.1",
-      "postcss-simple-vars": "^5.0.2",
-      "postcss-strip-inline-comments": "^0.1.5"
-   }
-}
diff --git a/web/template/404.tmpl b/web/template/404.tmpl
index 633ed65cf..096f7f364 100644
--- a/web/template/404.tmpl
+++ b/web/template/404.tmpl
@@ -1,11 +1,9 @@
 {{ template "header.tmpl" .}}
-
-<aside class="left logo">
-	<img src="/assets/sloth.png" alt="Clipart styled sloth logo">
-</aside>
-<section>
-	<h1>404: Page Not Found</h1>
-	If you believe this was an error, you can <a href="{{.instance.ContactAccount.URL}}">contact an admin</a>
-</section>
+<main>
+	<section>
+		<h1>404: Page Not Found</h1>
+		If you believe this was an error, you can <a href="{{.instance.ContactAccount.URL}}">contact an admin</a>
+	</section>
+</main>
 
 {{ template "footer.tmpl" .}}
\ No newline at end of file
diff --git a/web/template/authorize.tmpl b/web/template/authorize.tmpl
index bc609ed66..b6eef9561 100644
--- a/web/template/authorize.tmpl
+++ b/web/template/authorize.tmpl
@@ -1,15 +1,17 @@
 {{ template "header.tmpl" .}}
-    <form action="/oauth/authorize" method="POST">
-        <h1>Hi {{.user}}!</h1>
-        <p>Application <b>{{.appname}}</b> {{if len .appwebsite | eq 0 | not}}({{.appwebsite}}) {{end}}would like to perform actions on your behalf, with scope <em>{{.scope}}</em>.</p>
-        <p>The application will redirect to {{.redirect}} to continue.</p>
-        <p>
-            <button
-                type="submit"
-                style="width:200px;"
-            >
-                Allow
-            </button>
-        </p>
-    </form>
+    <main>
+        <form action="/oauth/authorize" method="POST">
+            <h1>Hi {{.user}}!</h1>
+            <p>Application <b>{{.appname}}</b> {{if len .appwebsite | eq 0 | not}}({{.appwebsite}}) {{end}}would like to perform actions on your behalf, with scope <em>{{.scope}}</em>.</p>
+            <p>The application will redirect to {{.redirect}} to continue.</p>
+            <p>
+                <button
+                    type="submit"
+                    style="width:200px;"
+                >
+                    Allow
+                </button>
+            </p>
+        </form>
+    </main>
 {{ template "footer.tmpl" .}}
\ No newline at end of file
diff --git a/web/template/header.tmpl b/web/template/header.tmpl
index 45d375ab8..0f224cf95 100644
--- a/web/template/header.tmpl
+++ b/web/template/header.tmpl
@@ -1,19 +1,26 @@
 <!DOCTYPE html>
-<!-- header.tmpl -->
+
+<!-- Header tmpl -->
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<meta name="og:title" content="{{.instance.Title}}">
-	<meta name="og:description" content="{{.instance.Description}}">
-	<link rel="stylesheet" href="/assets/bundle.css">
-	<link rel="shortcut icon" href="/assets/sloth.png" type="image/png">
+	<meta name="og:title" content="GoToSocial Testing Instance">
+	<meta name="og:description" content="">
+	<link rel="stylesheet" href="/assets/base.css">
+	{{range .stylesheets}}<link rel="stylesheet" href="{{.}}">
+	{{end}}
+	<link rel="shortcut icon" href="/assets/logo.png" type="image/png">
 	<title>{{.instance.Title}} - GoToSocial</title>
 </head>
 <body>
 	<header>
-		<h1>
-			{{.instance.Title}}
-		</h1>
+		<img src="/assets/logo.png" alt="Instance Logo"/>
+		<div>
+			<h1>
+				{{.instance.Title}}
+			</h1>
+		</div>
+		<div></div>
 	</header>
\ No newline at end of file
diff --git a/web/template/index.tmpl b/web/template/index.tmpl
index 6751c9bd2..52581d3aa 100644
--- a/web/template/index.tmpl
+++ b/web/template/index.tmpl
@@ -1,40 +1,40 @@
 {{ template "header.tmpl" .}}
-<div class="left logo">
-	<img src="/assets/sloth.png" alt="Clipart styled sloth logo">
-</div>
-<section>
-	<h1>Home to <span class="count">{{.instance.Stats.user_count}}</span> users
-		who posted <span class="count">{{.instance.Stats.status_count}}</span> statuses,
-		federating with  <span class="count">{{.instance.Stats.domain_count}}</span> other instances.</h1>
-	<div className="short-description">
-		{{.instance.ShortDescription |noescape}}
-	</div>
-</section>
+<main class="lightgray">
 
-<section class="apps">
-	<p>
-		GoToSocial does not provide its own frontend, but implements the Mastodon client API.
-		You can use this server through a variety of clients:
-	</p>
-	<div class="applist">
-		<div class="entry">
-			<svg class="logo redraw" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10000 10000">
-				<path d="M9212 5993H5987V823c1053 667 2747 2177 3225 5170zM3100 2690A12240 12240 0 01939 6035h2161zm676 7210h2448a3067 3067 0 003067-3067H5052V627a527 527 0 00-1052 0v6206H709a3067 3067 0 003067 3067z"></path>
-			</svg>
-			<div>
-				<h2>Pinafore</h2>
-				<p>Pinafore is a web client designed for speed and simplicity.</p>
-				<a class="button" href="https://pinafore.social/settings/instances/add">Use Pinafore</a>
+	<section>
+		<h1>Home to <span class="count">{{.instance.Stats.user_count}}</span> users
+			who posted <span class="count">{{.instance.Stats.status_count}}</span> statuses,
+			federating with  <span class="count">{{.instance.Stats.domain_count}}</span> other instances.</h1>
+		<div className="short-description">
+			{{.instance.ShortDescription |noescape}}
+		</div>
+	</section>
+	
+	<section class="apps">
+		<p>
+			GoToSocial does not provide its own frontend, but implements the Mastodon client API.
+			You can use this server through a variety of clients:
+		</p>
+		<div class="applist">
+			<div class="entry">
+				<svg class="logo redraw" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10000 10000">
+					<path d="M9212 5993H5987V823c1053 667 2747 2177 3225 5170zM3100 2690A12240 12240 0 01939 6035h2161zm676 7210h2448a3067 3067 0 003067-3067H5052V627a527 527 0 00-1052 0v6206H709a3067 3067 0 003067 3067z"></path>
+				</svg>
+				<div>
+					<h2>Pinafore</h2>
+					<p>Pinafore is a web client designed for speed and simplicity.</p>
+					<a class="button" href="https://pinafore.social/settings/instances/add">Use Pinafore</a>
+				</div>
+			</div>
+			<div class="entry">
+				<img class="logo" src="/assets/tusky.svg" alt="The Tusky mascot, a cartoon elephant tooting happily"/>
+				<div>
+					<h2>Tusky</h2>
+					<p>Tusky is a lightweight mobile client for Android</p>
+					<a class="button" href="https://tusky.app">Get Tusky</a>
+				</div>
 			</div>
 		</div>
-		<div class="entry">
-			<img class="logo" src="/assets/tusky.svg" alt="The Tusky mascot, a cartoon elephant tooting happily"/>
-			<div>
-				<h2>Tusky</h2>
-				<p>Tusky is a lightweight mobile client for Android</p>
-				<a class="button" href="https://tusky.app">Get Tusky</a>
-			</div>
-		</div>
-	</div>
-</section>
+	</section>
+</main>
 {{ template "footer.tmpl" .}}
\ No newline at end of file
diff --git a/web/template/sign-in.tmpl b/web/template/sign-in.tmpl
index cfe932b3a..48a833cee 100644
--- a/web/template/sign-in.tmpl
+++ b/web/template/sign-in.tmpl
@@ -1,13 +1,15 @@
 {{ template "header.tmpl" .}}
-<section class="login">
-    <h1>Login</h1>
-    <form action="/auth/sign_in" method="POST">
-        <label for="email">Email</label>
-        <input type="text" class="form-control" name="username" required placeholder="Please enter your email address">
-    
-        <label for="password">Password</label>
-        <input type="password" class="form-control" name="password" required placeholder="Please enter your password">
-        <button type="submit" class="btn btn-success">Login</button>
-    </form>
-</section>
+<main>
+    <section class="login">
+        <h1>Login</h1>
+        <form action="/auth/sign_in" method="POST">
+            <label for="email">Email</label>
+            <input type="text" class="form-control" name="username" required placeholder="Please enter your email address">
+        
+            <label for="password">Password</label>
+            <input type="password" class="form-control" name="password" required placeholder="Please enter your password">
+            <button type="submit" class="btn btn-success">Login</button>
+        </form>
+    </section>
+</main>
 {{ template "footer.tmpl" .}}
diff --git a/web/template/status.tmpl b/web/template/status.tmpl
new file mode 100644
index 000000000..343eb2d0a
--- /dev/null
+++ b/web/template/status.tmpl
@@ -0,0 +1,36 @@
+<a href="{{.Account.URL}}" class="avatar"><img src="{{.Account.Avatar}}"></a>
+<a href="{{.Account.URL}}" class="displayname">{{if .Account.DisplayName}}{{.Account.DisplayName}}{{else}}{{.Account.Username}}{{end}}</a>
+<a href="{{.Account.URL}}" class="username">@{{.Account.Username}}</a>
+<div class="text">
+	{{if .SpoilerText}}
+	<input class="spoiler" id="hideSpoiler-{{.ID}}" type="checkbox" style="display: none" aria-hidden="true" checked="true" />
+	<div class="spoiler">
+		<span>{{.SpoilerText}}</span><label class="spoiler-label" for="hideSpoiler-{{.ID}}">Toggle visibility</label>
+	</div>
+	{{end}}
+	<div class="content">
+		{{.Content |noescape}}
+	</div>
+</div>
+{{with .MediaAttachments}}
+	<div class="media {{(len .) | oddOrEven }}{{if eq (len .) 1}} single{{end}}{{if eq (len .) 2}} double{{end}}">
+		{{range .}}
+			<a href="{{.URL}}" target="_blank" title="{{.Description}}">
+					{{if not .Description}}
+			 		<div class="no-image-desc" aria-hidden="true" ><i class="fa fa-info-circle"></i><span>Missing image description</span></div>
+				{{end}}
+				<img src="{{.PreviewURL}}" alt="{{.Description}}"/>
+			</a>
+		{{end}}
+	</div>
+{{end}}
+<div class="info">
+	<div id="date">{{.CreatedAt | timestamp}}</div>
+	<div class="stats">
+		<div id="visibility">{{.Visibility | visibilityIcon}}</div>
+		<div id="replies"><i aria-label="Replies" class="fa fa-reply-all"></i> {{.RepliesCount}}</div>
+		<div id="boosts"><i aria-label="Boosts" class="fa fa-retweet"></i> {{.ReblogsCount}}</div>
+		<div id="favorites"><i aria-label="Favorites" class="fa fa-star"></i> {{.FavouritesCount}}</div>
+	</div>
+</div>
+<a href="{{.URL}}" class="toot-link">View toot</a>
\ No newline at end of file
diff --git a/web/template/thread.tmpl b/web/template/thread.tmpl
new file mode 100644
index 000000000..b6b91fd31
--- /dev/null
+++ b/web/template/thread.tmpl
@@ -0,0 +1,34 @@
+{{ template "header.tmpl" .}}
+<main>
+	<div class="thread">
+		{{range .context.Ancestors}}
+		<div class="toot">
+			{{ template "status.tmpl" .}}
+		</div>
+		{{end}}
+		<div class="toot expanded">
+			{{ template "status.tmpl" .status}}
+		</div>
+		{{range .context.Descendants}}
+		<div class="toot">
+			{{ template "status.tmpl" .}}
+		</div>
+		{{end}}
+	</div>
+</main>
+<script>
+	Array.from(document.getElementsByClassName("spoiler-label")).forEach((label) => {
+		let checkbox = document.getElementById(label.htmlFor);
+		function update() {
+			if(checkbox.checked) {
+				label.innerHTML = "Show more";
+			} else {
+				label.innerHTML = "Show less";
+			}
+		}
+		update();
+
+		label.addEventListener("click", () => {setTimeout(update, 1)});
+	});
+</script>
+{{ template "footer.tmpl" .}}
\ No newline at end of file