diff --git a/ui/appwindow.slint b/ui/appwindow.slint
index a1ab547..d3a18c2 100644
--- a/ui/appwindow.slint
+++ b/ui/appwindow.slint
@@ -1,9 +1,10 @@
 import { Metrics, DarkPalette } from "theme.slint";
+import { VerticalBox, HorizontalBox } from "widgets/components.slint";
+
 import { EditorBar } from "editor_bar.slint";
 import { StatusBar } from "status_bar.slint";
 import { ToolBar } from "tool_bar.slint";
 import { ObjectToolPanel } from "object_tool_panel.slint";
-import { VerticalBox, HorizontalBox } from "widgets/layout.slint";
 
 export component AppWindow inherits Window {
     title: @tr("FM Editor");
diff --git a/ui/editor_bar.slint b/ui/editor_bar.slint
index 3d62a74..dffc251 100644
--- a/ui/editor_bar.slint
+++ b/ui/editor_bar.slint
@@ -1,5 +1,5 @@
 import { Metrics, DarkPalette } from "theme.slint";
-import { HorizontalBox } from "widgets/layout.slint";
+import { HorizontalBox } from "widgets/components.slint";
 
 export component EditorBar inherits HorizontalBox {
     height: Metrics.size-xl;
diff --git a/ui/object_tool_panel.slint b/ui/object_tool_panel.slint
index 9f5ee53..8ffff8b 100644
--- a/ui/object_tool_panel.slint
+++ b/ui/object_tool_panel.slint
@@ -1,7 +1,5 @@
 import { Metrics, DarkPalette } from "theme.slint";
-import { Panel } from "widgets/panel.slint";
-import { Box, HorizontalBox, VerticalBox } from "widgets/layout.slint";
-
+import { Box, HorizontalBox, VerticalBox, Panel } from "widgets/components.slint";
 
 export component ObjectToolPanel inherits VerticalBox {
     width: 280px;
diff --git a/ui/status_bar.slint b/ui/status_bar.slint
index 495f32a..8a02c8b 100644
--- a/ui/status_bar.slint
+++ b/ui/status_bar.slint
@@ -1,6 +1,5 @@
 import { Metrics, DarkPalette } from "theme.slint";
-import { VerticalSeparator } from "widgets/separator.slint";
-import { HorizontalBox } from "widgets/layout.slint";
+import { HorizontalBox, VerticalSeparator } from "widgets/components.slint";
 
 export component StatusBar inherits HorizontalBox {
     height: Metrics.size-lg;
diff --git a/ui/tool_bar.slint b/ui/tool_bar.slint
index 6786ac2..f235f1f 100644
--- a/ui/tool_bar.slint
+++ b/ui/tool_bar.slint
@@ -1,7 +1,5 @@
 import { Metrics, DarkPalette } from "theme.slint";
-import { HorizontalSeparator } from "widgets/separator.slint";
-import { Box, VerticalBox } from "widgets/layout.slint";
-import { Button } from "widgets/button.slint";
+import { Box, Button, HorizontalSeparator, VerticalBox } from "widgets/components.slint";
 
 component ToolBarItem inherits Button {
     width: Metrics.size-lg;
diff --git a/ui/widgets/components.slint b/ui/widgets/components.slint
new file mode 100644
index 0000000..a133527
--- /dev/null
+++ b/ui/widgets/components.slint
@@ -0,0 +1,6 @@
+import { Button } from "button.slint";
+import { VerticalBox, HorizontalBox, Box } from "layout.slint";
+import { Panel } from "panel.slint";
+import { VerticalSeparator, HorizontalSeparator } from "separator.slint";
+
+export { Button, VerticalBox, HorizontalBox, Box, Panel, VerticalSeparator, HorizontalSeparator }
\ No newline at end of file