diff --git a/crates/ui-egui/src/header.rs b/crates/ui-egui/src/header.rs
index c3c0c08a9..bf64d987a 100644
--- a/crates/ui-egui/src/header.rs
+++ b/crates/ui-egui/src/header.rs
@@ -615,7 +615,7 @@ mod tests {
     fn long_press_type_keeps_the_tool_until_vertical_is_selected() {
         let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
         let ctx = egui::Context::default();
-        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(app));
+        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));
         frame(&mut app, &ctx, 0.0, vec![]);
         frame(&mut app, &ctx, 0.1, vec![]);
         let center = |element: &crate::automation::Element| {
diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs
index 667879b62..f4de0059d 100644
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@ -2244,7 +2244,7 @@ mod tests {
         let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
         let ctx = egui::Context::default();
         let tokens = crate::theme::Tokens::for_kind(crate::theme::ThemeKind::Dark);
-        crate::theme::install(&ctx, &tokens, language(app));
+        crate::theme::install(&ctx, &tokens, language(&app));
         crate::panels::settings::open(&mut app, "general");
         let mut out = ctx.run_ui(egui::RawInput::default(), |_| {
             crate::panels::settings::show(&mut app, &ctx, &tokens);
diff --git a/crates/ui-egui/src/panels/dialogs.rs b/crates/ui-egui/src/panels/dialogs.rs
index 149846580..8e707d36f 100644
--- a/crates/ui-egui/src/panels/dialogs.rs
+++ b/crates/ui-egui/src/panels/dialogs.rs
@@ -548,7 +548,7 @@ mod tests {
     fn app() -> (EffectcraftApp, egui::Context) {
         let ctx = egui::Context::default();
         let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(app));
+        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));
         app.session.execute("comp.new", json!({"name": "Main", "width": 640, "height": 360})).unwrap();
         (app, ctx)
     }
diff --git a/crates/ui-egui/src/panels/forms.rs b/crates/ui-egui/src/panels/forms.rs
index cb93f1147..370740d27 100644
--- a/crates/ui-egui/src/panels/forms.rs
+++ b/crates/ui-egui/src/panels/forms.rs
@@ -844,7 +844,7 @@ mod tests {
     fn premiere_export_dialog() {
         let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
         let ctx = egui::Context::default();
-        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(app));
+        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));
         app.session.execute("comp.new", json!({"name": "Spot", "width": 64, "height": 36, "frameRate": 25, "duration": 1})).unwrap();
         app.session.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap();
         crate::menus::invoke(&mut app, &ctx, "file.exportTimeline", json!({})).unwrap();
diff --git a/crates/ui-egui/src/panels/home.rs b/crates/ui-egui/src/panels/home.rs
index d14e7031d..53b5e0479 100644
--- a/crates/ui-egui/src/panels/home.rs
+++ b/crates/ui-egui/src/panels/home.rs
@@ -540,7 +540,7 @@ mod tests {
         s.prefs.push_recent("/projects/Alpha.ecproj");
         let mut app = EffectcraftApp::new(s);
         let ctx = egui::Context::default();
-        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(app));
+        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));
         ctx.run_ui(Default::default(), |_| {}).textures_delta.clear();
         ctx.run_ui(Default::default(), |ui| {
             app.auto.begin_frame();
@@ -573,7 +573,7 @@ mod tests {
         app.ui.start_screen = true;
         app.ui.home_learn = true;
         let ctx = egui::Context::default();
-        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(app));
+        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));
         let frame = |app: &mut EffectcraftApp| {
             ctx.run_ui(Default::default(), |ui| {
                 app.auto.begin_frame();
diff --git a/crates/ui-egui/src/panels/templates.rs b/crates/ui-egui/src/panels/templates.rs
index ee7396211..6ef0df2bd 100644
--- a/crates/ui-egui/src/panels/templates.rs
+++ b/crates/ui-egui/src/panels/templates.rs
@@ -194,7 +194,7 @@ mod tests {
     fn gallery_lists_renders_and_opens_templates() {
         let mut app = app_with_store();
         let ctx = egui::Context::default();
-        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(app));
+        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));
         // File ▸ New ▸ New Project from Template… opens the Templates tab.
         let ev = app.session.execute("file.newFromTemplate", json!({})).unwrap();
         assert_eq!(ev["frontend"], "file.newFromTemplate");
@@ -250,7 +250,7 @@ mod tests {
     fn my_custom_rgb_dialog() {
         let mut app = app_with_store();
         let ctx = egui::Context::default();
-        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(app));
+        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));
         // Menu check marks follow the active comp's viewer.
         app.session.execute("comp.new", json!({"name": "C", "width": 64, "height": 48})).unwrap();
         let item = crate::menus::menu_items(&app).into_iter().find(|m| m.id == "view.customRgb").expect("menu item");
diff --git a/crates/ui-egui/src/panels/unsaved.rs b/crates/ui-egui/src/panels/unsaved.rs
index 047674f70..df0a99025 100644
--- a/crates/ui-egui/src/panels/unsaved.rs
+++ b/crates/ui-egui/src/panels/unsaved.rs
@@ -170,7 +170,7 @@ mod tests {
     fn app() -> (EffectcraftApp, egui::Context) {
         let ctx = egui::Context::default();
         let app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(app));
+        crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));
         (app, ctx)
     }
 
diff --git a/crates/ui-egui/src/theme.rs b/crates/ui-egui/src/theme.rs
index 18e0e1ed6..7b13112ff 100644
--- a/crates/ui-egui/src/theme.rs
+++ b/crates/ui-egui/src/theme.rs
@@ -316,8 +316,8 @@ fn install_cjk_fallbacks(family_fonts: &mut FontDefinitions, language: &str) ->
         use effectcraft_text::fonts;
         // Kana is unambiguously Japanese; Han ideographs are shared, so the order decides which
         // language's face draws them.
-        const KANA: (char, &'static str) = ('あ', "japanese-system");
-        const HAN: (char, &'static str) = ('文', "chinese-system");
+        const KANA: (char, &str) = ('あ', "japanese-system");
+        const HAN: (char, &str) = ('文', "chinese-system");
         // Han text follows the interface language, not the operating system's locale.
         fonts::set_cjk_locale(cjk_locale(language));
         let base = fonts::resolve("Inter", "Regular").face;