diff --git a/Cargo.lock b/Cargo.lock
index 8f8c429c..74c6d115 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5998,19 +5998,29 @@ dependencies = [
 [[package]]
 name = "vulkano"
 version = "0.35.0"
+source = "git+https://github.com/galister/vulkano.git?rev=ee170056e0402e18eb352df36894aa1f1d35aaad#ee170056e0402e18eb352df36894aa1f1d35aaad"
 dependencies = [
  "ash",
  "bytemuck",
  "crossbeam-queue",
  "foldhash 0.1.5",
  "half",
+ "heck 0.4.1",
+ "indexmap 2.12.1",
  "libloading 0.8.9",
+ "nom 7.1.3",
+ "once_cell",
  "parking_lot",
+ "proc-macro2",
+ "quote",
  "raw-window-handle",
  "raw-window-metal",
+ "serde",
+ "serde_json",
  "slabbin",
  "smallvec",
  "thread_local",
+ "vk-parse",
  "vulkano-macros",
 ]
 
@@ -6046,6 +6056,7 @@ dependencies = [
 [[package]]
 name = "vulkano-macros"
 version = "0.35.0"
+source = "git+https://github.com/galister/vulkano.git?rev=ee170056e0402e18eb352df36894aa1f1d35aaad#ee170056e0402e18eb352df36894aa1f1d35aaad"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/dash-frontend/assets/dashboard/down.svg b/dash-frontend/assets/dashboard/down.svg
index 5ab12e3e..a9995174 120000
--- a/dash-frontend/assets/dashboard/down.svg
+++ b/dash-frontend/assets/dashboard/down.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/keyboard/down.svg
\ No newline at end of file
+../../../wayvr/src/assets/keyboard/down.svg
\ No newline at end of file
diff --git a/dash-frontend/assets/gui/tab/settings.xml b/dash-frontend/assets/gui/tab/settings.xml
index b2b635f7..1d8acc55 100644
--- a/dash-frontend/assets/gui/tab/settings.xml
+++ b/dash-frontend/assets/gui/tab/settings.xml
@@ -34,6 +34,13 @@
     </Button>
   </template>
 
+  <template name="AutoStartApp">
+    <Button id="${id}" color="#AA3333" height="32" tooltip="${translation}_HELP" padding="4" gap="8" >
+      <sprite src_builtin="${icon}" height="24" width="24" />
+      <label align="left" translation="${translation}" weight="bold" min_width="200" />
+    </Button>
+  </template>
+
   <elements>
     <TabTitle translation="SETTINGS" icon="dashboard/settings.svg" />
     <div flex_wrap="wrap" justify_content="stretch" gap="4" id="settings_root" />
diff --git a/uidev/assets/edit/3d.svg b/uidev/assets/edit/3d.svg
new file mode 120000
index 00000000..56988695
--- /dev/null
+++ b/uidev/assets/edit/3d.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/3d.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/3d_bottomtop.svg b/uidev/assets/edit/3d_bottomtop.svg
new file mode 120000
index 00000000..e7b169af
--- /dev/null
+++ b/uidev/assets/edit/3d_bottomtop.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/3d_bottomtop.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/3d_leftright.svg b/uidev/assets/edit/3d_leftright.svg
new file mode 120000
index 00000000..21456180
--- /dev/null
+++ b/uidev/assets/edit/3d_leftright.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/3d_leftright.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/3d_rightleft.svg b/uidev/assets/edit/3d_rightleft.svg
new file mode 120000
index 00000000..ff9bc543
--- /dev/null
+++ b/uidev/assets/edit/3d_rightleft.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/3d_rightleft.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/3d_topbottom.svg b/uidev/assets/edit/3d_topbottom.svg
new file mode 120000
index 00000000..3d8553da
--- /dev/null
+++ b/uidev/assets/edit/3d_topbottom.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/3d_topbottom.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/add.svg b/uidev/assets/edit/add.svg
index f3fdd372..e7b46bc4 120000
--- a/uidev/assets/edit/add.svg
+++ b/uidev/assets/edit/add.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/add.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/add.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/anchor.svg b/uidev/assets/edit/anchor.svg
index 2ef87629..4f816e8f 120000
--- a/uidev/assets/edit/anchor.svg
+++ b/uidev/assets/edit/anchor.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/anchor.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/anchor.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/background-off.svg b/uidev/assets/edit/background-off.svg
index 7f6c9a6a..6f92eff2 120000
--- a/uidev/assets/edit/background-off.svg
+++ b/uidev/assets/edit/background-off.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/background-off.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/background-off.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/background.svg b/uidev/assets/edit/background.svg
index cc614ccf..e0d2c13e 120000
--- a/uidev/assets/edit/background.svg
+++ b/uidev/assets/edit/background.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/background.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/background.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/cancel.svg b/uidev/assets/edit/cancel.svg
index 5ff20eed..8d3e2170 120000
--- a/uidev/assets/edit/cancel.svg
+++ b/uidev/assets/edit/cancel.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/cancel.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/cancel.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/checkbox-checked.svg b/uidev/assets/edit/checkbox-checked.svg
index 77955539..ae8d004f 120000
--- a/uidev/assets/edit/checkbox-checked.svg
+++ b/uidev/assets/edit/checkbox-checked.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/checkbox-checked.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/checkbox-checked.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/checkbox.svg b/uidev/assets/edit/checkbox.svg
index 88629641..36e585a4 120000
--- a/uidev/assets/edit/checkbox.svg
+++ b/uidev/assets/edit/checkbox.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/checkbox.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/checkbox.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/close.svg b/uidev/assets/edit/close.svg
new file mode 120000
index 00000000..acf04cb6
--- /dev/null
+++ b/uidev/assets/edit/close.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/close.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/curve.svg b/uidev/assets/edit/curve.svg
index 158e5725..750dc1a2 120000
--- a/uidev/assets/edit/curve.svg
+++ b/uidev/assets/edit/curve.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/curve.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/curve.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/delete.svg b/uidev/assets/edit/delete.svg
index 316cee49..fc48699c 120000
--- a/uidev/assets/edit/delete.svg
+++ b/uidev/assets/edit/delete.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/delete.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/delete.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/desktop.svg b/uidev/assets/edit/desktop.svg
deleted file mode 120000
index 6779bfae..00000000
--- a/uidev/assets/edit/desktop.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../wlx-overlay-s/src/assets/edit/desktop.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/disable-grab.svg b/uidev/assets/edit/disable-grab.svg
new file mode 120000
index 00000000..8c00d1ca
--- /dev/null
+++ b/uidev/assets/edit/disable-grab.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/disable-grab.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/fade.svg b/uidev/assets/edit/fade.svg
index fba0c682..519f9f19 120000
--- a/uidev/assets/edit/fade.svg
+++ b/uidev/assets/edit/fade.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/fade.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/fade.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/flip180.svg b/uidev/assets/edit/flip180.svg
new file mode 120000
index 00000000..9722fc7f
--- /dev/null
+++ b/uidev/assets/edit/flip180.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/flip180.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/flip270.svg b/uidev/assets/edit/flip270.svg
new file mode 120000
index 00000000..02149236
--- /dev/null
+++ b/uidev/assets/edit/flip270.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/flip270.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/flip90.svg b/uidev/assets/edit/flip90.svg
new file mode 120000
index 00000000..d0750487
--- /dev/null
+++ b/uidev/assets/edit/flip90.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/flip90.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/flipped.svg b/uidev/assets/edit/flipped.svg
new file mode 120000
index 00000000..838a1585
--- /dev/null
+++ b/uidev/assets/edit/flipped.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/flipped.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/float.svg b/uidev/assets/edit/float.svg
index daea741e..56577cba 120000
--- a/uidev/assets/edit/float.svg
+++ b/uidev/assets/edit/float.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/float.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/float.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/grabbable.svg b/uidev/assets/edit/grabbable.svg
new file mode 120000
index 00000000..fdd4cfd2
--- /dev/null
+++ b/uidev/assets/edit/grabbable.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/grabbable.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/grid.svg b/uidev/assets/edit/grid.svg
index 699353b1..992c53f4 120000
--- a/uidev/assets/edit/grid.svg
+++ b/uidev/assets/edit/grid.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/grid.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/grid.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/inout.svg b/uidev/assets/edit/inout.svg
index 76c26a99..28ea1067 120000
--- a/uidev/assets/edit/inout.svg
+++ b/uidev/assets/edit/inout.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/inout.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/inout.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/lock.svg b/uidev/assets/edit/lock.svg
index 463ac648..f7825e06 120000
--- a/uidev/assets/edit/lock.svg
+++ b/uidev/assets/edit/lock.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/lock.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/lock.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/lock_open.svg b/uidev/assets/edit/lock_open.svg
index f27700f1..7c2c9b67 120000
--- a/uidev/assets/edit/lock_open.svg
+++ b/uidev/assets/edit/lock_open.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/lock_open.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/lock_open.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/mirror.svg b/uidev/assets/edit/mirror.svg
index f2447886..8276c0a6 120000
--- a/uidev/assets/edit/mirror.svg
+++ b/uidev/assets/edit/mirror.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/mirror.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/mirror.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/monitor.svg b/uidev/assets/edit/monitor.svg
deleted file mode 120000
index 91ee221d..00000000
--- a/uidev/assets/edit/monitor.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../wlx-overlay-s/src/assets/edit/monitor.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/mouse.svg b/uidev/assets/edit/mouse.svg
index dd5a9db3..510fd7a3 120000
--- a/uidev/assets/edit/mouse.svg
+++ b/uidev/assets/edit/mouse.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/mouse.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/mouse.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/mouse_lock.svg b/uidev/assets/edit/mouse_lock.svg
index 5b2d15ae..bbb0d3da 120000
--- a/uidev/assets/edit/mouse_lock.svg
+++ b/uidev/assets/edit/mouse_lock.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/mouse_lock.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/mouse_lock.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/move-all.svg b/uidev/assets/edit/move-all.svg
index 2d23158e..5d09a6fb 120000
--- a/uidev/assets/edit/move-all.svg
+++ b/uidev/assets/edit/move-all.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/move-all.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/move-all.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/move-horizontal.svg b/uidev/assets/edit/move-horizontal.svg
index bda318a4..cf8b9082 120000
--- a/uidev/assets/edit/move-horizontal.svg
+++ b/uidev/assets/edit/move-horizontal.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/move-horizontal.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/move-horizontal.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/normal.svg b/uidev/assets/edit/normal.svg
new file mode 120000
index 00000000..7d6ebfe9
--- /dev/null
+++ b/uidev/assets/edit/normal.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/normal.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/panel.svg b/uidev/assets/edit/panel.svg
new file mode 120000
index 00000000..7d60868f
--- /dev/null
+++ b/uidev/assets/edit/panel.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/panel.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/pin.svg b/uidev/assets/edit/pin.svg
index a4960f49..cc39579e 120000
--- a/uidev/assets/edit/pin.svg
+++ b/uidev/assets/edit/pin.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/pin.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/pin.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/resize.svg b/uidev/assets/edit/resize.svg
index ffde6e0c..b77690ab 120000
--- a/uidev/assets/edit/resize.svg
+++ b/uidev/assets/edit/resize.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/resize.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/resize.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/rotate180.svg b/uidev/assets/edit/rotate180.svg
new file mode 120000
index 00000000..5339922b
--- /dev/null
+++ b/uidev/assets/edit/rotate180.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/rotate180.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/rotate270.svg b/uidev/assets/edit/rotate270.svg
new file mode 120000
index 00000000..736f5dbe
--- /dev/null
+++ b/uidev/assets/edit/rotate270.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/rotate270.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/rotate90.svg b/uidev/assets/edit/rotate90.svg
new file mode 120000
index 00000000..a5fbda7e
--- /dev/null
+++ b/uidev/assets/edit/rotate90.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/rotate90.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/screen-add.svg b/uidev/assets/edit/screen-add.svg
index 8a83ef56..8d215b70 120000
--- a/uidev/assets/edit/screen-add.svg
+++ b/uidev/assets/edit/screen-add.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/screen-add.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/screen-add.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/screen-options.svg b/uidev/assets/edit/screen-options.svg
index b4327b55..5912077d 120000
--- a/uidev/assets/edit/screen-options.svg
+++ b/uidev/assets/edit/screen-options.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/screen-options.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/screen-options.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/screen-remove.svg b/uidev/assets/edit/screen-remove.svg
index e7e9b5a5..3ffdcac9 120000
--- a/uidev/assets/edit/screen-remove.svg
+++ b/uidev/assets/edit/screen-remove.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/edit/screen-remove.svg
\ No newline at end of file
+../../../wayvr/src/assets/edit/screen-remove.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/screen.svg b/uidev/assets/edit/screen.svg
new file mode 120000
index 00000000..987a216b
--- /dev/null
+++ b/uidev/assets/edit/screen.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/screen.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/wayvr.svg b/uidev/assets/edit/wayvr.svg
new file mode 120000
index 00000000..928940c3
--- /dev/null
+++ b/uidev/assets/edit/wayvr.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/edit/wayvr.svg
\ No newline at end of file
diff --git a/uidev/assets/edit/window.svg b/uidev/assets/edit/window.svg
deleted file mode 120000
index 4e61941b..00000000
--- a/uidev/assets/edit/window.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../wlx-overlay-s/src/assets/edit/window.svg
\ No newline at end of file
diff --git a/uidev/assets/grab-help/controller-grip-b.svg b/uidev/assets/grab-help/controller-grip-b.svg
index 1968a00d..ea6259f7 120000
--- a/uidev/assets/grab-help/controller-grip-b.svg
+++ b/uidev/assets/grab-help/controller-grip-b.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/grab-help/controller-grip-b.svg
\ No newline at end of file
+../../../wayvr/src/assets/grab-help/controller-grip-b.svg
\ No newline at end of file
diff --git a/uidev/assets/grab-help/controller-grip-joy.svg b/uidev/assets/grab-help/controller-grip-joy.svg
index cb8261a3..848483d9 120000
--- a/uidev/assets/grab-help/controller-grip-joy.svg
+++ b/uidev/assets/grab-help/controller-grip-joy.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/grab-help/controller-grip-joy.svg
\ No newline at end of file
+../../../wayvr/src/assets/grab-help/controller-grip-joy.svg
\ No newline at end of file
diff --git a/uidev/assets/grab-help/controller-grip-trigger-joy.svg b/uidev/assets/grab-help/controller-grip-trigger-joy.svg
index ef9258bf..62133bce 120000
--- a/uidev/assets/grab-help/controller-grip-trigger-joy.svg
+++ b/uidev/assets/grab-help/controller-grip-trigger-joy.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/grab-help/controller-grip-trigger-joy.svg
\ No newline at end of file
+../../../wayvr/src/assets/grab-help/controller-grip-trigger-joy.svg
\ No newline at end of file
diff --git a/uidev/assets/grab-help/controller.svg b/uidev/assets/grab-help/controller.svg
index c26f9017..ad21aff3 120000
--- a/uidev/assets/grab-help/controller.svg
+++ b/uidev/assets/grab-help/controller.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/grab-help/controller.svg
\ No newline at end of file
+../../../wayvr/src/assets/grab-help/controller.svg
\ No newline at end of file
diff --git a/uidev/assets/gui/watch.xml b/uidev/assets/gui/watch.xml
deleted file mode 120000
index 9135c1ca..00000000
--- a/uidev/assets/gui/watch.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../wlx-overlay-s/src/assets/gui/watch.xml
\ No newline at end of file
diff --git a/uidev/assets/sound/wgui_button_press.mp3 b/uidev/assets/sound/wgui_button_press.mp3
index 2425ade4..a1917e8f 120000
--- a/uidev/assets/sound/wgui_button_press.mp3
+++ b/uidev/assets/sound/wgui_button_press.mp3
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/sound/wgui_button_press.mp3
\ No newline at end of file
+../../../wayvr/src/assets/sound/wgui_button_press.mp3
\ No newline at end of file
diff --git a/uidev/assets/sound/wgui_button_release.mp3 b/uidev/assets/sound/wgui_button_release.mp3
index 7511fdc4..a8a89882 120000
--- a/uidev/assets/sound/wgui_button_release.mp3
+++ b/uidev/assets/sound/wgui_button_release.mp3
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/sound/wgui_button_release.mp3
\ No newline at end of file
+../../../wayvr/src/assets/sound/wgui_button_release.mp3
\ No newline at end of file
diff --git a/uidev/assets/sound/wgui_checkbox_check.mp3 b/uidev/assets/sound/wgui_checkbox_check.mp3
index d7905869..2afd9215 120000
--- a/uidev/assets/sound/wgui_checkbox_check.mp3
+++ b/uidev/assets/sound/wgui_checkbox_check.mp3
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/sound/wgui_checkbox_check.mp3
\ No newline at end of file
+../../../wayvr/src/assets/sound/wgui_checkbox_check.mp3
\ No newline at end of file
diff --git a/uidev/assets/sound/wgui_checkbox_uncheck.mp3 b/uidev/assets/sound/wgui_checkbox_uncheck.mp3
index 13da97db..29046cd7 120000
--- a/uidev/assets/sound/wgui_checkbox_uncheck.mp3
+++ b/uidev/assets/sound/wgui_checkbox_uncheck.mp3
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/sound/wgui_checkbox_uncheck.mp3
\ No newline at end of file
+../../../wayvr/src/assets/sound/wgui_checkbox_uncheck.mp3
\ No newline at end of file
diff --git a/uidev/assets/sound/wgui_mouse_enter.mp3 b/uidev/assets/sound/wgui_mouse_enter.mp3
index 6971fa14..45608905 120000
--- a/uidev/assets/sound/wgui_mouse_enter.mp3
+++ b/uidev/assets/sound/wgui_mouse_enter.mp3
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/sound/wgui_mouse_enter.mp3
\ No newline at end of file
+../../../wayvr/src/assets/sound/wgui_mouse_enter.mp3
\ No newline at end of file
diff --git a/uidev/assets/watch/controller_l.svg b/uidev/assets/watch/controller_l.svg
index c77227ec..7605e791 120000
--- a/uidev/assets/watch/controller_l.svg
+++ b/uidev/assets/watch/controller_l.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/controller_l.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/controller_l.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/controller_r.svg b/uidev/assets/watch/controller_r.svg
index 34384180..ea604f70 120000
--- a/uidev/assets/watch/controller_r.svg
+++ b/uidev/assets/watch/controller_r.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/controller_r.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/controller_r.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/display.svg b/uidev/assets/watch/display.svg
new file mode 120000
index 00000000..24591d63
--- /dev/null
+++ b/uidev/assets/watch/display.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/watch/display.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/edit.svg b/uidev/assets/watch/edit.svg
index 9955b795..b8aa1781 120000
--- a/uidev/assets/watch/edit.svg
+++ b/uidev/assets/watch/edit.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/edit.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/edit.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/fix-floor.svg b/uidev/assets/watch/fix-floor.svg
index ac0b9a1b..096e60eb 120000
--- a/uidev/assets/watch/fix-floor.svg
+++ b/uidev/assets/watch/fix-floor.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/fix-floor.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/fix-floor.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/hmd.svg b/uidev/assets/watch/hmd.svg
index fabe502d..6207493e 120000
--- a/uidev/assets/watch/hmd.svg
+++ b/uidev/assets/watch/hmd.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/hmd.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/hmd.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/home.svg b/uidev/assets/watch/home.svg
index f27eb010..dad2f7ed 120000
--- a/uidev/assets/watch/home.svg
+++ b/uidev/assets/watch/home.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/home.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/home.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/keyboard.svg b/uidev/assets/watch/keyboard.svg
index acfa4fb4..d568189f 120000
--- a/uidev/assets/watch/keyboard.svg
+++ b/uidev/assets/watch/keyboard.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/keyboard.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/keyboard.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/mirror-off.svg b/uidev/assets/watch/mirror-off.svg
index d27dbd54..ee0c86e3 120000
--- a/uidev/assets/watch/mirror-off.svg
+++ b/uidev/assets/watch/mirror-off.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/mirror-off.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/mirror-off.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/recenter.svg b/uidev/assets/watch/recenter.svg
index 063f53f8..b89a1f00 120000
--- a/uidev/assets/watch/recenter.svg
+++ b/uidev/assets/watch/recenter.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/recenter.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/recenter.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/restart.svg b/uidev/assets/watch/restart.svg
index 487ddd38..77983e86 120000
--- a/uidev/assets/watch/restart.svg
+++ b/uidev/assets/watch/restart.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/restart.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/restart.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/set2.svg b/uidev/assets/watch/set2.svg
index 72ed831b..4b50a753 120000
--- a/uidev/assets/watch/set2.svg
+++ b/uidev/assets/watch/set2.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/set2.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/set2.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/settings.svg b/uidev/assets/watch/settings.svg
index 7cb5bcdb..1d2d39f1 120000
--- a/uidev/assets/watch/settings.svg
+++ b/uidev/assets/watch/settings.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/settings.svg
\ No newline at end of file
+../../../wayvr/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
index 15660af1..885489bb 120000
--- a/uidev/assets/watch/track.svg
+++ b/uidev/assets/watch/track.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/track.svg
\ No newline at end of file
+../../../wayvr/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
index eb98b02b..e15751fa 120000
--- a/uidev/assets/watch/track2.svg
+++ b/uidev/assets/watch/track2.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/track2.svg
\ No newline at end of file
+../../../wayvr/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
index 3a888787..e3b6d811 120000
--- a/uidev/assets/watch/track3.svg
+++ b/uidev/assets/watch/track3.svg
@@ -1 +1 @@
-../../../wlx-overlay-s/src/assets/watch/track3.svg
\ No newline at end of file
+../../../wayvr/src/assets/watch/track3.svg
\ No newline at end of file
diff --git a/uidev/assets/watch/wayvr_dashboard_mono.svg b/uidev/assets/watch/wayvr_dashboard_mono.svg
new file mode 120000
index 00000000..586e3281
--- /dev/null
+++ b/uidev/assets/watch/wayvr_dashboard_mono.svg
@@ -0,0 +1 @@
+../../../wayvr/src/assets/watch/wayvr_dashboard_mono.svg
\ No newline at end of file