diff --git a/Adwaita/adw/colors.styles b/Adwaita/adw/colors.styles
index fa53ee45..2369ea48 100644
--- a/Adwaita/adw/colors.styles
+++ b/Adwaita/adw/colors.styles
@@ -38,6 +38,7 @@ colors.styles
 		view_fg="255 255 255 255"
 
 		popover_bg="56 56 56 255"
+		popover_bg_transparent="56 56 56 0"
 		popover_fg="255 255 255 255"
 
 		button_bg="255 255 255 26"
diff --git a/Adwaita/public/SteamLoginDialog.res b/Adwaita/public/SteamLoginDialog.res
new file mode 100755
index 00000000..280119d7
--- /dev/null
+++ b/Adwaita/public/SteamLoginDialog.res
@@ -0,0 +1,279 @@
+SteamLoginDialog.res
+{
+	styles
+	{
+		CSteamLoginDialog
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+			minimum-height=360
+		}
+
+		FrameTitle
+		{
+			textcolor="popover_fg"
+			font-size=20
+			inset-left=10
+			render_bg {}
+		}
+
+		Button
+		{
+			inset-left=10
+			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)"
+			}
+		}
+
+		TextEntry
+		{
+			inset-left=9
+			inset-right=9
+			inset-top=6
+			inset-bottom=-6
+			textcolor="button_fg"
+			shadowtextcolor="button_fg"
+			selectedtextcolor="accent_fg"
+			selectedbgcolor="accent_bg"
+			render
+			{
+				0="fill(x0, y1-1, x1, y1, headerbar_shade)"
+				1="image(x1-28, y0+17, x1-12, y1-17, assets/icons/edit)"
+			}
+			render_bg
+			{
+				0="fill(x0, y0+12, x1, y1, button_bg)"
+				1="fill(x0+12, y0, x1-12, y0+12, 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)"
+			}
+		}
+		TextEntry:hover
+		{
+			render_bg
+			{
+				0="fill(x0, y0+12, x1, y1, button_hover_bg)"
+				1="fill(x0+12, y0, x1-12, y0+12, 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)"
+			}
+		}
+		TextEntry:disabled
+		{
+			textcolor="button_disabled_fg"
+			render_bg
+			{
+				0="fill(x0, y0+12, x1, y1, button_disabled_bg)"
+				1="fill(x0+12, y0, x1-12, y0+12, 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)"
+			}
+		}
+		TextEntry:focus
+		{
+			render
+			{
+				0="image(x0, y0, x0+13, y0+13, assets/focusring/12/tl)"
+				1="image(x1-13, y0, x1, y0+13, assets/focusring/12/tr)"
+				2="fill(x0+13, y0, x1-13, y0+2, focusring)"
+				3="fill(x0, y0+13, x0+2, y1-2, focusring)"
+				4="fill(x1-2, y0+13, x1, y1-2, focusring)"
+				5="fill(x0, y1-2, x1, y1, focusring)"
+			}
+		}
+
+		TextEntryLarge
+		{
+			inset-left=9
+			inset-right=9
+			inset-top=6
+			inset-bottom=-6
+			bgcolor=none
+			textcolor="button_fg"
+			shadowtextcolor="button_fg"
+			selectedtextcolor="accent_fg"
+			selectedbgcolor="accent_bg"
+			render
+			{
+				0="fill(x0, y1-1, x1, y1, headerbar_shade)"
+				1="image(x1-28, y0+17, x1-12, y1-17, assets/icons/edit)"
+			}
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_bg)"
+			}
+		}
+		TextEntryLarge:hover
+		{
+			bgcolor=none
+			render
+			{
+				0="fill(x0, y1-1, x1, y1, headerbar_shade)"
+				1="image(x1-28, y0+17, x1-12, y1-17, assets/icons/edit)"
+			}
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_hover_bg)"
+			}
+		}
+		TextEntry:disabled
+		{
+			bgcolor=none
+			textcolor="button_disabled_fg"
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1, button_disabled_bg)"
+			}
+		}
+		TextEntryLarge:focus
+		{
+			bgcolor=none
+			render
+			{
+				0="fill(x0, y0, x1, y0+2, focusring)"
+				1="fill(x0, y0+2, x0+2, y1-2, focusring)"
+				2="fill(x1-2, y0+2, x1, y1-2, focusring)"
+				3="fill(x0, y1-2, x1, y1, focusring)"
+			}
+		}
+
+		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-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)"
+			}
+		}
+		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-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)"
+			}
+		}
+		CheckButton:active
+		{
+			image="assets/pixel"
+			render_bg
+			{
+				0="fill(x0, y0, x1, y1-12, button_active_bg)"
+				1="fill(x0+12, y1-12, x1-12, y1, button_active_bg)"
+				2="image(x0, y1-12, x0+12, y1, assets/corners/12_w30/bl)"
+				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w30/br)"
+			}
+		}
+		CheckButton:selected
+		{
+			image="assets/pixel"
+			render
+			{
+				0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked)"
+			}
+		}
+		CheckButton:selected:hover
+		{
+			image="assets/pixel"
+			render
+			{
+				0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked_hover)"
+			}
+		}
+		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-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)"
+			}
+		}
+
+		Label
+		{
+			font-size=12
+			textcolor="button_disabled_fg"
+			selectedtextcolor="button_disabled_fg"
+		}
+
+		loginerror_style_body
+		{
+			font-size=14
+			textcolor="warning"
+			bgcolor=none
+			padding-left=32
+			render
+			{
+				0="image(x0+6, y0+9, x0+24, y0+25, assets/icons/warning)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="frame_title" width=max height=64 }
+
+		place { control="LoginProcessThrobber" align=right margin-top=24 margin-right=16 width=16 height=16 }
+
+		place { control="UserNameEdit,PasswordEdit,SavePasswordCheck" dir=down margin-top=64 margin-left=16 margin-right=16 width=max height=50 }
+
+		place { control="UserNameLabel" start="UserNameEdit" dir=down margin-left=12 margin-top=-43 }
+		place { control="PasswordLabel" start="PasswordEdit" dir=down margin-left=12 margin-top=-43 }
+		place { control="PasswordCapsLockLabel,PasswordCapsLockImage" start="PasswordEdit" dir=down align=right margin-top=-43 margin-right=12 }
+
+		place { control="AlreadyLoggedIn,LoginProcessText,LoginErrorText" start="SavePasswordCheck" dir=down margin-top=16 margin-right=16 width=max }
+
+		place { control="LostPasswordButton,CreateNewAccountButton" dir=down start="LoginErrorText" align=bottom margin-top=24 margin-bottom=43 margin-left=-16 width=max height=42 spacing=1 }
+		place { control="CancelButton,LoginButton" align=bottom margin-left=0 margin-right=0 width=240 height=42 spacing=1 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_close,ImagePanelLogo,Label2,Label4,LoginProcessImage,LoginProcessLabel,Divider1" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/layout/htmlpopup.layout b/Adwaita/resource/layout/htmlpopup.layout
new file mode 100755
index 00000000..e8626598
--- /dev/null
+++ b/Adwaita/resource/layout/htmlpopup.layout
@@ -0,0 +1,244 @@
+htmlpopup.layout
+{
+	styles
+	{
+		Frame
+		{
+			minimum-width=700
+			minimum-height=600
+		}
+
+		FrameTitle
+		{
+			textcolor=none
+			font-size=1
+		}
+
+		HTML
+		{
+			inset="2 0 2 2"
+		}
+
+		BackButtonSm
+		{
+			inset="0 0 0 0"
+			padding="3 0 0 0"
+			minimum-width=34
+			minimum-height=34
+			image="assets/icons/back_backdrop"
+			render_bg {}
+		}
+		BackButtonSm:framefocus
+		{
+			image="assets/icons/back"
+		}
+		BackButtonSm: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)"
+			}
+		}
+		BackButtonSm:active
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x0+28, y0+34, button_active_bg)"
+				1="fill(x0, y0+6, x0+6, y0+28, button_active_bg)"
+				2="fill(x0+28, y0+6, x0+34, y0+28, button_active_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w30/tl)"
+				4="image(x0+28, y0, x0+34, y0+6, assets/corners/6_w30/tr)"
+				5="image(x0, y0+28, x0+6, y0+34, assets/corners/6_w30/bl)"
+				6="image(x0+28, y0+28, x0+34, y0+34, assets/corners/6_w30/br)"
+			}
+		}
+		BackButtonSm:disabled
+		{
+			image="assets/icons/back_disabled"
+			render_bg {}
+		}
+
+		ForwardButtonSm
+		{
+			inset="0 0 0 0"
+			padding="3 0 0 0"
+			minimum-width=34
+			minimum-height=34
+			image="assets/icons/forward_backdrop"
+			render_bg {}
+		}
+		ForwardButtonSm:framefocus
+		{
+			image="assets/icons/forward"
+		}
+		ForwardButtonSm: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)"
+			}
+		}
+		ForwardButtonSm:active
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x0+28, y0+34, button_active_bg)"
+				1="fill(x0, y0+6, x0+6, y0+28, button_active_bg)"
+				2="fill(x0+28, y0+6, x0+34, y0+28, button_active_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w30/tl)"
+				4="image(x0+28, y0, x0+34, y0+6, assets/corners/6_w30/tr)"
+				5="image(x0, y0+28, x0+6, y0+34, assets/corners/6_w30/bl)"
+				6="image(x0+28, y0+28, x0+34, y0+34, assets/corners/6_w30/br)"
+			}
+		}
+		ForwardButtonSm:disabled
+		{
+			image="assets/icons/forward_disabled"
+			render_bg {}
+		}
+
+		ReloadButton
+		{
+			inset="0 0 0 0"
+			padding="3 0 0 0"
+			minimum-width=34
+			minimum-height=34
+			image="assets/icons/refresh_backdrop"
+			render_bg {}
+		}
+		ReloadButton:framefocus
+		{
+			image="assets/icons/refresh"
+		}
+		ReloadButton: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)"
+			}
+		}
+		ReloadButton:active
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x0+28, y0+34, button_active_bg)"
+				1="fill(x0, y0+6, x0+6, y0+28, button_active_bg)"
+				2="fill(x0+28, y0+6, x0+34, y0+28, button_active_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w30/tl)"
+				4="image(x0+28, y0, x0+34, y0+6, assets/corners/6_w30/tr)"
+				5="image(x0, y0+28, x0+6, y0+34, assets/corners/6_w30/bl)"
+				6="image(x0+28, y0+28, x0+34, y0+34, assets/corners/6_w30/br)"
+			}
+		}
+		ReloadButton:disabled
+		{
+			image="assets/icons/refresh_disabled"
+			render_bg {}
+		}
+
+		StopButton
+		{
+			inset="0 0 0 0"
+			padding="3 0 0 0"
+			minimum-width=34
+			minimum-height=34
+			image="assets/icons/stop_backdrop"
+			render_bg {}
+		}
+		StopButton:framefocus
+		{
+			image="assets/icons/stop"
+		}
+		StopButton: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)"
+			}
+		}
+		StopButton:active
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x0+28, y0+34, button_active_bg)"
+				1="fill(x0, y0+6, x0+6, y0+28, button_active_bg)"
+				2="fill(x0+28, y0+6, x0+34, y0+28, button_active_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w30/tl)"
+				4="image(x0+28, y0, x0+34, y0+6, assets/corners/6_w30/tr)"
+				5="image(x0, y0+28, x0+6, y0+34, assets/corners/6_w30/bl)"
+				6="image(x0+28, y0+28, x0+34, y0+34, assets/corners/6_w30/br)"
+			}
+		}
+		StopButton:disabled
+		{
+			image="assets/icons/stop_disabled"
+		}
+
+		TextEntryURL
+		{
+			inset-left=24
+			textcolor="headerbar_backdrop_fg"
+			shadowtextcolor="button_fg"
+			selectedtextcolor="accent_fg"
+			selectedbgcolor="accent_bg"
+		}
+		URLBarSecure:framefocus
+		{
+			textcolor="headerbar_fg"
+		}
+		URLBarBrokenSecure
+		{
+			inset-left=24
+			textcolor="warning"
+			selectedtextcolor="warning_fg"
+			selectedbgcolor="warning_bg"
+		}
+		URLStatusImage
+		{
+			render_bg {}
+			image="graphics/html_lock_disabled"
+			inset="0 0 0 0"
+		}
+	}
+
+	layout
+	{
+		place { control="frame_minimize,frame_close" align=right spacing=14 margin-right=12 y=12 }
+		place { control="BackButton,ForwardButton,ReloadButton,StopButton" x=7 y=7 width=34 height=34 spacing=6 }
+
+		place { control="frame_title" width=max height=48 }
+
+		place { control="URLBar" align=top-center width=max height=34 margin-top=7 margin-left=210 margin-right=210 }
+		place { control="URLStatusImage" start="URLBar" dir=down width=16 height=16 margin-left=6 margin-top=-25 }
+		place { control="PageLoadThrobber" start="URLBar" dir=down width=16 height=16 margin-left=6 margin-top=-25 }
+
+		place { control="htmlpopupchild" width=max height=max margin-top=48 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_maximize,StatusText,EVCert" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/layout/subpaneloptionsbrowser.layout b/Adwaita/resource/layout/subpaneloptionsbrowser.layout
index d3dd1a00..f863a8a2 100755
--- a/Adwaita/resource/layout/subpaneloptionsbrowser.layout
+++ b/Adwaita/resource/layout/subpaneloptionsbrowser.layout
@@ -2,12 +2,6 @@ subpaneloptionsbrowser.layout
 {
 	styles
 	{
-		Label
-		{
-			font-size=12
-			textcolor="button_disabled_fg"
-		}
-
 		TextEntry
 		{
 			inset-left=9
@@ -50,6 +44,12 @@ subpaneloptionsbrowser.layout
 			}
 		}
 
+		Label
+		{
+			font-size=12
+			textcolor="button_disabled_fg"
+		}
+
 		Button
 		{
 			bgcolor=none
@@ -83,6 +83,58 @@ subpaneloptionsbrowser.layout
 				3="image(x1-12, y1-12, x1, y1, assets/corners/12_w30/br)"
 			}
 		}
+
+		"QueryBox Label"
+		{
+			textcolor="popover_fg"
+			font-size=15
+			inset-bottom=16
+		}
+		"QueryBox Button"
+		{
+			textcolor="popover_fg"
+			font-family=basefont
+			font-size=15
+			font-weight=700
+			font-style=none
+			inset-left=20
+			render_bg
+			{
+				0="fill(x0+6, y0, x1-6, y1, button_bg)"
+				1="fill(x0, y0+6, x0+6, y1-6, button_bg)"
+				2="fill(x1-6, y0+6, x1, y1-6, button_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w10/tl)"
+				4="image(x1-6, y0, x1, y0+6, assets/corners/6_w10/tr)"
+				5="image(x0, y1-6, x0+6, y1, assets/corners/6_w10/bl)"
+				6="image(x1-6, y1-6, x1, y1, assets/corners/6_w10/br)"
+			}
+		}
+		"QueryBox Button:hover"
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x1-6, y1, button_hover_bg)"
+				1="fill(x0, y0+6, x0+6, y1-6, button_hover_bg)"
+				2="fill(x1-6, y0+6, x1, y1-6, button_hover_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w15/tl)"
+				4="image(x1-6, y0, x1, y0+6, assets/corners/6_w15/tr)"
+				5="image(x0, y1-6, x0+6, y1, assets/corners/6_w15/bl)"
+				6="image(x1-6, y1-6, x1, y1, assets/corners/6_w15/br)"
+			}
+		}
+		"QueryBox Button:active"
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x1-6, y1, button_active_bg)"
+				1="fill(x0, y0+6, x0+6, y1-6, button_active_bg)"
+				2="fill(x1-6, y0+6, x1, y1-6, button_active_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w30/tl)"
+				4="image(x1-6, y0, x1, y0+6, assets/corners/6_w30/tr)"
+				5="image(x0, y1-6, x0+6, y1, assets/corners/6_w30/bl)"
+				6="image(x1-6, y1-6, x1, y1, assets/corners/6_w30/br)"
+			}
+		}
 	}
 	
 	layout
diff --git a/Adwaita/resource/layout/subpaneloptionscloud.layout b/Adwaita/resource/layout/subpaneloptionscloud.layout
index 881c70e2..b1753be7 100755
--- a/Adwaita/resource/layout/subpaneloptionscloud.layout
+++ b/Adwaita/resource/layout/subpaneloptionscloud.layout
@@ -16,14 +16,16 @@ subpaneloptionscloud.layout
 
 		CheckButton
 		{
-			inset-top=84
+			inset-top=-16
+			inset-bottom=-16
+			minimum-height=50
 		}
 	}
 	
 	layout
 	{
 		region { name="content" margin-top=16 margin-left=16 width=500 height=max }
-		place { control="EnableCloudCheck,EnableScreenshotsCheck" region="content" dir=down width=max height=50 }
+		place { control="EnableCloudCheck,EnableScreenshotsCheck" region="content" dir=down width=max }
 		place { control="SteamCloudInfo" region="content" start="EnableScreenshotsCheck" dir=down margin-top=16 width=max }
 	}
 }
diff --git a/Adwaita/resource/layout/subpaneloptionsshadercache.layout b/Adwaita/resource/layout/subpaneloptionsshadercache.layout
index 81c2a980..5b548551 100755
--- a/Adwaita/resource/layout/subpaneloptionsshadercache.layout
+++ b/Adwaita/resource/layout/subpaneloptionsshadercache.layout
@@ -16,14 +16,16 @@ subpaneloptionsshadercache.layout
 
 		CheckButton
 		{
-			inset-top=58
+			inset-top=-16
+			inset-bottom=-16
+			minimum-height=50
 		}
 	}
 
 	layout
 	{
 		region { name="content" margin-top=16 margin-left=16 width=500 height=max }
-		place { control="ShaderCacheEnabledCheckbox,ShaderCacheBGProcessingEnabledCheckbox" region="content" dir=down width=max height=50 }
+		place { control="ShaderCacheEnabledCheckbox,ShaderCacheBGProcessingEnabledCheckbox" region="content" dir=down width=max }
 		place { control="ShaderCacheBGProcessingProgress,ShaderCacheInfo" region="content" start="ShaderCacheBGProcessingEnabledCheckbox" dir=down margin-top=16 width=max spacing=16 }
 	}
 }
diff --git a/Adwaita/resource/layout/twofactorcodechallenge.layout b/Adwaita/resource/layout/twofactorcodechallenge.layout
new file mode 100755
index 00000000..611019fe
--- /dev/null
+++ b/Adwaita/resource/layout/twofactorcodechallenge.layout
@@ -0,0 +1,70 @@
+twofactorcodechallenge.layout
+{
+	styles
+	{
+		TwoFactorCodeChallenge
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+			minimum-width=480
+			minimum-height=210
+		}
+
+		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="Label2,AuthCode" dir=down margin-top=56 margin-left=16 margin-right=16 margin-bottom=58 width=max spacing=16 }
+
+		place { control="Cancel,OK" align=bottom margin-left=0 margin-right=0 width=240 height=42 spacing=1 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_close,Background,Key,Label1" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/menus/steam.menu b/Adwaita/resource/menus/steam.menu
index 912df380..a332558d 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.6" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
+		SkinVersion			{ text="Adwaita for Steam v0.7" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
 
 		Divider				{}
 
diff --git a/Adwaita/steam/cached/ChooseBetaDialog.res b/Adwaita/steam/cached/ChooseBetaDialog.res
new file mode 100755
index 00000000..a1577eac
--- /dev/null
+++ b/Adwaita/steam/cached/ChooseBetaDialog.res
@@ -0,0 +1,137 @@
+ChooseBetaDialog.res
+{
+	styles
+	{
+		CChooseBetaDialog
+		{
+			bgcolor="popover_bg"
+			textcolor="popover_fg"
+			minimum-width=440
+		}
+
+		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
+		{
+			inset-left=10
+			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)"
+			}
+		}
+
+		ComboBox
+		{
+			font-size=14
+			inset="8 0 -6 0"
+			render_bg {}
+			render
+			{
+				0="fill(x0, y0+12, x1, y1-12, button_bg)"
+				1="fill(x0+12, y0, x1-12, y0+12, button_bg)"
+				2="fill(x0+12, y1-12, x1-12, y1, button_bg)"
+				3="image(x0, y0, x0+12, y0+12, assets/corners/12_w10/tl)"
+				4="image(x1-12, y0, x1, y0+12, assets/corners/12_w10/tr)"
+				5="image(x0, y1-12, x0+12, y1, assets/corners/12_w10/bl)"
+				6="image(x1-12, y1-12, x1, y1, assets/corners/12_w10/br)"
+			}
+		}
+		ComboBox:hover
+		{
+			render_bg {}
+			render
+			{
+				0="fill(x0, y0+12, x1, y1-12, button_hover_bg)"
+				1="fill(x0+12, y0, x1-12, y0+12, button_hover_bg)"
+				2="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
+				3="image(x0, y0, x0+12, y0+12, assets/corners/12_w15/tl)"
+				4="image(x1-12, y0, x1, y0+12, assets/corners/12_w15/tr)"
+				5="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
+				6="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
+			}
+		}
+		ComboBox:active
+		{
+			render_bg {}
+			render
+			{
+				0="fill(x0, y0+12, x1, y1-12, button_hover_bg)"
+				1="fill(x0+12, y0, x1-12, y0+12, button_hover_bg)"
+				2="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
+				3="image(x0, y0, x0+12, y0+12, assets/corners/12_w15/tl)"
+				4="image(x1-12, y0, x1, y0+12, assets/corners/12_w15/tr)"
+				5="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
+				6="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
+			}
+		}
+		ComboBoxButton
+		{
+			render {}
+			render_bg
+			{
+				0="gradient_horizontal(x0-6, y0, x0+6, y1, popover_bg_transparent, popover_bg)"
+				1="fill(x0+6, y0, x1, y1, popover_bg)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="frame_title" width=max height=64 }
+
+		place { control="Label1" dir=down margin-top=56 margin-left=16 margin-right=16 width=max }
+		place { control="BetaListComboBox" dir=down margin-top=220 margin-left=16 margin-right=16 width=max height=50 }
+		place { control="ReadMoreURL" start="BetaListComboBox" dir=down margin-top=16 margin-right=16 width=max }
+
+		place { control="CancelButton,OKButton" align=bottom margin-left=0 margin-right=0 width=220 height=42 spacing=1 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_close,Label2" region="hidden" width=0 height=0 }
+	}
+}
\ No newline at end of file
diff --git a/Adwaita/steam/cached/accountsettingswebdialog.layout b/Adwaita/steam/cached/accountsettingswebdialog.layout
new file mode 100755
index 00000000..f1d72eac
--- /dev/null
+++ b/Adwaita/steam/cached/accountsettingswebdialog.layout
@@ -0,0 +1,15 @@
+accountsettingswebdialog.layout
+{
+	styles
+	{
+		HTML
+		{
+			inset="2 0 2 2"
+		}
+	}
+	
+	layout
+	{
+		place { controls="HTML" width=max height=max margin-top=38 }
+	}
+}
diff --git a/patches/windowcontrols/left-all.patch b/patches/windowcontrols/left-all.patch
index bd934b10..e25b3cbc 100644
--- a/patches/windowcontrols/left-all.patch
+++ b/patches/windowcontrols/left-all.patch
@@ -118,3 +118,17 @@
  
  		place { control="HTMLSellPage" width=max height=max margin-top=48 }
  
+
+--- Adwaita/resource/layout/htmlpopup.layout
++++ Adwaita/resource/layout/htmlpopup.layout
+@@ -231,8 +231,8 @@
+ 
+ 	layout
+ 	{
+-		place { control="frame_minimize,frame_close" align=right spacing=14 margin-right=12 y=12 }
+-		place { control="BackButton,ForwardButton,ReloadButton,StopButton" x=7 y=7 width=34 height=34 spacing=6 }
++		place { control="frame_close,frame_minimize" align=left spacing=14 margin-left=12 y=12 }
++		place { control="BackButton,ForwardButton,ReloadButton,StopButton" x=87 y=7 width=34 height=34 spacing=6 }
+ 
+ 		place { control="frame_title" width=max height=48 }
+ 
diff --git a/patches/windowcontrols/left.patch b/patches/windowcontrols/left.patch
index dd7fb43e..1f23679a 100644
--- a/patches/windowcontrols/left.patch
+++ b/patches/windowcontrols/left.patch
@@ -103,3 +103,17 @@
 +		place { control="CloseButton,BgRect,frame_maximize,frame_minimize" region="hidden" width=0 height=0 }
  	}
  }
+
+--- Adwaita/resource/layout/htmlpopup.layout
++++ Adwaita/resource/layout/htmlpopup.layout
+@@ -231,8 +231,8 @@
+ 
+ 	layout
+ 	{
+-		place { control="frame_minimize,frame_close" align=right spacing=14 margin-right=12 y=12 }
+-		place { control="BackButton,ForwardButton,ReloadButton,StopButton" x=7 y=7 width=34 height=34 spacing=6 }
++		place { control="frame_close,frame_minimize" align=left spacing=14 margin-left=12 y=12 }
++		place { control="BackButton,ForwardButton,ReloadButton,StopButton" x=47 y=7 width=34 height=34 spacing=6 }
+ 
+ 		place { control="frame_title" width=max height=48 }
+