From 54a35dda261bb44a93631344a6976e26fb103268 Mon Sep 17 00:00:00 2001
From: pjc09h <48838413+pjc09h@users.noreply.github.com>
Date: Fri, 31 May 2024 22:02:51 +0000
Subject: [PATCH] delete old torrent form templates

---
 app/Models/ObjectCrud.php                     |    1 +
 app/Models/TorrentGroups.php                  |   24 +
 app/Models/Torrents.php                       |    2 +-
 app/Permissions.php                           |   10 +
 app/Top10.php                                 |   97 +-
 app/TorrentForm.php                           | 1235 -----------------
 config/metadata.php                           |    8 +
 resources/js/torrent.js                       |    2 +
 resources/scss/assets/icons.scss              |    7 +
 resources/scss/global/forms.scss              |    1 +
 resources/scss/global/layout.scss             |    1 +
 resources/scss/global/torrents.scss           |    8 +-
 sections/better/badFolders.php                |    9 +-
 sections/better/badTags.php                   |    7 +-
 sections/better/missingCitations.php          |    7 +-
 sections/better/missingPictures.php           |    9 +-
 sections/better/singleSeeder.php              |    9 +-
 sections/literature/details.php               |    1 +
 sections/top10/torrents.php                   |   30 -
 sections/torrentGroups/browse.php             |   22 +-
 sections/torrentGroups/details.php            |    3 +
 sections/torrents/details.php                 |   38 +-
 sections/torrents/update.php                  |    1 -
 sections/upload/upload.php                    |   24 +-
 templates/_base/userInfo.twig                 |   36 +-
 templates/better/list.twig                    |   20 +-
 templates/bonusPoints/store.twig              |    5 +
 templates/collages/browse.twig                |   93 +-
 templates/literature/details.twig             |   49 +-
 templates/literature/sidebar.twig             |   53 +-
 templates/tables/collages.twig                |   66 +
 templates/tables/literature.twig              |   56 +-
 .../tables/torrentGroupsWithTorrents.twig     |   99 +-
 .../tables/torrentGroupsWithoutTorrents.twig  |   79 +-
 templates/tables/torrents.twig                |  121 ++
 templates/top10/torrents.twig                 |   96 +-
 templates/torrentGroups/details.twig          |  293 +---
 templates/torrentGroups/sidebar.twig          |    4 +-
 templates/torrent_form/announce_source.html   |   25 -
 templates/torrent_form/identifier.html        |   23 -
 templates/torrent_form/location.html          |   16 -
 templates/torrent_form/mirrors.html           |   14 -
 templates/torrent_form/notice.html            |   21 -
 templates/torrent_form/picture.html           |   16 -
 templates/torrent_form/seqhash.html           |   54 -
 templates/torrent_form/titles.html            |   50 -
 templates/torrent_form/version.html           |   19 -
 templates/torrent_form/workgroup.html         |   16 -
 templates/torrent_form/year.html              |   17 -
 templates/torrents/browse.twig                |   85 +-
 templates/torrents/details.twig               |  123 +-
 templates/torrents/sidebar.twig               |   36 +-
 52 files changed, 683 insertions(+), 2458 deletions(-)
 delete mode 100644 app/TorrentForm.php
 create mode 100644 templates/tables/collages.twig
 create mode 100644 templates/tables/torrents.twig
 delete mode 100644 templates/torrent_form/announce_source.html
 delete mode 100644 templates/torrent_form/identifier.html
 delete mode 100644 templates/torrent_form/location.html
 delete mode 100644 templates/torrent_form/mirrors.html
 delete mode 100644 templates/torrent_form/notice.html
 delete mode 100644 templates/torrent_form/picture.html
 delete mode 100644 templates/torrent_form/seqhash.html
 delete mode 100644 templates/torrent_form/titles.html
 delete mode 100644 templates/torrent_form/version.html
 delete mode 100644 templates/torrent_form/workgroup.html
 delete mode 100644 templates/torrent_form/year.html

diff --git a/app/Models/ObjectCrud.php b/app/Models/ObjectCrud.php
index ecfadb0f1..464a941a6 100644
--- a/app/Models/ObjectCrud.php
+++ b/app/Models/ObjectCrud.php
@@ -409,6 +409,7 @@ private function loadRelationships($object): void
 
         $this->relationships->{$object::$type} ??= null;
         if (!$this->relationships->{$object::$type}) {
+            $this->relationships->{$object::$type} = [];
             return;
         }
 
diff --git a/app/Models/TorrentGroups.php b/app/Models/TorrentGroups.php
index fcfaa6421..9a69ce1f6 100644
--- a/app/Models/TorrentGroups.php
+++ b/app/Models/TorrentGroups.php
@@ -147,6 +147,7 @@ public function delete(): void
     public function relationships(): ?array
     {
         return [
+            Collages::$type => $this->relatedCollages(),
             Creators::$type => $this->relatedCreators(),
             Literature::$type => $this->relatedLiterature(),
             Tags::$type => $this->relatedTags(),
@@ -155,6 +156,29 @@ public function relationships(): ?array
     }
 
 
+    /**
+     * relatedCollages
+     */
+    private function relatedCollages(): ?array
+    {
+        $app = App::go();
+
+        $query = "select collageId from collages_torrents where groupId = ?";
+        $ref = $app->dbNew->column($query, [$this->id]);
+
+        if (!$ref) {
+            return null;
+        }
+
+        $data = [];
+        foreach ($ref as $row) {
+            $data[] = ["id" => $row, "type" => Collages::$type];
+        }
+
+        return $data;
+    }
+
+
     /**
      * relatedCreators
      */
diff --git a/app/Models/Torrents.php b/app/Models/Torrents.php
index 1431ee499..5cd7daa4f 100644
--- a/app/Models/Torrents.php
+++ b/app/Models/Torrents.php
@@ -157,7 +157,7 @@ public function read(int|string $id = null): void
         parent::read($id);
 
         # explode the fileList
-        $fileList = explode("÷", $this->attributes->fileList);
+        $fileList = explode("÷", $this->attributes->fileList ?? "");
         $fileData = [];
 
         foreach ($fileList as $file) {
diff --git a/app/Permissions.php b/app/Permissions.php
index 86c961e38..6830819ea 100644
--- a/app/Permissions.php
+++ b/app/Permissions.php
@@ -67,6 +67,16 @@ class Permissions
             "deleteAny" => "Can delete any creators",
         ],
 
+        # literature
+        "literature" => [
+            "create" => "Can create literature",
+            "read" => "Can read literature",
+            "updateOwn" => "Can update own literature",
+            "updateAny" => "Can update any literature",
+            "deleteOwn" => "Can delete own literature",
+            "deleteAny" => "Can delete any literature",
+        ],
+
         # requests
         "requests" => [
             "create" => "Can create requests",
diff --git a/app/Top10.php b/app/Top10.php
index 172ff7608..d3dcba3da 100644
--- a/app/Top10.php
+++ b/app/Top10.php
@@ -98,7 +98,7 @@ public static function dailyTorrents(int $limit = null): ?array
         $cacheHit = $app->cache->get($cacheKey);
 
         if ($cacheHit) {
-            return $cacheHit;
+            #return $cacheHit;
         }
 
         # set limit and query extras
@@ -106,8 +106,14 @@ public static function dailyTorrents(int $limit = null): ?array
         $query = self::$torrentQuery . "where torrents.created_at > (now() - interval 1 day) order by (torrents.seeders + torrents.leechers) desc limit :limit";
         $ref = $app->dbNew->multi($query, ["limit" => $limit]);
 
-        $app->cache->set($cacheKey, $ref, self::$cacheDuration);
-        return $ref;
+        $data = [];
+        foreach ($ref as $key => $row) {
+            $data[] = new TorrentGroups($row["id"]);
+            $data[$key]->attributes->dataTransfer = $row["dataTransfer"];
+        }
+
+        $app->cache->set($cacheKey, $data, self::$cacheDuration);
+        return $data;
     }
 
 
@@ -128,7 +134,7 @@ public static function weeklyTorrents(int $limit = null): ?array
         $cacheHit = $app->cache->get($cacheKey);
 
         if ($cacheHit) {
-            return $cacheHit;
+            #return $cacheHit;
         }
 
         # set limit and query extras
@@ -136,8 +142,14 @@ public static function weeklyTorrents(int $limit = null): ?array
         $query = self::$torrentQuery . "where torrents.created_at > (now() - interval 1 week) order by (torrents.seeders + torrents.leechers) desc limit :limit";
         $ref = $app->dbNew->multi($query, ["limit" => $limit]);
 
-        $app->cache->set($cacheKey, $ref, self::$cacheDuration);
-        return $ref;
+        $data = [];
+        foreach ($ref as $key => $row) {
+            $data[] = new TorrentGroups($row["id"]);
+            $data[$key]->attributes->dataTransfer = $row["dataTransfer"];
+        }
+
+        $app->cache->set($cacheKey, $data, self::$cacheDuration);
+        return $data;
     }
 
 
@@ -158,7 +170,7 @@ public static function monthlyTorrents(int $limit = null): ?array
         $cacheHit = $app->cache->get($cacheKey);
 
         if ($cacheHit) {
-            return $cacheHit;
+            #return $cacheHit;
         }
 
         # set limit and query extras
@@ -166,8 +178,14 @@ public static function monthlyTorrents(int $limit = null): ?array
         $query = self::$torrentQuery . "where torrents.created_at > (now() - interval 1 month) order by (torrents.seeders + torrents.leechers) desc limit :limit";
         $ref = $app->dbNew->multi($query, ["limit" => $limit]);
 
-        $app->cache->set($cacheKey, $ref, self::$cacheDuration);
-        return $ref;
+        $data = [];
+        foreach ($ref as $key => $row) {
+            $data[] = new TorrentGroups($row["id"]);
+            $data[$key]->attributes->dataTransfer = $row["dataTransfer"];
+        }
+
+        $app->cache->set($cacheKey, $data, self::$cacheDuration);
+        return $data;
     }
 
 
@@ -188,7 +206,7 @@ public static function yearlyTorrents(int $limit = null): ?array
         $cacheHit = $app->cache->get($cacheKey);
 
         if ($cacheHit) {
-            return $cacheHit;
+            #return $cacheHit;
         }
 
         # set limit and query extras
@@ -196,10 +214,17 @@ public static function yearlyTorrents(int $limit = null): ?array
         $query = self::$torrentQuery . "where torrents.created_at > (now() - interval 1 year) order by (torrents.seeders + torrents.leechers) desc limit :limit";
         $ref = $app->dbNew->multi($query, ["limit" => $limit]);
 
-        $app->cache->set($cacheKey, $ref, self::$cacheDuration);
-        return $ref;
+        $data = [];
+        foreach ($ref as $key => $row) {
+            $data[] = new TorrentGroups($row["id"]);
+            $data[$key]->attributes->dataTransfer = $row["dataTransfer"];
+        }
+
+        $app->cache->set($cacheKey, $data, self::$cacheDuration);
+        return $data;
     }
 
+
     /**
      * overallTorrents
      *
@@ -217,7 +242,7 @@ public static function overallTorrents(int $limit = null): ?array
         $cacheHit = $app->cache->get($cacheKey);
 
         if ($cacheHit) {
-            return $cacheHit;
+            #return $cacheHit;
         }
 
         # set limit and query extras
@@ -225,8 +250,14 @@ public static function overallTorrents(int $limit = null): ?array
         $query = self::$torrentQuery . "order by (torrents.seeders + torrents.leechers) desc limit :limit";
         $ref = $app->dbNew->multi($query, ["limit" => $limit]);
 
-        $app->cache->set($cacheKey, $ref, self::$cacheDuration);
-        return $ref;
+        $data = [];
+        foreach ($ref as $key => $row) {
+            $data[] = new TorrentGroups($row["id"]);
+            $data[$key]->attributes->dataTransfer = $row["dataTransfer"];
+        }
+
+        $app->cache->set($cacheKey, $data, self::$cacheDuration);
+        return $data;
     }
 
 
@@ -247,7 +278,7 @@ public static function torrentSeeders(int $limit = null): ?array
         $cacheHit = $app->cache->get($cacheKey);
 
         if ($cacheHit) {
-            return $cacheHit;
+            #return $cacheHit;
         }
 
         # set limit and query extras
@@ -255,8 +286,14 @@ public static function torrentSeeders(int $limit = null): ?array
         $query = self::$torrentQuery . "order by torrents.seeders desc limit :limit";
         $ref = $app->dbNew->multi($query, ["limit" => $limit]);
 
-        $app->cache->set($cacheKey, $ref, self::$cacheDuration);
-        return $ref;
+        $data = [];
+        foreach ($ref as $key => $row) {
+            $data[] = new TorrentGroups($row["id"]);
+            $data[$key]->attributes->dataTransfer = $row["dataTransfer"];
+        }
+
+        $app->cache->set($cacheKey, $data, self::$cacheDuration);
+        return $data;
     }
 
 
@@ -277,7 +314,7 @@ public static function torrentSnatches(int $limit = null): ?array
         $cacheHit = $app->cache->get($cacheKey);
 
         if ($cacheHit) {
-            return $cacheHit;
+            #return $cacheHit;
         }
 
         # set limit and query extras
@@ -285,8 +322,14 @@ public static function torrentSnatches(int $limit = null): ?array
         $query = self::$torrentQuery . "order by torrents.snatched desc limit :limit";
         $ref = $app->dbNew->multi($query, ["limit" => $limit]);
 
-        $app->cache->set($cacheKey, $ref, self::$cacheDuration);
-        return $ref;
+        $data = [];
+        foreach ($ref as $key => $row) {
+            $data[] = new TorrentGroups($row["id"]);
+            $data[$key]->attributes->dataTransfer = $row["dataTransfer"];
+        }
+
+        $app->cache->set($cacheKey, $data, self::$cacheDuration);
+        return $data;
     }
 
 
@@ -307,7 +350,7 @@ public static function torrentData(int $limit = null): ?array
         $cacheHit = $app->cache->get($cacheKey);
 
         if ($cacheHit) {
-            return $cacheHit;
+            #return $cacheHit;
         }
 
         # set limit and query extras
@@ -315,8 +358,14 @@ public static function torrentData(int $limit = null): ?array
         $query = self::$torrentQuery . "order by dataTransfer desc limit :limit";
         $ref = $app->dbNew->multi($query, ["limit" => $limit]);
 
-        $app->cache->set($cacheKey, $ref, self::$cacheDuration);
-        return $ref;
+        $data = [];
+        foreach ($ref as $key => $row) {
+            $data[] = new TorrentGroups($row["id"]);
+            $data[$key]->attributes->dataTransfer = $row["dataTransfer"];
+        }
+
+        $app->cache->set($cacheKey, $data, self::$cacheDuration);
+        return $data;
     }
 
 
diff --git a/app/TorrentForm.php b/app/TorrentForm.php
deleted file mode 100644
index a011010f7..000000000
--- a/app/TorrentForm.php
+++ /dev/null
@@ -1,1235 +0,0 @@
-<?php
-
-#declare(strict_types=1);
-
-# THIS IS GOING AWAY!
-
-// This class is used in upload.php to display the upload form, and the edit
-// section of torrents.php to display a shortened version of the same form
-class TorrentForm
-{
-    public $UploadForm = '';
-    public $Categories = [];
-
-    /**
-     * This kind of stuff will eventually go away.
-     * The goal is to loop through multidimensional $ENV objects,
-     * recursively copying parts to arrays in place as needed.
-     */
-
-    # Formats
-    # See classes/config.php
-    public $SeqFormats = [];
-    public $ProtFormats = [];
-    public $GraphXmlFormats = [];
-    public $GraphTxtFormats = [];
-    public $ImgFormats = [];
-    public $MapVectorFormats = [];
-    public $MapRasterFormats = [];
-    public $BinDocFormats = [];
-    public $CpuGenFormats = [];
-    public $PlainFormats = [];
-    public $Resolutions = [];
-
-    # Gazelle
-    public $NewTorrent = false;
-    public $Torrent = [];
-    public $Error = false;
-    public $TorrentID = false;
-    public $Disabled = '';
-    public $DisabledFlag = false;
-
-    public function __construct($Torrent = false, $Error = false, $NewTorrent = true)
-    {
-        # See classes/config.php
-        global $UploadForm, $Categories, $TorrentID, $SeqFormats, $ProtFormats, $GraphXmlFormats, $GraphTxtFormats, $ImgFormats, $MapVectorFormats, $MapRasterFormats, $BinDocFormats, $CpuGenFormats, $PlainFormats, $Resolutions;
-        #global $UploadForm, $Categories, $TorrentID, $SeqPlatforms, $GraphPlatforms, $ImgPlatforms, $DocPlatforms, $RawPlatforms, $SeqFormats, $ProtFormats, $GraphXmlFormats, $GraphTxtFormats, $ImgFormats, $MapVectorFormats, $MapRasterFormats, $BinDocFormats, $CpuGenFormats, $PlainFormats, $Codecs, $Archives, $Resolutions;
-        #global $UploadForm, $Categories, $Formats, $Bitrates, $Media, $MediaManga, $TorrentID, $Containers, $ContainersGames, $Codecs, $Resolutions, $Platform, $Archives, $ArchivesManga;
-
-        # Gazelle
-        $this->NewTorrent = $NewTorrent;
-        $this->Torrent = $Torrent;
-        $this->Error = $Error;
-
-        $this->UploadForm = $UploadForm;
-        $this->Categories = $Categories;
-        $this->TorrentID = $TorrentID;
-
-        # Formats
-        # See classes/config.php
-        $this->SeqFormats = $SeqFormats;
-        $this->ProtFormats = $ProtFormats;
-        $this->GraphXmlFormats = $GraphXmlFormats;
-        $this->GraphTxtFormats = $GraphTxtFormats;
-        $this->ImgFormats = $ImgFormats;
-        $this->MapVectorFormats = $MapVectorFormats;
-        $this->MapRasterFormats = $MapRasterFormats;
-        $this->BinDocFormats = $BinDocFormats;
-        $this->CpuGenFormats = $CpuGenFormats;
-        $this->PlainFormats = $PlainFormats;
-        $this->Resolutions = $Resolutions;
-
-        # Quick constructor test
-        if ($this->Torrent && $this->Torrent['GroupID']) {
-            $this->Disabled = ' readonly="readonly"';
-            $this->DisabledFlag = true;
-        }
-    }
-
-
-    /**
-     * ====================
-     * = Twig-based class =
-     * ====================
-     */
-
-
-    /**
-     * render
-     *
-     * TorrentForm Twig wrapper.
-     * Hopefully more pleasant.
-     */
-    public function render()
-    {
-        $app = \Gazelle\App::go();
-
-        $ENV = \Gazelle\ENV::go();
-        $twig  = \Gazelle\Twig::go();
-
-        /**
-         * Upload notice
-         */
-        if ($this->NewTorrent) {
-            echo $twig->render('torrent_form/notice.html');
-        }
-
-        /**
-         * Announce and source
-         */
-        if ($this->NewTorrent) {
-            $Announces = ANNOUNCE_URLS[0];
-            #$Announces = call_user_func_array('array_merge', ANNOUNCE_URLS);
-
-            $TorrentPass = $app->user->extra['torrent_pass'];
-            $TorrentSource = User::uploadSource();
-
-            echo $twig->render(
-                'torrent_form/announce_source.html',
-                [
-                  'announces' => $Announces,
-                  'torrent_pass' => $TorrentPass,
-                  'torrent_source' => $TorrentSource,
-                ]
-            );
-        }
-
-        /**
-         * Errors
-         * (Twig unjustified)
-         */
-        if ($this->Error) {
-            echo <<<HTML
-              <aside class="upload_error">
-                <p>$this->Error</p>
-              </aside>
-HTML;
-        }
-
-        /**
-         * head
-         * IMPORTANT!
-         */
-        echo $this->head();
-
-        /**
-         * upload_form
-         * Where the fields are.
-         */
-        echo $this->upload_form();
-
-        /**
-         * foot
-         */
-        echo $this->foot();
-    } # End render()
-
-
-    /**
-     * head
-     *
-     * Everything up to the main form tag open:
-     * <div id="dynamic_form">
-     * Kept as an HTML function because it's simpler.
-     */
-    private function head()
-    {
-        $app = \Gazelle\App::go();
-
-        $ENV = \Gazelle\ENV::go();
-        $app->dbOld->query(
-            "
-        SELECT
-          COUNT(`ID`)
-        FROM
-          `torrents`
-        WHERE
-          `UserID` = " . $app->user->core["id"]
-        );
-        list($Uploads) = $app->dbOld->next_record();
-
-        # Torrent form hidden values
-        $AuthKey = $app->user->extra['AuthKey'];
-        $HTML = <<<HTML
-        <form class="box pad" name="torrent" action="" enctype="multipart/form-data" method="post"
-          onsubmit="$('#post').raw().disabled = 'disabled';">
-
-        <input type="hidden" name="submit" value="true">
-        <input type="hidden" name="auth" value="$AuthKey">
-HTML;
-
-        if (!$this->NewTorrent) {
-            # Edit form hidden fields
-            $TorrentID = \Gazelle\Text::esc($this->TorrentID);
-            $CategoryID = \Gazelle\Text::esc($this->Torrent['CategoryID'] - 1);
-
-            $HTML .= <<<HTML
-            <input type="hidden" name="action" value="takeedit">
-            <input type="hidden" name="torrentid" value="$TorrentID">
-            <input type="hidden" name="type" value="$CategoryID">
-HTML;
-        } # fi !NewTorrent
-        else {
-            # Torrent upload hidden fields
-            if ($this->Torrent && $this->Torrent['GroupID']) {
-                $GroupID = \Gazelle\Text::esc($this->Torrent['GroupID']);
-                $CategoryID = \Gazelle\Text::esc($this->Torrent['CategoryID'] - 1);
-
-                $HTML .= <<<HTML
-                <input type="hidden" name="groupid" value="$GroupID">
-                <input type="hidden" name="type" value="$CategoryID">
-HTML;
-            }
-
-            # Request hidden fields (new or edit?)
-            if ($this->Torrent && ($this->Torrent['RequestID'] ?? false)) {
-                $RequestID = \Gazelle\Text::esc($this->Torrent['RequestID']);
-                $HTML .=  <<<HTML
-                <input type="hidden" name="requestid"value="$RequestID">
-HTML;
-            }
-        } # else
-
-        /**
-         * Start printing the torrent form
-         */
-        $HTML .= '<table class="torrentForm">';
-
-        /**
-         * New torrent options:
-         * file and category
-         */
-        if ($this->NewTorrent) {
-            $HTML .=  '<h2 class="header">Basic Info</h2>';
-            $HTML .= <<<HTML
-            <tr>
-              <td>
-                <label for="file_input" class="required">
-                  Torrent File
-                </label>
-              </td>
-
-              <td>
-                <input id="file" type="file" name="file_input" size="50">
-
-                <p>
-                  Set the private flag, e.g.,
-                  <code>mktorrent -p -a &lt;announce&gt; &lt;target folder&gt;</code>
-                </p>
-              </td>
-            </tr>
-HTML;
-
-            $DisabledFlag = ($this->DisabledFlag) ? ' disabled="disabled"' : '';
-            $HTML .= <<<HTML
-              <tr>
-                <td>
-                  <label for="type" class="required">
-                    Category
-                  </label>
-                </td>
-
-                <td>
-                <select id="categories" name="type" onchange="Categories()" $DisabledFlag>
-HTML;
-
-            foreach ($ENV->CATS as $Cat) {
-                $Minus1 = $Cat->ID - 1;
-                $HTML .= "<option value='$Minus1'";
-
-                if ($Cat->Name === $this->Torrent['CategoryName']) {
-                    $HTML .= ' selected="selected"';
-                }
-
-                $HTML .= ">$Cat->Name</option>";
-            }
-
-            $HTML .= <<<HTML
-                  </select>
-                  <p id="category_description" class="">
-                  <!-- $Cat->Description will live here -->
-                  Please see the
-                  <a href="/wiki/categories">Categories Wiki</a>
-                  for details
-                  </p>
-                </td>
-              </tr>
-            </table>
-HTML;
-        } # fi NewTorrent
-
-        # Start the dynamic form
-        $HTML .= '<div id="dynamic_form">';
-        return $HTML;
-    } # End head()
-
-
-    /**
-     * foot
-     *
-     * Make the endmatter.
-     */
-    private function foot()
-    {
-        $Torrent = $this->Torrent;
-        echo '<table class="torrentForm>';
-
-        /**
-         * Freeleech type
-         */
-        if (!$this->NewTorrent) {
-            if ($app->user->can(["admin" => "freeleechTorrents"])) {
-                echo <<<HTML
-                <tr id="freetorrent">
-                  <td>
-                    <label for="freeleech">
-                      Freeleech
-                    </label>
-                  </td>
-        
-                  <td>
-                  <select name="freeleech">
-HTML;
-
-                $FL = ['Normal', 'Free', 'Neutral'];
-                foreach ($FL as $Key => $Name) {
-                    $Selected = ($Key === $Torrent['FreeTorrent']) ? ' selected="selected"' : '';
-
-                    echo <<<HTML
-                  <option value="$Key" $Selected>
-                    $Name
-                  </option>
-HTML;
-                }
-
-                echo <<<HTML
-                </select>
-                because
-                <select name="freeleechtype">
-HTML;
-
-                /**
-                 * Freeleech reasons
-                 */
-                $FL = array('N/A', 'Staff Pick', 'Perma-FL', 'Freeleechizer', 'Site-Wide FL');
-                foreach ($FL as $Key => $Name) {
-                    $Selected = ($Key === $Torrent['FreeLeechType']) ? ' selected="selected"' : '';
-                    echo <<<HTML
-                    <option value="$Key?>" $Selected>
-                      $Name
-                    </option>
-HTML;
-                }
-
-                echo <<<HTML
-                  </select>
-                </td>
-              </tr>
-HTML;
-            }
-        } # fi !NewTorrent
-
-        # For new torrents only
-        if ($this->NewTorrent) {
-            # Rules notice
-            echo <<<HTML
-        <tr>
-          <td>
-            <aside class="torrent_upload">
-              <p>
-                Be sure that your torrent is approved by the
-                <a href="/rules/upload" target="_blank">rules</a>.
-                Not doing this will result in a
-                <strong class="important_text">warning</strong> or
-                <strong class="important_text">worse</strong>.
-              </p>
-HTML;
-
-            # Request fill notice
-            echo <<<HTML
-            <p>
-              After uploading the torrent, you will have a one hour grace period.
-              During this time only you can fill requests with this torrent.
-              Make use of it wisely, and
-              <a href="requests.php">search the list of requests</a>.
-            </p>
-HTML;
-            echo '</aside></td></tr>';
-        }
-
-
-        /**
-         * Submit button
-         */
-        $Value = ($this->NewTorrent) ? 'Upload' : 'Edit';
-
-        echo <<<HTML
-              <tr>
-                <td class="center">
-                  <input id="post" type="submit" value="$Value" class="button-primary">
-                </td>
-              </tr>
-            </table> <!-- torrent_form -->
-          </form>
-        </div> <!-- dynamic_form -->
-HTML;
-    } # End foot()
-
-
-    /**
-     * upload_form
-     *
-     * Finally the "real" upload form.
-     * Contains all the fields you'd expect.
-     *
-     * This is currently one enormous function.
-     * It has sub-functions, variables, and everything.
-     * It continues to the end of the class.
-     */
-    public function upload_form()
-    {
-        $app = \Gazelle\App::go();
-
-        $ENV = \Gazelle\ENV::go();
-        $twig = \Gazelle\Twig::go();
-
-        $QueryID = $app->dbOld->get_query_id();
-        $Torrent = $this->Torrent;
-
-        # Start printing the form
-        echo '<h2 class="header">Torrent Form</h2>';
-        echo '<table class="torrentForm skeletonFix">';
-
-
-        /**
-         * Accession Number
-         */
-        $CatalogueNumber = \Gazelle\Text::esc($Torrent['CatalogueNumber']);
-        $Disabled = $this->Disabled;
-
-        echo $twig->render(
-            'torrent_form/identifier.html',
-            [
-                'db' => $ENV->DB->identifier,
-                'identifier' => $CatalogueNumber,
-            ]
-        );
-
-
-        /**
-         * Version
-         */
-
-        $Version = \Gazelle\Text::esc($Torrent['Version']);
-
-        echo $twig->render(
-            'torrent_form/version.html',
-            [
-              'db' => $ENV->DB->version,
-              'version' => $Version,
-          ]
-        );
-
-
-        /**
-         * Title Fields
-         */
-
-        # New torrent upload
-        if ($this->NewTorrent) {
-            $Title1 = \Gazelle\Text::esc($Torrent['Title']);
-            $Title2 = \Gazelle\Text::esc($Torrent['Title2']);
-            $Title3 = \Gazelle\Text::esc($Torrent['TitleJP']);
-            #$Disabled = $this->Disabled;
-
-            echo $twig->render(
-                'torrent_form/titles.html',
-                [
-                  'db' => $ENV->DB,
-                  'title' => $Title1,
-                  'subject' => $Title2,
-                  'object' => $Title3,
-                ]
-            );
-        } # fi NewTorrent
-
-
-        /**
-         * Creator(s)
-         * CURRENTLY BROKEN
-         *
-         * Gazelle supports multiple creators per torrent.
-         * One day I want to integrate the creator DB to join:
-         *  - DOI publication info in `torrents_screenshots`
-         *  - Attributions listed on the creator pages
-         *  - Stats about creator vs. total DOI citations
-         */
-        if ($this->NewTorrent) {
-            # Useful variables
-            $Disabled = $this->Disabled;
-
-            $AddRemoveBrackets = <<<HTML
-            <a class="add_artist_button brackets" onclick="AddArtistField()">+</a>
-            <a class="remove_artist_button brackets" onclick="RemoveArtistField()">&minus;</a>
-HTML;
-
-            echo <<<HTML
-            <tr id="artists_tr">
-              <td>
-                <label for="artistfields" class="required">
-                  Authors(s)
-                </label>
-              </td>
-
-              <td id="artistfields">
-                <p>
-                  One per field, e.g., Robert K. Mortimer [+] David Schild
-                </p>
-HTML;
-
-            # If there are already creators listed
-            if (!empty($Torrent['Artists'])) {
-                foreach ($Torrent['Artists'] as $Num => $Artist) {
-                    $ArtistName = \Gazelle\Text::esc($Artist['name']);
-                    $AddRemoveBrackets = ($Num === 0) ?: null;
-
-                    echo <<<HTML
-                    <input type="text" id="artist_$Num" name="artists[]" size="45"
-                      value="$ArtistName" $Disabled>
-                    $AddRemoveBrackets
-HTML;
-                }
-            } else {
-                echo <<<HTML
-                <input type="text" id="artist_0" name="artists[]" size="45"
-                  value="" $Disabled>
-                $AddRemoveBrackets
-HTML;
-            }
-
-            echo '</td></tr>';
-        } # fi $NewTorrent
-
-
-        /**
-         * Workgroup
-         */
-        if ($this->NewTorrent) {
-            $Affiliation = \Gazelle\Text::esc($Torrent['Studio']);
-
-            echo $twig->render(
-                'torrent_form/workgroup.html',
-                [
-                  'db' => $ENV->DB->workgroup,
-                  'workgroup' => $Affiliation,
-                ]
-            );
-        }
-
-
-        /**
-         * Location
-         *
-         * The location of the studio, lab, etc.
-         * Currently not sanitized to a standard format.
-         */
-        if ($this->NewTorrent) {
-            $TorrentLocation = \Gazelle\Text::esc($Torrent['Series']);
-            echo $twig->render(
-                'torrent_form/location.html',
-                [
-                  'db' => $ENV->DB->location,
-                  'location' => $TorrentLocation,
-                ]
-            );
-        }
-
-
-        /**
-         * ============================
-         * = End if NewTorrent fields =
-         * ============================
-         */
-
-
-        /**
-         * Year
-         */
-        $TorrentYear = \Gazelle\Text::esc($Torrent['Year']);
-
-        echo $twig->render(
-            'torrent_form/year.html',
-            [
-            'db' => $ENV->DB->year,
-            'year' => $TorrentYear,
-          ]
-        );
-
-
-        /**
-         * Misc meta
-         *
-         * Used in OT Gazelle as Codec.
-         * Used in Bio Gazelle as License.
-         *
-         * Unsure what to call the final field.
-         * Some essential, specific one-off info.
-         */
-        echo <<<HTML
-        <tr id="codec_tr">
-          <td>
-            <label for="codec" class="required">
-              License
-            </label>
-          </td>
-
-          <td>
-            <select name="codec">
-              <option>---</option>
-HTML;
-
-        foreach ($ENV->META->Licenses as $License) {
-            echo "<option value='$License'";
-
-            if ($License === ($Torrent['Codec'] ?? false)) {
-                echo " selected";
-            }
-
-            echo ">$License</option>\n";
-        }
-
-        echo <<<HTML
-            </select>
-            <p>
-              Please see
-              <a href="http://www.dcc.ac.uk/resources/how-guides/license-research-data" target="_blank">How to License Research Data</a>
-            </p>
-          </td>
-        </tr>
-HTML;
-
-
-        /**
-         * ====================================
-         * = Begin if NewTorrent fields again =
-         * ====================================
-         */
-
-
-        /**
-         * Media
-         *
-         * The class of technology associated with the data.
-         * Answers the question: "Where does the data come from?"
-         *
-         * This could be the data genesis platform or program,
-         * or a genre of physical media (e.g., vinyl record).
-         */
-
-
-        /**
-         * Make select element
-         *
-         * Takes an ID, label, torrent, and media list.
-         * Returns a media select option as on upload.php.
-         */
-        function mediaSelect($trID = '', $Label = '', $Torrent = [], $Media = [], $Desc = '')
-        {
-            echo <<<HTML
-                <tr id="$trID">
-                  <td>
-                    <label for="media" class="required">
-                      $Label
-                    </label>
-                  </td>
-  
-                  <td>
-                    <select name="media">
-                      <option>---</option>
-  HTML;
-
-            foreach ($Media as $Media) {
-                echo "<option value='$Media'";
-
-                if ($Media === ($Torrent['Media'] ?? false)) {
-                    echo ' selected';
-                }
-
-                echo ">$Media</option>\n";
-            }
-
-            echo <<<HTML
-                    </select>
-                    <p>
-                      The class of technology used
-                    </p>
-                  </td>
-                </tr>
-  HTML;
-        } # End mediaSelect()
-
-
-        /**
-         * Platform: Sequences
-         */
-        if ($this->NewTorrent) {
-            mediaSelect(
-                $trID = 'media_tr',
-                $Label = 'Platform',
-                $Torrent = $Torrent,
-                $Media = $ENV->CATS->{1}->Platforms
-            );
-
-
-            /**
-             * Platform: Graphs
-             */
-            mediaSelect(
-                $trID = 'media_graphs_tr',
-                $Label = 'Platform',
-                $Torrent = $Torrent,
-                $Media = $ENV->CATS->{2}->Platforms
-            );
-
-
-            /**
-             * Platform: Scalars/Vectors
-             */
-            mediaSelect(
-                $trID = 'media_scalars_vectors_tr',
-                $Label = 'Platform',
-                $Torrent = $Torrent,
-                $Media = $ENV->CATS->{5}->Platforms
-            );
-
-
-            /**
-             * Platform: Images
-             */
-            mediaSelect(
-                $trID = 'media_images_tr',
-                $Label = 'Platform',
-                $Torrent = $Torrent,
-                $Media = $ENV->CATS->{8}->Platforms
-            );
-
-
-            /**
-             * Platform: Documents
-             */
-            mediaSelect(
-                $trID = 'media_documents_tr',
-                $Label = 'Platform',
-                $Torrent = $Torrent,
-                $Media = $ENV->CATS->{11}->Platforms
-            );
-
-
-            /**
-             * Platform: Machine Data
-             */
-            mediaSelect(
-                $trID = 'media_machine_data_tr',
-                $Label = 'Platform',
-                $Torrent = $Torrent,
-                $Media = $ENV->CATS->{12}->Platforms
-            );
-        } # fi NewTorrent
-        else {
-            $TorrentMedia = $Torrent['Media'];
-            echo <<<HTML
-          <input type="hidden" name="media" value="$TorrentMedia">
-HTML;
-        }
-
-
-        /**
-         * Format
-         *
-         * Simple: the data's file format.
-         * Called Container in OT Gazelle, same diff.
-         * In the future, $ENV will automagically set this.
-         */
-        function formatSelect($trID = '', $Label = '', $Torrent = [], $FileTypes = [])
-        {
-            #var_dump($FileTypes);
-            echo <<<HTML
-            <tr id="$trID">
-              <td>
-                <label for="container" class="required">
-                  $Label
-                <label>
-              </td>
-
-              <td>
-                <select id="container" name="container">
-                  <option value="Autofill">Autofill</option>
-HTML;
-
-            foreach ($FileTypes as $FileType) {
-                foreach ($FileType as $Type => $Extensions) {
-                    echo "<option value='$Type'";
-
-                    if ($Type === ($Torrent['Container'] ?? false)) {
-                        echo ' selected';
-                    }
-
-                    echo ">$Type</option>\n";
-                }
-            }
-
-
-            echo <<<HTML
-                </select>
-                <p>
-                  File format, or detect from file list
-                  <!--
-                    todo: Make work with config.php metadata
-                    Data file format, or detect from file list
-                    Compression algorithm, or detect from file list
-                  -->
-                </p>
-              </td>
-            </tr>
-HTML;
-        } # End formatSelect()
-
-
-        /**
-         * Format: Sequences
-         */
-        formatSelect(
-            $trID = 'container_tr',
-            $Label = 'Format',
-            $Torrent = $Torrent,
-            $FileTypes = $ENV->CATS->{1}->Formats
-        );
-
-
-        /**
-         * Format: Graphs
-         */
-        formatSelect(
-            $trID = 'container_graphs_tr',
-            $Label = 'Format',
-            $Torrent = $Torrent,
-            #$FileTypes = array_column($ENV->META, $Formats)
-            $FileTypes = $ENV->CATS->{2}->Formats
-        );
-
-
-        /**
-         * Format: Scalars/Vectors
-         */
-        formatSelect(
-            $trID = 'container_scalars_vectors_tr',
-            $Label = 'Format',
-            $Torrent = $Torrent,
-            #$FileTypes = $ENV->flatten($ENV->CATS->{5}->Formats)
-            $FileTypes = $ENV->CATS->{5}->Formats
-        );
-
-
-        /**
-         * Format: Images
-         */
-        formatSelect(
-            $trID = 'container_images_tr',
-            $Label = 'Format',
-            $Torrent = $Torrent,
-            #$FileTypes = array_merge($this->ImgFormats)
-            $FileTypes = $ENV->CATS->{8}->Formats
-        );
-
-
-        /**
-         * Format: Spatial
-         */
-        formatSelect(
-            $trID = 'container_spatial_tr',
-            $Label = 'Format',
-            $Torrent = $Torrent,
-            #$FileTypes = array_merge($this->MapVectorFormats, $this->MapRasterFormats, $this->ImgFormats, $this->PlainFormats)
-            $FileTypes = $ENV->CATS->{9}->Formats
-        );
-
-
-        /**
-         * Format: Documents
-         */
-        formatSelect(
-            $trID = 'container_documents_tr',
-            $Label = 'Format',
-            $Torrent = $Torrent,
-            #$FileTypes = array_merge($this->BinDocFormats, $this->CpuGenFormats, $this->PlainFormats)
-            $FileTypes = $ENV->CATS->{11}->Formats
-        );
-
-
-        /**
-         * Format: Compression
-         */
-        formatSelect(
-            $trID = 'archive_tr',
-            $Label = 'Archive',
-            $Torrent = $Torrent,
-            # $ENV->Archives nests -1 deep
-            $FileTypes = [$ENV->META->Formats->Archives]
-        );
-
-
-        /**
-         * Scope
-         *
-         * How complete the data are.
-         * Relatively, how much information does it contain?
-         */
-        $TorrentResolution = ($Torrent['Resolution']) ?? '';
-        echo <<<HTML
-        <tr id="resolution_tr">
-          <td>
-            <label for="ressel" class="required">
-              Scope
-            </label>
-          </td>
-
-          <td>
-            <select id="ressel" name="ressel" onchange="SetResolution()">
-              <option>---</option>
-HTML;
-
-        foreach ($this->Resolutions as $Res) {
-            echo "<option value='$Res'";
-
-            if ($Res === ($Torrent['Resolution'] ?? false)
-              || (!isset($FoundRes) && ($Torrent['Resolution'] ?? false)
-              && $Res === 'Other')) {
-                echo " selected";
-                $FoundRes = true;
-            }
-
-            echo ">$Res</option>\n";
-        }
-
-        echo <<<HTML
-            </select>
-            <!-- Enter your own -->
-            <input type="text" id="resolution" name="resolution" size="15" maxlength="20"
-              class="hidden" value="$TorrentResolution" readonly>
-            </input>
-        
-            <script>
-            if ($('#ressel').raw().value === 'Other') {
-              $('#resolution').raw().readOnly = false
-              $('#resolution').gshow()
-            }
-            </script>
-        
-            <p>
-              How complete the data is, specifically or conceptually
-            </p>
-          </td>
-        </tr>
-HTML;
-
-
-        /**
-         * ====================================
-         * = Begin if NewTorrent fields again =
-         * ====================================
-         */
-
-
-        /**
-         * Tags
-         *
-         * Simple enough.
-         * I won't rehash tag management.
-         */
-        if ($this->NewTorrent) {
-            echo <<<HTML
-            <tr id="tags_tr">
-              <td>
-                <label for="tags" class="required">
-                  Tags
-                </label>
-              </td>
-              <td>
-HTML;
-
-            $GenreTags = $app->cache->get('genre_tags');
-            if (!$GenreTags) {
-                $app->dbOld->query("
-                SELECT
-                  `Name`
-                FROM
-                  `tags`
-                WHERE
-                  `TagType` = 'genre'
-                ORDER BY
-                  `Name`
-                ");
-
-                $GenreTags = $app->dbOld->collect('Name');
-                $app->cache->set('genre_tags', $GenreTags, 3600 * 6);
-            }
-
-            # todo: Find a better place for these
-            $Disabled = ($this->DisabledFlag) ? ' disabled="disabled"' : null;
-            $TorrentTagList = \Gazelle\Text::esc(implode(', ', explode(',', $Torrent['TagList'])));
-
-            echo <<<HTML
-            <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" $Disabled>
-              <option>---</option>
-HTML;
-
-            foreach (Misc::display_array($GenreTags) as $Genre) {
-                echo <<<HTML
-                <option value="$Genre">
-                  $Genre
-                </option>
-HTML;
-            }
-
-            echo <<<HTML
-                </select>
-                <input type="text" id="tags" name="tags" size="60"
-                  placeholder="Comma-seperated list of at least 5 tags"
-                  value="$TorrentTagList">
-              </td>
-            </tr>
-HTML;
-        } # fi NewTorrent
-
-
-        /**
-         * Picture
-         *
-         * Another obvious field.
-         */
-        if ($this->NewTorrent) {
-            $TorrentImage = \Gazelle\Text::esc($Torrent['Image']);
-            $Disabled = $this->Disabled;
-
-            echo $twig->render(
-                'torrent_form/picture.html',
-                [
-                    'db' => $ENV->DB->picture,
-                    'picture' => $TorrentImage,
-                ]
-            );
-        }
-
-
-        /**
-         * Mirrors
-         *
-         * This should be in the `torrents` table not `torrents_group.`
-         * The intended use is for web seeds, Dat mirrors, etc.
-         */
-        if (!$this->DisabledFlag && $this->NewTorrent) {
-            $TorrentMirrors = \Gazelle\Text::esc($Torrent['Mirrors']);
-            echo $twig->render(
-                'torrent_form/mirrors.html',
-                [
-                  'db' => $ENV->DB->mirrors,
-                  'mirrors' => $TorrentMirrors,
-              ]
-            );
-        }
-
-
-        /**
-         * Samples
-         *
-         * Called Screenshots in OT Gazelle.
-         * Called Publication in Bio Gazelle.
-         * Eventually this will be a proper database in itself,
-         * pulling info from DOI to populate the schema.
-         */
-        if (!$this->DisabledFlag && $this->NewTorrent) {
-            $TorrentSamples = \Gazelle\Text::esc($Torrent['Screenshots']);
-
-            echo <<<HTML
-            <tr id="screenshots_tr">
-              <td>
-                <label for="screenshots">
-                  Publications
-                </label>
-              </td>
-              
-              <td>
-                <!-- Needs to be all on one line -->
-                <textarea rows="8" name="screenshots" id="screenshots"
-                  placeholder="Up to ten DOI numbers, one per line">$TorrentSamples</textarea>
-              </td>
-            </tr>
-HTML;
-        }
-
-
-        /**
-         * Seqhash
-         */
-
-        if ($ENV->enableBioPhp && !$this->DisabledFlag && $this->NewTorrent) {
-            $TorrentSeqhash = \Gazelle\Text::esc($Torrent['Seqhash']);
-            echo $twig->render(
-                'torrent_form/seqhash.html',
-                [
-                    'db' => $ENV->DB->seqhash,
-                    'seqhash' => $TorrentSeqhash,
-                ]
-            );
-        }
-
-
-        /**
-         * Torrent group description
-         *
-         * The text on the main torrent pages,
-         * between torrent info and torrent comments,
-         * visible even if individual torrents are collapsed.
-         */
-        if ($this->NewTorrent) {
-            echo <<<HTML
-            <tr id="group_desc_tr">
-              <td>
-                <label for="album_desc" class="required">
-                  Torrent Group Description
-                </label>
-              </td>
-              <td>
-HTML;
-
-            View::textarea(
-                id: 'album_desc',
-                placeholder: "General info about the torrent subject's function or significance",
-                value: \Gazelle\Text::esc($Torrent['GroupDescription']) ?? ''
-            );
-
-            echo '</td></tr>';
-        } # fi NewTorrent
-
-
-        /**
-         * ============================
-         * = End if NewTorrent fields =
-         * ============================
-         */
-
-
-        /**
-         * Torrent description
-         *
-         * The test displayed when torrent info is expanded.
-         * It should describe the specific torrent, not the group.
-         */
-        echo <<<HTML
-        <tr id="release_desc_tr">
-          <td>
-            <label for="release_desc">
-              Torrent Description
-            </label>
-          </td>
-          <td>
-HTML;
-
-        View::textarea(
-            id: 'release_desc',
-            placeholder: 'Specific info about the protocols and equipment used to produce the data',
-            value: \Gazelle\Text::esc($Torrent['TorrentDescription'] ?? ''),
-        );
-
-        echo '</td></tr>';
-
-
-        /**
-         * Boolean options
-         *
-         * Simple checkboxes that do stuff.
-         * Currently checks for data annotations and anonymous uploads.
-         * More fields could be created as the need arises.
-         */
-
-
-        /**
-         * Aligned/Annontated
-         *
-         * Called Censored in OT Gazelle.
-         */
-        $TorrentAnnotated = ($Torrent['Censored'] ?? 0) ? ' checked' : '';
-        echo <<<HTML
-        <tr id="censored_tr">
-          <td>
-            <label for="censored">
-              Aligned/Annotated
-            </label>
-          </td>
-          
-          <td>
-            <input type="checkbox" name="censored" value="1" $TorrentAnnotated>
-            &ensp;
-            Whether the torrent contains alignments, annotations, or other structural metadata
-          </td>
-        </tr>
-HTML;
-
-
-        /**
-         * Upload Anonymously
-         */
-        $TorrentAnonymous = ($Torrent['Anonymous'] ?? false) ? ' checked' : '';
-        echo <<<HTML
-        <tr id="anon_tr">
-          <td>
-            <label for="anonymous">
-              Upload Anonymously
-            </label>
-          </td>
-          
-          <td>
-            <input type="checkbox" name="anonymous" value="1" $TorrentAnonymous>
-            &ensp;
-            Hide your username from other users on the torrent details page
-          </td>
-        </tr>
-HTML;
-
-        # End the giant dynamic form table
-        echo '</table>';
-
-        # Drink a stiff one
-        $app->dbOld->set_query_id($QueryID);
-    } # End upload_form()
-} # End TorrentForm()
diff --git a/config/metadata.php b/config/metadata.php
index 44d7714e8..c5970037d 100644
--- a/config/metadata.php
+++ b/config/metadata.php
@@ -3,6 +3,14 @@
 declare(strict_types=1);
 
 
+/**
+ * metadata configuration
+ */
+
+# set the collage categories before things get too intense
+$env->collageCategories = \Gazelle\Collages::$categories;
+
+
 /**
  * $env->database
  *
diff --git a/resources/js/torrent.js b/resources/js/torrent.js
index 541a3ad3c..d8de6269e 100644
--- a/resources/js/torrent.js
+++ b/resources/js/torrent.js
@@ -16,12 +16,14 @@
     return confirm("Are you sure you want to use a freeleech token here?");
   });
 
+  /*
   // toggle biblatex citation
   $(".bibtexCitation").hide();
   $(".toggleBibtex").on("click", (event) => {
     let torrentId = $(event.target).data("torrentid");
     $("#bibtexCitation-" + torrentId).toggle(toggleDuration);
   });
+  */
 
 
   /**
diff --git a/resources/scss/assets/icons.scss b/resources/scss/assets/icons.scss
index c577293ca..44715c64a 100644
--- a/resources/scss/assets/icons.scss
+++ b/resources/scss/assets/icons.scss
@@ -267,6 +267,13 @@ img.torrent_header {
   }
 }
 
+.referenceCount {
+  &:before {
+    content: "📜";
+    margin-right: 0.5rem;
+  }
+}
+
 .publicationDate {
   &:before {
     content: "📅";
diff --git a/resources/scss/global/forms.scss b/resources/scss/global/forms.scss
index 5fc3cc2c6..72be23521 100644
--- a/resources/scss/global/forms.scss
+++ b/resources/scss/global/forms.scss
@@ -73,6 +73,7 @@
     display: flex;
     flex-flow: row nowrap;
     gap: 2rem;
+    margin-bottom: 1rem;
   }
 
   #seqhashTable {
diff --git a/resources/scss/global/layout.scss b/resources/scss/global/layout.scss
index f5df14400..c25d8d97a 100644
--- a/resources/scss/global/layout.scss
+++ b/resources/scss/global/layout.scss
@@ -131,6 +131,7 @@ section {
   flex-flow: row wrap;
   gap: 0 2rem;
   align-items: baseline;
+  margin-bottom: 1rem;
 }
 
 /* torrent collage cover display */
diff --git a/resources/scss/global/torrents.scss b/resources/scss/global/torrents.scss
index 08db2b85e..0e5870aaa 100644
--- a/resources/scss/global/torrents.scss
+++ b/resources/scss/global/torrents.scss
@@ -44,11 +44,11 @@
   }
 
   /* tom select */
-  .ts-control > * {
+  .ts-control>* {
     width: auto;
   }
 
-  .ts-wrapper.multi .ts-control > div.active {
+  .ts-wrapper.multi .ts-control>div.active {
     background: $skeletonDefault;
   }
 
@@ -94,6 +94,7 @@
     display: flex;
     flex-flow: row wrap;
     gap: 0 2rem;
+    margin-bottom: 1rem;
   }
 }
 
@@ -137,6 +138,7 @@
     display: flex;
     flex-flow: row wrap;
     gap: 0 2rem;
+    margin-bottom: 1rem;
   }
 }
 
@@ -169,4 +171,4 @@ table#announceSource {
   input {
     width: 100%;
   }
-}
+}
\ No newline at end of file
diff --git a/sections/better/badFolders.php b/sections/better/badFolders.php
index b29466155..8ffc30fcb 100644
--- a/sections/better/badFolders.php
+++ b/sections/better/badFolders.php
@@ -19,10 +19,15 @@
 
 # twig template
 $app->twig->display("better/list.twig", [
-  "title" => "Better",
-  "header" => "Torrents with bad folder names",
+  "title" => "Torrent groups with bad folder names",
+  "header" => "Torrent groups with bad folder names",
   "sidebar" => true,
 
+  "breadcrumbs" => [
+    "/torrents" => "torrents",
+    "/better" => "better",
+  ],
+
   "torrentGroups" => $torrentGroups,
   "snatchedOnly" => $snatchedOnly,
   "currentPage" => "bad-folders",
diff --git a/sections/better/badTags.php b/sections/better/badTags.php
index 825d593d1..7d68eff91 100644
--- a/sections/better/badTags.php
+++ b/sections/better/badTags.php
@@ -19,10 +19,15 @@
 
 # twig template
 $app->twig->display("better/list.twig", [
-  "title" => "Better",
+  "title" => "Torrents with bad tags",
   "header" => "Torrents with bad tags",
   "sidebar" => true,
 
+  "breadcrumbs" => [
+    "/torrents" => "torrents",
+    "/better" => "better",
+  ],
+
   "torrentGroups" => $torrentGroups,
   "snatchedOnly" => $snatchedOnly,
   "currentPage" => "bad-tags",
diff --git a/sections/better/missingCitations.php b/sections/better/missingCitations.php
index d779d49a7..5451cccbb 100644
--- a/sections/better/missingCitations.php
+++ b/sections/better/missingCitations.php
@@ -19,10 +19,15 @@
 
 # twig template
 $app->twig->display("better/list.twig", [
-  "title" => "Better",
+  "title" => "Torrent groups with no publications",
   "header" => "Torrent groups with no publications",
   "sidebar" => true,
 
+  "breadcrumbs" => [
+    "/torrents" => "torrents",
+    "/better" => "better",
+  ],
+
   "torrentGroups" => $torrentGroups,
   "snatchedOnly" => $snatchedOnly,
   "currentPage" => "missing-citations",
diff --git a/sections/better/missingPictures.php b/sections/better/missingPictures.php
index bb9b4b4fc..28a89788a 100644
--- a/sections/better/missingPictures.php
+++ b/sections/better/missingPictures.php
@@ -19,10 +19,15 @@
 
 # twig template
 $app->twig->display("better/list.twig", [
-  "title" => "Better",
-  "header" => "Torrent groups with no picture",
+  "title" => "Torrent groups groups with no picture",
+  "header" => "Torrent groups groups with no picture",
   "sidebar" => true,
 
+  "breadcrumbs" => [
+    "/torrents" => "torrents",
+    "/better" => "better",
+  ],
+
   "torrentGroups" => $torrentGroups,
   "snatchedOnly" => $snatchedOnly,
   "currentPage" => "missing-pictures",
diff --git a/sections/better/singleSeeder.php b/sections/better/singleSeeder.php
index e642c9f5a..506dc2bd6 100644
--- a/sections/better/singleSeeder.php
+++ b/sections/better/singleSeeder.php
@@ -14,10 +14,15 @@
 
 # twig template
 $app->twig->display("better/list.twig", [
-    "title" => "Better",
-    "header" => "Torrents with only one seeder",
+    "title" => "Torrent groups with only one seeder",
+    "header" => "Torrent groups with only one seeder",
     "sidebar" => true,
 
+    "breadcrumbs" => [
+      "/torrents" => "torrents",
+      "/better" => "better",
+    ],
+
     "torrentGroups" => $torrentGroups,
     "snatchedOnly" => null,
     "currentPage" => "single-seeder",
diff --git a/sections/literature/details.php b/sections/literature/details.php
index da8307e85..973c97788 100644
--- a/sections/literature/details.php
+++ b/sections/literature/details.php
@@ -46,6 +46,7 @@
     ],
 
     "literature" => $literature,
+    "torrentGroups" => $literature->relationships->torrentGroups,
 
     "enableConversation" => true,
     "conversation" => $conversation,
diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php
index bd6b6f8c3..fd8fea698 100644
--- a/sections/top10/torrents.php
+++ b/sections/top10/torrents.php
@@ -14,44 +14,14 @@
 
 # data
 $dailyTorrents = Gazelle\Top10::dailyTorrents($limit);
-if (!empty($dailyTorrents)) {
-    $dailyTorrents = \Gazelle\Torrents::get_groups(array_column($dailyTorrents, "id"));
-}
-
 $weeklyTorrents = Gazelle\Top10::weeklyTorrents($limit);
-if (!empty($weeklyTorrents)) {
-    $weeklyTorrents = \Gazelle\Torrents::get_groups(array_column($dailyTorreweeklyTorrentsnts, "id"));
-}
-
 $monthlyTorrents = Gazelle\Top10::monthlyTorrents($limit);
-if (!empty($monthlyTorrents)) {
-    $monthlyTorrents = \Gazelle\Torrents::get_groups(array_column($monthlyTorrents, "id"));
-}
-
 $yearlyTorrents = Gazelle\Top10::yearlyTorrents($limit);
-if (!empty($yearlyTorrents)) {
-    $yearlyTorrents = \Gazelle\Torrents::get_groups(array_column($yearlyTorrents, "id"));
-}
-
 $overallTorrents = Gazelle\Top10::overallTorrents($limit);
-if (!empty($overallTorrents)) {
-    $overallTorrents = \Gazelle\Torrents::get_groups(array_column($overallTorrents, "id"));
-}
 
 $torrentSeeders = Gazelle\Top10::torrentSeeders($limit);
-if (!empty($torrentSeeders)) {
-    $torrentSeeders = \Gazelle\Torrents::get_groups(array_column($torrentSeeders, "id"));
-}
-
 $torrentSnatches = Gazelle\Top10::torrentSnatches($limit);
-if (!empty($torrentSnatches)) {
-    $torrentSnatches = \Gazelle\Torrents::get_groups(array_column($torrentSnatches, "id"));
-}
-
 $torrentData = Gazelle\Top10::torrentData($limit);
-if (!empty($torrentData)) {
-    $torrentData = \Gazelle\Torrents::get_groups(array_column($torrentData, "id"));
-}
 
 # template
 $app->twig->display("top10/torrents.twig", [
diff --git a/sections/torrentGroups/browse.php b/sections/torrentGroups/browse.php
index b46c76c35..9ae195c46 100644
--- a/sections/torrentGroups/browse.php
+++ b/sections/torrentGroups/browse.php
@@ -18,10 +18,8 @@
     $get["simpleSearch"] = $get["search"];
 }
 
-
 /** torrent search handling */
 
-
 # collect the query
 $searchTerms = [
     "simpleSearch" => $get["simpleSearch"] ?? null,
@@ -79,15 +77,12 @@
 $manticore = new Gazelle\Manticore();
 $searchResults = $manticore->search("torrents", $get);
 $resultCount = count($searchResults);
-#!d($searchResults);
-
 
 /** pagination */
 
-
+# resultCount and pageSize
 $pagination = [];
 
-# resultCount and pageSize
 $pagination["resultCount"] = count($searchResults);
 $pagination["pageSize"] = $app->user->extra["siteOptions"]["searchPagination"] ?? 20;
 
@@ -123,32 +118,31 @@
     $pagination["limit"] = $pagination["resultCount"];
 }
 
-
 /** torrent group info */
 
-
-# \Gazelle\Torrents::get_groups
 # this is slow, only do the current page
 $app->debug["time"]->startMeasure("browse", "get torrent groups");
+
 $groupIds = array_column($searchResults, "id");
 $groupIds = array_slice($groupIds, $pagination["offset"], $pagination["pageSize"]);
 
-$torrentGroups = \Gazelle\Torrents::get_groups($groupIds);
+$torrentGroups = [];
+foreach ($groupIds as $key => $groupId) {
+    $torrentGroups[] = new Gazelle\TorrentGroups($groupId);
+    $torrentGroups[$key]->loadTorrents();
+}
+
 $app->debug["time"]->stopMeasure("browse", "get torrent groups");
 #!d($torrentGroups);exit;
 
-
 /** tags */
 
-
 $query = "select name from tags where tagType = 'genre' order by name";
 $ref = $app->dbNew->multi($query, []);
 $officialTags = array_column($ref, "name");
 
-
 /** twig template */
 
-
 $app->twig->display("torrents/browse.twig", [
     "title" => "Browse",
     "js" => ["vendor/tom-select.base.min", "browse"],
diff --git a/sections/torrentGroups/details.php b/sections/torrentGroups/details.php
index 1bb42173b..1efacee8f 100644
--- a/sections/torrentGroups/details.php
+++ b/sections/torrentGroups/details.php
@@ -17,6 +17,7 @@
         throw new Exception("not found");
     }
 
+    $torrentGroup->loadCollages();
     $torrentGroup->loadCreators();
     $torrentGroup->loadLiterature();
     $torrentGroup->loadTags();
@@ -73,6 +74,8 @@
     ],
 
     "torrentGroup" => $torrentGroup,
+    "torrents" => $torrentGroup->relationships->torrents,
+    "collages" => $torrentGroup->relationships->collages,
     "literature" => $literature,
     "revisionId" => $revisionId ?? null,
     "officialTags" => $officialTags,
diff --git a/sections/torrents/details.php b/sections/torrents/details.php
index 1e96cebe5..20433f12c 100644
--- a/sections/torrents/details.php
+++ b/sections/torrents/details.php
@@ -9,30 +9,21 @@
 
 $app = Gazelle\App::go();
 
-#try {
-$id ??= null;
-$torrent = new Gazelle\Torrents($id);
-$torrent->loadTorrentGroups();
+try {
+    $id ??= null;
+    $torrent = new Gazelle\Torrents($id);
+    $torrent->loadTorrentGroups();
 
-if (!$torrent->id) {
-    throw new Exception("not found");
-}
-
-$torrentGroup = $torrent->relationships->torrentGroups->first();
-$torrentGroup->loadLiterature();
-$torrentGroup->loadTorrents();
+    if (!$torrent->id) {
+        throw new Exception("not found");
+    }
 
-$literature = $torrentGroup->relationships->literature;
-foreach ($literature as $item) {
-    $item->loadCreators();
+    $torrentGroup = $torrent->relationships->torrentGroups->first();
+    $torrentGroup->loadCreators();
+    $torrentGroup->loadTorrents();
+} catch (Throwable $e) {
+    $app->error(404);
 }
-echo "<pre>";
-~d($literature);
-exit;
-#!d($torrentGroup->relationships->literature);exit;
-#} catch (Throwable $e) {
-#    $app->error(404);
-#}
 
 # request variables
 $get = Gazelle\Http::request("get");
@@ -52,12 +43,13 @@
 
     "breadcrumbs" => [
      "/torrents" => "torrents",
-     "/torrents/{$torrent->id}" => $torrent->attributes->infoHash,
+     "/torrent-groups/{$torrentGroup->id}" => $torrentGroup->attributes->title,
  ],
 
 
     "torrent" => $torrent,
-    "torrentGroup" => $torrentGroup,
+    "torrentGroup" => $torrentGroup, # for the sidebar picture
+    "torrentGroups" => $torrent->relationships->torrentGroups,
     "revisionId" => $revisionId ?? null,
 
     "isBookmarked" => Bookmarks::isBookmarked("torrent", $torrent->id),
diff --git a/sections/torrents/update.php b/sections/torrents/update.php
index 116a9e207..016230d95 100644
--- a/sections/torrents/update.php
+++ b/sections/torrents/update.php
@@ -36,7 +36,6 @@
  * which are off limits to most members.
  */
 
-require_once serverRoot . '/classes/torrent_form.class.php';
 if (!is_numeric($_GET['id']) || !$_GET['id']) {
     error(400);
 }
diff --git a/sections/upload/upload.php b/sections/upload/upload.php
index 2226a92a8..318c3e60f 100644
--- a/sections/upload/upload.php
+++ b/sections/upload/upload.php
@@ -3,14 +3,7 @@
 declare(strict_types=1);
 
 /**
- * Upload form
- *
- * This page relies on the TorrentForm class.
- * All it does is call the necessary functions.
- *
- * $Properties, $Err and $UploadForm are set in takeupload.php,
- * and are only used when the form doesn't validate
- * and this page must be called again.
+ * upload form
  */
 
 $app = \Gazelle\App::go();
@@ -26,8 +19,6 @@
 $query = "select name from tags where tagType = ? order by name";
 $tagList = $app->dbNew->column($query, ["genre"]);
 
-
-
 # twig template
 $app->twig->display("torrents/upload.twig", [
     "title" => "Upload",
@@ -73,25 +64,12 @@
       "annotated" => null,
       "anonymous" => null,
     ],
-
-
-
 ]);
 
 
 exit;
 
 
-
-
-
-
-
-
-
-
-
-
 View::header(
     'Upload',
     'upload,vendor/easymde.min',
diff --git a/templates/_base/userInfo.twig b/templates/_base/userInfo.twig
index 350f8096a..09ae7d0af 100644
--- a/templates/_base/userInfo.twig
+++ b/templates/_base/userInfo.twig
@@ -12,9 +12,7 @@
             <a href="/torrents.php?type=seeding&userid={{ user.core.id }}" class="tooltip conversationButton" title="Seeding">
                 <i class="fa-thin fa-cloud-arrow-up"></i>
             </a>
-            <span class="stat tooltip" title="{{ user.extra.Uploaded|get_size(levels = 5) }}">
-                {{ user.extra.Uploaded|get_size }}
-            </span>
+            {{ user.extra.Uploaded|get_size }}
         </li>
 
         {# leeching #}
@@ -22,9 +20,7 @@
             <a href="/torrents.php?type=leeching&userid={{ user.core.id }}" class="tooltip conversationButton" title="Leeching">
                 <i class="fa-thin fa-cloud-arrow-down"></i>
             </a>
-            <span class="stat tooltip" title="{{ user.extra.Downloaded|get_size(levels = 5) }}">
-                {{ user.extra.Downloaded|get_size }}
-            </span>
+            {{ user.extra.Downloaded|get_size }}
         </li>
 
         {# ratio #}
@@ -32,9 +28,7 @@
             <a href="/rules/ratio" class="tooltip conversationButton" title="Ratio">
                 <i class="fa-thin fa-percent"></i>
             </a>
-            <span class="stat">
-                {{ ratio(user.extra.Uploaded, user.extra.Downloaded) }}
-            </span>
+            {{ ratio(user.extra.Uploaded, user.extra.Downloaded) }}
         </li>
 
         {# required ratio #}
@@ -43,9 +37,7 @@
             <a href="/rules/ratio" class="tooltip conversationButton" title="Required ratio">
                 Required
             </a>
-            <span class="stat tooltip" title="{{ user.extra.RequiredRatio|float(decimals = 5) }}">
-                {{ user.extra.RequiredRatio|float }}
-            </span>
+            {{ user.extra.RequiredRatio|float }}
         </li>
         {% endif %}
 
@@ -55,11 +47,9 @@
             <a href="/wiki/tokens" class="tooltip conversationButton" title="Freeleech tokens">
                 <i class="fa-thin fa-ticket"></i>
             </a>
-            <span class="stat">
-                <a href="/userhistory.php?action=token_history&userid={{ user.core.id }}">
-                    {{ user.extra.FLTokens }}
-                </a>
-            </span>
+            <a href="/userhistory.php?action=token_history&userid={{ user.core.id }}">
+                {{ user.extra.FLTokens }}
+            </a>
         </li>
         {% endif %}
 
@@ -68,9 +58,7 @@
             <a href="/store" class="tooltip conversationButton" title="{{ env.bonusPoints }}">
                 <i class="fa-thin fa-cart-shopping"></i>
             </a>
-            <span class="stat">
-                {{ user.extra.BonusPoints|number_format }}
-            </span>
+            {{ user.extra.BonusPoints|number_format }}
         </li>
 
         {# hit and runs #}
@@ -79,12 +67,8 @@
             <a href="/snatchlist.php" class="tooltip conversationButton" title="HnRs">
                 <i class="fa-thin fa-car-bolt"></i>
             </a>
-            <span class="stat">
-                {{ user.extra.HnR }}
-            </span>
+            {{ user.extra.HnR }}
         </li>
         {% endif %}
-
     </ul>
-
-</nav>
\ No newline at end of file
+</nav>
diff --git a/templates/better/list.twig b/templates/better/list.twig
index 44c7be811..0c2796389 100644
--- a/templates/better/list.twig
+++ b/templates/better/list.twig
@@ -4,17 +4,15 @@
 {% block content %}
 
 <section>
-<h2>{{ header }}</h2>
-
-{# no torrents #}
-{% if torrentGroups is empty %}
-<h3 class="center">No torrents found :)</h3>
-{% endif %}
-
-{# torrent list #}
-<section>
-<h3>{{ Torrent groups }}</h3>
-{% include("tables/torrentGroupsWithoutTorrents.twig") %}
+    <h2>{{ header }}</h2>
+
+    {# no torrents #}
+    {% if torrentGroups is empty %}
+        <h3 class="center">No torrents found :)</h3>
+    {% else %}
+        {# torrent list #}
+        {{ include("tables/torrentGroupsWithoutTorrents.twig") }}
+    {% endif %}
 </section>
 
 {% endblock %}
diff --git a/templates/bonusPoints/store.twig b/templates/bonusPoints/store.twig
index 7e74cc89c..fc904cfd0 100644
--- a/templates/bonusPoints/store.twig
+++ b/templates/bonusPoints/store.twig
@@ -206,6 +206,7 @@
 </section>
 
 {# lottery badges #}
+<section>
 <h4>Lottery badges</h4>
 
 <p>
@@ -239,6 +240,7 @@
 </section>
 
 {# auction badge #}
+<section>
 <h4>Auction badge</h4>
 
 <p>
@@ -270,6 +272,7 @@
 </section>
 
 {# pyramid scheme badge #}
+<section>
 <h4>Coin badge</h4>
 <p>
     "It's not a pyramid, it's a triangle!"
@@ -298,8 +301,10 @@
         </tr>
     </tbody>
 </table>
+</section>
 
 {# random badge #}
+<section>
 <h4>Random badge</h4>
 <p>
     Purchase a badge whose icon is chosen at random.
diff --git a/templates/collages/browse.twig b/templates/collages/browse.twig
index a4f3e92ab..6a52f02f7 100644
--- a/templates/collages/browse.twig
+++ b/templates/collages/browse.twig
@@ -46,97 +46,8 @@
 {% endif %}
 
 
-{# start the results table #}
-<table id="torrentSearchResults" class="{{ grouping }}" data-sortable>
-
-{# start results table headings #}
-{# todo: this can be reorganized to suck less #}
-<thead>
-<tr>
-
-	{# category #}
-	<th class="categoryColumn" />
-
-	{# collage title #}
-	<th>Collage&nbsp;title</th>
-
-	{# torrent count #}
-	<th>Torrents</th>
-
-	{# subscriber count #}
-	<th>Subscribers</th>
-
-	{# last update #}
-	<th>Updated at</th>
-
-	{# author #}
-	<th>User</th>
-
-</tr>
-</thead>
-{# end results table headings #}
-
-{# start the results themselves #}
-<tbody>
-{% for item in collages %}
-
-  <tr>
-
-	{# category #}
-	<td class="center">
-		{{ categories[item.attributes.categoryId] }}
-	  {# <a href="collages.php?action=search&amp;cats[<?=(int)$CategoryID?>]=1"><?=$app->env->collageCategories[(int)$CategoryID]?></a> #}
-	</td>
-
-	<td>
-	  <a class="torrentTitle" id="collage_name"
-		href="collages/{{ item.id }}">{{ item.attributes.title }}</a>
-		{#
-	  <?php if ($BookmarkView) { ?>
-	  <span class="u-pull-right">
-		<a href="#"
-		  onclick="Unbookmark('collage', <?=$ID?>, ''); return false;"
-		  class="brackets">Remove bookmark</a>
-	  </span>
-	  <?php } ?>
-	  #}
-
-	{% if item.attributes.tags is not empty %}
-	  <div class="tooltip tagList" title="Tags">{{ item.attributes.tags|join(", ") }}</div>
-	{% endif %}
-	</td>
-
-	{# torrent count #}
-	<td class="number_column">{{ item.attributes.torrentCount }}</td>
-
-		{# subscriber count #}
-	<td class="number_column">{{ item.attributes.subscriberCount }}</td>
-
-	{# last update #}
-	{% if item.attributes.updatedAt %}
-	<td class="nobr">{{ item.attributes.updatedAt|relativeTime }}</td>
-	{% else %}
-		<td class="nobr">{{ item.attributes.createdAt|relativeTime }}</td>
-		{% endif %}
-
-	<td>{{ item.attributes.userId|formatUsername }}</td>
-  </tr>
-
-
-{% endfor %}
-</tbody>
-
-{# end the results table #}
-</table>
-
-{# todo: share search #}
-{# <a id="searchParamsPermalink" class="button">link this search</a> #}
-
-{# todo: download all this page #}
-{# <a id="downloadAllThisPage" class="button">download all this page</a> #}
-
-{# back to top: lazy af #}
-{# <a href="#searchResultsHeader" class="button">back to top</a> #}
+{# include the search results table #}
+{{ include("tables/collages.twig") }}
 
 {% endblock %}
 
diff --git a/templates/literature/details.twig b/templates/literature/details.twig
index 684c7e0b4..52e352ce4 100644
--- a/templates/literature/details.twig
+++ b/templates/literature/details.twig
@@ -19,16 +19,6 @@
 				</tr>
 			{% endif %}
 
-      {# sci-hub #}
-			{% if literature.attributes.doi is not empty %}
-				<tr>
-					<th><span class="sci-hub nobr">Sci-Hub</span></th>
-					<td>
-            <a href="{{ sciHubLink(literature.attributes.doi) }}" target="_blank" class="external">{{ sciHubLink(literature.attributes.doi) }}</a>
-          </td>
-				</tr>
-			{% endif %}
-
       {# semanticScholarId #}
 			{% if literature.attributes.semanticScholarId is not empty %}
 				<tr>
@@ -70,34 +60,6 @@
 					<td>{{ literature.attributes.publicationDate }}</td>
 				</tr>
 			{% endif %}
-
-
-      {# influentialCitationCount #}
-			{% if literature.attributes.influentialCitationCount is not empty %}
-				<tr>
-					<th><span class="influentialCitationCount nobr">Influential citations</span></th>
-					<td>{{ literature.attributes.influentialCitationCount|number_format }}</td>
-				</tr>
-			{% endif %}
-
-
-      {# citationCount #}
-			{% if literature.attributes.citationCount is not empty %}
-				<tr>
-					<th><span class="citationCount nobr">Citations</span></th>
-					<td>{{ literature.attributes.citationCount|number_format }}</td>
-				</tr>
-			{% endif %}
-
-
-      {# referenceCount #}
-			{% if literature.attributes.referenceCount is not empty %}
-				<tr>
-					<th><span class="referenceCount nobr">References</span></th>
-					<td>{{ literature.attributes.referenceCount|number_format }}</td>
-				</tr>
-			{% endif %}
-
 		</table>
 	</section>
 
@@ -113,13 +75,22 @@
 
   	{# tl;dr #}
     {% if literature.attributes.tldr is not empty %}
-	<section class="faded">
+	<section class="faded small">
 		<h3>tl;dr by {{ literature.attributes.tldr.model }}</h3>
       {{ literature.attributes.tldr.text|raw }}
 	</section>
     {% endif %}
 
 
+  	{# torrent groups #}
+    {% if torrentGroups is not empty %}
+	<section>
+		<h3>Torrent groups</h3>
+      {{ include("tables/torrentGroupsWithoutTorrents.twig") }}
+	</section>
+    {% endif %}
+
+
 {% if enableConversation and conversation %}
     {% set variables = { "conversation": conversation } %}
     {% include "_base/conversation.twig" with variables %}
diff --git a/templates/literature/sidebar.twig b/templates/literature/sidebar.twig
index 7485ddcb1..9b0fd0af6 100644
--- a/templates/literature/sidebar.twig
+++ b/templates/literature/sidebar.twig
@@ -9,7 +9,7 @@
 	{% endif %}
 	#}
 
-	{% set uri = processImage("#{env.staticServer}/images/noartwork.webp", "thumb") %}
+	{% set uri = processImage("/images/noartwork.webp", "thumb") %}
 	<figure id="groupPicture" class="box_image box_image_albumart box_albumart">
 		<img src="{{ uri }}" lightbox-img="{{ uri }}" alt="{{ literature.attributes.title }}" title="{{ literature.attributes.title }}">
 	</figure>
@@ -22,34 +22,61 @@
 	<h3>Actions</h3>
 
 	<form>
+		{# sci-hub #}
+		<a href="{{ sciHubLink(literature.attributes.doi) }}" target="_blank" class="button button-green">find on sci-hub</a>
+
 		{# update #}
 		{% if can({"literature": "updateAny"}) or literature.attributes.userId == user.core.id %}
-			<a class="button button-orange" href="/literature{{ literature.id }}/update">update</a>
+			<a class="button button-orange" href="/literature{{ literature.id }}/update">update this item</a>
 		{% endif %}
 
 
 		{# delete #}
 		{% if can({"literature": "deleteAny"}) or literature.attributes.userId == user.core.id %}
-			<a class="button button-red" href="/literature{{ literature.id }}/delete">delete</a>
+			<a class="button button-red" href="/literature{{ literature.id }}/delete">delete this item</a>
 		{% endif %}
-
-		{# semantic scholar #}
-        <a href="https://www.semanticscholar.org/paper/{{ literature.attributes.semanticScholarId }}" target="_blank" class="button">semantic scholar</a>
-
-		{# sci-hub #}
-		<a href="{{ sciHubLink(literature.attributes.doi) }}" target="_blank" class="button">sci-hub</a>
-
 	</form>
+</section>
+
 
+{# impact stats #}
+<section>
+	<h3>Impact stats</h3>
+	
+	<table class="compact">
+	      {# influentialCitationCount #}
+			{% if literature.attributes.influentialCitationCount is not empty %}
+				<tr>
+					<th><span class="influentialCitationCount nobr">Influential citations</span></th>
+					<td>{{ literature.attributes.influentialCitationCount|number_format }}</td>
+				</tr>
+			{% endif %}
+
+
+      {# citationCount #}
+			{% if literature.attributes.citationCount is not empty %}
+				<tr>
+					<th><span class="citationCount nobr">Citations</span></th>
+					<td>{{ literature.attributes.citationCount|number_format }}</td>
+				</tr>
+			{% endif %}
+
+
+      {# referenceCount #}
+			{% if literature.attributes.referenceCount is not empty %}
+				<tr>
+					<th><span class="referenceCount nobr">References</span></th>
+					<td>{{ literature.attributes.referenceCount|number_format }}</td>
+				</tr>
+			{% endif %}
+	</table>
 </section>
 
 
+
 {# creators #}
 <section>
-<span id="creatorListHeader">
 <h3>Creators</h3>
-<a class="button button-orange">edit</a>
-</span>
 
 <table class="compact">
 
diff --git a/templates/tables/collages.twig b/templates/tables/collages.twig
new file mode 100644
index 000000000..39ceed5b0
--- /dev/null
+++ b/templates/tables/collages.twig
@@ -0,0 +1,66 @@
+{#
+ # collages table
+ #}
+
+<table>
+    <thead>
+		<tr>
+			{# category #}
+			<th class="categoryColumn" />
+
+			{# collage title #}
+			<th>Title</th>
+
+			{# torrent count #}
+			<th>Torrents</th>
+
+			{# subscriber count #}
+			<th>Subscribers</th>
+
+			{# last update #}
+			<th>Updated at</th>
+
+			{# author #}
+			<th>User</th>
+        </tr>
+    </thead>
+
+    <tbody>
+        {% for item in collages %}
+            <tr>
+				{# category #}
+				<td class="center">
+					{{ env.collageCategories[item.attributes.categoryId] }}
+				</td>
+
+				<td>
+					{# title #}
+					<p class="flexRow">
+	  					<a class="torrentTitle" href="collages/{{ item.id }}">{{ item.attributes.title }}</a>
+					</p>
+
+					{# tags #}
+					{% if item.attributes.tags is not empty %}
+	  					<div class="tooltip tagList" title="Tags">{{ item.attributes.tags|join(", ") }}</div>
+					{% endif %}
+				</td>
+
+				{# torrent count #}
+				<td>{{ item.attributes.torrentCount|number_format }}</td>
+
+				{# subscriber count #}
+				<td>{{ item.attributes.subscriberCount|number_format }}</td>
+
+				{# last update #}
+				{% if item.attributes.updatedAt is not empty %}
+					<td class="nobr">{{ item.attributes.updatedAt|relativeTime }}</td>
+				{% else %}
+					<td class="nobr">{{ item.attributes.createdAt|relativeTime }}</td>
+				{% endif %}
+
+				{# collage owner #}
+				<td>{{ item.attributes.userId|formatUsername }}</td>
+			</tr>
+		{% endfor %}
+    </tbody>
+</table>
diff --git a/templates/tables/literature.twig b/templates/tables/literature.twig
index 11a23e965..e50c352d7 100644
--- a/templates/tables/literature.twig
+++ b/templates/tables/literature.twig
@@ -2,39 +2,10 @@
  # literature table
  #}
 
-{#107                    'userId' => integer 2
-                    'doi' => string (22) "10.1074/JBC.M211914200"
-                    'semanticScholarId' => string (40) "fd29d55bea8295907d3d62af7725361436bcf58e"
-                    'title' => string (94) "The Catabolism of Amino Acids to Long Chain and Complex Alcohols in Saccharomyces cerevisiae *"
-                    'venue' => string (31) "Journal of Biological Chemistry"
-                    'journal' => stdClass (3) (
-                        public 'name' -> string (35) "The Journal of Biological Chemistry"
-                        public 'pages' -> string (11) "8028 - 8034"
-                        public 'volume' -> string (3) "278"
-                    )
-                    'year' => integer 2003
-                    'publicationDate' => string (10) "2003-03-07"
-                    'abstract' => string (1122) "The catabolism of phenylalanine to 2-phenylethanol and of tryptophan to tryptophol were studied by13C NMR spectroscopy and gas chromatography-mass spectrometry. Phenylalanine and tryptophan are first deaminated (to 3-phenylpyruvate and 3-indolepyruvate, respectively) and then decarboxylated. This decarboxylation can be effected by any of Pdc1p, Pdc5p, Pdc6p, or Ydr380wp; Ydl080cp has no role in the catabolism of either amino acid. We also report that in leucine catabolism Ydr380wp is the minor decarboxylase. Hence, all amino acid catabolic pathways studied to date use a subtly different spectrum of decarboxylases from the five-membered family that comprises Pdc1p, Pdc5p, Pdc6p, Ydl080cp, and Ydr380wp. Using strains containing all possible combinations of mutations affecting the seven AAD genes (putativearyl alcohol dehydrogenases), fiveADH genes, and SFA1, showed that the final step of amino acid catabolism (conversion of an aldehyde to a long chain or complex alcohol) can be accomplished by any one of the ethanol dehydrogenases (Adh1p, Adh2p, Adh3p, Adh4p, Adh5p) or by Sfa1p (formaldehyde dehydrogenase.)"
-                    'tldr' => stdClass (2) (
-                        public 'model' -> string (11) "tldr@v2.0.0"
-                        public 'text' -> string (279) "Using strains containing all possible combinations of mutations affecting the seven AAD genes, fiveADH genes, and SFA1, it is shown that the final step of amino acid catabolism can be accomplished by any one of the ethanol dehydrogenases or by Sfa1p (formaldehyde dehydrogenase.)"
-                    )
-                    'bibtex' => null
-                    'influentialCitationCount' => integer 10
-                    'citationCount' => integer 323
-                    'referenceCount' => integer 28
-                    'isOpenAccess' => boolean true
-                    'openAccessPdf' => null
-                    'failCount' => null
-                    'createdAt' => string (19) "2023-05-12 02:30:32"
-                    'updatedAt' => string (19) "2024-05-29 18:07:53"
-                    'deletedAt' => null
-                    'isOwner' => boolean false
-					#}
 <table>
     <thead>
 	        {# literature info #}
-	        <th>Literature&nbsp;info</th>
+	        <th>Info</th>
         </tr>
     </thead>
 
@@ -42,15 +13,19 @@
         {% for item in literature %}
             <tr>
 	            {# title #}
-	            <td class="tableGroup">
-		            <div class="flexColumn">
-
+	            <td>
 		                {# title link #}
+                        <p class="flexRow">
 		                <a class="torrentTitle" href="/literature/{{ item.id }}">
-			                {{ item.attributes.title }}
+                        	{% if item.attributes.title is not empty %}
+			                    {{ item.attributes.title }}
+                            {% else %}
+			                    {{ item.attributes.doi }}
+                            {% endif %}
 		                </a>
+                        </p>
 
-		                <div class="flexRow">
+		                <p class="flexRow">
 			                {# doi #}
 			                {% if item.attributes.doi is not empty %}
 				                <span class="tooltip doi" title="DOI">{{ item.attributes.doi }}</span>
@@ -58,7 +33,7 @@
 
 			                {# journal #}
 			                {% if item.attributes.journal is not empty %}
-				                <span class="tooltip journal" title="Journal">{{ item.attributes.journal.name }}</span>
+				                <span class="tooltip journal" title="Journal"><em>{{ item.attributes.journal.name }}</em></span>
 			                {% endif %}
 
 			                {# publicationDate #}
@@ -66,11 +41,16 @@
 				                <span class="tooltip publicationDate" title="Publication date">{{ item.attributes.publicationDate }}</span>
 			                {% endif %}
 
+			                {# influentialCitationCount #}
+			                {% if item.attributes.influentialCitationCount is not empty %}
+				                <span class="tooltip influentialCitationCount" title="Influential citations">{{ item.attributes.influentialCitationCount|number_format }}</span>
+			                {% endif %}
+
 							{# sci-hub #}
 			                {% if item.attributes.doi is not empty %}
 				                <a href="{{ sciHubLink(item.attributes.doi) }}" target="_blank" class="tooltip sci-hub external" title="Sci-Hub">Sci-Hub</a>
 			                {% endif %}
-		                </div>
+		                </p>
 
 		                {# creators #}
                         {#
@@ -81,7 +61,7 @@
 
 						{# tl;dr: no tooltip #}
 		                {% if item.attributes.tldr is not empty %}
-			                <p class="tldr faded ai">{{ item.attributes.tldr.text }}</p>
+			                <p class="faded flexRow small"><span class="ai">{{ item.attributes.tldr.text }}</span></p>
 		                {% endif %}
                     </div>
 	            </td>
diff --git a/templates/tables/torrentGroupsWithTorrents.twig b/templates/tables/torrentGroupsWithTorrents.twig
index d028f4708..846854278 100644
--- a/templates/tables/torrentGroupsWithTorrents.twig
+++ b/templates/tables/torrentGroupsWithTorrents.twig
@@ -10,7 +10,7 @@
 	        <th class="categoryColumn" />
 
 	        {# torrent info #}
-	        <th>Torrent&nbsp;info</th>
+	        <th>Info</th>
 
 	        {# timeAdded #}
 	        <th>Time&nbsp;added</th>
@@ -43,8 +43,8 @@
 	            </td>
 
 	            {# title #}
-	            <td class="tableGroup" colspan="6">
-		            <div class="flexColumn">
+	            <td colspan="4">
+		            <p class="flexRow">
 
 		                {# title link #}
 		                <a class="torrentTitle" href="/torrent-groups/{{ torrentGroup.id }}" {# open tag #}
@@ -56,8 +56,9 @@
     	                dir="ltr">
 			                {{ torrentGroup.attributes.title|raw }}
 		                </a>
+					</p>
 
-		                <div class="flexRow">
+		                <p class="flexRow">
 			                {# subject #}
 			                {% if torrentGroup.attributes.subject is not empty %}
 				                <span class="tooltip subjectObject" title="Organism">{{ "<em>#{torrentGroup.attributes.subject}</em>"|raw }}
@@ -85,11 +86,11 @@
 			                {% if torrentGroup.attributes.location is not empty %}
 				                <span class="tooltip location" title="Location">{{ torrentGroup.attributes.location|raw }}</span>
 			                {% endif %}
-		                </div>
+		                </p>
 
 		                {# tags #}
 		                {% if torrentGroup.attributes.tags is not empty %}
-			                <div class="tooltip tagList" title="Tags">{{ torrentGroup.attributes.tags|slice(0, 5)|join(", ") }}</div>
+			                <p class="flexRow tooltip tagList" title="Tags">{{ torrentGroup.attributes.tags|slice(0, 5)|join(", ") }}</p>
 		                {% endif %}
 
 		                {# creators #}
@@ -98,7 +99,6 @@
 			                <div class="tooltip creatorList" title="Creators">{{ displayCreators(torrentGroup.attributes.Artists)|raw }}</div>
 		                {% endif %}
 		                #}
-                    </div>
 	            </td>
             </tr>
                 
@@ -107,48 +107,53 @@
                 {% for torrent in torrentGroup.relationships.torrents %}
                     <tr>
 	                    {# category icon #}
-                        <td class="center">
-                            <a href="/torrents/{{ torrent.id }}">Go&nbsp;»</a>
-                        </td>
+                        <td />
 
 	                    {# title #}
-	                    <td class="flexRow">
-                            {# platform #}
-                            {% if torrent.attributes.platform is not empty %}
-                                <span class="tooltip platform" title="Platform">{{ torrent.attributes.platform }}</span>
-                            {% endif %}
-
-                            {# format #}
-                            {% if torrent.attributes.format is not empty %}
-                                <span class="tooltip format" title="Format">{{ torrent.attributes.format }}</span>
-                            {% endif %}
-
-                            {# version #}
-                            {% if torrent.attributes.version is not empty %}
-                                <span class="tooltip version" title="Version">{{ torrent.attributes.version }}</span>
-                            {% endif %}
-
-                            {# scope #}
-                            {% if torrent.attributes.scope is not empty %}
-                                <span class="tooltip scope" title="Scope">{{ torrent.attributes.scope }}</span>
-                            {% endif %}
-
-                            {# archive #}
-                            {% if torrent.attributes.archive is not empty %}
-                                <span class="tooltip archive" title="Archive">{{ torrent.attributes.archive }}</span>
-                            {% endif %}
-
-                            {# license #}
-                            {% if torrent.attributes.license is not empty %}
-                                <span class="tooltip license" title="License">{{ torrent.attributes.license }}</span>
-                            {% endif %}
-
-                            {# isAnnotated #}
-                            {% if torrent.attributes.isAnnotated is not empty %}
-                                <span title="Alignment" class="tooltip good">Aligned</span>
-                            {% else %}
-                                <span title="Alignment" class="tooltip bad">Not aligned</span>
-                            {% endif %}
+	                    <td>
+							<p class="flexRow">
+		                		{# title link #}
+		                		<a class="torrentTitle monospace" href="/torrents/{{ torrent.id }}">{{ torrent.attributes.infoHash }}</a>
+							</p>
+
+							<p class="flexRow">
+                            	{# platform #}
+                            	{% if torrent.attributes.platform is not empty %}
+                                	<span class="tooltip platform" title="Platform">{{ torrent.attributes.platform }}</span>
+                            	{% endif %}
+
+                            	{# format #}
+                            	{% if torrent.attributes.format is not empty %}
+                                	<span class="tooltip format" title="Format">{{ torrent.attributes.format }}</span>
+                            	{% endif %}
+
+                            	{# version #}
+                            	{% if torrent.attributes.version is not empty %}
+                                	<span class="tooltip version" title="Version">{{ torrent.attributes.version }}</span>
+                            	{% endif %}
+
+                            	{# scope #}
+                            	{% if torrent.attributes.scope is not empty %}
+                                	<span class="tooltip scope" title="Scope">{{ torrent.attributes.scope }}</span>
+                            	{% endif %}
+
+                            	{# archive #}
+                            	{% if torrent.attributes.archive is not empty %}
+                                	<span class="tooltip archive" title="Archive">{{ torrent.attributes.archive }}</span>
+                            	{% endif %}
+
+                            	{# license #}
+                            	{% if torrent.attributes.license is not empty %}
+                                	<span class="tooltip license" title="License">{{ torrent.attributes.license }}</span>
+                            	{% endif %}
+
+                            	{# isAnnotated #}
+                            	{% if torrent.attributes.isAnnotated is not empty %}
+                                	<span title="Alignment" class="tooltip good">Aligned</span>
+                            	{% else %}
+                                	<span title="Alignment" class="tooltip bad">Not aligned</span>
+                            	{% endif %}
+							</p>
                         </td>
 
 	                    {# createdAt #}
diff --git a/templates/tables/torrentGroupsWithoutTorrents.twig b/templates/tables/torrentGroupsWithoutTorrents.twig
index 34de92297..bdb1a12f4 100644
--- a/templates/tables/torrentGroupsWithoutTorrents.twig
+++ b/templates/tables/torrentGroupsWithoutTorrents.twig
@@ -10,7 +10,7 @@
 	        <th class="categoryColumn" />
 
 	        {# torrent info #}
-	        <th>Torrent&nbsp;info</th>
+	        <th>Info</th>
         </tr>
     </thead>
 
@@ -23,9 +23,8 @@
 	            </td>
 
 	            {# title #}
-	            <td class="tableGroup">
-		            <div class="flexColumn">
-
+	            <td>
+		            <p class="flexRow">
 		                {# title link #}
 		                <a class="torrentTitle" href="/torrent-groups/{{ torrentGroup.id }}" {# open tag #}
 
@@ -36,49 +35,49 @@
     	                dir="ltr">
 			                {{ torrentGroup.attributes.title|raw }}
 		                </a>
+					</p>
 
-		                <div class="flexRow">
-			                {# subject #}
-			                {% if torrentGroup.attributes.subject is not empty %}
-				                <span class="tooltip subjectObject" title="Organism">{{ "<em>#{torrentGroup.attributes.subject}</em>"|raw }}
-					                {# object #}
-					                {{ (torrentGroup.attributes.object is not empty) ? torrentGroup.attributes.object : "" }}
-				                </span>
-			                {% endif %}
+		            <p class="flexRow">
+			            {# subject #}
+			            {% if torrentGroup.attributes.subject is not empty %}
+				            <span class="tooltip subjectObject" title="Organism">{{ "<em>#{torrentGroup.attributes.subject}</em>"|raw }}
+					            {# object #}
+					            {{ (torrentGroup.attributes.object is not empty) ? torrentGroup.attributes.object : "" }}
+				            </span>
+			            {% endif %}
 
-			                {# year #}
-			                {% if torrentGroup.attributes.year is not empty %}
-				                <span class="tooltip year" title="Year">{{ torrentGroup.attributes.year }}</span>
-			                {% endif %}
+			            {# year #}
+			            {% if torrentGroup.attributes.year is not empty %}
+				            <span class="tooltip year" title="Year">{{ torrentGroup.attributes.year }}</span>
+			            {% endif %}
 
-			                {# identifier #}
-			                {% if torrentGroup.attributes.identifier is not empty %}
-				                <span class="tooltip identifier" title="Identifier">{{ torrentGroup.attributes.identifier }}</span>
-			                {% endif %}
+			            {# identifier #}
+			            {% if torrentGroup.attributes.identifier is not empty %}
+				            <span class="tooltip identifier" title="Identifier">{{ torrentGroup.attributes.identifier }}</span>
+			            {% endif %}
 
-			                {# workgroup #}
-			                {% if torrentGroup.attributes.workgroup is not empty %}
-				                <span class="tooltip workgroup" title="Workgroup">{{ torrentGroup.attributes.workgroup|raw }}</span>
-			                {% endif %}
+			            {# workgroup #}
+			            {% if torrentGroup.attributes.workgroup is not empty %}
+				            <span class="tooltip workgroup" title="Workgroup">{{ torrentGroup.attributes.workgroup|raw }}</span>
+			            {% endif %}
 
-			                {# location #}
-			                {% if torrentGroup.attributes.location is not empty %}
-				                <span class="tooltip location" title="Location">{{ torrentGroup.attributes.location|raw }}</span>
-			                {% endif %}
-		                </div>
+			            {# location #}
+			            {% if torrentGroup.attributes.location is not empty %}
+				            <span class="tooltip location" title="Location">{{ torrentGroup.attributes.location|raw }}</span>
+			            {% endif %}
+		            </p>
 
-		                {# tags #}
-		                {% if torrentGroup.attributes.tags is not empty %}
-			                <div class="tooltip tagList" title="Tags">{{ torrentGroup.attributes.tags|slice(0, 5)|join(", ") }}</div>
-		                {% endif %}
+		            {# tags #}
+		            {% if torrentGroup.attributes.tags is not empty %}
+			            <p class="flexRow tooltip tagList" title="Tags">{{ torrentGroup.attributes.tags|slice(0, 5)|join(", ") }}</p>
+		            {% endif %}
 
-		                {# creators #}
-                        {#
-		                {% if torrentGroup.attributes.Artists is not empty %}
-			                <div class="tooltip creatorList" title="Creators">{{ displayCreators(torrentGroup.attributes.Artists)|raw }}</div>
-		                {% endif %}
-		                #}
-                    </div>
+		            {# creators #}
+                    {#
+		            {% if torrentGroup.attributes.Artists is not empty %}
+			            <div class="tooltip creatorList" title="Creators">{{ displayCreators(torrentGroup.attributes.Artists)|raw }}</div>
+		            {% endif %}
+		            #}
 	            </td>
             </tr>
         {% endfor %}
diff --git a/templates/tables/torrents.twig b/templates/tables/torrents.twig
new file mode 100644
index 000000000..c36f45f56
--- /dev/null
+++ b/templates/tables/torrents.twig
@@ -0,0 +1,121 @@
+{#
+ # torrents table
+ #}
+
+<table>
+    <thead>
+        <tr>
+            {# torrent info #}
+	        <th>Info</th>
+
+	        {# timeAdded #}
+	        <th>Time&nbsp;added</th>
+
+	        {# data size #}
+	        <th>Data&nbsp;size</th>
+
+	        {# seeders #}
+	        <th title="Seeders">↑</th>
+
+	        {# leechers #}
+	        <th title="Leechers">↓</th>
+
+            {# snatches #}
+	        <th title="Snatches">↻</th>
+        </tr>
+    </thead>
+
+    <tbody>
+        {% for torrent in torrents %}
+            <tr>
+	            {# title #}
+	            <td>
+					<p class="flexRow">
+		                {# title link #}
+		                <a class="torrentTitle monospace" href="/torrents/{{ torrent.id }}">{{ torrent.attributes.infoHash }}</a>
+					</p>
+
+					<p class="flexRow">
+                        {# platform #}
+                        {% if torrent.attributes.platform is not empty %}
+                            <span class="tooltip platform" title="Platform">{{ torrent.attributes.platform }}</span>
+                        {% endif %}
+
+                        {# format #}
+                        {% if torrent.attributes.format is not empty %}
+                            <span class="tooltip format" title="Format">{{ torrent.attributes.format }}</span>
+                        {% endif %}
+
+                        {# version #}
+                        {% if torrent.attributes.version is not empty %}
+                            <span class="tooltip version" title="Version">{{ torrent.attributes.version }}</span>
+                        {% endif %}
+
+                        {# scope #}
+                        {% if torrent.attributes.scope is not empty %}
+                            <span class="tooltip scope" title="Scope">{{ torrent.attributes.scope }}</span>
+                        {% endif %}
+
+                        {# archive #}
+                        {% if torrent.attributes.archive is not empty %}
+                            <span class="tooltip archive" title="Archive">{{ torrent.attributes.archive }}</span>
+                        {% endif %}
+
+                        {# license #}
+                        {% if torrent.attributes.license is not empty %}
+                            <span class="tooltip license" title="License">{{ torrent.attributes.license }}</span>
+                        {% endif %}
+
+                        {# isAnnotated #}
+                        {% if torrent.attributes.isAnnotated is not empty %}
+                            <span title="Alignment" class="tooltip good">Aligned</span>
+                        {% else %}
+                            <span title="Alignment" class="tooltip bad">Not aligned</span>
+                        {% endif %}
+					</p>
+
+                    {# download, freeleech, etc. #}
+                    {% if withActions is defined and withActions == true %}
+                        <p class="flexRow">
+                            {# download #}
+                            <a class="button button-primary" href="/torrents.php?action=download&torrentId={{ torrent.id }}&torrent_pass={{ user.extra.torrent_pass}}">download</a>
+
+                            {# freeleech token #}
+                            {% if canUseToken(torrent.id) %}
+                                <a class="button button-purple useFreeleechToken" href="/torrents.php?action=download&torrentId={{ torrent.id }}&torrent_pass={{ user.extra.torrent_pass}}&usetoken=1">freeleech</a>
+                            {% endif %}
+
+                            {# report #}
+                            <a class="button button-red" href="/reportsv2.php?action=report&id={{ torrent.id }}">report</a>
+                        </p>
+                    {% endif %}
+                </td>
+
+	            {# createdAt #}
+	            <td class="nobr">
+  		            <span class="tooltip" title="{{ torrent.attributes.createdAt }}">{{ torrent.attributes.createdAt|relativeTime }}</span>
+                </td>
+
+	            {# dataSize #}
+	            <td class="nobr">
+                    {{ torrent.attributes.dataSize|get_size }}
+                </td>
+
+	            {# seederCount #}
+	            <td class="nobr">
+                    {{ torrent.attributes.seederCount|number_format }}
+                </td>
+
+	            {# leecherCount #}
+	            <td class="nobr">
+                    {{ torrent.attributes.leecherCount|number_format }}
+                </td>
+
+	            {# snatchCount #}
+	            <td class="nobr">
+                    {{ torrent.attributes.snatchCount|number_format }}
+                </td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
diff --git a/templates/top10/torrents.twig b/templates/top10/torrents.twig
index 4cbf19e3f..76df34b4a 100644
--- a/templates/top10/torrents.twig
+++ b/templates/top10/torrents.twig
@@ -8,17 +8,7 @@
 	{% if dailyTorrents is not empty %}
 	<section>
 		<h3>{{ limit }} most active daily uploads</h3>
-
-		<table>
-
-			<tbody>
-				{% for group in dailyTorrents %}
-
-					{% include "torrents/tableEntryForObjects.twig" with group %}
-
-				{% endfor %}
-			</tbody>
-		</table>
+		{{ include("tables/torrentGroupsWithoutTorrents.twig", {"torrentGroups": dailyTorrents}) }}
 	</section>
 	{% endif %}
 
@@ -26,17 +16,7 @@
 	{% if weeklyTorrents is not empty %}
 	<section>
 		<h3>{{ limit }} most active weekly uploads</h3>
-
-		<table>
-
-			<tbody>
-				{% for group in weeklyTorrents %}
-
-					{% include "torrents/tableEntryForObjects.twig" with group %}
-
-				{% endfor %}
-			</tbody>
-		</table>
+		{{ include("tables/torrentGroupsWithoutTorrents.twig", {"torrentGroups": weeklyTorrents}) }}
 	</section>
 	{% endif %}
 
@@ -44,17 +24,7 @@
 	{% if monthlyTorrents is not empty %}
 	<section>
 		<h3>{{ limit }} most active monthly uploads</h3>
-
-		<table>
-
-			<tbody>
-				{% for group in monthlyTorrents %}
-
-					{% include "torrents/tableEntryForObjects.twig" with group %}
-
-				{% endfor %}
-			</tbody>
-		</table>
+		{{ include("tables/torrentGroupsWithoutTorrents.twig", {"torrentGroups": monthlyTorrents}) }}
 	</section>
 	{% endif %}
 
@@ -62,17 +32,7 @@
 	{% if yearlyTorrents is not empty %}
 	<section>
 		<h3>{{ limit }} most active yearly uploads</h3>
-
-		<table>
-
-			<tbody>
-				{% for group in yearlyTorrents %}
-
-					{% include "torrents/tableEntryForObjects.twig" with group %}
-
-				{% endfor %}
-			</tbody>
-		</table>
+		{{ include("tables/torrentGroupsWithoutTorrents.twig", {"torrentGroups": yearlyTorrents}) }}
 	</section>
 	{% endif %}
 
@@ -80,17 +40,7 @@
 	{% if overallTorrents is not empty %}
 	<section>
 		<h3>{{ limit }} most active overall uploads</h3>
-
-		<table>
-
-			<tbody>
-				{% for group in overallTorrents %}
-
-					{% include "torrents/tableEntryForObjects.twig" with group %}
-
-				{% endfor %}
-			</tbody>
-		</table>
+		{{ include("tables/torrentGroupsWithoutTorrents.twig", {"torrentGroups": overallTorrents}) }}
 	</section>
 	{% endif %}
 
@@ -98,17 +48,7 @@
 	{% if torrentSeeders is not empty %}
 	<section>
 		<h3>{{ limit }} best seeded torrents</h3>
-
-		<table>
-
-			<tbody>
-				{% for group in torrentSeeders %}
-
-					{% include "torrents/tableEntryForObjects.twig" with group %}
-
-				{% endfor %}
-			</tbody>
-		</table>
+		{{ include("tables/torrentGroupsWithoutTorrents.twig", {"torrentGroups": torrentSeeders}) }}
 	</section>
 	{% endif %}
 
@@ -116,17 +56,7 @@
 	{% if torrentSnatches is not empty %}
 	<section>
 		<h3>{{ limit }} most snatched torrents</h3>
-
-		<table>
-
-			<tbody>
-				{% for group in torrentSnatches %}
-
-					{% include "torrents/tableEntryForObjects.twig" with group %}
-
-				{% endfor %}
-			</tbody>
-		</table>
+		{{ include("tables/torrentGroupsWithoutTorrents.twig", {"torrentGroups": torrentSnatches}) }}
 	</section>
 	{% endif %}
 
@@ -134,17 +64,7 @@
 	{% if torrentData is not empty %}
 	<section>
 		<h3>{{ limit }} most transferred torrents</h3>
-
-		<table>
-
-			<tbody>
-				{% for group in torrentData %}
-
-					{% include "torrents/tableEntryForObjects.twig" with group %}
-
-				{% endfor %}
-			</tbody>
-		</table>
+		{{ include("tables/torrentGroupsWithoutTorrents.twig", {"torrentGroups": torrentData}) }}
 	</section>
 	{% endif %}
 
diff --git a/templates/torrentGroups/details.twig b/templates/torrentGroups/details.twig
index 50a4fce33..a385ac362 100644
--- a/templates/torrentGroups/details.twig
+++ b/templates/torrentGroups/details.twig
@@ -9,7 +9,7 @@
 		<table>
 
 			{# organism #}
-			{% if torrentGroup.attributes.subject %}
+			{% if torrentGroup.attributes.subject is not empty %}
 				<tr>
 					<th><span class="subjectObject nobr">Organism</span></th>
 
@@ -19,31 +19,21 @@
 						{# object #}
 					  {{ (torrentGroup.attributes.object) ? torrentGroup.attributes.object : "" }}
 					</td>
-
-					<td>
-						<a href="/torrents?complexSearch={{ torrentGroup.attributes.subject }} {{ torrentGroup.attributes.object }}">Search&nbsp;»</a>
-					</td>
-				</tr>
+			</tr>
 			{% endif %}
 
 			{# year #}
-			{% if torrentGroup.attributes.year %}
+			{% if torrentGroup.attributes.year is not empty %}
 				<tr>
 					<th><span class="year nobr">Year</span></th>
-
 					<td>{{ torrentGroup.attributes.year }}</td>
-
-					<td>
-						<a href="/torrents.php?year={{ torrentGroup.attributes.year }}">Search&nbsp;»</a>
-					</td>
-				</tr>
+			</tr>
 			{% endif %}
 
 			{# identifier #}
-			{% if torrentGroup.attributes.identifier %}
+			{% if torrentGroup.attributes.identifier is not empty %}
 				<tr>
 					<th><span class="identifier nobr">Identifier</span></th>
-
 					<td>{{ torrentGroup.attributes.identifier }}</td>
 
 					<td/>
@@ -51,44 +41,36 @@
 			{% endif %}
 
 			{# workgroup #}
-			{% if torrentGroup.attributes.workgroup %}
+			{% if torrentGroup.attributes.workgroup is not empty %}
 				<tr>
 					<th><span class="workgroup nobr">Workgroup</span></th>
-
 					<td>{{ torrentGroup.attributes.workgroup|raw }}</td>
-
-					<td>
-						<a href="/torrents.php?location={{ torrentGroup.attributes.workgroup }}">Search&nbsp;»</a>
-					</td>
-				</tr>
+			</tr>
 			{% endif %}
 
 			{# location #}
-			{% if torrentGroup.attributes.location %}
+			{% if torrentGroup.attributes.location is not empty %}
 				<tr>
 					<th><span class="location nobr">Location</span></th>
-
 					<td>{{ torrentGroup.attributes.location|raw }}</td>
-
-					<td>
-						<a href="/torrents.php?location={{ torrentGroup.attributes.location }}">Search&nbsp;»</a>
-					</td>
-				</tr>
+			</tr>
 			{% endif %}
 
 		</table>
 	</section>
 
 	{# description #}
+  {% if torrentGroup.attributes.description is not empty %}
 	<section>
 		<h3>Description</h3>
-		{{ torrentGroup.attributes.description|raw }}
+		{{ torrentGroup.attributes.description|parse }}
 	</section>
+			{% endif %}
 
 
   	{# openai #}
    {% if torrentGroup.attributes.openai is not empty and user.siteOptions.openaiContent %}
-	<section class="faded">
+	<section class="faded small">
 		<h3>tl;dr by {{ torrentGroup.attributes.openai.model }}</h3>
     {{ torrentGroup.attributes.openai.text }}
 	</section>
@@ -96,256 +78,31 @@
 
 
     {# torrent list #}
-    <section style="overflow-x: scroll;">
+  {% if torrentGroup.relationships.torrents is not empty %}
+    <section>
     <h3>Torrents</h3>
-
-    {# individual torrents #}
-{% for item in torrentGroup.relationships.torrents %}
-
-    <table id="torrentId-{{ item.id }}" class="torrentDetails">
-
-    <tr>
-
-    {# permalink #}
-    <th />
-
-	{# torrent info #}
-	<th>Torrent&nbsp;info</th>
-
-	{# timeAdded #}
-	<th>Time&nbsp;added</th>
-
-	{# data size #}
-	<th>Data&nbsp;size</th>
-
-	{# seeders #}
-	<th title="Seeders">↑</th>
-
-	{# leechers #}
-	<th title="Leechers">↓</th>
-
-  {# snatches #}
-	<th title="Snatches">↻</th>
-
-</tr>
-
-
-<tr>
-
-{# permalink #}
-<td class="center" title="Permalink (click to copy)">
-<a class="permalink" href="#torrentId-{{ item.id }}" data-permalink="https://{{ env.siteDomain }}/torrents.php?torrentid={{ item.id }}">🔗</a>
-</td>
-
-	{# title #}
-	<td class="flexRow">
-
-  {# platform #}
-  {% if item.attributes.platform %}
-    <span title="Platform">📦 {{ item.attributes.platform }}</span>
-  {% endif %}
-
-  {# format #}
-  {% if item.attributes.format %}
-    <span title="Format">💾 {{ item.attributes.format }}</span>
-  {% endif %}
-
-  {# version #}
-  {% if item.attributes.version %}
-    <span title="Version"><img src="/images/icons/version.webp" alt="version" class="icon"> {{ item.attributes.version }}</span>
-  {% endif %}
-
-  {# scope #}
-  {% if item.attributes.scope %}
-    <span title="Scope">🔎 {{ item.attributes.scope }}</span>
-  {% endif %}
-
-  {# archive #}
-  {% if item.attributes.archive %}
-    <span title="Archive"><img src="/images/icons/archive.webp" alt="archive" class="icon"> {{ item.attributes.archive }}</span>
+    {{ include("tables/torrents.twig", {"withActions": true}) }}
+    </section>
   {% endif %}
 
-  {# license #}
-  {% if item.attributes.license %}
-    <span title="License">📜 {{ item.attributes.license }}</span>
-  {% endif %}
 
-  {# alignment #}
-  {% if item.attributes.isAnnotated %}
-    <span title="Alignment" class="good">Aligned</span>
-  {% else %}
-      <span title="Alignment" class="bad">Not aligned</span>
+      {# collages #}
+  {% if torrentGroup.relationships.collages is not empty %}
+    <section>
+    <h3>Collages</h3>
+   {{ include("tables/collages.twig") }}
+    </section>
   {% endif %}
 
-</td>
-
-	{# createdAt #}
-	<td class="nobr" title="{{ item.attributes.createdAt }}">
-  {{ item.attributes.createdAt|relativeTime }}
-  </td>
-
-
-	{# dataSize #}
-	<td class="nobr">
-  {{ item.attributes.dataSize|get_size }}
-  </td>
-
-	{# seederCount #}
-	<td class="nobr">
-    {{ item.attributes.seederCount|number_format }}
-  </td>
-
-
-	{# leecherCount #}
-	<td class="nobr">
-    {{ item.attributes.leecherCount|number_format }}
-</td>
-
-
-	{# snatchCount #}
-	<td class="nobr">
-    {{ item.attributes.snatchCount|number_format }}
-</td>
-</tr>
-
-{# second row: buttons #}
-<tr>
-
-{# controls #}
-<td colspan="7">
-
-<div class="flexRow">
-{# download #}
-<a class="button button-primary" href="/torrents.php?action=download&torrentId={{ item.id }}&torrent_pass={{ user.extra.torrent_pass}}">download</a>
-
-{# freeleech token #}
-{% if canUseToken(item.id) %}
-<a class="button button-purple useFreeleechToken" href="/torrents.php?action=download&torrentId={{ item.id }}&torrent_pass={{ user.extra.torrent_pass}}&usetoken=1">freeleech</a>
-{% endif %}
-
-{# update #}
-{% if can({"torrents": "updateAny"}) or item.attributes.userId == user.core.id %}
-<a class="button button-orange" href="/torrents.php?action=edit&id={{ item.id }}">update</a>
-{% endif %}
-
-{# report #}
-<a class="button button-red" href="/reportsv2.php?action=report&id={{ item.id }}">report</a>
-
-{# delete #}
-{% if can({"torrents": "deleteAny"}) or item.UserID == user.core.id %}
-<a class="button button-red" href="/torrents.php?action=delete&torrentid={{ item.id }}">delete</a>
-{% endif %}
-</div>
-</td>
-</tr>
-
-{# third row:description #}
-{% if item.attributes.description is not empty %}
-<tr>
-
-{# description #}
-<td colspan="7">
-<h4>Description</h4>
-{{ item.attributes.description }}
-</td>
-{% endif %}
-</tr>
-
-
-{# citation #}
-<tr>
-
-<td colspan="7">
-
-<span class="flexHeader">
-<h4>Cite this dataset</h4>
-<a class="button toggleBibtex" data-torrentid="{{ item.id }}">biblatex</a>
-</span>
-
-{##
- # https://en.wikibooks.org/wiki/LaTeX/Bibliography_Management#biblatex
- # https://ctan.math.washington.edu/tex-archive/macros/latex/contrib/biblatex/doc/biblatex.pdf
- #
- # @misc{ enwiki:1116502991,
- #   author = "{Wikipedia contributors}",
- #   title = "Biber (LaTeX) --- {Wikipedia}{,} The Free Encyclopedia",
- #   year = "2022",
- #   howpublished = "\url{https://en.wikipedia.org/w/index.php?title=Biber_(LaTeX)&oldid=1116502991}",
- #   note = "[Online; accessed 10-January-2023]"
- # }
- #
- # important: the weird indentation below is absolutely necessary due to the textarea
- #}
-
-<textarea class="bibtexCitation" id="bibtexCitation-{{ item.id }}" rows="10">
-@dataset{ BioTorrents.de-torrentId-{{ item.id }}
-  title = {{ torrentGroup.attributes.title|curlyBraces }},
-  author = todo,
-{% if torrentGroup.attributes.workgroup %}
-  organization = {{ torrentGroup.attributes.workgroup|curlyBraces }},
-{% endif %}
-{% if torrentGroup.attributes.year %}
-  year = {{ torrentGroup.attributes.year|curlyBraces }},
-{% endif %}
-{% if item.attributes.version %}
-  version = {{ item.attributes.version|curlyBraces }},
-{% endif %}
-  url = \href{https://{{ env.siteDomain }}/torrents/{{ item.id }}},
-  urldate = {{ "now"|date|curlyBraces }},
-  note = {{ "BitTorrent info hash: #{item.attributes.infoHash}"|curlyBraces }}
-}
-</textarea>
-</td>
-
-</tr>
-
-{#}
-                  if (!empty($Description)) {
-                      echo '<blockquote class="torrent_description">'.\Gazelle\Text::parse($Description).'</blockquote>';
-                  }
-
-                  echo "\n<blockquote>"; ?>
-            <div class="spoilerContainer hideContainer">
-              <?php
-                  # Make a BibTeX citation
-                  # todo: Expand this and move HTTP/FTP, IPFS, Dat, etc.
-                  $EntryName = "BioTorrents.de-$TorrentID";
-    $Today = strftime('%Y-%m-%d');
-
-    # Author format handling
-    $ArtistArray = [];
-    foreach ($Artists as $Num => $Artist) {
-        array_push($ArtistArray, $Artist['name']);
-    }
-
-    # Not sure if inline newlines are valid
-    $ArtistString = (count($ArtistArray) > 3)
-        ? implode("\n    and ", $ArtistArray)
-        : implode(' and ', $ArtistArray);
-
-    # DOI number
-    $BibtexDOI = (count($Screenshots) > 0)
-        ? $Screenshots[0]['Image']
-        : null;
-
-
-    ?>
-
-
-#}
-
-</table>
-{% endfor %}
-
-    </section>
 
 
     {# literature #}
+  {% if torrentGroup.relationships.literature is not empty %}
     <section>
     <h3>Literature</h3>
    {{ include("tables/literature.twig") }}
     </section>
-
+  {% endif %}
 
 
 {% if enableConversation and conversation %}
diff --git a/templates/torrentGroups/sidebar.twig b/templates/torrentGroups/sidebar.twig
index 037fc6b9c..a1aa78837 100644
--- a/templates/torrentGroups/sidebar.twig
+++ b/templates/torrentGroups/sidebar.twig
@@ -1,10 +1,10 @@
 {# cover art #}
 <section>
 
-	{% if user.siteOptions.coverArtTorrents %}
+	{% if torrentGroup.attributes.picture is not empty and user.siteOptions.coverArtTorrents == true %}
 		{% set uri = processImage(torrentGroup.attributes.picture, "thumb") %}
 	{% else %}
-		{% set uri = processImage("#{env.staticServer}/images/noartwork.webp", "thumb") %}
+		{% set uri = processImage("/images/noartwork.webp", "thumb") %}
 	{% endif %}
 
 	<figure id="groupPicture" class="box_image box_image_albumart box_albumart">
diff --git a/templates/torrent_form/announce_source.html b/templates/torrent_form/announce_source.html
deleted file mode 100644
index 2c020605d..000000000
--- a/templates/torrent_form/announce_source.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<aside class="announce_source">
-  {% for announce in announces %}
-  <p>
-    <strong>Announce</strong>
-    <input
-      type="text"
-      value="{{ announce }}/{{ torrent_pass }}/announce"
-      size="60"
-      readonly="readonly"
-      onclick="this.select();"
-    />
-  </p>
-  {% endfor %}
-
-  <p>
-    <strong>Source</strong>
-    <input
-      type="text"
-      value="{{ torrent_source }}"
-      size="30"
-      readonly="readonly"
-      onclick="this.select();"
-    />
-  </p>
-</aside>
diff --git a/templates/torrent_form/identifier.html b/templates/torrent_form/identifier.html
deleted file mode 100644
index 87a6bdcad..000000000
--- a/templates/torrent_form/identifier.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<tr id="javdb_tr">
-  <td>
-    <label for="catalogue"> {{ db.name }} </label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="catalogue"
-      name="catalogue"
-      size="30"
-      placeholder="{{ db.desc }}"
-      value="{{ identifier }}"
-    />
-
-    <input
-      type="button"
-      autofill="jav"
-      value="Autofill"
-      style="pointer-events: none; opacity: 0.5"
-    />
-  </td>
-</tr>
diff --git a/templates/torrent_form/location.html b/templates/torrent_form/location.html
deleted file mode 100644
index 62b7f8d19..000000000
--- a/templates/torrent_form/location.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<tr id="series_tr">
-  <td>
-    <label for="series">{{ db.name }}</label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="series"
-      name="series"
-      size="60"
-      placeholder="{{ db.desc }}"
-      value="{{ location }}"
-    />
-  </td>
-</tr>
diff --git a/templates/torrent_form/mirrors.html b/templates/torrent_form/mirrors.html
deleted file mode 100644
index 55753394c..000000000
--- a/templates/torrent_form/mirrors.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<tr id="mirrors_tr">
-  <td>
-    <label for="mirrors">{{ db.name }}</label>
-  </td>
-
-  <td>
-    <textarea
-      rows="2"
-      name="mirrors"
-      id="mirrors"
-      {# Needs to be all on one line #}
-      placeholder="{{ db.desc }}">{{ mirrors }}</textarea>
-  </td>
-</tr>
diff --git a/templates/torrent_form/notice.html b/templates/torrent_form/notice.html
deleted file mode 100644
index 03d9a2fb5..000000000
--- a/templates/torrent_form/notice.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<aside class="upload_notice">
-  <p>
-    Please consult the
-    <a href="/rules/upload">Upload Rules</a>
-    and the
-    <a href="/wiki/categories">Categories Wiki</a>
-    to help fill out the upload form correctly.
-  </p>
-
-  <p>
-    The site adds the Announce and Source automatically. Just download and seed
-    the new torrent after uploading it.
-
-    <!--
-    <strong>
-      If you never have before, be sure to read this list of
-      <a href="wiki/uploadPitfalls">uploading pitfalls</a>.
-    </strong>
-    -->
-  </p>
-</aside>
diff --git a/templates/torrent_form/picture.html b/templates/torrent_form/picture.html
deleted file mode 100644
index b00b94113..000000000
--- a/templates/torrent_form/picture.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<tr id="cover_tr">
-  <td>
-    <label for="image">{{db.name }}</label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="image"
-      name="image"
-      size="60"
-      placeholder="{{ db.desc }}"
-      value="{{ picture }}"
-    />
-  </td>
-</tr>
diff --git a/templates/torrent_form/seqhash.html b/templates/torrent_form/seqhash.html
deleted file mode 100644
index 8c3cd0af9..000000000
--- a/templates/torrent_form/seqhash.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<tr id="seqhash_tr">
-  <td>
-    <label for="seqhash">{{ db.name }}</label>
-    {#
-    <br>
-    <a class="add_artist_button brackets" onclick="AddArtistField()">+</a>
-    <a class="remove_artist_button brackets" onclick="RemoveArtistField()">&minus;</a>
-    #}
-  </td>
-
-  <td>
-    <textarea
-      rows="2"
-      name="seqhash"
-      id="seqhash"
-      {# Needs to be all on one line #}
-      placeholder="{{ db.desc }}">{{ seqhash }}</textarea>
-
-    <input type="radio" id="dna" name="seqhash_meta1" value="DNA" checked> DNA
-    {# <label for="dna">DNA</label> #}
-
-    &emsp;
-
-    <input type="radio" id="rna" name="seqhash_meta1" value="RNA"> RNA
-    {# <label for="rna">RNA</label> #}
-
-    &emsp;
-
-    <input type="radio" id="protein" name="seqhash_meta1" value="PROTEIN"> Protein
-    {# <label for="protein">Protein</label> #}
-
-    <br>
-
-    <input type="radio" id="linear" name="seqhash_meta2" value="false" checked> Linear
-    {# <label for="linear">Linear</label> #}
-
-    &emsp;
-
-    <input type="radio" id="circular" name="seqhash_meta2" value="true"> Circular
-    {# <label for="circular">Circular</label> #}
-
-    <br>
-
-    <input type="radio" id="double_stranded" name="seqhash_meta3" value="true" checked> Double-Stranded
-    {# <label for="double_stranded">Double-Stranded</label> #}
-
-    &emsp;
-
-    <input type="radio" id="single_stranded" name="seqhash_meta3" value="false"> Single-Stranded
-    {# <label for="single_stranded">Single-Stranded</label> #}
-
-    <p>{{ db.note|raw }}</p>
-  </td>
-</tr>
diff --git a/templates/torrent_form/titles.html b/templates/torrent_form/titles.html
deleted file mode 100644
index 3aef3225d..000000000
--- a/templates/torrent_form/titles.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<tr id="title_tr">
-  <td>
-    <label for="title" class="required">{{ db.title.name }}</label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="title"
-      name="title"
-      size="60"
-      placeholder="{{ db.title.desc }}"
-      value="{{ title }}"
-    />
-  </td>
-</tr>
-
-<tr id="title_rj_tr">
-  <td>
-    <label for="title_rj">{{ db.subject.name }}</label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="title_rj"
-      name="title_rj"
-      size="60"
-      placeholder="{{ db.subject.desc }}"
-      value="{{ subject }}"
-    />
-  </td>
-</tr>
-
-<tr id="title_jp_tr">
-  <td>
-    <label for="title_jp">{{ db.object.name }}</label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="title_jp"
-      name="title_jp"
-      size="60"
-      placeholder="{{ db.object.desc }}"
-      value="{{ object }}"
-    />
-  </td>
-</tr>
diff --git a/templates/torrent_form/version.html b/templates/torrent_form/version.html
deleted file mode 100644
index 0fd8f8e5a..000000000
--- a/templates/torrent_form/version.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<tr id="audio_tr">
-  <td>
-    <label for="version">{{ db.name }}</label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="version"
-      name="version"
-      size="12"
-      pattern="\d+\.*\d*\.*\d*"
-      placeholder="{{ db.desc }}"
-      value="{{ version }}"
-    />
-
-    <p>{{ db.note|raw }}</p>
-  </td>
-</tr>
diff --git a/templates/torrent_form/workgroup.html b/templates/torrent_form/workgroup.html
deleted file mode 100644
index 0bc851ab0..000000000
--- a/templates/torrent_form/workgroup.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<tr id="studio_tr">
-  <td>
-    <label for="studio" class="required">{{ db.name }}</label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="studio"
-      name="studio"
-      size="60"
-      placeholder="{{ db.desc }}"
-      value="{{ workgroup }}"
-    />
-  </td>
-</tr>
diff --git a/templates/torrent_form/year.html b/templates/torrent_form/year.html
deleted file mode 100644
index c943f5dee..000000000
--- a/templates/torrent_form/year.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<tr id="year_tr">
-  <td>
-    <label for="year" class="required">{{ db.name }}</label>
-  </td>
-
-  <td>
-    <input
-      type="text"
-      id="year"
-      name="year"
-      maxlength="4"
-      size="15"
-      placeholder="{{ db.desc }}"
-      value="{{ year }}"
-    />
-  </td>
-</tr>
diff --git a/templates/torrents/browse.twig b/templates/torrents/browse.twig
index 6ae0cb52c..0b5ff0d84 100644
--- a/templates/torrents/browse.twig
+++ b/templates/torrents/browse.twig
@@ -3,7 +3,7 @@
 {% block content %}
 
 {# include the main search form #}
-{% include "torrents/search.twig" %}
+{{ include("torrents/search.twig") }}
 
 {# no results message #}
 {% if pagination.resultCount == 0 %}
@@ -47,92 +47,11 @@
 
 
 {# start the results table #}
-<table id="torrentSearchResults" class="{{ grouping }}">
-
-{# start results table headings #}
-{# todo: this can be reorganized to suck less #}
-<thead>
-<tr>
-
-	{# grouped #}
-  	{# <th /> #}
-
-	{#
-  {% if searchTerms.groupResults %}
-		<th />
-	{% endif %}
-  #}
-
-	{# category icon #}
-	<th class="categoryColumn" />
-
-	{# torrent info #}
-	<th>Torrent&nbsp;info</th>
-
-	{# timeAdded #}
-	<th>Time&nbsp;added</th>
-
-	{# data size #}
-	<th>Data&nbsp;size</th>
-
-	{# file count #}
-	{#
-	<th>File&nbsp;count</th>
-	#}
-
-	{# seeders #}
-	<th title="Seeders">↑</th>
-	{# <th>Seeders&nbsp;↑</th> #}
-
-	{# leechers #}
-	<th title="Leechers">↓</th>
-	{# <th>Leechers&nbsp;↓</th> #}
-
-  {# snatches #}
-	<th title="Snatches">↻</th>
-	{# <th>Snatches&nbsp;↻</th> #}
-
-</tr>
-</thead>
-{# end results table headings #}
-
-{# start the results themselves #}
-<tbody>
-{% for group in torrentGroups %}
-
-{% include "torrents/tableEntryForObjects.twig" with group %}
-
-{% endfor %}
-</tbody>
-{# end the results themselves #}
-
-{# end the results table #}
-</table>
-
-{# todo: share search #}
-{# <a id="searchParamsPermalink" class="button">link this search</a> #}
-
-{# todo: download all this page #}
-{# <a id="downloadAllThisPage" class="button">download all this page</a> #}
-
-{# back to top: lazy af #}
-{# <a href="#searchResultsHeader" class="button">back to top</a> #}
+{{ include("tables/torrentGroupsWithTorrents.twig") }}
 
 {% endblock %}
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 {#}														  foreach ($Results as $Key => $GroupID) {
 														
 {% set groupInfo = resultGroups.key %}
diff --git a/templates/torrents/details.twig b/templates/torrents/details.twig
index 554c79560..b24fb5d14 100644
--- a/templates/torrents/details.twig
+++ b/templates/torrents/details.twig
@@ -2,124 +2,111 @@
 
 {% block content %}
 
-	<h2>{{ torrent.attributes.infoHash }}</h2>
+	<h2 class="monospace">{{ torrent.attributes.infoHash }}</h2>
 
 	{# essential details table #}
 	<section>
 		<table>
 
 			{# platform #}
-			{% if torrent.attributes.platform %}
+			{% if torrent.attributes.platform is not empty %}
 				<tr>
 					<th><span class="platform nobr">Platform</span></th>
-
 					<td>{{ torrent.attributes.platform }}</td>
-
-					<td>
-						<a href="/torrents?platform={{ torrent.attributes.platform }}">Search&nbsp;»</a>
-					</td>
-				</tr>
+			</tr>
 			{% endif %}
 
 			{# format #}
-			{% if torrent.attributes.format %}
+			{% if torrent.attributes.format is not empty %}
 				<tr>
 					<th><span class="format nobr">Format</span></th>
-
 					<td>{{ torrent.attributes.format }}</td>
-
-					<td>
-						<a href="/torrents?format={{ torrent.attributes.format }}">Search&nbsp;»</a>
-					</td>
-				</tr>
+			</tr>
 			{% endif %}
 
 			{# license #}
-			{% if torrent.attributes.license %}
+			{% if torrent.attributes.license is not empty %}
 				<tr>
 					<th><span class="license nobr">License</span></th>
-
 					<td>{{ torrent.attributes.license }}</td>
-
-					<td/>
 				</tr>
 			{% endif %}
 
 			{# scope #}
-			{% if torrent.attributes.scope %}
+			{% if torrent.attributes.scope is not empty %}
 				<tr>
 					<th><span class="scope nobr">Scope</span></th>
-
 					<td>{{ torrent.attributes.scope }}</td>
-
-					<td>
-						<a href="/torrents.php?scope={{ torrent.attributes.scope }}">Search&nbsp;»</a>
-					</td>
-				</tr>
+			</tr>
 			{% endif %}
 
 			{# version #}
-			{% if torrent.attributes.version %}
+			{% if torrent.attributes.version is not empty %}
 				<tr>
-					<th><span class="version nobr">version</span></th>
-
+					<th><span class="version nobr">Version</span></th>
 					<td>{{ torrent.attributes.version }}</td>
-
-					<td>
-						<a href="/torrents.php?version={{ torrent.attributes.version }}">Search&nbsp;»</a>
-					</td>
-				</tr>
+			</tr>
 			{% endif %}
 
 		</table>
 	</section>
 
+
 	{# description #}
+  {% if torrent.attributes.description is not empty %}
 	<section>
 		<h3>Description</h3>
-
 		{{ torrent.attributes.description|raw }}
 	</section>
+  {% endif %}
 
-  	{# fileList #}
-	<section>
-		<h3>File list</h3>
-
-    <select class="select" multiple>
-      {% for file in torrent.attributes.fileList %}
-      <option value="{{ file.name }}">{{ file.name }}</option>
-      {% endfor %}
-    </select>
 
-{#
-    <table class="compact">
-      <tr>
-        <th>File name</th>
-        <th>Size</th>
-      </tr>
-
-      {% for file in torrent.attributes.fileList %}
-        <tr>
-          <td>{{ file.name }}</td>
-          <td>{{ file.size|get_size }}</td>
-        </tr>
-      {% endfor %}
-    </table>
-#}
-
-	</section>
-
-    	{# torrentGroup #}
+  {# torrentGroup #}
 	<section>
 		<h3>Torrent group</h3>
-
-    {{ include("torrents/tableEntryForObjects.twig", {group: torrentGroup}) }}
-
-
-
+    {{ include("tables/torrentGroupsWithTorrents.twig") }}
 	</section>
 
 
+  {# citation #}
+  	<section>
+		<h3>Cite this dataset</h3>
+
+{##
+ # https://en.wikibooks.org/wiki/LaTeX/Bibliography_Management#biblatex
+ # https://ctan.math.washington.edu/tex-archive/macros/latex/contrib/biblatex/doc/biblatex.pdf
+ #
+ # @misc{ enwiki:1116502991,
+ #   author = "{Wikipedia contributors}",
+ #   title = "Biber (LaTeX) --- {Wikipedia}{,} The Free Encyclopedia",
+ #   year = "2022",
+ #   howpublished = "\url{https://en.wikipedia.org/w/index.php?title=Biber_(LaTeX)&oldid=1116502991}",
+ #   note = "[Online; accessed 10-January-2023]"
+ # }
+ #
+ # important: the weird indentation below is absolutely necessary due to the textarea
+ #}
+
+<textarea class="bibtexCitation" id="bibtexCitation-{{ torrent.id }}" rows="10">
+@dataset{ {{ env.siteName }}-torrentId-{{ torrent.id }}
+  title = {{ torrentGroup.attributes.title|curlyBraces }},
+  author = todo,
+{% if torrentGroup.attributes.workgroup %}
+  organization = {{ torrentGroup.attributes.workgroup|curlyBraces }},
+{% endif %}
+{% if torrentGroup.attributes.year %}
+  year = {{ torrentGroup.attributes.year|curlyBraces }},
+{% endif %}
+{% if torrent.attributes.version %}
+  version = {{ torrent.attributes.version|curlyBraces }},
+{% endif %}
+  url = \href{https://{{ env.siteDomain }}/torrents/{{ torrent.id }}},
+  urldate = {{ "now"|date|curlyBraces }},
+  note = {{ "BitTorrent info hash: #{torrent.attributes.infoHash}"|curlyBraces }}
+}
+</textarea>
+</section>
+
 
 {% if enableConversation and conversation %}
     {% set variables = { "conversation": conversation } %}
diff --git a/templates/torrents/sidebar.twig b/templates/torrents/sidebar.twig
index 0e8edac72..fa3c6be1a 100644
--- a/templates/torrents/sidebar.twig
+++ b/templates/torrents/sidebar.twig
@@ -46,38 +46,38 @@
 
 {# tracker #}
 <section>
-	<h3>Tracker</h3>
+	<h3>Tracker data</h3>
 
 	<table class="compact">
 
 		{# fileCount #}
 		<tr>
-			<th>fileCount</th>
-			<td>{{ torrent.attributes.fileCount }}</td>
+			<th>File count</th>
+			<td>{{ torrent.attributes.fileCount|number_format }}</td>
 		</tr>
 
 		{# dataSize #}
 		<tr>
-			<th>dataSize</th>
-			<td>{{ torrent.attributes.dataSize }}</td>
+			<th>Data size</th>
+			<td>{{ torrent.attributes.dataSize|get_size }}</td>
 		</tr>
 
 		{# leecherCount #}
 		<tr>
-			<th>leecherCount</th>
-			<td>{{ torrent.attributes.leecherCount }}</td>
+			<th>Leechers</th>
+			<td>{{ torrent.attributes.leecherCount|number_format }}</td>
 		</tr>
 
 		{# seederCount #}
 		<tr>
-			<th>seederCount</th>
-			<td>{{ torrent.attributes.seederCount }}</td>
+			<th>Seeders</th>
+			<td>{{ torrent.attributes.seederCount|number_format }}</td>
 		</tr>
 
 		{# lastAction #}
 		<tr>
-			<th>fileCount</th>
-			<td>{{ torrent.attributes.lastAction }}</td>
+			<th>Last action</th>
+			<td>{{ torrent.attributes.lastAction|relativeTime }}</td>
 		</tr>
 
 </table>
@@ -85,4 +85,18 @@
 </section>
 
 
+  	{# fileList #}
+   {% if torrent.attributes.fileList is not empty %}
+	<section>
+		<h3>File list</h3>
+
+    <select class="select" multiple placeholder="Search the file list">
+      {% for file in torrent.attributes.fileList %}
+      <option value="{{ file.name }}">{{ file.name }}</option>
+      {% endfor %}
+    </select>
+  {% endif %}
+
+	</section>
+