From e0588a6113ff6b3c1000fa6c82629f81fb5e05b5 Mon Sep 17 00:00:00 2001
From: winter
Date: Sat, 15 Mar 2025 18:53:29 +0000
Subject: [refactor] move some templates to subdirs

---
 templates/actor/atom.php                   |  51 +++++++++
 templates/actor/avatar.php                 |   5 +
 templates/actor/profile.php                |  83 ++++++++++++++
 templates/actor/profile_block_button.php   |   9 ++
 templates/actor/profile_editable.php       |  40 +++++++
 templates/actor/profile_follow_button.php  |  20 ++++
 templates/actor/profile_page.php           |  52 +++++++++
 templates/actor/profile_pending_follow.php |  21 ++++
 templates/actor/profile_reset_avatar.php   |   3 +
 templates/actor/rss.php                    |  46 ++++++++
 templates/actor_atom.php                   |  51 ---------
 templates/actor_avatar.php                 |   5 -
 templates/actor_profile.php                |  83 --------------
 templates/actor_profile_block_button.php   |   9 --
 templates/actor_profile_editable.php       |  40 -------
 templates/actor_profile_follow_button.php  |  20 ----
 templates/actor_profile_page.php           |  52 ---------
 templates/actor_profile_pending_follow.php |  21 ----
 templates/actor_profile_reset_avatar.php   |   3 -
 templates/actor_rss.php                    |  46 --------
 templates/attachment_pill.php              |  44 --------
 templates/follow_requests_page.php         |   2 +-
 templates/left_side_navigation.php         |  41 -------
 templates/mobilepane_left.php              |   6 +-
 templates/navigation/header_links.php      |  12 ++
 templates/navigation/left_side.php         |  41 +++++++
 templates/navigation/side_links.php        |  13 +++
 templates/navigation_links.php             |  12 --
 templates/note.php                         | 176 -----------------------------
 templates/note/attachment.php              |  17 +++
 templates/note/attachment_pill.php         |  44 ++++++++
 templates/note/link_preview.php            |  23 ++++
 templates/note/note.php                    | 176 +++++++++++++++++++++++++++++
 templates/note/reply_button.php            |  13 +++
 templates/note/reply_form.php              |  60 ++++++++++
 templates/note/write_form.php              |  49 ++++++++
 templates/note_attachment.php              |  17 ---
 templates/note_link_preview.php            |  23 ----
 templates/note_page.php                    |  36 ------
 templates/pages/list_item.php              |  11 ++
 templates/pages/list_page.php              |  19 ++++
 templates/pages/new_form.php               |  26 +++++
 templates/pages/new_page.php               |   4 +
 templates/pages/page.php                   |  36 ++++++
 templates/pages_list_item.php              |  11 --
 templates/pages_list_page.php              |  19 ----
 templates/pages_new_form.php               |  26 -----
 templates/pages_new_page.php               |   4 -
 templates/reply_button.php                 |  13 ---
 templates/reply_form.php                   |  60 ----------
 templates/side_navigation.php              |  13 ---
 templates/skeleton.php                     |  10 +-
 templates/thread_page.php                  |   2 +-
 templates/write_note_form.php              |  49 --------
 54 files changed, 884 insertions(+), 884 deletions(-)
 create mode 100644 templates/actor/atom.php
 create mode 100644 templates/actor/avatar.php
 create mode 100644 templates/actor/profile.php
 create mode 100644 templates/actor/profile_block_button.php
 create mode 100644 templates/actor/profile_editable.php
 create mode 100644 templates/actor/profile_follow_button.php
 create mode 100644 templates/actor/profile_page.php
 create mode 100644 templates/actor/profile_pending_follow.php
 create mode 100644 templates/actor/profile_reset_avatar.php
 create mode 100644 templates/actor/rss.php
 delete mode 100644 templates/actor_atom.php
 delete mode 100644 templates/actor_avatar.php
 delete mode 100644 templates/actor_profile.php
 delete mode 100644 templates/actor_profile_block_button.php
 delete mode 100644 templates/actor_profile_editable.php
 delete mode 100644 templates/actor_profile_follow_button.php
 delete mode 100644 templates/actor_profile_page.php
 delete mode 100644 templates/actor_profile_pending_follow.php
 delete mode 100644 templates/actor_profile_reset_avatar.php
 delete mode 100644 templates/actor_rss.php
 delete mode 100644 templates/attachment_pill.php
 delete mode 100644 templates/left_side_navigation.php
 create mode 100644 templates/navigation/header_links.php
 create mode 100644 templates/navigation/left_side.php
 create mode 100644 templates/navigation/side_links.php
 delete mode 100644 templates/navigation_links.php
 delete mode 100644 templates/note.php
 create mode 100644 templates/note/attachment.php
 create mode 100644 templates/note/attachment_pill.php
 create mode 100644 templates/note/link_preview.php
 create mode 100644 templates/note/note.php
 create mode 100644 templates/note/reply_button.php
 create mode 100644 templates/note/reply_form.php
 create mode 100644 templates/note/write_form.php
 delete mode 100644 templates/note_attachment.php
 delete mode 100644 templates/note_link_preview.php
 delete mode 100644 templates/note_page.php
 create mode 100644 templates/pages/list_item.php
 create mode 100644 templates/pages/list_page.php
 create mode 100644 templates/pages/new_form.php
 create mode 100644 templates/pages/new_page.php
 create mode 100644 templates/pages/page.php
 delete mode 100644 templates/pages_list_item.php
 delete mode 100644 templates/pages_list_page.php
 delete mode 100644 templates/pages_new_form.php
 delete mode 100644 templates/pages_new_page.php
 delete mode 100644 templates/reply_button.php
 delete mode 100644 templates/reply_form.php
 delete mode 100644 templates/side_navigation.php
 delete mode 100644 templates/write_note_form.php

(limited to 'templates')

diff --git a/templates/actor/atom.php b/templates/actor/atom.php
new file mode 100644
index 0000000..8bd40fb
--- /dev/null
+++ b/templates/actor/atom.php
@@ -0,0 +1,51 @@
+<?php
+/** @var \Digitigrade\Model\Actor $actor */
+/** @var string $lang */
+
+use Digitigrade\GlobalSettings;
+use Digitigrade\Model\Note;
+use Digitigrade\Model\NotePrivacyScope;
+
+$selfUri = path_to_uri("/actor/$actor->id/feed/$lang/feed.atom");
+$actorPage = path_to_uri("/@/$actor->handle");
+
+echo '<?xml version="1.0" encoding="utf-8"?>';
+?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <id><?= $selfUri ?></id>
+    <title>
+        <?= htmlspecialchars($actor->displayName) ?> — <?= GlobalSettings::getInstance()->get('instance.name') ?>
+    </title>
+    <updated><?= Note::findAllWithAuthor($actor, 1)[0]->created->format(DateTime::ATOM) ?></updated>
+    <author>
+        <name><?= htmlspecialchars($actor->displayName) ?></name>
+        <uri><?= $actorPage ?></uri>
+    </author>
+    <link rel="self" href="<?= $selfUri ?>" />
+    <link rel="alternate" type="text/html" href="<?= $actorPage ?>" />
+    <generator version="<?= get_version() ?>">Digitigrade</generator>
+    <?php if (isset($actor->avatar)): ?>
+        <icon><?= $actor->avatar ?></icon>
+    <?php endif; ?>
+    <subtitle><?= __f('user.rss.description', $actor->displayName) ?></subtitle>
+
+    <?php foreach (Note::findAllWithAuthor($actor, limit: 50) as $note): ?>
+        <?php
+        /** @var Note $note */
+        if ($note->privacy->scope != NotePrivacyScope::PUBLIC || $note->inReplyTo != null) {
+            continue;
+        }
+        ?>
+        <entry>
+            <id><?= path_to_uri("/note/$note->id") ?></id>
+            <title><![CDATA[<?= htmlspecialchars(substr($note->plainContent, 0, 50), double_encode: false) ?>]]></title>
+            <updated><?= ($note->modified ?? $note->created)->format(DateTime::ATOM) ?></updated>
+            <link rel="alternate" type="text/html" href="<?= path_to_uri("/@/$actor->handle/note/$note->id") ?>" />
+            <content type="html"><![CDATA[<?= $note->getBestContentAsHtml() ?>]]></content>
+            <?php foreach ($note->attachments as $file): ?>
+                <link rel="enclosure" title="<?= htmlspecialchars($file->description) ?>" type="<?= $file->type ?>"
+                    href="<?= $file->href ?>" />
+            <?php endforeach; ?>
+        </entry>
+    <?php endforeach; ?>
+</feed>
\ No newline at end of file
diff --git a/templates/actor/avatar.php b/templates/actor/avatar.php
new file mode 100644
index 0000000..16b529b
--- /dev/null
+++ b/templates/actor/avatar.php
@@ -0,0 +1,5 @@
+<?php if (isset($actor->avatar)): ?>
+    <img class="avatar" src="<?= $actor->avatar ?>">
+<?php else: ?>
+    <img class="avatar" src="/static/default-avatar.png">
+<?php endif; ?>
\ No newline at end of file
diff --git a/templates/actor/profile.php b/templates/actor/profile.php
new file mode 100644
index 0000000..be27c86
--- /dev/null
+++ b/templates/actor/profile.php
@@ -0,0 +1,83 @@
+<?php
+use Digitigrade\Model\UserAccount;
+use Digitigrade\UserSettings;
+
+$user = UserAccount::findByCurrentSession();
+$actorUser = UserAccount::findByLinkedActor($actor);
+?>
+<div class="fullProfile">
+    <div class="basicInfo">
+
+        <?php if ($addLink ?? false): ?>
+            <a href="/@/<?= $actor->getFullHandle() ?>">
+            <?php endif; ?>
+            <?php call_template('actor/avatar', ['actor' => $actor]); ?>
+            <?php if ($addLink ?? false): ?>
+            </a>
+        <?php endif; ?>
+
+        <div>
+            <div class="displayName"><?= htmlspecialchars($actor->displayName) ?></div>
+            <div class="pronouns"><?= htmlspecialchars($actor->pronouns) ?></div>
+            <div class="handle">@<?= $actor->getFullHandle() ?></div>
+            <div class="joinedDate"><?= sprintf(__('user.profile.createdAt'), $actor->created->format('Y-m-d')) ?>
+            </div>
+        </div>
+
+        <div class="profileMiniActions">
+            <?php call_template('menu_button', [], function () use ($actor, $user, $actorUser) { ?>
+                <?php if (!$actor->isLocal && isset($actor->homepage)): ?>
+                    <li>
+                        <a href="<?= $actor->homepage ?>" target="_blank">
+                            <span class="material-symbols open-in-new"></span>
+                            <span><?= __('user.profile.openRemote') ?></span>
+                        </a>
+                    </li>
+                <?php endif; ?>
+                <?php if ($actorUser != null && (new UserSettings($actorUser))->getBool('profile.rssEnabled')): ?>
+                    <?php $lang = get_ui_language(); ?>
+                    <li>
+                        <a href="<?= "/actor/$actor->id/feed/$lang/feed.rss" ?>" target="_blank" type="application/rss+xml">
+                            <span class="material-symbols rss-feed"></span>
+                            <span><?= __('user.profile.feed.rss') ?></span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="<?= "/actor/$actor->id/feed/$lang/feed.atom" ?>" target="_blank" type="application/atom+xml">
+                            <span class="material-symbols orbit-outline"></span>
+                            <span><?= __('user.profile.feed.atom') ?></span>
+                        </a>
+                    </li>
+                <?php endif; ?>
+                <?php if ($user != null && $user->actor != $actor): ?>
+                    <li><?php call_template('actor/profile_block_button', ['user' => $user, 'actor' => $actor]) ?></li>
+                <?php endif; ?>
+            <?php }); ?>
+        </div>
+
+    </div>
+
+    <?php if (isset($actor->bio) && $actor->bio != '') { ?>
+        <pre class="bio"><?= htmlspecialchars($actor->bio) ?></pre>
+    <?php } else {
+        call_template('placeholder_text', ['message' => __('user.profile.bio.placeholder')]);
+    } ?>
+
+    <?php if (isset($user) && $actor->id != $user->actor->id): ?>
+        <div class="profileActions">
+            <?php if ($actor->followsPending($user->actor))
+                call_template('actor/profile_pending_follow', ['subject' => $actor, 'object' => $user->actor]); ?>
+            <?php if ($actor->follows($user->actor)): ?>
+                <?= __('user.profile.followsYou') ?>
+            <?php endif; ?>
+            <?php call_template('actor/profile_follow_button', ['actor' => $actor, 'user' => $user]); ?>
+        </div>
+    <?php elseif ($actor->id == $user->actor->id): ?>
+        <div class="profileActions">
+            <button class="primary" hx-get="/fragment/profile" hx-target="closest .fullProfile" hx-swap="outerHTML">
+                <?= __('form.edit') ?>
+            </button>
+        </div>
+    <?php endif; ?>
+
+</div>
\ No newline at end of file
diff --git a/templates/actor/profile_block_button.php b/templates/actor/profile_block_button.php
new file mode 100644
index 0000000..1b71613
--- /dev/null
+++ b/templates/actor/profile_block_button.php
@@ -0,0 +1,9 @@
+<?php
+$blocks = $user->actor->blocks($actor);
+$action = $blocks ? 'unblock' : 'block';
+?>
+<button hx-confirm="<?= __("user.profile.$action.confirm") ?>" hx-post="/fragment/actor/<?= $actor->id ?>/blockButton"
+    hx-swap="outerHTML">
+    <span class="material-symbols <?= $blocks ? 'remove' : 'block' ?>"></span>
+    <span><?= __("user.profile.$action") ?></span>
+</button>
\ No newline at end of file
diff --git a/templates/actor/profile_editable.php b/templates/actor/profile_editable.php
new file mode 100644
index 0000000..fc969bd
--- /dev/null
+++ b/templates/actor/profile_editable.php
@@ -0,0 +1,40 @@
+<form class="fullProfile" hx-post="/fragment/profile" hx-swap="outerHTML" enctype="multipart/form-data">
+    <div class="basicInfo">
+        <?php call_template('actor/avatar', ['actor' => $actor]); ?>
+        <div>
+            <div class="row">
+                <div class="column">
+                    <label for="profileDisplayName"><?= __('user.profile.displayName') ?></label>
+                    <input id="profileDisplayName" name="displayName" type="text" required
+                        value="<?= htmlspecialchars($actor->displayName) ?>">
+                </div>
+                <div class="column">
+                    <label for="profilePronouns"><?= __('user.profile.pronouns') ?></label>
+                    <input id="profilePronouns" name="pronouns" type="text"
+                        value="<?= htmlspecialchars($actor->pronouns) ?>">
+                </div>
+            </div>
+            <div class="handle">@<?= $actor->getFullHandle() ?></div>
+            <div class="joinedDate"><?= sprintf(__('user.profile.createdAt'), $actor->created->format('Y-m-d')) ?></div>
+        </div>
+    </div>
+
+    <div class="row">
+        <label for="profileAvatar"><?= __('user.profile.changeAvatar') ?></label>
+        <input style="display: inline-block" type="file" id="profileAvatar" name="avatar" accept="image/*">
+        <?php call_template('actor/profile_reset_avatar'); ?>
+    </div>
+
+    <div class="row">
+        <label for="profileBio"><?= __('user.profile.bio') ?></label>
+        <textarea id="profileBio" name="bio"><?= htmlspecialchars($actor->bio ?? '') ?></textarea>
+    </div>
+
+    <div class="profileActions">
+        <button type="button" class="secondary" hx-get="/fragment/actor/<?= $actor->id ?>"
+            hx-target="closest .fullProfile" hx-swap="outerHTML">
+            <?= __('form.discardChanges') ?>
+        </button>
+        <button class="primary"><?= __('form.saveChanges') ?></button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/templates/actor/profile_follow_button.php b/templates/actor/profile_follow_button.php
new file mode 100644
index 0000000..e2b314d
--- /dev/null
+++ b/templates/actor/profile_follow_button.php
@@ -0,0 +1,20 @@
+<?php
+use Digitigrade\Model\FollowRelation;
+use Digitigrade\Model\FollowRelationStatus;
+
+$relation = FollowRelation::findByActors($user->actor, $actor);
+$state = match ($relation?->status) {
+    null => $actor->requestToFollow ? 'request' : 'normal',
+    FollowRelationStatus::PENDING => 'pending',
+    FollowRelationStatus::ACTIVE => 'active'
+};
+?>
+<button class="<?= $state == 'active' ? 'secondary' : 'primary' ?>"
+    hx-post="/fragment/actor/<?= $actor->id ?>/followButton" hx-swap="outerHTML" <?= $state == 'pending' ? 'disabled' : '' ?> hx-disabled-elt="this">
+    <?= __(match ($state) {
+        'active' => 'user.profile.unfollow.action',
+        'pending' => 'user.profile.follow.pending',
+        'request' => 'user.profile.requestToFollow.action',
+        'normal' => 'user.profile.follow.action'
+    }) ?>
+</button>
\ No newline at end of file
diff --git a/templates/actor/profile_page.php b/templates/actor/profile_page.php
new file mode 100644
index 0000000..9c11dd6
--- /dev/null
+++ b/templates/actor/profile_page.php
@@ -0,0 +1,52 @@
+<?php
+
+use Digitigrade\Model\Note;
+use Digitigrade\Model\UserAccount;
+use Digitigrade\UserSettings;
+
+$lang = get_ui_language();
+$actorUser = UserAccount::findByLinkedActor($actor);
+
+call_template('skeleton', [
+    'pageTitle' => "$actor->displayName - @" . $actor->getFullHandle(),
+    'renderTitleHeading' => false,
+    'ogTitle' => $actor->displayName,
+    'ogDesc' => $actor->bio,
+    'ogImage' => $actor->avatar ?? path_to_uri('/static/default-avatar.png'),
+    'ogType' => 'profile',
+    'ogHandle' => '@' . $actor->getFullHandle(true),
+    'headLinks' => ($actorUser != null && (new UserSettings($actorUser))->getBool('profile.rssEnabled')) ? [
+        [
+            'rel' => 'alternate',
+            'type' => 'application/rss+xml',
+            'href' => "/actor/$actor->id/feed/$lang/feed.rss",
+            'title' => __('user.profile.feed.rss')
+        ],
+        [
+            'rel' => 'alternate',
+            'type' => 'application/atom+xml',
+            'href' => "/actor/$actor->id/feed/$lang/feed.atom",
+            'title' => __('user.profile.feed.atom')
+        ]
+    ] : []
+], function () use ($actor) {
+    $user = UserAccount::findByCurrentSession();
+
+    call_template('actor/profile', ['actor' => $actor]);
+    echo '<hr>';
+    $notes = Note::findAllWithAuthor($actor, 20);
+    if (count($notes) == 0) {
+        call_template('placeholder_text', ['message' => __('user.notes.placeholder')]);
+    } elseif ($user != null && $user->actor->blocks($actor)) {
+        call_template('placeholder_text', ['message' => __('user.profile.notesHidden')]);
+    } else {
+        foreach ($notes as $n) {
+            if ($n->isViewableBy($user))
+                call_template('note/note', ['note' => $n]);
+        }
+        $countNotShown = Note::countWithAuthor($actor) - count($notes);
+        if ($countNotShown >= 0) {
+            call_template('placeholder_text', ['count' => $countNotShown]);
+        }
+    }
+});
\ No newline at end of file
diff --git a/templates/actor/profile_pending_follow.php b/templates/actor/profile_pending_follow.php
new file mode 100644
index 0000000..2f49fcd
--- /dev/null
+++ b/templates/actor/profile_pending_follow.php
@@ -0,0 +1,21 @@
+<?php if (isset($response)): ?>
+
+    <div class="pendingInfo">
+        <?= __("followRequests.$response") ?>
+    </div>
+
+<?php else: ?>
+
+    <div class="pendingInfo">
+        <?= __('user.profile.pendingFollowsYou') ?>
+        <button class="primary" hx-post="/fragment/actor/<?= $subject->id ?>/acceptPending" hx-target="closest .pendingInfo"
+            hx-swap="outerHTML">
+            <?= __('followRequests.accept.action') ?>
+        </button>
+        <button class="secondary" hx-post="/fragment/actor/<?= $subject->id ?>/rejectPending"
+            hx-target="closest .pendingInfo" hx-swap="outerHTML">
+            <?= __('followRequests.reject.action') ?>
+        </button>
+    </div>
+
+<?php endif; ?>
\ No newline at end of file
diff --git a/templates/actor/profile_reset_avatar.php b/templates/actor/profile_reset_avatar.php
new file mode 100644
index 0000000..86a3507
--- /dev/null
+++ b/templates/actor/profile_reset_avatar.php
@@ -0,0 +1,3 @@
+<button type="button" class="secondary inline" hx-post="/fragment/profile/resetAvatar" <?= ($reset ?? false) ? 'disabled' : '' ?>>
+    <?= __(($reset ?? false) ? 'user.profile.avatarReset' : 'user.profile.resetAvatar') ?>
+</button>
\ No newline at end of file
diff --git a/templates/actor/rss.php b/templates/actor/rss.php
new file mode 100644
index 0000000..03fc4f5
--- /dev/null
+++ b/templates/actor/rss.php
@@ -0,0 +1,46 @@
+<?php
+/** @var \Digitigrade\Model\Actor $actor */
+/** @var string $lang */
+
+use Digitigrade\GlobalSettings;
+use Digitigrade\Model\Note;
+use Digitigrade\Model\NotePrivacyScope;
+
+// putting this here because otherwise my ide yells about "shorthand <?"
+// because it thinks i'm trying to do a php thing instead of xml directive
+echo '<?xml version="1.0" encoding="utf-8"?>';
+?>
+<rss version="2.0">
+    <channel>
+        <title>
+            <?= htmlspecialchars($actor->displayName) ?> — <?= GlobalSettings::getInstance()->get('instance.name') ?>
+        </title>
+        <link><?= path_to_uri("/@/$actor->handle") ?></link>
+        <description><?= __f('user.rss.description', htmlspecialchars($actor->displayName)) ?></description>
+        <language><?= $lang ?></language>
+        <generator><?= __f('version', get_version()) ?></generator>
+        <?php if (isset($actor->avatar)): ?>
+            <image>
+                <url><?= $actor->avatar ?></url>
+            </image>
+        <?php endif; ?>
+        <?php foreach (Note::findAllWithAuthor($actor, limit: 50) as $note): ?>
+            <?php
+            /** @var Note $note */
+            if ($note->privacy->scope != NotePrivacyScope::PUBLIC || $note->inReplyTo != null) {
+                continue;
+            }
+            ?>
+            <item>
+                <link><?= path_to_uri("/@/$actor->handle/note/$note->id") ?></link>
+                <guid><?= path_to_uri("/note/$note->id") ?></guid>
+                <title><![CDATA[<?= htmlspecialchars(substr($note->plainContent, 0, 50), double_encode: false) ?>]]></title>
+                <description><![CDATA[<?= $note->getBestContentAsHtml() ?>]]></description>
+                <pubDate><?= $note->created->format(DateTime::RSS) ?></pubDate>
+                <?php foreach ($note->attachments as $file): ?>
+                    <enclosure url="<?= $file->href ?>" type="<?= $file->type ?>" size="-1" /><!-- size unknown sorry :( -->
+                <?php endforeach; ?>
+            </item>
+        <?php endforeach; ?>
+    </channel>
+</rss>
\ No newline at end of file
diff --git a/templates/actor_atom.php b/templates/actor_atom.php
deleted file mode 100644
index 8bd40fb..0000000
--- a/templates/actor_atom.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/** @var \Digitigrade\Model\Actor $actor */
-/** @var string $lang */
-
-use Digitigrade\GlobalSettings;
-use Digitigrade\Model\Note;
-use Digitigrade\Model\NotePrivacyScope;
-
-$selfUri = path_to_uri("/actor/$actor->id/feed/$lang/feed.atom");
-$actorPage = path_to_uri("/@/$actor->handle");
-
-echo '<?xml version="1.0" encoding="utf-8"?>';
-?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <id><?= $selfUri ?></id>
-    <title>
-        <?= htmlspecialchars($actor->displayName) ?> — <?= GlobalSettings::getInstance()->get('instance.name') ?>
-    </title>
-    <updated><?= Note::findAllWithAuthor($actor, 1)[0]->created->format(DateTime::ATOM) ?></updated>
-    <author>
-        <name><?= htmlspecialchars($actor->displayName) ?></name>
-        <uri><?= $actorPage ?></uri>
-    </author>
-    <link rel="self" href="<?= $selfUri ?>" />
-    <link rel="alternate" type="text/html" href="<?= $actorPage ?>" />
-    <generator version="<?= get_version() ?>">Digitigrade</generator>
-    <?php if (isset($actor->avatar)): ?>
-        <icon><?= $actor->avatar ?></icon>
-    <?php endif; ?>
-    <subtitle><?= __f('user.rss.description', $actor->displayName) ?></subtitle>
-
-    <?php foreach (Note::findAllWithAuthor($actor, limit: 50) as $note): ?>
-        <?php
-        /** @var Note $note */
-        if ($note->privacy->scope != NotePrivacyScope::PUBLIC || $note->inReplyTo != null) {
-            continue;
-        }
-        ?>
-        <entry>
-            <id><?= path_to_uri("/note/$note->id") ?></id>
-            <title><![CDATA[<?= htmlspecialchars(substr($note->plainContent, 0, 50), double_encode: false) ?>]]></title>
-            <updated><?= ($note->modified ?? $note->created)->format(DateTime::ATOM) ?></updated>
-            <link rel="alternate" type="text/html" href="<?= path_to_uri("/@/$actor->handle/note/$note->id") ?>" />
-            <content type="html"><![CDATA[<?= $note->getBestContentAsHtml() ?>]]></content>
-            <?php foreach ($note->attachments as $file): ?>
-                <link rel="enclosure" title="<?= htmlspecialchars($file->description) ?>" type="<?= $file->type ?>"
-                    href="<?= $file->href ?>" />
-            <?php endforeach; ?>
-        </entry>
-    <?php endforeach; ?>
-</feed>
\ No newline at end of file
diff --git a/templates/actor_avatar.php b/templates/actor_avatar.php
deleted file mode 100644
index 16b529b..0000000
--- a/templates/actor_avatar.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php if (isset($actor->avatar)): ?>
-    <img class="avatar" src="<?= $actor->avatar ?>">
-<?php else: ?>
-    <img class="avatar" src="/static/default-avatar.png">
-<?php endif; ?>
\ No newline at end of file
diff --git a/templates/actor_profile.php b/templates/actor_profile.php
deleted file mode 100644
index dfb0174..0000000
--- a/templates/actor_profile.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-use Digitigrade\Model\UserAccount;
-use Digitigrade\UserSettings;
-
-$user = UserAccount::findByCurrentSession();
-$actorUser = UserAccount::findByLinkedActor($actor);
-?>
-<div class="fullProfile">
-    <div class="basicInfo">
-
-        <?php if ($addLink ?? false): ?>
-            <a href="/@/<?= $actor->getFullHandle() ?>">
-            <?php endif; ?>
-            <?php call_template('actor_avatar', ['actor' => $actor]); ?>
-            <?php if ($addLink ?? false): ?>
-            </a>
-        <?php endif; ?>
-
-        <div>
-            <div class="displayName"><?= htmlspecialchars($actor->displayName) ?></div>
-            <div class="pronouns"><?= htmlspecialchars($actor->pronouns) ?></div>
-            <div class="handle">@<?= $actor->getFullHandle() ?></div>
-            <div class="joinedDate"><?= sprintf(__('user.profile.createdAt'), $actor->created->format('Y-m-d')) ?>
-            </div>
-        </div>
-
-        <div class="profileMiniActions">
-            <?php call_template('menu_button', [], function () use ($actor, $user, $actorUser) { ?>
-                <?php if (!$actor->isLocal && isset($actor->homepage)): ?>
-                    <li>
-                        <a href="<?= $actor->homepage ?>" target="_blank">
-                            <span class="material-symbols open-in-new"></span>
-                            <span><?= __('user.profile.openRemote') ?></span>
-                        </a>
-                    </li>
-                <?php endif; ?>
-                <?php if ($actorUser != null && (new UserSettings($actorUser))->getBool('profile.rssEnabled')): ?>
-                    <?php $lang = get_ui_language(); ?>
-                    <li>
-                        <a href="<?= "/actor/$actor->id/feed/$lang/feed.rss" ?>" target="_blank" type="application/rss+xml">
-                            <span class="material-symbols rss-feed"></span>
-                            <span><?= __('user.profile.feed.rss') ?></span>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="<?= "/actor/$actor->id/feed/$lang/feed.atom" ?>" target="_blank" type="application/atom+xml">
-                            <span class="material-symbols orbit-outline"></span>
-                            <span><?= __('user.profile.feed.atom') ?></span>
-                        </a>
-                    </li>
-                <?php endif; ?>
-                <?php if ($user != null && $user->actor != $actor): ?>
-                    <li><?php call_template('actor_profile_block_button', ['user' => $user, 'actor' => $actor]) ?></li>
-                <?php endif; ?>
-            <?php }); ?>
-        </div>
-
-    </div>
-
-    <?php if (isset($actor->bio) && $actor->bio != '') { ?>
-        <pre class="bio"><?= htmlspecialchars($actor->bio) ?></pre>
-    <?php } else {
-        call_template('placeholder_text', ['message' => __('user.profile.bio.placeholder')]);
-    } ?>
-
-    <?php if (isset($user) && $actor->id != $user->actor->id): ?>
-        <div class="profileActions">
-            <?php if ($actor->followsPending($user->actor))
-                call_template('actor_profile_pending_follow', ['subject' => $actor, 'object' => $user->actor]); ?>
-            <?php if ($actor->follows($user->actor)): ?>
-                <?= __('user.profile.followsYou') ?>
-            <?php endif; ?>
-            <?php call_template('actor_profile_follow_button', ['actor' => $actor, 'user' => $user]); ?>
-        </div>
-    <?php elseif ($actor->id == $user->actor->id): ?>
-        <div class="profileActions">
-            <button class="primary" hx-get="/fragment/profile" hx-target="closest .fullProfile" hx-swap="outerHTML">
-                <?= __('form.edit') ?>
-            </button>
-        </div>
-    <?php endif; ?>
-
-</div>
\ No newline at end of file
diff --git a/templates/actor_profile_block_button.php b/templates/actor_profile_block_button.php
deleted file mode 100644
index 1b71613..0000000
--- a/templates/actor_profile_block_button.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$blocks = $user->actor->blocks($actor);
-$action = $blocks ? 'unblock' : 'block';
-?>
-<button hx-confirm="<?= __("user.profile.$action.confirm") ?>" hx-post="/fragment/actor/<?= $actor->id ?>/blockButton"
-    hx-swap="outerHTML">
-    <span class="material-symbols <?= $blocks ? 'remove' : 'block' ?>"></span>
-    <span><?= __("user.profile.$action") ?></span>
-</button>
\ No newline at end of file
diff --git a/templates/actor_profile_editable.php b/templates/actor_profile_editable.php
deleted file mode 100644
index 6ff5d8c..0000000
--- a/templates/actor_profile_editable.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<form class="fullProfile" hx-post="/fragment/profile" hx-swap="outerHTML" enctype="multipart/form-data">
-    <div class="basicInfo">
-        <?php call_template('actor_avatar', ['actor' => $actor]); ?>
-        <div>
-            <div class="row">
-                <div class="column">
-                    <label for="profileDisplayName"><?= __('user.profile.displayName') ?></label>
-                    <input id="profileDisplayName" name="displayName" type="text" required
-                        value="<?= htmlspecialchars($actor->displayName) ?>">
-                </div>
-                <div class="column">
-                    <label for="profilePronouns"><?= __('user.profile.pronouns') ?></label>
-                    <input id="profilePronouns" name="pronouns" type="text"
-                        value="<?= htmlspecialchars($actor->pronouns) ?>">
-                </div>
-            </div>
-            <div class="handle">@<?= $actor->getFullHandle() ?></div>
-            <div class="joinedDate"><?= sprintf(__('user.profile.createdAt'), $actor->created->format('Y-m-d')) ?></div>
-        </div>
-    </div>
-
-    <div class="row">
-        <label for="profileAvatar"><?= __('user.profile.changeAvatar') ?></label>
-        <input style="display: inline-block" type="file" id="profileAvatar" name="avatar" accept="image/*">
-        <?php call_template('actor_profile_reset_avatar'); ?>
-    </div>
-
-    <div class="row">
-        <label for="profileBio"><?= __('user.profile.bio') ?></label>
-        <textarea id="profileBio" name="bio"><?= htmlspecialchars($actor->bio ?? '') ?></textarea>
-    </div>
-
-    <div class="profileActions">
-        <button type="button" class="secondary" hx-get="/fragment/actor/<?= $actor->id ?>"
-            hx-target="closest .fullProfile" hx-swap="outerHTML">
-            <?= __('form.discardChanges') ?>
-        </button>
-        <button class="primary"><?= __('form.saveChanges') ?></button>
-    </div>
-</form>
\ No newline at end of file
diff --git a/templates/actor_profile_follow_button.php b/templates/actor_profile_follow_button.php
deleted file mode 100644
index e2b314d..0000000
--- a/templates/actor_profile_follow_button.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-use Digitigrade\Model\FollowRelation;
-use Digitigrade\Model\FollowRelationStatus;
-
-$relation = FollowRelation::findByActors($user->actor, $actor);
-$state = match ($relation?->status) {
-    null => $actor->requestToFollow ? 'request' : 'normal',
-    FollowRelationStatus::PENDING => 'pending',
-    FollowRelationStatus::ACTIVE => 'active'
-};
-?>
-<button class="<?= $state == 'active' ? 'secondary' : 'primary' ?>"
-    hx-post="/fragment/actor/<?= $actor->id ?>/followButton" hx-swap="outerHTML" <?= $state == 'pending' ? 'disabled' : '' ?> hx-disabled-elt="this">
-    <?= __(match ($state) {
-        'active' => 'user.profile.unfollow.action',
-        'pending' => 'user.profile.follow.pending',
-        'request' => 'user.profile.requestToFollow.action',
-        'normal' => 'user.profile.follow.action'
-    }) ?>
-</button>
\ No newline at end of file
diff --git a/templates/actor_profile_page.php b/templates/actor_profile_page.php
deleted file mode 100644
index 1b2981d..0000000
--- a/templates/actor_profile_page.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-use Digitigrade\Model\Note;
-use Digitigrade\Model\UserAccount;
-use Digitigrade\UserSettings;
-
-$lang = get_ui_language();
-$actorUser = UserAccount::findByLinkedActor($actor);
-
-call_template('skeleton', [
-    'pageTitle' => "$actor->displayName - @" . $actor->getFullHandle(),
-    'renderTitleHeading' => false,
-    'ogTitle' => $actor->displayName,
-    'ogDesc' => $actor->bio,
-    'ogImage' => $actor->avatar ?? path_to_uri('/static/default-avatar.png'),
-    'ogType' => 'profile',
-    'ogHandle' => '@' . $actor->getFullHandle(true),
-    'headLinks' => ($actorUser != null && (new UserSettings($actorUser))->getBool('profile.rssEnabled')) ? [
-        [
-            'rel' => 'alternate',
-            'type' => 'application/rss+xml',
-            'href' => "/actor/$actor->id/feed/$lang/feed.rss",
-            'title' => __('user.profile.feed.rss')
-        ],
-        [
-            'rel' => 'alternate',
-            'type' => 'application/atom+xml',
-            'href' => "/actor/$actor->id/feed/$lang/feed.atom",
-            'title' => __('user.profile.feed.atom')
-        ]
-    ] : []
-], function () use ($actor) {
-    $user = UserAccount::findByCurrentSession();
-
-    call_template('actor_profile', ['actor' => $actor]);
-    echo '<hr>';
-    $notes = Note::findAllWithAuthor($actor, 20);
-    if (count($notes) == 0) {
-        call_template('placeholder_text', ['message' => __('user.notes.placeholder')]);
-    } elseif ($user != null && $user->actor->blocks($actor)) {
-        call_template('placeholder_text', ['message' => __('user.profile.notesHidden')]);
-    } else {
-        foreach ($notes as $n) {
-            if ($n->isViewableBy($user))
-                call_template('note', ['note' => $n]);
-        }
-        $countNotShown = Note::countWithAuthor($actor) - count($notes);
-        if ($countNotShown >= 0) {
-            call_template('placeholder_text', ['count' => $countNotShown]);
-        }
-    }
-});
\ No newline at end of file
diff --git a/templates/actor_profile_pending_follow.php b/templates/actor_profile_pending_follow.php
deleted file mode 100644
index 2f49fcd..0000000
--- a/templates/actor_profile_pending_follow.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php if (isset($response)): ?>
-
-    <div class="pendingInfo">
-        <?= __("followRequests.$response") ?>
-    </div>
-
-<?php else: ?>
-
-    <div class="pendingInfo">
-        <?= __('user.profile.pendingFollowsYou') ?>
-        <button class="primary" hx-post="/fragment/actor/<?= $subject->id ?>/acceptPending" hx-target="closest .pendingInfo"
-            hx-swap="outerHTML">
-            <?= __('followRequests.accept.action') ?>
-        </button>
-        <button class="secondary" hx-post="/fragment/actor/<?= $subject->id ?>/rejectPending"
-            hx-target="closest .pendingInfo" hx-swap="outerHTML">
-            <?= __('followRequests.reject.action') ?>
-        </button>
-    </div>
-
-<?php endif; ?>
\ No newline at end of file
diff --git a/templates/actor_profile_reset_avatar.php b/templates/actor_profile_reset_avatar.php
deleted file mode 100644
index 86a3507..0000000
--- a/templates/actor_profile_reset_avatar.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<button type="button" class="secondary inline" hx-post="/fragment/profile/resetAvatar" <?= ($reset ?? false) ? 'disabled' : '' ?>>
-    <?= __(($reset ?? false) ? 'user.profile.avatarReset' : 'user.profile.resetAvatar') ?>
-</button>
\ No newline at end of file
diff --git a/templates/actor_rss.php b/templates/actor_rss.php
deleted file mode 100644
index 03fc4f5..0000000
--- a/templates/actor_rss.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/** @var \Digitigrade\Model\Actor $actor */
-/** @var string $lang */
-
-use Digitigrade\GlobalSettings;
-use Digitigrade\Model\Note;
-use Digitigrade\Model\NotePrivacyScope;
-
-// putting this here because otherwise my ide yells about "shorthand <?"
-// because it thinks i'm trying to do a php thing instead of xml directive
-echo '<?xml version="1.0" encoding="utf-8"?>';
-?>
-<rss version="2.0">
-    <channel>
-        <title>
-            <?= htmlspecialchars($actor->displayName) ?> — <?= GlobalSettings::getInstance()->get('instance.name') ?>
-        </title>
-        <link><?= path_to_uri("/@/$actor->handle") ?></link>
-        <description><?= __f('user.rss.description', htmlspecialchars($actor->displayName)) ?></description>
-        <language><?= $lang ?></language>
-        <generator><?= __f('version', get_version()) ?></generator>
-        <?php if (isset($actor->avatar)): ?>
-            <image>
-                <url><?= $actor->avatar ?></url>
-            </image>
-        <?php endif; ?>
-        <?php foreach (Note::findAllWithAuthor($actor, limit: 50) as $note): ?>
-            <?php
-            /** @var Note $note */
-            if ($note->privacy->scope != NotePrivacyScope::PUBLIC || $note->inReplyTo != null) {
-                continue;
-            }
-            ?>
-            <item>
-                <link><?= path_to_uri("/@/$actor->handle/note/$note->id") ?></link>
-                <guid><?= path_to_uri("/note/$note->id") ?></guid>
-                <title><![CDATA[<?= htmlspecialchars(substr($note->plainContent, 0, 50), double_encode: false) ?>]]></title>
-                <description><![CDATA[<?= $note->getBestContentAsHtml() ?>]]></description>
-                <pubDate><?= $note->created->format(DateTime::RSS) ?></pubDate>
-                <?php foreach ($note->attachments as $file): ?>
-                    <enclosure url="<?= $file->href ?>" type="<?= $file->type ?>" size="-1" /><!-- size unknown sorry :( -->
-                <?php endforeach; ?>
-            </item>
-        <?php endforeach; ?>
-    </channel>
-</rss>
\ No newline at end of file
diff --git a/templates/attachment_pill.php b/templates/attachment_pill.php
deleted file mode 100644
index 6fff74d..0000000
--- a/templates/attachment_pill.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$type ??= 'add';
-?>
-
-<?php if ($type == 'add'): ?>
-
-    <button id="writeNoteAttachmentPillAdder" type="button" class="inlinePill" type="button"
-        _="on click set f to #noteAttachmentFile then f.click()">
-        <span class="pillIcon material-symbols add"></span>
-        <span class="pillText"><?= __('writeNote.attachments.add.action') ?></span>
-    </button>
-
-<?php elseif ($type == 'file'): ?>
-
-    <button class="inlinePill" type="button" _="on click remove me">
-        <span class="pillIcon material-symbols attach-file"></span>
-        <span class="pillText"><?= $name ?></span>
-        <input type="hidden" name="attachments[]" value="<?= $oid ?>">
-        <input type="hidden" name="altTexts[]" value="<?= $name ?>">
-        <span class="pillIcon material-symbols close-small"></span>
-    </button>
-
-<?php elseif ($type == 'image'): ?>
-
-    <div class="inlinePill imageAttachmentPill">
-        <div class="row pillInfo">
-            <span class="pillIcon material-symbols attach-file"></span>
-            <span class="pillText"><?= $name ?></span>
-        </div>
-        <img src="<?= $href ?>">
-        <input type="hidden" name="attachments[]" value="<?= $oid ?>">
-        <div class="row">
-            <label for="altText-<?= $oid ?>"><?= __('writeNote.attachments.altText.label') ?></label>
-            <textarea id="altText-<?= $oid ?>" name="altTexts[]"></textarea>
-        </div>
-        <div class="row">
-            <button type="button" class="secondary" _="on click remove closest .inlinePill">
-                <span class="material-symbols close-small"></span>
-                <?= __('writeNote.attachments.remove.action') ?>
-            </button>
-        </div>
-    </div>
-
-<?php endif; ?>
\ No newline at end of file
diff --git a/templates/follow_requests_page.php b/templates/follow_requests_page.php
index f93601c..beb26d5 100644
--- a/templates/follow_requests_page.php
+++ b/templates/follow_requests_page.php
@@ -4,6 +4,6 @@
         call_template('placeholder_text');
     }
     foreach ($actors as $actor) {
-        call_template('actor_profile', ['actor' => $actor, 'addLink' => true]);
+        call_template('actor/profile', ['actor' => $actor, 'addLink' => true]);
     }
 });
\ No newline at end of file
diff --git a/templates/left_side_navigation.php b/templates/left_side_navigation.php
deleted file mode 100644
index 5d7f368..0000000
--- a/templates/left_side_navigation.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-use Digitigrade\Model\FollowRelation;
-use Digitigrade\Model\UserAccount;
-
-$links = [];
-$user = UserAccount::findByCurrentSession();
-
-if ($user != null) {
-    $links = [[
-        'href' => '/followrequests',
-        'icon' => 'person-add-outline',
-        'label' => __('navigation.followRequests'),
-        'unreadCount' => FollowRelation::countWhere("object = ? AND status = 'pending'", [$user->actor->id])
-    ], [
-        'href' => '/pages',
-        'icon' => 'article-outline',
-        'label' => __('note.page.list.pageTitle')
-    ], [
-        'href' => '/preferences',
-        'icon' => 'tune',
-        'label' => __('preferences.pageTitle')
-    ]];
-    if ($user->isAdmin) {
-        $links[] = ['href' => '/admin/settings/instance', 'icon' => 'settings-outline', 'label' => __('navigation.instanceSettings')];
-    }
-}
-$links[] = [
-    'href' => '/about',
-    'icon' => 'info-outline',
-    'label' => __('about.pageTitle')
-];
-if ($user != null) {
-    $links[] = [
-        'href' => '/logout',
-        'icon' => 'logout',
-        'label' => __('navigation.logout'),
-        'confirmation' => __('navigation.logout.confirmation')
-    ];
-}
-
-call_template('side_navigation', ['links' => $links]);
diff --git a/templates/mobilepane_left.php b/templates/mobilepane_left.php
index 753383a..29be318 100644
--- a/templates/mobilepane_left.php
+++ b/templates/mobilepane_left.php
@@ -31,10 +31,10 @@ $settings = GlobalSettings::getInstance();
             '/feed/global' => __('timeline.global.shortName'),
             '/feed/local' => __('timeline.local.shortName'),
         ];
-        call_template('navigation_links', ['links' => $links]);
+        call_template('navigation/header_links', ['links' => $links]);
 
-        call_template('write_note_form', ['actor' => $user->actor]);
-        call_template('left_side_navigation');
+        call_template('note/write_form', ['actor' => $user->actor]);
+        call_template('navigation/left_side');
         ?>
         <p class="versionInfo"><?= sprintf(__('version'), get_version()) ?></p>
     </main>
diff --git a/templates/navigation/header_links.php b/templates/navigation/header_links.php
new file mode 100644
index 0000000..1540491
--- /dev/null
+++ b/templates/navigation/header_links.php
@@ -0,0 +1,12 @@
+<?php
+use Digitigrade\Router;
+?>
+<ul>
+    <?php foreach ($links as $href => $name): ?>
+        <?php if (Router::getInstance()->getCurrentPath() == $href): ?>
+            <li><span class="navlink disabled"><?= $name ?></span></li>
+        <?php else: ?>
+            <li><a class="navlink" href="<?= $href ?>"><?= $name ?></a></li>
+        <?php endif; ?>
+    <?php endforeach; ?>
+</ul>
\ No newline at end of file
diff --git a/templates/navigation/left_side.php b/templates/navigation/left_side.php
new file mode 100644
index 0000000..219e7a1
--- /dev/null
+++ b/templates/navigation/left_side.php
@@ -0,0 +1,41 @@
+<?php
+use Digitigrade\Model\FollowRelation;
+use Digitigrade\Model\UserAccount;
+
+$links = [];
+$user = UserAccount::findByCurrentSession();
+
+if ($user != null) {
+    $links = [[
+        'href' => '/followrequests',
+        'icon' => 'person-add-outline',
+        'label' => __('navigation.followRequests'),
+        'unreadCount' => FollowRelation::countWhere("object = ? AND status = 'pending'", [$user->actor->id])
+    ], [
+        'href' => '/pages',
+        'icon' => 'article-outline',
+        'label' => __('note.page.list.pageTitle')
+    ], [
+        'href' => '/preferences',
+        'icon' => 'tune',
+        'label' => __('preferences.pageTitle')
+    ]];
+    if ($user->isAdmin) {
+        $links[] = ['href' => '/admin/settings/instance', 'icon' => 'settings-outline', 'label' => __('navigation.instanceSettings')];
+    }
+}
+$links[] = [
+    'href' => '/about',
+    'icon' => 'info-outline',
+    'label' => __('about.pageTitle')
+];
+if ($user != null) {
+    $links[] = [
+        'href' => '/logout',
+        'icon' => 'logout',
+        'label' => __('navigation.logout'),
+        'confirmation' => __('navigation.logout.confirmation')
+    ];
+}
+
+call_template('navigation/side_links', ['links' => $links]);
diff --git a/templates/navigation/side_links.php b/templates/navigation/side_links.php
new file mode 100644
index 0000000..94bff5e
--- /dev/null
+++ b/templates/navigation/side_links.php
@@ -0,0 +1,13 @@
+<ul class="sideNavigation">
+    <?php foreach ($links as $entry): ?>
+        <li>
+            <a href="<?= $entry['href'] ?>" <?= ($entry['confirmation'] ?? null) ? ('hx-confirm="' . $entry['confirmation'] . '"') : '' ?>>
+                <div class="material-symbols <?= $entry['icon'] ?>"></div>
+                <div><?= $entry['label'] ?></div>
+                <?php if (isset($entry['unreadCount']) && $entry['unreadCount'] > 0) {
+                    call_template('unread_indicator', ['count' => $entry['unreadCount']]);
+                } ?>
+            </a>
+        </li>
+    <?php endforeach; ?>
+</ul>
\ No newline at end of file
diff --git a/templates/navigation_links.php b/templates/navigation_links.php
deleted file mode 100644
index 1540491..0000000
--- a/templates/navigation_links.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-use Digitigrade\Router;
-?>
-<ul>
-    <?php foreach ($links as $href => $name): ?>
-        <?php if (Router::getInstance()->getCurrentPath() == $href): ?>
-            <li><span class="navlink disabled"><?= $name ?></span></li>
-        <?php else: ?>
-            <li><a class="navlink" href="<?= $href ?>"><?= $name ?></a></li>
-        <?php endif; ?>
-    <?php endforeach; ?>
-</ul>
\ No newline at end of file
diff --git a/templates/note.php b/templates/note.php
deleted file mode 100644
index c80eace..0000000
--- a/templates/note.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/** @var \Digitigrade\Model\Note $note */
-
-use Digitigrade\Model\Actor;
-use Digitigrade\Model\InteractionKind;
-use Digitigrade\Model\NotePrivacyScope;
-use Digitigrade\Model\UserAccount;
-use Digitigrade\UserSettings;
-
-$MAX_PREVIEW_CARDS = 1;
-
-$user = UserAccount::findByCurrentSession();
-$prefs = $user ? new UserSettings($user) : null;
-$interKinds = [];
-$actionsDisabled = $user == null;
-if ($user != null) {
-    $interactions = $note->getInteractionsWithAuthor($user->actor);
-    $interKinds = array_map(fn($inter) => $inter->kind, $interactions);
-}
-$pathToSelf = $note->getLocalUiHref();
-?>
-<article class="note <?= ($selected ?? false) ? 'selected' : '' ?>">
-
-    <a href="/@/<?= $note->author->getFullHandle() ?>">
-        <?php call_template('actor_avatar', ['actor' => $note->author]); ?>
-    </a>
-
-    <div>
-
-        <div class="infoLine">
-            <a class="authorName"
-                href="/@/<?= htmlspecialchars($note->author->getFullHandle()) ?>"><?= htmlspecialchars($note->author->displayName) ?></a>
-            <span class="authorPronouns">
-                <?php if (isset($note->author->pronouns) && trim($note->author->pronouns) != '') {
-                    echo htmlspecialchars($note->author->pronouns);
-                } ?>
-            </span>
-            <a class="timestamp" href="<?= htmlspecialchars($pathToSelf) ?>">
-                <?= format_datetime($note->created)
-                    . (isset($note->modified) && $note->modified != $note->created
-                        ? ' (' . format_datetime($note->modified) . ')'
-                        : ''
-                    ) ?>
-            </a>
-            <span class="privacyScope inlineIcon material-symbols <?= match ($note->privacy->scope) {
-                NotePrivacyScope::NONE => 'lock',
-                NotePrivacyScope::MUTUALS => 'group',
-                NotePrivacyScope::FOLLOWERS => 'groups',
-                NotePrivacyScope::PUBLIC => 'public'
-            } ?>" title="<?= match ($note->privacy->scope) {
-                 NotePrivacyScope::NONE => __('note.privacy.scope.none'),
-                 NotePrivacyScope::MUTUALS => __('note.privacy.scope.mutuals'),
-                 NotePrivacyScope::FOLLOWERS => __('note.privacy.scope.followers'),
-                 NotePrivacyScope::PUBLIC => __('note.privacy.scope.public')
-             } ?>"></span>
-        </div>
-
-        <?php if (isset($note->inReplyTo)): ?>
-            <div class="replyInfo">
-                <span class="material-symbols reply inlineIcon"></span>
-                <a
-                    href="/@/<?= htmlspecialchars($note->inReplyTo->author->getFullHandle()) ?>/note/<?= $note->inReplyTo->id ?>">
-                    <?= sprintf(__('note.info.replyTo'),
-                        '<b>' . htmlspecialchars($note->inReplyTo->author->displayName)) . '</b>' ?>
-                </a>
-            </div>
-        <?php elseif (count($note->mentions) > 0): ?>
-            <div class="replyInfo">
-                <span class="material-symbols alternate-email inlineIcon"></span>
-                <span>
-                    <?= sprintf(__('note.info.mentions'), implode(', ', array_map(
-                        fn(Actor $m) => '<b><a href="/@/' . htmlspecialchars($m->getFullHandle()) . '">' . htmlspecialchars($m->displayName) . '</a></b>',
-                        $note->mentions
-                    ))) ?>
-                </span>
-            </div>
-        <?php endif; ?>
-
-        <?php if (isset($note->summary)): ?>
-            <details>
-                <summary><?= htmlspecialchars($note->summary) ?></summary>
-            <?php endif; ?>
-            <div class="content" lang="<?= $note->language ?>">
-                <?php if ($note->hasPage()): ?>
-                    <?= __f('note.page.summaryMessage', htmlspecialchars($note->getPage()->title)) ?>
-                <?php else: ?>
-                    <?= $note->getBestContentAsHtml() ?>
-                <?php endif; ?>
-            </div>
-
-            <?php if (count($note->attachments) > 0): ?>
-                <div class="attachments">
-                    <?php foreach ($note->attachments as $attachment) {
-                        call_template('note_attachment', ['attachment' => $attachment]);
-                    } ?>
-                </div>
-            <?php endif; ?>
-
-            <?php
-            $i = 0;
-            foreach ($note->getLinkPreviews() as $preview) {
-                call_template("note_link_preview", ['preview' => $preview]);
-                if (++$i > $MAX_PREVIEW_CARDS)
-                    break;
-            }
-            ?>
-
-            <?php if (isset($note->summary)): ?>
-            </details>
-        <?php endif; ?>
-
-        <?php if ($note->hasPage()): ?>
-            <a class="button secondary minWidth" href="<?= $note->getLocalUiHref(true) ?>">
-                <span class="material-symbols article-outline"></span>
-                <span><?= __('note.openPage') ?></span>
-            </a>
-        <?php endif; ?>
-
-        <div class="buttons">
-            <?php foreach (['like', 'dislike', 'reshare'] as $action) {
-                $kind = InteractionKind::from($action);
-                call_template('interaction_button', [
-                    'action' => $action,
-                    'note' => $note,
-                    'active' => in_array($kind, $interKinds),
-                    'count' => $note->countInteractionsOfKind($kind),
-                    'disabled' => $actionsDisabled
-                ]);
-            }
-            call_template('reply_button', [
-                'note' => $note,
-                'count' => $note->countReplies(),
-                'disabled' => $actionsDisabled
-            ]);
-            ?>
-            <div class="right">
-                <?php call_template('menu_button', [], function () {
-                    global $note;
-                    $user = UserAccount::findByCurrentSession();
-                    ?>
-                    <li>
-                        <button data-share-url="<?= htmlspecialchars($note->uri) ?>" _="
-                        on click
-                            set url to my @data-share-url
-                            js(url)
-                                navigator.share({ url: url })
-                            end" type="button">
-                            <span class="material-symbols share"></span>
-                            <span><?= __('action.share') ?></span>
-                        </button>
-                    </li>
-                    <?php if ($note->author->isLocal && ($note->author == $user?->actor || $user?->isAdmin)): ?>
-                        <li>
-                            <button hx-delete="/fragment/note/<?= $note->id ?>"
-                                hx-confirm="<?= __('note.action.delete.confirmation') ?>" hx-target="closest .note"
-                                hx-swap="delete">
-                                <span class="material-symbols delete-outline"></span>
-                                <span><?= __('note.action.delete') ?></span>
-                            </button>
-                        </li>
-                    <?php endif; ?>
-                    <?php if (!$note->author->isLocal): ?>
-                        <li>
-                            <a target="_blank" href="<?= htmlspecialchars($note->uri) ?>" rel="nofollow noreferrer">
-                                <span class="material-symbols open-in-new"></span>
-                                <span><?= __('note.openRemote') ?></span>
-                            </a>
-                        </li>
-                    <?php endif; ?>
-                <?php }); ?>
-            </div>
-        </div>
-
-        <?php call_template('reply_form', ['note' => $note]); ?>
-    </div>
-</article>
\ No newline at end of file
diff --git a/templates/note/attachment.php b/templates/note/attachment.php
new file mode 100644
index 0000000..c139a00
--- /dev/null
+++ b/templates/note/attachment.php
@@ -0,0 +1,17 @@
+<?php
+$filename = basename($attachment->href);
+if (!$attachment->isImage() && $attachment->description) {
+    $filename = $attachment->description;
+}
+?>
+<div>
+    <?php if ($attachment->isImage()): ?>
+        <img src="<?= $attachment->href ?>" alt="<?= htmlspecialchars($attachment->description ?? '') ?>"
+            title="<?= htmlspecialchars($attachment->description ?? '') ?>">
+    <?php else: ?>
+        <a class="file" href="<?= $attachment->href ?>" target="_blank" download="<?= htmlspecialchars($filename) ?>">
+            <span class="material-symbols attach-file"></span>
+            <span><?= htmlspecialchars($filename) ?></span>
+        </a>
+    <?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/templates/note/attachment_pill.php b/templates/note/attachment_pill.php
new file mode 100644
index 0000000..6fff74d
--- /dev/null
+++ b/templates/note/attachment_pill.php
@@ -0,0 +1,44 @@
+<?php
+$type ??= 'add';
+?>
+
+<?php if ($type == 'add'): ?>
+
+    <button id="writeNoteAttachmentPillAdder" type="button" class="inlinePill" type="button"
+        _="on click set f to #noteAttachmentFile then f.click()">
+        <span class="pillIcon material-symbols add"></span>
+        <span class="pillText"><?= __('writeNote.attachments.add.action') ?></span>
+    </button>
+
+<?php elseif ($type == 'file'): ?>
+
+    <button class="inlinePill" type="button" _="on click remove me">
+        <span class="pillIcon material-symbols attach-file"></span>
+        <span class="pillText"><?= $name ?></span>
+        <input type="hidden" name="attachments[]" value="<?= $oid ?>">
+        <input type="hidden" name="altTexts[]" value="<?= $name ?>">
+        <span class="pillIcon material-symbols close-small"></span>
+    </button>
+
+<?php elseif ($type == 'image'): ?>
+
+    <div class="inlinePill imageAttachmentPill">
+        <div class="row pillInfo">
+            <span class="pillIcon material-symbols attach-file"></span>
+            <span class="pillText"><?= $name ?></span>
+        </div>
+        <img src="<?= $href ?>">
+        <input type="hidden" name="attachments[]" value="<?= $oid ?>">
+        <div class="row">
+            <label for="altText-<?= $oid ?>"><?= __('writeNote.attachments.altText.label') ?></label>
+            <textarea id="altText-<?= $oid ?>" name="altTexts[]"></textarea>
+        </div>
+        <div class="row">
+            <button type="button" class="secondary" _="on click remove closest .inlinePill">
+                <span class="material-symbols close-small"></span>
+                <?= __('writeNote.attachments.remove.action') ?>
+            </button>
+        </div>
+    </div>
+
+<?php endif; ?>
\ No newline at end of file
diff --git a/templates/note/link_preview.php b/templates/note/link_preview.php
new file mode 100644
index 0000000..1525642
--- /dev/null
+++ b/templates/note/link_preview.php
@@ -0,0 +1,23 @@
+<?php
+$siteName = hostname_from_uri($preview->url);
+if ($preview->siteName != $siteName) {
+    $siteName = htmlspecialchars($preview->siteName) . ' &mdash; ' . $siteName;
+}
+?>
+
+<a class="linkPreview style-<?= htmlspecialchars($preview->style) ?>" href="<?= htmlspecialchars($preview->url) ?>"
+    target="_blank" rel="noreferrer nofollow">
+
+    <?php if ($preview->style == 'text' || !isset($preview->imageUrl)): ?>
+        <div></div>
+    <?php else: ?>
+        <img src="<?= htmlspecialchars($preview->imageUrl) ?>">
+    <?php endif; ?>
+
+    <div class="info">
+        <span class="siteName"><?= $siteName ?></span>
+        <span class="title"><?= htmlspecialchars($preview->title) ?></span>
+        <span class="description"><?= htmlspecialchars($preview->description) ?></span>
+    </div>
+
+</a>
\ No newline at end of file
diff --git a/templates/note/note.php b/templates/note/note.php
new file mode 100644
index 0000000..7cef342
--- /dev/null
+++ b/templates/note/note.php
@@ -0,0 +1,176 @@
+<?php
+/** @var \Digitigrade\Model\Note $note */
+
+use Digitigrade\Model\Actor;
+use Digitigrade\Model\InteractionKind;
+use Digitigrade\Model\NotePrivacyScope;
+use Digitigrade\Model\UserAccount;
+use Digitigrade\UserSettings;
+
+$MAX_PREVIEW_CARDS = 1;
+
+$user = UserAccount::findByCurrentSession();
+$prefs = $user ? new UserSettings($user) : null;
+$interKinds = [];
+$actionsDisabled = $user == null;
+if ($user != null) {
+    $interactions = $note->getInteractionsWithAuthor($user->actor);
+    $interKinds = array_map(fn($inter) => $inter->kind, $interactions);
+}
+$pathToSelf = $note->getLocalUiHref();
+?>
+<article class="note <?= ($selected ?? false) ? 'selected' : '' ?>">
+
+    <a href="/@/<?= $note->author->getFullHandle() ?>">
+        <?php call_template('actor/avatar', ['actor' => $note->author]); ?>
+    </a>
+
+    <div>
+
+        <div class="infoLine">
+            <a class="authorName"
+                href="/@/<?= htmlspecialchars($note->author->getFullHandle()) ?>"><?= htmlspecialchars($note->author->displayName) ?></a>
+            <span class="authorPronouns">
+                <?php if (isset($note->author->pronouns) && trim($note->author->pronouns) != '') {
+                    echo htmlspecialchars($note->author->pronouns);
+                } ?>
+            </span>
+            <a class="timestamp" href="<?= htmlspecialchars($pathToSelf) ?>">
+                <?= format_datetime($note->created)
+                    . (isset($note->modified) && $note->modified != $note->created
+                        ? ' (' . format_datetime($note->modified) . ')'
+                        : ''
+                    ) ?>
+            </a>
+            <span class="privacyScope inlineIcon material-symbols <?= match ($note->privacy->scope) {
+                NotePrivacyScope::NONE => 'lock',
+                NotePrivacyScope::MUTUALS => 'group',
+                NotePrivacyScope::FOLLOWERS => 'groups',
+                NotePrivacyScope::PUBLIC => 'public'
+            } ?>" title="<?= match ($note->privacy->scope) {
+                 NotePrivacyScope::NONE => __('note.privacy.scope.none'),
+                 NotePrivacyScope::MUTUALS => __('note.privacy.scope.mutuals'),
+                 NotePrivacyScope::FOLLOWERS => __('note.privacy.scope.followers'),
+                 NotePrivacyScope::PUBLIC => __('note.privacy.scope.public')
+             } ?>"></span>
+        </div>
+
+        <?php if (isset($note->inReplyTo)): ?>
+            <div class="replyInfo">
+                <span class="material-symbols reply inlineIcon"></span>
+                <a
+                    href="/@/<?= htmlspecialchars($note->inReplyTo->author->getFullHandle()) ?>/note/<?= $note->inReplyTo->id ?>">
+                    <?= sprintf(__('note.info.replyTo'),
+                        '<b>' . htmlspecialchars($note->inReplyTo->author->displayName)) . '</b>' ?>
+                </a>
+            </div>
+        <?php elseif (count($note->mentions) > 0): ?>
+            <div class="replyInfo">
+                <span class="material-symbols alternate-email inlineIcon"></span>
+                <span>
+                    <?= sprintf(__('note.info.mentions'), implode(', ', array_map(
+                        fn(Actor $m) => '<b><a href="/@/' . htmlspecialchars($m->getFullHandle()) . '">' . htmlspecialchars($m->displayName) . '</a></b>',
+                        $note->mentions
+                    ))) ?>
+                </span>
+            </div>
+        <?php endif; ?>
+
+        <?php if (isset($note->summary)): ?>
+            <details>
+                <summary><?= htmlspecialchars($note->summary) ?></summary>
+            <?php endif; ?>
+            <div class="content" lang="<?= $note->language ?>">
+                <?php if ($note->hasPage()): ?>
+                    <?= __f('note.page.summaryMessage', htmlspecialchars($note->getPage()->title)) ?>
+                <?php else: ?>
+                    <?= $note->getBestContentAsHtml() ?>
+                <?php endif; ?>
+            </div>
+
+            <?php if (count($note->attachments) > 0): ?>
+                <div class="attachments">
+                    <?php foreach ($note->attachments as $attachment) {
+                        call_template('note/attachment', ['attachment' => $attachment]);
+                    } ?>
+                </div>
+            <?php endif; ?>
+
+            <?php
+            $i = 0;
+            foreach ($note->getLinkPreviews() as $preview) {
+                call_template('note/link_preview', ['preview' => $preview]);
+                if (++$i > $MAX_PREVIEW_CARDS)
+                    break;
+            }
+            ?>
+
+            <?php if (isset($note->summary)): ?>
+            </details>
+        <?php endif; ?>
+
+        <?php if ($note->hasPage()): ?>
+            <a class="button secondary minWidth" href="<?= $note->getLocalUiHref(true) ?>">
+                <span class="material-symbols article-outline"></span>
+                <span><?= __('note.openPage') ?></span>
+            </a>
+        <?php endif; ?>
+
+        <div class="buttons">
+            <?php foreach (['like', 'dislike', 'reshare'] as $action) {
+                $kind = InteractionKind::from($action);
+                call_template('interaction_button', [
+                    'action' => $action,
+                    'note' => $note,
+                    'active' => in_array($kind, $interKinds),
+                    'count' => $note->countInteractionsOfKind($kind),
+                    'disabled' => $actionsDisabled
+                ]);
+            }
+            call_template('note/reply_button', [
+                'note' => $note,
+                'count' => $note->countReplies(),
+                'disabled' => $actionsDisabled
+            ]);
+            ?>
+            <div class="right">
+                <?php call_template('menu_button', [], function () {
+                    global $note;
+                    $user = UserAccount::findByCurrentSession();
+                    ?>
+                    <li>
+                        <button data-share-url="<?= htmlspecialchars($note->uri) ?>" _="
+                        on click
+                            set url to my @data-share-url
+                            js(url)
+                                navigator.share({ url: url })
+                            end" type="button">
+                            <span class="material-symbols share"></span>
+                            <span><?= __('action.share') ?></span>
+                        </button>
+                    </li>
+                    <?php if ($note->author->isLocal && ($note->author == $user?->actor || $user?->isAdmin)): ?>
+                        <li>
+                            <button hx-delete="/fragment/note/<?= $note->id ?>"
+                                hx-confirm="<?= __('note.action.delete.confirmation') ?>" hx-target="closest .note"
+                                hx-swap="delete">
+                                <span class="material-symbols delete-outline"></span>
+                                <span><?= __('note.action.delete') ?></span>
+                            </button>
+                        </li>
+                    <?php endif; ?>
+                    <?php if (!$note->author->isLocal): ?>
+                        <li>
+                            <a target="_blank" href="<?= htmlspecialchars($note->uri) ?>" rel="nofollow noreferrer">
+                                <span class="material-symbols open-in-new"></span>
+                                <span><?= __('note.openRemote') ?></span>
+                            </a>
+                        </li>
+                    <?php endif; ?>
+                <?php }); ?>
+            </div>
+        </div>
+
+        <?php call_template('note/reply_form', ['note' => $note]); ?>
+    </div>
+</article>
\ No newline at end of file
diff --git a/templates/note/reply_button.php b/templates/note/reply_button.php
new file mode 100644
index 0000000..dadc121
--- /dev/null
+++ b/templates/note/reply_button.php
@@ -0,0 +1,13 @@
+<?php
+use Digitigrade\Model\Note;
+
+/** @var Note $note */
+
+$icon = $note->inReplyTo == null ? 'reply' : 'reply-all';
+$id = "interactButton-reply-$note->id";
+?>
+<div class="interactButtonContainer reply">
+    <button title="<?= __('note.action.reply') ?>" class="material-symbols <?= $icon ?>" id="<?= $id ?>" <?= ($disabled ?? false) ? 'disabled' : '' ?>
+        _="on click send toggle to [me, next .noteReplyForm] on toggle toggle .active on closest <div/>"></button>
+    <label for="<?= $id ?>"><?= $count ?? '' ?></label>
+</div>
\ No newline at end of file
diff --git a/templates/note/reply_form.php b/templates/note/reply_form.php
new file mode 100644
index 0000000..2d8cfc3
--- /dev/null
+++ b/templates/note/reply_form.php
@@ -0,0 +1,60 @@
+<?php
+use Digitigrade\Model\NotePrivacyScope;
+use Digitigrade\Model\UserAccount;
+
+$user = UserAccount::findByCurrentSession();
+
+$summaryText = '';
+if ($note->summary) {
+    if (strtolower(substr($note->summary, 0, 3)) == 're:') {
+        $summaryText = $note->summary;
+    } else {
+        $summaryText = "re: $note->summary";
+    }
+}
+
+$scopeOptions = match ($note->privacy->scope) {
+    NotePrivacyScope::NONE => ['none'],
+    NotePrivacyScope::MUTUALS => ['none', 'mutuals'],
+    NotePrivacyScope::FOLLOWERS => ['none', 'mutuals', 'followers'],
+    default => ['none', 'mutuals', 'followers', 'public']
+};
+$selectedScope = $note->privacy->scope->value;
+?>
+<form class="noteReplyForm" id="replyForm-<?= $note->id ?>"
+    _="on submit send toggle to previous <button.reply/> then wait 1s then trigger update on #liveTimelineUpdater on toggle or submit toggle @hidden"
+    hidden hx-post="/fragment/note/<?= $note->id ?>/reply" hx-disabled-elt="find button" hx-swap="outerHTML">
+    <div class="row summaryAndContent">
+        <label for="replyContent-<?= $note->id ?>"><?= __('writeReply.label') ?></label>
+        <input type="text" id="replySummary-<?= $note->id ?>" name="summary" autocomplete="off"
+            value="<?= $summaryText ?>" placeholder="<?= __('writeNote.summary.label') ?>">
+        <textarea id="replyContent-<?= $note->id ?>" name="content" required autocomplete="off"
+            placeholder="<?= __('writeReply.placeholder') ?>"></textarea>
+        <?php call_template('formatting_hint'); ?>
+    </div>
+    <details>
+        <summary><?= __('writeNote.moreOptions') ?></summary>
+        <div class="row">
+            <label class="standalone"><?= __('writeNote.mentions.label') ?></label>
+            <?php foreach (array_merge($note->mentions, [$note->author]) as $m) {
+                if ($m != $user?->actor) {
+                    call_template('user_mention_pill', ['type' => 'user', 'actor' => $m]);
+                }
+            } ?>
+            <?php call_template('user_mention_pill'); ?>
+        </div>
+        <div class="row">
+            <label for="replyScope-<?= $note->id ?>"><?= __('writeNote.scope.label') ?></label>
+            <select name="scope" id="replyScope-<?= $note->id ?>" required autocomplete="off">
+                <?php foreach ($scopeOptions as $s): ?>
+                    <option value="<?= $s ?>" <?= $selectedScope == $s ? 'selected' : '' ?>>
+                        <?= __("note.privacy.scope.$s") ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+    </details>
+    <div class="row">
+        <button class="primary"><?= __('writeReply.action') ?></button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/templates/note/write_form.php b/templates/note/write_form.php
new file mode 100644
index 0000000..add00ec
--- /dev/null
+++ b/templates/note/write_form.php
@@ -0,0 +1,49 @@
+<form hidden id="writeNoteAttachmentForm" action="/todo" hx-post="/fragment/note/attachmentPill" hx-swap="beforebegin"
+    hx-target="#writeNoteAttachmentPillAdder" enctype="multipart/form-data">
+    <input hidden type="file" name="file" id="noteAttachmentFile" _="on change send submit to closest <form/>">
+</form>
+
+<form id="writeNoteForm" action="/todo" method="post" hx-post="/fragment/note" hx-swap="outerHTML"
+    hx-disabled-elt="find button" _="on submit wait 1s then trigger update on #liveTimelineUpdater"
+    <?= ($_SERVER['REQUEST_METHOD'] == 'GET') ? 'hx-preserve' : '' ?>>
+    <div class="row miniProfile">
+        <a href="/@/<?= $actor->handle ?>">
+            <?php call_template('actor/avatar', ['actor' => $actor]); ?>
+        </a>
+        <div class="basicInfo">
+            <a class="displayName" href="/@/<?= $actor->handle ?>"><?= htmlspecialchars($actor->displayName) ?></a>
+            <div class="handle">@<?= $actor->handle ?></div>
+        </div>
+    </div>
+    <div class="row summaryAndContent">
+        <label for="noteContent"><?= __('writeNote.label') ?></label>
+        <input type="text" id="noteSummary" name="summary" autocomplete="off"
+            placeholder="<?= __('writeNote.summary.label') ?>">
+        <textarea name="content" id="noteContent" required autocomplete="off"
+            placeholder="<?= __('writeNote.placeholder') ?>"></textarea>
+        <?php call_template('formatting_hint'); ?>
+    </div>
+    <details>
+        <summary><?= __('writeNote.moreOptions') ?></summary>
+        <div class="row">
+            <label class="standalone"><?= __('writeNote.mentions.label') ?></label>
+            <?php call_template('user_mention_pill'); ?>
+        </div>
+        <div class="row">
+            <label class="standalone"><?= __('writeNote.attachments.label') ?></label>
+            <?php call_template('note/attachment_pill'); ?>
+        </div>
+        <div class="row">
+            <label for="noteScope"><?= __('writeNote.scope.label') ?></label>
+            <select name="scope" id="noteScope" required autocomplete="off">
+                <option value="none"><?= __('note.privacy.scope.none') ?></option>
+                <option value="mutuals"><?= __('note.privacy.scope.mutuals') ?></option>
+                <option value="followers"><?= __('note.privacy.scope.followers') ?></option>
+                <option value="public" selected><?= __('note.privacy.scope.public') ?></option>
+            </select>
+        </div>
+    </details>
+    <div class="row">
+        <button class="primary"><?= __('writeNote.action') ?></button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/templates/note_attachment.php b/templates/note_attachment.php
deleted file mode 100644
index c139a00..0000000
--- a/templates/note_attachment.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$filename = basename($attachment->href);
-if (!$attachment->isImage() && $attachment->description) {
-    $filename = $attachment->description;
-}
-?>
-<div>
-    <?php if ($attachment->isImage()): ?>
-        <img src="<?= $attachment->href ?>" alt="<?= htmlspecialchars($attachment->description ?? '') ?>"
-            title="<?= htmlspecialchars($attachment->description ?? '') ?>">
-    <?php else: ?>
-        <a class="file" href="<?= $attachment->href ?>" target="_blank" download="<?= htmlspecialchars($filename) ?>">
-            <span class="material-symbols attach-file"></span>
-            <span><?= htmlspecialchars($filename) ?></span>
-        </a>
-    <?php endif; ?>
-</div>
\ No newline at end of file
diff --git a/templates/note_link_preview.php b/templates/note_link_preview.php
deleted file mode 100644
index 1525642..0000000
--- a/templates/note_link_preview.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-$siteName = hostname_from_uri($preview->url);
-if ($preview->siteName != $siteName) {
-    $siteName = htmlspecialchars($preview->siteName) . ' &mdash; ' . $siteName;
-}
-?>
-
-<a class="linkPreview style-<?= htmlspecialchars($preview->style) ?>" href="<?= htmlspecialchars($preview->url) ?>"
-    target="_blank" rel="noreferrer nofollow">
-
-    <?php if ($preview->style == 'text' || !isset($preview->imageUrl)): ?>
-        <div></div>
-    <?php else: ?>
-        <img src="<?= htmlspecialchars($preview->imageUrl) ?>">
-    <?php endif; ?>
-
-    <div class="info">
-        <span class="siteName"><?= $siteName ?></span>
-        <span class="title"><?= htmlspecialchars($preview->title) ?></span>
-        <span class="description"><?= htmlspecialchars($preview->description) ?></span>
-    </div>
-
-</a>
\ No newline at end of file
diff --git a/templates/note_page.php b/templates/note_page.php
deleted file mode 100644
index 647c64e..0000000
--- a/templates/note_page.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/** @var \Digitigrade\Model\Note $note */
-
-use Digitigrade\FormattingProvider;
-use Digitigrade\Model\UserAccount;
-use Digitigrade\UserSettings;
-
-$page = $note->getPage();
-
-call_template('skeleton', ['pageTitle' => $page->title, 'renderTitleHeading' => false], function () use ($note, $page) { ?>
-    <div class="notePage">
-        <article lang="<?= htmlspecialchars($note->language) ?>">
-            <h1><?= htmlspecialchars($page->title) ?></h1>
-            <a class="pageAuthor" href="/@/<?= htmlspecialchars($note->author->getFullHandle()) ?>">
-                <?php call_template('actor_avatar', ['actor' => $note->author]); ?>
-                <span><?= __f(
-                    'note.page.author',
-                    '<span class="displayName">' . htmlspecialchars($note->author->displayName) . '</span>'
-                ) ?></span>
-            </a>
-            <div class="created">
-                <?= __f('note.page.created', format_datetime($note->created)) ?>
-            </div>
-            <?php if (isset($note->modified) && $note->modified != $note->created): ?>
-                <div class="modified">
-                    <?= __f('note.page.modified', format_datetime($note->modified)) ?>
-                </div>
-            <?php endif; ?>
-            <hr>
-            <div class="pageContent">
-                <?= $page->getBestContentAsHtml() ?>
-            </div>
-        </article>
-    </div>
-<?php });
\ No newline at end of file
diff --git a/templates/pages/list_item.php b/templates/pages/list_item.php
new file mode 100644
index 0000000..3d4d2e2
--- /dev/null
+++ b/templates/pages/list_item.php
@@ -0,0 +1,11 @@
+<?php
+/** @var \Digitigrade\Model\Note $note */
+$page = $note->getPage();
+?>
+<a class="pageItem" href="<?= htmlspecialchars($note->getLocalUiHref(true)) ?>">
+    <?= call_template('actor/avatar', ['actor' => $note->author]) ?>
+    <div>
+        <div class="title"><?= htmlspecialchars($page->title) ?></div>
+        <div class="author"><?= htmlspecialchars($note->author->displayName) ?></div>
+    </div>
+</a>
\ No newline at end of file
diff --git a/templates/pages/list_page.php b/templates/pages/list_page.php
new file mode 100644
index 0000000..e347e18
--- /dev/null
+++ b/templates/pages/list_page.php
@@ -0,0 +1,19 @@
+<?php
+
+use Digitigrade\Model\Note;
+
+call_template('skeleton', ['pageTitle' => __('note.page.list.pageTitle')], function () {
+    ?>
+    <a class="button secondary margined" href="/pages/new"><?= __('note.page.new.pageTitle') ?></a>
+    <?php
+
+    $notes = Note::findAllWithExtension(Note::EXTENSION_PAGES, 20);
+    foreach ($notes as $note) {
+        call_template('pages/list_item', ['note' => $note]);
+    }
+    if (count($notes) == 0) {
+        call_template('placeholder_text');
+    } else {
+        call_template('placeholder_text', ['count' => Note::countWithExtension(Note::EXTENSION_PAGES) - count($notes)]);
+    }
+});
\ No newline at end of file
diff --git a/templates/pages/new_form.php b/templates/pages/new_form.php
new file mode 100644
index 0000000..a8dde16
--- /dev/null
+++ b/templates/pages/new_form.php
@@ -0,0 +1,26 @@
+<form id="writePageForm" hx-post="" hx-disabled-elt="find button">
+    <div class="row">
+        <label for="newPageTitle"><?= __('note.page.new.title.label') ?></label>
+        <input type="text" id="newPageTitle" name="title" required>
+    </div>
+
+    <div class="row">
+        <label for="newPageBody"><?= __('note.page.new.body.label') ?></label>
+        <textarea id="newPageBody" name="body" required></textarea>
+        <?php call_template('formatting_hint'); ?>
+    </div>
+
+    <div class="row">
+        <label for="newPageScope"><?= __('writeNote.scope.label') ?></label>
+        <select name="scope" id="newPageScope" required autocomplete="off">
+            <option value="none"><?= __('note.privacy.scope.none') ?></option>
+            <option value="mutuals"><?= __('note.privacy.scope.mutuals') ?></option>
+            <option value="followers"><?= __('note.privacy.scope.followers') ?></option>
+            <option value="public" selected><?= __('note.privacy.scope.public') ?></option>
+        </select>
+    </div>
+
+    <div class="row">
+        <button type="submit" class="primary"><?= __('note.page.new.action') ?></button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/templates/pages/new_page.php b/templates/pages/new_page.php
new file mode 100644
index 0000000..9bb44b4
--- /dev/null
+++ b/templates/pages/new_page.php
@@ -0,0 +1,4 @@
+<?php
+call_template('skeleton', ['pageTitle' => __('note.page.new.pageTitle')], function () {
+    call_template('pages/new_form');
+});
\ No newline at end of file
diff --git a/templates/pages/page.php b/templates/pages/page.php
new file mode 100644
index 0000000..bc17664
--- /dev/null
+++ b/templates/pages/page.php
@@ -0,0 +1,36 @@
+<?php
+
+/** @var \Digitigrade\Model\Note $note */
+
+use Digitigrade\FormattingProvider;
+use Digitigrade\Model\UserAccount;
+use Digitigrade\UserSettings;
+
+$page = $note->getPage();
+
+call_template('skeleton', ['pageTitle' => $page->title, 'renderTitleHeading' => false], function () use ($note, $page) { ?>
+    <div class="notePage">
+        <article lang="<?= htmlspecialchars($note->language) ?>">
+            <h1><?= htmlspecialchars($page->title) ?></h1>
+            <a class="pageAuthor" href="/@/<?= htmlspecialchars($note->author->getFullHandle()) ?>">
+                <?php call_template('actor/avatar', ['actor' => $note->author]); ?>
+                <span><?= __f(
+                    'note.page.author',
+                    '<span class="displayName">' . htmlspecialchars($note->author->displayName) . '</span>'
+                ) ?></span>
+            </a>
+            <div class="created">
+                <?= __f('note.page.created', format_datetime($note->created)) ?>
+            </div>
+            <?php if (isset($note->modified) && $note->modified != $note->created): ?>
+                <div class="modified">
+                    <?= __f('note.page.modified', format_datetime($note->modified)) ?>
+                </div>
+            <?php endif; ?>
+            <hr>
+            <div class="pageContent">
+                <?= $page->getBestContentAsHtml() ?>
+            </div>
+        </article>
+    </div>
+<?php });
\ No newline at end of file
diff --git a/templates/pages_list_item.php b/templates/pages_list_item.php
deleted file mode 100644
index 7944956..0000000
--- a/templates/pages_list_item.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/** @var \Digitigrade\Model\Note $note */
-$page = $note->getPage();
-?>
-<a class="pageItem" href="<?= htmlspecialchars($note->getLocalUiHref(true)) ?>">
-    <?= call_template('actor_avatar', ['actor' => $note->author]) ?>
-    <div>
-        <div class="title"><?= htmlspecialchars($page->title) ?></div>
-        <div class="author"><?= htmlspecialchars($note->author->displayName) ?></div>
-    </div>
-</a>
\ No newline at end of file
diff --git a/templates/pages_list_page.php b/templates/pages_list_page.php
deleted file mode 100644
index 2dd1af2..0000000
--- a/templates/pages_list_page.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-use Digitigrade\Model\Note;
-
-call_template('skeleton', ['pageTitle' => __('note.page.list.pageTitle')], function () {
-    ?>
-    <a class="button secondary margined" href="/pages/new"><?= __('note.page.new.pageTitle') ?></a>
-    <?php
-
-    $notes = Note::findAllWithExtension(Note::EXTENSION_PAGES, 20);
-    foreach ($notes as $note) {
-        call_template('pages_list_item', ['note' => $note]);
-    }
-    if (count($notes) == 0) {
-        call_template('placeholder_text');
-    } else {
-        call_template('placeholder_text', ['count' => Note::countWithExtension(Note::EXTENSION_PAGES) - count($notes)]);
-    }
-});
\ No newline at end of file
diff --git a/templates/pages_new_form.php b/templates/pages_new_form.php
deleted file mode 100644
index a8dde16..0000000
--- a/templates/pages_new_form.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<form id="writePageForm" hx-post="" hx-disabled-elt="find button">
-    <div class="row">
-        <label for="newPageTitle"><?= __('note.page.new.title.label') ?></label>
-        <input type="text" id="newPageTitle" name="title" required>
-    </div>
-
-    <div class="row">
-        <label for="newPageBody"><?= __('note.page.new.body.label') ?></label>
-        <textarea id="newPageBody" name="body" required></textarea>
-        <?php call_template('formatting_hint'); ?>
-    </div>
-
-    <div class="row">
-        <label for="newPageScope"><?= __('writeNote.scope.label') ?></label>
-        <select name="scope" id="newPageScope" required autocomplete="off">
-            <option value="none"><?= __('note.privacy.scope.none') ?></option>
-            <option value="mutuals"><?= __('note.privacy.scope.mutuals') ?></option>
-            <option value="followers"><?= __('note.privacy.scope.followers') ?></option>
-            <option value="public" selected><?= __('note.privacy.scope.public') ?></option>
-        </select>
-    </div>
-
-    <div class="row">
-        <button type="submit" class="primary"><?= __('note.page.new.action') ?></button>
-    </div>
-</form>
\ No newline at end of file
diff --git a/templates/pages_new_page.php b/templates/pages_new_page.php
deleted file mode 100644
index e047b99..0000000
--- a/templates/pages_new_page.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-call_template('skeleton', ['pageTitle' => __('note.page.new.pageTitle')], function () {
-    call_template('pages_new_form');
-});
\ No newline at end of file
diff --git a/templates/reply_button.php b/templates/reply_button.php
deleted file mode 100644
index dadc121..0000000
--- a/templates/reply_button.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-use Digitigrade\Model\Note;
-
-/** @var Note $note */
-
-$icon = $note->inReplyTo == null ? 'reply' : 'reply-all';
-$id = "interactButton-reply-$note->id";
-?>
-<div class="interactButtonContainer reply">
-    <button title="<?= __('note.action.reply') ?>" class="material-symbols <?= $icon ?>" id="<?= $id ?>" <?= ($disabled ?? false) ? 'disabled' : '' ?>
-        _="on click send toggle to [me, next .noteReplyForm] on toggle toggle .active on closest <div/>"></button>
-    <label for="<?= $id ?>"><?= $count ?? '' ?></label>
-</div>
\ No newline at end of file
diff --git a/templates/reply_form.php b/templates/reply_form.php
deleted file mode 100644
index 2d8cfc3..0000000
--- a/templates/reply_form.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-use Digitigrade\Model\NotePrivacyScope;
-use Digitigrade\Model\UserAccount;
-
-$user = UserAccount::findByCurrentSession();
-
-$summaryText = '';
-if ($note->summary) {
-    if (strtolower(substr($note->summary, 0, 3)) == 're:') {
-        $summaryText = $note->summary;
-    } else {
-        $summaryText = "re: $note->summary";
-    }
-}
-
-$scopeOptions = match ($note->privacy->scope) {
-    NotePrivacyScope::NONE => ['none'],
-    NotePrivacyScope::MUTUALS => ['none', 'mutuals'],
-    NotePrivacyScope::FOLLOWERS => ['none', 'mutuals', 'followers'],
-    default => ['none', 'mutuals', 'followers', 'public']
-};
-$selectedScope = $note->privacy->scope->value;
-?>
-<form class="noteReplyForm" id="replyForm-<?= $note->id ?>"
-    _="on submit send toggle to previous <button.reply/> then wait 1s then trigger update on #liveTimelineUpdater on toggle or submit toggle @hidden"
-    hidden hx-post="/fragment/note/<?= $note->id ?>/reply" hx-disabled-elt="find button" hx-swap="outerHTML">
-    <div class="row summaryAndContent">
-        <label for="replyContent-<?= $note->id ?>"><?= __('writeReply.label') ?></label>
-        <input type="text" id="replySummary-<?= $note->id ?>" name="summary" autocomplete="off"
-            value="<?= $summaryText ?>" placeholder="<?= __('writeNote.summary.label') ?>">
-        <textarea id="replyContent-<?= $note->id ?>" name="content" required autocomplete="off"
-            placeholder="<?= __('writeReply.placeholder') ?>"></textarea>
-        <?php call_template('formatting_hint'); ?>
-    </div>
-    <details>
-        <summary><?= __('writeNote.moreOptions') ?></summary>
-        <div class="row">
-            <label class="standalone"><?= __('writeNote.mentions.label') ?></label>
-            <?php foreach (array_merge($note->mentions, [$note->author]) as $m) {
-                if ($m != $user?->actor) {
-                    call_template('user_mention_pill', ['type' => 'user', 'actor' => $m]);
-                }
-            } ?>
-            <?php call_template('user_mention_pill'); ?>
-        </div>
-        <div class="row">
-            <label for="replyScope-<?= $note->id ?>"><?= __('writeNote.scope.label') ?></label>
-            <select name="scope" id="replyScope-<?= $note->id ?>" required autocomplete="off">
-                <?php foreach ($scopeOptions as $s): ?>
-                    <option value="<?= $s ?>" <?= $selectedScope == $s ? 'selected' : '' ?>>
-                        <?= __("note.privacy.scope.$s") ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-    </details>
-    <div class="row">
-        <button class="primary"><?= __('writeReply.action') ?></button>
-    </div>
-</form>
\ No newline at end of file
diff --git a/templates/side_navigation.php b/templates/side_navigation.php
deleted file mode 100644
index 94bff5e..0000000
--- a/templates/side_navigation.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<ul class="sideNavigation">
-    <?php foreach ($links as $entry): ?>
-        <li>
-            <a href="<?= $entry['href'] ?>" <?= ($entry['confirmation'] ?? null) ? ('hx-confirm="' . $entry['confirmation'] . '"') : '' ?>>
-                <div class="material-symbols <?= $entry['icon'] ?>"></div>
-                <div><?= $entry['label'] ?></div>
-                <?php if (isset($entry['unreadCount']) && $entry['unreadCount'] > 0) {
-                    call_template('unread_indicator', ['count' => $entry['unreadCount']]);
-                } ?>
-            </a>
-        </li>
-    <?php endforeach; ?>
-</ul>
\ No newline at end of file
diff --git a/templates/skeleton.php b/templates/skeleton.php
index 5848054..62090bd 100644
--- a/templates/skeleton.php
+++ b/templates/skeleton.php
@@ -53,7 +53,7 @@ $settings = GlobalSettings::getInstance();
                 '/feed/global' => __('timeline.global.shortName'),
                 '/feed/local' => __('timeline.local.shortName'),
             ]);
-            call_template('navigation_links', ['links' => $links]);
+            call_template('navigation/header_links', ['links' => $links]);
             ?>
             <span id="siteTitle"><?= $settings->get('instance.name') ?></span>
             <img id="loadingIndicator" class="htmx-indicator" src="/static/tail-spin.svg">
@@ -63,12 +63,12 @@ $settings = GlobalSettings::getInstance();
             <?php endif; ?>
 
             <?php if ($user == null):
-                call_template('navigation_links', ['links' => [
+                call_template('navigation/header_links', ['links' => [
                     '/login' => __('navigation.login')
                 ]]);
             else: ?>
                 <a href="/@/<?= $user->actor->handle ?>" id="currentUserInfo">
-                    <?php call_template('actor_avatar', ['actor' => $user->actor]) ?>
+                    <?php call_template('actor/avatar', ['actor' => $user->actor]) ?>
                     <?= htmlspecialchars($user->actor->displayName) ?>
                 </a>
             <?php endif; ?>
@@ -79,9 +79,9 @@ $settings = GlobalSettings::getInstance();
             <section id="leftPane">
                 <?php
                 if ($user != null) {
-                    call_template('write_note_form', ['actor' => $user->actor]);
+                    call_template('note/write_form', ['actor' => $user->actor]);
                 }
-                call_template('left_side_navigation');
+                call_template('navigation/left_side');
                 ?>
                 <p class="versionInfo"><?= sprintf(__('version'), get_version()) ?></p>
             </section>
diff --git a/templates/thread_page.php b/templates/thread_page.php
index 5237f6c..ac2e640 100644
--- a/templates/thread_page.php
+++ b/templates/thread_page.php
@@ -17,7 +17,7 @@ call_template('skeleton', [
     $user = UserAccount::findByCurrentSession();
     foreach ($notes as $n) {
         if (!($user != null && $user->actor->blocks($n->author)) && $n->isViewableBy($user)) {
-            call_template('note', ['note' => $n, 'selected' => $n == $targetNote]);
+            call_template('note/note', ['note' => $n, 'selected' => $n == $targetNote]);
         }
     }
 });
\ No newline at end of file
diff --git a/templates/write_note_form.php b/templates/write_note_form.php
deleted file mode 100644
index 394f7ba..0000000
--- a/templates/write_note_form.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<form hidden id="writeNoteAttachmentForm" action="/todo" hx-post="/fragment/note/attachmentPill" hx-swap="beforebegin"
-    hx-target="#writeNoteAttachmentPillAdder" enctype="multipart/form-data">
-    <input hidden type="file" name="file" id="noteAttachmentFile" _="on change send submit to closest <form/>">
-</form>
-
-<form id="writeNoteForm" action="/todo" method="post" hx-post="/fragment/note" hx-swap="outerHTML"
-    hx-disabled-elt="find button" _="on submit wait 1s then trigger update on #liveTimelineUpdater"
-    <?= ($_SERVER['REQUEST_METHOD'] == 'GET') ? 'hx-preserve' : '' ?>>
-    <div class="row miniProfile">
-        <a href="/@/<?= $actor->handle ?>">
-            <?php call_template('actor_avatar', ['actor' => $actor]); ?>
-        </a>
-        <div class="basicInfo">
-            <a class="displayName" href="/@/<?= $actor->handle ?>"><?= htmlspecialchars($actor->displayName) ?></a>
-            <div class="handle">@<?= $actor->handle ?></div>
-        </div>
-    </div>
-    <div class="row summaryAndContent">
-        <label for="noteContent"><?= __('writeNote.label') ?></label>
-        <input type="text" id="noteSummary" name="summary" autocomplete="off"
-            placeholder="<?= __('writeNote.summary.label') ?>">
-        <textarea name="content" id="noteContent" required autocomplete="off"
-            placeholder="<?= __('writeNote.placeholder') ?>"></textarea>
-        <?php call_template('formatting_hint'); ?>
-    </div>
-    <details>
-        <summary><?= __('writeNote.moreOptions') ?></summary>
-        <div class="row">
-            <label class="standalone"><?= __('writeNote.mentions.label') ?></label>
-            <?php call_template('user_mention_pill'); ?>
-        </div>
-        <div class="row">
-            <label class="standalone"><?= __('writeNote.attachments.label') ?></label>
-            <?php call_template('attachment_pill'); ?>
-        </div>
-        <div class="row">
-            <label for="noteScope"><?= __('writeNote.scope.label') ?></label>
-            <select name="scope" id="noteScope" required autocomplete="off">
-                <option value="none"><?= __('note.privacy.scope.none') ?></option>
-                <option value="mutuals"><?= __('note.privacy.scope.mutuals') ?></option>
-                <option value="followers"><?= __('note.privacy.scope.followers') ?></option>
-                <option value="public" selected><?= __('note.privacy.scope.public') ?></option>
-            </select>
-        </div>
-    </details>
-    <div class="row">
-        <button class="primary"><?= __('writeNote.action') ?></button>
-    </div>
-</form>
\ No newline at end of file
-- 
cgit v1.3