diff --git a/Adwaita/adw/colors.styles b/Adwaita/adw/colors.styles
index fd8b544d..49820b0d 100644
--- a/Adwaita/adw/colors.styles
+++ b/Adwaita/adw/colors.styles
@@ -24,6 +24,7 @@ colors.styles
 		error_fg="255 255 255 255"
 
 		window_bg="36 36 36 255"
+		window_bg_transparent="36 36 36 0"
 		window_fg="255 255 255 255"
 		window_border="255 255 255 28"
 
diff --git a/Adwaita/adw/controls/popup.styles b/Adwaita/adw/controls/popup.styles
index efb7d1bf..b5b365a8 100644
--- a/Adwaita/adw/controls/popup.styles
+++ b/Adwaita/adw/controls/popup.styles
@@ -3,6 +3,14 @@ popup.styles
 	colors
 	{
 		Menu.TextInset=4
+		Tooltip.Delay=75
+		Tooltip.Anchor=Parent
+		Notifications.PanelPosition=TopRight
+		Notifications.SlideDirection=None
+		Notifications.FadeInTime=0
+		Notifications.FadeOutTime=0
+		Notifications.DisplayTime=6
+		Notifications.StackSize=5
 	}
 
 	styles
diff --git a/Adwaita/adw/rootdialog.styles b/Adwaita/adw/rootdialog.styles
index 089dad42..09ff1a82 100644
--- a/Adwaita/adw/rootdialog.styles
+++ b/Adwaita/adw/rootdialog.styles
@@ -242,6 +242,61 @@ rootdialog.styles
 			image="assets/icons/inbox_unread"
 		}
 
+		parental_lock_button
+		{
+			inset="3 0 0 0"
+			image="assets/icons/family_view_backdrop"
+			render_bg {}
+		}
+		parental_lock_button:framefocus
+		{
+			image="assets/icons/family_view"
+		}
+		parental_lock_button:hover
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x0+28, y0+34, button_hover_bg)"
+				1="fill(x0, y0+6, x0+6, y0+28, button_hover_bg)"
+				2="fill(x0+28, y0+6, x0+34, y0+28, button_hover_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w15/tl)"
+				4="image(x0+28, y0, x0+34, y0+6, assets/corners/6_w15/tr)"
+				5="image(x0, y0+28, x0+6, y0+34, assets/corners/6_w15/bl)"
+				6="image(x0+28, y0+28, x0+34, y0+34, assets/corners/6_w15/br)"
+			}
+		}
+		parental_lock_button:selected
+		{
+			image="assets/icons/family_view_active_backdrop"
+			render_bg {}
+		}
+		parental_lock_button:selected:framefocus
+		{
+			image="assets/icons/family_view_active"
+		}
+		parental_lock_button:selected:hover
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x0+28, y0+34, button_hover_bg)"
+				1="fill(x0, y0+6, x0+6, y0+28, button_hover_bg)"
+				2="fill(x0+28, y0+6, x0+34, y0+28, button_hover_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w15/tl)"
+				4="image(x0+28, y0, x0+34, y0+6, assets/corners/6_w15/tr)"
+				5="image(x0, y0+28, x0+6, y0+34, assets/corners/6_w15/bl)"
+				6="image(x0+28, y0+28, x0+34, y0+34, assets/corners/6_w15/br)"
+			}
+		}
+
+		support_alert
+		{
+			image="assets/icons/warning_backdrop"
+		}
+		support_alert:framefocus
+		{
+			image="assets/icons/warning"
+		}
+
 		CUINavButton
 		{
 			inset="8 0 8 0"
diff --git a/Adwaita/adw/settingsdialog.styles b/Adwaita/adw/settingsdialog.styles
index 4e600ecf..98502ee6 100644
--- a/Adwaita/adw/settingsdialog.styles
+++ b/Adwaita/adw/settingsdialog.styles
@@ -82,173 +82,424 @@ settingsdialog.styles
 			render_bg {}
 		}
 
+		"CDialogSettings Page Button"
+		{
+			bgcolor="button_bg"
+			font-size=14
+			font-weight=400
+			inset-left=6
+			render_bg
+			{
+				0="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+			render
+			{
+				0="image(x1-28, y0+17, x1-12, y1-17, assets/icons/forward)"
+			}
+		}
+		"CDialogSettings Page Button:hover"
+		{
+			bgcolor="button_hover_bg"
+		}
+		"CDialogSettings Page Button:active"
+		{
+			bgcolor="button_active_bg"
+		}
+		"CDialogSettings Page Button:disabled"
+		{
+			bgcolor="button_disabled_bg"
+		}
+
+		"CDialogSettings Page CheckButton"
+		{
+			inset="5 6 6 6"
+			padding-right=64
+			image="assets/pixel"
+			render
+			{
+				0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked)"
+			}
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page CheckButton:hover"
+		{
+			image="assets/pixel"
+			render
+			{
+				0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked_hover)"
+			}
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_hover_bg)"
+				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page CheckButton:active"
+		{
+			image="assets/pixel"
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_active_bg)"
+				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page CheckButton:selected"
+		{
+			image="assets/pixel"
+			render
+			{
+				0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked)"
+			}
+		}
+		"CDialogSettings Page CheckButton:selected:hover"
+		{
+			image="assets/pixel"
+			render
+			{
+				0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked_hover)"
+			}
+		}
+		"CDialogSettings Page CheckButton:disabled"
+		{
+			image="assets/pixel"
+			render
+			{
+				0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked_disabled)"
+			}
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_disabled_bg)"
+				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page CheckButton:disabled:selected"
+		{
+			image="assets/pixel"
+			render
+			{
+				0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked_disabled)"
+			}
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_disabled_bg)"
+				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+
+		"CDialogSettings Page RadioButton"
+		{
+			inset="6 6 6 6"
+			image="assets/radiobutton_padded/unchecked"
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page RadioButton:hover"
+		{
+			image="assets/radiobutton_padded/unchecked_hover"
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_hover_bg)"
+				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page RadioButton:selected"
+		{
+			image="assets/radiobutton_padded/checked"
+		}
+		"CDialogSettings Page RadioButton:selected:hover"
+		{
+			image="assets/radiobutton_padded/checked_hover"
+		}
+		"CDialogSettings Page RadioButton:active"
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_active_bg)"
+				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page RadioButton:disabled"
+		{
+			image="assets/radiobutton_padded/unchecked_disabled"
+		}
+		"CDialogSettings Page RadioButton:selected:disabled"
+		{
+			image="assets/radiobutton_padded/checked_disabled"
+		}
+
+		"CDialogSettings Page Highlight"
+		{
+			textcolor="window_fg"
+			font-weight=700
+			render
+			{
+				0="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
+				1="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)"
+			}
+		}
+
+		"CDialogSettings Page Label"
+		{
+			font-size=14
+			textcolor="window_fg"
+			selectedtextcolor="window_fg"
+		}
+
+		"CDialogSettings Page URLLabel"
+		{
+			font-style=none
+			font-weight=700
+			textcolor="window_fg"
+		}
+		"CDialogSettings Page URLLabel:hover"
+		{
+			font-style=underline
+		}
+
+		"CDialogSettings Page Divider"
+		{
+			render_bg {}
+			render
+			{
+				0="fill(x0, y0-1, x1, y0, window_bg)"
+				1="image(x0, y0-12, x0+12, y0, assets/corners/12_mask_window_bg/bl)"
+				2="image(x1-12, y0-12, x1, y0, assets/corners/12_mask_window_bg/br)"
+				3="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
+				4="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)"
+			}
+		}
+
+		"CDialogSettings Page ComboBox"
+		{
+			font-size=14
+			inset="350 0 -6 0"
+			render_bg {}
+			render
+			{
+				0="fill(x0+12, y0, x1-12, y0+12, button_bg)"
+				1="fill(x0, y0+12, x1, y1, button_bg)"
+				2="image(x0, y0, x0+12, y0+12, assets/corners/12_w10/tl)"
+				3="image(x1-12, y0, x1, y0+12, assets/corners/12_w10/tr)"
+				4="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page ComboBox:hover"
+		{
+			render
+			{
+				0="fill(x0+12, y0, x1-12, y0+12, button_hover_bg)"
+				1="fill(x0, y0+12, x1, y1, button_hover_bg)"
+				2="image(x0, y0, x0+12, y0+12, assets/corners/12_w15/tl)"
+				3="image(x1-12, y0, x1, y0+12, assets/corners/12_w15/tr)"
+				4="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page ComboBox:active"
+		{
+			render
+			{
+				0="fill(x0+12, y0, x1-12, y0+12, button_hover_bg)"
+				1="fill(x0, y0+12, x1, y1, button_hover_bg)"
+				2="image(x0, y0, x0+12, y0+12, assets/corners/12_w15/tl)"
+				3="image(x1-12, y0, x1, y0+12, assets/corners/12_w15/tr)"
+				4="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page ComboBox:disabled"
+		{
+			render
+			{
+				0="fill(x0+12, y0, x1-12, y0+12, button_disabled_bg)"
+				1="fill(x0, y0+12, x1, y1, button_disabled_bg)"
+				2="image(x0, y0, x0+12, y0+12, assets/corners/12_w5/tl)"
+				3="image(x1-12, y0, x1, y0+12, assets/corners/12_w5/tr)"
+				4="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+		}
+		"CDialogSettings Page ComboBoxButton"
+		{
+			render {}
+			render_bg
+			{
+				0="gradient_horizontal(x0-6, y0, x0+6, y1, window_bg_transparent, window_bg)"
+				1="fill(x0+6, y0, x1, y1, window_bg)"
+			}
+		}
+
 		// Fake sidebar rounded corners
 		CAccountPage
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+10, x0+12, y0+22, button_bg)"
-				1="fill(x0+168, y0+10, x0+174, y0+22, button_bg)"
-				2="image(x0+6, y0+4, x0+12, y0+10, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+4, x0+174, y0+10, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+22, x0+12, y0+28, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+22, x0+174, y0+28, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+10, x0-168, y0+22, button_bg)"
+				1="fill(x0-12, y0+10, x0-6, y0+22, button_bg)"
+				2="image(x0-174, y0+4, x0-168, y0+10, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+4, x0-6, y0+10, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+22, x0-168, y0+28, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+22, x0-6, y0+28, assets/corners/6_w10/br)"
 			}
 		}
 		CSubPanelOptionsFamily
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+34, x0+12, y0+46, button_bg)"
-				1="fill(x0+168, y0+34, x0+174, y0+46, button_bg)"
-				2="image(x0+6, y0+28, x0+12, y0+34, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+28, x0+174, y0+34, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+46, x0+12, y0+52, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+46, x0+174, y0+52, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+34, x0-168, y0+46, button_bg)"
+				1="fill(x0-12, y0+34, x0-6, y0+46, button_bg)"
+				2="image(x0-174, y0+28, x0-168, y0+34, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+28, x0-6, y0+34, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+46, x0-168, y0+52, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+46, x0-6, y0+52, assets/corners/6_w10/br)"
 			}
 		}
 		CSettingsSubInGame
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+58, x0+12, y0+70, button_bg)"
-				1="fill(x0+168, y0+58, x0+174, y0+70, button_bg)"
-				2="image(x0+6, y0+52, x0+12, y0+58, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+52, x0+174, y0+58, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+70, x0+12, y0+76, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+70, x0+174, y0+76, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+58, x0-168, y0+70, button_bg)"
+				1="fill(x0-12, y0+58, x0-6, y0+70, button_bg)"
+				2="image(x0-174, y0+52, x0-168, y0+58, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+52, x0-6, y0+58, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+70, x0-168, y0+76, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+70, x0-6, y0+76, assets/corners/6_w10/br)"
 			}
 		}
 		CSubPanelOptionsInterface
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+82, x0+12, y0+94, button_bg)"
-				1="fill(x0+168, y0+82, x0+174, y0+94, button_bg)"
-				2="image(x0+6, y0+76, x0+12, y0+82, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+76, x0+174, y0+82, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+94, x0+12, y0+100, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+94, x0+174, y0+100, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+82, x0-168, y0+94, button_bg)"
+				1="fill(x0-12, y0+82, x0-6, y0+94, button_bg)"
+				2="image(x0-174, y0+76, x0-168, y0+82, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+76, x0-6, y0+82, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+94, x0-168, y0+100, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+94, x0-6, y0+100, assets/corners/6_w10/br)"
 			}
 		}
 		CSettingsSubLibrary
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+106, x0+12, y0+118, button_bg)"
-				1="fill(x0+168, y0+106, x0+174, y0+118, button_bg)"
-				2="image(x0+6, y0+100, x0+12, y0+106, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+100, x0+174, y0+106, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+118, x0+12, y0+124, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+118, x0+174, y0+124, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+106, x0-168, y0+118, button_bg)"
+				1="fill(x0-12, y0+106, x0-6, y0+118, button_bg)"
+				2="image(x0-174, y0+100, x0-168, y0+106, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+100, x0-6, y0+106, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+118, x0-168, y0+124, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+118, x0-6, y0+124, assets/corners/6_w10/br)"
 			}
 		}
 		CSubPanelOptionsDownloads
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+130, x0+12, y0+142, button_bg)"
-				1="fill(x0+168, y0+130, x0+174, y0+142, button_bg)"
-				2="image(x0+6, y0+124, x0+12, y0+130, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+124, x0+174, y0+130, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+142, x0+12, y0+148, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+142, x0+174, y0+148, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+130, x0-168, y0+142, button_bg)"
+				1="fill(x0-12, y0+130, x0-6, y0+142, button_bg)"
+				2="image(x0-174, y0+124, x0-168, y0+130, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+124, x0-6, y0+130, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+142, x0-168, y0+148, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+142, x0-6, y0+148, assets/corners/6_w10/br)"
 			}
 		}
 		CSubPanelOptionsCloud
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+154, x0+12, y0+166, button_bg)"
-				1="fill(x0+168, y0+154, x0+174, y0+166, button_bg)"
-				2="image(x0+6, y0+148, x0+12, y0+154, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+148, x0+174, y0+154, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+166, x0+12, y0+172, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+166, x0+174, y0+172, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+154, x0-168, y0+166, button_bg)"
+				1="fill(x0-12, y0+154, x0-6, y0+166, button_bg)"
+				2="image(x0-174, y0+148, x0-168, y0+154, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+148, x0-6, y0+154, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+166, x0-168, y0+172, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+166, x0-6, y0+172, assets/corners/6_w10/br)"
 			}
 		}
 		CSettingsSubMusic
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+178, x0+12, y0+190, button_bg)"
-				1="fill(x0+168, y0+178, x0+174, y0+190, button_bg)"
-				2="image(x0+6, y0+172, x0+12, y0+178, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+172, x0+174, y0+178, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+190, x0+12, y0+196, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+190, x0+174, y0+196, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+178, x0-168, y0+190, button_bg)"
+				1="fill(x0-12, y0+178, x0-6, y0+190, button_bg)"
+				2="image(x0-174, y0+172, x0-168, y0+178, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+172, x0-6, y0+178, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+190, x0-168, y0+196, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+190, x0-6, y0+196, assets/corners/6_w10/br)"
 			}
 		}
 		CSettingsSubBroadcast
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+202, x0+12, y0+214, button_bg)"
-				1="fill(x0+168, y0+202, x0+174, y0+214, button_bg)"
-				2="image(x0+6, y0+196, x0+12, y0+202, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+196, x0+174, y0+202, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+214, x0+12, y0+220, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+214, x0+174, y0+220, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+202, x0-168, y0+214, button_bg)"
+				1="fill(x0-12, y0+202, x0-6, y0+214, button_bg)"
+				2="image(x0-174, y0+196, x0-168, y0+202, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+196, x0-6, y0+202, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+214, x0-168, y0+220, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+214, x0-6, y0+220, assets/corners/6_w10/br)"
 			}
 		}
 		CSettingsSubStreaming
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+226, x0+12, y0+238, button_bg)"
-				1="fill(x0+168, y0+226, x0+174, y0+238, button_bg)"
-				2="image(x0+6, y0+220, x0+12, y0+226, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+220, x0+174, y0+226, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+238, x0+12, y0+244, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+238, x0+174, y0+244, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+226, x0-168, y0+238, button_bg)"
+				1="fill(x0-12, y0+226, x0-6, y0+238, button_bg)"
+				2="image(x0-174, y0+220, x0-168, y0+226, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+220, x0-6, y0+226, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+238, x0-168, y0+244, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+238, x0-6, y0+244, assets/corners/6_w10/br)"
 			}
 		}
 		CSettingsSubBrowser
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+250, x0+12, y0+262, button_bg)"
-				1="fill(x0+168, y0+250, x0+174, y0+262, button_bg)"
-				2="image(x0+6, y0+244, x0+12, y0+250, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+244, x0+174, y0+250, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+262, x0+12, y0+268, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+262, x0+174, y0+268, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+250, x0-168, y0+262, button_bg)"
+				1="fill(x0-12, y0+250, x0-6, y0+262, button_bg)"
+				2="image(x0-174, y0+244, x0-168, y0+250, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+244, x0-6, y0+250, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+262, x0-168, y0+268, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+262, x0-6, y0+268, assets/corners/6_w10/br)"
 			}
 		}
 		CSettingsSubController
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+274, x0+12, y0+286, button_bg)"
-				1="fill(x0+168, y0+274, x0+174, y0+286, button_bg)"
-				2="image(x0+6, y0+268, x0+12, y0+274, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+268, x0+174, y0+274, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+286, x0+12, y0+292, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+286, x0+174, y0+292, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+274, x0-168, y0+286, button_bg)"
+				1="fill(x0-12, y0+274, x0-6, y0+286, button_bg)"
+				2="image(x0-174, y0+268, x0-168, y0+274, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+268, x0-6, y0+274, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+286, x0-168, y0+292, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+286, x0-6, y0+292, assets/corners/6_w10/br)"
 			}
 		}
 		CSubPanelShaderCache
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+298, x0+12, y0+310, button_bg)"
-				1="fill(x0+168, y0+298, x0+174, y0+310, button_bg)"
-				2="image(x0+6, y0+292, x0+12, y0+298, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+292, x0+174, y0+298, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+310, x0+12, y0+316, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+310, x0+174, y0+316, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+298, x0-168, y0+310, button_bg)"
+				1="fill(x0-12, y0+298, x0-6, y0+310, button_bg)"
+				2="image(x0-174, y0+292, x0-168, y0+298, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+292, x0-6, y0+298, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+310, x0-168, y0+316, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+310, x0-6, y0+316, assets/corners/6_w10/br)"
 			}
 		}
 		CSubPanelCompat
 		{
-			render
+			render_bg
 			{
-				0="fill(x0+6, y0+322, x0+12, y0+334, button_bg)"
-				1="fill(x0+168, y0+322, x0+174, y0+334, button_bg)"
-				2="image(x0+6, y0+316, x0+12, y0+322, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+316, x0+174, y0+322, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+334, x0+12, y0+340, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+334, x0+174, y0+340, assets/corners/6_w10/br)"
+				0="fill(x0-174, y0+322, x0-168, y0+334, button_bg)"
+				1="fill(x0-12, y0+322, x0-6, y0+334, button_bg)"
+				2="image(x0-174, y0+316, x0-168, y0+322, assets/corners/6_w10/tl)"
+				3="image(x0-12, y0+316, x0-6, y0+322, assets/corners/6_w10/tr)"
+				4="image(x0-174, y0+334, x0-168, y0+340, assets/corners/6_w10/bl)"
+				5="image(x0-12, y0+334, x0-6, y0+340, assets/corners/6_w10/br)"
 			}
 		}
 	}
diff --git a/Adwaita/assets/icons/external_link.tga b/Adwaita/assets/icons/external_link.tga
new file mode 100644
index 00000000..e63015ec
Binary files /dev/null and b/Adwaita/assets/icons/external_link.tga differ
diff --git a/Adwaita/assets/icons/external_link@2x.tga b/Adwaita/assets/icons/external_link@2x.tga
new file mode 100644
index 00000000..108297a6
Binary files /dev/null and b/Adwaita/assets/icons/external_link@2x.tga differ
diff --git a/Adwaita/assets/icons/family_view.tga b/Adwaita/assets/icons/family_view.tga
new file mode 100644
index 00000000..919b4a97
Binary files /dev/null and b/Adwaita/assets/icons/family_view.tga differ
diff --git a/Adwaita/assets/icons/family_view@2x.tga b/Adwaita/assets/icons/family_view@2x.tga
new file mode 100644
index 00000000..1b529481
Binary files /dev/null and b/Adwaita/assets/icons/family_view@2x.tga differ
diff --git a/Adwaita/assets/icons/family_view_active.tga b/Adwaita/assets/icons/family_view_active.tga
new file mode 100644
index 00000000..e4454973
Binary files /dev/null and b/Adwaita/assets/icons/family_view_active.tga differ
diff --git a/Adwaita/assets/icons/family_view_active@2x.tga b/Adwaita/assets/icons/family_view_active@2x.tga
new file mode 100644
index 00000000..2930fbe2
Binary files /dev/null and b/Adwaita/assets/icons/family_view_active@2x.tga differ
diff --git a/Adwaita/assets/icons/family_view_active_backdrop.tga b/Adwaita/assets/icons/family_view_active_backdrop.tga
new file mode 100644
index 00000000..70a5b776
Binary files /dev/null and b/Adwaita/assets/icons/family_view_active_backdrop.tga differ
diff --git a/Adwaita/assets/icons/family_view_active_backdrop@2x.tga b/Adwaita/assets/icons/family_view_active_backdrop@2x.tga
new file mode 100644
index 00000000..42d93526
Binary files /dev/null and b/Adwaita/assets/icons/family_view_active_backdrop@2x.tga differ
diff --git a/Adwaita/assets/icons/family_view_backdrop.tga b/Adwaita/assets/icons/family_view_backdrop.tga
new file mode 100644
index 00000000..5b5a8983
Binary files /dev/null and b/Adwaita/assets/icons/family_view_backdrop.tga differ
diff --git a/Adwaita/assets/icons/family_view_backdrop@2x.tga b/Adwaita/assets/icons/family_view_backdrop@2x.tga
new file mode 100644
index 00000000..d2cc74a9
Binary files /dev/null and b/Adwaita/assets/icons/family_view_backdrop@2x.tga differ
diff --git a/Adwaita/assets/icons/warning.tga b/Adwaita/assets/icons/warning.tga
new file mode 100644
index 00000000..e8ae956e
Binary files /dev/null and b/Adwaita/assets/icons/warning.tga differ
diff --git a/Adwaita/assets/icons/warning@2x.tga b/Adwaita/assets/icons/warning@2x.tga
new file mode 100644
index 00000000..63fde184
Binary files /dev/null and b/Adwaita/assets/icons/warning@2x.tga differ
diff --git a/Adwaita/assets/icons/warning_backdrop.tga b/Adwaita/assets/icons/warning_backdrop.tga
new file mode 100644
index 00000000..c1dd3800
Binary files /dev/null and b/Adwaita/assets/icons/warning_backdrop.tga differ
diff --git a/Adwaita/assets/icons/warning_backdrop@2x.tga b/Adwaita/assets/icons/warning_backdrop@2x.tga
new file mode 100644
index 00000000..d2ed8fbf
Binary files /dev/null and b/Adwaita/assets/icons/warning_backdrop@2x.tga differ
diff --git a/Adwaita/public/UseOfflineMode.res b/Adwaita/public/UseOfflineMode.res
index 0ce00d48..3c9a2311 100755
--- a/Adwaita/public/UseOfflineMode.res
+++ b/Adwaita/public/UseOfflineMode.res
@@ -1,78 +1,78 @@
-UseOfflineModeChosen.res
-{
-	styles
-	{
-		CUseOfflineModeDialog
-		{
-			bgcolor="popover_bg"
-			textcolor="popover_fg"
-		}
-
-		FrameTitle
-		{
-			textcolor="popover_fg"
-			font-size=20
-			inset-left=10
-			render_bg {}
-		}
-
-		Label
-		{
-			textcolor="popover_fg"
-			font-size=15
-		}
-
-		URLLabel
-		{
-			font-style=none
-			font-weight=700
-			textcolor="window_fg"
-		}
-		URLLabel:hover
-		{
-			font-style=underline
-		}
-
-		Button
-		{
-			render
-			{
-				0="fill(x0, y0-1, x1, y0, border)"
-			}
-			render_bg {}
-		}
-		Button:hover
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_bg)"
-			}
-		}
-		Button:focus
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_bg)"
-			}
-		}
-		Button:active
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_hover_bg)"
-			}
-		}
-	}
-
-	layout
-	{
-		place { control="frame_title" width=max height=64 }
-
-		place { control="Label1,Label3,URLLabel1" dir=down spacing=16 margin-top=56 margin-left=16 margin-right=16 width=max }
-
-		place { control="RetryButton,OfflineModeButton,QuitButton" dir=down align=bottom margin-left=0 margin-right=0 width=max height=42 spacing=1 }
-
-		region { name="hidden" width=0 height=0 margin-left=-999 }
-		place { control="frame_close,LabelAppearOffline" region="hidden" width=0 height=0 }
-	}
-}
+UseOfflineModeChosen.res
+{
+	styles
+	{
+		CUseOfflineModeDialog
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+		}
+
+		FrameTitle
+		{
+			textcolor="popover_fg"
+			font-size=20
+			inset-left=10
+			render_bg {}
+		}
+
+		Label
+		{
+			textcolor="popover_fg"
+			font-size=15
+		}
+
+		URLLabel
+		{
+			font-style=none
+			font-weight=700
+			textcolor="window_fg"
+		}
+		URLLabel:hover
+		{
+			font-style=underline
+		}
+
+		Button
+		{
+			render
+			{
+				0="fill(x0, y0-1, x1, y0, border)"
+			}
+			render_bg {}
+		}
+		Button:hover
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		Button:focus
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		Button:active
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_hover_bg)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="frame_title" width=max height=64 }
+
+		place { control="Label1,Label3,URLLabel1" dir=down spacing=16 margin-top=56 margin-left=16 margin-right=16 width=max }
+
+		place { control="RetryButton,OfflineModeButton,QuitButton" dir=down align=bottom margin-left=0 margin-right=0 width=max height=42 spacing=1 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_close,LabelAppearOffline" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/public/UseOfflineModeChosen.res b/Adwaita/public/UseOfflineModeChosen.res
index b6fb2221..8d5a58b0 100755
--- a/Adwaita/public/UseOfflineModeChosen.res
+++ b/Adwaita/public/UseOfflineModeChosen.res
@@ -1,68 +1,68 @@
-UseOfflineModeChosen.res
-{
-	styles
-	{
-		CUseOfflineModeDialog
-		{
-			bgcolor="popover_bg"
-			textcolor="popover_fg"
-		}
-
-		FrameTitle
-		{
-			textcolor="popover_fg"
-			font-size=20
-			inset-left=10
-			render_bg {}
-		}
-
-		Label
-		{
-			textcolor="popover_fg"
-			font-size=15
-		}
-
-		Button
-		{
-			render
-			{
-				0="fill(x0, y0-1, x1+1, y0, border)"
-				1="fill(x1, y0, x1+1, y1, border)"
-			}
-			render_bg {}
-		}
-		Button:hover
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_bg)"
-			}
-		}
-		Button:focus
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_bg)"
-			}
-		}
-		Button:active
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_hover_bg)"
-			}
-		}
-	}
-
-	layout
-	{
-		place { control="frame_title" width=max height=64 }
-
-		place { control="Label1" margin-top=56 margin-bottom=50 margin-left=16 margin-right=16 width=max height=max }
-
-		place { control="RetryButton,OfflineModeButton" align=bottom margin-left=0 margin-right=0 width=180 height=42 spacing=1 }
-
-		region { name="hidden" width=0 height=0 margin-left=-999 }
-		place { control="frame_close,QuitButton" region="hidden" width=0 height=0 }
-	}
-}
+UseOfflineModeChosen.res
+{
+	styles
+	{
+		CUseOfflineModeDialog
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+		}
+
+		FrameTitle
+		{
+			textcolor="popover_fg"
+			font-size=20
+			inset-left=10
+			render_bg {}
+		}
+
+		Label
+		{
+			textcolor="popover_fg"
+			font-size=15
+		}
+
+		Button
+		{
+			render
+			{
+				0="fill(x0, y0-1, x1+1, y0, border)"
+				1="fill(x1, y0, x1+1, y1, border)"
+			}
+			render_bg {}
+		}
+		Button:hover
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		Button:focus
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		Button:active
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_hover_bg)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="frame_title" width=max height=64 }
+
+		place { control="Label1" margin-top=56 margin-bottom=50 margin-left=16 margin-right=16 width=max height=max }
+
+		place { control="RetryButton,OfflineModeButton" align=bottom margin-left=0 margin-right=0 width=180 height=42 spacing=1 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_close,QuitButton" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/layout/parentallockdialog.layout b/Adwaita/resource/layout/parentallockdialog.layout
new file mode 100755
index 00000000..7f886490
--- /dev/null
+++ b/Adwaita/resource/layout/parentallockdialog.layout
@@ -0,0 +1,70 @@
+parentallockdialog.layout
+{
+	styles
+	{
+		ParentalLockDialog
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+			minimum-width=360
+			minimum-height=140
+		}
+
+		FrameTitle
+		{
+			textcolor="popover_fg"
+			font-size=20
+			inset-left=10
+			render_bg {}
+		}
+
+		Label
+		{
+			textcolor="popover_fg"
+			font-size=15
+		}
+
+		Button
+		{
+			render
+			{
+				0="fill(x0, y0-1, x1+1, y0, border)"
+				1="fill(x1, y0, x1+1, y1, border)"
+			}
+			render_bg {}
+		}
+		Button:hover
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		Button:focus
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		Button:active
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_hover_bg)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="frame_title" width=max height=64 }
+
+		place { control="Instructions" dir=down spacing=16 margin-top=56 margin-left=16 margin-right=16 width=max }
+
+		place { control="Cancel,OK" align=bottom margin-left=0 margin-right=0 width=180 height=42 spacing=1 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_close,KeyImage" region="hidden" width=0 height=0 }
+	}
+}
\ No newline at end of file
diff --git a/Adwaita/resource/layout/parentalunlockdialog.layout b/Adwaita/resource/layout/parentalunlockdialog.layout
new file mode 100755
index 00000000..65977d08
--- /dev/null
+++ b/Adwaita/resource/layout/parentalunlockdialog.layout
@@ -0,0 +1,70 @@
+parentalunlockdialog.layout
+{
+	styles
+	{
+		ParentalUnlockDialog
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+			minimum-width=360
+			minimum-height=180
+		}
+
+		FrameTitle
+		{
+			textcolor="popover_fg"
+			font-size=20
+			inset-left=10
+			render_bg {}
+		}
+
+		Label
+		{
+			textcolor="popover_fg"
+			font-size=15
+		}
+
+		Button
+		{
+			render
+			{
+				0="fill(x0, y0-1, x1+1, y0, border)"
+				1="fill(x1, y0, x1+1, y1, border)"
+			}
+			render_bg {}
+		}
+		Button:hover
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		Button:focus
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		Button:active
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_hover_bg)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="frame_title" width=max height=64 }
+
+		place { control="Instructions,Instructions2,Password,Recovery" dir=down margin-top=56 margin-left=16 margin-right=16 margin-bottom=58 width=max }
+
+		place { control="Cancel,OK" align=bottom margin-left=0 margin-right=0 width=180 height=42 spacing=1 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_close,KeyImage" region="hidden" width=0 height=0 }
+	}
+}
\ No newline at end of file
diff --git a/Adwaita/resource/layout/steamrootdialog.layout b/Adwaita/resource/layout/steamrootdialog.layout
index 00e4c165..8216402f 100644
--- a/Adwaita/resource/layout/steamrootdialog.layout
+++ b/Adwaita/resource/layout/steamrootdialog.layout
@@ -7,13 +7,13 @@ steamrootdialog.layout
 		place { control="frame_title" width=max height=48 }
 		place { control="UINavigatorPanel" width=max height=max }
 
-		place { control="InboxButton,MenuBar" width=34 height=34 y=7 margin-right=12 spacing=6 align=right end-right="frame_minimize" }
+		place { control="InboxButton,SupportAlert,ParentalLockButton,MenuBar" width=34 height=34 y=7 margin-right=12 spacing=6 align=right end-right="frame_minimize" }
 
 		place { control="AccountButton" width=28 height=28 y=10 margin-right=12 align=right end-right="InboxButton" }
 
 		place { control="frame_captiongrip" margin=2 width=max height=104 }
 
 		region { name="hidden" width=0 height=0 margin-left=-999 }
-		place { control="UIStatusPanel,view_friends,fullscreen,startvr,exitvr,add_game,AnnouncementButton,ParentalLockButton,universe_label,EOLAlert,SupportAlert" region="hidden" width=0 height=0 }
+		place { control="UIStatusPanel,view_friends,fullscreen,startvr,exitvr,add_game,AnnouncementButton,universe_label,EOLAlert" region="hidden" width=0 height=0 }
 	}
 }
diff --git a/Adwaita/resource/layout/subpaneloptionscompat.layout b/Adwaita/resource/layout/subpaneloptionscompat.layout
index 85d8c6b7..b4a83453 100755
--- a/Adwaita/resource/layout/subpaneloptionscompat.layout
+++ b/Adwaita/resource/layout/subpaneloptionscompat.layout
@@ -1,150 +1,61 @@
-subpaneloptioncompat.layout
-{
-	styles
-	{
-		Highlight
-		{
-			textcolor="window_fg"
-			font-weight=700
-			render
-			{
-				0="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
-				1="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)"
-			}
-		}
-
-		CheckButton
-		{
-			inset="5 6 6 6"
-			padding-right=64
-			image="assets/pixel"
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/unchecked)"
-			}
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:hover
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/unchecked_hover)"
-			}
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_hover_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:active
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_active_bg)"
-			}
-		}
-		CheckButton:selected
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/checked)"
-			}
-		}
-		CheckButton:selected:hover
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/checked_hover)"
-			}
-		}
-
-		ComboBox
-		{
-			font-size=14
-			inset="320 0 -12 0"
-			render_bg {}
-			render
-			{
-				0="fill(x0, y0, x1, y1-12, button_bg)"
-				1="fill(x0+12, y1-12, x1-12, y1, button_bg)"
-				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w10/bl)"
-				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w10/br)"
-			}
-		}
-		ComboBox:hover
-		{
-			render
-			{
-				0="fill(x0, y0, x1, y1-12, button_hover_bg)"
-				1="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
-				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
-				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
-			}
-		}
-		ComboBox:active
-		{
-			render
-			{
-				0="fill(x0, y0, x1, y1-12, button_hover_bg)"
-				1="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
-				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
-				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
-			}
-		}
-		ComboBox:disabled
-		{
-			render
-			{
-				0="fill(x0, y0, x1, y1-12, button_disabled_bg)"
-				1="fill(x0+12, y1-12, x1-12, y1, button_disabled_bg)"
-				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w5/bl)"
-				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w5/br)"
-			}
-		}
-
-		ComboBoxButton
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, window_bg)"
-			}
-		}
-
-		Label
-		{
-			font-size=14
-			textcolor="window_fg"
-		}
-
-		URLLabel
-		{
-			font-style=none
-			font-weight=700
-			textcolor="window_fg"
-		}
-		URLLabel:hover
-		{
-			font-style=underline
-		}
-	}
-
-	layout
-	{
-		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
-
-		place { control="TitleLabel" region="content" width=max height=34 }
-
-		place { control="CompatEnabledCheckbox,CompatForcedCheckbox,AdvancedToolComboBox" region="content" start="TitleLabel" dir=down width=max height=50 }
-
-		place { control="AdvancedToolLabel" region="content" start="AdvancedToolComboBox" dir=down margin-top=-32 margin-left=12 width=320 }
-
-		place { control="DescriptionInfo,CompatForcedInfo,DescriptionLink" region="content" start="AdvancedToolComboBox" dir=down margin-top=16 width=max spacing=16 }
-
-		region { name="hidden" width=0 height=0 margin-left=-999 }
-		place { control="AdvancedTitle,Divider1" region="hidden" width=0 height=0 }
-	}
-}
+subpaneloptioncompat.layout
+{
+	styles
+	{
+		ComboBox
+		{
+			inset-left=320
+			render
+			{
+				0="fill(x0, y0, x1, y1-12, button_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w10/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w10/br)"
+			}
+		}
+		ComboBox:hover
+		{
+			render
+			{
+				0="fill(x0, y0, x1, y1-12, button_hover_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
+			}
+		}
+		ComboBox:active
+		{
+			render
+			{
+				0="fill(x0, y0, x1, y1-12, button_hover_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
+			}
+		}
+		ComboBox:disabled
+		{
+			render
+			{
+				0="fill(x0, y0, x1, y1-12, button_disabled_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_disabled_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w5/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w5/br)"
+			}
+		}
+	}
+
+	layout
+	{
+		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+
+		place { control="TitleLabel" region="content" width=max height=34 }
+		place { control="CompatEnabledCheckbox,CompatForcedCheckbox,AdvancedToolComboBox" region="content" start="TitleLabel" dir=down width=max height=50 }
+
+		place { control="AdvancedToolLabel" region="content" start="AdvancedToolComboBox" dir=down margin-top=-32 margin-left=12 width=320 }
+		place { control="DescriptionInfo,CompatForcedInfo,DescriptionLink" region="content" start="AdvancedToolComboBox" dir=down margin-top=16 width=max spacing=16 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="AdvancedTitle,Divider1" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/layout/subpaneloptionscontroller.layout b/Adwaita/resource/layout/subpaneloptionscontroller.layout
new file mode 100755
index 00000000..78b52006
--- /dev/null
+++ b/Adwaita/resource/layout/subpaneloptionscontroller.layout
@@ -0,0 +1,21 @@
+subpaneloptionscontroller.layout
+{
+	layout
+	{
+		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+
+		place { control="TitleLabel" region="content" width=max height=34 }
+
+		place { control="GeneralSettingsButton,DisableNotificationsCheckbox,DisableDualSenseUpdatesCheckbox" region="content" start="TitleLabel" dir=down width=max height=50 }
+
+		place { controls="Divider1" region="content" start="DisableDualSenseUpdatesCheckbox" dir=down width=max height=16 }
+
+		place { control="BigPictureConfigButton,DesktopConfigButton,GuideConfigButton" region="content" start="Divider1" dir=down width=max height=50 }
+
+		place { controls="Divider2" region="content" start="GuideConfigButton" dir=down width=max height=0 }
+
+		place { control="DescriptionLabel,DescriptionBindingLabel" region="content" start="Divider2" dir=down margin-top=24 width=max spacing=16 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+	}
+}
diff --git a/Adwaita/resource/layout/subpaneloptionsingame.layout b/Adwaita/resource/layout/subpaneloptionsingame.layout
new file mode 100755
index 00000000..5190c424
--- /dev/null
+++ b/Adwaita/resource/layout/subpaneloptionsingame.layout
@@ -0,0 +1,122 @@
+subpaneloptionsingame.layout
+{
+	styles
+	{
+		TextEntry
+		{
+			font-family=basefont
+			font-size=14
+			font-style=regular
+			textcolor="window_fg"
+			selectedtextcolor="window_fg"
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1-12, button_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w10/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w10/br)"
+			}
+		}
+		TextEntry:hover
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1-12, button_hover_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
+			}
+		}
+		TextEntry:focus
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1-12, button_hover_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
+			}
+		}
+		TextEntry:disabled
+		{
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1-12, button_disabled_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_disabled_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w5/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w5/br)"
+			}
+		}
+
+		URLLabel
+		{
+			bgcolor="button_bg"
+			font-size=14
+			font-weight=400
+			inset-left=12
+			inset-top=32
+			render_bg
+			{
+				0="fill(x0, y1-1, x1, y1, headerbar_shade)"
+			}
+			render
+			{
+				0="image(x1-28, y0+17, x1-12, y1-17, assets/icons/external_link)"
+			}
+		}
+		URLLabel:hover
+		{
+			bgcolor="button_hover_bg"
+			font-style=regular
+		}
+		URLLabel:active
+		{
+			bgcolor="button_active_bg"
+		}
+
+		Highlight
+		{
+			inset-top=16
+			render
+			{
+				0="fill(x0, y0-1, x1, y0, window_bg)"
+				1="image(x0, y0-12, x0+12, y0, assets/corners/12_mask_window_bg/bl)"
+				2="image(x1-12, y0-12, x1, y0, assets/corners/12_mask_window_bg/br)"
+				3="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
+				4="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)"
+				5="fill(x0, y1+99, x1, y1+100, window_bg)"
+				6="image(x0, y1+88, x0+12, y1+100, assets/corners/12_mask_window_bg/bl)"
+				7="image(x1-12, y1+88, x1, y1+100, assets/corners/12_mask_window_bg/br)"
+			}
+		}
+	}
+	
+	layout
+	{
+		region { name="content" margin-left=16 width=520 height=max overflow=scroll-vertical }
+
+		place { control="TitleLabel" region="content" dir=down width=484 height=50 }
+		place { control="EnableOverlayCheck,EnableVRDesktopGameTheaterCheck,EnableSCTenfootOverlayCheck" region="content" start="TitleLabel" dir=down width=484 height=50 }
+
+		place { control="ShowIngameFPSCombo,ShowIngameFPSContrastCheck" region="content" start="EnableSCTenfootOverlayCheck" dir=down width=484 height=50 margin-top=16 }
+		place { control="ShowIngameFPSLabel" region="content" start="ShowIngameFPSCombo" dir=down margin-top=-34 margin-left=12 width=335 }
+		
+		
+		place { control="Divider1" region="content" start="ShowIngameFPSContrastCheck" dir=down width=484 height=34 }
+		place { control="ScreenshotActionLabel" region="content" start="ShowIngameFPSContrastCheck" dir=down width=484 height=34 }
+		place { control="ScreenshotNotifyCheck,ScreenshotPlaySoundCheck,ScreenshotSaveUncompressedCheck,SetScreenshotFolderButton" region="content" start="ScreenshotActionLabel" dir=down width=484 height=50 }
+
+		place { control="ShareIPNetworkingLabel" region="content" start="SetScreenshotFolderButton" dir=down width=484 height=34 }
+		place { control="ShareIPNetworkingCombo,ShareIPNetworkingURL" region="content" start="ShareIPNetworkingLabel" dir=down width=484 height=50 }
+		place { control="ShareIPNetworkingInfo" region="content" start="ShareIPNetworkingCombo" dir=down margin-top=-42 margin-left=12 width=335 }
+
+		place { control="Divider2" region="content" start="ShareIPNetworkingURL" dir=down width=484 height=16 }
+		
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+
+		place { control="DescriptionLabel,HotKeySelectorLabel,ScreenshotLabel,TextFilterLabel,TextFilterStatus,TextFilterUpdateSettingURL,PingRateLabel,PingRateInfo,PingRateCombo" region="hidden" width=0 height=0 }
+
+		// hidden because of invalid font issues, no idea what's wrong
+		place { control="HotKeySelector,ScreenshotHotKeySelector" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/layout/subpaneloptionslibrary.layout b/Adwaita/resource/layout/subpaneloptionslibrary.layout
index 665a50a3..b7ce397e 100755
--- a/Adwaita/resource/layout/subpaneloptionslibrary.layout
+++ b/Adwaita/resource/layout/subpaneloptionslibrary.layout
@@ -1,172 +1,42 @@
-subpaneloptionslibrary.layout
-{
-	styles
-	{
-		Label
-		{
-			textcolor="window_fg"
-			font-weight=700
-			render
-			{
-				0="fill(x0, y1+199, x1, y1+200, window_bg)"
-				1="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
-				2="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)"
-				3="image(x0, y1+188, x0+12, y1+200, assets/corners/12_mask_window_bg/bl)"
-				4="image(x1-12, y1+188, x1, y1+200, assets/corners/12_mask_window_bg/br)"
-			}
-		}
-
-		CSettingsSubLibrary
-		{
-			render
-			{
-				// fake sidebar corners copy
-				0="fill(x0+6, y0+106, x0+12, y0+118, button_bg)"
-				1="fill(x0+168, y0+106, x0+174, y0+118, button_bg)"
-				2="image(x0+6, y0+100, x0+12, y0+106, assets/corners/6_w10/tl)"
-				3="image(x0+168, y0+100, x0+174, y0+106, assets/corners/6_w10/tr)"
-				4="image(x0+6, y0+118, x0+12, y0+124, assets/corners/6_w10/bl)"
-				5="image(x0+168, y0+118, x0+174, y0+124, assets/corners/6_w10/br)"
-
-				// round bottom corners
-				6="image(x0+196, y0+237, x0+208, y0+249, assets/corners/12_mask_window_bg/bl)"
-				7="image(x1-32, y0+237, x1-20, y0+249, assets/corners/12_mask_window_bg/br)"
-				8="fill(x0+196, y0+249, x1-20, y0+250, window_bg)"
-			}
-		}
-
-		CheckButton
-		{
-			inset="5 6 6 6"
-			padding-right=64
-			image="assets/pixel"
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/unchecked)"
-			}
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:hover
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/unchecked_hover)"
-			}
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_hover_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:active
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_active_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:selected
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/checked)"
-			}
-		}
-		CheckButton:selected:hover
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/checked_hover)"
-			}
-		}
-		CheckButton:disabled
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/unchecked_disabled)"
-			}
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_disabled_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:disabled:selected
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/checked_disabled)"
-			}
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_disabled_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-
-		RadioButton
-		{
-			inset="6 6 6 6"
-			image="assets/radiobutton_padded/unchecked"
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		RadioButton:hover
-		{
-			image="assets/radiobutton_padded/unchecked_hover"
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_hover_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		RadioButton:selected
-		{
-			image="assets/radiobutton_padded/checked"
-		}
-		RadioButton:selected:hover
-		{
-			image="assets/radiobutton_padded/checked_hover"
-		}
-		RadioButton:active
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_active_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		RadioButton:disabled
-		{
-			image="assets/radiobutton_padded/unchecked_disabled"
-		}
-		RadioButton:selected:disabled
-		{
-			image="assets/radiobutton_padded/checked_disabled"
-		}
-	}
-
-	layout
-	{
-		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
-
-		place { control="TitleLabel" region="content" width=max height=34 }
-
-		place { control="LibraryLowBandwidthCheckbox,LibraryLowPerfCheckbox,LibraryDisableCommunityContentCheckbox,LibraryDisplayIconInGameListCheckbox" region="content" start="TitleLabel" dir=down width=max height=50 }
-
-		place { controls="LibraryDisplaySizeLabel" region="content" start="LibraryDisplayIconInGameListCheckbox" dir=down margin-top=8 width=max height=34 }
-
-		place { control="LibraryDisplaySizeAutomatic,LibraryDisplaySizeSmall,LibraryDisplaySizeMedium,LibraryDisplaySizeLarge" region="content" start="LibraryDisplaySizeLabel" dir=down width=max height=50 }
-
-		region { name="hidden" width=0 height=0 margin-left=-999 }
-		place { control="LibraryDisplaySizeAutomaticLabel,LibraryLowBandwidthLabel,LibraryLowPerfLabel,LibraryDisableCommunityContentLabel" region="hidden" width=0 height=0 }
-	}
-}
+subpaneloptionslibrary.layout
+{
+	styles
+	{
+		CSettingsSubLibrary
+		{
+			render
+			{
+				0="image(x0+196, y0+237, x0+208, y0+249, assets/corners/12_mask_window_bg/bl)"
+				1="image(x1-32, y0+237, x1-20, y0+249, assets/corners/12_mask_window_bg/br)"
+				2="fill(x0+196, y0+249, x1-20, y0+250, window_bg)"
+			}
+		}
+
+		Label
+		{
+			font-weight=700
+			render
+			{
+				0="fill(x0, y1+199, x1, y1+200, window_bg)"
+				1="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
+				2="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)"
+				3="image(x0, y1+188, x0+12, y1+200, assets/corners/12_mask_window_bg/bl)"
+				4="image(x1-12, y1+188, x1, y1+200, assets/corners/12_mask_window_bg/br)"
+			}
+		}
+	}
+
+	layout
+	{
+		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+
+		place { control="TitleLabel" region="content" width=max height=34 }
+		place { control="LibraryLowBandwidthCheckbox,LibraryLowPerfCheckbox,LibraryDisableCommunityContentCheckbox,LibraryDisplayIconInGameListCheckbox" region="content" start="TitleLabel" dir=down width=max height=50 }
+
+		place { controls="LibraryDisplaySizeLabel" region="content" start="LibraryDisplayIconInGameListCheckbox" dir=down margin-top=8 width=max height=34 }
+		place { control="LibraryDisplaySizeAutomatic,LibraryDisplaySizeSmall,LibraryDisplaySizeMedium,LibraryDisplaySizeLarge" region="content" start="LibraryDisplaySizeLabel" dir=down width=max height=50 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="LibraryDisplaySizeAutomaticLabel,LibraryLowBandwidthLabel,LibraryLowPerfLabel,LibraryDisableCommunityContentLabel" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/layout/subpaneloptionsshadercache.layout b/Adwaita/resource/layout/subpaneloptionsshadercache.layout
new file mode 100755
index 00000000..8d0e369a
--- /dev/null
+++ b/Adwaita/resource/layout/subpaneloptionsshadercache.layout
@@ -0,0 +1,33 @@
+subpaneloptionsshadercache.layout
+{
+	styles
+	{
+		CSubPanelShaderCache
+		{
+			render
+			{
+				0="image(x0+196, y0+16, x0+208, y0+28, assets/corners/12_mask_window_bg/tl)"
+				1="image(x1-32, y0+16, x1-20, y0+28, assets/corners/12_mask_window_bg/tr)"
+				2="image(x0+196, y0+104, x0+208, y0+116, assets/corners/12_mask_window_bg/bl)"
+				3="image(x1-32, y0+104, x1-20, y0+116, assets/corners/12_mask_window_bg/br)"
+				4="fill(x0+196, y0+115, x1-20, y0+116, window_bg)"
+			}
+		}
+
+		CheckButton
+		{
+			inset-top=58
+		}
+	}
+
+	layout
+	{
+		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+
+		place { control="ShaderCacheEnabledCheckbox,ShaderCacheBGProcessingEnabledCheckbox" region="content" dir=down width=max height=50 }
+
+		place { control="ShaderCacheBGProcessingProgress,ShaderCacheInfo" region="content" start="ShaderCacheBGProcessingEnabledCheckbox" dir=down margin-top=16 width=max spacing=16 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+	}
+}
diff --git a/Adwaita/resource/menus/steam.menu b/Adwaita/resource/menus/steam.menu
index 13b6896d..bc1b8e70 100644
--- a/Adwaita/resource/menus/steam.menu
+++ b/Adwaita/resource/menus/steam.menu
@@ -4,7 +4,7 @@ menubar
 	{
 		text=""
 
-		SkinVersion			{ text="Adwaita for Steam v0.2" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
+		SkinVersion			{ text="Adwaita for Steam v0.3" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
 
 		Divider				{}
 
@@ -38,8 +38,8 @@ menubar
 		About				{ text="#steam_about" command="About" }
 		CheckForUpdates		{ text="#steam_menu_checkforupdates" command="CheckForUpdates" }
 		SystemInfo			{ text="#steam_menu_systeminfo" command="SystemInfo" }
-		Console				{ text="#app_task_console" shellcmd="steam://open/console" }
 		Settings			{ text="#steam_menu_settings" command="Settings" }
+		Console				{ text="#app_task_console" shellcmd="steam://open/console" }
 
 		Divider				{}
 
diff --git a/Adwaita/resource/styles/steam.styles b/Adwaita/resource/styles/steam.styles
index c58477f5..909b8357 100755
--- a/Adwaita/resource/styles/steam.styles
+++ b/Adwaita/resource/styles/steam.styles
@@ -1,81 +1,120 @@
-steam.styles
-{
-	include "adw/colors.styles"
-
-	include "adw/controls/window.styles"
-	include "adw/controls/button.styles"
-	include "adw/controls/entry.styles"
-	include "adw/controls/popup.styles"
-	include "adw/controls/scrollbar.styles"
-
-	include "adw/rootdialog.styles"
-	include "adw/settingsdialog.styles"
-
-	// include default Steam styles to ensure unstyled controls still work
-	include "../../resource/styles/steam.styles"
-
-	colors
-	{
-		basefont="Cantarell"
-		none="0 0 0 0"
-	}
-
-	styles
-	{
-		// splash screen
-		ProgressBox
-		{
-			render_bg
-			{
-				0="image(x0+160, y0+24, x0+204, y0+86, assets/splash_logo)"
-			}
-		}
-		"ProgressBox FrameTitle"
-		{
-			textcolor=none
-			bgcolor=none
-			render_bg {}
-		}
-		"ProgressBox Label"
-		{
-			textcolor=none
-			bgcolor=none
-		}
-		"ProgressBox FrameCloseButton"
-		{
-			render_bg {}
-		}
-		"ProgressBox Button"
-		{
-			textcolor=none
-			bgcolor=none
-			render_bg {}
-		}
-
-		QueryBox
-		{
-			bgcolor="popover_bg"
-			textcolor="popover_fg"
-		}
-		"QueryBox FrameTitle"
-		{
-			minimum-height=80
-			textcolor="popover_fg"
-			font-size=20
-			inset-left=10
-			render_bg {}
-		}
-		"QueryBox Label"
-		{
-			textcolor="popover_fg"
-			font-size=15
-			inset-bottom=16
-		}
-		"QueryBox Button"
-		{
-			textcolor="popover_fg"
-			font-size=15
-			inset-left=20
-		}
-	}
+steam.styles
+{
+	include "adw/colors.styles"
+
+	include "adw/rootdialog.styles"
+	include "adw/settingsdialog.styles"
+
+	include "adw/controls/window.styles"
+	include "adw/controls/button.styles"
+	include "adw/controls/entry.styles"
+	include "adw/controls/popup.styles"
+	include "adw/controls/scrollbar.styles"
+
+	// include default Steam styles to ensure unstyled controls still work
+	include "../../resource/styles/steam.styles"
+
+	colors
+	{
+		basefont="Cantarell"
+		none="0 0 0 0"
+	}
+
+	styles
+	{
+		ProgressBar
+		{
+			bgcolor="view_bg"
+			textcolor="accent"
+			render
+			{
+				0="fill(x0, y0, x1, y0+1, border)"
+				1="fill(x0, y1-1, x1, y1, border)"
+				2="fill(x0, y0+1, x0+1, y1-1, border)"
+				3="fill(x1-1, y0+1, x1, y1-1, border)"
+			}
+		}
+
+		// splash screen
+		ProgressBox
+		{
+			render_bg
+			{
+				0="image(x0+160, y0+24, x0+204, y0+86, assets/splash_logo)"
+			}
+		}
+		"ProgressBox FrameTitle"
+		{
+			textcolor=none
+			bgcolor=none
+			render_bg {}
+		}
+		"ProgressBox Label"
+		{
+			textcolor=none
+			bgcolor=none
+		}
+		"ProgressBox FrameCloseButton"
+		{
+			render_bg {}
+		}
+		"ProgressBox Button"
+		{
+			textcolor=none
+			bgcolor=none
+			render_bg {}
+		}
+
+		QueryBox
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+		}
+		"QueryBox FrameTitle"
+		{
+			minimum-height=80
+			textcolor="popover_fg"
+			font-size=20
+			inset-left=10
+			render_bg {}
+		}
+		"QueryBox Label"
+		{
+			textcolor="popover_fg"
+			font-size=15
+			inset-bottom=16
+		}
+		"QueryBox Button"
+		{
+			textcolor="popover_fg"
+			font-size=15
+			inset-left=20
+		}
+
+		MessageBox
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+		}
+		"MessageBox FrameTitle"
+		{
+			minimum-height=80
+			textcolor="popover_fg"
+			font-size=20
+			inset-left=10
+			render_bg {}
+		}
+		"MessageBox Label"
+		{
+			textcolor="popover_fg"
+			font-size=15
+			inset-bottom=16
+		}
+		"MessageBox Button"
+		{
+			textcolor="popover_fg"
+			font-size=15
+			inset-left=20
+		}
+	}
 }
\ No newline at end of file
diff --git a/Adwaita/steam/cached/AccountPage.res b/Adwaita/steam/cached/AccountPage.res
index aab73b91..81d263cb 100755
--- a/Adwaita/steam/cached/AccountPage.res
+++ b/Adwaita/steam/cached/AccountPage.res
@@ -1,65 +1,61 @@
-AccountPage.res
-{
-	styles
-	{
-		ImagePanel
-		{
-			render_bg
-			{
-				// background
-				0="fill(x0, y0-14, x0+460, y0+135, button_bg)"
-				-1="fill(x0-12, y0-2, x0, y0+123, button_bg)"
-				-2="fill(x0+460, y0-2, x0+472, y0+123, button_bg)"
-				-3="image(x0-12, y0-14, x0, y0-2, assets/corners/12_w10/tl)"
-				-4="image(x0+460, y0-14, x0+472, y0-2, assets/corners/12_w10/tr)"
-				-5="image(x0-12, y0+123, x0, y0+135, assets/corners/12_w10/bl)"
-				-6="image(x0+460, y0+123, x0+472, y0+135, assets/corners/12_w10/br)"
-
-				// separators
-				1="fill(x0-12, y0+35, x0+472, y0+36, headerbar_shade)"
-				2="fill(x0-12, y0+85, x0+472, y0+86, headerbar_shade)"
-
-				// icons
-				3="image(x0, y0+50, x0+24, y0+74, assets/icons_24/shield)"
-				4="image(x0, y0+98, x0+24, y0+122, assets/icons_24/bug)"
-			}
-		}
-
-		Label
-		{
-			textcolor="window_fg"
-		}
-
-		URLLabel
-		{
-			font-style=none
-			font-weight=700
-			textcolor="window_fg"
-		}
-		URLLabel:hover
-		{
-			font-style=underline
-		}
-	}
-
-	layout
-	{
-		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
-
-		place { control="SecurityIcon" region="content" x=12 y=14 width=24 height=24 }
-		place { control="SecurityStatusLabel,SecurityStatusState" region="content" x=48 y=7 spacing=2 dir=down }
-
-		place { control="Label2,VacInfoLink" region="content" x=48 y=57 spacing=2 dir=down }
-
-		place { control="BetaParticipationLabel,CurrentBetaLabel" region="content" x=48 y=106 spacing=2 dir=down }
-		place { control="ChangeBetaButton" region="content" y=110 align=right margin-right=12 height=25 }
-
-		place { control="AccountLink" region="content" y=156 }
-		place { control="ReportBugLink" region="content" y=156 align=right }
-
-		place { control="NoPersonalInfoCheck,ChangeUserButton,ManageSecurityButton,ChangePasswordButton,ChangeContactEmailButton,ValidateContactEmailButton,MachineLockAccountButton" region="content" y=180 width=max height=34 spacing=6 dir=down }
-
-		region { name="hidden" width=0 height=0 margin-left=-999 }
-		place { control="LogOutLabel,AccountInfo,ContactEmailLabel,EmailInfo,Label1,Divider1,Divider2" region="hidden" }
-	}
+AccountPage.res
+{
+	styles
+	{
+		ImagePanel
+		{
+			render_bg
+			{
+				// background
+				0="fill(x0, y0-14, x0+460, y0+86, button_bg)"
+				1="fill(x0-12, y0-2, x0, y0+86, button_bg)"
+				2="fill(x0+460, y0-2, x0+472, y0+86, button_bg)"
+				3="image(x0-12, y0-14, x0, y0-2, assets/corners/12_w10/tl)"
+				4="image(x0+460, y0-14, x0+472, y0-2, assets/corners/12_w10/tr)"
+			}
+			render
+			{
+				// separators
+				0="fill(x0-12, y0+35, x0+472, y0+36, headerbar_shade)"
+				1="fill(x0-12, y0+85, x0+472, y0+86, headerbar_shade)"
+				// icons
+				2="image(x0, y0+50, x0+24, y0+74, assets/icons_24/shield)"
+				3="image(x0, y0+98, x0+24, y0+122, assets/icons_24/bug)"
+			}
+		}
+
+		URLLabel
+		{
+			render
+			{
+				0="fill(x0, y0-17, x0+484, y0-16, window_bg)"
+				1="image(x0, y0-28, x0+12, y0-16, assets/corners/12_mask_window_bg/bl)"
+				2="image(x0+472, y0-28, x0+484, y0-16, assets/corners/12_mask_window_bg/br)"
+				3="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
+				4="image(x0+472, y1, x0+484, y1+12, assets/corners/12_mask_window_bg/tr)"
+			}
+		}
+	}
+
+	layout
+	{
+		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+
+		place { control="SecurityIcon" region="content" x=12 y=14 width=24 height=24 }
+		place { control="SecurityStatusLabel,SecurityStatusState" region="content" x=48 y=7 spacing=2 dir=down }
+
+		place { control="Label2,VacInfoLink" region="content" x=48 y=57 spacing=2 dir=down }
+
+		place { control="BetaParticipationLabel,CurrentBetaLabel" region="content" x=48 y=106 spacing=2 dir=down }
+		place { control="ChangeBetaButton" region="content" margin-left=-300 y=100 width=max height=50 }
+
+		place { control="AccountLink" region="content" dir=down start="ChangeBetaButton" margin-top=16 width=max height=28 }
+
+		place { control="NoPersonalInfoCheck,ChangeUserButton,ManageSecurityButton,ChangePasswordButton,ChangeContactEmailButton,ValidateContactEmailButton,MachineLockAccountButton" region="content" dir=down start="AccountLink" width=max height=50 }
+
+		place { control="ReportBugLink" region="content" dir=down start="MachineLockAccountButton" margin-top=16 width=max height=28 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="LogOutLabel,AccountInfo,ContactEmailLabel,EmailInfo,Label1,Divider1,Divider2" region="hidden" }
+	}
 }
\ No newline at end of file
diff --git a/Adwaita/steam/cached/SettingsSubInterface.res b/Adwaita/steam/cached/SettingsSubInterface.res
index 42c1fcb3..2c84eab0 100755
--- a/Adwaita/steam/cached/SettingsSubInterface.res
+++ b/Adwaita/steam/cached/SettingsSubInterface.res
@@ -1,178 +1,24 @@
-SettingsSubInterface.res
-{
-	styles
-	{
-		CheckButton
-		{
-			inset="5 6 6 6"
-			padding-right=64
-			image="assets/pixel"
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/unchecked)"
-			}
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:hover
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/unchecked_hover)"
-			}
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_hover_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:active
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, button_active_bg)"
-				1="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		CheckButton:selected
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/checked)"
-			}
-		}
-		CheckButton:selected:hover
-		{
-			render
-			{
-				0="image(x1-56, y0+12, x1-8, y1-12, assets/switch/checked_hover)"
-			}
-		}
-
-		ComboBox
-		{
-			font-size=14
-			inset="350 0 -12 0"
-			render_bg {}
-			render
-			{
-				0="fill(x0+12, y0, x1-12, y0+12, button_bg)"
-				1="fill(x0, y0+12, x1, y1, button_bg)"
-				2="image(x0, y0, x0+12, y0+12, assets/corners/12_w10/tl)"
-				3="image(x1-12, y0, x1, y0+12, assets/corners/12_w10/tr)"
-				4="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		ComboBox:hover
-		{
-			render
-			{
-				0="fill(x0+12, y0, x1-12, y0+12, button_hover_bg)"
-				1="fill(x0, y0+12, x1, y1, button_hover_bg)"
-				2="image(x0, y0, x0+12, y0+12, assets/corners/12_w15/tl)"
-				3="image(x1-12, y0, x1, y0+12, assets/corners/12_w15/tr)"
-				4="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		ComboBox:active
-		{
-			render
-			{
-				0="fill(x0+12, y0, x1-12, y0+12, button_hover_bg)"
-				1="fill(x0, y0+12, x1, y1, button_hover_bg)"
-				2="image(x0, y0, x0+12, y0+12, assets/corners/12_w15/tl)"
-				3="image(x1-12, y0, x1, y0+12, assets/corners/12_w15/tr)"
-				4="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-		ComboBox:disabled
-		{
-			render
-			{
-				0="fill(x0+12, y0, x1-12, y0+12, button_disabled_bg)"
-				1="fill(x0, y0+12, x1, y1, button_disabled_bg)"
-				2="image(x0, y0, x0+12, y0+12, assets/corners/12_w5/tl)"
-				3="image(x1-12, y0, x1, y0+12, assets/corners/12_w5/tr)"
-				4="fill(x0, y1-1, x1, y1, headerbar_shade)"
-			}
-		}
-
-		ComboBoxButton
-		{
-			render_bg
-			{
-				0="fill(x0, y0, x1, y1, window_bg)"
-			}
-		}
-
-		Button
-		{
-			bgcolor="button_bg"
-			render_bg {}
-		}
-		Button:hover
-		{
-			bgcolor="button_hover_bg"
-		}
-		Button:active
-		{
-			bgcolor="button_active_bg"
-		}
-
-		Label
-		{
-			font-size=14
-			textcolor="window_fg"
-			selectedtextcolor="window_fg"
-		}
-
-		URLLabel
-		{
-			font-style=none
-			font-weight=700
-			textcolor="window_fg"
-		}
-		URLLabel:hover
-		{
-			font-style=underline
-		}
-
-		Divider
-		{
-			render_bg {}
-			render
-			{
-				0="fill(x0, y0-1, x1, y0, window_bg)"
-				1="image(x0, y0-12, x0+12, y0, assets/corners/12_mask_window_bg/bl)"
-				2="image(x1-12, y0-12, x1, y0, assets/corners/12_mask_window_bg/br)"
-				3="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
-				4="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)"
-			}
-		}
-	}
-
-	layout
-	{
-		region { name="content" margin-left=16 width=520 height=max overflow=scroll-vertical }
-
-		place { control="LanguageCombo,NotifyAvailableGamesCheck" region="content" margin-top=16 dir=down width=484 height=50 }
-
-		place { control="Divider1" region="content" width=484 height=16 dir=down start="NotifyAvailableGamesCheck" }
-
-		place { control="FavoriteWindowCombo,AutoLaunchCheck,BigPictureModeCheck" region="content" start="Divider1" dir=down width=484 height=50 }
-
-		place { control="Divider2" region="content" width=484 height=16 dir=down start="BigPictureModeCheck" }
-
-		place { control="SkinCombo,DPIScalingCheck,UrlBarCheck,DWriteCheck,SmoothScrollWebViewCheck,GPUWebViewCheck,H264HWAccelCheck,SetJumplistOptionsButton" region="content" start="Divider2" dir=down width=484 height=50 }
-
-		place { control="Divider3" region="content" width=484 height=16 dir=down start="SetJumplistOptionsButton" }
-
-		place { control="LabelLanguageCombo,LabelSteamChinaLanguageCombo" region="content" start="LanguageCombo" dir=down margin-top=-42 margin-left=12 width=335 }
-		place { control="TranslationLabel" region="content" start="LanguageCombo" dir=down margin-top=-24 margin-left=12 width=335 }
-		place { control="Label1" region="content" start="FavoriteWindowCombo" dir=down margin-top=-42 margin-left=12 width=335 }
-		place { control="Label3" region="content" start="SkinCombo" dir=down margin-top=-32 margin-left=12 width=335 }
-	}
-}
+SettingsSubInterface.res
+{
+	layout
+	{
+		region { name="content" margin-left=16 width=520 height=max overflow=scroll-vertical }
+
+		place { control="LanguageCombo,NotifyAvailableGamesCheck" region="content" margin-top=16 dir=down width=484 height=50 }
+
+		place { control="Divider1" region="content" width=484 height=16 dir=down start="NotifyAvailableGamesCheck" }
+
+		place { control="FavoriteWindowCombo,AutoLaunchCheck,BigPictureModeCheck" region="content" start="Divider1" dir=down width=484 height=50 }
+
+		place { control="Divider2" region="content" width=484 height=16 dir=down start="BigPictureModeCheck" }
+
+		place { control="SkinCombo,DPIScalingCheck,UrlBarCheck,DWriteCheck,SmoothScrollWebViewCheck,GPUWebViewCheck,H264HWAccelCheck,SetJumplistOptionsButton" region="content" start="Divider2" dir=down width=484 height=50 }
+
+		place { control="Divider3" region="content" width=484 height=16 dir=down start="SetJumplistOptionsButton" }
+
+		place { control="LabelLanguageCombo,LabelSteamChinaLanguageCombo" region="content" start="LanguageCombo" dir=down margin-top=-42 margin-left=12 width=335 }
+		place { control="TranslationLabel" region="content" start="LanguageCombo" dir=down margin-top=-24 margin-left=12 width=335 }
+		place { control="Label1" region="content" start="FavoriteWindowCombo" dir=down margin-top=-42 margin-left=12 width=335 }
+		place { control="Label3" region="content" start="SkinCombo" dir=down margin-top=-32 margin-left=12 width=335 }
+	}
+}