diff --git a/Adwaita/adw/controls/entry.styles b/Adwaita/adw/controls/entry.styles
index 3bb3f01c..dce1bfb4 100644
--- a/Adwaita/adw/controls/entry.styles
+++ b/Adwaita/adw/controls/entry.styles
@@ -79,6 +79,20 @@ entry.styles
 			}
 			render {}
 		}
+		TextEntry:disabled
+		{
+			render_bg
+			{
+				0="fill(x0+6, y0, x1-6, y1, button_disabled_bg)"
+				1="fill(x0, y0+6, x0+6, y1-6, button_disabled_bg)"
+				2="fill(x1-6, y0+6, x1, y1-6, button_disabled_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w5/tl)"
+				4="image(x1-6, y0, x1, y0+6, assets/corners/6_w5/tr)"
+				5="image(x0, y1-6, x0+6, y1, assets/corners/6_w5/bl)"
+				6="image(x1-6, y1-6, x1, y1, assets/corners/6_w5/br)"
+			}
+			render {}
+		}
 
 		RichText
 		{
diff --git a/Adwaita/resource/layout/subpaneloptionscompat.layout b/Adwaita/resource/layout/subpaneloptionscompat.layout
index b4a83453..04537753 100755
--- a/Adwaita/resource/layout/subpaneloptionscompat.layout
+++ b/Adwaita/resource/layout/subpaneloptionscompat.layout
@@ -47,7 +47,7 @@ subpaneloptioncompat.layout
 
 	layout
 	{
-		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+		region { name="content" margin-top=8 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 }
diff --git a/Adwaita/resource/layout/subpaneloptionscontroller.layout b/Adwaita/resource/layout/subpaneloptionscontroller.layout
index 78b52006..ee2d3f9b 100755
--- a/Adwaita/resource/layout/subpaneloptionscontroller.layout
+++ b/Adwaita/resource/layout/subpaneloptionscontroller.layout
@@ -2,7 +2,7 @@ subpaneloptionscontroller.layout
 {
 	layout
 	{
-		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+		region { name="content" margin-top=8 margin-left=16 width=500 height=max }
 
 		place { control="TitleLabel" region="content" width=max height=34 }
 
diff --git a/Adwaita/resource/layout/subpaneloptionsdownloads.layout b/Adwaita/resource/layout/subpaneloptionsdownloads.layout
new file mode 100755
index 00000000..db323cb2
--- /dev/null
+++ b/Adwaita/resource/layout/subpaneloptionsdownloads.layout
@@ -0,0 +1,251 @@
+subpaneloptionsdownloads.layout
+{
+	styles
+	{
+		CSubPanelOptionsDownloads
+		{
+			render
+			{
+				// library folders button
+				0="image(x0+196, y0+80, x0+208, y0+92, assets/corners/12_mask_window_bg/bl)"
+				1="image(x1-32, y0+80, x1-20, y0+92, assets/corners/12_mask_window_bg/br)"
+				2="image(x1-48, y0+59, x1-32, y0+75, assets/icons/forward)"
+				// region row
+				3="fill(x0+208, y0+126, x1-32, y0+176, button_bg)"
+				4="fill(x0+196, y0+138, x0+208, y0+164, button_bg)"
+				5="fill(x1-32, y0+138, x1-20, y0+164, button_bg)"
+				6="image(x0+196, y0+126, x0+208, y0+138, assets/corners/12_w10/tl)"
+				7="image(x1-32, y0+126, x1-20, y0+138, assets/corners/12_w10/tr)"
+				8="image(x0+196, y0+164, x0+208, y0+176, assets/corners/12_w10/bl)"
+				9="image(x1-32, y0+164, x1-20, y0+176, assets/corners/12_w10/br)"
+				// download restrictions section
+				10="image(x0+196, y0+448, x0+208, y0+460, assets/corners/12_mask_window_bg/bl)"
+				11="image(x1-32, y0+448, x1-20, y0+460, assets/corners/12_mask_window_bg/br)"
+				13="fill(x0+196, y0+459, x1-20, y0+460, window_bg)"
+				// clear download cache button
+				14="image(x0+196, y0+476, x0+208, y0+488, assets/corners/12_mask_window_bg/tl)"
+				15="image(x1-32, y0+476, x1-20, y0+488, assets/corners/12_mask_window_bg/tr)"
+				16="image(x0+196, y0+514, x0+208, y0+526, assets/corners/12_mask_window_bg/bl)"
+				17="image(x1-32, y0+514, x1-20, y0+526, assets/corners/12_mask_window_bg/br)"
+				18="image(x1-44, y0+493, x1-32, y0+509, assets/icons/forward)"
+			}
+		}
+
+		ComboBoxButton
+		{
+			inset-left=-6
+			render_bg {}
+		}
+
+		ComboBox
+		{
+			inset-left=8
+			render
+			{
+				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)"
+			}
+		}
+		ComboBox:hover
+		{
+			render
+			{
+				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)"
+			}
+		}
+		ComboBox:active
+		{
+			render
+			{
+				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)"
+			}
+		}
+		ComboBox:focus
+		{
+			render
+			{
+				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)"
+			}
+		}
+		ComboBox:disabled
+		{
+			render
+			{
+				0="fill(x0+6, y0, x1-6, y1, button_disabled_bg)"
+				1="fill(x0, y0+6, x0+6, y1-6, button_disabled_bg)"
+				2="fill(x1-6, y0+6, x1, y1-6, button_disabled_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w5/tl)"
+				4="image(x1-6, y0, x1, y0+6, assets/corners/6_w5/tr)"
+				5="image(x0, y1-6, x0+6, y1, assets/corners/6_w5/bl)"
+				6="image(x1-6, y1-6, x1, y1, assets/corners/6_w5/br)"
+			}
+		}
+
+		Button
+		{
+			inset="8 0 8 0"
+			font-family=basefont
+			font-size=14
+			font-weight=400
+			font-style=none
+			bgcolor=none
+			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)"
+			}
+			render {}
+		}
+		Button:hover
+		{
+			bgcolor=none
+			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)"
+			}
+		}
+		Button:active
+		{
+			bgcolor=none
+			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)"
+			}
+		}
+		Button:disabled
+		{
+			bgcolor=none
+			render_bg
+			{
+				0="fill(x0+6, y0, x1-6, y1, button_disabled_bg)"
+				1="fill(x0, y0+6, x0+6, y1-6, button_disabled_bg)"
+				2="fill(x1-6, y0+6, x1, y1-6, button_disabled_bg)"
+				3="image(x0, y0, x0+6, y0+6, assets/corners/6_w5/tl)"
+				4="image(x1-6, y0, x1, y0+6, assets/corners/6_w5/tr)"
+				5="image(x0, y1-6, x0+6, y1, assets/corners/6_w5/bl)"
+				6="image(x1-6, y1-6, x1, y1, assets/corners/6_w5/br)"
+			}
+		}
+
+		CheckButton
+		{
+			image="assets/checkbox_padded/unchecked"
+			padding-right=0
+			render {}
+			render_bg
+			{
+				0="fill(x0, y0, x0+484, y1, button_bg)"
+				1="fill(x0, y1-1, x0+484, y1, headerbar_shade)"
+			}
+		}
+		CheckButton:hover
+		{
+			image="assets/checkbox_padded/unchecked_hover"
+			render {}
+			render_bg
+			{
+				0="fill(x0, y0, x0+484, y1, button_hover_bg)"
+				1="fill(x0, y1-1, x0+484, y1, headerbar_shade)"
+			}
+		}
+		CheckButton:selected
+		{
+			image="assets/checkbox_padded/checked"
+			render {}
+		}
+		CheckButton:selected:hover
+		{
+			image="assets/checkbox_padded/checked_hover"
+			render {}
+		}
+		CheckButton:disabled
+		{
+			image="assets/checkbox_padded/unchecked_disabled"
+			render {}
+			render_bg
+			{
+				0="fill(x0, y0, x0+484, y1, button_disabled_bg)"
+				1="fill(x0, y1-1, x0+484, y1, headerbar_shade)"
+			}
+		}
+		CheckButton:selected:disabled
+		{
+			image="assets/checkbox_padded/checked_disabled"
+			render {}
+		}
+
+		TextEntry
+		{
+			font-size=14
+			inset-right=32
+		}
+	}
+	
+	layout
+	{
+		region { name="content" margin-top=8 margin-left=16 width=500 height=max }
+
+		place { control="LibrariesLabel" region="content" dir=down width=max height=34 }
+		place { control="ManageInstalledApps" region="content" start="LibrariesLabel" dir=down width=max height=50 }
+
+		place { control="RegionLabel" region="content" start="ManageInstalledApps" dir=down width=max height=34 }
+		place { control="DownloadRegionCombo" region="content" start="RegionLabel" dir=down margin-top=8 margin-left=278 width=200 height=34 }
+		place { control="RegionInfoLabel" region="content" start="RegionLabel" dir=down margin-top=8 margin-left=12 width=254 height=34 }
+
+		place { control="RestrictionsLabel" region="content" start="RegionLabel" margin-top=50 dir=down width=max height=34 }
+		place { control="AutoUpdateTimeRestrictCheckbox,ThrottleCheckbox" region="content" start="RestrictionsLabel" dir=down width=272 height=50 }
+
+		place { control="AutoUpdateTimeRestrictStart,AutoUpdateTimeRestrictEnd" region="content" start="AutoUpdateTimeRestrictCheckbox" align=right margin-top=7 margin-right=6 width=97 height=34 spacing=6 }
+
+		place { control="ThrottleRateEdit,ThrottleRateApply" region="content" start="ThrottleCheckbox" align=right margin-top=7 margin-right=6 width=97 height=34 spacing=6 }
+		place { control="ThrottleRateEditSuffix" region="content" align=right start="ThrottleRateApply" end-right="ThrottleRateApply" margin-right=10 height=34 }
+
+		place { control="AllowDownloadsDuringGameplayCheckbox,ThrottleDownloadsWhileStreamingCheckbox,DownloadRatesInBitsCheckbox" region="content" start="ThrottleCheckbox" dir=down width=max height=50 }
+
+		place { control="FlushDownloadConfig" region="content" start="DownloadRatesInBitsCheckbox" dir=down width=max height=50 margin-top=16 }
+		
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="Divider1,Divider2,Divider3,ManageInstalledappsLabel" region="hidden" width=0 height=0 }
+		place { control="AutoUpdateTimeRestrictEndLabel,ThrottleRateCurrent,ThrottleRateEditLabel,FlushDownloadConfigLabel" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/layout/subpaneloptionsingame.layout b/Adwaita/resource/layout/subpaneloptionsingame.layout
index 5190c424..6f35d6cc 100755
--- a/Adwaita/resource/layout/subpaneloptionsingame.layout
+++ b/Adwaita/resource/layout/subpaneloptionsingame.layout
@@ -76,7 +76,7 @@ subpaneloptionsingame.layout
 
 		Highlight
 		{
-			inset-top=16
+			inset-top=8
 			render
 			{
 				0="fill(x0, y0-1, x1, y0, window_bg)"
@@ -95,13 +95,12 @@ subpaneloptionsingame.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="TitleLabel" region="content" dir=down width=484 height=42 }
 		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 }
diff --git a/Adwaita/resource/layout/subpaneloptionslibrary.layout b/Adwaita/resource/layout/subpaneloptionslibrary.layout
index b7ce397e..981d9080 100755
--- a/Adwaita/resource/layout/subpaneloptionslibrary.layout
+++ b/Adwaita/resource/layout/subpaneloptionslibrary.layout
@@ -6,9 +6,9 @@ subpaneloptionslibrary.layout
 		{
 			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)"
+				0="image(x0+196, y0+229, x0+208, y0+241, assets/corners/12_mask_window_bg/bl)"
+				1="image(x1-32, y0+229, x1-20, y0+241, assets/corners/12_mask_window_bg/br)"
+				2="fill(x0+196, y0+241, x1-20, y0+242, window_bg)"
 			}
 		}
 
@@ -28,7 +28,7 @@ subpaneloptionslibrary.layout
 
 	layout
 	{
-		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+		region { name="content" margin-top=8 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 }
diff --git a/Adwaita/resource/layout/subpaneloptionsshadercache.layout b/Adwaita/resource/layout/subpaneloptionsshadercache.layout
index 8d0e369a..bc8fbd0b 100755
--- a/Adwaita/resource/layout/subpaneloptionsshadercache.layout
+++ b/Adwaita/resource/layout/subpaneloptionsshadercache.layout
@@ -22,7 +22,7 @@ subpaneloptionsshadercache.layout
 
 	layout
 	{
-		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+		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 }
 
diff --git a/Adwaita/resource/menus/steam.menu b/Adwaita/resource/menus/steam.menu
index bc1b8e70..b4299900 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.3" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
+		SkinVersion			{ text="Adwaita for Steam v0.4" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
 
 		Divider				{}
 
diff --git a/Adwaita/steam/cached/AccountPage.res b/Adwaita/steam/cached/AccountPage.res
index 81d263cb..e0f6cf5e 100755
--- a/Adwaita/steam/cached/AccountPage.res
+++ b/Adwaita/steam/cached/AccountPage.res
@@ -39,7 +39,7 @@ AccountPage.res
 
 	layout
 	{
-		region { name="content" margin-top=16 margin-bottom=16 margin-left=16 width=500 height=max }
+		region { name="content" margin-top=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 }