diff --git a/Cargo.lock b/Cargo.lock
index 5e2c5b3..cdf6836 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5117,7 +5117,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "uidev-vk"
+name = "uidev"
 version = "0.1.0"
 dependencies = [
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 449c1c0..f97d435 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ inherits = "release"
 debug = true
 
 [workspace]
-members = ["wgui", "wgui/uidev-vk", "wlx-overlay-s", "wlx-capture"]
+members = ["uidev", "wgui", "wlx-overlay-s", "wlx-capture"]
 resolver = "3"
 
 [workspace.dependencies]
diff --git a/wgui/uidev-vk/.gitignore b/uidev/.gitignore
similarity index 100%
rename from wgui/uidev-vk/.gitignore
rename to uidev/.gitignore
diff --git a/wgui/uidev-vk/Cargo.lock b/uidev/Cargo.lock
similarity index 100%
rename from wgui/uidev-vk/Cargo.lock
rename to uidev/Cargo.lock
diff --git a/wgui/uidev-vk/Cargo.toml b/uidev/Cargo.toml
similarity index 88%
rename from wgui/uidev-vk/Cargo.toml
rename to uidev/Cargo.toml
index 5c941c8..9cfa9e9 100644
--- a/wgui/uidev-vk/Cargo.toml
+++ b/uidev/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "uidev-vk"
+name = "uidev"
 version = "0.1.0"
 edition = "2024"
 
@@ -9,7 +9,7 @@ glam = { workspace = true }
 log = { workspace = true }
 rust-embed = "8.7.2"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-wgui = { path = "../" }
+wgui = { path = "../wgui/" }
 winit = "0.30.10"
 vulkano = { workspace = true }
 vulkano-shaders = { workspace = true }
diff --git a/wgui/uidev-vk/assets/bar/add.svg b/uidev/assets/bar/add.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/add.svg
rename to uidev/assets/bar/add.svg
diff --git a/wgui/uidev-vk/assets/bar/background-off.svg b/uidev/assets/bar/background-off.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/background-off.svg
rename to uidev/assets/bar/background-off.svg
diff --git a/wgui/uidev-vk/assets/bar/background.svg b/uidev/assets/bar/background.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/background.svg
rename to uidev/assets/bar/background.svg
diff --git a/wgui/uidev-vk/assets/bar/cancel.svg b/uidev/assets/bar/cancel.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/cancel.svg
rename to uidev/assets/bar/cancel.svg
diff --git a/wgui/uidev-vk/assets/bar/checkbox-checked.svg b/uidev/assets/bar/checkbox-checked.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/checkbox-checked.svg
rename to uidev/assets/bar/checkbox-checked.svg
diff --git a/wgui/uidev-vk/assets/bar/checkbox.svg b/uidev/assets/bar/checkbox.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/checkbox.svg
rename to uidev/assets/bar/checkbox.svg
diff --git a/wgui/uidev-vk/assets/bar/delete.svg b/uidev/assets/bar/delete.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/delete.svg
rename to uidev/assets/bar/delete.svg
diff --git a/wgui/uidev-vk/assets/bar/fade.svg b/uidev/assets/bar/fade.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/fade.svg
rename to uidev/assets/bar/fade.svg
diff --git a/wgui/uidev-vk/assets/bar/inout.svg b/uidev/assets/bar/inout.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/inout.svg
rename to uidev/assets/bar/inout.svg
diff --git a/wgui/uidev-vk/assets/bar/lock.svg b/uidev/assets/bar/lock.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/lock.svg
rename to uidev/assets/bar/lock.svg
diff --git a/wgui/uidev-vk/assets/bar/lock_open.svg b/uidev/assets/bar/lock_open.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/lock_open.svg
rename to uidev/assets/bar/lock_open.svg
diff --git a/wgui/uidev-vk/assets/bar/mouse.svg b/uidev/assets/bar/mouse.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/mouse.svg
rename to uidev/assets/bar/mouse.svg
diff --git a/wgui/uidev-vk/assets/bar/mouse_lock.svg b/uidev/assets/bar/mouse_lock.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/mouse_lock.svg
rename to uidev/assets/bar/mouse_lock.svg
diff --git a/wgui/uidev-vk/assets/bar/move-all.svg b/uidev/assets/bar/move-all.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/move-all.svg
rename to uidev/assets/bar/move-all.svg
diff --git a/wgui/uidev-vk/assets/bar/move-horizontal.svg b/uidev/assets/bar/move-horizontal.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/move-horizontal.svg
rename to uidev/assets/bar/move-horizontal.svg
diff --git a/wgui/uidev-vk/assets/bar/resize.svg b/uidev/assets/bar/resize.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/resize.svg
rename to uidev/assets/bar/resize.svg
diff --git a/wgui/uidev-vk/assets/bar/screen-add.svg b/uidev/assets/bar/screen-add.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/screen-add.svg
rename to uidev/assets/bar/screen-add.svg
diff --git a/wgui/uidev-vk/assets/bar/screen-options.svg b/uidev/assets/bar/screen-options.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/screen-options.svg
rename to uidev/assets/bar/screen-options.svg
diff --git a/wgui/uidev-vk/assets/bar/screen-remove.svg b/uidev/assets/bar/screen-remove.svg
similarity index 100%
rename from wgui/uidev-vk/assets/bar/screen-remove.svg
rename to uidev/assets/bar/screen-remove.svg
diff --git a/wgui/uidev-vk/assets/dashboard/add.svg b/uidev/assets/dashboard/add.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/add.svg
rename to uidev/assets/dashboard/add.svg
diff --git a/wgui/uidev-vk/assets/dashboard/alphabetical.svg b/uidev/assets/dashboard/alphabetical.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/alphabetical.svg
rename to uidev/assets/dashboard/alphabetical.svg
diff --git a/wgui/uidev-vk/assets/dashboard/apps.svg b/uidev/assets/dashboard/apps.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/apps.svg
rename to uidev/assets/dashboard/apps.svg
diff --git a/wgui/uidev-vk/assets/dashboard/back.svg b/uidev/assets/dashboard/back.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/back.svg
rename to uidev/assets/dashboard/back.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_10.svg b/uidev/assets/dashboard/bat_10.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_10.svg
rename to uidev/assets/dashboard/bat_10.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_100.svg b/uidev/assets/dashboard/bat_100.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_100.svg
rename to uidev/assets/dashboard/bat_100.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_20.svg b/uidev/assets/dashboard/bat_20.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_20.svg
rename to uidev/assets/dashboard/bat_20.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_30.svg b/uidev/assets/dashboard/bat_30.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_30.svg
rename to uidev/assets/dashboard/bat_30.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_40.svg b/uidev/assets/dashboard/bat_40.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_40.svg
rename to uidev/assets/dashboard/bat_40.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_50.svg b/uidev/assets/dashboard/bat_50.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_50.svg
rename to uidev/assets/dashboard/bat_50.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_60.svg b/uidev/assets/dashboard/bat_60.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_60.svg
rename to uidev/assets/dashboard/bat_60.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_70.svg b/uidev/assets/dashboard/bat_70.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_70.svg
rename to uidev/assets/dashboard/bat_70.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_80.svg b/uidev/assets/dashboard/bat_80.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_80.svg
rename to uidev/assets/dashboard/bat_80.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_90.svg b/uidev/assets/dashboard/bat_90.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_90.svg
rename to uidev/assets/dashboard/bat_90.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_10.svg b/uidev/assets/dashboard/bat_chr_10.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_10.svg
rename to uidev/assets/dashboard/bat_chr_10.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_100.svg b/uidev/assets/dashboard/bat_chr_100.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_100.svg
rename to uidev/assets/dashboard/bat_chr_100.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_20.svg b/uidev/assets/dashboard/bat_chr_20.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_20.svg
rename to uidev/assets/dashboard/bat_chr_20.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_30.svg b/uidev/assets/dashboard/bat_chr_30.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_30.svg
rename to uidev/assets/dashboard/bat_chr_30.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_40.svg b/uidev/assets/dashboard/bat_chr_40.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_40.svg
rename to uidev/assets/dashboard/bat_chr_40.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_50.svg b/uidev/assets/dashboard/bat_chr_50.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_50.svg
rename to uidev/assets/dashboard/bat_chr_50.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_60.svg b/uidev/assets/dashboard/bat_chr_60.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_60.svg
rename to uidev/assets/dashboard/bat_chr_60.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_70.svg b/uidev/assets/dashboard/bat_chr_70.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_70.svg
rename to uidev/assets/dashboard/bat_chr_70.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_80.svg b/uidev/assets/dashboard/bat_chr_80.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_80.svg
rename to uidev/assets/dashboard/bat_chr_80.svg
diff --git a/wgui/uidev-vk/assets/dashboard/bat_chr_90.svg b/uidev/assets/dashboard/bat_chr_90.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/bat_chr_90.svg
rename to uidev/assets/dashboard/bat_chr_90.svg
diff --git a/wgui/uidev-vk/assets/dashboard/binary.svg b/uidev/assets/dashboard/binary.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/binary.svg
rename to uidev/assets/dashboard/binary.svg
diff --git a/wgui/uidev-vk/assets/dashboard/burger.svg b/uidev/assets/dashboard/burger.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/burger.svg
rename to uidev/assets/dashboard/burger.svg
diff --git a/wgui/uidev-vk/assets/dashboard/category_search.svg b/uidev/assets/dashboard/category_search.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/category_search.svg
rename to uidev/assets/dashboard/category_search.svg
diff --git a/wgui/uidev-vk/assets/dashboard/circle.svg b/uidev/assets/dashboard/circle.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/circle.svg
rename to uidev/assets/dashboard/circle.svg
diff --git a/wgui/uidev-vk/assets/dashboard/close.svg b/uidev/assets/dashboard/close.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/close.svg
rename to uidev/assets/dashboard/close.svg
diff --git a/wgui/uidev-vk/assets/dashboard/cpu.svg b/uidev/assets/dashboard/cpu.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/cpu.svg
rename to uidev/assets/dashboard/cpu.svg
diff --git a/wgui/uidev-vk/assets/dashboard/display.svg b/uidev/assets/dashboard/display.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/display.svg
rename to uidev/assets/dashboard/display.svg
diff --git a/wgui/uidev-vk/assets/dashboard/displayport.svg b/uidev/assets/dashboard/displayport.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/displayport.svg
rename to uidev/assets/dashboard/displayport.svg
diff --git a/wgui/uidev-vk/assets/dashboard/eye.svg b/uidev/assets/dashboard/eye.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/eye.svg
rename to uidev/assets/dashboard/eye.svg
diff --git a/wgui/uidev-vk/assets/dashboard/fix_floor.svg b/uidev/assets/dashboard/fix_floor.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/fix_floor.svg
rename to uidev/assets/dashboard/fix_floor.svg
diff --git a/wgui/uidev-vk/assets/dashboard/games.svg b/uidev/assets/dashboard/games.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/games.svg
rename to uidev/assets/dashboard/games.svg
diff --git a/wgui/uidev-vk/assets/dashboard/github.svg b/uidev/assets/dashboard/github.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/github.svg
rename to uidev/assets/dashboard/github.svg
diff --git a/wgui/uidev-vk/assets/dashboard/globe.svg b/uidev/assets/dashboard/globe.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/globe.svg
rename to uidev/assets/dashboard/globe.svg
diff --git a/wgui/uidev-vk/assets/dashboard/home.svg b/uidev/assets/dashboard/home.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/home.svg
rename to uidev/assets/dashboard/home.svg
diff --git a/wgui/uidev-vk/assets/dashboard/knife.svg b/uidev/assets/dashboard/knife.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/knife.svg
rename to uidev/assets/dashboard/knife.svg
diff --git a/wgui/uidev-vk/assets/dashboard/magic_wand.svg b/uidev/assets/dashboard/magic_wand.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/magic_wand.svg
rename to uidev/assets/dashboard/magic_wand.svg
diff --git a/wgui/uidev-vk/assets/dashboard/microphone.svg b/uidev/assets/dashboard/microphone.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/microphone.svg
rename to uidev/assets/dashboard/microphone.svg
diff --git a/wgui/uidev-vk/assets/dashboard/minijack.svg b/uidev/assets/dashboard/minijack.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/minijack.svg
rename to uidev/assets/dashboard/minijack.svg
diff --git a/wgui/uidev-vk/assets/dashboard/monado.svg b/uidev/assets/dashboard/monado.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/monado.svg
rename to uidev/assets/dashboard/monado.svg
diff --git a/wgui/uidev-vk/assets/dashboard/panorama.svg b/uidev/assets/dashboard/panorama.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/panorama.svg
rename to uidev/assets/dashboard/panorama.svg
diff --git a/wgui/uidev-vk/assets/dashboard/play.svg b/uidev/assets/dashboard/play.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/play.svg
rename to uidev/assets/dashboard/play.svg
diff --git a/wgui/uidev-vk/assets/dashboard/power.svg b/uidev/assets/dashboard/power.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/power.svg
rename to uidev/assets/dashboard/power.svg
diff --git a/wgui/uidev-vk/assets/dashboard/recenter.svg b/uidev/assets/dashboard/recenter.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/recenter.svg
rename to uidev/assets/dashboard/recenter.svg
diff --git a/wgui/uidev-vk/assets/dashboard/refresh.svg b/uidev/assets/dashboard/refresh.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/refresh.svg
rename to uidev/assets/dashboard/refresh.svg
diff --git a/wgui/uidev-vk/assets/dashboard/remove_circle.svg b/uidev/assets/dashboard/remove_circle.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/remove_circle.svg
rename to uidev/assets/dashboard/remove_circle.svg
diff --git a/wgui/uidev-vk/assets/dashboard/search.svg b/uidev/assets/dashboard/search.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/search.svg
rename to uidev/assets/dashboard/search.svg
diff --git a/wgui/uidev-vk/assets/dashboard/settings.svg b/uidev/assets/dashboard/settings.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/settings.svg
rename to uidev/assets/dashboard/settings.svg
diff --git a/wgui/uidev-vk/assets/dashboard/sleep.svg b/uidev/assets/dashboard/sleep.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/sleep.svg
rename to uidev/assets/dashboard/sleep.svg
diff --git a/wgui/uidev-vk/assets/dashboard/terminal.svg b/uidev/assets/dashboard/terminal.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/terminal.svg
rename to uidev/assets/dashboard/terminal.svg
diff --git a/wgui/uidev-vk/assets/dashboard/usage.svg b/uidev/assets/dashboard/usage.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/usage.svg
rename to uidev/assets/dashboard/usage.svg
diff --git a/wgui/uidev-vk/assets/dashboard/volume.svg b/uidev/assets/dashboard/volume.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/volume.svg
rename to uidev/assets/dashboard/volume.svg
diff --git a/wgui/uidev-vk/assets/dashboard/volume_off.svg b/uidev/assets/dashboard/volume_off.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/volume_off.svg
rename to uidev/assets/dashboard/volume_off.svg
diff --git a/wgui/uidev-vk/assets/dashboard/vr.svg b/uidev/assets/dashboard/vr.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/vr.svg
rename to uidev/assets/dashboard/vr.svg
diff --git a/wgui/uidev-vk/assets/dashboard/wayvr_dashboard.svg b/uidev/assets/dashboard/wayvr_dashboard.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/wayvr_dashboard.svg
rename to uidev/assets/dashboard/wayvr_dashboard.svg
diff --git a/wgui/uidev-vk/assets/dashboard/wayvr_dashboard_mono.svg b/uidev/assets/dashboard/wayvr_dashboard_mono.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/wayvr_dashboard_mono.svg
rename to uidev/assets/dashboard/wayvr_dashboard_mono.svg
diff --git a/wgui/uidev-vk/assets/dashboard/window.svg b/uidev/assets/dashboard/window.svg
similarity index 100%
rename from wgui/uidev-vk/assets/dashboard/window.svg
rename to uidev/assets/dashboard/window.svg
diff --git a/wgui/uidev-vk/assets/gui/anchor.xml b/uidev/assets/gui/anchor.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/anchor.xml
rename to uidev/assets/gui/anchor.xml
diff --git a/wgui/uidev-vk/assets/gui/bar.xml b/uidev/assets/gui/bar.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/bar.xml
rename to uidev/assets/gui/bar.xml
diff --git a/wgui/uidev-vk/assets/gui/dashboard.xml b/uidev/assets/gui/dashboard.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/dashboard.xml
rename to uidev/assets/gui/dashboard.xml
diff --git a/wgui/uidev-vk/assets/gui/templates.xml b/uidev/assets/gui/templates.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/templates.xml
rename to uidev/assets/gui/templates.xml
diff --git a/wgui/uidev-vk/assets/gui/testbed.xml b/uidev/assets/gui/testbed.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/testbed.xml
rename to uidev/assets/gui/testbed.xml
diff --git a/wgui/uidev-vk/assets/gui/testbed/icons.xml b/uidev/assets/gui/testbed/icons.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/testbed/icons.xml
rename to uidev/assets/gui/testbed/icons.xml
diff --git a/wgui/uidev-vk/assets/gui/theme.xml b/uidev/assets/gui/theme.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/theme.xml
rename to uidev/assets/gui/theme.xml
diff --git a/uidev/assets/gui/watch.xml b/uidev/assets/gui/watch.xml
new file mode 120000
index 0000000..9135c1c
--- /dev/null
+++ b/uidev/assets/gui/watch.xml
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/gui/watch.xml
\ No newline at end of file
diff --git a/wgui/uidev-vk/assets/gui/wlx_theme.xml b/uidev/assets/gui/wlx_theme.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/wlx_theme.xml
rename to uidev/assets/gui/wlx_theme.xml
diff --git a/wgui/uidev-vk/assets/raster.png b/uidev/assets/raster.png
similarity index 100%
rename from wgui/uidev-vk/assets/raster.png
rename to uidev/assets/raster.png
diff --git a/uidev/assets/watch/controller.svg b/uidev/assets/watch/controller.svg
new file mode 120000
index 0000000..a80e2d5
--- /dev/null
+++ b/uidev/assets/watch/controller.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/controller.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/hmd.svg b/uidev/assets/watch/hmd.svg
new file mode 120000
index 0000000..fabe502
--- /dev/null
+++ b/uidev/assets/watch/hmd.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/hmd.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/keyboard.svg b/uidev/assets/watch/keyboard.svg
new file mode 120000
index 0000000..acfa4fb
--- /dev/null
+++ b/uidev/assets/watch/keyboard.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/keyboard.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/settings.svg b/uidev/assets/watch/settings.svg
new file mode 120000
index 0000000..7cb5bcd
--- /dev/null
+++ b/uidev/assets/watch/settings.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/settings.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/track.svg b/uidev/assets/watch/track.svg
new file mode 120000
index 0000000..15660af
--- /dev/null
+++ b/uidev/assets/watch/track.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/track.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/track2.svg b/uidev/assets/watch/track2.svg
new file mode 120000
index 0000000..eb98b02
--- /dev/null
+++ b/uidev/assets/watch/track2.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/track2.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/track3.svg b/uidev/assets/watch/track3.svg
new file mode 120000
index 0000000..3a88878
--- /dev/null
+++ b/uidev/assets/watch/track3.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/track3.svg
\ No newline at end of file
diff --git a/wgui/uidev-vk/res/watch.xml b/uidev/res/watch.xml
similarity index 100%
rename from wgui/uidev-vk/res/watch.xml
rename to uidev/res/watch.xml
diff --git a/wgui/uidev-vk/src/assets.rs b/uidev/src/assets.rs
similarity index 100%
rename from wgui/uidev-vk/src/assets.rs
rename to uidev/src/assets.rs
diff --git a/wgui/uidev-vk/src/main.rs b/uidev/src/main.rs
similarity index 100%
rename from wgui/uidev-vk/src/main.rs
rename to uidev/src/main.rs
diff --git a/wgui/uidev-vk/src/profiler.rs b/uidev/src/profiler.rs
similarity index 100%
rename from wgui/uidev-vk/src/profiler.rs
rename to uidev/src/profiler.rs
diff --git a/wgui/uidev-vk/src/testbed/mod.rs b/uidev/src/testbed/mod.rs
similarity index 100%
rename from wgui/uidev-vk/src/testbed/mod.rs
rename to uidev/src/testbed/mod.rs
diff --git a/wgui/uidev-vk/src/testbed/testbed_any.rs b/uidev/src/testbed/testbed_any.rs
similarity index 100%
rename from wgui/uidev-vk/src/testbed/testbed_any.rs
rename to uidev/src/testbed/testbed_any.rs
diff --git a/wgui/uidev-vk/src/testbed/testbed_dashboard.rs b/uidev/src/testbed/testbed_dashboard.rs
similarity index 100%
rename from wgui/uidev-vk/src/testbed/testbed_dashboard.rs
rename to uidev/src/testbed/testbed_dashboard.rs
diff --git a/wgui/uidev-vk/src/testbed/testbed_generic.rs b/uidev/src/testbed/testbed_generic.rs
similarity index 97%
rename from wgui/uidev-vk/src/testbed/testbed_generic.rs
rename to uidev/src/testbed/testbed_generic.rs
index 10e0e95..ce71aab 100644
--- a/wgui/uidev-vk/src/testbed/testbed_generic.rs
+++ b/uidev/src/testbed/testbed_generic.rs
@@ -77,7 +77,7 @@ impl Testbed for TestbedGeneric {
 		if let Some(widget_id) = *self.widget_id.borrow() {
 			self.rot += 0.01;
 
-			let a = self.layout.widget_states.get(widget_id).unwrap();
+			let a = self.layout.widget_map.get(widget_id).unwrap();
 			let mut widget = a.lock().unwrap();
 			widget.data.transform = Mat4::IDENTITY
 				* Mat4::from_rotation_y(-self.rot)
@@ -96,4 +96,4 @@ impl Testbed for TestbedGeneric {
 	fn layout(&mut self) -> &mut Layout {
 		&mut self.layout
 	}
-}
+}
\ No newline at end of file
diff --git a/wgui/uidev-vk/src/timestep.rs b/uidev/src/timestep.rs
similarity index 100%
rename from wgui/uidev-vk/src/timestep.rs
rename to uidev/src/timestep.rs
diff --git a/wgui/uidev-vk/src/vulkan.rs b/uidev/src/vulkan.rs
similarity index 100%
rename from wgui/uidev-vk/src/vulkan.rs
rename to uidev/src/vulkan.rs
diff --git a/wgui/uidev-vk/assets/gui/watch.xml b/wlx-overlay-s/src/assets/gui/watch.xml
similarity index 100%
rename from wgui/uidev-vk/assets/gui/watch.xml
rename to wlx-overlay-s/src/assets/gui/watch.xml
diff --git a/wgui/uidev-vk/assets/watch/controller.svg b/wlx-overlay-s/src/assets/watch/controller.svg
similarity index 100%
rename from wgui/uidev-vk/assets/watch/controller.svg
rename to wlx-overlay-s/src/assets/watch/controller.svg
diff --git a/wgui/uidev-vk/assets/watch/hmd.svg b/wlx-overlay-s/src/assets/watch/hmd.svg
similarity index 100%
rename from wgui/uidev-vk/assets/watch/hmd.svg
rename to wlx-overlay-s/src/assets/watch/hmd.svg
diff --git a/wgui/uidev-vk/assets/watch/keyboard.svg b/wlx-overlay-s/src/assets/watch/keyboard.svg
similarity index 100%
rename from wgui/uidev-vk/assets/watch/keyboard.svg
rename to wlx-overlay-s/src/assets/watch/keyboard.svg
diff --git a/wgui/uidev-vk/assets/watch/settings.svg b/wlx-overlay-s/src/assets/watch/settings.svg
similarity index 100%
rename from wgui/uidev-vk/assets/watch/settings.svg
rename to wlx-overlay-s/src/assets/watch/settings.svg
diff --git a/wgui/uidev-vk/assets/watch/track.svg b/wlx-overlay-s/src/assets/watch/track.svg
similarity index 100%
rename from wgui/uidev-vk/assets/watch/track.svg
rename to wlx-overlay-s/src/assets/watch/track.svg
diff --git a/wgui/uidev-vk/assets/watch/track2.svg b/wlx-overlay-s/src/assets/watch/track2.svg
similarity index 100%
rename from wgui/uidev-vk/assets/watch/track2.svg
rename to wlx-overlay-s/src/assets/watch/track2.svg
diff --git a/wgui/uidev-vk/assets/watch/track3.svg b/wlx-overlay-s/src/assets/watch/track3.svg
similarity index 100%
rename from wgui/uidev-vk/assets/watch/track3.svg
rename to wlx-overlay-s/src/assets/watch/track3.svg