From 2d672c53e29b3a638334fcd5a5b152270b0f7453 Mon Sep 17 00:00:00 2001
From: Matan Bareket
Date: Sun, 31 Mar 2019 23:16:57 -0400
Subject: BUILD: Update Remastered theme

---
 gui/themes/scummremastered.zip                | Bin 1663918 -> 672031 bytes
 gui/themes/scummremastered/THEMERC            |   2 +-
 gui/themes/scummremastered/checkbox.bmp       | Bin 774 -> 774 bytes
 gui/themes/scummremastered/eraser.bmp         | Bin 824 -> 822 bytes
 gui/themes/scummremastered/radiobutton.bmp    | Bin 774 -> 774 bytes
 gui/themes/scummremastered/remastered_gfx.stx | 202 +++++++++++++-------------
 6 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index f317df8acc..1632aed3ee 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/THEMERC b/gui/themes/scummremastered/THEMERC
index 4d281d7b5e..ff5b8b3cf0 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.26:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.8.26:ScummVM Modern Theme Remastered dev:No Author]
diff --git a/gui/themes/scummremastered/checkbox.bmp b/gui/themes/scummremastered/checkbox.bmp
index 2b24df57ca..c9e2be2b38 100644
Binary files a/gui/themes/scummremastered/checkbox.bmp and b/gui/themes/scummremastered/checkbox.bmp differ
diff --git a/gui/themes/scummremastered/eraser.bmp b/gui/themes/scummremastered/eraser.bmp
index b927a6384f..c8713a92d8 100644
Binary files a/gui/themes/scummremastered/eraser.bmp and b/gui/themes/scummremastered/eraser.bmp differ
diff --git a/gui/themes/scummremastered/radiobutton.bmp b/gui/themes/scummremastered/radiobutton.bmp
index d3ba468321..41b8d25eb8 100644
Binary files a/gui/themes/scummremastered/radiobutton.bmp and b/gui/themes/scummremastered/radiobutton.bmp differ
diff --git a/gui/themes/scummremastered/remastered_gfx.stx b/gui/themes/scummremastered/remastered_gfx.stx
index 2989f209ef..4870f64d48 100644
--- a/gui/themes/scummremastered/remastered_gfx.stx
+++ b/gui/themes/scummremastered/remastered_gfx.stx
@@ -23,44 +23,29 @@
 <render_info>
 	<palette>
 		<!-- Main background colors -->
-		<color name = 'darkorange'
+		<color name = 'background'
 				rgb = '204, 102, 0'
 		/>
 
-		<!-- Idle button/slider -->
-		<color name = 'darkred'
-				rgb = '168, 39, 9'
-		/>
-		<color name = 'brightred'
-				rgb = '203, 126, 107'
+		<!-- Buttons/Sliders -->
+		<color name = 'button_idle'
+				rgb = '130, 29, 6'
 		/>
 
-		<color name = 'brightredborder'
-				rgb = '238, 213, 207'
-		/>
-
-		<color name = 'darkredborder'
-				rgb = '30, 7, 1'
+		<color name = 'button_hover'
+				rgb = '180, 39, 9'
 		/>
 
-		<!-- Disabled button/slider -->
-		<color name = 'darkeneddarkred'
-				rgb = '120, 28, 0'
-		/>
-		<color name = 'darkenedbrightred'
-				rgb = '144, 84, 72'
+    <color name = 'button_pressed'
+				rgb = '190, 39, 9'
 		/>
 
-		<!-- Highlighted button/slider -->
-		<color name = 'brightpink'
-				rgb = '255, 210, 200'
-		/>
-		<color name = 'darkpink'
-				rgb = '200, 70, 50'
-		/>
+    <color name = 'button_disabled'
+        rgb = '96, 96, 96'
+    />
 
 		<!-- Dialog background -->
-		<color name = 'xtrabrightred'
+		<color name = 'dialog_background'
 				rgb = '251, 241, 206'
 		/>
 		<color name = 'blandyellow'
@@ -68,13 +53,14 @@
 		/>
 
 		<!-- Others -->
-		<color name = 'bgreen'
+		<color name = 'highlight'
 				rgb = '0, 204, 51'
 		/>
 
-    <color name = 'disabledgray'
-        rgb = '96, 96, 96'
-    />
+    <color name = 'paleyellow'
+				rgb = '247, 228, 166'
+		/>
+
 		<color name = 'black'
 				rgb = '0, 0, 0'
 		/>
@@ -93,8 +79,22 @@
 		<color name = 'lightgray2'
 				rgb = '231, 223, 189'
 		/>
-		<color name = 'paleyellow'
-				rgb = '247, 228, 166'
+
+
+    <!-- Older/Unused? -->
+    <color name = 'brightredborder'
+				rgb = '238, 213, 207'
+		/>
+
+		<color name = 'darkredborder'
+				rgb = '110, 29, 6'
+		/>
+
+		<color name = 'darkeneddarkred'
+				rgb = '120, 29, 6'
+		/>
+		<color name = 'darkenedbrightred'
+				rgb = '144, 84, 72'
 		/>
 	</palette>
 
@@ -172,7 +172,7 @@
 		/>
 
 		<text_color	id = 'color_normal_hover'
-				color = 'darkred'
+				color = 'button_idle'
 		/>
 
 		<text_color	id = 'color_normal_disabled'
@@ -224,7 +224,7 @@
 	<drawdata id = 'text_selection_focus' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
-					fg_color = 'bgreen'
+					fg_color = 'highlight'
 		/>
 	</drawdata>
 
@@ -232,7 +232,7 @@
 	<drawdata id = 'mainmenu_bg' cache = 'false'>
 		<drawstep	func = 'fill'
 					fill = 'background'
-					bg_color = 'darkorange'
+					bg_color = 'background'
 		/>
 	</drawdata>
 
@@ -242,7 +242,7 @@
 					radius = '5'
 					fill = 'background'
 					stroke = '0'
-					bg_color = 'darkorange'
+					bg_color = 'background'
 					shadow = '7'
 		/>
 	</drawdata>
@@ -274,9 +274,9 @@
 					stroke = '1'
 					radius = '10'
 					fill = 'gradient'
-					fg_color = 'blandyellow'
-					gradient_start = 'brightred'
-					gradient_end = 'brightred'
+          fg_color = 'blandyellow'
+					gradient_start = 'button_hover'
+					gradient_end = 'button_hover'
 		/>
 	</drawdata>
 
@@ -285,9 +285,9 @@
 					stroke = '1'
 					radius = '10'
 					fill = 'gradient'
-					fg_color = 'blandyellow'
-					gradient_start = 'darkred'
-					gradient_end = 'darkred'
+          fg_color = 'blandyellow'
+					gradient_start = 'button_idle'
+					gradient_end = 'button_idle'
 		/>
 	</drawdata>
 
@@ -297,7 +297,7 @@
 					radius = '10'
 					fill = 'none'
 					fg_color = 'darkgray'
-					stroke = '1'
+					stroke = '0'
 		/>
 		<drawstep	func = 'triangle'
 					fg_color = 'shadowcolor'
@@ -316,7 +316,7 @@
 					radius = '10'
 					fill = 'none'
 					fg_color = 'darkgray'
-					stroke = '1'
+					stroke = '0'
 		/>
 		<drawstep	func = 'triangle'
 					fg_color = 'shadowcolor'
@@ -331,18 +331,18 @@
 	</drawdata>
 
 	<drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'>
-		<drawstep	func = 'roundedsq'
+		<!-- <drawstep	func = 'roundedsq'
 					radius = '10'
 					fill = 'gradient'
-					gradient_start = 'brightred'
-					gradient_end = 'brightred'
-					stroke = '1'
-					fg_color = 'darkred'
-					bevel = '1'
-					bevel_color = 'brightred'
-		/>
+					gradient_start = 'button_hover'
+					gradient_end = 'button_hover'
+					stroke = '0'
+					fg_color = 'button_idle'
+					bevel = '0'
+					bevel_color = 'button_hover'
+		/> -->
 		<drawstep	func = 'triangle'
-					fg_color = 'shadowcolor'
+					fg_color = 'button_hover'
 					fill = 'foreground'
 					width = '10'
 					height = '10'
@@ -354,18 +354,18 @@
 	</drawdata>
 
 	<drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'>
-		<drawstep	func = 'roundedsq'
+		<!-- <drawstep	func = 'roundedsq'
 					radius = '10'
 					fill = 'gradient'
-					gradient_start = 'darkred'
-					gradient_end = 'darkred'
-					stroke = '1'
-					fg_color = 'darkred'
-					bevel = '1'
-					bevel_color = 'brightred'
-		/>
+					gradient_start = 'button_idle'
+					gradient_end = 'button_idle'
+					stroke = '0'
+					fg_color = 'button_idle'
+					bevel = '0'
+					bevel_color = 'button_hover'
+		/> -->
 		<drawstep	func = 'triangle'
-					fg_color = 'shadowcolor'
+					fg_color = 'button_hover'
 					fill = 'foreground'
 					width = '5'
 					height = '5'
@@ -439,8 +439,8 @@
 					radius = '5'
 					fill = 'gradient'
 					fg_color = '123, 112, 56'
-					gradient_start = 'darkred'
-					gradient_end = 'darkred'
+					gradient_start = 'button_idle'
+					gradient_end = 'button_idle'
 		/>
 	</drawdata>
 
@@ -451,8 +451,8 @@
 					radius = '5'
 					fill = 'gradient'
 					fg_color = '123, 112, 56'
-					gradient_start = 'brightred'
-					gradient_end = 'brightred'
+					gradient_start = 'button_hover'
+					gradient_end = 'button_hover'
 		/>
 	</drawdata>
 
@@ -463,8 +463,8 @@
 					radius = '5'
 					fill = 'gradient'
 					fg_color = '123, 112, 56'
-					gradient_start = 'disabledgray'
-					gradient_end = 'disabledgray'
+					gradient_start = 'button_disabled'
+					gradient_end = 'button_disabled'
 		/>
 	</drawdata>
 
@@ -475,7 +475,7 @@
 					stroke = '1'
 					fg_color = 'lightgray2'
 					fill = 'background'
-					bg_color = 'xtrabrightred'
+					bg_color = 'dialog_background'
 					shadow = '1'
 		/>
 
@@ -514,7 +514,7 @@
 					stroke = '1'
 					fg_color = 'lightgray2'
 					fill = 'background'
-					bg_color = 'xtrabrightred'
+					bg_color = 'dialog_background'
 					shadow = '1'
 		/>
 
@@ -554,8 +554,8 @@
 					fg_color = 'lightgray'
 					radius = '5'
 					fill = 'gradient'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'xtrabrightred'
+					gradient_start = 'dialog_background'
+					gradient_end = 'dialog_background'
 					shadow = '0'
 		/>
 		<drawstep	func = 'triangle'
@@ -593,7 +593,7 @@
 					stroke = '1'
 					fg_color = 'lightgray2'
 					fill = 'background'
-					bg_color = 'xtrabrightred'
+					bg_color = 'dialog_background'
 					shadow = '2'
 		/>
 
@@ -633,8 +633,8 @@
 					fg_color = 'lightgray'
 					radius = '5'
 					fill = 'gradient'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'xtrabrightred'
+					gradient_start = 'dialog_background'
+					gradient_end = 'dialog_background'
 					shadow = '0'
 		/>
 		<drawstep	func = 'triangle'
@@ -672,7 +672,7 @@
 					stroke = '1'
 					fg_color = 'lightgray2'
 					fill = 'background'
-					bg_color = 'xtrabrightred'
+					bg_color = 'dialog_background'
 					shadow = '1'
 		/>
 
@@ -723,8 +723,8 @@
 		<drawstep	func = 'roundedsq'
 					radius = '6'
 					stroke = '0'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'xtrabrightred'
+					gradient_start = 'dialog_background'
+					gradient_end = 'dialog_background'
 					fill = 'gradient'
 					shadow = '7'
 		/>
@@ -744,8 +744,8 @@
 					radius = '6'
 					stroke = '0'
 					fill = 'gradient'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'xtrabrightred'
+					gradient_start = 'dialog_background'
+					gradient_end = 'dialog_background'
 					gradient_factor = '4'
 					shadow = '7'
 		/>
@@ -769,14 +769,14 @@
 		/>
 		<drawstep	func = 'roundedsq'
 					radius = '5'
-					stroke = '1'
+					stroke = '0'
 					fill = 'foreground'
 					shadow = '0'
 					factor = '0'
-					fg_color = '120, 40, 16'
+					fg_color = 'button_pressed'
 					gradient_start = '255, 0, 0'
 					gradient_end = '255, 0, 0'
-					bevel = '1'
+					bevel = '0'
 					bevel_color = 'black'
 		/>
 	</drawdata>
@@ -790,12 +790,12 @@
 		/>
 		<drawstep	func = 'roundedsq'
 					radius = '5'
-					stroke = '1'
+					stroke = '0'
 					fill = 'background'
-					shadow = '0'
+					shadow = '2'
 					fg_color = 'darkredborder'
-          bg_color = 'darkred'
-					bevel = '1'
+          bg_color = 'button_idle'
+					bevel = '0'
 					bevel_color = 'brightredborder'
 		/>
 	</drawdata>
@@ -809,12 +809,12 @@
 		/>
 		<drawstep	func = 'roundedsq'
 					radius = '5'
-					stroke = '1'
+					stroke = '0'
 					fill = 'background'
-					shadow = '0'
+					shadow = '2'
 					fg_color = 'darkredborder'
-          bg_color = 'brightred'
-					bevel = '1'
+          bg_color = 'button_hover'
+					bevel = '0'
 					bevel_color = 'brightredborder'
 		/>
 	</drawdata>
@@ -828,13 +828,13 @@
 		/>
 		<drawstep	func = 'roundedsq'
 					radius = '5'
-					stroke = '1'
+					stroke = '0'
 					fill = 'gradient'
 					shadow = '0'
 					fg_color = 'shadowcolor'
-					gradient_start = 'disabledgray'
-					gradient_end = 'disabledgray'
-					bevel = '1'
+					gradient_start = 'button_disabled'
+					gradient_end = 'button_disabled'
+					bevel = '0'
 					bevel_color = 'darkgray'
 		/>
 	</drawdata>
@@ -918,11 +918,11 @@
 					radius = '6'
 					stroke = '1'
 					fg_color = 'lightgray'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'xtrabrightred'
+					gradient_start = 'dialog_background'
+					gradient_end = 'dialog_background'
 					gradient_factor = '6'
 					fill = 'gradient'
-					bg_color = 'xtrabrightred'
+					bg_color = 'dialog_background'
 					shadow = '7'
 		/>
 	</drawdata>
@@ -930,8 +930,8 @@
 	<drawdata id = 'widget_small' cache = 'false'>
 		<drawstep	func = 'square'
 					stroke = '0'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'xtrabrightred'
+					gradient_start = 'dialog_background'
+					gradient_end = 'dialog_background'
 					gradient_factor = '6'
 					fill = 'gradient'
 					shadow = '3'
-- 
cgit v1.2.3