diff --git a/scripts/translator/main.ts b/scripts/translator/main.ts
index 134ef767..7e04e9c3 100644
--- a/scripts/translator/main.ts
+++ b/scripts/translator/main.ts
@@ -19,7 +19,12 @@ if (template_name === undefined) {
 }
 
 if (lang_path === undefined) {
-  console.log("LANG_PATH is not set. Try one of these:\n\nLANG_PATH=../../uidev/assets/lang/ ./run.sh\nLANG_PATH=../../dash-frontend/assets/lang/ ./run.sh\n");
+  console.log(
+    `LANG_PATH is not set.
+Try one of these:
+LANG_PATH=../../uidev/assets/lang/ ./run.sh
+LANG_PATH=../../dash-frontend/assets/lang/ ./run.sh
+LANG_PATH=../../wlx-overlay-s/src/assets/lang/ ./run.sh`);
   exit(-1);
 }
 
diff --git a/wgui/doc/widgets.md b/wgui/doc/widgets.md
index 0587c256..a1f6573d 100644
--- a/wgui/doc/widgets.md
+++ b/wgui/doc/widgets.md
@@ -104,6 +104,10 @@ _Translated by key_
 
 _Text size in pixel units_
 
+`wrap`: "1" | "0" (default: "0")
+
+_Enable text wrapping?_
+
 `color`: #FFAABB | #FFAABBCC
 
 `align`: "left" | "right" | "center" | "justified" | "end"
diff --git a/wgui/src/components/tooltip.rs b/wgui/src/components/tooltip.rs
index 00c29151..ec8e0167 100644
--- a/wgui/src/components/tooltip.rs
+++ b/wgui/src/components/tooltip.rs
@@ -86,8 +86,8 @@ impl Drop for ComponentTooltip {
 	}
 }
 
-pub const TOOLTIP_COLOR: Color = Color::new(0.1, 0.1, 0.1, 0.9);
-pub const TOOLTIP_BORDER_COLOR: Color = Color::new(0.3, 0.3, 0.3, 1.0);
+pub const TOOLTIP_COLOR: Color = Color::new(0.02, 0.02, 0.02, 0.95);
+pub const TOOLTIP_BORDER_COLOR: Color = Color::new(0.4, 0.4, 0.4, 1.0);
 
 #[allow(clippy::too_many_lines)]
 pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentTooltip>)> {
diff --git a/wgui/src/drawing.rs b/wgui/src/drawing.rs
index 4f4b4c40..123d84f2 100644
--- a/wgui/src/drawing.rs
+++ b/wgui/src/drawing.rs
@@ -9,7 +9,7 @@ use crate::{
 	event::EventAlterables,
 	globals::Globals,
 	layout::Widget,
-	renderer_vk::text::{TextShadow, custom_glyph::CustomGlyph},
+	renderer_vk::text::{custom_glyph::CustomGlyph, TextShadow},
 	stack::{self, ScissorBoundary, ScissorStack, TransformStack},
 	widget::{self, ScrollbarInfo, WidgetState},
 };
diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs
index cd137ee9..6afd0fdb 100644
--- a/wgui/src/parser/mod.rs
+++ b/wgui/src/parser/mod.rs
@@ -8,7 +8,7 @@ mod widget_rectangle;
 mod widget_sprite;
 
 use crate::{
-	assets::{AssetPath, AssetPathOwned, normalize_path},
+	assets::{normalize_path, AssetPath, AssetPathOwned},
 	components::{Component, ComponentWeak},
 	drawing::{self},
 	globals::WguiGlobals,
diff --git a/wgui/src/parser/widget_label.rs b/wgui/src/parser/widget_label.rs
index 2ef6ddc8..71c567ef 100644
--- a/wgui/src/parser/widget_label.rs
+++ b/wgui/src/parser/widget_label.rs
@@ -2,7 +2,8 @@ use crate::{
 	i18n::Translation,
 	layout::WidgetID,
 	parser::{
-		AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal,
+		AttribPair, ParserContext, ParserFile, parse_check_i32, parse_children, parse_i32, parse_widget_universal,
+		print_invalid_attrib,
 		style::{parse_style, parse_text_style},
 	},
 	widget::label::{WidgetLabel, WidgetLabelParams},
@@ -23,6 +24,13 @@ pub fn parse_widget_label<'a>(
 	for pair in attribs {
 		let (key, value) = (pair.attrib.as_ref(), pair.value.as_ref());
 		match key {
+			"wrap" => {
+				if let Some(num) = parse_i32(value) {
+					params.style.wrap = num == 1;
+				} else {
+					print_invalid_attrib(key, value);
+				}
+			}
 			"text" => {
 				if !value.is_empty() {
 					params.content = Translation::from_raw_text(value);
diff --git a/wlx-overlay-s/src/assets/edit/close.svg b/wlx-overlay-s/src/assets/edit/close.svg
new file mode 100644
index 00000000..1aeb3985
--- /dev/null
+++ b/wlx-overlay-s/src/assets/edit/close.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24">
+  <path fill="white" d="M8.4 17L7 15.6l3.6-3.6L7 8.425l1.4-1.4l3.6 3.6l3.575-3.6l1.4 1.4l-3.6 3.575l3.6 3.6l-1.4 1.4L12 13.4z" />
+</svg>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/gui/edit.xml b/wlx-overlay-s/src/assets/gui/edit.xml
index cfe5d42d..111579d3 100644
--- a/wlx-overlay-s/src/assets/gui/edit.xml
+++ b/wlx-overlay-s/src/assets/gui/edit.xml
@@ -44,7 +44,7 @@
                 <TopButton sticky="0" id="top_pos" src="edit/anchor.svg" tooltip="EDIT_MODE.POSITIONING" press="::EditModeTab pos" />
                 <TopButton sticky="0" id="top_alpha" src="edit/fade.svg" tooltip="EDIT_MODE.OPACITY" press="::EditModeTab alpha" />
                 <TopButton sticky="0" id="top_curve" src="edit/curve.svg" tooltip="EDIT_MODE.ADJUST_CURVATURE" press="::EditModeTab curve" />
-                <TopButton sticky="0" id="top_stereo" src="edit/3d.svg" tooltip="EDIT_MODE.STEREO_MODE" press="::EditModeTab stereo" />
+                <TopButton sticky="0" id="top_stereo" src="edit/3d.svg" tooltip="EDIT_MODE.STEREO_3D_MODE.TITLE" press="::EditModeTab stereo" />
                 <!-- TopButton sticky="0" id="top_move" src="edit/move-all.svg" tooltip="EDIT_MODE.MOVE_PRESS_AND_DRAG" / -->
                 <!-- TopButton sticky="0" id="top_resize" src="edit/resize.svg" tooltip="EDIT_MODE.RESIZE_PRESS_AND_DRAG" / -->
                 <TopButtonDanger src="edit/delete.svg" tooltip="EDIT_MODE.DELETE" press="::EditModeDeletePress" release="::EditModeDeleteRelease" />
@@ -52,7 +52,7 @@
                 <TopButtonFaded src="watch/edit.svg" tooltip="EDIT_MODE.LEAVE" press="::EditToggle" />
               </div>
               <div id="tab_none" display="none" height="100">
-                  <label align="center" translation="EDIT_MODE.HINT_POINT_WINDOW" />
+                <label align="center" translation="EDIT_MODE.HINT_POINT_WINDOW" />
               </div>
               <div id="tab_pos" display="none" height="100" flex_direction="column">
                 <div padding="8" gap="8" justify_content="center" align_items="center">
@@ -70,11 +70,11 @@
               </div>
               <div id="tab_stereo" display="none" height="100" flex_direction="column">
                 <div padding="8" gap="8" justify_content="center" align_items="center">
-                  <PosButton id="stereo_none" src="edit/3d.svg" tooltip="EDIT_MODE.STEREO_NONE" press="::EditModeSetStereo none" />
-                  <PosButton id="stereo_leftright" src="edit/3d_leftright.svg" tooltip="EDIT_MODE.STEREO_LEFTRIGHT" press="::EditModeSetStereo leftright" />
-                  <PosButton id="stereo_rightleft" src="edit/3d_rightleft.svg" tooltip="EDIT_MODE.STEREO_RIGHTLEFT" press="::EditModeSetStereo rightleft" />
-                  <PosButton id="stereo_topbottom" src="edit/3d_topbottom.svg" tooltip="EDIT_MODE.STEREO_TOPBOTTOM" press="::EditModeSetStereo topbottom" />
-                  <PosButton id="stereo_bottomtop" src="edit/3d_bottomtop.svg" tooltip="EDIT_MODE.STEREO_BOTTOMTOP" press="::EditModeSetStereo bottomtop" />
+                  <PosButton id="stereo_none" src="edit/close.svg" tooltip="DISABLED" press="::EditModeSetStereo none" />
+                  <PosButton id="stereo_leftright" src="edit/3d_leftright.svg" tooltip="EDIT_MODE.STEREO_3D_MODE.SPLIT_LEFT_RIGHT" press="::EditModeSetStereo leftright" />
+                  <PosButton id="stereo_rightleft" src="edit/3d_rightleft.svg" tooltip="EDIT_MODE.STEREO_3D_MODE.SPLIT_RIGHT_LEFT" press="::EditModeSetStereo rightleft" />
+                  <PosButton id="stereo_topbottom" src="edit/3d_topbottom.svg" tooltip="EDIT_MODE.STEREO_3D_MODE.SPLIT_TOP_BOTTOM" press="::EditModeSetStereo topbottom" />
+                  <PosButton id="stereo_bottomtop" src="edit/3d_bottomtop.svg" tooltip="EDIT_MODE.STEREO_3D_MODE.SPLIT_BOTTOM_TOP" press="::EditModeSetStereo bottomtop" />
                 </div>
               </div>
               <div id="tab_alpha" display="none" height="100" padding="8" gap="8" justify_content="center" align_items="center">
@@ -98,4 +98,4 @@
       </rectangle>
     </div>
   </elements>
-</layout>
+</layout>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/gui/toast.xml b/wlx-overlay-s/src/assets/gui/toast.xml
index deb0ae99..c9169324 100644
--- a/wlx-overlay-s/src/assets/gui/toast.xml
+++ b/wlx-overlay-s/src/assets/gui/toast.xml
@@ -1,14 +1,27 @@
 <layout>
   <elements>
-    <div interactable="0" >
-      <rectangle max_width="500" max_height="400" padding="4" box_sizing="content_box" flex_wrap="wrap" flex_direction="row" gap="4" color="#000000c0" border_color="~color_accent" border="2" round="8" justify_content="space_between">
-        <div width="100%" padding="4">
-          <label text="toast title" id="toast_title" weight="bold" />
+    <div interactable="0">
+      <rectangle
+        max_width="500"
+        padding="16"
+        flex_direction="column"
+        gap="8"
+        color="#000000c0" border_color="~color_accent" border="2" round="8">
+
+        <!-- Toast title -->
+        <div flex_direction="row" align_items="center" gap="8">
+          <sprite src="icons/bell.svg" min_width="32" min_height="32" max_width="32" max_height="32" flex_grow="1" />
+          <label wrap="1" id="toast_title" weight="bold" size="25" padding_left="16" padding_right="16" />
         </div>
-        <div width="100%" height="100%" padding="4" flex_wrap="wrap">
-          <label text="toast body goes here" id="toast_body" wrap="1" />
+
+        <!-- A simple separator -->
+        <rectangle width="100%" height="2" color="~color_accent" />
+
+        <div>
+          <!-- Toast message -->
+          <label id="toast_body" wrap="1" size="20" padding_left="16" padding_right="16" />
         </div>
       </rectangle>
     </div>
   </elements>
-</layout>
+</layout>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/gui/watch.xml b/wlx-overlay-s/src/assets/gui/watch.xml
index 12da31fe..f656b4f2 100644
--- a/wlx-overlay-s/src/assets/gui/watch.xml
+++ b/wlx-overlay-s/src/assets/gui/watch.xml
@@ -1,34 +1,42 @@
 <layout>
   <theme>
     <var key="set_color" value="#cad3f5" />
+    <var key="bgcolor" value="#010206d5" />
 
     <var key="clock0_color" value="#cad3f5" />
     <var key="clock0_size" value="46" />
-    <var key="clock0_date_size" value="14" />
-    <var key="clock0_dow_size" value="14" />
+    <var key="clock0_date_size" value="16" />
+    <var key="clock0_dow_size" value="16" />
     <var key="clock_alt1_color" value="#8bd5ca" />
     <var key="clock_alt2_color" value="#b7bdf8" />
     <var key="clock_alt_size" value="24" />
     <var key="clock_alt_tz_size" value="14" />
   </theme>
 
+  <macro name="decorative_rect"
+    padding="8" color="~bgcolor"
+    border="2" border_color="~color_accent" round="8" />
+
   <macro name="button_style"
-    margin="2" overflow="hidden" box_sizing="border_box"
+    padding="8"
     border_color="~color_accent_translucent" border="2" round="8" color="~color_accent_5" color2="~color_accent_1" gradient="vertical"
     align_items="center" justify_content="center" />
 
   <template name="Device">
-    <div id="dev_${idx}" margin="2" display="none">
+    <rectangle id="dev_${idx}" macro="decorative_rect" padding_top="4" padding_bottom="4" display="none" align_items="center" gap="8">
       <sprite id="dev_${idx}_sprite" width="32" height="32" src="${src}" />
-      <!-- div margin_top="10" margin_left="-31" -->
-      <div position="absolute" margin_top="6" margin_left="4">
-        <label _source="battery" _device="${idx}" size="18" shadow="#000000" weight="bold" />
-      </div>
-    </div>
+      <label _source="battery" _device="${idx}" size="24" weight="bold" />
+    </rectangle>
   </template>
 
   <template name="Overlay">
-    <Button macro="button_style" padding="4" id="overlay_${idx}" text="WLX-${idx}" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::EditModeOverlayToggle ${idx}" />
+    <Button macro="button_style" id="overlay_${idx}"
+      tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::EditModeOverlayToggle ${idx}"
+      align_items="center"
+      height="40">
+      <sprite src_builtin="watch/display.svg" width="32" height="32" />
+      <label text="WLX-${idx}" size="18" />
+    </Button>
   </template>
 
   <template name="Set">
@@ -40,11 +48,18 @@
     </Button>
   </template>
 
-  <!-- Elements with id="norm_*" show in normal mode. -->
-  <!-- Elements with id="edit_*" show in edit mode. -->
+  <!-- 
+    [!!!!!!!!] Disclaimer [!!!!!!!!]
+    Elements with id="norm_*" show in normal mode.
+    Elements with id="edit_*" show in edit mode.
+  -->
   <elements>
-    <div width="460" height="260" padding="30" interactable="0" flex_direction="column">
-      <div padding="2" flex_direction="row" id="devices" interactable="0" >
+    <!-- padding="32" is required there (to make room for tooltips) -->
+    <div
+      padding="32" interactable="0"
+      flex_direction="column" gap="8">
+      <!-- Top elements (device battery levels) -->
+      <div flex_direction="row" id="devices" interactable="0" gap="8">
         <!-- Src here may be changed, but maintain order: HMD, Left, Right, Tracker -->
         <Device src="watch/hmd.svg" idx="0" />
         <Device src="watch/controller_l.svg" idx="1" />
@@ -52,60 +67,75 @@
         <Device src="watch/track.svg" idx="3" />
         <!-- Will populate additional <Device> tags at runtime -->
       </div>
-      <rectangle height="100%" padding="4" box_sizing="content_box" flex_wrap="wrap" flex_direction="column" gap="4" color="#000000c0" border_color="~color_accent" border="2" round="8" justify_content="space_between">
-        <div flex_direction="row" id="norm_pane">
-          <div flex_direction="column" padding="4">
-            <label text="23:59" _source="clock" _display="time" color="~clock0_color" size="~clock0_size" weight="bold" />
-            <div padding="2" gap="2" flex_direction="column">
-              <label text="22/2/2022" _source="clock" _display="date" color="~clock0_color" size="~clock0_date_size" weight="bold" />
-              <label text="Tuesday" _source="clock" _display="dow" color="~clock0_color" size="~clock0_dow_size" weight="bold" />
+
+      <!-- All other elements inside the container -->
+      <div flex_direction="column" gap="8">
+        <rectangle macro="decorative_rect" flex_direction="row" id="norm_pane" gap="8">
+          <!-- Clock, date and various timezones -->
+          <div gap="8">
+            <div flex_direction="column">
+              <label text="23:59" _source="clock" _display="time" color="~clock0_color" size="~clock0_size" weight="bold" />
+              <div padding="2" gap="2" flex_direction="column">
+                <label text="22/2/2022" _source="clock" _display="date" color="~clock0_color" size="~clock0_date_size" weight="bold" />
+                <label text="Tuesday" _source="clock" _display="dow" color="~clock0_color" size="~clock0_dow_size" weight="bold" />
+              </div>
+            </div>
+            <div flex_direction="column" gap="8">
+              <!-- Timezone names here are only placeholders. Set your timezones via ~/.config/wlxoverlay/conf.d -->
+              <div flex_direction="column">
+                <label text="Paris" _source="clock" _display="name" _timezone="0" color="~clock_alt1_color" size="~clock_alt_tz_size" weight="bold" />
+                <label text="23:59" _source="clock" _display="time" _timezone="0" color="~clock_alt1_color" size="~clock_alt_size" weight="bold" />
+              </div>
+              <div flex_direction="column">
+                <label text="New York" _source="clock" _display="name" _timezone="1" color="~clock_alt2_color" size="~clock_alt_tz_size" weight="bold" />
+                <label text="23:59" _source="clock" _display="time" _timezone="1" color="~clock_alt2_color" size="~clock_alt_size" weight="bold" />
+              </div>
             </div>
           </div>
-          <div width="10" height="100%" />
-          <div flex_direction="column" padding="4">
-            <!-- Timezone names here are only placeholders. Set your timezones via ~/.config/wlxoverlay/conf.d -->
-            <div padding="2" />
-            <label text="Paris" _source="clock" _display="name" _timezone="0" color="~clock_alt1_color" size="~clock_alt_tz_size" weight="bold" />
-            <label text="23:59" _source="clock" _display="time" _timezone="0" color="~clock_alt1_color" size="~clock_alt_size" weight="bold" />
-            <div padding="2" />
-            <label text="New York" _source="clock" _display="name" _timezone="1" color="~clock_alt2_color" size="~clock_alt_tz_size" weight="bold" />
-            <label text="23:59" _source="clock" _display="time" _timezone="1" color="~clock_alt2_color" size="~clock_alt_size" weight="bold" />
+
+          <!-- Four buttons -->
+          <div flex_direction="column" gap="8">
+            <div gap="8">
+              <Button macro="button_style" _press="::NewMirror" tooltip="WATCH.MIRROR" tooltip_side="left">
+                <sprite width="40" height="40" color="~set_color" src="edit/mirror.svg" />
+              </Button>
+              <Button macro="button_style" _press="::CleanupMirrors" tooltip="WATCH.CLEANUP_MIRRORS" tooltip_side="left">
+                <sprite width="40" height="40" color="~set_color" src="watch/mirror-off.svg" />
+              </Button>
+            </div>
+            <div gap="8">
+              <Button macro="button_style" _press="::PlayspaceRecenter" tooltip="WATCH.RECENTER" tooltip_side="left">
+                <sprite width="40" height="40" color="~set_color" src="watch/recenter.svg" />
+              </Button>
+              <Button macro="button_style" _press="::PlayspaceFixFloor" tooltip="WATCH.FIX_FLOOR" tooltip_side="left">
+                <sprite width="40" height="40" color="~set_color" src="watch/fix-floor.svg" />
+              </Button>
+            </div>
           </div>
-          <div padding="8" />
-          <div flex_direction="column" padding="4" gap="4">
-            <Button macro="button_style" _press="::NewMirror" tooltip="WATCH.MIRROR" tooltip_side="bottom">
-              <sprite width="40" height="40" color="~set_color" src="edit/mirror.svg" />
-            </Button>
-            <Button macro="button_style" _press="::CleanupMirrors" tooltip="WATCH.CLEANUP_MIRRORS" tooltip_side="bottom">
-              <sprite width="40" height="40" color="~set_color" src="watch/mirror-off.svg" />
-            </Button>
-          </div>
-          <div flex_direction="column" padding="4" gap="4">
-            <Button macro="button_style" _press="::PlayspaceRecenter" tooltip="WATCH.RECENTER" tooltip_side="bottom">
-              <sprite width="40" height="40" color="~set_color" src="watch/recenter.svg" />
-            </Button>
-            <Button macro="button_style" _press="::PlayspaceFixFloor" tooltip="WATCH.FIX_FLOOR" tooltip_side="bottom">
-              <sprite width="40" height="40" color="~set_color" src="watch/fix-floor.svg" />
-            </Button>
-          </div>
-        </div>
-        <div flex_direction="column" id="edit_pane" display="none" >
+        </rectangle>
+
+        <rectangle macro="decorative_rect" flex_direction="column" id="edit_pane" display="none" gap="8">
           <div flex_direction="column" padding="4" align_items="center" justify_content="center">
             <label translation="WATCH.EDIT_MODE_EXPLANATION" align="center" />
           </div>
-          <div flex_direction="row" flex_wrap="wrap" padding="4" align_items="center" justify_content="center" id="toolbox">
-            <Button macro="button_style" padding="4" translation="Keyboard" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" />
-            <!-- Will populate additional <Overlay> tags at runtime -->
-          </div>
-        </div>
-        <div flex_direction="row">
-          <div id="norm_dash">
-            <Button macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" id="norm_dash">
-              <sprite color="~set_color" width="40" height="40" src="watch/home.svg" />
-            </Button>
+          <div flex_direction="column" align_items="center" justify_content="center">
+            <div id="toolbox" gap="8" width="100%" flex_wrap="wrap">
+              <Button height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd">
+                <sprite src_builtin="watch/keyboard.svg" width="32" height="32" />
+                <label translation="EDIT_MODE.KEYBOARD" size="18" />
+              </Button>
+              <!-- Will populate additional <Overlay> tags at runtime -->
+            </div>
           </div>
+        </rectangle>
+
+        <!-- Bottom buttons -->
+        <div flex_direction="row" gap="4">
+          <Button macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top">
+            <sprite color="~set_color" width="40" height="40" src="watch/wayvr_dashboard_mono.svg" />
+          </Button>
           <div id="edit_delete" display="none">
-            <Button macro="button_style" _press="::EditModeDeleteDown" _release="::EditModeDeleteUp" tooltip="WATCH.LONG_PRESS_TO_DELETE_SET" tooltip_side="top" border_color="~color_danger_translucent" color="~color_danger_5" color2="~color_danger_1" >
+            <Button macro="button_style" _press="::EditModeDeleteDown" _release="::EditModeDeleteUp" tooltip="WATCH.LONG_PRESS_TO_DELETE_SET" tooltip_side="top" border_color="~color_danger_translucent" color="~color_danger_5" color2="~color_danger_1">
               <sprite color="~set_color" width="40" height="40" src="edit/delete.svg" />
             </Button>
           </div>
@@ -122,7 +152,7 @@
             <sprite color="~set_color" width="40" height="40" src="watch/edit.svg" />
           </Button>
         </div>
-      </rectangle>
+      </div>
     </div>
   </elements>
-</layout>
+</layout>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/icons/bell.svg b/wlx-overlay-s/src/assets/icons/bell.svg
new file mode 100644
index 00000000..4d98bf97
--- /dev/null
+++ b/wlx-overlay-s/src/assets/icons/bell.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
+  <path fill="white" d="M12 18.5q.625 0 1.063-.437T13.5 17h-3q0 .625.438 1.063T12 18.5M7 16h10v-2h-1v-2.6q0-1.525-.788-2.787T13 7V5.5h-2V7q-1.425.35-2.212 1.613T8 11.4V14H7zm5 6q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22" />
+</svg>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/de.json b/wlx-overlay-s/src/assets/lang/de.json
index eb947e68..ac6a9abe 100644
--- a/wlx-overlay-s/src/assets/lang/de.json
+++ b/wlx-overlay-s/src/assets/lang/de.json
@@ -35,6 +35,17 @@
     "POS_HMD": "Folge dem HMD.",
     "POS_HAND_L": "Folge der linken Hand.",
     "POS_HAND_R": "Folge der rechten Hand.",
-    "INTERPOLATION": "Interpolation"
-  }
-}
+    "INTERPOLATION": "Interpolation",
+    "KEYBOARD": "Tastatur",
+    "STEREO_3D_MODE_A": {},
+    "STEREO_3D_MODE": {
+      "TITLE": "3D Stereoklangmodus",
+      "SPLIT_LEFT_RIGHT": "LINKS→RECHTS",
+      "SPLIT_RIGHT_LEFT": "RECHTS→LINKS",
+      "SPLIT_TOP_BOTTOM": "OBEN→UNTEN",
+      "SPLIT_BOTTOM_TOP": "UNTEN→OBEN"
+    },
+    "STEREO_3D_MODE_": {}
+  },
+  "DISABLED": "Deaktiviert"
+}
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/en.json b/wlx-overlay-s/src/assets/lang/en.json
index cf2e77a0..84bee535 100644
--- a/wlx-overlay-s/src/assets/lang/en.json
+++ b/wlx-overlay-s/src/assets/lang/en.json
@@ -1,40 +1,49 @@
 {
-  "ANCHOR": {
-    "CENTER": "Center"
-  },
-  "WATCH": {
-    "MIRROR": "Add a new mirror overlay",
-    "CLEANUP_MIRRORS": "Remove mirrors that are\nnot currently visible",
-    "RECENTER": "Recenter playspace",
-    "FIX_FLOOR": "Fix floor level",
-    "EDIT_MODE_EXPLANATION": "Overlays can now be moved and tuned individually.\nControl which overlays are visible on this set:",
-    "DASHBOARD": "Dashboard",
-    "EDIT_MODE": "Edit Mode",
-    "ADD_NEW_SET": "Add a new set",
-    "SWITCH_TO_SET": "Switch to set",
-    "TOGGLE_FOR_CURRENT_SET": "Toggle for current set",
-    "LONG_PRESS_TO_DELETE_SET": "Hold to delete"
-  },
-  "EDIT_MODE": {
-    "ADJUST_CURVATURE": "Adjust curvature",
-    "ALPHA_BLEND_MODE": "Alpha blend mode",
-    "BLENDING_ADDITIVE": "Additive blending",
-    "CURVATURE": "Curvature",
-    "DELETE": "Long press to remove from current set",
-    "HINT_POINT_WINDOW": "Point at a window to change its parameters.\nOnce done, leave edit mode using the button on the right.",
-    "LEAVE": "Leave edit mode",
-    "LOCK_INTERACTION": "Lock interaction",
-    "DISABLE_GRAB": "Disable grab",
-    "MOVE_PRESS_AND_DRAG": "Move (press & drag)",
-    "OPACITY": "Opacity",
-    "POSITIONING": "Positioning",
-    "RESIZE_PRESS_AND_DRAG": "Resize (press & drag)",
-    "POS_STATIC": "Static: Stay in place and never recenter.",
-    "POS_ANCHORED": "Anchored: Moves together with the rest of the set. Default.",
-    "POS_FLOATING": "Floating: Stay in place, recenter when shown.",
-    "POS_HMD": "Follow the HMD.",
-    "POS_HAND_L": "Follow the left hand.",
-    "POS_HAND_R": "Follow the right hand.",
-    "INTERPOLATION": "Interpolation"
-  }
+	"ANCHOR": {
+		"CENTER": "Center"
+	},
+	"DISABLED": "Disabled",
+	"EDIT_MODE": {
+		"ADJUST_CURVATURE": "Adjust curvature",
+		"ALPHA_BLEND_MODE": "Alpha blend mode",
+		"BLENDING_ADDITIVE": "Additive blending",
+		"CURVATURE": "Curvature",
+		"DELETE": "Long press to remove from current set",
+		"DISABLE_GRAB": "Disable grab",
+		"HINT_POINT_WINDOW": "Point at a window to change its parameters.\nOnce done, leave edit mode using the button on the right.",
+		"INTERPOLATION": "Interpolation",
+		"KEYBOARD": "Keyboard",
+		"LEAVE": "Leave edit mode",
+		"LOCK_INTERACTION": "Lock interaction",
+		"MOVE_PRESS_AND_DRAG": "Move (press & drag)",
+		"OPACITY": "Opacity",
+		"POS_ANCHORED": "Anchored: Moves together with the rest of the set. Default.",
+		"POS_FLOATING": "Floating: Stay in place, recenter when shown.",
+		"POS_HAND_L": "Follow the left hand.",
+		"POS_HAND_R": "Follow the right hand.",
+		"POS_HMD": "Follow the HMD.",
+		"POS_STATIC": "Static: Stay in place and never recenter.",
+		"POSITIONING": "Positioning",
+		"RESIZE_PRESS_AND_DRAG": "Resize (press & drag)",
+		"STEREO_3D_MODE": {
+			"SPLIT_BOTTOM_TOP": "BOTTOM→TOP",
+			"SPLIT_LEFT_RIGHT": "LEFT→RIGHT",
+			"SPLIT_RIGHT_LEFT": "RIGHT→LEFT",
+			"SPLIT_TOP_BOTTOM": "TOP→BOTTOM",
+			"TITLE": "3D Stereo Mode"
+		}
+	},
+	"WATCH": {
+		"ADD_NEW_SET": "Add a new set",
+		"CLEANUP_MIRRORS": "Remove mirrors that are\nnot currently visible",
+		"DASHBOARD": "Dashboard",
+		"EDIT_MODE": "Edit Mode",
+		"EDIT_MODE_EXPLANATION": "Overlays can now be moved and tuned individually.\nControl which overlays are visible on this set:",
+		"FIX_FLOOR": "Fix floor level",
+		"LONG_PRESS_TO_DELETE_SET": "Hold to delete",
+		"MIRROR": "Add a new mirror overlay",
+		"RECENTER": "Recenter playspace",
+		"SWITCH_TO_SET": "Switch to set",
+		"TOGGLE_FOR_CURRENT_SET": "Toggle for current set"
+	}
 }
diff --git a/wlx-overlay-s/src/assets/lang/es.json b/wlx-overlay-s/src/assets/lang/es.json
index 3efe90e7..8462baca 100644
--- a/wlx-overlay-s/src/assets/lang/es.json
+++ b/wlx-overlay-s/src/assets/lang/es.json
@@ -35,6 +35,17 @@
     "POS_HMD": "Seguir el HMD.",
     "POS_HAND_L": "Seguir la mano izquierda.",
     "POS_HAND_R": "Seguir la mano derecha.",
-    "INTERPOLATION": "Interpolación"
-  }
-}
+    "INTERPOLATION": "Interpolación",
+    "KEYBOARD": "Teclado",
+    "STEREO_3D_MODE_A": {},
+    "STEREO_3D_MODE": {
+      "TITLE": "Modo Estéreo 3D",
+      "SPLIT_LEFT_RIGHT": "IZQ→DER",
+      "SPLIT_RIGHT_LEFT": "DERECHA→IZQUIERDA",
+      "SPLIT_TOP_BOTTOM": "ARRIBA→ABAJO",
+      "SPLIT_BOTTOM_TOP": "ABAJO→ARRIBA"
+    },
+    "STEREO_3D_MODE_": {}
+  },
+  "DISABLED": "Deshabilitado"
+}
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/ja.json b/wlx-overlay-s/src/assets/lang/ja.json
index eab02d9f..745b58b8 100644
--- a/wlx-overlay-s/src/assets/lang/ja.json
+++ b/wlx-overlay-s/src/assets/lang/ja.json
@@ -35,6 +35,17 @@
     "POS_HMD": "HMD に追従する。",
     "POS_HAND_L": "左手に追従する。",
     "POS_HAND_R": "右手に追従する。",
-    "INTERPOLATION": "補間"
-  }
-}
+    "INTERPOLATION": "補間",
+    "KEYBOARD": "キーボード",
+    "STEREO_3D_MODE_A": {},
+    "STEREO_3D_MODE": {
+      "TITLE": "ステレオ3Dモード",
+      "SPLIT_LEFT_RIGHT": "左→右",
+      "SPLIT_RIGHT_LEFT": "右→左",
+      "SPLIT_TOP_BOTTOM": "上→下",
+      "SPLIT_BOTTOM_TOP": "下→上"
+    },
+    "STEREO_3D_MODE_": {}
+  },
+  "DISABLED": "無効"
+}
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/pl.json b/wlx-overlay-s/src/assets/lang/pl.json
index 7221a114..a418e0e6 100644
--- a/wlx-overlay-s/src/assets/lang/pl.json
+++ b/wlx-overlay-s/src/assets/lang/pl.json
@@ -1,40 +1,49 @@
 {
-	"ANCHOR": {
-		"CENTER": "Centrum"
-	},
-	"WATCH": {
-		"MIRROR": "Dodaj nowy widok lustrzany",
-		"CLEANUP_MIRRORS": "Usuń widoki lustrzane, które\nnie są obecnie widoczne",
-		"RECENTER": "Wyśrodkuj przestrzeń gry",
-		"FIX_FLOOR": "Napraw wysokość podłogi",
-		"EDIT_MODE_EXPLANATION": "Nakładki można teraz przesuwać i dostosowywać indywidualnie.\nPrzełącz nakładki dla bieżącego zestawu:",
-		"DASHBOARD": "Pulpit",
-		"EDIT_MODE": "Tryb edycji",
-		"ADD_NEW_SET": "Dodaj nowy zestaw",
-		"SWITCH_TO_SET": "Przełącz na zestaw",
-		"TOGGLE_FOR_CURRENT_SET": "Przełącz widoczność w bieżącym zestawie",
-		"LONG_PRESS_TO_DELETE_SET": "Przytrzymaj, aby usunąć zestaw"
-	},
-	"EDIT_MODE": {
-		"ADJUST_CURVATURE": "Dostosuj zakrzywienie",
-		"ALPHA_BLEND_MODE": "Tryb mieszania kolorów",
-		"BLENDING_ADDITIVE": "Addytywne",
-		"CURVATURE": "Zakrzywienie",
-		"DELETE": "Usuń",
-		"HINT_POINT_WINDOW": "Wskaż na okno, aby zmienić jego parametry.\nPo zakończeniu wyjdź z trybu edycji za pomocą przycisku po prawej stronie.",
-		"LEAVE": "Wyjdź z trybu edycji",
-		"LOCK_INTERACTION": "Zablokuj interakcję",
+  "ANCHOR": {
+    "CENTER": "Centrum"
+  },
+  "WATCH": {
+    "MIRROR": "Dodaj nowy widok lustrzany",
+    "CLEANUP_MIRRORS": "Usuń widoki lustrzane, które\nnie są obecnie widoczne",
+    "RECENTER": "Wyśrodkuj przestrzeń gry",
+    "FIX_FLOOR": "Napraw wysokość podłogi",
+    "EDIT_MODE_EXPLANATION": "Nakładki można teraz przesuwać i dostosowywać indywidualnie.\nPrzełącz nakładki dla bieżącego zestawu:",
+    "DASHBOARD": "Pulpit",
+    "EDIT_MODE": "Tryb edycji",
+    "ADD_NEW_SET": "Dodaj nowy zestaw",
+    "SWITCH_TO_SET": "Przełącz na zestaw",
+    "TOGGLE_FOR_CURRENT_SET": "Przełącz widoczność w bieżącym zestawie",
+    "LONG_PRESS_TO_DELETE_SET": "Przytrzymaj, aby usunąć zestaw"
+  },
+  "EDIT_MODE": {
+    "ADJUST_CURVATURE": "Dostosuj zakrzywienie",
+    "ALPHA_BLEND_MODE": "Tryb mieszania kolorów",
+    "BLENDING_ADDITIVE": "Addytywne",
+    "CURVATURE": "Zakrzywienie",
+    "DELETE": "Usuń",
+    "HINT_POINT_WINDOW": "Wskaż na okno, aby zmienić jego parametry.\nPo zakończeniu wyjdź z trybu edycji za pomocą przycisku po prawej stronie.",
+    "LEAVE": "Wyjdź z trybu edycji",
+    "LOCK_INTERACTION": "Zablokuj interakcję",
     "DISABLE_GRAB": "Wyłącz chwytanie",
-		"MOVE_PRESS_AND_DRAG": "Przesuń (naciśnij i przeciągnij)",
-		"OPACITY": "Przezroczystość",
-		"POSITIONING": "Pozycjonowanie",
-		"RESIZE_PRESS_AND_DRAG": "Zmień rozmiar (naciśnij i przeciągnij)",
-		"POS_STATIC": "Statyczne: Pozostaje w miejscu i nigdy nie jest ponownie wyśrodkowywane.",
-		"POS_ANCHORED": "Zakotwiczone: Porusza się razem z resztą zestawu. Domyślne.",
-		"POS_FLOATING": "Pływające: Pozostaje w miejscu, ponownie się wyśrodkowuje po pokazaniu.",
-		"POS_HMD": "Podążaj za HMD.",
-		"POS_HAND_L": "Podążaj za lewą dłonią.",
-		"POS_HAND_R": "Podążaj za prawą dłonią.",
-		"INTERPOLATION": "Interpolacja"
-	}
-}
+    "MOVE_PRESS_AND_DRAG": "Przesuń (naciśnij i przeciągnij)",
+    "OPACITY": "Przezroczystość",
+    "POSITIONING": "Pozycjonowanie",
+    "RESIZE_PRESS_AND_DRAG": "Zmień rozmiar (naciśnij i przeciągnij)",
+    "POS_STATIC": "Statyczne: Pozostaje w miejscu i nigdy nie jest ponownie wyśrodkowywane.",
+    "POS_ANCHORED": "Zakotwiczone: Porusza się razem z resztą zestawu. Domyślne.",
+    "POS_FLOATING": "Pływające: Pozostaje w miejscu, ponownie się wyśrodkowuje po pokazaniu.",
+    "POS_HMD": "Podążaj za HMD.",
+    "POS_HAND_L": "Podążaj za lewą dłonią.",
+    "POS_HAND_R": "Podążaj za prawą dłonią.",
+    "INTERPOLATION": "Interpolacja",
+    "KEYBOARD": "Klawiatura",
+    "STEREO_3D_MODE": {
+      "SPLIT_BOTTOM_TOP": "DOŁ→GÓRA",
+      "SPLIT_LEFT_RIGHT": "LEWO→PRAWO",
+      "SPLIT_RIGHT_LEFT": "PRAWO→LEWO",
+      "SPLIT_TOP_BOTTOM": "GÓRA→DÓŁ",
+      "TITLE": "Tryb stereoskopowy 3D"
+    }
+  },
+  "DISABLED": "Wyłączone"
+}
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/watch/display.svg b/wlx-overlay-s/src/assets/watch/display.svg
new file mode 100644
index 00000000..f749bdab
--- /dev/null
+++ b/wlx-overlay-s/src/assets/watch/display.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24">
+	<path fill="white" d="M2 16V4q0-.825.588-1.412T4 2h14v2H4v12zm9 6v-2H8q-.825 0-1.412-.587T6 18V8q0-.825.588-1.412T8 6h13q.825 0 1.413.588T23 8v10q0 .825-.587 1.413T21 20h-3v2zm-3-4h13V8H8zm6.5-5" />
+</svg>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/watch/wayvr_dashboard_mono.svg b/wlx-overlay-s/src/assets/watch/wayvr_dashboard_mono.svg
new file mode 100644
index 00000000..e2e7ad21
--- /dev/null
+++ b/wlx-overlay-s/src/assets/watch/wayvr_dashboard_mono.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="30"
+   height="30"
+   viewBox="0 0 7.9375004 7.9375004"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   sodipodi:docname="mono.svg"
+   inkscape:export-filename="dashboard_logo.png"
+   inkscape:export-xdpi="409.60001"
+   inkscape:export-ydpi="409.60001"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="16"
+     inkscape:cx="11.84375"
+     inkscape:cy="16.78125"
+     inkscape:window-width="1836"
+     inkscape:window-height="1080"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false">
+    <inkscape:grid
+       id="grid2"
+       units="mm"
+       originx="0"
+       originy="0"
+       spacingx="0.26458333"
+       spacingy="0.26458333"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       enabled="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="back"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.05833;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.5874998,3.7041664 v 1.3229167 h 1.3229166 v 1.3229165 l 1.3229165,-1e-7"
+       id="path3"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.05833;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1.5874998,2.6458332 V 1.5875 c 3.1749997,-2e-7 4.7624995,1.5874997 4.7624995,4.7624995 H 5.2916661"
+       id="path4"
+       sodipodi:nodetypes="cccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="front"
+     style="stroke-width:2.11667;stroke-dasharray:none" />
+</svg>