diff --git a/ts/editor-toolbar/BUILD.bazel b/ts/editor-toolbar/BUILD.bazel
index 9d96c691c..5576245f3 100644
--- a/ts/editor-toolbar/BUILD.bazel
+++ b/ts/editor-toolbar/BUILD.bazel
@@ -13,6 +13,9 @@ svelte_names = [f.replace(".svelte", "") for f in svelte_files]
 compile_svelte(
     name = "svelte",
     srcs = svelte_files,
+    deps = [
+        "//ts/sass/bootstrap",
+    ],
 )
 
 compile_sass(
@@ -137,6 +140,6 @@ svelte_check(
     srcs = glob([
         "*.ts",
         "*.svelte",
-    ]),
+    ]) + ["//ts/sass/bootstrap"],
 )
 
diff --git a/ts/editor-toolbar/ColorPicker.svelte b/ts/editor-toolbar/ColorPicker.svelte
index 3d78e2c9f..eec691cfb 100644
--- a/ts/editor-toolbar/ColorPicker.svelte
+++ b/ts/editor-toolbar/ColorPicker.svelte
@@ -24,8 +24,8 @@
 <style lang="scss">
     @use "ts/sass/button_mixins" as button;
 
-    @import "ts/node_modules/bootstrap/scss/functions";
-    @import "ts/node_modules/bootstrap/scss/variables";
+    @import "ts/bootstrap/functions";
+    @import "ts/bootstrap/variables";
 
     button {
         padding: 0;
diff --git a/ts/editor-toolbar/CommandIconButton.svelte b/ts/editor-toolbar/CommandIconButton.svelte
index c1ff007a3..2db6675b8 100644
--- a/ts/editor-toolbar/CommandIconButton.svelte
+++ b/ts/editor-toolbar/CommandIconButton.svelte
@@ -51,7 +51,7 @@
     if (activatable) {
         updateButton(command);
 
-        commandMap.subscribe((map: Map<string, boolean>): void => {
+        commandMap.subscribe((map: Map<string, boolean>): () => void => {
             active = map.get(command);
             return () => map.delete(command);
         });
diff --git a/ts/editor-toolbar/DropdownItem.svelte b/ts/editor-toolbar/DropdownItem.svelte
index 019294b24..510670dee 100644
--- a/ts/editor-toolbar/DropdownItem.svelte
+++ b/ts/editor-toolbar/DropdownItem.svelte
@@ -14,8 +14,8 @@
 </script>
 
 <style lang="scss">
-    @import "ts/node_modules/bootstrap/scss/functions";
-    @import "ts/node_modules/bootstrap/scss/variables";
+    @import "ts/bootstrap/functions";
+    @import "ts/bootstrap/variables";
 
     button {
         display: flex;
diff --git a/ts/editor-toolbar/DropdownMenu.svelte b/ts/editor-toolbar/DropdownMenu.svelte
index 5dc3c1467..84e2e78fe 100644
--- a/ts/editor-toolbar/DropdownMenu.svelte
+++ b/ts/editor-toolbar/DropdownMenu.svelte
@@ -10,8 +10,8 @@
 </script>
 
 <style lang="scss">
-    @import "ts/node_modules/bootstrap/scss/functions";
-    @import "ts/node_modules/bootstrap/scss/variables";
+    @import "ts/bootstrap/functions";
+    @import "ts/bootstrap/variables";
 
     ul {
         background-color: $light;