tldraw 3.16.0-internal.51e99e128bd4 → 3.16.0-internal.a478398270c6

package/src/lib/ui.css

@@ -1,15 +1,15 @@
 /* @tldraw/ui */
 
 .tl-container {
-	--tl-layer-above: 1;
-	--tl-layer-focused-input: 10;
-	--tl-layer-menu-click-capture: 250;
-	--tl-layer-panels: 300;
-	--tl-layer-menus: 400;
-	--tl-layer-toasts: 650;
-	--tl-layer-cursor: 700;
-	--tl-layer-header-footer: 999;
-	--tl-layer-following-indicator: 1000;
+	--layer-above: 1;
+	--layer-focused-input: 10;
+	--layer-menu-click-capture: 250;
+	--layer-panels: 300;
+	--layer-menus: 400;
+	--layer-toasts: 650;
+	--layer-cursor: 700;
+	--layer-header-footer: 999;
+	--layer-following-indicator: 1000;
 }
 
 /* Button */
@@ -33,23 +33,23 @@
 	text-rendering: optimizeLegibility;
 	font-size: 12px;
 	gap: 0px;
-	color: var(--tl-color-text-1);
+	color: var(--color-text-1);
 	z-index: 0;
 }
 
 .tlui-button:disabled {
-	color: var(--tl-color-text-3);
+	color: var(--color-text-3);
 	text-shadow: none;
 	cursor: default;
 }
 
 .tlui-button:disabled .tlui-kbd {
-	color: var(--tl-color-text-3);
+	color: var(--color-text-3);
 }
 
 .tlui-button > * {
 	position: relative;
-	z-index: var(--tl-layer-above);
+	z-index: var(--layer-above);
 }
 
 .tlui-button__label {
@@ -65,7 +65,7 @@
  */
 .tl-container__focused:not(.tl-container__no-focus-ring) .tlui-button:focus-visible {
 	border-radius: 10px;
-	outline: 2px solid var(--tl-color-focus);
+	outline: 2px solid var(--color-focus);
 	outline-offset: -5px;
 }
 .tl-container__focused:not(.tl-container__no-focus-ring) .tlui-button__tool:focus-visible {
@@ -73,7 +73,7 @@
 }
 .tlui-slider__container:has(.tlui-slider__thumb:focus-visible) {
 	border-radius: 10px;
-	outline: 2px solid var(--tl-color-focus);
+	outline: 2px solid var(--color-focus);
 	outline-offset: -5px;
 }
 
@@ -82,8 +82,8 @@
 	content: '';
 	position: absolute;
 	inset: 4px;
-	border-radius: var(--tl-radius-2);
-	background: var(--tl-color-muted-2);
+	border-radius: var(--radius-2);
+	background: var(--color-muted-2);
 	opacity: 0;
 }
 
@@ -93,18 +93,18 @@
 
 .tlui-button[data-isactive='true']::after,
 .tlui-button[data-isactive='true']:not(:disabled, :focus-visible):active:after {
-	background: var(--tl-color-hint);
+	background: var(--color-hint);
 	opacity: 1;
 }
 
-.tlui-button[aria-expanded='true'][data-direction='left'] {
-	background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+.tlui-button[aria-expanded='true'][data-direction='left']::after {
+	background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 	opacity: 1;
 }
 
 @media (hover: hover) {
 	.tlui-button[aria-expanded='true'][data-direction='left']:not(:hover)::after {
-		background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+		background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 		opacity: 1;
 	}
 
@@ -118,18 +118,18 @@
 }
 
 .tlui-button__icon + .tlui-button__label {
-	margin-left: var(--tl-space-2);
+	margin-left: var(--space-2);
 }
 
 /* Low button  */
 
 .tlui-button__low {
-	border-radius: var(--tl-radius-3);
-	background-color: var(--tl-color-low);
+	border-radius: var(--radius-3);
+	background-color: var(--color-low);
 }
 
 .tlui-button__low::after {
-	background-color: var(--tl-color-muted-2);
+	background-color: var(--color-muted-2);
 	opacity: 0;
 }
 
@@ -142,25 +142,31 @@
 /* Primary / danger buttons */
 
 .tlui-button__primary {
-	color: var(--tl-color-primary);
+	color: var(--color-primary);
 }
 
 .tlui-button__danger {
-	color: var(--tl-color-danger);
+	color: var(--color-danger);
 	text-shadow: none;
 }
 
 @media (hover: hover) {
 	.tlui-button__primary:not(:disabled, :focus-visible):hover {
-		color: var(--tl-color-primary);
+		color: var(--color-primary);
 	}
 
 	.tlui-button__danger:not(:disabled, :focus-visible):hover {
-		color: var(--tl-color-danger);
+		color: var(--color-danger);
 		text-shadow: none;
 	}
 }
 
+/* Panel button */
+
+.tlui-button__panel {
+	position: relative;
+}
+
 /* Menu button */
 
 .tlui-button__menu {
@@ -173,7 +179,7 @@
 
 .tlui-button__menu::after {
 	inset: 4px;
-	border-radius: var(--tl-radius-2);
+	border-radius: var(--radius-2);
 }
 
 .tlui-button__menu > .tlui-icon + .tlui-button__label {
@@ -201,26 +207,18 @@
 
 /* Tool lock button */
 
-.tlui-main-toolbar__lock-button {
+.tlui-toolbar__lock-button {
 	position: absolute;
+	top: 4px;
+	right: 0px;
 	pointer-events: all;
 	height: 40px;
 	width: 40px;
-	border-radius: var(--tl-radius-2);
-}
-
-.tlui-main-toolbar--horizontal .tlui-main-toolbar__lock-button {
-	top: 4px;
-	right: 0px;
 	min-width: 0px;
+	border-radius: var(--radius-2);
 }
 
-.tlui-main-toolbar--vertical .tlui-main-toolbar__lock-button {
-	bottom: 0px;
-	min-height: 0px;
-}
-
-.tlui-main-toolbar__lock-button::after {
+.tlui-toolbar__lock-button::after {
 	top: 4px;
 	left: 8px;
 	inset: 4px;
@@ -232,6 +230,16 @@
 	position: relative;
 	height: 48px;
 	width: 48px;
+	margin-left: -2px;
+	margin-right: -2px;
+}
+
+.tlui-button__tool:nth-of-type(1) {
+	margin-left: 0px;
+}
+
+.tlui-button__tool:nth-last-of-type(1) {
+	margin-right: 0px;
 }
 
 .tlui-button__tool::after {
@@ -240,64 +248,69 @@
 }
 
 .tlui-button__tool[aria-pressed='true'] {
-	color: var(--tl-color-selected-contrast);
+	color: var(--color-selected-contrast);
 }
 
 .tlui-button__tool[aria-pressed='true']:not(:disabled, :focus-visible):active {
-	color: var(--tl-color-selected-contrast);
+	color: var(--color-selected-contrast);
 }
 
 .tlui-button__tool[aria-pressed='true']:not(:disabled)::after {
-	background: var(--tl-color-selected);
+	background: var(--color-selected);
 	opacity: 1;
 }
 
-.tlui-layout__mobile .tlui-main-toolbar--horizontal .tlui-button__tool {
+.tlui-layout__mobile .tlui-button__tool {
 	height: 48px;
 	width: 43px;
 }
 
-.tlui-layout__mobile .tlui-main-toolbar--horizontal .tlui-button__tool > .tlui-icon {
+.tlui-layout__mobile .tlui-button__tool > .tlui-icon {
 	height: 16px;
 	width: 16px;
 }
 
-/* Row layout */
+/* Button Row */
 
-.tlui-row {
+.tlui-buttons__horizontal {
 	display: flex;
 	flex-direction: row;
-	padding: 0 2px;
 }
-.tlui-row > * {
+.tlui-buttons__horizontal > * {
 	margin-left: -2px;
 	margin-right: -2px;
 }
-
-/* Column layout */
-
-.tlui-column {
-	display: flex;
-	flex-direction: column;
-	padding: 2px 0;
+.tlui-buttons__horizontal > *:nth-child(1) {
+	margin-left: 0px;
 }
-.tlui-column > * {
-	margin-top: -2px;
-	margin-bottom: -2px;
+.tlui-buttons__horizontal > *:nth-last-child(1) {
+	margin-right: 0px;
 }
 
-/* Grid layout */
+/* Button Grid */
 
-.tlui-grid {
+.tlui-buttons__grid {
 	display: grid;
-	grid-template-columns: repeat(4, 1fr);
+	grid-template-columns: repeat(4, auto);
 	grid-auto-flow: row;
 	overflow: hidden;
-	padding: 2px;
 }
-.tlui-grid > * {
+.tlui-buttons__grid > .tlui-button {
 	margin: -2px;
 }
+.tlui-buttons__grid > .tlui-button:nth-of-type(4n),
+.tlui-buttons__vertical-align > .tlui-button:nth-of-type(3n) {
+	margin-right: 0px;
+}
+.tlui-buttons__grid > .tlui-button:nth-of-type(4n - 3) {
+	margin-left: 0px;
+}
+.tlui-buttons__grid > .tlui-button:nth-of-type(-n + 4) {
+	margin-top: 0px;
+}
+.tlui-buttons__grid > .tlui-button:nth-last-of-type(-n + 4) {
+	margin-bottom: 0px;
+}
 
 /* Zoom button */
 
@@ -321,9 +334,9 @@
 	pointer-events: none;
 	user-select: none;
 	contain: strict;
-	z-index: var(--tl-layer-panels);
+	z-index: var(--layer-panels);
 	transform: translate3d(0, 0, 0);
-	--tl-sab: env(safe-area-inset-bottom);
+	--sab: env(safe-area-inset-bottom);
 	font-weight: 500;
 	line-height: 1.6;
 	-webkit-font-smoothing: antialiased;
@@ -376,11 +389,11 @@
 	justify-content: flex-start;
 	align-items: flex-start;
 	width: min-content;
-	gap: var(--tl-space-3);
-	margin: var(--tl-space-2) var(--tl-space-3);
+	gap: var(--space-3);
+	margin: var(--space-2) var(--space-3);
 	white-space: nowrap;
 	pointer-events: none;
-	z-index: var(--tl-layer-panels);
+	z-index: var(--layer-panels);
 }
 
 /* ---------------------- Icon ---------------------- */
@@ -408,7 +421,7 @@
 
 .tlui-slider__container {
 	width: 100%;
-	padding: 0px var(--tl-space-4);
+	padding: 0px var(--space-4);
 }
 
 .tlui-slider {
@@ -434,7 +447,7 @@
 	content: '';
 	height: 3px;
 	width: 100%;
-	background-color: var(--tl-color-muted-1);
+	background-color: var(--color-muted-1);
 	border-radius: 14px;
 }
 
@@ -443,7 +456,7 @@
 	top: calc(50% - 2px);
 	left: 0px;
 	height: 3px;
-	background-color: var(--tl-color-selected);
+	background-color: var(--color-selected);
 	border-radius: 14px;
 }
 
@@ -455,16 +468,16 @@
 	height: 18px;
 	position: relative;
 	top: -1px;
-	background-color: var(--tl-color-panel);
+	background-color: var(--color-panel);
 	border-radius: 999px;
-	box-shadow: inset 0px 0px 0px 2px var(--tl-color-text-1);
+	box-shadow: inset 0px 0px 0px 2px var(--color-text-1);
 }
 
 .tlui-slider__thumb:active {
 	cursor: grabbing;
 	box-shadow:
-		inset 0px 0px 0px 2px var(--tl-color-text-1),
-		var(--tl-shadow-1);
+		inset 0px 0px 0px 2px var(--color-text-1),
+		var(--shadow-1);
 }
 
 /* ---------------------- Input --------------------- */
@@ -473,7 +486,7 @@
 	background: none;
 	margin: 0px;
 	position: relative;
-	z-index: var(--tl-layer-above);
+	z-index: var(--layer-above);
 	height: 40px;
 	max-height: 40px;
 	display: flex;
@@ -482,8 +495,8 @@
 	font-family: inherit;
 	font-size: 12px;
 	font-weight: inherit;
-	color: var(--tl-color-text-1);
-	padding: var(--tl-space-4);
+	color: var(--color-text-1);
+	padding: var(--space-4);
 	padding-left: 0px;
 	border: none;
 	outline: none;
@@ -499,8 +512,8 @@
 	height: 44px;
 	display: flex;
 	align-items: center;
-	gap: var(--tl-space-4);
-	color: var(--tl-color-text);
+	gap: var(--space-4);
+	color: var(--color-text);
 }
 
 .tlui-input__wrapper > .tlui-icon {
@@ -532,7 +545,7 @@
 	grid-auto-columns: minmax(1em, auto);
 	align-self: bottom;
 	color: currentColor;
-	margin-left: var(--tl-space-4);
+	margin-left: var(--space-4);
 }
 
 .tlui-kbd > span {
@@ -549,13 +562,13 @@
 }
 
 .tlui-kbd:not(:last-child) {
-	margin-right: var(--tl-space-2);
+	margin-right: var(--space-2);
 }
 
 /* Focus Mode Button */
 
 .tlui-focus-button {
-	z-index: var(--tl-layer-panels);
+	z-index: var(--layer-panels);
 	pointer-events: all;
 }
 
@@ -566,16 +579,16 @@
 }
 
 .tlui-menu {
-	z-index: var(--tl-layer-menus);
+	z-index: var(--layer-menus);
 	height: fit-content;
 	width: fit-content;
-	border-radius: var(--tl-radius-3);
+	border-radius: var(--radius-3);
 	pointer-events: all;
 	touch-action: auto;
 	overflow-y: auto;
 	overscroll-behavior: none;
-	background-color: var(--tl-color-panel);
-	box-shadow: var(--tl-shadow-3);
+	background-color: var(--color-panel);
+	box-shadow: var(--shadow-3);
 }
 
 .tlui-menu::-webkit-scrollbar {
@@ -593,7 +606,7 @@
 }
 
 .tlui-menu__group {
-	border-bottom: 1px solid var(--tl-color-divider);
+	border-bottom: 1px solid var(--color-divider);
 }
 .tlui-menu__group:nth-last-of-type(1) {
 	border-bottom: none;
@@ -603,23 +616,23 @@
 
 .tlui-menu__submenu__trigger[data-state='open']::after {
 	opacity: 1;
-	background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+	background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 }
 
 .tlui-menu__submenu__trigger[data-direction='left'][data-state='open']::after {
 	opacity: 1;
-	background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+	background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 }
 
 @media (hover: hover) {
 	.tlui-menu__submenu__trigger[data-state='open']:not(:hover)::after {
 		opacity: 1;
-		background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+		background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 	}
 
 	.tlui-menu__submenu__trigger[data-direction='left'][data-state='open']:not(:hover)::after {
 		opacity: 1;
-		background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+		background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 	}
 }
 
@@ -644,7 +657,7 @@
 .tlui-menu-click-capture {
 	position: fixed;
 	inset: 0;
-	z-index: var(--tl-layer-menu-click-capture);
+	z-index: var(--layer-menu-click-capture);
 }
 
 /* --------------------- Popover -------------------- */
@@ -660,10 +673,10 @@
 	max-height: calc(var(--radix-popover-content-available-height) - 8px);
 	margin: 0px;
 	border: none;
-	border-radius: var(--tl-radius-3);
-	background-color: var(--tl-color-panel);
-	box-shadow: var(--tl-shadow-3);
-	z-index: var(--tl-layer-menus);
+	border-radius: var(--radius-3);
+	background-color: var(--color-panel);
+	box-shadow: var(--shadow-3);
+	z-index: var(--layer-menus);
 	overflow: hidden;
 	overflow-y: auto;
 	touch-action: auto;
@@ -676,22 +689,22 @@
 
 .tlui-menu-zone {
 	position: relative;
-	z-index: var(--tl-layer-panels);
+	z-index: var(--layer-panels);
 	width: fit-content;
-	border-right: 2px solid var(--tl-color-background);
-	border-bottom: 2px solid var(--tl-color-background);
-	border-bottom-right-radius: var(--tl-radius-4);
-	background-color: var(--tl-color-low);
+	border-right: 2px solid var(--color-background);
+	border-bottom: 2px solid var(--color-background);
+	border-bottom-right-radius: var(--radius-4);
+	background-color: var(--color-low);
 }
 
 .tlui-menu-zone *[data-state='open']::after {
-	background: linear-gradient(180deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+	background: linear-gradient(180deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 	opacity: 1;
 }
 
 @media (hover: hover) {
 	.tlui-menu-zone *[data-state='open']:not(:hover)::after {
-		background: linear-gradient(180deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+		background: linear-gradient(180deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 		opacity: 1;
 	}
 }
@@ -717,8 +730,8 @@
 	align-items: center;
 	width: 100%;
 	height: 40px;
-	padding-left: var(--tl-space-4);
-	border-bottom: 1px solid var(--tl-color-divider);
+	padding-left: var(--space-4);
+	border-bottom: 1px solid var(--color-divider);
 }
 
 .tlui-page-menu__header > .tlui-button:nth-of-type(1) {
@@ -726,7 +739,7 @@
 }
 
 .tlui-page-menu__header__title {
-	color: var(--tl-color-text);
+	color: var(--color-text);
 	font-size: 12px;
 	flex-grow: 2;
 }
@@ -811,7 +824,7 @@
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
-	color: var(--tl-color-text);
+	color: var(--color-text);
 }
 
 .tlui-page_menu__item__sortable {
@@ -824,7 +837,7 @@
 	flex-direction: row;
 	align-items: center;
 	overflow: hidden;
-	z-index: var(--tl-layer-above);
+	z-index: var(--layer-above);
 }
 
 .tlui-page_menu__item__sortable__title {
@@ -836,7 +849,7 @@
 }
 
 .tlui-page_menu__item__sortable:focus-visible {
-	z-index: var(--tl-layer-focused-input);
+	z-index: var(--layer-focused-input);
 }
 
 .tlui-page_menu__item__sortable__handle {
@@ -845,7 +858,7 @@
 	min-width: 0px;
 	height: 40px;
 	cursor: grab;
-	color: var(--tl-color-text-3);
+	color: var(--color-text-3);
 	flex-shrink: 0;
 	margin-right: -9px;
 }
@@ -887,13 +900,13 @@
 }
 
 .tlui-page_menu__item__submenu > .tlui-button[data-state='open']::after {
-	background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+	background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 	opacity: 1;
 }
 
 @media (hover: hover) {
 	.tlui-page_menu__item__submenu > .tlui-button[data-state='open']:not(:hover)::after {
-		background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+		background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 		opacity: 1;
 	}
 }
@@ -929,7 +942,7 @@
 	top: 48px;
 	left: -9999px;
 	padding: 8px 16px;
-	z-index: var(--tl-layer-toasts);
+	z-index: var(--layer-toasts);
 }
 
 .tl-skip-to-main-content:focus {
@@ -941,17 +954,17 @@
 .tlui-offline-indicator {
 	display: flex;
 	flex-direction: row;
-	gap: var(--tl-space-3);
-	color: var(--tl-color-text);
-	background-color: var(--tl-color-low);
-	border: 3px solid var(--tl-color-background);
-	padding: 0px var(--tl-space-5);
+	gap: var(--space-3);
+	color: var(--color-text);
+	background-color: var(--color-low);
+	border: 3px solid var(--color-background);
+	padding: 0px var(--space-5);
 	height: 42px;
 	align-items: center;
 	justify-content: center;
 	border-radius: 99px;
 	opacity: 0;
-	animation: tl-fade-in;
+	animation: fade-in;
 	animation-duration: 0.12s;
 	animation-delay: 2s;
 	animation-fill-mode: forwards;
@@ -960,10 +973,10 @@
 /* ------------------- Style panel ------------------ */
 
 .tlui-style-panel__wrapper {
-	box-shadow: var(--tl-shadow-2);
-	border-radius: var(--tl-radius-3);
+	box-shadow: var(--shadow-2);
+	border-radius: var(--radius-3);
 	pointer-events: all;
-	background-color: var(--tl-color-panel);
+	background-color: var(--color-panel);
 	height: fit-content;
 	max-height: 100%;
 	margin: 8px;
@@ -972,7 +985,7 @@
 	overscroll-behavior: none;
 	overflow-y: auto;
 	overflow-x: hidden;
-	color: var(--tl-color-text);
+	color: var(--color-text);
 }
 /* if the style panel is the only child (ie no share menu), increase the margin */
 .tlui-style-panel__wrapper:only-child {
@@ -981,18 +994,12 @@
 
 .tlui-style-panel {
 	position: relative;
-	z-index: var(--tl-layer-panels);
+	z-index: var(--layer-panels);
 	pointer-events: all;
 	width: 148px;
 	max-width: 148px;
 }
 
-.tlui-style-panel[data-show-ui-labels='true'] .tlui-button[data-isactive='true'] {
-	border-radius: 10px;
-	outline: 2px solid var(--tl-color-text);
-	outline-offset: -5px;
-}
-
 .tlui-style-panel::-webkit-scrollbar {
 	display: none;
 }
@@ -1008,7 +1015,7 @@
 }
 
 .tlui-style-panel__section:nth-of-type(n + 2):not(:last-child) {
-	border-bottom: 1px solid var(--tl-color-divider);
+	border-bottom: 1px solid var(--color-divider);
 }
 
 .tlui-style-panel__section:empty {
@@ -1017,19 +1024,23 @@
 
 .tlui-style-panel__section__common:not(:only-child) {
 	margin-bottom: 7px;
-	border-bottom: 1px solid var(--tl-color-divider);
+	border-bottom: 1px solid var(--color-divider);
 }
 
-.tlui-style-panel__dropdown-picker:only-child {
-	width: 100%;
+.tlui-style-panel__row {
+	display: flex;
+}
+/* Only really used for the alignment picker */
+.tlui-style-panel__row__extra-button {
+	margin-left: -2px;
 }
 
 .tlui-style-panel__double-select-picker {
 	display: flex;
 	grid-template-columns: 1fr auto;
 	align-items: center;
-	padding-left: var(--tl-space-4);
-	color: var(--tl-color-text-1);
+	padding-left: var(--space-4);
+	color: var(--color-text-1);
 	font-size: 12px;
 }
 
@@ -1043,45 +1054,25 @@
 
 .tlui-style-panel .tlui-button[data-state='open']::after {
 	opacity: 1;
-	background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+	background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 }
 
 @media (hover: hover) {
 	.tlui-style-panel .tlui-button[data-state='open']:not(:hover)::after {
 		opacity: 1;
-		background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+		background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 	}
 }
 
-/* Accessibility subheadings */
-
-.tlui-style-panel__section .tlui-style-panel__subheading,
-.tlui-style-panel__section__common .tlui-style-panel__subheading,
-.tlui-style-panel__subheading + .tlui-slider__container {
-	margin: 0;
-	padding: var(--tl-space-2) var(--tl-space-3) 0px var(--tl-space-4);
-	font-size: 12px;
-	font-weight: inherit;
-	line-height: inherit;
-}
-
-.tlui-style-panel .tlui-style-panel__subheading:nth-of-type(1) {
-	padding-top: var(--tl-space-3);
-}
-
-.tlui-style-panel__subheading + .tlui-slider__container {
-	padding-top: 0px;
-}
-
 /* --------------------- Bottom --------------------- */
 
 .tlui-layout__bottom {
 	grid-row: 2;
-	width: 100%;
 }
 
 .tlui-layout__bottom__main {
 	width: 100%;
+	position: relative;
 	display: flex;
 	align-items: flex-end;
 	justify-content: center;
@@ -1093,10 +1084,11 @@
 	display: flex;
 	width: min-content;
 	flex-direction: column;
-	z-index: var(--tl-layer-panels);
+	z-index: var(--layer-panels);
 	pointer-events: all;
 	position: absolute;
 	left: 0px;
+	bottom: 0px;
 }
 
 .tlui-navigation-panel::before {
@@ -1106,16 +1098,30 @@
 	z-index: -1;
 	inset: -2px -2px 0px 0px;
 	border-radius: 0;
-	border-top: 2px solid var(--tl-color-background);
-	border-right: 2px solid var(--tl-color-background);
-	border-top-right-radius: var(--tl-radius-4);
-	background-color: var(--tl-color-low);
+	border-top: 2px solid var(--color-background);
+	border-right: 2px solid var(--color-background);
+	border-top-right-radius: var(--radius-4);
+	background-color: var(--color-low);
 }
 
 .tlui-navigation-panel[data-a11y='true']::before {
 	display: none;
 }
 
+.tlui-navigation-panel__toggle .tlui-icon {
+	opacity: 0.24;
+}
+
+.tlui-navigation-panel__toggle:active .tlui-icon {
+	opacity: 1;
+}
+
+@media (hover: hover) {
+	.tlui-navigation-panel__toggle:hover .tlui-icon {
+		opacity: 1;
+	}
+}
+
 /* Minimap */
 
 .tlui-minimap {
@@ -1123,7 +1129,7 @@
 	height: 96px;
 	min-height: 96px;
 	overflow: hidden;
-	padding: var(--tl-space-3);
+	padding: var(--space-3);
 	padding-top: 0px;
 }
 
@@ -1136,220 +1142,114 @@
 /* --------------------- Toolbar -------------------- */
 
 /* Wide container */
-.tlui-main-toolbar {
+.tlui-toolbar {
 	grid-column: 1 / span 3;
 	grid-row: 1;
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	flex-grow: 2;
-}
-
-.tlui-main-toolbar--horizontal {
-	padding-bottom: calc(var(--tl-space-3) + var(--tl-sab));
-	max-width: 100%;
-}
-
-.tlui-main-toolbar--vertical {
-	position: absolute;
-	left: 0;
-	top: 90px; /* height of page menu + 'back to content' button */
-	bottom: 140px; /* height of expanded mini-map */
-	padding-left: calc(var(--tl-space-3) + var(--tl-sab));
-}
-
-[data-breakpoints-below*='6'] .tlui-main-toolbar--vertical {
-	bottom: 90px; /* collapsed mini-map, but same as top to keep things looking even */
+	padding-bottom: calc(var(--space-3) + var(--sab));
 }
 
 /* Centered Content */
-.tlui-main-toolbar__inner {
+.tlui-toolbar__inner {
 	position: relative;
 	width: fit-content;
 	display: flex;
-	gap: var(--tl-space-3);
-	align-items: flex-start;
-}
-
-.tlui-main-toolbar--vertical .tlui-main-toolbar__inner {
-	flex-direction: column;
+	gap: var(--space-3);
+	align-items: flex-end;
 }
 
-.tlui-main-toolbar--horizontal .tlui-main-toolbar__left {
+.tlui-toolbar__left {
 	width: fit-content;
 }
-.tlui-main-toolbar--vertical .tlui-main-toolbar__left {
-	display: flex;
-	height: fit-content;
-}
 
 /* Row of controls + lock button */
-.tlui-main-toolbar__extras {
+.tlui-toolbar__extras {
 	position: relative;
-	z-index: var(--tl-layer-above);
+	z-index: var(--layer-above);
+	width: 100%;
 	pointer-events: none;
-	align-self: stretch;
-}
-
-.tlui-main-toolbar__extras:empty {
-	display: none;
-}
-
-.tlui-main-toolbar--horizontal .tlui-main-toolbar__extras {
-	height: 48px;
 	top: 6px;
+	height: 48px;
 }
 
-.tlui-main-toolbar--vertical .tlui-main-toolbar__extras {
-	width: 48px;
-	order: 1;
+.tlui-toolbar__extras:empty {
+	display: none;
 }
 
-.tlui-main-toolbar__extras__controls {
+.tlui-toolbar__extras__controls {
+	display: flex;
 	position: relative;
-	z-index: var(--tl-layer-above);
-	background-color: var(--tl-color-low);
-	border: 2px solid var(--tl-color-background);
-	pointer-events: all;
-}
-
-.tlui-main-toolbar--horizontal .tlui-main-toolbar__extras__controls {
-	border-top-left-radius: var(--tl-radius-4);
-	border-top-right-radius: var(--tl-radius-4);
+	flex-direction: row;
+	z-index: var(--layer-above);
+	background-color: var(--color-low);
+	border-top-left-radius: var(--radius-4);
+	border-top-right-radius: var(--radius-4);
+	border: 2px solid var(--color-background);
 	margin-left: 8px;
 	margin-right: 0px;
+	pointer-events: all;
 	width: fit-content;
 }
 
-.tlui-main-toolbar--vertical .tlui-main-toolbar__extras__controls {
-	border-top-right-radius: var(--tl-radius-4);
-	border-bottom-right-radius: var(--tl-radius-4);
-	margin-top: 8px;
-	margin-left: -2px;
-	margin-bottom: 0px;
-	width: fit-content;
-}
-
-.tlui-main-toolbar__tools {
-	border-radius: var(--tl-radius-4);
-	z-index: var(--tl-layer-panels);
+.tlui-toolbar__tools {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	border-radius: var(--radius-4);
+	z-index: var(--layer-panels);
 	pointer-events: all;
 	position: relative;
-	background: var(--tl-color-panel);
-	box-shadow: var(--tl-shadow-2);
-}
-
-.tlui-main-toolbar--horizontal .tlui-main-toolbar__mobile-style-panel {
-	align-self: flex-end;
+	background: var(--color-panel);
+	box-shadow: var(--shadow-2);
 }
-.tlui-main-toolbar--vertical .tlui-main-toolbar__mobile-style-panel {
-	align-self: flex-start;
+.tlui-toolbar__tools__list {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
 }
 
-.tlui-main-toolbar--horizontal .tlui-main-toolbar__overflow {
+.tlui-toolbar__overflow {
 	width: 40px;
-	margin-left: 2px;
-}
-.tlui-main-toolbar--vertical .tlui-main-toolbar__overflow {
-	height: 40px;
-	margin-top: 2px;
 }
 
-.tlui-layout__mobile .tlui-main-toolbar--horizontal .tlui-main-toolbar__overflow {
+.tlui-layout__mobile .tlui-toolbar__overflow {
 	width: 32px;
 	padding: 0px;
 }
 
-.tlui-main-toolbar--horizontal *[data-state='open']::after {
-	background: linear-gradient(0deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+.tlui-toolbar *[data-state='open']::after {
+	background: linear-gradient(0deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 	opacity: 1;
 }
-.tlui-main-toolbar--vertical *[data-state='open']::after {
-	background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
-	opacity: 1;
-}
-
-.tlui-main-toolbar__overflow-content {
-	touch-action: none;
-}
-
-.tlui-main-toolbar__tools [data-toolbar-visible='false'],
-.tlui-main-toolbar__overflow-content [data-toolbar-visible='false'] {
-	display: none;
-}
-
-.tlui-main-toolbar__group:empty {
-	display: none;
-}
-.tlui-row.tlui-main-toolbar__group:not(:nth-last-child(-n + 1 of [data-toolbar-visible='true'])) {
-	border-right: 1px solid var(--color-divider);
-	margin-right: 2px;
-}
-.tlui-column.tlui-main-toolbar__group:not(
-		:nth-last-child(-n + 1 of [data-toolbar-visible='true'])
-	) {
-	border-bottom: 1px solid var(--color-divider);
-	margin-bottom: 2px;
-}
-.tlui-grid.tlui-main-toolbar__group {
-	grid-column: 1 / span 4;
-}
-.tlui-grid.tlui-main-toolbar__group:not(:nth-last-child(-n + 1 of [data-toolbar-visible='true'])) {
-	border-bottom: 1px solid var(--color-divider);
-	margin-bottom: 2px;
-}
 
 @media (hover: hover) {
-	.tlui-main-toolbar--horizontal *[data-state='open']:not(:hover)::after {
-		background: linear-gradient(0deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
-		opacity: 1;
-	}
-	.tlui-main-toolbar--vertical *[data-state='open']:not(:hover)::after {
-		background: linear-gradient(90deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
+	.tlui-toolbar *[data-state='open']:not(:hover)::after {
+		background: linear-gradient(0deg, rgba(144, 144, 144, 0) 0%, var(--color-muted-2) 100%);
 		opacity: 1;
 	}
 }
 
-/* ------------------- Tooltip -------------------- */
-
-.tlui-tooltip {
-	font-size: 12px;
-	padding: 2px 8px;
-	border-radius: 4px;
-	background-color: var(--tl-color-tooltip);
-	box-shadow: none;
-	color: var(--tl-color-text-shadow);
-	max-width: 400px;
-	width: fit-content;
-	text-align: center;
-	will-change: transform, opacity;
-	z-index: 2;
-}
-
-.tlui-tooltip__arrow {
-	fill: var(--tl-color-tooltip);
-	will-change: opacity;
-}
-
-[data-radix-popper-content-wrapper]:has(.tlui-tooltip) {
-	z-index: var(--tl-layer-toasts) !important;
-	pointer-events: none;
+.tlui-layout__mobile .tlui-toolbar {
+	transition: transform 0.15s ease-out 0.05s;
 }
 
 /* ------------------- Debug panel ------------------ */
 
 .tlui-debug-panel {
-	background-color: var(--tl-color-low);
+	background-color: var(--color-low);
 	width: 100%;
 	display: grid;
 	align-items: center;
 	grid-template-columns: 1fr auto auto auto;
 	justify-content: space-between;
-	padding-left: var(--tl-space-4);
-	border-top: 1px solid var(--tl-color-background);
+	padding-left: var(--space-4);
+	border-top: 1px solid var(--color-background);
 	font-size: 12px;
-	color: var(--tl-color-text-1);
-	z-index: var(--tl-layer-panels);
+	color: var(--color-text-1);
+	z-index: var(--layer-panels);
 	pointer-events: all;
 }
 
@@ -1365,7 +1265,7 @@
 
 .tlui-debug-panel__fps__slow {
 	font-weight: bold;
-	color: var(--tl-color-danger);
+	color: var(--color-danger);
 }
 
 .tlui-a11y-audit {
@@ -1375,7 +1275,7 @@
 .tlui-a11y-audit th,
 .tlui-a11y-audit td {
 	padding: 8px;
-	border: 1px solid var(--tl-color-low-border);
+	border: 1px solid var(--color-low-border);
 }
 
 /* --------------------- Toasts --------------------- */
@@ -1388,10 +1288,10 @@
 	align-items: flex-end;
 	justify-content: flex-end;
 	flex-direction: column;
-	gap: var(--tl-space-3);
+	gap: var(--space-3);
 	pointer-events: none;
-	padding: 0px var(--tl-space-3) 64px 0px;
-	z-index: var(--tl-layer-toasts);
+	padding: 0px var(--space-3) 64px 0px;
+	z-index: var(--layer-toasts);
 }
 
 .tlui-toast__viewport > * {
@@ -1400,34 +1300,34 @@
 
 .tlui-toast__icon {
 	padding-top: 11px;
-	padding-left: var(--tl-space-4);
-	color: var(--tl-color-text-1);
+	padding-left: var(--space-4);
+	color: var(--color-text-1);
 }
 
 .tlui-toast__container {
 	min-width: 200px;
 	display: flex;
 	flex-direction: row;
-	background-color: var(--tl-color-panel);
-	box-shadow: var(--tl-shadow-2);
-	border-radius: var(--tl-radius-3);
+	background-color: var(--color-panel);
+	box-shadow: var(--shadow-2);
+	border-radius: var(--radius-3);
 	font-size: 12px;
 }
 
 .tlui-toast__container[data-severity='success'] .tlui-icon {
-	color: var(--tl-color-success);
+	color: var(--color-success);
 }
 
 .tlui-toast__container[data-severity='info'] .tlui-icon {
-	color: var(--tl-color-info);
+	color: var(--color-info);
 }
 
 .tlui-toast__container[data-severity='warning'] .tlui-icon {
-	color: var(--tl-color-warning);
+	color: var(--color-warning);
 }
 
 .tlui-toast__container[data-severity='error'] .tlui-icon {
-	color: var(--tl-color-danger);
+	color: var(--color-danger);
 }
 
 .tlui-toast__main {
@@ -1436,27 +1336,27 @@
 }
 
 .tlui-toast__content {
-	padding: var(--tl-space-4);
+	padding: var(--space-4);
 	display: flex;
 	line-height: 1.4;
 	flex-direction: column;
-	gap: var(--tl-space-3);
+	gap: var(--space-3);
 }
 
 .tlui-toast__main[data-actions='true'] .tlui-toast__content {
-	padding-bottom: var(--tl-space-2);
+	padding-bottom: var(--space-2);
 }
 
 .tlui-toast__title {
 	font-weight: bold;
-	color: var(--tl-color-text-1);
+	color: var(--color-text-1);
 	/* this makes the default toast look better */
 	line-height: 16px;
 }
 
 .tlui-toast__description {
-	color: var(--tl-color-text-1);
-	padding: var(--tl-space-3);
+	color: var(--color-text-1);
+	padding: var(--space-3);
 	margin: 0px;
 	padding: 0px;
 }
@@ -1479,11 +1379,11 @@
 
 @media (prefers-reduced-motion: no-preference) {
 	.tlui-toast__container[data-state='open'] {
-		animation: tlui-slide-in 200ms cubic-bezier(0.785, 0.135, 0.15, 0.86);
+		animation: slide-in 200ms cubic-bezier(0.785, 0.135, 0.15, 0.86);
 	}
 
 	.tlui-toast__container[data-state='closed'] {
-		animation: tlui-fade-out 100ms ease-in;
+		animation: hide 100ms ease-in;
 	}
 
 	.tlui-toast__container[data-swipe='move'] {
@@ -1496,7 +1396,7 @@
 	}
 
 	.tlui-toast__container[data-swipe='end'] {
-		animation: tlui-slide-out 100ms ease-out;
+		animation: swipe-out 100ms ease-out;
 	}
 }
 
@@ -1508,14 +1408,14 @@
 	left: 0px;
 	width: 100%;
 	height: 100%;
-	z-index: var(--tl-layer-canvas-overlays);
-	background-color: var(--tl-color-overlay);
+	z-index: var(--layer-canvas-overlays);
+	background-color: var(--color-overlay);
 	pointer-events: all;
-	animation: tl-fade-in 0.12s ease-out;
+	animation: fadeIn 0.12s ease-out;
 	display: grid;
 	place-items: center;
 	overflow-y: auto;
-	padding: 0px var(--tl-space-3);
+	padding: 0px var(--space-3);
 }
 
 .tlui-dialog__content {
@@ -1523,9 +1423,9 @@
 	flex-direction: column;
 	position: relative;
 	cursor: default;
-	background-color: var(--tl-color-panel);
-	box-shadow: var(--tl-shadow-3);
-	border-radius: var(--tl-radius-3);
+	background-color: var(--color-panel);
+	box-shadow: var(--shadow-3);
+	border-radius: var(--radius-3);
 	font-size: 12px;
 	overflow: hidden;
 	min-width: 300px;
@@ -1538,9 +1438,9 @@
 	display: flex;
 	align-items: center;
 	flex: 0;
-	z-index: var(--tl-layer-header-footer);
-	padding-left: var(--tl-space-4);
-	color: var(--tl-color-text);
+	z-index: var(--layer-header-footer);
+	padding-left: var(--space-4);
+	color: var(--color-text);
 	height: 40px;
 }
 
@@ -1549,7 +1449,7 @@
 	font-weight: inherit;
 	font-size: 12px;
 	margin: 0px;
-	color: var(--tl-color-text-1);
+	color: var(--color-text-1);
 }
 
 .tlui-dialog__header__close {
@@ -1557,16 +1457,16 @@
 }
 
 .tlui-dialog__body {
-	padding: var(--tl-space-4) var(--tl-space-4);
+	padding: var(--space-4) var(--space-4);
 	flex: 0 1;
 	overflow-y: auto;
 	overflow-x: hidden;
-	color: var(--tl-color-text-1);
+	color: var(--color-text-1);
 	user-select: all;
 	-webkit-user-select: text;
 }
 .tlui-dialog__body a {
-	color: var(--tl-color-selected);
+	color: var(--color-selected);
 }
 
 .tlui-dialog__body ul,
@@ -1574,13 +1474,13 @@
 	padding-left: 16px;
 	display: flex;
 	flex-direction: column;
-	gap: var(--tl-space-2);
+	gap: var(--space-2);
 }
 
 .tlui-dialog__footer {
 	position: relative;
 	min-height: 12px;
-	z-index: var(--tl-layer-header-footer);
+	z-index: var(--layer-header-footer);
 }
 
 .tlui-dialog__footer__actions {
@@ -1600,15 +1500,15 @@
 .tlui-edit-link-dialog {
 	display: flex;
 	flex-direction: column;
-	gap: var(--tl-space-4);
-	color: var(--tl-color-text);
+	gap: var(--space-4);
+	color: var(--color-text);
 }
 
 .tlui-edit-link-dialog__input {
-	background-color: var(--tl-color-muted-2);
+	background-color: var(--color-muted-2);
 	flex-grow: 2;
-	border-radius: var(--tl-radius-2);
-	padding: 0px var(--tl-space-4);
+	border-radius: var(--radius-2);
+	padding: 0px var(--space-4);
 }
 
 /* Embed Dialog */
@@ -1616,15 +1516,15 @@
 .tlui-embed__spacer {
 	flex-grow: 2;
 	min-height: 0px;
-	margin-left: calc(-1 * var(--tl-space-4));
-	margin-top: calc(-1 * var(--tl-space-4));
+	margin-left: calc(-1 * var(--space-4));
+	margin-top: calc(-1 * var(--space-4));
 	pointer-events: none;
 }
 
 .tlui-embed-dialog__list {
 	display: flex;
 	flex-direction: column;
-	padding: 0px var(--tl-space-3) var(--tl-space-4) var(--tl-space-3);
+	padding: 0px var(--space-3) var(--space-4) var(--space-3);
 }
 
 .tlui-embed-dialog__item__image {
@@ -1636,49 +1536,49 @@
 	background-size: contain;
 	background-repeat: no-repeat;
 	background-position: center center;
-	background-color: var(--tl-color-selected-contrast);
-	border-radius: var(--tl-radius-1);
+	background-color: var(--color-selected-contrast);
+	border-radius: var(--radius-1);
 }
 
 .tlui-embed-dialog__enter {
 	display: flex;
 	flex-direction: column;
-	gap: var(--tl-space-4);
-	color: var(--tl-color-text-1);
+	gap: var(--space-4);
+	color: var(--color-text-1);
 }
 
 .tlui-embed-dialog__input {
-	background-color: var(--tl-color-muted-2);
+	background-color: var(--color-muted-2);
 	flex-grow: 2;
-	border-radius: var(--tl-radius-2);
-	padding: 0px var(--tl-space-4);
+	border-radius: var(--radius-2);
+	padding: 0px var(--space-4);
 }
 
 .tlui-embed-dialog__warning {
-	color: var(--tl-color-danger);
+	color: var(--color-danger);
 	text-shadow: none;
 }
 
 .tlui-embed-dialog__instruction__link {
 	display: flex;
-	gap: var(--tl-space-1);
-	margin-top: var(--tl-space-4);
+	gap: var(--space-1);
+	margin-top: var(--space-4);
 }
 
 .tlui-embed-dialog__enter a {
-	color: var(--tl-color-text-1);
+	color: var(--color-text-1);
 }
 
 /* --------------- Keyboard shortcuts --------------- */
 
 .tlui-shortcuts-dialog__header {
-	border-bottom: 1px solid var(--tl-color-divider);
+	border-bottom: 1px solid var(--color-divider);
 }
 
 .tlui-shortcuts-dialog__body {
 	position: relative;
 	columns: 3;
-	column-gap: var(--tl-space-9);
+	column-gap: var(--space-9);
 	pointer-events: all;
 	touch-action: auto;
 
@@ -1696,14 +1596,14 @@
 
 .tlui-shortcuts-dialog__group {
 	break-inside: avoid-column;
-	padding-bottom: var(--tl-space-6);
+	padding-bottom: var(--space-6);
 }
 
 .tlui-shortcuts-dialog__group__title {
 	font-size: inherit;
 	font-weight: inherit;
 	margin: 0px;
-	color: var(--tl-color-text-3);
+	color: var(--color-text-3);
 	height: 32px;
 	display: flex;
 	align-items: center;
@@ -1712,12 +1612,12 @@
 .tlui-shortcuts-dialog__group__content {
 	display: flex;
 	flex-direction: column;
-	color: var(--tl-color-text-1);
+	color: var(--color-text-1);
 }
 
 .tlui-shortcuts-dialog__key-pair {
 	display: flex;
-	gap: var(--tl-space-4);
+	gap: var(--space-4);
 	align-items: center;
 	justify-content: space-between;
 	height: 32px;
@@ -1744,12 +1644,12 @@
 	height: 24px;
 	background: linear-gradient(
 		to bottom,
-		var(--tl-color-panel-transparent) 0%,
-		var(--tl-color-panel) 90%,
-		var(--tl-color-panel) 100%
+		var(--color-panel-transparent) 0%,
+		var(--color-panel) 90%,
+		var(--color-panel) 100%
 	);
-	border-bottom-left-radius: var(--tl-radius-3);
-	border-bottom-right-radius: var(--tl-radius-3);
+	border-bottom-left-radius: var(--radius-3);
+	border-bottom-right-radius: var(--radius-3);
 	pointer-events: none;
 }
 
@@ -1764,10 +1664,10 @@
 .tlui-help-menu {
 	pointer-events: all;
 	position: absolute;
-	bottom: var(--tl-space-2);
-	right: var(--tl-space-2);
-	z-index: var(--tl-layer-panels);
-	border: 2px solid var(--tl-color-background);
+	bottom: var(--space-2);
+	right: var(--space-2);
+	z-index: var(--layer-panels);
+	border: 2px solid var(--color-background);
 	border-radius: 100%;
 }
 
@@ -1778,7 +1678,7 @@
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-end;
-	z-index: var(--tl-layer-panels);
+	z-index: var(--layer-panels);
 	align-items: center;
 	padding-top: 2px;
 	padding-right: 4px;
@@ -1794,7 +1694,7 @@
 	border: none;
 	cursor: pointer;
 	pointer-events: all;
-	border-radius: var(--tl-radius-1);
+	border-radius: var(--radius-1);
 	padding-right: 1px;
 	height: 100%;
 }
@@ -1807,8 +1707,8 @@
 .tlui-people-menu__avatar {
 	height: 24px;
 	width: 24px;
-	border: 2px solid var(--tl-color-background);
-	background-color: var(--tl-color-low);
+	border: 2px solid var(--color-background);
+	background-color: var(--color-low);
 	border-radius: 100%;
 	display: flex;
 	align-items: center;
@@ -1817,7 +1717,7 @@
 	font-size: 10px;
 	font-weight: bold;
 	text-align: center;
-	color: var(--tl-color-selected-contrast);
+	color: var(--color-selected-contrast);
 	z-index: 2;
 }
 
@@ -1831,7 +1731,7 @@
 
 @media (hover: hover) {
 	.tlui-people-menu__avatars-button:hover .tlui-people-menu__avatar {
-		border-color: var(--tl-color-low);
+		border-color: var(--color-low);
 	}
 }
 
@@ -1839,12 +1739,12 @@
 	min-width: 0px;
 	font-size: 11px;
 	font-weight: 600;
-	color: var(--tl-color-text-1);
+	color: var(--color-text-1);
 	font-family: inherit;
 	padding: 0px 4px;
 }
 .tlui-people-menu__more::after {
-	border-radius: var(--tl-radius-2);
+	border-radius: var(--radius-2);
 	inset: 0px;
 }
 
@@ -1873,7 +1773,7 @@
 }
 
 .tlui-people-menu__section:not(:last-child) {
-	border-bottom: 1px solid var(--tl-color-divider);
+	border-bottom: 1px solid var(--color-divider);
 }
 
 .tlui-people-menu__user {
@@ -1892,7 +1792,7 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	font-size: 12px;
-	color: var(--tl-color-text-1);
+	color: var(--color-text-1);
 	max-width: 100%;
 	flex-grow: 1;
 	flex-shrink: 100;
@@ -1904,7 +1804,7 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	font-size: 12px;
-	color: var(--tl-color-text-3);
+	color: var(--color-text-3);
 	flex-grow: 100;
 	flex-shrink: 0;
 	margin-left: 4px;
@@ -1995,7 +1895,7 @@
 	inset: 0px;
 	border-width: 2px;
 	border-style: solid;
-	z-index: var(--tl-layer-following-indicator);
+	z-index: var(--layer-following-indicator);
 	pointer-events: none;
 }
 
@@ -2014,7 +1914,7 @@
 }
 
 .tlui-contextual-toolbar [data-isactive='true']::after {
-	background-color: var(--tl-color-muted-2);
+	background-color: var(--color-muted-2);
 	opacity: 1;
 }
 
@@ -2030,7 +1930,7 @@
 
 .tlui-contextual-toolbar[data-visible='true'] {
 	opacity: 1;
-	z-index: var(--tl-layer-menus);
+	z-index: var(--layer-menus);
 }
 
 .tlui-contextual-toolbar[data-interactive='true'],
@@ -2078,7 +1978,7 @@
 }
 
 /* ------------------- Animations ------------------- */
-@keyframes tlui-fade-out {
+@keyframes hide {
 	0% {
 		opacity: 1;
 	}
@@ -2087,20 +1987,20 @@
 	}
 }
 
-@keyframes tlui-slide-in {
+@keyframes slide-in {
 	from {
-		transform: translateX(calc(100% + var(--tl-space-3)));
+		transform: translateX(calc(100% + var(--space-3)));
 	}
 	to {
 		transform: translateX(0px);
 	}
 }
 
-@keyframes tlui-slide-out {
+@keyframes swipe-out {
 	from {
 		transform: translateX(var(--radix-toast-swipe-end-x));
 	}
 	to {
-		transform: translateX(calc(100% + var(--tl-space-3)));
+		transform: translateX(calc(100% + var(--space-3)));
 	}
 }