Upgrade lit v1 to v3.

Lit-Element v3 works better with other UI components like go/md3.

This CL is unfortunately large but most of them are renaming from lit-html to lit/html in BUILD and import. There are three noticeable changes.

1. The eventContext in the RenderOptions is renamed to host, see the example in:
  * infra-sk/modules/ElementSk/ElementSk.ts
2. Type changes, see examples in:
  * am/modules/am.ts
  * debugger-app/modules/commands-sk/commands-sk.ts
3. Additional comments nodes appended automatically, see the example in:
  * perf/modules/regressions-page-sk/regressions-page-sk_test.ts

For the Gold screenshots. They looks good and I also compared them locally with the v1. Note:

1. The theme-chooser-sk didn't get updated in Gold, so even they are significantly different, but the diffs were introduced long before;
2. In the gold_query-dialog-sk_multiple-values-selected, the screenshots were not taken correctly, it needs to wait for all the elements to settle. The test util, like open-wc.org, has good tools to facilitate and we can look into that later.

Bug: b/361365957
Change-Id: I091c919479d3067d5100397af691f4f24b333ab7
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/895021
Reviewed-by: Jeff Yoon <jeffyoon@google.com>
Commit-Queue: Hao Wu <haowoo@google.com>
Reviewed-by: Kaylee Lubick <kjlubick@google.com>
diff --git a/am/modules/BUILD.bazel b/am/modules/BUILD.bazel
index 91ced51..a7fe06f 100644
--- a/am/modules/BUILD.bazel
+++ b/am/modules/BUILD.bazel
@@ -17,7 +17,7 @@
     srcs = ["am.ts"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//am/modules/json:index_ts_lib",
         "//infra-sk/modules:human_ts_lib",
     ],
diff --git a/am/modules/alert-manager-sk/BUILD.bazel b/am/modules/alert-manager-sk/BUILD.bazel
index 977b375..4e13e90 100644
--- a/am/modules/alert-manager-sk/BUILD.bazel
+++ b/am/modules/alert-manager-sk/BUILD.bazel
@@ -37,7 +37,7 @@
         "//infra-sk/modules:human_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "alert-manager-sk.ts",
diff --git a/am/modules/alert-manager-sk/alert-manager-sk.ts b/am/modules/alert-manager-sk/alert-manager-sk.ts
index 4404d6b..eb8445a 100644
--- a/am/modules/alert-manager-sk/alert-manager-sk.ts
+++ b/am/modules/alert-manager-sk/alert-manager-sk.ts
@@ -5,7 +5,7 @@
  *   The main application element for am.skia.org.
  *
  */
-import { html, render, TemplateResult } from 'lit-html';
+import { html, render, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/checkbox-sk';
 import '../../../elements-sk/modules/error-toast-sk';
@@ -1555,7 +1555,7 @@
 
   private _render(): void {
     this.rationalize();
-    render(AlertManagerSk.template(this), this, { eventContext: this });
+    render(AlertManagerSk.template(this), this, { host: this });
     // Update the icon.
     const isInfraGardener = this.user === this.infra_gardener;
     const numActive = this.incidents.reduce(
diff --git a/am/modules/am.ts b/am/modules/am.ts
index 8e288c1..1f0fcdd 100644
--- a/am/modules/am.ts
+++ b/am/modules/am.ts
@@ -1,6 +1,7 @@
 // Functions used by more than one element.
-import { unsafeHTML } from 'lit-html/directives/unsafe-html';
-import { TemplateResult, html, Part } from 'lit-html';
+import { unsafeHTML, UnsafeHTMLDirective } from 'lit/directives/unsafe-html.js';
+import { DirectiveResult } from 'lit/directive.js';
+import { TemplateResult, html } from 'lit/html.js';
 import { diffDate } from '../../infra-sk/modules/human';
 import { Note, ParamSet } from './json';
 
@@ -49,7 +50,9 @@
  * Convert all URLs in a string into links in a lit-html TemplateResult.
  */
 // eslint-disable-next-line @typescript-eslint/type-annotation-spacing
-export function linkify(s: string): (part: Part) => void {
+export function linkify(
+  s: string
+): DirectiveResult<typeof UnsafeHTMLDirective> {
   return unsafeHTML(
     s.replace(linkRe, '<a href="$&" rel=noopener target=_blank>$&</a>')
   );
diff --git a/am/modules/auto-assign-sk/BUILD.bazel b/am/modules/auto-assign-sk/BUILD.bazel
index d1e0bd6..69bcd79 100644
--- a/am/modules/auto-assign-sk/BUILD.bazel
+++ b/am/modules/auto-assign-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "auto-assign-sk.ts",
diff --git a/am/modules/auto-assign-sk/auto-assign-sk.ts b/am/modules/auto-assign-sk/auto-assign-sk.ts
index 3b23123..52d2d4b 100644
--- a/am/modules/auto-assign-sk/auto-assign-sk.ts
+++ b/am/modules/auto-assign-sk/auto-assign-sk.ts
@@ -9,7 +9,7 @@
  * </p>
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/am/modules/bot-chooser-sk/BUILD.bazel b/am/modules/bot-chooser-sk/BUILD.bazel
index adcbeb5..265b221 100644
--- a/am/modules/bot-chooser-sk/BUILD.bazel
+++ b/am/modules/bot-chooser-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//am/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "bot-chooser-sk.ts",
diff --git a/am/modules/bot-chooser-sk/bot-chooser-sk.ts b/am/modules/bot-chooser-sk/bot-chooser-sk.ts
index 80d8bf0..0c24e72 100644
--- a/am/modules/bot-chooser-sk/bot-chooser-sk.ts
+++ b/am/modules/bot-chooser-sk/bot-chooser-sk.ts
@@ -9,7 +9,7 @@
  * </p>
  *
  */
-import { html, render, TemplateResult } from 'lit-html';
+import { html, render, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 
@@ -126,7 +126,7 @@
   }
 
   private _render(): void {
-    render(BotChooserSk.template(this), this, { eventContext: this });
+    render(BotChooserSk.template(this), this, { host: this });
   }
 }
 
diff --git a/am/modules/email-chooser-sk/BUILD.bazel b/am/modules/email-chooser-sk/BUILD.bazel
index 7e8b1e5..af009bf 100644
--- a/am/modules/email-chooser-sk/BUILD.bazel
+++ b/am/modules/email-chooser-sk/BUILD.bazel
@@ -16,7 +16,7 @@
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "email-chooser-sk.ts",
diff --git a/am/modules/email-chooser-sk/email-chooser-sk.ts b/am/modules/email-chooser-sk/email-chooser-sk.ts
index d9a4819..e4c966e 100644
--- a/am/modules/email-chooser-sk/email-chooser-sk.ts
+++ b/am/modules/email-chooser-sk/email-chooser-sk.ts
@@ -9,7 +9,7 @@
  * </p>
  *
  */
-import { html, render, TemplateResult } from 'lit-html';
+import { html, render, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 
@@ -90,7 +90,7 @@
   }
 
   private _render(): void {
-    render(EmailChooserSk.template(this), this, { eventContext: this });
+    render(EmailChooserSk.template(this), this, { host: this });
   }
 }
 
diff --git a/am/modules/incident-sk/BUILD.bazel b/am/modules/incident-sk/BUILD.bazel
index 599ebfe..412e1e1 100644
--- a/am/modules/incident-sk/BUILD.bazel
+++ b/am/modules/incident-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:human_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "incident-sk.ts",
diff --git a/am/modules/incident-sk/incident-sk.ts b/am/modules/incident-sk/incident-sk.ts
index a236439..a10c968 100644
--- a/am/modules/incident-sk/incident-sk.ts
+++ b/am/modules/incident-sk/incident-sk.ts
@@ -51,8 +51,8 @@
  *   </pre>
  *
  */
-import { html, render, TemplateResult } from 'lit-html';
-import { until } from 'lit-html/directives/until';
+import { html, render, TemplateResult } from 'lit/html.js';
+import { until } from 'lit/directives/until.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/icons/alarm-off-icon-sk';
 import '../../../elements-sk/modules/icons/delete-icon-sk';
@@ -413,7 +413,7 @@
     if (!this.state) {
       return;
     }
-    render(IncidentSk.template(this), this, { eventContext: this });
+    render(IncidentSk.template(this), this, { host: this });
   }
 }
 
diff --git a/am/modules/silence-sk/BUILD.bazel b/am/modules/silence-sk/BUILD.bazel
index 39880cf..d1267ad 100644
--- a/am/modules/silence-sk/BUILD.bazel
+++ b/am/modules/silence-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/am/modules/silence-sk/silence-sk.ts b/am/modules/silence-sk/silence-sk.ts
index cd2a208..5140298 100644
--- a/am/modules/silence-sk/silence-sk.ts
+++ b/am/modules/silence-sk/silence-sk.ts
@@ -86,7 +86,7 @@
  *   </pre>
  *
  */
-import { html, render, TemplateResult } from 'lit-html';
+import { html, render, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/icons/add-box-icon-sk';
 import '../../../elements-sk/modules/icons/delete-icon-sk';
@@ -462,7 +462,7 @@
   }
 
   private _render(): void {
-    render(SilenceSk.template(this), this, { eventContext: this });
+    render(SilenceSk.template(this), this, { host: this });
   }
 }
 
diff --git a/autoroll/modules/BUILD.bazel b/autoroll/modules/BUILD.bazel
index 8256d0c..d7215e4 100644
--- a/autoroll/modules/BUILD.bazel
+++ b/autoroll/modules/BUILD.bazel
@@ -11,7 +11,7 @@
     srcs = ["utils.ts"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//autoroll/modules/rpc:index_ts_lib",
         "//infra-sk/modules:human_ts_lib",
     ],
diff --git a/autoroll/modules/arb-config-sk/BUILD.bazel b/autoroll/modules/arb-config-sk/BUILD.bazel
index b6456d9..4b3ad81 100644
--- a/autoroll/modules/arb-config-sk/BUILD.bazel
+++ b/autoroll/modules/arb-config-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "arb-config-sk.ts",
diff --git a/autoroll/modules/arb-config-sk/arb-config-sk.ts b/autoroll/modules/arb-config-sk/arb-config-sk.ts
index d23aa14..3635251 100644
--- a/autoroll/modules/arb-config-sk/arb-config-sk.ts
+++ b/autoroll/modules/arb-config-sk/arb-config-sk.ts
@@ -7,7 +7,7 @@
  * </p>
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 
 import { $$ } from '../../../infra-sk/modules/dom';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/autoroll/modules/arb-mode-history-sk/BUILD.bazel b/autoroll/modules/arb-mode-history-sk/BUILD.bazel
index 1415773..c7f367c 100644
--- a/autoroll/modules/arb-mode-history-sk/BUILD.bazel
+++ b/autoroll/modules/arb-mode-history-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//autoroll/modules/rpc:index_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "arb-mode-history-sk.ts",
diff --git a/autoroll/modules/arb-mode-history-sk/arb-mode-history-sk.ts b/autoroll/modules/arb-mode-history-sk/arb-mode-history-sk.ts
index 8824088..9de9fd3 100644
--- a/autoroll/modules/arb-mode-history-sk/arb-mode-history-sk.ts
+++ b/autoroll/modules/arb-mode-history-sk/arb-mode-history-sk.ts
@@ -7,7 +7,7 @@
  * </p>
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/autoroll/modules/arb-roll-history-sk/BUILD.bazel b/autoroll/modules/arb-roll-history-sk/BUILD.bazel
index ee203f3..dbbd7db 100644
--- a/autoroll/modules/arb-roll-history-sk/BUILD.bazel
+++ b/autoroll/modules/arb-roll-history-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//autoroll/modules/rpc:index_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "arb-roll-history-sk.ts",
diff --git a/autoroll/modules/arb-roll-history-sk/arb-roll-history-sk.ts b/autoroll/modules/arb-roll-history-sk/arb-roll-history-sk.ts
index 85c6ccd..b7b566a 100644
--- a/autoroll/modules/arb-roll-history-sk/arb-roll-history-sk.ts
+++ b/autoroll/modules/arb-roll-history-sk/arb-roll-history-sk.ts
@@ -7,7 +7,7 @@
  * </p>
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/autoroll/modules/arb-scaffold-sk/BUILD.bazel b/autoroll/modules/arb-scaffold-sk/BUILD.bazel
index 3def6e6..5151022 100644
--- a/autoroll/modules/arb-scaffold-sk/BUILD.bazel
+++ b/autoroll/modules/arb-scaffold-sk/BUILD.bazel
@@ -20,7 +20,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "arb-scaffold-sk.ts",
diff --git a/autoroll/modules/arb-scaffold-sk/arb-scaffold-sk.ts b/autoroll/modules/arb-scaffold-sk/arb-scaffold-sk.ts
index c45f663..fe5eba0 100644
--- a/autoroll/modules/arb-scaffold-sk/arb-scaffold-sk.ts
+++ b/autoroll/modules/arb-scaffold-sk/arb-scaffold-sk.ts
@@ -16,7 +16,7 @@
  * @attr {boolean} testing_offline - If we should operate entirely in offline
  *     mode.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { SpinnerSk } from '../../../elements-sk/modules/spinner-sk/spinner-sk';
diff --git a/autoroll/modules/arb-status-sk/BUILD.bazel b/autoroll/modules/arb-status-sk/BUILD.bazel
index 253c909..e7a68c7 100644
--- a/autoroll/modules/arb-status-sk/BUILD.bazel
+++ b/autoroll/modules/arb-status-sk/BUILD.bazel
@@ -26,7 +26,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:human_ts_lib",
         "//infra-sk/modules/json:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "arb-status-sk.ts",
diff --git a/autoroll/modules/arb-status-sk/arb-status-sk.ts b/autoroll/modules/arb-status-sk/arb-status-sk.ts
index 15d05c0..5bce5bb 100644
--- a/autoroll/modules/arb-status-sk/arb-status-sk.ts
+++ b/autoroll/modules/arb-status-sk/arb-status-sk.ts
@@ -7,7 +7,7 @@
  * </p>
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 
 import { $$ } from '../../../infra-sk/modules/dom';
 import { localeTime } from '../../../infra-sk/modules/human';
diff --git a/autoroll/modules/arb-strategy-history-sk/BUILD.bazel b/autoroll/modules/arb-strategy-history-sk/BUILD.bazel
index fb18caf..f0d950f 100644
--- a/autoroll/modules/arb-strategy-history-sk/BUILD.bazel
+++ b/autoroll/modules/arb-strategy-history-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//autoroll/modules/rpc:index_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "arb-strategy-history-sk.ts",
diff --git a/autoroll/modules/arb-strategy-history-sk/arb-strategy-history-sk.ts b/autoroll/modules/arb-strategy-history-sk/arb-strategy-history-sk.ts
index 38aa65d..6b317ea 100644
--- a/autoroll/modules/arb-strategy-history-sk/arb-strategy-history-sk.ts
+++ b/autoroll/modules/arb-strategy-history-sk/arb-strategy-history-sk.ts
@@ -7,7 +7,7 @@
  * </p>
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/autoroll/modules/arb-table-sk/BUILD.bazel b/autoroll/modules/arb-table-sk/BUILD.bazel
index e5dcb9d..8fab63e 100644
--- a/autoroll/modules/arb-table-sk/BUILD.bazel
+++ b/autoroll/modules/arb-table-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:hintable_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "arb-table-sk.ts",
diff --git a/autoroll/modules/arb-table-sk/arb-table-sk.ts b/autoroll/modules/arb-table-sk/arb-table-sk.ts
index 391c40d..ea7c57f 100644
--- a/autoroll/modules/arb-table-sk/arb-table-sk.ts
+++ b/autoroll/modules/arb-table-sk/arb-table-sk.ts
@@ -8,7 +8,7 @@
  */
 
 import '../../../infra-sk/modules/human-date-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { HintableObject } from '../../../infra-sk/modules/hintable';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
 import { define } from '../../../elements-sk/modules/define';
diff --git a/autoroll/modules/utils.ts b/autoroll/modules/utils.ts
index 2ec7e71..749896e 100644
--- a/autoroll/modules/utils.ts
+++ b/autoroll/modules/utils.ts
@@ -1,6 +1,6 @@
 // Utilities for autoroll frontend modules.
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { diffDate } from '../../infra-sk/modules/human';
 import { AutoRollMiniStatus } from './rpc';
 
diff --git a/bazel/gazelle/frontend/extension_test.go b/bazel/gazelle/frontend/extension_test.go
index 35f9be2..4300a80 100644
--- a/bazel/gazelle/frontend/extension_test.go
+++ b/bazel/gazelle/frontend/extension_test.go
@@ -24,7 +24,7 @@
     "@google-web-components/google-chart": "^4.0.2",
     "common-sk": "^3.4.1",
     "elements-sk": "^4.0.0",
-    "lit-html": "~1.1.2"
+    "lit": "~3.0"
   },
   "devDependencies": {
     "@types/puppeteer": "^3.0.0",
@@ -59,7 +59,7 @@
 import '../c';                                // Resolves to c/index.ts.
 import '../c/delta';                          // Resolves to c/delta.ts.
 import '../d_ts_lib/d';                       // Resolves to d_ts_lib/d.ts.
-import 'lit-html';                            // NPM import with built-in TypeScript annotations.
+import 'lit/html.js';                         // NPM import with built-in TypeScript annotations.
 import 'puppeteer';                           // NPM import with a separate @types/puppeteer package.
 import '@google-web-components/google-chart'; // Scoped NPM import.
 import 'net'                                  // Built-in Node.js module.
@@ -77,7 +77,8 @@
 import '../c';                                // Resolves to c/index.ts.
 import '../c/delta';                          // Resolves to c/delta.ts.
 import '../d_ts_lib/d';                       // Resolves to d_ts_lib/d.ts.
-import 'lit-html';                            // NPM import with built-in TypeScript annotations.
+import 'lit/html.js';                         // NPM import with built-in TypeScript annotations.
+import 'lit/html.js';                         // NPM import with built-in TypeScript annotations.
 import 'puppeteer';                           // NPM import with a separate @types/puppeteer package.
 import '@google-web-components/google-chart'; // Scoped NPM import.
 import 'net'                                  // Built-in Node.js module.
@@ -94,7 +95,7 @@
 import '../c';                                // Resolves to c/index.ts.
 import '../c/delta';                          // Resolves to c/delta.ts.
 import '../d_ts_lib/d';                       // Resolves to d_ts_lib/d.ts.
-import 'lit-html';                            // NPM import with built-in TypeScript annotations.
+import 'lit/html.js';                         // NPM import with built-in TypeScript annotations.
 import 'puppeteer';                           // NPM import with a separate @types/puppeteer package.
 import '@google-web-components/google-chart'; // Scoped NPM import.
 import 'net'                                  // Built-in Node.js module.
@@ -143,7 +144,7 @@
 import '../subdirectory/juliett-sk/juliett-sk'; // Resolves to myapp/modules/subdirectory/juliett-sk/juliett-sk.ts.
 import '../../../c';                            // Resolves to c/index.ts.
 import '../../../d_ts_lib/d';                   // Resolves to d_ts_lib/d.ts.
-import 'lit-html';                              // NPM import with built-in TypeScript annotations.
+import 'lit/html.js';                           // NPM import with built-in TypeScript annotations.
 import 'puppeteer';                             // NPM import with a separate @types/puppeteer package.
 import '@google-web-components/google-chart';   // Scoped NPM import.
 import 'net'                                    // Built-in Node.js module.
@@ -174,7 +175,7 @@
 import '../hotel-sk/hotel-sk';                // Resolves to myapp/modules/hotel-sk/hotel-sk.ts.
 import '../../../c';                          // Resolves to c/index.ts.
 import '../../../d_ts_lib/d';                 // Resolves to d_ts_lib/d.ts.
-import 'lit-html';                            // NPM import with built-in TypeScript annotations.
+import 'lit/html.js';                         // NPM import with built-in TypeScript annotations.
 import 'puppeteer';                           // NPM import with a separate @types/puppeteer package.
 import '@google-web-components/google-chart'; // Scoped NPM import.
 import 'net'                                  // Built-in Node.js module.
@@ -191,7 +192,7 @@
 import '../hotel-sk/hotel-sk';                // Resolves to myapp/modules/hotel-sk/hotel-sk.ts.
 import '../../../c';                          // Resolves to c/index.ts.
 import '../../../d_ts_lib/d';                 // Resolves to d_ts_lib/d.ts.
-import 'lit-html';                            // NPM import with built-in TypeScript annotations.
+import 'lit/html.js';                         // NPM import with built-in TypeScript annotations.
 import 'puppeteer';                           // NPM import with a separate @types/puppeteer package.
 import '@google-web-components/google-chart'; // Scoped NPM import.
 import 'net'                                  // Built-in Node.js module.
@@ -208,7 +209,7 @@
 import '../hotel-sk/hotel-sk';                // Resolves to myapp/modules/hotel-sk/hotel-sk.ts.
 import '../../../c';                          // Resolves to c/index.ts.
 import '../../../d_ts_lib/d';                 // Resolves to d_ts_lib/d.ts.
-import 'lit-html';                            // NPM import with built-in TypeScript annotations.
+import 'lit/html.js';                         // NPM import with built-in TypeScript annotations.
 import 'puppeteer';                           // NPM import with a separate @types/puppeteer package.
 import '@google-web-components/google-chart'; // Scoped NPM import.
 import 'net'                                  // Built-in Node.js module.
@@ -279,7 +280,7 @@
         ":bravo_ts_lib",
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/puppeteer",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/puppeteer",
         "//a/b:charlie_ts_lib",
         "//c:delta_ts_lib",
@@ -308,7 +309,7 @@
         ":bravo_ts_lib",
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/puppeteer",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/puppeteer",
         "//a/b:charlie_ts_lib",
         "//c:delta_ts_lib",
@@ -325,7 +326,7 @@
         ":bravo_ts_lib",
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/puppeteer",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/puppeteer",
         "//a/b:charlie_ts_lib",
         "//c:delta_ts_lib",
@@ -463,7 +464,7 @@
     ts_deps = [
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/puppeteer",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/puppeteer",
         "//c:index_ts_lib",
         "//d_ts_lib",
@@ -494,7 +495,7 @@
     ts_deps = [
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/puppeteer",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/puppeteer",
         "//c:index_ts_lib",
         "//d_ts_lib",
@@ -513,7 +514,7 @@
         ":wibble_ts_lib",
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/puppeteer",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/puppeteer",
         "//c:index_ts_lib",
         "//d_ts_lib",
@@ -530,7 +531,7 @@
         ":wibble_ts_lib",
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/puppeteer",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/puppeteer",
         "//c:index_ts_lib",
         "//d_ts_lib",
@@ -784,7 +785,7 @@
 			Path: "a/alfa.ts",
 			Content: `
 import 'elements-sk/checkbox-sk';  // Existing import.
-import 'lit-html';                 // New import. Gazelle should add this dep.
+import 'lit/html.js';              // New import. Gazelle should add this dep.
 `,
 		},
 		{
@@ -792,7 +793,7 @@
 			Content: `
 import './alfa';                   // Existing import.
 import 'elements-sk/checkbox-sk';  // Existing import.
-import 'lit-html';                 // New import. Gazelle should add this dep.
+import 'lit/html.js';              // New import. Gazelle should add this dep.
 `,
 		},
 		{
@@ -800,7 +801,7 @@
 			Content: `
 import './alfa';                   // Existing import.
 import 'elements-sk/checkbox-sk';  // Existing import.
-import 'lit-html';                 // New import. Gazelle should add this dep.
+import 'lit/html.js';              // New import. Gazelle should add this dep.
 `,
 		},
 		{Path: "a/bravo.scss"},
@@ -829,7 +830,7 @@
     ts_deps = [
         # Not imported from echo-sk.ts. Gazelle should remove this dep.
         "//:node_modules/common-sk",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = ["echo-sk.ts"],
     visibility = ["//visibility:public"],
@@ -907,7 +908,7 @@
 import '../golf-sk/golf-sk';       // Existing import.
 import '../hotel-sk/hotel-sk';     // New import. Gazelle should add this dep.
 import 'elements-sk/checkbox-sk';  // New import. Gazelle should add this dep.
-import 'lit-html';                 // Existing import.
+import 'lit/html.js';              // Existing import.
 `,
 		},
 		{Path: "myapp/modules/echo-sk/index.ts"}, // This new file should be added to ts_srcs.
@@ -928,7 +929,7 @@
 import '../golf-sk/golf-sk';       // Existing import.
 import '../hotel-sk/hotel-sk';     // New import. Gazelle should add this dep.
 import 'common-sk';                // Existing import.
-import 'lit-html';                 // New import. Gazelle should add this dep.
+import 'lit/html.js';              // New import. Gazelle should add this dep.
 `,
 		},
 		{
@@ -938,7 +939,7 @@
 import '../golf-sk/golf-sk';       // Existing import.
 import '../hotel-sk/hotel-sk';     // New import. Gazelle should add this dep.
 import 'elements-sk/checkbox-sk';  // Existing import.
-import 'lit-html';                 // New import. Gazelle should add this dep.
+import 'lit/html.js';              // New import. Gazelle should add this dep.
 `,
 		},
 		{
@@ -948,7 +949,7 @@
 import '../golf-sk/golf-sk';       // Existing import.
 import '../hotel-sk/hotel-sk';     // New import. Gazelle should add this dep.
 import 'elements-sk/checkbox-sk';  // Existing import.
-import 'lit-html';                 // New import. Gazelle should add this dep.
+import 'lit/html.js';              // New import. Gazelle should add this dep.
 `,
 		},
 
@@ -1016,7 +1017,7 @@
     deps = [
         ":alfa_ts_lib",
         "//:node_modules/elements-sk",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
 )
 
@@ -1036,7 +1037,7 @@
     deps = [
         ":alfa_ts_lib",
         "//:node_modules/elements-sk",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
 )
 
@@ -1046,7 +1047,7 @@
     visibility = ["//visibility:public"],
     deps = [
         "//:node_modules/elements-sk",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
 )
 
@@ -1086,7 +1087,7 @@
         "//myapp/modules/hotel-sk",
     ],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/elements-sk",
     ],
     ts_srcs = [
@@ -1111,7 +1112,7 @@
     ],
     ts_deps = [
         "//:node_modules/common-sk",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_entry_point = "echo-sk-demo.ts",
 )
@@ -1123,7 +1124,7 @@
     deps = [
         ":echo-sk",
         "//:node_modules/elements-sk",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//myapp/modules/golf-sk",
         "//myapp/modules/hotel-sk",
     ],
@@ -1135,7 +1136,7 @@
     deps = [
         ":echo-sk",
         "//:node_modules/elements-sk",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//myapp/modules/golf-sk",
         "//myapp/modules/hotel-sk",
     ],
diff --git a/bugs-central/modules/bugs-central-scaffold-sk/BUILD.bazel b/bugs-central/modules/bugs-central-scaffold-sk/BUILD.bazel
index 851f2de..733408d 100644
--- a/bugs-central/modules/bugs-central-scaffold-sk/BUILD.bazel
+++ b/bugs-central/modules/bugs-central-scaffold-sk/BUILD.bazel
@@ -21,7 +21,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "bugs-central-scaffold-sk.ts",
diff --git a/bugs-central/modules/bugs-central-scaffold-sk/bugs-central-scaffold-sk.ts b/bugs-central/modules/bugs-central-scaffold-sk/bugs-central-scaffold-sk.ts
index bc64cc8..794ad72 100644
--- a/bugs-central/modules/bugs-central-scaffold-sk/bugs-central-scaffold-sk.ts
+++ b/bugs-central/modules/bugs-central-scaffold-sk/bugs-central-scaffold-sk.ts
@@ -12,7 +12,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/bugs-central/modules/bugs-central-sk/BUILD.bazel b/bugs-central/modules/bugs-central-sk/BUILD.bazel
index b47b3ef..486f6ac 100644
--- a/bugs-central/modules/bugs-central-sk/BUILD.bazel
+++ b/bugs-central/modules/bugs-central-sk/BUILD.bazel
@@ -17,7 +17,7 @@
         "//infra-sk/modules:hintable_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "bugs-central-sk.ts",
diff --git a/bugs-central/modules/bugs-central-sk/bugs-central-sk.ts b/bugs-central/modules/bugs-central-sk/bugs-central-sk.ts
index 4eb53d2..4e70694 100644
--- a/bugs-central/modules/bugs-central-sk/bugs-central-sk.ts
+++ b/bugs-central/modules/bugs-central-sk/bugs-central-sk.ts
@@ -9,7 +9,7 @@
  *
  */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
diff --git a/bugs-central/modules/bugs-chart-sk/BUILD.bazel b/bugs-central/modules/bugs-chart-sk/BUILD.bazel
index 5ef6a66..38d415f 100644
--- a/bugs-central/modules/bugs-chart-sk/BUILD.bazel
+++ b/bugs-central/modules/bugs-chart-sk/BUILD.bazel
@@ -11,7 +11,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/google.visualization",  # keep
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "bugs-chart-sk.ts",
diff --git a/bugs-central/modules/bugs-chart-sk/bugs-chart-sk.ts b/bugs-central/modules/bugs-chart-sk/bugs-chart-sk.ts
index 64046d9..fd31734 100644
--- a/bugs-central/modules/bugs-chart-sk/bugs-chart-sk.ts
+++ b/bugs-central/modules/bugs-chart-sk/bugs-chart-sk.ts
@@ -14,7 +14,7 @@
 
 import '@google-web-components/google-chart';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/bugs-central/modules/bugs-slo-popup-sk/BUILD.bazel b/bugs-central/modules/bugs-slo-popup-sk/BUILD.bazel
index 8fcd818..b2bea8d 100644
--- a/bugs-central/modules/bugs-slo-popup-sk/BUILD.bazel
+++ b/bugs-central/modules/bugs-slo-popup-sk/BUILD.bazel
@@ -9,7 +9,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "bugs-slo-popup-sk.ts",
diff --git a/bugs-central/modules/bugs-slo-popup-sk/bugs-slo-popup-sk.ts b/bugs-central/modules/bugs-slo-popup-sk/bugs-slo-popup-sk.ts
index 9934c5a..9c083c7 100644
--- a/bugs-central/modules/bugs-slo-popup-sk/bugs-slo-popup-sk.ts
+++ b/bugs-central/modules/bugs-slo-popup-sk/bugs-slo-popup-sk.ts
@@ -5,7 +5,7 @@
  * A dialog that displays all bugs that are outside SLO.
  */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import { $$ } from '../../../infra-sk/modules/dom';
diff --git a/codesize/modules/binary-diff-page-sk/BUILD.bazel b/codesize/modules/binary-diff-page-sk/BUILD.bazel
index 2424c25..d9d5bb9 100644
--- a/codesize/modules/binary-diff-page-sk/BUILD.bazel
+++ b/codesize/modules/binary-diff-page-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "binary-diff-page-sk.ts",
diff --git a/codesize/modules/binary-diff-page-sk/binary-diff-page-sk.ts b/codesize/modules/binary-diff-page-sk/binary-diff-page-sk.ts
index f6ff083..3258eea 100644
--- a/codesize/modules/binary-diff-page-sk/binary-diff-page-sk.ts
+++ b/codesize/modules/binary-diff-page-sk/binary-diff-page-sk.ts
@@ -1,6 +1,6 @@
 /** Shows a size diff between two binaries. */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/codesize/modules/binary-page-sk/BUILD.bazel b/codesize/modules/binary-page-sk/BUILD.bazel
index 86f95d0..d79436a 100644
--- a/codesize/modules/binary-page-sk/BUILD.bazel
+++ b/codesize/modules/binary-page-sk/BUILD.bazel
@@ -20,7 +20,7 @@
         "//:node_modules/@google-web-components/google-chart",
         "//:node_modules/@types/google.visualization",  # keep
         "//:node_modules/fuse.js",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "binary-page-sk.ts",
diff --git a/codesize/modules/binary-page-sk/binary-page-sk.ts b/codesize/modules/binary-page-sk/binary-page-sk.ts
index 1efde84..b3f9a54 100644
--- a/codesize/modules/binary-page-sk/binary-page-sk.ts
+++ b/codesize/modules/binary-page-sk/binary-page-sk.ts
@@ -1,6 +1,6 @@
 /** Shows code size statistics about a single binary. */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { load } from '@google-web-components/google-chart/loader';
 import Fuse from 'fuse.js';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/codesize/modules/codesize-scaffold-sk/BUILD.bazel b/codesize/modules/codesize-scaffold-sk/BUILD.bazel
index 37fa972..df9735a 100644
--- a/codesize/modules/codesize-scaffold-sk/BUILD.bazel
+++ b/codesize/modules/codesize-scaffold-sk/BUILD.bazel
@@ -17,7 +17,7 @@
         ":events_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "codesize-scaffold-sk.ts",
diff --git a/codesize/modules/codesize-scaffold-sk/codesize-scaffold-sk.ts b/codesize/modules/codesize-scaffold-sk/codesize-scaffold-sk.ts
index c01d635..06bb63d 100644
--- a/codesize/modules/codesize-scaffold-sk/codesize-scaffold-sk.ts
+++ b/codesize/modules/codesize-scaffold-sk/codesize-scaffold-sk.ts
@@ -1,6 +1,6 @@
 /** Root element for all codesize.skia.org pages. */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 
 import { define } from '../../../elements-sk/modules/define';
 import { SpinnerSk } from '../../../elements-sk/modules/spinner-sk/spinner-sk';
diff --git a/codesize/modules/index-page-sk/BUILD.bazel b/codesize/modules/index-page-sk/BUILD.bazel
index f381d1f..d8d499a 100644
--- a/codesize/modules/index-page-sk/BUILD.bazel
+++ b/codesize/modules/index-page-sk/BUILD.bazel
@@ -27,7 +27,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index-page-sk.ts",
diff --git a/codesize/modules/index-page-sk/index-page-sk.ts b/codesize/modules/index-page-sk/index-page-sk.ts
index ca3f1a0..b080590 100644
--- a/codesize/modules/index-page-sk/index-page-sk.ts
+++ b/codesize/modules/index-page-sk/index-page-sk.ts
@@ -1,6 +1,6 @@
 /** Shows the most recent binaries for which we have code size statistics. */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/ct/modules/admin-task-runs-sk/BUILD.bazel b/ct/modules/admin-task-runs-sk/BUILD.bazel
index d25497d..a68d487 100644
--- a/ct/modules/admin-task-runs-sk/BUILD.bazel
+++ b/ct/modules/admin-task-runs-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "admin-task-runs-sk.ts",
diff --git a/ct/modules/admin-task-runs-sk/admin-task-runs-sk.ts b/ct/modules/admin-task-runs-sk/admin-task-runs-sk.ts
index ac11a16..d158e3e 100644
--- a/ct/modules/admin-task-runs-sk/admin-task-runs-sk.ts
+++ b/ct/modules/admin-task-runs-sk/admin-task-runs-sk.ts
@@ -8,7 +8,7 @@
 
 import '../pagination-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, DomReady } from '../../../infra-sk/modules/dom';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/admin-tasks-sk/BUILD.bazel b/ct/modules/admin-tasks-sk/BUILD.bazel
index f2cddd6..9532661 100644
--- a/ct/modules/admin-tasks-sk/BUILD.bazel
+++ b/ct/modules/admin-tasks-sk/BUILD.bazel
@@ -27,7 +27,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "admin-tasks-sk.ts",
diff --git a/ct/modules/admin-tasks-sk/admin-tasks-sk.ts b/ct/modules/admin-tasks-sk/admin-tasks-sk.ts
index 95745f2..b24429e 100644
--- a/ct/modules/admin-tasks-sk/admin-tasks-sk.ts
+++ b/ct/modules/admin-tasks-sk/admin-tasks-sk.ts
@@ -14,7 +14,7 @@
 import '../pageset-selector-sk';
 import '../task-repeater-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, $ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/select-sk';
diff --git a/ct/modules/chromium-analysis-runs-sk/BUILD.bazel b/ct/modules/chromium-analysis-runs-sk/BUILD.bazel
index b393e15..66ae636 100644
--- a/ct/modules/chromium-analysis-runs-sk/BUILD.bazel
+++ b/ct/modules/chromium-analysis-runs-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "chromium-analysis-runs-sk.ts",
diff --git a/ct/modules/chromium-analysis-runs-sk/chromium-analysis-runs-sk.ts b/ct/modules/chromium-analysis-runs-sk/chromium-analysis-runs-sk.ts
index 2928bc2..de6cb25 100644
--- a/ct/modules/chromium-analysis-runs-sk/chromium-analysis-runs-sk.ts
+++ b/ct/modules/chromium-analysis-runs-sk/chromium-analysis-runs-sk.ts
@@ -11,7 +11,7 @@
 import '../../../elements-sk/modules/toast-sk';
 import '../pagination-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, DomReady } from '../../../infra-sk/modules/dom';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/chromium-analysis-sk/BUILD.bazel b/ct/modules/chromium-analysis-sk/BUILD.bazel
index 70ee20d..04f7ab3 100644
--- a/ct/modules/chromium-analysis-sk/BUILD.bazel
+++ b/ct/modules/chromium-analysis-sk/BUILD.bazel
@@ -24,7 +24,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "chromium-analysis-sk.ts",
diff --git a/ct/modules/chromium-analysis-sk/chromium-analysis-sk.ts b/ct/modules/chromium-analysis-sk/chromium-analysis-sk.ts
index af88c04..d31c49e 100644
--- a/ct/modules/chromium-analysis-sk/chromium-analysis-sk.ts
+++ b/ct/modules/chromium-analysis-sk/chromium-analysis-sk.ts
@@ -14,7 +14,7 @@
 import '../task-repeater-sk';
 import '../task-priority-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, $ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/select-sk';
diff --git a/ct/modules/chromium-perf-runs-sk/BUILD.bazel b/ct/modules/chromium-perf-runs-sk/BUILD.bazel
index 5b920ed..809b172 100644
--- a/ct/modules/chromium-perf-runs-sk/BUILD.bazel
+++ b/ct/modules/chromium-perf-runs-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "chromium-perf-runs-sk.ts",
diff --git a/ct/modules/chromium-perf-runs-sk/chromium-perf-runs-sk.ts b/ct/modules/chromium-perf-runs-sk/chromium-perf-runs-sk.ts
index 508e263..042854d 100644
--- a/ct/modules/chromium-perf-runs-sk/chromium-perf-runs-sk.ts
+++ b/ct/modules/chromium-perf-runs-sk/chromium-perf-runs-sk.ts
@@ -11,7 +11,7 @@
 import '../../../elements-sk/modules/toast-sk';
 import '../pagination-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, DomReady } from '../../../infra-sk/modules/dom';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/chromium-perf-sk/BUILD.bazel b/ct/modules/chromium-perf-sk/BUILD.bazel
index 0ef2a5c..24f39c5 100644
--- a/ct/modules/chromium-perf-sk/BUILD.bazel
+++ b/ct/modules/chromium-perf-sk/BUILD.bazel
@@ -24,7 +24,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "chromium-perf-sk.ts",
diff --git a/ct/modules/chromium-perf-sk/chromium-perf-sk.ts b/ct/modules/chromium-perf-sk/chromium-perf-sk.ts
index 3d127d0..dc49b9d 100644
--- a/ct/modules/chromium-perf-sk/chromium-perf-sk.ts
+++ b/ct/modules/chromium-perf-sk/chromium-perf-sk.ts
@@ -14,7 +14,7 @@
 import '../task-repeater-sk';
 import '../task-priority-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, $ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/select-sk';
diff --git a/ct/modules/ct-scaffold-sk/BUILD.bazel b/ct/modules/ct-scaffold-sk/BUILD.bazel
index 4309c81..5f33535 100644
--- a/ct/modules/ct-scaffold-sk/BUILD.bazel
+++ b/ct/modules/ct-scaffold-sk/BUILD.bazel
@@ -39,7 +39,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "ct-scaffold-sk.ts",
diff --git a/ct/modules/ct-scaffold-sk/ct-scaffold-sk.ts b/ct/modules/ct-scaffold-sk/ct-scaffold-sk.ts
index 6de723b..6a1de5c 100644
--- a/ct/modules/ct-scaffold-sk/ct-scaffold-sk.ts
+++ b/ct/modules/ct-scaffold-sk/ct-scaffold-sk.ts
@@ -14,7 +14,7 @@
  *
  * @attr {boolean} testing_offline - If we should operate entirely in offline mode.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/input-sk/BUILD.bazel b/ct/modules/input-sk/BUILD.bazel
index 9ef267c..e753f00 100644
--- a/ct/modules/input-sk/BUILD.bazel
+++ b/ct/modules/input-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/input-sk/input-sk.ts b/ct/modules/input-sk/input-sk.ts
index 21e17a5..34e7957 100644
--- a/ct/modules/input-sk/input-sk.ts
+++ b/ct/modules/input-sk/input-sk.ts
@@ -9,8 +9,8 @@
  * @attr {string} textPrefix - Optional prefix to put before the input box.
  */
 
-import { html } from 'lit-html';
-import { ifDefined } from 'lit-html/directives/if-defined';
+import { html } from 'lit/html.js';
+import { ifDefined } from 'lit/directives/if-defined.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 
diff --git a/ct/modules/metrics-analysis-runs-sk/BUILD.bazel b/ct/modules/metrics-analysis-runs-sk/BUILD.bazel
index 306c920..8f21bcf 100644
--- a/ct/modules/metrics-analysis-runs-sk/BUILD.bazel
+++ b/ct/modules/metrics-analysis-runs-sk/BUILD.bazel
@@ -23,7 +23,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/metrics-analysis-runs-sk/metrics-analysis-runs-sk.ts b/ct/modules/metrics-analysis-runs-sk/metrics-analysis-runs-sk.ts
index 9c5f527..65b2494 100644
--- a/ct/modules/metrics-analysis-runs-sk/metrics-analysis-runs-sk.ts
+++ b/ct/modules/metrics-analysis-runs-sk/metrics-analysis-runs-sk.ts
@@ -8,7 +8,7 @@
 import '../../../elements-sk/modules/toast-sk';
 import '../pagination-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, DomReady } from '../../../infra-sk/modules/dom';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/metrics-analysis-sk/BUILD.bazel b/ct/modules/metrics-analysis-sk/BUILD.bazel
index 578c368..8a0ea36 100644
--- a/ct/modules/metrics-analysis-sk/BUILD.bazel
+++ b/ct/modules/metrics-analysis-sk/BUILD.bazel
@@ -28,7 +28,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/metrics-analysis-sk/metrics-analysis-sk.ts b/ct/modules/metrics-analysis-sk/metrics-analysis-sk.ts
index b6ab578..cb9768f 100644
--- a/ct/modules/metrics-analysis-sk/metrics-analysis-sk.ts
+++ b/ct/modules/metrics-analysis-sk/metrics-analysis-sk.ts
@@ -13,7 +13,7 @@
 import '../task-repeater-sk';
 import '../task-priority-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, $ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/select-sk';
diff --git a/ct/modules/pageset-selector-sk/BUILD.bazel b/ct/modules/pageset-selector-sk/BUILD.bazel
index 384b68e..367b95c 100644
--- a/ct/modules/pageset-selector-sk/BUILD.bazel
+++ b/ct/modules/pageset-selector-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/pageset-selector-sk/pageset-selector-sk.ts b/ct/modules/pageset-selector-sk/pageset-selector-sk.ts
index 93ee1aa..47830cf 100644
--- a/ct/modules/pageset-selector-sk/pageset-selector-sk.ts
+++ b/ct/modules/pageset-selector-sk/pageset-selector-sk.ts
@@ -7,7 +7,7 @@
  * the option to input custom webpages.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/pagination-sk/BUILD.bazel b/ct/modules/pagination-sk/BUILD.bazel
index b933766..96e7233 100644
--- a/ct/modules/pagination-sk/BUILD.bazel
+++ b/ct/modules/pagination-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//ct/modules/json:index_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/pagination-sk/pagination-sk.ts b/ct/modules/pagination-sk/pagination-sk.ts
index 246ba92..8e342a4 100644
--- a/ct/modules/pagination-sk/pagination-sk.ts
+++ b/ct/modules/pagination-sk/pagination-sk.ts
@@ -7,7 +7,7 @@
 import '../../../elements-sk/modules/icons/chevron-left-icon-sk';
 import '../../../elements-sk/modules/icons/chevron-right-icon-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/ct/modules/patch-sk/BUILD.bazel b/ct/modules/patch-sk/BUILD.bazel
index c3b721b..3c2120e 100644
--- a/ct/modules/patch-sk/BUILD.bazel
+++ b/ct/modules/patch-sk/BUILD.bazel
@@ -31,7 +31,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/patch-sk/patch-sk.ts b/ct/modules/patch-sk/patch-sk.ts
index dc4d296..23224bb 100644
--- a/ct/modules/patch-sk/patch-sk.ts
+++ b/ct/modules/patch-sk/patch-sk.ts
@@ -20,7 +20,7 @@
 import '../../../elements-sk/modules/toast-sk';
 import '../../../infra-sk/modules/expandable-textarea-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { SpinnerSk } from '../../../elements-sk/modules/spinner-sk/spinner-sk';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { fromObject } from '../../../infra-sk/modules/query';
diff --git a/ct/modules/runs-history-summary-sk/BUILD.bazel b/ct/modules/runs-history-summary-sk/BUILD.bazel
index 2215f17..747b19c 100644
--- a/ct/modules/runs-history-summary-sk/BUILD.bazel
+++ b/ct/modules/runs-history-summary-sk/BUILD.bazel
@@ -19,7 +19,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/runs-history-summary-sk/runs-history-summary-sk.ts b/ct/modules/runs-history-summary-sk/runs-history-summary-sk.ts
index 897dfb7..9ec0d1c 100644
--- a/ct/modules/runs-history-summary-sk/runs-history-summary-sk.ts
+++ b/ct/modules/runs-history-summary-sk/runs-history-summary-sk.ts
@@ -4,7 +4,7 @@
 
 import '../../../elements-sk/modules/tabs-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { DomReady } from '../../../infra-sk/modules/dom';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/suggest-input-sk/BUILD.bazel b/ct/modules/suggest-input-sk/BUILD.bazel
index d8f28b9..09b0504 100644
--- a/ct/modules/suggest-input-sk/BUILD.bazel
+++ b/ct/modules/suggest-input-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/suggest-input-sk/suggest-input-sk.ts b/ct/modules/suggest-input-sk/suggest-input-sk.ts
index 2b84e22..301b733 100644
--- a/ct/modules/suggest-input-sk/suggest-input-sk.ts
+++ b/ct/modules/suggest-input-sk/suggest-input-sk.ts
@@ -10,7 +10,7 @@
  * committed. Event is of the form { value: <newValue> }
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 
diff --git a/ct/modules/task-priority-sk/BUILD.bazel b/ct/modules/task-priority-sk/BUILD.bazel
index 3381ed3..7e1535e 100644
--- a/ct/modules/task-priority-sk/BUILD.bazel
+++ b/ct/modules/task-priority-sk/BUILD.bazel
@@ -19,7 +19,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/task-priority-sk/task-priority-sk.ts b/ct/modules/task-priority-sk/task-priority-sk.ts
index ebf65f4..432f555 100644
--- a/ct/modules/task-priority-sk/task-priority-sk.ts
+++ b/ct/modules/task-priority-sk/task-priority-sk.ts
@@ -4,7 +4,7 @@
  * task's priority.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/task-queue-sk/BUILD.bazel b/ct/modules/task-queue-sk/BUILD.bazel
index 561f86d..419337d 100644
--- a/ct/modules/task-queue-sk/BUILD.bazel
+++ b/ct/modules/task-queue-sk/BUILD.bazel
@@ -23,7 +23,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/task-queue-sk/task-queue-sk.ts b/ct/modules/task-queue-sk/task-queue-sk.ts
index 927fad6..53e076a 100644
--- a/ct/modules/task-queue-sk/task-queue-sk.ts
+++ b/ct/modules/task-queue-sk/task-queue-sk.ts
@@ -9,7 +9,7 @@
 import '../../../elements-sk/modules/icons/help-icon-sk';
 import '../../../elements-sk/modules/toast-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$, DomReady } from '../../../infra-sk/modules/dom';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/ct/modules/task-repeater-sk/BUILD.bazel b/ct/modules/task-repeater-sk/BUILD.bazel
index 1e82af2..5a0aaa6 100644
--- a/ct/modules/task-repeater-sk/BUILD.bazel
+++ b/ct/modules/task-repeater-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/ct/modules/task-repeater-sk/task-repeater-sk.ts b/ct/modules/task-repeater-sk/task-repeater-sk.ts
index 45a9c34..9300e2e 100644
--- a/ct/modules/task-repeater-sk/task-repeater-sk.ts
+++ b/ct/modules/task-repeater-sk/task-repeater-sk.ts
@@ -5,7 +5,7 @@
  * or weekly.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 
diff --git a/debugger-app/modules/android-layers-sk/BUILD.bazel b/debugger-app/modules/android-layers-sk/BUILD.bazel
index d90607e..a86161d 100644
--- a/debugger-app/modules/android-layers-sk/BUILD.bazel
+++ b/debugger-app/modules/android-layers-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//debugger-app/modules:debugger_ts_lib",
         "//debugger-app/modules:events_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "android-layers-sk.ts",
diff --git a/debugger-app/modules/android-layers-sk/android-layers-sk.ts b/debugger-app/modules/android-layers-sk/android-layers-sk.ts
index 4ea82ad..54c5621 100644
--- a/debugger-app/modules/android-layers-sk/android-layers-sk.ts
+++ b/debugger-app/modules/android-layers-sk/android-layers-sk.ts
@@ -2,7 +2,7 @@
  * @module modules/android-layers-sk
  * @description <h2><code>android-layers-sk</code></h2>
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementDocSk } from '../element-doc-sk/element-doc-sk';
 import { LayerInfo } from '../commands-sk/commands-sk';
diff --git a/debugger-app/modules/commands-sk/BUILD.bazel b/debugger-app/modules/commands-sk/BUILD.bazel
index 7b76f5b..c9d2b6d 100644
--- a/debugger-app/modules/commands-sk/BUILD.bazel
+++ b/debugger-app/modules/commands-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//debugger-app/modules:default-map_ts_lib",
         "//debugger-app/modules:events_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "commands-sk.ts",
diff --git a/debugger-app/modules/commands-sk/commands-sk.ts b/debugger-app/modules/commands-sk/commands-sk.ts
index 81a9c40..f82383f 100644
--- a/debugger-app/modules/commands-sk/commands-sk.ts
+++ b/debugger-app/modules/commands-sk/commands-sk.ts
@@ -21,7 +21,7 @@
  * the unfiltered command list for this frame.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, HTMLTemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementDocSk } from '../element-doc-sk/element-doc-sk';
 import { PlaySk } from '../play-sk/play-sk';
@@ -562,7 +562,7 @@
     // An unlikely string meaning 'insert html template here'
     const magic = '546rftvyghbjjkjiuytre';
     // a list of templates to be used to replaces occurrences of magic.
-    const inserts: TemplateResult[] = [];
+    const inserts: HTMLTemplateResult[] = [];
     const replacer = function (name: string, value: any) {
       if (name === 'imageIndex') {
         // Show a clickable button that takes the user to the image resource viewer.
@@ -608,7 +608,7 @@
 
   // lit-html does not appear to support setting a tag's name with a ${} so here's
   // a crummy workaround
-  private _icon(item: PrefixItem): TemplateResult | null {
+  private _icon(item: PrefixItem): HTMLTemplateResult | null {
     if (item.icon === 'save-icon-sk') {
       return html`<save-icon-sk style="fill: ${item.color};" class="icon">
       </save-icon-sk>`;
diff --git a/debugger-app/modules/cycler-button-sk/BUILD.bazel b/debugger-app/modules/cycler-button-sk/BUILD.bazel
index 05138ed..46858c6 100644
--- a/debugger-app/modules/cycler-button-sk/BUILD.bazel
+++ b/debugger-app/modules/cycler-button-sk/BUILD.bazel
@@ -6,7 +6,7 @@
         "//debugger-app/modules:events_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "cycler-button-sk.ts",
diff --git a/debugger-app/modules/cycler-button-sk/cycler-button-sk.ts b/debugger-app/modules/cycler-button-sk/cycler-button-sk.ts
index 6dcf671..37e5d43 100644
--- a/debugger-app/modules/cycler-button-sk/cycler-button-sk.ts
+++ b/debugger-app/modules/cycler-button-sk/cycler-button-sk.ts
@@ -11,7 +11,7 @@
  *    <cycler-button-sk .text=${'next'} .list=${[1, 2, 3]} @next-item=${(e: Event)=>{}}>
  *    </cycler-button-sk>
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { NextItemEventDetail, NextItemEvent } from '../events';
diff --git a/debugger-app/modules/debug-view-sk/BUILD.bazel b/debugger-app/modules/debug-view-sk/BUILD.bazel
index ce12ed8..3c4320c 100644
--- a/debugger-app/modules/debug-view-sk/BUILD.bazel
+++ b/debugger-app/modules/debug-view-sk/BUILD.bazel
@@ -7,7 +7,7 @@
     ts_deps = [
         "//debugger-app/modules:events_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "debug-view-sk.ts",
diff --git a/debugger-app/modules/debug-view-sk/debug-view-sk.ts b/debugger-app/modules/debug-view-sk/debug-view-sk.ts
index c4d8572..5b7bd30 100644
--- a/debugger-app/modules/debug-view-sk/debug-view-sk.ts
+++ b/debugger-app/modules/debug-view-sk/debug-view-sk.ts
@@ -5,7 +5,7 @@
  *
  * @evt move-cursor: Emitted when the user has moved the cursor by clicking or hovering.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementDocSk } from '../element-doc-sk/element-doc-sk';
 import {
diff --git a/debugger-app/modules/debugger-page-sk/BUILD.bazel b/debugger-app/modules/debugger-page-sk/BUILD.bazel
index f3e7424..6e90fc1 100644
--- a/debugger-app/modules/debugger-page-sk/BUILD.bazel
+++ b/debugger-app/modules/debugger-page-sk/BUILD.bazel
@@ -26,7 +26,7 @@
         "//debugger-app/wasm_libs:canvaskit_types",  # keep
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "debugger-page-sk.ts",
diff --git a/debugger-app/modules/debugger-page-sk/debugger-page-sk.ts b/debugger-app/modules/debugger-page-sk/debugger-page-sk.ts
index cf98343..3c7c32ec 100644
--- a/debugger-app/modules/debugger-page-sk/debugger-page-sk.ts
+++ b/debugger-app/modules/debugger-page-sk/debugger-page-sk.ts
@@ -24,7 +24,7 @@
  *       [ debug-view-sk ]                     [ debugger- ]                     [ zoom-sk ]
  *       [               ] <- render-cursor -- [ page-sk   ] -- render-cursor -> [         ]
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import '../../../elements-sk/modules/tabs-sk';
diff --git a/debugger-app/modules/histogram-sk/BUILD.bazel b/debugger-app/modules/histogram-sk/BUILD.bazel
index f22bc83..2a07085 100644
--- a/debugger-app/modules/histogram-sk/BUILD.bazel
+++ b/debugger-app/modules/histogram-sk/BUILD.bazel
@@ -12,7 +12,7 @@
     ts_deps = [
         "//debugger-app/modules:events_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "histogram-sk.ts",
diff --git a/debugger-app/modules/histogram-sk/histogram-sk.ts b/debugger-app/modules/histogram-sk/histogram-sk.ts
index f9f20a6..9a8cefa 100644
--- a/debugger-app/modules/histogram-sk/histogram-sk.ts
+++ b/debugger-app/modules/histogram-sk/histogram-sk.ts
@@ -16,7 +16,7 @@
  * @evt toggle-command-inclusion: Emitted when a row is clicked, indicating it's
  * inclusion in the command filter should be toggled.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementDocSk } from '../element-doc-sk/element-doc-sk';
 
diff --git a/debugger-app/modules/play-sk/BUILD.bazel b/debugger-app/modules/play-sk/BUILD.bazel
index cece8ee..51fcf94 100644
--- a/debugger-app/modules/play-sk/BUILD.bazel
+++ b/debugger-app/modules/play-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//debugger-app/modules:events_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/debugger-app/modules/play-sk/play-sk.ts b/debugger-app/modules/play-sk/play-sk.ts
index b8bea6b..0d48c87 100644
--- a/debugger-app/modules/play-sk/play-sk.ts
+++ b/debugger-app/modules/play-sk/play-sk.ts
@@ -11,7 +11,7 @@
  *           detail: {item: number} // the index the play module wants the app
  *           to move to.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../elements-sk/modules/icons/skip-previous-icon-sk';
diff --git a/debugger-app/modules/resources-sk/BUILD.bazel b/debugger-app/modules/resources-sk/BUILD.bazel
index f0a835e..8a51362 100644
--- a/debugger-app/modules/resources-sk/BUILD.bazel
+++ b/debugger-app/modules/resources-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//debugger-app/modules:default-map_ts_lib",
         "//debugger-app/modules:events_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/debugger-app/modules/resources-sk/resources-sk.ts b/debugger-app/modules/resources-sk/resources-sk.ts
index fd7e7a7..e631836 100644
--- a/debugger-app/modules/resources-sk/resources-sk.ts
+++ b/debugger-app/modules/resources-sk/resources-sk.ts
@@ -5,7 +5,7 @@
  *  and an image selection function so different parts of the app can send you
  *  to an image here, or you can pick one and view details about it.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementDocSk } from '../element-doc-sk/element-doc-sk';
 import { DefaultMap } from '../default-map';
diff --git a/debugger-app/modules/timeline-sk/BUILD.bazel b/debugger-app/modules/timeline-sk/BUILD.bazel
index ef6cc25..dc4b8d0 100644
--- a/debugger-app/modules/timeline-sk/BUILD.bazel
+++ b/debugger-app/modules/timeline-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//debugger-app/modules:events_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/debugger-app/modules/timeline-sk/timeline-sk.ts b/debugger-app/modules/timeline-sk/timeline-sk.ts
index 86ecceb..3dba8d8 100644
--- a/debugger-app/modules/timeline-sk/timeline-sk.ts
+++ b/debugger-app/modules/timeline-sk/timeline-sk.ts
@@ -2,7 +2,7 @@
  * @module modules/timeline-sk
  * @description An element for displaying a position in a timeline.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { PlaySk } from '../play-sk/play-sk';
diff --git a/debugger-app/modules/version-page-sk/BUILD.bazel b/debugger-app/modules/version-page-sk/BUILD.bazel
index 63e7c76..b6142d0 100644
--- a/debugger-app/modules/version-page-sk/BUILD.bazel
+++ b/debugger-app/modules/version-page-sk/BUILD.bazel
@@ -15,7 +15,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "version-page-sk.ts",
diff --git a/debugger-app/modules/version-page-sk/version-page-sk.ts b/debugger-app/modules/version-page-sk/version-page-sk.ts
index 9a7efb4..c4c7304 100644
--- a/debugger-app/modules/version-page-sk/version-page-sk.ts
+++ b/debugger-app/modules/version-page-sk/version-page-sk.ts
@@ -5,7 +5,7 @@
  * Shows links to all older versions of the debugger (which do not automatically update).
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../infra-sk/modules/theme-chooser-sk';
diff --git a/debugger-app/modules/zoom-sk/BUILD.bazel b/debugger-app/modules/zoom-sk/BUILD.bazel
index 7b476ce..a9d06e3 100644
--- a/debugger-app/modules/zoom-sk/BUILD.bazel
+++ b/debugger-app/modules/zoom-sk/BUILD.bazel
@@ -12,7 +12,7 @@
     ts_deps = [
         "//debugger-app/modules:events_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/debugger-app/modules/zoom-sk/zoom-sk.ts b/debugger-app/modules/zoom-sk/zoom-sk.ts
index 55f049e..7a27fc1 100644
--- a/debugger-app/modules/zoom-sk/zoom-sk.ts
+++ b/debugger-app/modules/zoom-sk/zoom-sk.ts
@@ -20,7 +20,7 @@
  *   the zoom view. The position is a coordinate in the source canvas.
  *   See debugger-page-sk for more info on move-cursor and render-cursor
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementDocSk } from '../element-doc-sk/element-doc-sk';
 import {
diff --git a/demos/modules/demo-list-sk/BUILD.bazel b/demos/modules/demo-list-sk/BUILD.bazel
index 9501e80..a147023 100644
--- a/demos/modules/demo-list-sk/BUILD.bazel
+++ b/demos/modules/demo-list-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "demo-list-sk.ts",
diff --git a/demos/modules/demo-list-sk/demo-list-sk.ts b/demos/modules/demo-list-sk/demo-list-sk.ts
index 17fe485..3664855 100644
--- a/demos/modules/demo-list-sk/demo-list-sk.ts
+++ b/demos/modules/demo-list-sk/demo-list-sk.ts
@@ -2,7 +2,7 @@
  * @fileoverview A custom element for the basic demos.skia.org header.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 
diff --git a/demos/modules/header-sk/BUILD.bazel b/demos/modules/header-sk/BUILD.bazel
index 09fcd07..6b01f5d 100644
--- a/demos/modules/header-sk/BUILD.bazel
+++ b/demos/modules/header-sk/BUILD.bazel
@@ -19,7 +19,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "header-sk.ts",
diff --git a/demos/modules/header-sk/header-sk.ts b/demos/modules/header-sk/header-sk.ts
index 518c195..6e3debb 100644
--- a/demos/modules/header-sk/header-sk.ts
+++ b/demos/modules/header-sk/header-sk.ts
@@ -2,7 +2,7 @@
  * @fileoverview A custom element for the basic demos.skia.org header.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../infra-sk/modules/theme-chooser-sk';
 
diff --git a/elements-sk/modules/icons-demo-sk/BUILD.bazel b/elements-sk/modules/icons-demo-sk/BUILD.bazel
index d26b217..a2d5f79 100644
--- a/elements-sk/modules/icons-demo-sk/BUILD.bazel
+++ b/elements-sk/modules/icons-demo-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         ":icons_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "icons-demo-sk.ts",
diff --git a/elements-sk/modules/icons-demo-sk/icons-demo-sk.ts b/elements-sk/modules/icons-demo-sk/icons-demo-sk.ts
index efcd57e..9674ed1 100644
--- a/elements-sk/modules/icons-demo-sk/icons-demo-sk.ts
+++ b/elements-sk/modules/icons-demo-sk/icons-demo-sk.ts
@@ -1,5 +1,5 @@
-import { html } from 'lit-html';
-import { unsafeHTML } from 'lit-html/directives/unsafe-html';
+import { html } from 'lit/html.js';
+import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 import { define } from '../define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { icons } from './icons';
diff --git a/fiddlek/modules/fiddle-embed-sk/BUILD.bazel b/fiddlek/modules/fiddle-embed-sk/BUILD.bazel
index 9018303..207ae52 100644
--- a/fiddlek/modules/fiddle-embed-sk/BUILD.bazel
+++ b/fiddlek/modules/fiddle-embed-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "fiddle-embed-sk.ts",
diff --git a/fiddlek/modules/fiddle-embed-sk/fiddle-embed-sk.ts b/fiddlek/modules/fiddle-embed-sk/fiddle-embed-sk.ts
index a014217..1f93770 100644
--- a/fiddlek/modules/fiddle-embed-sk/fiddle-embed-sk.ts
+++ b/fiddlek/modules/fiddle-embed-sk/fiddle-embed-sk.ts
@@ -12,7 +12,7 @@
  *
  * @event context-loaded is sent when the context for a fiddle had been loaded from the server.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import '../../../elements-sk/modules/error-toast-sk';
diff --git a/fiddlek/modules/fiddle-sk/BUILD.bazel b/fiddlek/modules/fiddle-sk/BUILD.bazel
index 1966b8c..6bf5854 100644
--- a/fiddlek/modules/fiddle-sk/BUILD.bazel
+++ b/fiddlek/modules/fiddle-sk/BUILD.bazel
@@ -29,7 +29,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "fiddle-sk.ts",
diff --git a/fiddlek/modules/fiddle-sk/fiddle-sk.ts b/fiddlek/modules/fiddle-sk/fiddle-sk.ts
index 357da51..22b926e 100644
--- a/fiddlek/modules/fiddle-sk/fiddle-sk.ts
+++ b/fiddlek/modules/fiddle-sk/fiddle-sk.ts
@@ -10,7 +10,7 @@
  *
  * @event fiddle-success is emitted when a run of a fiddle has completed successfully.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../textarea-numbers-sk';
 import '../../../elements-sk/modules/checkbox-sk';
diff --git a/fiddlek/modules/test-src-sk/BUILD.bazel b/fiddlek/modules/test-src-sk/BUILD.bazel
index c7bce81..1ec696b 100644
--- a/fiddlek/modules/test-src-sk/BUILD.bazel
+++ b/fiddlek/modules/test-src-sk/BUILD.bazel
@@ -12,7 +12,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/fiddlek/modules/test-src-sk/test-src-sk.ts b/fiddlek/modules/test-src-sk/test-src-sk.ts
index 12f531f..42feb93 100644
--- a/fiddlek/modules/test-src-sk/test-src-sk.ts
+++ b/fiddlek/modules/test-src-sk/test-src-sk.ts
@@ -6,7 +6,7 @@
  *  from a URL.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/golden/modules/blamelist-panel-sk/BUILD.bazel b/golden/modules/blamelist-panel-sk/BUILD.bazel
index d34db65..08b8311 100644
--- a/golden/modules/blamelist-panel-sk/BUILD.bazel
+++ b/golden/modules/blamelist-panel-sk/BUILD.bazel
@@ -10,7 +10,7 @@
         "//golden/modules:rpc_types_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "blamelist-panel-sk.ts",
diff --git a/golden/modules/blamelist-panel-sk/blamelist-panel-sk.ts b/golden/modules/blamelist-panel-sk/blamelist-panel-sk.ts
index 5c040f3..65483a6 100644
--- a/golden/modules/blamelist-panel-sk/blamelist-panel-sk.ts
+++ b/golden/modules/blamelist-panel-sk/blamelist-panel-sk.ts
@@ -8,7 +8,7 @@
  *
  * This should typically go into some sort of dialog to show the user.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { diffDate } from '../../../infra-sk/modules/human';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/golden/modules/bulk-triage-sk/BUILD.bazel b/golden/modules/bulk-triage-sk/BUILD.bazel
index b290cc1..6109c09 100644
--- a/golden/modules/bulk-triage-sk/BUILD.bazel
+++ b/golden/modules/bulk-triage-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//golden/modules:rpc_types_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "bulk-triage-sk.ts",
diff --git a/golden/modules/bulk-triage-sk/bulk-triage-sk.ts b/golden/modules/bulk-triage-sk/bulk-triage-sk.ts
index ccba162..58749f4 100644
--- a/golden/modules/bulk-triage-sk/bulk-triage-sk.ts
+++ b/golden/modules/bulk-triage-sk/bulk-triage-sk.ts
@@ -10,7 +10,7 @@
  * @evt bulk_triage_invoked - Sent just before the triage RPC is hit.
  * @evt bulk_triage_finished - Sent if the triage RPC returns success.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/golden/modules/byblame-page-sk/BUILD.bazel b/golden/modules/byblame-page-sk/BUILD.bazel
index 0bb1dcf..93479d6 100644
--- a/golden/modules/byblame-page-sk/BUILD.bazel
+++ b/golden/modules/byblame-page-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "byblame-page-sk.ts",
diff --git a/golden/modules/byblame-page-sk/byblame-page-sk.ts b/golden/modules/byblame-page-sk/byblame-page-sk.ts
index 961df47..89ded8f 100644
--- a/golden/modules/byblame-page-sk/byblame-page-sk.ts
+++ b/golden/modules/byblame-page-sk/byblame-page-sk.ts
@@ -6,7 +6,7 @@
  * (i.e. the blamelist or blame, for short).
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
diff --git a/golden/modules/byblameentry-sk/BUILD.bazel b/golden/modules/byblameentry-sk/BUILD.bazel
index 4eeb4d8..c3fed04 100644
--- a/golden/modules/byblameentry-sk/BUILD.bazel
+++ b/golden/modules/byblameentry-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//golden/modules:common_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "byblameentry-sk.ts",
diff --git a/golden/modules/byblameentry-sk/byblameentry-sk.ts b/golden/modules/byblameentry-sk/byblameentry-sk.ts
index 15b9646..6dbf7f2 100644
--- a/golden/modules/byblameentry-sk/byblameentry-sk.ts
+++ b/golden/modules/byblameentry-sk/byblameentry-sk.ts
@@ -7,7 +7,7 @@
  * that is, a blame group of untriaged digests.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { diffDate } from '../../../infra-sk/modules/human';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/golden/modules/changelist-controls-sk/BUILD.bazel b/golden/modules/changelist-controls-sk/BUILD.bazel
index 6ccd85a..ed130a2 100644
--- a/golden/modules/changelist-controls-sk/BUILD.bazel
+++ b/golden/modules/changelist-controls-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//infra-sk/modules:string_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "changelist-controls-sk.ts",
diff --git a/golden/modules/changelist-controls-sk/changelist-controls-sk.ts b/golden/modules/changelist-controls-sk/changelist-controls-sk.ts
index b0d782a..9defd6a 100644
--- a/golden/modules/changelist-controls-sk/changelist-controls-sk.ts
+++ b/golden/modules/changelist-controls-sk/changelist-controls-sk.ts
@@ -1,4 +1,4 @@
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { truncate } from '../../../infra-sk/modules/string';
diff --git a/golden/modules/changelists-page-sk/BUILD.bazel b/golden/modules/changelists-page-sk/BUILD.bazel
index e0e1186..eb484dd 100644
--- a/golden/modules/changelists-page-sk/BUILD.bazel
+++ b/golden/modules/changelists-page-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//infra-sk/modules:human_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "changelists-page-sk.ts",
diff --git a/golden/modules/changelists-page-sk/changelists-page-sk.ts b/golden/modules/changelists-page-sk/changelists-page-sk.ts
index a2b8e4b..6f805ad 100644
--- a/golden/modules/changelists-page-sk/changelists-page-sk.ts
+++ b/golden/modules/changelists-page-sk/changelists-page-sk.ts
@@ -6,7 +6,7 @@
  * data uploaded via TryJobs.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import * as human from '../../../infra-sk/modules/human';
 
 import { define } from '../../../elements-sk/modules/define';
diff --git a/golden/modules/cluster-digests-sk/BUILD.bazel b/golden/modules/cluster-digests-sk/BUILD.bazel
index 292fed7..3c539d7 100644
--- a/golden/modules/cluster-digests-sk/BUILD.bazel
+++ b/golden/modules/cluster-digests-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//:node_modules/@types/d3-selection",
         "//:node_modules/d3-force",
         "//:node_modules/d3-selection",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "cluster-digests-sk.ts",
diff --git a/golden/modules/cluster-digests-sk/cluster-digests-sk.ts b/golden/modules/cluster-digests-sk/cluster-digests-sk.ts
index a3af1df..f7d89cf 100644
--- a/golden/modules/cluster-digests-sk/cluster-digests-sk.ts
+++ b/golden/modules/cluster-digests-sk/cluster-digests-sk.ts
@@ -17,7 +17,7 @@
  *   contains a list of digests that are selected.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import * as d3Force from 'd3-force';
 import * as d3Select from 'd3-selection';
 import { SimulationLinkDatum, SimulationNodeDatum } from 'd3-force';
diff --git a/golden/modules/cluster-page-sk/BUILD.bazel b/golden/modules/cluster-page-sk/BUILD.bazel
index 96c28630..46376d5 100644
--- a/golden/modules/cluster-page-sk/BUILD.bazel
+++ b/golden/modules/cluster-page-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "cluster-page-sk.ts",
diff --git a/golden/modules/cluster-page-sk/cluster-page-sk.ts b/golden/modules/cluster-page-sk/cluster-page-sk.ts
index d9e5aa0..c1e708a 100644
--- a/golden/modules/cluster-page-sk/cluster-page-sk.ts
+++ b/golden/modules/cluster-page-sk/cluster-page-sk.ts
@@ -7,7 +7,7 @@
  *
  * It is a top level element.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
diff --git a/golden/modules/corpus-selector-sk/BUILD.bazel b/golden/modules/corpus-selector-sk/BUILD.bazel
index afba1ec..da52a46 100644
--- a/golden/modules/corpus-selector-sk/BUILD.bazel
+++ b/golden/modules/corpus-selector-sk/BUILD.bazel
@@ -9,7 +9,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "corpus-selector-sk.ts",
diff --git a/golden/modules/corpus-selector-sk/corpus-selector-sk.ts b/golden/modules/corpus-selector-sk/corpus-selector-sk.ts
index 442b50f..f45026f 100644
--- a/golden/modules/corpus-selector-sk/corpus-selector-sk.ts
+++ b/golden/modules/corpus-selector-sk/corpus-selector-sk.ts
@@ -10,7 +10,7 @@
  *                    selected corpus.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/golden/modules/details-page-sk/BUILD.bazel b/golden/modules/details-page-sk/BUILD.bazel
index b017aad..144fd11 100644
--- a/golden/modules/details-page-sk/BUILD.bazel
+++ b/golden/modules/details-page-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "details-page-sk.ts",
diff --git a/golden/modules/details-page-sk/details-page-sk.ts b/golden/modules/details-page-sk/details-page-sk.ts
index 080c350..3733b79 100644
--- a/golden/modules/details-page-sk/details-page-sk.ts
+++ b/golden/modules/details-page-sk/details-page-sk.ts
@@ -4,7 +4,7 @@
  *
  * Page to view details about a digest. This includes other digests similar to it and trace history.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
diff --git a/golden/modules/diff-page-sk/BUILD.bazel b/golden/modules/diff-page-sk/BUILD.bazel
index 261d338..3f6d6d8 100644
--- a/golden/modules/diff-page-sk/BUILD.bazel
+++ b/golden/modules/diff-page-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "diff-page-sk.ts",
diff --git a/golden/modules/diff-page-sk/diff-page-sk.ts b/golden/modules/diff-page-sk/diff-page-sk.ts
index 7721097..5147ab3 100644
--- a/golden/modules/diff-page-sk/diff-page-sk.ts
+++ b/golden/modules/diff-page-sk/diff-page-sk.ts
@@ -4,7 +4,7 @@
  *
  * Page to view a specific diff between two digests. This does not include trace data.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
diff --git a/golden/modules/digest-details-sk/BUILD.bazel b/golden/modules/digest-details-sk/BUILD.bazel
index d352885..ecc2cb2 100644
--- a/golden/modules/digest-details-sk/BUILD.bazel
+++ b/golden/modules/digest-details-sk/BUILD.bazel
@@ -33,7 +33,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:human_ts_lib",
         "//golden/modules:settings_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "digest-details-sk.ts",
diff --git a/golden/modules/digest-details-sk/digest-details-sk.ts b/golden/modules/digest-details-sk/digest-details-sk.ts
index f72bd04..e53660a 100644
--- a/golden/modules/digest-details-sk/digest-details-sk.ts
+++ b/golden/modules/digest-details-sk/digest-details-sk.ts
@@ -16,8 +16,8 @@
  *   the blamelist (an array of commits that could have made up that dot).
  *
  */
-import { html } from 'lit-html';
-import { unsafeHTML } from 'lit-html/directives/unsafe-html';
+import { html } from 'lit/html.js';
+import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { diffDate } from '../../../infra-sk/modules/human';
diff --git a/golden/modules/dots-legend-sk/BUILD.bazel b/golden/modules/dots-legend-sk/BUILD.bazel
index e1f473d..e823036 100644
--- a/golden/modules/dots-legend-sk/BUILD.bazel
+++ b/golden/modules/dots-legend-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//golden/modules:rpc_types_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "dots-legend-sk.ts",
diff --git a/golden/modules/dots-legend-sk/dots-legend-sk.ts b/golden/modules/dots-legend-sk/dots-legend-sk.ts
index e84a142..5f79022 100644
--- a/golden/modules/dots-legend-sk/dots-legend-sk.ts
+++ b/golden/modules/dots-legend-sk/dots-legend-sk.ts
@@ -5,7 +5,7 @@
  * A legend for the dots-sk element.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import {
diff --git a/golden/modules/dots-sk/BUILD.bazel b/golden/modules/dots-sk/BUILD.bazel
index 4b20c80..7dfa414 100644
--- a/golden/modules/dots-sk/BUILD.bazel
+++ b/golden/modules/dots-sk/BUILD.bazel
@@ -27,7 +27,7 @@
         ":constants_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "dots-sk.ts",
diff --git a/golden/modules/dots-sk/dots-sk.ts b/golden/modules/dots-sk/dots-sk.ts
index 604a395..eab2dd1 100644
--- a/golden/modules/dots-sk/dots-sk.ts
+++ b/golden/modules/dots-sk/dots-sk.ts
@@ -13,7 +13,7 @@
  *   the trace id.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/golden/modules/edit-ignore-rule-sk/BUILD.bazel b/golden/modules/edit-ignore-rule-sk/BUILD.bazel
index 8239c7e..23cc4ea 100644
--- a/golden/modules/edit-ignore-rule-sk/BUILD.bazel
+++ b/golden/modules/edit-ignore-rule-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "edit-ignore-rule-sk.ts",
diff --git a/golden/modules/edit-ignore-rule-sk/edit-ignore-rule-sk.ts b/golden/modules/edit-ignore-rule-sk/edit-ignore-rule-sk.ts
index d21db42..f6bf7f0 100644
--- a/golden/modules/edit-ignore-rule-sk/edit-ignore-rule-sk.ts
+++ b/golden/modules/edit-ignore-rule-sk/edit-ignore-rule-sk.ts
@@ -8,7 +8,7 @@
  * TODO(kjlubick) Add client-side validation of expires values.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { diffDate } from '../../../infra-sk/modules/human';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/golden/modules/filter-dialog-sk/BUILD.bazel b/golden/modules/filter-dialog-sk/BUILD.bazel
index ffe6c60..e8a8945 100644
--- a/golden/modules/filter-dialog-sk/BUILD.bazel
+++ b/golden/modules/filter-dialog-sk/BUILD.bazel
@@ -20,7 +20,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:object_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "filter-dialog-sk.ts",
diff --git a/golden/modules/filter-dialog-sk/filter-dialog-sk.ts b/golden/modules/filter-dialog-sk/filter-dialog-sk.ts
index 8465e13..369a5a1 100644
--- a/golden/modules/filter-dialog-sk/filter-dialog-sk.ts
+++ b/golden/modules/filter-dialog-sk/filter-dialog-sk.ts
@@ -9,8 +9,8 @@
  *         The "detail" field of the event contains the filter values entered by the user.
  */
 
-import { html } from 'lit-html';
-import { live } from 'lit-html/directives/live';
+import { html } from 'lit/html.js';
+import { live } from 'lit/directives/live.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { deepCopy } from '../../../infra-sk/modules/object';
diff --git a/golden/modules/gold-scaffold-sk/BUILD.bazel b/golden/modules/gold-scaffold-sk/BUILD.bazel
index d93cab7..56dbe06 100644
--- a/golden/modules/gold-scaffold-sk/BUILD.bazel
+++ b/golden/modules/gold-scaffold-sk/BUILD.bazel
@@ -35,7 +35,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "gold-scaffold-sk.ts",
diff --git a/golden/modules/gold-scaffold-sk/gold-scaffold-sk.ts b/golden/modules/gold-scaffold-sk/gold-scaffold-sk.ts
index 102912b..b411669 100644
--- a/golden/modules/gold-scaffold-sk/gold-scaffold-sk.ts
+++ b/golden/modules/gold-scaffold-sk/gold-scaffold-sk.ts
@@ -12,7 +12,7 @@
  *
  * @attr {boolean} testing_offline - If we should operate entirely in offline mode.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { SpinnerSk } from '../../../elements-sk/modules/spinner-sk/spinner-sk';
diff --git a/golden/modules/ignores-page-sk/BUILD.bazel b/golden/modules/ignores-page-sk/BUILD.bazel
index 2d5d02b..a40da35 100644
--- a/golden/modules/ignores-page-sk/BUILD.bazel
+++ b/golden/modules/ignores-page-sk/BUILD.bazel
@@ -30,7 +30,7 @@
         "//infra-sk/modules:human_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "ignores-page-sk.ts",
diff --git a/golden/modules/ignores-page-sk/ignores-page-sk.ts b/golden/modules/ignores-page-sk/ignores-page-sk.ts
index 7250dd1..c38062e 100644
--- a/golden/modules/ignores-page-sk/ignores-page-sk.ts
+++ b/golden/modules/ignores-page-sk/ignores-page-sk.ts
@@ -5,8 +5,8 @@
  * Page to view/edit/delete ignore rules.
  */
 
-import { classMap } from 'lit-html/directives/class-map';
-import { html } from 'lit-html';
+import { classMap } from 'lit/directives/class-map.js';
+import { html } from 'lit/html.js';
 import * as human from '../../../infra-sk/modules/human';
 
 import { define } from '../../../elements-sk/modules/define';
diff --git a/golden/modules/image-compare-sk/BUILD.bazel b/golden/modules/image-compare-sk/BUILD.bazel
index 7a1c09b..125b5a3 100644
--- a/golden/modules/image-compare-sk/BUILD.bazel
+++ b/golden/modules/image-compare-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//golden/modules:common_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "image-compare-sk.ts",
diff --git a/golden/modules/image-compare-sk/image-compare-sk.ts b/golden/modules/image-compare-sk/image-compare-sk.ts
index c0202b9..c4cd685 100644
--- a/golden/modules/image-compare-sk/image-compare-sk.ts
+++ b/golden/modules/image-compare-sk/image-compare-sk.ts
@@ -6,7 +6,7 @@
  * only display one.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { MultiZoomSk } from '../multi-zoom-sk/multi-zoom-sk';
diff --git a/golden/modules/last-commit-sk/BUILD.bazel b/golden/modules/last-commit-sk/BUILD.bazel
index 4e562d8..f8030b3 100644
--- a/golden/modules/last-commit-sk/BUILD.bazel
+++ b/golden/modules/last-commit-sk/BUILD.bazel
@@ -24,7 +24,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/last-commit-sk/last-commit-sk.ts b/golden/modules/last-commit-sk/last-commit-sk.ts
index 790df65..3ff814a 100644
--- a/golden/modules/last-commit-sk/last-commit-sk.ts
+++ b/golden/modules/last-commit-sk/last-commit-sk.ts
@@ -6,7 +6,7 @@
  * ingested for it. If there are any network errors, it will log them and retry.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/golden/modules/list-page-sk/BUILD.bazel b/golden/modules/list-page-sk/BUILD.bazel
index 5a8f87e..7efc714 100644
--- a/golden/modules/list-page-sk/BUILD.bazel
+++ b/golden/modules/list-page-sk/BUILD.bazel
@@ -29,7 +29,7 @@
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/list-page-sk/list-page-sk.ts b/golden/modules/list-page-sk/list-page-sk.ts
index 1d66546..ac89093 100644
--- a/golden/modules/list-page-sk/list-page-sk.ts
+++ b/golden/modules/list-page-sk/list-page-sk.ts
@@ -7,7 +7,7 @@
  *
  * It is a top level element.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/golden/modules/multi-zoom-sk/BUILD.bazel b/golden/modules/multi-zoom-sk/BUILD.bazel
index 419c0d5..e6fe505 100644
--- a/golden/modules/multi-zoom-sk/BUILD.bazel
+++ b/golden/modules/multi-zoom-sk/BUILD.bazel
@@ -17,7 +17,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/multi-zoom-sk/multi-zoom-sk.ts b/golden/modules/multi-zoom-sk/multi-zoom-sk.ts
index 92717e0..84740ca 100644
--- a/golden/modules/multi-zoom-sk/multi-zoom-sk.ts
+++ b/golden/modules/multi-zoom-sk/multi-zoom-sk.ts
@@ -10,7 +10,7 @@
  *
  * It should typically be wrapped in a dialog tag.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/golden/modules/pagination-sk/BUILD.bazel b/golden/modules/pagination-sk/BUILD.bazel
index 8e5ea12..4f8457a 100644
--- a/golden/modules/pagination-sk/BUILD.bazel
+++ b/golden/modules/pagination-sk/BUILD.bazel
@@ -10,7 +10,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/pagination-sk/pagination-sk.ts b/golden/modules/pagination-sk/pagination-sk.ts
index bb33d4c..35243d3 100644
--- a/golden/modules/pagination-sk/pagination-sk.ts
+++ b/golden/modules/pagination-sk/pagination-sk.ts
@@ -18,7 +18,7 @@
  *       e.detail.delta for how many pages changed and which direction.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/golden/modules/query-dialog-sk/BUILD.bazel b/golden/modules/query-dialog-sk/BUILD.bazel
index 5fa0427..a056fce 100644
--- a/golden/modules/query-dialog-sk/BUILD.bazel
+++ b/golden/modules/query-dialog-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/query-dialog-sk/query-dialog-sk.ts b/golden/modules/query-dialog-sk/query-dialog-sk.ts
index ea11f45..6197fe0 100644
--- a/golden/modules/query-dialog-sk/query-dialog-sk.ts
+++ b/golden/modules/query-dialog-sk/query-dialog-sk.ts
@@ -15,7 +15,7 @@
  *         the url-encoded selections.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { ParamSet, toParamSet } from '../../../infra-sk/modules/query';
diff --git a/golden/modules/search-controls-sk/BUILD.bazel b/golden/modules/search-controls-sk/BUILD.bazel
index d015bca..6a4ffce 100644
--- a/golden/modules/search-controls-sk/BUILD.bazel
+++ b/golden/modules/search-controls-sk/BUILD.bazel
@@ -23,7 +23,7 @@
         "//infra-sk/modules:hintable_ts_lib",
         "//infra-sk/modules:object_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/search-controls-sk/search-controls-sk.ts b/golden/modules/search-controls-sk/search-controls-sk.ts
index 46859dc..cf98442 100644
--- a/golden/modules/search-controls-sk/search-controls-sk.ts
+++ b/golden/modules/search-controls-sk/search-controls-sk.ts
@@ -7,8 +7,8 @@
  * Events:
  *   search-controls-sk-change: Emitted when the user changes the search criteria.
  */
-import { html } from 'lit-html';
-import { live } from 'lit-html/directives/live';
+import { html } from 'lit/html.js';
+import { live } from 'lit/directives/live.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import { deepCopy } from '../../../infra-sk/modules/object';
diff --git a/golden/modules/search-page-sk/BUILD.bazel b/golden/modules/search-page-sk/BUILD.bazel
index dfbfbd0..e35ed26 100644
--- a/golden/modules/search-page-sk/BUILD.bazel
+++ b/golden/modules/search-page-sk/BUILD.bazel
@@ -37,7 +37,7 @@
         "//infra-sk/modules:object_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/search-page-sk/search-page-sk.ts b/golden/modules/search-page-sk/search-page-sk.ts
index 0aeb8fb..0492076 100644
--- a/golden/modules/search-page-sk/search-page-sk.ts
+++ b/golden/modules/search-page-sk/search-page-sk.ts
@@ -3,7 +3,7 @@
  * @description <h2><code>search-page-sk</code></h2>
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { deepCopy } from '../../../infra-sk/modules/object';
diff --git a/golden/modules/sort-toggle-sk/BUILD.bazel b/golden/modules/sort-toggle-sk/BUILD.bazel
index d437ce6..28973ed 100644
--- a/golden/modules/sort-toggle-sk/BUILD.bazel
+++ b/golden/modules/sort-toggle-sk/BUILD.bazel
@@ -30,7 +30,7 @@
     sk_element_deps = [":sort-toggle-sk"],
     ts_deps = [
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_entry_point = "sort-toggle-sk-demo.ts",
 )
diff --git a/golden/modules/sort-toggle-sk/sort-toggle-sk-demo.ts b/golden/modules/sort-toggle-sk/sort-toggle-sk-demo.ts
index f9d918d..c005e6e 100644
--- a/golden/modules/sort-toggle-sk/sort-toggle-sk-demo.ts
+++ b/golden/modules/sort-toggle-sk/sort-toggle-sk-demo.ts
@@ -1,6 +1,6 @@
 import './index';
-import { html, render } from 'lit-html';
-import { repeat } from 'lit-html/directives/repeat';
+import { html, render } from 'lit/html.js';
+import { repeat } from 'lit/directives/repeat.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { SortToggleSk } from './sort-toggle-sk';
 
@@ -62,7 +62,7 @@
 </sort-toggle-sk>`;
 
 function renderTemplates() {
-  render(usingMap, $$('#container')!);
+  render(usingMap, $$<HTMLElement>('#container')!);
 }
 
 renderTemplates();
diff --git a/golden/modules/trace-filter-sk/BUILD.bazel b/golden/modules/trace-filter-sk/BUILD.bazel
index 8b70f9a..88450ee 100644
--- a/golden/modules/trace-filter-sk/BUILD.bazel
+++ b/golden/modules/trace-filter-sk/BUILD.bazel
@@ -19,7 +19,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/trace-filter-sk/trace-filter-sk.ts b/golden/modules/trace-filter-sk/trace-filter-sk.ts
index fb49753..f3280a2 100644
--- a/golden/modules/trace-filter-sk/trace-filter-sk.ts
+++ b/golden/modules/trace-filter-sk/trace-filter-sk.ts
@@ -10,7 +10,7 @@
  *                           contains the new ParamSet.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import {
   ParamSet,
diff --git a/golden/modules/triage-sk/BUILD.bazel b/golden/modules/triage-sk/BUILD.bazel
index d9120ef..c2eb5af 100644
--- a/golden/modules/triage-sk/BUILD.bazel
+++ b/golden/modules/triage-sk/BUILD.bazel
@@ -23,7 +23,7 @@
         "//golden/modules:rpc_types_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/triage-sk/triage-sk.ts b/golden/modules/triage-sk/triage-sk.ts
index cde86c1..fdca056 100644
--- a/golden/modules/triage-sk/triage-sk.ts
+++ b/golden/modules/triage-sk/triage-sk.ts
@@ -13,7 +13,7 @@
 import '../../../elements-sk/modules/icons/check-circle-icon-sk';
 import '../../../elements-sk/modules/icons/cancel-icon-sk';
 import '../../../elements-sk/modules/icons/help-icon-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { Label } from '../rpc_types';
diff --git a/golden/modules/triagelog-page-sk/BUILD.bazel b/golden/modules/triagelog-page-sk/BUILD.bazel
index 6a356fd..44ddfa2 100644
--- a/golden/modules/triagelog-page-sk/BUILD.bazel
+++ b/golden/modules/triagelog-page-sk/BUILD.bazel
@@ -36,7 +36,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/golden/modules/triagelog-page-sk/triagelog-page-sk.ts b/golden/modules/triagelog-page-sk/triagelog-page-sk.ts
index be365e1..4773fa6 100644
--- a/golden/modules/triagelog-page-sk/triagelog-page-sk.ts
+++ b/golden/modules/triagelog-page-sk/triagelog-page-sk.ts
@@ -6,7 +6,7 @@
  * labels applied to triaged diffs.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/checkbox-sk';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/infra-sk/modules/ElementSk/BUILD.bazel b/infra-sk/modules/ElementSk/BUILD.bazel
index 0af09ba..cf1d217 100644
--- a/infra-sk/modules/ElementSk/BUILD.bazel
+++ b/infra-sk/modules/ElementSk/BUILD.bazel
@@ -7,7 +7,7 @@
         ":elementsk_ts_lib",
         "//:node_modules/@types/chai",
         "//:node_modules/chai",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//elements-sk/modules:define_ts_lib",
     ],
 )
@@ -17,7 +17,7 @@
     srcs = ["ElementSk.ts"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//elements-sk/modules:upgradeproperty_ts_lib",
     ],
 )
diff --git a/infra-sk/modules/ElementSk/ElementSk.ts b/infra-sk/modules/ElementSk/ElementSk.ts
index 9733ed8..b4ea39d 100644
--- a/infra-sk/modules/ElementSk/ElementSk.ts
+++ b/infra-sk/modules/ElementSk/ElementSk.ts
@@ -3,7 +3,7 @@
  * @description <h2><code>ElementSk</code></h2>
  *
  */
-import { render } from 'lit-html';
+import { render } from 'lit/html.js';
 import { upgradeProperty } from '../../../elements-sk/modules/upgradeProperty';
 
 /**
@@ -67,7 +67,7 @@
    */
   protected _render() {
     if (this._connected && !!this._template) {
-      render(this._template(this), this, { eventContext: this });
+      render(this._template(this), this, { host: this });
     }
   }
 }
diff --git a/infra-sk/modules/ElementSk/ElementSk_test.ts b/infra-sk/modules/ElementSk/ElementSk_test.ts
index de3fdea..1ee7b32 100644
--- a/infra-sk/modules/ElementSk/ElementSk_test.ts
+++ b/infra-sk/modules/ElementSk/ElementSk_test.ts
@@ -1,4 +1,4 @@
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { assert } from 'chai';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from './ElementSk';
diff --git a/infra-sk/modules/alogin-sk/BUILD.bazel b/infra-sk/modules/alogin-sk/BUILD.bazel
index 33b06b5..e9de2ae 100644
--- a/infra-sk/modules/alogin-sk/BUILD.bazel
+++ b/infra-sk/modules/alogin-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules/url:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "alogin-sk.ts",
diff --git a/infra-sk/modules/alogin-sk/alogin-sk.ts b/infra-sk/modules/alogin-sk/alogin-sk.ts
index 19edba0..bf9009c 100644
--- a/infra-sk/modules/alogin-sk/alogin-sk.ts
+++ b/infra-sk/modules/alogin-sk/alogin-sk.ts
@@ -9,7 +9,7 @@
  *
  * @attr {string} url - The url that returns the JSON serialized alogin.Status response.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { ElementSk } from '../ElementSk';
diff --git a/infra-sk/modules/autogrow-textarea-sk/BUILD.bazel b/infra-sk/modules/autogrow-textarea-sk/BUILD.bazel
index dac70f8..5717e4b 100644
--- a/infra-sk/modules/autogrow-textarea-sk/BUILD.bazel
+++ b/infra-sk/modules/autogrow-textarea-sk/BUILD.bazel
@@ -12,7 +12,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "autogrow-textarea-sk.ts",
diff --git a/infra-sk/modules/autogrow-textarea-sk/autogrow-textarea-sk.ts b/infra-sk/modules/autogrow-textarea-sk/autogrow-textarea-sk.ts
index 68344bc..9342980 100644
--- a/infra-sk/modules/autogrow-textarea-sk/autogrow-textarea-sk.ts
+++ b/infra-sk/modules/autogrow-textarea-sk/autogrow-textarea-sk.ts
@@ -8,7 +8,7 @@
  * @attr {number} minRows - Minimum (and initial) rows in the textarea.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import { ElementSk } from '../ElementSk';
diff --git a/infra-sk/modules/clipboard-sk/BUILD.bazel b/infra-sk/modules/clipboard-sk/BUILD.bazel
index 7948bfe..6cf0bf6 100644
--- a/infra-sk/modules/clipboard-sk/BUILD.bazel
+++ b/infra-sk/modules/clipboard-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "clipboard-sk.ts",
diff --git a/infra-sk/modules/clipboard-sk/clipboard-sk.ts b/infra-sk/modules/clipboard-sk/clipboard-sk.ts
index 953e5ab..aa62036 100644
--- a/infra-sk/modules/clipboard-sk/clipboard-sk.ts
+++ b/infra-sk/modules/clipboard-sk/clipboard-sk.ts
@@ -12,7 +12,7 @@
  * @attr value - The content to put into the clipboard.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../dom';
 import { ElementSk } from '../ElementSk';
diff --git a/infra-sk/modules/confirm-dialog-sk/BUILD.bazel b/infra-sk/modules/confirm-dialog-sk/BUILD.bazel
index 6df3e6a..ad3bea4 100644
--- a/infra-sk/modules/confirm-dialog-sk/BUILD.bazel
+++ b/infra-sk/modules/confirm-dialog-sk/BUILD.bazel
@@ -6,7 +6,7 @@
     sass_srcs = ["confirm-dialog-sk.scss"],
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "confirm-dialog-sk.ts",
diff --git a/infra-sk/modules/confirm-dialog-sk/confirm-dialog-sk.ts b/infra-sk/modules/confirm-dialog-sk/confirm-dialog-sk.ts
index 28c1240..8aa32ab 100644
--- a/infra-sk/modules/confirm-dialog-sk/confirm-dialog-sk.ts
+++ b/infra-sk/modules/confirm-dialog-sk/confirm-dialog-sk.ts
@@ -22,7 +22,7 @@
  * </script>
  *
  */
-import { html, render } from 'lit-html';
+import { html, render } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 export class ConfirmDialogSk extends HTMLElement {
@@ -77,7 +77,7 @@
   }
 
   private render() {
-    render(ConfirmDialogSk.template(this), this, { eventContext: this });
+    render(ConfirmDialogSk.template(this), this, { host: this });
   }
 }
 
diff --git a/infra-sk/modules/expandable-textarea-sk/BUILD.bazel b/infra-sk/modules/expandable-textarea-sk/BUILD.bazel
index caabca8..3ad3b58 100644
--- a/infra-sk/modules/expandable-textarea-sk/BUILD.bazel
+++ b/infra-sk/modules/expandable-textarea-sk/BUILD.bazel
@@ -18,7 +18,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "expandable-textarea-sk.ts",
diff --git a/infra-sk/modules/expandable-textarea-sk/expandable-textarea-sk.ts b/infra-sk/modules/expandable-textarea-sk/expandable-textarea-sk.ts
index f16857f..f3cfdb2 100644
--- a/infra-sk/modules/expandable-textarea-sk/expandable-textarea-sk.ts
+++ b/infra-sk/modules/expandable-textarea-sk/expandable-textarea-sk.ts
@@ -11,7 +11,7 @@
  * @attr {number} minRows - Minimum (and initial) rows in the textarea.
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import '../autogrow-textarea-sk';
diff --git a/infra-sk/modules/human-date-sk/BUILD.bazel b/infra-sk/modules/human-date-sk/BUILD.bazel
index 696f5f7..73bc4b2 100644
--- a/infra-sk/modules/human-date-sk/BUILD.bazel
+++ b/infra-sk/modules/human-date-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:upgradeproperty_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "human-date-sk.ts",
diff --git a/infra-sk/modules/human-date-sk/human-date-sk.ts b/infra-sk/modules/human-date-sk/human-date-sk.ts
index 82d7671..adb2c4b 100644
--- a/infra-sk/modules/human-date-sk/human-date-sk.ts
+++ b/infra-sk/modules/human-date-sk/human-date-sk.ts
@@ -10,7 +10,7 @@
  * @property seconds - Indicates that the given date is expressed in seconds, not milliseconds.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { diffDate } from '../human';
 import { upgradeProperty } from '../../../elements-sk/modules/upgradeProperty';
diff --git a/infra-sk/modules/multi-input-sk/BUILD.bazel b/infra-sk/modules/multi-input-sk/BUILD.bazel
index c710391..d6c4130 100644
--- a/infra-sk/modules/multi-input-sk/BUILD.bazel
+++ b/infra-sk/modules/multi-input-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/multi-input-sk/multi-input-sk.ts b/infra-sk/modules/multi-input-sk/multi-input-sk.ts
index e475b35..a86a22f 100644
--- a/infra-sk/modules/multi-input-sk/multi-input-sk.ts
+++ b/infra-sk/modules/multi-input-sk/multi-input-sk.ts
@@ -5,7 +5,7 @@
  * multi-input-sk behaves similarly to <input type="text"> but its value is a
  * string[].
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../dom';
 import { ElementSk } from '../ElementSk';
diff --git a/infra-sk/modules/paramset-sk/BUILD.bazel b/infra-sk/modules/paramset-sk/BUILD.bazel
index 27c5b38..37acd8d 100644
--- a/infra-sk/modules/paramset-sk/BUILD.bazel
+++ b/infra-sk/modules/paramset-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/paramset-sk/paramset-sk.ts b/infra-sk/modules/paramset-sk/paramset-sk.ts
index 7cd58f6..21ca028 100644
--- a/infra-sk/modules/paramset-sk/paramset-sk.ts
+++ b/infra-sk/modules/paramset-sk/paramset-sk.ts
@@ -72,7 +72,7 @@
  * a checkbox to let the user select/unselect the specific value.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ParamSet } from '../query';
 import { ElementSk } from '../ElementSk';
diff --git a/infra-sk/modules/query-sk/BUILD.bazel b/infra-sk/modules/query-sk/BUILD.bazel
index a3264f4..f8e541d 100644
--- a/infra-sk/modules/query-sk/BUILD.bazel
+++ b/infra-sk/modules/query-sk/BUILD.bazel
@@ -20,7 +20,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/query-sk/query-sk.ts b/infra-sk/modules/query-sk/query-sk.ts
index e1446f2..b2a5341 100644
--- a/infra-sk/modules/query-sk/query-sk.ts
+++ b/infra-sk/modules/query-sk/query-sk.ts
@@ -18,7 +18,7 @@
  *       available to the user.
  * @attr {boolean} values_only - If true then only display the values selection and hide the key selection.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ParamSet, toParamSet, fromParamSet } from '../query';
 import { SelectSk } from '../../../elements-sk/modules/select-sk/select-sk';
diff --git a/infra-sk/modules/query-values-sk/BUILD.bazel b/infra-sk/modules/query-values-sk/BUILD.bazel
index 12892f1..f38b4e9 100644
--- a/infra-sk/modules/query-values-sk/BUILD.bazel
+++ b/infra-sk/modules/query-values-sk/BUILD.bazel
@@ -16,7 +16,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/query-values-sk/query-values-sk.ts b/infra-sk/modules/query-values-sk/query-values-sk.ts
index 368e327..6351161 100644
--- a/infra-sk/modules/query-values-sk/query-values-sk.ts
+++ b/infra-sk/modules/query-values-sk/query-values-sk.ts
@@ -13,7 +13,7 @@
  * @attr {boolean} hide_regex - If the option to include regex in the query should be made
  *       available to the user.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { CheckOrRadio } from '../../../elements-sk/modules/checkbox-sk/checkbox-sk';
 import {
diff --git a/infra-sk/modules/task-driver-sk/BUILD.bazel b/infra-sk/modules/task-driver-sk/BUILD.bazel
index 16e7c91..aae63de 100644
--- a/infra-sk/modules/task-driver-sk/BUILD.bazel
+++ b/infra-sk/modules/task-driver-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:upgradeproperty_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/task-driver-sk/task-driver-sk.ts b/infra-sk/modules/task-driver-sk/task-driver-sk.ts
index 51eba6d..bcce4c4 100644
--- a/infra-sk/modules/task-driver-sk/task-driver-sk.ts
+++ b/infra-sk/modules/task-driver-sk/task-driver-sk.ts
@@ -7,7 +7,7 @@
  * </p>
  *
  */
-import { html, render } from 'lit-html';
+import { html, render } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { localeTime, strDuration } from '../human';
 import { upgradeProperty } from '../../../elements-sk/modules/upgradeProperty';
@@ -403,7 +403,7 @@
   }
 
   private render() {
-    render(TaskDriverSk.template(this), this, { eventContext: this });
+    render(TaskDriverSk.template(this), this, { host: this });
   }
 
   private stepClass(s: StepDisplay): string {
diff --git a/infra-sk/modules/theme-chooser-sk/BUILD.bazel b/infra-sk/modules/theme-chooser-sk/BUILD.bazel
index 5e54e17..80f19ce 100644
--- a/infra-sk/modules/theme-chooser-sk/BUILD.bazel
+++ b/infra-sk/modules/theme-chooser-sk/BUILD.bazel
@@ -16,7 +16,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
@@ -61,7 +61,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:gentheme_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_entry_point = "theme-chooser-sk-demo.ts",
 )
diff --git a/infra-sk/modules/theme-chooser-sk/theme-chooser-sk-demo.ts b/infra-sk/modules/theme-chooser-sk/theme-chooser-sk-demo.ts
index 9f0fb73..ad0b420 100644
--- a/infra-sk/modules/theme-chooser-sk/theme-chooser-sk-demo.ts
+++ b/infra-sk/modules/theme-chooser-sk/theme-chooser-sk-demo.ts
@@ -1,4 +1,4 @@
-import { render, html, TemplateResult } from 'lit-html';
+import { render, html, TemplateResult } from 'lit/html.js';
 import { DARKMODE_LOCALSTORAGE_KEY } from './theme-chooser-sk';
 import { CollapseSk } from '../../../elements-sk/modules/collapse-sk/collapse-sk';
 import { ToastSk } from '../../../elements-sk/modules/toast-sk/toast-sk';
@@ -182,9 +182,12 @@
   )}
 `;
 
-render(template(examples), document.querySelector('#demotable')!);
+render(template(examples), document.querySelector<HTMLElement>('#demotable')!);
 
-render(template(specialty), document.querySelector('#demotable2')!);
+render(
+  template(specialty),
+  document.querySelector<HTMLElement>('#demotable2')!
+);
 
 document.querySelector('#toggle-collapse-sk')?.addEventListener('click', () => {
   const collapseSk = document.querySelector<CollapseSk>('collapse-sk')!;
diff --git a/infra-sk/modules/theme-chooser-sk/theme-chooser-sk.ts b/infra-sk/modules/theme-chooser-sk/theme-chooser-sk.ts
index dcb079a..75c7077 100644
--- a/infra-sk/modules/theme-chooser-sk/theme-chooser-sk.ts
+++ b/infra-sk/modules/theme-chooser-sk/theme-chooser-sk.ts
@@ -26,7 +26,7 @@
  *   </pre>
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../ElementSk';
 import '../../../elements-sk/modules/icons/invert-colors-icon-sk';
diff --git a/infra-sk/modules/tooltip-sk/BUILD.bazel b/infra-sk/modules/tooltip-sk/BUILD.bazel
index 3bd7a04..e550a35 100644
--- a/infra-sk/modules/tooltip-sk/BUILD.bazel
+++ b/infra-sk/modules/tooltip-sk/BUILD.bazel
@@ -12,7 +12,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "tooltip-sk.ts",
diff --git a/infra-sk/modules/tooltip-sk/tooltip-sk.ts b/infra-sk/modules/tooltip-sk/tooltip-sk.ts
index dbc8317..d30f5c0 100644
--- a/infra-sk/modules/tooltip-sk/tooltip-sk.ts
+++ b/infra-sk/modules/tooltip-sk/tooltip-sk.ts
@@ -12,7 +12,7 @@
  * @attr value - The text to display.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../ElementSk';
 
diff --git a/infra-sk/modules/uniform-color-sk/BUILD.bazel b/infra-sk/modules/uniform-color-sk/BUILD.bazel
index fd86657..caf3e83 100644
--- a/infra-sk/modules/uniform-color-sk/BUILD.bazel
+++ b/infra-sk/modules/uniform-color-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//infra-sk/modules/uniform:uniform_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/uniform-color-sk/uniform-color-sk.ts b/infra-sk/modules/uniform-color-sk/uniform-color-sk.ts
index 1e84bd2..5132614 100644
--- a/infra-sk/modules/uniform-color-sk/uniform-color-sk.ts
+++ b/infra-sk/modules/uniform-color-sk/uniform-color-sk.ts
@@ -7,7 +7,7 @@
  *
  * The color uniform values are floats in [0, 1] and are in RGB order.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$ } from '../dom';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../ElementSk';
diff --git a/infra-sk/modules/uniform-dimensions-sk/BUILD.bazel b/infra-sk/modules/uniform-dimensions-sk/BUILD.bazel
index 46a7170..dba85bd 100644
--- a/infra-sk/modules/uniform-dimensions-sk/BUILD.bazel
+++ b/infra-sk/modules/uniform-dimensions-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//infra-sk/modules/uniform:uniform_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/uniform-dimensions-sk/uniform-dimensions-sk.ts b/infra-sk/modules/uniform-dimensions-sk/uniform-dimensions-sk.ts
index 0cd4fd1..672f995 100644
--- a/infra-sk/modules/uniform-dimensions-sk/uniform-dimensions-sk.ts
+++ b/infra-sk/modules/uniform-dimensions-sk/uniform-dimensions-sk.ts
@@ -10,7 +10,7 @@
  *
  * Emits a `dimensions-changed` event when the user has changed the dimensions.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../ElementSk';
 import { Uniform, UniformControl } from '../uniform/uniform';
diff --git a/infra-sk/modules/uniform-fps-sk/BUILD.bazel b/infra-sk/modules/uniform-fps-sk/BUILD.bazel
index b25403b..7494a56 100644
--- a/infra-sk/modules/uniform-fps-sk/BUILD.bazel
+++ b/infra-sk/modules/uniform-fps-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//infra-sk/modules/fps:fps_ts_lib",
         "//infra-sk/modules/uniform:uniform_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/uniform-fps-sk/uniform-fps-sk.ts b/infra-sk/modules/uniform-fps-sk/uniform-fps-sk.ts
index d0963d6..03f2dde 100644
--- a/infra-sk/modules/uniform-fps-sk/uniform-fps-sk.ts
+++ b/infra-sk/modules/uniform-fps-sk/uniform-fps-sk.ts
@@ -4,7 +4,7 @@
  *
  * Displays the frames per second.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../ElementSk';
 import { FPS } from '../fps/fps';
diff --git a/infra-sk/modules/uniform-generic-sk/BUILD.bazel b/infra-sk/modules/uniform-generic-sk/BUILD.bazel
index 38476db..1ddeab9 100644
--- a/infra-sk/modules/uniform-generic-sk/BUILD.bazel
+++ b/infra-sk/modules/uniform-generic-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//infra-sk/modules/uniform:uniform_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/uniform-generic-sk/uniform-generic-sk.ts b/infra-sk/modules/uniform-generic-sk/uniform-generic-sk.ts
index dfd5c85..d8f9240 100644
--- a/infra-sk/modules/uniform-generic-sk/uniform-generic-sk.ts
+++ b/infra-sk/modules/uniform-generic-sk/uniform-generic-sk.ts
@@ -6,7 +6,7 @@
  *
  * Simply displays number input controls in a table.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { $$ } from '../dom';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../ElementSk';
diff --git a/infra-sk/modules/uniform-slider-sk/BUILD.bazel b/infra-sk/modules/uniform-slider-sk/BUILD.bazel
index 1b7f3f5..d497bf2 100644
--- a/infra-sk/modules/uniform-slider-sk/BUILD.bazel
+++ b/infra-sk/modules/uniform-slider-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//infra-sk/modules/uniform:uniform_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/uniform-slider-sk/uniform-slider-sk.ts b/infra-sk/modules/uniform-slider-sk/uniform-slider-sk.ts
index 0a14f60..86e108b 100644
--- a/infra-sk/modules/uniform-slider-sk/uniform-slider-sk.ts
+++ b/infra-sk/modules/uniform-slider-sk/uniform-slider-sk.ts
@@ -4,7 +4,7 @@
  *
  * Constructs a single slider for a single float uniform.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$ } from '../dom';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../ElementSk';
diff --git a/infra-sk/modules/uniform-time-sk/BUILD.bazel b/infra-sk/modules/uniform-time-sk/BUILD.bazel
index d62c47f..3121257 100644
--- a/infra-sk/modules/uniform-time-sk/BUILD.bazel
+++ b/infra-sk/modules/uniform-time-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//infra-sk/modules/uniform:uniform_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/infra-sk/modules/uniform-time-sk/uniform-time-sk.ts b/infra-sk/modules/uniform-time-sk/uniform-time-sk.ts
index 67a26af..37c53d0 100644
--- a/infra-sk/modules/uniform-time-sk/uniform-time-sk.ts
+++ b/infra-sk/modules/uniform-time-sk/uniform-time-sk.ts
@@ -6,7 +6,7 @@
  *
  * Displays the play/pause and rewind buttons.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../ElementSk';
 import '../../../elements-sk/modules/icons/play-arrow-icon-sk';
diff --git a/jsfiddle/modules/canvaskit-fiddle-sk/BUILD.bazel b/jsfiddle/modules/canvaskit-fiddle-sk/BUILD.bazel
index d5f0bc3..374f1d3 100644
--- a/jsfiddle/modules/canvaskit-fiddle-sk/BUILD.bazel
+++ b/jsfiddle/modules/canvaskit-fiddle-sk/BUILD.bazel
@@ -11,7 +11,7 @@
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
         "//:node_modules/canvaskit-wasm",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "canvaskit-fiddle-sk.ts",
diff --git a/jsfiddle/modules/canvaskit-fiddle-sk/canvaskit-fiddle-sk.ts b/jsfiddle/modules/canvaskit-fiddle-sk/canvaskit-fiddle-sk.ts
index 1709341..52c2283 100644
--- a/jsfiddle/modules/canvaskit-fiddle-sk/canvaskit-fiddle-sk.ts
+++ b/jsfiddle/modules/canvaskit-fiddle-sk/canvaskit-fiddle-sk.ts
@@ -1,6 +1,6 @@
 /* eslint-disable import/order */
 import '../../../elements-sk/modules/error-toast-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { WasmFiddle } from '../wasm-fiddle-sk/wasm-fiddle-sk';
 import '../../../infra-sk/modules/theme-chooser-sk';
diff --git a/jsfiddle/modules/pathkit-fiddle-sk/BUILD.bazel b/jsfiddle/modules/pathkit-fiddle-sk/BUILD.bazel
index 2f65751..84b2582 100644
--- a/jsfiddle/modules/pathkit-fiddle-sk/BUILD.bazel
+++ b/jsfiddle/modules/pathkit-fiddle-sk/BUILD.bazel
@@ -15,7 +15,7 @@
     ],
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/jsfiddle/modules/pathkit-fiddle-sk/pathkit-fiddle-sk.ts b/jsfiddle/modules/pathkit-fiddle-sk/pathkit-fiddle-sk.ts
index c75bea8..13e73a2 100644
--- a/jsfiddle/modules/pathkit-fiddle-sk/pathkit-fiddle-sk.ts
+++ b/jsfiddle/modules/pathkit-fiddle-sk/pathkit-fiddle-sk.ts
@@ -1,5 +1,5 @@
 import '../../../elements-sk/modules/error-toast-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { WasmFiddle } from '../wasm-fiddle-sk/wasm-fiddle-sk';
 import '../../../infra-sk/modules/theme-chooser-sk';
diff --git a/jsfiddle/modules/wasm-fiddle-sk/BUILD.bazel b/jsfiddle/modules/wasm-fiddle-sk/BUILD.bazel
index a1ef2ad..2e0b718 100644
--- a/jsfiddle/modules/wasm-fiddle-sk/BUILD.bazel
+++ b/jsfiddle/modules/wasm-fiddle-sk/BUILD.bazel
@@ -45,7 +45,7 @@
         "//:node_modules/@types/codemirror",
         "//:node_modules/canvaskit-wasm",
         "//:node_modules/codemirror",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/jsfiddle/modules/wasm-fiddle-sk/wasm-fiddle-sk.ts b/jsfiddle/modules/wasm-fiddle-sk/wasm-fiddle-sk.ts
index 935dedf..df03d81 100644
--- a/jsfiddle/modules/wasm-fiddle-sk/wasm-fiddle-sk.ts
+++ b/jsfiddle/modules/wasm-fiddle-sk/wasm-fiddle-sk.ts
@@ -1,5 +1,5 @@
 import 'codemirror/mode/javascript/javascript'; // Syntax highlighting for js.
-import { html, render, TemplateResult } from 'lit-html';
+import { html, render, TemplateResult } from 'lit/html.js';
 import CodeMirror from 'codemirror';
 import type { CanvasKit } from 'canvaskit-wasm';
 import { $$ } from '../../../infra-sk/modules/dom';
@@ -326,7 +326,7 @@
   }
 
   private _render(): void {
-    render(this.templateFunc(this), this, { eventContext: this });
+    render(this.templateFunc(this), this, { host: this });
   }
 
   private changed(): void {
diff --git a/leasing/modules/leasing-list-sk/BUILD.bazel b/leasing/modules/leasing-list-sk/BUILD.bazel
index a686aa4..8dd8f15 100644
--- a/leasing/modules/leasing-list-sk/BUILD.bazel
+++ b/leasing/modules/leasing-list-sk/BUILD.bazel
@@ -23,7 +23,7 @@
         "//leasing/modules:leasing_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:upgradeproperty_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/leasing/modules/leasing-list-sk/leasing-list-sk.ts b/leasing/modules/leasing-list-sk/leasing-list-sk.ts
index c0a4d3a..da2ad0e 100644
--- a/leasing/modules/leasing-list-sk/leasing-list-sk.ts
+++ b/leasing/modules/leasing-list-sk/leasing-list-sk.ts
@@ -8,7 +8,7 @@
  *
  */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { upgradeProperty } from '../../../elements-sk/modules/upgradeProperty';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/leasing/modules/leasing-scaffold-sk/BUILD.bazel b/leasing/modules/leasing-scaffold-sk/BUILD.bazel
index 9d168d0..c1e99da 100644
--- a/leasing/modules/leasing-scaffold-sk/BUILD.bazel
+++ b/leasing/modules/leasing-scaffold-sk/BUILD.bazel
@@ -17,7 +17,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/leasing/modules/leasing-scaffold-sk/leasing-scaffold-sk.ts b/leasing/modules/leasing-scaffold-sk/leasing-scaffold-sk.ts
index 892d4f5..3c59fbc 100644
--- a/leasing/modules/leasing-scaffold-sk/leasing-scaffold-sk.ts
+++ b/leasing/modules/leasing-scaffold-sk/leasing-scaffold-sk.ts
@@ -9,7 +9,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/leasing/modules/leasing-selections-sk/BUILD.bazel b/leasing/modules/leasing-selections-sk/BUILD.bazel
index e057ef6..14cee20 100644
--- a/leasing/modules/leasing-selections-sk/BUILD.bazel
+++ b/leasing/modules/leasing-selections-sk/BUILD.bazel
@@ -25,7 +25,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/leasing/modules/leasing-selections-sk/leasing-selections-sk.ts b/leasing/modules/leasing-selections-sk/leasing-selections-sk.ts
index 49f53c1..4e5fb5f 100644
--- a/leasing/modules/leasing-selections-sk/leasing-selections-sk.ts
+++ b/leasing/modules/leasing-selections-sk/leasing-selections-sk.ts
@@ -9,7 +9,7 @@
  *
  */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 
diff --git a/leasing/modules/leasing-task-sk/BUILD.bazel b/leasing/modules/leasing-task-sk/BUILD.bazel
index 462dedc..f4c6bb1 100644
--- a/leasing/modules/leasing-task-sk/BUILD.bazel
+++ b/leasing/modules/leasing-task-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//leasing/modules:leasing_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/leasing/modules/leasing-task-sk/leasing-task-sk.ts b/leasing/modules/leasing-task-sk/leasing-task-sk.ts
index 55461f5..54e932a 100644
--- a/leasing/modules/leasing-task-sk/leasing-task-sk.ts
+++ b/leasing/modules/leasing-task-sk/leasing-task-sk.ts
@@ -8,7 +8,7 @@
  *
  */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/machine/modules/auto-refresh-sk/BUILD.bazel b/machine/modules/auto-refresh-sk/BUILD.bazel
index 8705ccb..c480b42 100644
--- a/machine/modules/auto-refresh-sk/BUILD.bazel
+++ b/machine/modules/auto-refresh-sk/BUILD.bazel
@@ -15,7 +15,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "auto-refresh-sk.ts",
diff --git a/machine/modules/auto-refresh-sk/auto-refresh-sk.ts b/machine/modules/auto-refresh-sk/auto-refresh-sk.ts
index 1c67444..c29ff73 100644
--- a/machine/modules/auto-refresh-sk/auto-refresh-sk.ts
+++ b/machine/modules/auto-refresh-sk/auto-refresh-sk.ts
@@ -11,7 +11,7 @@
  * @evt refresh-page - This event bubbles, and is produced every time the data
  *   on the page should be refreshed.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../elements-sk/modules/icons/pause-icon-sk';
diff --git a/machine/modules/device-editor-sk/BUILD.bazel b/machine/modules/device-editor-sk/BUILD.bazel
index 9175d27..813e4f3 100644
--- a/machine/modules/device-editor-sk/BUILD.bazel
+++ b/machine/modules/device-editor-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//machine/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "device-editor-sk.ts",
diff --git a/machine/modules/device-editor-sk/device-editor-sk.ts b/machine/modules/device-editor-sk/device-editor-sk.ts
index 8e06be3..a2c36cc 100644
--- a/machine/modules/device-editor-sk/device-editor-sk.ts
+++ b/machine/modules/device-editor-sk/device-editor-sk.ts
@@ -6,7 +6,7 @@
  *
  * It emits events when the user takes actions.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import '../../../elements-sk/modules/checkbox-sk';
diff --git a/machine/modules/machine-app-sk/BUILD.bazel b/machine/modules/machine-app-sk/BUILD.bazel
index 970df94..e8d5b4c 100644
--- a/machine/modules/machine-app-sk/BUILD.bazel
+++ b/machine/modules/machine-app-sk/BUILD.bazel
@@ -24,7 +24,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:hintable_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/machine/modules/machine-app-sk/machine-app-sk.ts b/machine/modules/machine-app-sk/machine-app-sk.ts
index 4619bca..27dc732 100644
--- a/machine/modules/machine-app-sk/machine-app-sk.ts
+++ b/machine/modules/machine-app-sk/machine-app-sk.ts
@@ -5,7 +5,7 @@
  * UI wrapper for machineserver readouts which sticks them in tabs and has a
  * shared toolbar
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
diff --git a/machine/modules/machine-table-columns-dialog-sk/BUILD.bazel b/machine/modules/machine-table-columns-dialog-sk/BUILD.bazel
index 20fbcbb..9f3e34e 100644
--- a/machine/modules/machine-table-columns-dialog-sk/BUILD.bazel
+++ b/machine/modules/machine-table-columns-dialog-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "machine-table-columns-dialog-sk.ts",
diff --git a/machine/modules/machine-table-columns-dialog-sk/machine-table-columns-dialog-sk.ts b/machine/modules/machine-table-columns-dialog-sk/machine-table-columns-dialog-sk.ts
index ac092a1..7404da5 100644
--- a/machine/modules/machine-table-columns-dialog-sk/machine-table-columns-dialog-sk.ts
+++ b/machine/modules/machine-table-columns-dialog-sk/machine-table-columns-dialog-sk.ts
@@ -7,7 +7,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import { CheckOrRadio } from '../../../elements-sk/modules/checkbox-sk/checkbox-sk';
diff --git a/machine/modules/machines-table-sk/BUILD.bazel b/machine/modules/machines-table-sk/BUILD.bazel
index 792b9a2..f11cbc3 100644
--- a/machine/modules/machines-table-sk/BUILD.bazel
+++ b/machine/modules/machines-table-sk/BUILD.bazel
@@ -40,7 +40,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:human_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/machine/modules/machines-table-sk/machines-table-sk.ts b/machine/modules/machines-table-sk/machines-table-sk.ts
index eed780d..97c3c37 100644
--- a/machine/modules/machines-table-sk/machines-table-sk.ts
+++ b/machine/modules/machines-table-sk/machines-table-sk.ts
@@ -8,7 +8,7 @@
  *
  * @attr waiting - If present then display the waiting cursor.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { diffDate, strDuration } from '../../../infra-sk/modules/human';
diff --git a/machine/modules/note-editor-sk/BUILD.bazel b/machine/modules/note-editor-sk/BUILD.bazel
index 28124fa..02cffff 100644
--- a/machine/modules/note-editor-sk/BUILD.bazel
+++ b/machine/modules/note-editor-sk/BUILD.bazel
@@ -17,7 +17,7 @@
         "//machine/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/machine/modules/note-editor-sk/note-editor-sk.ts b/machine/modules/note-editor-sk/note-editor-sk.ts
index d5fba3f..f06af5a 100644
--- a/machine/modules/note-editor-sk/note-editor-sk.ts
+++ b/machine/modules/note-editor-sk/note-editor-sk.ts
@@ -4,7 +4,7 @@
  *
  * Displays a dialog to edit an Annotation Message.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/new_element/modules/example-control-sk/BUILD.bazel b/new_element/modules/example-control-sk/BUILD.bazel
index 549f1bd..37a6a56 100644
--- a/new_element/modules/example-control-sk/BUILD.bazel
+++ b/new_element/modules/example-control-sk/BUILD.bazel
@@ -9,7 +9,7 @@
     name = "example-control-sk",
     sass_srcs = ["example-control-sk.scss"],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
     ],
diff --git a/new_element/modules/example-control-sk/example-control-sk.ts b/new_element/modules/example-control-sk/example-control-sk.ts
index 26b8b13..589b1ed 100644
--- a/new_element/modules/example-control-sk/example-control-sk.ts
+++ b/new_element/modules/example-control-sk/example-control-sk.ts
@@ -8,7 +8,7 @@
  *
  * @example
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/new_element/templates/BUILD.bazel.template b/new_element/templates/BUILD.bazel.template
index 375864e..3ccbf39 100644
--- a/new_element/templates/BUILD.bazel.template
+++ b/new_element/templates/BUILD.bazel.template
@@ -9,7 +9,7 @@
     name = "{{.ElementName}}",
     sass_srcs = ["{{.ElementName}}.scss"],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
     ],
diff --git a/new_element/templates/file.ts b/new_element/templates/file.ts
index 22a1f1b..c3711be 100644
--- a/new_element/templates/file.ts
+++ b/new_element/templates/file.ts
@@ -8,7 +8,7 @@
  *
  * @example
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/package.json b/package.json
index ca32da7..128e14f 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,6 @@
     "karma-sinon": "^1.0.5",
     "karma-spec-reporter": "0.0.32",
     "lit": "^3.2.0",
-    "lit-html": "^1.3.0",
     "lottie-web": "^5.9.6",
     "mocha": "^9.2.2",
     "natives": "^1.1.6",
diff --git a/perf/modules/alert-config-sk/BUILD.bazel b/perf/modules/alert-config-sk/BUILD.bazel
index b85cce7..b1d5055 100644
--- a/perf/modules/alert-config-sk/BUILD.bazel
+++ b/perf/modules/alert-config-sk/BUILD.bazel
@@ -23,7 +23,7 @@
         "//perf/modules/window:window_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "alert-config-sk.ts",
diff --git a/perf/modules/alert-config-sk/alert-config-sk.ts b/perf/modules/alert-config-sk/alert-config-sk.ts
index c22fedc..08a5ba5 100644
--- a/perf/modules/alert-config-sk/alert-config-sk.ts
+++ b/perf/modules/alert-config-sk/alert-config-sk.ts
@@ -5,7 +5,7 @@
  * Control that allows editing an alert.Config.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import '../../../elements-sk/modules/checkbox-sk';
diff --git a/perf/modules/alerts-page-sk/BUILD.bazel b/perf/modules/alerts-page-sk/BUILD.bazel
index 1bb3031..280469b 100644
--- a/perf/modules/alerts-page-sk/BUILD.bazel
+++ b/perf/modules/alerts-page-sk/BUILD.bazel
@@ -25,7 +25,7 @@
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules/json:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "alerts-page-sk.ts",
diff --git a/perf/modules/alerts-page-sk/alerts-page-sk.ts b/perf/modules/alerts-page-sk/alerts-page-sk.ts
index beed3e7..531546e 100644
--- a/perf/modules/alerts-page-sk/alerts-page-sk.ts
+++ b/perf/modules/alerts-page-sk/alerts-page-sk.ts
@@ -9,7 +9,7 @@
 import '../../../elements-sk/modules/icons/create-icon-sk';
 import '../../../infra-sk/modules/paramset-sk';
 import '../alert-config-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { fromObject, toParamSet } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/perf/modules/algo-select-sk/BUILD.bazel b/perf/modules/algo-select-sk/BUILD.bazel
index 6733e35..c5457c2 100644
--- a/perf/modules/algo-select-sk/BUILD.bazel
+++ b/perf/modules/algo-select-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//perf/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "algo-select-sk.ts",
diff --git a/perf/modules/algo-select-sk/algo-select-sk.ts b/perf/modules/algo-select-sk/algo-select-sk.ts
index cb84296..679cd55 100644
--- a/perf/modules/algo-select-sk/algo-select-sk.ts
+++ b/perf/modules/algo-select-sk/algo-select-sk.ts
@@ -10,7 +10,7 @@
  * @attr {string} algo - The algorithm name.
  */
 import '../../../elements-sk/modules/select-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $ } from '../../../infra-sk/modules/dom';
 import { SelectSkSelectionChangedEventDetail } from '../../../elements-sk/modules/select-sk/select-sk';
diff --git a/perf/modules/anomaly-sk/BUILD.bazel b/perf/modules/anomaly-sk/BUILD.bazel
index 5176528..a665c64 100644
--- a/perf/modules/anomaly-sk/BUILD.bazel
+++ b/perf/modules/anomaly-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//perf/modules/json:index_ts_lib",
         "//perf/modules/window:window_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//perf/modules/cid:cid_ts_lib",
     ],
     ts_srcs = [
@@ -58,7 +58,7 @@
         "//:node_modules/@types/chai",
         "//:node_modules/chai",
         "//:node_modules/fetch-mock",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules:test_util_ts_lib",
         "//perf/modules/json:index_ts_lib",
         "//perf/modules/plot-simple-sk",
diff --git a/perf/modules/anomaly-sk/anomaly-sk.ts b/perf/modules/anomaly-sk/anomaly-sk.ts
index 3e6f25a..b565ff0 100644
--- a/perf/modules/anomaly-sk/anomaly-sk.ts
+++ b/perf/modules/anomaly-sk/anomaly-sk.ts
@@ -3,7 +3,7 @@
  * @description <h2><code>anomaly-sk</code></h2>
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import {
diff --git a/perf/modules/anomaly-sk/anomaly-sk_test.ts b/perf/modules/anomaly-sk/anomaly-sk_test.ts
index 075ca30..573d028 100644
--- a/perf/modules/anomaly-sk/anomaly-sk_test.ts
+++ b/perf/modules/anomaly-sk/anomaly-sk_test.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 import fetchMock from 'fetch-mock';
-import { TemplateResult, html } from 'lit-html';
+import { TemplateResult, html } from 'lit/html.js';
 import {
   Anomaly,
   AnomalyMap,
diff --git a/perf/modules/calendar-input-sk/BUILD.bazel b/perf/modules/calendar-input-sk/BUILD.bazel
index a980db0..eaeaa39 100644
--- a/perf/modules/calendar-input-sk/BUILD.bazel
+++ b/perf/modules/calendar-input-sk/BUILD.bazel
@@ -13,7 +13,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "calendar-input-sk.ts",
diff --git a/perf/modules/calendar-input-sk/calendar-input-sk.ts b/perf/modules/calendar-input-sk/calendar-input-sk.ts
index 6b231ca..faa69e4 100644
--- a/perf/modules/calendar-input-sk/calendar-input-sk.ts
+++ b/perf/modules/calendar-input-sk/calendar-input-sk.ts
@@ -8,7 +8,7 @@
  * @evt input - A CustomEvent<Date> with the new date.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../elements-sk/modules/icons/date-range-icon-sk';
diff --git a/perf/modules/calendar-sk/BUILD.bazel b/perf/modules/calendar-sk/BUILD.bazel
index 7d9fffe..0c1c20d 100644
--- a/perf/modules/calendar-sk/BUILD.bazel
+++ b/perf/modules/calendar-sk/BUILD.bazel
@@ -14,7 +14,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "calendar-sk.ts",
diff --git a/perf/modules/calendar-sk/calendar-sk.ts b/perf/modules/calendar-sk/calendar-sk.ts
index af7e5ef..d834d57 100644
--- a/perf/modules/calendar-sk/calendar-sk.ts
+++ b/perf/modules/calendar-sk/calendar-sk.ts
@@ -21,7 +21,7 @@
  * detached to/from the appropriate containing element when it is used, for
  * example, a containing 'dialog' element.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../elements-sk/modules/icons/navigate-before-icon-sk';
diff --git a/perf/modules/chart-tooltip-sk/BUILD.bazel b/perf/modules/chart-tooltip-sk/BUILD.bazel
index 051ebd2..22b446f 100644
--- a/perf/modules/chart-tooltip-sk/BUILD.bazel
+++ b/perf/modules/chart-tooltip-sk/BUILD.bazel
@@ -24,7 +24,7 @@
         "//perf/modules/ingest-file-links-sk",
     ],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:upgradeproperty_ts_lib",
diff --git a/perf/modules/chart-tooltip-sk/chart-tooltip-sk.ts b/perf/modules/chart-tooltip-sk/chart-tooltip-sk.ts
index e5668fd..9452c7d 100644
--- a/perf/modules/chart-tooltip-sk/chart-tooltip-sk.ts
+++ b/perf/modules/chart-tooltip-sk/chart-tooltip-sk.ts
@@ -8,7 +8,7 @@
  *
  * @example
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { upgradeProperty } from '../../../elements-sk/modules/upgradeProperty';
diff --git a/perf/modules/cluster-lastn-page-sk/BUILD.bazel b/perf/modules/cluster-lastn-page-sk/BUILD.bazel
index c150bb5..862e194 100644
--- a/perf/modules/cluster-lastn-page-sk/BUILD.bazel
+++ b/perf/modules/cluster-lastn-page-sk/BUILD.bazel
@@ -25,7 +25,7 @@
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "cluster-lastn-page-sk.ts",
diff --git a/perf/modules/cluster-lastn-page-sk/cluster-lastn-page-sk.ts b/perf/modules/cluster-lastn-page-sk/cluster-lastn-page-sk.ts
index d2517f9e..d06d7d0 100644
--- a/perf/modules/cluster-lastn-page-sk/cluster-lastn-page-sk.ts
+++ b/perf/modules/cluster-lastn-page-sk/cluster-lastn-page-sk.ts
@@ -4,7 +4,7 @@
  *
  *  Allows trying out an alert by clustering over a range of commits.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/perf/modules/cluster-page-sk/BUILD.bazel b/perf/modules/cluster-page-sk/BUILD.bazel
index 364fe6e..4be5a75 100644
--- a/perf/modules/cluster-page-sk/BUILD.bazel
+++ b/perf/modules/cluster-page-sk/BUILD.bazel
@@ -30,7 +30,7 @@
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "cluster-page-sk.ts",
diff --git a/perf/modules/cluster-page-sk/cluster-page-sk.ts b/perf/modules/cluster-page-sk/cluster-page-sk.ts
index 145b29c..800f7c7 100644
--- a/perf/modules/cluster-page-sk/cluster-page-sk.ts
+++ b/perf/modules/cluster-page-sk/cluster-page-sk.ts
@@ -5,7 +5,7 @@
  *   The top level element for clustering traces.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { fromObject, toParamSet } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/perf/modules/cluster-summary2-sk/BUILD.bazel b/perf/modules/cluster-summary2-sk/BUILD.bazel
index 86578b6..38e4bf8 100644
--- a/perf/modules/cluster-summary2-sk/BUILD.bazel
+++ b/perf/modules/cluster-summary2-sk/BUILD.bazel
@@ -25,7 +25,7 @@
         "//perf/modules/cid:cid_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/json:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//perf/modules/plot-simple-sk:ticks_ts_lib",
     ],
     ts_srcs = [
diff --git a/perf/modules/cluster-summary2-sk/cluster-summary2-sk.ts b/perf/modules/cluster-summary2-sk/cluster-summary2-sk.ts
index a4b9247..6cb47ae 100644
--- a/perf/modules/cluster-summary2-sk/cluster-summary2-sk.ts
+++ b/perf/modules/cluster-summary2-sk/cluster-summary2-sk.ts
@@ -33,7 +33,7 @@
  *
  * @example
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/collapse-sk';
 import '../commit-detail-panel-sk';
diff --git a/perf/modules/commit-detail-panel-sk/BUILD.bazel b/perf/modules/commit-detail-panel-sk/BUILD.bazel
index 5cb43f1..c85b7cf 100644
--- a/perf/modules/commit-detail-panel-sk/BUILD.bazel
+++ b/perf/modules/commit-detail-panel-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//perf/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "commit-detail-panel-sk.ts",
diff --git a/perf/modules/commit-detail-panel-sk/commit-detail-panel-sk.ts b/perf/modules/commit-detail-panel-sk/commit-detail-panel-sk.ts
index fb72aaa..9da6b03 100644
--- a/perf/modules/commit-detail-panel-sk/commit-detail-panel-sk.ts
+++ b/perf/modules/commit-detail-panel-sk/commit-detail-panel-sk.ts
@@ -25,7 +25,7 @@
  *
  * @attr {Number} selected - The index of the selected commit.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { findParent } from '../../../infra-sk/modules/dom';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/perf/modules/commit-detail-picker-sk/BUILD.bazel b/perf/modules/commit-detail-picker-sk/BUILD.bazel
index 5f2d5e7..c6c0dd5 100644
--- a/perf/modules/commit-detail-picker-sk/BUILD.bazel
+++ b/perf/modules/commit-detail-picker-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//perf/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "commit-detail-picker-sk.ts",
diff --git a/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.ts b/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.ts
index c2dd2ed..d5d0bef 100644
--- a/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.ts
+++ b/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.ts
@@ -10,7 +10,7 @@
 import '../../../elements-sk/modules/spinner-sk';
 import '../day-range-sk';
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { errorMessage } from '../errorMessage';
diff --git a/perf/modules/commit-detail-sk/BUILD.bazel b/perf/modules/commit-detail-sk/BUILD.bazel
index 3ba65be..148f86f 100644
--- a/perf/modules/commit-detail-sk/BUILD.bazel
+++ b/perf/modules/commit-detail-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//elements-sk/modules:upgradeproperty_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "commit-detail-sk.ts",
diff --git a/perf/modules/commit-detail-sk/commit-detail-sk.ts b/perf/modules/commit-detail-sk/commit-detail-sk.ts
index 523be4a..5aa6780 100644
--- a/perf/modules/commit-detail-sk/commit-detail-sk.ts
+++ b/perf/modules/commit-detail-sk/commit-detail-sk.ts
@@ -5,7 +5,7 @@
  * An element to display information around a single commit.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { upgradeProperty } from '../../../elements-sk/modules/upgradeProperty';
diff --git a/perf/modules/commit-range-sk/BUILD.bazel b/perf/modules/commit-range-sk/BUILD.bazel
index 2353f73..d5f5cd2 100644
--- a/perf/modules/commit-range-sk/BUILD.bazel
+++ b/perf/modules/commit-range-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//perf/modules/const:const_ts_lib",
         "//perf/modules/cid:cid_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "commit-range-sk.ts",
diff --git a/perf/modules/commit-range-sk/commit-range-sk.ts b/perf/modules/commit-range-sk/commit-range-sk.ts
index 7225d03..7674b5c 100644
--- a/perf/modules/commit-range-sk/commit-range-sk.ts
+++ b/perf/modules/commit-range-sk/commit-range-sk.ts
@@ -6,7 +6,7 @@
  * uses the global `window.perf.commit_range_url`, which can be set on Perf via
  * the command line.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { lookupCids } from '../cid/cid';
diff --git a/perf/modules/day-range-sk/BUILD.bazel b/perf/modules/day-range-sk/BUILD.bazel
index 77e6608..5f1b76a 100644
--- a/perf/modules/day-range-sk/BUILD.bazel
+++ b/perf/modules/day-range-sk/BUILD.bazel
@@ -10,7 +10,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "day-range-sk.ts",
diff --git a/perf/modules/day-range-sk/day-range-sk.ts b/perf/modules/day-range-sk/day-range-sk.ts
index 532c66e..1f82c97 100644
--- a/perf/modules/day-range-sk/day-range-sk.ts
+++ b/perf/modules/day-range-sk/day-range-sk.ts
@@ -14,7 +14,7 @@
  * @attr {Number} end - The end of the time range in seconds since the epoch.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../calendar-input-sk';
diff --git a/perf/modules/domain-picker-sk/BUILD.bazel b/perf/modules/domain-picker-sk/BUILD.bazel
index a87e087..2091f1c 100644
--- a/perf/modules/domain-picker-sk/BUILD.bazel
+++ b/perf/modules/domain-picker-sk/BUILD.bazel
@@ -20,7 +20,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//perf/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "domain-picker-sk.ts",
diff --git a/perf/modules/domain-picker-sk/domain-picker-sk.ts b/perf/modules/domain-picker-sk/domain-picker-sk.ts
index 57d21fd..0960659 100644
--- a/perf/modules/domain-picker-sk/domain-picker-sk.ts
+++ b/perf/modules/domain-picker-sk/domain-picker-sk.ts
@@ -10,7 +10,7 @@
  *   force the corresponding request_type to be always set.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { RequestType } from '../json';
diff --git a/perf/modules/explore-multi-sk/BUILD.bazel b/perf/modules/explore-multi-sk/BUILD.bazel
index 9a417fa..431af46 100644
--- a/perf/modules/explore-multi-sk/BUILD.bazel
+++ b/perf/modules/explore-multi-sk/BUILD.bazel
@@ -17,7 +17,7 @@
         "//infra-sk/modules:statereflector_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//perf/modules/paramtools:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//perf/modules/json:index_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
diff --git a/perf/modules/explore-multi-sk/explore-multi-sk.ts b/perf/modules/explore-multi-sk/explore-multi-sk.ts
index 3890b9b..fd6c875 100644
--- a/perf/modules/explore-multi-sk/explore-multi-sk.ts
+++ b/perf/modules/explore-multi-sk/explore-multi-sk.ts
@@ -12,7 +12,7 @@
  * keeping the logic simple.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import {
   DEFAULT_RANGE_S,
diff --git a/perf/modules/explore-simple-sk/BUILD.bazel b/perf/modules/explore-simple-sk/BUILD.bazel
index edb31ce..7f79504 100644
--- a/perf/modules/explore-simple-sk/BUILD.bazel
+++ b/perf/modules/explore-simple-sk/BUILD.bazel
@@ -55,7 +55,7 @@
         "//infra-sk/modules/json:index_ts_lib",
         "//autoroll/modules/rpc:index_ts_lib",
         "//perf/modules/trace-details-formatter:traceformatter_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules:object_ts_lib",
         "//perf/modules/plot-simple-sk:ticks_ts_lib",
         "//perf/modules/common:plot-builder_ts_lib",
diff --git a/perf/modules/explore-simple-sk/explore-simple-sk.ts b/perf/modules/explore-simple-sk/explore-simple-sk.ts
index c4ee5ea..4a26a9c 100644
--- a/perf/modules/explore-simple-sk/explore-simple-sk.ts
+++ b/perf/modules/explore-simple-sk/explore-simple-sk.ts
@@ -4,7 +4,7 @@
  *
  * Element for exploring data.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 
diff --git a/perf/modules/explore-sk/BUILD.bazel b/perf/modules/explore-sk/BUILD.bazel
index e0eba98..63221cb 100644
--- a/perf/modules/explore-sk/BUILD.bazel
+++ b/perf/modules/explore-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//infra-sk/modules:hintable_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//perf/modules/json:index_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
diff --git a/perf/modules/explore-sk/explore-sk.ts b/perf/modules/explore-sk/explore-sk.ts
index 0540af2..2523f25 100644
--- a/perf/modules/explore-sk/explore-sk.ts
+++ b/perf/modules/explore-sk/explore-sk.ts
@@ -4,7 +4,7 @@
  *
  * Main page of Perf, for exploring data.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ExploreSimpleSk, State } from '../explore-simple-sk/explore-simple-sk';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
diff --git a/perf/modules/favorites-dialog-sk/BUILD.bazel b/perf/modules/favorites-dialog-sk/BUILD.bazel
index 4c82f79..da8f7e8 100644
--- a/perf/modules/favorites-dialog-sk/BUILD.bazel
+++ b/perf/modules/favorites-dialog-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//elements-sk/modules/spinner-sk",
     ],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
diff --git a/perf/modules/favorites-dialog-sk/favorites-dialog-sk.ts b/perf/modules/favorites-dialog-sk/favorites-dialog-sk.ts
index d5508cd..a912bed 100644
--- a/perf/modules/favorites-dialog-sk/favorites-dialog-sk.ts
+++ b/perf/modules/favorites-dialog-sk/favorites-dialog-sk.ts
@@ -5,7 +5,7 @@
  * This module is a modal that contains a form to capture user
  * input for adding/editing a new favorite.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
diff --git a/perf/modules/favorites-sk/BUILD.bazel b/perf/modules/favorites-sk/BUILD.bazel
index 9e0e180..65fcb2f 100644
--- a/perf/modules/favorites-sk/BUILD.bazel
+++ b/perf/modules/favorites-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//perf/modules/window:window_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//perf/modules/json:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules:dom_ts_lib",
     ],
     ts_srcs = [
diff --git a/perf/modules/favorites-sk/favorites-sk.ts b/perf/modules/favorites-sk/favorites-sk.ts
index 447bdc4..88c897e 100644
--- a/perf/modules/favorites-sk/favorites-sk.ts
+++ b/perf/modules/favorites-sk/favorites-sk.ts
@@ -8,7 +8,7 @@
  *
  * @example
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/perf/modules/graph-title-sk/BUILD.bazel b/perf/modules/graph-title-sk/BUILD.bazel
index 8f2400a..6cb49fa 100644
--- a/perf/modules/graph-title-sk/BUILD.bazel
+++ b/perf/modules/graph-title-sk/BUILD.bazel
@@ -6,7 +6,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "graph-title-sk.ts",
diff --git a/perf/modules/graph-title-sk/graph-title-sk.ts b/perf/modules/graph-title-sk/graph-title-sk.ts
index 9d0b748..b2fdac9 100644
--- a/perf/modules/graph-title-sk/graph-title-sk.ts
+++ b/perf/modules/graph-title-sk/graph-title-sk.ts
@@ -22,7 +22,7 @@
  *
  * "test" is ignored as its value is empty, and "subtest_1"'s value is truncated.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/perf/modules/ingest-file-links-sk/BUILD.bazel b/perf/modules/ingest-file-links-sk/BUILD.bazel
index 7433976..46f68fa 100644
--- a/perf/modules/ingest-file-links-sk/BUILD.bazel
+++ b/perf/modules/ingest-file-links-sk/BUILD.bazel
@@ -19,7 +19,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "ingest-file-links-sk.ts",
diff --git a/perf/modules/ingest-file-links-sk/ingest-file-links-sk.ts b/perf/modules/ingest-file-links-sk/ingest-file-links-sk.ts
index 882605f..ee6c57d 100644
--- a/perf/modules/ingest-file-links-sk/ingest-file-links-sk.ts
+++ b/perf/modules/ingest-file-links-sk/ingest-file-links-sk.ts
@@ -7,7 +7,7 @@
  *
  * See also https://pkg.go.dev/go.skia.org/infra/perf/go/ingest/format#Format
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { SpinnerSk } from '../../../elements-sk/modules/spinner-sk/spinner-sk';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/perf/modules/json-source-sk/BUILD.bazel b/perf/modules/json-source-sk/BUILD.bazel
index 2cdea62..e5242d2 100644
--- a/perf/modules/json-source-sk/BUILD.bazel
+++ b/perf/modules/json-source-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//perf/modules/paramtools:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/json-source-sk/json-source-sk.ts b/perf/modules/json-source-sk/json-source-sk.ts
index a275cf0..a912579 100644
--- a/perf/modules/json-source-sk/json-source-sk.ts
+++ b/perf/modules/json-source-sk/json-source-sk.ts
@@ -7,7 +7,7 @@
  * id.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/perf/modules/perf-scaffold-sk/BUILD.bazel b/perf/modules/perf-scaffold-sk/BUILD.bazel
index 2815371..154757a 100644
--- a/perf/modules/perf-scaffold-sk/BUILD.bazel
+++ b/perf/modules/perf-scaffold-sk/BUILD.bazel
@@ -31,7 +31,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//perf/modules/window:window_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/perf-scaffold-sk/perf-scaffold-sk.ts b/perf/modules/perf-scaffold-sk/perf-scaffold-sk.ts
index 25d7e24..396e617 100644
--- a/perf/modules/perf-scaffold-sk/perf-scaffold-sk.ts
+++ b/perf/modules/perf-scaffold-sk/perf-scaffold-sk.ts
@@ -6,7 +6,7 @@
  * every Perf page should be a child of this element.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../elements-sk/modules/error-toast-sk';
diff --git a/perf/modules/picker-field-sk/BUILD.bazel b/perf/modules/picker-field-sk/BUILD.bazel
index 2491c48..8e09ce5 100644
--- a/perf/modules/picker-field-sk/BUILD.bazel
+++ b/perf/modules/picker-field-sk/BUILD.bazel
@@ -12,7 +12,7 @@
     ],
     sass_srcs = ["picker-field-sk.scss"],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//:node_modules/@vaadin/combo-box",
diff --git a/perf/modules/picker-field-sk/picker-field-sk.ts b/perf/modules/picker-field-sk/picker-field-sk.ts
index b0778a4..001b665 100644
--- a/perf/modules/picker-field-sk/picker-field-sk.ts
+++ b/perf/modules/picker-field-sk/picker-field-sk.ts
@@ -23,7 +23,7 @@
  * >
  * </picker-field-sk>
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '@vaadin/combo-box/theme/lumo/vaadin-combo-box.js';
diff --git a/perf/modules/pivot-query-sk/BUILD.bazel b/perf/modules/pivot-query-sk/BUILD.bazel
index 626f204..db381b0 100644
--- a/perf/modules/pivot-query-sk/BUILD.bazel
+++ b/perf/modules/pivot-query-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//perf/modules/json:index_ts_lib",
         "//perf/modules/pivotutil:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "pivot-query-sk.ts",
diff --git a/perf/modules/pivot-query-sk/pivot-query-sk.ts b/perf/modules/pivot-query-sk/pivot-query-sk.ts
index 2d98698..25874f4 100644
--- a/perf/modules/pivot-query-sk/pivot-query-sk.ts
+++ b/perf/modules/pivot-query-sk/pivot-query-sk.ts
@@ -5,7 +5,7 @@
  * @evt pivot-changed - Emitted every time the control is changed by the user.
  * See PivotQueryChangedEventDetail.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { MultiSelectSkSelectionChangedEventDetail } from '../../../elements-sk/modules/multi-select-sk/multi-select-sk';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/perf/modules/pivot-table-sk/BUILD.bazel b/perf/modules/pivot-table-sk/BUILD.bazel
index 911e7c4..e481a47 100644
--- a/perf/modules/pivot-table-sk/BUILD.bazel
+++ b/perf/modules/pivot-table-sk/BUILD.bazel
@@ -25,7 +25,7 @@
         "//perf/modules/const:const_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "pivot-table-sk.ts",
diff --git a/perf/modules/pivot-table-sk/pivot-table-sk.ts b/perf/modules/pivot-table-sk/pivot-table-sk.ts
index e68ac6a..53f0d19 100644
--- a/perf/modules/pivot-table-sk/pivot-table-sk.ts
+++ b/perf/modules/pivot-table-sk/pivot-table-sk.ts
@@ -13,7 +13,7 @@
  * @evt Emits a change event with the sort history encoded as a string when the
  *    user sorts on a column.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { toParamSet } from '../../../infra-sk/modules/query';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/perf/modules/plot-simple-sk/BUILD.bazel b/perf/modules/plot-simple-sk/BUILD.bazel
index 3a5a18f..06453e6 100644
--- a/perf/modules/plot-simple-sk/BUILD.bazel
+++ b/perf/modules/plot-simple-sk/BUILD.bazel
@@ -38,7 +38,7 @@
         "//:node_modules/@types/d3-scale",
         "//:node_modules/d3-array",
         "//:node_modules/d3-scale",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/plot-simple-sk/plot-simple-sk.ts b/perf/modules/plot-simple-sk/plot-simple-sk.ts
index e56892c..899bf18 100644
--- a/perf/modules/plot-simple-sk/plot-simple-sk.ts
+++ b/perf/modules/plot-simple-sk/plot-simple-sk.ts
@@ -90,7 +90,7 @@
  *
  * @attr summary {Boolean} - If present then display the summary bar.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import * as d3Scale from 'd3-scale';
 import * as d3Array from 'd3-array';
 import { Anomaly } from '../json';
diff --git a/perf/modules/plot-summary-sk/BUILD.bazel b/perf/modules/plot-summary-sk/BUILD.bazel
index 54d7a29..63d7b78 100644
--- a/perf/modules/plot-summary-sk/BUILD.bazel
+++ b/perf/modules/plot-summary-sk/BUILD.bazel
@@ -11,7 +11,7 @@
     sass_srcs = ["plot-summary-sk.scss"],
     sk_element_deps = ["//perf/modules/plot-simple-sk"],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//:node_modules/@types/d3-scale",
diff --git a/perf/modules/plot-summary-sk/plot-summary-sk.ts b/perf/modules/plot-summary-sk/plot-summary-sk.ts
index 9c3fa2c..529be20 100644
--- a/perf/modules/plot-summary-sk/plot-summary-sk.ts
+++ b/perf/modules/plot-summary-sk/plot-summary-sk.ts
@@ -8,7 +8,7 @@
  *
  * @example
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import * as d3Scale from 'd3-scale';
 import { load } from '@google-web-components/google-chart/loader';
 import { define } from '../../../elements-sk/modules/define';
diff --git a/perf/modules/point-links-sk/BUILD.bazel b/perf/modules/point-links-sk/BUILD.bazel
index 75a32ea..685ca79 100644
--- a/perf/modules/point-links-sk/BUILD.bazel
+++ b/perf/modules/point-links-sk/BUILD.bazel
@@ -9,7 +9,7 @@
     name = "point-links-sk",
     sass_srcs = ["point-links-sk.scss"],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
diff --git a/perf/modules/point-links-sk/point-links-sk.ts b/perf/modules/point-links-sk/point-links-sk.ts
index 9ace535..568b855 100644
--- a/perf/modules/point-links-sk/point-links-sk.ts
+++ b/perf/modules/point-links-sk/point-links-sk.ts
@@ -20,7 +20,7 @@
  *
  * <a href='https://chromium.googlesource.com/v8/v8/+log/f052b8c4..47f420e>V8 Git Hash Range</a>
  */
-import { TemplateResult, html } from 'lit-html';
+import { TemplateResult, html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { CommitDetailsRequest, CommitNumber, ingest } from '../json';
diff --git a/perf/modules/query-chooser-sk/BUILD.bazel b/perf/modules/query-chooser-sk/BUILD.bazel
index 3bcd915..654ce40 100644
--- a/perf/modules/query-chooser-sk/BUILD.bazel
+++ b/perf/modules/query-chooser-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/query-chooser-sk/query-chooser-sk.ts b/perf/modules/query-chooser-sk/query-chooser-sk.ts
index bc0e4cb..bf2a053 100644
--- a/perf/modules/query-chooser-sk/query-chooser-sk.ts
+++ b/perf/modules/query-chooser-sk/query-chooser-sk.ts
@@ -12,7 +12,7 @@
  * @attr {string} count_url - The  URL to POST the query to, passed down to quuery-count-sk.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ParamSet, toParamSet } from '../../../infra-sk/modules/query';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/perf/modules/query-count-sk/BUILD.bazel b/perf/modules/query-count-sk/BUILD.bazel
index 5d76999..59a1e6f 100644
--- a/perf/modules/query-count-sk/BUILD.bazel
+++ b/perf/modules/query-count-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//perf/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/query-count-sk/query-count-sk.ts b/perf/modules/query-count-sk/query-count-sk.ts
index f91e3f7..68acac0 100644
--- a/perf/modules/query-count-sk/query-count-sk.ts
+++ b/perf/modules/query-count-sk/query-count-sk.ts
@@ -12,7 +12,7 @@
  *   from the fetch response.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { errorMessage } from '../errorMessage';
diff --git a/perf/modules/regressions-page-sk/BUILD.bazel b/perf/modules/regressions-page-sk/BUILD.bazel
index 0b4ef59..8f784c2 100644
--- a/perf/modules/regressions-page-sk/BUILD.bazel
+++ b/perf/modules/regressions-page-sk/BUILD.bazel
@@ -16,7 +16,7 @@
     name = "regressions-page-sk",
     sass_srcs = ["regressions-page-sk.scss"],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
diff --git a/perf/modules/regressions-page-sk/regressions-page-sk.ts b/perf/modules/regressions-page-sk/regressions-page-sk.ts
index 89c8894..167e215 100644
--- a/perf/modules/regressions-page-sk/regressions-page-sk.ts
+++ b/perf/modules/regressions-page-sk/regressions-page-sk.ts
@@ -5,7 +5,7 @@
  * This module is a component that displays a list of regressions for a given
  * subscription.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
@@ -96,7 +96,7 @@
       @input=${(e: InputEvent) =>
         ele.filterChange((e.target as HTMLInputElement).value)}>
       <option disabled selected value>-- select an option --</option>
-      ${RegressionsPageSk.allSubscriptions(ele)}
+      ${RegressionsPageSk.allSubscriptions(ele)}]
     </select>
     ${ele.regressions.length > 0
       ? html` <div id="regressions_container">
diff --git a/perf/modules/regressions-page-sk/regressions-page-sk_test.ts b/perf/modules/regressions-page-sk/regressions-page-sk_test.ts
index 3df191c..a639314 100644
--- a/perf/modules/regressions-page-sk/regressions-page-sk_test.ts
+++ b/perf/modules/regressions-page-sk/regressions-page-sk_test.ts
@@ -103,7 +103,8 @@
   describe('RegressionsPageSK', () => {
     it('Loads associated regressions when subscription selected', async () => {
       const dropdown = document.getElementById('filter');
-      assert.equal(dropdown?.childNodes.length, 4);
+      // Three options and two additional node: the non-selected option and the Lit comment node
+      assert.equal(dropdown?.childNodes.length, 5);
       assert.equal(element.regressions.length, 0);
 
       await element.filterChange('Sheriff Config 2');
diff --git a/perf/modules/revision-info-sk/BUILD.bazel b/perf/modules/revision-info-sk/BUILD.bazel
index 503d998..1fe81c5 100644
--- a/perf/modules/revision-info-sk/BUILD.bazel
+++ b/perf/modules/revision-info-sk/BUILD.bazel
@@ -21,7 +21,7 @@
         "//perf/modules/explore-simple-sk",
     ],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
diff --git a/perf/modules/revision-info-sk/revision-info-sk.ts b/perf/modules/revision-info-sk/revision-info-sk.ts
index 0a8abb3..807819c 100644
--- a/perf/modules/revision-info-sk/revision-info-sk.ts
+++ b/perf/modules/revision-info-sk/revision-info-sk.ts
@@ -5,7 +5,7 @@
  * Displays information regarding the anomalies that were detected around
  * a specific revision.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/perf/modules/test-picker-sk/BUILD.bazel b/perf/modules/test-picker-sk/BUILD.bazel
index df1ab9a..b77e19d 100644
--- a/perf/modules/test-picker-sk/BUILD.bazel
+++ b/perf/modules/test-picker-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//elements-sk/modules/spinner-sk",
     ],
     ts_deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//perf/modules/json:index_ts_lib",
diff --git a/perf/modules/test-picker-sk/test-picker-sk.ts b/perf/modules/test-picker-sk/test-picker-sk.ts
index 95f0942..629c8ca 100644
--- a/perf/modules/test-picker-sk/test-picker-sk.ts
+++ b/perf/modules/test-picker-sk/test-picker-sk.ts
@@ -25,7 +25,7 @@
  * event.detail.query.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/perf/modules/triage-page-sk/BUILD.bazel b/perf/modules/triage-page-sk/BUILD.bazel
index 08cd296..443f782 100644
--- a/perf/modules/triage-page-sk/BUILD.bazel
+++ b/perf/modules/triage-page-sk/BUILD.bazel
@@ -30,7 +30,7 @@
         "//infra-sk/modules:object_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/triage-page-sk/triage-page-sk.ts b/perf/modules/triage-page-sk/triage-page-sk.ts
index 5add8b1..0e06bae 100644
--- a/perf/modules/triage-page-sk/triage-page-sk.ts
+++ b/perf/modules/triage-page-sk/triage-page-sk.ts
@@ -7,7 +7,7 @@
  * TODO(jcgregorio) Needs working demo page and tests.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { equals, deepCopy } from '../../../infra-sk/modules/object';
 import { fromObject } from '../../../infra-sk/modules/query';
diff --git a/perf/modules/triage-status-sk/BUILD.bazel b/perf/modules/triage-status-sk/BUILD.bazel
index 7c6e3c3..088e025 100644
--- a/perf/modules/triage-status-sk/BUILD.bazel
+++ b/perf/modules/triage-status-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//perf/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/triage-status-sk/triage-status-sk.ts b/perf/modules/triage-status-sk/triage-status-sk.ts
index 64eb6c1..b8067cf 100644
--- a/perf/modules/triage-status-sk/triage-status-sk.ts
+++ b/perf/modules/triage-status-sk/triage-status-sk.ts
@@ -10,7 +10,7 @@
  *    alert, cluster_type, full_summary, and triage.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../tricon2-sk';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/perf/modules/triage2-sk/BUILD.bazel b/perf/modules/triage2-sk/BUILD.bazel
index ef720d0..2698923 100644
--- a/perf/modules/triage2-sk/BUILD.bazel
+++ b/perf/modules/triage2-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//perf/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/triage2-sk/triage2-sk.ts b/perf/modules/triage2-sk/triage2-sk.ts
index 1fc9a7d..8db4f26 100644
--- a/perf/modules/triage2-sk/triage2-sk.ts
+++ b/perf/modules/triage2-sk/triage2-sk.ts
@@ -13,7 +13,7 @@
  * @example
  *   <triage2-sk value=positive></triage2-sk>
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../elements-sk/modules/icons/check-circle-icon-sk';
diff --git a/perf/modules/tricon2-sk/BUILD.bazel b/perf/modules/tricon2-sk/BUILD.bazel
index a3d027e..24d752a 100644
--- a/perf/modules/tricon2-sk/BUILD.bazel
+++ b/perf/modules/tricon2-sk/BUILD.bazel
@@ -21,7 +21,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/tricon2-sk/tricon2-sk.ts b/perf/modules/tricon2-sk/tricon2-sk.ts
index 3ad7ce9..87b8eee 100644
--- a/perf/modules/tricon2-sk/tricon2-sk.ts
+++ b/perf/modules/tricon2-sk/tricon2-sk.ts
@@ -8,7 +8,7 @@
  *     "untriaged", "positive", or "negative".
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../elements-sk/modules/icons/check-circle-icon-sk';
diff --git a/perf/modules/trybot-page-sk/BUILD.bazel b/perf/modules/trybot-page-sk/BUILD.bazel
index 3717492..cb57736 100644
--- a/perf/modules/trybot-page-sk/BUILD.bazel
+++ b/perf/modules/trybot-page-sk/BUILD.bazel
@@ -34,7 +34,7 @@
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//perf/modules/plot-simple-sk:ticks_ts_lib",
     ],
     ts_srcs = [
diff --git a/perf/modules/trybot-page-sk/trybot-page-sk.ts b/perf/modules/trybot-page-sk/trybot-page-sk.ts
index e314903..a391d6c 100644
--- a/perf/modules/trybot-page-sk/trybot-page-sk.ts
+++ b/perf/modules/trybot-page-sk/trybot-page-sk.ts
@@ -5,7 +5,7 @@
  * This page allows the user to select either a CL or an existing commit in the
  * repo to analyze looking for regressions.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { toParamSet } from '../../../infra-sk/modules/query';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/perf/modules/word-cloud-sk/BUILD.bazel b/perf/modules/word-cloud-sk/BUILD.bazel
index 5af4ffb..fd0b803 100644
--- a/perf/modules/word-cloud-sk/BUILD.bazel
+++ b/perf/modules/word-cloud-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//perf/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/perf/modules/word-cloud-sk/word-cloud-sk.ts b/perf/modules/word-cloud-sk/word-cloud-sk.ts
index 0639e99..526d869 100644
--- a/perf/modules/word-cloud-sk/word-cloud-sk.ts
+++ b/perf/modules/word-cloud-sk/word-cloud-sk.ts
@@ -7,7 +7,7 @@
  *
  * @example
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { ValuePercent } from '../json';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 65e22b8..a41d0a3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -188,9 +188,6 @@
   lit:
     specifier: ^3.2.0
     version: 3.2.0
-  lit-html:
-    specifier: ^1.3.0
-    version: 1.3.0
   lottie-web:
     specifier: ^5.9.6
     version: 5.9.6
diff --git a/puppeteer-tests/modules/screenshots-viewer-sk/BUILD.bazel b/puppeteer-tests/modules/screenshots-viewer-sk/BUILD.bazel
index 98221f8..48c52ef 100644
--- a/puppeteer-tests/modules/screenshots-viewer-sk/BUILD.bazel
+++ b/puppeteer-tests/modules/screenshots-viewer-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "screenshots-viewer-sk.ts",
diff --git a/puppeteer-tests/modules/screenshots-viewer-sk/screenshots-viewer-sk.ts b/puppeteer-tests/modules/screenshots-viewer-sk/screenshots-viewer-sk.ts
index c194035..3076a91 100644
--- a/puppeteer-tests/modules/screenshots-viewer-sk/screenshots-viewer-sk.ts
+++ b/puppeteer-tests/modules/screenshots-viewer-sk/screenshots-viewer-sk.ts
@@ -1,4 +1,4 @@
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
 import { define } from '../../../elements-sk/modules/define';
diff --git a/scrap/modules/scrap-exchange-sk/BUILD.bazel b/scrap/modules/scrap-exchange-sk/BUILD.bazel
index 78aa06f..862935b 100644
--- a/scrap/modules/scrap-exchange-sk/BUILD.bazel
+++ b/scrap/modules/scrap-exchange-sk/BUILD.bazel
@@ -15,7 +15,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/scrap/modules/scrap-exchange-sk/scrap-exchange-sk.ts b/scrap/modules/scrap-exchange-sk/scrap-exchange-sk.ts
index 64eb0fd..31d3310 100644
--- a/scrap/modules/scrap-exchange-sk/scrap-exchange-sk.ts
+++ b/scrap/modules/scrap-exchange-sk/scrap-exchange-sk.ts
@@ -3,7 +3,7 @@
  * @description <h2><code>scrap-exchange-sk</code></h2>
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/shaders/modules/debugger-app-sk/BUILD.bazel b/shaders/modules/debugger-app-sk/BUILD.bazel
index 47217f6..54d9632 100644
--- a/shaders/modules/debugger-app-sk/BUILD.bazel
+++ b/shaders/modules/debugger-app-sk/BUILD.bazel
@@ -67,7 +67,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//:node_modules/@types/codemirror",
         "//:node_modules/codemirror",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/shaders/modules/debugger-app-sk/debugger-app-sk.ts b/shaders/modules/debugger-app-sk/debugger-app-sk.ts
index a4b5393..98d543e 100644
--- a/shaders/modules/debugger-app-sk/debugger-app-sk.ts
+++ b/shaders/modules/debugger-app-sk/debugger-app-sk.ts
@@ -5,8 +5,8 @@
  */
 import 'codemirror/mode/clike/clike'; // Syntax highlighting for c-like languages.
 import CodeMirror, { EditorConfiguration } from 'codemirror';
-import { html, TemplateResult } from 'lit-html';
-import { classMap } from 'lit-html/directives/class-map';
+import { html, TemplateResult } from 'lit/html.js';
+import { classMap } from 'lit/directives/class-map.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 
diff --git a/shaders/modules/edit-child-shader-sk/BUILD.bazel b/shaders/modules/edit-child-shader-sk/BUILD.bazel
index bbb24fb..e6bcc0c 100644
--- a/shaders/modules/edit-child-shader-sk/BUILD.bazel
+++ b/shaders/modules/edit-child-shader-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//shaders/modules/shadernode:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "edit-child-shader-sk.ts",
diff --git a/shaders/modules/edit-child-shader-sk/edit-child-shader-sk.ts b/shaders/modules/edit-child-shader-sk/edit-child-shader-sk.ts
index d2ac822..344f05e 100644
--- a/shaders/modules/edit-child-shader-sk/edit-child-shader-sk.ts
+++ b/shaders/modules/edit-child-shader-sk/edit-child-shader-sk.ts
@@ -6,7 +6,7 @@
  *
  * May be expanded in the future to also edit the ScrapHashOrName.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/shaders/modules/shaders-app-sk/BUILD.bazel b/shaders/modules/shaders-app-sk/BUILD.bazel
index f6cf3f0..0d3a871 100644
--- a/shaders/modules/shaders-app-sk/BUILD.bazel
+++ b/shaders/modules/shaders-app-sk/BUILD.bazel
@@ -82,7 +82,7 @@
         "//shaders/wasm_libs:canvaskit_types",  # keep
         "//:node_modules/@types/codemirror",
         "//:node_modules/codemirror",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/shaders/modules/shaders-app-sk/shaders-app-sk.ts b/shaders/modules/shaders-app-sk/shaders-app-sk.ts
index 606a83e..b2ea9e7 100644
--- a/shaders/modules/shaders-app-sk/shaders-app-sk.ts
+++ b/shaders/modules/shaders-app-sk/shaders-app-sk.ts
@@ -6,8 +6,8 @@
  *
  */
 import CodeMirror from 'codemirror';
-import { unsafeHTML } from 'lit-html/directives/unsafe-html';
-import { html, TemplateResult } from 'lit-html';
+import { unsafeHTML } from 'lit/directives/unsafe-html.js';
+import { html, TemplateResult } from 'lit/html.js';
 import { $, $$ } from '../../../infra-sk/modules/dom';
 import 'codemirror/mode/clike/clike'; // Syntax highlighting for c-like languages.
 import { define } from '../../../elements-sk/modules/define';
diff --git a/skcq/modules/processing-table-sk/BUILD.bazel b/skcq/modules/processing-table-sk/BUILD.bazel
index 33c7183..dffb106 100644
--- a/skcq/modules/processing-table-sk/BUILD.bazel
+++ b/skcq/modules/processing-table-sk/BUILD.bazel
@@ -28,7 +28,7 @@
         "//skcq/modules:skcq_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skcq/modules/processing-table-sk/processing-table-sk.ts b/skcq/modules/processing-table-sk/processing-table-sk.ts
index 2699797..eb6acf1 100644
--- a/skcq/modules/processing-table-sk/processing-table-sk.ts
+++ b/skcq/modules/processing-table-sk/processing-table-sk.ts
@@ -6,7 +6,7 @@
  *                          changes else displays only CQ runs.
  */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { diffDate } from '../../../infra-sk/modules/human';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/skcq/modules/skcq-scaffold-sk/BUILD.bazel b/skcq/modules/skcq-scaffold-sk/BUILD.bazel
index c0bda4e..6facff7 100644
--- a/skcq/modules/skcq-scaffold-sk/BUILD.bazel
+++ b/skcq/modules/skcq-scaffold-sk/BUILD.bazel
@@ -24,7 +24,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skcq/modules/skcq-scaffold-sk/skcq-scaffold-sk.ts b/skcq/modules/skcq-scaffold-sk/skcq-scaffold-sk.ts
index bf4894e..22fb5e7 100644
--- a/skcq/modules/skcq-scaffold-sk/skcq-scaffold-sk.ts
+++ b/skcq/modules/skcq-scaffold-sk/skcq-scaffold-sk.ts
@@ -11,7 +11,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/skcq/modules/skcq-sk/BUILD.bazel b/skcq/modules/skcq-sk/BUILD.bazel
index 57b130d..67cdff4 100644
--- a/skcq/modules/skcq-sk/BUILD.bazel
+++ b/skcq/modules/skcq-sk/BUILD.bazel
@@ -25,7 +25,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skcq/modules/skcq-sk/skcq-sk.ts b/skcq/modules/skcq-sk/skcq-sk.ts
index 7f0a82d..b68073a 100644
--- a/skcq/modules/skcq-sk/skcq-sk.ts
+++ b/skcq/modules/skcq-sk/skcq-sk.ts
@@ -4,7 +4,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/skcq/modules/verifiers-detail-sk/BUILD.bazel b/skcq/modules/verifiers-detail-sk/BUILD.bazel
index 1616586..1bb9049 100644
--- a/skcq/modules/verifiers-detail-sk/BUILD.bazel
+++ b/skcq/modules/verifiers-detail-sk/BUILD.bazel
@@ -29,7 +29,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:upgradeproperty_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skcq/modules/verifiers-detail-sk/verifiers-detail-sk.ts b/skcq/modules/verifiers-detail-sk/verifiers-detail-sk.ts
index 59cc87d..e005c47 100644
--- a/skcq/modules/verifiers-detail-sk/verifiers-detail-sk.ts
+++ b/skcq/modules/verifiers-detail-sk/verifiers-detail-sk.ts
@@ -11,7 +11,7 @@
  *
  */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { upgradeProperty } from '../../../elements-sk/modules/upgradeProperty';
 import { diffDate } from '../../../infra-sk/modules/human';
diff --git a/skottie/modules/helpers/BUILD.bazel b/skottie/modules/helpers/BUILD.bazel
index 5ecabb3..48de7d5 100644
--- a/skottie/modules/helpers/BUILD.bazel
+++ b/skottie/modules/helpers/BUILD.bazel
@@ -25,7 +25,7 @@
     visibility = ["//visibility:public"],
     deps = [
         ":domains_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
 )
 
diff --git a/skottie/modules/helpers/templates.ts b/skottie/modules/helpers/templates.ts
index 31af3d5..492f3e8 100644
--- a/skottie/modules/helpers/templates.ts
+++ b/skottie/modules/helpers/templates.ts
@@ -1,4 +1,4 @@
-import { TemplateResult } from 'lit-html';
+import { TemplateResult } from 'lit/html.js';
 import { isOneOfDomains } from './domains';
 
 export function renderByDomain(
diff --git a/skottie/modules/skottie-audio-sk/BUILD.bazel b/skottie/modules/skottie-audio-sk/BUILD.bazel
index e5f44e3..37ce94c 100644
--- a/skottie/modules/skottie-audio-sk/BUILD.bazel
+++ b/skottie/modules/skottie-audio-sk/BUILD.bazel
@@ -9,7 +9,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//:node_modules/@types/howler",
         "//:node_modules/howler",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-audio-sk/skottie-audio-sk.ts b/skottie/modules/skottie-audio-sk/skottie-audio-sk.ts
index 3a59439..3245933 100644
--- a/skottie/modules/skottie-audio-sk/skottie-audio-sk.ts
+++ b/skottie/modules/skottie-audio-sk/skottie-audio-sk.ts
@@ -29,7 +29,7 @@
  *
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { Howl } from 'howler';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/skottie/modules/skottie-background-settings-sk/BUILD.bazel b/skottie/modules/skottie-background-settings-sk/BUILD.bazel
index 812eac2..169ff92 100644
--- a/skottie/modules/skottie-background-settings-sk/BUILD.bazel
+++ b/skottie/modules/skottie-background-settings-sk/BUILD.bazel
@@ -8,7 +8,7 @@
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-background-settings-sk/skottie-background-settings-sk.ts b/skottie/modules/skottie-background-settings-sk/skottie-background-settings-sk.ts
index 701fda5..1276939 100644
--- a/skottie/modules/skottie-background-settings-sk/skottie-background-settings-sk.ts
+++ b/skottie/modules/skottie-background-settings-sk/skottie-background-settings-sk.ts
@@ -11,7 +11,7 @@
  *      user selects a new color or opacity
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../skottie-dropdown-sk';
diff --git a/skottie/modules/skottie-button-sk/BUILD.bazel b/skottie/modules/skottie-button-sk/BUILD.bazel
index a28cd75..31d1afc 100644
--- a/skottie/modules/skottie-button-sk/BUILD.bazel
+++ b/skottie/modules/skottie-button-sk/BUILD.bazel
@@ -7,7 +7,7 @@
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-button-sk/skottie-button-sk.ts b/skottie/modules/skottie-button-sk/skottie-button-sk.ts
index f228ba2..fd17b8f 100644
--- a/skottie/modules/skottie-button-sk/skottie-button-sk.ts
+++ b/skottie/modules/skottie-button-sk/skottie-button-sk.ts
@@ -25,7 +25,7 @@
  * @prop disabled This mirrors the disabled attribute.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/skottie/modules/skottie-color-input-sk/BUILD.bazel b/skottie/modules/skottie-color-input-sk/BUILD.bazel
index be0bcaf..6048b84 100644
--- a/skottie/modules/skottie-color-input-sk/BUILD.bazel
+++ b/skottie/modules/skottie-color-input-sk/BUILD.bazel
@@ -7,7 +7,7 @@
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-color-input-sk/skottie-color-input-sk.ts b/skottie/modules/skottie-color-input-sk/skottie-color-input-sk.ts
index 4935d12..8a5dd2b 100644
--- a/skottie/modules/skottie-color-input-sk/skottie-color-input-sk.ts
+++ b/skottie/modules/skottie-color-input-sk/skottie-color-input-sk.ts
@@ -19,7 +19,7 @@
  *         or the color is changed.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/skottie/modules/skottie-color-manager-sk/BUILD.bazel b/skottie/modules/skottie-color-manager-sk/BUILD.bazel
index 1377b3d..2105242 100644
--- a/skottie/modules/skottie-color-manager-sk/BUILD.bazel
+++ b/skottie/modules/skottie-color-manager-sk/BUILD.bazel
@@ -10,7 +10,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//skottie/modules:types_ts_lib",
         "//skottie/modules/helpers:color_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-color-manager-sk/skottie-color-manager-sk.ts b/skottie/modules/skottie-color-manager-sk/skottie-color-manager-sk.ts
index 67f0b16..f0b3076 100644
--- a/skottie/modules/skottie-color-manager-sk/skottie-color-manager-sk.ts
+++ b/skottie/modules/skottie-color-manager-sk/skottie-color-manager-sk.ts
@@ -14,7 +14,7 @@
  *      either from applying the filter or when its properties change.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { LottieAnimation, LottieCompAsset, LottieTintEffect } from '../types';
diff --git a/skottie/modules/skottie-compatibility-sk/BUILD.bazel b/skottie/modules/skottie-compatibility-sk/BUILD.bazel
index ee48f3d..fbafbaa 100644
--- a/skottie/modules/skottie-compatibility-sk/BUILD.bazel
+++ b/skottie/modules/skottie-compatibility-sk/BUILD.bazel
@@ -8,7 +8,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//skottie/modules:types_ts_lib",
         "//skottie/modules/skottie-compatibility-sk/schemas:lottie.schema_ts_lib",
         "//skottie/modules/skottie-compatibility-sk/schemas:low-power-lottie-profile.schema_ts_lib",
diff --git a/skottie/modules/skottie-compatibility-sk/skottie-compatibility-sk.ts b/skottie/modules/skottie-compatibility-sk/skottie-compatibility-sk.ts
index d5c94d3..e7b8521 100644
--- a/skottie/modules/skottie-compatibility-sk/skottie-compatibility-sk.ts
+++ b/skottie/modules/skottie-compatibility-sk/skottie-compatibility-sk.ts
@@ -7,7 +7,7 @@
  * JSON schemas.
  * </p>
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { LottieAnimation } from '../types';
diff --git a/skottie/modules/skottie-config-sk/BUILD.bazel b/skottie/modules/skottie-config-sk/BUILD.bazel
index aaccaf1..b2385f6 100644
--- a/skottie/modules/skottie-config-sk/BUILD.bazel
+++ b/skottie/modules/skottie-config-sk/BUILD.bazel
@@ -19,7 +19,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-config-sk/skottie-config-sk.ts b/skottie/modules/skottie-config-sk/skottie-config-sk.ts
index fb9e901..91fb5be 100644
--- a/skottie/modules/skottie-config-sk/skottie-config-sk.ts
+++ b/skottie/modules/skottie-config-sk/skottie-config-sk.ts
@@ -25,7 +25,7 @@
  * @evt cancelled - This event is generated when the user presses Cancel.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { $$ } from '../../../infra-sk/modules/dom';
diff --git a/skottie/modules/skottie-drive-sk/BUILD.bazel b/skottie/modules/skottie-drive-sk/BUILD.bazel
index 63451e5..2de49bf 100644
--- a/skottie/modules/skottie-drive-sk/BUILD.bazel
+++ b/skottie/modules/skottie-drive-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-drive-sk/skottie-drive-sk.ts b/skottie/modules/skottie-drive-sk/skottie-drive-sk.ts
index 435364b..e1f8c0c 100644
--- a/skottie/modules/skottie-drive-sk/skottie-drive-sk.ts
+++ b/skottie/modules/skottie-drive-sk/skottie-drive-sk.ts
@@ -26,8 +26,8 @@
  */
 import '../skottie-player-sk';
 import '../../../elements-sk/modules/error-toast-sk';
-import { html } from 'lit-html';
-import { until } from 'lit-html/directives/until.js';
+import { html } from 'lit/html.js';
+import { until } from 'lit/directives/until.js';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
diff --git a/skottie/modules/skottie-dropdown-sk/BUILD.bazel b/skottie/modules/skottie-dropdown-sk/BUILD.bazel
index f5ea066..c908b5b 100644
--- a/skottie/modules/skottie-dropdown-sk/BUILD.bazel
+++ b/skottie/modules/skottie-dropdown-sk/BUILD.bazel
@@ -7,7 +7,7 @@
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-dropdown-sk/skottie-dropdown-sk.ts b/skottie/modules/skottie-dropdown-sk/skottie-dropdown-sk.ts
index e01bf17..fd86aba 100644
--- a/skottie/modules/skottie-dropdown-sk/skottie-dropdown-sk.ts
+++ b/skottie/modules/skottie-dropdown-sk/skottie-dropdown-sk.ts
@@ -14,7 +14,7 @@
  * @attr reset - Resets the dropdown after select.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/skottie/modules/skottie-embed-sk/BUILD.bazel b/skottie/modules/skottie-embed-sk/BUILD.bazel
index cd07068..d4c3077 100644
--- a/skottie/modules/skottie-embed-sk/BUILD.bazel
+++ b/skottie/modules/skottie-embed-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//infra-sk/modules:hintable_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-embed-sk/skottie-embed-sk.ts b/skottie/modules/skottie-embed-sk/skottie-embed-sk.ts
index 010d13e..2605781 100644
--- a/skottie/modules/skottie-embed-sk/skottie-embed-sk.ts
+++ b/skottie/modules/skottie-embed-sk/skottie-embed-sk.ts
@@ -16,7 +16,7 @@
  *  </iframe>
  */
 import '../skottie-player-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
diff --git a/skottie/modules/skottie-exporter-sk/BUILD.bazel b/skottie/modules/skottie-exporter-sk/BUILD.bazel
index 2b5c20d..1be20a5 100644
--- a/skottie/modules/skottie-exporter-sk/BUILD.bazel
+++ b/skottie/modules/skottie-exporter-sk/BUILD.bazel
@@ -14,7 +14,7 @@
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-base-sk/BUILD.bazel b/skottie/modules/skottie-exporter-sk/skottie-exporter-base-sk/BUILD.bazel
index 0622bb1..5b301e0 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-base-sk/BUILD.bazel
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-base-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-base-sk/skottie-exporter-base-sk.ts b/skottie/modules/skottie-exporter-sk/skottie-exporter-base-sk/skottie-exporter-base-sk.ts
index 3ebf2a0..485d807 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-base-sk/skottie-exporter-base-sk.ts
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-base-sk/skottie-exporter-base-sk.ts
@@ -7,7 +7,7 @@
  * </p>
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../../elements-sk/modules/define';
 import { ElementSk } from '../../../../infra-sk/modules/ElementSk';
 import { $$ } from '../../../../infra-sk/modules/dom';
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-gif-sk/BUILD.bazel b/skottie/modules/skottie-exporter-sk/skottie-exporter-gif-sk/BUILD.bazel
index 0853b36..23ba3ac 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-gif-sk/BUILD.bazel
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-gif-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//skottie/modules/helpers:framecollectorfactory_ts_lib",
         "//:node_modules/@ffmpeg/ffmpeg",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-gif-sk/skottie-exporter-gif-sk.ts b/skottie/modules/skottie-exporter-sk/skottie-exporter-gif-sk/skottie-exporter-gif-sk.ts
index 5866931..f12a9ec 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-gif-sk/skottie-exporter-gif-sk.ts
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-gif-sk/skottie-exporter-gif-sk.ts
@@ -15,7 +15,7 @@
  * </p>
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import '../../skottie-dropdown-sk';
 import { createFFmpeg, FFmpeg } from '@ffmpeg/ffmpeg';
 import { define } from '../../../../elements-sk/modules/define';
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-png-sk/BUILD.bazel b/skottie/modules/skottie-exporter-sk/skottie-exporter-png-sk/BUILD.bazel
index c6ef890..0faf801 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-png-sk/BUILD.bazel
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-png-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//skottie/modules/helpers:delay_ts_lib",
         "//:node_modules/jszip",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-png-sk/skottie-exporter-png-sk.ts b/skottie/modules/skottie-exporter-sk/skottie-exporter-png-sk/skottie-exporter-png-sk.ts
index 9d21566..5cdcfdc 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-png-sk/skottie-exporter-png-sk.ts
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-png-sk/skottie-exporter-png-sk.ts
@@ -8,7 +8,7 @@
  * </p>
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import JSZip from 'jszip';
 import { define } from '../../../../elements-sk/modules/define';
 import '../../skottie-dropdown-sk';
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-sk.ts b/skottie/modules/skottie-exporter-sk/skottie-exporter-sk.ts
index e0ac878..0d1f642 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-sk.ts
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-sk.ts
@@ -7,7 +7,7 @@
  * </p>
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../skottie-dropdown-sk';
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-webm-sk/BUILD.bazel b/skottie/modules/skottie-exporter-sk/skottie-exporter-webm-sk/BUILD.bazel
index 8186678..4c76c1b 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-webm-sk/BUILD.bazel
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-webm-sk/BUILD.bazel
@@ -15,7 +15,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//skottie/modules/helpers:framecollectorfactory_ts_lib",
         "//:node_modules/@ffmpeg/ffmpeg",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-exporter-sk/skottie-exporter-webm-sk/skottie-exporter-webm-sk.ts b/skottie/modules/skottie-exporter-sk/skottie-exporter-webm-sk/skottie-exporter-webm-sk.ts
index 19fd8da..9d7baa4 100644
--- a/skottie/modules/skottie-exporter-sk/skottie-exporter-webm-sk/skottie-exporter-webm-sk.ts
+++ b/skottie/modules/skottie-exporter-sk/skottie-exporter-webm-sk/skottie-exporter-webm-sk.ts
@@ -13,7 +13,7 @@
  * </p>
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import '../../skottie-dropdown-sk';
 import { createFFmpeg, FFmpeg } from '@ffmpeg/ffmpeg';
 import { define } from '../../../../elements-sk/modules/define';
diff --git a/skottie/modules/skottie-file-form-sk/BUILD.bazel b/skottie/modules/skottie-file-form-sk/BUILD.bazel
index 42894ff..2c891d4 100644
--- a/skottie/modules/skottie-file-form-sk/BUILD.bazel
+++ b/skottie/modules/skottie-file-form-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         "//skottie/modules:types_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-file-form-sk/skottie-file-form-sk.ts b/skottie/modules/skottie-file-form-sk/skottie-file-form-sk.ts
index 2b0961e..4676d83 100644
--- a/skottie/modules/skottie-file-form-sk/skottie-file-form-sk.ts
+++ b/skottie/modules/skottie-file-form-sk/skottie-file-form-sk.ts
@@ -11,7 +11,7 @@
  *      The updated state is submitted with all files attached to the form.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/skottie/modules/skottie-file-settings-sk/BUILD.bazel b/skottie/modules/skottie-file-settings-sk/BUILD.bazel
index eaa7b6e..e2857d4 100644
--- a/skottie/modules/skottie-file-settings-sk/BUILD.bazel
+++ b/skottie/modules/skottie-file-settings-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-file-settings-sk/skottie-file-settings-sk.ts b/skottie/modules/skottie-file-settings-sk/skottie-file-settings-sk.ts
index 0b61b13..5392596 100644
--- a/skottie/modules/skottie-file-settings-sk/skottie-file-settings-sk.ts
+++ b/skottie/modules/skottie-file-settings-sk/skottie-file-settings-sk.ts
@@ -11,7 +11,7 @@
  *         The updated fps, width, and height is available in the event detail.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../elements-sk/modules/icons/lock-icon-sk';
diff --git a/skottie/modules/skottie-font-selector-sk/BUILD.bazel b/skottie/modules/skottie-font-selector-sk/BUILD.bazel
index c22a75c..ea3afe5 100644
--- a/skottie/modules/skottie-font-selector-sk/BUILD.bazel
+++ b/skottie/modules/skottie-font-selector-sk/BUILD.bazel
@@ -9,7 +9,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//skottie/modules/helpers:availablefonts_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-font-selector-sk/skottie-font-selector-sk.ts b/skottie/modules/skottie-font-selector-sk/skottie-font-selector-sk.ts
index 2f0f919..bc6528b 100644
--- a/skottie/modules/skottie-font-selector-sk/skottie-font-selector-sk.ts
+++ b/skottie/modules/skottie-font-selector-sk/skottie-font-selector-sk.ts
@@ -11,7 +11,7 @@
  * </p>
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../skottie-dropdown-sk';
diff --git a/skottie/modules/skottie-gif-exporter-sk/BUILD.bazel b/skottie/modules/skottie-gif-exporter-sk/BUILD.bazel
index ff13831..435ff12 100644
--- a/skottie/modules/skottie-gif-exporter-sk/BUILD.bazel
+++ b/skottie/modules/skottie-gif-exporter-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//skottie/modules/helpers:gifstorage_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-gif-exporter-sk/skottie-gif-exporter-sk.ts b/skottie/modules/skottie-gif-exporter-sk/skottie-gif-exporter-sk.ts
index e282c3a..5ae1bd6 100644
--- a/skottie/modules/skottie-gif-exporter-sk/skottie-gif-exporter-sk.ts
+++ b/skottie/modules/skottie-gif-exporter-sk/skottie-gif-exporter-sk.ts
@@ -9,7 +9,7 @@
  * @evt start - This event is generated when the saving process starts.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../elements-sk/modules/select-sk';
 import { bytes, diffDate } from '../../../infra-sk/modules/human';
diff --git a/skottie/modules/skottie-inline-sk/BUILD.bazel b/skottie/modules/skottie-inline-sk/BUILD.bazel
index 6bb776a..80509e0 100644
--- a/skottie/modules/skottie-inline-sk/BUILD.bazel
+++ b/skottie/modules/skottie-inline-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-inline-sk/skottie-inline-sk.ts b/skottie/modules/skottie-inline-sk/skottie-inline-sk.ts
index edff3d8..74d4f8e 100644
--- a/skottie/modules/skottie-inline-sk/skottie-inline-sk.ts
+++ b/skottie/modules/skottie-inline-sk/skottie-inline-sk.ts
@@ -23,7 +23,7 @@
  *  </skottie-inline-sk>
  */
 import '../skottie-player-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/skottie/modules/skottie-library-sk/BUILD.bazel b/skottie/modules/skottie-library-sk/BUILD.bazel
index e2bb4c6..6008306 100644
--- a/skottie/modules/skottie-library-sk/BUILD.bazel
+++ b/skottie/modules/skottie-library-sk/BUILD.bazel
@@ -11,7 +11,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//:node_modules/jszip",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-library-sk/skottie-library-sk.ts b/skottie/modules/skottie-library-sk/skottie-library-sk.ts
index 5eb889c..7e5896b 100644
--- a/skottie/modules/skottie-library-sk/skottie-library-sk.ts
+++ b/skottie/modules/skottie-library-sk/skottie-library-sk.ts
@@ -16,7 +16,7 @@
  *
  */
 import '../skottie-player-sk';
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import JSZip, { JSZipObject } from 'jszip';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { define } from '../../../elements-sk/modules/define';
diff --git a/skottie/modules/skottie-performance-sk/BUILD.bazel b/skottie/modules/skottie-performance-sk/BUILD.bazel
index 0ce0f14..d36855d 100644
--- a/skottie/modules/skottie-performance-sk/BUILD.bazel
+++ b/skottie/modules/skottie-performance-sk/BUILD.bazel
@@ -8,7 +8,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//:node_modules/chart.js",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-performance-sk/skottie-performance-sk.ts b/skottie/modules/skottie-performance-sk/skottie-performance-sk.ts
index e21f10d..c42c956 100644
--- a/skottie/modules/skottie-performance-sk/skottie-performance-sk.ts
+++ b/skottie/modules/skottie-performance-sk/skottie-performance-sk.ts
@@ -10,7 +10,7 @@
  *
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import {
   Chart,
   BarController,
diff --git a/skottie/modules/skottie-player-sk/BUILD.bazel b/skottie/modules/skottie-player-sk/BUILD.bazel
index 8056048..7c22e5f 100644
--- a/skottie/modules/skottie-player-sk/BUILD.bazel
+++ b/skottie/modules/skottie-player-sk/BUILD.bazel
@@ -18,7 +18,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//:node_modules/canvaskit-wasm",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-player-sk/skottie-player-sk.ts b/skottie/modules/skottie-player-sk/skottie-player-sk.ts
index 19a1dff..89d6fe9 100644
--- a/skottie/modules/skottie-player-sk/skottie-player-sk.ts
+++ b/skottie/modules/skottie-player-sk/skottie-player-sk.ts
@@ -13,8 +13,8 @@
 import '../../../elements-sk/modules/icons/play-arrow-icon-sk';
 import '../../../elements-sk/modules/icons/settings-icon-sk';
 import '../../../elements-sk/modules/spinner-sk';
-import { html, TemplateResult } from 'lit-html';
-import { repeat } from 'lit-html/directives/repeat';
+import { html, TemplateResult } from 'lit/html.js';
+import { repeat } from 'lit/directives/repeat.js';
 import {
   Canvas,
   CanvasKit,
diff --git a/skottie/modules/skottie-shader-editor-sk/BUILD.bazel b/skottie/modules/skottie-shader-editor-sk/BUILD.bazel
index 623ed06..d7332f3 100644
--- a/skottie/modules/skottie-shader-editor-sk/BUILD.bazel
+++ b/skottie/modules/skottie-shader-editor-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         ":shader-replace_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//skottie/modules/helpers:animation_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-shader-editor-sk/skottie-shader-editor-sk.ts b/skottie/modules/skottie-shader-editor-sk/skottie-shader-editor-sk.ts
index c44ea37..84be112 100644
--- a/skottie/modules/skottie-shader-editor-sk/skottie-shader-editor-sk.ts
+++ b/skottie/modules/skottie-shader-editor-sk/skottie-shader-editor-sk.ts
@@ -17,7 +17,7 @@
  *              Supported values are default and presentation
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ShaderData } from './shader-replace';
 import { LottieAnimation, LottieAsset, LottieLayer, ViewMode } from '../types';
diff --git a/skottie/modules/skottie-sk/BUILD.bazel b/skottie/modules/skottie-sk/BUILD.bazel
index 0c85cc4..9c4ed0f 100644
--- a/skottie/modules/skottie-sk/BUILD.bazel
+++ b/skottie/modules/skottie-sk/BUILD.bazel
@@ -81,7 +81,7 @@
         "//skottie/modules/helpers:animation_ts_lib",
         "//skottie/modules/window:window_ts_lib",
         "//:node_modules/ajv",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//:node_modules/lottie-web",
         "//:node_modules/vanilla-jsoneditor",
         "//skottie/modules/skottie-compatibility-sk/schemas:lottie.schema_ts_lib",
diff --git a/skottie/modules/skottie-sk/skottie-sk.ts b/skottie/modules/skottie-sk/skottie-sk.ts
index c5ab9d0..d51f037 100644
--- a/skottie/modules/skottie-sk/skottie-sk.ts
+++ b/skottie/modules/skottie-sk/skottie-sk.ts
@@ -13,7 +13,7 @@
 import '../../../elements-sk/modules/collapse-sk';
 import '../../../elements-sk/modules/error-toast-sk';
 import Ajv from 'ajv/dist/2020';
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import {
   JSONEditor,
   toJSONContent,
diff --git a/skottie/modules/skottie-slot-manager-sk/BUILD.bazel b/skottie/modules/skottie-slot-manager-sk/BUILD.bazel
index cbc8d27..d9ddc23 100644
--- a/skottie/modules/skottie-slot-manager-sk/BUILD.bazel
+++ b/skottie/modules/skottie-slot-manager-sk/BUILD.bazel
@@ -16,7 +16,7 @@
         ":slot-info_ts_lib",
         ":slot-replace_ts_lib",
         ":skottie-vec2-input-sk_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//skottie/modules:types_ts_lib",
     ],
     ts_srcs = [
@@ -37,7 +37,7 @@
     srcs = ["skottie-vec2-input-sk.ts"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
     ],
diff --git a/skottie/modules/skottie-slot-manager-sk/skottie-slot-manager-sk.ts b/skottie/modules/skottie-slot-manager-sk/skottie-slot-manager-sk.ts
index 0f108f3..72e6080 100644
--- a/skottie/modules/skottie-slot-manager-sk/skottie-slot-manager-sk.ts
+++ b/skottie/modules/skottie-slot-manager-sk/skottie-slot-manager-sk.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { SkottieColorEventDetail } from '../skottie-color-input-sk/skottie-color-input-sk';
 import { colorToHex, hexToColor } from '../helpers/color';
diff --git a/skottie/modules/skottie-slot-manager-sk/skottie-vec2-input-sk.ts b/skottie/modules/skottie-slot-manager-sk/skottie-vec2-input-sk.ts
index 8ace2b9..635fb8e 100644
--- a/skottie/modules/skottie-slot-manager-sk/skottie-vec2-input-sk.ts
+++ b/skottie/modules/skottie-slot-manager-sk/skottie-vec2-input-sk.ts
@@ -22,7 +22,7 @@
  * @evt value-change - This event is triggered every time either x or y change.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/skottie/modules/skottie-text-editor-sk/BUILD.bazel b/skottie/modules/skottie-text-editor-sk/BUILD.bazel
index 6be3eec..ad1aac5 100644
--- a/skottie/modules/skottie-text-editor-sk/BUILD.bazel
+++ b/skottie/modules/skottie-text-editor-sk/BUILD.bazel
@@ -11,7 +11,7 @@
         "//skottie/modules/helpers:animation_ts_lib",
         "//skottie/modules:types_ts_lib",
         ":text-replace_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-text-editor-sk/skottie-text-editor-sk.ts b/skottie/modules/skottie-text-editor-sk/skottie-text-editor-sk.ts
index daf1806..2fb4ebb 100644
--- a/skottie/modules/skottie-text-editor-sk/skottie-text-editor-sk.ts
+++ b/skottie/modules/skottie-text-editor-sk/skottie-text-editor-sk.ts
@@ -17,7 +17,7 @@
  *         Supported values are default and presentation
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ExtraLayerData, replaceTexts, TextData } from './text-replace';
 import { LottieAnimation, LottieAsset, LottieLayer, ViewMode } from '../types';
diff --git a/skottie/modules/skottie-text-editor-sk/text-box-sk/BUILD.bazel b/skottie/modules/skottie-text-editor-sk/text-box-sk/BUILD.bazel
index 93d134f..65985da 100644
--- a/skottie/modules/skottie-text-editor-sk/text-box-sk/BUILD.bazel
+++ b/skottie/modules/skottie-text-editor-sk/text-box-sk/BUILD.bazel
@@ -14,7 +14,7 @@
         "//skottie/modules/skottie-text-editor-sk:text-replace_ts_lib",
         "//skottie/modules/skottie-text-editor-sk:text-sanizite_ts_lib",
         "//skottie/modules:types_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-text-editor-sk/text-box-sk/text-box-sk.ts b/skottie/modules/skottie-text-editor-sk/text-box-sk/text-box-sk.ts
index 95bb566..2b7be8e 100644
--- a/skottie/modules/skottie-text-editor-sk/text-box-sk/text-box-sk.ts
+++ b/skottie/modules/skottie-text-editor-sk/text-box-sk/text-box-sk.ts
@@ -18,8 +18,8 @@
  *         Supported values are default and presentation
  *
  */
-import { html, TemplateResult } from 'lit-html';
-import { ifDefined } from 'lit-html/directives/if-defined';
+import { html, TemplateResult } from 'lit/html.js';
+import { ifDefined } from 'lit/directives/if-defined.js';
 import { define } from '../../../../elements-sk/modules/define';
 import { ElementSk } from '../../../../infra-sk/modules/ElementSk';
 import { ViewMode } from '../../types';
diff --git a/skottie/modules/skottie-text-sampler-sk/BUILD.bazel b/skottie/modules/skottie-text-sampler-sk/BUILD.bazel
index 438179d..5b0d461 100644
--- a/skottie/modules/skottie-text-sampler-sk/BUILD.bazel
+++ b/skottie/modules/skottie-text-sampler-sk/BUILD.bazel
@@ -11,7 +11,7 @@
     ts_deps = [
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules/ElementSk:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/skottie/modules/skottie-text-sampler-sk/skottie-text-sampler-sk.ts b/skottie/modules/skottie-text-sampler-sk/skottie-text-sampler-sk.ts
index 1ef309d..c61a5b0 100644
--- a/skottie/modules/skottie-text-sampler-sk/skottie-text-sampler-sk.ts
+++ b/skottie/modules/skottie-text-sampler-sk/skottie-text-sampler-sk.ts
@@ -9,7 +9,7 @@
  *
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../skottie-button-sk';
diff --git a/status/modules/autoroller-status-sk/BUILD.bazel b/status/modules/autoroller-status-sk/BUILD.bazel
index aeae819..664663a 100644
--- a/status/modules/autoroller-status-sk/BUILD.bazel
+++ b/status/modules/autoroller-status-sk/BUILD.bazel
@@ -10,7 +10,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//status/modules/rpc:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "autoroller-status-sk.ts",
diff --git a/status/modules/autoroller-status-sk/autoroller-status-sk.ts b/status/modules/autoroller-status-sk/autoroller-status-sk.ts
index 8bfe47e..239c8d8 100644
--- a/status/modules/autoroller-status-sk/autoroller-status-sk.ts
+++ b/status/modules/autoroller-status-sk/autoroller-status-sk.ts
@@ -7,7 +7,7 @@
  * @event rollers-update: Periodic event for updated roller status. Detail
  * is of type Array<AutorollerStatus>
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { StatusService, GetStatusService, AutorollerStatus } from '../rpc';
diff --git a/status/modules/branches-sk/BUILD.bazel b/status/modules/branches-sk/BUILD.bazel
index c288d85..6f854e1 100644
--- a/status/modules/branches-sk/BUILD.bazel
+++ b/status/modules/branches-sk/BUILD.bazel
@@ -13,7 +13,7 @@
         "//status/modules:util_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "branches-sk.ts",
diff --git a/status/modules/branches-sk/branches-sk.ts b/status/modules/branches-sk/branches-sk.ts
index a8fa676..aa7734e 100644
--- a/status/modules/branches-sk/branches-sk.ts
+++ b/status/modules/branches-sk/branches-sk.ts
@@ -4,7 +4,7 @@
  *
  *  Custom element for displaying branches.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/status/modules/bugs-status-sk/BUILD.bazel b/status/modules/bugs-status-sk/BUILD.bazel
index cf10c4d..73902b2 100644
--- a/status/modules/bugs-status-sk/BUILD.bazel
+++ b/status/modules/bugs-status-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "bugs-status-sk.ts",
diff --git a/status/modules/bugs-status-sk/bugs-status-sk.ts b/status/modules/bugs-status-sk/bugs-status-sk.ts
index 00ebfe6..9a64846 100644
--- a/status/modules/bugs-status-sk/bugs-status-sk.ts
+++ b/status/modules/bugs-status-sk/bugs-status-sk.ts
@@ -4,7 +4,7 @@
  *
  * Custom element to display untriaged Skia bugs.
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/status/modules/capacity-sk/BUILD.bazel b/status/modules/capacity-sk/BUILD.bazel
index 2ec0b1a..f29dab8 100644
--- a/status/modules/capacity-sk/BUILD.bazel
+++ b/status/modules/capacity-sk/BUILD.bazel
@@ -26,7 +26,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:hintable_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "capacity-sk.ts",
diff --git a/status/modules/capacity-sk/capacity-sk.ts b/status/modules/capacity-sk/capacity-sk.ts
index 235db7d..add413d 100644
--- a/status/modules/capacity-sk/capacity-sk.ts
+++ b/status/modules/capacity-sk/capacity-sk.ts
@@ -9,7 +9,7 @@
  *
  * @example
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import '../../../infra-sk/modules/theme-chooser-sk';
 import '../../../infra-sk/modules/app-sk';
diff --git a/status/modules/comments-sk/BUILD.bazel b/status/modules/comments-sk/BUILD.bazel
index c764f4d..37627a3 100644
--- a/status/modules/comments-sk/BUILD.bazel
+++ b/status/modules/comments-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "comments-sk.ts",
diff --git a/status/modules/comments-sk/comments-sk.ts b/status/modules/comments-sk/comments-sk.ts
index 854b7bd..1f7ad55 100644
--- a/status/modules/comments-sk/comments-sk.ts
+++ b/status/modules/comments-sk/comments-sk.ts
@@ -15,7 +15,7 @@
  * @property showIgnoreFailure: boolean - Display ignoreFailure field of comments.
  *
  */
-import { html, TemplateResult } from 'lit-html';
+import { html, TemplateResult } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { $$ } from '../../../infra-sk/modules/dom';
diff --git a/status/modules/commits-table-sk/BUILD.bazel b/status/modules/commits-table-sk/BUILD.bazel
index f772345..5dc1a08 100644
--- a/status/modules/commits-table-sk/BUILD.bazel
+++ b/status/modules/commits-table-sk/BUILD.bazel
@@ -35,7 +35,7 @@
         "//infra-sk/modules:hintable_ts_lib",
         "//infra-sk/modules:query_ts_lib",
         "//infra-sk/modules:statereflector_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "commits-table-sk.ts",
diff --git a/status/modules/commits-table-sk/commits-table-sk.ts b/status/modules/commits-table-sk/commits-table-sk.ts
index b348aed..3d878db 100644
--- a/status/modules/commits-table-sk/commits-table-sk.ts
+++ b/status/modules/commits-table-sk/commits-table-sk.ts
@@ -12,9 +12,9 @@
  * @event repo-changed - Occurs when user selects a repo. Event has {detail: '<new repo>'}
  */
 
-import { html, TemplateResult } from 'lit-html';
-import { styleMap } from 'lit-html/directives/style-map';
-import { classMap } from 'lit-html/directives/class-map';
+import { html, TemplateResult } from 'lit/html.js';
+import { styleMap } from 'lit/directives/style-map.js';
+import { classMap } from 'lit/directives/class-map.js';
 import { $, $$, DomReady } from '../../../infra-sk/modules/dom';
 import { fromObject } from '../../../infra-sk/modules/query';
 import { stateReflector } from '../../../infra-sk/modules/stateReflector';
diff --git a/status/modules/details-dialog-sk/BUILD.bazel b/status/modules/details-dialog-sk/BUILD.bazel
index 5e578b0..ee3f6d9 100644
--- a/status/modules/details-dialog-sk/BUILD.bazel
+++ b/status/modules/details-dialog-sk/BUILD.bazel
@@ -28,7 +28,7 @@
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules/json:index_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "details-dialog-sk.ts",
diff --git a/status/modules/details-dialog-sk/details-dialog-sk.ts b/status/modules/details-dialog-sk/details-dialog-sk.ts
index b24b156..3495955 100644
--- a/status/modules/details-dialog-sk/details-dialog-sk.ts
+++ b/status/modules/details-dialog-sk/details-dialog-sk.ts
@@ -5,8 +5,8 @@
  * @property repo {string} - The repo associated with the tasks/taskspecs/commits that will be
  * displayed.
  */
-import { html, TemplateResult } from 'lit-html';
-import { until } from 'lit-html/directives/until.js';
+import { html, TemplateResult } from 'lit/html.js';
+import { until } from 'lit/directives/until.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/status/modules/gold-status-sk/BUILD.bazel b/status/modules/gold-status-sk/BUILD.bazel
index f12d68d..da31588 100644
--- a/status/modules/gold-status-sk/BUILD.bazel
+++ b/status/modules/gold-status-sk/BUILD.bazel
@@ -17,7 +17,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "gold-status-sk.ts",
diff --git a/status/modules/gold-status-sk/gold-status-sk.ts b/status/modules/gold-status-sk/gold-status-sk.ts
index e2e585b..432ac49 100644
--- a/status/modules/gold-status-sk/gold-status-sk.ts
+++ b/status/modules/gold-status-sk/gold-status-sk.ts
@@ -6,7 +6,7 @@
 
  * Custom element to display untriaged Gold iamges.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/status/modules/navigation-sk/BUILD.bazel b/status/modules/navigation-sk/BUILD.bazel
index 5cdb9e9..8cfbf1c 100644
--- a/status/modules/navigation-sk/BUILD.bazel
+++ b/status/modules/navigation-sk/BUILD.bazel
@@ -19,7 +19,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/status/modules/navigation-sk/navigation-sk.ts b/status/modules/navigation-sk/navigation-sk.ts
index b2e0a56..78b5398 100644
--- a/status/modules/navigation-sk/navigation-sk.ts
+++ b/status/modules/navigation-sk/navigation-sk.ts
@@ -5,7 +5,7 @@
  * Element that offers navigation links for available pages.
  *
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/status/modules/perf-status-sk/BUILD.bazel b/status/modules/perf-status-sk/BUILD.bazel
index 3701ab8..432e6d5 100644
--- a/status/modules/perf-status-sk/BUILD.bazel
+++ b/status/modules/perf-status-sk/BUILD.bazel
@@ -17,7 +17,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/status/modules/perf-status-sk/perf-status-sk.ts b/status/modules/perf-status-sk/perf-status-sk.ts
index 1179401..eb0d522 100644
--- a/status/modules/perf-status-sk/perf-status-sk.ts
+++ b/status/modules/perf-status-sk/perf-status-sk.ts
@@ -4,7 +4,7 @@
  *
  * Custom element for displaying status of Perf regressions.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
diff --git a/status/modules/rotations-sk/BUILD.bazel b/status/modules/rotations-sk/BUILD.bazel
index 92034fc..2b3738c 100644
--- a/status/modules/rotations-sk/BUILD.bazel
+++ b/status/modules/rotations-sk/BUILD.bazel
@@ -15,7 +15,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/status/modules/rotations-sk/rotations-sk.ts b/status/modules/rotations-sk/rotations-sk.ts
index 7b57b6f..dc40d4e 100644
--- a/status/modules/rotations-sk/rotations-sk.ts
+++ b/status/modules/rotations-sk/rotations-sk.ts
@@ -4,8 +4,8 @@
  *
  * Custom element for displaying current rotations for Skia, GPU, Android, and Infra.
  */
-import { html } from 'lit-html';
-import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
+import { html } from 'lit/html.js';
+import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { Rotation } from '../tree-status-sk/tree-status-sk';
diff --git a/status/modules/status-sk/BUILD.bazel b/status/modules/status-sk/BUILD.bazel
index c8b939e..6121ff8 100644
--- a/status/modules/status-sk/BUILD.bazel
+++ b/status/modules/status-sk/BUILD.bazel
@@ -33,7 +33,7 @@
         "//status/modules:settings_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/status/modules/status-sk/status-sk.ts b/status/modules/status-sk/status-sk.ts
index 9e350f8..f8e6626 100644
--- a/status/modules/status-sk/status-sk.ts
+++ b/status/modules/status-sk/status-sk.ts
@@ -4,7 +4,7 @@
  *
  * The majority of the Status page.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
diff --git a/status/modules/tree-status-sk/BUILD.bazel b/status/modules/tree-status-sk/BUILD.bazel
index 2182a15..58d922a 100644
--- a/status/modules/tree-status-sk/BUILD.bazel
+++ b/status/modules/tree-status-sk/BUILD.bazel
@@ -30,7 +30,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:human_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/status/modules/tree-status-sk/tree-status-sk.ts b/status/modules/tree-status-sk/tree-status-sk.ts
index 40482a5..e079f16 100644
--- a/status/modules/tree-status-sk/tree-status-sk.ts
+++ b/status/modules/tree-status-sk/tree-status-sk.ts
@@ -9,7 +9,7 @@
  * @property baseURL: string - The base URL for getting tree status of specific repos.
  * @property repo: string - The repository we are currently looking at.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { diffDate } from '../../../infra-sk/modules/human';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';
diff --git a/task_scheduler/modules/gantt-chart-sk/BUILD.bazel b/task_scheduler/modules/gantt-chart-sk/BUILD.bazel
index 8f0a4d5..ee93e5f 100644
--- a/task_scheduler/modules/gantt-chart-sk/BUILD.bazel
+++ b/task_scheduler/modules/gantt-chart-sk/BUILD.bazel
@@ -12,7 +12,7 @@
     ts_deps = [
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "gantt-chart-sk.ts",
diff --git a/task_scheduler/modules/gantt-chart-sk/gantt-chart-sk.ts b/task_scheduler/modules/gantt-chart-sk/gantt-chart-sk.ts
index 7d9f202..84c7fb0 100644
--- a/task_scheduler/modules/gantt-chart-sk/gantt-chart-sk.ts
+++ b/task_scheduler/modules/gantt-chart-sk/gantt-chart-sk.ts
@@ -3,7 +3,7 @@
  * @description Tools for displaying Gantt charts.
  */
 
-import { render, svg } from 'lit-html';
+import { render, svg } from 'lit/html.js';
 import { strDuration } from '../../../infra-sk/modules/human';
 import { $$ } from '../../../infra-sk/modules/dom';
 
diff --git a/task_scheduler/modules/job-search-sk/BUILD.bazel b/task_scheduler/modules/job-search-sk/BUILD.bazel
index a0d15d6..2c7dd65 100644
--- a/task_scheduler/modules/job-search-sk/BUILD.bazel
+++ b/task_scheduler/modules/job-search-sk/BUILD.bazel
@@ -20,7 +20,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/task_scheduler/modules/job-search-sk/job-search-sk.ts b/task_scheduler/modules/job-search-sk/job-search-sk.ts
index 6a7135b..35a7775 100644
--- a/task_scheduler/modules/job-search-sk/job-search-sk.ts
+++ b/task_scheduler/modules/job-search-sk/job-search-sk.ts
@@ -4,7 +4,7 @@
  *
  * Provides UI for searching the jobs in the DB.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import {
   ParamSet,
diff --git a/task_scheduler/modules/job-sk/BUILD.bazel b/task_scheduler/modules/job-sk/BUILD.bazel
index 569bc6f..8ad8592 100644
--- a/task_scheduler/modules/job-sk/BUILD.bazel
+++ b/task_scheduler/modules/job-sk/BUILD.bazel
@@ -26,7 +26,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/task_scheduler/modules/job-sk/job-sk.ts b/task_scheduler/modules/job-sk/job-sk.ts
index 4507daf..ab8b698 100644
--- a/task_scheduler/modules/job-sk/job-sk.ts
+++ b/task_scheduler/modules/job-sk/job-sk.ts
@@ -8,7 +8,7 @@
  *
  * @example
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { diffDate } from '../../../infra-sk/modules/human';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
diff --git a/task_scheduler/modules/job-trigger-sk/BUILD.bazel b/task_scheduler/modules/job-trigger-sk/BUILD.bazel
index 34fde21..3a554bc 100644
--- a/task_scheduler/modules/job-trigger-sk/BUILD.bazel
+++ b/task_scheduler/modules/job-trigger-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//task_scheduler/modules/rpc:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:query_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/task_scheduler/modules/job-trigger-sk/job-trigger-sk.ts b/task_scheduler/modules/job-trigger-sk/job-trigger-sk.ts
index 5230088..0e4c774 100644
--- a/task_scheduler/modules/job-trigger-sk/job-trigger-sk.ts
+++ b/task_scheduler/modules/job-trigger-sk/job-trigger-sk.ts
@@ -4,7 +4,7 @@
  *
  * Provides an interface for triggering jobs.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import {
diff --git a/task_scheduler/modules/skip-tasks-sk/BUILD.bazel b/task_scheduler/modules/skip-tasks-sk/BUILD.bazel
index ef3dc11..e71b99a 100644
--- a/task_scheduler/modules/skip-tasks-sk/BUILD.bazel
+++ b/task_scheduler/modules/skip-tasks-sk/BUILD.bazel
@@ -23,7 +23,7 @@
         "//task_scheduler/modules/rpc:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/task_scheduler/modules/skip-tasks-sk/skip-tasks-sk.ts b/task_scheduler/modules/skip-tasks-sk/skip-tasks-sk.ts
index 71f68c2..168e7f3 100644
--- a/task_scheduler/modules/skip-tasks-sk/skip-tasks-sk.ts
+++ b/task_scheduler/modules/skip-tasks-sk/skip-tasks-sk.ts
@@ -4,7 +4,7 @@
  *
  * Provides UI for manipulating rules to prevent triggering of matching tasks.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../infra-sk/modules/multi-input-sk';
diff --git a/task_scheduler/modules/task-graph-sk/BUILD.bazel b/task_scheduler/modules/task-graph-sk/BUILD.bazel
index 635f765..13272f1 100644
--- a/task_scheduler/modules/task-graph-sk/BUILD.bazel
+++ b/task_scheduler/modules/task-graph-sk/BUILD.bazel
@@ -14,7 +14,7 @@
     ts_deps = [
         "//task_scheduler/modules/rpc:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/task_scheduler/modules/task-graph-sk/task-graph-sk.ts b/task_scheduler/modules/task-graph-sk/task-graph-sk.ts
index 6bfe512..5bcbfc0 100644
--- a/task_scheduler/modules/task-graph-sk/task-graph-sk.ts
+++ b/task_scheduler/modules/task-graph-sk/task-graph-sk.ts
@@ -5,7 +5,7 @@
  * Displays a graph which shows the relationship between a set of tasks.
  */
 
-import { render, svg } from 'lit-html';
+import { render, svg } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import {
diff --git a/task_scheduler/modules/task-scheduler-scaffold-sk/BUILD.bazel b/task_scheduler/modules/task-scheduler-scaffold-sk/BUILD.bazel
index bc7c0a1..8f6c207 100644
--- a/task_scheduler/modules/task-scheduler-scaffold-sk/BUILD.bazel
+++ b/task_scheduler/modules/task-scheduler-scaffold-sk/BUILD.bazel
@@ -28,7 +28,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//elements-sk/modules:errormessage_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/task_scheduler/modules/task-scheduler-scaffold-sk/task-scheduler-scaffold-sk.ts b/task_scheduler/modules/task-scheduler-scaffold-sk/task-scheduler-scaffold-sk.ts
index 86afbf6..28cfea3 100644
--- a/task_scheduler/modules/task-scheduler-scaffold-sk/task-scheduler-scaffold-sk.ts
+++ b/task_scheduler/modules/task-scheduler-scaffold-sk/task-scheduler-scaffold-sk.ts
@@ -17,7 +17,7 @@
  * @attr {boolean} testing_offline - If we should operate entirely in offline
  *     mode.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { SpinnerSk } from '../../../elements-sk/modules/spinner-sk/spinner-sk';
diff --git a/task_scheduler/modules/task-sk/BUILD.bazel b/task_scheduler/modules/task-sk/BUILD.bazel
index 25f43a3..665d466 100644
--- a/task_scheduler/modules/task-sk/BUILD.bazel
+++ b/task_scheduler/modules/task-sk/BUILD.bazel
@@ -22,7 +22,7 @@
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:human_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/task_scheduler/modules/task-sk/task-sk.ts b/task_scheduler/modules/task-sk/task-sk.ts
index 3c88c99..53e79c5 100644
--- a/task_scheduler/modules/task-sk/task-sk.ts
+++ b/task_scheduler/modules/task-sk/task-sk.ts
@@ -8,7 +8,7 @@
  * @attr {string} swarming - URL of the Swarming server.
  * @attr {string} taskID - Unique ID of the task to display.
  */
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { diffDate } from '../../../infra-sk/modules/human';
 import { define } from '../../../elements-sk/modules/define';
 import { $$ } from '../../../infra-sk/modules/dom';
diff --git a/tool/modules/tools-sk/BUILD.bazel b/tool/modules/tools-sk/BUILD.bazel
index b2a21fe..331a404 100644
--- a/tool/modules/tools-sk/BUILD.bazel
+++ b/tool/modules/tools-sk/BUILD.bazel
@@ -24,7 +24,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "tools-sk.ts",
diff --git a/tool/modules/tools-sk/tools-sk.ts b/tool/modules/tools-sk/tools-sk.ts
index a6b1257..8a13fd2 100644
--- a/tool/modules/tools-sk/tools-sk.ts
+++ b/tool/modules/tools-sk/tools-sk.ts
@@ -5,7 +5,7 @@
  * Main page for the tools application.
  *
  */
-import { TemplateResult, html } from 'lit-html';
+import { TemplateResult, html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import '../../../infra-sk/modules/app-sk';
diff --git a/tree_status/modules/display-tree-status-sk/BUILD.bazel b/tree_status/modules/display-tree-status-sk/BUILD.bazel
index a54e4a5..d0cad6d 100644
--- a/tree_status/modules/display-tree-status-sk/BUILD.bazel
+++ b/tree_status/modules/display-tree-status-sk/BUILD.bazel
@@ -10,7 +10,7 @@
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//tree_status/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "display-tree-status-sk.ts",
diff --git a/tree_status/modules/display-tree-status-sk/display-tree-status-sk.ts b/tree_status/modules/display-tree-status-sk/display-tree-status-sk.ts
index eb8c679..5b15597 100644
--- a/tree_status/modules/display-tree-status-sk/display-tree-status-sk.ts
+++ b/tree_status/modules/display-tree-status-sk/display-tree-status-sk.ts
@@ -9,7 +9,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 import { Status } from '../json';
diff --git a/tree_status/modules/enter-tree-status-sk/BUILD.bazel b/tree_status/modules/enter-tree-status-sk/BUILD.bazel
index 9e6b265..be17626 100644
--- a/tree_status/modules/enter-tree-status-sk/BUILD.bazel
+++ b/tree_status/modules/enter-tree-status-sk/BUILD.bazel
@@ -9,7 +9,7 @@
         "//tree_status/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "enter-tree-status-sk.ts",
diff --git a/tree_status/modules/enter-tree-status-sk/enter-tree-status-sk.ts b/tree_status/modules/enter-tree-status-sk/enter-tree-status-sk.ts
index 3ca30214..9cf55af 100644
--- a/tree_status/modules/enter-tree-status-sk/enter-tree-status-sk.ts
+++ b/tree_status/modules/enter-tree-status-sk/enter-tree-status-sk.ts
@@ -21,7 +21,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 
 import '../list-autorollers-sk';
diff --git a/tree_status/modules/list-autorollers-sk/BUILD.bazel b/tree_status/modules/list-autorollers-sk/BUILD.bazel
index 3340797..65fed70 100644
--- a/tree_status/modules/list-autorollers-sk/BUILD.bazel
+++ b/tree_status/modules/list-autorollers-sk/BUILD.bazel
@@ -12,7 +12,7 @@
         "//tree_status/modules/json:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/tree_status/modules/list-autorollers-sk/list-autorollers-sk.ts b/tree_status/modules/list-autorollers-sk/list-autorollers-sk.ts
index 1765e5e..8c2787d 100644
--- a/tree_status/modules/list-autorollers-sk/list-autorollers-sk.ts
+++ b/tree_status/modules/list-autorollers-sk/list-autorollers-sk.ts
@@ -17,7 +17,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { findParent } from '../../../infra-sk/modules/dom';
 import { CheckOrRadio } from '../../../elements-sk/modules/checkbox-sk/checkbox-sk';
diff --git a/tree_status/modules/tree-scaffold-sk/BUILD.bazel b/tree_status/modules/tree-scaffold-sk/BUILD.bazel
index a589753..38a7332 100644
--- a/tree_status/modules/tree-scaffold-sk/BUILD.bazel
+++ b/tree_status/modules/tree-scaffold-sk/BUILD.bazel
@@ -15,7 +15,7 @@
     ts_deps = [
         "//infra-sk/modules/ElementSk:index_ts_lib",
         "//elements-sk/modules:define_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/tree_status/modules/tree-scaffold-sk/tree-scaffold-sk.ts b/tree_status/modules/tree-scaffold-sk/tree-scaffold-sk.ts
index 39ea8e6..096a6f2 100644
--- a/tree_status/modules/tree-scaffold-sk/tree-scaffold-sk.ts
+++ b/tree_status/modules/tree-scaffold-sk/tree-scaffold-sk.ts
@@ -9,7 +9,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { ElementSk } from '../../../infra-sk/modules/ElementSk';
 
diff --git a/tree_status/modules/tree-status-sk/BUILD.bazel b/tree_status/modules/tree-status-sk/BUILD.bazel
index 696ff44..efdddc5 100644
--- a/tree_status/modules/tree-status-sk/BUILD.bazel
+++ b/tree_status/modules/tree-status-sk/BUILD.bazel
@@ -17,7 +17,7 @@
         "//elements-sk/modules:errormessage_ts_lib",
         "//infra-sk/modules:dom_ts_lib",
         "//infra-sk/modules:jsonorthrow_ts_lib",
-        "//:node_modules/lit-html",
+        "//:node_modules/lit",
     ],
     ts_srcs = [
         "index.ts",
diff --git a/tree_status/modules/tree-status-sk/tree-status-sk.ts b/tree_status/modules/tree-status-sk/tree-status-sk.ts
index 97586ac..5c13a15 100644
--- a/tree_status/modules/tree-status-sk/tree-status-sk.ts
+++ b/tree_status/modules/tree-status-sk/tree-status-sk.ts
@@ -9,7 +9,7 @@
  *
  */
 
-import { html } from 'lit-html';
+import { html } from 'lit/html.js';
 import { define } from '../../../elements-sk/modules/define';
 import { errorMessage } from '../../../elements-sk/modules/errorMessage';
 import { jsonOrThrow } from '../../../infra-sk/modules/jsonOrThrow';