diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 7e64906d..f9c2e623 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -7,14 +7,10 @@
 
 pub mod a11y;
 pub mod bidi;
-mod board_picker;
 pub mod canvas;
 pub mod cjk;
-pub mod colorpicker;
 pub mod control;
 pub mod dialogs;
-pub mod field_math;
-pub mod font_preview;
 pub mod home;
 pub mod home_recents;
 pub mod i18n;
@@ -25,7 +21,6 @@ pub mod online;
 pub mod pending_open;
 pub mod present;
 pub mod shortcuts;
-pub mod style_picker;
 pub mod tabs;
 pub mod theme;
 pub mod toolbar;
@@ -260,6 +255,11 @@ pub use panels::typography;
 pub use panels::variable_ui;
 pub use panels::vector_panel;
 pub use panels::versions;
+use widgets::board_picker;
+pub use widgets::colorpicker;
+pub use widgets::field_math;
+pub use widgets::font_preview;
+pub use widgets::style_picker;
 
 use std::collections::BTreeSet;
 use std::ffi::OsStr;
diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs
index 5f08a998..0a39604e 100644
--- a/crates/ui-egui/src/widgets.rs
+++ b/crates/ui-egui/src/widgets.rs
@@ -8,6 +8,11 @@ pub use crate::field_math::{Rel, Typed, eval, parse, stepped};
 use crate::i18n::tr;
 use crate::icons::{self, Icon};
 use crate::theme::{Tokens, regular, semibold};
+pub(crate) mod board_picker;
+pub mod colorpicker;
+pub mod field_math;
+pub mod font_preview;
+pub mod style_picker;
 
 pub const ROW_H: f32 = 32.0;
 pub const FIELD_H: f32 = 24.0;
diff --git a/crates/ui-egui/src/board_picker.rs b/crates/ui-egui/src/widgets/board_picker.rs
similarity index 100%
rename from crates/ui-egui/src/board_picker.rs
rename to crates/ui-egui/src/widgets/board_picker.rs
diff --git a/crates/ui-egui/src/colorpicker.rs b/crates/ui-egui/src/widgets/colorpicker.rs
similarity index 100%
rename from crates/ui-egui/src/colorpicker.rs
rename to crates/ui-egui/src/widgets/colorpicker.rs
diff --git a/crates/ui-egui/src/field_math.rs b/crates/ui-egui/src/widgets/field_math.rs
similarity index 100%
rename from crates/ui-egui/src/field_math.rs
rename to crates/ui-egui/src/widgets/field_math.rs
diff --git a/crates/ui-egui/src/font_preview.rs b/crates/ui-egui/src/widgets/font_preview.rs
similarity index 100%
rename from crates/ui-egui/src/font_preview.rs
rename to crates/ui-egui/src/widgets/font_preview.rs
diff --git a/crates/ui-egui/src/style_picker.rs b/crates/ui-egui/src/widgets/style_picker.rs
similarity index 100%
rename from crates/ui-egui/src/style_picker.rs
rename to crates/ui-egui/src/widgets/style_picker.rs
diff --git a/crates/ui-egui/src/style_picker_tests.rs b/crates/ui-egui/src/widgets/style_picker_tests.rs
similarity index 100%
rename from crates/ui-egui/src/style_picker_tests.rs
rename to crates/ui-egui/src/widgets/style_picker_tests.rs