Switch from window-size to render-output-size

Override the LETTERBOX logical presentation while the scroller is
active so it renders into the full physical window.  On a 1920x6480
rotated display the scroller now scrolls through all 6480 pixels of
vertical space instead of being confined to the 1920x1080 letterbox
region.  Text scale is unchanged (same font size, same pixel
rasterization); more lines are simply visible at once.

- onPush: save current logical presentation, switch to DISABLED with
  real window dimensions
- onPop: restore the saved LETTERBOX presentation
- resize handler in main.cpp: skip re-apply while scroller is active
  (it owns its own presentation and restores on pop)

.gitea/workflows/dev.yml

@@ -0,0 +1,68 @@
+name: build-dev
+on:
+  # Every push to dev: build, run the offline test suite, publish to the
+  # dev Attic cache.
+  push:
+    branches: [dev]
+jobs:
+  nix-build:
+    runs-on: build-server
+    steps:
+      # actions/checkout@v4 is unreliable on host-mode runners (its files are
+      # copied into the workspace instead of the repo), so clone explicitly.
+      - name: Checkout
+        run: |
+          rm -rf ./* ./.[!.]* 2>/dev/null || true
+          git config --global http.extraheader "Authorization: token ${{ github.token }}"
+          git clone --branch "${{ gitea.ref_name }}" \
+            "${{ gitea.server_url }}/${{ gitea.repository }}.git" .
+          test -f flake.nix
+          git log --oneline -1
+      - name: Inspect workspace
+        run: |
+          pwd
+          ls -la
+          git rev-parse --show-toplevel 2>&1 || true
+          git remote -v 2>&1 || true
+          git describe --tags --always 2>&1 || true
+          test -f flake.nix && echo "flake.nix present" || echo "NO flake.nix"
+      # Dev builds fingerprint as the short commit hash.
+      # Persisted via GITHUB_ENV so the impure nix eval below reads it via
+      # builtins.getEnv.
+      - name: Compute version
+        run: |
+          echo "APP_VERSION=$(git rev-parse --short HEAD)" >> "$GITHUB_ENV"
+      # checks is keyed per-system (checks.<system>.default); nix build's
+      # #attr shorthand can't resolve it, so resolve the current system inline.
+      # --impure lets the flake read APP_VERSION via builtins.getEnv
+      # (pure evals always get the package defaults).
+      - name: Build package
+        run: |
+          nix build -L ".#packages.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" \
+            --impure --out-link result-pkg
+      # The offline test suite runs in the check derivation's checkPhase.
+      # This is a separate build/output from the package itself.
+      - name: Build + offline test suite
+        run: |
+          nix build -L ".#checks.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" \
+            --impure --out-link result-checks
+      - name: Live portal tests
+        env:
+          RWT_LIVE_ACCOUNT_EMAIL: ${{ secrets.RWT_LIVE_ACCOUNT_EMAIL }}
+          RWT_LIVE_LICENSE_EMAIL: ${{ secrets.RWT_LIVE_LICENSE_EMAIL }}
+          RWT_LIVE_LICENSE_KEY: ${{ secrets.RWT_LIVE_LICENSE_KEY }}
+        run: |
+          nix develop --command bash -c '
+            cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+            cmake --build build --target test_api_client test_license_service
+            ./build/test_api_client
+            ./build/test_license_service
+          '
+      # Dev closure (the actual package, not the check output) lands in the
+      # dev cache.
+      - name: Push to Attic dev cache
+        env:
+          ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN_DEV }}
+        run: |
+          attic login radiantwave https://attic.radiantwavetech.com "$ATTIC_TOKEN"
+          attic push radiantwave:radiantwave-dev ./result-pkg

.gitea/workflows/main.yml

@@ -1,10 +1,8 @@
-name: build
+name: build-main
 
 on:
-  # Manual only for now. Select the branch to build when dispatching:
-  #   main -> APP_VERSION is the current git tag
-  #   dev  -> APP_VERSION is the current commit hash
-  # Both branches bake the portal API key from secrets.
+  # Manual only. Dispatch against main: build, run the offline test suite,
+  # publish to the release Attic cache.
   workflow_dispatch:
 
 jobs:
@@ -13,8 +11,8 @@ jobs:
     steps:
       # actions/checkout@v4 is unreliable on host-mode runners (its files are
       # copied into the workspace instead of the repo), so clone explicitly.
-      # A full clone (no --depth) is required so `git describe --tags` on main
-      # resolves the real nearest tag instead of falling back to a hash.
+      # A full clone (no --depth) is required so `git describe --tags` resolves
+      # the real nearest tag instead of falling back to a hash.
       - name: Checkout
         run: |
           rm -rf ./* ./.[!.]* 2>/dev/null || true
@@ -33,39 +31,30 @@ jobs:
           git describe --tags --always 2>&1 || true
           test -f flake.nix && echo "flake.nix present" || echo "NO flake.nix"
 
-      # Compute the version string baked into the binary's Home footer:
-      # main reports the git tag, dev reports the commit hash fingerprint.
-      # The key stays in the build step's environment (never echoed).
+      # Release builds report the current git tag.
+      # Persisted via GITHUB_ENV so the impure nix eval below reads it via
+      # builtins.getEnv.
       - name: Compute version
-        id: version
         run: |
-          if [ "${{ gitea.ref_name }}" = "main" ]; then
-            APP_VERSION="$(git describe --tags --always)"
-          else
-            APP_VERSION="$(git rev-parse --short HEAD)"
-          fi
-          echo "APP_VERSION=$APP_VERSION" >> "$GITHUB_ENV"
-          echo "Branch: ${{ gitea.ref_name }} -> APP_VERSION=$APP_VERSION"
-          if [ -n "${{ secrets.RWT_API_KEY }}" ]; then
-            echo "API key: provided via secret RWT_API_KEY"
-          else
-            echo "API key: NOT set (build proceeds without an Authorization header)"
-          fi
+          echo "APP_VERSION=$(git describe --tags --always)" >> "$GITHUB_ENV"
 
       # checks is keyed per-system (checks.<system>.default); nix build's
       # #attr shorthand can't resolve it, so resolve the current system inline.
-      # --impure lets the flake read APP_VERSION/API_KEY via builtins.getEnv
-      # (pure evals always get the package defaults). The offline test suite
-      # runs in the package's checkPhase.
+      # --impure lets the flake read APP_VERSION via builtins.getEnv
+      # (pure evals always get the package defaults).
+      - name: Build package
+        run: |
+          nix build -L ".#packages.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" \
+            --impure --out-link result-pkg
+      # The offline test suite runs in the check derivation's checkPhase.
+      # This is a separate build/output from the package itself.
       - name: Build + offline test suite
-        env:
-          API_KEY: ${{ secrets.RWT_API_KEY }}
-        run: nix build -L ".#checks.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" --impure
+        run: |
+          nix build -L ".#checks.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" \
+            --impure --out-link result-checks
 
       - name: Live portal tests
-        if: ${{ secrets.RWT_LIVE_API_KEY != '' }}
         env:
-          RWT_LIVE_API_KEY: ${{ secrets.RWT_LIVE_API_KEY }}
           RWT_LIVE_ACCOUNT_EMAIL: ${{ secrets.RWT_LIVE_ACCOUNT_EMAIL }}
           RWT_LIVE_LICENSE_EMAIL: ${{ secrets.RWT_LIVE_LICENSE_EMAIL }}
           RWT_LIVE_LICENSE_KEY: ${{ secrets.RWT_LIVE_LICENSE_KEY }}
@@ -76,3 +65,12 @@ jobs:
             ./build/test_api_client
             ./build/test_license_service
           '
+
+      # Release closure (the actual package, not the check output) lands in the
+      # release cache.
+      - name: Push to Attic release cache
+        env:
+          ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN_PROD }}
+        run: |
+          attic login radiantwave https://attic.radiantwavetech.com "$ATTIC_TOKEN"
+          attic push radiantwave:radiantwave ./result-pkg

AGENTS.md

@@ -33,23 +33,8 @@ cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DAPP_VERSION="1.2.3"
 The Nix package bakes `-DAPP_VERSION=<pkg version>` via `cmakeFlags` (`version`
 defaults to `0.1.0` in `nix/package.nix`; the flake overrides it from the
 `APP_VERSION` env var on impure evals). `nix develop`
-sets `APP_VERSION=dev` and exports `API_KEY` from the ambient environment
-(falling back to `RWT_LIVE_API_KEY`). CMake seeds a *fresh* configure from the
-`APP_VERSION` / `API_KEY` env vars; `-D` wins on reconfigure.
-
-The portal API key is also a build-time argument: `-DAPI_KEY="..."` (CMake) or
-`apiKey` on `callPackage` (Nix). It is compiled into the binary as the
-`Authorization: Bearer` token and defaults to empty (no auth header). Keep the
-real value in CI secrets, never in source — rotate by rebuilding with a new
-key.
-
-Version and API key can be baked in together with a single configure:
-
-```sh
-cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug \
-  -DAPP_VERSION="1.2.3" \
-  -DAPI_KEY="$API_KEY"
-```
+sets `APP_VERSION=dev`. CMake seeds a *fresh* configure from the
+`APP_VERSION` env var; `-D` wins on reconfigure.
 
 - The app resolves `assets/...` relative to its working directory — launch
   `./build/radiantwave` from the repo root. (The Nix wrapper chdirs to
@@ -238,14 +223,11 @@ cached.
   `checks` is keyed per-system, so the workflow resolves the current system
   via `nix eval --impure --expr 'builtins.currentSystem'`). The build bakes
   in a per-branch `APP_VERSION` — the current git tag on `main`, the current
-  commit hash on `dev` — plus the portal API key from the `RWT_API_KEY`
-  secret. The flake reads `APP_VERSION`/`API_KEY` from the environment via
+  commit hash on `dev`. The flake reads `APP_VERSION` from the environment via
   `builtins.getEnv`, so the build must pass `--impure` (pure evals get the
-  package defaults). When the `RWT_LIVE_API_KEY` secret is set it also runs
-  `test_api_client` / `test_license_service` against the portal via
-  `nix develop` (outside the sandbox, like a dev machine). Those live tests
-  also need `RWT_LIVE_ACCOUNT_EMAIL`, `RWT_LIVE_LICENSE_EMAIL`, and
-  `RWT_LIVE_LICENSE_KEY`.
+  package defaults). The live portal tests run from `nix develop` when the
+  `RWT_LIVE_*` secrets are set and need `RWT_LIVE_ACCOUNT_EMAIL`,
+  `RWT_LIVE_LICENSE_EMAIL`, and `RWT_LIVE_LICENSE_KEY`.
 - `test_assets` must pass before committing — it catches missing fonts/images
   that break the app at runtime.
 - `cmake --build build` builds everything; pass `--target <name>` to build one

CMakeLists.txt

@@ -18,20 +18,6 @@ else()
       "Version string shown in the Home footer (override at configure time)")
 endif()
 
-# API bearer key baked into the binary and sent as `Authorization: Bearer <key>`
-# on every portal request. Leave empty to send no auth header. Never commit the
-# real value — inject it at CI build time from a secret, e.g.:
-#   cmake ... -DAPI_KEY="${{ secrets.PORTAL_API_KEY }}"
-# The `nix develop` shell exports API_KEY from the ambient environment, which
-# seeds a fresh configure; -D wins on reconfigure.
-if(DEFINED ENV{API_KEY})
-  set(API_KEY "$ENV{API_KEY}" CACHE STRING
-      "Portal API key baked into the binary (leave empty to skip auth)")
-else()
-  set(API_KEY "" CACHE STRING
-      "Portal API key baked into the binary (leave empty to skip auth)")
-endif()
-
 find_package(SDL3 REQUIRED)
 find_package(SDL3_ttf REQUIRED)
 find_package(SDL3_image REQUIRED)
@@ -90,7 +76,6 @@ add_executable(radiantwave
 
 target_compile_definitions(radiantwave PRIVATE
     APP_VERSION="${APP_VERSION}"
-    API_KEY="${API_KEY}"
 )
 
 target_include_directories(radiantwave PRIVATE src)

README.md

@@ -136,45 +136,13 @@ If `APP_VERSION` is left unset the footer falls back to the project version
 from `CMakeLists.txt` (`project(... VERSION ...)`); a build that defines no
 version at all shows `unknown`. The Nix build sets `APP_VERSION` automatically
 to the flake package version, so a plain `nix build` needs no extra flags.
-With `--impure` the flake instead reads the `APP_VERSION` / `API_KEY`
-environment variables — this is how CI injects the version and portal key
+With `--impure` the flake instead reads the `APP_VERSION`
+environment variable — this is how CI injects the version
 (see the CI note under *Common Pitfalls*). Pure evals always get the package
 defaults, because `builtins.getEnv` cannot see the environment in pure
 evaluation mode.
 
-#### Portal API key
-
-Every portal request sends `Authorization: Bearer <key>`. The key is baked
-into the binary at build time via the `API_KEY` CMake cache variable. It is
-**optional** — when unset, requests go out without an auth header. Keep the
-real value out of the source tree and inject it at build time from your CI
-secret store so it never lands in `git`:
-
-```sh
-cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \
-  -DAPI_KEY="${{ secrets.PORTAL_API_KEY }}"
-cmake --build build
-```
-
-Rotate the key by building with a new value and shipping the new binary. The
-Nix package accepts the same value via `callPackage ./nix/package.nix {
-apiKey = "…"; }`, or via the `API_KEY` environment variable with
-`nix build --impure`; the flake itself never embeds one.
-
-#### Version + API key in one configure
-
-`APP_VERSION` and `API_KEY` are independent CMake cache variables, so pass
-both — plus the build type — in a single configure:
-
-```sh
-cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug \
-  -DAPP_VERSION="1.2.3" \
-  -DAPI_KEY="${{ secrets.PORTAL_API_KEY }}"
-cmake --build build
-```
-
-`-D` values always win over the `APP_VERSION` / `API_KEY` environment
-variables, which `nix develop` seeds from the ambient environment.
+#### Version in one configure
 
 ### Building with Nix
 
@@ -187,14 +155,14 @@ nix build .#packages.x86_64-linux.default  # needs a Linux machine/builders
 nix build .#packages.aarch64-linux.default
 ```
 
-To bake in a custom version and/or portal key, build impurely — the flake
-reads `APP_VERSION` and `API_KEY` from the environment on impure evals:
+To bake in a custom version, build impurely — the flake
+reads `APP_VERSION` from the environment on impure evals:
 
 ```sh
-APP_VERSION="1.2.3" API_KEY="$PORTAL_API_KEY" nix build --impure .#default
+APP_VERSION="1.2.3" nix build --impure .#default
 ```
 
-A pure `nix build` always uses the package defaults (`0.1.0`, no auth header)
+A pure `nix build` always uses the package defaults (`0.1.0`)
 even if those variables are set in your shell, because pure evaluation cannot
 see the environment. CI uses `--impure` to inject them.
 
@@ -633,9 +601,9 @@ status to decide which page to show.
   workflow is `.gitea/workflows/build.yml`. It is **manual-only**
   (`workflow_dispatch`) — pick the branch when dispatching. `main` builds bake
   the current git tag as `APP_VERSION`; `dev` builds bake the current commit
-  hash. Both pass the portal key from the `RWT_API_KEY` secret and build with
-  `nix build --impure` (which lets the flake's env injection work). The
-  offline test suite runs in the package's `checkPhase`; the live portal tests
-  run from `nix develop` when the `RWT_LIVE_*` secrets are set.
+  hash. Both build with `nix build --impure` (which lets the flake's env
+  injection work). The offline test suite runs in the package's `checkPhase`;
+  the live portal tests run from `nix develop` when the `RWT_LIVE_*` secrets
+  are set.
 - Asset tests (`test_assets`) must pass before committing -- they catch missing
   fonts and images that would break the app at runtime.

flake.nix

@@ -34,18 +34,16 @@
             };
           in
           {
-            # Version and API key are injected from the ambient environment on
-            # impure evals (CI sets APP_VERSION/API_KEY from the git ref and a
-            # secret). Pure evals (`nix flake check`, local `nix build`) can't
-            # see the environment, so builtins.getEnv returns "" and the
-            # package falls back to its 0.1.0 default / no auth header.
+            # Version is injected from the ambient environment on
+            # impure evals (CI sets APP_VERSION from the git ref). Pure evals
+            # (`nix flake check`, local `nix build`) can't see the
+            # environment, so builtins.getEnv returns "" and the package
+            # falls back to its 0.1.0 default.
             packages.default =
               let
                 envVersion = builtins.getEnv "APP_VERSION";
-                envApiKey = builtins.getEnv "API_KEY";
                 packageArgs =
-                  { apiKey = envApiKey; }
-                  // (nixpkgs.lib.optionalAttrs (envVersion != "") { version = envVersion; });
+                  nixpkgs.lib.optionalAttrs (envVersion != "") { version = envVersion; };
               in
               pkgs.callPackage ./nix/package.nix packageArgs;
 
@@ -53,22 +51,17 @@
               inputsFrom = [ self.packages.${system}.default ];
               packages = [ ];
               env = {
-                # APP_VERSION and API_KEY are CMake cache variables with no
-                # default; on a fresh configure cmake seeds their cache from
-                # environment variables of the same name, so a plain
-                # `cmake -S . -B build` bakes them into the binary.
+                # APP_VERSION is a CMake cache variable with no default; on a
+                # fresh configure cmake seeds its cache from the environment
+                # variable of the same name, so a plain `cmake -S . -B build`
+                # bakes it into the binary.
                 APP_VERSION = "dev";
               };
               shellHook = ''
-                # Never commit the real key. Export API_KEY (or the CI name
-                # RWT_LIVE_API_KEY) in your ambient environment and this shell
-                # picks it up; empty by default (no auth header).
-                export API_KEY="''${API_KEY:-''${RWT_LIVE_API_KEY:-}}"
-
-                echo "RadiantWave dev shell (APP_VERSION=dev, API_KEY=$([[ -n "$API_KEY" ]] && echo set || echo unset))"
+                echo "RadiantWave dev shell (APP_VERSION=dev)"
                 echo "  Configure: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug"
-                echo "  Bake version+key: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DAPP_VERSION=\"1.2.3\" -DAPI_KEY=\"<key>\""
-                echo "  Nix build (env version+key, impure): APP_VERSION=... API_KEY=... nix build --impure .#default"
+                echo "  Bake version:  cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DAPP_VERSION=\"1.2.3\""
+                echo "  Nix build (env version, impure): APP_VERSION=... nix build --impure .#default"
                 echo "  Build:     cmake --build build"
                 echo "  Run:       ./build/radiantwave"
                 echo "  Tests:     ./build/test_assets && ./build/test_<name>"

nix/package.nix

@@ -15,9 +15,6 @@
   curl,
   openssl,
   systemdLibs,
-  # Portal API key baked into the binary. Keep it out of the flake; pass it
-  # when calling callPackage from CI/your own config (see README "App version").
-  apiKey ? "",
   # App version baked into the Home footer's Version row. CI overrides this
   # per branch (git tag on main, commit hash on dev); local/pure builds keep
   # the 0.1.0 default.
@@ -54,10 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Bake the package version into the binary so the Home footer's Version row
   # shows it (CMake passes APP_VERSION through as a compile definition).
-  # API_KEY is only added when a non-empty key is supplied to callPackage.
-  cmakeFlags =
-    [ "-DAPP_VERSION=${finalAttrs.version}" ]
-    ++ lib.optionals (apiKey != "") [ "-DAPI_KEY=${apiKey}" ];
+  cmakeFlags = [ "-DAPP_VERSION=${finalAttrs.version}" ];
 
   # gtest is a buildInput, not native: nixpkgs builds it shared, so the
   # check-phase test binaries need its lib dir baked into their RPATH.

src/audio/audio_downloader.h

@@ -53,12 +53,12 @@ public:
 	AudioDownloader() = default;
 	~AudioDownloader();
 
-    AudioDownloader(const AudioDownloader&) = delete;
-    AudioDownloader& operator=(const AudioDownloader&) = delete;
+	AudioDownloader(const AudioDownloader &) = delete;
+	AudioDownloader &operator=(const AudioDownloader &) = delete;
 
 	// Spawns the background thread. Safe to call repeatedly; only one worker
 	// runs at a time. The manifest is reconciled against `db` on every pass.
-    void start(db::DatabaseManager& db);
+	void start(db::DatabaseManager &db);
 
 	// Signals the worker to stop and joins the thread.
 	void shutdown();
@@ -66,15 +66,18 @@ public:
 	// Returns the current human-readable status for display (e.g. footer).
 	std::string statusString() const;
 
-    static constexpr const char* AUDIO_BASE_URL = "https://files.radiantwavetech.com/audio/";
-    static constexpr const char* MANIFEST_FILENAME = "checksums.md5";
+	static constexpr const char *AUDIO_BASE_URL =
+		"https://files.radiantwavetech.com/audio/";
+	static constexpr const char *MANIFEST_FILENAME = "checksums.md5";
 
 private:
 	void run();
-    bool fetchManifest(std::vector<AudioManifestEntry>& out);
-    bool downloadAndVerify(const std::string& filename, const std::string& expectedMd5, const std::string& displayName);
+	bool fetchManifest(std::vector<AudioManifestEntry> &out);
+	bool downloadAndVerify(const std::string &filename,
+						   const std::string &expectedMd5,
+						   const std::string &displayName);
 
-    void setStatus(const std::string& msg);
+	void setStatus(const std::string &msg);
 	void wait(std::chrono::seconds seconds);
 
 	mutable std::mutex mutex_;
@@ -82,13 +85,14 @@ private:
 	std::thread worker_;
 	std::atomic<bool> stop_{false};
 	std::string status_;
-    db::DatabaseManager* db_ = nullptr;
+	db::DatabaseManager *db_ = nullptr;
 };
 
 // Parses checksums.md5 manifest text into entries. Blank lines and lines
 // starting with '#' are ignored. Lines that don't match a known format are
 // skipped. Returns false if no valid entries were found.
-bool parseManifest(const std::string& text, std::vector<AudioManifestEntry>& out);
+bool parseManifest(const std::string &text,
+				   std::vector<AudioManifestEntry> &out);
 
 // Maps a frequency value in Hz to its internal solfeggio frequency id using
 // the same table the color palettes are seeded from (174/285->1, 396->2,
@@ -100,9 +104,9 @@ int frequencyIdForHz(int hz);
 // "396Hz.wav" -> 396. Requires the digits to be followed by "Hz"
 // (case-insensitive); returns 0 when the name has no frequency (e.g.
 // "AlphaWaves.wav", "OriginalAudio.wav").
-int hzFromFilename(const std::string& filename);
+int hzFromFilename(const std::string &filename);
 
 // Computes the lowercase MD5 hex of a file, or an empty string on failure.
-std::string computeFileMd5(const std::string& path);
+std::string computeFileMd5(const std::string &path);
 
 } // namespace radiantwave::audio

src/audio_settings_page.cpp

@@ -1,5 +1,6 @@
 #include "audio_settings_page.h"
 #include "app_state.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 #include <algorithm>
 #include <cctype>
@@ -477,7 +478,7 @@ void AudioSettingsPage::renderModal(SDL_Renderer* renderer, float fw, float fh,
 
 void AudioSettingsPage::render(SDL_Renderer* renderer) {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

src/date_format_page.cpp

@@ -1,6 +1,7 @@
 #include "date_format_page.h"
 #include "app_state.h"
 #include "date_format.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 #include <algorithm>
 #include <ctime>
@@ -131,7 +132,7 @@ void DateFormatPage::update(float dt)
 void DateFormatPage::render(SDL_Renderer* renderer)
 {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

src/email_address_page.cpp

@@ -3,6 +3,7 @@
 #include "db/db_keys.h"
 #include "provisioning.h"
 #include "validation.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 
 namespace {
@@ -164,7 +165,7 @@ void EmailAddressPage::exitPage(AppState& state)
 void EmailAddressPage::render(SDL_Renderer* renderer)
 {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

src/home.cpp

@@ -8,6 +8,7 @@
 #include "audio/audio_downloader.h"
 #include "db/db_keys.h"
 #include "network/proclamation_sync.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 #include <SDL3_image/SDL_image.h>
 #include <ctime>
@@ -114,7 +115,7 @@ void Home::update(float dt)
 void Home::render(SDL_Renderer *renderer)
 {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 
@@ -280,10 +281,10 @@ void Home::render(SDL_Renderer *renderer)
         fourSpaces.destroy();
 
         const float margin = 20.0f;
-        float rectRight = fw - margin;
+        float rectRight = fw - margin - 50.0f;
         float rectLeft = rectRight - (maxNameW + spaceW4 + maxValueW);
 
-        float lineY = fh - margin;
+        float lineY = fh - margin - 50.0f;
         const float lineGap = 6.0f;
         for (size_t i = footerNames_.size(); i-- > 0;)
         {

src/license_blocked_page.cpp

@@ -1,6 +1,7 @@
 #include "license_blocked_page.h"
 #include "app_state.h"
 #include "home.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 
 void LicenseBlockedPage::onPush(AppState& state)
@@ -71,7 +72,7 @@ void LicenseBlockedPage::update(float dt)
 void LicenseBlockedPage::render(SDL_Renderer* renderer)
 {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

src/license_key_page.cpp

@@ -4,6 +4,7 @@
 #include "network/license_service.h"
 #include "provisioning.h"
 #include "validation.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 
 void LicenseKeyPage::onPush(AppState& state)
@@ -97,7 +98,7 @@ void LicenseKeyPage::submit()
     // When the email is missing the key is saved but the check is skipped.
     std::string errorMessage;
     const radiantwave::license::Result result = radiantwave::license::validateStoredLicense(
-        state_->db, "", &errorMessage);
+        state_->db, &errorMessage);
 
     switch (result) {
         case radiantwave::license::Result::Ok:
@@ -172,7 +173,7 @@ void LicenseKeyPage::exitPage(AppState& state)
 void LicenseKeyPage::render(SDL_Renderer* renderer)
 {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

src/log_viewer_page.cpp

@@ -1,6 +1,7 @@
 #include "log_viewer_page.h"
 #include "app_state.h"
 #include "timezone_helper.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 #include <algorithm>
 #include <sstream>
@@ -162,7 +163,7 @@ void LogViewerPage::update(float dt) {
 
 void LogViewerPage::render(SDL_Renderer* renderer) {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

src/logical_size.h

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <SDL3/SDL.h>
+
+namespace radiantwave {
+
+// Design resolution every page lays out against. The renderer's logical
+// presentation (LETTERBOX) scales this fixed space onto whatever
+// window/backbuffer the display actually provides.
+inline constexpr int kDesignWidth = 1920;
+inline constexpr int kDesignHeight = 1080;
+
+// Returns the size pages should lay out against: the renderer's logical size
+// when presentation is active, otherwise the real window size. The output
+// params are always written — design constants are the last-resort fallback.
+inline void getLayoutSize(SDL_Renderer *renderer, int *w, int *h)
+{
+	if (!w || !h)
+		return;
+	*w = kDesignWidth;
+	*h = kDesignHeight;
+
+	if (!renderer)
+		return;
+
+	SDL_RendererLogicalPresentation mode = SDL_LOGICAL_PRESENTATION_DISABLED;
+	int logicalW = 0;
+	int logicalH = 0;
+	if (SDL_GetRenderLogicalPresentation(renderer, &logicalW, &logicalH,
+										 &mode) &&
+		mode != SDL_LOGICAL_PRESENTATION_DISABLED && logicalW > 0 &&
+		logicalH > 0) {
+		*w = logicalW;
+		*h = logicalH;
+		return;
+	}
+
+	SDL_Window *window = SDL_GetRenderWindow(renderer);
+	if (!window)
+		return;
+
+	int windowW = 0;
+	int windowH = 0;
+	SDL_GetWindowSize(window, &windowW, &windowH);
+	if (windowW > 0 && windowH > 0) {
+		*w = windowW;
+		*h = windowH;
+	}
+}
+
+} // namespace radiantwave

src/main.cpp

@@ -4,47 +4,64 @@
 
 #include "app_state.h"
 #include "home.h"
-#include "provisioning.h"
+#include "logical_size.h"
 #include "logger/logger.h"
+#include "provisioning.h"
+#include "scroller_page.h"
 
-namespace
-{
-    // How long audio fades out before the app tears down on quit. Only applied
-    // when audio is actually playing; otherwise quitting is immediate.
-    constexpr float kQuitFadeSeconds = 5.0f;
+namespace {
+// How long audio fades out before the app tears down on quit. Only applied
+// when audio is actually playing; otherwise quitting is immediate.
+constexpr float kQuitFadeSeconds = 5.0f;
 } // anonymous namespace
 
-SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
-{
+SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[]) {
 	// Initialize text logger
 	radiantwave::logger::Logger::instance().initialize();
-    radiantwave::logger::Logger::instance().info("System", "RadiantWave Kiosk starting up");
+	radiantwave::logger::Logger::instance().info(
+		"System", "RadiantWave Kiosk starting up");
 
-    if (!SDL_Init(SDL_INIT_VIDEO))
-    {
+	if (!SDL_Init(SDL_INIT_VIDEO)) {
 		std::string err = SDL_GetError();
-        radiantwave::logger::Logger::instance().fatal("Graphics",
-            "Screen display initialization failed. Please verify graphics hardware and display connections (SDL_Init error: " + err + ")");
+		radiantwave::logger::Logger::instance().fatal(
+			"Graphics",
+			"Screen display initialization failed. Please verify graphics "
+			"hardware and display connections (SDL_Init error: " +
+				err + ")");
 		SDL_Log("Failed to initialize SDL: %s", err.c_str());
 		return SDL_APP_FAILURE;
 	}
 
 	auto *state = new AppState{};
 
-    // SDL_WINDOW_FULLSCREEN fills the desktop's native resolution, so the
-    // compositor never has to scale the moving scroller (scaling moving text
-    // causes flicker).
-    state->window = SDL_CreateWindow("RadiantWave", 1920, 1080, SDL_WINDOW_FULLSCREEN);
-    if (!state->window)
-    {
+	// Size the fullscreen window from the display's actual mode so the very
+	// first buffer commit already matches what the compositor scanouts 1:1.
+	// Requesting a hardcoded size left the backbuffer at that size on
+	// displays running a different mode, and frames reached the panel
+	// unscaled (quarter-size on 4K, cropped on smaller panels).
+	const SDL_DisplayMode *displayMode =
+		SDL_GetCurrentDisplayMode(SDL_GetPrimaryDisplay());
+	int windowWidth =
+		(displayMode && displayMode->w > 0) ? displayMode->w
+											: radiantwave::kDesignWidth;
+	int windowHeight =
+		(displayMode && displayMode->h > 0) ? displayMode->h
+											: radiantwave::kDesignHeight;
+
+	// Borderless desktop fullscreen: the compositor never has to scale the
+	// moving scroller (scaling moving text causes flicker). Deliberately no
+	// SDL_WINDOW_HIGH_PIXEL_DENSITY — kiosk panels are not HiDPI, so keeping
+	// the pixel buffer equal to the display mode keeps scanout 1:1.
+	state->window = SDL_CreateWindow("RadiantWave", windowWidth, windowHeight,
+									 SDL_WINDOW_FULLSCREEN);
+	if (!state->window) {
 		SDL_Log("Failed to create window: %s", SDL_GetError());
 		delete state;
 		return SDL_APP_FAILURE;
 	}
 
 	state->renderer = SDL_CreateRenderer(state->window, nullptr);
-    if (!state->renderer)
-    {
+	if (!state->renderer) {
 		SDL_Log("Failed to create renderer: %s", SDL_GetError());
 		delete state;
 		return SDL_APP_FAILURE;
@@ -53,56 +70,105 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 	// Present on the display's refresh. Without VSync the kiosk panel tears
 	// fast-scrolling text into horizontal bands that flicker as the text moves.
 	if (!SDL_SetRenderVSync(state->renderer, 1)) {
-        radiantwave::logger::Logger::instance().warning("Graphics",
-            "VSync could not be enabled; scrolling text may tear (VSync error: " + std::string(SDL_GetError()) + ")");
+		radiantwave::logger::Logger::instance().warning(
+			"Graphics", "VSync could not be enabled; scrolling text may tear "
+						"(VSync error: " +
+							std::string(SDL_GetError()) + ")");
+	}
+
+	// All page layout targets the fixed design resolution; LETTERBOX maps it
+	// onto the real window with aspect preserved (bars on non-16:9 panels).
+	if (!SDL_SetRenderLogicalPresentation(state->renderer,
+										  radiantwave::kDesignWidth,
+										  radiantwave::kDesignHeight,
+										  SDL_LOGICAL_PRESENTATION_LETTERBOX)) {
+		radiantwave::logger::Logger::instance().warning(
+			"Graphics", "Could not set logical render size; layout may be "
+						"wrong on HiDPI displays");
+	}
+
+	{
+		// Record how the requested mode, window, pixel buffer, and render
+		// output actually compare — this is the evidence trail for
+		// display-scaling problems on field units.
+		int windowW = 0, windowH = 0;
+		SDL_GetWindowSize(state->window, &windowW, &windowH);
+		int pixelW = 0, pixelH = 0;
+		SDL_GetWindowSizeInPixels(state->window, &pixelW, &pixelH);
+		int outputW = 0, outputH = 0;
+		SDL_GetRenderOutputSize(state->renderer, &outputW, &outputH);
+		radiantwave::logger::Logger::instance().info(
+			"Graphics",
+			"Requested " + std::to_string(windowWidth) + "x" +
+				std::to_string(windowHeight) + ", window " +
+				std::to_string(windowW) + "x" + std::to_string(windowH) +
+				", pixels " + std::to_string(pixelW) + "x" +
+				std::to_string(pixelH) + ", render output " +
+				std::to_string(outputW) + "x" + std::to_string(outputH) +
+				", presentation LETTERBOX");
 	}
 
 	SDL_HideCursor();
 
 	// Initialize configuration, database, and network manager
 	if (!state->config.initialize()) {
-        radiantwave::logger::Logger::instance().warning("Config",
-            "Settings file could not be loaded. Default settings will be used (Config initialization failed at ~/.local/radiantwave/config.yaml)");
+		radiantwave::logger::Logger::instance().warning(
+			"Config", "Settings file could not be loaded. Default settings "
+					  "will be used (Config initialization failed at "
+					  "~/.local/radiantwave/config.yaml)");
 	} else {
-        radiantwave::logger::Logger::instance().info("Config", "Configuration initialized successfully");
+		radiantwave::logger::Logger::instance().info(
+			"Config", "Configuration initialized successfully");
 	}
 
 	if (!state->db.initialize()) {
-        radiantwave::logger::Logger::instance().error("Database",
-            "Database storage unavailable. App features may be limited (Database initialization failed at ~/.local/radiantwave/radiantwave.db)");
+		radiantwave::logger::Logger::instance().error(
+			"Database", "Database storage unavailable. App features may be "
+						"limited (Database initialization failed at "
+						"~/.local/radiantwave/radiantwave.db)");
 	} else {
-        radiantwave::logger::Logger::instance().info("Database", "Database initialized and schema migrated");
+		radiantwave::logger::Logger::instance().info(
+			"Database", "Database initialized and schema migrated");
 	}
 
 	if (!state->network.initialize()) {
-        radiantwave::logger::Logger::instance().warning("Network",
-            "WiFi network management is unavailable. Check if NetworkManager is running (D-Bus connection to org.freedesktop.NetworkManager failed)");
+		radiantwave::logger::Logger::instance().warning(
+			"Network", "WiFi network management is unavailable. Check if "
+					   "NetworkManager is running (D-Bus connection to "
+					   "org.freedesktop.NetworkManager failed)");
 	} else {
-        radiantwave::logger::Logger::instance().info("Network", "NetworkManager service connected");
+		radiantwave::logger::Logger::instance().info(
+			"Network", "NetworkManager service connected");
 	}
 
 	if (!state->audio.initialize(state->config)) {
-        radiantwave::logger::Logger::instance().warning("Audio",
-            "Audio playback is unavailable. Check sound hardware connections (SDL3_mixer initialization failed)");
+		radiantwave::logger::Logger::instance().warning(
+			"Audio", "Audio playback is unavailable. Check sound hardware "
+					 "connections (SDL3_mixer initialization failed)");
 	} else {
-        radiantwave::logger::Logger::instance().info("Audio", "Audio subsystem initialized");
+		radiantwave::logger::Logger::instance().info(
+			"Audio", "Audio subsystem initialized");
 	}
 	// Let playback logs report user-facing display names from the database.
 	state->audio.attachDatabase(state->db);
 
 	// Background download of audio assets. The worker keeps retrying until
 	// internet is available, so downloads start automatically on connect.
-    // The downloaded files are reconciled into the database's audio_files table.
+	// The downloaded files are reconciled into the database's audio_files
+	// table.
 	state->audioDownloader.start(state->db);
 
 	// Background license validation. Home triggers a refresh whenever it is
 	// displayed; the result gates access to Play and the Proclamation options.
 	state->licenseTracker.start(state->db);
 
-    state->config.onChanged([state](const radiantwave::config::AppConfig& new_config) {
+	state->config.onChanged(
+		[state](const radiantwave::config::AppConfig &new_config) {
 			SDL_Log("Live config update received: volume=%d, dynamic_audio=%d",
-                new_config.audio.volume, new_config.audio.dynamic_audio ? 1 : 0);
-        state->db.logEvent("INFO", "Config", "Live configuration hot-reloaded");
+					new_config.audio.volume,
+					new_config.audio.dynamic_audio ? 1 : 0);
+			state->db.logEvent("INFO", "Config",
+							   "Live configuration hot-reloaded");
 		});
 
 	state->keybinds.bind(SDLK_UP, "menu_up", [state]() {
@@ -113,9 +179,9 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 	});
 
 	// Drive the First-Run walkthrough: shows the WiFi page when the internet
-    // is unreachable, then the email and license pages when those are missing,
-    // finishing on Home. The internet check is a real connectivity probe
-    // (Ethernet, WiFi, or macOS all work), so it never traps a connected
+	// is unreachable <DEPRECATED>, then the email and license pages when those
+	// are missing, finishing on Home. The internet check is a real connectivity
+	// probe (Ethernet, WiFi, or macOS all work), so it never traps a connected
 	// device on the WiFi page.
 	radiantwave::provisioning::begin(*state);
 
@@ -123,27 +189,40 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 	return SDL_APP_CONTINUE;
 }
 
-SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event)
-{
+SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
 	auto &state = *static_cast<AppState *>(appstate);
 
-    if (event->type == SDL_EVENT_QUIT)
-    {
+	if (event->type == SDL_EVENT_QUIT) {
 		state.quitRequested = true;
 	}
 
+	if (event->type == SDL_EVENT_WINDOW_RESIZED) {
+		radiantwave::logger::Logger::instance().info(
+			"Graphics", "Window resized to " +
+							std::to_string(event->window.data1) + "x" +
+							std::to_string(event->window.data2));
+		// Logical presentation persists across resizes; re-apply defensively
+		// in case backend state was reset underneath us.  Skip while the
+		// scroller is active — it owns its own presentation (NONE, full
+		// window) and restores LETTERBOX in onPop.
+		if (!dynamic_cast<ScrollerPage *>(state.pages.current())) {
+			SDL_SetRenderLogicalPresentation(state.renderer,
+											 radiantwave::kDesignWidth,
+											 radiantwave::kDesignHeight,
+											 SDL_LOGICAL_PRESENTATION_LETTERBOX);
+		}
+	}
+
 	if (!state.keybinds.handleEvent(*event)) {
 		state.pages.handleEvent(*event);
 	}
 
-    if (state.quitRequested && state.quitFadeRemaining <= 0.0f)
-    {
+	if (state.quitRequested && state.quitFadeRemaining <= 0.0f) {
 		// Graceful shutdown: start the audio fade-out and keep the loop
 		// running until it completes, then let SDL_AppQuit tear everything
 		// down. When nothing is playing there is nothing to fade and quitting
 		// is immediate.
-        if (state.audio.stopTrackFadeOut(kQuitFadeSeconds))
-        {
+		if (state.audio.stopTrackFadeOut(kQuitFadeSeconds)) {
 			state.quitFadeRemaining = kQuitFadeSeconds;
 			return SDL_APP_CONTINUE;
 		}
@@ -153,23 +232,21 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event)
 	return SDL_APP_CONTINUE;
 }
 
-SDL_AppResult SDL_AppIterate(void *appstate)
-{
+SDL_AppResult SDL_AppIterate(void *appstate) {
 	auto &state = *static_cast<AppState *>(appstate);
 
 	Uint64 nowTicks = SDL_GetTicks();
 	static Uint64 lastTicks = nowTicks;
 	float dt = static_cast<float>(nowTicks - lastTicks) / 1000.0f;
-    if (dt > 0.1f) dt = 0.1f;
+	if (dt > 0.1f)
+		dt = 0.1f;
 	lastTicks = nowTicks;
 
 	state.pages.update(dt);
 
-    if (state.quitFadeRemaining > 0.0f)
-    {
+	if (state.quitFadeRemaining > 0.0f) {
 		state.quitFadeRemaining -= dt;
-        if (state.quitFadeRemaining <= 0.0f)
-        {
+		if (state.quitFadeRemaining <= 0.0f) {
 			return SDL_APP_SUCCESS;
 		}
 	}
@@ -183,8 +260,7 @@ SDL_AppResult SDL_AppIterate(void *appstate)
 	return SDL_APP_CONTINUE;
 }
 
-void SDL_AppQuit(void *appstate, SDL_AppResult result)
-{
+void SDL_AppQuit(void *appstate, SDL_AppResult result) {
 	auto *state = static_cast<AppState *>(appstate);
 	if (state) {
 		state->audioDownloader.shutdown();

src/network/api_client.cpp

@@ -4,10 +4,6 @@
 #include <curl/curl.h>
 #include <string>
 
-#ifndef API_KEY
-#define API_KEY ""
-#endif
-
 namespace radiantwave::api {
 
 namespace {
@@ -31,7 +27,7 @@ size_t writeCallback(char* ptr, size_t size, size_t nmemb, void* userdata) {
 }
 
 // Shared curl setup + perform. Returns a populated HttpResponse.
-HttpResponse performRequest(const std::string& url, const std::string& apiKey,
+HttpResponse performRequest(const std::string& url,
                             bool post, const std::string& jsonBody) {
     HttpResponse response;
 
@@ -47,12 +43,6 @@ HttpResponse performRequest(const std::string& url, const std::string& apiKey,
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response.body);
 
     struct curl_slist* headers = nullptr;
-    // An explicit apiKey wins; otherwise fall back to the key baked in at
-    // build time via -DAPI_KEY (empty string when unset).
-    const std::string effectiveKey = apiKey.empty() ? API_KEY : apiKey;
-    if (!effectiveKey.empty()) {
-        headers = curl_slist_append(headers, ("Authorization: Bearer " + effectiveKey).c_str());
-    }
     if (post) {
         headers = curl_slist_append(headers, "Content-Type: application/json");
         curl_easy_setopt(curl, CURLOPT_POST, 1L);
@@ -79,13 +69,12 @@ HttpResponse performRequest(const std::string& url, const std::string& apiKey,
 
 // ─── HTTP helpers ──────────────────────────────────────────────────────
 
-HttpResponse httpGet(const std::string& path, const std::string& apiKey) {
-    return performRequest(urlFor(path), apiKey, false, "");
+HttpResponse httpGet(const std::string& path) {
+    return performRequest(urlFor(path), false, "");
 }
 
-HttpResponse httpPost(const std::string& path, const std::string& jsonBody,
-                      const std::string& apiKey) {
-    return performRequest(urlFor(path), apiKey, true, jsonBody);
+HttpResponse httpPost(const std::string& path, const std::string& jsonBody) {
+    return performRequest(urlFor(path), true, jsonBody);
 }
 
 // ─── GET /frequencies ──────────────────────────────────────────────────
@@ -112,8 +101,8 @@ bool parseFrequenciesJson(const std::string& body, std::vector<Frequency>& out)
     return true;
 }
 
-bool fetchFrequencies(std::vector<Frequency>& out, const std::string& apiKey) {
-    HttpResponse response = httpGet(PATH_FREQUENCIES, apiKey);
+bool fetchFrequencies(std::vector<Frequency>& out) {
+    HttpResponse response = httpGet(PATH_FREQUENCIES);
     if (!response.transportOk || response.status < 200 || response.status >= 300) {
         return false;
     }
@@ -169,8 +158,8 @@ bool parseColorPalettesJson(const std::string& body, std::vector<ColorPalette>&
     return true;
 }
 
-bool fetchColorPalettes(std::vector<ColorPalette>& out, const std::string& apiKey) {
-    HttpResponse response = httpGet(PATH_COLOR_PALETTES, apiKey);
+bool fetchColorPalettes(std::vector<ColorPalette>& out) {
+    HttpResponse response = httpGet(PATH_COLOR_PALETTES);
     if (!response.transportOk || response.status < 200 || response.status >= 300) {
         return false;
     }
@@ -196,13 +185,12 @@ bool parseLicenseJson(const std::string& body, LicenseInfo& out) {
     return !out.key.empty();
 }
 
-LicenseResult validateLicense(const std::string& key, const std::string& email,
-                              const std::string& apiKey) {
+LicenseResult validateLicense(const std::string& key, const std::string& email) {
     LicenseResult result;
 
     const std::string jsonBody =
         "{\"license_key\":\"" + key + "\",\"email_address\":\"" + email + "\"}";
-    HttpResponse response = httpPost(PATH_LICENSE, jsonBody, apiKey);
+    HttpResponse response = httpPost(PATH_LICENSE, jsonBody);
     result.status = response.status;
 
     if (!response.transportOk) {
@@ -233,8 +221,7 @@ bool parseCreateAccountJson(const std::string& body, AccountBody& out) {
     return true;
 }
 
-AccountResult createAccount(const std::string& email, const std::string& name,
-                            const std::string& apiKey) {
+AccountResult createAccount(const std::string& email, const std::string& name) {
     AccountResult result;
 
     std::string jsonBody =
@@ -244,7 +231,7 @@ AccountResult createAccount(const std::string& email, const std::string& name,
     }
     jsonBody += "}";
 
-    HttpResponse response = httpPost(PATH_CREATE_ACCOUNT, jsonBody, apiKey);
+    HttpResponse response = httpPost(PATH_CREATE_ACCOUNT, jsonBody);
     result.status = response.status;
 
     if (!response.transportOk) {

src/network/api_client.h

@@ -24,14 +24,9 @@ struct HttpResponse {
     bool transportOk = false; // true when the request completed without a transport error
 };
 
-// Performs a GET/POST against `path` (relative to API_BASE_URL). When `apiKey` is
-// non-empty it is sent as `Authorization: Bearer <apiKey>`. When it is empty (or
-// omitted) the request falls back to the key baked in at build time via the
-// `API_KEY` compile definition (see CMakeLists.txt); with neither set, no auth
-// header is sent.
-HttpResponse httpGet(const std::string& path, const std::string& apiKey = "");
-HttpResponse httpPost(const std::string& path, const std::string& jsonBody,
-                      const std::string& apiKey = "");
+// Performs a GET/POST against `path` (relative to API_BASE_URL).
+HttpResponse httpGet(const std::string& path);
+HttpResponse httpPost(const std::string& path, const std::string& jsonBody);
 
 // ─── GET /frequencies ──────────────────────────────────────────────────
 
@@ -45,7 +40,7 @@ struct Frequency {
 bool parseFrequenciesJson(const std::string& body, std::vector<Frequency>& out);
 
 // Fetch the solfeggio frequencies. Returns true only on HTTP 2xx + successful parse.
-bool fetchFrequencies(std::vector<Frequency>& out, const std::string& apiKey = "");
+bool fetchFrequencies(std::vector<Frequency>& out);
 
 // ─── GET /color-palettes ───────────────────────────────────────────────
 
@@ -75,7 +70,7 @@ bool parseColorPalettesJson(const std::string& body, std::vector<ColorPalette>&
 // NOTE: the portal does not expose this route yet. This is readiness code — it
 // is deliberately not called anywhere in the app until the route ships, so
 // palettes can be updated from the portal rather than code releases.
-bool fetchColorPalettes(std::vector<ColorPalette>& out, const std::string& apiKey = "");
+bool fetchColorPalettes(std::vector<ColorPalette>& out);
 
 // ─── POST /license ─────────────────────────────────────────────────────
 
@@ -98,8 +93,7 @@ struct LicenseResult {
 // Validate a license key / email pair against the portal. Never throws; failures
 // (network, HTTP error status) are reported through the returned LicenseResult.
 // A 2xx response means the license is valid and the subscription is active.
-LicenseResult validateLicense(const std::string& key, const std::string& email,
-                              const std::string& apiKey = "");
+LicenseResult validateLicense(const std::string& key, const std::string& email);
 
 // ─── POST /automations/create/account ──────────────────────────────────
 
@@ -122,7 +116,6 @@ struct AccountResult {
 
 // Creates (or reuses) a user account and issues a license key. The key is emailed
 // to the user and is NOT part of the response. `name` may be empty.
-AccountResult createAccount(const std::string& email, const std::string& name = "",
-                            const std::string& apiKey = "");
+AccountResult createAccount(const std::string& email, const std::string& name = "");
 
 } // namespace radiantwave::api

src/network/license_service.cpp

@@ -17,7 +17,6 @@ long long nowEpochSeconds() {
 } // namespace
 
 Result validateStoredLicense(radiantwave::db::DatabaseManager& db,
-                             const std::string& apiKey,
                              std::string* outErrorMessage) {
     if (outErrorMessage) outErrorMessage->clear();
 
@@ -28,7 +27,7 @@ Result validateStoredLicense(radiantwave::db::DatabaseManager& db,
     }
 
     const radiantwave::api::LicenseResult result =
-        radiantwave::api::validateLicense(key, email, apiKey);
+        radiantwave::api::validateLicense(key, email);
 
     if (result.status == 0) {
         if (outErrorMessage) *outErrorMessage = "network error";

src/network/license_service.h

@@ -26,7 +26,6 @@ constexpr long long GRACE_PERIOD_SECONDS = 7LL * 24 * 60 * 60;
 //
 // `outErrorMessage` is an optional out-param.
 Result validateStoredLicense(radiantwave::db::DatabaseManager& db,
-                             const std::string& apiKey = "",
                              std::string* outErrorMessage = nullptr);
 
 // Records the current time as the "last verified" stamp of the license. Called

src/network/proclamation_sync.cpp

@@ -190,10 +190,9 @@ bool parseProclamationPalettesJson(const std::string& body,
     return true;
 }
 
-bool syncColorPalettesFromApi(radiantwave::db::DatabaseManager& db,
-                              const std::string& apiKey) {
+bool syncColorPalettesFromApi(radiantwave::db::DatabaseManager& db) {
     std::vector<api::ColorPalette> palettes;
-    if (!api::fetchColorPalettes(palettes, apiKey)) {
+    if (!api::fetchColorPalettes(palettes)) {
         return false;
     }
 
@@ -211,9 +210,8 @@ bool syncColorPalettesFromApi(radiantwave::db::DatabaseManager& db,
     return db.replaceColorPalettes(records);
 }
 
-bool syncProclamationPalettesFromApi(radiantwave::db::DatabaseManager& db,
-                                     const std::string& apiKey) {
-    api::HttpResponse response = api::httpGet(api::PATH_PROCLAMATIONS, apiKey);
+bool syncProclamationPalettesFromApi(radiantwave::db::DatabaseManager& db) {
+    api::HttpResponse response = api::httpGet(api::PATH_PROCLAMATIONS);
     if (!response.transportOk || response.status < 200 || response.status >= 300) {
         return false;
     }

src/network/proclamation_sync.h

@@ -37,13 +37,11 @@ bool parseProclamationPalettesJson(const std::string& body,
 // NOTE: not yet wired into the app flow — the portal does not expose the route
 // yet. Readiness code: palettes should be updated from the portal, not code
 // releases, so callers should treat this as a future sync step.
-bool syncColorPalettesFromApi(radiantwave::db::DatabaseManager& db,
-                              const std::string& apiKey = "");
+bool syncColorPalettesFromApi(radiantwave::db::DatabaseManager& db);
 
 // Alternative to syncColorPalettesFromApi: fetch proclamations and replace the
 // local palette table using the palettes embedded in each proclamation.
 // NOTE: not yet wired into the app flow; see syncColorPalettesFromApi.
-bool syncProclamationPalettesFromApi(radiantwave::db::DatabaseManager& db,
-                                     const std::string& apiKey = "");
+bool syncProclamationPalettesFromApi(radiantwave::db::DatabaseManager& db);
 
 } // namespace radiantwave::sync

src/proclamation_options_page.cpp

@@ -1,6 +1,7 @@
 #include "proclamation_options_page.h"
 #include "app_state.h"
 #include "network/proclamation_sync.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 #include <algorithm>
 #include <cctype>
@@ -197,7 +198,7 @@ void ProclamationOptionsPage::rebuildItems()
                 FlatItem::Type::SubCategory,
                 std::to_string(sub.id),
                 sub.name,
-                1, false, false, false,
+                1, true, false, false,
             });
 
             for (const auto& p : proclamations_) {
@@ -267,7 +268,7 @@ void ProclamationOptionsPage::rebuildVisible()
             parentVisible = true; // the always-on top-level proclamation
         } else if (currentRoot >= 0 && items_[currentRoot].expanded) {
             parentVisible = (item.depth == 1) ||
-                            (item.depth == 2 && currentSub >= 0 && items_[currentSub].expanded);
+                            (item.depth == 2 && currentSub >= 0);
         }
         if (parentVisible) visible_.push_back(i);
     }
@@ -282,7 +283,7 @@ void ProclamationOptionsPage::toggleItem()
     if (visible_.empty()) return;
     FlatItem& item = items_[visible_[highlightIndex_]];
 
-    if (item.type == FlatItem::Type::RootCategory || item.type == FlatItem::Type::SubCategory) {
+    if (item.type == FlatItem::Type::RootCategory) {
         item.expanded = !item.expanded;
         rebuildVisible();
         return;
@@ -387,7 +388,7 @@ void ProclamationOptionsPage::collapseCurrent()
 {
     if (visible_.empty()) return;
     FlatItem& item = items_[visible_[highlightIndex_]];
-    if (item.type == FlatItem::Type::RootCategory || item.type == FlatItem::Type::SubCategory) {
+    if (item.type == FlatItem::Type::RootCategory) {
         if (item.expanded) {
             item.expanded = false;
             rebuildVisible();
@@ -399,7 +400,7 @@ void ProclamationOptionsPage::expandCurrent()
 {
     if (visible_.empty()) return;
     FlatItem& item = items_[visible_[highlightIndex_]];
-    if (item.type == FlatItem::Type::RootCategory || item.type == FlatItem::Type::SubCategory) {
+    if (item.type == FlatItem::Type::RootCategory) {
         if (!item.expanded) {
             item.expanded = true;
             rebuildVisible();
@@ -525,8 +526,7 @@ void ProclamationOptionsPage::handleEvent(const SDL_Event& event)
         if (searchActive_) return;
         if (!visible_.empty()) {
             const FlatItem& item = items_[visible_[highlightIndex_]];
-            if ((item.type == FlatItem::Type::RootCategory ||
-                 item.type == FlatItem::Type::SubCategory) && item.expanded) {
+            if (item.type == FlatItem::Type::RootCategory && item.expanded) {
                 collapseCurrent();
             } else {
                 moveToParent();
@@ -552,7 +552,7 @@ void ProclamationOptionsPage::update(float dt)
 void ProclamationOptionsPage::render(SDL_Renderer* renderer)
 {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 
@@ -654,14 +654,18 @@ void ProclamationOptionsPage::render(SDL_Renderer* renderer)
                     SDL_RenderTexture(renderer, emptyHintText_.texture, nullptr, &dst);
                 }
             } else {
-                // Compute the widest row so the block can be centered.
+                // Stable width: compute from every result so the list doesn't shift.
                 float maxTotalWidth = 0.0f;
+                for (const auto& r : searchResults_) {
+                    int w = 0, h = 0;
+                    TTF_GetStringSize(fontItem_, proclamations_[r].title.c_str(), 0, &w, &h);
+                    maxTotalWidth = std::max(maxTotalWidth, static_cast<float>(w));
+                }
+
                 std::vector<float> textWidths(static_cast<size_t>(listSize));
                 for (int i = scrollOffset_; i < scrollOffset_ + visibleCount_ && i < listSize; ++i) {
-                    const std::string& label = proclamations_[searchResults_[i]].title;
                     int w = 0, h = 0;
-                    TTF_GetStringSize(fontItem_, label.c_str(), 0, &w, &h);
-                    maxTotalWidth = std::max(maxTotalWidth, static_cast<float>(w));
+                    TTF_GetStringSize(fontItem_, proclamations_[searchResults_[i]].title.c_str(), 0, &w, &h);
                     textWidths[i] = static_cast<float>(w);
                 }
                 float sharedX = (fw - maxTotalWidth) / 2.0f;
@@ -694,19 +698,29 @@ void ProclamationOptionsPage::render(SDL_Renderer* renderer)
             }
         } else {
             // --- Browse tree ---
-            // Compute the widest row so the block can be centered.
+            // Stable width: compute from every item so the list doesn't
+            // shift left/right when groups expand or collapse.
             float maxTotalWidth = 0.0f;
-            std::vector<float> textWidths(visible_.size());
-            for (int i = scrollOffset_; i < scrollOffset_ + visibleCount_ && i < static_cast<int>(visible_.size()); ++i) {
-                const FlatItem& item = items_[visible_[i]];
+            for (const auto& item : items_) {
                 std::string label = item.label;
-                if (item.type == FlatItem::Type::RootCategory || item.type == FlatItem::Type::SubCategory) {
+                if (item.type == FlatItem::Type::RootCategory) {
                     label = (item.expanded ? "[-] " : "[+] ") + label;
                 }
                 int w = 0, h = 0;
                 TTF_GetStringSize(fontItem_, label.c_str(), 0, &w, &h);
                 float total = item.depth * indent + static_cast<float>(w);
                 maxTotalWidth = std::max(maxTotalWidth, total);
+            }
+
+            std::vector<float> textWidths(visible_.size());
+            for (int i = scrollOffset_; i < scrollOffset_ + visibleCount_ && i < static_cast<int>(visible_.size()); ++i) {
+                const FlatItem& item = items_[visible_[i]];
+                std::string label = item.label;
+                if (item.type == FlatItem::Type::RootCategory) {
+                    label = (item.expanded ? "[-] " : "[+] ") + label;
+                }
+                int w = 0, h = 0;
+                TTF_GetStringSize(fontItem_, label.c_str(), 0, &w, &h);
                 textWidths[i] = static_cast<float>(w);
             }
 
@@ -720,7 +734,7 @@ void ProclamationOptionsPage::render(SDL_Renderer* renderer)
                 float y = listTop + rowIndex * rowPitch;
 
                 std::string label = item.label;
-                if (item.type == FlatItem::Type::RootCategory || item.type == FlatItem::Type::SubCategory) {
+                if (item.type == FlatItem::Type::RootCategory) {
                     label = (item.expanded ? "[-] " : "[+] ") + label;
                 }
 

src/provisioning.cpp

@@ -1,19 +1,18 @@
 #include "provisioning.h"
-#include "wifi_setup_page.h"
 #include "email_address_page.h"
-#include "license_key_page.h"
 #include "home.h"
+#include "license_key_page.h"
 #include "logger/logger.h"
+#include "wifi_setup_page.h"
 
 namespace radiantwave::provisioning {
 
 // Push the page for a walkthrough step, or Home when the walkthrough is done.
-static void pushStep(AppState& state, Step step)
-{
+static void pushStep(AppState &state, Step step) {
 	switch (step) {
-        case Step::Internet:
-            state.pages.push(state, std::make_unique<WiFiSetupPage>());
-            break;
+	// case Step::Internet:
+	//     state.pages.push(state, std::make_unique<WiFiSetupPage>());
+	//     break;
 	case Step::Email:
 		state.pages.push(state, std::make_unique<EmailAddressPage>());
 		break;
@@ -27,8 +26,7 @@ static void pushStep(AppState& state, Step step)
 	}
 }
 
-void begin(AppState& state)
-{
+void begin(AppState &state) {
 	// Without the database there is nowhere to persist email/license, so the
 	// walkthrough would trap the user on pages that can never be completed.
 	if (!state.db.isOpen()) {
@@ -38,14 +36,17 @@ void begin(AppState& state)
 	}
 
 	const bool internetUp = state.network.hasInternet();
-    const bool hasEmail = !state.db.getKV(radiantwave::db::KV_EMAIL_ADDRESS).empty();
-    const bool hasLicense = !state.db.getKV(radiantwave::db::KV_LICENSE_KEY).empty();
+	const bool hasEmail =
+		!state.db.getKV(radiantwave::db::KV_EMAIL_ADDRESS).empty();
+	const bool hasLicense =
+		!state.db.getKV(radiantwave::db::KV_LICENSE_KEY).empty();
 
 	if (indicatesFirstRun(internetUp, hasEmail, hasLicense)) {
 		// Placeholder: a brand-new device. Later this flag will launch the
 		// first-run welcome walkthrough (TOS, quick user guide, ...).
 		state.firstRunWalkthrough = true;
-        radiantwave::logger::Logger::instance().info("Provisioning",
+		radiantwave::logger::Logger::instance().info(
+			"Provisioning",
 			"First-Run detected (no internet, no email, no license); "
 			"first-run welcome walkthrough is not yet implemented");
 	}
@@ -55,8 +56,7 @@ void begin(AppState& state)
 	pushStep(state, firstMissingStep(internetUp, hasEmail, hasLicense));
 }
 
-void advance(AppState& state)
-{
+void advance(AppState &state) {
 	if (state.pages.depth() > 0) {
 		state.pages.pop(state);
 	}
@@ -70,8 +70,10 @@ void advance(AppState& state)
 		state.walkthroughInternetUp = internetUp;
 	}
 
-    const bool hasEmail = !state.db.getKV(radiantwave::db::KV_EMAIL_ADDRESS).empty();
-    const bool hasLicense = !state.db.getKV(radiantwave::db::KV_LICENSE_KEY).empty();
+	const bool hasEmail =
+		!state.db.getKV(radiantwave::db::KV_EMAIL_ADDRESS).empty();
+	const bool hasLicense =
+		!state.db.getKV(radiantwave::db::KV_LICENSE_KEY).empty();
 
 	state.provisioningMode = true;
 	pushStep(state, firstMissingStep(internetUp, hasEmail, hasLicense));

src/provisioning.h

@@ -24,33 +24,33 @@
 namespace radiantwave::provisioning {
 
 // Prerequisite steps in walkthrough priority order.
-enum class Step { Done, Internet, Email, License };
+enum class Step { Done, Email, License };
 
 // First unsatisfied step, given the current conditions.
-inline Step firstMissingStep(bool internetUp, bool hasEmail, bool hasLicense)
-{
-    if (!internetUp) return Step::Internet;
-    if (!hasEmail) return Step::Email;
-    if (!hasLicense) return Step::License;
+inline Step firstMissingStep(bool internetUp, bool hasEmail, bool hasLicense) {
+	// if (!internetUp) return Step::Internet;
+	if (!hasEmail)
+		return Step::Email;
+	if (!hasLicense)
+		return Step::License;
 	return Step::Done;
 }
 
 // True when nothing is configured (no internet, no email, no license).
 // Signals a brand-new, never-provisioned device.
-inline bool indicatesFirstRun(bool internetUp, bool hasEmail, bool hasLicense)
-{
+inline bool indicatesFirstRun(bool internetUp, bool hasEmail, bool hasLicense) {
 	return !internetUp && !hasEmail && !hasLicense;
 }
 
 // Startup walkthrough. Evaluates the prerequisites and pushes the first
 // missing step's page (with provisioningMode set), or Home when everything
 // is satisfied. Home is always the end of the walkthrough.
-void begin(AppState& state);
+void begin(AppState &state);
 
 // Called by a walkthrough page when the user finishes or exits it. Pops the
 // current page, re-evaluates the prerequisites, and pushes the next missing
 // step's page (or Home). Internet is only re-probed when it was still
 // missing, so completing a step never blocks on a redundant check.
-void advance(AppState& state);
+void advance(AppState &state);
 
 } // namespace radiantwave::provisioning

src/scroller_page.cpp

@@ -2,6 +2,7 @@
 
 #include "app_state.h"
 #include "audio/audio_downloader.h"
+#include "logical_size.h"
 #include "proclamation_options_page.h"
 #include "scramble/fibonacci_scrambler.h"
 #include "utf8_utils.h"
@@ -10,36 +11,59 @@
 #include <SDL3_ttf/SDL_ttf.h>
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <cstdint>
 #include <filesystem>
 #include <vector>
 
 using radiantwave::FibonacciLinePattern;
 using radiantwave::scroller::ProclamationStream;
 
-namespace
-{
+namespace {
 
-    constexpr float kFadeSeconds = 5.0f;
-    constexpr float kVelocityMin = -3500.0f;
-    constexpr float kVelocityMax = 3500.0f;
+constexpr float kFadeSeconds = 5.0f;
+constexpr float kVelocityMin = -3500.0f;
+constexpr float kVelocityMax = 3500.0f;
 
 } // anonymous namespace
 
-void ScrollerPage::onPush(AppState &state)
-{
+void ScrollerPage::onPush(AppState &state) {
 	state_ = &state;
 
-    int winW = 0;
-    int winH = 0;
-    SDL_GetWindowSize(state.window, &winW, &winH);
-    screenW_ = static_cast<float>(winW);
-    screenH_ = static_cast<float>(winH);
-    // Lines are capped at the full screen width; the widest Fibonacci lines are
-    // sized to fill it with whole words (peak word count derived from the
+	// Save the current logical presentation (LETTERBOX at design resolution)
+	// and switch to NONE so we render into the full physical window.  This
+	// lets the scroller scroll the entire vertical extent of tall/rotated
+	// displays while keeping text at the same pixel scale.  onPop restores
+	// the original presentation for other pages.
+	SDL_GetRenderLogicalPresentation(state.renderer, &savedLogicalW_,
+									 &savedLogicalH_, &savedMode_);
+
+	// Use the renderer's actual output size in pixels, not the window size in
+	// points. SDL_GetWindowSize() returns screen coordinates, which can be
+	// smaller than the real drawable if the display has a content scale
+	// applied (common on some monitors/compositors) — that mismatch caused
+	// this page to lay out and center within a sub-region of the screen
+	// instead of the full physical canvas. SDL_GetRenderOutputSize() gives us
+	// the true pixel dimensions of whatever we're actually rendering into.
+	int windowW = 0;
+	int windowH = 0;
+	SDL_GetRenderOutputSize(state.renderer, &windowW, &windowH);
+	if (windowW <= 0) {
+		windowW = radiantwave::kDesignWidth;
+	}
+	if (windowH <= 0) {
+		windowH = radiantwave::kDesignHeight;
+	}
+
+	SDL_SetRenderLogicalPresentation(state.renderer, windowW, windowH,
+									 SDL_LOGICAL_PRESENTATION_DISABLED);
+
+	screenW_ = static_cast<float>(windowW);
+	screenH_ = static_cast<float>(windowH);
+	// Lines are capped at the full screen width; the widest Fibonacci lines
+	// are sized to fill it with whole words (peak word count derived from the
 	// screen), independent of resolution.
 	maxLineWidth_ = screenW_;
 
@@ -57,63 +81,59 @@ void ScrollerPage::onPush(AppState &state)
 	// plays. A frequency file that is not on disk yet falls back to the manual
 	// track rather than playing nothing.
 	std::string track = state.config.get().audio.current_track;
-    if (state.config.get().audio.dynamic_audio && !streams_.empty())
-    {
+	if (state.config.get().audio.dynamic_audio && !streams_.empty()) {
 		const ProclamationStream &stream = streams_[streamIndex_];
-        if (stream.solfeggio_frequency_id != 0 && !stream.audioFilename.empty() &&
-            std::filesystem::exists(audioFilePath(stream.audioFilename)))
-        {
+		if (stream.solfeggio_frequency_id != 0 &&
+			!stream.audioFilename.empty() &&
+			std::filesystem::exists(audioFilePath(stream.audioFilename))) {
 			track = stream.audioFilename;
 		}
 	}
-    if (std::filesystem::exists(audioFilePath(track)))
-    {
+	if (std::filesystem::exists(audioFilePath(track))) {
 		state.audio.playTrackFadeIn(track, kFadeSeconds);
 	}
 
-    state.keybinds.bind(SDLK_ESCAPE, "scroller_exit", [this]()
-                        {
+	state.keybinds.bind(SDLK_ESCAPE, "scroller_exit", [this]() {
 		if (state_) {
 			state_->pages.pop(*state_);
-        } });
+		}
+	});
 }
 
-void ScrollerPage::onResume(AppState &state)
-{
+void ScrollerPage::onResume(AppState &state) {
 	state_ = &state;
 	createFont(state);
 	createPatterns();
 	rebuildWordTextures();
 
-    state.keybinds.bind(SDLK_ESCAPE, "scroller_exit", [this]()
-                        {
+	state.keybinds.bind(SDLK_ESCAPE, "scroller_exit", [this]() {
 		if (state_) {
 			state_->pages.pop(*state_);
-        } });
+		}
+	});
 }
 
-void ScrollerPage::onPause(AppState &state)
-{
+void ScrollerPage::onPause(AppState &state) {
 	state.keybinds.unbindAll();
 	destroyResources();
 }
 
-void ScrollerPage::onPop(AppState &state)
-{
+void ScrollerPage::onPop(AppState &state) {
+	// Restore the original logical presentation so other pages (Home,
+	// Settings, etc.) render in the design-resolution LETTERBOX space.
+	SDL_SetRenderLogicalPresentation(state.renderer, savedLogicalW_,
+									 savedLogicalH_, savedMode_);
+
 	state.audio.stopTrackFadeOut(kFadeSeconds);
 	state.keybinds.unbindAll();
 	destroyResources();
 	TTF_Quit();
 }
 
-void ScrollerPage::handleEvent(const SDL_Event &)
-{
-}
+void ScrollerPage::handleEvent(const SDL_Event &) {}
 
-void ScrollerPage::update(float dt)
-{
-    if (state_)
-    {
+void ScrollerPage::update(float dt) {
+	if (state_) {
 		state_->audio.update(dt);
 	}
 
@@ -121,69 +141,55 @@ void ScrollerPage::update(float dt)
 
 	scrollOffset_ += velocity_ * dt;
 	float move = std::floor(scrollOffset_);
-    if (move != 0.0f)
-    {
+	if (move != 0.0f) {
 		scrollOffset_ -= move;
-        for (auto &line : lines_)
-        {
-            for (auto &w : line.words)
-            {
+		for (auto &line : lines_) {
+			for (auto &w : line.words) {
 				w.y += move;
 			}
 		}
 	}
 
-    if (lines_.empty())
-    {
+	if (lines_.empty()) {
 		return;
 	}
 
-    if (velocity_ > 0.0f)
-    {
+	if (velocity_ > 0.0f) {
 		// Lines move downward. Recycle every line that scrolled fully off the
 		// bottom this frame (movement is continuous, so one frame can cover
 		// several line heights) and add a replacement just above the top.
-        while (!lines_.empty() && lines_.back().words[0].y > screenH_)
-        {
+		while (!lines_.empty() && lines_.back().words[0].y > screenH_) {
 			float baseY = lines_.front().words[0].y - lineHeight_;
 			lines_.pop_back();
-            if (!addLineAt(baseY))
-            {
+			if (!addLineAt(baseY)) {
 				break;
 			}
 		}
-    }
-    else if (velocity_ < 0.0f)
-    {
+	} else if (velocity_ < 0.0f) {
 		// Lines move upward. Recycle every line that scrolled fully off the top
 		// this frame and add a replacement just below the bottom.
 		while (!lines_.empty() &&
-               lines_.front().words[0].y + lines_.front().words[0].height < 0.0f)
-        {
+			   lines_.front().words[0].y + lines_.front().words[0].height <
+				   0.0f) {
 			float baseY = lines_.back().words[0].y + lineHeight_;
 			lines_.pop_front();
-            if (!addLineAt(baseY))
-            {
+			if (!addLineAt(baseY)) {
 				break;
 			}
 		}
 	}
 }
 
-void ScrollerPage::render(SDL_Renderer *renderer)
-{
+void ScrollerPage::render(SDL_Renderer *renderer) {
 	SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
 	SDL_RenderClear(renderer);
 
-    for (const auto &line : lines_)
-    {
-        if (line.words.empty())
-        {
+	for (const auto &line : lines_) {
+		if (line.words.empty()) {
 			continue;
 		}
 		float startX = std::floor((screenW_ - line.width) / 2.0f);
-        for (const auto &w : line.words)
-        {
+		for (const auto &w : line.words) {
 			SDL_SetTextureColorMod(w.texture, line.r, line.g, line.b);
 			SDL_FRect dst{startX + w.x, w.y, w.width, w.height};
 			SDL_RenderTexture(renderer, w.texture, nullptr, &dst);
@@ -191,53 +197,46 @@ void ScrollerPage::render(SDL_Renderer *renderer)
 	}
 }
 
-void ScrollerPage::buildStreams(AppState &state)
-{
+void ScrollerPage::buildStreams(AppState &state) {
 	streams_.clear();
 	fallbackPalette_.clear();
 	lines_.clear();
 	streamIndex_ = 0;
 
 	auto proclamations = state.db.getActiveProclamations();
-    if (proclamations.empty())
-    {
+	if (proclamations.empty()) {
 		return;
 	}
 
-    for (const auto &c : state.db.getPaletteForFrequencyId(5))
-    { // 528 Hz palette
+	for (const auto &c :
+		 state.db.getPaletteForFrequencyId(5)) { // 528 Hz palette
 		fallbackPalette_.push_back({c.r, c.g, c.b, c.a});
 	}
 
-    std::unordered_map<int, std::vector<radiantwave::scroller::StreamColor>> palettesByFreqId;
-    for (const auto &rec : proclamations)
-    {
+	std::unordered_map<int, std::vector<radiantwave::scroller::StreamColor>>
+		palettesByFreqId;
+	for (const auto &rec : proclamations) {
 		int freqId = rec.solfeggio_frequency_id;
-        if (palettesByFreqId.count(freqId) != 0)
-        {
+		if (palettesByFreqId.count(freqId) != 0) {
 			continue;
 		}
 		std::vector<radiantwave::scroller::StreamColor> colors;
-        for (const auto &c : state.db.getPaletteForFrequencyId(freqId))
-        {
+		for (const auto &c : state.db.getPaletteForFrequencyId(freqId)) {
 			colors.push_back({c.r, c.g, c.b, c.a});
 		}
 		palettesByFreqId[freqId] = std::move(colors);
 	}
 
 	std::unordered_map<int, radiantwave::db::AudioFileRecord> audioByFreqId;
-    for (const auto &af : state.db.getAudioFiles())
-    {
+	for (const auto &af : state.db.getAudioFiles()) {
 		int freqId = af.solfeggio_frequency_id;
 		// Self-heal for databases seeded from a legacy manifest that left the
 		// frequency id at 0 for every row: recover the id from the filename.
-        if (freqId == 0)
-        {
+		if (freqId == 0) {
 			freqId = radiantwave::audio::frequencyIdForHz(
 				radiantwave::audio::hzFromFilename(af.filename));
 		}
-        if (freqId != 0)
-        {
+		if (freqId != 0) {
 			audioByFreqId[freqId] = af;
 		}
 	}
@@ -247,10 +246,8 @@ void ScrollerPage::buildStreams(AppState &state)
 		DEFAULT_PROPLEAMATION_ID);
 }
 
-void ScrollerPage::createFont(AppState &state)
-{
-    if (font_)
-    {
+void ScrollerPage::createFont(AppState &state) {
+	if (font_) {
 		TTF_CloseFont(font_);
 		font_ = nullptr;
 	}
@@ -261,46 +258,41 @@ void ScrollerPage::createFont(AppState &state)
 	clearCharTextures();
 
 	fontPxSize_ = state.config.get().proclamation.font_size;
-    if (fontPxSize_ <= 0)
-    {
+	if (fontPxSize_ <= 0) {
 		fontPxSize_ = 32;
 	}
 
 	font_ = TTF_OpenFont("assets/fonts/Roboto-Regular.ttf", fontPxSize_);
-    if (!font_)
-    {
+	if (!font_) {
 		return;
 	}
 
 	int w = 0;
 	int h = 0;
 	TTF_GetStringSize(font_, "Mg", 0, &w, &h);
-    lineHeight_ = h > 0 ? static_cast<float>(h) : static_cast<float>(fontPxSize_);
+	lineHeight_ =
+		h > 0 ? static_cast<float>(h) : static_cast<float>(fontPxSize_);
 
 	spaceWidth_ = measureWidth(" ");
-    if (spaceWidth_ <= 0.0f)
-    {
+	if (spaceWidth_ <= 0.0f) {
 		spaceWidth_ = static_cast<float>(fontPxSize_) * 0.5f;
 	}
 }
 
-void ScrollerPage::createPatterns()
-{
+void ScrollerPage::createPatterns() {
 	patterns_.clear();
 	patterns_.reserve(streams_.size());
-    for (size_t i = 0; i < streams_.size(); ++i)
-    {
+	for (size_t i = 0; i < streams_.size(); ++i) {
 		int peak = computePeakWordCount(streams_[i].words);
-        patterns_.emplace_back(peak, maxLineWidth_, spaceWidth_,
-                               [this](const std::string &word)
-                               { return measureWidth(word); });
+		patterns_.emplace_back(
+			peak, maxLineWidth_, spaceWidth_,
+			[this](const std::string &word) { return measureWidth(word); });
 	}
 }
 
-int ScrollerPage::computePeakWordCount(const std::vector<std::string> &words) const
-{
-    if (words.empty() || screenW_ <= 0.0f)
-    {
+int ScrollerPage::computePeakWordCount(
+	const std::vector<std::string> &words) const {
+	if (words.empty() || screenW_ <= 0.0f) {
 		return 1;
 	}
 
@@ -308,14 +300,12 @@ int ScrollerPage::computePeakWordCount(const std::vector<std::string> &words) co
 	// spacing. The peak is the number of whole words that fit across the
 	// screen, so the widest Fibonacci lines fill the width at natural spacing.
 	double total = 0.0;
-    for (const auto &w : words)
-    {
+	for (const auto &w : words) {
 		total += measureWidth(w);
 	}
 	double n = static_cast<double>(words.size());
 	double perWord = (total + (n - 1.0) * spaceWidth_) / n;
-    if (perWord <= 0.0)
-    {
+	if (perWord <= 0.0) {
 		perWord = 1.0;
 	}
 
@@ -323,45 +313,36 @@ int ScrollerPage::computePeakWordCount(const std::vector<std::string> &words) co
 	return fit < 1 ? 1 : fit;
 }
 
-void ScrollerPage::destroyResources()
-{
+void ScrollerPage::destroyResources() {
 	clearCharTextures();
 
-    for (auto &entry : wordTextures_)
-    {
-        if (entry.second.texture)
-        {
+	for (auto &entry : wordTextures_) {
+		if (entry.second.texture) {
 			SDL_DestroyTexture(entry.second.texture);
 		}
 	}
 	wordTextures_.clear();
 
-    if (font_)
-    {
+	if (font_) {
 		TTF_CloseFont(font_);
 		font_ = nullptr;
 	}
 }
 
-void ScrollerPage::rebuildWordTextures()
-{
+void ScrollerPage::rebuildWordTextures() {
 	wordTextures_.clear();
-    for (auto &line : lines_)
-    {
+	for (auto &line : lines_) {
 		float width = 0.0f;
-        for (auto &item : line.words)
-        {
+		for (auto &item : line.words) {
 			ensureWordTexture(item.text);
 			const CachedWord &cached = wordTextures_[item.text];
-            if (!cached.texture)
-            {
+			if (!cached.texture) {
 				continue;
 			}
 			item.texture = cached.texture;
 			item.width = cached.width;
 			item.height = cached.height;
-            if (width > 0.0f)
-            {
+			if (width > 0.0f) {
 				width += spaceWidth_;
 			}
 			item.x = width;
@@ -371,31 +352,25 @@ void ScrollerPage::rebuildWordTextures()
 	}
 }
 
-void ScrollerPage::prefillLines()
-{
-    if (streams_.empty() || lineHeight_ <= 0.0f)
-    {
+void ScrollerPage::prefillLines() {
+	if (streams_.empty() || lineHeight_ <= 0.0f) {
 		return;
 	}
 
 	int n = static_cast<int>(std::ceil(screenH_ / lineHeight_)) + 2;
-    for (int i = 0; i < n; ++i)
-    {
+	for (int i = 0; i < n; ++i) {
 		float baseY = -lineHeight_ + static_cast<float>(i) * lineHeight_;
 		addLineAt(baseY);
 	}
 }
 
-bool ScrollerPage::addLineAt(float baseY)
-{
-    if (streams_.empty() || !font_)
-    {
+bool ScrollerPage::addLineAt(float baseY) {
+	if (streams_.empty() || !font_) {
 		return false;
 	}
 
 	ProclamationStream &stream = streams_[streamIndex_];
-    if (stream.words.empty())
-    {
+	if (stream.words.empty()) {
 		advanceStream();
 		return false;
 	}
@@ -403,7 +378,8 @@ bool ScrollerPage::addLineAt(float baseY)
 	FibonacciLinePattern &pattern = patterns_[streamIndex_];
 
 	// Capture palette state before any stream advance.
-    std::vector<radiantwave::scroller::StreamColor> paletteCopy = stream.palette;
+	std::vector<radiantwave::scroller::StreamColor> paletteCopy =
+		stream.palette;
 	int lineColorIndex = stream.colorIndex;
 	stream.colorIndex++;
 
@@ -413,17 +389,15 @@ bool ScrollerPage::addLineAt(float baseY)
 	stream.wordsPlaced += placed;
 	// First word of a fresh pass is the "start" of the proclamation; print to
 	// stdout once so the console shows the current title while it plays.
-    if (stream.wordsPlaced == placed)
-    {
+	if (stream.wordsPlaced == placed) {
 		std::printf("Playing %s\n", stream.name.c_str());
 	}
 	bool advanced = false;
-    while (!advanced && !stream.words.empty() && stream.wordsPlaced >= static_cast<int>(stream.words.size()))
-    {
+	while (!advanced && !stream.words.empty() &&
+		   stream.wordsPlaced >= static_cast<int>(stream.words.size())) {
 		stream.wordsPlaced -= static_cast<int>(stream.words.size());
 		stream.completed++;
-        if (stream.completed >= stream.repeat)
-        {
+		if (stream.completed >= stream.repeat) {
 			stream.completed = 0;
 			advanceStream();
 			advanced = true;
@@ -432,12 +406,10 @@ bool ScrollerPage::addLineAt(float baseY)
 
 	ScrollerLine line;
 	float width = 0.0f;
-    for (const auto &text : wordStrs)
-    {
+	for (const auto &text : wordStrs) {
 		ensureWordTexture(text);
 		const CachedWord &cached = wordTextures_[text];
-        if (!cached.texture)
-        {
+		if (!cached.texture) {
 			continue;
 		}
 		WordItem item;
@@ -446,8 +418,7 @@ bool ScrollerPage::addLineAt(float baseY)
 		item.width = cached.width;
 		item.height = cached.height;
 		item.y = baseY;
-        if (width > 0.0f)
-        {
+		if (width > 0.0f) {
 			width += spaceWidth_;
 		}
 		item.x = width;
@@ -455,77 +426,63 @@ bool ScrollerPage::addLineAt(float baseY)
 		line.words.push_back(item);
 	}
 
-    if (line.words.empty())
-    {
+	if (line.words.empty()) {
 		return false;
 	}
 	line.width = width;
 
-    if (!paletteCopy.empty())
-    {
-        const auto &c = paletteCopy[lineColorIndex % static_cast<int>(paletteCopy.size())];
+	if (!paletteCopy.empty()) {
+		const auto &c =
+			paletteCopy[lineColorIndex % static_cast<int>(paletteCopy.size())];
 		line.r = c.r;
 		line.g = c.g;
 		line.b = c.b;
 	}
 
-    if (!lines_.empty() && baseY < lines_.front().words[0].y)
-    {
+	if (!lines_.empty() && baseY < lines_.front().words[0].y) {
 		lines_.push_front(std::move(line));
-    }
-    else
-    {
+	} else {
 		lines_.push_back(std::move(line));
 	}
 	return true;
 }
 
-void ScrollerPage::advanceStream()
-{
-    if (streams_.empty())
-    {
+void ScrollerPage::advanceStream() {
+	if (streams_.empty()) {
 		return;
 	}
 	streamIndex_ = (streamIndex_ + 1) % static_cast<int>(streams_.size());
 	// Diagnostic: report the palette the incoming stream will render so the
 	// console shows whether colors should change when this stream starts.
 	const ProclamationStream &stream = streams_[streamIndex_];
-    if (!stream.palette.empty())
-    {
+	if (!stream.palette.empty()) {
 		const auto &c = stream.palette[0];
 		std::printf("[Scroller] -> %s freqId=%d palette[0]=#%02X%02X%02X\n",
-                    stream.name.c_str(), stream.solfeggio_frequency_id,
-                    c.r, c.g, c.b);
-    }
-    else
-    {
+					stream.name.c_str(), stream.solfeggio_frequency_id, c.r,
+					c.g, c.b);
+	} else {
 		std::printf("[Scroller] -> %s freqId=%d palette=EMPTY\n",
 					stream.name.c_str(), stream.solfeggio_frequency_id);
 	}
 	switchAudioForCurrentStream();
 }
 
-void ScrollerPage::switchAudioForCurrentStream()
-{
-    if (prefilling_ || streams_.empty() || !state_)
-    {
+void ScrollerPage::switchAudioForCurrentStream() {
+	if (prefilling_ || streams_.empty() || !state_) {
 		return;
 	}
 
 	// Dynamic audio only: with a fixed manual track selected the audio must
 	// never switch as proclamations change.
-    if (!state_->config.get().audio.dynamic_audio)
-    {
+	if (!state_->config.get().audio.dynamic_audio) {
 		return;
 	}
 
 	const ProclamationStream &stream = streams_[streamIndex_];
-    if (stream.solfeggio_frequency_id == 0 || stream.audioFilename.empty())
-    {
+	if (stream.solfeggio_frequency_id == 0 || stream.audioFilename.empty()) {
 		return; // default stream: never touch audio
 	}
-    if (!std::filesystem::exists(audioFilePath(stream.audioFilename)))
-    {
+	if (!std::filesystem::exists(audioFilePath(stream.audioFilename))) {
 		return; // keep current track; retried on the next activation
 	}
 	// Crossfades over kFadeSeconds; a no-op when the requested track is the
@@ -533,14 +490,11 @@ void ScrollerPage::switchAudioForCurrentStream()
 	state_->audio.playTrackCrossfade(stream.audioFilename, kFadeSeconds);
 }
 
-void ScrollerPage::updateAutoVelocity(float dt)
-{
-    switch (velocityState_)
-    {
+void ScrollerPage::updateAutoVelocity(float dt) {
+	switch (velocityState_) {
 	case 0: // ramping to the negative extreme
 		velocity_ -= velocityStep_ * dt;
-        if (velocity_ <= kVelocityMin)
-        {
+		if (velocity_ <= kVelocityMin) {
 			velocity_ = kVelocityMin;
 			velocityTimer_ = velocityDelay_;
 			velocityState_ = 1;
@@ -548,15 +502,13 @@ void ScrollerPage::updateAutoVelocity(float dt)
 		break;
 	case 1: // holding at the negative extreme
 		velocityTimer_ -= dt;
-        if (velocityTimer_ <= 0.0f)
-        {
+		if (velocityTimer_ <= 0.0f) {
 			velocityState_ = 2;
 		}
 		break;
 	case 2: // ramping to the positive extreme
 		velocity_ += velocityStep_ * dt;
-        if (velocity_ >= kVelocityMax)
-        {
+		if (velocity_ >= kVelocityMax) {
 			velocity_ = kVelocityMax;
 			velocityTimer_ = velocityDelay_;
 			velocityState_ = 3;
@@ -564,8 +516,7 @@ void ScrollerPage::updateAutoVelocity(float dt)
 		break;
 	case 3: // holding at the positive extreme
 		velocityTimer_ -= dt;
-        if (velocityTimer_ <= 0.0f)
-        {
+		if (velocityTimer_ <= 0.0f) {
 			velocityState_ = 0;
 		}
 		break;
@@ -575,10 +526,8 @@ void ScrollerPage::updateAutoVelocity(float dt)
 	}
 }
 
-void ScrollerPage::ensureWordTexture(const std::string &word)
-{
-    if (wordTextures_.count(word) != 0)
-    {
+void ScrollerPage::ensureWordTexture(const std::string &word) {
+	if (wordTextures_.count(word) != 0) {
 		return;
 	}
 
@@ -601,69 +550,64 @@ void ScrollerPage::ensureWordTexture(const std::string &word)
 	// breaking, centering, and the Fibonacci line pattern are unchanged; only
 	// the glyph pixels move.
 	CachedWord cached;
-    if (font_ && state_)
-    {
+	if (font_ && state_) {
 		std::vector<uint32_t> codePoints;
-        if (radiantwave::splitUtf8(word, codePoints) && !codePoints.empty())
-        {
+		if (radiantwave::splitUtf8(word, codePoints) && !codePoints.empty()) {
 			std::vector<CharEntry *> glyphs;
 			float totalWidth = 0.0f;
 			float glyphHeight = 0.0f;
-            for (uint32_t cp : codePoints)
-            {
+			for (uint32_t cp : codePoints) {
 				const std::string glyphText = radiantwave::encodeUtf8(cp);
-                if (glyphText.empty())
-                {
+				if (glyphText.empty()) {
 					continue;
 				}
 				ensureCharTexture(glyphText);
 				CharEntry &entry = charTextures_[glyphText];
-                if (!entry.surface)
-                {
+				if (!entry.surface) {
 					continue;
 				}
 				glyphs.push_back(&entry);
 				totalWidth += entry.advance;
-                if (entry.glyphH > glyphHeight)
-                {
+				if (entry.glyphH > glyphHeight) {
 					glyphHeight = entry.glyphH;
 				}
 			}
 
-            if (!glyphs.empty())
-            {
-                const int wordW = std::max(1, static_cast<int>(std::lround(totalWidth)));
-                const int wordH = std::max(1, static_cast<int>(std::lround(glyphHeight)));
-                SDL_Surface *wordSurface = SDL_CreateSurface(wordW, wordH, SDL_PIXELFORMAT_RGBA8888);
-                if (wordSurface)
-                {
+			if (!glyphs.empty()) {
+				const int wordW =
+					std::max(1, static_cast<int>(std::lround(totalWidth)));
+				const int wordH =
+					std::max(1, static_cast<int>(std::lround(glyphHeight)));
+				SDL_Surface *wordSurface =
+					SDL_CreateSurface(wordW, wordH, SDL_PIXELFORMAT_RGBA8888);
+				if (wordSurface) {
 					// Every glyph surface carries the font's full line height
 					// (probe-verified), so y = 0 keeps every crop on the shared
 					// baseline and per-word textures stay line-height tall.
 					float x = 0.0f;
-                    for (const CharEntry *entry : glyphs)
-                    {
+					for (const CharEntry *entry : glyphs) {
 						SDL_Rect srcRect{0, 0, static_cast<int>(entry->glyphW),
 										 static_cast<int>(entry->glyphH)};
 						SDL_Rect dstRect{static_cast<int>(std::lround(x)), 0,
 										 static_cast<int>(entry->glyphW),
 										 static_cast<int>(entry->glyphH)};
-                        SDL_BlitSurface(entry->surface, &srcRect, wordSurface, &dstRect);
+						SDL_BlitSurface(entry->surface, &srcRect, wordSurface,
+										&dstRect);
 						x += entry->advance;
 					}
-                    cached.texture = SDL_CreateTextureFromSurface(state_->renderer, wordSurface);
+					cached.texture = SDL_CreateTextureFromSurface(
+						state_->renderer, wordSurface);
 					// The scroller steps glyphs in whole pixels, so bilinear
 					// filtering can only smear them: nearest-neighbor keeps
 					// every frame pixel-sharp.
-                    if (cached.texture)
-                    {
-                        SDL_SetTextureScaleMode(cached.texture, SDL_SCALEMODE_NEAREST);
+					if (cached.texture) {
+						SDL_SetTextureScaleMode(cached.texture,
+												SDL_SCALEMODE_NEAREST);
 					}
 					cached.width = static_cast<float>(wordSurface->w);
 					cached.height = static_cast<float>(wordSurface->h);
 					SDL_DestroySurface(wordSurface);
-                    if (!cached.texture)
-                    {
+					if (!cached.texture) {
 						cached.width = 0.0f;
 						cached.height = 0.0f;
 					}
@@ -674,10 +618,8 @@ void ScrollerPage::ensureWordTexture(const std::string &word)
 	wordTextures_[word] = cached;
 }
 
-void ScrollerPage::ensureCharTexture(const std::string &glyph)
-{
-    if (charTextures_.count(glyph) != 0)
-    {
+void ScrollerPage::ensureCharTexture(const std::string &glyph) {
+	if (charTextures_.count(glyph) != 0) {
 		return;
 	}
 
@@ -686,25 +628,23 @@ void ScrollerPage::ensureCharTexture(const std::string &glyph)
 	// font size; createFont() clears the atlas whenever the font or its size
 	// changes, and pause/pop clear it as part of destroyResources().
 	CharEntry entry;
-    if (font_ && state_)
-    {
+	if (font_ && state_) {
 		SDL_Surface *surface = TTF_RenderText_Blended(font_, glyph.c_str(), 0,
 													  {255, 255, 255, 255});
-        if (surface)
-        {
+		if (surface) {
 			const int gW = surface->w;
 			const int gH = surface->h;
 			const int n = radiantwave::scramble::canvasSize(gW, gH);
-            if (n > 0)
-            {
+			if (n > 0) {
 				// The scrambler needs tightly packed RGBA8888; a TTF surface's
 				// pitch can exceed gW * 4, so copy row by row.
 				std::vector<uint8_t> source(static_cast<size_t>(gW) * gH * 4);
-                const uint8_t *pixels = static_cast<const uint8_t *>(surface->pixels);
-                for (int y = 0; y < gH; ++y)
-                {
+				const uint8_t *pixels =
+					static_cast<const uint8_t *>(surface->pixels);
+				for (int y = 0; y < gH; ++y) {
 					std::memcpy(source.data() + static_cast<size_t>(y) * gW * 4,
-                                pixels + static_cast<size_t>(y) * surface->pitch,
+								pixels +
+									static_cast<size_t>(y) * surface->pitch,
 								static_cast<size_t>(gW) * 4);
 				}
 
@@ -713,25 +653,24 @@ void ScrollerPage::ensureCharTexture(const std::string &glyph)
 				// The fixed seed makes every device render the same glyph as
 				// the same scrambled pattern, with no key to persist or ship.
 				radiantwave::scramble::ScrambleConfig config;
-                if (radiantwave::scramble::scramble(source.data(), scrambled.data(),
-                                                    gW, gH, config))
-                {
-                    SDL_Surface *tile = SDL_CreateSurface(n, n, SDL_PIXELFORMAT_RGBA8888);
-                    if (tile)
-                    {
+				if (radiantwave::scramble::scramble(
+						source.data(), scrambled.data(), gW, gH, config)) {
+					SDL_Surface *tile =
+						SDL_CreateSurface(n, n, SDL_PIXELFORMAT_RGBA8888);
+					if (tile) {
 						uint8_t *dst = static_cast<uint8_t *>(tile->pixels);
-                        for (int y = 0; y < n; ++y)
-                        {
-                            std::memcpy(dst + static_cast<size_t>(y) * tile->pitch,
-                                        scrambled.data() + static_cast<size_t>(y) * n * 4,
+						for (int y = 0; y < n; ++y) {
+							std::memcpy(dst + static_cast<size_t>(y) *
+												  tile->pitch,
+										scrambled.data() +
+											static_cast<size_t>(y) * n * 4,
 										static_cast<size_t>(n) * 4);
 						}
 						entry.surface = tile;
 						entry.glyphW = static_cast<float>(gW);
 						entry.glyphH = static_cast<float>(gH);
 						entry.advance = measureWidth(glyph);
-                        if (entry.advance <= 0.0f)
-                        {
+						if (entry.advance <= 0.0f) {
 							entry.advance = entry.glyphW;
 						}
 					}
@@ -743,22 +682,17 @@ void ScrollerPage::ensureCharTexture(const std::string &glyph)
 	charTextures_[glyph] = entry;
 }
 
-void ScrollerPage::clearCharTextures()
-{
-    for (auto &entry : charTextures_)
-    {
-        if (entry.second.surface)
-        {
+void ScrollerPage::clearCharTextures() {
+	for (auto &entry : charTextures_) {
+		if (entry.second.surface) {
 			SDL_DestroySurface(entry.second.surface);
 		}
 	}
 	charTextures_.clear();
 }
 
-float ScrollerPage::measureWidth(const std::string &text) const
-{
-    if (!font_)
-    {
+float ScrollerPage::measureWidth(const std::string &text) const {
+	if (!font_) {
 		return 0.0f;
 	}
 	int w = 0;
@@ -767,9 +701,9 @@ float ScrollerPage::measureWidth(const std::string &text) const
 	return static_cast<float>(w);
 }
 
-std::string ScrollerPage::audioFilePath(const std::string &filename) const
-{
-    std::string path1 = std::string(std::getenv("HOME") ? std::getenv("HOME") : "/tmp") +
+std::string ScrollerPage::audioFilePath(const std::string &filename) const {
+	std::string path1 =
+		std::string(std::getenv("HOME") ? std::getenv("HOME") : "/tmp") +
 		"/.local/radiantwave/audio/" + filename;
 	std::string path2 = "assets/audio/" + filename;
 	return std::filesystem::exists(path1) ? path1 : path2;

src/scroller_page.h

@@ -115,4 +115,8 @@ private:
     float velocityDelay_ = 2.5f;
     int velocityState_ = 0;
     float velocityTimer_ = 0.0f;
+
+    int savedLogicalW_ = 0;
+    int savedLogicalH_ = 0;
+    SDL_RendererLogicalPresentation savedMode_ = SDL_LOGICAL_PRESENTATION_DISABLED;
 };

src/settings.cpp

@@ -10,6 +10,7 @@
 #include "email_address_page.h"
 #include "license_key_page.h"
 #include "date_format_page.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 #include <SDL3_image/SDL_image.h>
 #include <algorithm>
@@ -18,18 +19,18 @@ namespace
 {
 
     constexpr int MENU_ITEM_COUNT = 9;
-    // 0 = WiFi Setup, 1 = Audio Options, 2 = Time Zone Setup, 3 = Proclamations,
-    // 4 = Email Address, 5 = License Key, 6 = Date Format,
-    // 7 = View System Logs, 8 = Back
+    // 0 = Proclamations, 1 = Audio Options, 2 = Email Address, 3 = License Key,
+    // 4 = WiFi Setup, 5 = Time Zone Setup, 6 = Date Format,
+    // 7 = System Logs, 8 = Back
     constexpr const char *MENU_LABELS[MENU_ITEM_COUNT] = {
-        "WiFi Setup",
-        "Audio Options",
-        "Time Zone Setup",
         "Proclamations",
+        "Audio Options",
         "Email Address",
         "License Key",
+        "WiFi Setup",
+        "Time Zone Setup",
         "Date Format",
-        "View System Logs",
+        "System Logs",
         "Back to Home",
     };
 
@@ -77,15 +78,6 @@ void Settings::handleEvent(const SDL_Event &event)
         switch (selectedItem_)
         {
         case 0:
-            state_->pages.push(*state_, std::make_unique<WiFiSetupPage>());
-            break;
-        case 1:
-            state_->pages.push(*state_, std::make_unique<AudioSettingsPage>());
-            break;
-        case 2:
-            state_->pages.push(*state_, std::make_unique<TimeZonePage>());
-            break;
-        case 3:
             // The Proclamation list is license-gated like Play.
             if (state_->licenseTracker.isValid())
             {
@@ -96,12 +88,21 @@ void Settings::handleEvent(const SDL_Event &event)
                 state_->pages.push(*state_, std::make_unique<LicenseBlockedPage>());
             }
             break;
-        case 4:
+        case 1:
+            state_->pages.push(*state_, std::make_unique<AudioSettingsPage>());
+            break;
+        case 2:
             state_->pages.push(*state_, std::make_unique<EmailAddressPage>());
             break;
-        case 5:
+        case 3:
             state_->pages.push(*state_, std::make_unique<LicenseKeyPage>());
             break;
+        case 4:
+            state_->pages.push(*state_, std::make_unique<WiFiSetupPage>());
+            break;
+        case 5:
+            state_->pages.push(*state_, std::make_unique<TimeZonePage>());
+            break;
         case 6:
             state_->pages.push(*state_, std::make_unique<DateFormatPage>());
             break;
@@ -128,7 +129,7 @@ void Settings::update(float dt)
 void Settings::render(SDL_Renderer *renderer)
 {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

src/timezone_page.cpp

@@ -1,5 +1,6 @@
 #include "timezone_page.h"
 #include "app_state.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 #include <algorithm>
 #include <ctime>
@@ -199,7 +200,7 @@ void TimeZonePage::update(float dt) {
 
 void TimeZonePage::render(SDL_Renderer* renderer) {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

src/wifi_setup_page.cpp

@@ -1,6 +1,7 @@
 #include "wifi_setup_page.h"
 #include "app_state.h"
 #include "provisioning.h"
+#include "logical_size.h"
 #include <SDL3/SDL.h>
 #include <algorithm>
 #include <exception>
@@ -301,7 +302,7 @@ void WiFiSetupPage::update(float dt) {
 
 void WiFiSetupPage::render(SDL_Renderer* renderer) {
     int winW, winH;
-    SDL_GetWindowSize(SDL_GetRenderWindow(renderer), &winW, &winH);
+    radiantwave::getLayoutSize(renderer, &winW, &winH);
     float fw = static_cast<float>(winW);
     float fh = static_cast<float>(winH);
 

tests/test_api_client.cpp

@@ -19,11 +19,6 @@ std::string env(const char* name) {
     return value ? std::string(value) : std::string();
 }
 
-// Returns the optional live API key, or "" when none was provided.
-std::string liveApiKey() {
-    return env("RW_LIVE_API_KEY");
-}
-
 } // namespace
 
 // ─── Offline: parse functions ─────────────────────────────────────────
@@ -163,7 +158,7 @@ TEST(ApiClientTest, ParseCategoriesHandlesNullParentId) {
 
 TEST(ApiClientLiveTest, FetchFrequenciesLive) {
     std::vector<Frequency> out;
-    EXPECT_TRUE(fetchFrequencies(out, liveApiKey()));
+    EXPECT_TRUE(fetchFrequencies(out));
     ASSERT_GE(out.size(), 7u);
 
     bool foundSolarPlexus = false;
@@ -180,7 +175,7 @@ TEST(ApiClientLiveTest, FetchFrequenciesLive) {
 // ─── Live: proclamation + category parsers against the real API ────────
 
 TEST(ApiClientLiveTest, ProclamationsAndCategoriesLiveSmoke) {
-    HttpResponse procsResponse = httpGet(PATH_PROCLAMATIONS, liveApiKey());
+    HttpResponse procsResponse = httpGet(PATH_PROCLAMATIONS);
     ASSERT_TRUE(procsResponse.transportOk);
     ASSERT_EQ(procsResponse.status, 200);
 
@@ -193,7 +188,7 @@ TEST(ApiClientLiveTest, ProclamationsAndCategoriesLiveSmoke) {
         EXPECT_FALSE(proclamations[0].id.empty());
     }
 
-    HttpResponse catsResponse = httpGet(PATH_CATEGORIES, liveApiKey());
+    HttpResponse catsResponse = httpGet(PATH_CATEGORIES);
     ASSERT_TRUE(catsResponse.transportOk);
     ASSERT_EQ(catsResponse.status, 200);
 
@@ -205,14 +200,14 @@ TEST(ApiClientLiveTest, ProclamationsAndCategoriesLiveSmoke) {
 // ─── Live: POST /license error paths (no credentials required) ─────────
 
 TEST(ApiClientLiveTest, ValidateLicenseMissingKeyLive) {
-    LicenseResult result = validateLicense("", "test@example.com", liveApiKey());
+    LicenseResult result = validateLicense("", "test@example.com");
     ASSERT_FALSE(result.ok());
     EXPECT_EQ(result.status, 400);
     EXPECT_EQ(result.error_message, "license_key is required");
 }
 
 TEST(ApiClientLiveTest, ValidateLicenseMissingEmailLive) {
-    LicenseResult result = validateLicense("AAAA-AAAA-AAAA-AAAA", "", liveApiKey());
+    LicenseResult result = validateLicense("AAAA-AAAA-AAAA-AAAA", "");
     ASSERT_FALSE(result.ok());
     EXPECT_EQ(result.status, 400);
     EXPECT_EQ(result.error_message, "email_address is required");
@@ -220,7 +215,7 @@ TEST(ApiClientLiveTest, ValidateLicenseMissingEmailLive) {
 
 TEST(ApiClientLiveTest, ValidateLicenseUnknownKeyLive) {
     LicenseResult result =
-        validateLicense("AAAA-AAAA-AAAA-AAAA", "nobody@example.com", liveApiKey());
+        validateLicense("AAAA-AAAA-AAAA-AAAA", "nobody@example.com");
     ASSERT_FALSE(result.ok());
     EXPECT_EQ(result.status, 400);
     EXPECT_EQ(result.error_message, "license key not found");
@@ -235,7 +230,7 @@ TEST(ApiClientLiveTest, ValidateLicenseSuccessLive) {
         GTEST_SKIP() << "RW_LIVE_LICENSE_KEY / RW_LIVE_LICENSE_EMAIL not set";
     }
 
-    LicenseResult result = validateLicense(key, email, liveApiKey());
+    LicenseResult result = validateLicense(key, email);
     ASSERT_TRUE(result.ok()) << "status=" << result.status
                              << " error=" << result.error_message;
     EXPECT_EQ(result.info.key, key);
@@ -245,7 +240,7 @@ TEST(ApiClientLiveTest, ValidateLicenseSuccessLive) {
 // ─── Live: POST /automations/create/account error paths (harmless) ─────
 
 TEST(ApiClientLiveTest, CreateAccountMissingEmailLive) {
-    AccountResult result = createAccount("", "", liveApiKey());
+    AccountResult result = createAccount("", "");
     ASSERT_FALSE(result.ok());
     EXPECT_EQ(result.status, 400);
     EXPECT_EQ(result.error_message, "email is required");
@@ -260,7 +255,7 @@ TEST(ApiClientLiveTest, CreateAccountSuccessLive) {
         GTEST_SKIP() << "RW_LIVE_ACCOUNT_EMAIL not set";
     }
 
-    AccountResult result = createAccount(email, "RadiantWave Test", liveApiKey());
+    AccountResult result = createAccount(email, "RadiantWave Test");
     ASSERT_TRUE(result.ok()) << "status=" << result.status
                              << " error=" << result.error_message;
     EXPECT_TRUE(result.body.success);

tests/test_color_palettes.cpp

@@ -175,7 +175,7 @@ TEST(ColorPalettesLiveTest, FetchColorPalettesLive) {
     }
 
     std::vector<ColorPalette> palettes;
-    ASSERT_TRUE(fetchColorPalettes(palettes, env("RW_LIVE_API_KEY")));
+    ASSERT_TRUE(fetchColorPalettes(palettes));
     EXPECT_FALSE(palettes.empty());
     for (const auto& p : palettes) {
         EXPECT_GE(p.colors.size(), 1u);

tests/test_license_service.cpp

@@ -48,7 +48,7 @@ TEST(LicenseServiceTest, NotConfiguredWhenNoEmail) {
     tmp.db.setKV(KV_LICENSE_KEY, "ABCD-EFGH-IJKL-MNOP");
 
     std::string errorMessage = "stale";
-    EXPECT_EQ(validateStoredLicense(tmp.db, "", &errorMessage),
+    EXPECT_EQ(validateStoredLicense(tmp.db, &errorMessage),
               Result::NotConfigured);
     EXPECT_EQ(errorMessage, "");
 }
@@ -57,7 +57,7 @@ TEST(LicenseServiceTest, NotConfiguredWhenNoLicense) {
     TempDb tmp;
     tmp.db.setKV(KV_EMAIL_ADDRESS, "user@example.com");
 
-    EXPECT_EQ(validateStoredLicense(tmp.db, "", nullptr),
+    EXPECT_EQ(validateStoredLicense(tmp.db, nullptr),
               Result::NotConfigured);
 }
 
@@ -117,7 +117,7 @@ TEST(LicenseServiceLiveTest, ValidatesAndGrantsSubscribedState) {
     tmp.db.setKV(KV_EMAIL_ADDRESS, email);
 
     std::string errorMessage;
-    const Result result = validateStoredLicense(tmp.db, "", &errorMessage);
+    const Result result = validateStoredLicense(tmp.db, &errorMessage);
     EXPECT_EQ(result, Result::Ok) << "error=" << errorMessage;
 
     // A successful validation is the "subscribed" flag; no subscription-level
@@ -134,7 +134,7 @@ TEST(LicenseServiceLiveTest, InvalidPairReportsInvalid) {
     tmp.db.setKV(KV_EMAIL_ADDRESS, "nobody@example.com");
 
     std::string errorMessage;
-    EXPECT_EQ(validateStoredLicense(tmp.db, "", &errorMessage),
+    EXPECT_EQ(validateStoredLicense(tmp.db, &errorMessage),
               Result::Invalid);
     EXPECT_FALSE(errorMessage.empty());
 }

tests/test_provisioning.cpp

@@ -1,50 +1,36 @@
-#include "test_harness.h"
 #include "../src/provisioning.h"
+#include "test_harness.h"
 
 using radiantwave::provisioning::firstMissingStep;
 using radiantwave::provisioning::indicatesFirstRun;
 using radiantwave::provisioning::Step;
 
-TEST(first_missing_step_all_satisfied)
-{
+TEST(first_missing_step_all_satisfied) {
 	ASSERT_EQ(firstMissingStep(true, true, true), Step::Done);
 }
 
-TEST(first_missing_step_no_internet)
-{
-    // Internet is checked before email/license regardless of the others.
-    ASSERT_EQ(firstMissingStep(false, false, false), Step::Internet);
-    ASSERT_EQ(firstMissingStep(false, true, true), Step::Internet);
-}
-
-TEST(first_missing_step_no_email)
-{
+TEST(first_missing_step_no_email) {
 	ASSERT_EQ(firstMissingStep(true, false, false), Step::Email);
 	ASSERT_EQ(firstMissingStep(true, false, true), Step::Email);
 }
 
-TEST(first_missing_step_no_license)
-{
+TEST(first_missing_step_no_license) {
 	ASSERT_EQ(firstMissingStep(true, true, false), Step::License);
 }
 
-TEST(first_run_all_missing)
-{
+TEST(first_run_all_missing) {
 	ASSERT_TRUE(indicatesFirstRun(false, false, false));
 }
 
-TEST(first_run_has_internet)
-{
+TEST(first_run_has_internet) {
 	ASSERT_FALSE(indicatesFirstRun(true, false, false));
 }
 
-TEST(first_run_has_email)
-{
+TEST(first_run_has_email) {
 	ASSERT_FALSE(indicatesFirstRun(false, true, false));
 }
 
-TEST(first_run_has_license)
-{
+TEST(first_run_has_license) {
 	ASSERT_FALSE(indicatesFirstRun(false, false, true));
 }