diff --git a/.gitmodules b/.gitmodules
index a3b2193..d3387f4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = http://www.nanako.site:9004/Nanako/AronaCore.git
 [submodule "Arona/third_party/hikogui"]
 	path = Arona/third_party/hikogui
-	url = http://www.nanako.site:9004/Nanako/hikogui.git
+	url = https://github.com/hikogui/hikogui.git
diff --git a/Arona/CMakeLists.txt b/Arona/CMakeLists.txt
index 066e3d8..fb6c640 100644
--- a/Arona/CMakeLists.txt
+++ b/Arona/CMakeLists.txt
@@ -1,18 +1,15 @@
 project(arona)
 set(CMAKE_CXX_STANDARD 26)
 
-set(ALL_FILES "")
-retrieve_files(${CMAKE_CURRENT_SOURCE_DIR} ALL_FILES)
-
-add_subdirectory(third_party/hikogui)
-
 if (WIN32)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:WinMainCRTStartup")
 endif()
 
-add_executable(${PROJECT_NAME} ${ALL_FILES})
+add_subdirectory(third_party/hikogui)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+set(ALL_FILES "")
+retrieve_files(${CMAKE_CURRENT_SOURCE_DIR}/src ALL_FILES)
+add_executable(${PROJECT_NAME} ${ALL_FILES})
 
 target_link_libraries(${PROJECT_NAME} core hikogui)
 target_include_directories(${PROJECT_NAME} PUBLIC core hikogui)
diff --git a/Arona/src/entry/windows/main.cpp b/Arona/src/entry/windows/main.cpp
index e90da1e..ebfde45 100644
--- a/Arona/src/entry/windows/main.cpp
+++ b/Arona/src/entry/windows/main.cpp
@@ -1,9 +1,9 @@
 #include "application/application.h"
 #include "audio/plugin_host/plugin_host_manager.h"
-#include "misc/singleton/singleton_manager.h"
 
 #include "hikogui/crt.hpp"
 #include "hikogui/hikogui.hpp"
+
 using namespace hi;
 
 class arona_application : public application {
diff --git a/Arona/src/widget/mixer/w_mixer_list.cpp b/Arona/src/widget/mixer/w_mixer_list.cpp
new file mode 100644
index 0000000..d105b36
--- /dev/null
+++ b/Arona/src/widget/mixer/w_mixer_list.cpp
@@ -0,0 +1 @@
+#include "w_mixer_list.h"
diff --git a/Arona/src/widget/mixer/w_mixer_list.h b/Arona/src/widget/mixer/w_mixer_list.h
new file mode 100644
index 0000000..6d5f188
--- /dev/null
+++ b/Arona/src/widget/mixer/w_mixer_list.h
@@ -0,0 +1,5 @@
+#pragma once
+
+class w_mixer_list {
+
+};
diff --git a/Arona/src/widget/mixer/w_mixer_track.cpp b/Arona/src/widget/mixer/w_mixer_track.cpp
new file mode 100644
index 0000000..d8834dc
--- /dev/null
+++ b/Arona/src/widget/mixer/w_mixer_track.cpp
@@ -0,0 +1 @@
+#include "w_mixer_track.h"
diff --git a/Arona/src/widget/mixer/w_mixer_track.h b/Arona/src/widget/mixer/w_mixer_track.h
new file mode 100644
index 0000000..9a673d1
--- /dev/null
+++ b/Arona/src/widget/mixer/w_mixer_track.h
@@ -0,0 +1,5 @@
+#pragma once
+
+class w_mixer_track {
+
+};
diff --git a/Arona/third_party/hikogui b/Arona/third_party/hikogui
index 34de06e..136eaaf 160000
--- a/Arona/third_party/hikogui
+++ b/Arona/third_party/hikogui
@@ -1 +1 @@
-Subproject commit 34de06e44f1aaa263e0ff61ccd876243ab3aae7c
+Subproject commit 136eaafba55888cff3bbf532deb32162f178c7f3
diff --git a/AronaCore b/AronaCore
index 83c7a1f..0d73da1 160000
--- a/AronaCore
+++ b/AronaCore
@@ -1 +1 @@
-Subproject commit 83c7a1fc7d12f75feb3228f27a759bed56560680
+Subproject commit 0d73da1657c53763a92826b5bc8ae3a4291a4531