diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index edef4d5187f9320942133bf5e893ab18e10ee4b6..8635a2b6a3cdb525d3942c353546be1a6f2e9d0c 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(preferences)
+add_subdirectory(toolbar)
 
 add_library(ui
 
@@ -19,6 +21,13 @@ add_library(ui
 	QMap3D.ui
 )
 
+add_custom_target(uiQml
+SOURCES
+	AppSettings.qml
+	ExitWithErrorWindow.qml
+	MainRootWindow.qml
+)
+
 target_link_libraries(ui
 	PUBLIC
 		qgc
diff --git a/src/ui/preferences/CMakeLists.txt b/src/ui/preferences/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a5a717c75748f933e57031d0ec0a7b8b55303d03
--- /dev/null
+++ b/src/ui/preferences/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_custom_target(UiPreferencesQml
+SOURCES
+    SerialSettings.qml
+    HelpSettings.qml
+    TcpSettings.qml
+    MavlinkSettings.qml
+    DebugWindow.qml
+    UdpSettings.qml
+    LinkSettings.qml
+    MockLink.qml
+    GeneralSettings.qml
+    BluetoothSettings.qml
+    LogReplaySettings.qml
+    MockLinkSettings.qml
+)
\ No newline at end of file
diff --git a/src/ui/toolbar/CMakeLists.txt b/src/ui/toolbar/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b23df04be854dcca93adc08bf0f97c1d9a31d34a
--- /dev/null
+++ b/src/ui/toolbar/CMakeLists.txt
@@ -0,0 +1,18 @@
+add_custom_target(UiToolbarQml
+SOURCES
+    ArmedIndicator.qml
+    BatteryIndicator.qml
+    GPSIndicator.qml
+    GPSRTKIndicator.qml
+    JoystickIndicator.qml
+    LinkIndicator.qml
+    MainToolBar.qml
+    MainToolBarIndicators.qml
+    MessageIndicator.qml
+    ModeIndicator.qml
+    MultiVehicleSelector.qml
+    RCRSSIIndicator.qml
+    SignalStrength.qml
+    TelemetryRSSIIndicator.qml
+    VTOLModeIndicator.qml
+)
\ No newline at end of file