diff --git a/.gitignore b/.gitignore
index 7a70de4..ca09e17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ compile_commands.json
 imgui.ini
 bave*.log
 /spaced
+/notes.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3753ed5..88c1028 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,12 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 include(FetchContent)
 
 FetchContent_Declare(
-  bave
-  GIT_REPOSITORY https://github.com/karnkaul/bave
-  GIT_TAG v0.5.4
-  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/bave"
+  bgf
+  GIT_REPOSITORY https://github.com/karnkaul/bgf
+  GIT_TAG v0.1.0
+  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/bgf"
 )
 
-FetchContent_MakeAvailable(bave)
+FetchContent_MakeAvailable(bgf)
 
 add_subdirectory(src)
diff --git a/assets/fonts/CuteDino.otf b/assets/fonts/CuteDino.otf
new file mode 100644
index 0000000..d247239
Binary files /dev/null and b/assets/fonts/CuteDino.otf differ
diff --git a/assets/fonts/hesitation.regular.ttf b/assets/fonts/hesitation.regular.ttf
deleted file mode 100644
index 83dafc7..0000000
Binary files a/assets/fonts/hesitation.regular.ttf and /dev/null differ
diff --git a/assets/styles.json b/assets/styles.json
index 50dd488..06607c0 100644
--- a/assets/styles.json
+++ b/assets/styles.json
@@ -37,8 +37,8 @@
       "padding": 10
     },
     "enemy": {
-      "background": "#f75c03ff",
-      "fill": "#ffffffff",
+      "background": "orange",
+      "fill": "milk",
       "corner_ratio": 0.5,
       "padding": 5
     }
@@ -50,9 +50,9 @@
         10.000000
       ],
       "corner_ratio": 0.25,
-      "background_tint": "#e5cdaeff",
-      "outline_tint": "#231d2aff",
-      "content_text_tint": "#231d2aff"
+      "background_tint": "milk",
+      "outline_tint": "black",
+      "content_text_tint": "black"
     }
   },
   "sliders": {
@@ -63,7 +63,7 @@
     }
   },
   "loading_screen": {
-    "background_tint": "#231d2aff",
+    "background_tint": "black",
     "spinner": {
       "size": [
         100.000000,
diff --git a/src/spaced/CMakeLists.txt b/src/spaced/CMakeLists.txt
index 3be00f3..c38e16e 100644
--- a/src/spaced/CMakeLists.txt
+++ b/src/spaced/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(${PROJECT_NAME})
 add_library(spaced::lib ALIAS ${PROJECT_NAME})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
-  bave::bave
+  bave::bgf
   bave::bave-compile-options
 )
 
@@ -19,3 +19,5 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 file(GLOB_RECURSE sources LIST_DIRECTORIES false CONFIGURE_DEPENDS "spaced/*.?pp")
 
 target_sources(${PROJECT_NAME} PRIVATE ${sources})
+
+target_precompile_headers(${PROJECT_NAME} REUSE_FROM bave)
diff --git a/src/spaced/spaced/assets/asset_list.cpp b/src/spaced/spaced/assets/asset_list.cpp
index 4d66598..c7edeb9 100644
--- a/src/spaced/spaced/assets/asset_list.cpp
+++ b/src/spaced/spaced/assets/asset_list.cpp
@@ -1,9 +1,12 @@
+#include <bave/services/resources.hpp>
 #include <spaced/assets/asset_list.hpp>
 #include <spaced/assets/asset_loader.hpp>
-#include <spaced/services/resources.hpp>
 
 namespace spaced {
+using bave::AsyncExec;
 using bave::Loader;
+using bave::Resources;
+using bave::Services;
 
 AssetList::AssetList(Loader loader, Services const& services) : m_loader(std::move(loader)), m_resources(&services.get<Resources>()) {}
 
diff --git a/src/spaced/spaced/assets/asset_list.hpp b/src/spaced/spaced/assets/asset_list.hpp
index 8545a2d..a2debc1 100644
--- a/src/spaced/spaced/assets/asset_list.hpp
+++ b/src/spaced/spaced/assets/asset_list.hpp
@@ -1,17 +1,21 @@
 #pragma once
+#include <bave/async_exec.hpp>
 #include <bave/loader.hpp>
+#include <bave/services/resources.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/assets/asset_manifest.hpp>
-#include <spaced/async_exec.hpp>
-#include <spaced/services/services.hpp>
 #include <set>
 
-namespace spaced {
+namespace bave {
 struct Resources;
+}
+
+namespace spaced {
 class AssetLoader;
 
 class AssetList {
   public:
-	explicit AssetList(bave::Loader loader, Services const& services);
+	explicit AssetList(bave::Loader loader, bave::Services const& services);
 
 	auto add_texture(std::string uri, bool mip_map = false) -> AssetList&;
 	auto add_font(std::string uri) -> AssetList&;
@@ -20,7 +24,7 @@ class AssetList {
 
 	void add_manifest(AssetManifest manifest);
 
-	[[nodiscard]] auto build_task_stages() const -> std::vector<AsyncExec::Stage>;
+	[[nodiscard]] auto build_task_stages() const -> std::vector<bave::AsyncExec::Stage>;
 
   private:
 	struct Tex {
@@ -32,11 +36,11 @@ class AssetList {
 		auto operator<(Tex const& rhs) const -> bool { return uri < rhs.uri; }
 	};
 
-	auto build_stage_0(AssetLoader& asset_loader) const -> AsyncExec::Stage;
-	auto build_stage_1(AssetLoader& asset_loader) const -> AsyncExec::Stage;
+	auto build_stage_0(AssetLoader& asset_loader) const -> bave::AsyncExec::Stage;
+	auto build_stage_1(AssetLoader& asset_loader) const -> bave::AsyncExec::Stage;
 
 	bave::Loader m_loader;
-	bave::NotNull<Resources*> m_resources;
+	bave::NotNull<bave::Resources*> m_resources;
 
 	std::set<Tex> m_textures{};
 	std::set<std::string> m_fonts{};
diff --git a/src/spaced/spaced/assets/asset_loader.cpp b/src/spaced/spaced/assets/asset_loader.cpp
index f88b847..c995b61 100644
--- a/src/spaced/spaced/assets/asset_loader.cpp
+++ b/src/spaced/spaced/assets/asset_loader.cpp
@@ -9,6 +9,7 @@ using bave::Loader;
 using bave::Logger;
 using bave::NotNull;
 using bave::ParticleEmitter;
+using bave::Resources;
 using bave::Texture;
 
 struct AssetLoader::Impl {
diff --git a/src/spaced/spaced/assets/asset_loader.hpp b/src/spaced/spaced/assets/asset_loader.hpp
index 36d1a68..22c9bf4 100644
--- a/src/spaced/spaced/assets/asset_loader.hpp
+++ b/src/spaced/spaced/assets/asset_loader.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <bave/core/ptr.hpp>
 #include <bave/loader.hpp>
-#include <spaced/services/resources.hpp>
+#include <bave/services/resources.hpp>
 #include <functional>
 #include <memory>
 
@@ -10,7 +10,7 @@ class AssetLoader {
   public:
 	using LoadTask = std::function<void()>;
 
-	explicit AssetLoader(bave::Loader loader, bave::NotNull<Resources*> resources);
+	explicit AssetLoader(bave::Loader loader, bave::NotNull<bave::Resources*> resources);
 
 	[[nodiscard]] auto make_load_font(std::string uri, bool reload = false) -> LoadTask;
 	[[nodiscard]] auto make_load_texture(std::string uri, bool mip_map = false, bool reload = false) -> LoadTask;
diff --git a/src/spaced/spaced/async_exec.cpp b/src/spaced/spaced/async_exec.cpp
deleted file mode 100644
index 00e50a5..0000000
--- a/src/spaced/spaced/async_exec.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <spaced/async_exec.hpp>
-#include <cassert>
-#include <iterator>
-#include <numeric>
-
-namespace spaced {
-using namespace std::chrono_literals;
-
-AsyncExec::AsyncExec(std::vector<Task> tasks) {
-	if (tasks.empty()) { return; }
-
-	m_total = static_cast<int>(tasks.size());
-	enqueue(tasks);
-}
-
-AsyncExec::AsyncExec(std::vector<Stage> stages) {
-	if (stages.empty()) { return; }
-	std::move(stages.begin(), stages.end(), std::back_inserter(m_stages));
-	m_total = std::accumulate(m_stages.begin(), m_stages.end(), 0, [](int count, auto const& tasks) { return static_cast<int>(tasks.size()) + count; });
-	start_next_stage();
-}
-
-auto AsyncExec::update() -> Status {
-	if (m_remain.empty()) {
-		if (m_stages.empty()) { return Status{.remain = 0, .total = m_total}; }
-		start_next_stage();
-	}
-	std::erase_if(m_remain, [](std::future<void> const& future) { return !future.valid() || future.wait_for(0s) == std::future_status::ready; });
-	return Status{.remain = m_total - m_completed, .total = m_total};
-}
-
-void AsyncExec::start_next_stage() {
-	if (m_stages.empty()) { return; }
-
-	auto get_next_stage = [&] {
-		auto ret = std::move(m_stages.front());
-		m_stages.pop_front();
-		return ret;
-	};
-
-	auto stage = get_next_stage();
-	while (stage.empty() && !m_stages.empty()) { stage = get_next_stage(); }
-
-	enqueue(stage);
-}
-
-void AsyncExec::enqueue(std::span<Task const> tasks) {
-	assert(m_remain.empty());
-	if (tasks.empty()) { return; }
-
-	m_remain.reserve(tasks.size());
-	for (auto const& task : tasks) {
-		auto func = [task = task, this] {
-			task();
-			++m_completed;
-		};
-		m_remain.push_back(std::async(std::move(func)));
-	}
-}
-} // namespace spaced
diff --git a/src/spaced/spaced/async_exec.hpp b/src/spaced/spaced/async_exec.hpp
deleted file mode 100644
index 66abe5e..0000000
--- a/src/spaced/spaced/async_exec.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-#include <atomic>
-#include <deque>
-#include <functional>
-#include <future>
-#include <span>
-#include <vector>
-
-namespace spaced {
-class AsyncExec {
-  public:
-	using Task = std::function<void()>;
-	using Stage = std::vector<Task>;
-
-	struct Status;
-
-	explicit AsyncExec(std::vector<Task> tasks);
-	explicit AsyncExec(std::vector<Stage> stages);
-
-	auto update() -> Status;
-
-  private:
-	void start_next_stage();
-	void enqueue(std::span<Task const> tasks);
-
-	std::vector<std::future<void>> m_remain{};
-	std::deque<Stage> m_stages{};
-	std::atomic<int> m_completed{};
-	int m_total{};
-};
-
-struct AsyncExec::Status {
-	int remain{};
-	int total{};
-
-	[[nodiscard]] constexpr auto progress() const -> float {
-		if (total == 0) { return 1.0f; }
-		return static_cast<float>(total - remain) / static_cast<float>(total);
-	}
-
-	[[nodiscard]] constexpr auto is_complete() const -> bool { return remain == 0; }
-
-	explicit constexpr operator bool() const { return is_complete(); }
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/game/arsenal.cpp b/src/spaced/spaced/game/arsenal.cpp
index 90ff556..11bb5b9 100644
--- a/src/spaced/spaced/game/arsenal.cpp
+++ b/src/spaced/spaced/game/arsenal.cpp
@@ -3,6 +3,7 @@
 
 namespace spaced {
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
 
 Arsenal::Arsenal(Services const& services) : m_primary(services), m_stats(&services.get<Stats>()) {}
diff --git a/src/spaced/spaced/game/arsenal.hpp b/src/spaced/spaced/game/arsenal.hpp
index 2322a49..38827f4 100644
--- a/src/spaced/spaced/game/arsenal.hpp
+++ b/src/spaced/spaced/game/arsenal.hpp
@@ -8,7 +8,7 @@ struct Stats;
 // Weapons only switch when they are idle.
 class Arsenal {
   public:
-	explicit Arsenal(Services const& services);
+	explicit Arsenal(bave::Services const& services);
 
 	[[nodiscard]] auto get_weapon() const -> Weapon const&;
 	[[nodiscard]] auto get_weapon() -> Weapon&;
diff --git a/src/spaced/spaced/game/controllers/auto_controller.hpp b/src/spaced/spaced/game/controllers/auto_controller.hpp
index d38fb3d..bf822ad 100644
--- a/src/spaced/spaced/game/controllers/auto_controller.hpp
+++ b/src/spaced/spaced/game/controllers/auto_controller.hpp
@@ -1,12 +1,12 @@
 #pragma once
 #include <bave/core/ptr.hpp>
 #include <bave/input/gamepad.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/game/controllers/follow_controller.hpp>
 #include <spaced/game/spring_arm.hpp>
 #include <spaced/game/target_provider.hpp>
 #include <spaced/services/gamepad_provider.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
 
 namespace spaced {
 class AutoController : public FollowController {
diff --git a/src/spaced/spaced/game/controllers/player_controller.cpp b/src/spaced/spaced/game/controllers/player_controller.cpp
index 28edd78..8fcae45 100644
--- a/src/spaced/spaced/game/controllers/player_controller.cpp
+++ b/src/spaced/spaced/game/controllers/player_controller.cpp
@@ -9,18 +9,20 @@ using bave::Action;
 using bave::EnumArray;
 using bave::GamepadAxis;
 using bave::GamepadButton;
+using bave::IDisplay;
 using bave::im_text;
 using bave::PointerMove;
 using bave::PointerTap;
 using bave::Seconds;
+using bave::Services;
 
-PlayerController::PlayerController(Services const& services) : m_layout(&services.get<ILayout>()), m_gamepad_provider(&services.get<IGamepadProvider>()) {
-	max_y = 0.5f * m_layout->get_world_space().y;
+PlayerController::PlayerController(Services const& services) : m_display(&services.get<IDisplay>()), m_gamepad_provider(&services.get<IGamepadProvider>()) {
+	max_y = 0.5f * m_display->get_world_space().y;
 	min_y = -max_y; // NOLINT(cppcoreguidelines-prefer-member-initializer)
 }
 
 void PlayerController::on_move(PointerMove const& pointer_move) {
-	auto const world_pos = m_layout->project_to_world(pointer_move.pointer.position);
+	auto const world_pos = m_display->project_to_world(pointer_move.pointer.position);
 
 	if (m_type == Type::eTouch) {
 		if (!is_in_move_area(world_pos)) {
@@ -39,7 +41,7 @@ void PlayerController::on_move(PointerMove const& pointer_move) {
 }
 
 void PlayerController::on_tap(PointerTap const& pointer_tap) {
-	auto const world_pos = m_layout->project_to_world(pointer_tap.pointer.position);
+	auto const world_pos = m_display->project_to_world(pointer_tap.pointer.position);
 	if (m_type == Type::eTouch && is_in_move_area(world_pos)) {
 		// pointer tap in move area is ingored
 		return;
@@ -66,7 +68,7 @@ void PlayerController::stop_firing() {
 }
 
 auto PlayerController::is_in_move_area(glm::vec2 const position) const -> bool {
-	auto const n_pos = position.x / m_layout->get_world_space().x;
+	auto const n_pos = position.x / m_display->get_world_space().x;
 	return n_pos <= -n_move_area;
 }
 
diff --git a/src/spaced/spaced/game/controllers/player_controller.hpp b/src/spaced/spaced/game/controllers/player_controller.hpp
index f20c325..72f0c2c 100644
--- a/src/spaced/spaced/game/controllers/player_controller.hpp
+++ b/src/spaced/spaced/game/controllers/player_controller.hpp
@@ -1,11 +1,11 @@
 #pragma once
 #include <bave/core/ptr.hpp>
 #include <bave/input/gamepad.hpp>
+#include <bave/services/display.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/game/controllers/follow_controller.hpp>
 #include <spaced/game/spring_arm.hpp>
 #include <spaced/services/gamepad_provider.hpp>
-#include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
 
 namespace spaced {
 class PlayerController : public FollowController {
@@ -18,7 +18,7 @@ class PlayerController : public FollowController {
 
 	[[nodiscard]] auto get_type_name() const -> std::string_view final { return type_name_v; };
 
-	explicit PlayerController(Services const& services);
+	explicit PlayerController(bave::Services const& services);
 
 	void on_move(bave::PointerMove const& pointer_move) final;
 	void on_tap(bave::PointerTap const& pointer_tap) final;
@@ -45,7 +45,7 @@ class PlayerController : public FollowController {
 	auto tick_y(bave::Seconds dt) -> float final;
 	void do_inspect() final;
 
-	bave::Ptr<ILayout const> m_layout{};
+	bave::Ptr<bave::IDisplay const> m_display{};
 	bave::Ptr<IGamepadProvider const> m_gamepad_provider{};
 
 	Type m_type{};
diff --git a/src/spaced/spaced/game/enemies/creep.cpp b/src/spaced/spaced/game/enemies/creep.cpp
index 903ec8c..db37e37 100644
--- a/src/spaced/spaced/game/enemies/creep.cpp
+++ b/src/spaced/spaced/game/enemies/creep.cpp
@@ -8,6 +8,6 @@ void Creep::tick(Seconds const dt, bool const in_play) {
 	if (!in_play) { return; }
 
 	shape.transform.position.x -= x_speed * dt.count();
-	if (shape.transform.position.x < -0.5f * (get_layout().get_world_space().x + shape.get_shape().size.x)) { set_destroyed(); }
+	if (shape.transform.position.x < -0.5f * (get_layout().world_space.x + shape.get_shape().size.x)) { set_destroyed(); }
 }
 } // namespace spaced
diff --git a/src/spaced/spaced/game/enemies/creep.hpp b/src/spaced/spaced/game/enemies/creep.hpp
index 12c1c6f..6579cc8 100644
--- a/src/spaced/spaced/game/enemies/creep.hpp
+++ b/src/spaced/spaced/game/enemies/creep.hpp
@@ -4,7 +4,7 @@
 namespace spaced {
 class Creep : public Enemy {
   public:
-	explicit Creep(Services const& services) : Enemy(services, "Creep") {}
+	explicit Creep(bave::Services const& services) : Enemy(services, "Creep") {}
 
 	void tick(bave::Seconds dt, bool in_play) override;
 
diff --git a/src/spaced/spaced/game/enemies/creep_factory.cpp b/src/spaced/spaced/game/enemies/creep_factory.cpp
index cea3595..18103ac 100644
--- a/src/spaced/spaced/game/enemies/creep_factory.cpp
+++ b/src/spaced/spaced/game/enemies/creep_factory.cpp
@@ -1,12 +1,13 @@
 #include <bave/core/random.hpp>
+#include <bave/services/resources.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/enemies/creep.hpp>
 #include <spaced/game/enemies/creep_factory.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
 using bave::random_in_range;
 using bave::Seconds;
+using bave::Styles;
 
 auto CreepFactory::spawn_enemy() -> std::unique_ptr<Enemy> {
 	auto ret = std::make_unique<Creep>(get_services());
diff --git a/src/spaced/spaced/game/enemy.cpp b/src/spaced/spaced/game/enemy.cpp
index e6e6a39..77cd6d3 100644
--- a/src/spaced/spaced/game/enemy.cpp
+++ b/src/spaced/spaced/game/enemy.cpp
@@ -1,19 +1,23 @@
 #include <bave/core/random.hpp>
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/services.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/enemy.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
 using bave::im_text;
 using bave::random_in_range;
 using bave::RoundedQuad;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
+using bave::Styles;
 
-Enemy::Enemy(Services const& services, std::string_view const type) : m_layout(&services.get<ILayout>()), m_health_bar(services), m_type(type) {
+namespace ui = bave::ui;
+
+Enemy::Enemy(Services const& services, std::string_view const type) : m_layout(&services.get<Layout>()), m_health_bar(services), m_type(type) {
 	static constexpr auto init_size_v = glm::vec2{100.0f};
-	auto const play_area = m_layout->get_play_area();
+	auto const play_area = m_layout->play_area;
 	auto const y_min = play_area.rb.y + 0.5f * init_size_v.y;
 	auto const y_max = play_area.lt.y - 0.5f * init_size_v.y - 50.0f;
 	setup(init_size_v, random_in_range(y_min, y_max));
@@ -49,7 +53,7 @@ void Enemy::setup(glm::vec2 max_size, float y_position) {
 	rounded_quad.size = max_size;
 	rounded_quad.corner_radius = 0.2f * max_size.x;
 	shape.set_shape(rounded_quad);
-	shape.transform.position.x = 0.5f * (get_layout().get_world_space().x + rounded_quad.size.x);
+	shape.transform.position.x = 0.5f * (get_layout().world_space.x + rounded_quad.size.x);
 	shape.transform.position.y = y_position;
 }
 
diff --git a/src/spaced/spaced/game/enemy.hpp b/src/spaced/spaced/game/enemy.hpp
index 04ffe58..45685ef 100644
--- a/src/spaced/spaced/game/enemy.hpp
+++ b/src/spaced/spaced/game/enemy.hpp
@@ -2,16 +2,16 @@
 #include <bave/core/time.hpp>
 #include <bave/graphics/shape.hpp>
 #include <bave/platform.hpp>
+#include <bave/services/services.hpp>
+#include <bave/ui/progress_bar.hpp>
 #include <spaced/game/damageable.hpp>
 #include <spaced/game/health.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/progress_bar.hpp>
 
 namespace spaced {
 class Enemy : public IDamageable, public bave::IDrawable {
   public:
-	explicit Enemy(Services const& services, std::string_view type);
+	explicit Enemy(bave::Services const& services, std::string_view type);
 
 	[[nodiscard]] auto get_instigator() const -> Instigator final { return Instigator::eEnemy; }
 	[[nodiscard]] auto get_bounds() const -> bave::Rect<> override { return shape.get_bounds(); }
@@ -27,7 +27,7 @@ class Enemy : public IDamageable, public bave::IDrawable {
 
 	void setup(glm::vec2 max_size, float y_position);
 
-	[[nodiscard]] auto get_layout() const -> ILayout const& { return *m_layout; }
+	[[nodiscard]] auto get_layout() const -> Layout const& { return *m_layout; }
 
 	void inspect() {
 		if constexpr (bave::debug_v) { do_inspect(); }
@@ -43,9 +43,9 @@ class Enemy : public IDamageable, public bave::IDrawable {
   private:
 	virtual void do_inspect();
 
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<Layout const*> m_layout;
 
-	ui::ProgressBar m_health_bar;
+	bave::ui::ProgressBar m_health_bar;
 
 	std::string_view m_type{};
 	bool m_destroyed{};
diff --git a/src/spaced/spaced/game/enemy_factory.cpp b/src/spaced/spaced/game/enemy_factory.cpp
index 97c4c20..e31c7ce 100644
--- a/src/spaced/spaced/game/enemy_factory.cpp
+++ b/src/spaced/spaced/game/enemy_factory.cpp
@@ -1,9 +1,11 @@
+#include <bave/services/audio.hpp>
 #include <spaced/game/enemy_factory.hpp>
-#include <spaced/services/audio.hpp>
 
 namespace spaced {
+using bave::IAudio;
 using bave::NotNull;
 using bave::Seconds;
+using bave::Services;
 
 EnemyFactory::EnemyFactory(NotNull<Services const*> services) : m_services(services), m_audio(&services->get<IAudio>()) {}
 
diff --git a/src/spaced/spaced/game/enemy_factory.hpp b/src/spaced/spaced/game/enemy_factory.hpp
index c183b30..af22ddb 100644
--- a/src/spaced/spaced/game/enemy_factory.hpp
+++ b/src/spaced/spaced/game/enemy_factory.hpp
@@ -1,25 +1,24 @@
 #pragma once
 #include <bave/graphics/particle_system.hpp>
+#include <bave/services/audio.hpp>
 #include <spaced/game/enemy.hpp>
 
 namespace spaced {
-class IAudio;
-
 class EnemyFactory : public bave::Polymorphic {
   public:
-	explicit EnemyFactory(bave::NotNull<Services const*> services);
+	explicit EnemyFactory(bave::NotNull<bave::Services const*> services);
 
 	[[nodiscard]] virtual auto spawn_enemy() -> std::unique_ptr<Enemy> = 0;
 
 	auto tick(bave::Seconds dt) -> std::unique_ptr<Enemy>;
 
-	[[nodiscard]] auto get_services() const -> Services const& { return *m_services; }
+	[[nodiscard]] auto get_services() const -> bave::Services const& { return *m_services; }
 
 	bave::Seconds spawn_rate{1s};
 
   private:
-	bave::NotNull<Services const*> m_services;
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::Services const*> m_services;
+	bave::NotNull<bave::IAudio*> m_audio;
 
 	bave::Seconds m_elapsed{};
 };
diff --git a/src/spaced/spaced/game/hud.cpp b/src/spaced/spaced/game/hud.cpp
index 9799892..2a6d3c5 100644
--- a/src/spaced/spaced/game/hud.cpp
+++ b/src/spaced/spaced/game/hud.cpp
@@ -1,11 +1,16 @@
 #include <fmt/format.h>
+#include <bave/services/styles.hpp>
 #include <spaced/game/hud.hpp>
-#include <spaced/services/styles.hpp>
+#include <spaced/services/layout.hpp>
 
 namespace spaced {
+using bave::Services;
+using bave::Styles;
 using bave::TextHeight;
 
-Hud::Hud(Services const& services) : ui::View(services), m_styles(&services.get<Styles>()), m_area(m_layout->get_hud_area()) {
+namespace ui = bave::ui;
+
+Hud::Hud(Services const& services) : ui::View(services), m_styles(&services.get<Styles>()), m_area(services.get<Layout>().hud_area) {
 	create_background();
 	create_score(services);
 
diff --git a/src/spaced/spaced/game/hud.hpp b/src/spaced/spaced/game/hud.hpp
index 0f1d0bb..bc26dc3 100644
--- a/src/spaced/spaced/game/hud.hpp
+++ b/src/spaced/spaced/game/hud.hpp
@@ -1,26 +1,26 @@
 #pragma once
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/text.hpp>
-#include <spaced/ui/view.hpp>
+#include <bave/services/styles.hpp>
+#include <bave/ui/outline_quad.hpp>
+#include <bave/ui/text.hpp>
+#include <bave/ui/view.hpp>
 
 namespace spaced {
-class Hud : public ui::View {
+class Hud : public bave::ui::View {
   public:
-	explicit Hud(Services const& services);
+	explicit Hud(bave::Services const& services);
 
 	void set_score(std::int64_t score);
 	void set_hi_score(std::int64_t score);
 
   private:
 	void create_background();
-	void create_score(Services const& services);
+	void create_score(bave::Services const& services);
 
-	bave::NotNull<Styles const*> m_styles;
+	bave::NotNull<bave::Styles const*> m_styles;
 	bave::Rect<> m_area{};
 
-	bave::Ptr<ui::OutlineQuad> m_background{};
-	bave::Ptr<ui::Text> m_score{};
-	bave::Ptr<ui::Text> m_hi_score{};
+	bave::Ptr<bave::ui::OutlineQuad> m_background{};
+	bave::Ptr<bave::ui::Text> m_score{};
+	bave::Ptr<bave::ui::Text> m_hi_score{};
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/game/player.cpp b/src/spaced/spaced/game/player.cpp
index c123d4b..79eb349 100644
--- a/src/spaced/spaced/game/player.cpp
+++ b/src/spaced/spaced/game/player.cpp
@@ -1,10 +1,11 @@
 #include <imgui.h>
 #include <bave/imgui/im_text.hpp>
 #include <bave/platform.hpp>
+#include <bave/services/resources.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/player.hpp>
-#include <spaced/services/resources.hpp>
+#include <spaced/services/layout.hpp>
 #include <spaced/services/stats.hpp>
-#include <spaced/services/styles.hpp>
 
 // temp for testing
 #include <spaced/game/weapons/gun_beam.hpp>
@@ -13,16 +14,19 @@ namespace spaced {
 using bave::ParticleEmitter;
 using bave::PointerMove;
 using bave::PointerTap;
+using bave::Resources;
 using bave::RoundedQuad;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
+using bave::Styles;
 
 Player::Player(Services const& services, std::unique_ptr<IController> controller)
 	: m_services(&services), m_stats(&services.get<Stats>()), m_controller(std::move(controller)) {
-	auto const& layout = services.get<ILayout>();
-	ship.transform.position.x = layout.get_player_x();
+	auto const& layout = services.get<Layout>();
+	ship.transform.position.x = layout.player_x;
 	auto rounded_quad = RoundedQuad{};
-	rounded_quad.size = layout.get_player_size();
+	rounded_quad.size = layout.player_size;
 	rounded_quad.corner_radius = 20.0f;
 	ship.set_shape(rounded_quad);
 
diff --git a/src/spaced/spaced/game/player.hpp b/src/spaced/spaced/game/player.hpp
index ebee256..015ca75 100644
--- a/src/spaced/spaced/game/player.hpp
+++ b/src/spaced/spaced/game/player.hpp
@@ -17,7 +17,7 @@ class Player : public bave::IDrawable {
 		std::span<bave::NotNull<IPowerup*> const> powerups{};
 	};
 
-	explicit Player(Services const& services, std::unique_ptr<IController> controller);
+	explicit Player(bave::Services const& services, std::unique_ptr<IController> controller);
 
 	void on_focus(bave::FocusChange const& focus_change);
 	void on_move(bave::PointerMove const& pointer_move);
@@ -50,7 +50,7 @@ class Player : public bave::IDrawable {
 	void do_inspect();
 
 	bave::Logger m_log{"Player"};
-	bave::NotNull<Services const*> m_services;
+	bave::NotNull<bave::Services const*> m_services;
 	bave::NotNull<Stats*> m_stats;
 	std::unique_ptr<IController> m_controller;
 	bave::ParticleEmitter m_exhaust{};
diff --git a/src/spaced/spaced/game/powerups/pu_base.cpp b/src/spaced/spaced/game/powerups/pu_base.cpp
index 22cd99f..f30d6b5 100644
--- a/src/spaced/spaced/game/powerups/pu_base.cpp
+++ b/src/spaced/spaced/game/powerups/pu_base.cpp
@@ -1,13 +1,15 @@
+#include <bave/services/resources.hpp>
 #include <spaced/game/powerups/pu_base.hpp>
-#include <spaced/services/resources.hpp>
 
 namespace spaced {
 using bave::ParticleEmitter;
+using bave::Resources;
 using bave::RoundedQuad;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
 
-PUBase::PUBase(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<ILayout>()), m_name(name) {
+PUBase::PUBase(Services const& services, std::string_view const name) : m_services(&services), m_layout(&services.get<Layout>()), m_name(name) {
 	auto quad = RoundedQuad{};
 	quad.size = glm::vec2{40.0f};
 	quad.corner_radius = 12.5f;
@@ -21,7 +23,7 @@ PUBase::PUBase(Services const& services, std::string_view const name) : m_servic
 
 void PUBase::tick(Seconds const dt) {
 	shape.transform.position.x -= speed * dt.count();
-	if (shape.transform.position.x < m_layout->get_play_area().lt.x - 0.5f * shape.get_shape().size.x) { m_destroyed = true; }
+	if (shape.transform.position.x < m_layout->play_area.lt.x - 0.5f * shape.get_shape().size.x) { m_destroyed = true; }
 
 	emitter.set_position(shape.transform.position);
 	if (!m_emitter_ticked) {
diff --git a/src/spaced/spaced/game/powerups/pu_base.hpp b/src/spaced/spaced/game/powerups/pu_base.hpp
index baf64e7..4c200c4 100644
--- a/src/spaced/spaced/game/powerups/pu_base.hpp
+++ b/src/spaced/spaced/game/powerups/pu_base.hpp
@@ -2,14 +2,14 @@
 #include <bave/core/time.hpp>
 #include <bave/graphics/particle_system.hpp>
 #include <bave/graphics/shape.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/game/powerup.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
 
 namespace spaced {
 class PUBase : public IPowerup {
   public:
-	explicit PUBase(Services const& services, std::string_view name);
+	explicit PUBase(bave::Services const& services, std::string_view name);
 
 	void tick(bave::Seconds dt) final;
 	void draw(bave::Shader& shader) const final;
@@ -26,8 +26,8 @@ class PUBase : public IPowerup {
   protected:
 	virtual void do_activate(Player& player) = 0;
 
-	bave::NotNull<Services const*> m_services;
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<bave::Services const*> m_services;
+	bave::NotNull<Layout const*> m_layout;
 	std::string_view m_name{};
 	bool m_emitter_ticked{};
 	bool m_destroyed{};
diff --git a/src/spaced/spaced/game/powerups/pu_beam.cpp b/src/spaced/spaced/game/powerups/pu_beam.cpp
index b1c50c5..49b2167 100644
--- a/src/spaced/spaced/game/powerups/pu_beam.cpp
+++ b/src/spaced/spaced/game/powerups/pu_beam.cpp
@@ -1,9 +1,12 @@
+#include <bave/services/styles.hpp>
 #include <spaced/game/player.hpp>
 #include <spaced/game/powerups/pu_beam.hpp>
 #include <spaced/game/weapons/gun_beam.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
+using bave::Services;
+using bave::Styles;
+
 PUBeam::PUBeam(Services const& services, int rounds) : PUBase(services, "Beam"), m_rounds(rounds) {
 	emitter.config.lerp.tint.lo = emitter.config.lerp.tint.hi = shape.tint = services.get<Styles>().rgbas["gun_beam"];
 	emitter.config.lerp.tint.hi.channels.w = 0;
diff --git a/src/spaced/spaced/game/powerups/pu_beam.hpp b/src/spaced/spaced/game/powerups/pu_beam.hpp
index 9e19668..abf8335 100644
--- a/src/spaced/spaced/game/powerups/pu_beam.hpp
+++ b/src/spaced/spaced/game/powerups/pu_beam.hpp
@@ -4,7 +4,7 @@
 namespace spaced {
 class PUBeam : public PUBase {
   public:
-	explicit PUBeam(Services const& services, int rounds = 2);
+	explicit PUBeam(bave::Services const& services, int rounds = 2);
 
   private:
 	void do_activate(Player& player) final;
diff --git a/src/spaced/spaced/game/weapon.cpp b/src/spaced/spaced/game/weapon.cpp
index fe67c4f..b4da785 100644
--- a/src/spaced/spaced/game/weapon.cpp
+++ b/src/spaced/spaced/game/weapon.cpp
@@ -1,11 +1,14 @@
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/audio.hpp>
 #include <spaced/game/weapon.hpp>
-#include <spaced/services/audio.hpp>
 
 namespace spaced {
+using bave::IAudio;
+using bave::IDisplay;
 using bave::im_text;
+using bave::Services;
 
-Weapon::Weapon(Services const& services, std::string name) : m_log{std::move(name)}, m_layout(&services.get<ILayout>()), m_audio(&services.get<IAudio>()) {}
+Weapon::Weapon(Services const& services, std::string name) : m_log{std::move(name)}, m_display(&services.get<IDisplay>()), m_audio(&services.get<IAudio>()) {}
 
 auto Weapon::fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Round> {
 	auto ret = do_fire(muzzle_position);
diff --git a/src/spaced/spaced/game/weapon.hpp b/src/spaced/spaced/game/weapon.hpp
index a105ca6..b114b84 100644
--- a/src/spaced/spaced/game/weapon.hpp
+++ b/src/spaced/spaced/game/weapon.hpp
@@ -1,18 +1,20 @@
 #pragma once
 #include <bave/logger.hpp>
 #include <bave/platform.hpp>
+#include <bave/services/display.hpp>
+#include <bave/services/services.hpp>
 #include <spaced/game/weapon_round.hpp>
-#include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
 
-namespace spaced {
+namespace bave {
 class IAudio;
+}
 
+namespace spaced {
 class Weapon : public bave::Polymorphic {
   public:
 	using Round = IWeaponRound;
 
-	explicit Weapon(Services const& services, std::string name);
+	explicit Weapon(bave::Services const& services, std::string name);
 
 	[[nodiscard]] auto get_rounds_remaining() const -> int { return rounds < 0 ? 1 : rounds; }
 
@@ -28,7 +30,7 @@ class Weapon : public bave::Polymorphic {
 	int rounds{-1};
 
   protected:
-	[[nodiscard]] auto get_layout() const -> ILayout const& { return *m_layout; }
+	[[nodiscard]] auto get_display() const -> bave::IDisplay const& { return *m_display; }
 
 	virtual auto do_fire(glm::vec2 muzzle_position) -> std::unique_ptr<Round> = 0;
 	virtual void do_inspect();
@@ -37,7 +39,7 @@ class Weapon : public bave::Polymorphic {
 	std::vector<std::string> m_fire_sfx{};
 
   private:
-	bave::NotNull<ILayout const*> m_layout;
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::IDisplay const*> m_display;
+	bave::NotNull<bave::IAudio*> m_audio;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/game/weapons/gun_beam.cpp b/src/spaced/spaced/game/weapons/gun_beam.cpp
index 43653a5..e877096 100644
--- a/src/spaced/spaced/game/weapons/gun_beam.cpp
+++ b/src/spaced/spaced/game/weapons/gun_beam.cpp
@@ -1,25 +1,28 @@
 #include <bave/graphics/sprite.hpp>
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/weapons/gun_beam.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
+using bave::IDisplay;
 using bave::im_text;
 using bave::NotNull;
 using bave::Ptr;
 using bave::Rect;
 using bave::Rgba;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
 using bave::Sprite;
+using bave::Styles;
 
 namespace {
 class LaserCharge : public IWeaponRound {
   public:
 	using Config = GunBeam::Config;
 
-	explicit LaserCharge(NotNull<ILayout const*> layout, Config config, glm::vec2 const muzzle_position)
-		: m_layout(layout), m_config(config), m_fire_remain(config.fire_duration) {
+	explicit LaserCharge(NotNull<IDisplay const*> display, Config config, glm::vec2 const muzzle_position)
+		: m_display(display), m_config(config), m_fire_remain(config.fire_duration) {
 		m_ray.transform.position.y = muzzle_position.y;
 	}
 
@@ -30,7 +33,7 @@ class LaserCharge : public IWeaponRound {
 
 		sort_entries(state.targets, state.muzzle_position);
 
-		auto const world_space = m_layout->get_world_space();
+		auto const world_space = m_display->get_world_space();
 		auto const left_x = state.muzzle_position.x;
 		auto right_x = 0.5f * world_space.x;
 		for (auto const& entry : m_entries) {
@@ -88,7 +91,7 @@ class LaserCharge : public IWeaponRound {
 		float distance{};
 	};
 
-	NotNull<ILayout const*> m_layout;
+	NotNull<IDisplay const*> m_display;
 	Config m_config;
 
 	Sprite m_ray{};
@@ -119,7 +122,7 @@ auto GunBeam::do_fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Round>
 	if (rounds > 0) { --rounds; }
 	m_fire_remain = config.fire_duration;
 	m_reload_remain = 0s;
-	return std::make_unique<LaserCharge>(&get_layout(), config, muzzle_position);
+	return std::make_unique<LaserCharge>(&get_display(), config, muzzle_position);
 }
 
 void GunBeam::do_inspect() {
diff --git a/src/spaced/spaced/game/weapons/gun_beam.hpp b/src/spaced/spaced/game/weapons/gun_beam.hpp
index 691bd74..038288c 100644
--- a/src/spaced/spaced/game/weapons/gun_beam.hpp
+++ b/src/spaced/spaced/game/weapons/gun_beam.hpp
@@ -12,7 +12,7 @@ class GunBeam final : public Weapon {
 		float dps{10.0f};
 	};
 
-	explicit GunBeam(Services const& services);
+	explicit GunBeam(bave::Services const& services);
 
 	[[nodiscard]] auto is_idle() const -> bool final { return m_fire_remain <= 0s; }
 	void tick(bave::Seconds dt) final;
diff --git a/src/spaced/spaced/game/weapons/gun_kinetic.cpp b/src/spaced/spaced/game/weapons/gun_kinetic.cpp
index 8f33586..981ceb1 100644
--- a/src/spaced/spaced/game/weapons/gun_kinetic.cpp
+++ b/src/spaced/spaced/game/weapons/gun_kinetic.cpp
@@ -1,11 +1,14 @@
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/game/weapons/gun_kinetic.hpp>
-#include <spaced/services/styles.hpp>
 
 namespace spaced {
+using bave::IAudio;
 using bave::im_text;
 using bave::Rgba;
 using bave::Seconds;
+using bave::Services;
+using bave::Styles;
 
 GunKinetic::GunKinetic(Services const& services) : Weapon(services, "GunKinetic"), m_audio(&services.get<IAudio>()) {
 	projectile_config.tint = services.get<Styles>().rgbas["black"];
@@ -20,7 +23,7 @@ auto GunKinetic::do_fire(glm::vec2 const muzzle_position) -> std::unique_ptr<Rou
 
 	if (rounds > 0) { --rounds; }
 	m_reload_remain = reload_delay;
-	return std::make_unique<Projectile>(&get_layout(), projectile_config, muzzle_position);
+	return std::make_unique<Projectile>(&get_display(), projectile_config, muzzle_position);
 }
 
 void GunKinetic::do_inspect() {
diff --git a/src/spaced/spaced/game/weapons/gun_kinetic.hpp b/src/spaced/spaced/game/weapons/gun_kinetic.hpp
index d58053a..c321966 100644
--- a/src/spaced/spaced/game/weapons/gun_kinetic.hpp
+++ b/src/spaced/spaced/game/weapons/gun_kinetic.hpp
@@ -1,12 +1,12 @@
 #pragma once
+#include <bave/services/audio.hpp>
 #include <spaced/game/weapon.hpp>
 #include <spaced/game/weapons/projectile.hpp>
-#include <spaced/services/audio.hpp>
 
 namespace spaced {
 class GunKinetic final : public Weapon {
   public:
-	explicit GunKinetic(Services const& services);
+	explicit GunKinetic(bave::Services const& services);
 
 	[[nodiscard]] auto is_idle() const -> bool final { return m_reload_remain <= 0s; }
 
@@ -20,6 +20,6 @@ class GunKinetic final : public Weapon {
 	void do_inspect() final;
 
 	bave::Seconds m_reload_remain{};
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::IAudio*> m_audio;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/game/weapons/projectile.cpp b/src/spaced/spaced/game/weapons/projectile.cpp
index 6652eca..11d2dbd 100644
--- a/src/spaced/spaced/game/weapons/projectile.cpp
+++ b/src/spaced/spaced/game/weapons/projectile.cpp
@@ -1,6 +1,7 @@
 #include <spaced/game/weapons/projectile.hpp>
 
 namespace spaced {
+using bave::IDisplay;
 using bave::NotNull;
 using bave::Rect;
 using bave::RoundedQuad;
@@ -15,7 +16,7 @@ namespace {
 }
 } // namespace
 
-Projectile::Projectile(NotNull<ILayout const*> layout, Config config, glm::vec2 const muzzle_position) : m_layout(layout), m_config(std::move(config)) {
+Projectile::Projectile(NotNull<IDisplay const*> display, Config config, glm::vec2 const muzzle_position) : m_display(display), m_config(std::move(config)) {
 	auto rounded_quad = RoundedQuad{};
 	rounded_quad.size = m_config.size;
 	rounded_quad.corner_radius = m_config.corner_radius;
@@ -42,7 +43,7 @@ void Projectile::tick(State const& state, Seconds const dt) {
 		}
 	}
 
-	if (m_shape.transform.position.x > 0.5f * (m_layout->get_world_space().x + m_config.size.x)) { m_destroyed = true; }
+	if (m_shape.transform.position.x > 0.5f * (m_display->get_world_space().x + m_config.size.x)) { m_destroyed = true; }
 }
 
 void Projectile::draw(Shader& shader) const { m_shape.draw(shader); }
diff --git a/src/spaced/spaced/game/weapons/projectile.hpp b/src/spaced/spaced/game/weapons/projectile.hpp
index a3f966b..ca4b129 100644
--- a/src/spaced/spaced/game/weapons/projectile.hpp
+++ b/src/spaced/spaced/game/weapons/projectile.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include <bave/graphics/shape.hpp>
+#include <bave/services/display.hpp>
 #include <spaced/game/instigator.hpp>
 #include <spaced/game/weapon_round.hpp>
-#include <spaced/services/layout.hpp>
 
 namespace spaced {
 class Projectile : public IWeaponRound {
@@ -17,14 +17,14 @@ class Projectile : public IWeaponRound {
 		Instigator instigator{Instigator::ePlayer};
 	};
 
-	explicit Projectile(bave::NotNull<ILayout const*> layout, Config config, glm::vec2 muzzle_position);
+	explicit Projectile(bave::NotNull<bave::IDisplay const*> display, Config config, glm::vec2 muzzle_position);
 
 	void tick(State const& state, bave::Seconds dt) override;
 	[[nodiscard]] auto is_destroyed() const -> bool override { return m_destroyed; }
 	void draw(bave::Shader& shader) const override;
 
   protected:
-	bave::NotNull<ILayout const*> m_layout;
+	bave::NotNull<bave::IDisplay const*> m_display;
 	Config m_config{};
 
 	bave::RoundedQuadShape m_shape{};
diff --git a/src/spaced/spaced/game/world.cpp b/src/spaced/spaced/game/world.cpp
index 9e55db6..4607c08 100644
--- a/src/spaced/spaced/game/world.cpp
+++ b/src/spaced/spaced/game/world.cpp
@@ -1,7 +1,7 @@
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/resources.hpp>
 #include <spaced/game/enemies/creep_factory.hpp>
 #include <spaced/game/world.hpp>
-#include <spaced/services/resources.hpp>
 #include <spaced/services/stats.hpp>
 
 #include <bave/core/random.hpp>
@@ -11,26 +11,29 @@
 
 namespace spaced {
 using bave::FixedString;
+using bave::IAudio;
 using bave::NotNull;
 using bave::ParticleEmitter;
 using bave::random_in_range;
+using bave::Resources;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
 
 namespace {
 [[nodiscard]] auto make_player_controller(Services const& services) {
 	auto ret = std::make_unique<PlayerController>(services);
 	if constexpr (bave::platform_v == bave::Platform::eAndroid) { ret->set_type(PlayerController::Type::eTouch); }
-	auto const& layout = services.get<ILayout>();
-	auto const half_size = 0.5f * layout.get_player_size();
-	auto const play_area = layout.get_play_area();
+	auto const& layout = services.get<Layout>();
+	auto const half_size = 0.5f * layout.player_size;
+	auto const play_area = layout.play_area;
 	ret->max_y = play_area.lt.y - half_size.y;
 	ret->min_y = play_area.rb.y + half_size.y;
 	return ret;
 }
 
 [[nodiscard]] auto make_auto_controller(ITargetProvider const& target_provider, Services const& services) {
-	return std::make_unique<AutoController>(&target_provider, services.get<ILayout>().get_player_x());
+	return std::make_unique<AutoController>(&target_provider, services.get<Layout>().player_x);
 }
 } // namespace
 
diff --git a/src/spaced/spaced/game/world.hpp b/src/spaced/spaced/game/world.hpp
index 46cf622..24720c9 100644
--- a/src/spaced/spaced/game/world.hpp
+++ b/src/spaced/spaced/game/world.hpp
@@ -4,13 +4,16 @@
 #include <spaced/game/scorer.hpp>
 #include <spaced/game/target_provider.hpp>
 
-namespace spaced {
+namespace bave {
 struct Resources;
+}
+
+namespace spaced {
 struct Stats;
 
 class World : public ITargetProvider {
   public:
-	explicit World(bave::NotNull<Services const*> services, bave::NotNull<IScorer*> scorer);
+	explicit World(bave::NotNull<bave::Services const*> services, bave::NotNull<IScorer*> scorer);
 
 	[[nodiscard]] auto get_targets() const -> std::span<bave::NotNull<IDamageable*> const> final { return m_targets; }
 
@@ -32,9 +35,9 @@ class World : public ITargetProvider {
 	void debug_controller_type();
 	void debug_spawn_powerup(glm::vec2 position);
 
-	bave::NotNull<Services const*> m_services;
-	bave::NotNull<Resources const*> m_resources;
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::Services const*> m_services;
+	bave::NotNull<bave::Resources const*> m_resources;
+	bave::NotNull<bave::IAudio*> m_audio;
 	bave::NotNull<Stats*> m_stats;
 	bave::NotNull<IScorer*> m_scorer;
 
diff --git a/src/spaced/spaced/prefs.cpp b/src/spaced/spaced/prefs.cpp
index da68d6d..223346f 100644
--- a/src/spaced/spaced/prefs.cpp
+++ b/src/spaced/spaced/prefs.cpp
@@ -1,16 +1,21 @@
 #include <bave/persistor.hpp>
+#include <bave/services/audio.hpp>
+#include <bave/services/styles.hpp>
+#include <bave/ui/button.hpp>
+#include <bave/ui/slider.hpp>
+#include <bave/ui/text.hpp>
 #include <djson/json.hpp>
 #include <spaced/prefs.hpp>
-#include <spaced/services/audio.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/button.hpp>
-#include <spaced/ui/slider.hpp>
-#include <spaced/ui/text.hpp>
 
 namespace spaced {
 using bave::App;
+using bave::IAudio;
 using bave::NotNull;
 using bave::Persistor;
+using bave::Services;
+using bave::Styles;
+
+namespace ui = bave::ui;
 
 namespace {
 constexpr std::string_view uri_v{"spaced/prefs.json"};
diff --git a/src/spaced/spaced/prefs.hpp b/src/spaced/spaced/prefs.hpp
index be0863d..ce99338 100644
--- a/src/spaced/spaced/prefs.hpp
+++ b/src/spaced/spaced/prefs.hpp
@@ -1,10 +1,9 @@
 #pragma once
 #include <bave/app.hpp>
-#include <spaced/ui/view.hpp>
+#include <bave/services/audio.hpp>
+#include <bave/ui/view.hpp>
 
 namespace spaced {
-class IAudio;
-
 struct Prefs {
 	class View;
 
@@ -15,19 +14,19 @@ struct Prefs {
 	void save(bave::App const& app) const;
 };
 
-class Prefs::View : public ui::View {
+class Prefs::View : public bave::ui::View {
   public:
 	View(View const&) = delete;
 	View(View&&) = delete;
 	auto operator=(View const&) = delete;
 	auto operator=(View&&) = delete;
 
-	explicit View(bave::NotNull<bave::App const*> app, Services const& services);
+	explicit View(bave::NotNull<bave::App const*> app, bave::Services const& services);
 	~View() override;
 
   private:
 	bave::NotNull<bave::App const*> m_app;
-	bave::NotNull<IAudio*> m_audio;
+	bave::NotNull<bave::IAudio*> m_audio;
 	Prefs m_prefs;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/resource_map.hpp b/src/spaced/spaced/resource_map.hpp
deleted file mode 100644
index fb44e4b..0000000
--- a/src/spaced/spaced/resource_map.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-#include <bave/core/polymorphic.hpp>
-#include <spaced/string_map.hpp>
-#include <memory>
-#include <typeindex>
-
-namespace spaced {
-class ResourceMap {
-  public:
-	template <typename Type>
-	auto add(std::string uri, std::shared_ptr<Type> resource) {
-		if (uri.empty() || !resource) { return; }
-		m_resources.insert_or_assign(std::move(uri), std::make_unique<Model<Type>>(std::move(resource)));
-	}
-
-	[[nodiscard]] auto contains(std::string_view const uri) const -> bool { return m_resources.contains(uri); }
-
-	template <typename Type>
-	[[nodiscard]] auto contains(std::string_view const uri) const -> bool {
-		if (uri.empty()) { return false; }
-		auto const it = m_resources.find(uri);
-		if (it == m_resources.end()) { return false; }
-		return it->second->type_index == typeid(Type);
-	}
-
-	template <typename Type>
-	[[nodiscard]] auto get(std::string_view const uri, std::shared_ptr<Type> const& fallback = {}) const -> std::shared_ptr<Type> {
-		if (uri.empty()) { return fallback; }
-		auto const it = m_resources.find(uri);
-		if (it == m_resources.end()) { return fallback; }
-		auto const& resource = it->second;
-		if (resource->type_index != typeid(Type)) { return fallback; }
-		return static_cast<Model<Type> const&>(*it->second).resource;
-	}
-
-	void clear() { m_resources.clear(); }
-
-	[[nodiscard]] auto size() const -> std::size_t { return m_resources.size(); }
-
-  private:
-	struct Base : bave::Polymorphic {
-		std::type_index type_index;
-		explicit Base(std::type_index type_index) : type_index(type_index) {}
-	};
-
-	template <typename T>
-	struct Model : Base {
-		std::shared_ptr<T> resource;
-		explicit Model(std::shared_ptr<T> t) : Base(typeid(T)), resource(std::move(t)) {}
-	};
-
-	StringMap<std::unique_ptr<Base>> m_resources{};
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/scene.cpp b/src/spaced/spaced/scene.cpp
deleted file mode 100644
index a339c55..0000000
--- a/src/spaced/spaced/scene.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <spaced/scene.hpp>
-#include <spaced/services/layout.hpp>
-#include <algorithm>
-
-namespace spaced {
-using bave::App;
-using bave::KeyInput;
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::Seconds;
-
-Scene::Scene(App& app, Services const& services, std::string name) : m_log{std::move(name)}, m_app(app), m_services(services) { m_log.info("constructed"); }
-
-void Scene::on_key_event(KeyInput const& key_input) { on_key(key_input); }
-
-void Scene::on_focus_event(bave::FocusChange const& focus_change) { on_focus(focus_change); }
-
-void Scene::on_move_event(PointerMove const& pointer_move) {
-	if (on_ui_event([pointer_move](ui::View& view) { view.on_move(pointer_move); })) { return; }
-	on_move(pointer_move);
-}
-
-void Scene::on_tap_event(PointerTap const& pointer_tap) {
-	if (on_ui_event([pointer_tap](ui::View& view) { view.on_tap(pointer_tap); })) { return; }
-	on_tap(pointer_tap);
-}
-
-void Scene::on_scroll_event(bave::MouseScroll const& mouse_scroll) { on_scroll(mouse_scroll); }
-
-auto Scene::is_ui_blocking_input() const -> bool {
-	return std::any_of(m_views.begin(), m_views.end(), [](auto const& view) { return view->block_input_events; });
-}
-
-void Scene::push_view(std::unique_ptr<ui::View> view) {
-	if (!view || view->is_destroyed()) { return; }
-	m_views.push_back(std::move(view));
-}
-
-void Scene::tick_frame(Seconds const dt) {
-	tick(dt);
-	for (auto const& view : cache_views()) { view->tick(dt); }
-	std::erase_if(m_views, [](auto const& view) { return view->is_destroyed(); });
-}
-
-void Scene::render_frame() const {
-	auto shader = get_app().load_shader("shaders/default.vert", "shaders/default.frag");
-	if (!shader) { return; }
-	render(*shader);
-	for (auto const& view : m_views) { view->render(*shader); }
-}
-
-template <typename F>
-auto Scene::on_ui_event(F per_view) -> bool {
-	auto const cached_views = cache_views();
-	for (auto it = cached_views.rbegin(); it != cached_views.rend(); ++it) {
-		auto const& view = *it;
-		per_view(*view);
-		if (view->block_input_events) { return true; }
-	}
-	return false;
-}
-
-auto Scene::cache_views() -> std::span<bave::Ptr<ui::View> const> {
-	m_cached_views.clear();
-	m_cached_views.reserve(m_views.size());
-	for (auto const& view : m_views) { m_cached_views.push_back(view.get()); }
-	return m_cached_views;
-}
-} // namespace spaced
diff --git a/src/spaced/spaced/scene.hpp b/src/spaced/spaced/scene.hpp
deleted file mode 100644
index 77acfcd..0000000
--- a/src/spaced/spaced/scene.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#pragma once
-#include <bave/app.hpp>
-#include <bave/core/polymorphic.hpp>
-#include <bave/loader.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/view.hpp>
-
-namespace spaced {
-class Scene : public bave::PolyPinned {
-  public:
-	explicit Scene(bave::App& app, Services const& services, std::string name = "Scene");
-
-	void on_focus_event(bave::FocusChange const& focus_change);
-	void on_key_event(bave::KeyInput const& key_input);
-	void on_move_event(bave::PointerMove const& pointer_move);
-	void on_tap_event(bave::PointerTap const& pointer_tap);
-	void on_scroll_event(bave::MouseScroll const& mouse_scroll);
-	void tick_frame(bave::Seconds dt);
-	void render_frame() const;
-
-	[[nodiscard]] virtual auto get_music_uri() const -> std::string_view { return {}; }
-
-	[[nodiscard]] auto get_app() const -> bave::App& { return m_app; }
-	[[nodiscard]] auto get_services() const -> Services const& { return m_services; }
-
-	[[nodiscard]] auto is_ui_blocking_input() const -> bool;
-
-	[[nodiscard]] auto make_loader() const -> bave::Loader { return bave::Loader{&m_app.get_data_store(), &m_app.get_render_device()}; }
-
-	void push_view(std::unique_ptr<ui::View> view);
-
-	bave::Rgba clear_colour{bave::black_v};
-
-  protected:
-	virtual void on_focus(bave::FocusChange const& /*focus_change*/) {}
-	virtual void on_resize(bave::WindowResize const& /*window_resize*/) {}
-	virtual void on_resize(bave::FramebufferResize const& /*framebuffer_resize*/) {}
-	virtual void on_key(bave::KeyInput const& /*key_input*/) {}
-	virtual void on_char(bave::CharInput const& /*char_input*/) {}
-	virtual void on_tap(bave::PointerTap const& /*pointer_tap*/) {}
-	virtual void on_move(bave::PointerMove const& /*pointer_move*/) {}
-	virtual void on_scroll(bave::MouseScroll const& /*mouse_scroll*/) {}
-	virtual void on_drop(std::span<std::string const> /*paths*/) {}
-
-	virtual void tick(bave::Seconds /*dt*/) {}
-	virtual void render(bave::Shader& /*shader*/) const {}
-
-	bave::Logger m_log{};
-
-  private:
-	template <typename F>
-	auto on_ui_event(F per_view) -> bool;
-
-	auto cache_views() -> std::span<bave::Ptr<ui::View> const>;
-
-	bave::App& m_app;
-	Services const& m_services;
-	std::vector<std::unique_ptr<ui::View>> m_views{};
-	std::vector<bave::Ptr<ui::View>> m_cached_views{};
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/scenes/game.cpp b/src/spaced/spaced/scenes/game.cpp
index 142d639..5ab679d 100644
--- a/src/spaced/spaced/scenes/game.cpp
+++ b/src/spaced/spaced/scenes/game.cpp
@@ -1,13 +1,13 @@
 #include <bave/core/random.hpp>
 #include <bave/imgui/im_text.hpp>
+#include <bave/services/scene_switcher.hpp>
+#include <bave/services/styles.hpp>
+#include <bave/ui/button.hpp>
+#include <bave/ui/dialog.hpp>
 #include <spaced/assets/asset_list.hpp>
 #include <spaced/scenes/game.hpp>
 #include <spaced/scenes/menu.hpp>
-#include <spaced/services/scene_switcher.hpp>
 #include <spaced/services/stats.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/button.hpp>
-#include <spaced/ui/dialog.hpp>
 
 namespace spaced {
 using bave::Action;
@@ -21,7 +21,11 @@ using bave::PointerMove;
 using bave::PointerTap;
 using bave::Ptr;
 using bave::Seconds;
+using bave::Services;
 using bave::Shader;
+using bave::Styles;
+
+namespace ui = bave::ui;
 
 auto GameScene::get_manifest() -> AssetManifest {
 	return AssetManifest{
@@ -54,9 +58,7 @@ GameScene::GameScene(App& app, Services const& services) : Scene(app, services,
 void GameScene::on_focus(FocusChange const& focus_change) { m_world.player.on_focus(focus_change); }
 
 void GameScene::on_key(KeyInput const& key_input) {
-	if (key_input.key == Key::eEscape && key_input.action == Action::eRelease && key_input.mods == KeyMods{}) {
-		get_services().get<ISceneSwitcher>().switch_to<MenuScene>();
-	}
+	if (key_input.key == Key::eEscape && key_input.action == Action::eRelease && key_input.mods == KeyMods{}) { get_switcher().switch_to<MenuScene>(); }
 }
 
 void GameScene::on_move(PointerMove const& pointer_move) { m_world.player.on_move(pointer_move); }
@@ -84,7 +86,7 @@ void GameScene::on_game_over() {
 	auto dci = ui::DialogCreateInfo{
 		.size = {600.0f, 200.0f},
 		.content_text = "GAME OVER",
-		.main_button = {.text = "RESTART", .callback = [this] { get_services().get<ISceneSwitcher>().switch_to<GameScene>(); }},
+		.main_button = {.text = "RESTART", .callback = [this] { get_switcher().switch_to<GameScene>(); }},
 		.second_button = {.text = "QUIT", .callback = [this] { get_app().shutdown(); }},
 	};
 
@@ -122,7 +124,7 @@ void GameScene::inspect(Seconds const dt, Seconds const frame_time) {
 			ImGui::Checkbox("fps lock", &m_debug.fps.lock);
 
 			ImGui::Separator();
-			if (ImGui::Button("reload scene")) { get_services().get<ISceneSwitcher>().switch_to<GameScene>(); }
+			if (ImGui::Button("reload scene")) { get_switcher().switch_to<GameScene>(); }
 		}
 		ImGui::End();
 
diff --git a/src/spaced/spaced/scenes/game.hpp b/src/spaced/spaced/scenes/game.hpp
index 3bd14d8..4566bb2 100644
--- a/src/spaced/spaced/scenes/game.hpp
+++ b/src/spaced/spaced/scenes/game.hpp
@@ -1,18 +1,18 @@
 #pragma once
+#include <bave/scene.hpp>
 #include <spaced/assets/asset_manifest.hpp>
 #include <spaced/game/game_save.hpp>
 #include <spaced/game/hud.hpp>
 #include <spaced/game/scorer.hpp>
 #include <spaced/game/target_provider.hpp>
 #include <spaced/game/world.hpp>
-#include <spaced/scene.hpp>
 
 namespace spaced {
-class GameScene : public Scene, public IScorer {
+class GameScene : public bave::Scene, public IScorer {
   public:
 	static auto get_manifest() -> AssetManifest;
 
-	GameScene(bave::App& app, Services const& services);
+	GameScene(bave::App& app, bave::Services const& services);
 
   private:
 	void on_focus(bave::FocusChange const& focus_change) final;
diff --git a/src/spaced/spaced/scenes/load_assets.cpp b/src/spaced/spaced/scenes/load_assets.cpp
index ec6e481..5482362 100644
--- a/src/spaced/spaced/scenes/load_assets.cpp
+++ b/src/spaced/spaced/scenes/load_assets.cpp
@@ -1,16 +1,17 @@
+#include <bave/services/resources.hpp>
+#include <bave/services/scene_switcher.hpp>
 #include <spaced/assets/asset_list.hpp>
 #include <spaced/scenes/game.hpp>
 #include <spaced/scenes/load_assets.hpp>
 #include <spaced/scenes/menu.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/scene_switcher.hpp>
 #include <spaced/util.hpp>
 
 namespace spaced {
 using bave::App;
+using bave::AsyncExec;
 using bave::Loader;
-using bave::Seconds;
-using bave::Shader;
+using bave::Resources;
+using bave::Services;
 
 namespace {
 auto make_load_stages(Loader loader, Services const& services) -> std::vector<AsyncExec::Stage> {
@@ -24,18 +25,9 @@ auto make_load_stages(Loader loader, Services const& services) -> std::vector<As
 }
 } // namespace
 
-LoadAssets::LoadAssets(App& app, Services const& services)
-	: Scene(app, services, "LoadAssets"), m_loading_screen(services), m_load(make_load_stages(make_loader(), services)) {}
+LoadAssets::LoadAssets(App& app, Services const& services) : Scene(app, services, "LoadAssets") {}
 
-void LoadAssets::on_loaded() { get_services().get<ISceneSwitcher>().switch_to<MenuScene>(); }
+auto LoadAssets::build_load_stages() -> std::vector<AsyncExec::Stage> { return make_load_stages(make_loader(), get_services()); }
 
-void LoadAssets::tick(Seconds const dt) {
-	auto const load_status = m_load.update();
-	auto const progress = load_status.progress();
-	m_loading_screen.update(dt, progress);
-
-	if (load_status.is_complete()) { on_loaded(); }
-}
-
-void LoadAssets::render(Shader& shader) const { m_loading_screen.draw(shader); }
+void LoadAssets::on_loaded() { get_switcher().switch_to<MenuScene>(); }
 } // namespace spaced
diff --git a/src/spaced/spaced/scenes/load_assets.hpp b/src/spaced/spaced/scenes/load_assets.hpp
index 95cc0c3..4a0f265 100644
--- a/src/spaced/spaced/scenes/load_assets.hpp
+++ b/src/spaced/spaced/scenes/load_assets.hpp
@@ -1,20 +1,13 @@
 #pragma once
-#include <spaced/async_exec.hpp>
-#include <spaced/scene.hpp>
-#include <spaced/ui/loading_screen.hpp>
+#include <bave/scene.hpp>
 
 namespace spaced {
-class LoadAssets : public Scene {
+class LoadAssets : public bave::Scene {
   public:
-	explicit LoadAssets(bave::App& app, Services const& services);
+	explicit LoadAssets(bave::App& app, bave::Services const& services);
 
   private:
-	void on_loaded();
-
-	void tick(bave::Seconds dt) final;
-	void render(bave::Shader& shader) const final;
-
-	ui::LoadingScreen m_loading_screen;
-	AsyncExec m_load;
+	auto build_load_stages() -> std::vector<bave::AsyncExec::Stage> final;
+	void on_loaded() final;
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/scenes/menu.cpp b/src/spaced/spaced/scenes/menu.cpp
index 650c229..d1d5d83 100644
--- a/src/spaced/spaced/scenes/menu.cpp
+++ b/src/spaced/spaced/scenes/menu.cpp
@@ -1,19 +1,22 @@
+#include <bave/services/resources.hpp>
+#include <bave/services/scene_switcher.hpp>
+#include <bave/ui/button.hpp>
+#include <bave/ui/dialog.hpp>
+#include <bave/ui/text.hpp>
 #include <spaced/prefs.hpp>
 #include <spaced/scenes/game.hpp>
 #include <spaced/scenes/menu.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/scene_switcher.hpp>
-#include <spaced/ui/button.hpp>
-#include <spaced/ui/dialog.hpp>
-#include <spaced/ui/text.hpp>
 #include <spaced/util.hpp>
 
 namespace spaced {
 using bave::App;
 using bave::Seconds;
+using bave::Services;
 using bave::TextHeight;
 
+namespace ui = bave::ui;
+
 auto MenuScene::get_text_heights() -> std::vector<TextHeight> { return {TextHeight{100}, TextHeight{60}, ui::Dialog::text_height_v}; }
 
 MenuScene::MenuScene(App& app, Services const& services) : Scene(app, services, "Home") { create_ui(); }
@@ -27,7 +30,7 @@ void MenuScene::create_ui() {
 	auto start = std::make_unique<ui::Button>(get_services());
 	start->set_text("start");
 	start->set_position({0.0f, -100.0f});
-	start->callback = [this]() { get_services().get<ISceneSwitcher>().switch_to<GameScene>(); };
+	start->callback = [this]() { get_switcher().switch_to<GameScene>(); };
 
 	auto options = std::make_unique<ui::Button>(get_services());
 	options->set_text("options");
diff --git a/src/spaced/spaced/scenes/menu.hpp b/src/spaced/spaced/scenes/menu.hpp
index bfc7694..ec5e437 100644
--- a/src/spaced/spaced/scenes/menu.hpp
+++ b/src/spaced/spaced/scenes/menu.hpp
@@ -1,12 +1,12 @@
 #pragma once
-#include <spaced/scene.hpp>
+#include <bave/scene.hpp>
 
 namespace spaced {
-class MenuScene : public Scene {
+class MenuScene : public bave::Scene {
   public:
 	static auto get_text_heights() -> std::vector<bave::TextHeight>;
 
-	explicit MenuScene(bave::App& app, Services const& services);
+	explicit MenuScene(bave::App& app, bave::Services const& services);
 
   private:
 	void create_ui();
diff --git a/src/spaced/spaced/services/audio.hpp b/src/spaced/spaced/services/audio.hpp
deleted file mode 100644
index abe1f90..0000000
--- a/src/spaced/spaced/services/audio.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-#include <bave/core/random.hpp>
-#include <bave/core/time.hpp>
-#include <spaced/services/service.hpp>
-#include <span>
-#include <string_view>
-
-namespace spaced {
-class IAudio : public IService {
-  public:
-	[[nodiscard]] virtual auto get_sfx_gain() const -> float = 0;
-	virtual void set_sfx_gain(float gain) = 0;
-
-	[[nodiscard]] virtual auto get_music_gain() const -> float = 0;
-	virtual void set_music_gain(float gain) = 0;
-
-	virtual void play_sfx(std::string_view uri) = 0;
-	virtual void play_music(std::string_view uri, bave::Seconds crossfade = 1s) = 0;
-	virtual void stop_music() = 0;
-
-	void play_any_sfx(std::span<std::string const> uris) {
-		if (uris.empty()) { return; }
-		if (uris.size() == 1) { return play_sfx(uris.front()); }
-		auto const index = bave::random_in_range(std::size_t{}, uris.size() - 1);
-		play_sfx(uris[index]);
-	}
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/gamepad_provider.hpp b/src/spaced/spaced/services/gamepad_provider.hpp
index 50e7711..11d9dde 100644
--- a/src/spaced/spaced/services/gamepad_provider.hpp
+++ b/src/spaced/spaced/services/gamepad_provider.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include <bave/input/gamepad.hpp>
-#include <spaced/services/service.hpp>
+#include <bave/services/service.hpp>
 
 namespace spaced {
-class IGamepadProvider : public IService {
+class IGamepadProvider : public bave::IService {
   public:
 	[[nodiscard]] virtual auto get_gamepad() const -> bave::Gamepad const& = 0;
 };
diff --git a/src/spaced/spaced/services/layout.hpp b/src/spaced/spaced/services/layout.hpp
index c33691a..61d8b69 100644
--- a/src/spaced/spaced/services/layout.hpp
+++ b/src/spaced/spaced/services/layout.hpp
@@ -1,20 +1,14 @@
 #pragma once
-#include <bave/graphics/render_view.hpp>
-#include <spaced/services/service.hpp>
+#include <bave/graphics/rect.hpp>
+#include <bave/services/service.hpp>
 
 namespace spaced {
-class ILayout : public IService {
-  public:
-	[[nodiscard]] virtual auto get_main_view() const -> bave::RenderView const& = 0;
-	[[nodiscard]] virtual auto get_framebuffer_size() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_world_space() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_play_area() const -> bave::Rect<> = 0;
-	[[nodiscard]] virtual auto get_hud_area() const -> bave::Rect<> = 0;
-	[[nodiscard]] virtual auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto unproject(glm::vec2 pointer) const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_player_x() const -> float = 0;
-	[[nodiscard]] virtual auto get_player_size() const -> glm::vec2 = 0;
+struct Layout : bave::IService {
+	glm::vec2 world_space{};
+	bave::Rect<> play_area{};
+	bave::Rect<> hud_area{};
 
-	virtual void set_framebuffer_size(glm::vec2 size) = 0;
+	float player_x{-700.0f};
+	glm::vec2 player_size{100.0f};
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/services/resources.hpp b/src/spaced/spaced/services/resources.hpp
deleted file mode 100644
index cdd9089..0000000
--- a/src/spaced/spaced/services/resources.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-#include <bave/font/font.hpp>
-#include <bave/graphics/texture.hpp>
-#include <spaced/resource_map.hpp>
-#include <spaced/services/service.hpp>
-#include <memory>
-
-namespace spaced {
-struct Resources : ResourceMap, IService {
-	std::shared_ptr<bave::Font> main_font{};
-	std::shared_ptr<bave::Texture> spinner{};
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/scene_switcher.hpp b/src/spaced/spaced/services/scene_switcher.hpp
deleted file mode 100644
index 3e26897..0000000
--- a/src/spaced/spaced/services/scene_switcher.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-#include <spaced/scene.hpp>
-#include <spaced/services/service.hpp>
-
-namespace spaced {
-class ISceneSwitcher : public IService {
-  public:
-	virtual void switch_to_scene(std::unique_ptr<Scene> new_scene) = 0;
-
-	template <std::derived_from<Scene> T, typename... Args>
-		requires(std::constructible_from<T, bave::App&, Services const&, Args && ...>)
-	void switch_to(Args&&... args) {
-		switch_to_scene(std::make_unique<T>(get_app(), get_services(), std::forward<Args>(args)...));
-	}
-
-  private:
-	[[nodiscard]] virtual auto get_app() const -> bave::App& = 0;
-	[[nodiscard]] virtual auto get_services() const -> Services const& = 0;
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/serializer.hpp b/src/spaced/spaced/services/serializer.hpp
index 206f12f..b636c7d 100644
--- a/src/spaced/spaced/services/serializer.hpp
+++ b/src/spaced/spaced/services/serializer.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include <bave/core/ptr.hpp>
 #include <bave/logger.hpp>
+#include <bave/services/service.hpp>
 #include <spaced/serializable.hpp>
-#include <spaced/services/service.hpp>
 #include <functional>
 #include <memory>
 #include <string_view>
@@ -13,7 +13,7 @@ namespace spaced {
 template <typename Type>
 concept SerializableT = std::derived_from<Type, ISerializable>;
 
-class Serializer : public IService {
+class Serializer : public bave::IService {
   public:
 	using Factory = std::function<std::unique_ptr<ISerializable>()>;
 
diff --git a/src/spaced/spaced/services/service.hpp b/src/spaced/spaced/services/service.hpp
deleted file mode 100644
index 653cd52..0000000
--- a/src/spaced/spaced/services/service.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-#include <bave/core/polymorphic.hpp>
-
-namespace spaced {
-/// \brief Base class for all services.
-class IService : public bave::Polymorphic {};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/services.hpp b/src/spaced/spaced/services/services.hpp
deleted file mode 100644
index 4c6b43f..0000000
--- a/src/spaced/spaced/services/services.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-#include <bave/core/not_null.hpp>
-#include <bave/core/ptr.hpp>
-#include <spaced/services/service.hpp>
-#include <memory>
-#include <mutex>
-#include <typeindex>
-#include <unordered_map>
-
-namespace spaced {
-/// \brief Concept constraining Type to a subclass of IService.
-template <typename Type>
-concept ServiceT = std::derived_from<Type, IService>;
-
-/// \brief Container of stored services.
-///
-/// Intended usage:
-/// 1. Own an instance in main / app Driver.
-/// 2. Bind services to subclasses. (From and To being the same type is also OK.)
-/// 3. Pass a const reference of Services to dependencies
-/// Point 3 ensures dependencies cannot bind new / remove existing services,
-/// but can locate and use already bound ones.
-class Services {
-  public:
-	/// \brief Bind a service instance to a type (From).
-	/// \param service Concrete instance of service to bind.
-	/// \pre service must not be null, From must not already be bound.
-	template <ServiceT From, std::derived_from<From> To>
-	void bind(std::unique_ptr<To> service) {
-		if (!service) { throw std::runtime_error{"Attempt to bind null service"}; }
-		static auto const index = std::type_index{typeid(From)};
-		auto lock = std::scoped_lock{m_mutex};
-		if (m_services.contains(index)) { throw std::runtime_error{"Attempt to bind duplicate service"}; }
-		m_services.insert_or_assign(index, std::move(service));
-	}
-
-	/// \brief Remove a bound service instance. Type need not actually be bound.
-	template <ServiceT Type>
-	void remove() {
-		static auto const index = std::type_index{typeid(Type)};
-		auto lock = std::scoped_lock{m_mutex};
-		m_services.erase(index);
-	}
-
-	/// \brief Remove all bound service instances.
-	void remove_all() {
-		auto lock = std::scoped_lock{m_mutex};
-		m_services.clear();
-	}
-
-	/// \brief Check if a service is bound.
-	/// \returns true if bound.
-	template <ServiceT Type>
-	[[nodiscard]] auto contains() const -> bool {
-		return find<Type>() != nullptr;
-	}
-
-	/// \brief Locate a service instance if bound.
-	/// \returns Pointer to service instance if bound, else nullptr.
-	template <ServiceT Type>
-	[[nodiscard]] auto find() const -> bave::Ptr<Type> {
-		static auto const index = std::type_index{typeid(Type)};
-		auto lock = std::scoped_lock{m_mutex};
-		if (auto const it = m_services.find(index); it != m_services.end()) { return static_cast<Type*>(it->second.get()); }
-		return {};
-	}
-
-	/// \brief Obtain a bound service.
-	/// \returns Mutable reference to bound service.
-	/// \pre Type must be bound.
-	template <ServiceT Type>
-	[[nodiscard]] auto get() const -> Type& {
-		auto ret = find<Type>();
-		if (!ret) { throw std::runtime_error{"Service not found"}; }
-		return *ret;
-	}
-
-	/// \brief Obtain the count of bound services.
-	/// \returns Count of bound services.
-	[[nodiscard]] auto size() const -> std::size_t {
-		auto lock = std::scoped_lock{m_mutex};
-		return m_services.size();
-	}
-
-  private:
-	std::unordered_map<std::type_index, std::unique_ptr<IService>> m_services{};
-	mutable std::mutex m_mutex{};
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/services/stats.hpp b/src/spaced/spaced/services/stats.hpp
index 682901f..ed4d037 100644
--- a/src/spaced/spaced/services/stats.hpp
+++ b/src/spaced/spaced/services/stats.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <spaced/services/service.hpp>
+#include <bave/services/service.hpp>
 #include <cstdint>
 
 namespace dj {
@@ -7,7 +7,7 @@ class Json;
 }
 
 namespace spaced {
-struct Stats : IService {
+struct Stats : bave::IService {
 	struct {
 		std::int64_t play_count{};
 	} game{};
diff --git a/src/spaced/spaced/services/styles.cpp b/src/spaced/spaced/services/styles.cpp
deleted file mode 100644
index f2065d9..0000000
--- a/src/spaced/spaced/services/styles.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <bave/io/json_io.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/util.hpp>
-
-namespace spaced {
-namespace {
-using bave::from_json;
-using bave::to_json;
-using util::from_json;
-using util::to_json;
-
-template <typename Type>
-void load_styles(StringMap<Type>& out, dj::Json const& json) {
-	for (auto const& [id, in_style] : json.object_view()) {
-		if (id.empty()) { continue; }
-		auto out_style = Type{};
-		from_json(in_style, out_style);
-		out.insert_or_assign(std::string{id}, out_style);
-	}
-}
-
-template <typename Type>
-void save_styles(StringMap<Type> const& styles, dj::Json& out, std::string_view const key) {
-	auto out_styles = dj::Json{};
-	for (auto const& [id, button_style] : styles) {
-		if (id.empty()) { continue; }
-		to_json(out_styles[id], button_style);
-	}
-	if (out_styles) { out[key] = std::move(out_styles); }
-}
-} // namespace
-
-auto Styles::load(dj::Json const& json) -> Styles {
-	auto ret = Styles{};
-	load_styles(ret.rgbas, json["rgbas"]);
-	load_styles(ret.buttons, json["buttons"]);
-	load_styles(ret.progress_bars, json["progress_bars"]);
-	load_styles(ret.dialogs, json["dialogs"]);
-	load_styles(ret.sliders, json["sliders"]);
-	if (auto const& loading_screen = json["loading_screen"]) { from_json(loading_screen, ret.loading_screen); }
-	return ret;
-}
-
-auto Styles::save() const -> dj::Json {
-	auto ret = dj::Json{};
-	save_styles(rgbas, ret, "rgbas");
-	save_styles(buttons, ret, "buttons");
-	save_styles(progress_bars, ret, "progress_bars");
-	save_styles(dialogs, ret, "dialogs");
-	save_styles(sliders, ret, "sliders");
-	to_json(ret["loading_screen"], loading_screen);
-	return ret;
-}
-} // namespace spaced
diff --git a/src/spaced/spaced/services/styles.hpp b/src/spaced/spaced/services/styles.hpp
deleted file mode 100644
index 32a8d8a..0000000
--- a/src/spaced/spaced/services/styles.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-#include <spaced/services/service.hpp>
-#include <spaced/string_map.hpp>
-#include <spaced/ui/style.hpp>
-
-namespace dj {
-class Json;
-}
-
-namespace spaced {
-struct Styles : IService {
-	StringMap<bave::Rgba> rgbas{};
-	StringMap<ui::ButtonStyle> buttons{};
-	StringMap<ui::ProgressBarStyle> progress_bars{};
-	StringMap<ui::DialogStyle> dialogs{};
-	StringMap<ui::SliderStyle> sliders{};
-	ui::LoadingScreenStyle loading_screen{};
-
-	static auto load(dj::Json const& json) -> Styles;
-
-	[[nodiscard]] auto save() const -> dj::Json;
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/spaced.cpp b/src/spaced/spaced/spaced.cpp
index 21ddd17..7db77e3 100644
--- a/src/spaced/spaced/spaced.cpp
+++ b/src/spaced/spaced/spaced.cpp
@@ -2,16 +2,15 @@
 #include <bave/io/json_io.hpp>
 #include <bave/loader.hpp>
 #include <bave/persistor.hpp>
+#include <bave/services/audio.hpp>
+#include <bave/services/resources.hpp>
+#include <bave/services/styles.hpp>
 #include <spaced/prefs.hpp>
 #include <spaced/scenes/load_assets.hpp>
-#include <spaced/services/audio.hpp>
 #include <spaced/services/gamepad_provider.hpp>
 #include <spaced/services/layout.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/scene_switcher.hpp>
 #include <spaced/services/serializer.hpp>
 #include <spaced/services/stats.hpp>
-#include <spaced/services/styles.hpp>
 #include <spaced/spaced.hpp>
 
 namespace spaced {
@@ -21,17 +20,17 @@ using bave::AudioClip;
 using bave::AudioDevice;
 using bave::AudioStreamer;
 using bave::Gamepad;
-using bave::KeyInput;
+using bave::IAudio;
+using bave::IDisplay;
 using bave::Loader;
-using bave::MouseScroll;
 using bave::NotNull;
 using bave::Persistor;
-using bave::PointerMove;
-using bave::PointerTap;
 using bave::Rect;
 using bave::RenderDevice;
 using bave::RenderView;
+using bave::Resources;
 using bave::Seconds;
+using bave::Styles;
 
 struct GamepadProvider : IGamepadProvider {
 	bave::App& app; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
@@ -41,63 +40,6 @@ struct GamepadProvider : IGamepadProvider {
 	[[nodiscard]] auto get_gamepad() const -> Gamepad const& final { return app.get_most_recent_gamepad(); }
 };
 
-struct Layout : ILayout {
-	NotNull<RenderDevice const*> render_device;
-	RenderView main_view{};
-	glm::vec2 framebuffer_size{};
-	Rect<> play_area{};
-	Rect<> hud_area{};
-
-	explicit Layout(NotNull<RenderDevice const*> render_device) : render_device(render_device) {}
-
-	[[nodiscard]] auto get_main_view() const -> RenderView const& final { return main_view; }
-	[[nodiscard]] auto get_framebuffer_size() const -> glm::vec2 final { return framebuffer_size; }
-	[[nodiscard]] auto get_world_space() const -> glm::vec2 final { return main_view.viewport; }
-	[[nodiscard]] auto get_play_area() const -> bave::Rect<> final { return play_area; }
-	[[nodiscard]] auto get_hud_area() const -> bave::Rect<> final { return hud_area; }
-
-	[[nodiscard]] auto project_to_world(glm::vec2 fb_point) const -> glm::vec2 final { return render_device->project_to(get_world_space(), fb_point); }
-
-	[[nodiscard]] auto unproject(glm::vec2 const pointer) const -> glm::vec2 final {
-		if (!bave::is_positive(framebuffer_size)) { return pointer; }
-		return main_view.unproject(pointer / framebuffer_size);
-	}
-
-	[[nodiscard]] auto get_player_x() const -> float final { return -700.0f; }
-	[[nodiscard]] auto get_player_size() const -> glm::vec2 final { return glm::vec2{100.0f}; }
-
-	void set_framebuffer_size(glm::vec2 const size) final { framebuffer_size = size; }
-};
-
-struct Audio : IAudio {
-	NotNull<AudioDevice*> audio_device;
-	NotNull<AudioStreamer*> audio_streamer;
-	NotNull<Resources const*> resources;
-
-	explicit Audio(NotNull<AudioDevice*> audio_device, NotNull<AudioStreamer*> audio_streamer, NotNull<Resources const*> resources)
-		: audio_device(audio_device), audio_streamer(audio_streamer), resources(resources) {}
-
-	[[nodiscard]] auto get_sfx_gain() const -> float final { return audio_device->sfx_gain; }
-	void set_sfx_gain(float const gain) final { audio_device->sfx_gain = gain; }
-
-	[[nodiscard]] auto get_music_gain() const -> float final { return audio_streamer->gain; }
-	void set_music_gain(float const gain) final { audio_streamer->gain = gain; }
-
-	void play_sfx(std::string_view const uri) final {
-		auto const clip = resources->get<AudioClip>(uri);
-		if (!clip) { return; }
-		audio_device->play_once(*clip);
-	}
-
-	void play_music(std::string_view const uri, Seconds const crossfade) final {
-		auto const clip = resources->get<AudioClip>(uri);
-		if (!clip) { return; }
-		audio_streamer->play(clip, crossfade);
-	}
-
-	void stop_music() final { audio_streamer->stop(); }
-};
-
 struct PersistentStats : Stats {
 	static constexpr std::string_view uri_v{"spaced/stats.json"};
 
@@ -124,22 +66,9 @@ struct PersistentStats : Stats {
 };
 } // namespace
 
-struct SceneSwitcher : ISceneSwitcher {
-	App& app;				  // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
-	Services const& services; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
-	std::unique_ptr<Scene> next_scene{};
-
-	explicit SceneSwitcher(App& app, Services const& services) : app(app), services(services) {}
-
-	void switch_to_scene(std::unique_ptr<Scene> new_scene) final { next_scene = std::move(new_scene); }
-
-	[[nodiscard]] auto get_app() const -> App& final { return app; }
-	[[nodiscard]] auto get_services() const -> Services const& final { return services; }
-};
-
 void Spaced::set_bindings([[maybe_unused]] Serializer& serializer) {}
 
-Spaced::Spaced(App& app) : Driver(app), m_scene(std::make_unique<Scene>(app, m_services)) {
+Spaced::Spaced(App& app) : GameDriver(app) {
 	m_log.info("using MSAA: {}x", static_cast<int>(app.get_render_device().get_sample_count()));
 	load_resources();
 	set_layout();
@@ -148,39 +77,11 @@ Spaced::Spaced(App& app) : Driver(app), m_scene(std::make_unique<Scene>(app, m_s
 	set_scene();
 }
 
-void Spaced::on_focus(bave::FocusChange const& focus_change) { m_scene->on_focus_event(focus_change); }
-
-void Spaced::on_key(KeyInput const& key_input) { m_scene->on_key_event(key_input); }
-
-void Spaced::on_move(PointerMove const& pointer_move) { m_scene->on_move_event(pointer_move); }
-
-void Spaced::on_tap(PointerTap const& pointer_tap) { m_scene->on_tap_event(pointer_tap); }
-
-void Spaced::on_scroll(MouseScroll const& mouse_scroll) { m_scene->on_scroll_event(mouse_scroll); }
-
-void Spaced::tick() {
-	auto const dt = get_app().get_dt();
-	m_layout->set_framebuffer_size(get_app().get_framebuffer_size());
-
-	if (m_scene_switcher->next_scene) {
-		switch_track(m_scene->get_music_uri(), m_scene_switcher->next_scene->get_music_uri());
-		m_scene = std::move(m_scene_switcher->next_scene);
-	}
-
-	m_scene->tick_frame(dt);
-
-	clear_colour = m_scene->clear_colour;
-}
-
-void Spaced::render() const { m_scene->render_frame(); }
-
 void Spaced::load_resources() {
 	auto const loader = Loader{&get_app().get_data_store(), &get_app().get_render_device()};
-	auto resources = std::make_unique<Resources>();
-	resources->main_font = loader.load_font("fonts/hesitation.regular.ttf");
-	resources->spinner = loader.load_texture("images/spinner.png", true);
-	m_resources = resources.get();
-	m_services.bind<Resources>(std::move(resources));
+	m_resources = &m_services.get<Resources>();
+	m_resources->main_font = loader.load_font("fonts/CuteDino.otf");
+	m_resources->spinner = loader.load_texture("images/spinner.png", true);
 
 	auto styles = std::make_unique<Styles>();
 	if (auto const json = loader.load_json("styles.json")) {
@@ -198,22 +99,6 @@ void Spaced::load_resources() {
 	m_services.bind<Styles>(std::move(styles));
 }
 
-void Spaced::set_layout() {
-	auto const& app = get_app();
-	auto layout = std::make_unique<Layout>(&app.get_render_device());
-	m_layout = layout.get();
-	layout->main_view = app.get_render_device().get_default_view();
-	layout->main_view.viewport = app.get_render_device().get_viewport_scaler().match_height({1920.0f, 1080.0f});
-	layout->framebuffer_size = app.get_framebuffer_size();
-	auto const hud_size = glm::vec2{layout->main_view.viewport.x, 100.0f};
-	auto const hud_origin = glm::vec2{0.0f, 0.5f * (layout->main_view.viewport.y - hud_size.y)};
-	layout->hud_area = Rect<>::from_size(hud_size, hud_origin);
-	auto const play_size = glm::vec2{hud_size.x, layout->main_view.viewport.y - hud_size.y};
-	auto const play_origin = glm::vec2{0.0f, -0.5f * (layout->main_view.viewport.y - play_size.y)};
-	layout->play_area = Rect<>::from_size(play_size, play_origin);
-	m_services.bind<ILayout>(std::move(layout));
-}
-
 void Spaced::create_services() {
 	auto serializer = std::make_unique<Serializer>();
 	set_bindings(*serializer);
@@ -221,33 +106,31 @@ void Spaced::create_services() {
 
 	m_services.bind<IGamepadProvider>(std::make_unique<GamepadProvider>(get_app()));
 
-	auto audio = std::make_unique<Audio>(&get_app().get_audio_device(), &get_app().get_audio_streamer(), m_resources);
-	m_audio = audio.get();
-	m_services.bind<IAudio>(std::move(audio));
-
 	auto stats = std::make_unique<PersistentStats>(&get_app());
 	++stats->run_count;
 	m_services.bind<Stats>(std::move(stats));
 }
 
-void Spaced::set_prefs() {
-	auto const prefs = Prefs::load(get_app());
-	m_audio->set_music_gain(prefs.music_gain);
-	m_audio->set_sfx_gain(prefs.sfx_gain);
+void Spaced::set_layout() {
+	auto game_layout = std::make_unique<Layout>();
+	auto const& display = m_services.get<IDisplay>();
+	game_layout->world_space = display.get_world_space();
+	auto const viewport = display.get_main_view().viewport;
+	auto const hud_size = glm::vec2{viewport.x, 100.0f};
+	auto const hud_origin = glm::vec2{0.0f, 0.5f * (viewport.y - hud_size.y)};
+	game_layout->hud_area = Rect<>::from_size(hud_size, hud_origin);
+	auto const play_size = glm::vec2{hud_size.x, viewport.y - hud_size.y};
+	auto const play_origin = glm::vec2{0.0f, -0.5f * (viewport.y - play_size.y)};
+	game_layout->play_area = Rect<>::from_size(play_size, play_origin);
+	m_services.bind<Layout>(std::move(game_layout));
 }
 
-void Spaced::set_scene() {
-	auto switcher = std::make_unique<SceneSwitcher>(get_app(), m_services);
-	m_scene_switcher = switcher.get();
-	switcher->switch_to<LoadAssets>();
-	m_services.bind<ISceneSwitcher>(std::move(switcher));
+void Spaced::set_prefs() {
+	auto const prefs = Prefs::load(get_app());
+	auto& audio = m_services.get<IAudio>();
+	audio.set_music_gain(prefs.music_gain);
+	audio.set_sfx_gain(prefs.sfx_gain);
 }
 
-void Spaced::switch_track(std::string_view const from, std::string_view const to) const {
-	if (to.empty()) {
-		m_audio->stop_music();
-	} else if (from != to) {
-		m_audio->play_music(to);
-	}
-}
+void Spaced::set_scene() { get_switcher().switch_to<LoadAssets>(); }
 } // namespace spaced
diff --git a/src/spaced/spaced/spaced.hpp b/src/spaced/spaced/spaced.hpp
index 42de8b9..e534ef8 100644
--- a/src/spaced/spaced/spaced.hpp
+++ b/src/spaced/spaced/spaced.hpp
@@ -1,44 +1,29 @@
 #pragma once
 #include <bave/driver.hpp>
-#include <spaced/scene.hpp>
-#include <spaced/services/services.hpp>
+#include <bave/game_driver.hpp>
+
+namespace bave {
+struct Resources;
+}
 
 namespace spaced {
 class Serializer;
-struct Resources;
-class IAudio;
 struct SceneSwitcher;
 
-class Spaced : public bave::Driver {
+class Spaced : public bave::GameDriver {
   public:
 	explicit Spaced(bave::App& app);
 
   private:
 	static void set_bindings(Serializer& serializer);
 
-	void on_focus(bave::FocusChange const& focus_change) final;
-	void on_key(bave::KeyInput const& key_input) final;
-	void on_move(bave::PointerMove const& pointer_move) final;
-	void on_tap(bave::PointerTap const& pointer_tap) final;
-	void on_scroll(bave::MouseScroll const& mouse_scroll) final;
-
-	void tick() final;
-	void render() const final;
-
 	void load_resources();
 	void create_services();
 	void set_layout();
 	void set_prefs();
 	void set_scene();
 
-	void switch_track(std::string_view from, std::string_view to) const;
-
 	bave::Logger m_log{"Spaced"};
-	Services m_services{};
-	bave::Ptr<ILayout> m_layout{};
-	bave::Ptr<SceneSwitcher> m_scene_switcher{};
-	bave::Ptr<Resources> m_resources{};
-	bave::Ptr<IAudio> m_audio{};
-	std::unique_ptr<Scene> m_scene{};
+	bave::Ptr<bave::Resources> m_resources{};
 };
 } // namespace spaced
diff --git a/src/spaced/spaced/string_map.hpp b/src/spaced/spaced/string_map.hpp
deleted file mode 100644
index 079af0e..0000000
--- a/src/spaced/spaced/string_map.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-#include <bave/core/string_hash.hpp>
-#include <unordered_map>
-
-namespace spaced {
-template <typename ValueType>
-class StringMap : public std::unordered_map<std::string, ValueType, bave::StringHash, std::equal_to<>> {
-  public:
-	[[nodiscard]] auto get_or(std::string_view const key, ValueType const& fallback) const -> ValueType {
-		if (auto const it = this->find(key); it != this->end()) { return it->second; }
-		return fallback;
-	}
-
-	[[nodiscard]] auto get(std::string_view const key) const -> ValueType
-		requires(std::is_default_constructible_v<ValueType>)
-	{
-		return get_or(key, ValueType{});
-	}
-
-	[[nodiscard]] auto operator[](std::string_view const key) const -> ValueType
-		requires(std::is_default_constructible_v<ValueType>)
-	{
-		return get(key);
-	}
-};
-} // namespace spaced
diff --git a/src/spaced/spaced/ui/button.cpp b/src/spaced/spaced/ui/button.cpp
deleted file mode 100644
index 74da866..0000000
--- a/src/spaced/spaced/ui/button.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <spaced/services/layout.hpp>
-#include <spaced/services/resources.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/button.hpp>
-#include <algorithm>
-
-namespace spaced::ui {
-using bave::Action;
-using bave::MouseButton;
-using bave::PointerId;
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::RoundedQuad;
-using bave::Seconds;
-using bave::Shader;
-using bave::TextHeight;
-
-Button::Button(Services const& services) : m_layout(&services.get<ILayout>()), m_styles(&services.get<Styles>()) {
-	m_text.set_font(services.get<Resources>().main_font);
-	set_text_height(TextHeight::eDefault);
-	set_style(m_styles->buttons["default"]);
-}
-
-void Button::set_position(glm::vec2 const position) {
-	m_background.set_position(position);
-	m_text.transform.position = position;
-	reposition_text();
-}
-
-void Button::set_scale(glm::vec2 const scale) {
-	m_background.set_scale(scale);
-	m_text.transform.scale = scale;
-}
-
-void Button::set_font(std::shared_ptr<bave::Font> font) {
-	m_text.set_font(std::move(font));
-	resize_background();
-}
-
-void Button::set_text(std::string text, bool const resize) {
-	m_text.set_string(std::move(text));
-	if (resize) { resize_background(); }
-}
-
-void Button::set_text_height(TextHeight const height, bool const resize) {
-	m_text.set_height(height);
-	if (resize) { resize_background(); }
-	reposition_text();
-}
-
-void Button::set_size(glm::vec2 const size) {
-	auto const ratio = std::clamp(m_style.corner_ratio, 0.0f, 0.5f);
-	auto quad = RoundedQuad{};
-	quad.size = glm::max(size, min_size_v);
-	quad.corner_resolution = 16;
-	m_background.set_size(glm::max(size, min_size_v));
-	m_background.set_corner_resolution(16);
-	m_background.set_corner_ratio(ratio);
-	m_background.set_outline_width(m_style.outline_width);
-}
-
-void Button::set_style(Style const& style) {
-	m_style = style;
-	resize_background();
-}
-
-void Button::on_move(PointerMove const& pointer_move) {
-	if (pointer_move.pointer.id != PointerId::ePrimary) { return; }
-	auto const position = m_layout->unproject(pointer_move.pointer.position);
-	if (m_hitbox.contains(position)) {
-		m_state = State::eHover;
-	} else {
-		m_state = State::eIdle;
-	}
-}
-
-void Button::on_tap(PointerTap const& pointer_tap) {
-	if (pointer_tap.pointer.id != PointerId::ePrimary || pointer_tap.button != MouseButton::eLeft) { return; }
-
-	auto const position = m_layout->unproject(pointer_tap.pointer.position);
-	if (!m_hitbox.contains(position)) {
-		m_state = State::eIdle;
-		return;
-	}
-
-	if (pointer_tap.action == Action::ePress) {
-		m_state = State::ePress;
-		return;
-	}
-
-	if (pointer_tap.action == Action::eRelease) {
-		m_state = State::eHover;
-		if (callback) { callback(); }
-	}
-}
-
-void Button::tick(Seconds const /*dt*/) {
-	m_hitbox = m_background.get_background().get_bounds();
-
-	m_background.set_outline_tint(m_style.outline[m_state]);
-	m_background.set_tint(m_style.background[m_state]);
-	m_text.tint = m_style.text[m_state];
-}
-
-void Button::draw(Shader& shader) const {
-	m_background.draw(shader);
-	m_text.draw(shader);
-}
-
-void Button::resize_background() { set_size(glm::vec2{1.2f, 2.5f} * m_text.get_bounds().size()); }
-
-void Button::reposition_text() { m_text.transform.position.y -= 0.33f * static_cast<float>(m_text.get_height()); }
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/button.hpp b/src/spaced/spaced/ui/button.hpp
deleted file mode 100644
index 1eb771a..0000000
--- a/src/spaced/spaced/ui/button.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-#include <bave/graphics/text.hpp>
-#include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/style.hpp>
-#include <spaced/ui/widget.hpp>
-#include <functional>
-
-namespace spaced::ui {
-class Button : public IWidget {
-  public:
-	using State = ButtonState;
-	using Style = ButtonStyle;
-
-	static constexpr auto min_size_v = glm::vec2{200.0f, 50.0f};
-
-	explicit Button(Services const& services);
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 final { return m_background.get_size(); }
-	void set_position(glm::vec2 position) final;
-	[[nodiscard]] auto get_position() const -> glm::vec2 final { return m_background.get_position(); }
-
-	void set_scale(glm::vec2 scale);
-	void set_font(std::shared_ptr<bave::Font> font);
-	void set_text(std::string text, bool resize = true);
-	void set_text_height(bave::TextHeight height, bool resize = true);
-	void set_size(glm::vec2 size);
-
-	[[nodiscard]] auto get_style() const -> Style { return m_style; }
-	void set_style(Style const& style);
-
-	[[nodiscard]] auto get_scale() const -> glm::vec2 { return m_background.get_background().transform.scale; }
-	[[nodiscard]] auto get_text() const -> std::string_view { return m_text.get_string(); }
-
-	[[nodiscard]] auto get_state() const -> State { return m_state; }
-
-	std::function<void()> callback{};
-
-  private:
-	void on_move(bave::PointerMove const& pointer_move) final;
-	void on_tap(bave::PointerTap const& pointer_tap) final;
-	void tick(bave::Seconds dt) final;
-	void draw(bave::Shader& shader) const final;
-
-	void resize_background();
-	void reposition_text();
-
-	bave::NotNull<ILayout const*> m_layout;
-	bave::NotNull<Styles const*> m_styles;
-
-	OutlineQuad m_background{};
-	bave::Text m_text{};
-
-	State m_state{};
-	Style m_style{};
-	bave::Rect<> m_hitbox{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/dialog.cpp b/src/spaced/spaced/ui/dialog.cpp
deleted file mode 100644
index 75c445b..0000000
--- a/src/spaced/spaced/ui/dialog.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/dialog.hpp>
-
-namespace spaced::ui {
-Dialog::Dialog(Services const& services, CreateInfo create_info) : View(services), m_style(services.get<Styles>().dialogs["default"]) {
-	auto main_button = std::make_unique<Button>(services);
-	auto const footer_height = main_button->get_size().y + m_style.footer_padding.y;
-	auto const footer_position = glm::vec2{0.0f, -0.5f * (create_info.size.y - footer_height)};
-
-	auto background = std::make_unique<OutlineQuad>();
-	background->set_size({create_info.size.x, create_info.size.y + footer_height});
-	background->set_tint(m_style.background_tint);
-	background->set_outline_tint(m_style.outline_tint);
-	background->set_corner_ratio(0.25f);
-	push(std::move(background));
-
-	auto content_text = std::make_unique<Text>(services);
-	content_text->text.set_string(std::move(create_info.content_text));
-	content_text->text.set_height(text_height_v);
-	content_text->text.tint = m_style.content_text_tint;
-	push(std::move(content_text));
-
-	main_button->set_text(std::move(create_info.main_button.text));
-	main_button->callback = [this, f = std::move(create_info.main_button.callback)] {
-		if (f) { f(); }
-		set_destroyed();
-	};
-	if (create_info.second_button.text.empty()) {
-		main_button->set_position(footer_position);
-	} else {
-		auto const x_offset = -0.5f * (create_info.size.x - main_button->get_size().x) + m_style.footer_padding.x;
-		main_button->set_position({footer_position.x + x_offset, footer_position.y});
-	}
-	push(std::move(main_button));
-
-	if (!create_info.second_button.text.empty()) {
-		auto second_button = std::make_unique<Button>(services);
-		second_button->set_text(std::move(create_info.second_button.text));
-		second_button->callback = [this, f = std::move(create_info.second_button.callback)] {
-			if (f) { f(); }
-			set_destroyed();
-		};
-		auto const x_offset = 0.5f * (create_info.size.x - second_button->get_size().x) - m_style.footer_padding.x;
-		second_button->set_position({footer_position.x + x_offset, footer_position.y});
-		push(std::move(second_button));
-	}
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/dialog.hpp b/src/spaced/spaced/ui/dialog.hpp
deleted file mode 100644
index 72d0533..0000000
--- a/src/spaced/spaced/ui/dialog.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-#include <spaced/ui/button.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/text.hpp>
-#include <spaced/ui/view.hpp>
-
-namespace spaced::ui {
-struct DialogCreateInfo {
-	struct ButtonInfo {
-		std::string text{};
-		std::function<void()> callback{};
-	};
-
-	glm::vec2 size{500.0f, 200.0f};
-	std::string content_text{"Content text."};
-	ButtonInfo main_button{.text = "OK"};
-	ButtonInfo second_button{};
-};
-
-class Dialog : public ui::View {
-  public:
-	using CreateInfo = DialogCreateInfo;
-
-	static constexpr auto text_height_v = bave::TextHeight{static_cast<int>(bave::TextHeight::eDefault) + 16};
-
-	explicit Dialog(Services const& services, CreateInfo create_info = {});
-
-  protected:
-	DialogStyle m_style{};
-
-	bave::Ptr<OutlineQuad> m_background{};
-	bave::Ptr<Text> m_content_text{};
-	std::array<bave::Ptr<ui::Button>, 2> m_footer_buttons{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/element.hpp b/src/spaced/spaced/ui/element.hpp
deleted file mode 100644
index c6fd879..0000000
--- a/src/spaced/spaced/ui/element.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-#include <bave/graphics/drawable.hpp>
-
-namespace spaced::ui {
-class IElement : public bave::IDrawable {
-  public:
-	[[nodiscard]] virtual auto get_size() const -> glm::vec2 = 0;
-	[[nodiscard]] virtual auto get_position() const -> glm::vec2 = 0;
-	virtual void set_position(glm::vec2 position) = 0;
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/list_box.hpp b/src/spaced/spaced/ui/list_box.hpp
deleted file mode 100644
index 259848d..0000000
--- a/src/spaced/spaced/ui/list_box.hpp
+++ /dev/null
@@ -1,201 +0,0 @@
-#pragma once
-#include <bave/graphics/drawable.hpp>
-#include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/widget.hpp>
-
-namespace spaced::ui {
-enum class ListBoxDir : int { eHorz, eVert };
-
-template <std::derived_from<IElement> Type>
-class ListBox : public IWidget {
-  public:
-	using Dir = ListBoxDir;
-
-	explicit ListBox(Services const& services, Dir dir = Dir::eHorz) : m_layout(&services.get<ILayout>()), m_dir(dir) {}
-
-	void push_back(Type item) {
-		m_items.push_back(std::move(item));
-		switch (m_dir) {
-		case Dir::eHorz: rearrange_horz(); break;
-		case Dir::eVert: rearrange_vert(); break;
-		}
-	}
-
-	void clear() { m_items.clear(); }
-
-	void shift_items(glm::vec2 delta) {
-		if (m_items.empty()) { return; }
-		switch (m_dir) {
-		default:
-		case Dir::eHorz: delta.y = 0.0f; break;
-		case Dir::eVert: delta.x = 0.0f; break;
-		}
-		delta = glm::clamp(delta, get_min_delta(), get_max_delta());
-		for (auto& item : m_items) { item.set_position(item.get_position() + delta); }
-	}
-
-	[[nodiscard]] auto get_items() const -> std::span<Type const> { return m_items; }
-	[[nodiscard]] auto get_items() -> std::span<Type> { return m_items; }
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 override { return background.get_size(); }
-	[[nodiscard]] auto get_position() const -> glm::vec2 override { return m_position; }
-
-	void set_position(glm::vec2 const position) override {
-		auto const delta = position - m_position;
-		background.set_position(position);
-		for (auto& item : m_items) { item.set_position(item.get_position() + delta); }
-		m_position = position;
-	}
-
-	void on_move(bave::PointerMove const& pointer_move) override {
-		if (m_drag_pos) {
-			auto const delta = pointer_move.pointer.position - *m_drag_pos;
-			shift_items(m_layout->project_to_world(delta));
-			m_drag_pos = pointer_move.pointer.position;
-			m_dragging = true;
-			return;
-		}
-		if constexpr (std::derived_from<Type, IWidget>) {
-			for (auto& item : m_items) { item.on_move(pointer_move); }
-		}
-	}
-
-	void on_tap(bave::PointerTap const& pointer_tap) override {
-		auto was_dragging = m_dragging;
-		if (pointer_tap.pointer.id == bave::PointerId::ePrimary && pointer_tap.button == bave::MouseButton::eLeft) {
-			switch (pointer_tap.action) {
-			case bave::Action::ePress: {
-				if (background.get_background().get_bounds().contains(m_layout->unproject(pointer_tap.pointer.position))) {
-					m_drag_pos = pointer_tap.pointer.position;
-				}
-				break;
-			}
-			case bave::Action::eRelease: {
-				m_drag_pos.reset();
-				m_dragging = false;
-				break;
-			}
-			default: break;
-			}
-		}
-		if (was_dragging) { return; }
-		if constexpr (std::derived_from<Type, IWidget>) {
-			for (auto& item : m_items) { item.on_tap(pointer_tap); }
-		}
-	}
-
-	void tick(bave::Seconds dt) override {
-		if constexpr (std::derived_from<Type, IWidget>) {
-			for (auto& item : m_items) { item.tick(dt); }
-		}
-	}
-
-	void draw(bave::Shader& shader) const override {
-		background.draw(shader);
-		auto const& collect_bg = background.get_background();
-		auto const collect_rect = bave::Rect<>::from_size(collect_bg.get_shape().size, collect_bg.transform.position);
-		auto render_view = m_layout->get_main_view();
-		render_view.n_scissor = render_view.to_n_scissor(collect_rect);
-		shader.set_render_view(render_view);
-		for (auto const& item : m_items) { item.draw(shader); }
-		render_view.n_scissor = bave::uv_rect_v;
-		shader.set_render_view(render_view);
-	}
-
-	OutlineQuad background{};
-	float item_pad{100.0f};
-
-  protected:
-	[[nodiscard]] auto get_min_delta() const -> glm::vec2 {
-		switch (m_dir) {
-		default:
-		case Dir::eHorz: return m_position - m_items.back().get_position();
-		case Dir::eVert: return m_position - m_items.front().get_position();
-		}
-	}
-
-	[[nodiscard]] auto get_max_delta() const -> glm::vec2 {
-		switch (m_dir) {
-		default:
-		case Dir::eHorz: return m_position - m_items.front().get_position();
-		case Dir::eVert: return m_position - m_items.back().get_position();
-		}
-	}
-
-	void rearrange_horz() {
-		if (m_items.size() == 1) {
-			m_items.front().set_position(background.get_position());
-			return;
-		}
-
-		auto const items_width = [&] {
-			auto ret = float{};
-			auto first = true;
-			for (auto const& item : m_items) {
-				ret += item.get_size().x;
-				if (!first) { ret += item_pad; }
-				first = false;
-			}
-			return ret;
-		}();
-		auto const bg_width = background.get_size().x;
-
-		auto pos = background.get_position();
-		pos.x += -0.5f * bg_width;
-		for (auto& item : m_items) {
-			auto const half_width = 0.5f * item.get_size().x;
-			pos.x += half_width;
-			item.set_position(pos);
-			pos.x += half_width + item_pad;
-		}
-		if (items_width > bg_width) {
-			shift_items({item_pad, 0.0f});
-		} else {
-			shift_items({0.5f * (bg_width - items_width), 0.0f});
-		}
-	}
-
-	void rearrange_vert() {
-		if (m_items.size() == 1) {
-			m_items.front().set_position(background.get_position());
-			return;
-		}
-
-		auto const items_height = [&] {
-			auto ret = float{};
-			auto first = true;
-			for (auto const& item : m_items) {
-				ret += item.get_size().y;
-				if (!first) { ret += item_pad; }
-				first = false;
-			}
-			return ret;
-		}();
-		auto const bg_height = background.get_size().y;
-
-		auto pos = background.get_position();
-		pos.y += 0.5f * bg_height;
-		for (auto& item : m_items) {
-			auto const half_height = 0.5f * item.get_size().y;
-			pos.y -= half_height;
-			item.set_position(pos);
-			pos.y -= half_height + item_pad;
-		}
-		if (items_height > bg_height) {
-			shift_items({0.0f, -item_pad});
-		} else {
-			shift_items({0.0f, -0.5f * (bg_height - items_height)});
-		}
-	}
-
-	bave::NotNull<ILayout const*> m_layout;
-	Dir m_dir;
-
-	std::vector<Type> m_items{};
-	glm::vec2 m_position{};
-	std::optional<glm::vec2> m_drag_pos{};
-	bool m_dragging{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/loading_screen.cpp b/src/spaced/spaced/ui/loading_screen.cpp
deleted file mode 100644
index 4bda201..0000000
--- a/src/spaced/spaced/ui/loading_screen.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <spaced/services/resources.hpp>
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/loading_screen.hpp>
-
-namespace spaced::ui {
-using bave::Seconds;
-using bave::Shader;
-
-LoadingScreen::LoadingScreen(Services const& services)
-	: m_layout(&services.get<ILayout>()), m_style(services.get<Styles>().loading_screen), m_progress_bar(services) {
-	auto const world_space = m_layout->get_world_space();
-
-	m_background.set_size(1.1f * world_space);
-	m_background.tint = m_style.background_tint;
-
-	m_spinner.set_size(m_style.spinner.size);
-	m_spinner.set_texture(services.get<Resources>().spinner);
-
-	m_progress_bar.size = {m_style.progress_bar.n_width * world_space.x, m_style.progress_bar.height};
-	m_progress_bar.position.y = -0.5f * world_space.y + m_style.progress_bar.bottom_offset;
-	auto style = m_progress_bar.get_style();
-	style.padding = m_style.progress_bar.padding;
-	m_progress_bar.set_style(style);
-}
-
-void LoadingScreen::update(Seconds const dt, float const progress) {
-	m_progress_bar.set_progress(progress);
-
-	bave::Degrees rotation = m_spinner.transform.rotation;
-	rotation.value -= m_style.spinner.spin_rate.value * dt.count();
-	m_spinner.transform.rotation = rotation;
-}
-
-void LoadingScreen::draw(Shader& shader) const {
-	shader.set_render_view(m_layout->get_main_view());
-	m_background.draw(shader);
-	m_spinner.draw(shader);
-	m_progress_bar.draw(shader);
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/loading_screen.hpp b/src/spaced/spaced/ui/loading_screen.hpp
deleted file mode 100644
index 9a1267e..0000000
--- a/src/spaced/spaced/ui/loading_screen.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-#include <bave/core/time.hpp>
-#include <bave/graphics/sprite.hpp>
-#include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/progress_bar.hpp>
-
-namespace spaced::ui {
-class LoadingScreen {
-  public:
-	explicit LoadingScreen(Services const& services);
-
-	void update(bave::Seconds dt, float progress);
-	void draw(bave::Shader& shader) const;
-
-  private:
-	bave::NotNull<ILayout const*> m_layout;
-	LoadingScreenStyle m_style{};
-	bave::Sprite m_background{};
-	bave::Sprite m_spinner{};
-	ProgressBar m_progress_bar;
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/outline_quad.cpp b/src/spaced/spaced/ui/outline_quad.cpp
deleted file mode 100644
index dae00bc..0000000
--- a/src/spaced/spaced/ui/outline_quad.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <spaced/ui/outline_quad.hpp>
-
-namespace spaced::ui {
-using bave::Rgba;
-using bave::RoundedQuad;
-using bave::Shader;
-
-void OutlineQuad::draw(Shader& shader) const {
-	m_outline.draw(shader);
-	m_quad.draw(shader);
-}
-
-void OutlineQuad::set_size(glm::vec2 const size) {
-	set_quad_and_outline([size, this](RoundedQuad& quad, RoundedQuad& outline) {
-		quad.size = size;
-		quad.corner_radius = m_corner_ratio * std::min(quad.size.x, quad.size.y);
-		outline.size = size + m_outline_width;
-		outline.corner_radius = m_corner_ratio * std::min(outline.size.x, outline.size.y);
-	});
-}
-
-void OutlineQuad::set_position(glm::vec2 const position) { m_quad.transform.position = m_outline.transform.position = position; }
-
-void OutlineQuad::set_scale(glm::vec2 const scale) { m_quad.transform.scale = m_outline.transform.scale = scale; }
-
-void OutlineQuad::set_corner_ratio(float const ratio) {
-	m_corner_ratio = ratio;
-	set_size(m_quad.get_shape().size);
-}
-
-void OutlineQuad::set_corner_resolution(int const resolution) {
-	set_quad_and_outline([resolution](RoundedQuad& quad, RoundedQuad& outline) { quad.corner_resolution = outline.corner_resolution = resolution; });
-}
-
-void OutlineQuad::set_outline_width(float const width) {
-	m_outline_width = width;
-	set_size(m_quad.get_shape().size);
-}
-
-void OutlineQuad::set_outline_tint(Rgba const tint) { m_outline.tint = tint; }
-
-void OutlineQuad::set_tint(Rgba const tint) { m_quad.tint = tint; }
-
-template <typename F>
-void OutlineQuad::set_quad_and_outline(F func) {
-	auto quad_shape = m_quad.get_shape();
-	auto outline_shape = m_outline.get_shape();
-	func(quad_shape, outline_shape);
-	m_quad.set_shape(quad_shape);
-	m_outline.set_shape(outline_shape);
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/outline_quad.hpp b/src/spaced/spaced/ui/outline_quad.hpp
deleted file mode 100644
index 808e715..0000000
--- a/src/spaced/spaced/ui/outline_quad.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-#include <bave/graphics/shape.hpp>
-#include <spaced/ui/element.hpp>
-
-namespace spaced::ui {
-class OutlineQuad : public IElement {
-  public:
-	OutlineQuad() { set_size(bave::Quad::size_v); }
-
-	void draw(bave::Shader& shader) const final;
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 final { return m_quad.get_shape().size; }
-	void set_size(glm::vec2 size);
-
-	[[nodiscard]] auto get_position() const -> glm::vec2 final { return m_quad.transform.position; }
-	void set_position(glm::vec2 position) final;
-
-	void set_scale(glm::vec2 scale);
-
-	void set_corner_ratio(float ratio);
-	void set_corner_resolution(int resolution);
-	void set_outline_width(float width);
-	void set_outline_tint(bave::Rgba tint);
-	void set_tint(bave::Rgba tint);
-
-	[[nodiscard]] auto get_background() const -> bave::RoundedQuadShape const& { return m_quad; }
-	[[nodiscard]] auto get_outline() const -> bave::RoundedQuadShape const& { return m_outline; }
-
-  private:
-	template <typename F>
-	void set_quad_and_outline(F func);
-
-	bave::RoundedQuadShape m_quad{};
-	bave::RoundedQuadShape m_outline{};
-	float m_outline_width{10.0f};
-	float m_corner_ratio{0.0f};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/progress_bar.cpp b/src/spaced/spaced/ui/progress_bar.cpp
deleted file mode 100644
index 556a788..0000000
--- a/src/spaced/spaced/ui/progress_bar.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/progress_bar.hpp>
-
-namespace spaced::ui {
-using bave::Shader;
-
-ProgressBar::ProgressBar(Services const& services) : m_style(services.get<Styles>().progress_bars["default"]) {}
-
-void ProgressBar::set_progress(float const progress) {
-	m_progress = progress;
-	auto const width = (1.0f - progress) * size.x;
-
-	auto bg_size = size;
-	bg_size.x += m_style.corner_ratio * bg_size.y;
-	auto quad = bave::RoundedQuad{};
-	quad.size = bg_size;
-	quad.corner_radius = m_style.corner_ratio * std::min(bg_size.x, bg_size.y);
-	m_background.set_shape(quad);
-
-	quad.size = size - m_style.padding;
-	quad.corner_radius = 0.0f;
-	quad.size.x = width;
-	m_fill.set_shape(quad);
-
-	m_background.tint = m_style.background;
-	m_fill.tint = m_style.fill;
-
-	m_fill.tint.channels.w = 0xff;
-
-	m_background.transform.position = m_fill.transform.position = position;
-	m_fill.transform.position.x += 0.5f * (size.x - width);
-}
-
-void ProgressBar::set_style(Style style) {
-	m_style = style;
-	set_progress(m_progress);
-}
-
-void ProgressBar::draw(Shader& shader) const {
-	m_background.draw(shader);
-	m_fill.draw(shader);
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/progress_bar.hpp b/src/spaced/spaced/ui/progress_bar.hpp
deleted file mode 100644
index b86037f..0000000
--- a/src/spaced/spaced/ui/progress_bar.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-#include <spaced/services/services.hpp>
-#include <spaced/ui/element.hpp>
-#include <spaced/ui/outline_quad.hpp>
-#include <spaced/ui/style.hpp>
-
-namespace spaced::ui {
-class ProgressBar : public IElement {
-  public:
-	using Style = ProgressBarStyle;
-
-	explicit ProgressBar(Services const& services);
-
-	glm::vec2 size{200.0f, 20.0f};
-	glm::vec2 position{};
-
-	void draw(bave::Shader& shader) const final;
-
-	[[nodiscard]] auto get_progress() const -> float { return m_progress; }
-	void set_progress(float progress);
-
-	[[nodiscard]] auto get_style() const -> Style const& { return m_style; }
-	void set_style(Style style);
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 final { return size; }
-	[[nodiscard]] auto get_position() const -> glm::vec2 final { return position; }
-	void set_position(glm::vec2 position) final { this->position = position; }
-
-	[[nodiscard]] auto get_bounds() const -> bave::Rect<> { return m_background.get_bounds(); }
-
-  private:
-	Style m_style{};
-
-	bave::RoundedQuadShape m_background{};
-	bave::QuadShape m_fill{};
-
-	float m_progress{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/slider.cpp b/src/spaced/spaced/ui/slider.cpp
deleted file mode 100644
index 390fab0..0000000
--- a/src/spaced/spaced/ui/slider.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/slider.hpp>
-#include <algorithm>
-
-namespace spaced::ui {
-using bave::Action;
-using bave::MouseButton;
-using bave::PointerId;
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::Rect;
-using bave::Shader;
-
-Slider::Slider(Services const& services) : m_styles(&services.get<Styles>()), m_progress_bar(services) {
-	set_style(m_styles->sliders["default"]);
-	set_value(0.0f);
-}
-
-auto Slider::get_size() const -> glm::vec2 {
-	auto ret = m_progress_bar.get_size();
-	ret.y = m_knob.get_shape().diameter;
-	return ret;
-}
-
-void Slider::set_position(glm::vec2 const position) {
-	m_progress_bar.set_position(position);
-	set_value(m_value);
-}
-
-void Slider::set_value(float const value) {
-	update_value(std::clamp(value, 0.0f, 1.0f));
-	auto const origin = m_progress_bar.get_position();
-	auto const size = m_progress_bar.get_size();
-	auto const left_x = origin.x - 0.5f * size.x;
-	auto const delta = m_value * size.x;
-
-	m_knob.transform.position = glm::vec2{left_x + delta, origin.y};
-	m_progress_bar.set_progress(m_value);
-}
-
-void Slider::set_style(Style style) {
-	m_style = std::move(style);
-	m_knob.tint = m_style.knob_tint;
-	auto shape = m_knob.get_shape();
-	shape.diameter = m_style.knob_diameter;
-	m_knob.set_shape(shape);
-	m_progress_bar.set_style(m_styles->progress_bars[m_style.progress_bar]);
-}
-
-void Slider::draw(Shader& shader) const {
-	m_progress_bar.draw(shader);
-	m_knob.draw(shader);
-}
-
-void Slider::on_tap(PointerTap const& pointer_tap) {
-	if (pointer_tap.pointer.id != PointerId::ePrimary || pointer_tap.button != MouseButton::eLeft) { return; }
-	switch (pointer_tap.action) {
-	case Action::ePress: m_pointer_down = hit_test(pointer_tap.pointer.position); break;
-	case Action::eRelease: m_pointer_down = false; break;
-	default: break;
-	}
-
-	if (m_pointer_down) { track(pointer_tap.pointer.position); }
-}
-
-void Slider::on_move(PointerMove const& pointer_move) {
-	if (pointer_move.pointer.id != PointerId::ePrimary) { return; }
-	if (!m_pointer_down) { return; }
-	track(pointer_move.pointer.position);
-}
-
-auto Slider::hit_test(glm::vec2 const position) const -> bool {
-	auto const bar_rect = Rect<>::from_size(m_progress_bar.get_size(), m_progress_bar.get_position());
-	if (bar_rect.contains(position)) { return true; }
-	if (m_knob.get_bounds().contains(position)) { return true; }
-	return false;
-}
-
-void Slider::track(glm::vec2 const pointer) {
-	auto const pointer_x = pointer.x;
-	auto const origin_x = m_progress_bar.get_position().x;
-	auto const size_x = m_progress_bar.get_size().x;
-	auto const left_x = origin_x - 0.5f * size_x;
-	auto const right_x = origin_x + 0.5f * size_x;
-	auto const knob_x = std::clamp(pointer_x, left_x, right_x);
-
-	m_knob.transform.position.x = knob_x;
-	update_value((knob_x - left_x) / size_x);
-	m_progress_bar.set_progress(m_value);
-}
-
-void Slider::update_value(float const value) {
-	if (std::abs(m_value - value) < 0.001f) { return; }
-	m_value = value;
-	if (on_change) { on_change(m_value); }
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/slider.hpp b/src/spaced/spaced/ui/slider.hpp
deleted file mode 100644
index dfda708..0000000
--- a/src/spaced/spaced/ui/slider.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-#include <spaced/services/styles.hpp>
-#include <spaced/ui/progress_bar.hpp>
-#include <spaced/ui/style.hpp>
-#include <spaced/ui/widget.hpp>
-#include <functional>
-
-namespace spaced::ui {
-class Slider : public IWidget {
-  public:
-	using Style = SliderStyle;
-
-	explicit Slider(Services const& services);
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 final;
-	[[nodiscard]] auto get_position() const -> glm::vec2 final { return m_progress_bar.get_position(); }
-	void set_position(glm::vec2 position) final;
-
-	[[nodiscard]] auto get_value() const -> float { return m_value; }
-	void set_value(float value);
-
-	[[nodiscard]] auto get_style() const -> Style { return m_style; }
-	void set_style(Style style);
-
-	std::function<void(float)> on_change{};
-
-  protected:
-	void draw(bave::Shader& shader) const final;
-	void on_move(bave::PointerMove const& pointer_move) final;
-	void on_tap(bave::PointerTap const& pointer_tap) final;
-
-	[[nodiscard]] auto hit_test(glm::vec2 position) const -> bool;
-	void track(glm::vec2 pointer);
-
-	void update_value(float value);
-
-	bave::NotNull<Styles const*> m_styles;
-	Style m_style{};
-
-	ui::ProgressBar m_progress_bar;
-	bave::CircleShape m_knob{};
-	float m_value{};
-
-	bool m_pointer_down{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/style.hpp b/src/spaced/spaced/ui/style.hpp
deleted file mode 100644
index f7405b3..0000000
--- a/src/spaced/spaced/ui/style.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-#include <bave/core/enum_array.hpp>
-#include <bave/core/radians.hpp>
-#include <bave/font/text_height.hpp>
-#include <bave/graphics/rgba.hpp>
-#include <glm/vec2.hpp>
-
-namespace spaced::ui {
-enum class ButtonState { eIdle, eHover, ePress, eCOUNT_ };
-
-struct LoadingScreenStyle {
-	bave::Rgba background_tint{bave::black_v};
-	struct {
-		glm::vec2 size{100.0f};
-		bave::Degrees spin_rate{720.0f};
-	} spinner{};
-	struct {
-		float n_width{0.9f};
-		float height{50.0f};
-		float bottom_offset{200.0f};
-		float padding{30.0f};
-	} progress_bar{};
-};
-
-struct ButtonStyle {
-	using Tint = bave::EnumArray<ButtonState, bave::Rgba>;
-
-	Tint background{bave::white_v, bave::yellow_v, bave::cyan_v};
-	Tint outline{bave::black_v, bave::black_v, bave::black_v};
-	Tint text{bave::black_v, bave::black_v, bave::black_v};
-	float outline_width{10.0f};
-	float corner_ratio{0.33f};
-};
-
-struct ProgressBarStyle {
-	bave::Rgba background{bave::white_v};
-	bave::Rgba fill{bave::yellow_v};
-	float corner_ratio{0.5f};
-	float padding{10.0f};
-};
-
-struct DialogStyle {
-	glm::vec2 footer_padding{20.0f, 10.0f};
-	float corner_ratio{0.25f};
-	bave::Rgba background_tint{bave::yellow_v};
-	bave::Rgba outline_tint{bave::cyan_v};
-	bave::Rgba content_text_tint{bave::black_v};
-};
-
-struct SliderStyle {
-	std::string progress_bar{};
-	float knob_diameter{30.0f};
-	bave::Rgba knob_tint{bave::white_v};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/text.cpp b/src/spaced/spaced/ui/text.cpp
deleted file mode 100644
index 432e7ed..0000000
--- a/src/spaced/spaced/ui/text.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <spaced/services/resources.hpp>
-#include <spaced/ui/text.hpp>
-
-namespace spaced::ui {
-Text::Text(Services const& services) {
-	text.set_font(services.get<Resources>().main_font);
-	text.tint = bave::white_v;
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/text.hpp b/src/spaced/spaced/ui/text.hpp
deleted file mode 100644
index 5110b7e..0000000
--- a/src/spaced/spaced/ui/text.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <bave/graphics/text.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/element.hpp>
-
-namespace spaced::ui {
-class Text : public IElement {
-  public:
-	explicit Text(Services const& services);
-
-	[[nodiscard]] auto get_size() const -> glm::vec2 override { return text.get_bounds().size(); }
-	[[nodiscard]] auto get_position() const -> glm::vec2 override { return text.transform.position; }
-	void set_position(glm::vec2 position) override { text.transform.position = position; }
-	void draw(bave::Shader& shader) const override { text.draw(shader); }
-
-	bave::Text text{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/view.cpp b/src/spaced/spaced/ui/view.cpp
deleted file mode 100644
index 02ac83c..0000000
--- a/src/spaced/spaced/ui/view.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <spaced/ui/view.hpp>
-
-namespace spaced::ui {
-using bave::PointerMove;
-using bave::PointerTap;
-using bave::Seconds;
-using bave::Shader;
-
-View::View(Services const& services) : m_layout(&services.get<ILayout>()) {}
-
-void View::push(std::unique_ptr<IElement> element) {
-	if (!element) { return; }
-	m_elements.push_back(std::move(element));
-	if (auto* widget = dynamic_cast<IWidget*>(m_elements.back().get())) { m_widgets.push_back(widget); }
-}
-
-void View::on_move(PointerMove const& pointer_move) {
-	for (auto const& widget : m_widgets) { widget->on_move(pointer_move); }
-}
-
-void View::on_tap(PointerTap const& pointer_tap) {
-	for (auto const& widget : m_widgets) { widget->on_tap(pointer_tap); }
-}
-
-void View::tick(Seconds const dt) {
-	for (auto const& widget : m_widgets) { widget->tick(dt); }
-}
-
-void View::render(Shader& shader) const {
-	if (m_elements.empty()) { return; }
-	shader.set_render_view(m_layout->get_main_view());
-	for (auto const& element : m_elements) { element->draw(shader); }
-}
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/view.hpp b/src/spaced/spaced/ui/view.hpp
deleted file mode 100644
index d5bf621..0000000
--- a/src/spaced/spaced/ui/view.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-#include <spaced/services/layout.hpp>
-#include <spaced/services/services.hpp>
-#include <spaced/ui/widget.hpp>
-#include <memory>
-#include <vector>
-
-namespace spaced::ui {
-class View : public bave::Polymorphic {
-  public:
-	explicit View(Services const& services);
-
-	void push(std::unique_ptr<IElement> element);
-
-	[[nodiscard]] auto is_destroyed() const -> bool { return m_destroyed; }
-	void set_destroyed() { m_destroyed = true; }
-
-	virtual void on_move(bave::PointerMove const& pointer_move);
-	virtual void on_tap(bave::PointerTap const& pointer_tap);
-	virtual void tick(bave::Seconds dt);
-	virtual void render(bave::Shader& shader) const;
-
-	bool block_input_events{true};
-
-  protected:
-	std::vector<std::unique_ptr<ui::IElement>> m_elements{};
-	std::vector<bave::Ptr<ui::IWidget>> m_widgets{};
-	bave::NotNull<ILayout const*> m_layout;
-	bool m_destroyed{};
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/ui/widget.hpp b/src/spaced/spaced/ui/widget.hpp
deleted file mode 100644
index b77a31a..0000000
--- a/src/spaced/spaced/ui/widget.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include <bave/core/time.hpp>
-#include <bave/graphics/shader.hpp>
-#include <bave/input/event.hpp>
-#include <spaced/ui/element.hpp>
-
-namespace spaced::ui {
-class IWidget : public IElement {
-  public:
-	virtual void on_move(bave::PointerMove const& /*pointer_move*/) {}
-	virtual void on_tap(bave::PointerTap const& /*pointer_tap*/) {}
-	virtual void tick(bave::Seconds /*dt*/) {}
-};
-} // namespace spaced::ui
diff --git a/src/spaced/spaced/util.cpp b/src/spaced/spaced/util.cpp
index 9886888..0ca3854 100644
--- a/src/spaced/spaced/util.cpp
+++ b/src/spaced/spaced/util.cpp
@@ -1,108 +1,6 @@
-#include <bave/io/json_io.hpp>
 #include <spaced/util.hpp>
 
 namespace spaced {
-void util::to_json(dj::Json& out, ui::LoadingScreenStyle const& loading_screen_style) {
-	using bave::to_json;
-	to_json(out["background_tint"], loading_screen_style.background_tint);
-	auto& spinner = out["spinner"];
-	to_json(spinner["size"], loading_screen_style.spinner.size);
-	spinner["spin_rate"] = loading_screen_style.spinner.spin_rate.value;
-	auto& progress_bar = out["progress_bar"];
-	progress_bar["n_width"] = loading_screen_style.progress_bar.n_width;
-	progress_bar["height"] = loading_screen_style.progress_bar.height;
-	progress_bar["bottom_offset"] = loading_screen_style.progress_bar.bottom_offset;
-	progress_bar["padding"] = loading_screen_style.progress_bar.padding;
-}
-
-void util::from_json(dj::Json const& json, ui::LoadingScreenStyle& out) {
-	using bave::from_json;
-	from_json(json["background_tint"], out.background_tint);
-	auto const& spinner = json["spinner"];
-	from_json(spinner["size"], out.spinner.size);
-	out.spinner.spin_rate.value = spinner["spin_rate"].as<float>(out.spinner.spin_rate.value);
-	auto const& progress_bar = json["progress_bar"];
-	out.progress_bar.n_width = progress_bar["n_width"].as<float>(out.progress_bar.n_width);
-	out.progress_bar.height = progress_bar["height"].as<float>(out.progress_bar.height);
-	out.progress_bar.bottom_offset = progress_bar["bottom_offset"].as<float>(out.progress_bar.bottom_offset);
-	out.progress_bar.padding = progress_bar["padding"].as<float>(out.progress_bar.padding);
-}
-
-void util::to_json(dj::Json& out, ui::ButtonStyle::Tint const& button_tint) {
-	using bave::to_json;
-	to_json(out["idle"], button_tint[ui::ButtonState::eIdle]);
-	to_json(out["hover"], button_tint[ui::ButtonState::eHover]);
-	to_json(out["press"], button_tint[ui::ButtonState::ePress]);
-}
-
-void util::from_json(dj::Json const& json, ui::ButtonStyle::Tint& out) {
-	from_json(json["idle"], out[ui::ButtonState::eIdle]);
-	from_json(json["hover"], out[ui::ButtonState::eHover]);
-	from_json(json["press"], out[ui::ButtonState::ePress]);
-}
-
-void util::to_json(dj::Json& out, ui::ButtonStyle const& button_style) {
-	to_json(out["background"], button_style.background);
-	to_json(out["outline"], button_style.outline);
-	to_json(out["text"], button_style.text);
-	out["outline_width"] = button_style.outline_width;
-	out["corner_ratio"] = button_style.corner_ratio;
-}
-
-void util::from_json(dj::Json const& json, ui::ButtonStyle& out) {
-	from_json(json["background"], out.background);
-	from_json(json["outline"], out.outline);
-	from_json(json["text"], out.text);
-	out.outline_width = json["outline_width"].as<float>();
-	out.corner_ratio = json["corner_ratio"].as<float>();
-}
-
-void util::to_json(dj::Json& out, ui::ProgressBarStyle const& progress_bar_style) {
-	to_json(out["background"], progress_bar_style.background);
-	to_json(out["fill"], progress_bar_style.fill);
-	out["corner_ratio"] = progress_bar_style.corner_ratio;
-	out["padding"] = progress_bar_style.padding;
-}
-
-void util::from_json(dj::Json const& json, ui::ProgressBarStyle& out) {
-	from_json(json["background"], out.background);
-	from_json(json["fill"], out.fill);
-	out.corner_ratio = json["corner_ratio"].as<float>(out.corner_ratio);
-	out.padding = json["padding"].as<float>(out.padding);
-}
-
-void util::to_json(dj::Json& out, ui::DialogStyle const& dialog_style) {
-	using bave::to_json;
-	to_json(out["footer_padding"], dialog_style.footer_padding);
-	to_json(out["corner_ratio"], dialog_style.corner_ratio);
-	to_json(out["background_tint"], dialog_style.background_tint);
-	to_json(out["outline_tint"], dialog_style.outline_tint);
-	to_json(out["content_text_tint"], dialog_style.content_text_tint);
-}
-
-void util::from_json(dj::Json const& json, ui::DialogStyle& out) {
-	using bave::from_json;
-	from_json(json["footer_padding"], out.footer_padding);
-	from_json(json["corner_ratio"], out.corner_ratio);
-	from_json(json["background_tint"], out.background_tint);
-	from_json(json["outline_tint"], out.outline_tint);
-	from_json(json["content_text_tint"], out.content_text_tint);
-}
-
-void util::to_json(dj::Json& out, ui::SliderStyle const& slider_style) {
-	using bave::to_json;
-	to_json(out["progress_bar"], slider_style.progress_bar);
-	to_json(out["knob_diameter"], slider_style.knob_diameter);
-	to_json(out["knob_tint"], slider_style.knob_tint);
-}
-
-void util::from_json(dj::Json const& json, ui::SliderStyle& out) {
-	using bave::from_json;
-	from_json(json["progress_bar"], out.progress_bar);
-	from_json(json["knob_diameter"], out.knob_diameter);
-	from_json(json["knob_tint"], out.knob_tint);
-}
-
 auto util::create_font_atlas_task(std::shared_ptr<bave::Font> font, std::vector<bave::TextHeight> heights) -> std::function<void()> {
 	if (!font || heights.empty()) { return {}; }
 	return [font = std::move(font), heights = std::move(heights)] {
diff --git a/src/spaced/spaced/util.hpp b/src/spaced/spaced/util.hpp
index 89bbbb4..bd54c39 100644
--- a/src/spaced/spaced/util.hpp
+++ b/src/spaced/spaced/util.hpp
@@ -1,27 +1,7 @@
 #pragma once
 #include <bave/font/font.hpp>
-#include <djson/json.hpp>
-#include <spaced/ui/style.hpp>
 #include <functional>
 
 namespace spaced::util {
-void to_json(dj::Json& out, ui::LoadingScreenStyle const& loading_screen_style);
-void from_json(dj::Json const& json, ui::LoadingScreenStyle& out);
-
-void to_json(dj::Json& out, ui::ButtonStyle::Tint const& button_tint);
-void from_json(dj::Json const& json, ui::ButtonStyle::Tint& out);
-
-void to_json(dj::Json& out, ui::ButtonStyle const& button_style);
-void from_json(dj::Json const& json, ui::ButtonStyle& out);
-
-void to_json(dj::Json& out, ui::ProgressBarStyle const& progress_bar_style);
-void from_json(dj::Json const& json, ui::ProgressBarStyle& out);
-
-void to_json(dj::Json& out, ui::DialogStyle const& dialog_style);
-void from_json(dj::Json const& json, ui::DialogStyle& out);
-
-void to_json(dj::Json& out, ui::SliderStyle const& slider_style);
-void from_json(dj::Json const& json, ui::SliderStyle& out);
-
 auto create_font_atlas_task(std::shared_ptr<bave::Font> font, std::vector<bave::TextHeight> heights) -> std::function<void()>;
 } // namespace spaced::util