GUI: Rewrite Cloud tab

- StorageWizardDialog is removed, along with bmps it was using;
- EditTextWidget now accepts custom font in constructor;
- ScrollContainer scrollbar now jumps to top when content height changes
so it's "overscrolled";
- IndexPageHandler now does not awaits for `code` GET-parameter, as
local webserver is no longer used to connect Storages;
- CloudManager and all corresponding Storages are updated to support
disconnecting and to notify about successful connection.

19 files changed, 669 insertions, 725 deletions

diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 6bd0fc9522..78229c36c1 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index c92c4d1718..3929af9e81 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -58,6 +58,12 @@
 		<widget name = 'SmallLabel'
 				size = '24, Globals.Line.Height'
 		/>
+		<widget name = 'CloudTabLabel'
+				size = '200, Globals.Line.Height'
+		/>
+		<widget name = 'CloudTabLabelValue'
+				size = '200, Globals.Line.Height'
+		/>
 
 		<widget name = 'ShortOptionsLabel'
 				size = '60, Globals.Line.Height'
@@ -66,6 +72,9 @@
 		<widget name = 'Button'
 				size = '108, 24'
 		/>
+		<widget name = 'WideButton'
+				size = '216, 24'
+		/>
 		<widget name = 'Slider'
 				size = '128, 18'
 		/>
@@ -602,49 +611,126 @@
 
 	<dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'>
 		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '-19, 7, 0, 0' spacing = '10'>
+				<layout type = 'vertical' padding = '0, 0, 2, 0' spacing = '2'>
+					<widget name = 'StoragePopupDesc'
+							type = 'OptionsLabel'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '2'>
+					<widget name = 'StoragePopup'
+							type = 'PopUp'
+					/>
+				</layout>
+			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StoragePopupDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StoragePopup'
-						type = 'PopUp'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageUsernameDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsernameLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageUsedSpaceDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsedSpaceLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageUsernameDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StorageUsernameLabel'
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageLastSyncDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageLastSyncLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 7, 0' spacing = '2'>
+					<widget name = 'SyncSavesButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -4, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageSyncHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageUsedSpaceDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StorageUsedSpaceLabel'
-						height = 'Globals.Line.Height'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '4'>
+					<widget name = 'StorageDownloadHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DownloadButton'
+							type = 'WideButton'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageLastSyncDesc'
-						type = 'OptionsLabel'
+				<layout type = 'vertical' padding = '0, 0, 8, 0' spacing = '4'>
+					<widget name = 'StorageDisconnectHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DisconnectButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+
+			<!-- here goes unconnected Storage layout (connection wizard) -->
+			<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+				<widget name = 'StorageWizardNotConnectedHint'
+						height = 'Globals.Line.Height'
 				/>
-				<widget name = 'StorageLastSyncLabel'
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '10' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 2, 0' spacing = '4'>
+					<widget name = 'StorageWizardOpenLinkHint'
+							width = '106'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '4'>
+					<widget name = 'StorageWizardLink'
+							width = '192'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageWizardCodeHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-				<widget name = 'RefreshButton'
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardCodeBox'
+						width = '108'
+						height = '24'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardPasteButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageWizardConnectButton'
 						type = 'Button'
 				/>
-				<widget name = 'DownloadButton'
-						type = 'Button'
+				<widget name = 'StorageWizardConnectionStatusHint'
+						height = 'Globals.Line.Height'
 				/>
 			</layout>
+
+			<!-- here goes Wi-Fi Sharing -->
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'RunServerButton'
 						type = 'Button'
@@ -716,99 +802,6 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0'>		
-			<widget name = 'Container'/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '0'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
-					<widget name = 'Picture'
-							width = '109'
-							height = '109'
-					/>
-					<widget name = 'OpenUrlButton'
-							type = 'Button'
-					/>
-					<widget name = 'PasteCodeButton'
-							type = 'Button'
-					/>
-				</layout>
-				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
-					<widget name = 'Headline'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '4' />
-					<widget name = 'NavigateLine'
-							height = 'Globals.Line.Height'
-					/>
-					<widget name = 'URLLine'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '4' />
-					<widget name = 'ReturnLine1'
-							height = 'Globals.Line.Height'
-					/>
-					<widget name = 'ReturnLine2'
-							height = 'Globals.Line.Height'
-					/>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-						<widget name = 'CodeBox1'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox2'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox3'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox4'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-					</layout>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-						<widget name = 'CodeBox5'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox6'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox7'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox8'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-					</layout>
-					<widget name = 'MessageLine'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '6' />
-				</layout>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'CancelButton'
-						type = 'Button'
-				/>
-				<space />
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 67e82f9127..8f39a69b17 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -56,6 +56,9 @@
 		<widget name = 'Button'
 				size = '72, 16'
 		/>
+		<widget name = 'WideButton'
+				size = '144, 16'
+		/>
 
 		<widget name = 'Slider'
 				size = '85, 12'
@@ -68,6 +71,12 @@
 		<widget name = 'SmallLabel'
 				size = '18, Globals.Line.Height'
 		/>
+		<widget name = 'CloudTabLabel'
+				size = '180, Globals.Line.Height'
+		/>
+		<widget name = 'CloudTabLabelValue'
+				size = '180, Globals.Line.Height'
+		/>
 		<widget name = 'PopUp'
 				size = '-1, 15'
 		/>
@@ -605,58 +614,128 @@
 	</dialog>
 
 	<dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+		<layout type = 'vertical' padding = '10, 13, 10, 10' spacing = '8'>
+			<layout type = 'horizontal' padding = '-10, 1, 0, 0' spacing = '6'>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '1'>
+					<widget name = 'StoragePopupDesc'
+							width = '100'
+							height = 'Globals.Line.Height'
+							textalign = 'right'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '1'>
+					<widget name = 'StoragePopup'
+							type = 'PopUp'
+					/>
+				</layout>
+			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StoragePopupDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StoragePopup'
-						type = 'PopUp'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageUsernameDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsernameLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageUsedSpaceDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsedSpaceLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageUsernameDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StorageUsernameLabel'
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageLastSyncDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageLastSyncLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 5, 0' spacing = '1'>
+					<widget name = 'SyncSavesButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -3, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageSyncHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageUsedSpaceDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StorageUsedSpaceLabel'
-						height = 'Globals.Line.Height'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '4'>
+					<widget name = 'StorageDownloadHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DownloadButton'
+							type = 'WideButton'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageLastSyncDesc'
-						width = '80'
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '4'>
+					<widget name = 'StorageDisconnectHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DisconnectButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+
+			<!-- here goes unconnected Storage layout (connection wizard) -->
+			<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+				<widget name = 'StorageWizardNotConnectedHint'
 						height = 'Globals.Line.Height'
-						textalign = 'right'
 				/>
-				<widget name = 'StorageLastSyncLabel'
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -3, 0' spacing = '6' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '2'>
+					<widget name = 'StorageWizardOpenLinkHint'
+							width = '90'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '4'>
+					<widget name = 'StorageWizardLink'
+							width = '150'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageWizardCodeHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-				<widget name = 'RefreshButton'
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardCodeBox'
+						width = '72'
+						height = '16'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardPasteButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageWizardConnectButton'
 						type = 'Button'
 				/>
-				<widget name = 'DownloadButton'
-						type = 'Button'
+				<widget name = 'StorageWizardConnectionStatusHint'
+						height = 'Globals.Line.Height'
 				/>
 			</layout>
+
+			<!-- here goes Wi-Fi Sharing -->
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'RunServerButton'
 						type = 'Button'
@@ -730,94 +809,6 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0'>
-			<widget name = 'Container'/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '4'>
-				<widget name = 'Headline'
-						height = 'Globals.Line.Height'
-				/>
-				<space size = '2' />
-				<widget name = 'NavigateLine'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'URLLine'
-						height = 'Globals.Line.Height'
-				/>
-				<space size = '2' />
-				<widget name = 'ReturnLine1'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'ReturnLine2'
-						height = 'Globals.Line.Height'
-				/>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CodeBox1'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox2'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox3'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox4'
-						width = '60'
-						height = '16'
-					/>
-				</layout>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CodeBox5'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox6'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox7'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox8'
-						width = '60'
-						height = '16'
-					/>
-				</layout>
-				<widget name = 'MessageLine'
-						height = 'Globals.Line.Height'
-				/>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'OpenUrlButton'
-							type = 'Button'
-					/>
-					<widget name = 'PasteCodeButton'
-							type = 'Button'
-					/>
-				</layout>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CancelButton'
-							type = 'Button'
-					/>
-					<space />
-					<widget name = 'ConnectButton'
-							type = 'Button'
-					/>
-				</layout>
-				<space size = '6' />
-				<widget name = 'Picture' width = '1' height = '1' />
-			</layout>
-		</layout>
-	</dialog>
-
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 1a5fd5c432..d1b4c239a1 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/box.bmp b/gui/themes/scummmodern/box.bmp
deleted file mode 100644
index 21fb650f02..0000000000
--- a/gui/themes/scummmodern/box.bmp
+++ /dev/null
diff --git a/gui/themes/scummmodern/dropbox.bmp b/gui/themes/scummmodern/dropbox.bmp
deleted file mode 100644
index bfe620740f..0000000000
--- a/gui/themes/scummmodern/dropbox.bmp
+++ /dev/null
diff --git a/gui/themes/scummmodern/googledrive.bmp b/gui/themes/scummmodern/googledrive.bmp
deleted file mode 100644
index f79a0e7769..0000000000
--- a/gui/themes/scummmodern/googledrive.bmp
+++ /dev/null
diff --git a/gui/themes/scummmodern/onedrive.bmp b/gui/themes/scummmodern/onedrive.bmp
deleted file mode 100644
index cd26d71d3c..0000000000
--- a/gui/themes/scummmodern/onedrive.bmp
+++ /dev/null
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index 8b884abcc2..0e62f36627 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -119,10 +119,6 @@
 		<bitmap filename = 'editbtn_small.bmp'/>
 		<bitmap filename = 'switchbtn_small.bmp'/>
 		<bitmap filename = 'fastreplay_small.bmp'/>
-		<bitmap filename = 'dropbox.bmp'/>
-		<bitmap filename = 'onedrive.bmp'/>
-		<bitmap filename = 'googledrive.bmp'/>
-		<bitmap filename = 'box.bmp'/>
 	</bitmaps>
 
 	<fonts>
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index d6c927c251..b1d4e28015 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -65,10 +65,19 @@
 		<widget name = 'SmallLabel'
 				size = '24, Globals.Line.Height'
 		/>
+		<widget name = 'CloudTabLabel'
+				size = '200, Globals.Line.Height'
+		/>
+		<widget name = 'CloudTabLabelValue'
+				size = '200, Globals.Line.Height'
+		/>
 
 		<widget name = 'Button'
 				size = '108, 24'
 		/>
+		<widget name = 'WideButton'
+				size = '216, 24'
+		/>
 
 		<widget name = 'Slider'
 				size = '128, 18'
@@ -616,49 +625,126 @@
 
 	<dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'>
 		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '-27, 7, 0, 0' spacing = '10'>
+				<layout type = 'vertical' padding = '0, 0, 2, 0' spacing = '2'>
+					<widget name = 'StoragePopupDesc'
+							type = 'OptionsLabel'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '2'>
+					<widget name = 'StoragePopup'
+							type = 'PopUp'
+					/>
+				</layout>
+			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StoragePopupDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StoragePopup'
-						type = 'PopUp'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageUsernameDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsernameLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageUsedSpaceDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsedSpaceLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageUsernameDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StorageUsernameLabel'
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageLastSyncDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageLastSyncLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 7, 0' spacing = '2'>
+					<widget name = 'SyncSavesButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -4, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageSyncHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageUsedSpaceDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StorageUsedSpaceLabel'
-						height = 'Globals.Line.Height'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '4'>
+					<widget name = 'StorageDownloadHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DownloadButton'
+							type = 'WideButton'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageLastSyncDesc'
-						type = 'OptionsLabel'
+				<layout type = 'vertical' padding = '0, 0, 8, 0' spacing = '4'>
+					<widget name = 'StorageDisconnectHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DisconnectButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+
+			<!-- here goes unconnected Storage layout (connection wizard) -->
+			<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+				<widget name = 'StorageWizardNotConnectedHint'
+						height = 'Globals.Line.Height'
 				/>
-				<widget name = 'StorageLastSyncLabel'
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -4, 0' spacing = '10' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 2, 0' spacing = '4'>
+					<widget name = 'StorageWizardOpenLinkHint'
+							width = '96'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '4'>
+					<widget name = 'StorageWizardLink'
+							width = '192'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageWizardCodeHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-				<widget name = 'RefreshButton'
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardCodeBox'
+						width = '108'
+						height = '24'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardPasteButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageWizardConnectButton'
 						type = 'Button'
 				/>
-				<widget name = 'DownloadButton'
-						type = 'Button'
+				<widget name = 'StorageWizardConnectionStatusHint'
+						height = 'Globals.Line.Height'
 				/>
 			</layout>
+
+			<!-- here goes Wi-Fi Sharing -->
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'RunServerButton'
 						type = 'Button'
@@ -730,99 +816,6 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0'>		
-			<widget name = 'Container'/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '0'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
-					<widget name = 'Picture'
-							width = '109'
-							height = '109'
-					/>
-					<widget name = 'OpenUrlButton'
-							type = 'Button'
-					/>
-					<widget name = 'PasteCodeButton'
-							type = 'Button'
-					/>
-				</layout>
-				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
-					<widget name = 'Headline'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '4' />
-					<widget name = 'NavigateLine'
-							height = 'Globals.Line.Height'
-					/>
-					<widget name = 'URLLine'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '4' />
-					<widget name = 'ReturnLine1'
-							height = 'Globals.Line.Height'
-					/>
-					<widget name = 'ReturnLine2'
-							height = 'Globals.Line.Height'
-					/>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-						<widget name = 'CodeBox1'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox2'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox3'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox4'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-					</layout>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-						<widget name = 'CodeBox5'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox6'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox7'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox8'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-					</layout>
-					<widget name = 'MessageLine'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '6' />
-				</layout>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'CancelButton'
-						type = 'Button'
-				/>
-				<space />
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 464450cbdc..fd9990d2e3 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -46,6 +46,9 @@
 		<widget name = 'Button'
 				size = '72, 16'
 		/>
+		<widget name = 'WideButton'
+				size = '144, 16'
+		/>
 
 		<widget name = 'Slider'
 				size = '85, 12'
@@ -66,6 +69,12 @@
 		<widget name = 'SmallLabel'
 				size = '18, Globals.Line.Height'
 		/>
+		<widget name = 'CloudTabLabel'
+				size = '170, Globals.Line.Height'
+		/>
+		<widget name = 'CloudTabLabelValue'
+				size = '170, Globals.Line.Height'
+		/>
 		<widget name = 'PopUp'
 				size = '-1, 15'
 		/>
@@ -603,58 +612,128 @@
 	</dialog>
 
 	<dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+		<layout type = 'vertical' padding = '10, 13, 10, 10' spacing = '8'>
+			<layout type = 'horizontal' padding = '-7, 1, 0, 0' spacing = '6'>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '1'>
+					<widget name = 'StoragePopupDesc'
+							width = '80'
+							height = 'Globals.Line.Height'
+							textalign = 'right'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '1'>
+					<widget name = 'StoragePopup'
+							type = 'PopUp'
+					/>
+				</layout>
+			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StoragePopupDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StoragePopup'
-						type = 'PopUp'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageUsernameDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsernameLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageUsedSpaceDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsedSpaceLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageUsernameDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StorageUsernameLabel'
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageLastSyncDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageLastSyncLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 5, 0' spacing = '1'>
+					<widget name = 'SyncSavesButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -3, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageSyncHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageUsedSpaceDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StorageUsedSpaceLabel'
-						height = 'Globals.Line.Height'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '4'>
+					<widget name = 'StorageDownloadHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DownloadButton'
+							type = 'WideButton'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageLastSyncDesc'
-						width = '80'
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '4'>
+					<widget name = 'StorageDisconnectHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DisconnectButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+
+			<!-- here goes unconnected Storage layout (connection wizard) -->
+			<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+				<widget name = 'StorageWizardNotConnectedHint'
 						height = 'Globals.Line.Height'
-						textalign = 'right'
 				/>
-				<widget name = 'StorageLastSyncLabel'
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -3, 0' spacing = '6' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '2'>
+					<widget name = 'StorageWizardOpenLinkHint'
+							width = '90'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '4'>
+					<widget name = 'StorageWizardLink'
+							width = '150'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageWizardCodeHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-				<widget name = 'RefreshButton'
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardCodeBox'
+						width = '72'
+						height = '16'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardPasteButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageWizardConnectButton'
 						type = 'Button'
 				/>
-				<widget name = 'DownloadButton'
-						type = 'Button'
+				<widget name = 'StorageWizardConnectionStatusHint'
+						height = 'Globals.Line.Height'
 				/>
 			</layout>
+
+			<!-- here goes Wi-Fi Sharing -->
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'RunServerButton'
 						type = 'Button'
@@ -728,94 +807,6 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0'>
-			<widget name = 'Container'/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '4'>
-				<widget name = 'Headline'
-						height = 'Globals.Line.Height'
-				/>
-				<space size = '2' />
-				<widget name = 'NavigateLine'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'URLLine'
-						height = 'Globals.Line.Height'
-				/>
-				<space size = '2' />
-				<widget name = 'ReturnLine1'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'ReturnLine2'
-						height = 'Globals.Line.Height'
-				/>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CodeBox1'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox2'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox3'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox4'
-						width = '60'
-						height = '16'
-					/>
-				</layout>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CodeBox5'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox6'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox7'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox8'
-						width = '60'
-						height = '16'
-					/>
-				</layout>
-				<widget name = 'MessageLine'
-						height = 'Globals.Line.Height'
-				/>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'OpenUrlButton'
-							type = 'Button'
-					/>
-					<widget name = 'PasteCodeButton'
-							type = 'Button'
-					/>
-				</layout>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CancelButton'
-							type = 'Button'
-					/>
-					<space />
-					<widget name = 'ConnectButton'
-							type = 'Button'
-					/>
-				</layout>
-				<space size = '6' />
-				<widget name = 'Picture' width = '1' height = '1' />
-			</layout>
-		</layout>
-	</dialog>
-
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 6d235b48f2..5b5f82d2b3 100644
--- a/gui/themes/scummremastered.zip
+++ b/gui/themes/scummremastered.zip
diff --git a/gui/themes/scummremastered/box.bmp b/gui/themes/scummremastered/box.bmp
deleted file mode 100644
index 7da33fc5fa..0000000000
--- a/gui/themes/scummremastered/box.bmp
+++ /dev/null
diff --git a/gui/themes/scummremastered/dropbox.bmp b/gui/themes/scummremastered/dropbox.bmp
deleted file mode 100644
index bfe620740f..0000000000
--- a/gui/themes/scummremastered/dropbox.bmp
+++ /dev/null
diff --git a/gui/themes/scummremastered/googledrive.bmp b/gui/themes/scummremastered/googledrive.bmp
deleted file mode 100644
index f79a0e7769..0000000000
--- a/gui/themes/scummremastered/googledrive.bmp
+++ /dev/null
diff --git a/gui/themes/scummremastered/onedrive.bmp b/gui/themes/scummremastered/onedrive.bmp
deleted file mode 100644
index 16f67cb179..0000000000
--- a/gui/themes/scummremastered/onedrive.bmp
+++ /dev/null
diff --git a/gui/themes/scummremastered/remastered_gfx.stx b/gui/themes/scummremastered/remastered_gfx.stx
index f5144321a0..76b722c5d5 100644
--- a/gui/themes/scummremastered/remastered_gfx.stx
+++ b/gui/themes/scummremastered/remastered_gfx.stx
@@ -120,10 +120,6 @@
 		<bitmap filename = 'editbtn_small.bmp'/>
 		<bitmap filename = 'switchbtn_small.bmp'/>
 		<bitmap filename = 'fastreplay_small.bmp'/>
-		<bitmap filename = 'dropbox.bmp'/>
-		<bitmap filename = 'onedrive.bmp'/>
-		<bitmap filename = 'googledrive.bmp'/>
-		<bitmap filename = 'box.bmp'/>
 	</bitmaps>
 
 	<fonts>
diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx
index d6c927c251..b1d4e28015 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -65,10 +65,19 @@
 		<widget name = 'SmallLabel'
 				size = '24, Globals.Line.Height'
 		/>
+		<widget name = 'CloudTabLabel'
+				size = '200, Globals.Line.Height'
+		/>
+		<widget name = 'CloudTabLabelValue'
+				size = '200, Globals.Line.Height'
+		/>
 
 		<widget name = 'Button'
 				size = '108, 24'
 		/>
+		<widget name = 'WideButton'
+				size = '216, 24'
+		/>
 
 		<widget name = 'Slider'
 				size = '128, 18'
@@ -616,49 +625,126 @@
 
 	<dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'>
 		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '-27, 7, 0, 0' spacing = '10'>
+				<layout type = 'vertical' padding = '0, 0, 2, 0' spacing = '2'>
+					<widget name = 'StoragePopupDesc'
+							type = 'OptionsLabel'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '2'>
+					<widget name = 'StoragePopup'
+							type = 'PopUp'
+					/>
+				</layout>
+			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StoragePopupDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StoragePopup'
-						type = 'PopUp'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageUsernameDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsernameLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageUsedSpaceDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsedSpaceLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageUsernameDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StorageUsernameLabel'
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+					<widget name = 'StorageLastSyncDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageLastSyncLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 7, 0' spacing = '2'>
+					<widget name = 'SyncSavesButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -4, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageSyncHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageUsedSpaceDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'StorageUsedSpaceLabel'
-						height = 'Globals.Line.Height'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '4'>
+					<widget name = 'StorageDownloadHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DownloadButton'
+							type = 'WideButton'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'StorageLastSyncDesc'
-						type = 'OptionsLabel'
+				<layout type = 'vertical' padding = '0, 0, 8, 0' spacing = '4'>
+					<widget name = 'StorageDisconnectHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DisconnectButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+
+			<!-- here goes unconnected Storage layout (connection wizard) -->
+			<layout type = 'vertical' padding = '0, 0, 6, 0' spacing = '2'>
+				<widget name = 'StorageWizardNotConnectedHint'
+						height = 'Globals.Line.Height'
 				/>
-				<widget name = 'StorageLastSyncLabel'
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -4, 0' spacing = '10' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 2, 0' spacing = '4'>
+					<widget name = 'StorageWizardOpenLinkHint'
+							width = '96'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '4'>
+					<widget name = 'StorageWizardLink'
+							width = '192'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageWizardCodeHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-				<widget name = 'RefreshButton'
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardCodeBox'
+						width = '108'
+						height = '24'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardPasteButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '10' center = 'true'>
+				<widget name = 'StorageWizardConnectButton'
 						type = 'Button'
 				/>
-				<widget name = 'DownloadButton'
-						type = 'Button'
+				<widget name = 'StorageWizardConnectionStatusHint'
+						height = 'Globals.Line.Height'
 				/>
 			</layout>
+
+			<!-- here goes Wi-Fi Sharing -->
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'RunServerButton'
 						type = 'Button'
@@ -730,99 +816,6 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0'>		
-			<widget name = 'Container'/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '0'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
-					<widget name = 'Picture'
-							width = '109'
-							height = '109'
-					/>
-					<widget name = 'OpenUrlButton'
-							type = 'Button'
-					/>
-					<widget name = 'PasteCodeButton'
-							type = 'Button'
-					/>
-				</layout>
-				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
-					<widget name = 'Headline'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '4' />
-					<widget name = 'NavigateLine'
-							height = 'Globals.Line.Height'
-					/>
-					<widget name = 'URLLine'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '4' />
-					<widget name = 'ReturnLine1'
-							height = 'Globals.Line.Height'
-					/>
-					<widget name = 'ReturnLine2'
-							height = 'Globals.Line.Height'
-					/>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-						<widget name = 'CodeBox1'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox2'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox3'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox4'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-					</layout>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-						<widget name = 'CodeBox5'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox6'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox7'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-						<widget name = 'CodeBox8'
-							width = '70'
-							height = 'Globals.Line.Height'
-						/>
-					</layout>
-					<widget name = 'MessageLine'
-							height = 'Globals.Line.Height'
-					/>
-					<space size = '6' />
-				</layout>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
-				<widget name = 'CancelButton'
-						type = 'Button'
-				/>
-				<space />
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'
diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx
index 464450cbdc..fd9990d2e3 100644
--- a/gui/themes/scummremastered/remastered_layout_lowres.stx
+++ b/gui/themes/scummremastered/remastered_layout_lowres.stx
@@ -46,6 +46,9 @@
 		<widget name = 'Button'
 				size = '72, 16'
 		/>
+		<widget name = 'WideButton'
+				size = '144, 16'
+		/>
 
 		<widget name = 'Slider'
 				size = '85, 12'
@@ -66,6 +69,12 @@
 		<widget name = 'SmallLabel'
 				size = '18, Globals.Line.Height'
 		/>
+		<widget name = 'CloudTabLabel'
+				size = '170, Globals.Line.Height'
+		/>
+		<widget name = 'CloudTabLabelValue'
+				size = '170, Globals.Line.Height'
+		/>
 		<widget name = 'PopUp'
 				size = '-1, 15'
 		/>
@@ -603,58 +612,128 @@
 	</dialog>
 
 	<dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+		<layout type = 'vertical' padding = '10, 13, 10, 10' spacing = '8'>
+			<layout type = 'horizontal' padding = '-7, 1, 0, 0' spacing = '6'>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '1'>
+					<widget name = 'StoragePopupDesc'
+							width = '80'
+							height = 'Globals.Line.Height'
+							textalign = 'right'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '1'>
+					<widget name = 'StoragePopup'
+							type = 'PopUp'
+					/>
+				</layout>
+			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StoragePopupDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StoragePopup'
-						type = 'PopUp'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageUsernameDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsernameLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageUsedSpaceDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageUsedSpaceLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageUsernameDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StorageUsernameLabel'
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+					<widget name = 'StorageLastSyncDesc'
+							type = 'CloudTabLabel'
+					/>
+					<widget name = 'StorageLastSyncLabel'
+							type = 'CloudTabLabelValue'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 5, 0' spacing = '1'>
+					<widget name = 'SyncSavesButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -3, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageSyncHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageUsedSpaceDesc'
-						width = '80'
-						height = 'Globals.Line.Height'
-						textalign = 'right'
-				/>
-				<widget name = 'StorageUsedSpaceLabel'
-						height = 'Globals.Line.Height'
-				/>
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '4'>
+					<widget name = 'StorageDownloadHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DownloadButton'
+							type = 'WideButton'
+					/>
+				</layout>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'StorageLastSyncDesc'
-						width = '80'
+				<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '4'>
+					<widget name = 'StorageDisconnectHint'
+							height = 'Globals.Line.Height'
+					/>
+					<widget name = 'DisconnectButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+
+			<!-- here goes unconnected Storage layout (connection wizard) -->
+			<layout type = 'vertical' padding = '0, 0, 3, 0' spacing = '1'>
+				<widget name = 'StorageWizardNotConnectedHint'
 						height = 'Globals.Line.Height'
-						textalign = 'right'
 				/>
-				<widget name = 'StorageLastSyncLabel'
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -3, 0' spacing = '6' center = 'true'>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '2'>
+					<widget name = 'StorageWizardOpenLinkHint'
+							width = '90'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, 1, 0' spacing = '4'>
+					<widget name = 'StorageWizardLink'
+							width = '150'
+							height = 'Globals.Line.Height'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageWizardCodeHint'
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
-				<widget name = 'ConnectButton'
-						type = 'Button'
-				/>
-				<widget name = 'RefreshButton'
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardCodeBox'
+						width = '72'
+						height = '16'
+					/>
+				</layout>
+				<layout type = 'vertical' padding = '0, 0, -2, 0' spacing = '2'>
+					<widget name = 'StorageWizardPasteButton'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, -2, 0' spacing = '6' center = 'true'>
+				<widget name = 'StorageWizardConnectButton'
 						type = 'Button'
 				/>
-				<widget name = 'DownloadButton'
-						type = 'Button'
+				<widget name = 'StorageWizardConnectionStatusHint'
+						height = 'Globals.Line.Height'
 				/>
 			</layout>
+
+			<!-- here goes Wi-Fi Sharing -->
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'RunServerButton'
 						type = 'Button'
@@ -728,94 +807,6 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0'>
-			<widget name = 'Container'/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Cloud_ConnectionWizard_Container' overlays = 'GlobalOptions_Cloud_ConnectionWizard.Container'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '4'>
-				<widget name = 'Headline'
-						height = 'Globals.Line.Height'
-				/>
-				<space size = '2' />
-				<widget name = 'NavigateLine'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'URLLine'
-						height = 'Globals.Line.Height'
-				/>
-				<space size = '2' />
-				<widget name = 'ReturnLine1'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'ReturnLine2'
-						height = 'Globals.Line.Height'
-				/>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CodeBox1'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox2'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox3'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox4'
-						width = '60'
-						height = '16'
-					/>
-				</layout>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CodeBox5'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox6'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox7'
-						width = '60'
-						height = '16'
-					/>
-					<widget name = 'CodeBox8'
-						width = '60'
-						height = '16'
-					/>
-				</layout>
-				<widget name = 'MessageLine'
-						height = 'Globals.Line.Height'
-				/>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'OpenUrlButton'
-							type = 'Button'
-					/>
-					<widget name = 'PasteCodeButton'
-							type = 'Button'
-					/>
-				</layout>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4' center = 'true'>
-					<widget name = 'CancelButton'
-							type = 'Button'
-					/>
-					<space />
-					<widget name = 'ConnectButton'
-							type = 'Button'
-					/>
-				</layout>
-				<space size = '6' />
-				<widget name = 'Picture' width = '1' height = '1' />
-			</layout>
-		</layout>
-	</dialog>
-
 	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>
 		<layout type='vertical' padding='8,8,8,8' center='true'>
 			<widget name='Action'