diff --git a/docs/.vitepress/playground.mjs b/docs/.vitepress/playground.mjs
index c0aa9ba6..e75b3079 100644
--- a/docs/.vitepress/playground.mjs
+++ b/docs/.vitepress/playground.mjs
@@ -105,6 +105,16 @@ const NEEDS_MORE_THAN_A_BROWSER = [
     why: 'calls a function module, and there is no application server to call one on',
     what: /\bCALL\s+FUNCTION\b/i,
   },
+  {
+    /* Not a transpiler question - whatever AUTHORITY-CHECK compiles to, the
+     * page in the browser has no user, no roles and no authorization objects,
+     * so sy-subrc after it means nothing. An example whose whole point is
+     * which branch the check takes cannot take either one here. Reasoned
+     * rather than watched, unlike the lines above it, and it fails towards no
+     * button like the rest. */
+    why: 'runs an authority check, and the browser has no user and no roles for one',
+    what: /\bAUTHORITY-CHECK\b/i,
+  },
 ];
 
 /*
diff --git a/docs/advanced/extensibility/custom_control.md b/docs/advanced/extensibility/custom_control.md
index f208534b..4a55e723 100644
--- a/docs/advanced/extensibility/custom_control.md
+++ b/docs/advanced/extensibility/custom_control.md
@@ -29,8 +29,8 @@ view->ele( n = `View` ns = `mvc`
             )->a( n = `onEvent` v = client->_event( `MY_EVENT` ) ).
 ```
 
-The wrapper class the previous builder needed for this
-([`z2ui5_cl_xml_view_cc`](https://github.com/abap2UI5/abap2UI5/blob/main/src/99/z2ui5_cl_xml_view_cc.clas.abap))
-is frozen along with the builder itself, and adding a method to it is no longer
-part of shipping a custom control.
+Nothing else is needed on the ABAP side. The builder writes whatever element
+and namespace you pass, verbatim, so a custom control is just another tag —
+there is no wrapper class to extend and no method to add before it can be
+used.
 
diff --git a/docs/advanced/extensibility/user_exits.md b/docs/advanced/extensibility/user_exits.md
index 37179ef4..19ead5ce 100644
--- a/docs/advanced/extensibility/user_exits.md
+++ b/docs/advanced/extensibility/user_exits.md
@@ -3,7 +3,7 @@ outline: [2, 4]
 ---
 # User Exits
 
-abap2UI5 offers predefined user exits for tweaking the standard behavior. The interface [`Z2UI5_IF_EXIT`](https://github.com/abap2UI5/abap2UI5/blob/main/src/99/z2ui5_if_exit.intf.abap) exposes the user exits. To use them on your system, build a class that implements the interface and its methods. The abap2UI5 class [`Z2UI5_CL_UI5_USER_EXIT`](https://github.com/abap2UI5/abap2UI5/blob/main/src/01/04/z2ui5_cl_ui5_user_exit.clas.abap) calls them dynamically. Put your class in a custom package — **not** in the abap2UI5 packages.
+abap2UI5 offers predefined user exits for tweaking the standard behavior. The interface [`Z2UI5_IF_UI5_EXIT`](https://github.com/abap2UI5/abap2UI5/blob/main/src/02/z2ui5_if_ui5_exit.intf.abap) exposes the user exits. To use them on your system, build a class that implements the interface and its methods. The abap2UI5 class [`Z2UI5_CL_UI5_USER_EXIT`](https://github.com/abap2UI5/abap2UI5/blob/main/src/01/04/z2ui5_cl_ui5_user_exit.clas.abap) calls them dynamically. Put your class in a custom package — **not** in the abap2UI5 packages.
 
 The interface exposes two exit methods:
 - **`set_config_http_get`** — called on the initial HTTP GET request (page load). Use it to set frontend properties like the UI5 theme, the UI5 version, or the inline CSS.
@@ -15,19 +15,19 @@ Both methods take a `cs_config` changing parameter whose fields you can set as n
 CLASS zcl_a2ui5_user_exit DEFINITION PUBLIC.
 
   PUBLIC SECTION.
-    INTERFACES  z2ui5_if_exit.
+    INTERFACES  z2ui5_if_ui5_exit.
 
 ENDCLASS.
 
 CLASS zcl_a2ui5_user_exit IMPLEMENTATION.
 
-  METHOD z2ui5_if_exit~set_config_http_get.
+  METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     cs_config-theme = `sap_belize`.
 
   ENDMETHOD.
 
-  METHOD z2ui5_if_exit~set_config_http_post.
+  METHOD z2ui5_if_ui5_exit~set_config_http_post.
 
     cs_config-draft_exp_time_in_hours = 8.
 
@@ -47,21 +47,4 @@ CLASS zcl_a2ui5_user_exit IMPLEMENTATION.
 ENDCLASS.
 ```
 
-::: tip The interface is being renamed
-`z2ui5_if_exit` becomes
-[`z2ui5_if_ui5_exit`](https://github.com/abap2UI5/abap2UI5/blob/main/src/02/z2ui5_if_ui5_exit.intf.abap),
-following the framework's naming. Both work — abap2UI5 looks up both
-interfaces, so an existing exit keeps running — and the examples here move to
-the new name once it is in a release. On `main` the old interface has already
-moved to the frozen `src/99` package, which is why the link above points
-there; it still ships and is still called. See
-[Deprecations](/resources/deprecations).
-:::
-
-::: warning The tab title is not set here
-`cs_config-title` is still on the structure — an exit that assigns it compiles
-and runs — but nothing reads it any more. The generated page always carries
-`<title>abap2UI5</title>`, and the title the user sees is set by the running
-app with the `set_title` frontend event: see
-[Title](/cookbook/browser_interaction/title).
-:::
+
diff --git a/docs/advanced/renaming.md b/docs/advanced/renaming.md
index 497acc54..d21de96b 100644
--- a/docs/advanced/renaming.md
+++ b/docs/advanced/renaming.md
@@ -52,7 +52,7 @@ alone would let them collide; the segment is what keeps them apart.
 
 | Segment | Meaning |
 |---|---|
-| *(none)* — `z2ui5_if_app`, `z2ui5_if_client`, `z2ui5_if_exit` | **The public API.** The three interfaces carry no segment on purpose: they are the contract, and a contract does not move between layers. `z2ui5_if_types` carries none either and is the exception that proves the rule: it is retired, ships unchanged so existing apps keep compiling, and every type it held now sits on the object that uses it — see [Deprecations](/resources/deprecations) |
+| *(none)* — `z2ui5_if_app`, `z2ui5_if_client` | **The public API.** Both interfaces carry no segment on purpose: they are the contract, and a contract does not move between layers. `z2ui5_if_types` carries none either and is the exception that proves the rule: it is retired, ships unchanged so existing apps keep compiling, and every type it held now sits on the object that uses it — see [Deprecations](/resources/deprecations) |
 | `ui5` | The framework itself — the engine and the shipped apps (`z2ui5_cl_ui5_handler`, `z2ui5_cl_ui5_srv_draft`, `z2ui5_cl_ui5_app_start`), plus the two public classes `z2ui5_cl_ui5_http_handler` and `z2ui5_cl_ui5_view_builder` |
 | `ui5f` | The UI5 **f**rontend, embedded as ABAP string constants and **generated** — never edit one by hand, the next build overwrites it |
 | `ajson`, `srt` | [ajson](/technical/tools/ajson) and [S-RTTI](/technical/tools/srtti), mirrored from their upstream projects under this namespace |
diff --git a/docs/configuration/authorization.md b/docs/configuration/authorization.md
index 15d77da3..0f7d698f 100644
--- a/docs/configuration/authorization.md
+++ b/docs/configuration/authorization.md
@@ -73,34 +73,63 @@ Alternatively, handle authorization within individual app classes. This approach
 ### Example: Authorization Check in an App Class
 In this approach, each app checks the user's permissions, like traditional ABAP apps.
 
-<!-- playground: no Run button — runs an authority check and shows nothing — an empty frame demonstrates nothing -->
+<!-- playground: no Run button — an authority check needs a user and roles, and the browser has neither -->
 ```abap
 CLASS z2ui5_cl_app DEFINITION PUBLIC.
 
   PUBLIC SECTION.
     INTERFACES z2ui5_if_app.
 
+    DATA mv_status TYPE string.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
 ENDCLASS.
 
 CLASS z2ui5_cl_app IMPLEMENTATION.
 
   METHOD z2ui5_if_app~main.
-    " Run an authorization check before launching the app
-    AUTHORITY-CHECK OBJECT `Z_APP_AUTH`
-                    ID `APP` FIELD `Z2UI5_APP_001`.
 
-    IF sy-subrc <> 0.
-      " Authorization failed, refuse access
-      RETURN.
+    IF client->check_on_navigated( ).
+
+      " Run an authorization check before showing anything
+      AUTHORITY-CHECK OBJECT `Z_APP_AUTH`
+                      ID `APP` FIELD `Z2UI5_APP_001`.
+
+      IF sy-subrc <> 0.
+        " Refuse, and SAY so - a blank screen looks like a broken app
+        mv_status = `You are not authorized to use this app.`.
+        client->message_box_display( text  = mv_status
+                                     type  = `error`
+                                     title = `Not authorized` ).
+      ELSE.
+        mv_status = |Authorized as { sy-uname }|.
+      ENDIF.
+
+      DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
+          )->ele( n = `View` ns = `mvc`
+              )->a( n = `xmlns`     v = `sap.m`
+              )->a( n = `xmlns:mvc` v = `sap.ui.core.mvc`
+
+              )->ele( `Page`
+                  )->a( n = `title` v = `Authorization`
+
+                  )->tag( `Text`
+                      )->a( n = `text` v = client->_bind( mv_status ) ) ).
+
+      client->view_display( view->stringify( ) ).
+
     ENDIF.
 
-    " Continue with app processing if authorized
-    " (App logic goes here)
   ENDMETHOD.
 
 ENDCLASS.
 ```
 
+The refusal branch matters as much as the check. Returning without displaying
+anything leaves the user on an empty frame with nothing to go on — indistinguishable
+from an app that crashed. Say what happened, then return.
+
 ::: warning
 If you don't add authorization checks at the app level, make sure users can't bypass service-level checks by navigating between apps.
 :::
diff --git a/docs/configuration/performance.md b/docs/configuration/performance.md
index e466607f..c92950c5 100644
--- a/docs/configuration/performance.md
+++ b/docs/configuration/performance.md
@@ -48,18 +48,12 @@ METHOD z2ui5_if_app~main.
 ENDMETHOD.
 ```
 
-::: tip You may see `client->view_model_update( )` in older code
-It used to be the way to ask for that push. It is a **no-op** now — the
-framework does it unconditionally — and it is scheduled for removal. Delete
-the call; nothing replaces it.
-:::
-
 
 ## Suggestions
 Want to tune your app further? A few tips:
 - Call `client->view_display` only when needed — on initialization and when the view structure changes. For a pure data change, set the attribute and return; the framework pushes the delta and UI5 re-renders only the controls that changed.
 
-- Bind data with `client->_bind` — the framework sends only the paths the user actually edited back to ABAP (a delta), so read-only and untouched fields cost nothing on the return trip. (`_bind_edit` is an obsolete alias of `_bind`.)
+- Bind data with `client->_bind` — the framework sends only the paths the user actually edited back to ABAP (a delta), so read-only and untouched fields cost nothing on the return trip.
 - Declare public attributes in your app class only for variables shown on the frontend. This keeps the framework from reading unused values.
 - Follow standard ABAP best practices, like cutting loops and choosing sorted tables, just like in any other ABAP project.
 
diff --git a/docs/configuration/security.md b/docs/configuration/security.md
index 82e1c579..8654a500 100644
--- a/docs/configuration/security.md
+++ b/docs/configuration/security.md
@@ -44,7 +44,7 @@ By default, abap2UI5 uses the CSP below (defined in `z2ui5_cl_ui5_user_exit`):
 If needed, adjust the CSP in the [user exit](/advanced/extensibility/user_exits). The exit runs after the framework fills in the defaults, so whatever you set there overrides the default policy:
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_get.
+METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     cs_config-content_security_policy = `<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' ui5.sap.com *.ui5.sap.com sdk.openui5.org *.sdk.openui5.org cdn.jsdelivr.net *.cdn.jsdelivr.net"/>`.
 
@@ -55,7 +55,7 @@ ENDMETHOD.
 `'unsafe-eval'` weakens the protection CSP provides against script injection. The default keeps it only because OpenUI5 `1.71` — the oldest supported release — still executes fetched modules via `eval()` in its module loader. If you pin a modern UI5 release, no `eval()` is involved and you can remove `'unsafe-eval'` in the same exit where you set the bootstrap source. The example below is the default policy without `'unsafe-eval'`:
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_get.
+METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     cs_config-src   = `https://ui5.sap.com/resources/sap-ui-core.js`.
     cs_config-theme = `sap_horizon`.
@@ -113,7 +113,7 @@ They live in `cs_config-t_security_header` and are set in the same
 behind a proxy that already sets one of them can drop or change it:
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_get.
+METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     " keep everything the framework set, override one entry
     DELETE cs_config-t_security_header WHERE n = `Referrer-Policy`.
@@ -129,7 +129,7 @@ Every state-changing request in abap2UI5 is a POST, so the framework ships its o
 **CSRF protection is active by default.** A fresh install rejects cross-origin POSTs without any configuration. If your endpoint must accept cross-origin POSTs (for example, behind a proxy setup where the origin legitimately differs), opt out in the [user exit](/advanced/extensibility/user_exits):
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_post.
+METHOD z2ui5_if_ui5_exit~set_config_http_post.
 
     " escape hatch - only disable this if your endpoint must accept cross-origin POSTs
     cs_config-check_csrf_active = abap_false.
diff --git a/docs/configuration/setup.md b/docs/configuration/setup.md
index 473f3b81..81d94a5a 100644
--- a/docs/configuration/setup.md
+++ b/docs/configuration/setup.md
@@ -3,19 +3,19 @@ outline: [2, 4]
 ---
 # Setup
 
-Every UI5 application has an `index.html` that bootstraps the framework, picks a theme, loads a UI5 version and so on. With abap2UI5 you don't maintain that file by hand — the framework generates it on every page load. To change what ends up in it, implement the `z2ui5_if_exit` interface in your own ABAP class:
+Every UI5 application has an `index.html` that bootstraps the framework, picks a theme, loads a UI5 version and so on. With abap2UI5 you don't maintain that file by hand — the framework generates it on every page load. To change what ends up in it, implement the `z2ui5_if_ui5_exit` interface in your own ABAP class:
 
 ```abap
 CLASS zcl_a2ui5_user_exit DEFINITION PUBLIC.
 
   PUBLIC SECTION.
-    INTERFACES z2ui5_if_exit.
+    INTERFACES z2ui5_if_ui5_exit.
 
 ENDCLASS.
 
 CLASS zcl_a2ui5_user_exit IMPLEMENTATION.
 
-  METHOD z2ui5_if_exit~set_config_http_get.
+  METHOD z2ui5_if_ui5_exit~set_config_http_get.
     " your configuration goes here
   ENDMETHOD.
 
@@ -36,9 +36,9 @@ ENDCLASS.
 
 Security-relevant headers and the Content Security Policy meta tag are configured separately — see [Security](/configuration/security).
 
-The tab title is **not** on this list. The generated page always carries `<title>abap2UI5</title>`, and the title the user sees is set by the running app with the `set_title` frontend event — see [Title](/cookbook/browser_interaction/title). The field `cs_config-title` still exists on `cs_config` so that existing exits compile, but nothing reads it.
+The tab title is **not** on this list. The generated page always carries `<title>abap2UI5</title>`, and the title the user sees is set by the running app with the `set_title` frontend event — see [Title](/cookbook/browser_interaction/title).
 
 ## See Also
 
 - Official SAP documentation on [UI5 bootstrapping](https://sapui5.hana.ondemand.com/#/topic/91f2cebe7c8e4d289fd80a4f0c0bd2ca) and [configuration options](https://sapui5.hana.ondemand.com/#/topic/91f2d03b6f4d1014b6dd926db0e91070).
-- The [User Exit](/advanced/extensibility/user_exits) page documents every hook on `z2ui5_if_exit`.
+- The [User Exit](/advanced/extensibility/user_exits) page documents every hook on `z2ui5_if_ui5_exit`.
diff --git a/docs/configuration/setup/bootstrap_attributes.md b/docs/configuration/setup/bootstrap_attributes.md
index e3bac8cf..0835a72e 100644
--- a/docs/configuration/setup/bootstrap_attributes.md
+++ b/docs/configuration/setup/bootstrap_attributes.md
@@ -23,7 +23,7 @@ The UI5 bootstrap script tag in `index.html` accepts a long list of `data-sap-ui
 To add an attribute — or override one of the defaults — append a row to `cs_config-t_add_config`. Each row contributes one `name='value'` pair to the script tag:
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_get.
+METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     cs_config-t_add_config = VALUE #(
       ( n = `data-sap-ui-libs`         v = `sap.m,sap.ui.table` )
diff --git a/docs/configuration/setup/logon_language.md b/docs/configuration/setup/logon_language.md
index 0eb11667..8fb59445 100644
--- a/docs/configuration/setup/logon_language.md
+++ b/docs/configuration/setup/logon_language.md
@@ -31,7 +31,7 @@ Most apps don't need this — the browser locale and the SAP logon language agre
 You can also pin the UI5 locale via the bootstrap, instead of relying on a URL parameter:
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_get.
+METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     cs_config-t_add_config = VALUE #(
       ( n = `data-sap-ui-language` v = `en` ) ).
diff --git a/docs/configuration/setup/style_css.md b/docs/configuration/setup/style_css.md
index 0d77a57c..30b11efb 100644
--- a/docs/configuration/setup/style_css.md
+++ b/docs/configuration/setup/style_css.md
@@ -6,7 +6,7 @@ outline: [2, 4]
 UI5 supports app-specific CSS in addition to the theme. abap2UI5 injects whatever string you assign to `cs_config-styles_css` directly into a `<style>` block in the page `<head>`, so any selector you write is applied to your application.
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_get.
+METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     cs_config-styles_css =
       |body \{ background-color: #f5f5f5; \}| &&
diff --git a/docs/configuration/setup/theme.md b/docs/configuration/setup/theme.md
index 5c3d5e1d..138e8c81 100644
--- a/docs/configuration/setup/theme.md
+++ b/docs/configuration/setup/theme.md
@@ -6,7 +6,7 @@ outline: [2, 4]
 The theme defines the look and feel of every UI5 control — colours, fonts, paddings, spacings. In a hand-written `index.html` it is set via the `data-sap-ui-theme` attribute on the bootstrap script. In abap2UI5 you set it from ABAP:
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_get.
+METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     cs_config-theme = `sap_horizon_dark`.
 
diff --git a/docs/configuration/setup/ui5_bootstrapping.md b/docs/configuration/setup/ui5_bootstrapping.md
index 62b42e4b..22a13918 100644
--- a/docs/configuration/setup/ui5_bootstrapping.md
+++ b/docs/configuration/setup/ui5_bootstrapping.md
@@ -8,7 +8,7 @@ Bootstrapping is the process of loading the UI5 runtime into the browser. abap2U
 ## Pick a Bootstrap Source
 
 ```abap
-METHOD z2ui5_if_exit~set_config_http_get.
+METHOD z2ui5_if_ui5_exit~set_config_http_get.
 
     cs_config-src = `https://ui5.sap.com/1.116.0/resources/sap-ui-core.js`.
 
diff --git a/docs/cookbook/browser_interaction/focus.md b/docs/cookbook/browser_interaction/focus.md
index 670ce41e..39577f97 100644
--- a/docs/cookbook/browser_interaction/focus.md
+++ b/docs/cookbook/browser_interaction/focus.md
@@ -32,7 +32,17 @@ This is useful for guided data entry, barcode scanning, or any flow where the ne
 After processing an event, call `client->follow_up_action( )` with `cs_event-set_focus` and the id of the input to focus next. (The value bindings on the inputs are omitted here to keep the focus logic clear — see [Barcode Scanning](/cookbook/device_capabilities/barcode_scanning) for the same form with bound inputs.)
 
 ```abap
-METHOD z2ui5_if_app~main.
+CLASS z2ui5_cl_sample_focus DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_focus IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
 
     IF client->check_on_navigated( ).
       DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
@@ -68,7 +78,8 @@ METHOD z2ui5_if_app~main.
 
     ENDIF.
 
-ENDMETHOD.
+  ENDMETHOD.
+ENDCLASS.
 ```
 
 After the user presses Enter in `id1`, the backend fires `set_focus` for `id2` and the cursor moves to the second input. The same pattern works for any chain of fields.
diff --git a/docs/cookbook/browser_interaction/keyboard_shortcuts.md b/docs/cookbook/browser_interaction/keyboard_shortcuts.md
index 8df02ee0..4619b18b 100644
--- a/docs/cookbook/browser_interaction/keyboard_shortcuts.md
+++ b/docs/cookbook/browser_interaction/keyboard_shortcuts.md
@@ -12,28 +12,51 @@ The `keyboard_shortcut` frontend event binds a key combination to a **named back
 `t_arg` is positional — the key combination and the backend event name:
 
 ```abap
-METHOD z2ui5_if_app~main.
+CLASS z2ui5_cl_sample_shortcut DEFINITION PUBLIC.
 
-  IF client->check_on_navigated( ).
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
 
-    client->follow_up_action( val   = client->cs_event-keyboard_shortcut
-                              t_arg = VALUE #( ( `Ctrl+S` )
-                                               ( `SAVE` ) ) ).
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
 
-    client->follow_up_action( val   = client->cs_event-keyboard_shortcut
-                              t_arg = VALUE #( ( `Ctrl+D` )
-                                               ( `DELETE` ) ) ).
-    view_display( ).
-  ENDIF.
+CLASS z2ui5_cl_sample_shortcut IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
 
-  CASE client->get( )-event.
-    WHEN `SAVE`.
+    IF client->check_on_navigated( ).
+
+      client->follow_up_action( val   = client->cs_event-keyboard_shortcut
+                                t_arg = VALUE #( ( `Ctrl+S` )
+                                                 ( `SAVE` ) ) ).
+
+      client->follow_up_action( val   = client->cs_event-keyboard_shortcut
+                                t_arg = VALUE #( ( `Ctrl+D` )
+                                                 ( `DELETE` ) ) ).
+
+      DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
+          )->ele( n = `View` ns = `mvc`
+              )->a( n = `xmlns`     v = `sap.m`
+              )->a( n = `xmlns:mvc` v = `sap.ui.core.mvc`
+
+              )->ele( `Page`
+                  )->a( n = `title` v = `Keyboard Shortcuts`
+
+                  )->tag( `Text`
+                      )->a( n = `text` v = `Press Ctrl+S or Ctrl+D` ) ).
+
+      client->view_display( view->stringify( ) ).
+
+    ELSEIF client->check_on_event( `SAVE` ).
       client->message_toast_display( `Saved via Ctrl+S` ).
-    WHEN `DELETE`.
+
+    ELSEIF client->check_on_event( `DELETE` ).
       client->message_toast_display( `Deleted via Ctrl+D` ).
-  ENDCASE.
 
-ENDMETHOD.
+    ENDIF.
+
+  ENDMETHOD.
+ENDCLASS.
 ```
 
 Pressing the combination fires the backend event exactly like a button press would — and the browser default for the combination is suppressed.
@@ -52,7 +75,7 @@ client->follow_up_action( val   = client->cs_event-keyboard_shortcut
 
 - **Lifetime:** the registry lives in the frontend and survives every roundtrip until the app is left. Navigating to another app starts from an empty set.
 
-The same registration also works without a backend roundtrip via `client->_event_client( )` with the identical `t_arg`.
+The same registration also works without a backend roundtrip: write the `follow_up_action( )` call where its result is consumed, as a view attribute, with the identical `t_arg` — see [the two positions](/cookbook/event_navigation/frontend#the-two-positions).
 
 ::: tip
 See demo app 471 in the [samples repository](https://github.com/abap2UI5/samples) for a complete example.
diff --git a/docs/cookbook/browser_interaction/soft_keyboard.md b/docs/cookbook/browser_interaction/soft_keyboard.md
index a93a64a6..802e462f 100644
--- a/docs/cookbook/browser_interaction/soft_keyboard.md
+++ b/docs/cookbook/browser_interaction/soft_keyboard.md
@@ -12,10 +12,20 @@ For UI5 input fields, the soft keyboard pops up automatically when an input rece
 The `keyboard_set_mode` frontend event sets the HTML `inputmode` attribute on a UI5 input. Pass the control id and the desired mode (`none` hides the soft keyboard; `text`, `numeric`, `decimal`, `tel`, etc. restore it with the matching layout).
 
 ```abap
-METHOD z2ui5_if_app~main.
+CLASS z2ui5_cl_sample_softkeyb DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
 
     DATA input TYPE string.
 
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_softkeyb IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
+
     IF client->check_on_navigated( ).
 
       DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
@@ -42,7 +52,6 @@ METHOD z2ui5_if_app~main.
                                   )->a( n = `id`               v = `ZINPUT`
                                   )->a( n = `value`            v = client->_bind( input )
                                   )->a( n = `valueHelpRequest` v = client->_event( `CALL_KEYBOARD` )
-                                  )->a( n = `valueHelpIconSrc` v = `sap-icon://keyboard-and-mouse`
                                   )->a( n = `showValueHelp`    b = abap_true ).
 
       client->view_display( view->stringify( ) ).
@@ -58,7 +67,8 @@ METHOD z2ui5_if_app~main.
         client->nav_app_leave( ).
     ENDCASE.
 
-ENDMETHOD.
+  ENDMETHOD.
+ENDCLASS.
 ```
 
 To re-enable the keyboard, fire the same event with a different mode (`text`, `numeric`, …).
diff --git a/docs/cookbook/browser_interaction/title.md b/docs/cookbook/browser_interaction/title.md
index d680e0e6..ea9ebce6 100644
--- a/docs/cookbook/browser_interaction/title.md
+++ b/docs/cookbook/browser_interaction/title.md
@@ -11,15 +11,24 @@ Set the text the browser shows in the tab and window title bar.
 The running app is the only place this is decided. The page abap2UI5 generates
 always carries `<title>abap2UI5</title>` — that is what the tab says while UI5
 boots, before any app can speak — and from the first roundtrip on it says
-whatever the app last set. The user exit's `cs_config-title` is not read any
-more; see [Deprecations](/resources/deprecations).
+whatever the app last set.
 
 ### Standalone
 
 To change the title after the app is running — for example, to reflect the current record — call the `set_title` frontend event from the backend:
 
 ```abap
-METHOD z2ui5_if_app~main.
+CLASS z2ui5_cl_sample_title DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_title IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
 
     CASE abap_true.
 
@@ -45,6 +54,7 @@ METHOD z2ui5_if_app~main.
     ENDCASE.
 
   ENDMETHOD.
+ENDCLASS.
 ```
 
 ### Launchpad
diff --git a/docs/cookbook/browser_interaction/url_handling.md b/docs/cookbook/browser_interaction/url_handling.md
index 48257937..308df564 100644
--- a/docs/cookbook/browser_interaction/url_handling.md
+++ b/docs/cookbook/browser_interaction/url_handling.md
@@ -40,6 +40,64 @@ should use is a decision of its own — see
 [Navigation → Hash](/cookbook/event_navigation/navigation/hash), which also
 covers framework routing and how to step back from ABAP.
 
+### All Three in One App
+
+```abap
+CLASS z2ui5_cl_sample_url DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+    DATA mv_search TYPE string.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_url IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
+
+    IF client->check_on_navigated( ).
+
+      mv_search = client->get( )-s_config-search.
+
+      DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
+          )->ele( n = `View` ns = `mvc`
+              )->a( n = `xmlns`     v = `sap.m`
+              )->a( n = `xmlns:mvc` v = `sap.ui.core.mvc`
+
+              )->ele( `Page`
+                  )->a( n = `title` v = `URL Handling`
+
+                  )->tag( `Label`
+                      )->a( n = `text` v = `the query string this app was started with:`
+                  )->tag( `Text`
+                      )->a( n = `text` v = client->_bind( mv_search )
+                  )->tag( `Button`
+                      )->a( n = `text`  v = `open abap2UI5.org in a new tab`
+                      )->a( n = `press` v = client->follow_up_action(
+                                               val   = client->cs_event-open_new_tab
+                                               t_arg = VALUE #( ( `https://www.abap2UI5.org` ) ) )
+                  )->tag( `Button`
+                      )->a( n = `text`  v = `push a history entry`
+                      )->a( n = `press` v = client->_event( `PUSH` ) ) ).
+
+      client->view_display( view->stringify( ) ).
+
+    ELSEIF client->check_on_event( `PUSH` ).
+      client->set_push_state( `&my-app-state=detail` ).
+      client->message_toast_display( `pushed - the browser Back button now has a step to take` ).
+
+    ENDIF.
+
+  ENDMETHOD.
+ENDCLASS.
+```
+
+The *open a new tab* button carries no roundtrip at all — the call sits in the
+view attribute, so the browser runs it on the press. The *push* button does,
+because the backend decides what to push.
+
 <!-- samples:start (generated by scripts/link-samples.mjs — do not edit) -->
 
 ## Working Samples
diff --git a/docs/cookbook/cheat_sheet.md b/docs/cookbook/cheat_sheet.md
index 8315e423..8c7459b1 100644
--- a/docs/cookbook/cheat_sheet.md
+++ b/docs/cookbook/cheat_sheet.md
@@ -14,7 +14,7 @@ A one-page recap of the rules that decide whether an abap2UI5 app works or misbe
 | Keep state in attributes, not in local variables | Between two events the app instance is serialized into a draft on the SERVER and read back — attributes survive at any visibility; locals, `DATA(...)` declarations, open cursors and locks do not → [Statefulness](/cookbook/expert_more/statefulness) |
 | Respect the UI5 aggregation rules even though the builder does not enforce them | The builder lets you nest anything inside anything; UI5 does not, and the mismatch surfaces as broken rendering rather than a syntax error → [Definition](/cookbook/view/definition) |
 | Never use a deprecated UI5 control | It renders today and vanishes on the next UI5 upgrade — and the XML is passed through unchanged, so nothing in the framework stops you → [linter](/advanced/linter), which reports it against the release your system runs |
-| Take a ready-made dialog from the popups add-on before building your own | Confirm, select, file up/download, ranges, PDF and about a dozen more, versioned on their own → [popups add-on](https://github.com/abap2UI5-addons/popups). The `Z2UI5_CL_POP_*` classes still inside the framework are frozen and on the [removal list](/resources/deprecations) |
+| Take a ready-made dialog from the popups add-on before building your own | Confirm, select, file up/download, ranges, PDF and about a dozen more, versioned on their own → [popups add-on](https://github.com/abap2UI5-addons/popups) |
 | Use backtick string literals (`` ` ``) | Project-wide convention in the framework, the samples and this documentation; keeps ABAP string handling consistent |
 
 ::: warning An ABAP flag passed as `v` does not reach the view as a boolean
diff --git a/docs/cookbook/device_capabilities/pdf.md b/docs/cookbook/device_capabilities/pdf.md
index 6dc61749..4133df37 100644
--- a/docs/cookbook/device_capabilities/pdf.md
+++ b/docs/cookbook/device_capabilities/pdf.md
@@ -7,50 +7,76 @@ samples:
 
 Render a PDF directly in your app — for printouts from Adobe Forms, SmartForms, archived documents from the Content Server, or anything else that produces an `xstring`.
 
-### Built-In Popup
+### Show It in Your Own View
 
-The simplest path is the built-in popup `Z2UI5_CL_POP_PDF`. It expects the PDF as a `data:application/pdf;base64,...` URI and embeds it in an iframe:
+`sap.m.PDFViewer` renders the document inline. It takes the PDF as a
+`data:application/pdf;base64,...` URI, so the whole job is: get the bytes,
+base64 them, bind the result.
 
-::: warning The built-in popups are frozen
-`Z2UI5_CL_POP_PDF` and its siblings live in the framework's frozen `src/99/02` package:
-they still run, so existing apps keep working, but they are not maintained and
-are on the [removal list](/resources/deprecations).
-New code should take its popups from the separate
-[popups addon](https://github.com/abap2UI5-addons/popups).
-:::
+Press **Run** — the base64 below is a real one-page PDF, so the viewer has
+something to show:
 
 ```abap
-METHOD z2ui5_if_app~main.
+CLASS z2ui5_cl_sample_pdf DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+    DATA mv_pdf TYPE string.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_pdf IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
 
-  CASE abap_true.
+    IF client->check_on_navigated( ).
+
+      " In a real app this is your document, base64-encoded:
+      "   DATA(lv_base64) = z2ui5_cl_util=>conv_encode_x_base64( lv_xstring ).
+      " where lv_xstring comes from cl_fp_function_module=>get_pdf, an OTF
+      " conversion of a SmartForm, or a SELECT from the archive.
+    mv_pdf = `data:application/pdf;base64,` &&
+             `JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwg` &&
+             `L1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2Ug` &&
+             `L1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA1OTUgODQyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA0IDAg` &&
+             `UiA+PiA+PiAvQ29udGVudHMgNSAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL1R5cGUgL0ZvbnQgL1N1YnR5cGUgL1R5` &&
+             `cGUxIC9CYXNlRm9udCAvSGVsdmV0aWNhID4+CmVuZG9iago1IDAgb2JqCjw8IC9MZW5ndGggNTMgPj4Kc3RyZWFtCkJU` &&
+             `IC9GMSAyNCBUZiA2MCA3MDAgVGQgKGFiYXAyVUk1IC0gUERGIFZpZXdlcikgVGogRVQKZW5kc3RyZWFtCmVuZG9iagp4` &&
+             `cmVmCjAgNgowMDAwMDAwMDAwIDY1NTM1IGYgCjAwMDAwMDAwMDkgMDAwMDAgbiAKMDAwMDAwMDA1OCAwMDAwMCBuIAow` &&
+             `MDAwMDAwMTE1IDAwMDAwIG4gCjAwMDAwMDAyNDEgMDAwMDAgbiAKMDAwMDAwMDMxMSAwMDAwMCBuIAp0cmFpbGVyCjw8` &&
+             `IC9TaXplIDYgL1Jvb3QgMSAwIFIgPj4Kc3RhcnR4cmVmCjQxMwolJUVPRgo=`.
 
-    WHEN client->check_on_init( ).
       DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
           )->ele( n = `View` ns = `mvc`
               )->a( n = `xmlns`     v = `sap.m`
               )->a( n = `xmlns:mvc` v = `sap.ui.core.mvc`
 
               )->ele( `Page`
-                  )->tag( `Button`
-                      )->a( n = `text`  v = `show PDF`
-                      )->a( n = `press` v = client->_event( `SHOW_PDF` ) ).
+                  )->a( n = `title` v = `Invoice 4711`
+
+                  )->tag( `PDFViewer`
+                      )->a( n = `source` v = client->_bind( mv_pdf )
+                      )->a( n = `title`  v = `Invoice 4711`
+                      )->a( n = `height` v = `600px` ) ).
 
       client->view_display( view->stringify( ) ).
+    ENDIF.
 
+  ENDMETHOD.
+ENDCLASS.
+```
 
-    WHEN client->check_on_event( `SHOW_PDF` ).
-      "lv_xstring contains the binary PDF — e.g. from cl_fp_function_module=>get_pdf, SmartForm OTF
-      "conversion, or SELECT FROM the SOFFCONT1 archive
-      DATA(lv_base64) = cl_web_http_utility=>encode_x_base64( lv_xstring ).
-      DATA(lo_popup)  = z2ui5_cl_pop_pdf=>factory(
-          i_title = `Invoice 4711`
-          i_pdf   = `data:application/pdf;base64,` && lv_base64 ).
-      client->nav_app_call( lo_popup ).
+Leave `height` off and the viewer opens in its own dialog instead of sitting in
+the page — the same control, one property apart.
 
-  ENDCASE.
+The base64 string travels in the model, so a large document is a large
+roundtrip. Past a few megabytes, offer the
+[download](#download-instead-of-display) below rather than rendering it inline.
 
-ENDMETHOD.
-```
+For a ready-made dialog with a title bar and buttons, the
+[popups add-on](https://github.com/abap2UI5-addons/popups) carries one.
 
 ### Download Instead of Display
 
diff --git a/docs/cookbook/eml_cds_sql/abap_sql.md b/docs/cookbook/eml_cds_sql/abap_sql.md
index e8bd4d8c..27d32900 100644
--- a/docs/cookbook/eml_cds_sql/abap_sql.md
+++ b/docs/cookbook/eml_cds_sql/abap_sql.md
@@ -91,7 +91,6 @@ IF client->check_on_navigated( ).
 ELSEIF client->check_on_event( `SEARCH` ).
 
   load_data( ).
-  client->view_model_update( ).
 
 ENDIF.
 ```
diff --git a/docs/cookbook/eml_cds_sql/draft_handling.md b/docs/cookbook/eml_cds_sql/draft_handling.md
index cee5ce5c..3c4c81d1 100644
--- a/docs/cookbook/eml_cds_sql/draft_handling.md
+++ b/docs/cookbook/eml_cds_sql/draft_handling.md
@@ -306,14 +306,13 @@ METHOD check_existing_draft.
 
   IF draft_info-created_by = sy-uname.
     " Same user — popup with Resume / Discard choice
-    client->nav_app_call( z2ui5_cl_pop_to_confirm=>factory(
-        i_title               = `Existing Draft Found`
-        i_question_text       = `You have an open draft. Resume working on it, or discard and start fresh?`
-        i_icon                = `sap-icon://edit`
-        i_button_text_confirm = `Resume Draft`
-        i_button_text_cancel  = `Discard && Start New`
-        i_event_confirm       = `STARTUP_RESUME`
-        i_event_cancel        = `STARTUP_DISCARD` ) ).
+    client->message_box_display(
+        type             = `confirm`
+        title            = `Existing Draft Found`
+        text             = `You have an open draft. Resume working on it, or discard and start fresh?`
+        actions          = VALUE #( ( `Resume Draft` ) ( `Discard && Start New` ) )
+        emphasizedaction = `Resume Draft`
+        onclose          = `STARTUP_ANSWERED` ).
   ELSE.
     " Different user holds the draft — stay in VIEW mode
     status_text = |Draft locked by user { draft_info-created_by }. Cannot enter edit mode.|.
@@ -323,7 +322,7 @@ ENDMETHOD.
 ```
 Three branches:
 - **no draft** — call `draft_acquire( )` and go straight to EDIT,
-- **same user** — show a popup so the user can resume or throw the draft away,
+- **same user** — ask, with a confirm box, whether to resume or throw the draft away,
 - **other user** — refuse and stay in VIEW with an explanatory status text.
 
 ::: tip
@@ -479,14 +478,18 @@ ELSEIF client->check_on_event( `EDIT_TOGGLE` ).
   on_event_edit_toggle( ).
 ELSEIF client->check_on_event( `ACTIVATE` ).
   on_event_activate( ).
-ELSEIF client->check_on_event( `STARTUP_RESUME` ).
-  on_event_startup_resume( ).
-ELSEIF client->check_on_event( `STARTUP_DISCARD` ).
-  on_event_startup_discard( ).
-ELSEIF client->check_on_event( `EXIT_KEEP` ).
-  on_event_exit_keep( ).
-ELSEIF client->check_on_event( `EXIT_DISCARD` ).
-  on_event_exit_discard( ).
+ELSEIF client->check_on_event( `STARTUP_ANSWERED` ).
+  IF client->get_event_arg( 1 ) = `Resume Draft`.
+    on_event_startup_resume( ).
+  ELSE.
+    on_event_startup_discard( ).
+  ENDIF.
+ELSEIF client->check_on_event( `EXIT_ANSWERED` ).
+  IF client->get_event_arg( 1 ) = `Keep Draft`.
+    on_event_exit_keep( ).
+  ELSE.
+    on_event_exit_discard( ).
+  ENDIF.
 ENDIF.
 ```
 The view itself is a single `simple_form` whose `editable` and per-input `enabled` flags follow `draft_open`. The primary button label and type flip between **Switch to Edit Mode** and **Switch to View Mode** based on `mode`, and **Activate** is only enabled while a draft is open.
@@ -539,14 +542,18 @@ CLASS z2ui5_cl_sample_draft IMPLEMENTATION.
       on_event_edit_toggle( ).
     ELSEIF client->check_on_event( `ACTIVATE` ).
       on_event_activate( ).
-    ELSEIF client->check_on_event( `STARTUP_RESUME` ).
-      on_event_startup_resume( ).
-    ELSEIF client->check_on_event( `STARTUP_DISCARD` ).
-      on_event_startup_discard( ).
-    ELSEIF client->check_on_event( `EXIT_KEEP` ).
-      on_event_exit_keep( ).
-    ELSEIF client->check_on_event( `EXIT_DISCARD` ).
-      on_event_exit_discard( ).
+    ELSEIF client->check_on_event( `STARTUP_ANSWERED` ).
+      IF client->get_event_arg( 1 ) = `Resume Draft`.
+        on_event_startup_resume( ).
+      ELSE.
+        on_event_startup_discard( ).
+      ENDIF.
+    ELSEIF client->check_on_event( `EXIT_ANSWERED` ).
+      IF client->get_event_arg( 1 ) = `Keep Draft`.
+        on_event_exit_keep( ).
+      ELSE.
+        on_event_exit_discard( ).
+      ENDIF.
     ELSEIF client->check_on_event( `LEAVE_APP` ).
       on_event_leave_app( ).
     ENDIF.
@@ -588,14 +595,13 @@ CLASS z2ui5_cl_sample_draft IMPLEMENTATION.
     ENDIF.
 
     " Changes detected — ask whether to keep or discard
-    client->nav_app_call( z2ui5_cl_pop_to_confirm=>factory(
-        i_title               = `Exit Edit Mode`
-        i_question_text       = `You have unsaved changes. Keep the draft for later, or discard it now?`
-        i_icon                = `sap-icon://question-mark`
-        i_button_text_confirm = `Keep Draft`
-        i_button_text_cancel  = `Discard Draft`
-        i_event_confirm       = `EXIT_KEEP`
-        i_event_cancel        = `EXIT_DISCARD` ) ).
+    client->message_box_display(
+        type             = `confirm`
+        title            = `Exit Edit Mode`
+        text             = `You have unsaved changes. Keep the draft for later, or discard it now?`
+        actions          = VALUE #( ( `Keep Draft` ) ( `Discard Draft` ) )
+        emphasizedaction = `Keep Draft`
+        onclose          = `EXIT_ANSWERED` ).
   ENDMETHOD.
 
   METHOD has_changes_vs_active.
@@ -712,15 +718,14 @@ CLASS z2ui5_cl_sample_draft IMPLEMENTATION.
 
     IF lv_owner = sy-uname.
       " Same user — popup with Resume / Discard choice
-      client->nav_app_call( z2ui5_cl_pop_to_confirm=>factory(
-          i_title               = `Existing Draft Found`
-          i_question_text       = |You have an open draft (last changed: { lv_time_text }). | &
-                                  |Resume working on it, or discard and start fresh?|
-          i_icon                = `sap-icon://edit`
-          i_button_text_confirm = `Resume Draft`
-          i_button_text_cancel  = `Discard && Start New`
-          i_event_confirm       = `STARTUP_RESUME`
-          i_event_cancel        = `STARTUP_DISCARD` ) ).
+      client->message_box_display(
+          type             = `confirm`
+          title            = `Existing Draft Found`
+          text             = |You have an open draft (last changed: { lv_time_text }). | &
+                             |Resume working on it, or discard and start fresh?|
+          actions          = VALUE #( ( `Resume Draft` ) ( `Discard && Start New` ) )
+          emphasizedaction = `Resume Draft`
+          onclose          = `STARTUP_ANSWERED` ).
     ELSE.
       " Different user holds the draft — stay in VIEW mode
       mode        = `VIEW`.
diff --git a/docs/cookbook/eml_cds_sql/eml.md b/docs/cookbook/eml_cds_sql/eml.md
index bf73db71..62efd6ca 100644
--- a/docs/cookbook/eml_cds_sql/eml.md
+++ b/docs/cookbook/eml_cds_sql/eml.md
@@ -148,8 +148,8 @@ TRY.
     ENDIF.
 
   CATCH cx_root INTO DATA(lx).
-    client->nav_app_call( z2ui5_cl_pop_error=>factory( lx ) ).
+    client->message_box_display( lx ).
 ENDTRY.
 ```
 
-For general exception handling and the framework's error popup, see the [Exception](/cookbook/event_navigation/exception) page.
+`message_box_display( )` reads the text out of the exception object itself. For what happens to an exception you do *not* catch, see [Exception](/cookbook/event_navigation/exception).
diff --git a/docs/cookbook/eml_cds_sql/fuzzy_search.md b/docs/cookbook/eml_cds_sql/fuzzy_search.md
index 5791b1cd..1bfa6ad5 100644
--- a/docs/cookbook/eml_cds_sql/fuzzy_search.md
+++ b/docs/cookbook/eml_cds_sql/fuzzy_search.md
@@ -37,7 +37,6 @@ CLASS z2ui5_cl_sample_fuzzy IMPLEMENTATION.
 
       WHEN client->check_on_event( `SEARCH` ).
         load_data( ).
-        client->view_model_update( ).
 
     ENDCASE.
 
diff --git a/docs/cookbook/event_navigation/exception.md b/docs/cookbook/event_navigation/exception.md
index 3d416268..cf441b02 100644
--- a/docs/cookbook/event_navigation/exception.md
+++ b/docs/cookbook/event_navigation/exception.md
@@ -64,15 +64,43 @@ locked object, a service that is not there — is better caught where it happens
 and shown as a message, which costs the user nothing:
 
 ```abap
-METHOD z2ui5_if_app~main.
+CLASS z2ui5_cl_sample_exception DEFINITION PUBLIC.
 
-  TRY.
-      DATA(lv_val) = 1 / 0.
-    CATCH cx_root INTO DATA(lx).
-      client->message_box_display( lx ).
-  ENDTRY.
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
 
-ENDMETHOD.
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_exception IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
+
+    IF client->check_on_navigated( ).
+      DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
+          )->ele( n = `View` ns = `mvc`
+              )->a( n = `xmlns`     v = `sap.m`
+              )->a( n = `xmlns:mvc` v = `sap.ui.core.mvc`
+
+              )->ele( `Page`
+                  )->a( n = `title` v = `Exception`
+
+                  )->tag( `Button`
+                      )->a( n = `text`  v = `divide by zero`
+                      )->a( n = `press` v = client->_event( `DIVIDE` ) ) ).
+
+      client->view_display( view->stringify( ) ).
+
+    ELSEIF client->check_on_event( `DIVIDE` ).
+      TRY.
+          DATA(lv_val) = 1 / 0.
+        CATCH cx_root INTO DATA(lx).
+          client->message_box_display( lx ).
+      ENDTRY.
+    ENDIF.
+
+  ENDMETHOD.
+ENDCLASS.
 ```
 
 `message_box_display( )` takes the exception object directly and reads the text
diff --git a/docs/cookbook/event_navigation/frontend.md b/docs/cookbook/event_navigation/frontend.md
index 05679b1c..2f1e7289 100644
--- a/docs/cookbook/event_navigation/frontend.md
+++ b/docs/cookbook/event_navigation/frontend.md
@@ -58,28 +58,11 @@ in both: everything in the table below can be wired to a control *or* scheduled
 after a roundtrip. Pick the position by when the action has to happen, not by
 what it does.
 
-::: tip Two older names for the same two forms
-`_event_client( )` is the older name of the **attribute** form — in that
-position the two produce the identical wire, byte for byte. `action->gen( )`
-was the older name of the **statement** form, and took the same `val` and
-`t_arg`, so that migration is a plain rename too:
-
-```abap
-" obsolete
-client->action->gen( val   = client->cs_event-open_new_tab
-                     t_arg = VALUE #( ( `https://github.com/abap2UI5` ) ) ).
-" now
-client->follow_up_action( val   = client->cs_event-open_new_tab
-                          t_arg = VALUE #( ( `https://github.com/abap2UI5` ) ) ).
-```
-
-Both old names stay in the interface so existing apps keep compiling — rename
-the calls at your leisure. See [Deprecations](/resources/deprecations).
-:::
 
 ## The frontend events
 
-The following frontend events are available:
+The frontend events, as `z2ui5_if_client=>cs_event` carries them:
+
 ```abap
   CONSTANTS:
     BEGIN OF cs_event,
@@ -97,6 +80,7 @@ The following frontend events are available:
       clipboard_app_state       TYPE string VALUE `CLIPBOARD_APP_STATE`,
       set_title                 TYPE string VALUE `SET_TITLE`,
       set_title_launchpad       TYPE string VALUE `SET_TITLE_LAUNCHPAD`,
+      set_favicon               TYPE string VALUE `SET_FAVICON`,
       set_focus                 TYPE string VALUE `SET_FOCUS`,
       scroll_to                 TYPE string VALUE `SCROLL_TO`,
       scroll_into_view          TYPE string VALUE `SCROLL_INTO_VIEW`,
@@ -110,7 +94,6 @@ The following frontend events are available:
       urlhelper                 TYPE string VALUE `URLHELPER`,
       store_data                TYPE string VALUE `STORE_DATA`,
       play_audio                TYPE string VALUE `PLAY_AUDIO`,
-      wizard_set_next_step      TYPE string VALUE `WIZARD_SET_NEXT_STEP`,
 
       "Control calls (positional t_arg)
       control_by_id             TYPE string VALUE `CONTROL_BY_ID`,
@@ -122,8 +105,17 @@ The following frontend events are available:
       smart_variant_init        TYPE string VALUE `SMART_VARIANT_INIT`,
       filter_bar_variant_init   TYPE string VALUE `FILTER_BAR_VARIANT_INIT`,
 
+      "URL and app state
+      set_app_state_active      TYPE string VALUE `SET_APP_STATE_ACTIVE`,
+      set_push_state            TYPE string VALUE `SET_PUSH_STATE`,
+      set_nav_routing           TYPE string VALUE `SET_NAV_ROUTING`,
+
     END OF cs_event.
 ```
+
+The interface carries a few more that are obsolete and are not listed here —
+they still dispatch, so old code keeps running, and what replaced each one is
+on [Deprecations](/resources/deprecations).
 Some of these events have their own pages: [`keyboard_shortcut`](/cookbook/browser_interaction/keyboard_shortcuts) binds key combinations to backend events, [`set_nav_routing`](/cookbook/event_navigation/navigation/hash) switches hash routing on, and [`smart_variant_init` / `filter_bar_variant_init`](/cookbook/expert_more/smart_controls) wire variant management for smart controls. The dedicated cookbook pages under [Browser Interaction](/cookbook/browser_interaction/title) and [Device Capabilities](/cookbook/device_capabilities/upload_download) carry the argument list of each event.
 
 ::: tip These used to be invisible custom controls
@@ -201,7 +193,7 @@ The `view` parameter selects the slot to bind; `t_arg` carries the row index and
 
 ### The `view` parameter
 
-For `control_by_id`, the control is looked up by id. `follow_up_action( )` (and the obsolete `_event_client( )`) takes a separate `view` parameter (default `cs_view-main`) that scopes this lookup:
+For `control_by_id`, the control is looked up by id. `follow_up_action( )` takes a separate `view` parameter (default `cs_view-main`) that scopes this lookup:
 
 - omit it (or pass `cs_view-main`) — the id is resolved across all open views;
 - pass `cs_view-popup` / `cs_view-popover` / `cs_view-nested` / … — the lookup is scoped to a control hosted in that view (e.g. a control living inside a popup).
@@ -241,14 +233,6 @@ security risks. Only use it if you fully understand the consequences and have no
 alternative.
 :::
 
-::: tip `cs_event-z2ui5` is the older form of the same thing
-The constant calls a function you registered as a `z2ui5.*` global
-(``follow_up_action( val = cs_event-z2ui5 t_arg = VALUE #( ( `myFunction` ) ) )``).
-It still works and is still dispatched, but it sits with the obsolete constants
-in `z2ui5_if_client`: passing the expression directly, as above, is the same
-call without the indirection. If the global is missing the frontend logs
-`Z2UI5: 'z2ui5.myFunction' is not a function` rather than failing silently.
-:::
 
 ### Why It Is a Security Risk
 
diff --git a/docs/cookbook/event_navigation/life_cycle.md b/docs/cookbook/event_navigation/life_cycle.md
index c0388397..abaaf189 100644
--- a/docs/cookbook/event_navigation/life_cycle.md
+++ b/docs/cookbook/event_navigation/life_cycle.md
@@ -110,7 +110,7 @@ ENDCASE.
 
 When the sub-app is left, `main` runs again, but neither `check_on_init` nor any event matches, so `view_display( )` is never called and the user is left looking at a stale or empty screen. Nothing reports it: the response simply carries no view, and the browser keeps showing whatever was on it.
 
-Display from the navigation-return branch as well. `check_on_navigated( )` covers strictly more than `check_on_init( )` does — the first display of the app raises it too, along with a `nav_app_leave( )`, one of the built-in `z2ui5_cl_pop_*` value helps closing, and a bookmarked draft being restored — so an app with no one-time setup to do can react to it alone and drop the init branch entirely:
+Display from the navigation-return branch as well. `check_on_navigated( )` covers strictly more than `check_on_init( )` does — the first display of the app raises it too, along with a `nav_app_leave( )`, a called sub-app or value help closing, and a bookmarked draft being restored — so an app with no one-time setup to do can react to it alone and drop the init branch entirely:
 
 ```abap
 " CORRECT — the view is rebuilt on first display and on every return
diff --git a/docs/cookbook/event_navigation/navigation/hash.md b/docs/cookbook/event_navigation/navigation/hash.md
index e70232d8..607105ae 100644
--- a/docs/cookbook/event_navigation/navigation/hash.md
+++ b/docs/cookbook/event_navigation/navigation/hash.md
@@ -86,9 +86,6 @@ entry, so Back returns to the calling app.
 client->nav_app_call( NEW z2ui5_cl_new_app( ) ).
 ```
 
-(The frontend-side `nav_to_route` event that used to do this was removed in
-1.143.0 — see [Deprecations](/resources/deprecations).)
-
 ## Pushing your own states
 
 The router gives you one route per *app*. An app with several screens of its
diff --git a/docs/cookbook/event_navigation/navigation/inner_app.md b/docs/cookbook/event_navigation/navigation/inner_app.md
index 93d86975..12aff74b 100644
--- a/docs/cookbook/event_navigation/navigation/inner_app.md
+++ b/docs/cookbook/event_navigation/navigation/inner_app.md
@@ -73,6 +73,72 @@ ENDMETHOD.
 Sounds familiar? The abap2UI5 framework echoes classic `call screen` and `leave to screen` behavior.
 :::
 
+### The Whole Stack in One Class
+
+The called app does not have to be a *different* class. An app that calls
+another instance of itself shows the stack, the return and `get_app_prev( )`
+in one runnable piece — press **Run** and walk down and back up:
+
+```abap
+CLASS z2ui5_cl_sample_stack DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+    DATA mv_level TYPE i.
+    DATA mv_note  TYPE string.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_stack IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
+
+    IF client->check_on_navigated( ).
+
+      " Coming back up: read what the app above left on its own instance
+      DATA(lo_prev) = CAST z2ui5_cl_sample_stack( client->get_app_prev( ) ).
+      IF lo_prev IS BOUND.
+        mv_note = |back from level { lo_prev->mv_level }|.
+      ENDIF.
+
+      DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
+          )->ele( n = `View` ns = `mvc`
+              )->a( n = `xmlns`     v = `sap.m`
+              )->a( n = `xmlns:mvc` v = `sap.ui.core.mvc`
+
+              )->ele( `Page`
+                  )->a( n = `title` v = |Level { mv_level }|
+
+                  )->tag( `Text`
+                      )->a( n = `text` v = client->_bind( mv_note )
+                  )->tag( `Button`
+                      )->a( n = `text`  v = `call one level deeper`
+                      )->a( n = `press` v = client->_event( `DOWN` )
+                  )->tag( `Button`
+                      )->a( n = `text`    v = `leave, back to the caller`
+                      )->a( n = `press`   v = client->_event( `UP` )
+                      )->a( n = `enabled` b = client->check_app_prev_stack( ) ) ).
+
+      client->view_display( view->stringify( ) ).
+
+    ELSEIF client->check_on_event( `DOWN` ).
+      client->nav_app_call( NEW z2ui5_cl_sample_stack( mv_level = mv_level + 1 ) ).
+
+    ELSEIF client->check_on_event( `UP` ).
+      client->nav_app_leave( ).
+
+    ENDIF.
+
+  ENDMETHOD.
+ENDCLASS.
+```
+
+`check_app_prev_stack( )` is what greys out *leave* at the bottom of the stack —
+calling `nav_app_leave( )` with nothing to return to drops the user out of the
+app.
+
 ::: tip Browser Back & Forward
 By default, the browser's Back button leaves the abap2UI5 page — it does not step through the app stack. Enable [hash routing](/cookbook/event_navigation/navigation/hash) with `client->follow_up_action( client->cs_event-set_nav_routing )` to couple the browser's Back/Forward buttons to `nav_app_call` / `nav_app_leave` and make apps bookmarkable.
 :::
diff --git a/docs/cookbook/expert_more/value_help.md b/docs/cookbook/expert_more/value_help.md
index 1118fdf2..ae0455bf 100644
--- a/docs/cookbook/expert_more/value_help.md
+++ b/docs/cookbook/expert_more/value_help.md
@@ -46,27 +46,28 @@ client->view_display( view->stringify( ) ).
 
 ### Selection Popup
 
-For a *"pick from this list"* dialog, navigate to a picker as a sub-app, pass
-any internal table, and read the result on return.
+For a *"pick from this list"* dialog, open a popup with the candidates in it
+and let the press event write the chosen value back. No sub-app and no
+navigation are involved — the popup is a second view of the same class, so the
+selected row is simply an attribute.
 
-::: warning The built-in popups are frozen
-`Z2UI5_CL_POP_TO_SELECT` and its siblings live in the framework's frozen
-`src/99/02` package: they still run, so existing apps keep working, but they
-are not maintained and are on the removal list. Their successor is the separate
-[popups addon](https://github.com/abap2UI5-addons/popups), which is where new
-code should get its picker from. The example below is written with the built-in
-one because that is what existing code contains.
-:::
-
-
-<!-- playground: no Run button — SELECTs from SCARR, which no browser database has -->
 ```abap
 CLASS z2ui5_cl_sample_f4 DEFINITION PUBLIC.
 
   PUBLIC SECTION.
     INTERFACES z2ui5_if_app.
-    DATA mv_carrid TYPE string.
 
+    TYPES:
+      BEGIN OF ty_s_carrier,
+        carrid   TYPE c LENGTH 3,
+        carrname TYPE c LENGTH 20,
+      END OF ty_s_carrier.
+
+    DATA mv_carrid   TYPE string.
+    DATA mt_carriers TYPE STANDARD TABLE OF ty_s_carrier WITH EMPTY KEY.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
 ENDCLASS.
 
 CLASS z2ui5_cl_sample_f4 IMPLEMENTATION.
@@ -74,7 +75,7 @@ CLASS z2ui5_cl_sample_f4 IMPLEMENTATION.
 
     CASE abap_true.
 
-      WHEN client->check_on_init( ).
+      WHEN client->check_on_navigated( ).
         DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
             )->ele( n = `View` ns = `mvc`
                 )->a( n = `xmlns`     v = `sap.m`
@@ -88,24 +89,39 @@ CLASS z2ui5_cl_sample_f4 IMPLEMENTATION.
 
         client->view_display( view->stringify( ) ).
 
-
       WHEN client->check_on_event( `F4` ).
-        SELECT carrid, carrname, url FROM scarr INTO TABLE @DATA(lt_carriers).
-        " abap2ui5lint-disable-next-line non-released-api -- frozen built-in picker, see the note above
-        client->nav_app_call( z2ui5_cl_pop_to_select=>factory(
-            i_tab   = lt_carriers
-            i_title = `Choose airline` ) ).
-
-      WHEN client->check_on_navigated( ).
-        " abap2ui5lint-disable-next-line non-released-api -- frozen built-in picker, see the note above
-        DATA(lo_prev) = CAST z2ui5_cl_pop_to_select( client->get_app_prev( ) ).
-        DATA(ls_res)  = lo_prev->result( ).
-        IF ls_res-check_confirmed = abap_true.
-          FIELD-SYMBOLS <row> TYPE any.
-          ASSIGN ls_res-row->* TO <row>.
-          ASSIGN COMPONENT `CARRID` OF STRUCTURE <row> TO FIELD-SYMBOL(<carrid>).
-          mv_carrid = <carrid>.
-        ENDIF.
+        " On a system this is your SELECT:
+        "   SELECT carrid, carrname FROM scarr INTO TABLE @mt_carriers.
+        mt_carriers = VALUE #( ( carrid = `LH` carrname = `Lufthansa` )
+                               ( carrid = `UA` carrname = `United Airlines` )
+                               ( carrid = `AA` carrname = `American Airlines` )
+                               ( carrid = `SQ` carrname = `Singapore Airlines` ) ).
+
+        DATA(popup) = z2ui5_cl_ui5_view_builder=>factory(
+            )->ele( n = `FragmentDefinition` ns = `core`
+                )->a( n = `xmlns`      v = `sap.m`
+                )->a( n = `xmlns:core` v = `sap.ui.core`
+
+                )->ele( `Dialog`
+                    )->a( n = `title` v = `Choose airline`
+
+                    )->ele( `List`
+                        )->a( n = `items` v = client->_bind( mt_carriers )
+
+                        )->ele( `items`
+                            )->tag( `StandardListItem`
+                                )->a( n = `title`       v = `{CARRNAME}`
+                                )->a( n = `description` v = `{CARRID}`
+                                )->a( n = `type`        v = `Active`
+                                )->a( n = `press`       v = client->_event(
+                                                                val = `PICK`
+                                                                t_arg = VALUE #( ( `${CARRID}` ) ) ) ) ).
+
+        client->popup_display( popup->stringify( ) ).
+
+      WHEN client->check_on_event( `PICK` ).
+        mv_carrid = client->get_event_arg( 1 ).
+        client->popup_destroy( ).
 
     ENDCASE.
 
@@ -113,6 +129,14 @@ CLASS z2ui5_cl_sample_f4 IMPLEMENTATION.
 ENDCLASS.
 ```
 
+The chosen key travels in the event argument, so nothing has to be looked up
+again on the way back. `type="Active"` is what makes a `StandardListItem`
+pressable — without it the `press` event never fires.
+
+For a ready-made picker with sorting, multi-select and a search field, the
+[popups add-on](https://github.com/abap2UI5-addons/popups) carries one.
+
+
 Pass `i_multiselect = abap_true` for multi-pick; the result table is then in `ls_res-table`.
 
 ### DDIC Search Help
diff --git a/docs/cookbook/model/binding.md b/docs/cookbook/model/binding.md
index 11c19dd3..4ec62652 100644
--- a/docs/cookbook/model/binding.md
+++ b/docs/cookbook/model/binding.md
@@ -90,9 +90,6 @@ CLASS zcl_app_hello_world IMPLEMENTATION.
 ENDCLASS.
 ```
 
-::: tip `_bind_edit` is obsolete
-Earlier releases split binding into a display-only `_bind` and a writable `_bind_edit`. Both now write to the same model and behave identically, so `_bind_edit` is only an obsolete alias of `_bind` — prefer `_bind( )`. You will still find `_bind_edit` in older examples.
-:::
 
 ::: warning **Bound Attributes Must Be Public**
 `_bind( )` resolves your class attributes from outside the controller via dynamic ASSIGN, and it only sees the `PUBLIC SECTION`. Passing a `PROTECTED` or `PRIVATE` attribute — or a local variable — is **not** silent: the framework finds no attribute for the reference and raises
diff --git a/docs/cookbook/model/device_model.md b/docs/cookbook/model/device_model.md
index 1a81ba92..9adb28a3 100644
--- a/docs/cookbook/model/device_model.md
+++ b/docs/cookbook/model/device_model.md
@@ -40,6 +40,91 @@ DATA(pointer)     = device-support-pointer.
 DATA(retina)      = device-support-retina.
 ```
 
+### Both Together
+
+Press **Run** — the top half reads the device model straight in the view, the
+bottom half is the same information taken from ABAP:
+
+```abap
+CLASS z2ui5_cl_sample_device DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+    DATA mv_system  TYPE string.
+    DATA mv_browser TYPE string.
+    DATA mv_size    TYPE string.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_device IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
+
+    IF client->check_on_navigated( ).
+
+      DATA(device) = client->get( )-s_device.
+      mv_system  = device-system.
+      mv_browser = |{ device-browser-name } { device-browser-version }|.
+      mv_size    = |{ device-resize-width } x { device-resize-height }|.
+
+      DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
+          )->ele( n = `View` ns = `mvc`
+              )->a( n = `xmlns`      v = `sap.m`
+              )->a( n = `xmlns:mvc`  v = `sap.ui.core.mvc`
+              )->a( n = `xmlns:form` v = `sap.ui.layout.form`
+
+              )->ele( `Page`
+                  )->a( n = `title` v = `Device Model`
+
+                  )->ele( n = `SimpleForm` ns = `form`
+                      )->a( n = `title`    v = `From the view (frontend)`
+                      )->a( n = `editable` b = abap_true
+
+                      )->ele( n = `content` ns = `form`
+                          )->tag( `Label`
+                              )->a( n = `text` v = `width`
+                          )->tag( `Text`
+                              )->a( n = `text` v = `{device>/resize/width}`
+                          )->tag( `Label`
+                              )->a( n = `text` v = `phone`
+                          )->tag( `Text`
+                              )->a( n = `text` v = `{device>/system/phone}`
+
+                      )->end(
+
+                  )->end(
+
+                  )->ele( n = `SimpleForm` ns = `form`
+                      )->a( n = `title`    v = `From ABAP (backend)`
+                      )->a( n = `editable` b = abap_true
+
+                      )->ele( n = `content` ns = `form`
+                          )->tag( `Label`
+                              )->a( n = `text` v = `system`
+                          )->tag( `Text`
+                              )->a( n = `text` v = client->_bind( mv_system )
+                          )->tag( `Label`
+                              )->a( n = `text` v = `browser`
+                          )->tag( `Text`
+                              )->a( n = `text` v = client->_bind( mv_browser )
+                          )->tag( `Label`
+                              )->a( n = `text` v = `viewport`
+                          )->tag( `Text`
+                              )->a( n = `text` v = client->_bind( mv_size ) ) ).
+
+      client->view_display( view->stringify( ) ).
+
+    ENDIF.
+
+  ENDMETHOD.
+ENDCLASS.
+```
+
+The frontend half updates as the window is resized; the backend half is a
+snapshot of the roundtrip that built the view.
+
 <!-- samples:start (generated by scripts/link-samples.mjs — do not edit) -->
 
 ## Working Samples
diff --git a/docs/cookbook/popup_popover/popover.md b/docs/cookbook/popup_popover/popover.md
index 26e90373..4787f62a 100644
--- a/docs/cookbook/popup_popover/popover.md
+++ b/docs/cookbook/popup_popover/popover.md
@@ -12,6 +12,16 @@ samples:
 
 To show a popover, call `client->popover_display` and pass the ID of the control the popover should attach to:
 ```abap
+CLASS z2ui5_cl_sample_popover DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_popover IMPLEMENTATION.
   METHOD z2ui5_if_app~main.
 
     IF client->check_on_navigated( ).
@@ -60,9 +70,10 @@ To show a popover, call `client->popover_display` and pass the ID of the control
     ENDCASE.
 
   ENDMETHOD.
+ENDCLASS.
 ```
 
-Like popups, popovers support a data-only refresh: `popover_model_update( )` pushes changed ABAP values into the open popover without re-rendering its XML.
+Like popups, a popover picks up changed ABAP values on its own: the framework compares the model before and after `main( )` and pushes the difference into the open popover, without re-rendering its XML. A handler that only changes data has nothing else to call.
 
 <!-- samples:start (generated by scripts/link-samples.mjs — do not edit) -->
 
diff --git a/docs/cookbook/popup_popover/popup.md b/docs/cookbook/popup_popover/popup.md
index c0cecdc7..991b1f3a 100644
--- a/docs/cookbook/popup_popover/popup.md
+++ b/docs/cookbook/popup_popover/popup.md
@@ -83,44 +83,98 @@ A typical popup flow shows a normal view, opens a popup, and finally closes it.
   ENDMETHOD.
 ```
 
-The popup has the same lifecycle as the main view: `popup_display( )` renders the XML and `popup_destroy( )` closes it. Changed ABAP data needs neither — the framework pushes the delta into the already-rendered popup with the response. (`popup_model_update( )` used to be how you asked for that; it is a no-op now and is on the removal list.)
+The popup has the same lifecycle as the main view: `popup_display( )` renders the XML and `popup_destroy( )` closes it. Changed ABAP data needs neither — the framework pushes the delta into the already-rendered popup with the response.
 
 
 ## Separated App
-For a cleaner source layout, encapsulate popups in separate classes and call them via [navigation](/cookbook/event_navigation/navigation/inner_app).
 
-An example with the confirmation popup:
+For a cleaner source layout, put a popup in its own class and call it via
+[navigation](/cookbook/event_navigation/navigation/inner_app). The popup is
+then an ordinary `z2ui5_if_app` — it just displays into the popup slot instead
+of the main one, and ends by handing control back:
 
-::: warning The built-in popups are frozen
-`Z2UI5_CL_POP_TO_CONFIRM` and its siblings live in the framework's frozen `src/99/02` package:
-they still run, so existing apps keep working, but they are not maintained and
-are on the [removal list](/resources/deprecations).
-New code should take its popups from the separate
-[popups addon](https://github.com/abap2UI5-addons/popups).
-:::
 ```abap
+CLASS z2ui5_cl_sample_confirm DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+    DATA mv_question TYPE string.
+    DATA mv_confirmed TYPE abap_bool.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_confirm IMPLEMENTATION.
   METHOD z2ui5_if_app~main.
 
     CASE abap_true.
 
-      WHEN client->check_on_init( ).
-        DATA(popup) = z2ui5_cl_pop_to_confirm=>factory(
-                          i_question_text = `Can you confirm this?`
-                          i_event_confirm = `CONFIRM`
-                          i_event_cancel  = `CANCEL` ).
-        client->nav_app_call( popup ).
+      WHEN client->check_on_navigated( ).
+        DATA(popup) = z2ui5_cl_ui5_view_builder=>factory(
+            )->ele( n = `FragmentDefinition` ns = `core`
+                )->a( n = `xmlns`      v = `sap.m`
+                )->a( n = `xmlns:core` v = `sap.ui.core`
+
+                )->ele( `Dialog`
+                    )->a( n = `title` v = `Please confirm`
+
+                    )->tag( `Text`
+                        )->a( n = `text` v = client->_bind( mv_question )
+
+                    )->ele( `buttons`
+                        )->tag( `Button`
+                            )->a( n = `text`  v = `OK`
+                            )->a( n = `press` v = client->_event( `CONFIRM` )
+                        )->tag( `Button`
+                            )->a( n = `text`  v = `Cancel`
+                            )->a( n = `press` v = client->_event( `CANCEL` ) ).
+
+        client->popup_display( popup->stringify( ) ).
 
       WHEN client->check_on_event( `CONFIRM` ).
-        client->message_box_display( `the result is confirmed` ).
+        mv_confirmed = abap_true.
+        client->nav_app_leave( ).
 
       WHEN client->check_on_event( `CANCEL` ).
-        client->message_box_display( `the result is rejected` ).
+        mv_confirmed = abap_false.
+        client->nav_app_leave( ).
 
     ENDCASE.
 
   ENDMETHOD.
+ENDCLASS.
+```
+
+The caller sets the question, hands the instance to `nav_app_call( )`, and
+reads the answer back off the same instance when control returns:
+
+```abap
+CASE abap_true.
+
+  WHEN client->check_on_event( `DELETE` ).
+    client->nav_app_call( NEW z2ui5_cl_sample_confirm( mv_question = `Delete this entry?` ) ).
+
+  WHEN client->check_on_navigated( ).
+    DATA(lo_prev) = CAST z2ui5_cl_sample_confirm( client->get_app_prev( ) ).
+    IF lo_prev IS BOUND AND lo_prev->mv_confirmed = abap_true.
+      delete_entry( ).
+    ENDIF.
+    view_display( ).
+
+ENDCASE.
 ```
 
+Two things carry the whole pattern: the popup's answer is a **public attribute**
+on its own instance, and `get_app_prev( )` is how the caller reaches it. Nothing
+is passed back through events.
+
+A ready-made set of these — confirm, select, ranges, file up- and download and
+about a dozen more — is the
+[popups add-on](https://github.com/abap2UI5-addons/popups), which is versioned
+on its own.
+
 To handle multiple stacked popups, note that abap2UI5 shows only one popup at a time on the frontend. But you can keep a popup stack in your backend logic and re-display the previous popup as needed. See `Z2UI5_CL_SMP_APP_161`.
 
 <!-- samples:start (generated by scripts/link-samples.mjs — do not edit) -->
diff --git a/docs/cookbook/translation_messages/logging.md b/docs/cookbook/translation_messages/logging.md
index 9a0f2d72..1d98cc22 100644
--- a/docs/cookbook/translation_messages/logging.md
+++ b/docs/cookbook/translation_messages/logging.md
@@ -3,18 +3,16 @@ outline: [2, 4]
 ---
 # Logging
 
-Logging is critical for business processes. In ABAP systems, the standard tool is the Business Application Log (BAL), available on-premise and in ABAP Cloud environments alike. With abap2UI5, use BAL like you would in classic ABAP and display logs with the framework's built-in popups.
-
-::: warning The built-in popups are frozen
-`Z2UI5_CL_POP_MESSAGES` and its siblings live in the framework's frozen `src/99/02` package:
-they still run, so existing apps keep working, but they are not maintained and
-are on the [removal list](/resources/deprecations).
-New code should take its popups from the separate
-[popups addon](https://github.com/abap2UI5-addons/popups).
-:::
+Logging is critical for business processes. In ABAP systems, the standard tool is the Business Application Log (BAL), available on-premise and in ABAP Cloud environments alike. With abap2UI5, use BAL like you would in classic ABAP — and to show a log, hand it straight to `client->message_box_display( )`.
+
+That method takes **any** message source, not just a string: a BAL table, a
+`cl_bali_log`, a `bapiret2` table, `sy`, an exception. Anything that is not a
+plain string goes through the framework's message mapper, which flattens it
+into the lines the box shows — so every example below is the same one call with
+a different argument. See [Message](./message) for the other sources.
 
 ## BAL Tables
-In classic ABAP, use the BAL function modules and show the BAL table with the popup `Z2UI5_CL_POP_MESSAGES`. In the `bal_t_msgr` structure, `msgno` is the message number within the message class (`msgid`), while `msgnumber` is the message's sequence number within the log:
+In classic ABAP, use the BAL function modules and hand the BAL table over as it is. In the `bal_t_msgr` structure, `msgno` is the message number within the message class (`msgid`), while `msgnumber` is the message's sequence number within the log:
 ```abap
 METHOD z2ui5_if_app~main.
 
@@ -22,13 +20,13 @@ METHOD z2ui5_if_app~main.
     ( msgid = `Z001` msgno = `001` msgty = `S` time_stmp = `21354` msgnumber = `01` )
     ( msgid = `Z001` msgno = `001` msgty = `S` time_stmp = `21354` msgnumber = `02` ) ).
 
-  client->nav_app_call( z2ui5_cl_pop_messages=>factory( lt_bal ) ).
+  client->message_box_display( lt_bal ).
 
 ENDMETHOD.
 ```
 
 ## ABAP Cloud
-In ABAP Cloud, hand the logging object straight to the popup:
+In ABAP Cloud, hand the logging object over the same way:
 ```abap
 METHOD z2ui5_if_app~main.
 
@@ -48,7 +46,7 @@ METHOD z2ui5_if_app~main.
       message_v1 = `Dummy` ) ).
   lo_log->add_item( lo_bapi ).
 
-  client->nav_app_call( z2ui5_cl_pop_messages=>factory( lo_log ) ).
+  client->message_box_display( lo_log ).
 
 ENDMETHOD.
 ```
@@ -62,13 +60,13 @@ METHOD z2ui5_if_app~main.
   lo_log->e( `This is an error...` ).
   lo_log->s( `This is a success message...` ).
 
-  client->nav_app_call( z2ui5_cl_pop_messages=>factory( lo_log ) ).
+  client->message_box_display( lo_log ).
 
 ENDMETHOD.
 ```
 
 ## BAL Logs
-Unlike message classes, BAL logs carry more detail — like timestamps. `Z2UI5_CL_POP_MESSAGES` accepts them like any other message source, so the examples above work for BAL logs too:
+Unlike message classes, BAL logs carry more detail — like timestamps. The mapper reads them like any other message source, so the examples above work for BAL logs too:
 
 ```abap
 METHOD z2ui5_if_app~main.
@@ -76,11 +74,15 @@ METHOD z2ui5_if_app~main.
   DATA(lo_log) = zcl_logger_factory=>create_log( desc = `ABAP Logger` ).
   lo_log->e( `This is an error...` ).
 
-  client->nav_app_call( z2ui5_cl_pop_messages=>factory( lo_log ) ).
+  client->message_box_display( lo_log ).
 
 ENDMETHOD.
 ```
 
-::: tip
-The BAL popup is still in its early stages and offers only basic features. If you've built BAL features with abap2UI5, please consider contributing to grow it.
+::: tip Something richer than a message box
+A message box is a list of lines. For a sortable table of the log with its
+severities, timestamps and long texts, either build the view yourself from the
+same data — it is an internal table like any other, see
+[Tables](/cookbook/model/tables) — or take the ready-made message dialog from
+the [popups add-on](https://github.com/abap2UI5-addons/popups).
 :::
diff --git a/docs/cookbook/translation_messages/message.md b/docs/cookbook/translation_messages/message.md
index 761dfd50..cd8be418 100644
--- a/docs/cookbook/translation_messages/message.md
+++ b/docs/cookbook/translation_messages/message.md
@@ -82,15 +82,76 @@ ENDMETHOD.
 ```
 The framework accepts other inputs too — pass your message structure and the message box shows it.
 
+### All of Them in One App
+
+The fragments above are each one call. Press **Run** to see the whole family in
+a single app:
+
+```abap
+CLASS z2ui5_cl_sample_message DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_message IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
+
+    IF client->check_on_navigated( ).
+      DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
+          )->ele( n = `View` ns = `mvc`
+              )->a( n = `xmlns`     v = `sap.m`
+              )->a( n = `xmlns:mvc` v = `sap.ui.core.mvc`
+
+              )->ele( `Page`
+                  )->a( n = `title` v = `Messages`
+
+                  )->tag( `Button`
+                      )->a( n = `text`  v = `toast`
+                      )->a( n = `press` v = client->_event( `TOAST` )
+                  )->tag( `Button`
+                      )->a( n = `text`  v = `box`
+                      )->a( n = `press` v = client->_event( `BOX` )
+                  )->tag( `Button`
+                      )->a( n = `text`  v = `from an exception`
+                      )->a( n = `press` v = client->_event( `EXC` ) ) ).
+
+      client->view_display( view->stringify( ) ).
+
+    ELSEIF client->check_on_event( `TOAST` ).
+      client->message_toast_display( `this is a message` ).
+
+    ELSEIF client->check_on_event( `BOX` ).
+      client->message_box_display( text = `This is an error message`
+                                   type = `error` ).
+
+    ELSEIF client->check_on_event( `EXC` ).
+      TRY.
+          DATA(lv_val) = 1 / 0.
+        CATCH cx_root INTO DATA(lx).
+          client->message_box_display( lx ).
+      ENDTRY.
+
+    ENDIF.
+
+  ENDMETHOD.
+ENDCLASS.
+```
+
 ### More Than One Message at a Time
 
-The message box shows one message. For a list of them — a BAPI return table, a
-message log, the result of a validation run — use a dialog from the
-[popups add-on](https://github.com/abap2UI5-addons/popups), which carries
-`Z2UI5_CL_POP_MESSAGES` and its siblings and is versioned on its own. The
-`Z2UI5_CL_POP_*` classes still shipped inside the framework's `src/99/02`
-package are frozen: they run, so existing apps keep working, but they are not
-maintained and are on the [removal list](/resources/deprecations).
+The message box shows one message — but it also takes a whole set of them. Pass
+a BAPI return table, a message log or the result of a validation run and the
+framework flattens it into the lines the box shows; see
+[Logging](./logging) for the sources it reads.
+
+For something richer than a list of lines — a sortable table with severities
+and long texts — build the view from the same data, or take the ready-made
+message dialog from the
+[popups add-on](https://github.com/abap2UI5-addons/popups).
 
 ::: tip **Improvements**
 These message functions evolve all the time. Open an issue if you hit errors or incompatibilities, or submit a PR to extend them.
diff --git a/docs/cookbook/view/nested_views.md b/docs/cookbook/view/nested_views.md
index 0f616fee..551850df 100644
--- a/docs/cookbook/view/nested_views.md
+++ b/docs/cookbook/view/nested_views.md
@@ -113,13 +113,12 @@ Always pass `method_destroy` when the nested view is going to be replaced over t
 
 ### Independent Re-rendering
 
-The whole point of nested views is to re-render only what changed. Four calls cover the common needs:
+The whole point of nested views is to re-render only what changed. Three calls cover the common needs:
 
 | Call                              | What it does                                                                                  |
 | --------------------------------- | --------------------------------------------------------------------------------------------- |
 | `client->view_display( ... )`     | Replaces the main view's XML. The anchor is recreated, so any nested content is lost too.    |
 | `client->nest_view_display( ... )`| Replaces only the nested view. The main view stays on screen.                                |
-| `client->view_model_update( )`    | Pushes current ABAP data values into **all already-rendered views**. No re-render.           |
 | `client->nest_view_destroy( )`    | Removes the nested view from the frontend without touching the main view.                    |
 
 The main view has the matching `client->view_destroy( )`; the second nested slot has `nest2_view_display( )` and `nest2_view_destroy( )`.
@@ -127,9 +126,9 @@ The main view has the matching `client->view_destroy( )`; the second nested slot
 A rule of thumb:
 
 - **Layout changed** (different controls, new columns, new sections) → `view_display` / `nest_view_display`.
-- **Only the data changed** (a flag flipped, a row added to a bound table) → `view_model_update`.
+- **Only the data changed** (a flag flipped, a row added to a bound table) → **nothing**. The framework compares the model before and after `main( )` and pushes the difference into every rendered view by itself.
 
-`Z2UI5_CL_SMP_APP_065` shows the difference between the three options in a single screen with one button per call.
+`Z2UI5_CL_SMP_APP_065` shows the difference between the options in a single screen with one button per call.
 
 ### Master-Detail with `FlexibleColumnLayout`
 
@@ -272,12 +271,10 @@ All bound data lives in a **single client-side model**, regardless of which view
 
 ```abap
 DELETE t_tab2 WHERE title = ls_arg-title.
-client->view_model_update( ).   " push the new data into all rendered views
 ```
 
-::: tip `nest_view_model_update` and the `view` parameter of `_bind` are obsolete
-Earlier releases kept a separate model per view: bindings were tagged with `view = client->cs_view-...` and each view had its own refresh call (`nest_view_model_update( )`, `nest2_view_model_update( )`). That separation is gone — there is now one root model. The old per-view refresh methods still exist as compatibility aliases and behave like `view_model_update( )`, and the `view` parameter of `_bind` / `_bind_edit` is an inert no-op. In new code, omit the parameter and use `view_model_update( )` only.
-:::
+That is the whole handler. The row is gone from the nested table on the next
+response, and nothing had to ask for it.
 
 ### Two Levels of Nesting
 
@@ -324,7 +321,7 @@ Plain composition is the right starting point: keep helper methods that take a p
 - The anchor id must be unique in the main view. The framework calls `byId` on the rendered view to find it; duplicate ids break the lookup.
 - Always provide `method_destroy` when a nested slot will be replaced more than once. Forgetting it causes nested fragments to accumulate.
 - Build the nested view in its own method (e.g. `view_display_detail`) and call it both from the initial render and from event handlers. Two call sites, one definition.
-- If a nested view does not pick up a data change, the value did not change on the ABAP side of the roundtrip — the push is automatic (`view_model_update( )` has been an empty method since 1.143.0). If a control simply isn't there, you need `nest_view_display( )` again.
+- If a nested view does not pick up a data change, the value did not change on the ABAP side of the roundtrip — the push itself is automatic. If a control simply isn't there, you need `nest_view_display( )` again.
 - For very large apps, look at `Z2UI5_CL_SMP_APP_104`, which loads each detail screen from a separate `z2ui5_if_app` class and renders it into the nested slot. It is an advanced pattern — start with the simpler form first.
 
 See `Z2UI5_CL_SMP_APP_065`, `Z2UI5_CL_SMP_APP_097`, `Z2UI5_CL_SMP_APP_098`, `Z2UI5_CL_SMP_APP_104` and `Z2UI5_CL_SMP_APP_176` for runnable examples covering every variation above.
diff --git a/docs/cookbook/view/xml_templating.md b/docs/cookbook/view/xml_templating.md
index d9adca7a..42856146 100644
--- a/docs/cookbook/view/xml_templating.md
+++ b/docs/cookbook/view/xml_templating.md
@@ -79,6 +79,103 @@ Notes on the snippet:
 
 The full sample is `Z2UI5_CL_SMP_APP_173`.
 
+### The Whole Thing, Runnable
+
+The fragments above are two halves of one view. Press **Run** to see the
+expansion happen — three rows of data, three columns built by the outer loop,
+and each cell wired to its field by the inner one:
+
+```abap
+CLASS z2ui5_cl_sample_templating DEFINITION PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+    TYPES:
+      BEGIN OF ty_s_layout,
+        fname   TYPE string,
+        merge   TYPE string,
+        visible TYPE string,
+      END OF ty_s_layout.
+
+    TYPES:
+      BEGIN OF ty_s_row,
+        name TYPE string,
+        date TYPE string,
+        age  TYPE string,
+      END OF ty_s_row.
+
+    DATA mt_layout TYPE STANDARD TABLE OF ty_s_layout WITH EMPTY KEY.
+    DATA mt_data   TYPE STANDARD TABLE OF ty_s_row    WITH EMPTY KEY.
+
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+ENDCLASS.
+
+CLASS z2ui5_cl_sample_templating IMPLEMENTATION.
+  METHOD z2ui5_if_app~main.
+
+    IF client->check_on_navigated( ).
+
+      mt_layout = VALUE #( ( fname = `NAME` merge = `true`  visible = `true` )
+                           ( fname = `DATE` merge = `false` visible = `true` )
+                           ( fname = `AGE`  merge = `false` visible = `true` ) ).
+
+      mt_data = VALUE #( ( name = `Alice` date = `2026-01-15` age = `34` )
+                         ( name = `Bob`   date = `2026-02-03` age = `28` )
+                         ( name = `Cleo`  date = `2026-03-21` age = `41` ) ).
+
+      DATA(view) = z2ui5_cl_ui5_view_builder=>factory(
+          )->ele( n = `View` ns = `mvc`
+              )->a( n = `xmlns`          v = `sap.m`
+              )->a( n = `xmlns:mvc`      v = `sap.ui.core.mvc`
+              )->a( n = `xmlns:template` v = `http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1`
+
+              )->ele( `Page`
+                  )->a( n = `title` v = `XML Templating`
+
+                  )->ele( `Table`
+                      )->a( n = `items` v = client->_bind( mt_data )
+
+                      )->ele( `columns`
+                          )->ele( n = `repeat` ns = `template`
+                              )->a( n = `list` v = `{template>/MT_LAYOUT}`
+                              )->a( n = `var`  v = `L0`
+
+                              )->ele( `Column`
+                                  )->a( n = `mergeDuplicates` v = `{L0>MERGE}`
+                                  )->a( n = `visible`         v = `{L0>VISIBLE}`
+
+                                  )->tag( `Text`
+                                      )->a( n = `text` v = `{L0>FNAME}`
+
+                              )->end(
+
+                          )->end(
+
+                      )->end(
+
+                      )->ele( `items`
+                          )->ele( `ColumnListItem`
+                              )->ele( `cells`
+                                  )->ele( n = `repeat` ns = `template`
+                                      )->a( n = `list` v = `{template>/MT_LAYOUT}`
+                                      )->a( n = `var`  v = `L1`
+
+                                      )->tag( `ObjectIdentifier`
+                                          )->a( n = `text` v = `{= '{' + ${L1>FNAME} + '}' }` ) ).
+
+      client->view_display( view->stringify( ) ).
+
+    ENDIF.
+
+  ENDMETHOD.
+ENDCLASS.
+```
+
+Flip a row's `visible` to `false` and re-run: the column is gone from the
+expanded XML entirely, not merely hidden.
+
 ### `template:if` / `template:then` / `template:else` — Conditionals
 
 `template:if` evaluates an expression against the templating model and keeps or drops its children accordingly. With a `template:then` / `template:else` pair you get a two-branch switch:
diff --git a/docs/technical/dx.md b/docs/technical/dx.md
index b40b9e23..05154802 100644
--- a/docs/technical/dx.md
+++ b/docs/technical/dx.md
@@ -221,19 +221,20 @@ CLASS zcl_app_alv_event IMPLEMENTATION.
   METHOD z2ui5_if_app~main.
 
     IF client->check_on_navigated( ).
-      client->nav_app_call( z2ui5_cl_pop_to_confirm=>factory(
-        i_question_text = `Do you like dinosaurs?`
-        i_title         = `Title`
-        i_event_confirm = `YES`
-        i_event_cancel  = `NO` ) ).
+      client->message_box_display( text    = `Do you like dinosaurs?`
+                                   type    = `confirm`
+                                   title   = `Title`
+                                   onclose = `ANSWERED` ).
       RETURN.
     ENDIF.
 
     CASE client->get( )-event.
-      WHEN `YES`.
-        client->message_box_display( `the result is YES` ).
-      WHEN `NO`.
-        client->message_box_display( `the result is NO` ).
+      WHEN `ANSWERED`.
+        IF client->get_event_arg( 1 ) = `OK`.
+          client->message_box_display( `the result is YES` ).
+        ELSE.
+          client->message_box_display( `the result is NO` ).
+        ENDIF.
     ENDCASE.
 
   ENDMETHOD.
diff --git a/docs/tutorials/walkthrough/step-7.md b/docs/tutorials/walkthrough/step-7.md
index e713a41e..d6c5c6de 100644
--- a/docs/tutorials/walkthrough/step-7.md
+++ b/docs/tutorials/walkthrough/step-7.md
@@ -121,11 +121,9 @@ ENDCLASS.
   main view is never rebuilt — it waits behind the popup.
 - **No refresh call after `SAVE`.** The handler changes `t_invoices` and
   does nothing else: every roundtrip that changed bound data pushes the new
-  model to the browser by itself, and the list updates. (You may see
-  `view_model_update( )` in older code — it is deliberately empty and does
-  nothing.)
+  model to the browser by itself, and the list updates.
 
-Popovers, message boxes and the built-in popup classes are covered under
+Popovers and message boxes are covered under
 [Popup, Popover](/cookbook/popup_popover/popup).
 
 The app is complete — one last step separates it into the structure real
diff --git a/test/playground.test.mjs b/test/playground.test.mjs
index 5085ff8c..13417739 100644
--- a/test/playground.test.mjs
+++ b/test/playground.test.mjs
@@ -73,10 +73,15 @@ test('a class name longer than 30 characters gets nothing, and says why', () =>
 });
 
 test('an app that displays nothing gets nothing', () => {
-  // configuration/authorization.md: an authority check and a RETURN. It starts
-  // perfectly well and shows an empty frame, which demonstrates nothing.
-  const code = app('z2ui5_cl_app', `    AUTHORITY-CHECK OBJECT \`Z_APP_AUTH\` ID \`APP\` FIELD \`Z2UI5_APP_001\`.
-    IF sy-subrc <> 0.
+  // An app that computes and keeps it to itself. It starts perfectly well and
+  // shows an empty frame, which demonstrates nothing.
+  //
+  // This used to be pinned with configuration/authorization.md's authority
+  // check, which is the shape the rule was written for - that example is now
+  // refused one rule earlier, for having no user to check, so the two are
+  // pinned apart.
+  const code = app('z2ui5_cl_app', `    DATA(lv_total) = 1 + 1.
+    IF lv_total <> 2.
       RETURN.
     ENDIF.`);
   assert.match(refused(code), /displays nothing/);
@@ -148,6 +153,22 @@ ${DISPLAY}`)), /on-premise/, call);
   }
 });
 
+test('an authority check gets nothing', () => {
+  const code = app('z2ui5_cl_sample', `    AUTHORITY-CHECK OBJECT \`Z_APP_AUTH\` ID \`APP\` FIELD \`X\`.
+    IF sy-subrc <> 0.
+      RETURN.
+    ENDIF.
+${DISPLAY}`);
+  assert.match(refused(code), /no user and no roles/);
+});
+
+// and the words inside a literal are not one - abapOnly blanks them, the same
+// guard the SELECT rules needed
+test('the words of an authority check inside a literal are not one', () => {
+  assert.ok(runs(app('z2ui5_cl_sample', `    DATA(x) = \`AUTHORITY-CHECK is explained below\`.
+${DISPLAY}`)));
+});
+
 test('a method that is declared and never implemented gets nothing', () => {
   // Watched failing on cookbook/event_navigation/life_cycle.md, whose skeleton
   // declared render_main and on_post and implemented neither; the page has