From 84a6447fd4ed5b18a8ecb4b6c248d69567c4f543 Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Wed, 22 Feb 2023 16:29:45 +0000
Subject: [PATCH] ci: fix lint and formatting issues

---
 .phpunit.cache/test-results                   |   2 +-
 app/Config/Database.php                       |   3 -
 app/Config/Events.php                         |   3 +-
 app/Config/Pager.php                          |   2 -
 app/Config/Services.php                       |   4 -
 app/Controllers/ColorsController.php          |   3 -
 app/Controllers/EpisodeAudioController.php    |   2 +-
 app/Controllers/EpisodeCommentController.php  |   8 +-
 app/Controllers/EpisodeController.php         |   8 +-
 app/Controllers/PodcastController.php         |   6 -
 app/Controllers/PostController.php            |   2 +-
 app/Entities/Category.php                     |   3 -
 app/Entities/Credit.php                       |   6 -
 app/Entities/Episode.php                      |   2 +-
 app/Entities/EpisodeComment.php               |   5 -
 app/Entities/Podcast.php                      |   3 -
 app/Helpers/form_helper.php                   |   2 +-
 app/Helpers/misc_helper.php                   |   1 -
 app/Helpers/rss_helper.php                    |  10 +-
 app/Libraries/Router.php                      |   1 -
 app/Libraries/TranscriptParser.php            |   1 -
 app/Libraries/Vite/Vite.php                   |   5 +-
 app/Models/ClipModel.php                      |   3 -
 app/Models/EpisodeCommentModel.php            |   2 -
 app/Models/MediaModel.php                     |   7 -
 app/Views/errors/html/error_exception.php     |  20 +-
 app/Views/pager/default_full.php              |  24 ++-
 .../Controllers/PodcastPlatformController.php |   2 +-
 .../Admin/Controllers/SchedulerController.php |   1 -
 .../Admin/Controllers/SoundbiteController.php |   2 +-
 .../Controllers/VideoClipsController.php      |   2 +-
 modules/Analytics/Config/Routes.php           |   4 +-
 .../Entities/AnalyticsPodcastsByCountry.php   |   3 -
 .../Entities/AnalyticsPodcastsByRegion.php    |   3 -
 .../Controllers/ActivityPubController.php     |   3 -
 .../Fediverse/Controllers/ActorController.php |  14 --
 .../Fediverse/Controllers/PostController.php  |   6 -
 modules/Fediverse/Models/PostModel.php        |   2 +-
 .../Install/Controllers/InstallController.php |  12 +-
 .../Models/SubscriptionModel.php              |   3 -
 .../WebSub/Controllers/WebSubController.php   |   1 -
 tests/modules/Api/Rest/V1/PodcastTest.php     |   7 +-
 themes/cp_admin/_partials/_nav_header.php     | 142 +++++++-------
 themes/cp_admin/episode/_card.php             |  32 ++--
 themes/cp_admin/episode/_sidebar.php          |  26 +--
 themes/cp_admin/episode/create.php            |   2 +-
 themes/cp_admin/episode/edit.php              |  28 +--
 themes/cp_admin/episode/publish.php           |  10 +-
 themes/cp_admin/episode/publish_edit.php      |  14 +-
 themes/cp_admin/episode/view.php              |  24 +--
 themes/cp_admin/podcast/_sidebar.php          |  20 +-
 themes/cp_admin/podcast/analytics/index.php   |  30 +--
 .../podcast/analytics/listening_time.php      |  20 +-
 .../cp_admin/podcast/analytics/locations.php  |  28 +--
 themes/cp_admin/podcast/analytics/players.php |  50 ++---
 .../podcast/analytics/time_periods.php        |  18 +-
 .../podcast/analytics/unique_listeners.php    |  20 +-
 .../cp_admin/podcast/analytics/webpages.php   |  36 ++--
 themes/cp_admin/podcast/create.php            |   4 +-
 themes/cp_admin/podcast/edit.php              |   4 +-
 themes/cp_admin/podcast/latest_episodes.php   |  10 +-
 themes/cp_admin/podcast/notifications.php     |  60 +++---
 themes/cp_admin/podcast/platforms.php         |  94 ++++-----
 themes/cp_admin/podcast/publish.php           |   4 +-
 themes/cp_admin/subscription/email/edited.php |   2 +-
 .../cp_admin/subscription/email/welcome.php   |   2 +-
 themes/cp_admin/subscription/list.php         | 180 +++++++++---------
 themes/cp_app/_admin_navbar.php               | 138 +++++++-------
 themes/cp_app/_persons_modal.php              |  22 +--
 themes/cp_app/episode/_layout.php             |  31 +--
 .../episode/_partials/comment_actions.php     |  52 ++---
 .../_partials/comment_actions_from_post.php   |  64 +++----
 .../cp_app/episode/_partials/comment_card.php |  40 ++--
 .../_partials/comment_reply_actions.php       |  38 ++--
 themes/cp_app/episode/comment.php             |   6 +-
 themes/cp_app/home.php                        |  52 ++---
 themes/cp_app/pages/_layout.php               |  12 +-
 themes/cp_app/pages/map.php                   |  12 +-
 themes/cp_app/podcast/_layout.php             |  24 +--
 .../podcast/_partials/funding_links_modal.php |   8 +-
 .../podcast/_partials/premium_banner.php      |   4 +-
 themes/cp_app/podcast/_partials/sidebar.php   |  62 +++---
 themes/cp_app/podcast/about.php               |   7 +-
 themes/cp_app/podcast/episodes.php            |  30 +--
 themes/cp_app/post/_partials/actions.php      | 178 ++++++++---------
 .../post/_partials/post_with_replies.php      |  22 +--
 themes/cp_app/post/_partials/preview_card.php |  12 +-
 themes/cp_app/post/_partials/reblog.php       |  46 ++---
 .../cp_app/post/_partials/reply_actions.php   | 114 +++++------
 themes/cp_app/post/post.php                   |  18 +-
 themes/cp_auth/_layout.php                    |   8 +-
 themes/cp_auth/register.php                   |   8 +-
 themes/cp_install/cache_config.php            |  12 +-
 themes/cp_install/database_config.php         |   8 +-
 94 files changed, 987 insertions(+), 1104 deletions(-)

diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
index 317399c1..9e9a42d9 100644
--- a/.phpunit.cache/test-results
+++ b/.phpunit.cache/test-results
@@ -1 +1 @@
-{"version":1,"defects":[],"times":{"Tests\\Database\\ExampleDatabaseTest::testModelFindAll":0.003,"Tests\\Database\\ExampleDatabaseTest::testSoftDeleteLeavesRow":0.004,"modules\\Api\\Rest\\V1\\PodcastTest::testList":0.033,"modules\\Api\\Rest\\V1\\PodcastTest::testView":0.004,"modules\\Api\\Rest\\V1\\PodcastTest::testViewNotFound":0.01,"modules\\Api\\Rest\\V1\\PodcastTest::testListEmpty":4.313,"Tests\\Session\\ExampleSessionTest::testSessionSimple":0,"HealthTest::testIsDefinedAppPath":0,"HealthTest::testBaseUrlHasBeenSet":0.005}}
\ No newline at end of file
+{"version":1,"defects":[],"times":{"Tests\\Database\\ExampleDatabaseTest::testModelFindAll":0.002,"Tests\\Database\\ExampleDatabaseTest::testSoftDeleteLeavesRow":0.002,"modules\\Api\\Rest\\V1\\PodcastTest::testList":0.008,"modules\\Api\\Rest\\V1\\PodcastTest::testView":0.003,"modules\\Api\\Rest\\V1\\PodcastTest::testViewNotFound":0.002,"modules\\Api\\Rest\\V1\\PodcastTest::testListEmpty":0.633,"Tests\\Session\\ExampleSessionTest::testSessionSimple":0,"HealthTest::testIsDefinedAppPath":0,"HealthTest::testBaseUrlHasBeenSet":0.001}}
\ No newline at end of file
diff --git a/app/Config/Database.php b/app/Config/Database.php
index dbafc1f2..7871428c 100644
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -49,8 +49,6 @@ class Database extends Config
     /**
      * This database connection is used when running PHPUnit database tests.
      *
-     * @noRector StringClassNameToClassConstantRector
-     *
      * @var array<string, mixed>
      */
     public array $tests = [
@@ -84,7 +82,6 @@ class Database extends Config
         // Ensure that we always set the database group to 'tests' if
         // we are currently running an automated test suite, so that
         // we don't overwrite live data on accident.
-        /** @noRector RemoveAlwaysTrueIfConditionRector */
         if (ENVIRONMENT === 'testing') {
             $this->defaultGroup = 'tests';
         }
diff --git a/app/Config/Events.php b/app/Config/Events.php
index 6d7f32bb..30419869 100644
--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -7,6 +7,7 @@ namespace Config;
 use App\Entities\Actor;
 use App\Entities\Post;
 use App\Models\EpisodeModel;
+use CodeIgniter\Debug\Toolbar\Collectors\Database;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\FrameworkException;
 
@@ -47,7 +48,7 @@ Events::on('pre_system', static function () {
      * If you delete, they will no longer be collected.
      */
     if (CI_DEBUG && ! is_cli()) {
-        Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+        Events::on('DBQuery', Database::class . '::collect');
         Services::toolbar()->respond();
     }
 });
diff --git a/app/Config/Pager.php b/app/Config/Pager.php
index b98b2d8f..6579aad1 100644
--- a/app/Config/Pager.php
+++ b/app/Config/Pager.php
@@ -21,8 +21,6 @@ class Pager extends BaseConfig
      * and the desired group as $pagerGroup;
      *
      * @var array<string, string>
-     *
-     * @noRector Rector\Php55\Rector\String_\StringClassNameToClassConstantRector
      */
     public $templates = [
         'default_full' => 'App\Views\pager\default_full',
diff --git a/app/Config/Services.php b/app/Config/Services.php
index 3fa2e092..48a3554d 100644
--- a/app/Config/Services.php
+++ b/app/Config/Services.php
@@ -27,8 +27,6 @@ class Services extends BaseService
     /**
      * The Router class uses a RouteCollection's array of routes, and determines the correct Controller and Method to
      * execute.
-     *
-     * @noRector PHPStan\Reflection\MissingMethodFromReflectionException
      */
     public static function router(
         ?RouteCollectionInterface $routes = null,
@@ -48,8 +46,6 @@ class Services extends BaseService
     /**
      * The Negotiate class provides the content negotiation features for working the request to determine correct
      * language, encoding, charset, and more.
-     *
-     * @noRector PHPStan\Reflection\MissingMethodFromReflectionException
      */
     public static function negotiator(?RequestInterface $request = null, bool $getShared = true): Negotiate
     {
diff --git a/app/Controllers/ColorsController.php b/app/Controllers/ColorsController.php
index 50a44db8..87875a49 100644
--- a/app/Controllers/ColorsController.php
+++ b/app/Controllers/ColorsController.php
@@ -15,9 +15,6 @@ use CodeIgniter\HTTP\Response;
 
 class ColorsController extends Controller
 {
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function index(): Response
     {
         $cacheName = 'colors.css';
diff --git a/app/Controllers/EpisodeAudioController.php b/app/Controllers/EpisodeAudioController.php
index 8566c64a..6d2baf17 100644
--- a/app/Controllers/EpisodeAudioController.php
+++ b/app/Controllers/EpisodeAudioController.php
@@ -74,7 +74,7 @@ class EpisodeAudioController extends Controller
 
         if (
             ($episode = (new EpisodeModel())->getEpisodeBySlug($params[0], $params[1])) === null
-            ) {
+        ) {
             throw PageNotFoundException::forPageNotFound();
         }
 
diff --git a/app/Controllers/EpisodeCommentController.php b/app/Controllers/EpisodeCommentController.php
index 9aaf2b5a..9f0a67c8 100644
--- a/app/Controllers/EpisodeCommentController.php
+++ b/app/Controllers/EpisodeCommentController.php
@@ -55,7 +55,7 @@ class EpisodeCommentController extends BaseController
 
         if (
             ($episode = (new EpisodeModel())->getEpisodeBySlug($params[0], $params[1])) === null
-            ) {
+        ) {
             throw PageNotFoundException::forPageNotFound();
         }
 
@@ -120,9 +120,6 @@ class EpisodeCommentController extends BaseController
         return $cachedView;
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function commentObject(): Response
     {
         $commentObject = new CommentObject($this->comment);
@@ -132,9 +129,6 @@ class EpisodeCommentController extends BaseController
             ->setBody($commentObject->toJSON());
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function replies(): Response
     {
         /**
diff --git a/app/Controllers/EpisodeController.php b/app/Controllers/EpisodeController.php
index 5b59cf55..455006ae 100644
--- a/app/Controllers/EpisodeController.php
+++ b/app/Controllers/EpisodeController.php
@@ -51,7 +51,7 @@ class EpisodeController extends BaseController
 
         if (
             ($episode = (new EpisodeModel())->getEpisodeBySlug($params[0], $params[1])) === null
-            ) {
+        ) {
             throw PageNotFoundException::forPageNotFound();
         }
 
@@ -274,9 +274,6 @@ class EpisodeController extends BaseController
         return $this->response->setXML($oembed);
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function episodeObject(): Response
     {
         $podcastObject = new PodcastEpisode($this->episode);
@@ -286,9 +283,6 @@ class EpisodeController extends BaseController
             ->setBody($podcastObject->toJSON());
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function comments(): Response
     {
         /**
diff --git a/app/Controllers/PodcastController.php b/app/Controllers/PodcastController.php
index 06377d4b..7cc17a47 100644
--- a/app/Controllers/PodcastController.php
+++ b/app/Controllers/PodcastController.php
@@ -47,9 +47,6 @@ class PodcastController extends BaseController
         return $this->{$method}(...$params);
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function podcastActor(): Response
     {
         $podcastActor = new PodcastActor($this->podcast);
@@ -285,9 +282,6 @@ class PodcastController extends BaseController
         return $cachedView;
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function episodeCollection(): Response
     {
         if ($this->podcast->type === 'serial') {
diff --git a/app/Controllers/PostController.php b/app/Controllers/PostController.php
index b2bf8e8d..285603fe 100644
--- a/app/Controllers/PostController.php
+++ b/app/Controllers/PostController.php
@@ -45,7 +45,7 @@ class PostController extends FediversePostController
     public function _remap(string $method, string ...$params): mixed
     {
         if (
-            ($podcast = (new PodcastModel())->getPodcastByHandle($params[0],)) === null
+            ($podcast = (new PodcastModel())->getPodcastByHandle($params[0])) === null
         ) {
             throw PageNotFoundException::forPageNotFound();
         }
diff --git a/app/Entities/Category.php b/app/Entities/Category.php
index d7f57736..fd9ec35e 100644
--- a/app/Entities/Category.php
+++ b/app/Entities/Category.php
@@ -36,9 +36,6 @@ class Category extends Entity
         'google_category' => 'string',
     ];
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function getParent(): ?self
     {
         if ($this->parent_id === null) {
diff --git a/app/Entities/Credit.php b/app/Entities/Credit.php
index dc12349d..358578b6 100644
--- a/app/Entities/Credit.php
+++ b/app/Entities/Credit.php
@@ -92,9 +92,6 @@ class Credit extends Entity
         return $this->episode;
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function getGroupLabel(): string
     {
         if ($this->person_group === null) {
@@ -104,9 +101,6 @@ class Credit extends Entity
         return lang("PersonsTaxonomy.persons.{$this->person_group}.label");
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function getRoleLabel(): string
     {
         if ($this->person_group === '') {
diff --git a/app/Entities/Episode.php b/app/Entities/Episode.php
index 12c20281..cf1fd027 100644
--- a/app/Entities/Episode.php
+++ b/app/Entities/Episode.php
@@ -450,7 +450,7 @@ class Episode extends Entity
     public function getEmbedUrl(string $theme = null): string
     {
         return $theme
-                ? url_to('embed-theme', esc($this->getPodcast()->handle), esc($this->attributes['slug']), $theme,)
+                ? url_to('embed-theme', esc($this->getPodcast()->handle), esc($this->attributes['slug']), $theme)
                 : url_to('embed', esc($this->getPodcast()->handle), esc($this->attributes['slug']));
     }
 
diff --git a/app/Entities/EpisodeComment.php b/app/Entities/EpisodeComment.php
index 95deefb4..561f7d0b 100644
--- a/app/Entities/EpisodeComment.php
+++ b/app/Entities/EpisodeComment.php
@@ -87,8 +87,6 @@ class EpisodeComment extends UuidEntity
 
     /**
      * Returns the comment's actor
-     *
-     * @noRector ReturnTypeDeclarationRector
      */
     public function getActor(): ?Actor
     {
@@ -125,9 +123,6 @@ class EpisodeComment extends UuidEntity
         return $this->getReplies() !== [];
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function getReplyToComment(): ?self
     {
         if ($this->in_reply_to_id === null) {
diff --git a/app/Entities/Podcast.php b/app/Entities/Podcast.php
index b9fb35a8..47c62e4d 100644
--- a/app/Entities/Podcast.php
+++ b/app/Entities/Podcast.php
@@ -215,9 +215,6 @@ class Podcast extends Entity
         return '@' . $this->handle;
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function getActor(): ?Actor
     {
         if ($this->actor_id === 0) {
diff --git a/app/Helpers/form_helper.php b/app/Helpers/form_helper.php
index 85808f64..68238513 100644
--- a/app/Helpers/form_helper.php
+++ b/app/Helpers/form_helper.php
@@ -61,7 +61,7 @@ if (! function_exists('parse_form_attributes')) {
                 }
             }
 
-            if (! empty($attributes)) {
+            if ($attributes !== []) {
                 $default = array_merge($default, $attributes);
             }
         }
diff --git a/app/Helpers/misc_helper.php b/app/Helpers/misc_helper.php
index 22dbd172..e4a5dc93 100644
--- a/app/Helpers/misc_helper.php
+++ b/app/Helpers/misc_helper.php
@@ -239,7 +239,6 @@ if (! function_exists('generate_random_salt')) {
 
 
 if (! function_exists('file_upload_max_size')) {
-
     /**
      * Returns a file size limit in bytes based on the PHP upload_max_filesize and post_max_size Adapted from:
      * https://stackoverflow.com/a/25370978
diff --git a/app/Helpers/rss_helper.php b/app/Helpers/rss_helper.php
index 28d81e31..c4329f77 100644
--- a/app/Helpers/rss_helper.php
+++ b/app/Helpers/rss_helper.php
@@ -125,7 +125,7 @@ if (! function_exists('get_rss_feed')) {
         $castopodSocialElement->addAttribute('accountUrl', $podcast->link);
 
         foreach ($podcast->social_platforms as $socialPlatform) {
-            $socialElement = $channel->addChild('social', null, $podcastNamespace,);
+            $socialElement = $channel->addChild('social', null, $podcastNamespace);
             $socialElement->addAttribute('priority', '2');
             $socialElement->addAttribute('platform', $socialPlatform->slug);
 
@@ -202,7 +202,7 @@ if (! function_exists('get_rss_feed')) {
 
         foreach ($podcast->persons as $person) {
             foreach ($person->roles as $role) {
-                $personElement = $channel->addChild('person', $person->full_name, $podcastNamespace,);
+                $personElement = $channel->addChild('person', $person->full_name, $podcastNamespace);
 
                 $personElement->addAttribute('img', $person->avatar->medium_url);
 
@@ -294,7 +294,7 @@ if (! function_exists('get_rss_feed')) {
             $item->addChild('guid', $episode->guid);
             $item->addChild('pubDate', $episode->published_at->format(DATE_RFC1123));
             if ($episode->location !== null) {
-                $locationElement = $item->addChild('location', $episode->location->name, $podcastNamespace,);
+                $locationElement = $item->addChild('location', $episode->location->name, $podcastNamespace);
                 if ($episode->location->geo !== null) {
                     $locationElement->addAttribute('geo', $episode->location->geo);
                 }
@@ -376,11 +376,11 @@ if (! function_exists('get_rss_feed')) {
 
             foreach ($episode->persons as $person) {
                 foreach ($person->roles as $role) {
-                    $personElement = $item->addChild('person', esc($person->full_name), $podcastNamespace,);
+                    $personElement = $item->addChild('person', esc($person->full_name), $podcastNamespace);
 
                     $personElement->addAttribute(
                         'role',
-                        esc(lang("PersonsTaxonomy.persons.{$role->group}.roles.{$role->role}.label", [], 'en'),),
+                        esc(lang("PersonsTaxonomy.persons.{$role->group}.roles.{$role->role}.label", [], 'en')),
                     );
 
                     $personElement->addAttribute(
diff --git a/app/Libraries/Router.php b/app/Libraries/Router.php
index f42f7491..6bb71997 100644
--- a/app/Libraries/Router.php
+++ b/app/Libraries/Router.php
@@ -30,7 +30,6 @@ class Router extends CodeIgniterRouter
      */
     protected function checkRoutes(string $uri): bool
     {
-        /** @noRector RemoveExtraParametersRector */
         $routes = $this->collection->getRoutes($this->collection->getHTTPVerb());
 
         // Don't waste any time
diff --git a/app/Libraries/TranscriptParser.php b/app/Libraries/TranscriptParser.php
index c54fec4e..b0f7f364 100644
--- a/app/Libraries/TranscriptParser.php
+++ b/app/Libraries/TranscriptParser.php
@@ -86,7 +86,6 @@ class TranscriptParser
                     }
 
                     break;
-
             }
         }
 
diff --git a/app/Libraries/Vite/Vite.php b/app/Libraries/Vite/Vite.php
index e85a3b5b..57d7ddc0 100644
--- a/app/Libraries/Vite/Vite.php
+++ b/app/Libraries/Vite/Vite.php
@@ -70,7 +70,6 @@ class Vite
             if (array_key_exists('imports', $manifestElement)) {
                 foreach ($manifestElement['imports'] as $importPath) {
                     if (array_key_exists($importPath, $this->manifestData)) {
-                        
                         // import css dependencies if any
                         if (array_key_exists('css', $this->manifestData[$importPath])) {
                             foreach ($this->manifestData[$importPath]['css'] as $cssFile) {
@@ -98,11 +97,11 @@ class Vite
             'css' => <<<CODE_SAMPLE
                 <link rel="stylesheet" href="{$assetUrl}"/>
             CODE_SAMPLE
-,
+            ,
             'js' => <<<CODE_SAMPLE
                     <script type="module" src="{$assetUrl}"></script>
                 CODE_SAMPLE
-,
+            ,
             default => '',
         };
     }
diff --git a/app/Models/ClipModel.php b/app/Models/ClipModel.php
index d4e01dcf..cd52b043 100644
--- a/app/Models/ClipModel.php
+++ b/app/Models/ClipModel.php
@@ -53,9 +53,6 @@ class ClipModel extends Model
         'job_ended_at',
     ];
 
-    /**
-     * @noRector
-     */
     protected $returnType = BaseClip::class;
 
     /**
diff --git a/app/Models/EpisodeCommentModel.php b/app/Models/EpisodeCommentModel.php
index 2c35b0c7..91479f09 100644
--- a/app/Models/EpisodeCommentModel.php
+++ b/app/Models/EpisodeCommentModel.php
@@ -195,8 +195,6 @@ class EpisodeCommentModel extends UuidModel
      * Retrieves all published posts for a given episode ordered by publication date
      *
      * @return EpisodeComment[]
-     *
-     * @noRector ReturnTypeDeclarationRector
      */
     public function getEpisodeComments(int $episodeId): array
     {
diff --git a/app/Models/MediaModel.php b/app/Models/MediaModel.php
index 7acb9608..c35263ba 100644
--- a/app/Models/MediaModel.php
+++ b/app/Models/MediaModel.php
@@ -28,9 +28,6 @@ class MediaModel extends Model
      */
     protected $table = 'media';
 
-    /**
-     * @noRector
-     */
     protected $returnType = Document::class;
 
     /**
@@ -135,8 +132,6 @@ class MediaModel extends Model
 
     /**
      * @param Document|Audio|Video|Image|Transcript|Chapters $media
-     *
-     * @noRector ReturnTypeDeclarationRector
      */
     public function saveMedia(object $media): int | false
     {
@@ -150,8 +145,6 @@ class MediaModel extends Model
 
     /**
      * @param Document|Audio|Video|Image|Transcript|Chapters $media
-     *
-     * @noRector ReturnTypeDeclarationRector
      */
     public function updateMedia(object $media): bool
     {
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index e0723098..99ce24a0 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -70,7 +70,7 @@ $error_id = uniqid('error', true); ?>
                                 } else {
                                     echo esc(clean_path($row['file']) . ' : ' . $row['line']);
                                 }
-                                ?>
+				    ?>
 							<?php else : ?>
 								{PHP internal code}
 							<?php endif; ?>
@@ -85,14 +85,14 @@ $error_id = uniqid('error', true); ?>
 										<table cellspacing="0">
 
 										<?php
-                                        $params = null;
-                                        // Reflection by name is not available for closure function
-                                        if (substr($row['function'], -1) !== '}') {
-                                            $mirror = isset($row['class']) ? new \ReflectionMethod($row['class'], $row['function']) : new \ReflectionFunction($row['function']);
-                                            $params = $mirror->getParameters();
-                                        }
+				            $params = null;
+								    // Reflection by name is not available for closure function
+								    if (substr($row['function'], -1) !== '}') {
+								        $mirror = isset($row['class']) ? new \ReflectionMethod($row['class'], $row['function']) : new \ReflectionFunction($row['function']);
+								        $params = $mirror->getParameters();
+								    }
 
-                                        foreach ($row['args'] as $key => $value) : ?>
+								    foreach ($row['args'] as $key => $value) : ?>
 											<tr>
 												<td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
 												<td><pre><?= esc(print_r($value, true)) ?></pre></td>
@@ -310,8 +310,8 @@ $error_id = uniqid('error', true); ?>
 			<!-- Response -->
 			<?php
                 $response = \Config\Services::response();
-                $response->setStatusCode(http_response_code());
-            ?>
+$response->setStatusCode(http_response_code());
+?>
 			<div class="content" id="response">
 				<table>
 					<tr>
diff --git a/app/Views/pager/default_full.php b/app/Views/pager/default_full.php
index 7d942e38..e82fefa8 100644
--- a/app/Views/pager/default_full.php
+++ b/app/Views/pager/default_full.php
@@ -11,18 +11,18 @@ $pager->setSurroundCount(2);
         <?php if ($pager->hasPreviousPage()): ?>
             <li>
                 <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang(
-    'Pager.first',
-) ?>"  class="block px-3 py-2 text-skin-muted hover:bg-highlight">
+                    'Pager.first',
+                ) ?>"  class="block px-3 py-2 text-skin-muted hover:bg-highlight">
                     <span aria-hidden="true"><?= lang('Pager.first') ?></span>
                 </a>
             </li>
             <li>
                 <a href="<?= $pager->getPreviousPage() ?>" aria-label="<?= lang(
-    'Pager.previous',
-) ?>" class="block px-3 py-2 text-skin-muted hover:bg-highlight">
+                    'Pager.previous',
+                ) ?>" class="block px-3 py-2 text-skin-muted hover:bg-highlight">
                     <span aria-hidden="true"><?= lang(
-    'Pager.previous',
-) ?></span>
+                        'Pager.previous',
+                    ) ?></span>
                 </a>
             </li>
         <?php endif; ?>
@@ -34,9 +34,7 @@ $pager->setSurroundCount(2);
                         <?= $link['title'] ?>
                     </span>
                 <?php else: ?>
-                    <a href="<?= $link[
-                        'uri'
-                    ] ?>" class="block px-4 py-2 rounded-full text-skin-muted hover:bg-highlight">
+                    <a href="<?= $link['uri'] ?>" class="block px-4 py-2 rounded-full text-skin-muted hover:bg-highlight">
                         <?= $link['title'] ?>
                     </a>
                 <?php endif; ?>
@@ -46,15 +44,15 @@ $pager->setSurroundCount(2);
         <?php if ($pager->hasNextPage()): ?>
             <li>
                 <a href="<?= $pager->getNextPage() ?>" aria-label="<?= lang(
-                        'Pager.next',
-                    ) ?>" class="block px-3 py-2 text-skin-muted hover:bg-highlight">
+                    'Pager.next',
+                ) ?>" class="block px-3 py-2 text-skin-muted hover:bg-highlight">
                     <span aria-hidden="true"><?= lang('Pager.next') ?></span>
                 </a>
             </li>
             <li>
                 <a href="<?= $pager->getLast() ?>" aria-label="<?= lang(
-                        'Pager.last',
-                    ) ?>" class="block px-3 py-2 text-skin-muted hover:bg-highlight">
+                    'Pager.last',
+                ) ?>" class="block px-3 py-2 text-skin-muted hover:bg-highlight">
                     <span aria-hidden="true"><?= lang('Pager.last') ?></span>
                 </a>
             </li>
diff --git a/modules/Admin/Controllers/PodcastPlatformController.php b/modules/Admin/Controllers/PodcastPlatformController.php
index 82cdfc77..46a94c9c 100644
--- a/modules/Admin/Controllers/PodcastPlatformController.php
+++ b/modules/Admin/Controllers/PodcastPlatformController.php
@@ -89,7 +89,7 @@ class PodcastPlatformController extends BaseController
                     array_key_exists('visible', $podcastPlatform) &&
                     $podcastPlatform['visible'] === 'yes',
                 'is_on_embed' =>
-                    array_key_exists('on_embed', $podcastPlatform,) && $podcastPlatform['on_embed'] === 'yes',
+                    array_key_exists('on_embed', $podcastPlatform) && $podcastPlatform['on_embed'] === 'yes',
             ];
         }
 
diff --git a/modules/Admin/Controllers/SchedulerController.php b/modules/Admin/Controllers/SchedulerController.php
index d13a29e4..9246557b 100644
--- a/modules/Admin/Controllers/SchedulerController.php
+++ b/modules/Admin/Controllers/SchedulerController.php
@@ -47,7 +47,6 @@ class SchedulerController extends Controller
         // Loop through clips to generate them
         foreach ($scheduledClips as $scheduledClip) {
             try {
-
                 // set clip to pending
                 (new ClipModel())
                     ->update($scheduledClip->id, [
diff --git a/modules/Admin/Controllers/SoundbiteController.php b/modules/Admin/Controllers/SoundbiteController.php
index e389e645..020785b7 100644
--- a/modules/Admin/Controllers/SoundbiteController.php
+++ b/modules/Admin/Controllers/SoundbiteController.php
@@ -117,7 +117,7 @@ class SoundbiteController extends BaseController
         $newSoundbite = new Soundbite([
             'title' => $this->request->getPost('title'),
             'start_time' => (float) $this->request->getPost('start_time'),
-            'duration' => (float) $this->request->getPost('duration',),
+            'duration' => (float) $this->request->getPost('duration'),
             'type' => 'audio',
             'status' => '',
             'podcast_id' => $this->podcast->id,
diff --git a/modules/Admin/Controllers/VideoClipsController.php b/modules/Admin/Controllers/VideoClipsController.php
index 02ab95cf..cac087e5 100644
--- a/modules/Admin/Controllers/VideoClipsController.php
+++ b/modules/Admin/Controllers/VideoClipsController.php
@@ -165,7 +165,7 @@ class VideoClipsController extends BaseController
         $videoClip = new VideoClip([
             'title' => $this->request->getPost('title'),
             'start_time' => (float) $this->request->getPost('start_time'),
-            'duration' => (float) $this->request->getPost('duration',),
+            'duration' => (float) $this->request->getPost('duration'),
             'theme' => $theme,
             'format' => $this->request->getPost('format'),
             'type' => 'video',
diff --git a/modules/Analytics/Config/Routes.php b/modules/Analytics/Config/Routes.php
index 0526f1d8..d6399e9d 100644
--- a/modules/Analytics/Config/Routes.php
+++ b/modules/Analytics/Config/Routes.php
@@ -57,8 +57,8 @@ $routes->group('', [
     /**
      * @deprecated Route for podcast audio file analytics (/audio/pack(podcast_id,episode_id,bytes_threshold,filesize,duration,date)/podcast_folder/filename.mp3)
      */
-    $routes->head('audio/(:base64)/(:any)', 'EpisodeAnalyticsController::hit/$1/$2',);
-    $routes->get('audio/(:base64)/(:any)', 'EpisodeAnalyticsController::hit/$1/$2',);
+    $routes->head('audio/(:base64)/(:any)', 'EpisodeAnalyticsController::hit/$1/$2');
+    $routes->get('audio/(:base64)/(:any)', 'EpisodeAnalyticsController::hit/$1/$2');
 });
 
 // Show the Unknown UserAgents
diff --git a/modules/Analytics/Entities/AnalyticsPodcastsByCountry.php b/modules/Analytics/Entities/AnalyticsPodcastsByCountry.php
index 30b9dfb5..60f9883d 100644
--- a/modules/Analytics/Entities/AnalyticsPodcastsByCountry.php
+++ b/modules/Analytics/Entities/AnalyticsPodcastsByCountry.php
@@ -39,9 +39,6 @@ class AnalyticsPodcastsByCountry extends Entity
         'hits' => 'integer',
     ];
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function getLabels(): string
     {
         return lang('Countries.' . $this->attributes['labels']);
diff --git a/modules/Analytics/Entities/AnalyticsPodcastsByRegion.php b/modules/Analytics/Entities/AnalyticsPodcastsByRegion.php
index 5de71693..d359890e 100644
--- a/modules/Analytics/Entities/AnalyticsPodcastsByRegion.php
+++ b/modules/Analytics/Entities/AnalyticsPodcastsByRegion.php
@@ -44,9 +44,6 @@ class AnalyticsPodcastsByRegion extends Entity
         'hits' => 'integer',
     ];
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function getCountryCode(): string
     {
         return lang('Countries.' . $this->attributes['country_code']);
diff --git a/modules/Fediverse/Controllers/ActivityPubController.php b/modules/Fediverse/Controllers/ActivityPubController.php
index fe94c9a1..d8fbbe86 100644
--- a/modules/Fediverse/Controllers/ActivityPubController.php
+++ b/modules/Fediverse/Controllers/ActivityPubController.php
@@ -15,9 +15,6 @@ use CodeIgniter\HTTP\Response;
 
 class ActivityPubController extends Controller
 {
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function preflight(): Response
     {
         return $this->response->setHeader('Access-Control-Allow-Origin', '*') // for allowing any domain, insecure
diff --git a/modules/Fediverse/Controllers/ActorController.php b/modules/Fediverse/Controllers/ActorController.php
index bf232890..e84250c4 100644
--- a/modules/Fediverse/Controllers/ActorController.php
+++ b/modules/Fediverse/Controllers/ActorController.php
@@ -56,9 +56,6 @@ class ActorController extends Controller
         return $this->{$method}(...$params);
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function index(): ResponseInterface
     {
         $actorObjectClass = $this->config->actorObject;
@@ -71,8 +68,6 @@ class ActorController extends Controller
 
     /**
      * Handles incoming requests from fediverse servers
-     *
-     * @noRector ReturnTypeDeclarationRector
      */
     public function inbox(): ResponseInterface
     {
@@ -264,9 +259,6 @@ class ActorController extends Controller
         }
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function outbox(): ResponseInterface
     {
         // get published activities by publication date
@@ -297,9 +289,6 @@ class ActorController extends Controller
             ->setBody($collection->toJSON());
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function followers(): ResponseInterface
     {
         $tablesPrefix = config('Fediverse')
@@ -386,9 +375,6 @@ class ActorController extends Controller
         );
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function activity(string $activityId): ResponseInterface
     {
         if (
diff --git a/modules/Fediverse/Controllers/PostController.php b/modules/Fediverse/Controllers/PostController.php
index a00efb83..bf8d1b16 100644
--- a/modules/Fediverse/Controllers/PostController.php
+++ b/modules/Fediverse/Controllers/PostController.php
@@ -53,9 +53,6 @@ class PostController extends Controller
         return $this->{$method}(...$params);
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function index(): Response
     {
         $noteObjectClass = $this->config->noteObject;
@@ -66,9 +63,6 @@ class PostController extends Controller
             ->setBody($noteObject->toJSON());
     }
 
-    /**
-     * @noRector ReturnTypeDeclarationRector
-     */
     public function replies(): Response
     {
         /**
diff --git a/modules/Fediverse/Models/PostModel.php b/modules/Fediverse/Models/PostModel.php
index 2dec8b49..70ab5563 100644
--- a/modules/Fediverse/Models/PostModel.php
+++ b/modules/Fediverse/Models/PostModel.php
@@ -539,7 +539,7 @@ class PostModel extends BaseUuidModel
                 ->first();
 
             $announceActivity = new AnnounceActivity($reblogPost);
-            $announceActivity->set('id', url_to('activity', $reblogPost->actor->username, $activity->id),);
+            $announceActivity->set('id', url_to('activity', $reblogPost->actor->username, $activity->id));
 
             $undoActivity
                 ->set('actor', $reblogPost->actor->uri)
diff --git a/modules/Install/Controllers/InstallController.php b/modules/Install/Controllers/InstallController.php
index 20cbc056..b9b88922 100644
--- a/modules/Install/Controllers/InstallController.php
+++ b/modules/Install/Controllers/InstallController.php
@@ -115,19 +115,13 @@ class InstallController extends Controller
         }
 
         try {
-            $db = db_connect();
-
             // Check if instance owner has been created, meaning install was completed
-            if (
-                $db->tableExists('users') &&
-                (new UserModel())->where('is_owner', true)
-                    ->first() !== null
-                ) {
+            if ((new UserModel())->where('is_owner', true)
+                ->first() !== null
+            ) {
                 // if so, show a 404 page
                 throw PageNotFoundException::forPageNotFound();
             }
-
-            /** @noRector */
         } catch (DatabaseException) {
             // Could not connect to the database
             // show database config view to fix value
diff --git a/modules/PremiumPodcasts/Models/SubscriptionModel.php b/modules/PremiumPodcasts/Models/SubscriptionModel.php
index 5f79271a..ec5eb4eb 100644
--- a/modules/PremiumPodcasts/Models/SubscriptionModel.php
+++ b/modules/PremiumPodcasts/Models/SubscriptionModel.php
@@ -42,9 +42,6 @@ class SubscriptionModel extends Model
         'updated_by',
     ];
 
-    /**
-     * @noRector
-     */
     protected $returnType = Subscription::class;
 
     /**
diff --git a/modules/WebSub/Controllers/WebSubController.php b/modules/WebSub/Controllers/WebSubController.php
index 11a0a2d7..0ca59e9c 100644
--- a/modules/WebSub/Controllers/WebSubController.php
+++ b/modules/WebSub/Controllers/WebSubController.php
@@ -20,7 +20,6 @@ class WebSubController extends Controller
 {
     public function publish(): void
     {
-        /** @noRector RemoveAlwaysTrueIfConditionRector */
         if (ENVIRONMENT !== 'production') {
             return;
         }
diff --git a/tests/modules/Api/Rest/V1/PodcastTest.php b/tests/modules/Api/Rest/V1/PodcastTest.php
index 6131ad90..d7e926a1 100644
--- a/tests/modules/Api/Rest/V1/PodcastTest.php
+++ b/tests/modules/Api/Rest/V1/PodcastTest.php
@@ -46,12 +46,9 @@ class PodcastTest extends CIUnitTestCase
 
     private readonly string $podcastApiUrl;
 
-    /**
-     * @param array<mixed> $data
-     */
-    public function __construct(?string $name = null, array $data = [], $dataName = '')
+    public function __construct(?string $name = null)
     {
-        parent::__construct($name, $data, $dataName);
+        parent::__construct($name);
         $this->podcast = FakeSinglePodcastApiSeeder::podcast();
         $this->podcast['created_at'] = [];
         $this->podcast['updated_at'] = [];
diff --git a/themes/cp_admin/_partials/_nav_header.php b/themes/cp_admin/_partials/_nav_header.php
index d3ec1f3c..279bd1d2 100644
--- a/themes/cp_admin/_partials/_nav_header.php
+++ b/themes/cp_admin/_partials/_nav_header.php
@@ -8,13 +8,13 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
         class="h-full pr-1 text-xl md:hidden focus:ring-accent focus:ring-inset" aria-label="<?= lang('Navigation.toggle_sidebar') ?>"><?= icon('menu') ?></button>
     <div class="inline-flex items-center h-full">
         <a href="<?= route_to(
-    'admin',
-) ?>" class="inline-flex items-center h-full px-2 border-r border-navigation focus:ring-inset focus:ring-accent">
+            'admin',
+        ) ?>" class="inline-flex items-center h-full px-2 border-r border-navigation focus:ring-inset focus:ring-accent">
             <?= (isset($podcast) ? icon('arrow-left', 'mr-2') : '') . svg('castopod-logo-base', 'h-6') ?>
         </a>
         <a href="<?= route_to(
-    'home',
-) ?>" class="inline-flex items-center h-full px-6 text-sm font-semibold hover:underline focus:ring-inset focus:ring-accent">
+            'home',
+        ) ?>" class="inline-flex items-center h-full px-6 text-sm font-semibold hover:underline focus:ring-inset focus:ring-accent">
                 <?= lang('Navigation.go_to_website') ?>
                 <?= icon('external-link', 'ml-1 opacity-60') ?>
         </a>
@@ -27,26 +27,26 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
             <?php endif ?>
         </button>
         <?php
-            $notificationsTitle = lang('Notifications.title');
+                    $notificationsTitle = lang('Notifications.title');
 
-            $items = [
-                [
-                    'type' => 'html',
-                    'content' => esc(<<<CODE_SAMPLE
+$items = [
+    [
+        'type' => 'html',
+        'content' => esc(<<<CODE_SAMPLE
                         <span class="px-4 my-2 text-xs font-semibold tracking-wider uppercase text-skin-muted">{$notificationsTitle}</span>
                         CODE_SAMPLE),
-                ],
-            ];
+    ],
+];
 
-            if ($userPodcasts !== []) {
-                foreach ($userPodcasts as $userPodcast) {
-                    $userPodcastTitle = esc($userPodcast->title);
+if ($userPodcasts !== []) {
+    foreach ($userPodcasts as $userPodcast) {
+        $userPodcastTitle = esc($userPodcast->title);
 
-                    $unreadNotificationDotDisplayClass = in_array($userPodcast->actor_id, $actorIdsWithUnreadNotifications, true) ? '' : 'hidden';
+        $unreadNotificationDotDisplayClass = in_array($userPodcast->actor_id, $actorIdsWithUnreadNotifications, true) ? '' : 'hidden';
 
-                    $items[] = [
-                        'type' => 'link',
-                        'title' => <<<CODE_SAMPLE
+        $items[] = [
+            'type' => 'link',
+            'title' => <<<CODE_SAMPLE
                             <div class="inline-flex items-center flex-1 text-sm align-middle">
                                 <div class="relative">
                                     <img src="{$userPodcast->cover->tiny_url}" class="w-6 h-6 mr-2 rounded-full" loading="lazy" />
@@ -55,20 +55,20 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
                                 <span class="max-w-xs truncate">{$userPodcastTitle}</span>
                             </div>
                         CODE_SAMPLE
-                        ,
-                        'uri' => route_to('notification-list', $userPodcast->id),
-                    ];
-                }
-            } else {
-                $noNotificationsText = lang('Notifications.no_notifications');
-                $items[] = [
-                    'type' => 'html',
-                    'content' => esc(<<<CODE_SAMPLE
+            ,
+            'uri' => route_to('notification-list', $userPodcast->id),
+        ];
+    }
+} else {
+    $noNotificationsText = lang('Notifications.no_notifications');
+    $items[] = [
+        'type' => 'html',
+        'content' => esc(<<<CODE_SAMPLE
                         <span class="mx-4 my-2 text-sm italic text-center text-skin-muted">{$noNotificationsText}</span>
                     CODE_SAMPLE),
-                ];
-            }
-        ?>
+    ];
+}
+?>
         <DropdownMenu id="notifications-dropdown-menu" labelledby="notifications-dropdown" items="<?= esc(json_encode($items)) ?>" placement="bottom"/>
 
         <button
@@ -86,48 +86,48 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
             <?= icon('caret-down', 'ml-auto text-2xl') ?></button>
     </div>
     <?php
-        $interactButtons = '';
-        foreach ($userPodcasts as $userPodcast) {
-            $checkMark = interact_as_actor_id() === $userPodcast->actor_id ? icon('check', 'ml-2 bg-accent-base text-accent-contrast rounded-full') : '';
-            $userPodcastTitle = esc($userPodcast->title);
+$interactButtons = '';
+foreach ($userPodcasts as $userPodcast) {
+    $checkMark = interact_as_actor_id() === $userPodcast->actor_id ? icon('check', 'ml-2 bg-accent-base text-accent-contrast rounded-full') : '';
+    $userPodcastTitle = esc($userPodcast->title);
 
-            $interactButtons .= <<<CODE_SAMPLE
+    $interactButtons .= <<<CODE_SAMPLE
                 <button class="inline-flex items-center w-full px-4 py-1 hover:bg-highlight" id="interact-as-actor-{$userPodcast->id}" name="actor_id" value="{$userPodcast->actor_id}">
                     <div class="inline-flex items-center flex-1 text-sm"><img src="{$userPodcast->cover->tiny_url}" class="w-6 h-6 mr-2 rounded-full" loading="lazy" /><span class="max-w-xs truncate">{$userPodcastTitle}</span>{$checkMark}</div>
                 </button>
             CODE_SAMPLE;
-        }
+}
 
-        $interactAsText = lang('Common.choose_interact');
-        $interactAsRoute = route_to('interact-as-actor');
-        $csrfField = csrf_field();
+$interactAsText = lang('Common.choose_interact');
+$interactAsRoute = route_to('interact-as-actor');
+$csrfField = csrf_field();
 
-        $menuItems = [
-            [
-                'type' => 'link',
-                'title' => lang('Navigation.account.my-account'),
-                'uri' => route_to('my-account'),
-            ],
-            [
-                'type' => 'link',
-                'title' => lang('Navigation.account.change-password'),
-                'uri' => route_to('change-password'),
-            ],
-            [
-                'type' => 'separator',
-            ],
-            [
-                'type' => 'link',
-                'title' => lang('Navigation.account.logout'),
-                'uri' => route_to('logout'),
-            ],
-        ];
+$menuItems = [
+    [
+        'type' => 'link',
+        'title' => lang('Navigation.account.my-account'),
+        'uri' => route_to('my-account'),
+    ],
+    [
+        'type' => 'link',
+        'title' => lang('Navigation.account.change-password'),
+        'uri' => route_to('change-password'),
+    ],
+    [
+        'type' => 'separator',
+    ],
+    [
+        'type' => 'link',
+        'title' => lang('Navigation.account.logout'),
+        'uri' => route_to('logout'),
+    ],
+];
 
-        if ($userPodcasts !== []) {
-            $menuItems = array_merge([
-                [
-                    'type' => 'html',
-                    'content' => esc(<<<CODE_SAMPLE
+if ($userPodcasts !== []) {
+    $menuItems = array_merge([
+        [
+            'type' => 'html',
+            'content' => esc(<<<CODE_SAMPLE
                         <nav class="flex flex-col py-2 whitespace-nowrap">
                             <span class="px-4 mb-2 text-xs font-semibold tracking-wider uppercase text-skin-muted">{$interactAsText}</span>
                             <form action="{$interactAsRoute}" method="POST" class="flex flex-col">
@@ -136,12 +136,12 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
                             </form>
                         </nav>
                     CODE_SAMPLE),
-                ],
-                [
-                    'type' => 'separator',
-                ],
-            ], $menuItems);
-        }
-    ?>
+        ],
+        [
+            'type' => 'separator',
+        ],
+    ], $menuItems);
+}
+?>
     <DropdownMenu id="my-account-dropdown-menu" labelledby="my-account-dropdown" items="<?= esc(json_encode($menuItems)) ?>" />
 </header>
\ No newline at end of file
diff --git a/themes/cp_admin/episode/_card.php b/themes/cp_admin/episode/_card.php
index c46b30ae..eac048ef 100644
--- a/themes/cp_admin/episode/_card.php
+++ b/themes/cp_admin/episode/_card.php
@@ -53,23 +53,23 @@
             'type' => 'separator',
         ],
     ];
-    if ($episode->published_at === null) {
-        $items[] = [
-            'type' => 'link',
-            'title' => lang('Episode.delete'),
-            'uri' => route_to('episode-delete', $episode->podcast->id, $episode->id),
-            'class' => 'font-semibold text-red-600',
-        ];
-    } else {
-        $label = lang('Episode.delete');
-        $icon = icon('forbid', 'mr-2');
-        $title = lang('Episode.messages.unpublishBeforeDeleteTip');
-        $items[] = [
-            'type' => 'html',
-            'content' => esc(<<<CODE_SAMPLE
+if ($episode->published_at === null) {
+    $items[] = [
+        'type' => 'link',
+        'title' => lang('Episode.delete'),
+        'uri' => route_to('episode-delete', $episode->podcast->id, $episode->id),
+        'class' => 'font-semibold text-red-600',
+    ];
+} else {
+    $label = lang('Episode.delete');
+    $icon = icon('forbid', 'mr-2');
+    $title = lang('Episode.messages.unpublishBeforeDeleteTip');
+    $items[] = [
+        'type' => 'html',
+        'content' => esc(<<<CODE_SAMPLE
                     <span class="inline-flex items-center px-4 py-1 font-semibold text-gray-400 cursor-not-allowed" data-tooltip="bottom" title="{$title}">{$icon}{$label}</span>
                 CODE_SAMPLE),
-        ];
-    } ?>
+    ];
+} ?>
     <DropdownMenu id="more-dropdown-<?= $episode->id ?>-menu" labelledby="more-dropdown-<?= $episode->id ?>" offsetY="-32" items="<?= esc(json_encode($items)) ?>" />
 </article>
\ No newline at end of file
diff --git a/themes/cp_admin/episode/_sidebar.php b/themes/cp_admin/episode/_sidebar.php
index fc3291e8..fe675faf 100644
--- a/themes/cp_admin/episode/_sidebar.php
+++ b/themes/cp_admin/episode/_sidebar.php
@@ -34,12 +34,12 @@ $podcastNavigation = [
     <div class="flex flex-col items-start flex-1 w-48 px-2">
         <span class="w-full font-semibold truncate" title="<?= esc($episode->title) ?>"><?= esc($episode->title) ?></span>
         <a href="<?= route_to(
-    'episode',
-    esc($podcast->handle),
-    esc($episode->slug),
-) ?>" class="inline-flex items-center text-xs hover:underline focus:ring-accent"><?= lang(
-    'EpisodeNavigation.go_to_page',
-) ?>
+            'episode',
+            esc($podcast->handle),
+            esc($episode->slug),
+        ) ?>" class="inline-flex items-center text-xs hover:underline focus:ring-accent"><?= lang(
+            'EpisodeNavigation.go_to_page',
+        ) ?>
         <?= icon('external-link', 'ml-1 opacity-60') ?>
         </a>
     </div>
@@ -49,19 +49,19 @@ $podcastNavigation = [
     <div>
         <button class="inline-flex items-center w-full px-4 py-1 font-semibold focus:ring-accent" type="button">
             <?= icon($data['icon'], 'opacity-60 text-2xl mr-4') .
-                lang('EpisodeNavigation.' . $section) ?>
+                        lang('EpisodeNavigation.' . $section) ?>
         </button>
         <ul class="flex flex-col">
             <?php foreach ($data['items'] as $item): ?>
                 <?php $isActive = url_is(route_to($item, $podcast->id, $episode->id)); ?>
             <li class="inline-flex">
                 <a class="w-full py-1 pl-14 pr-2 text-sm hover:opacity-100 focus:ring-inset focus:ring-accent <?= $isActive
-                    ? 'font-semibold opacity-100 inline-flex items-center'
-                    : 'opacity-75' ?>" href="<?= route_to(
-                        $item,
-                        $podcast->id,
-                        $episode->id
-                    ) ?>"><?= ($isActive ? icon('chevron-right', 'mr-2') : '') . lang('EpisodeNavigation.' . $item) ?></a>
+                            ? 'font-semibold opacity-100 inline-flex items-center'
+                            : 'opacity-75' ?>" href="<?= route_to(
+                                $item,
+                                $podcast->id,
+                                $episode->id
+                            ) ?>"><?= ($isActive ? icon('chevron-right', 'mr-2') : '') . lang('EpisodeNavigation.' . $item) ?></a>
             </li>
             <?php endforeach; ?>
         </ul>
diff --git a/themes/cp_admin/episode/create.php b/themes/cp_admin/episode/create.php
index 64e3f995..90aff523 100644
--- a/themes/cp_admin/episode/create.php
+++ b/themes/cp_admin/episode/create.php
@@ -32,7 +32,7 @@
     name="cover"
     label="<?= lang('Episode.form.cover') ?>"
     hint="<?= lang('Episode.form.cover_hint') ?>"
-    helper="<?= lang('Episode.form.cover_size_hint', ) ?>"
+    helper="<?= lang('Episode.form.cover_size_hint') ?>"
     type="file"
     accept=".jpg,.jpeg,.png" />
 
diff --git a/themes/cp_admin/episode/edit.php b/themes/cp_admin/episode/edit.php
index 346ec7da..55fe2fea 100644
--- a/themes/cp_admin/episode/edit.php
+++ b/themes/cp_admin/episode/edit.php
@@ -172,13 +172,13 @@
             <?php if ($episode->transcript) : ?>
                 <div class="flex items-center mb-1 gap-x-2">
                     <?= anchor(
-                $episode->transcript->file_url,
-                icon('file-download', 'mr-1 text-skin-muted text-xl') . lang('Episode.form.transcript_download'),
-                [
-                    'class' => 'flex-1 font-semibold hover:underline inline-flex items-center text-xs',
-                    'download' => '',
-                ],
-            ) .
+                        $episode->transcript->file_url,
+                        icon('file-download', 'mr-1 text-skin-muted text-xl') . lang('Episode.form.transcript_download'),
+                        [
+                            'class' => 'flex-1 font-semibold hover:underline inline-flex items-center text-xs',
+                            'download' => '',
+                        ],
+                    ) .
                         anchor(
                             route_to(
                                 'transcript-delete',
@@ -227,13 +227,13 @@
             <?php if ($episode->chapters) : ?>
                 <div class="flex mb-1 gap-x-2">
                     <?= anchor(
-                $episode->chapters->file_url,
-                icon('file-download', 'mr-1 text-skin-muted text-xl') . lang('Episode.form.chapters_download'),
-                [
-                    'class' => 'flex-1 font-semibold hover:underline inline-flex items-center text-xs',
-                    'download' => '',
-                ],
-            ) .
+                        $episode->chapters->file_url,
+                        icon('file-download', 'mr-1 text-skin-muted text-xl') . lang('Episode.form.chapters_download'),
+                        [
+                            'class' => 'flex-1 font-semibold hover:underline inline-flex items-center text-xs',
+                            'download' => '',
+                        ],
+                    ) .
                     anchor(
                         route_to(
                             'chapters-delete',
diff --git a/themes/cp_admin/episode/publish.php b/themes/cp_admin/episode/publish.php
index 50cc5049..264e73bd 100644
--- a/themes/cp_admin/episode/publish.php
+++ b/themes/cp_admin/episode/publish.php
@@ -47,11 +47,11 @@
                 <div class="flex items-baseline">
                     <span class="flex-1 w-0 mr-2 text-sm font-semibold truncate"><?= esc($episode->title) ?></span>
                     <?= episode_numbering(
-        $episode->number,
-        $episode->season_number,
-        'text-xs font-semibold text-skin-muted !no-underline border px-1 border-gray-500',
-        true,
-    ) ?>
+                        $episode->number,
+                        $episode->season_number,
+                        'text-xs font-semibold text-skin-muted !no-underline border px-1 border-gray-500',
+                        true,
+                    ) ?>
                 </div>
                 <div class="text-xs text-skin-muted">
                     <time datetime="PT<?= round($episode->audio->duration, 3) ?>S">
diff --git a/themes/cp_admin/episode/publish_edit.php b/themes/cp_admin/episode/publish_edit.php
index 216d1e70..797a131d 100644
--- a/themes/cp_admin/episode/publish_edit.php
+++ b/themes/cp_admin/episode/publish_edit.php
@@ -49,11 +49,11 @@
                 <div class="flex items-baseline">
                     <span class="flex-1 w-0 mr-2 text-sm font-semibold truncate"><?= esc($episode->title) ?></span>
                     <?= episode_numbering(
-                    $episode->number,
-                    $episode->season_number,
-                    'text-xs font-semibold text-skin-muted !no-underline border px-1 border-gray-500',
-                    true,
-                ) ?>
+                        $episode->number,
+                        $episode->season_number,
+                        'text-xs font-semibold text-skin-muted !no-underline border px-1 border-gray-500',
+                        true,
+                    ) ?>
                 </div>
                 <div class="text-xs text-skin-muted">
                     <?= relative_time($episode->published_at) ?>
@@ -76,8 +76,8 @@
 <?php if ($podcast->publication_status === 'published'): ?>
     <fieldset class="flex flex-col">
     <legend class="text-lg font-semibold"><?= lang(
-                    'Episode.publish_form.publication_date',
-                ) ?></legend>
+        'Episode.publish_form.publication_date',
+    ) ?></legend>
         <Forms.Radio value="now" name="publication_method" isChecked="<?= old('publication_method') && old('publish') === 'now' ?>"><?= lang('Episode.publish_form.publication_method.now') ?></Forms.Radio>
         <div class="inline-flex flex-wrap items-center radio-toggler">
             <input
diff --git a/themes/cp_admin/episode/view.php b/themes/cp_admin/episode/view.php
index 6357011e..58580b9e 100644
--- a/themes/cp_admin/episode/view.php
+++ b/themes/cp_admin/episode/view.php
@@ -41,20 +41,20 @@
 
 <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
     <Charts.XY title="<?= lang('Charts.episode_by_day') ?>" dataUrl="<?= route_to(
-    'analytics-filtered-data',
-    $podcast->id,
-    'PodcastByEpisode',
-    'ByDay',
-    $episode->id,
-) ?>"/>
+        'analytics-filtered-data',
+        $podcast->id,
+        'PodcastByEpisode',
+        'ByDay',
+        $episode->id,
+    ) ?>"/>
 
     <Charts.XY title="<?= lang('Charts.episode_by_month') ?>" dataUrl="<?= route_to(
-    'analytics-filtered-data',
-    $podcast->id,
-    'PodcastByEpisode',
-    'ByMonth',
-    $episode->id,
-) ?>"/>
+        'analytics-filtered-data',
+        $podcast->id,
+        'PodcastByEpisode',
+        'ByMonth',
+        $episode->id,
+    ) ?>"/>
 </div>
 
 
diff --git a/themes/cp_admin/podcast/_sidebar.php b/themes/cp_admin/podcast/_sidebar.php
index 360d531c..66798944 100644
--- a/themes/cp_admin/podcast/_sidebar.php
+++ b/themes/cp_admin/podcast/_sidebar.php
@@ -58,12 +58,12 @@ $counts = [
     <div class="flex flex-col items-start flex-1 w-48 px-2">
         <span class="w-full font-semibold truncate" title="<?= esc($podcast->title) ?>"><?= esc($podcast->title) ?></span>
         <a href="<?= route_to(
-    'podcast-activity',
-    esc($podcast->handle),
-) ?>" class="inline-flex items-center text-sm hover:underline focus:ring-accent"
+            'podcast-activity',
+            esc($podcast->handle),
+        ) ?>" class="inline-flex items-center text-sm hover:underline focus:ring-accent"
         data-tooltip="bottom" title="<?= lang(
-    'PodcastNavigation.go_to_page',
-) ?>">@<?= esc($podcast->handle) ?>
+            'PodcastNavigation.go_to_page',
+        ) ?>">@<?= esc($podcast->handle) ?>
         <?= icon('external-link', 'ml-1 opacity-60') ?>
         </a>
     </div>
@@ -73,16 +73,16 @@ $counts = [
     <div>
         <button class="inline-flex items-center w-full px-4 py-1 font-semibold focus:ring-accent" type="button">
             <?= icon($data['icon'], 'opacity-60 text-2xl mr-4') .
-                lang('PodcastNavigation.' . $section) ?>
+                        lang('PodcastNavigation.' . $section) ?>
         </button>
         <ul class="flex flex-col">
             <?php foreach ($data['items'] as $item): ?>
                 <?php $isActive = url_is(route_to($item, $podcast->id)); ?>
                 <?php
-                    $itemLabel = lang('PodcastNavigation.' . $item);
-                    if (array_key_exists($item, $counts)) {
-                        $itemLabel .= ' (' . $counts[$item] . ')';
-                    }
+                            $itemLabel = lang('PodcastNavigation.' . $item);
+                if (array_key_exists($item, $counts)) {
+                    $itemLabel .= ' (' . $counts[$item] . ')';
+                }
                 ?>
             <li class="inline-flex">
                 <a class="w-full py-1 pl-14 pr-2 text-sm hover:opacity-100 focus:ring-inset focus:ring-accent <?= $isActive
diff --git a/themes/cp_admin/podcast/analytics/index.php b/themes/cp_admin/podcast/analytics/index.php
index f9740c3c..c625586d 100644
--- a/themes/cp_admin/podcast/analytics/index.php
+++ b/themes/cp_admin/podcast/analytics/index.php
@@ -12,25 +12,25 @@
 
 <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
     <Charts.XY class="col-span-1" title="<?= lang('Charts.podcast_by_day') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'Podcast',
-    'ByDay',
-) ?>"/>
+        'analytics-data',
+        $podcast->id,
+        'Podcast',
+        'ByDay',
+    ) ?>"/>
 
     <Charts.XY class="col-span-1" title="<?= lang('Charts.podcast_by_month') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'Podcast',
-    'ByMonth',
-) ?>"/>
+        'analytics-data',
+        $podcast->id,
+        'Podcast',
+        'ByMonth',
+    ) ?>"/>
 
     <Charts.XY class="col-span-1" title="<?= lang('Charts.podcast_by_bandwidth') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'Podcast',
-    'BandwidthByDay',
-) ?>"/>
+        'analytics-data',
+        $podcast->id,
+        'Podcast',
+        'BandwidthByDay',
+    ) ?>"/>
 </div>
 
 <?= service('vite')
diff --git a/themes/cp_admin/podcast/analytics/listening_time.php b/themes/cp_admin/podcast/analytics/listening_time.php
index a835497a..362528ed 100644
--- a/themes/cp_admin/podcast/analytics/listening_time.php
+++ b/themes/cp_admin/podcast/analytics/listening_time.php
@@ -12,18 +12,18 @@
 
 <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
     <Charts.XY class="col-span-1" title="<?= lang('Charts.daily_listening_time') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'Podcast',
-    'TotalListeningTimeByDay',
-) ?>"/>
+        'analytics-data',
+        $podcast->id,
+        'Podcast',
+        'TotalListeningTimeByDay',
+    ) ?>"/>
 
     <Charts.XY class="col-span-1" title="<?= lang('Charts.monthly_listening_time') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'Podcast',
-    'TotalListeningTimeByMonth',
-) ?>"/>
+        'analytics-data',
+        $podcast->id,
+        'Podcast',
+        'TotalListeningTimeByMonth',
+    ) ?>"/>
 </div>
 
 <?= service('vite')
diff --git a/themes/cp_admin/podcast/analytics/locations.php b/themes/cp_admin/podcast/analytics/locations.php
index 2e009430..b5544184 100644
--- a/themes/cp_admin/podcast/analytics/locations.php
+++ b/themes/cp_admin/podcast/analytics/locations.php
@@ -12,22 +12,22 @@
 
 <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
     <Charts.Pie title="<?= lang('Charts.by_country_weekly') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'PodcastByCountry',
-    'Weekly',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'PodcastByCountry',
+        'Weekly',
+    ) ?>" />
     <Charts.Pie title="<?= lang('Charts.by_country_yearly') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'PodcastByCountry',
-    'Yearly',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'PodcastByCountry',
+        'Yearly',
+    ) ?>" />
     <Charts.Map class="col-span-2" title="<?= lang('Charts.podcast_by_region') ?>" dataUrl="<?= route_to(
-    'analytics-full-data',
-    $podcast->id,
-    'PodcastByRegion',
-) ?>" />
+        'analytics-full-data',
+        $podcast->id,
+        'PodcastByRegion',
+    ) ?>" />
 </div>
 
 
diff --git a/themes/cp_admin/podcast/analytics/players.php b/themes/cp_admin/podcast/analytics/players.php
index 38be6fa0..f728ca78 100644
--- a/themes/cp_admin/podcast/analytics/players.php
+++ b/themes/cp_admin/podcast/analytics/players.php
@@ -12,35 +12,35 @@
 
 <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
     <Charts.Pie title="<?= lang('Charts.by_player_weekly') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'PodcastByPlayer',
-    'ByAppWeekly',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'PodcastByPlayer',
+        'ByAppWeekly',
+    ) ?>" />
     <Charts.Pie title="<?= lang('Charts.by_service_weekly') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'PodcastByService',
-    'ByServiceWeekly',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'PodcastByService',
+        'ByServiceWeekly',
+    ) ?>" />
     <Charts.Pie title="<?= lang('Charts.by_device_weekly') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'PodcastByPlayer',
-    'ByDeviceWeekly',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'PodcastByPlayer',
+        'ByDeviceWeekly',
+    ) ?>" />
     <Charts.Pie title="<?= lang('Charts.by_os_weekly') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'PodcastByPlayer',
-    'ByOsWeekly',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'PodcastByPlayer',
+        'ByOsWeekly',
+    ) ?>" />
     <Charts.XY class="col-span-2" title="<?= lang('Charts.podcast_bots') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'PodcastByPlayer',
-    'Bots',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'PodcastByPlayer',
+        'Bots',
+    ) ?>" />
 </div>
 
 <?= service('vite')
diff --git a/themes/cp_admin/podcast/analytics/time_periods.php b/themes/cp_admin/podcast/analytics/time_periods.php
index 46a4db2f..bd656741 100644
--- a/themes/cp_admin/podcast/analytics/time_periods.php
+++ b/themes/cp_admin/podcast/analytics/time_periods.php
@@ -12,16 +12,16 @@
 
 <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
     <Charts.Bar title="<?= lang('Charts.by_weekday') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'Podcast',
-    'ByWeekday',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'Podcast',
+        'ByWeekday',
+    ) ?>" />
     <Charts.Bar title="<?= lang('Charts.by_hour') ?>" dataUrl="<?= route_to(
-    'analytics-full-data',
-    $podcast->id,
-    'PodcastByHour',
-) ?>" />
+        'analytics-full-data',
+        $podcast->id,
+        'PodcastByHour',
+    ) ?>" />
 </div>
 
 <?= service('vite')
diff --git a/themes/cp_admin/podcast/analytics/unique_listeners.php b/themes/cp_admin/podcast/analytics/unique_listeners.php
index d4de1c72..29b40cab 100644
--- a/themes/cp_admin/podcast/analytics/unique_listeners.php
+++ b/themes/cp_admin/podcast/analytics/unique_listeners.php
@@ -12,18 +12,18 @@
 
 <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
     <Charts.XY class="col-span-1" title="<?= lang('Charts.unique_daily_listeners') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'Podcast',
-    'UniqueListenersByDay',
-) ?>"/>
+        'analytics-data',
+        $podcast->id,
+        'Podcast',
+        'UniqueListenersByDay',
+    ) ?>"/>
 
     <Charts.XY class="col-span-1" title="<?= lang('Charts.unique_monthly_listeners') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'Podcast',
-    'UniqueListenersByMonth',
-) ?>"/>
+        'analytics-data',
+        $podcast->id,
+        'Podcast',
+        'UniqueListenersByMonth',
+    ) ?>"/>
 </div>
 
 <?= service('vite')
diff --git a/themes/cp_admin/podcast/analytics/webpages.php b/themes/cp_admin/podcast/analytics/webpages.php
index 9ede392b..82acfd5c 100644
--- a/themes/cp_admin/podcast/analytics/webpages.php
+++ b/themes/cp_admin/podcast/analytics/webpages.php
@@ -12,27 +12,27 @@
 
 <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
     <Charts.Pie title="<?= lang('Charts.by_domain_weekly') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'WebsiteByReferer',
-    'ByDomainWeekly',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'WebsiteByReferer',
+        'ByDomainWeekly',
+    ) ?>" />
     <Charts.Pie title="<?= lang('Charts.by_domain_yearly') ?>" dataUrl="<?= route_to(
-    'analytics-data',
-    $podcast->id,
-    'WebsiteByReferer',
-    'ByDomainYearly',
-) ?>" />
+        'analytics-data',
+        $podcast->id,
+        'WebsiteByReferer',
+        'ByDomainYearly',
+    ) ?>" />
     <Charts.Pie title="<?= lang('Charts.by_entry_page') ?>" dataUrl="<?= route_to(
-    'analytics-full-data',
-    $podcast->id,
-    'WebsiteByEntryPage',
-) ?>" />
+        'analytics-full-data',
+        $podcast->id,
+        'WebsiteByEntryPage',
+    ) ?>" />
     <Charts.Pie title="<?= lang('Charts.by_browser') ?>" dataUrl="<?= route_to(
-    'analytics-full-data',
-    $podcast->id,
-    'WebsiteByBrowser',
-) ?>" />
+        'analytics-full-data',
+        $podcast->id,
+        'WebsiteByBrowser',
+    ) ?>" />
 </div>
 
 
diff --git a/themes/cp_admin/podcast/create.php b/themes/cp_admin/podcast/create.php
index 74492e18..330f9426 100644
--- a/themes/cp_admin/podcast/create.php
+++ b/themes/cp_admin/podcast/create.php
@@ -111,11 +111,11 @@
             <Forms.RadioButton
                 value="clean"
                 name="parental_advisory"
-                isChecked="false" ><?= lang('Podcast.form.parental_advisory.clean', ) ?></Forms.RadioButton>
+                isChecked="false" ><?= lang('Podcast.form.parental_advisory.clean') ?></Forms.RadioButton>
             <Forms.RadioButton
                 value="explicit"
                 name="parental_advisory"
-                isChecked="false" ><?= lang('Podcast.form.parental_advisory.explicit', ) ?></Forms.RadioButton>
+                isChecked="false" ><?= lang('Podcast.form.parental_advisory.explicit') ?></Forms.RadioButton>
         </div>
     </fieldset>
 </Forms.Section>
diff --git a/themes/cp_admin/podcast/edit.php b/themes/cp_admin/podcast/edit.php
index 4995fd7f..794e446c 100644
--- a/themes/cp_admin/podcast/edit.php
+++ b/themes/cp_admin/podcast/edit.php
@@ -128,11 +128,11 @@
             <Forms.RadioButton
                 value="clean"
                 name="parental_advisory"
-                isChecked="<?= $podcast->parental_advisory === 'clean' ? 'true' : 'false' ?>" ><?= lang('Podcast.form.parental_advisory.clean', ) ?></Forms.RadioButton>
+                isChecked="<?= $podcast->parental_advisory === 'clean' ? 'true' : 'false' ?>" ><?= lang('Podcast.form.parental_advisory.clean') ?></Forms.RadioButton>
             <Forms.RadioButton
                 value="explicit"
                 name="parental_advisory"
-                isChecked="<?= $podcast->parental_advisory === 'explicit' ? 'true' : 'false' ?>" ><?= lang('Podcast.form.parental_advisory.explicit', ) ?></Forms.RadioButton>
+                isChecked="<?= $podcast->parental_advisory === 'explicit' ? 'true' : 'false' ?>" ><?= lang('Podcast.form.parental_advisory.explicit') ?></Forms.RadioButton>
         </div>
     </fieldset>
 </Forms.Section>
diff --git a/themes/cp_admin/podcast/latest_episodes.php b/themes/cp_admin/podcast/latest_episodes.php
index 337005c6..6070dff7 100644
--- a/themes/cp_admin/podcast/latest_episodes.php
+++ b/themes/cp_admin/podcast/latest_episodes.php
@@ -2,9 +2,9 @@
     <header class="flex justify-between">
         <Heading tagName="h2"><?= lang('Podcast.latest_episodes') ?></Heading>
         <a href="<?= route_to(
-    'episode-list',
-    $podcast->id,
-) ?>" class="inline-flex items-center text-sm underline hover:no-underline focus:ring-accent">
+            'episode-list',
+            $podcast->id,
+        ) ?>" class="inline-flex items-center text-sm underline hover:no-underline focus:ring-accent">
             <?= lang('Podcast.see_all_episodes') ?>
             <?= icon('chevron-right', 'ml-2') ?>
         </a>
@@ -13,8 +13,8 @@
         <div class="grid px-4 pt-2 pb-5 -mx-2 overflow-x-auto grid-cols-latestEpisodes gap-x-4 snap snap-x snap-proximity">
         <?php foreach ($episodes as $episode): ?>
             <?= view('episode/_card', [
-                'episode' => $episode,
-            ]) ?>
+                        'episode' => $episode,
+                    ]) ?>
         <?php endforeach; ?>
         </div>
     <?php else: ?>
diff --git a/themes/cp_admin/podcast/notifications.php b/themes/cp_admin/podcast/notifications.php
index 3b960d0b..025d1a8c 100644
--- a/themes/cp_admin/podcast/notifications.php
+++ b/themes/cp_admin/podcast/notifications.php
@@ -19,47 +19,47 @@
     <div class="-mx-2 -mt-8 border-b divide-y md:-mx-12">
         <?php
             foreach ($notifications as $notification):
-            $backgroundColor = $notification->read_at === null ? 'bg-heading-background' : 'bg-base';
-        ?>
+                $backgroundColor = $notification->read_at === null ? 'bg-heading-background' : 'bg-base';
+                ?>
             <div class="py-3 hover:bg-white px-4 <?= $backgroundColor ?> group">
                 <?php
-                    $post = $notification->post_id !== null ? $notification->post : null;
+                            $post = $notification->post_id !== null ? $notification->post : null;
 
-                    $actorUsername = '@' . esc($notification->actor
-                        ->username) .
-                                ($notification->actor->is_local
-                                    ? ''
-                                    : '@' . esc($notification->actor->domain));
+                $actorUsername = '@' . esc($notification->actor
+                    ->username) .
+                            ($notification->actor->is_local
+                                ? ''
+                                : '@' . esc($notification->actor->domain));
 
-                    $actorUsernameHtml = <<<CODE_SAMPLE
+                $actorUsernameHtml = <<<CODE_SAMPLE
                     <strong class="break-all">{$actorUsername}</strong>
                     CODE_SAMPLE;
 
-                    $targetActorUsername = '@' . esc($notification->target_actor->username);
+                $targetActorUsername = '@' . esc($notification->target_actor->username);
 
-                    $targetActorUsernameHtml = <<<CODE_SAMPLE
+                $targetActorUsernameHtml = <<<CODE_SAMPLE
                     <strong class="break-all">{$targetActorUsername}</strong>
                     CODE_SAMPLE;
 
-                    $notificationTitle = match ($notification->type) {
-                        'reply' => lang('Notifications.reply', [
-                            'actor_username' => $actorUsernameHtml,
-                        ], null, false),
-                        'like' => lang('Notifications.favourite', [
-                            'actor_username' => $actorUsernameHtml,
-                        ], null, false),
-                        'share' => lang('Notifications.reblog', [
-                            'actor_username' => $actorUsernameHtml,
-                        ], null, false),
-                        'follow' => lang('Notifications.follow', [
-                            'actor_username' => $actorUsernameHtml,
-                        ], null, false),
-                        default => '',
-                    };
-                    $notificationContent = $post !== null ? $post->message_html : null;
+                $notificationTitle = match ($notification->type) {
+                    'reply' => lang('Notifications.reply', [
+                        'actor_username' => $actorUsernameHtml,
+                    ], null, false),
+                    'like' => lang('Notifications.favourite', [
+                        'actor_username' => $actorUsernameHtml,
+                    ], null, false),
+                    'share' => lang('Notifications.reblog', [
+                        'actor_username' => $actorUsernameHtml,
+                    ], null, false),
+                    'follow' => lang('Notifications.follow', [
+                        'actor_username' => $actorUsernameHtml,
+                    ], null, false),
+                    default => '',
+                };
+                $notificationContent = $post !== null ? $post->message_html : null;
 
-                    $postLink = $post !== null ? route_to('post', esc($podcast->handle), $post->id) : route_to('podcast-activity', esc($podcast->handle));
-                    $link = $notification->read_at !== null ? $postLink : route_to('notification-mark-as-read', $podcast->id, $notification->id);
+                $postLink = $post !== null ? route_to('post', esc($podcast->handle), $post->id) : route_to('podcast-activity', esc($podcast->handle));
+                $link = $notification->read_at !== null ? $postLink : route_to('notification-mark-as-read', $podcast->id, $notification->id);
                 ?>
                 <a href="<?= $link ?>">
                     <div class="flex items-start md:items-center">
@@ -76,7 +76,7 @@
                                             'follow' => icon('user-follow', 'text-violet-500 text-base'),
                                             default => '',
                                         };
-                                    ?>
+                ?>
                                     <?= $icon ?>
                                 </span>
                             </div>
diff --git a/themes/cp_admin/podcast/platforms.php b/themes/cp_admin/podcast/platforms.php
index 45771d39..511cb080 100644
--- a/themes/cp_admin/podcast/platforms.php
+++ b/themes/cp_admin/podcast/platforms.php
@@ -23,28 +23,28 @@
     <div class="flex flex-col items-center w-12 mr-4">
         <?php if ($platform->submit_url === ''): ?>
             <?= icon(
-    esc($platform->slug),
-    'text-skin-muted text-4xl',
-    $platform->type
-) ?>
+                esc($platform->slug),
+                'text-skin-muted text-4xl',
+                $platform->type
+            ) ?>
         <?php else: ?>
             <?= anchor(
-    $platform->submit_url,
-    icon(
-        esc($platform->slug),
-        'text-skin-muted text-4xl',
-        $platform->type
-    ),
-    [
-        'class' => 'text-skin-muted hover:text-skin-base',
-        'target' => '_blank',
-        'rel' => 'noopener noreferrer',
-        'data-tooltip' => 'bottom',
-        'title' => lang('Platforms.submit_url', [
-            'platformName' => $platform->label,
-        ]),
-    ],
-) ?>
+                $platform->submit_url,
+                icon(
+                    esc($platform->slug),
+                    'text-skin-muted text-4xl',
+                    $platform->type
+                ),
+                [
+                    'class' => 'text-skin-muted hover:text-skin-base',
+                    'target' => '_blank',
+                    'rel' => 'noopener noreferrer',
+                    'data-tooltip' => 'bottom',
+                    'title' => lang('Platforms.submit_url', [
+                        'platformName' => $platform->label,
+                    ]),
+                ],
+            ) ?>
         <?php endif; ?>
         <div class="inline-flex mt-1 bg-highlight">
             <?= anchor($platform->home_url, icon('external-link', 'mx-auto'), [
@@ -57,37 +57,37 @@
                 ]),
             ]) ?>
             <?= $platform->submit_url
-                ? anchor($platform->submit_url, icon('add', 'mx-auto'), [
-                    'class' => 'flex-1 text-skin-muted hover:text-skin-base',
-                    'target' => '_blank',
-                    'rel' => 'noopener noreferrer',
-                    'data-tooltip' => 'bottom',
-                    'title' => lang('Platforms.submit_url', [
-                        'platformName' => $platform->label,
-                    ]),
-                ])
-                : '' ?>
+                            ? anchor($platform->submit_url, icon('add', 'mx-auto'), [
+                                'class' => 'flex-1 text-skin-muted hover:text-skin-base',
+                                'target' => '_blank',
+                                'rel' => 'noopener noreferrer',
+                                'data-tooltip' => 'bottom',
+                                'title' => lang('Platforms.submit_url', [
+                                    'platformName' => $platform->label,
+                                ]),
+                            ])
+                            : '' ?>
         </div>
     </div>
     <div class="flex flex-col flex-1">
         <?= $platform->link_url
-            ? anchor(
-                route_to(
-                    'podcast-platform-remove',
-                    $podcast->id,
-                    esc($platform->slug),
-                ),
-                icon('delete-bin', 'mx-auto'),
-                [
-                    'class' =>
-                        'absolute right-0 p-1 bg-red-100 rounded-full text-red-700 hover:text-red-900',
-                    'data-tooltip' => 'bottom',
-                    'title' => lang('Platforms.remove', [
-                        'platformName' => $platform->label,
-                    ]),
-                ],
-            )
-            : '' ?>
+                        ? anchor(
+                            route_to(
+                                'podcast-platform-remove',
+                                $podcast->id,
+                                esc($platform->slug),
+                            ),
+                            icon('delete-bin', 'mx-auto'),
+                            [
+                                'class' =>
+                                    'absolute right-0 p-1 bg-red-100 rounded-full text-red-700 hover:text-red-900',
+                                'data-tooltip' => 'bottom',
+                                'title' => lang('Platforms.remove', [
+                                    'platformName' => $platform->label,
+                                ]),
+                            ],
+                        )
+                        : '' ?>
         <fieldset>
             <legend class="mb-2 font-semibold"><?= $platform->label ?></legend>
             <Forms.Input
diff --git a/themes/cp_admin/podcast/publish.php b/themes/cp_admin/podcast/publish.php
index 8469551f..a2427275 100644
--- a/themes/cp_admin/podcast/publish.php
+++ b/themes/cp_admin/podcast/publish.php
@@ -48,8 +48,8 @@
 
 <fieldset class="flex flex-col">
     <legend class="text-lg font-semibold"><?= lang(
-    'Podcast.publish_form.publication_date',
-) ?></legend>
+        'Podcast.publish_form.publication_date',
+    ) ?></legend>
     <Forms.Radio value="now" name="publication_method" isChecked="<?= old('publication_method') ? old('publish') === 'now' : true ?>"><?= lang('Podcast.publish_form.publication_method.now') ?></Forms.Radio>
     <div class="inline-flex flex-wrap items-center radio-toggler">
         <input
diff --git a/themes/cp_admin/subscription/email/edited.php b/themes/cp_admin/subscription/email/edited.php
index 3b21d9d3..5446e9c8 100644
--- a/themes/cp_admin/subscription/email/edited.php
+++ b/themes/cp_admin/subscription/email/edited.php
@@ -3,7 +3,7 @@
 <?php if ($subscription->expires_at): ?>
     <?php
         $formatter = new IntlDateFormatter($subscription->podcast->language_code, IntlDateFormatter::LONG, IntlDateFormatter::LONG);
-        $translatedDate = $subscription->expires_at->toLocalizedString($formatter->getPattern());
+    $translatedDate = $subscription->expires_at->toLocalizedString($formatter->getPattern());
     ?>
     <?= lang('Subscription.emails.edited_expires', [
         'podcastTitle' => '<strong>' . $subscription->podcast->title . '</strong>',
diff --git a/themes/cp_admin/subscription/email/welcome.php b/themes/cp_admin/subscription/email/welcome.php
index 8fa9c848..73b5fc32 100644
--- a/themes/cp_admin/subscription/email/welcome.php
+++ b/themes/cp_admin/subscription/email/welcome.php
@@ -11,7 +11,7 @@
 <?php if ($subscription->expires_at): ?>
     <?php
         $formatter = new IntlDateFormatter($subscription->podcast->language_code, IntlDateFormatter::LONG, IntlDateFormatter::LONG);
-        $translatedDate = $subscription->expires_at->toLocalizedString($formatter->getPattern());
+    $translatedDate = $subscription->expires_at->toLocalizedString($formatter->getPattern());
     ?>
     <?= lang('Subscription.emails.welcome_expires', ['<strong>' . $translatedDate . '</strong>'], $subscription->podcast->language_code, false) ?>
 <?php else: ?>
diff --git a/themes/cp_admin/subscription/list.php b/themes/cp_admin/subscription/list.php
index c63833a6..db3b1791 100644
--- a/themes/cp_admin/subscription/list.php
+++ b/themes/cp_admin/subscription/list.php
@@ -32,99 +32,99 @@
 <hr class="my-6 border-subtle">
 
 <?= data_table(
-            [
-                [
-                    'header' => lang('Subscription.list.number'),
-                    'cell' => function ($subscription) {
-                        return '#' . $subscription->id;
-                    },
-                ],
-                [
-                    'header' => lang('Subscription.list.email'),
-                    'cell' => function ($subscription) {
-                        return esc($subscription->email);
-                    },
-                ],
-                [
-                    'header' => lang('Subscription.list.expiration_date'),
-                    'cell' => function ($subscription) {
-                        return $subscription->expires_at ? local_date($subscription->expires_at) : lang('Subscription.list.unlimited');
-                    },
-                ],
-                [
-                    'header' => lang('Subscription.list.downloads'),
-                    'cell' => function ($subscription) {
-                        return $subscription->downloads_last_3_months;
-                    },
-                ],
-                [
-                    'header' => lang('Subscription.list.status'),
-                    'cell' => function ($subscription) {
-                        $statusMapping = [
-                            'active' => 'success',
-                            'suspended' => 'warning',
-                            'expired' => 'default',
-                        ];
+    [
+        [
+            'header' => lang('Subscription.list.number'),
+            'cell' => function ($subscription) {
+                return '#' . $subscription->id;
+            },
+        ],
+        [
+            'header' => lang('Subscription.list.email'),
+            'cell' => function ($subscription) {
+                return esc($subscription->email);
+            },
+        ],
+        [
+            'header' => lang('Subscription.list.expiration_date'),
+            'cell' => function ($subscription) {
+                return $subscription->expires_at ? local_date($subscription->expires_at) : lang('Subscription.list.unlimited');
+            },
+        ],
+        [
+            'header' => lang('Subscription.list.downloads'),
+            'cell' => function ($subscription) {
+                return $subscription->downloads_last_3_months;
+            },
+        ],
+        [
+            'header' => lang('Subscription.list.status'),
+            'cell' => function ($subscription) {
+                $statusMapping = [
+                    'active' => 'success',
+                    'suspended' => 'warning',
+                    'expired' => 'default',
+                ];
 
-                        return '<Pill variant="' . $statusMapping[$subscription->status] . '" class="lowercase">' . lang('Subscription.status.' . $subscription->status) . '</Pill>';
-                    },
-                ],
-                [
-                    'header' => lang('Common.actions'),
-                    'cell' => function ($subscription, $podcast) {
-                        $items = [
-                            [
-                                'type' => 'link',
-                                'title' => lang('Subscription.view'),
-                                'uri' => route_to('subscription-view', $podcast->id, $subscription->id),
-                            ],
-                            [
-                                'type' => 'link',
-                                'title' => lang('Subscription.edit'),
-                                'uri' => route_to('subscription-edit', $podcast->id, $subscription->id),
-                            ],
-                            [
-                                'type' => 'link',
-                                'title' => lang('Subscription.regenerate_token'),
-                                'uri' => route_to('subscription-regenerate-token', $podcast->id, $subscription->id),
-                            ],
-                            [
-                                'type' => 'separator',
-                            ],
-                            [
-                                'type' => 'link',
-                                'title' => lang('Subscription.delete'),
-                                'uri' => route_to('subscription-delete', $podcast->id, $subscription->id),
-                                'class' => 'font-semibold text-red-600',
-                            ],
-                        ];
+                return '<Pill variant="' . $statusMapping[$subscription->status] . '" class="lowercase">' . lang('Subscription.status.' . $subscription->status) . '</Pill>';
+            },
+        ],
+        [
+            'header' => lang('Common.actions'),
+            'cell' => function ($subscription, $podcast) {
+                $items = [
+                    [
+                        'type' => 'link',
+                        'title' => lang('Subscription.view'),
+                        'uri' => route_to('subscription-view', $podcast->id, $subscription->id),
+                    ],
+                    [
+                        'type' => 'link',
+                        'title' => lang('Subscription.edit'),
+                        'uri' => route_to('subscription-edit', $podcast->id, $subscription->id),
+                    ],
+                    [
+                        'type' => 'link',
+                        'title' => lang('Subscription.regenerate_token'),
+                        'uri' => route_to('subscription-regenerate-token', $podcast->id, $subscription->id),
+                    ],
+                    [
+                        'type' => 'separator',
+                    ],
+                    [
+                        'type' => 'link',
+                        'title' => lang('Subscription.delete'),
+                        'uri' => route_to('subscription-delete', $podcast->id, $subscription->id),
+                        'class' => 'font-semibold text-red-600',
+                    ],
+                ];
 
-                        if ($subscription->status === 'suspended') {
-                            $suspendAction = [[
-                                'type' => 'link',
-                                'title' => lang('Subscription.resume'),
-                                'uri' => route_to('subscription-resume', $podcast->id, $subscription->id),
-                            ]];
-                        } else {
-                            $suspendAction = [[
-                                'type' => 'link',
-                                'title' => lang('Subscription.suspend'),
-                                'uri' => route_to('subscription-suspend', $podcast->id, $subscription->id),
-                            ]];
-                        }
+                if ($subscription->status === 'suspended') {
+                    $suspendAction = [[
+                        'type' => 'link',
+                        'title' => lang('Subscription.resume'),
+                        'uri' => route_to('subscription-resume', $podcast->id, $subscription->id),
+                    ]];
+                } else {
+                    $suspendAction = [[
+                        'type' => 'link',
+                        'title' => lang('Subscription.suspend'),
+                        'uri' => route_to('subscription-suspend', $podcast->id, $subscription->id),
+                    ]];
+                }
 
-                        array_splice($items, 3, 0, $suspendAction);
+                array_splice($items, 3, 0, $suspendAction);
 
-                        return '<button id="more-dropdown-' . $subscription->id . '" type="button" class="inline-flex items-center p-1 rounded-full focus:ring-accent" data-dropdown="button" data-dropdown-target="more-dropdown-' . $subscription->id . '-menu" aria-haspopup="true" aria-expanded="false">' .
-                            icon('more') .
-                            '</button>' .
-                            '<DropdownMenu id="more-dropdown-' . $subscription->id . '-menu" labelledby="more-dropdown-' . $subscription->id . '" offsetY="-24" items="' . esc(json_encode($items)) . '" />';
-                    },
-                ],
-            ],
-            $podcast->subscriptions,
-            '',
-            $podcast,
-        ) ?>
+                return '<button id="more-dropdown-' . $subscription->id . '" type="button" class="inline-flex items-center p-1 rounded-full focus:ring-accent" data-dropdown="button" data-dropdown-target="more-dropdown-' . $subscription->id . '-menu" aria-haspopup="true" aria-expanded="false">' .
+                    icon('more') .
+                    '</button>' .
+                    '<DropdownMenu id="more-dropdown-' . $subscription->id . '-menu" labelledby="more-dropdown-' . $subscription->id . '" offsetY="-24" items="' . esc(json_encode($items)) . '" />';
+            },
+        ],
+    ],
+    $podcast->subscriptions,
+    '',
+    $podcast,
+) ?>
 
 <?= $this->endSection() ?>
diff --git a/themes/cp_app/_admin_navbar.php b/themes/cp_app/_admin_navbar.php
index f17ea0d8..8e31084e 100644
--- a/themes/cp_app/_admin_navbar.php
+++ b/themes/cp_app/_admin_navbar.php
@@ -7,7 +7,7 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
             <a href="<?= route_to('home') ?>" class="inline-flex items-center h-full px-2 border-r border-navigation focus:ring-inset focus:ring-accent">
                     <?= svg('castopod-logo-base', 'h-6') ?>
             </a>
-            <a href="<?= route_to('admin', ) ?>" class="inline-flex items-center h-full px-6 text-sm font-semibold hover:underline focus:ring-inset focus:ring-accent">
+            <a href="<?= route_to('admin') ?>" class="inline-flex items-center h-full px-6 text-sm font-semibold hover:underline focus:ring-inset focus:ring-accent">
                 <?= lang('Navigation.go_to_admin') ?>
                 <?= icon('external-link', 'ml-1 opacity-60') ?>
             </a>
@@ -23,24 +23,24 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
             <?php
                 $notificationsTitle = lang('Notifications.title');
 
-                $items = [
-                    [
-                        'type' => 'html',
-                        'content' => esc(<<<CODE_SAMPLE
+$items = [
+    [
+        'type' => 'html',
+        'content' => esc(<<<CODE_SAMPLE
                             <span class="px-4 my-2 text-xs font-semibold tracking-wider uppercase text-skin-muted">{$notificationsTitle}</span>
                             CODE_SAMPLE),
-                    ],
-                ];
+    ],
+];
 
-                if ($userPodcasts !== []) {
-                    foreach ($userPodcasts as $userPodcast) {
-                        $userPodcastTitle = esc($userPodcast->title);
+if ($userPodcasts !== []) {
+    foreach ($userPodcasts as $userPodcast) {
+        $userPodcastTitle = esc($userPodcast->title);
 
-                        $unreadNotificationDotDisplayClass = in_array($userPodcast->actor_id, $actorIdsWithUnreadNotifications, true) ? '' : 'hidden';
+        $unreadNotificationDotDisplayClass = in_array($userPodcast->actor_id, $actorIdsWithUnreadNotifications, true) ? '' : 'hidden';
 
-                        $items[] = [
-                            'type' => 'link',
-                            'title' => <<<CODE_SAMPLE
+        $items[] = [
+            'type' => 'link',
+            'title' => <<<CODE_SAMPLE
                                 <div class="inline-flex items-center flex-1 text-sm align-middle">
                                     <div class="relative">
                                         <img src="{$userPodcast->cover->tiny_url}" class="w-6 h-6 mr-2 rounded-full" loading="lazy" />
@@ -49,20 +49,20 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
                                     <span class="max-w-xs truncate">{$userPodcastTitle}</span>
                                 </div>
                             CODE_SAMPLE
-                            ,
-                            'uri' => route_to('notification-list', $userPodcast->id),
-                        ];
-                    }
-                } else {
-                    $noNotificationsText = lang('Notifications.no_notifications');
-                    $items[] = [
-                        'type' => 'html',
-                        'content' => esc(<<<CODE_SAMPLE
+            ,
+            'uri' => route_to('notification-list', $userPodcast->id),
+        ];
+    }
+} else {
+    $noNotificationsText = lang('Notifications.no_notifications');
+    $items[] = [
+        'type' => 'html',
+        'content' => esc(<<<CODE_SAMPLE
                             <span class="mx-4 my-2 text-sm italic text-center text-skin-muted">{$noNotificationsText}</span>
                         CODE_SAMPLE),
-                    ];
-                }
-            ?>
+    ];
+}
+?>
             <DropdownMenu id="notifications-dropdown-menu" labelledby="notifications-dropdown" items="<?= esc(json_encode($items)) ?>" placement="bottom"/>
 
             <button
@@ -84,50 +84,50 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
                 <?= esc(auth()->user()->username) ?>
                 <?= icon('caret-down', 'ml-auto text-2xl') ?></button>
         <?php
-            $interactButtons = '';
-            foreach ($userPodcasts as $userPodcast) {
-                if (can_podcast(auth()->user(), $userPodcast->id, 'interact-as')) {
-                    $checkMark = interact_as_actor_id() === $userPodcast->actor_id ? icon('check', 'ml-2 bg-accent-base text-accent-contrast rounded-full') : '';
-                    $userPodcastTitle = esc($userPodcast->title);
+$interactButtons = '';
+foreach ($userPodcasts as $userPodcast) {
+    if (can_podcast(auth()->user(), $userPodcast->id, 'interact-as')) {
+        $checkMark = interact_as_actor_id() === $userPodcast->actor_id ? icon('check', 'ml-2 bg-accent-base text-accent-contrast rounded-full') : '';
+        $userPodcastTitle = esc($userPodcast->title);
 
-                    $interactButtons .= <<<CODE_SAMPLE
+        $interactButtons .= <<<CODE_SAMPLE
                        <button class="inline-flex items-center w-full px-4 py-1 hover:bg-highlight" id="interact-as-actor-{$userPodcast->id}" name="actor_id" value="{$userPodcast->actor_id}">
                             <div class="inline-flex items-center flex-1 text-sm"><img src="{$userPodcast->cover->tiny_url}" class="w-6 h-6 mr-2 rounded-full" loading="lazy" /><span class="max-w-xs truncate">{$userPodcastTitle}</span>{$checkMark}</div>
                        </button>
                     CODE_SAMPLE;
-                }
-            }
+    }
+}
 
-            $interactAsText = lang('Common.choose_interact');
-            $interactAsRoute = route_to('interact-as-actor');
-            $csrfField = csrf_field();
+$interactAsText = lang('Common.choose_interact');
+$interactAsRoute = route_to('interact-as-actor');
+$csrfField = csrf_field();
 
-            $menuItems = [
-                [
-                    'type' => 'link',
-                    'title' => lang('Navigation.account.my-account'),
-                    'uri' => route_to('my-account'),
-                ],
-                [
-                    'type' => 'link',
-                    'title' => lang('Navigation.account.change-password'),
-                    'uri' => route_to('change-password'),
-                ],
-                [
-                    'type' => 'separator',
-                ],
-                [
-                    'type' => 'link',
-                    'title' => lang('Navigation.account.logout'),
-                    'uri' => route_to('logout'),
-                ],
-            ];
+$menuItems = [
+    [
+        'type' => 'link',
+        'title' => lang('Navigation.account.my-account'),
+        'uri' => route_to('my-account'),
+    ],
+    [
+        'type' => 'link',
+        'title' => lang('Navigation.account.change-password'),
+        'uri' => route_to('change-password'),
+    ],
+    [
+        'type' => 'separator',
+    ],
+    [
+        'type' => 'link',
+        'title' => lang('Navigation.account.logout'),
+        'uri' => route_to('logout'),
+    ],
+];
 
-            if ($userPodcasts !== []) {
-                $menuItems = array_merge([
-                    [
-                        'type' => 'html',
-                        'content' => esc(<<<CODE_SAMPLE
+if ($userPodcasts !== []) {
+    $menuItems = array_merge([
+        [
+            'type' => 'html',
+            'content' => esc(<<<CODE_SAMPLE
                             <nav class="flex flex-col py-2 whitespace-nowrap">
                                 <span class="px-4 mb-2 text-xs font-semibold tracking-wider uppercase text-skin-muted">{$interactAsText}</span>
                                 <form action="{$interactAsRoute}" method="POST" class="flex flex-col">
@@ -136,13 +136,13 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
                                 </form>
                             </nav>
                         CODE_SAMPLE),
-                    ],
-                    [
-                        'type' => 'separator',
-                    ],
-                ], $menuItems);
-            }
-        ?>
+        ],
+        [
+            'type' => 'separator',
+        ],
+    ], $menuItems);
+}
+?>
         <DropdownMenu id="my-account-dropdown-menu" labelledby="my-account-dropdown" items="<?= esc(json_encode($menuItems)) ?>" />
     </div>
 </div>
\ No newline at end of file
diff --git a/themes/cp_app/_persons_modal.php b/themes/cp_app/_persons_modal.php
index 6294fe90..237fefee 100644
--- a/themes/cp_app/_persons_modal.php
+++ b/themes/cp_app/_persons_modal.php
@@ -27,17 +27,17 @@
                             <?php endif; ?>
                         </h4>
                         <p class="text-xs text-skin-muted"><?= implode(
-    ', ',
-    array_map(function ($role) {
-        return lang(
-            'PersonsTaxonomy.persons.' .
-                                            $role->group .
-                                            '.roles.' .
-                                            $role->role .
-                                            '.label',
-        );
-    }, $person->roles),
-) ?></p>
+                            ', ',
+                            array_map(function ($role) {
+                                return lang(
+                                    'PersonsTaxonomy.persons.' .
+                                                                    $role->group .
+                                                                    '.roles.' .
+                                                                    $role->role .
+                                                                    '.label',
+                                );
+                            }, $person->roles),
+                        ) ?></p>
                     </div>
                 </div>
             <?php endforeach; ?>
diff --git a/themes/cp_app/episode/_layout.php b/themes/cp_app/episode/_layout.php
index 48e1a0ed..8bf65fd3 100644
--- a/themes/cp_app/episode/_layout.php
+++ b/themes/cp_app/episode/_layout.php
@@ -63,18 +63,18 @@
                 <button class="p-2 text-red-600 bg-white rounded-full shadow hover:text-red-500 focus:ring-accent" data-toggle="funding-links" data-toggle-class="hidden" title="<?= lang('Podcast.sponsor') ?>"><Icon glyph="heart"></Icon></button>
             <?php endif; ?>
             <?= anchor_popup(
-                        route_to('follow', esc($podcast->handle)),
-                        icon(
-                            'social/castopod',
-                            'mr-2 text-xl text-black/75 group-hover:text-black',
-                        ) . lang('Podcast.follow'),
-                        [
-                            'width' => 420,
-                            'height' => 620,
-                            'class' =>
-                                'group inline-flex items-center px-3 leading-8 text-xs tracking-wider font-semibold text-black uppercase rounded-full shadow focus:ring-accent bg-white',
-                        ],
-                    ) ?>
+                route_to('follow', esc($podcast->handle)),
+                icon(
+                    'social/castopod',
+                    'mr-2 text-xl text-black/75 group-hover:text-black',
+                ) . lang('Podcast.follow'),
+                [
+                    'width' => 420,
+                    'height' => 620,
+                    'class' =>
+                        'group inline-flex items-center px-3 leading-8 text-xs tracking-wider font-semibold text-black uppercase rounded-full shadow focus:ring-accent bg-white',
+                ],
+            ) ?>
         </div>
     </nav>
     <header class="relative z-50 flex flex-col col-start-2 px-8 pt-8 pb-4 overflow-hidden bg-accent-base/75 gap-y-4">
@@ -98,9 +98,10 @@
                             <?php $i = 0; ?>
                             <?php foreach ($episode->persons as $person): ?>
                                 <img src="<?= $person->avatar->thumbnail_url ?>" alt="<?= esc($person->full_name) ?>" class="object-cover w-8 h-8 -ml-4 border-2 rounded-full aspect-square border-background-header last:ml-0" loading="lazy" />
-                                <?php $i++; if ($i === 3) {
-                        break;
-                    }?>
+                                <?php $i++;
+                                if ($i === 3) {
+                                    break;
+                                }?>
                             <?php endforeach; ?>
                         </span>
                         <?= lang('Episode.persons', [
diff --git a/themes/cp_app/episode/_partials/comment_actions.php b/themes/cp_app/episode/_partials/comment_actions.php
index 0272c769..d978fa15 100644
--- a/themes/cp_app/episode/_partials/comment_actions.php
+++ b/themes/cp_app/episode/_partials/comment_actions.php
@@ -3,41 +3,41 @@
         <form action="<?= route_to('episode-comment-attempt-like', esc($comment->episode->podcast->handle), esc($comment->episode->slug), $comment->id) ?>" method="POST" class="flex items-center gap-x-4">
             <?= csrf_field() ?>
             <button type="submit" name="action" class="inline-flex items-center hover:underline group" title="<?= lang(
-    'Comment.likes',
-    [
-        'numberOfLikes' => $comment->likes_count,
-    ],
-) ?>"><?= icon('heart', 'text-xl mr-1 text-gray-400 group-hover:text-red-600') . $comment->likes_count ?></button>
+                'Comment.likes',
+                [
+                    'numberOfLikes' => $comment->likes_count,
+                ],
+            ) ?>"><?= icon('heart', 'text-xl mr-1 text-gray-400 group-hover:text-red-600') . $comment->likes_count ?></button>
             <Button uri="<?= route_to('episode-comment', esc($comment->episode->podcast->handle), esc($comment->episode->slug), $comment->id) ?>" size="small"><?= lang('Comment.reply') ?></Button>
         </form>
         <?php if ($comment->replies_count): ?>
             <?= anchor(
-    route_to('episode-comment', esc($comment->episode->podcast->handle), esc($comment->episode->slug), $comment->id),
-    icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
-        'numberOfReplies' => $comment->replies_count,
-    ]),
-    [
-        'class' => 'inline-flex items-center text-xs hover:underline',
-    ]
-) ?>
+                route_to('episode-comment', esc($comment->episode->podcast->handle), esc($comment->episode->slug), $comment->id),
+                icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
+                    'numberOfReplies' => $comment->replies_count,
+                ]),
+                [
+                    'class' => 'inline-flex items-center text-xs hover:underline',
+                ]
+            ) ?>
         <?php endif; ?>
     <?php else: ?>
         <button class="inline-flex items-center opacity-50 cursor-not-allowed hover:underline" title="<?= lang(
-    'Comment.like',
-    [
-        'numberOfLikes' => $comment->likes_count,
-    ],
-) ?>"><?= icon('heart', 'text-xl mr-1 text-skin-muted') . $comment->likes_count ?></button>
+            'Comment.like',
+            [
+                'numberOfLikes' => $comment->likes_count,
+            ],
+        ) ?>"><?= icon('heart', 'text-xl mr-1 text-skin-muted') . $comment->likes_count ?></button>
         <?php if ($comment->replies_count): ?>
             <?= anchor(
-    route_to('episode-comment', esc($comment->episode->podcast->handle), esc($comment->episode->slug), $comment->id),
-    icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
-        'numberOfReplies' => $comment->replies_count,
-    ]),
-    [
-        'class' => 'inline-flex items-center text-xs hover:underline',
-    ]
-) ?>
+                route_to('episode-comment', esc($comment->episode->podcast->handle), esc($comment->episode->slug), $comment->id),
+                icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
+                    'numberOfReplies' => $comment->replies_count,
+                ]),
+                [
+                    'class' => 'inline-flex items-center text-xs hover:underline',
+                ]
+            ) ?>
         <?php endif; ?>
     <?php endif; ?>
 </footer>
diff --git a/themes/cp_app/episode/_partials/comment_actions_from_post.php b/themes/cp_app/episode/_partials/comment_actions_from_post.php
index 803b53b6..1cf35210 100644
--- a/themes/cp_app/episode/_partials/comment_actions_from_post.php
+++ b/themes/cp_app/episode/_partials/comment_actions_from_post.php
@@ -3,47 +3,47 @@
         <form action="<?= route_to('post-attempt-action', esc(interact_as_actor()->username), $comment->id) ?>" method="POST" class="flex items-center gap-x-4">
         <?= csrf_field() ?>
         <button type="submit" name="action" value="favourite" class="inline-flex items-center hover:underline group" title="<?= lang(
-    'Comment.likes',
-    [
-        'numberOfLikes' => $comment->likes_count,
-    ],
-) ?>"><?= icon('heart', 'text-xl mr-1 text-gray-400 group-hover:text-red-600') . $comment->likes_count ?></button>
+            'Comment.likes',
+            [
+                'numberOfLikes' => $comment->likes_count,
+            ],
+        ) ?>"><?= icon('heart', 'text-xl mr-1 text-gray-400 group-hover:text-red-600') . $comment->likes_count ?></button>
             <Button uri="<?= route_to('post', esc($podcast->handle), $comment->id) ?>" size="small"><?= lang('Comment.reply') ?></Button>
         </form>
         <?php if ($comment->replies_count): ?>
             <?= anchor(
-    route_to('post', esc($podcast->handle), $comment->id),
-    icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
-        'numberOfReplies' => $comment->replies_count,
-    ]),
-    [
-        'class' => 'inline-flex items-center text-xs hover:underline',
-    ]
-) ?>
+                route_to('post', esc($podcast->handle), $comment->id),
+                icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
+                    'numberOfReplies' => $comment->replies_count,
+                ]),
+                [
+                    'class' => 'inline-flex items-center text-xs hover:underline',
+                ]
+            ) ?>
         <?php endif; ?>
     <?php else: ?>
         <?= anchor_popup(
-    route_to('post-remote-action', esc($podcast->handle), $comment->id, 'favourite'),
-    icon('heart', 'text-xl mr-1 opacity-40') . $comment->likes_count,
-    [
-        'class' => 'inline-flex items-center hover:underline',
-        'width' => 420,
-        'height' => 620,
-        'title' => lang('Post.favourites', [
-            'numberOfFavourites' => $comment->likes_count,
-        ]),
-    ],
-) ?>
+            route_to('post-remote-action', esc($podcast->handle), $comment->id, 'favourite'),
+            icon('heart', 'text-xl mr-1 opacity-40') . $comment->likes_count,
+            [
+                'class' => 'inline-flex items-center hover:underline',
+                'width' => 420,
+                'height' => 620,
+                'title' => lang('Post.favourites', [
+                    'numberOfFavourites' => $comment->likes_count,
+                ]),
+            ],
+        ) ?>
         <?php if ($comment->replies_count): ?>
             <?= anchor(
-    route_to('post', esc($podcast->handle), $comment->id),
-    icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
-        'numberOfReplies' => $comment->replies_count,
-    ]),
-    [
-        'class' => 'inline-flex items-center text-xs hover:underline',
-    ]
-) ?>
+                route_to('post', esc($podcast->handle), $comment->id),
+                icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
+                    'numberOfReplies' => $comment->replies_count,
+                ]),
+                [
+                    'class' => 'inline-flex items-center text-xs hover:underline',
+                ]
+            ) ?>
         <?php endif; ?>
     <?php endif; ?>
 </footer>
diff --git a/themes/cp_app/episode/_partials/comment_card.php b/themes/cp_app/episode/_partials/comment_card.php
index bb937715..eac26a0f 100644
--- a/themes/cp_app/episode/_partials/comment_card.php
+++ b/themes/cp_app/episode/_partials/comment_card.php
@@ -25,29 +25,29 @@
                     <?= csrf_field() ?>
 
                     <button type="submit" name="action" class="inline-flex items-center hover:underline group" title="<?= lang(
-                            'Comment.likes',
-                            [
-                                'numberOfLikes' => $comment->likes_count,
-                            ],
-                        ) ?>"><?= icon('heart', 'text-xl mr-1 text-gray-400 group-hover:text-red-600') . lang(
-                            'Comment.likes',
-                            [
-                                'numberOfLikes' => $comment->likes_count,
-                            ],
-                        ) ?></button>
+                        'Comment.likes',
+                        [
+                            'numberOfLikes' => $comment->likes_count,
+                        ],
+                    ) ?>"><?= icon('heart', 'text-xl mr-1 text-gray-400 group-hover:text-red-600') . lang(
+                        'Comment.likes',
+                        [
+                            'numberOfLikes' => $comment->likes_count,
+                        ],
+                    ) ?></button>
                 </form>
                 <?php else: ?>
                     <button class="inline-flex items-center opacity-50 cursor-not-allowed" title="<?= lang(
-                            'Comment.likes',
-                            [
-                                'numberOfLikes' => $comment->likes_count,
-                            ],
-                        ) ?>"><?= icon('heart', 'text-xl mr-1 text-skin-muted') . lang(
-                            'Comment.likes',
-                            [
-                                'numberOfLikes' => $comment->likes_count,
-                            ],
-                        ) ?></button>
+                        'Comment.likes',
+                        [
+                            'numberOfLikes' => $comment->likes_count,
+                        ],
+                    ) ?>"><?= icon('heart', 'text-xl mr-1 text-skin-muted') . lang(
+                        'Comment.likes',
+                        [
+                            'numberOfLikes' => $comment->likes_count,
+                        ],
+                    ) ?></button>
                 <?php endif; ?>
             </footer>
         <?php endif; ?>
diff --git a/themes/cp_app/episode/_partials/comment_reply_actions.php b/themes/cp_app/episode/_partials/comment_reply_actions.php
index 837f73d5..f4f3464e 100644
--- a/themes/cp_app/episode/_partials/comment_reply_actions.php
+++ b/themes/cp_app/episode/_partials/comment_reply_actions.php
@@ -4,31 +4,31 @@
             <?= csrf_field() ?>
 
             <button type="submit" name="action" class="inline-flex items-center hover:underline group" title="<?= lang(
-    'Comment.likes',
-    [
-        'numberOfLikes' => $reply->likes_count,
-    ],
-) ?>"><?= icon('heart', 'text-lg mr-1 text-gray-400 group-hover:text-red-600') . $reply->likes_count ?></button>
+                'Comment.likes',
+                [
+                    'numberOfLikes' => $reply->likes_count,
+                ],
+            ) ?>"><?= icon('heart', 'text-lg mr-1 text-gray-400 group-hover:text-red-600') . $reply->likes_count ?></button>
             <Button uri="<?= route_to('episode-comment', esc($reply->episode->podcast->handle), esc($reply->episode->slug), $reply->id) ?>" size="small"><?= lang('Comment.reply') ?></Button>
         </form>
     <?php else: ?>
         <button type="submit" name="action" class="inline-flex items-center opacity-50 cursor-not-allowed" disabled="disabled" title="<?= lang(
-    'Comment.likes',
-    [
-        'numberOfLikes' => $reply->likes_count,
-    ],
-) ?>"><?= icon('heart', 'text-lg mr-1 text-skin-muted') . $reply->likes_count ?></button>
+            'Comment.likes',
+            [
+                'numberOfLikes' => $reply->likes_count,
+            ],
+        ) ?>"><?= icon('heart', 'text-lg mr-1 text-skin-muted') . $reply->likes_count ?></button>
             <?php if ($reply->replies_count): ?>
                     <?= anchor(
-    route_to('episode-comment', esc($reply->episode->podcast->handle), esc($reply->episode->slug), $reply->id),
-    icon('chat', 'text-2xl mr-1 opacity-40') . $reply->replies_count,
-    [
-        'class' => 'inline-flex items-center hover:underline',
-        'title' => lang('Comment.replies', [
-            'numberOfReplies' => $reply->replies_count,
-        ]),
-    ],
-) ?>
+                        route_to('episode-comment', esc($reply->episode->podcast->handle), esc($reply->episode->slug), $reply->id),
+                        icon('chat', 'text-2xl mr-1 opacity-40') . $reply->replies_count,
+                        [
+                            'class' => 'inline-flex items-center hover:underline',
+                            'title' => lang('Comment.replies', [
+                                'numberOfReplies' => $reply->replies_count,
+                            ]),
+                        ],
+                    ) ?>
             <?php endif; ?>
     <?php endif; ?>
 </footer>
diff --git a/themes/cp_app/episode/comment.php b/themes/cp_app/episode/comment.php
index 18d26a11..a7a54ce6 100644
--- a/themes/cp_app/episode/comment.php
+++ b/themes/cp_app/episode/comment.php
@@ -5,9 +5,9 @@
     <nav class="mb-2">
         <a href="<?= route_to('episode', esc($podcast->handle), esc($episode->slug)) ?>"
         class="inline-flex items-center px-4 py-2 text-sm focus:ring-accent"><?= icon(
-    'arrow-left',
-    'mr-2 text-lg',
-) . lang('Comment.back_to_comments') ?></a>
+            'arrow-left',
+            'mr-2 text-lg',
+        ) . lang('Comment.back_to_comments') ?></a>
     </nav>
     <div class="pb-12">
         <?= $this->include('episode/_partials/comment_with_replies') ?>
diff --git a/themes/cp_app/home.php b/themes/cp_app/home.php
index b04f2994..aa6eedda 100644
--- a/themes/cp_app/home.php
+++ b/themes/cp_app/home.php
@@ -39,8 +39,8 @@
     <header class="py-8 text-white border-b bg-header border-subtle">
         <h1 class="container flex items-center justify-between px-2 py-4 mx-auto">
             <a href="<?= route_to(
-            'home',
-        ) ?>" class="inline-flex items-baseline text-3xl font-semibold font-display"><?= service('settings')
+                'home',
+            ) ?>" class="inline-flex items-baseline text-3xl font-semibold font-display"><?= service('settings')
         ->get('App.siteName') === 'Castopod' ? 'castopod' .
     svg('castopod-logo-base', 'h-6 ml-2') : esc(service('settings')
         ->get('App.siteName')) ?></a>
@@ -49,29 +49,29 @@
     <main class="container flex-1 px-4 py-10 mx-auto">
         <div class="flex flex-wrap items-center justify-between py-2 border-b border-subtle gap-x-4">
             <Heading tagName="h2" class="inline-block"><?= lang('Home.all_podcasts') ?> (<?= count(
-            $podcasts,
-        ) ?>)</Heading>
+                $podcasts,
+            ) ?>)</Heading>
             <button class="inline-flex items-center px-2 py-1 text-sm font-semibold focus:ring-accent" id="sortby-dropdown" data-dropdown="button" data-dropdown-target="sortby-dropdown-menu" aria-haspopup="true" aria-expanded="false"><?= icon('sort', 'mr-1 text-xl opacity-50') . lang('Home.sort_by') ?></button>
             <DropdownMenu id="sortby-dropdown-menu" labelledby="sortby-dropdown" items="<?= esc(json_encode([
-                [
-                    'type' => 'link',
-                    'title' => ($sortBy === 'activity' ? '✓ ' : '') . lang('Home.sort_options.activity'),
-                    'uri' => route_to('home') . '?sort=activity',
-                    'class' => $sortBy === 'activity' ? 'font-semibold' : '',
-                ],
-                [
-                    'type' => 'link',
-                    'title' => ($sortBy === 'created_desc' ? '✓ ' : '') . lang('Home.sort_options.created_desc'),
-                    'uri' => route_to('home') . '?sort=created_desc',
-                    'class' => $sortBy === 'created_desc' ? 'font-semibold' : '',
-                ],
-                [
-                    'type' => 'link',
-                    'title' => ($sortBy === 'created_asc' ? '✓ ' : '') . lang('Home.sort_options.created_asc'),
-                    'uri' => route_to('home') . '?sort=created_asc',
-                    'class' => $sortBy === 'created_asc' ? 'font-semibold' : '',
-                ],
-            ])) ?>" />
+                    [
+                        'type' => 'link',
+                        'title' => ($sortBy === 'activity' ? '✓ ' : '') . lang('Home.sort_options.activity'),
+                        'uri' => route_to('home') . '?sort=activity',
+                        'class' => $sortBy === 'activity' ? 'font-semibold' : '',
+                    ],
+                    [
+                        'type' => 'link',
+                        'title' => ($sortBy === 'created_desc' ? '✓ ' : '') . lang('Home.sort_options.created_desc'),
+                        'uri' => route_to('home') . '?sort=created_desc',
+                        'class' => $sortBy === 'created_desc' ? 'font-semibold' : '',
+                    ],
+                    [
+                        'type' => 'link',
+                        'title' => ($sortBy === 'created_asc' ? '✓ ' : '') . lang('Home.sort_options.created_asc'),
+                        'uri' => route_to('home') . '?sort=created_asc',
+                        'class' => $sortBy === 'created_asc' ? 'font-semibold' : '',
+                    ],
+                ])) ?>" />
         </div>
         <div class="grid gap-4 mt-4 grid-cols-cards">
             <?php if ($podcasts): ?>
@@ -105,8 +105,8 @@
     <footer class="container flex justify-between px-2 py-4 mx-auto text-sm text-right border-t border-subtle">
         <?= render_page_links() ?>
         <small><?= lang('Common.powered_by', [
-            'castopod' =>
-                '<a class="inline-flex font-semibold hover:underline focus:ring-accent" href="https://castopod.org/" target="_blank" rel="noreferrer noopener">Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '</a>',
-        ], null, false) ?></small>
+                'castopod' =>
+                    '<a class="inline-flex font-semibold hover:underline focus:ring-accent" href="https://castopod.org/" target="_blank" rel="noreferrer noopener">Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '</a>',
+            ], null, false) ?></small>
     </footer>
 </body>
diff --git a/themes/cp_app/pages/_layout.php b/themes/cp_app/pages/_layout.php
index 0e3134fe..466d9a94 100644
--- a/themes/cp_app/pages/_layout.php
+++ b/themes/cp_app/pages/_layout.php
@@ -42,9 +42,9 @@
         <div class="container flex flex-col items-start px-2 py-4 mx-auto">
             <a href="<?= route_to('home') ?>"
             class="inline-flex items-center mb-2 text-sm focus:ring-accent"><?= icon(
-            'arrow-left',
-            'mr-2',
-        ) . lang('Page.back_to_home') ?></a>
+                'arrow-left',
+                'mr-2',
+            ) . lang('Page.back_to_home') ?></a>
             <Heading tagName="h1" size="large"><?= esc($page->title) ?></Heading>
         </div>
     </header>
@@ -54,8 +54,8 @@
     <footer class="container flex justify-between px-2 py-4 mx-auto text-sm text-right border-t border-subtle">
         <?= render_page_links() ?>
         <small><?= lang('Common.powered_by', [
-            'castopod' =>
-                '<a class="underline hover:no-underline focus:ring-accent" href="https://castopod.org/" target="_blank" rel="noreferrer noopener">Castopod</a>',
-        ], null, false) ?></small>
+                'castopod' =>
+                    '<a class="underline hover:no-underline focus:ring-accent" href="https://castopod.org/" target="_blank" rel="noreferrer noopener">Castopod</a>',
+            ], null, false) ?></small>
     </footer>
 </body>
diff --git a/themes/cp_app/pages/map.php b/themes/cp_app/pages/map.php
index 228f1488..a0629f7b 100644
--- a/themes/cp_app/pages/map.php
+++ b/themes/cp_app/pages/map.php
@@ -45,9 +45,9 @@
         <div class="container flex flex-col items-start px-2 py-4 mx-auto">
             <a href="<?= route_to('home') ?>"
             class="inline-flex items-center mb-2 text-sm focus:ring-accent"><?= icon(
-            'arrow-left',
-            'mr-2',
-        ) . lang('Page.back_to_home') ?></a>
+                'arrow-left',
+                'mr-2',
+            ) . lang('Page.back_to_home') ?></a>
             <Heading tagName="h1" size="large"><?= lang('Page.map.title') ?></Heading>
         </div>
     </header>
@@ -57,8 +57,8 @@
     <footer class="container flex justify-between px-2 py-4 mx-auto text-sm text-right">
         <?= render_page_links() ?>
         <small><?= lang('Common.powered_by', [
-            'castopod' =>
-                '<a class="inline-flex font-semibold hover:underline focus:ring-accent" href="https://castopod.org/" target="_blank" rel="noreferrer noopener">Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '</a>',
-        ], null, false) ?></small>
+                'castopod' =>
+                    '<a class="inline-flex font-semibold hover:underline focus:ring-accent" href="https://castopod.org/" target="_blank" rel="noreferrer noopener">Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '</a>',
+            ], null, false) ?></small>
     </footer> 
 </body>
diff --git a/themes/cp_app/podcast/_layout.php b/themes/cp_app/podcast/_layout.php
index 2136465a..372002ab 100644
--- a/themes/cp_app/podcast/_layout.php
+++ b/themes/cp_app/podcast/_layout.php
@@ -62,18 +62,18 @@
                 <button class="inline-flex items-center px-4 text-xs font-semibold leading-8 tracking-wider text-red-600 uppercase bg-white rounded-full shadow hover:text-red-500 focus:ring-accent" data-toggle="funding-links" data-toggle-class="hidden"><Icon glyph="heart" class="mr-2 text-sm"></Icon><?= lang('Podcast.sponsor') ?></button>
             <?php endif; ?>
             <?= anchor_popup(
-                        route_to('follow', esc($podcast->handle)),
-                        icon(
-                            'social/castopod',
-                            'mr-2 text-xl text-black/75 group-hover:text-black',
-                        ) . lang('Podcast.follow'),
-                        [
-                            'width' => 420,
-                            'height' => 620,
-                            'class' =>
-                                'group inline-flex items-center px-4 text-xs tracking-wider font-semibold text-black uppercase rounded-full leading-8 shadow focus:ring-accent bg-white',
-                        ],
-                    ) ?>
+                route_to('follow', esc($podcast->handle)),
+                icon(
+                    'social/castopod',
+                    'mr-2 text-xl text-black/75 group-hover:text-black',
+                ) . lang('Podcast.follow'),
+                [
+                    'width' => 420,
+                    'height' => 620,
+                    'class' =>
+                        'group inline-flex items-center px-4 text-xs tracking-wider font-semibold text-black uppercase rounded-full leading-8 shadow focus:ring-accent bg-white',
+                ],
+            ) ?>
         </div>
     </header>
     <?= $this->include('podcast/_partials/navigation') ?>
diff --git a/themes/cp_app/podcast/_partials/funding_links_modal.php b/themes/cp_app/podcast/_partials/funding_links_modal.php
index 25bfcbce..d2d0e0c7 100644
--- a/themes/cp_app/podcast/_partials/funding_links_modal.php
+++ b/themes/cp_app/podcast/_partials/funding_links_modal.php
@@ -26,10 +26,10 @@
                     rel="noopener noreferrer"
                     class="inline-flex items-center w-full font-semibold text-accent-base hover:text-accent-hover focus:ring-accent">
                     <?= icon(
-                esc($fundingPlatform->slug),
-                'mr-2 flex-shrink-0',
-                $fundingPlatform->type
-            ) . '<span class="truncate">' . esc($fundingPlatform->link_url) . '</span>' ?>
+                        esc($fundingPlatform->slug),
+                        'mr-2 flex-shrink-0',
+                        $fundingPlatform->type
+                    ) . '<span class="truncate">' . esc($fundingPlatform->link_url) . '</span>' ?>
                     </a>
                 <?php endif; ?>
             <?php endforeach; ?>
diff --git a/themes/cp_app/podcast/_partials/premium_banner.php b/themes/cp_app/podcast/_partials/premium_banner.php
index 69b6e636..b49c7dad 100644
--- a/themes/cp_app/podcast/_partials/premium_banner.php
+++ b/themes/cp_app/podcast/_partials/premium_banner.php
@@ -4,8 +4,8 @@ if ($podcast->is_premium): ?>
     <?php
         $isUnlocked = service('premium_podcasts')
             ->isUnlocked($podcast->handle);
-        $shownIcon = $isUnlocked ? 'lock-unlock' : 'lock';
-        $hiddenIcon = $isUnlocked ? 'lock' : 'lock-unlock';
+    $shownIcon = $isUnlocked ? 'lock-unlock' : 'lock';
+    $hiddenIcon = $isUnlocked ? 'lock' : 'lock-unlock';
     ?>
     <div class="flex flex-col items-center justify-between col-start-2 px-2 py-1 mt-2 sm:px-1 md:mt-4 rounded-conditional-full gap-y-2 sm:flex-row bg-accent-base gap-x-2 text-accent-contrast">
         <p class="inline-flex items-center text-sm md:pl-4 gap-x-2"><?= $isUnlocked ? lang('PremiumPodcasts.banner_lock') : lang('PremiumPodcasts.banner_unlock') ?></p>
diff --git a/themes/cp_app/podcast/_partials/sidebar.php b/themes/cp_app/podcast/_partials/sidebar.php
index ead51a4b..7a70ba3f 100644
--- a/themes/cp_app/podcast/_partials/sidebar.php
+++ b/themes/cp_app/podcast/_partials/sidebar.php
@@ -14,20 +14,20 @@
         <?php foreach ($podcast->socialPlatforms as $socialPlatform): ?>
             <?php if ($socialPlatform->is_visible): ?>
                 <?= anchor(
-            esc($socialPlatform->link_url),
-            icon(
-                esc($socialPlatform->slug),
-                '',
-                $socialPlatform->type
-            ),
-            [
-                'class' => 'text-2xl text-skin-muted hover:text-skin-base w-8 h-8 items-center inline-flex justify-center',
-                'target' => '_blank',
-                'rel' => 'noopener noreferrer',
-                'data-tooltip' => 'bottom',
-                'title' => $socialPlatform->label,
-            ],
-        ) ?>
+                    esc($socialPlatform->link_url),
+                    icon(
+                        esc($socialPlatform->slug),
+                        '',
+                        $socialPlatform->type
+                    ),
+                    [
+                        'class' => 'text-2xl text-skin-muted hover:text-skin-base w-8 h-8 items-center inline-flex justify-center',
+                        'target' => '_blank',
+                        'rel' => 'noopener noreferrer',
+                        'data-tooltip' => 'bottom',
+                        'title' => $socialPlatform->label,
+                    ],
+                ) ?>
             <?php endif; ?>
         <?php endforeach; ?>
         </div>
@@ -41,20 +41,20 @@
             <?php foreach ($podcast->podcastingPlatforms as $podcastingPlatform): ?>
                 <?php if ($podcastingPlatform->is_visible): ?>
                     <?= anchor(
-            esc($podcastingPlatform->link_url),
-            icon(
-                esc($podcastingPlatform->slug),
-                '',
-                $podcastingPlatform->type
-            ),
-            [
-                'class' => 'text-2xl text-skin-muted hover:text-skin-base w-8 h-8 items-center inline-flex justify-center',
-                'target' => '_blank',
-                'rel' => 'noopener noreferrer',
-                'data-tooltip' => 'bottom',
-                'title' => $podcastingPlatform->label,
-            ],
-        ) ?>
+                        esc($podcastingPlatform->link_url),
+                        icon(
+                            esc($podcastingPlatform->slug),
+                            '',
+                            $podcastingPlatform->type
+                        ),
+                        [
+                            'class' => 'text-2xl text-skin-muted hover:text-skin-base w-8 h-8 items-center inline-flex justify-center',
+                            'target' => '_blank',
+                            'rel' => 'noopener noreferrer',
+                            'data-tooltip' => 'bottom',
+                            'title' => $podcastingPlatform->label,
+                        ],
+                    ) ?>
                 <?php endif; ?>
             <?php endforeach; ?>
         </div>
@@ -64,9 +64,9 @@
             <div class="flex flex-col">
                 <p><?= esc($podcast->copyright) ?></p>
                 <p><?= lang('Common.powered_by', [
-                    'castopod' =>
-                        '<a class="inline-flex font-semibold text-skin-muted hover:underline focus:ring-accent" href="https://castopod.org" target="_blank" rel="noreferrer noopener">Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '</a>',
-                ], null, false) ?></p>
+                                'castopod' =>
+                                    '<a class="inline-flex font-semibold text-skin-muted hover:underline focus:ring-accent" href="https://castopod.org" target="_blank" rel="noreferrer noopener">Castopod' . icon('castopod', 'ml-1 text-lg', 'social') . '</a>',
+                            ], null, false) ?></p>
             </div>
         </footer>
     </div>
diff --git a/themes/cp_app/podcast/about.php b/themes/cp_app/podcast/about.php
index 4a721c98..7909f3ba 100644
--- a/themes/cp_app/podcast/about.php
+++ b/themes/cp_app/podcast/about.php
@@ -22,9 +22,10 @@
                     <?php $i = 0; ?>
                     <?php foreach ($podcast->persons as $person): ?>
                         <img src="<?= $person->avatar->thumbnail_url ?>" alt="<?= esc($person->full_name) ?>" class="object-cover w-8 -ml-4 border-2 rounded-full aspect-square bg-header border-background-base last:ml-0" loading="lazy" />
-                        <?php $i++; if ($i === 3) {
-    break;
-}?>
+                        <?php $i++;
+                        if ($i === 3) {
+                            break;
+                        }?>
                     <?php endforeach; ?>
                 </span>
                 <?= lang('Podcast.persons', [
diff --git a/themes/cp_app/podcast/episodes.php b/themes/cp_app/podcast/episodes.php
index faf65931..d9920194 100644
--- a/themes/cp_app/podcast/episodes.php
+++ b/themes/cp_app/podcast/episodes.php
@@ -24,16 +24,16 @@
             <nav id="episode-lists-dropdown-menu" class="flex flex-col py-2 rounded-lg shadow border-3 border-contrast bg-elevated" aria-labelledby="episode-lists-dropdown" data-dropdown="menu" data-dropdown-placement="bottom-end">
                 <?php foreach ($episodesNav as $link): ?>
                     <?= anchor(
-    $link['route'],
-    $link['label'] . ' (' . $link['number_of_episodes'] . ')',
-    [
-        'class' =>
-            'px-2 py-1 whitespace-nowrap hover:bg-highlight ' .
-            ($link['is_active']
-                ? 'font-semibold'
-                : 'text-skin-muted hover:text-skin-base'),
-    ],
-) ?>
+                        $link['route'],
+                        $link['label'] . ' (' . $link['number_of_episodes'] . ')',
+                        [
+                            'class' =>
+                                'px-2 py-1 whitespace-nowrap hover:bg-highlight ' .
+                                ($link['is_active']
+                                    ? 'font-semibold'
+                                    : 'text-skin-muted hover:text-skin-base'),
+                        ],
+                    ) ?>
                 <?php endforeach; ?>
             </nav>
         <?php endif; ?>
@@ -41,15 +41,15 @@
     <div class="flex flex-col mt-4 gap-y-4">
         <?php foreach ($episodes as $episode): ?>
             <?= view('episode/_partials/card', [
-                'episode' => $episode,
-                'podcast' => $podcast,
-            ]) ?>
+                                    'episode' => $episode,
+                                    'podcast' => $podcast,
+                                ]) ?>
         <?php endforeach; ?>
     </div>
 <?php else: ?>
     <h1 class="px-4 mb-2 text-xl text-center"><?= lang(
-                'Podcast.no_episode',
-            ) ?></h1>
+        'Podcast.no_episode',
+    ) ?></h1>
 <?php endif; ?>
 
 <?= $this->endSection()
diff --git a/themes/cp_app/post/_partials/actions.php b/themes/cp_app/post/_partials/actions.php
index 721ef7b0..ffb13974 100644
--- a/themes/cp_app/post/_partials/actions.php
+++ b/themes/cp_app/post/_partials/actions.php
@@ -3,122 +3,122 @@
         <form action="<?= route_to('post-attempt-action', esc(interact_as_actor()->username), $post->id) ?>" method="POST" class="flex justify-around w-full">
             <?= csrf_field() ?>
             <?= anchor(
-    route_to('post', esc($podcast->handle), $post->id),
-    icon('chat', 'text-2xl mr-1 opacity-40') . $post->replies_count,
-    [
-        'class' => 'inline-flex items-center hover:underline',
-        'title' => lang('Post.replies', [
-            'numberOfReplies' => $post->replies_count,
-        ]),
-    ],
-) ?>
+                route_to('post', esc($podcast->handle), $post->id),
+                icon('chat', 'text-2xl mr-1 opacity-40') . $post->replies_count,
+                [
+                    'class' => 'inline-flex items-center hover:underline',
+                    'title' => lang('Post.replies', [
+                        'numberOfReplies' => $post->replies_count,
+                    ]),
+                ],
+            ) ?>
             <button type="submit" name="action" value="reblog" class="inline-flex items-center hover:underline" title="<?= lang(
-    'Post.reblogs',
-    [
-        'numberOfReblogs' => $post->reblogs_count,
-    ],
-) ?>"><?= icon('repeat', 'text-2xl mr-1 opacity-40') .
-        $post->reblogs_count ?></button>
+                'Post.reblogs',
+                [
+                    'numberOfReblogs' => $post->reblogs_count,
+                ],
+            ) ?>"><?= icon('repeat', 'text-2xl mr-1 opacity-40') .
+                    $post->reblogs_count ?></button>
             <button type="submit" name="action" value="favourite" class="inline-flex items-center hover:underline" title="<?= lang(
-            'Post.favourites',
-            [
-                'numberOfFavourites' => $post->favourites_count,
-            ],
-        ) ?>"><?= icon('heart', 'text-2xl mr-1 opacity-40') .
-        $post->favourites_count ?></button>
+                'Post.favourites',
+                [
+                    'numberOfFavourites' => $post->favourites_count,
+                ],
+            ) ?>"><?= icon('heart', 'text-2xl mr-1 opacity-40') .
+            $post->favourites_count ?></button>
             <button id="<?= $post->id .
-                '-more-dropdown' ?>" type="button" class="px-2 py-1 text-2xl text-skin-muted focus:ring-accent" data-dropdown="button" data-dropdown-target="<?= $post->id .
-        '-more-dropdown-menu' ?>" aria-label="<?= lang(
-            'Common.more',
-        ) ?>" aria-haspopup="true" aria-expanded="false"><?= icon('more') ?>
+            '-more-dropdown' ?>" type="button" class="px-2 py-1 text-2xl text-skin-muted focus:ring-accent" data-dropdown="button" data-dropdown-target="<?= $post->id .
+            '-more-dropdown-menu' ?>" aria-label="<?= lang(
+                'Common.more',
+            ) ?>" aria-haspopup="true" aria-expanded="false"><?= icon('more') ?>
             </button>
         </form>
         <nav id="<?= $post->id .
-            '-more-dropdown-menu' ?>" class="flex flex-col py-2 text-sm rounded-lg shadow border-3 border-subtle bg-elevated" aria-labelledby="<?= $post->id .
-        '-more-dropdown' ?>" data-dropdown="menu" data-dropdown-placement="bottom">
+                '-more-dropdown-menu' ?>" class="flex flex-col py-2 text-sm rounded-lg shadow border-3 border-subtle bg-elevated" aria-labelledby="<?= $post->id .
+            '-more-dropdown' ?>" data-dropdown="menu" data-dropdown-placement="bottom">
             <?= anchor(
-            route_to('post', esc($podcast->handle), $post->id),
-            lang('Post.expand'),
-            [
-                'class' => 'px-4 py-1 hover:bg-highlight',
-            ],
-        ) ?>
+                route_to('post', esc($podcast->handle), $post->id),
+                lang('Post.expand'),
+                [
+                    'class' => 'px-4 py-1 hover:bg-highlight',
+                ],
+            ) ?>
             <form action="<?= route_to(
-            'post-attempt-block-actor',
-            esc(interact_as_actor()
-                ->username),
-            $post->id,
-        ) ?>" method="POST">
+                'post-attempt-block-actor',
+                esc(interact_as_actor()
+                    ->username),
+                $post->id,
+            ) ?>" method="POST">
                 <?= csrf_field() ?>
                 <button class="w-full px-4 py-1 text-left hover:bg-highlight"><?= lang(
-            'Post.block_actor',
-            [
-                'actorUsername' => esc($post->actor->username),
-            ],
-        ) ?></button>
+                    'Post.block_actor',
+                    [
+                        'actorUsername' => esc($post->actor->username),
+                    ],
+                ) ?></button>
             </form>
             <form action="<?= route_to(
-            'post-attempt-block-domain',
-            esc(interact_as_actor()
+                'post-attempt-block-domain',
+                esc(interact_as_actor()
                 ->username),
-            $post->id,
-        ) ?>" method="POST">
+                $post->id,
+            ) ?>" method="POST">
                 <?= csrf_field() ?>
                 <button class="w-full px-4 py-1 text-left hover:bg-highlight"><?= lang(
-            'Post.block_domain',
-            [
-                'actorDomain' => esc($post->actor->domain),
-            ],
-        ) ?></button>
+                    'Post.block_domain',
+                    [
+                        'actorDomain' => esc($post->actor->domain),
+                    ],
+                ) ?></button>
             </form>
             <?php if ($post->actor->is_local): ?>
                 <hr class="my-2 border-subtle" />
                 <form action="<?= route_to(
-            'post-attempt-delete',
-            esc($post->actor->username),
-            $post->id,
-        ) ?>" method="POST">
+                    'post-attempt-delete',
+                    esc($post->actor->username),
+                    $post->id,
+                ) ?>" method="POST">
                     <?= csrf_field() ?>
                     <button class="w-full px-4 py-1 font-semibold text-left text-red-600 hover:bg-highlight"><?= lang(
-            'Post.delete',
-        ) ?></button>
+                        'Post.delete',
+                    ) ?></button>
                 </form>
             <?php endif; ?>
         </nav>
     <?php else: ?>
     <?= anchor(
-            route_to('post', esc($podcast->handle), $post->id),
-            icon('chat', 'text-2xl mr-1 opacity-40') . $post->replies_count,
-            [
-                'class' => 'inline-flex items-center hover:underline',
-                'title' => lang('Post.replies', [
-                    'numberOfReplies' => $post->replies_count,
-                ]),
-            ],
-        ) ?>
+        route_to('post', esc($podcast->handle), $post->id),
+        icon('chat', 'text-2xl mr-1 opacity-40') . $post->replies_count,
+        [
+            'class' => 'inline-flex items-center hover:underline',
+            'title' => lang('Post.replies', [
+                'numberOfReplies' => $post->replies_count,
+            ]),
+        ],
+    ) ?>
     <?= anchor_popup(
-            route_to('post-remote-action', esc($podcast->handle), $post->id, 'reblog'),
-            icon('repeat', 'text-2xl mr-1 opacity-40') . $post->reblogs_count,
-            [
-                'class' => 'inline-flex items-center hover:underline',
-                'width' => 420,
-                'height' => 620,
-                'title' => lang('Post.reblogs', [
-                    'numberOfReblogs' => $post->reblogs_count,
-                ]),
-            ],
-        ) ?>
+        route_to('post-remote-action', esc($podcast->handle), $post->id, 'reblog'),
+        icon('repeat', 'text-2xl mr-1 opacity-40') . $post->reblogs_count,
+        [
+            'class' => 'inline-flex items-center hover:underline',
+            'width' => 420,
+            'height' => 620,
+            'title' => lang('Post.reblogs', [
+                'numberOfReblogs' => $post->reblogs_count,
+            ]),
+        ],
+    ) ?>
     <?= anchor_popup(
-            route_to('post-remote-action', esc($podcast->handle), $post->id, 'favourite'),
-            icon('heart', 'text-2xl mr-1 opacity-40') . $post->favourites_count,
-            [
-                'class' => 'inline-flex items-center hover:underline',
-                'width' => 420,
-                'height' => 620,
-                'title' => lang('Post.favourites', [
-                    'numberOfFavourites' => $post->favourites_count,
-                ]),
-            ],
-        ) ?>
+        route_to('post-remote-action', esc($podcast->handle), $post->id, 'favourite'),
+        icon('heart', 'text-2xl mr-1 opacity-40') . $post->favourites_count,
+        [
+            'class' => 'inline-flex items-center hover:underline',
+            'width' => 420,
+            'height' => 620,
+            'title' => lang('Post.favourites', [
+                'numberOfFavourites' => $post->favourites_count,
+            ]),
+        ],
+    ) ?>
     <?php endif; ?>
 </footer>
diff --git a/themes/cp_app/post/_partials/post_with_replies.php b/themes/cp_app/post/_partials/post_with_replies.php
index 21ed54dd..e3c58031 100644
--- a/themes/cp_app/post/_partials/post_with_replies.php
+++ b/themes/cp_app/post/_partials/post_with_replies.php
@@ -37,17 +37,17 @@ if ($post->in_reply_to_id): ?>
             </form>
         <?php else: ?>
             <?= anchor_popup(
-                            route_to('post-remote-action', esc($podcast->handle), $post->id, 'reply'),
-                            lang('Post.reply_to', [
-                                'actorUsername' => esc($post->actor->username),
-                            ]),
-                            [
-                                'class' =>
-                                    'text-center justify-center font-semibold rounded-full shadow relative z-10 px-4 py-2 w-full bg-accent-base text-accent-contrast inline-flex items-center hover:bg-accent-hover',
-                                'width' => 420,
-                                'height' => 620,
-                            ],
-                        ) ?>
+                route_to('post-remote-action', esc($podcast->handle), $post->id, 'reply'),
+                lang('Post.reply_to', [
+                    'actorUsername' => esc($post->actor->username),
+                ]),
+                [
+                    'class' =>
+                        'text-center justify-center font-semibold rounded-full shadow relative z-10 px-4 py-2 w-full bg-accent-base text-accent-contrast inline-flex items-center hover:bg-accent-hover',
+                    'width' => 420,
+                    'height' => 620,
+                ],
+            ) ?>
         <?php endif; ?>
     </div>
 
diff --git a/themes/cp_app/post/_partials/preview_card.php b/themes/cp_app/post/_partials/preview_card.php
index 552331ce..f3a6d48d 100644
--- a/themes/cp_app/post/_partials/preview_card.php
+++ b/themes/cp_app/post/_partials/preview_card.php
@@ -5,9 +5,9 @@ if ($preview_card->type === 'image'): ?>
     <?php if ($preview_card->image): ?>
     <div class="relative group">
         <?= icon(
-    'external-link',
-    'absolute inset-0 m-auto text-6xl bg-accent-base bg-opacity-50 group-hover:bg-opacity-100 text-accent-contrast rounded-full p-2',
-) ?>
+            'external-link',
+            'absolute inset-0 m-auto text-6xl bg-accent-base bg-opacity-50 group-hover:bg-opacity-100 text-accent-contrast rounded-full p-2',
+        ) ?>
         <img src="<?= $preview_card->image ?>" alt="<?= esc($preview_card->title) ?>" class="object-cover w-full aspect-video" loading="lazy" />
     </div>
     <?php endif; ?>
@@ -21,9 +21,9 @@ if ($preview_card->type === 'image'): ?>
     <?php if ($preview_card->image): ?>
     <div class="relative group">
         <?= icon(
-    'play',
-    'absolute inset-0 m-auto text-6xl bg-accent-base bg-opacity-50 group-hover:bg-opacity-100 text-accent-contrast rounded-full p-2',
-) ?>
+            'play',
+            'absolute inset-0 m-auto text-6xl bg-accent-base bg-opacity-50 group-hover:bg-opacity-100 text-accent-contrast rounded-full p-2',
+        ) ?>
         <img class="object-cover w-full aspect-video" src="<?= $preview_card->image ?>" alt="<?= esc($preview_card->title) ?>" loading="lazy" />
     </div>
     <?php endif; ?>
diff --git a/themes/cp_app/post/_partials/reblog.php b/themes/cp_app/post/_partials/reblog.php
index 70d6c003..220f3310 100644
--- a/themes/cp_app/post/_partials/reblog.php
+++ b/themes/cp_app/post/_partials/reblog.php
@@ -1,44 +1,32 @@
 <article class="relative z-10 w-full shadow bg-elevated rounded-conditional-2xl">
     <p class="inline-flex px-6 pt-4 text-xs text-skin-muted"><?= icon(
-    'repeat',
-    'text-lg mr-2 opacity-40',
-) .
-        lang('Post.actor_shared', [
-            'actor' => esc($post->actor->display_name),
-        ]) ?></p>
+        'repeat',
+        'text-lg mr-2 opacity-40',
+    ) . lang('Post.actor_shared', [
+        'actor' => esc($post->actor->display_name),
+    ]) ?></p>
     <header class="flex px-6 py-4 gap-x-2">
-        <img src="<?= $post->actor
-            ->avatar_image_url ?>" alt="<?= esc($post->actor->display_name) ?>" class="w-10 h-10 rounded-full aspect-square" loading="lazy" />
+        <img src="<?= $post->actor->avatar_image_url ?>" alt="<?= esc($post->actor->display_name) ?>" class="w-10 h-10 rounded-full aspect-square" loading="lazy" />
         <div class="flex flex-col min-w-0">
-            <a href="<?= $post->actor
-            ->uri ?>" class="flex items-baseline hover:underline" <?= $post
-            ->actor->is_local
-    ? ''
-    : 'target="_blank" rel="noopener noreferrer"' ?>>
-                <span class="mr-2 font-semibold truncate"><?= esc($post->actor
-        ->display_name) ?></span>
-                <span class="text-sm truncate text-skin-muted">@<?= esc($post->actor
-        ->username) .
-                    ($post->actor->is_local
-                        ? ''
-                        : '@' . $post->actor->domain) ?></span>
+            <a href="<?= $post->actor->uri ?>" class="flex items-baseline hover:underline" <?= $post->actor->is_local ? '' : 'target="_blank" rel="noopener noreferrer"' ?>>
+                <span class="mr-2 font-semibold truncate"><?= esc($post->actor->display_name) ?></span>
+                <span class="text-sm truncate text-skin-muted">@<?= esc($post->actor->username) . ($post->actor->is_local ? '' : '@' . $post->actor->domain) ?></span>
             </a>
-            <a href="<?= route_to('post', esc($podcast->handle), $post->id) ?>"
-            class="text-xs text-skin-muted">
+            <a href="<?= route_to('post', esc($podcast->handle), $post->id) ?>" class="text-xs text-skin-muted">
                 <?= relative_time($post->published_at) ?>
             </a>
         </div>
     </header>
     <div class="px-6 mb-4 post-content"><?= $post->message_html ?></div>
-    <?php if ($post->episode_id): ?>
+    <?php if ($post->episode_id) : ?>
         <?= view('episode/_partials/preview_card', [
-            'index' => $index,
-            'episode' => $post->episode,
-        ]) ?>
-    <?php elseif ($post->preview_card_id): ?>
+                'index' => $index,
+                'episode' => $post->episode,
+            ]) ?>
+    <?php elseif ($post->preview_card_id) : ?>
         <?= view('post/_partials/preview_card', [
-            'preview_card' => $post->preview_card,
-        ]) ?>
+                'preview_card' => $post->preview_card,
+            ]) ?>
     <?php endif; ?>
     <?= $this->include('post/_partials/actions') ?>
 </article>
diff --git a/themes/cp_app/post/_partials/reply_actions.php b/themes/cp_app/post/_partials/reply_actions.php
index 0e2b853f..fce6befb 100644
--- a/themes/cp_app/post/_partials/reply_actions.php
+++ b/themes/cp_app/post/_partials/reply_actions.php
@@ -5,85 +5,85 @@ if (can_user_interact()): ?>
         <form action="<?= route_to('post-attempt-action', esc(interact_as_actor()->username), $reply->id) ?>" method="POST" class="flex items-start gap-x-6">
             <?= csrf_field() ?>
             <?= anchor(
-    route_to('post', esc($podcast->handle), $reply->id),
-    icon('chat', 'text-lg mr-1 opacity-40') . $reply->replies_count,
-    [
-        'class' => 'inline-flex items-center hover:underline text-sm',
-        'title' => lang('Post.replies', [
-            'numberOfReplies' => $reply->replies_count,
-        ]),
-    ],
-) ?>
-            <button type="submit" name="action" value="reblog" class="inline-flex items-center text-sm hover:underline" title="<?= lang(
-    'Post.reblogs',
-    [
-        'numberOfReblogs' => $reply->reblogs_count,
-    ],
-) ?>"><?= icon('repeat', 'text-lg mr-1 opacity-40') .
-            $reply->reblogs_count ?></button>
-                <button type="submit" name="action" value="favourite" class="inline-flex items-center text-sm hover:underline" title="<?= lang(
-                'Post.favourites',
+                route_to('post', esc($podcast->handle), $reply->id),
+                icon('chat', 'text-lg mr-1 opacity-40') . $reply->replies_count,
                 [
-                    'numberOfFavourites' => $reply->favourites_count,
+                    'class' => 'inline-flex items-center hover:underline text-sm',
+                    'title' => lang('Post.replies', [
+                        'numberOfReplies' => $reply->replies_count,
+                    ]),
                 ],
-            ) ?>"><?= icon('heart', 'text-lg mr-1 opacity-40') .
-            $reply->favourites_count ?></button>
+            ) ?>
+            <button type="submit" name="action" value="reblog" class="inline-flex items-center text-sm hover:underline" title="<?= lang(
+                'Post.reblogs',
+                [
+                    'numberOfReblogs' => $reply->reblogs_count,
+                ],
+            ) ?>"><?= icon('repeat', 'text-lg mr-1 opacity-40') .
+                        $reply->reblogs_count ?></button>
+                <button type="submit" name="action" value="favourite" class="inline-flex items-center text-sm hover:underline" title="<?= lang(
+                    'Post.favourites',
+                    [
+                        'numberOfFavourites' => $reply->favourites_count,
+                    ],
+                ) ?>"><?= icon('heart', 'text-lg mr-1 opacity-40') .
+                $reply->favourites_count ?></button>
                 <button id="<?= $reply->id .
-                    '-more-dropdown' ?>" type="button" class="text-xl text-skin-muted focus:ring-accent" data-dropdown="button" data-dropdown-target="<?= $reply->id .
-            '-more-dropdown-menu' ?>" aria-label="<?= lang(
-                'Common.more',
-            ) ?>" aria-haspopup="true" aria-expanded="false"><?= icon('more') ?>
+                '-more-dropdown' ?>" type="button" class="text-xl text-skin-muted focus:ring-accent" data-dropdown="button" data-dropdown-target="<?= $reply->id .
+                '-more-dropdown-menu' ?>" aria-label="<?= lang(
+                    'Common.more',
+                ) ?>" aria-haspopup="true" aria-expanded="false"><?= icon('more') ?>
                 </button>
         </form>
         <nav id="<?= $reply->id .
-            '-more-dropdown-menu' ?>" class="flex flex-col py-2 text-sm rounded-lg shadow border-3 border-subtle bg-elevated" aria-labelledby="<?= $reply->id .
+                '-more-dropdown-menu' ?>" class="flex flex-col py-2 text-sm rounded-lg shadow border-3 border-subtle bg-elevated" aria-labelledby="<?= $reply->id .
         '-more-dropdown' ?>" data-dropdown="menu" data-dropdown-placement="bottom">
             <?= anchor(
-            route_to('post', esc($podcast->handle), $reply->id),
-            lang('Post.expand'),
-            [
-                'class' => 'px-4 py-1 hover:bg-highlight',
-            ],
-        ) ?>
+                route_to('post', esc($podcast->handle), $reply->id),
+                lang('Post.expand'),
+                [
+                    'class' => 'px-4 py-1 hover:bg-highlight',
+                ],
+            ) ?>
             <form action="<?= route_to(
-            'post-attempt-block-actor',
-            esc(interact_as_actor()
-                ->username),
-            $reply->id,
-        ) ?>" method="POST">
+                'post-attempt-block-actor',
+                esc(interact_as_actor()
+                    ->username),
+                $reply->id,
+            ) ?>" method="POST">
                 <?= csrf_field() ?>
                 <button class="w-full px-4 py-1 text-left hover:bg-highlight"><?= lang(
-            'Post.block_actor',
-            [
-                'actorUsername' => esc($reply->actor->username),
-            ],
-        ) ?></button>
+                    'Post.block_actor',
+                    [
+                        'actorUsername' => esc($reply->actor->username),
+                    ],
+                ) ?></button>
             </form>
             <form action="<?= route_to(
-            'post-attempt-block-domain',
-            esc(interact_as_actor()
+                'post-attempt-block-domain',
+                esc(interact_as_actor()
                 ->username),
-            $reply->id,
-        ) ?>" method="POST">
+                $reply->id,
+            ) ?>" method="POST">
                 <?= csrf_field() ?>
                 <button class="w-full px-4 py-1 text-left hover:bg-highlight"><?= lang(
-            'Post.block_domain',
-            [
-                'actorDomain' => esc($reply->actor->domain),
-            ],
-        ) ?></button>
+                    'Post.block_domain',
+                    [
+                        'actorDomain' => esc($reply->actor->domain),
+                    ],
+                ) ?></button>
             </form>
             <?php if ($reply->actor->is_local): ?>
                 <hr class="my-2 border-subtle" />
                 <form action="<?= route_to(
-            'post-attempt-delete',
-            esc($reply->actor->username),
-            $reply->id,
-        ) ?>" method="POST">
+                    'post-attempt-delete',
+                    esc($reply->actor->username),
+                    $reply->id,
+                ) ?>" method="POST">
                     <?= csrf_field() ?>
                     <button class="w-full px-4 py-1 font-semibold text-left text-red-600 hover:bg-highlight"><?= lang(
-            'Post.delete',
-        ) ?></button>
+                        'Post.delete',
+                    ) ?></button>
                 </form>
             <?php endif; ?>
         </nav>
diff --git a/themes/cp_app/post/post.php b/themes/cp_app/post/post.php
index 47a09e6a..a0a6998c 100644
--- a/themes/cp_app/post/post.php
+++ b/themes/cp_app/post/post.php
@@ -4,18 +4,18 @@
 <nav class="py-2">
     <a href="<?= route_to('podcast-activity', esc($podcast->handle)) ?>"
     class="inline-flex items-center px-4 py-2 text-sm focus:ring-accent"><?= icon(
-    'arrow-left',
-    'mr-2 text-lg',
-) .
+        'arrow-left',
+        'mr-2 text-lg',
+    ) .
         lang('Post.back_to_actor_posts', [
-            'actor' => esc($post->actor->display_name),
-        ]) ?></a>
+                'actor' => esc($post->actor->display_name),
+            ]) ?></a>
 </nav>
 <div class="pb-12">
     <?= view('post/_partials/post_with_replies', [
-        'index' => 1,
-        'post' => $post,
-        'podcast' => $podcast,
-    ]) ?>
+            'index' => 1,
+            'post' => $post,
+            'podcast' => $podcast,
+        ]) ?>
 </div>
 <?= $this->endSection() ?>
diff --git a/themes/cp_auth/_layout.php b/themes/cp_auth/_layout.php
index 166dff03..f000eae4 100644
--- a/themes/cp_auth/_layout.php
+++ b/themes/cp_auth/_layout.php
@@ -18,15 +18,15 @@
 <body class="flex flex-col items-center justify-center min-h-screen mx-auto bg-base">
 	<header class="mb-4">
 		<a href="<?= route_to(
-            'home',
-        ) ?>" class="inline-flex items-baseline text-4xl font-bold font-display text-accent-base focus:ring-accent">
+		    'home',
+		) ?>" class="inline-flex items-baseline text-4xl font-bold font-display text-accent-base focus:ring-accent">
 			<?= 'castopod' . svg('castopod-logo', 'h-8 ml-2') ?>
 		</a>
 	</header>
 	<main class="flex flex-col w-full max-w-md px-6 py-4 mx-auto rounded-lg bg-elevated border-3 border-subtle gap-y-4">
 		<Heading tagName="h1" size="large" class="self-center"><?= $this->renderSection(
-            'title',
-        ) ?></Heading>
+		    'title',
+		) ?></Heading>
 		<?= view('_message_block') ?>
 		<?= $this->renderSection('content') ?>
 	</main>
diff --git a/themes/cp_auth/register.php b/themes/cp_auth/register.php
index c8eeccc2..af5e06df 100644
--- a/themes/cp_auth/register.php
+++ b/themes/cp_auth/register.php
@@ -53,10 +53,10 @@
 
 <p class="py-4 text-sm text-center">
     <?= lang(
-    'Auth.haveAccount',
-) ?> <a class="underline hover:no-underline" href="<?= route_to(
-    'login',
-) ?>"><?= lang('Auth.login') ?></a>
+        'Auth.haveAccount',
+    ) ?> <a class="underline hover:no-underline" href="<?= route_to(
+        'login',
+    ) ?>"><?= lang('Auth.login') ?></a>
 </p>
 
 <?= $this->endSection() ?>
diff --git a/themes/cp_install/cache_config.php b/themes/cp_install/cache_config.php
index abc477e0..093f3e16 100644
--- a/themes/cp_install/cache_config.php
+++ b/themes/cp_install/cache_config.php
@@ -12,8 +12,8 @@
     </div>
 
     <p class="mt-2 text-sm text-skin-muted"><?= lang(
-    'Install.form.cache_config_hint',
-) ?></p>
+        'Install.form.cache_config_hint',
+    ) ?></p>
 </div>
 
 <Forms.Field
@@ -21,10 +21,10 @@
     name="cache_handler"
     label="<?= lang('Install.form.cache_handler') ?>"
     options="<?= esc(json_encode([
-        'file' => lang('Install.form.cacheHandlerOptions.file'),
-        'redis' => lang('Install.form.cacheHandlerOptions.redis'),
-        'predis' => lang('Install.form.cacheHandlerOptions.predis'),
-    ])) ?>"
+            'file' => lang('Install.form.cacheHandlerOptions.file'),
+            'redis' => lang('Install.form.cacheHandlerOptions.redis'),
+            'predis' => lang('Install.form.cacheHandlerOptions.predis'),
+        ])) ?>"
     selected="file"
     required="true" />
 
diff --git a/themes/cp_install/database_config.php b/themes/cp_install/database_config.php
index 90a4f550..2357d659 100644
--- a/themes/cp_install/database_config.php
+++ b/themes/cp_install/database_config.php
@@ -9,13 +9,13 @@
     <div class="flex items-center">
         <span class="inline-flex items-center justify-center w-12 h-12 mr-2 text-sm font-semibold tracking-wider border-4 rounded-full text-accent-base border-accent-base">2/4</span>
         <Heading tagName="h1"><?= lang(
-    'Install.form.database_config',
-) ?></Heading>
+            'Install.form.database_config',
+        ) ?></Heading>
     </div>
 
     <p class="mt-2 text-sm text-skin-muted"><?= lang(
-    'Install.form.database_config_hint',
-) ?></p>
+        'Install.form.database_config_hint',
+    ) ?></p>
 </div>
 
 <Forms.Field