diff --git a/app/views/analyse/replay.scala b/app/views/analyse/replay.scala
index bd555564a4648..5fc753da3efad 100644
--- a/app/views/analyse/replay.scala
+++ b/app/views/analyse/replay.scala
@@ -79,6 +79,7 @@ def replay(
     .css(ctx.blind.option("round.nvui"))
     .css(ctx.pref.hasKeyboardMove.option("keyboardMove"))
     .i18n(_.puzzle, _.study)
+    .i18nOpt(ctx.blind, _.keyboardMove)
     .js(analyseNvuiTag)
     .js(
       bits.analyseModule(
diff --git a/app/views/study.scala b/app/views/study.scala
index ec7b11aaee197..3dd856b1784f8 100644
--- a/app/views/study.scala
+++ b/app/views/study.scala
@@ -51,6 +51,7 @@ def show(
     .css("analyse.study")
     .css(ctx.pref.hasKeyboardMove.option("keyboardMove"))
     .i18n(_.puzzle, _.study)
+    .i18nOpt(ctx.blind, _.keyboardMove)
     .js(analyseNvuiTag)
     .js(
       PageModule(
diff --git a/modules/analyse/src/main/ui/AnalyseUi.scala b/modules/analyse/src/main/ui/AnalyseUi.scala
index e44e01c05e50e..e9f548c473024 100644
--- a/modules/analyse/src/main/ui/AnalyseUi.scala
+++ b/modules/analyse/src/main/ui/AnalyseUi.scala
@@ -24,6 +24,7 @@ final class AnalyseUi(helpers: Helpers)(externalEngineEndpoint: String):
       .css(ctx.pref.hasKeyboardMove.option("keyboardMove"))
       .csp(csp.compose(_.withExternalAnalysisApis))
       .i18n(_.puzzle, _.study)
+      .i18nOpt(ctx.blind, _.keyboardMove)
       .graph(
         title = "Chess analysis board",
         url = s"$netBaseUrl${routes.UserAnalysis.index.url}",
diff --git a/modules/game/src/main/Game.scala b/modules/game/src/main/Game.scala
index 8223f0bd1fc70..36f946d5639bc 100644
--- a/modules/game/src/main/Game.scala
+++ b/modules/game/src/main/Game.scala
@@ -237,18 +237,6 @@ object Game:
 
   val unanalysableVariants: Set[Variant] = Variant.list.all.toSet -- analysableVariants
 
-  val blindModeVariants: Set[Variant] = Set(
-    chess.variant.Standard,
-    chess.variant.Chess960,
-    chess.variant.KingOfTheHill,
-    chess.variant.ThreeCheck,
-    chess.variant.FromPosition,
-    chess.variant.Antichess,
-    chess.variant.Atomic,
-    chess.variant.RacingKings,
-    chess.variant.Horde
-  )
-
   val hordeWhitePawnsSince = instantOf(2015, 4, 11, 10, 0)
 
   def isOldHorde(game: Game) =
diff --git a/modules/practice/src/main/PracticeUi.scala b/modules/practice/src/main/PracticeUi.scala
index 9e11fc3ff00fa..ca5ae3629da6e 100644
--- a/modules/practice/src/main/PracticeUi.scala
+++ b/modules/practice/src/main/PracticeUi.scala
@@ -16,10 +16,11 @@ final class PracticeUi(helpers: Helpers)(
 ):
   import helpers.{ *, given }
 
-  def show(us: UserStudy, data: JsonView.JsData)(using Context) =
+  def show(us: UserStudy, data: JsonView.JsData)(using ctx: Context) =
     Page(us.practiceStudy.name.value)
       .css("analyse.practice")
       .i18n(_.puzzle, _.study)
+      .i18nOpt(ctx.blind, _.keyboardMove)
       .js(analyseNvuiTag)
       .js(
         PageModule(
diff --git a/modules/puzzle/src/main/ui/PuzzleUi.scala b/modules/puzzle/src/main/ui/PuzzleUi.scala
index 532ba5e0cc899..78fb6d5c4003b 100644
--- a/modules/puzzle/src/main/ui/PuzzleUi.scala
+++ b/modules/puzzle/src/main/ui/PuzzleUi.scala
@@ -31,6 +31,7 @@ final class PuzzleUi(helpers: Helpers, val bits: PuzzleBits)(
       .css(ctx.pref.hasVoice.option("voice"))
       .css(ctx.blind.option("round.nvui"))
       .i18n(_.puzzle, _.puzzleTheme, _.storm)
+      .i18nOpt(ctx.blind, _.keyboardMove)
       .js(ctx.blind.option(Esm("puzzle.nvui")))
       .js(
         PageModule(
diff --git a/modules/round/src/main/ui/RoundUi.scala b/modules/round/src/main/ui/RoundUi.scala
index 8608b4b103379..cebb644f24171 100644
--- a/modules/round/src/main/ui/RoundUi.scala
+++ b/modules/round/src/main/ui/RoundUi.scala
@@ -16,6 +16,7 @@ final class RoundUi(helpers: Helpers, gameUi: lila.game.ui.GameUi):
       .css(ctx.pref.hasKeyboardMove.option("keyboardMove"))
       .css(ctx.pref.hasVoice.option("voice"))
       .css(ctx.blind.option("round.nvui"))
+      .i18nOpt(ctx.blind, _.keyboardMove)
       .zoom
       .csp(_.withPeer.withWebAssembly)
 
diff --git a/ui/analyse/src/ctrl.ts b/ui/analyse/src/ctrl.ts
index 5fcf46c2549b5..6c79e9af7997d 100644
--- a/ui/analyse/src/ctrl.ts
+++ b/ui/analyse/src/ctrl.ts
@@ -140,7 +140,10 @@ export default class AnalyseCtrl {
     if (this.data.forecast) this.forecast = new ForecastCtrl(this.data.forecast, this.data, redraw);
     if (this.opts.wiki) this.wiki = wikiTheory();
     if (site.blindMode)
-      site.asset.loadEsm<NvuiPlugin>('analyse.nvui', { init: this }).then(nvui => (this.nvui = nvui));
+      site.asset.loadEsm<NvuiPlugin>('analyse.nvui', { init: this }).then(nvui => {
+        this.nvui = nvui;
+        this.redraw();
+      });
 
     this.instanciateEvalCache();
 
diff --git a/ui/analyse/src/ground.ts b/ui/analyse/src/ground.ts
index 83271f82a5c56..1830080e899bc 100644
--- a/ui/analyse/src/ground.ts
+++ b/ui/analyse/src/ground.ts
@@ -10,7 +10,6 @@ export const render = (ctrl: AnalyseCtrl): VNode =>
   h('div.cg-wrap.cgv' + ctrl.cgVersion.js, {
     hook: {
       insert: vnode => ctrl.setChessground(makeChessground(vnode.elm as HTMLElement, makeConfig(ctrl))),
-      destroy: _ => ctrl.chessground.destroy(),
     },
   });
 
diff --git a/ui/analyse/src/plugins/analyse.nvui.ts b/ui/analyse/src/plugins/analyse.nvui.ts
index 6268c89c1603b..c63cd67efb4a5 100644
--- a/ui/analyse/src/plugins/analyse.nvui.ts
+++ b/ui/analyse/src/plugins/analyse.nvui.ts
@@ -1,13 +1,12 @@
-import { h, type VNode } from 'snabbdom';
+import { h, type VNode, type VNodeChildren } from 'snabbdom';
 import { defined, prop, type Prop } from 'common';
 import { text as xhrText } from 'common/xhr';
 import type AnalyseController from '../ctrl';
 import { makeConfig as makeCgConfig } from '../ground';
-import type { AnalyseData } from '../interfaces';
+import type { AnalyseData, NvuiPlugin } from '../interfaces';
 import type { Player } from 'game';
-import viewStatus from 'game/view/status';
 import {
-  type Style,
+  type MoveStyle,
   renderSan,
   renderPieces,
   renderBoard,
@@ -29,12 +28,12 @@ import {
 } from 'nvui/chess';
 import { renderSetting } from 'nvui/setting';
 import { Notify } from 'nvui/notify';
-import { commands } from 'nvui/command';
-import { bind, type MaybeVNodes } from 'common/snabbdom';
+import { commands, boardCommands } from 'nvui/command';
+import { bind, onInsert, type MaybeVNode, type MaybeVNodes } from 'common/snabbdom';
 import { throttle } from 'common/timing';
 import explorerView from '../explorer/explorerView';
 import { ops, path as treePath } from 'tree';
-import { view as cevalView, renderEval } from 'ceval';
+import { view as cevalView, renderEval, type CevalCtrl } from 'ceval';
 import { next, prev } from '../control';
 import { lichessRules } from 'chessops/compat';
 import { makeSan } from 'chessops/san';
@@ -44,13 +43,16 @@ import { setupPosition } from 'chessops/variant';
 import { plyToTurn } from 'chess';
 import { Chessground as makeChessground } from 'chessground';
 import { pubsub } from 'common/pubsub';
+import { renderResult } from '../view/components';
+import { view as chapterNewFormView } from '../study/chapterNewForm';
+import { view as chapterEditFormView } from '../study/chapterEditForm';
 
 const throttled = (sound: string) => throttle(100, () => site.sound.play(sound));
 const selectSound = throttled('select');
 const borderSound = throttled('outOfBound');
 const errorSound = throttled('error');
 
-export function initModule(ctrl: AnalyseController) {
+export function initModule(ctrl: AnalyseController): NvuiPlugin {
   const notify = new Notify(),
     moveStyle = styleSetting(),
     pieceStyle = pieceSetting(),
@@ -70,21 +72,21 @@ export function initModule(ctrl: AnalyseController) {
       notify.redraw = ctrl.redraw;
       const d = ctrl.data,
         style = moveStyle.get();
-      if (!ctrl.chessground)
-        ctrl.chessground = makeChessground(document.createElement('div'), {
-          ...makeCgConfig(ctrl),
-          animation: { enabled: false },
-          drawable: { enabled: false },
-          coordinates: false,
-        });
+      ctrl.chessground = makeChessground(document.createElement('div'), {
+        ...makeCgConfig(ctrl),
+        animation: { enabled: false },
+        drawable: { enabled: false },
+        coordinates: false,
+      });
       return h('main.analyse', [
         h('div.nvui', [
+          studyDetails(ctrl),
           h('h1', 'Textual representation'),
           h('h2', 'Game info'),
           ...['white', 'black'].map((color: Color) =>
             h('p', [color + ' player: ', renderPlayer(ctrl, playerByColor(d, color))]),
           ),
-          h('p', `${d.game.rated ? 'Rated' : 'Casual'} ${d.game.perf}`),
+          h('p', `${d.game.rated ? 'Rated' : 'Casual'} ${d.game.perf || d.game.variant.name}`),
           d.clock ? h('p', `Clock: ${d.clock.initial / 60} + ${d.clock.increment}`) : null,
           h('h2', 'Moves'),
           h('p.moves', { attrs: { role: 'log', 'aria-live': 'off' } }, renderCurrentLine(ctrl, style)),
@@ -103,7 +105,7 @@ export function initModule(ctrl: AnalyseController) {
             : []),
           h('h2', 'Pieces'),
           h('div.pieces', renderPieces(ctrl.chessground.state.pieces, style)),
-          ...renderResult(ctrl),
+          ...renderAriaResult(ctrl),
           h('h2', 'Current position'),
           h(
             'p.position.lastMove',
@@ -119,7 +121,7 @@ export function initModule(ctrl: AnalyseController) {
                 insert(vnode) {
                   const $form = $(vnode.elm as HTMLFormElement),
                     $input = $form.find('.move').val('');
-                  $input[0]!.focus();
+                  $input[0]?.focus();
                   $form.on('submit', onSubmit(ctrl, notify.set, moveStyle.get, $input));
                 },
               },
@@ -134,8 +136,6 @@ export function initModule(ctrl: AnalyseController) {
             ],
           ),
           notify.render(),
-          // h('h2', 'Actions'),
-          // h('div.actions', tableInner(ctrl)),
           h('h2', 'Computer analysis'),
           ...cevalView.renderCeval(ctrl),
           cevalView.renderPvs(ctrl),
@@ -165,7 +165,7 @@ export function initModule(ctrl: AnalyseController) {
             },
             renderBoard(
               ctrl.chessground.state.pieces,
-              ctrl.data.player.color,
+              ctrl.data.game.variant.key === 'racingKings' ? 'white' : ctrl.data.player.color,
               pieceStyle.get(),
               prefixStyle.get(),
               positionStyle.get(),
@@ -203,40 +203,18 @@ export function initModule(ctrl: AnalyseController) {
           h('p', [
             'Use arrow keys to navigate in the game.',
             h('br'),
-            'l: toggle local computer analysis',
+            `l: ${i18n.site.toggleLocalAnalysis}`,
             h('br'),
-            'z: toggle all computer analysis',
+            `z: ${i18n.site.toggleAllAnalysis}`,
             h('br'),
-            'space: play best computer move',
+            `space: ${i18n.site.playComputerMove}`,
             h('br'),
             'c: announce computer evaluation',
             h('br'),
-            'x: show threat',
-            h('br'),
-          ]),
-          h('h2', 'Board mode commands'),
-          h('p', [
-            'Use these commands when focused on the board itself.',
-            h('br'),
-            'o: announce current position.',
-            h('br'),
-            "c: announce last move's captured piece.",
-            h('br'),
-            'l: display last move.',
-            h('br'),
-            't: display clocks.',
-            h('br'),
-            'arrow keys: move left, right, up or down.',
-            h('br'),
-            'kqrbnp/KQRBNP: move forward/backward to a piece.',
-            h('br'),
-            '1-8: move to rank 1-8.',
-            h('br'),
-            'Shift+1-8: move to file a-h.',
-            h('br'),
-            '',
+            `x: ${i18n.site.showThreat}`,
             h('br'),
           ]),
+          ...boardCommands(),
           h('h2', 'Commands'),
           h('p', [
             'Type these commands in the command input.',
@@ -263,51 +241,36 @@ export function initModule(ctrl: AnalyseController) {
   };
 }
 
-const NOT_ALLOWED = 'local evaluation not allowed';
-const NOT_POSSIBLE = 'local evaluation not possible';
-const NOT_ENABLED = 'local evaluation not enabled';
-
 function renderEvalAndDepth(ctrl: AnalyseController): string {
-  let evalStr: string, depthStr: string;
-  if (ctrl.threatMode()) {
-    evalStr = evalInfo(ctrl.node.threat);
-    depthStr = depthInfo(ctrl.node.threat, false);
-    return `${evalInfo(ctrl.node.threat)} ${depthInfo(ctrl.node.threat, false)}`;
-  } else {
-    const evs = ctrl.currentEvals(),
-      bestEv = cevalView.getBestEval(evs);
-    evalStr = evalInfo(bestEv);
-    depthStr = depthInfo(evs.client, !!evs.client?.cloud);
-  }
-  if (!evalStr) {
-    if (!ctrl.ceval.allowed()) return NOT_ALLOWED;
-    else if (!ctrl.ceval.possible) return NOT_POSSIBLE;
-    else return NOT_ENABLED;
-  } else {
-    return evalStr + ' ' + depthStr;
-  }
+  if (ctrl.threatMode()) return `${evalInfo(ctrl.node.threat)} ${depthInfo(ctrl.node.threat, false)}`;
+  const evs = ctrl.currentEvals(),
+    bestEv = cevalView.getBestEval(evs);
+  const evalStr = evalInfo(bestEv);
+  return !evalStr ? noEvalStr(ctrl.ceval) : `${evalStr} ${depthInfo(evs.client, !!evs.client?.cloud)}`;
 }
 
-function evalInfo(bestEv: EvalScore | undefined): string {
-  if (bestEv) {
-    if (defined(bestEv.cp)) return renderEval(bestEv.cp).replace('-', '−');
-    else if (defined(bestEv.mate))
-      return `mate in ${Math.abs(bestEv.mate)} for ${bestEv.mate > 0 ? 'white' : 'black'}`;
-  }
-  return '';
-}
+const evalInfo = (bestEv: EvalScore | undefined): string =>
+  defined(bestEv?.cp)
+    ? renderEval(bestEv.cp).replace('-', '−')
+    : defined(bestEv?.mate)
+      ? `mate in ${Math.abs(bestEv.mate)} for ${bestEv.mate > 0 ? 'white' : 'black'}`
+      : '';
 
-function depthInfo(clientEv: Tree.ClientEval | undefined, isCloud: boolean): string {
-  if (!clientEv) return '';
-  const depth = clientEv.depth || 0;
-  return i18n.site.depthX(depth) + isCloud ? ' Cloud' : '';
-}
+const depthInfo = (clientEv: Tree.ClientEval | undefined, isCloud: boolean): string =>
+  clientEv ? `${i18n.site.depthX(clientEv.depth || 0)} ${isCloud ? 'Cloud' : ''}` : '';
+
+const noEvalStr = (ctrl: CevalCtrl) =>
+  !ctrl.allowed()
+    ? 'local evaluation not allowed'
+    : !ctrl.possible
+      ? 'local evaluation not possible'
+      : !ctrl.enabled()
+        ? 'local evaluation not enabled'
+        : '';
 
-function renderBestMove(ctrl: AnalyseController, style: Style): string {
-  const instance = ctrl.getCeval();
-  if (!instance.allowed()) return NOT_ALLOWED;
-  if (!instance.possible) return NOT_POSSIBLE;
-  if (!instance.enabled()) return NOT_ENABLED;
+function renderBestMove(ctrl: AnalyseController, style: MoveStyle): string {
+  const noEvalMsg = noEvalStr(ctrl.ceval);
+  if (noEvalMsg) return noEvalMsg;
   const node = ctrl.node,
     setup = parseFen(node.fen).unwrap();
   let pvs: Tree.PvData[] = [];
@@ -315,44 +278,26 @@ function renderBestMove(ctrl: AnalyseController, style: Style): string {
     pvs = node.threat.pvs;
     setup.turn = opposite(setup.turn);
     if (setup.turn === 'white') setup.fullmoves += 1;
-  } else if (node.ceval) {
-    pvs = node.ceval.pvs;
-  }
-  const pos = setupPosition(lichessRules(instance.opts.variant.key), setup);
+  } else if (node.ceval) pvs = node.ceval.pvs;
+  const pos = setupPosition(lichessRules(ctrl.ceval.opts.variant.key), setup);
   if (pos.isOk && pvs.length > 0 && pvs[0].moves.length > 0) {
     const uci = pvs[0].moves[0];
     const san = makeSan(pos.unwrap(), parseUci(uci)!);
     return renderSan(san, uci, style);
-  } else {
-    return '';
   }
+  return '';
 }
 
-function renderResult(ctrl: AnalyseController): VNode[] {
-  if (ctrl.data.game.status.id >= 30) {
-    let result;
-    switch (ctrl.data.game.winner) {
-      case 'white':
-        result = '1-0';
-        break;
-      case 'black':
-        result = '0-1';
-        break;
-      default:
-        result = '½-½';
-    }
-    return [
-      h('h2', 'Game status'),
-      h('div.status', { attrs: { role: 'status', 'aria-live': 'assertive', 'aria-atomic': 'true' } }, [
-        h('div.result', result),
-        h('div.status', viewStatus(ctrl)),
-      ]),
-    ];
-  }
-  return [];
+function renderAriaResult(ctrl: AnalyseController): VNode[] {
+  const result = renderResult(ctrl);
+  const res = result.length ? result : 'No result';
+  return [
+    h('h2', 'Game status'),
+    h('div.status', { attrs: { role: 'status', 'aria-live': 'assertive', 'aria-atomic': 'true' } }, res),
+  ];
 }
 
-function renderCurrentLine(ctrl: AnalyseController, style: Style): (string | VNode)[] {
+function renderCurrentLine(ctrl: AnalyseController, style: MoveStyle): VNodeChildren {
   if (ctrl.path.length === 0) {
     return renderMainline(ctrl.mainline, ctrl.path, style);
   } else {
@@ -361,8 +306,14 @@ function renderCurrentLine(ctrl: AnalyseController, style: Style): (string | VNo
   }
 }
 
-function onSubmit(ctrl: AnalyseController, notify: (txt: string) => void, style: () => Style, $input: Cash) {
-  return function () {
+function onSubmit(
+  ctrl: AnalyseController,
+  notify: (txt: string) => void,
+  style: () => MoveStyle,
+  $input: Cash,
+) {
+  return (e: SubmitEvent) => {
+    e.preventDefault();
     let input = castlingFlavours(($input.val() as string).trim());
     if (isShortCommand(input)) input = '/' + input;
     if (input[0] === '/') onCommand(ctrl, notify, input.slice(1), style());
@@ -373,31 +324,23 @@ function onSubmit(ctrl: AnalyseController, notify: (txt: string) => void, style:
       else notify('Invalid command');
     }
     $input.val('');
-    return false;
   };
 }
 
-const shortCommands = ['p', 's', 'next', 'prev', 'eval', 'best'];
-
-function isShortCommand(input: string): boolean {
-  return shortCommands.includes(input.split(' ')[0].toLowerCase());
-}
+const isShortCommand = (input: string) =>
+  ['p', 's', 'next', 'prev', 'eval', 'best'].includes(input.split(' ')[0].toLowerCase());
 
-function onCommand(ctrl: AnalyseController, notify: (txt: string) => void, c: string, style: Style) {
+function onCommand(ctrl: AnalyseController, notify: (txt: string) => void, c: string, style: MoveStyle) {
   const lowered = c.toLowerCase();
-  if (lowered === 'next') {
-    next(ctrl);
-    ctrl.redraw();
-  } else if (lowered === 'prev') {
-    prev(ctrl);
+  const doAndRedraw = (fn: (ctrl: AnalyseController) => void): void => {
+    fn(ctrl);
     ctrl.redraw();
-  } else if (lowered === 'next line') {
-    jumpNextLine(ctrl);
-    ctrl.redraw();
-  } else if (lowered === 'prev line') {
-    jumpPrevLine(ctrl);
-    ctrl.redraw();
-  } else if (lowered === 'eval') notify(renderEvalAndDepth(ctrl));
+  };
+  if (lowered === 'next') doAndRedraw(next);
+  else if (lowered === 'prev') doAndRedraw(prev);
+  else if (lowered === 'next line') doAndRedraw(jumpNextLine);
+  else if (lowered === 'prev line') doAndRedraw(jumpPrevLine);
+  else if (lowered === 'eval') notify(renderEvalAndDepth(ctrl));
   else if (lowered === 'best') notify(renderBestMove(ctrl, style));
   else {
     const pieces = ctrl.chessground.state.pieces;
@@ -409,18 +352,14 @@ function onCommand(ctrl: AnalyseController, notify: (txt: string) => void, c: st
   }
 }
 
-const analysisGlyphs = ['?!', '?', '??'];
-
-function renderAcpl(ctrl: AnalyseController, style: Style): MaybeVNodes | undefined {
-  const anal = ctrl.data.analysis;
+function renderAcpl(ctrl: AnalyseController, style: MoveStyle): MaybeVNodes | undefined {
+  const anal = ctrl.data.analysis; // heh
   if (!anal) return undefined;
-  const analysisNodes = ctrl.mainline.filter(n =>
-    (n.glyphs || []).find(g => analysisGlyphs.includes(g.symbol)),
-  );
+  const analysisGlyphs = ['?!', '?', '??'];
+  const analysisNodes = ctrl.mainline.filter(n => n.glyphs?.find(g => analysisGlyphs.includes(g.symbol)));
   const res: Array<VNode> = [];
   ['white', 'black'].forEach((color: Color) => {
-    const acpl = anal[color].acpl;
-    res.push(h('h3', `${color} player: ${acpl} ACPL`));
+    res.push(h('h3', `${color} player: ${anal[color].acpl} ACPL`));
     res.push(
       h(
         'select',
@@ -448,29 +387,30 @@ function renderAcpl(ctrl: AnalyseController, style: Style): MaybeVNodes | undefi
   return res;
 }
 
-function requestAnalysisButton(
+const requestAnalysisButton = (
   ctrl: AnalyseController,
   inProgress: Prop<boolean>,
   notify: (msg: string) => void,
-) {
-  if (inProgress()) return h('p', 'Server-side analysis in progress');
-  if (ctrl.ongoing || ctrl.synthetic) return undefined;
-  return h(
-    'button',
-    {
-      hook: bind('click', _ =>
-        xhrText(`/${ctrl.data.game.id}/request-analysis`, { method: 'post' }).then(
-          () => {
-            inProgress(true);
-            notify('Server-side analysis in progress');
+): MaybeVNode =>
+  ctrl.ongoing || ctrl.synthetic
+    ? undefined
+    : inProgress()
+      ? h('p', 'Server-side analysis in progress')
+      : h(
+          'button',
+          {
+            hook: bind('click', _ =>
+              xhrText(`/${ctrl.data.game.id}/request-analysis`, { method: 'post' }).then(
+                () => {
+                  inProgress(true);
+                  notify('Server-side analysis in progress');
+                },
+                () => notify('Cannot run server-side analysis'),
+              ),
+            ),
           },
-          () => notify('Cannot run server-side analysis'),
-        ),
-      ),
-    },
-    'Request a computer analysis',
-  );
-}
+          i18n.site.requestAComputerAnalysis,
+        );
 
 function currentLineIndex(ctrl: AnalyseController): { i: number; of: number } {
   if (ctrl.path === treePath.root) return { i: 1, of: 1 };
@@ -486,7 +426,7 @@ function renderLineIndex(ctrl: AnalyseController): string {
   return of > 1 ? `, line ${i + 1} of ${of} ,` : '';
 }
 
-function renderCurrentNode(ctrl: AnalyseController, style: Style): string {
+function renderCurrentNode(ctrl: AnalyseController, style: MoveStyle): string {
   const node = ctrl.node;
   if (!node.san || !node.uci) return 'Initial position';
   return [
@@ -499,9 +439,8 @@ function renderCurrentNode(ctrl: AnalyseController, style: Style): string {
     .trim();
 }
 
-function renderPlayer(ctrl: AnalyseController, player: Player) {
-  return player.ai ? i18n.site.aiNameLevelAiLevel('Stockfish', player.ai) : userHtml(ctrl, player);
-}
+const renderPlayer = (ctrl: AnalyseController, player: Player): VNodeChildren =>
+  player.ai ? i18n.site.aiNameLevelAiLevel('Stockfish', player.ai) : userHtml(ctrl, player);
 
 function userHtml(ctrl: AnalyseController, player: Player) {
   const d = ctrl.data,
@@ -523,9 +462,8 @@ function userHtml(ctrl: AnalyseController, player: Player) {
     : 'Anonymous';
 }
 
-function playerByColor(d: AnalyseData, color: Color) {
-  return color === d.player.color ? d.player : d.opponent;
-}
+const playerByColor = (d: AnalyseData, color: Color): Player =>
+  color === d.player.color ? d.player : d.opponent;
 
 const jumpNextLine = (ctrl: AnalyseController) => jumpLine(ctrl, 1);
 const jumpPrevLine = (ctrl: AnalyseController) => jumpLine(ctrl, -1);
@@ -539,3 +477,82 @@ function jumpLine(ctrl: AnalyseController, delta: number) {
   const newPath = prevPath + prevNode.children[newI].id;
   ctrl.userJumpIfCan(newPath);
 }
+
+function studyDetails(ctrl: AnalyseController): MaybeVNode {
+  const study = ctrl.study;
+  const onInsertHandler = (callback: () => void, el: HTMLElement) => {
+    el.addEventListener('click', callback);
+    el.addEventListener('keydown', ev => ev.key === 'Enter' && callback());
+  };
+
+  return (
+    study &&
+    h('div.study-details', [
+      h('h2', 'Study details'),
+      h('span', `Title: ${study.data.name}. By: ${study.data.ownerId}`),
+      h('br'),
+      h('label.chapters', [
+        h('h2', 'Current chapter:'),
+        h(
+          'select',
+          {
+            hook: bind('change', (e: InputEvent) => {
+              const target = e.target as HTMLSelectElement;
+              const selectedOption = target.options[target.selectedIndex];
+              const chapterId = selectedOption.getAttribute('chapterId');
+              study.setChapter(chapterId!);
+            }),
+          },
+          study.chapters.list.all().map((ch, i) =>
+            h(
+              'option',
+              {
+                attrs: {
+                  selected: ch.id === study.currentChapter().id,
+                  chapterId: ch.id,
+                },
+              },
+              `${i + 1}. ${ch.name}`,
+            ),
+          ),
+        ),
+        study.members.canContribute()
+          ? h('div.buttons', [
+              h(
+                'button',
+                {
+                  hook: onInsert((el: HTMLButtonElement) => {
+                    const toggle = () => {
+                      study.chapters.editForm.toggle(study.currentChapter());
+                      ctrl.redraw();
+                    };
+                    onInsertHandler(toggle, el);
+                  }),
+                },
+                [
+                  'Edit current chapter',
+                  study.chapters.editForm.current() && chapterEditFormView(study.chapters.editForm),
+                ],
+              ),
+              h(
+                'button',
+                {
+                  hook: onInsert((el: HTMLButtonElement) => {
+                    const toggle = () => {
+                      study.chapters.newForm.toggle();
+                      ctrl.redraw();
+                    };
+                    onInsertHandler(toggle, el);
+                  }),
+                },
+                [
+                  'Add new chapter',
+                  study.chapters.newForm.isOpen() ? chapterNewFormView(study.chapters.newForm) : undefined,
+                ],
+              ),
+            ])
+          : undefined,
+      ]),
+    ])
+  );
+}
diff --git a/ui/analyse/src/view/components.ts b/ui/analyse/src/view/components.ts
index 88b7f03fe34dc..f0aa4055b3521 100644
--- a/ui/analyse/src/view/components.ts
+++ b/ui/analyse/src/view/components.ts
@@ -349,36 +349,27 @@ export function renderControls(ctrl: AnalyseCtrl) {
   );
 }
 
-function renderMoveList(ctrl: AnalyseCtrl, deps?: typeof studyDeps, concealOf?: ConcealOf) {
-  function renderResult(ctrl: AnalyseCtrl, deps?: typeof studyDeps): VNode[] {
-    const render = (result: string, status: VNodeKids) => [h('div.result', result), h('div.status', status)];
-    if (ctrl.data.game.status.id >= 30) {
-      let result;
-      switch (ctrl.data.game.winner) {
-        case 'white':
-          result = '1-0';
-          break;
-        case 'black':
-          result = '0-1';
-          break;
-        default:
-          result = '½-½';
-      }
-      return render(result, statusView(ctrl));
-    } else if (ctrl.study) {
-      const result = deps?.findTag(ctrl.study.data.chapter.tags, 'result');
-      if (!result || result === '*') return [];
-      if (result === '1-0') return render(result, [i18n.site.whiteIsVictorious]);
-      if (result === '0-1') return render(result, [i18n.site.blackIsVictorious]);
-      return render('½-½', [i18n.site.draw]);
-    }
-    return [];
+export function renderResult(ctrl: AnalyseCtrl, deps?: typeof studyDeps): VNode[] {
+  const render = (result: string, status: VNodeKids) => [h('div.result', result), h('div.status', status)];
+  if (ctrl.data.game.status.id >= 30) {
+    const winner = ctrl.data.game.winner;
+    const result = winner === 'white' ? '1-0' : winner === 'black' ? '0-1' : '½-½';
+    return render(result, statusView(ctrl));
+  } else if (ctrl.study) {
+    const result = deps?.findTag(ctrl.study.data.chapter.tags, 'result');
+    if (!result || result === '*') return [];
+    if (result === '1-0') return render(result, [i18n.site.whiteIsVictorious]);
+    if (result === '0-1') return render(result, [i18n.site.blackIsVictorious]);
+    return render('½-½', [i18n.site.draw]);
   }
-  return h('div.analyse__moves.areplay', [
+  return [];
+}
+
+const renderMoveList = (ctrl: AnalyseCtrl, deps?: typeof studyDeps, concealOf?: ConcealOf): VNode =>
+  h('div.analyse__moves.areplay', [
     h(`div.areplay__v${ctrl.treeVersion}`, [renderTreeView(ctrl, concealOf), ...renderResult(ctrl)]),
     !ctrl.practice && !deps?.gbEdit.running(ctrl) && renderNextChapter(ctrl),
   ]);
-}
 
 export const renderMaterialDiffs = (ctrl: AnalyseCtrl): [VNode, VNode] =>
   materialView.renderMaterialDiffs(
diff --git a/ui/chess/src/sanWriter.ts b/ui/chess/src/sanWriter.ts
index 542db6f0a4380..10b5185617ccc 100644
--- a/ui/chess/src/sanWriter.ts
+++ b/ui/chess/src/sanWriter.ts
@@ -1,7 +1,7 @@
 import { charToRole, type Square } from 'chessops';
 
 export type Board = { pieces: { [key: number]: string }; turn: boolean };
-export type SanToUci = { [key: string]: Uci };
+export type SanToUci = { [key: AlmostSan]: Uci };
 
 function fixCrazySan(san: string) {
   return san[0] === 'P' ? san.slice(1) : san;
@@ -151,39 +151,40 @@ export function sanWriter(fen: string, ucis: string[]): SanToUci {
   return sans;
 }
 
+export function sanToUci(san: string, legalSans: SanToUci): Uci | undefined {
+  if (san in legalSans) return legalSans[san];
+  const lowered = san.toLowerCase();
+  for (const i in legalSans) if (i.toLowerCase() === lowered) return legalSans[i];
+  return;
+}
+
+export const sanToWords = (san: string): string =>
+  san
+    .split('')
+    .map(c => {
+      if (c === 'x') return 'takes';
+      if (c === '+') return 'check';
+      if (c === '#') return 'checkmate';
+      if (c === '=') return 'promotes to';
+      if (c === '@') return 'at';
+      const code = c.charCodeAt(0);
+      if (code > 48 && code < 58) return c; // 1-8
+      if (code > 96 && code < 105) return c.toUpperCase(); // a-h
+      return charToRole(c) ?? c;
+    })
+    .join(' ')
+    .replace('O - O - O', 'long castle')
+    .replace('O - O', 'short castle');
+
 export function speakable(san?: San): string {
   const text = !san
     ? 'Game start'
-    : san.includes('O-O-O#')
-      ? 'long castle checkmate'
-      : san.includes('O-O-O+')
-        ? 'long castle check'
-        : san.includes('O-O-O')
-          ? 'long castle'
-          : san.includes('O-O#')
-            ? 'short castle checkmate'
-            : san.includes('O-O+')
-              ? 'short castle check'
-              : san.includes('O-O')
-                ? 'short castle'
-                : san
-                    .split('')
-                    .map(c => {
-                      if (c === 'x') return 'takes';
-                      if (c === '+') return 'check';
-                      if (c === '#') return 'checkmate';
-                      if (c === '=') return 'promotes to';
-                      if (c === '@') return 'at';
-                      const code = c.charCodeAt(0);
-                      if (code > 48 && code < 58) return c; // 1-8
-                      if (code > 96 && code < 105) return c.toUpperCase();
-                      return charToRole(c) ?? c;
-                    })
-                    .join(' ')
-                    .replace(/^A /, '"A"') // "A takes" & "A 3" are mispronounced
-                    .replace(/(\d) E (\d)/, '$1,E $2') // Strings such as 1E5 are treated as scientific notation
-                    .replace(/C /, 'c ') // Capital C is pronounced as "degrees celsius" when it comes after a number (e.g. R8c3)
-                    .replace(/F /, 'f ') // Capital F is pronounced as "degrees fahrenheit" when it comes after a number (e.g. R8f3)
-                    .replace(/(\d) H (\d)/, '$1H$2'); // "H" is pronounced as "hour" when it comes after a number with a space (e.g. Rook 5 H 3)
+    : sanToWords(san)
+        .replace(/^A /, '"A"') // "A takes" & "A 3" are mispronounced
+        .replace(/(\d) E (\d)/, '$1,E $2') // Strings such as 1E5 are treated as scientific notation
+        .replace(/C /, 'c ') // Capital C is pronounced as "degrees celsius" when it comes after a number (e.g. R8c3)
+        .replace(/F /, 'f ') // Capital F is pronounced as "degrees fahrenheit" when it comes after a number (e.g. R8f3)
+        .replace(/(\d) H (\d)/, '$1H$2') // "H" is pronounced as "hour" when it comes after a number with a space (e.g. Rook 5 H 3)
+        .replace(/(\d) H (\d)/, '$1H$2');
   return text;
 }
diff --git a/ui/keyboardMove/src/keyboardSubmit.ts b/ui/keyboardMove/src/keyboardSubmit.ts
index 14d4c138ee9cc..4833ca0d3fd04 100644
--- a/ui/keyboardMove/src/keyboardSubmit.ts
+++ b/ui/keyboardMove/src/keyboardSubmit.ts
@@ -1,5 +1,5 @@
 import { files } from 'chessground/types';
-import type { SanToUci } from 'chess';
+import { sanToUci, type SanToUci } from 'chess';
 import type { Opts } from './exports';
 
 const keyRegex = /^[a-h][1-8]$/;
@@ -138,13 +138,6 @@ function iccfToUci(v: string) {
   return chars.join('');
 }
 
-function sanToUci(san: string, legalSans: SanToUci): Uci | undefined {
-  if (san in legalSans) return legalSans[san];
-  const lowered = san.toLowerCase();
-  for (const i in legalSans) if (i.toLowerCase() === lowered) return legalSans[i];
-  return;
-}
-
 function sanCandidates(san: string, legalSans: SanToUci): San[] {
   // replace '=' in promotion moves (#7326)
   const lowered = san.replace('=', '').toLowerCase();
diff --git a/ui/nvui/src/chess.ts b/ui/nvui/src/chess.ts
index 575def341abb5..ecb51c278ceb5 100644
--- a/ui/nvui/src/chess.ts
+++ b/ui/nvui/src/chess.ts
@@ -1,26 +1,28 @@
 import { h, type VNode, type VNodeChildren } from 'snabbdom';
 import { type Pieces, files } from 'chessground/types';
-import { invRanks, allKeys } from 'chessground/util';
 import { type Setting, makeSetting } from './setting';
 import { parseFen } from 'chessops/fen';
-import { chessgroundDests } from 'chessops/compat';
-import { type SquareName, RULES, type Rules } from 'chessops/types';
+import { chessgroundDests, lichessRules } from 'chessops/compat';
+import { COLORS, RANK_NAMES, ROLES, type FileName } from 'chessops/types';
 import { setupPosition } from 'chessops/variant';
-import { charToRole, parseUci, roleToChar } from 'chessops/util';
-import { plyToTurn, type SanToUci, sanWriter } from 'chess';
+import { charToRole, opposite, parseUci, roleToChar } from 'chessops/util';
+import { destsToUcis, plyToTurn, sanToUci, sanToWords, sanWriter } from 'chess';
 import { storage } from 'common/storage';
 
-export type Style = 'uci' | 'san' | 'literate' | 'nato' | 'anna';
-export type PieceStyle = 'letter' | 'white uppercase letter' | 'name' | 'white uppercase name';
-export type PrefixStyle = 'letter' | 'name' | 'none';
+const moveStyles = ['uci', 'san', 'literate', 'nato', 'anna'] as const;
+export type MoveStyle = (typeof moveStyles)[number];
+const pieceStyles = ['letter', 'white uppercase letter', 'name', 'white uppercase name'] as const;
+export type PieceStyle = (typeof pieceStyles)[number];
+const prefixStyles = ['letter', 'name', 'none'] as const;
+export type PrefixStyle = (typeof prefixStyles)[number];
 export type PositionStyle = 'before' | 'after' | 'none';
 export type BoardStyle = 'plain' | 'table';
 
 interface RoundStep {
-  uci: Uci;
+  uci?: Uci;
 }
 
-const nato: { [letter: string]: string } = {
+const nato: { [file in Files]: string } = {
   a: 'alpha',
   b: 'bravo',
   c: 'charlie',
@@ -30,7 +32,7 @@ const nato: { [letter: string]: string } = {
   g: 'golf',
   h: 'hotel',
 };
-const anna: { [letter: string]: string } = {
+const anna: { [file in Files]: string } = {
   a: 'anna',
   b: 'bella',
   c: 'cesar',
@@ -40,7 +42,7 @@ const anna: { [letter: string]: string } = {
   g: 'gustav',
   h: 'hector',
 };
-const skipToFile: { [letter: string]: string } = {
+const skipToFile: { [letter: string]: Files } = {
   '!': 'a',
   '@': 'b',
   '#': 'c',
@@ -51,15 +53,9 @@ const skipToFile: { [letter: string]: string } = {
   '*': 'h',
 };
 
-export function symbolToFile(char: string): string {
-  return skipToFile[char] ?? '';
-}
+const symbolToFile = (char: string): Files => skipToFile[char] ?? '';
 
-export function supportedVariant(key: string): boolean {
-  return ['standard', 'chess960', 'kingOfTheHill', 'threeCheck', 'fromPosition', 'atomic', 'horde'].includes(
-    key,
-  );
-}
+export const supportedVariant = (key: VariantKey): boolean => key !== 'crazyhouse';
 
 export function boardSetting(): Setting<BoardStyle> {
   return makeSetting<BoardStyle>({
@@ -72,15 +68,9 @@ export function boardSetting(): Setting<BoardStyle> {
   });
 }
 
-export function styleSetting(): Setting<Style> {
-  return makeSetting<Style>({
-    choices: [
-      ['san', 'SAN: Nxf3'],
-      ['uci', 'UCI: g1f3'],
-      ['literate', 'Literate: knight takes f 3'],
-      ['anna', 'Anna: knight takes felix 3'],
-      ['nato', 'Nato: knight takes foxtrot 3'],
-    ],
+export function styleSetting(): Setting<MoveStyle> {
+  return makeSetting<MoveStyle>({
+    choices: moveStyles.map(s => [s, `${s}: ${renderSan('Nxf3', 'g1f3', s)}`]),
     default: 'anna', // all the rage in OTB blind chess tournaments
     storage: storage.make('nvui.moveNotation'),
   });
@@ -88,12 +78,7 @@ export function styleSetting(): Setting<Style> {
 
 export function pieceSetting(): Setting<PieceStyle> {
   return makeSetting<PieceStyle>({
-    choices: [
-      ['letter', 'Letter: p, p'],
-      ['white uppercase letter', 'White uppercase letter: P, p'],
-      ['name', 'Name: pawn, pawn'],
-      ['white uppercase name', 'White uppercase name: Pawn, pawn'],
-    ],
+    choices: pieceStyles.map(p => [p, `${p}: ${renderPieceStyle('P', p)}`]),
     default: 'letter',
     storage: storage.make('nvui.pieceStyle'),
   });
@@ -101,11 +86,7 @@ export function pieceSetting(): Setting<PieceStyle> {
 
 export function prefixSetting(): Setting<PrefixStyle> {
   return makeSetting<PrefixStyle>({
-    choices: [
-      ['letter', 'Letter: w/b'],
-      ['name', 'Name: white/black'],
-      ['none', 'None'],
-    ],
+    choices: prefixStyles.map(p => [p, `${p}: ${renderPrefixStyle('white', p)}`]),
     default: 'letter',
     storage: storage.make('nvui.prefixStyle'),
   });
@@ -122,40 +103,28 @@ export function positionSetting(): Setting<PositionStyle> {
     storage: storage.make('nvui.positionStyle'),
   });
 }
-const renderPieceStyle = (piece: string, pieceStyle: PieceStyle) => {
-  switch (pieceStyle) {
-    case 'letter':
-      return piece.toLowerCase();
-    case 'white uppercase letter':
-      return piece;
-    case 'name':
-      return charToRole(piece);
-    case 'white uppercase name':
-      return `${piece}${charToRole(piece)?.slice(1)}`;
-  }
-};
-const renderPrefixStyle = (color: Color, prefixStyle: PrefixStyle) => {
-  switch (prefixStyle) {
-    case 'letter':
-      return color.charAt(0);
-    case 'name':
-      return color + ' ';
-    case 'none':
-      return '';
-  }
-};
+
+const renderPieceStyle = (piece: string, pieceStyle: PieceStyle) =>
+  pieceStyle === 'letter'
+    ? piece.toLowerCase()
+    : pieceStyle === 'white uppercase letter'
+      ? piece
+      : pieceStyle === 'name'
+        ? charToRole(piece)!
+        : `${piece.replace('N', 'K').replace('n', 'k')}${charToRole(piece)!.slice(1)}`;
+
+const renderPrefixStyle = (color: Color, prefixStyle: PrefixStyle): `${Color} ` | 'w' | 'b' | '' =>
+  prefixStyle === 'letter' ? (color[0] as 'w' | 'b') : prefixStyle === 'name' ? `${color} ` : '';
 
 export function lastCaptured(
-  movesGenerator: () => string[],
+  fensteps: () => string[],
   pieceStyle: PieceStyle,
   prefixStyle: PrefixStyle,
 ): string {
-  const moves = movesGenerator();
-  const oldFen = moves[moves.length - 2];
-  const newFen = moves[moves.length - 1];
-  if (!oldFen || !newFen) {
-    return 'none';
-  }
+  const fens = fensteps();
+  const oldFen = fens[fens.length - 2];
+  const newFen = fens[fens.length - 1];
+  if (!oldFen || !newFen) return 'none';
   const oldSplitFen = oldFen.split(' ')[0];
   const newSplitFen = newFen.split(' ')[0];
   for (const p of 'kKqQrRbBnNpP') {
@@ -170,80 +139,68 @@ export function lastCaptured(
   return 'none';
 }
 
-export function renderSan(san: San, uci: Uci | undefined, style: Style): string {
-  if (!san) return '';
-  let move: string;
-  if (san.includes('O-O-O')) move = 'long castling';
-  else if (san.includes('O-O')) move = 'short castling';
-  else if (style === 'san') move = san.replace(/[\+#]/, '');
-  else if (style === 'uci') move = uci || san;
-  else {
-    move = san
-      .replace(/[\+#]/, '')
-      .split('')
-      .map(c => {
-        if (c === 'x') return 'takes';
-        if (c === '+') return 'check';
-        if (c === '#') return 'checkmate';
-        if (c === '=') return 'promotion';
-        const code = c.charCodeAt(0);
-        if (code > 48 && code < 58) return c; // 1-8
-        if (code > 96 && code < 105) return renderFile(c, style); // a-g
-        return charToRole(c) || c;
-      })
-      .join(' ');
-  }
-  if (san.includes('+')) move += ' check';
-  if (san.includes('#')) move += ' checkmate';
-  return move;
-}
-
-export function renderPieces(pieces: Pieces, style: Style): VNode {
-  return h(
+export const renderSan = (san: San | undefined, uci: Uci | undefined, style: MoveStyle): string =>
+  !san
+    ? 'Game start'
+    : style === 'uci'
+      ? (uci ?? '')
+      : style === 'san'
+        ? san
+        : sanToWords(san)
+            .split(' ')
+            .map(f =>
+              files.includes(f.toLowerCase() as FileName)
+                ? renderFile(f.toLowerCase() as FileName, style)
+                : f,
+            )
+            .join(' ');
+
+export const renderPieces = (pieces: Pieces, style: MoveStyle): VNode =>
+  h(
     'div',
-    ['white', 'black'].map(color => {
-      const lists: string[][] = [];
-      ['king', 'queen', 'rook', 'bishop', 'knight', 'pawn'].forEach(role => {
-        const keys = [];
-        for (const [key, piece] of pieces) {
-          if (piece.color === color && piece.role === role) keys.push(key);
-        }
-        if (keys.length) lists.push([`${role}${keys.length > 1 ? 's' : ''}`, ...keys]);
-      });
-      return h('div', [
+    COLORS.map(color =>
+      h('div', [
         h('h3', `${color} pieces`),
-        lists
+        ROLES.slice()
+          .reverse()
+          .reduce<{ role: Role; keys: Key[] }[]>(
+            (lists, role) =>
+              lists.concat({
+                role,
+                keys: keysWithPiece(pieces, role, color),
+              }),
+            [],
+          )
+          .filter(l => l.keys.length)
           .map(
             l =>
-              `${l[0]}: ${l
-                .slice(1)
-                .map((k: string) => renderKey(k, style))
-                .join(', ')}`,
+              `${l.role}${l.keys.length > 1 ? 's' : ''}: ${l.keys.map(k => renderKey(k, style)).join(', ')}`,
           )
           .join(', '),
-      ]);
-    }),
+      ]),
+    ),
   );
-}
 
-export function renderPieceKeys(pieces: Pieces, p: string, style: Style): string {
-  const name = `${p === p.toUpperCase() ? 'white' : 'black'} ${charToRole(p)}`;
-  const res: Key[] = [];
-  for (const [k, piece] of pieces) {
-    if (piece && `${piece.color} ${piece.role}` === name) res.push(k as Key);
-  }
-  return `${name}: ${res.length ? res.map(k => renderKey(k, style)).join(', ') : 'none'}`;
+const keysWithPiece = (pieces: Pieces, role?: Role, color?: Color): Key[] =>
+  Array.from(pieces).reduce<Key[]>(
+    (keys, [key, p]) => (p.color === color && p.role === role ? keys.concat(key) : keys),
+    [],
+  );
+
+export function renderPieceKeys(pieces: Pieces, p: string, style: MoveStyle): string {
+  const color: Color = p === p.toUpperCase() ? 'white' : 'black';
+  const role = charToRole(p)!;
+  const keys = keysWithPiece(pieces, role, color);
+  return `${color} ${role}: ${keys.length ? keys.map(k => renderKey(k, style)).join(', ') : 'none'}`;
 }
 
-export function renderPiecesOn(pieces: Pieces, rankOrFile: string, style: Style): string {
-  const res: string[] = [];
-  for (const k of allKeys) {
-    if (k.includes(rankOrFile)) {
-      const piece = pieces.get(k);
-      if (piece) res.push(`${renderKey(k, style)} ${piece.color} ${piece.role}`);
-    }
-  }
-  return res.length ? res.join(', ') : 'blank';
+export function renderPiecesOn(pieces: Pieces, rankOrFile: string, style: MoveStyle): string {
+  const renderedKeysWithPiece = Array.from(pieces).reduce<string[]>(
+    (acc, [key, p]) =>
+      key.includes(rankOrFile) ? acc.concat(`${renderKey(key, style)} ${p.color} ${p.role}`) : acc,
+    [],
+  );
+  return renderedKeysWithPiece.length ? renderedKeysWithPiece.join(', ') : 'blank';
 }
 
 export function renderBoard(
@@ -254,55 +211,52 @@ export function renderBoard(
   positionStyle: PositionStyle,
   boardStyle: BoardStyle,
 ): VNode {
-  const doRankHeader = (rank: Ranks): VNode => {
-    return h('th', { attrs: { scope: 'row' } }, rank);
-  };
+  const doRankHeader = (rank: Ranks): VNode => h('th', { attrs: { scope: 'row' } }, rank);
+
   const doFileHeaders = (): VNode => {
     const ths = files.map(file => h('th', { attrs: { scope: 'col' } }, file));
-    if (pov === 'black') ths.reverse();
-    return h('tr', [h('td'), ...ths, h('td')]);
-  };
-  const renderPositionStyle = (rank: Ranks, file: Files, orig: string) => {
-    switch (positionStyle) {
-      case 'before':
-        return file.toUpperCase() + rank + ' ' + orig;
-      case 'after':
-        return orig + ' ' + file.toUpperCase() + rank;
-      case 'none':
-        return orig;
-    }
+    return h('tr', [h('td'), ...(pov === 'black' ? ths.reverse() : ths), h('td')]);
   };
+
+  const renderPositionStyle = (rank: Ranks, file: Files, orig: string) =>
+    positionStyle === 'before'
+      ? file.toUpperCase() + rank + ' ' + orig
+      : positionStyle === 'after'
+        ? orig + ' ' + file.toUpperCase() + rank
+        : orig;
+
   const doPieceButton = (
     rank: Ranks,
     file: Files,
     letter: string,
     color: Color | 'none',
     text: string,
-  ): VNode => {
-    return h(
+  ): VNode =>
+    h(
       'button',
       {
         attrs: { rank: rank, file: file, piece: letter.toLowerCase(), color: color, 'trap-bypass': true },
       },
       text,
     );
-  };
+
   const doPiece = (rank: Ranks, file: Files): VNode => {
-    const key = (file + rank) as Key;
+    const key: Key = `${file}${rank}`;
     const piece = pieces.get(key);
     const pieceWrapper = boardStyle === 'table' ? 'td' : 'span';
     if (piece) {
-      const role = roleToChar(piece.role);
-      const pieceText = renderPieceStyle(piece.color === 'white' ? role.toUpperCase() : role, pieceStyle);
+      const roleCh = roleToChar(piece.role);
+      const pieceText = renderPieceStyle(piece.color === 'white' ? roleCh.toUpperCase() : roleCh, pieceStyle);
       const prefix = renderPrefixStyle(piece.color, prefixStyle);
       const text = renderPositionStyle(rank, file, prefix + pieceText);
-      return h(pieceWrapper, doPieceButton(rank, file, role, piece.color, text));
+      return h(pieceWrapper, doPieceButton(rank, file, roleCh, piece.color, text));
     } else {
       const letter = (key.charCodeAt(0) + key.charCodeAt(1)) % 2 ? '-' : '+';
       const text = renderPositionStyle(rank, file, letter);
       return h(pieceWrapper, doPieceButton(rank, file, letter, 'none', text));
     }
   };
+
   const doRank = (pov: Color, rank: Ranks): VNode => {
     const rankElements = [];
     if (boardStyle === 'table') rankElements.push(doRankHeader(rank));
@@ -311,19 +265,24 @@ export function renderBoard(
     if (pov === 'black') rankElements.reverse();
     return h(boardStyle === 'table' ? 'tr' : 'div', rankElements);
   };
+
   const ranks: VNode[] = [];
   if (boardStyle === 'table') ranks.push(doFileHeaders());
-  ranks.push(...invRanks.map(rank => doRank(pov, rank)));
+  ranks.push(
+    ...RANK_NAMES.slice()
+      .reverse()
+      .map(rank => doRank(pov, rank)),
+  );
   if (boardStyle === 'table') ranks.push(doFileHeaders());
   if (pov === 'black') ranks.reverse();
   return h(boardStyle === 'table' ? 'table.board-wrapper' : 'div.board-wrapper', ranks);
 }
 
-export const renderFile = (f: string, style: Style): string =>
+export const renderFile = (f: Files, style: MoveStyle): string =>
   style === 'nato' ? nato[f] : style === 'anna' ? anna[f] : f;
 
-export const renderKey = (key: string, style: Style): string =>
-  style === 'nato' || style === 'anna' ? `${renderFile(key[0], style)} ${key[1]}` : `${key[0]}${key[1]}`;
+export const renderKey = (key: Key, style: MoveStyle): string =>
+  style === 'nato' || style === 'anna' ? `${renderFile(key[0] as Files, style)} ${key[1]}` : key;
 
 export function castlingFlavours(input: string): string {
   switch (input.toLowerCase().replace(/[-\s]+/g, '')) {
@@ -339,191 +298,149 @@ export function castlingFlavours(input: string): string {
 
 /* Listen to interactions on the chessboard */
 export function positionJumpHandler() {
-  return (ev: KeyboardEvent): boolean => {
+  return (ev: KeyboardEvent): void => {
     const $btn = $(ev.target as HTMLElement);
-    const $file = $btn.attr('file') ?? '';
-    const $rank = $btn.attr('rank') ?? '';
-    let $newRank = '';
-    let $newFile = '';
+    const key = keyFromAttrs($btn);
+    if (!key) return;
+    let newRank: string;
+    let newFile: string;
     if (ev.key.match(/^[1-8]$/)) {
-      $newRank = ev.key;
-      $newFile = $file;
+      newRank = ev.key;
+      newFile = key[0];
     } else if (ev.key.match(/^[!@#$%^&*]$/)) {
-      $newRank = $rank;
-      $newFile = symbolToFile(ev.key);
+      newRank = key[1];
+      newFile = symbolToFile(ev.key);
       // if not a valid key for jumping
-    } else {
-      return true;
-    }
-    const newBtn = document.querySelector(
-      '.board-wrapper button[rank="' + $newRank + '"][file="' + $newFile + '"]',
-    ) as HTMLElement;
-    if (newBtn) {
-      newBtn.focus();
-      return false;
-    }
-    return true;
+    } else return;
+    document.querySelector<HTMLElement>(squareSelector(newRank, newFile))?.focus();
   };
 }
 
-export function pieceJumpingHandler(wrapSound: () => void, errorSound: () => void) {
-  return (ev: KeyboardEvent): boolean => {
-    if (!ev.key.match(/^[kqrbnp]$/i)) return true;
+export function pieceJumpingHandler(selectSound: () => void, errorSound: () => void) {
+  return (ev: KeyboardEvent): void => {
+    if (!ev.key.match(/^[kqrbnp]$/i)) return;
     const $currBtn = $(ev.target as HTMLElement);
 
     // TODO: decouple from promotion attribute setting in selectionHandler
     if ($currBtn.attr('promotion') === 'true') {
       const $moveBox = $('input.move');
       const $boardLive = $('.boardstatus');
-      const $promotionPiece = ev.key.toLowerCase();
+      const promotionPiece = ev.key.toLowerCase();
       const $form = $moveBox.parent().parent();
-      if (!$promotionPiece.match(/^[qnrb]$/)) {
+      if (!promotionPiece.match(/^[qnrb]$/)) {
         $boardLive.text('Invalid promotion piece. q for queen, n for knight, r for rook, b for bishop');
-        return false;
+        return;
       }
-      $moveBox.val($moveBox.val() + $promotionPiece);
+      $moveBox.val($moveBox.val() + promotionPiece);
       $currBtn.removeAttr('promotion');
-      const $sendForm = new Event('submit', {
+      const sendForm = new Event('submit', {
         cancelable: true,
         bubbles: true,
       });
-      $form.trigger($sendForm);
-      return false;
+      $form.trigger(sendForm);
+      return;
     }
 
-    const $myBtnAttrs =
-      '.board-wrapper [rank="' + $currBtn.attr('rank') + '"][file="' + $currBtn.attr('file') + '"]';
-    const $allPieces = $('.board-wrapper [piece="' + ev.key.toLowerCase() + '"], ' + $myBtnAttrs);
-    const $myPieceIndex = $allPieces.index($myBtnAttrs);
-    const $next = ev.key.toLowerCase() === ev.key;
-    const $prevNextPieces = $next ? $allPieces.slice($myPieceIndex + 1) : $allPieces.slice(0, $myPieceIndex);
-    const $piece = $next ? $prevNextPieces.get(0) : $prevNextPieces.get($prevNextPieces.length - 1);
-    if ($piece) {
-      $piece.focus();
-      // if detected any matching piece; one is the piece being clicked on,
-    } else if ($allPieces.length >= 2) {
-      const $wrapPiece = $next ? $allPieces.get(0) : $allPieces.get($allPieces.length - 1);
-      $wrapPiece?.focus();
-      wrapSound();
-    } else {
-      errorSound();
-    }
-    return false;
+    const myBtnAttrs = squareSelector($currBtn.attr('rank') ?? '', $currBtn.attr('file') ?? '');
+    const $allPieces = $(`.board-wrapper [piece="${ev.key.toLowerCase()}"], ${myBtnAttrs}`);
+    const myPieceIndex = $allPieces.index(myBtnAttrs);
+    const next = ev.key.toLowerCase() === ev.key;
+    const $prevNextPieces = next ? $allPieces.slice(myPieceIndex + 1) : $allPieces.slice(0, myPieceIndex);
+    const pieceEl = next ? $prevNextPieces.get(0) : $prevNextPieces.get($prevNextPieces.length - 1);
+    if (pieceEl) pieceEl.focus();
+    // if detected any matching piece; one is the piece being clicked on,
+    else if ($allPieces.length >= 2) {
+      const wrapPieceEl = next ? $allPieces.get(0) : $allPieces.get($allPieces.length - 1);
+      wrapPieceEl?.focus();
+      selectSound();
+    } else errorSound();
   };
 }
 
 export function arrowKeyHandler(pov: Color, borderSound: () => void) {
-  return (ev: KeyboardEvent): boolean => {
-    const $currBtn = $(ev.target as HTMLElement);
-    const $isWhite = pov === 'white';
-    let $file = $currBtn.attr('file') ?? ' ';
-    let $rank = Number($currBtn.attr('rank'));
-    if (ev.key === 'ArrowUp') {
-      $rank = $isWhite ? ($rank += 1) : ($rank -= 1);
-    } else if (ev.key === 'ArrowDown') {
-      $rank = $isWhite ? ($rank -= 1) : ($rank += 1);
-    } else if (ev.key === 'ArrowLeft') {
-      $file = String.fromCharCode($isWhite ? $file.charCodeAt(0) - 1 : $file.charCodeAt(0) + 1);
-    } else if (ev.key === 'ArrowRight') {
-      $file = String.fromCharCode($isWhite ? $file.charCodeAt(0) + 1 : $file.charCodeAt(0) - 1);
-    } else {
-      return true;
-    }
-    const $newSq = document.querySelector(
-      '.board-wrapper [file="' + $file + '"][rank="' + $rank + '"]',
-    ) as HTMLElement;
-    if ($newSq) {
-      $newSq.focus();
-    } else {
-      borderSound();
-    }
+  return (ev: KeyboardEvent): void => {
+    const isWhite = pov === 'white';
+    const key = keyFromAttrs($(ev.target as HTMLElement));
+    if (!key) return;
+    let file = key[0];
+    let rank = Number(key[1]);
+    if (ev.key === 'ArrowUp') rank = isWhite ? (rank += 1) : (rank -= 1);
+    else if (ev.key === 'ArrowDown') rank = isWhite ? (rank -= 1) : (rank += 1);
+    else if (ev.key === 'ArrowLeft')
+      file = String.fromCharCode(isWhite ? file.charCodeAt(0) - 1 : file.charCodeAt(0) + 1);
+    else if (ev.key === 'ArrowRight')
+      file = String.fromCharCode(isWhite ? file.charCodeAt(0) + 1 : file.charCodeAt(0) - 1);
+    else return;
+    const newSqEl = document.querySelector<HTMLElement>(squareSelector(`${rank}`, file));
+    newSqEl ? newSqEl.focus() : borderSound();
     ev.preventDefault();
-    return false;
   };
 }
 
 export function selectionHandler(getOpponentColor: () => Color, selectSound: () => void) {
-  return (ev: MouseEvent): boolean => {
+  return (ev: MouseEvent): void => {
     const opponentColor = getOpponentColor();
     // this depends on the current document structure. This may not be advisable in case the structure wil change.
     const $evBtn = $(ev.target as HTMLElement);
-    const $rank = $evBtn.attr('rank');
-    const $pos = ($evBtn.attr('file') ?? '') + $rank;
+    const rank = $evBtn.attr('rank');
+    const pos = ($evBtn.attr('file') ?? '') + rank;
     const $boardLive = $('.boardstatus');
-    const $promotionRank = opponentColor === 'black' ? '8' : '1';
-    const $moveBox = $(document.querySelector('input.move') as HTMLInputElement);
-    if (!$moveBox) return false;
+    const promotionRank = opponentColor === 'black' ? '8' : '1';
+    const $moveBox = $('input.move');
+    if (!$moveBox.length) return;
 
     // if no move in box yet
     if ($moveBox.val() === '') {
       // if user selects another's piece first
-      if ($evBtn.attr('color') === opponentColor) return false;
+      if ($evBtn.attr('color') === opponentColor) return;
       // as long as the user is selecting a piece and not a blank tile
       if ($evBtn.text().match(/^[^\-+]+/g)) {
-        $moveBox.val($pos);
+        $moveBox.val(pos);
         selectSound();
       }
     } else {
       // if user selects their own piece second
-      if ($evBtn.attr('color') === (opponentColor === 'black' ? 'white' : 'black')) return false;
+      if ($evBtn.attr('color') === opposite(opponentColor)) return;
 
-      const $first = $moveBox.val();
-      const $firstPiece = $('.board-wrapper [file="' + $first[0] + '"][rank="' + $first[1] + '"]');
-      $moveBox.val($moveBox.val() + $pos);
+      const first = $moveBox.val();
+      if (typeof first !== 'string' || !isKey(first)) return;
+      const $firstPiece = $(squareSelector(first[1], first[0]));
+      $moveBox.val($moveBox.val() + pos);
       // this is coupled to pieceJumpingHandler() noticing that the attribute is set and acting differently. TODO: make cleaner
       // if pawn promotion
-      if ($rank === $promotionRank && $firstPiece.attr('piece')?.toLowerCase() === 'p') {
+      if (rank === promotionRank && $firstPiece.attr('piece')?.toLowerCase() === 'p') {
         $evBtn.attr('promotion', 'true');
         $boardLive.text('Promote to? q for queen, n for knight, r for rook, b for bishop');
-        return false;
+        return;
       }
       // this section depends on the form being the grandparent of the input.move box.
       const $form = $moveBox.parent().parent();
-      const $event = new Event('submit', {
+      const event = new Event('submit', {
         cancelable: true,
         bubbles: true,
       });
-      $form.trigger($event);
+      $form.trigger(event);
     }
-    return false;
   };
 }
 
 export function boardCommandsHandler() {
-  return (ev: KeyboardEvent): boolean => {
-    const $currBtn = $(ev.target as HTMLElement);
+  return (ev: KeyboardEvent): void => {
+    const key = keyFromAttrs($(ev.target as HTMLElement));
     const $boardLive = $('.boardstatus');
-    const $position = ($currBtn.attr('file') ?? '') + ($currBtn.attr('rank') ?? '');
-    if (ev.key === 'o') {
-      $boardLive.text();
-      $boardLive.text($position);
-      return false;
-    } else if (ev.key === 'l') {
-      const $lastMove = $('p.lastMove').text();
-      $boardLive.text();
-      $boardLive.text($lastMove);
-      return false;
-    } else if (ev.key === 't') {
-      $boardLive.text();
-      $boardLive.text($('.nvui .botc').text() + ', ' + $('.nvui .topc').text());
-      return false;
-    }
-    return true;
+    if (ev.key === 'o' && key) $boardLive.text(key);
+    else if (ev.key === 'l') $boardLive.text($('p.lastMove').text());
+    else if (ev.key === 't') $boardLive.text(`${$('.nvui .botc').text()}, ${$('.nvui .topc').text()}`);
   };
 }
+
 export function lastCapturedCommandHandler(
-  steps: () => string[],
+  fensteps: () => string[],
   pieceStyle: PieceStyle,
   prefixStyle: PrefixStyle,
 ) {
-  return (ev: KeyboardEvent): boolean => {
-    const $boardLive = $('.boardstatus');
-    if (ev.key === 'c') {
-      $boardLive.text();
-      $boardLive.text(lastCaptured(steps, pieceStyle, prefixStyle));
-      return false;
-    }
-    return true;
+  return (ev: KeyboardEvent): void => {
+    if (ev.key === 'c') $('.boardstatus').text(lastCaptured(fensteps, pieceStyle, prefixStyle));
   };
 }
 
@@ -532,37 +449,26 @@ export function possibleMovesHandler(
   turnColor: () => Color,
   startingFen: () => string,
   piecesFunc: () => Pieces,
-  variant: string,
-  moveable: () => Map<string, Array<string>> | undefined,
+  variant: VariantKey,
+  moveable: () => Dests | undefined,
   steps: () => RoundStep[],
 ) {
-  return (ev: KeyboardEvent): boolean => {
-    if (ev.key !== 'm' && ev.key !== 'M') return true;
+  return (ev: KeyboardEvent): void => {
+    if (ev.key.toLowerCase() !== 'm') return;
     const $boardLive = $('.boardstatus');
     const pieces: Pieces = piecesFunc();
 
-    const $btn = $(ev.target as HTMLElement);
-    const pos = (($btn.attr('file') ?? '') + $btn.attr('rank')) as SquareName;
-    const ruleTranslation: { [vari: string]: number } = {
-      standard: 0,
-      antichess: 1,
-      kingOfTheHill: 2,
-      threeCheck: 3,
-      atomic: 4,
-      horde: 5,
-      racingKings: 6,
-      crazyhouse: 7,
-    };
-    const rules: Rules = RULES[ruleTranslation[variant]];
-
-    let rawMoves;
+    const pos = keyFromAttrs($(ev.target as HTMLElement));
+    if (!pos) return;
+
+    let rawMoves: Dests | undefined;
 
     // possible inefficient to reparse fen; but seems to work when it is AND when it is not the users' turn. Also note that this FEN is incomplete as it only contains the piece information.
     // if it is your turn
     if (turnColor() === yourColor) {
       rawMoves = moveable();
     } else {
-      const fromSetup = setupPosition(rules, parseFen(startingFen()).unwrap()).unwrap();
+      const fromSetup = setupPosition(lichessRules(variant), parseFen(startingFen()).unwrap()).unwrap();
       steps().forEach(s => {
         if (s.uci) {
           const move = parseUci(s.uci);
@@ -577,46 +483,24 @@ export function possibleMovesHandler(
     const possibleMoves = rawMoves
       ?.get(pos)
       ?.map(i => {
-        const p = pieces.get(i as Key);
+        const p = pieces.get(i);
         // logic to prevent 'capture rook' on own piece in chess960
         return p && p.color !== yourColor ? `${i} captures ${p.role}` : i;
       })
       ?.filter(i => ev.key === 'm' || i.includes('captures'));
-    if (!possibleMoves) {
-      $boardLive.text('None');
-      // if filters out non-capturing moves
-    } else if (possibleMoves.length === 0) {
-      $boardLive.text('No captures');
-    } else {
-      $boardLive.text(possibleMoves.join(', '));
-    }
-    return false;
+    $boardLive.text(
+      !possibleMoves ? 'None' : !possibleMoves.length ? 'No captures' : possibleMoves.join(', '),
+    );
   };
 }
 
-const promotionRegex = /^([a-h]x?)?[a-h](1|8)=\w$/;
-const uciPromotionRegex = /^([a-h][1-8])([a-h](1|8))[qrbn]$/;
-
-function destsToUcis(dests: Dests) {
-  const ucis: string[] = [];
-  for (const [orig, d] of dests) {
-    if (d)
-      d.forEach(function (dest) {
-        ucis.push(orig + dest);
-      });
-  }
-  return ucis;
-}
-
-function sanToUci(san: string, legalSans: SanToUci): Uci | undefined {
-  if (san in legalSans) return legalSans[san];
-  const lowered = san.toLowerCase();
-  for (const i in legalSans) if (i.toLowerCase() === lowered) return legalSans[i];
-  return;
-}
+const promotionRegex = /^([a-h]x?)?[a-h](1|8)=[kqnbr]$/;
+const uciPromotionRegex = /^([a-h][1-8])([a-h](1|8))[kqnbr]$/;
 
 export function inputToLegalUci(input: string, fen: string, chessground: CgApi): string | undefined {
-  const legalUcis = destsToUcis(chessground.state.movable.dests!),
+  const dests = chessground.state.movable.dests;
+  if (!dests) return;
+  const legalUcis = destsToUcis(dests),
     legalSans = sanWriter(fen, legalUcis);
   let uci = sanToUci(input, legalSans) || input,
     promotion = '';
@@ -634,12 +518,8 @@ export function inputToLegalUci(input: string, fen: string, chessground: CgApi):
   else return;
 }
 
-export function renderMainline(
-  nodes: Tree.Node[],
-  currentPath: Tree.Path,
-  style: Style,
-): Array<string | VNode> {
-  const res: Array<string | VNode> = [];
+export function renderMainline(nodes: Tree.Node[], currentPath: Tree.Path, style: MoveStyle): VNodeChildren {
+  const res: VNodeChildren = [];
   let path: Tree.Path = '';
   nodes.forEach(node => {
     if (!node.san || !node.uci) return;
@@ -656,16 +536,23 @@ export function renderMainline(
   return res;
 }
 
-export function renderComments(node: Tree.Node, style: Style): string {
-  if (!node.comments) return '';
-  return (node.comments || []).map(c => renderComment(c, style)).join('. ');
-}
+export const renderComments = (node: Tree.Node, style: MoveStyle): string =>
+  node.comments?.map(c => ` ${augmentLichessComment(c, style)}`).join('.') ?? '';
 
-function renderComment(comment: Tree.Comment, style: Style): string {
-  return comment.by === 'lichess'
+const augmentLichessComment = (comment: Tree.Comment, style: MoveStyle): string =>
+  comment.by === 'lichess'
     ? comment.text.replace(
-        /Best move was (.+)\./,
-        (_, san) => 'Best move was ' + renderSan(san, undefined, style),
+        /([^\s]+) was best\./,
+        (_, san) => `Best move was ${renderSan(san, undefined, style)}`,
       )
     : comment.text;
-}
+
+const squareSelector = (rank: string, file: string) =>
+  `.board-wrapper button[rank="${rank}"][file="${file}"]`;
+
+const isKey = (maybeKey: string): maybeKey is Key => !!maybeKey.match(/^[a-h][1-8]$/);
+
+const keyFromAttrs = (cash: Cash): Key | undefined => {
+  const maybeKey = `${cash.attr('file') ?? ''}${cash.attr('rank') ?? ''}`;
+  return isKey(maybeKey) ? maybeKey : undefined;
+};
diff --git a/ui/nvui/src/command.ts b/ui/nvui/src/command.ts
index dc0e6b564afb5..1941861cb7abd 100644
--- a/ui/nvui/src/command.ts
+++ b/ui/nvui/src/command.ts
@@ -1,16 +1,17 @@
-import { renderPieceKeys, renderPiecesOn, type Style } from './chess';
+import { type VNode, h } from 'snabbdom';
+import { renderPieceKeys, renderPiecesOn, type MoveStyle } from './chess';
 import type { Pieces } from 'chessground/types';
 
 export const commands = {
   piece: {
     help: 'p: Read locations of a piece type. Example: p N, p k.',
-    apply(c: string, pieces: Pieces, style: Style): string | undefined {
+    apply(c: string, pieces: Pieces, style: MoveStyle): string | undefined {
       return tryC(c, /^p ([pnbrqk])$/i, p => renderPieceKeys(pieces, p, style));
     },
   },
   scan: {
     help: 's: Read pieces on a rank or file. Example: s a, s 1.',
-    apply(c: string, pieces: Pieces, style: Style): string | undefined {
+    apply(c: string, pieces: Pieces, style: MoveStyle): string | undefined {
       return tryC(c, /^s ([a-h1-8])$/i, p => renderPiecesOn(pieces, p, style));
     },
   },
@@ -20,3 +21,31 @@ function tryC<A>(c: string, regex: RegExp, f: (arg: string) => A | undefined): A
   if (!c.match(regex)) return undefined;
   return f(c.replace(regex, '$1'));
 }
+
+export const boardCommands = (): VNode[] => [
+  h('h2', 'Board mode commands'),
+  h('p', [
+    'Use these commands when focused on the board itself.',
+    h('br'),
+    'o: announce current position.',
+    h('br'),
+    "c: announce last move's captured piece.",
+    h('br'),
+    'l: announce last move.',
+    h('br'),
+    `t: ${i18n.keyboardMove.readOutClocks}`,
+    h('br'),
+    'm: announce possible moves for the selected piece.',
+    h('br'),
+    'shift+m: announce possible moves for the selected pieces which capture..',
+    h('br'),
+    'arrow keys: move left, right, up or down.',
+    h('br'),
+    'kqrbnp/KQRBNP: move forward/backward to a piece.',
+    h('br'),
+    '1-8: move to rank 1-8.',
+    h('br'),
+    'Shift+1-8: move to file a-h.',
+    h('br'),
+  ]),
+];
diff --git a/ui/nvui/src/notify.ts b/ui/nvui/src/notify.ts
index b883631870d81..18d6712ea713b 100644
--- a/ui/nvui/src/notify.ts
+++ b/ui/nvui/src/notify.ts
@@ -10,7 +10,7 @@ export class Notify {
   notification: Notification | undefined;
   redraw?: () => void;
 
-  constructor(readonly timeout: number = 3000) {}
+  constructor() {}
 
   set = (msg: string): void => {
     // make sure it's different from previous, so it gets read again
@@ -20,9 +20,7 @@ export class Notify {
   };
 
   currentText = (): string =>
-    this.notification && this.notification.date.getTime() > Date.now() - this.timeout
-      ? this.notification.text
-      : '';
+    this.notification && this.notification.date.getTime() > Date.now() - 3000 ? this.notification.text : '';
 
   render = (): VNode =>
     h('div.notify', { attrs: { 'aria-live': 'assertive', 'aria-atomic': 'true' } }, this.currentText());
diff --git a/ui/nvui/src/setting.ts b/ui/nvui/src/setting.ts
index b4159224cceba..90ba6d7d1c45a 100644
--- a/ui/nvui/src/setting.ts
+++ b/ui/nvui/src/setting.ts
@@ -19,9 +19,9 @@ interface Opts<A> {
 export function makeSetting<A>(opts: Opts<A>): Setting<A> {
   return {
     choices: opts.choices,
-    get: () => cast<A>(opts.storage.get()) || opts.default,
+    get: () => (opts.storage.get() as A) || opts.default,
     set(v: A) {
-      opts.storage.set(cast<string>(v));
+      opts.storage.set(v);
       return v;
     },
   };
@@ -35,7 +35,7 @@ export function renderSetting<A>(setting: Setting<A>, redraw: () => void): VNode
       hook: {
         insert(vnode) {
           (vnode.elm as HTMLSelectElement).addEventListener('change', e => {
-            setting.set(cast<A>((e.target as HTMLSelectElement).value));
+            setting.set((e.target as HTMLSelectElement).value as A);
             redraw();
           });
         },
@@ -47,7 +47,3 @@ export function renderSetting<A>(setting: Setting<A>, redraw: () => void): VNode
     }),
   );
 }
-
-function cast<T>(v: any): T {
-  return v;
-}
diff --git a/ui/puzzle/src/plugins/puzzle.nvui.ts b/ui/puzzle/src/plugins/puzzle.nvui.ts
index 0afcb870e991e..1bd8c4e4b067a 100644
--- a/ui/puzzle/src/plugins/puzzle.nvui.ts
+++ b/ui/puzzle/src/plugins/puzzle.nvui.ts
@@ -19,18 +19,19 @@ import {
   renderPieces,
   renderSan,
   selectionHandler,
-  Style,
   styleSetting,
+  type MoveStyle,
 } from 'nvui/chess';
 import { makeConfig } from '../view/chessground';
 import { renderSetting } from 'nvui/setting';
 import { Notify } from 'nvui/notify';
-import { commands } from 'nvui/command';
+import { commands, boardCommands } from 'nvui/command';
 import { next as controlNext } from '../control';
 import { bind, onInsert } from 'common/snabbdom';
 import { throttle } from 'common/timing';
 import type PuzzleCtrl from '../ctrl';
 import { Chessground as makeChessground } from 'chessground';
+import { opposite } from 'chessops';
 
 const throttled = (sound: string) => throttle(100, () => site.sound.play(sound));
 const selectSound = throttled('select');
@@ -62,11 +63,10 @@ export function initModule() {
           ctrl.streak ? '.puzzle--streak' : ''
         }`,
         h('div.nvui', [
-          h('h1', `Puzzle: ${ctrl.pov} to play.`),
           h('h2', 'Puzzle info'),
           puzzleBox(ctrl),
           theme(ctrl),
-          !ctrl.streak ? userBox(ctrl) : null,
+          !ctrl.streak && userBox(ctrl),
           h('h2', 'Moves'),
           h(
             'p.moves',
@@ -81,8 +81,8 @@ export function initModule() {
             { attrs: { role: 'status', 'aria-live': 'polite', 'aria-atomic': 'true' } },
             renderStatus(ctrl),
           ),
-          h('div.replay', renderReplay(ctrl)),
-          ...(ctrl.streak ? renderStreak(ctrl) : []),
+          ctrl.data.replay && h('div.replay', renderReplay(ctrl)),
+          ctrl.streak && renderStreak(ctrl),
           h('h2', 'Last move'),
           h(
             'p.lastMove',
@@ -96,13 +96,15 @@ export function initModule() {
               hook: onInsert(el => {
                 const $form = $(el),
                   $input = $form.find('.move').val('');
-                $input[0]!.focus();
+                $input[0]?.focus();
                 $form.on('submit', onSubmit(ctrl, notify.set, moveStyle.get, $input, ground));
               }),
             },
             [
               h('label', [
-                ctrl.mode === 'view' ? 'Command input' : `Find the best move for ${ctrl.pov}.`,
+                ctrl.mode === 'view'
+                  ? 'Command input'
+                  : `${i18n.puzzle[ctrl.pov === 'white' ? 'findTheBestMoveForWhite' : 'findTheBestMoveForBlack']}`,
                 h('input.move.mousetrap', {
                   attrs: { name: 'move', type: 'text', autocomplete: 'off', autofocus: true },
                 }),
@@ -119,10 +121,9 @@ export function initModule() {
               hook: onInsert(el => {
                 const $board = $(el);
                 const $buttons = $board.find('button');
-                const steps = () => ctrl.tree.getNodeList(ctrl.path);
-                const uciSteps = () => steps().filter(hasUci);
-                const fenSteps = () => steps().map(step => step.fen);
-                const opponentColor = ctrl.pov === 'white' ? 'black' : 'white';
+                const steps = ctrl.tree.getNodeList(ctrl.path);
+                const fenSteps = () => steps.map(step => step.fen);
+                const opponentColor = opposite(ctrl.pov);
                 $board.on(
                   'click',
                   selectionHandler(() => opponentColor, selectSound),
@@ -142,7 +143,7 @@ export function initModule() {
                     () => ground.state.pieces,
                     'standard',
                     () => ground.state.movable.dests,
-                    uciSteps,
+                    () => steps,
                   ),
                 );
                 $buttons.on('keypress', positionJumpHandler());
@@ -169,17 +170,17 @@ export function initModule() {
           ...(!ctrl.data.replay && !ctrl.streak
             ? [h('h3', 'Puzzle Settings'), renderDifficultyForm(ctrl)]
             : []),
-          h('h2', 'Keyboard shortcuts'),
+          h('h2', i18n.site.keyboardShortcuts),
           h('p', [
-            'Left and right arrow keys or k and j: Navigate to the previous or next move.',
+            `Left and right arrow keys: ${i18n.site.keyMoveBackwardOrForward}`,
             h('br'),
-            'Up and down arrow keys, or 0 and $, or home and end: Jump to the first or last move.',
+            `Up and down arrow keys, or 0 and $, or home and end: ${i18n.site.keyGoToStartOrEnd}`,
           ]),
           h('h2', 'Commands'),
           h('p', [
             'Type these commands in the move input.',
             h('br'),
-            'v: View the solution.',
+            `v: ${i18n.site.viewTheSolution}`,
             h('br'),
             'l: Read last move.',
             h('br'),
@@ -188,31 +189,7 @@ export function initModule() {
             commands.scan.help,
             h('br'),
           ]),
-          h('h2', 'Board mode commands'),
-          h('p', [
-            'Use these commands when focused on the board itself.',
-            h('br'),
-            'o: announce current position.',
-            h('br'),
-            "c: announce last move's captured piece.",
-            h('br'),
-            'l: announce last move.',
-            h('br'),
-            't: announce clocks.',
-            h('br'),
-            'm: announce possible moves for the selected piece.',
-            h('br'),
-            'shift+m: announce possible moves for the selected pieces which capture..',
-            h('br'),
-            'arrow keys: move left, right, up or down.',
-            h('br'),
-            'kqrbnp/KQRBNP: move forward/backward to a piece.',
-            h('br'),
-            '1-8: move to rank 1-8.',
-            h('br'),
-            'Shift+1-8: move to file a-h.',
-            h('br'),
-          ]),
+          ...boardCommands(),
           h('h2', 'Promotion'),
           h('p', [
             'Standard PGN notation selects the piece to promote to. Example: a8=n promotes to a knight.',
@@ -225,29 +202,23 @@ export function initModule() {
   };
 }
 
-interface StepWithUci extends Tree.Node {
-  uci: Uci;
-}
-
-function hasUci(step: Tree.Node): step is StepWithUci {
-  return step.uci !== undefined;
-}
-
-function lastMove(ctrl: PuzzleCtrl, style: Style): string {
+function lastMove(ctrl: PuzzleCtrl, style: MoveStyle): string {
   const node = ctrl.node;
-  if (node.ply === 0) return 'Initial position';
-  // make sure consecutive moves are different so that they get re-read
-  return renderSan(node.san || '', node.uci, style) + (node.ply % 2 === 0 ? '' : ' ');
+  return node.ply === 0
+    ? 'Initial position'
+    : // make sure consecutive moves are different so that they get re-read
+      renderSan(node.san || '', node.uci, style) + (node.ply % 2 === 0 ? '' : ' ');
 }
 
 function onSubmit(
   ctrl: PuzzleCtrl,
   notify: (txt: string) => void,
-  style: () => Style,
+  style: () => MoveStyle,
   $input: Cash,
   ground: CgApi,
-): () => false {
-  return () => {
+): (ev: SubmitEvent) => void {
+  return (ev: SubmitEvent) => {
+    ev.preventDefault();
     let input = castlingFlavours(($input.val() as string).trim());
     if (isShortCommand(input)) input = '/' + input;
     if (input[0] === '/') onCommand(ctrl, notify, input.slice(1), style());
@@ -255,41 +226,27 @@ function onSubmit(
       const uci = inputToLegalUci(input, ctrl.node.fen, ground);
       if (uci) {
         ctrl.playUci(uci);
-        switch (ctrl.lastFeedback) {
-          case 'fail':
-            notify(i18n.puzzle.notTheMove);
-            break;
-          case 'good':
-            notify(i18n.puzzle.bestMove);
-            break;
-          case 'win':
-            notify(i18n.puzzle.puzzleSuccess);
-        }
-      } else {
-        notify([`Invalid move: ${input}`, ...browseHint(ctrl)].join('. '));
-      }
+        const fback = ctrl.lastFeedback;
+        if (fback === 'fail') notify(i18n.puzzle.notTheMove);
+        else if (fback === 'good') notify(i18n.puzzle.bestMove);
+        else if (fback === 'win') notify(i18n.puzzle.puzzleSuccess);
+      } else notify([`Invalid move: ${input}`, ...browseHint(ctrl)].join('. '));
     }
     $input.val('');
-    return false;
   };
 }
 
-function isYourMove(ctrl: PuzzleCtrl) {
-  return ctrl.node.children.length === 0 || ctrl.node.children[0].puzzle === 'fail';
-}
+const isYourMove = (ctrl: PuzzleCtrl): boolean =>
+  ctrl.node.children.length === 0 || ctrl.node.children[0].puzzle === 'fail';
 
-function browseHint(ctrl: PuzzleCtrl): string[] {
-  if (ctrl.mode !== 'view' && !isYourMove(ctrl)) return ['You browsed away from the latest position.'];
-  else return [];
-}
+const browseHint = (ctrl: PuzzleCtrl): string[] =>
+  ctrl.mode !== 'view' && !isYourMove(ctrl) ? [i18n.site.youBrowsedAway] : [];
 
 const shortCommands = ['l', 'last', 'p', 's', 'v'];
 
-function isShortCommand(input: string): boolean {
-  return shortCommands.includes(input.split(' ')[0].toLowerCase());
-}
+const isShortCommand = (input: string): boolean => shortCommands.includes(input.split(' ')[0].toLowerCase());
 
-function onCommand(ctrl: PuzzleCtrl, notify: (txt: string) => void, c: string, style: Style): void {
+function onCommand(ctrl: PuzzleCtrl, notify: (txt: string) => void, c: string, style: MoveStyle): void {
   const lowered = c.toLowerCase();
   const pieces = ctrl.ground().state.pieces;
   if (lowered === 'l' || lowered === 'last') notify($('.lastMove').text());
@@ -310,35 +267,27 @@ function viewOrAdvanceSolution(ctrl: PuzzleCtrl, notify: (txt: string) => void):
     if (isInSolution(next) || (isInSolution(node) && isInSolution(nextNext))) {
       controlNext(ctrl);
       ctrl.redraw();
-    } else if (isInSolution(node)) {
-      notify('Puzzle complete!');
-    } else {
-      ctrl.viewSolution();
-    }
-  } else {
-    ctrl.viewSolution();
-  }
+    } else if (isInSolution(node)) notify(i18n.puzzle.puzzleComplete);
+    else ctrl.viewSolution();
+  } else ctrl.viewSolution();
 }
 
-function isInSolution(node?: Tree.Node): boolean {
-  return !!node && (node.puzzle === 'good' || node.puzzle === 'win');
-}
+const isInSolution = (node?: Tree.Node): boolean =>
+  !!node && (node.puzzle === 'good' || node.puzzle === 'win');
 
-function nextNode(node?: Tree.Node): Tree.Node | undefined {
-  if (node?.children?.length) return node.children[0];
-  else return;
-}
+const nextNode = (node?: Tree.Node): Tree.Node | undefined =>
+  node?.children?.length ? node.children[0] : undefined;
 
-function renderStreak(ctrl: PuzzleCtrl): VNode[] {
-  if (!ctrl.streak) return [];
-  return [h('h2', 'Puzzle streak'), h('p', ctrl.streak.data.index || i18n.puzzle.streakDescription)];
-}
+const renderStreak = (ctrl: PuzzleCtrl): VNode[] =>
+  !ctrl.streak
+    ? []
+    : [h('h2', 'Puzzle streak'), h('p', ctrl.streak.data.index || i18n.puzzle.streakDescription)];
 
 function renderStatus(ctrl: PuzzleCtrl): string {
   if (ctrl.mode !== 'view') return 'Solving';
-  else if (ctrl.streak) return `GAME OVER. Your streak: ${ctrl.streak.data.index}`;
-  else if (ctrl.lastFeedback === 'win') return 'Puzzle solved!';
-  else return 'Puzzle complete.';
+  else if (ctrl.streak) return `GAME OVER. ${i18n.puzzle.yourStreakX(ctrl.streak.data.index)}`;
+  else if (ctrl.lastFeedback === 'win') return i18n.puzzle.puzzleSuccess;
+  else return i18n.puzzle.puzzleComplete;
 }
 
 function renderReplay(ctrl: PuzzleCtrl): string {
@@ -349,44 +298,36 @@ function renderReplay(ctrl: PuzzleCtrl): string {
   return `Replaying ${text} puzzles: ${i} of ${replay.of}`;
 }
 
-function playActions(ctrl: PuzzleCtrl): VNode {
-  if (ctrl.streak)
-    return button(i18n.storm.skip, ctrl.skip, i18n.puzzle.streakSkipExplanation, !ctrl.streak.data.skip);
-  else return h('div.actions_play', button('View the solution', ctrl.viewSolution));
-}
+const playActions = (ctrl: PuzzleCtrl): VNode =>
+  ctrl.streak
+    ? button(i18n.storm.skip, ctrl.skip, i18n.puzzle.streakSkipExplanation, !ctrl.streak.data.skip)
+    : h('div.actions_play', button(i18n.site.viewTheSolution, ctrl.viewSolution));
 
-function afterActions(ctrl: PuzzleCtrl): VNode {
-  const win = ctrl.lastFeedback === 'win';
-  return h(
+const afterActions = (ctrl: PuzzleCtrl): VNode =>
+  h(
     'div.actions_after',
-    ctrl.streak && !win
-      ? anchor(i18n.puzzle.newStreak, '/streak')
-      : [...renderVote(ctrl), button('Continue training', ctrl.nextPuzzle)],
+    ctrl.streak && ctrl.lastFeedback === 'win'
+      ? h('a', { attrs: { href: '/streak' } }, i18n.puzzle.newStreak)
+      : [...renderVote(ctrl), button(i18n.puzzle.continueTraining, ctrl.nextPuzzle)],
   );
-}
 
 const renderVoteTutorial = (ctrl: PuzzleCtrl): VNode[] =>
   ctrl.session.isNew() && ctrl.data.user?.provisional
     ? [h('p', i18n.puzzle.didYouLikeThisPuzzle), h('p', i18n.puzzle.voteToLoadNextOne)]
     : [];
 
-function renderVote(ctrl: PuzzleCtrl): VNode[] {
-  if (!ctrl.data.user || ctrl.autoNexting()) return [];
-  return [
-    ...renderVoteTutorial(ctrl),
-    button('Thumbs up', () => ctrl.vote(true), undefined, ctrl.voteDisabled),
-    button('Thumbs down', () => ctrl.vote(false), undefined, ctrl.voteDisabled),
-  ];
-}
+const renderVote = (ctrl: PuzzleCtrl): VNode[] =>
+  !ctrl.data.user || ctrl.autoNexting()
+    ? []
+    : [
+        ...renderVoteTutorial(ctrl),
+        button(i18n.puzzle.upVote, () => ctrl.vote(true), undefined, ctrl.voteDisabled),
+        button(i18n.puzzle.downVote, () => ctrl.vote(false), undefined, ctrl.voteDisabled),
+      ];
 
-function anchor(text: string, href: string): VNode {
-  return h('a', { attrs: { href } }, text);
-}
-
-function button(text: string, action: (e: Event) => void, title?: string, disabled?: boolean): VNode {
-  return h(
+const button = (text: string, action: (e: Event) => void, title?: string, disabled?: boolean): VNode =>
+  h(
     'button',
     { hook: bind('click', action), attrs: { ...(title ? { title } : {}), disabled: !!disabled } },
     text,
   );
-}
diff --git a/ui/round/src/plugins/round.nvui.ts b/ui/round/src/plugins/round.nvui.ts
index 9507130f05251..5bda519f21584 100644
--- a/ui/round/src/plugins/round.nvui.ts
+++ b/ui/round/src/plugins/round.nvui.ts
@@ -9,7 +9,7 @@ import { plyStep } from '../util';
 import type { Step, Position, NvuiPlugin } from '../interfaces';
 import { type Player, playable } from 'game';
 import {
-  type Style,
+  type MoveStyle,
   renderSan,
   renderPieces,
   renderBoard,
@@ -31,9 +31,10 @@ import {
 } from 'nvui/chess';
 import { renderSetting } from 'nvui/setting';
 import { Notify } from 'nvui/notify';
-import { commands } from 'nvui/command';
+import { commands, boardCommands } from 'nvui/command';
 import { Chessground as makeChessground } from 'chessground';
 import { pubsub } from 'common/pubsub';
+import { plyToTurn } from 'chess';
 
 const selectSound = () => site.sound.play('select');
 const borderSound = () => site.sound.play('outOfBound');
@@ -87,7 +88,7 @@ export function initModule(): NvuiPlugin {
         ...['white', 'black'].map((color: Color) =>
           h('p', [color + ' player: ', playerHtml(ctrl, ctrl.playerByColor(color))]),
         ),
-        h('p', `${d.game.rated ? 'Rated' : 'Casual'} ${d.game.perf}`),
+        h('p', `${d.game.rated ? i18n.site.rated : i18n.site.casual} ${d.game.perf}`),
         d.clock ? h('p', `Clock: ${d.clock.initial / 60} + ${d.clock.increment}`) : null,
         h('h2', 'Moves'),
         h('p.moves', { attrs: { role: 'log', 'aria-live': 'off' } }, renderMoves(d.steps.slice(1), style)),
@@ -95,7 +96,7 @@ export function initModule(): NvuiPlugin {
         h('div.pieces', renderPieces(ctrl.chessground.state.pieces, style)),
         h('h2', 'Game status'),
         h('div.status', { attrs: { role: 'status', 'aria-live': 'assertive', 'aria-atomic': 'true' } }, [
-          ctrl.data.game.status.name === 'started' ? 'Playing' : renderResult(ctrl),
+          ctrl.data.game.status.name === 'started' ? i18n.site.playingRightNow : renderResult(ctrl),
         ]),
         h('h2', 'Last move'),
         h(
@@ -114,12 +115,15 @@ export function initModule(): NvuiPlugin {
                   $input = $form.find('.move').val('');
                 $input[0]!.focus();
                 nvui.submitMove = createSubmitHandler(ctrl, notify.set, moveStyle.get, $input);
-                $form.on('submit', () => nvui.submitMove?.());
+                $form.on('submit', (ev: SubmitEvent) => {
+                  ev.preventDefault();
+                  nvui.submitMove?.();
+                });
               }),
             },
             [
               h('label', [
-                d.player.color === d.game.player ? 'Your move' : 'Waiting',
+                d.player.color === d.game.player ? i18n.site.yourTurn : i18n.site.waiting,
                 h('input.move.mousetrap', {
                   attrs: {
                     name: 'move',
@@ -145,13 +149,12 @@ export function initModule(): NvuiPlugin {
           : playable(ctrl.data)
             ? renderTablePlay(ctrl)
             : renderTableEnd(ctrl)),
-        h('h2', 'Board'),
+        h('h2', i18n.site.board),
         h(
           'div.board',
           {
             hook: onInsert(el => {
               const $board = $(el);
-              $board.on('keypress', () => console.log(ctrl));
               // NOTE: This is the only line different from analysis board listener setup
               const $buttons = $board.find('button');
               $buttons.on(
@@ -186,7 +189,7 @@ export function initModule(): NvuiPlugin {
           },
           renderBoard(
             ctrl.chessground.state.pieces,
-            ctrl.data.player.color,
+            ctrl.data.game.variant.key === 'racingKings' ? 'white' : ctrl.data.player.color,
             pieceStyle.get(),
             prefixStyle.get(),
             positionStyle.get(),
@@ -194,7 +197,6 @@ export function initModule(): NvuiPlugin {
           ),
         ),
         h('div.boardstatus', { attrs: { 'aria-live': 'polite', 'aria-atomic': 'true' } }, ''),
-        // h('p', takes(ctrl.data.steps.map(data => data.fen))),
         h('h2', 'Settings'),
         h('label', ['Move notation', renderSetting(moveStyle, ctrl.redraw)]),
         h('h3', 'Board settings'),
@@ -202,54 +204,30 @@ export function initModule(): NvuiPlugin {
         h('label', ['Piece prefix style', renderSetting(prefixStyle, ctrl.redraw)]),
         h('label', ['Show position', renderSetting(positionStyle, ctrl.redraw)]),
         h('label', ['Board layout', renderSetting(boardStyle, ctrl.redraw)]),
-        h('h2', 'Commands'),
+        h('h2', `${i18n.keyboardMove.keyboardInputCommands}`),
         h('p', [
           'Type these commands in the move input.',
           h('br'),
-          'c: Read clocks.',
+          `c: ${i18n.keyboardMove.readOutClocks}`,
           h('br'),
           'l: Read last move.',
           h('br'),
-          'o: Read name and rating of the opponent.',
+          `o: ${i18n.keyboardMove.readOutOpponentName}`,
           h('br'),
           commands.piece.help,
           h('br'),
           commands.scan.help,
           h('br'),
-          'abort: Abort game.',
+          `abort: ${i18n.site.abortGame}`,
           h('br'),
-          'resign: Resign game.',
+          `resign: ${i18n.site.resign}`,
           h('br'),
-          'draw: Offer or accept draw.',
+          `draw: ${i18n.keyboardMove.offerOrAcceptDraw}`,
           h('br'),
-          'takeback: Offer or accept take back.',
-          h('br'),
-        ]),
-        h('h2', 'Board mode commands'),
-        h('p', [
-          'Use these commands when focused on the board itself.',
-          h('br'),
-          'o: announce current position.',
-          h('br'),
-          "c: announce last move's captured piece.",
-          h('br'),
-          'l: announce last move.',
-          h('br'),
-          't: announce clocks.',
-          h('br'),
-          'm: announce possible moves for the selected piece.',
-          h('br'),
-          'shift+m: announce possible moves for the selected pieces which capture..',
-          h('br'),
-          'arrow keys: move left, right, up or down.',
-          h('br'),
-          'kqrbnp/KQRBNP: move forward/backward to a piece.',
-          h('br'),
-          '1-8: move to rank 1-8.',
-          h('br'),
-          'Shift+1-8: move to file a-h.',
+          `takeback: ${i18n.site.proposeATakeback}`,
           h('br'),
         ]),
+        ...boardCommands(),
         h('h2', 'Promotion'),
         h('p', [
           'Standard PGN notation selects the piece to promote to. Example: a8=n promotes to a knight.',
@@ -264,41 +242,39 @@ export function initModule(): NvuiPlugin {
 function createSubmitHandler(
   ctrl: RoundController,
   notify: (txt: string) => void,
-  style: () => Style,
+  style: () => MoveStyle,
   $input: Cash,
 ) {
   return (submitStoredPremove = false) => {
     const nvui = ctrl.nvui!;
 
-    if (submitStoredPremove && nvui.premoveInput === '') return false;
+    if (submitStoredPremove && nvui.premoveInput === '') return;
     if (!submitStoredPremove && $input.val() === '') {
       if (nvui.premoveInput !== '') {
         // if this is not a premove submission, the input is empty, and we have a stored premove, clear it
         nvui.premoveInput = '';
         notify('Cleared premove');
       } else notify('Invalid move');
-      return false;
     }
 
     let input = submitStoredPremove ? nvui.premoveInput : castlingFlavours(($input.val() as string).trim());
+    if (!input) return;
 
     // commands may be submitted with or without a leading /
     if (isShortCommand(input)) input = '/' + input;
     if (input[0] === '/') {
       onCommand(ctrl, notify, input.slice(1), style());
       $input.val('');
-      return false;
+    } else {
+      const uci = inputToLegalUci(input, plyStep(ctrl.data, ctrl.ply).fen, ctrl.chessground);
+      if (uci) ctrl.socket.send('move', { u: uci }, { ackable: true });
+      else if (ctrl.data.player.color !== ctrl.data.game.player) {
+        // if it is not the user's turn, store this input as a premove
+        nvui.premoveInput = input;
+        notify(`Will attempt to premove: ${input}. Enter to cancel`);
+      } else notify(`Invalid move: ${input}`);
+      $input.val('');
     }
-
-    const uci = inputToLegalUci(input, plyStep(ctrl.data, ctrl.ply).fen, ctrl.chessground);
-    if (uci) ctrl.socket.send('move', { u: uci }, { ackable: true });
-    else if (ctrl.data.player.color !== ctrl.data.game.player) {
-      // if it is not the user's turn, store this input as a premove
-      nvui.premoveInput = input;
-      notify(`Will attempt to premove: ${input}. Enter to cancel`);
-    } else notify(`Invalid move: ${input}`);
-    $input.val('');
-    return false;
   };
 }
 
@@ -321,7 +297,7 @@ function isShortCommand(input: string): boolean {
   return shortCommands.includes(input.split(' ')[0].toLowerCase());
 }
 
-function onCommand(ctrl: RoundController, notify: (txt: string) => void, c: string, style: Style) {
+function onCommand(ctrl: RoundController, notify: (txt: string) => void, c: string, style: MoveStyle) {
   const lowered = c.toLowerCase();
   if (lowered === 'c' || lowered === 'clock')
     notify($('.nvui .botc').text() + ', ' + $('.nvui .topc').text());
@@ -346,29 +322,22 @@ function anyClock(ctrl: RoundController, position: Position) {
     player = ctrl.playerAt(position);
   return (
     (ctrl.clock && renderClock(ctrl, player, position)) ||
-    (d.correspondence && renderCorresClock(ctrl.corresClock!, player.color, position, d.game.player)) ||
-    undefined
+    (d.correspondence && renderCorresClock(ctrl.corresClock!, player.color, position, d.game.player))
   );
 }
 
-function renderMoves(steps: Step[], style: Style) {
-  const res: Array<string | VNode> = [];
-  steps.forEach(s => {
-    let str = '';
-    if (s.ply & 1) str += Math.ceil(s.ply / 2) + ' ';
-    str += renderSan(s.san, s.uci, style) + ', ';
-    res.push(str);
-    if (s.ply % 2 === 0) res.push(h('br'));
-  });
-  return res;
-}
+const renderMoves = (steps: Step[], style: MoveStyle) =>
+  steps.reduce<(string | VNode)[]>((res, s) => {
+    const turn = s.ply & 1 ? `${plyToTurn(s.ply)}` : '';
+    const san = `${renderSan(s.san, s.uci, style)}, `;
+    return res.concat(`${turn} ${san}`).concat(s.ply % 2 === 0 ? h('br') : []);
+  }, []);
 
 function playerHtml(ctrl: RoundController, player: Player) {
   if (player.ai) return i18n.site.aiNameLevelAiLevel('Stockfish', player.ai);
-  const d = ctrl.data,
+  const perf = ctrl.data.game.perf,
     user = player.user,
-    perf = user ? user.perfs[d.game.perf] : null,
-    rating = player.rating ? player.rating : perf && perf.rating,
+    rating = user?.perfs[perf]?.rating,
     rd = player.ratingDiff,
     ratingDiff = rd ? (rd > 0 ? '+' + rd : rd < 0 ? '−' + -rd : '') : '';
   return user
@@ -386,12 +355,9 @@ function playerHtml(ctrl: RoundController, player: Player) {
 
 function playerText(ctrl: RoundController, player: Player) {
   if (player.ai) return i18n.site.aiNameLevelAiLevel('Stockfish', player.ai);
-  const d = ctrl.data,
-    user = player.user,
-    perf = user ? user.perfs[d.game.perf] : null,
-    rating = player.rating ? player.rating : perf && perf.rating;
-  if (!user) return 'Anonymous';
-  return `${user.title || ''} ${user.username} rated ${rating || 'unknown'}`;
+  const user = player.user,
+    rating = player?.rating ?? user?.perfs[ctrl.data.game.perf]?.rating ?? 'unknown';
+  return !user ? 'Anonymous' : `${user.title || ''} ${user.username} rated ${rating}`;
 }
 
 function gameText(ctrl: RoundController) {
@@ -399,13 +365,14 @@ function gameText(ctrl: RoundController) {
   return [
     d.game.status.name === 'started'
       ? ctrl.isPlaying()
-        ? 'You play the ' + ctrl.data.player.color + ' pieces.'
+        ? ctrl.data.player.color === 'white'
+          ? i18n.site.youPlayTheWhitePieces
+          : i18n.site.youPlayTheBlackPieces
         : 'Spectating.'
-      : 'Game over.',
-    d.game.rated ? 'Rated' : 'Casual',
+      : i18n.site.gameOver,
+    d.game.rated ? i18n.site.rated : i18n.site.casual,
     d.clock ? `${d.clock.initial / 60} + ${d.clock.increment}` : '',
     d.game.perf,
-    'game versus',
-    playerText(ctrl, ctrl.data.opponent),
+    i18n.site.gameVsX(playerText(ctrl, ctrl.data.opponent)),
   ].join(' ');
 }