From 2e28c6ad000e55eecb469481b15ee004462f4ccc Mon Sep 17 00:00:00 2001
From: HugoFara <github@hugofara.net>
Date: Wed, 4 Nov 2026 13:36:09 +0100
Subject: [PATCH] fix: smooth out sign-in, Add Text, activity counts and dark
 theme

Problems found while testing 3.8.0 on production with real data.

- Sign-in pages are one centred card. They no longer repeat the logo and
  title above a form that was about 195px wide.
- The "Email not verified" banner and profile notice skip accounts with no
  email address.
- The Gutenberg browser waits until it is on screen, and library previews
  count separately, so they cannot make saving a text fail with HTTP 429.
- Terms added from the reader count as created, and a text counts as read
  once a day rather than on every page load.
- A new term's translation appears under the word without a reload.
- Dark theme: readable annotations and home and starter cards, and dark
  empty days on the activity calendar.
- Anki import pages no longer show their heading twice.
---
 CHANGELOG.md                                  | 26 ++++++++++
 src/Modules/Home/Views/index.php              |  8 ++--
 src/Modules/Text/Http/TextReadController.php  | 28 ++++++++++-
 src/Modules/User/Domain/User.php              | 12 +++++
 src/Modules/User/Views/profile.php            |  2 +-
 .../Services/WordDiscoveryService.php         |  3 ++
 .../Vocabulary/Http/TermCrudApiHandler.php    |  3 ++
 .../Vocabulary/Views/anki_deck_mapping.php    |  1 -
 .../Vocabulary/Views/anki_deck_result.php     |  1 -
 .../Vocabulary/Views/anki_deck_upload.php     |  1 -
 src/Modules/Vocabulary/Views/apkg_import.php  |  1 -
 .../Vocabulary/Views/starter_vocab.php        |  4 +-
 src/Modules/Vocabulary/Views/upload_form.php  |  2 +-
 src/Shared/Http/BaseController.php            |  6 ++-
 .../Middleware/RateLimitMiddleware.php        |  9 +++-
 src/Shared/UI/Helpers/PageLayoutHelper.php    | 23 +++++++--
 src/frontend/css/base/styles.css              | 47 +++++++++++++++++++
 .../activity/components/calendar_heatmap.ts   |  8 +++-
 .../text/pages/reading/text_renderer.ts       | 17 ++++++-
 .../js/modules/text/pages/text_suggestions.ts | 27 +++++++++--
 .../js/modules/user/pages/profile_app.ts      |  5 ++
 tests/backend/Core/Entity/UserTest.php        | 17 +++++++
 .../Middleware/RateLimitMiddlewareTest.php    | 14 ++++++
 tests/frontend/reading/text_renderer.test.ts  | 25 ++++++++++
 24 files changed, 266 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e876dde0..1302bc23a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,32 @@ ones are marked like "v1.0.0-fork".
 
 ## [Unreleased]
 
+### Changed in Unreleased
+
+* **The sign-in pages are one centred card** on every screen size. Login,
+  registration and password recovery no longer repeat the logo and title
+  above a narrow form.
+
+### Fixed in Unreleased
+
+* The "Email not verified" banner no longer follows accounts that have no
+  email address.
+
+* Opening the Add Text page no longer loads every suggested Gutenberg book
+  in the background, and book previews have their own request quota, so
+  they cannot make saving a text fail with "Too Many Requests".
+
+* Terms added from the reader now count towards "terms created", and a text
+  counts as read once a day rather than on every page load.
+
+* A new term's translation appears under the word straight away, not after
+  a reload.
+
+* Dark theme: readable reader annotations, home cards and starter vocabulary
+  cards, and a darker background for empty days on the activity calendar.
+
+* The Anki import pages no longer show their heading twice.
+
 ## [3.8.0-fork] - 2026-11-03
 
 ### Added in 3.8.0-fork
diff --git a/src/Modules/Home/Views/index.php b/src/Modules/Home/Views/index.php
index 2886db5de..8ff8c0dec 100644
--- a/src/Modules/Home/Views/index.php
+++ b/src/Modules/Home/Views/index.php
@@ -109,7 +109,7 @@ class="delete"
             <!-- Current text card -->
             <div style="flex-shrink: 0;">
                 <template x-if="lastText">
-                    <div class="box has-background-link-light" style="width: 280px; min-height: 180px;">
+                    <div class="box has-background-link-soft" style="width: 280px; min-height: 180px;">
                         <p dir="auto" class="title is-5 mb-3" x-text="lastText.title"></p>
                         <!-- Statistics bar - colors match word status highlights -->
                         <div
@@ -194,7 +194,7 @@ class="button is-success is-light is-small"
             <div style="flex-shrink: 0;">
                 <a
                     href="<?php echo $base; ?>/texts/new"
-                    class="box has-background-primary-light has-text-centered"
+                    class="box has-background-primary-soft has-text-centered"
                     style="width: 180px; min-height: 180px; display: flex;
                         flex-direction: column; justify-content: center; align-items: center;"
                 >
@@ -209,12 +209,12 @@ class="box has-background-primary-light has-text-centered"
             <div style="flex-shrink: 0;">
                 <div
                     data-action="open-library-search"
-                    class="box has-background-warning-light has-text-centered"
+                    class="box has-background-warning-soft has-text-centered"
                     style="width: 180px; min-height: 180px; display: flex;
                         flex-direction: column; justify-content: center; align-items: center;
                         cursor: pointer;"
                 >
-                    <span class="icon is-large has-text-warning-dark">
+                    <span class="icon is-large has-text-warning">
                         <i data-lucide="search" style="width: 48px; height: 48px;"></i>
                     </span>
                     <p class="mt-3 has-text-weight-semibold"><?= __('home.search_library') ?></p>
diff --git a/src/Modules/Text/Http/TextReadController.php b/src/Modules/Text/Http/TextReadController.php
index 6a5dfb1fd..8a9c38415 100644
--- a/src/Modules/Text/Http/TextReadController.php
+++ b/src/Modules/Text/Http/TextReadController.php
@@ -94,6 +94,32 @@ public function getTextIdFromRequest(?int $injectedId = null): ?int
         return null;
     }
 
+    /**
+     * Count a text as read once per day, however often its page is opened.
+     *
+     * @param int $textId Text ID
+     *
+     * @return void
+     */
+    private function countTextAsRead(int $textId): void
+    {
+        $today = date('Y-m-d');
+        /** @var mixed $counted */
+        $counted = $_SESSION['texts_read_counted'] ?? null;
+        if (!is_array($counted) || ($counted['date'] ?? null) !== $today) {
+            $counted = ['date' => $today, 'ids' => []];
+        }
+        /** @var list<int> $ids */
+        $ids = is_array($counted['ids'] ?? null) ? $counted['ids'] : [];
+        if (in_array($textId, $ids, true)) {
+            return;
+        }
+
+        $ids[] = $textId;
+        $_SESSION['texts_read_counted'] = ['date' => $today, 'ids' => $ids];
+        (new MySqlActivityRepository())->incrementTextsRead();
+    }
+
     /**
      * Render the text reading page.
      *
@@ -110,7 +136,7 @@ public function renderReadPage(int $textId): ?RedirectResponse
             return $this->redirect('/text/edit');
         }
 
-        (new MySqlActivityRepository())->incrementTextsRead();
+        $this->countTextAsRead($textId);
 
         $title = (string) $headerData['TxTitle'];
         $langId = (int) $headerData['TxLgID'];
diff --git a/src/Modules/User/Domain/User.php b/src/Modules/User/Domain/User.php
index d3106c0fe..bfda2f665 100644
--- a/src/Modules/User/Domain/User.php
+++ b/src/Modules/User/Domain/User.php
@@ -591,6 +591,18 @@ public function isEmailVerified(): bool
         return $this->emailVerifiedAt !== null;
     }
 
+    /**
+     * Whether the user has an email address still waiting for verification.
+     *
+     * Email is optional, and an account without one has nothing to verify.
+     *
+     * @return bool
+     */
+    public function needsEmailVerification(): bool
+    {
+        return $this->email !== null && !$this->isEmailVerified();
+    }
+
     /**
      * Mark the email as verified.
      *
diff --git a/src/Modules/User/Views/profile.php b/src/Modules/User/Views/profile.php
index 989f8ca17..cdc9ef6ec 100644
--- a/src/Modules/User/Views/profile.php
+++ b/src/Modules/User/Views/profile.php
@@ -64,7 +64,7 @@
                         <?php echo $t('profile.email_verified'); ?>
                     </div>
                     <div class="notification is-warning is-light is-size-7 py-2 px-3 mb-4"
-                         x-show="!emailVerified" x-cloak>
+                         x-show="showsUnverifiedNotice()" x-cloak>
                         <?php echo $t('profile.email_not_verified'); ?>
                     </div>
 
diff --git a/src/Modules/Vocabulary/Application/Services/WordDiscoveryService.php b/src/Modules/Vocabulary/Application/Services/WordDiscoveryService.php
index 5c0677aff..2d8d36c5a 100644
--- a/src/Modules/Vocabulary/Application/Services/WordDiscoveryService.php
+++ b/src/Modules/Vocabulary/Application/Services/WordDiscoveryService.php
@@ -17,6 +17,7 @@
 
 namespace Lwt\Modules\Vocabulary\Application\Services;
 
+use Lwt\Modules\Activity\Infrastructure\MySqlActivityRepository;
 use Lwt\Shared\Infrastructure\Utilities\StringUtils;
 use Lwt\Shared\Infrastructure\Database\Connection;
 use Lwt\Shared\Infrastructure\Database\Escaping;
@@ -206,6 +207,8 @@ public function insertWordWithStatus(int $textId, string $term, int $status): ar
                 . ")";
 
             $wid = (int) Connection::preparedInsert($sql, $bindings);
+
+            (new MySqlActivityRepository())->incrementTermsCreated();
         } else {
             /** @var list<int|string> $updateBindings */
             $updateBindings = [$status, $wid];
diff --git a/src/Modules/Vocabulary/Http/TermCrudApiHandler.php b/src/Modules/Vocabulary/Http/TermCrudApiHandler.php
index 86c3a7fb1..8c1f6b065 100644
--- a/src/Modules/Vocabulary/Http/TermCrudApiHandler.php
+++ b/src/Modules/Vocabulary/Http/TermCrudApiHandler.php
@@ -24,6 +24,7 @@
 use Lwt\Shared\Infrastructure\Database\Maintenance;
 use Lwt\Shared\Infrastructure\Database\QueryBuilder;
 use Lwt\Shared\Infrastructure\Database\UserScopedQuery;
+use Lwt\Modules\Activity\Infrastructure\MySqlActivityRepository;
 use Lwt\Modules\Vocabulary\Application\VocabularyFacade;
 use Lwt\Modules\Vocabulary\Application\UseCases\FindSimilarTerms;
 use Lwt\Modules\Vocabulary\Application\Services\TermStatusService;
@@ -815,6 +816,8 @@ public function createTermFull(array $data): array
 
         $wordId = $stmt->insertId();
 
+        (new MySqlActivityRepository())->incrementTermsCreated();
+
         // Update text items to link to this word
         // word_occurrences inherits user context via Ti2TxID -> texts FK
         Connection::preparedExecute(
diff --git a/src/Modules/Vocabulary/Views/anki_deck_mapping.php b/src/Modules/Vocabulary/Views/anki_deck_mapping.php
index a7f2c2185..4511e1852 100644
--- a/src/Modules/Vocabulary/Views/anki_deck_mapping.php
+++ b/src/Modules/Vocabulary/Views/anki_deck_mapping.php
@@ -71,7 +71,6 @@
 };
 
 ?>
-<h1><?= __e('vocabulary.anki.deck.title') ?></h1>
 
 <?php if ($error !== null) { ?>
   <div class="notification is-danger"><?= htmlspecialchars($error, ENT_QUOTES, 'UTF-8') ?></div>
diff --git a/src/Modules/Vocabulary/Views/anki_deck_result.php b/src/Modules/Vocabulary/Views/anki_deck_result.php
index de2223881..d9dfa60db 100644
--- a/src/Modules/Vocabulary/Views/anki_deck_result.php
+++ b/src/Modules/Vocabulary/Views/anki_deck_result.php
@@ -37,7 +37,6 @@
 };
 
 ?>
-<h1><?= __e('vocabulary.anki.deck.title') ?></h1>
 
 <div class="notification is-success">
   <p><strong><?= __ne('vocabulary.anki.deck.imported', $result->created) ?></strong></p>
diff --git a/src/Modules/Vocabulary/Views/anki_deck_upload.php b/src/Modules/Vocabulary/Views/anki_deck_upload.php
index ca9d1e03a..d413c67b7 100644
--- a/src/Modules/Vocabulary/Views/anki_deck_upload.php
+++ b/src/Modules/Vocabulary/Views/anki_deck_upload.php
@@ -25,7 +25,6 @@
 assert($error === null || is_string($error));
 
 ?>
-<h1><?= __e('vocabulary.anki.deck.title') ?></h1>
 
 <?php if ($error !== null) { ?>
   <div class="notification is-danger"><?= htmlspecialchars($error, ENT_QUOTES, 'UTF-8') ?></div>
diff --git a/src/Modules/Vocabulary/Views/apkg_import.php b/src/Modules/Vocabulary/Views/apkg_import.php
index 9127d766d..a968818bd 100644
--- a/src/Modules/Vocabulary/Views/apkg_import.php
+++ b/src/Modules/Vocabulary/Views/apkg_import.php
@@ -56,7 +56,6 @@
     : 'vocabulary.anki.apkg.settings_export';
 
 ?>
-<h1><?= __e('vocabulary.anki.apkg.title') ?></h1>
 
 <?php if ($error !== null) { ?>
   <div class="notification is-danger"><?= htmlspecialchars($error, ENT_QUOTES, 'UTF-8') ?></div>
diff --git a/src/Modules/Vocabulary/Views/starter_vocab.php b/src/Modules/Vocabulary/Views/starter_vocab.php
index cc90b396e..9d61bb67b 100644
--- a/src/Modules/Vocabulary/Views/starter_vocab.php
+++ b/src/Modules/Vocabulary/Views/starter_vocab.php
@@ -94,7 +94,7 @@
             <?php if ($isAvailable) : ?>
             <!-- Wiktionary frequency words source -->
             <label class="box mb-3 p-4" style="cursor: pointer;"
-                   :class="useWiktionary ? 'has-background-success-light' : ''">
+                   :class="useWiktionary ? 'has-background-success-soft' : ''">
                 <div class="is-flex is-align-items-center">
                     <input type="checkbox" class="me-3"
                            :checked="useWiktionary"
@@ -129,7 +129,7 @@
             <!-- Curated dictionaries -->
             <template x-for="source in dictSources" :key="source.name">
                 <label class="box mb-3 p-4" style="cursor: pointer;"
-                       :class="isSourceSelected(source.url) ? 'has-background-success-light' : ''">
+                       :class="isSourceSelected(source.url) ? 'has-background-success-soft' : ''">
                     <div class="is-flex is-align-items-center">
                         <input type="checkbox" class="me-3"
                                :checked="isSourceSelected(source.url)"
diff --git a/src/Modules/Vocabulary/Views/upload_form.php b/src/Modules/Vocabulary/Views/upload_form.php
index cc5975f70..8e228c4b0 100644
--- a/src/Modules/Vocabulary/Views/upload_form.php
+++ b/src/Modules/Vocabulary/Views/upload_form.php
@@ -347,7 +347,7 @@ class="mb-3">
                 <h3 class="title is-5 mb-3" x-text="group.languageName"></h3>
                 <template x-for="source in group.sources" :key="source.name">
                     <label class="box mb-3 p-4" style="cursor: pointer;"
-                           :class="isSelected(source.url) ? 'has-background-success-light' : ''">
+                           :class="isSelected(source.url) ? 'has-background-success-soft' : ''">
                         <div class="is-flex is-align-items-center">
                             <input type="checkbox" class="me-3"
                                    :checked="isSelected(source.url)"
diff --git a/src/Shared/Http/BaseController.php b/src/Shared/Http/BaseController.php
index 64cfdf503..570e3587d 100644
--- a/src/Shared/Http/BaseController.php
+++ b/src/Shared/Http/BaseController.php
@@ -58,7 +58,11 @@ public function __construct()
      */
     protected function render(string $title, bool $showMenu = true): void
     {
-        PageLayoutHelper::renderPageStart($title, $showMenu);
+        if ($showMenu) {
+            PageLayoutHelper::renderPageStart($title, true);
+            return;
+        }
+        PageLayoutHelper::renderAuthPageStart($title);
     }
 
     /**
diff --git a/src/Shared/Infrastructure/Routing/Middleware/RateLimitMiddleware.php b/src/Shared/Infrastructure/Routing/Middleware/RateLimitMiddleware.php
index 43c0ee92b..0b3ce9b87 100644
--- a/src/Shared/Infrastructure/Routing/Middleware/RateLimitMiddleware.php
+++ b/src/Shared/Infrastructure/Routing/Middleware/RateLimitMiddleware.php
@@ -200,7 +200,7 @@ private function getClientIdentifier(): string
     /**
      * Get the endpoint type for rate limiting.
      *
-     * @return string Endpoint type: 'auth', 'whisper', or 'api'
+     * @return string Endpoint type: 'auth', 'whisper', 'preview', or 'api'
      */
     private function getEndpointType(): string
     {
@@ -223,6 +223,13 @@ private function getEndpointType(): string
             return 'whisper';
         }
 
+        // Library previews arrive in bursts, one per suggested book. They keep
+        // the default limit but count separately, so browsing books cannot
+        // use up the quota that saving a text needs.
+        if (preg_match('#/api(?:\.php)?/v1/texts/library-preview$#', $requestPath)) {
+            return 'preview';
+        }
+
         return 'api';
     }
 
diff --git a/src/Shared/UI/Helpers/PageLayoutHelper.php b/src/Shared/UI/Helpers/PageLayoutHelper.php
index f674e011c..a53459d5a 100644
--- a/src/Shared/UI/Helpers/PageLayoutHelper.php
+++ b/src/Shared/UI/Helpers/PageLayoutHelper.php
@@ -718,6 +718,22 @@ public static function renderPageStart(string $title, bool $close, string $curre
         echo self::buildPageTitle($title);
     }
 
+    /**
+     * Start a sign-in page.
+     *
+     * These pages carry their own logo and heading inside a centred card, so
+     * they take neither the page logo nor the page title.
+     *
+     * @param string $title Browser-tab title
+     *
+     * @return void
+     */
+    public static function renderAuthPageStart(string $title): void
+    {
+        self::renderPageStartNobody($title, 'auth-page');
+        echo '<main id="main-content">';
+    }
+
     /**
      * Build a compact UI-language switcher for the pre-login pages.
      *
@@ -860,8 +876,9 @@ public static function renderPageEnd(): void
     /**
      * Render a warning banner when the current user's email is not verified.
      *
-     * Only shows in multi-user mode when the user is authenticated
-     * but has not yet verified their email address.
+     * Only shows in multi-user mode when the user is authenticated and has an
+     * email address they have not yet verified. Email is optional at
+     * registration, and an account without one has nothing to verify.
      *
      * @return void
      */
@@ -879,7 +896,7 @@ public static function renderEmailVerificationBanner(): void
             return;
         }
 
-        if ($user === null || $user->isEmailVerified()) {
+        if ($user === null || !$user->needsEmailVerification()) {
             return;
         }
 
diff --git a/src/frontend/css/base/styles.css b/src/frontend/css/base/styles.css
index 43ed15e4b..826086e67 100644
--- a/src/frontend/css/base/styles.css
+++ b/src/frontend/css/base/styles.css
@@ -3306,3 +3306,50 @@ Searchable Select Component (Alpine.js)
     max-height: 190px;
   }
 }
+
+/* Reader annotations: the #006699 set in text_styles.ts is unreadable on black */
+@media (prefers-color-scheme: dark) {
+  :root:not([data-theme]) .word-ann {
+    color: #7cc4ff;
+  }
+}
+
+:root[data-theme="dark"] .word-ann {
+  color: #7cc4ff;
+}
+
+/* Sign-in pages: one centred card, on every screen size */
+.auth-page main {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-height: 100vh;
+  min-height: 100dvh;
+  padding: 0;
+}
+
+.auth-page .section {
+  padding: 1.5rem 1rem;
+}
+
+.auth-page .section > .container {
+  padding: 0;
+}
+
+.auth-page .section > .container > .columns {
+  display: flex;
+  justify-content: center;
+  margin: 0;
+}
+
+.auth-page .section > .container > .columns > .column {
+  flex: 0 1 26rem;
+  max-width: 26rem;
+  padding: 0;
+  width: 100%;
+}
+
+.auth-page .box h1.title {
+  border-bottom: none;
+  padding-bottom: 0;
+}
diff --git a/src/frontend/js/modules/activity/components/calendar_heatmap.ts b/src/frontend/js/modules/activity/components/calendar_heatmap.ts
index c7cd7ed9b..f3b89f1b9 100644
--- a/src/frontend/js/modules/activity/components/calendar_heatmap.ts
+++ b/src/frontend/js/modules/activity/components/calendar_heatmap.ts
@@ -236,7 +236,13 @@ export function calendarHeatmap(): CalendarHeatmapState {
         rect.setAttribute('width', String(CELL_SIZE));
         rect.setAttribute('height', String(CELL_SIZE));
         rect.setAttribute('rx', '2');
-        rect.setAttribute('fill', COLORS[colorLevel(day.total, maxVal)]);
+        const level = colorLevel(day.total, maxVal);
+        rect.setAttribute('fill', COLORS[level]);
+        if (level === 0) {
+          // A fill attribute cannot read a CSS variable, and this one follows
+          // the theme, so that a dark page does not show a wall of white.
+          rect.style.fill = 'var(--bulma-border, #ebedf0)';
+        }
 
         const label = formatTooltip(day);
         rect.addEventListener('mouseenter', (e: MouseEvent) => {
diff --git a/src/frontend/js/modules/text/pages/reading/text_renderer.ts b/src/frontend/js/modules/text/pages/reading/text_renderer.ts
index 4e0908200..dbd05a068 100644
--- a/src/frontend/js/modules/text/pages/reading/text_renderer.ts
+++ b/src/frontend/js/modules/text/pages/reading/text_renderer.ts
@@ -57,6 +57,9 @@ function shouldShowTransForStatus(status: number, displayStatTrans: number): boo
   }
 }
 
+/** Settings of the latest render, for words annotated after the fact. */
+let lastSettings: RenderSettings | null = null;
+
 /**
  * Build annotation span HTML for a word.
  *
@@ -64,7 +67,10 @@ function shouldShowTransForStatus(status: number, displayStatTrans: number): boo
  * @param settings Render settings
  * @returns Annotation span HTML or empty string
  */
-function buildAnnotationSpan(word: WordData, settings: RenderSettings): string {
+function buildAnnotationSpan(
+  word: Pick<WordData, 'translation' | 'status'>,
+  settings: RenderSettings
+): string {
   const { showLearning, displayStatTrans } = settings;
 
   // Check if annotations should be shown for this word
@@ -307,6 +313,7 @@ export function renderParseWarning(warning: ParseWarning | null): string {
 }
 
 export function renderText(words: WordData[], settings: RenderSettings): string {
+  lastSettings = settings;
   if (words.length === 0) return '';
 
   const parts: string[] = [];
@@ -518,6 +525,14 @@ export function updateWordTranslationInDOM(
       } else {
         annSpan.remove();
       }
+    } else if (translation && lastSettings) {
+      // A word that was unknown when the text rendered has no span yet.
+      const status = Number(el.getAttribute('data_status'));
+      const before = (lastSettings.modeTrans ?? 1) >= 3;
+      el.insertAdjacentHTML(
+        before ? 'afterbegin' : 'beforeend',
+        buildAnnotationSpan({ translation, status }, lastSettings)
+      );
     }
   });
 }
diff --git a/src/frontend/js/modules/text/pages/text_suggestions.ts b/src/frontend/js/modules/text/pages/text_suggestions.ts
index 03f632135..d6962bab9 100644
--- a/src/frontend/js/modules/text/pages/text_suggestions.ts
+++ b/src/frontend/js/modules/text/pages/text_suggestions.ts
@@ -99,9 +99,28 @@ export function gutenbergBrowserData(): GutenbergBrowserData {
     importing: null,
 
     init() {
-      const langId = getSelectedLanguageId();
-      if (langId > 0) {
-        this.fetchBooks(1);
+      let shown = false;
+      const start = () => {
+        shown = true;
+        if (getSelectedLanguageId() > 0) {
+          this.fetchBooks(1);
+        }
+      };
+
+      // The browser sits in the Add Text form from the start, hidden until
+      // the user picks Gutenberg, and each book it lists costs a request for
+      // its vocabulary stats. Hold off until it is actually on screen.
+      const root = document.querySelector('[x-data="gutenbergBrowser"]');
+      if (!root || typeof IntersectionObserver === 'undefined') {
+        start();
+      } else {
+        const observer = new IntersectionObserver((entries) => {
+          if (entries.some((entry) => entry.isIntersecting)) {
+            observer.disconnect();
+            start();
+          }
+        });
+        observer.observe(root);
       }
 
       // Re-fetch when language selector changes (delegated on document)
@@ -109,7 +128,7 @@ export function gutenbergBrowserData(): GutenbergBrowserData {
         this.books = [];
         this.page = 1;
         this.error = '';
-        if (newLangId > 0) {
+        if (shown && newLangId > 0) {
           this.fetchBooks(1);
         }
       });
diff --git a/src/frontend/js/modules/user/pages/profile_app.ts b/src/frontend/js/modules/user/pages/profile_app.ts
index e83bb052e..63133f327 100644
--- a/src/frontend/js/modules/user/pages/profile_app.ts
+++ b/src/frontend/js/modules/user/pages/profile_app.ts
@@ -18,6 +18,7 @@ export interface ProfileAppData {
   username: string;
   email: string;
   emailVerified: boolean;
+  showsUnverifiedNotice(): boolean;
   currentPassword: string;
   newPassword: string;
   confirmPassword: string;
@@ -76,6 +77,10 @@ export function profileAppData(): ProfileAppData {
       this.emailVerified = response.data.profile.emailVerified;
     },
 
+    showsUnverifiedNotice(): boolean {
+      return this.email !== '' && !this.emailVerified;
+    },
+
     async saveProfile(): Promise<void> {
       this.isSavingProfile = true;
       this.profileError = '';
diff --git a/tests/backend/Core/Entity/UserTest.php b/tests/backend/Core/Entity/UserTest.php
index 7b74e57df..ad1944ea9 100644
--- a/tests/backend/Core/Entity/UserTest.php
+++ b/tests/backend/Core/Entity/UserTest.php
@@ -87,6 +87,23 @@ public function testCreateUser(): void
         $this->assertInstanceOf(DateTimeImmutable::class, $user->created());
     }
 
+    public function testAnAccountWithoutEmailHasNothingToVerify(): void
+    {
+        $user = User::create('testuser', null, 'hashedpassword');
+
+        $this->assertFalse($user->needsEmailVerification());
+    }
+
+    public function testAnEmailNeedsVerifyingUntilItIsVerified(): void
+    {
+        $user = User::create('testuser', 'test@example.com', 'hashedpassword');
+        $this->assertTrue($user->needsEmailVerification());
+
+        $user->markEmailVerified();
+
+        $this->assertFalse($user->needsEmailVerification());
+    }
+
     public function testCreateUserTrimsInputs(): void
     {
         $user = User::create('  testuser  ', '  test@example.com  ', 'hashedpassword');
diff --git a/tests/backend/Shared/Infrastructure/Routing/Middleware/RateLimitMiddlewareTest.php b/tests/backend/Shared/Infrastructure/Routing/Middleware/RateLimitMiddlewareTest.php
index 89d0eb81c..f7e21ff04 100644
--- a/tests/backend/Shared/Infrastructure/Routing/Middleware/RateLimitMiddlewareTest.php
+++ b/tests/backend/Shared/Infrastructure/Routing/Middleware/RateLimitMiddlewareTest.php
@@ -176,6 +176,20 @@ public function testWhisperTranscribeGetsItsOwnBucket(): void
         $this->assertNotNull($this->storage->get('rate_limit:api:192.168.1.100'));
     }
 
+    public function testLibraryPreviewsCannotUseUpTheGeneralQuota(): void
+    {
+        $middleware = new RateLimitMiddleware($this->storage, 1, 60);
+
+        $_SERVER['REQUEST_URI'] = '/api/v1/texts/library-preview?url=x';
+        $this->assertTrue($middleware->handle());
+
+        $this->assertNotNull($this->storage->get('rate_limit:preview:192.168.1.100'));
+        $this->assertNull($this->storage->get('rate_limit:api:192.168.1.100'));
+
+        $_SERVER['REQUEST_URI'] = '/api/v1/texts';
+        $this->assertTrue($middleware->handle());
+    }
+
     public function testForwardedIpHeader(): void
     {
         $middleware = new RateLimitMiddleware($this->storage, 10, 60);
diff --git a/tests/frontend/reading/text_renderer.test.ts b/tests/frontend/reading/text_renderer.test.ts
index 9e4707d06..72c8f706d 100644
--- a/tests/frontend/reading/text_renderer.test.ts
+++ b/tests/frontend/reading/text_renderer.test.ts
@@ -349,6 +349,31 @@ describe('reading/text_renderer.ts', () => {
       expect(element.getAttribute('data_trans')).toBe('translation');
     });
 
+    it('adds the annotation to a word that had none when the text rendered', () => {
+      renderText([], {
+        showAll: false, showTranslations: true, rightToLeft: false, textSize: 100,
+        showLearning: true, displayStatTrans: 1, modeTrans: 1
+      } as RenderSettings);
+      document.body.innerHTML = '<span data_hex="123" data_status="1">word</span>';
+
+      updateWordTranslationInDOM('123', 'basket', '');
+
+      expect(document.querySelector('[data_hex="123"]')?.innerHTML)
+        .toBe('word<span class="word-ann">basket</span>');
+    });
+
+    it('leaves a word unannotated when its status is not annotated', () => {
+      renderText([], {
+        showAll: false, showTranslations: true, rightToLeft: false, textSize: 100,
+        showLearning: true, displayStatTrans: 1, modeTrans: 1
+      } as RenderSettings);
+      document.body.innerHTML = '<span data_hex="123" data_status="99">word</span>';
+
+      updateWordTranslationInDOM('123', 'basket', '');
+
+      expect(document.querySelector('.word-ann')).toBeNull();
+    });
+
     it('sets data_rom attribute', () => {
       document.body.innerHTML = '<span data_hex="123">word</span>';
       const element = document.querySelector('[data_hex="123"]') as HTMLElement;