4 files changed, 9 insertions, 11 deletions
diff --git a/src/ui/lvgl_task.cpp b/src/ui/lvgl_task.cpp
index f746734f..06a6b28b 100644
--- a/src/ui/lvgl_task.cpp
+++ b/src/ui/lvgl_task.cpp
@@ -62,9 +62,9 @@ void LvglMain(std::weak_ptr<drivers::RelativeWheel> weak_touch_wheel,
   TouchWheelEncoder encoder(weak_touch_wheel);
 
   std::shared_ptr<Screen> current_screen;
-  auto& events = events::EventQueue::GetInstance();
+  auto* events = events::queues::Ui();
   while (1) {
-    while (events.ServiceUi(0)) {
+    while (events->Service(0)) {
     }
 
     std::shared_ptr<Screen> screen = UiState::current_screen();
diff --git a/src/ui/screen_menu.cpp b/src/ui/screen_menu.cpp
index 37254f92..4730db84 100644
--- a/src/ui/screen_menu.cpp
+++ b/src/ui/screen_menu.cpp
@@ -33,8 +33,7 @@ static void item_click_cb(lv_event_t* ev) {
   database::IndexInfo* index =
       reinterpret_cast<database::IndexInfo*>(ev->user_data);
 
-  events::Dispatch<internal::IndexSelected, UiState>(
-      internal::IndexSelected{.index = *index});
+  events::Ui().Dispatch(internal::IndexSelected{.index = *index});
 }
 
 Menu::Menu(std::vector<database::IndexInfo> indexes) : indexes_(indexes) {
diff --git a/src/ui/screen_track_browser.cpp b/src/ui/screen_track_browser.cpp
index 07977710..4a39578e 100644
--- a/src/ui/screen_track_browser.cpp
+++ b/src/ui/screen_track_browser.cpp
@@ -137,12 +137,11 @@ auto TrackBrowser::OnItemClicked(lv_event_t* ev) -> void {
   for (const auto& page : current_pages_) {
     for (std::size_t i = 0; i < page->values().size(); i++) {
       if (index == 0) {
-        events::Dispatch<internal::RecordSelected, UiState>(
-            internal::RecordSelected{
-                .initial_page = initial_page_,
-                .page = page,
-                .record = i,
-            });
+        events::Ui().Dispatch(internal::RecordSelected{
+            .initial_page = initial_page_,
+            .page = page,
+            .record = i,
+        });
         return;
       }
       index--;
diff --git a/src/ui/widget_top_bar.cpp b/src/ui/widget_top_bar.cpp
index 9f192c84..e5d51350 100644
--- a/src/ui/widget_top_bar.cpp
+++ b/src/ui/widget_top_bar.cpp
@@ -20,7 +20,7 @@ namespace ui {
 namespace widgets {
 
 static void back_click_cb(lv_event_t* ev) {
-  events::Dispatch<internal::BackPressed, UiState>({});
+  events::Ui().Dispatch(internal::BackPressed{});
 }
 
 TopBar::TopBar(lv_obj_t* parent, const Configuration& config) {