Removed _shiny materials.

Updated materials to use the new shininess setting.

3 files changed, 116 insertions, 116 deletions

diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index f42d26d..1223ad0 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -1921,7 +1921,7 @@
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -672 16 16 0 -5 ) ( -672 16 48 0 -4.625 ) ( -672 64 48 0 -4.125 ) ( -672 80 48 0 -3.875 ) ( -672 96 48 0 -3.625 ) ( -672 144 48 0 -3.125 ) ( -672 144 16 0 -2.75 ) ( -672 144 0 0 -2.625 ) ( -672 144 -16 0 -2.5 ) ( -672 144 -48 0 -2.125 ) ( -672 96 -48 0 -1.625 ) ( -672 80 -48 0 -1.375 ) ( -672 64 -48 0 -1.125 ) ( -672 16 -48 0 -0.625 ) ( -672 16 -16 0 -0.25 ) ( -672 16 0 0 -0.125 ) ( -672 16 16 0 0 ) )
@@ -1934,7 +1934,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -672 20 14.6666622162 0 0 ) ( -672 20 43.9999961853 0 -0.4583333433 ) ( -672 65 43.9999961853 0 -1.1614583731 ) ( -672 80 43.9999961853 0 -1.3958333731 ) ( -672 95 43.9999961853 0 -1.6302083731 ) ( -672 140 43.9999961853 0 -2.3333332539 ) ( -672 140 14.6666622162 0 -2.7916667461 ) ( -672 140 -0.0000039339 0 -3.0208332539 ) ( -672 140 -14.6666717529 0 -3.25 ) ( -672 140 -44 0 -3.7083332539 ) ( -672 95 -44 0 -4.4114584923 ) ( -672 80 -44 0 -4.6458334923 ) ( -672 65 -44 0 -4.8802084923 ) ( -672 20 -44 0 -5.5833334923 ) ( -672 20 -14.6666717529 0 -6.0416665077 ) ( -672 20 -0.0000039339 0 -6.2708330154 ) ( -672 20 14.6666622162 0 -6.5 ) )
@@ -1947,7 +1947,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -736 32 8 0 0 ) ( -736 32 0 0 -0.125 ) ( -736 32 -8 0 -0.25 ) ( -736 32 -32 0 -0.625 ) ( -736 64 -32 0 -1.125 ) ( -736 80 -32 0 -1.375 ) ( -736 96 -32 0 -1.625 ) ( -736 128 -32 0 -2.125 ) ( -736 128 -8 0 -2.5 ) ( -736 128 0 0 -2.625 ) ( -736 128 8 0 -2.75 ) ( -736 128 32 0 -3.125 ) ( -736 96 32 0 -3.625 ) ( -736 80 32 0 -3.875 ) ( -736 64 32 0 -4.125 ) ( -736 32 32 0 -4.625 ) ( -736 32 8 0 -5 ) )
@@ -1960,7 +1960,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -576 16 16 0 0 ) ( -576 16 0 0 -0.125 ) ( -576 16 -16 0 -0.25 ) ( -576 16 -48 0 -0.625 ) ( -576 64 -48 0 -1.125 ) ( -576 80 -48 0 -1.375 ) ( -576 96 -48 0 -1.625 ) ( -576 144 -48 0 -2.125 ) ( -576 144 -16 0 -2.5 ) ( -576 144 0 0 -2.625 ) ( -576 144 16 0 -2.75 ) ( -576 144 48 0 -3.125 ) ( -576 96 48 0 -3.625 ) ( -576 80 48 0 -3.875 ) ( -576 64 48 0 -4.125 ) ( -576 16 48 0 -4.625 ) ( -576 16 16 0 -5 ) )
@@ -1986,7 +1986,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -736 16 16 0 0 ) ( -736 16 0 0 -0.125 ) ( -736 16 -16 0 -0.25 ) ( -736 16 -48 0 -0.625 ) ( -736 64 -48 0 -1.125 ) ( -736 80 -48 0 -1.375 ) ( -736 96 -48 0 -1.625 ) ( -736 144 -48 0 -2.125 ) ( -736 144 -16 0 -2.5 ) ( -736 144 0 0 -2.625 ) ( -736 144 16 0 -2.75 ) ( -736 144 48 0 -3.125 ) ( -736 96 48 0 -3.625 ) ( -736 80 48 0 -3.875 ) ( -736 64 48 0 -4.125 ) ( -736 16 48 0 -4.625 ) ( -736 16 16 0 -5 ) )
@@ -1999,7 +1999,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -736 16 16 0 0 ) ( -736 16 48 0 -0.5 ) ( -736 64 48 0 -1.25 ) ( -736 80 48 0 -1.5 ) ( -736 96 48 0 -1.75 ) ( -736 144 48 0 -2.5 ) ( -736 144 16 0 -3 ) ( -736 144 0 0 -3.25 ) ( -736 144 -16 0 -3.5 ) ( -736 144 -48 0 -4 ) ( -736 96 -48 0 -4.75 ) ( -736 80 -48 0 -5 ) ( -736 64 -48 0 -5.25 ) ( -736 16 -48 0 -6 ) ( -736 16 -16 0 -6.5 ) ( -736 16 0 0 -6.75 ) ( -736 16 16 0 -7 ) )
@@ -2012,7 +2012,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -576 16 16 0 0 ) ( -576 16 48 0 -0.5 ) ( -576 64 48 0 -1.25 ) ( -576 80 48 0 -1.5 ) ( -576 96 48 0 -1.75 ) ( -576 144 48 0 -2.5 ) ( -576 144 16 0 -3 ) ( -576 144 0 0 -3.25 ) ( -576 144 -16 0 -3.5 ) ( -576 144 -48 0 -4 ) ( -576 96 -48 0 -4.75 ) ( -576 80 -48 0 -5 ) ( -576 64 -48 0 -5.25 ) ( -576 16 -48 0 -6 ) ( -576 16 -16 0 -6.5 ) ( -576 16 0 0 -6.75 ) ( -576 16 16 0 -7 ) )
@@ -2034,7 +2034,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -736 -144 16 0 0 ) ( -736 -144 0 0 -0.125 ) ( -736 -144 -16 0 -0.25 ) ( -736 -144 -48 0 -0.625 ) ( -736 -96 -48 0 -1.125 ) ( -736 -80 -48 0 -1.375 ) ( -736 -64 -48 0 -1.625 ) ( -736 -16 -48 0 -2.125 ) ( -736 -16 -16 0 -2.5 ) ( -736 -16 0 0 -2.625 ) ( -736 -16 16 0 -2.75 ) ( -736 -16 48 0 -3.125 ) ( -736 -64 48 0 -3.625 ) ( -736 -80 48 0 -3.875 ) ( -736 -96 48 0 -4.125 ) ( -736 -144 48 0 -4.625 ) ( -736 -144 16 0 -5 ) )
@@ -2047,7 +2047,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -672 -140 14.6666622162 0 0 ) ( -672 -140 43.9999961853 0 -0.4583333433 ) ( -672 -95 43.9999961853 0 -1.1614583731 ) ( -672 -80 43.9999961853 0 -1.3958333731 ) ( -672 -65 43.9999961853 0 -1.6302083731 ) ( -672 -20.0000019073 43.9999961853 0 -2.3333332539 ) ( -672 -20.0000019073 14.6666622162 0 -2.7916667461 ) ( -672 -20.0000019073 -0.0000039339 0 -3.0208332539 ) ( -672 -20.0000019073 -14.6666717529 0 -3.25 ) ( -672 -20.0000019073 -44 0 -3.7083332539 ) ( -672 -65 -44 0 -4.4114584923 ) ( -672 -80 -44 0 -4.6458334923 ) ( -672 -95 -44 0 -4.8802084923 ) ( -672 -140 -44 0 -5.5833334923 ) ( -672 -140 -14.6666717529 0 -6.0416665077 ) ( -672 -140 -0.0000039339 0 -6.2708330154 ) ( -672 -140 14.6666622162 0 -6.5 ) )
@@ -2060,7 +2060,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -736 -144 16 0 0 ) ( -736 -144 48 0 -0.5 ) ( -736 -96 48 0 -1.25 ) ( -736 -80 48 0 -1.5 ) ( -736 -64 48 0 -1.75 ) ( -736 -16 48 0 -2.5 ) ( -736 -16 16 0 -3 ) ( -736 -16 0 0 -3.25 ) ( -736 -16 -16 0 -3.5 ) ( -736 -16 -48 0 -4 ) ( -736 -64 -48 0 -4.75 ) ( -736 -80 -48 0 -5 ) ( -736 -96 -48 0 -5.25 ) ( -736 -144 -48 0 -6 ) ( -736 -144 -16 0 -6.5 ) ( -736 -144 0 0 -6.75 ) ( -736 -144 16 0 -7 ) )
@@ -2073,7 +2073,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -672 -144 16 0 -5 ) ( -672 -144 48 0 -4.625 ) ( -672 -96 48 0 -4.125 ) ( -672 -80 48 0 -3.875 ) ( -672 -64 48 0 -3.625 ) ( -672 -16 48 0 -3.125 ) ( -672 -16 16 0 -2.75 ) ( -672 -16 0 0 -2.625 ) ( -672 -16 -16 0 -2.5 ) ( -672 -16 -48 0 -2.125 ) ( -672 -64 -48 0 -1.625 ) ( -672 -80 -48 0 -1.375 ) ( -672 -96 -48 0 -1.125 ) ( -672 -144 -48 0 -0.625 ) ( -672 -144 -16 0 -0.25 ) ( -672 -144 0 0 -0.125 ) ( -672 -144 16 0 0 ) )
@@ -2108,7 +2108,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -576 -144 16 0 0 ) ( -576 -144 0 0 -0.125 ) ( -576 -144 -16 0 -0.25 ) ( -576 -144 -48 0 -0.625 ) ( -576 -96 -48 0 -1.125 ) ( -576 -80 -48 0 -1.375 ) ( -576 -64 -48 0 -1.625 ) ( -576 -16 -48 0 -2.125 ) ( -576 -16 -16 0 -2.5 ) ( -576 -16 0 0 -2.625 ) ( -576 -16 16 0 -2.75 ) ( -576 -16 48 0 -3.125 ) ( -576 -64 48 0 -3.625 ) ( -576 -80 48 0 -3.875 ) ( -576 -96 48 0 -4.125 ) ( -576 -144 48 0 -4.625 ) ( -576 -144 16 0 -5 ) )
@@ -2121,7 +2121,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -576 -144 16 0 0 ) ( -576 -144 48 0 -0.5 ) ( -576 -96 48 0 -1.25 ) ( -576 -80 48 0 -1.5 ) ( -576 -64 48 0 -1.75 ) ( -576 -16 48 0 -2.5 ) ( -576 -16 16 0 -3 ) ( -576 -16 0 0 -3.25 ) ( -576 -16 -16 0 -3.5 ) ( -576 -16 -48 0 -4 ) ( -576 -64 -48 0 -4.75 ) ( -576 -80 -48 0 -5 ) ( -576 -96 -48 0 -5.25 ) ( -576 -144 -48 0 -6 ) ( -576 -144 -16 0 -6.5 ) ( -576 -144 0 0 -6.75 ) ( -576 -144 16 0 -7 ) )
@@ -2134,7 +2134,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 3 17 0 0 0 )
 (
 ( ( -736 -128 8 0 0 ) ( -736 -128 0 0 -0.125 ) ( -736 -128 -8 0 -0.25 ) ( -736 -128 -32 0 -0.625 ) ( -736 -96 -32 0 -1.125 ) ( -736 -80 -32 0 -1.375 ) ( -736 -64 -32 0 -1.625 ) ( -736 -32 -32 0 -2.125 ) ( -736 -32 -8 0 -2.5 ) ( -736 -32 0 0 -2.625 ) ( -736 -32 8 0 -2.75 ) ( -736 -32 32 0 -3.125 ) ( -736 -64 32 0 -3.625 ) ( -736 -80 32 0 -3.875 ) ( -736 -96 32 0 -4.125 ) ( -736 -128 32 0 -4.625 ) ( -736 -128 8 0 -5 ) )
@@ -2896,7 +2896,7 @@ common/entity_second
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 192 184 -152 0 0 ) ( 192 184 -152 0 -1 ) ( 192 184 -144 0 -2 ) )
@@ -2919,7 +2919,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( 144 184 -144 0 -2 ) ( 48 184 -144 0 -1 ) ( 48 184 -144 0 0 ) )
@@ -2942,7 +2942,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 152 184 -152 0 -1.5 ) ( 192 184 -152 0 -0.75 ) ( 192 184 -152 0 0 ) )
@@ -2965,7 +2965,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 192 184 -144 0 0 ) ( 192 184 -144 0 -1 ) ( 144 184 -144 0 -2 ) )
@@ -2988,7 +2988,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -448 184 -144 0 -2 ) ( -480 184 -144 0 -1 ) ( -480 184 -144 0 0 ) )
@@ -3011,7 +3011,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -336 184 -144 0 -2 ) ( -448 184 -144 0 -1 ) ( -448 184 -144 0 0 ) )
@@ -3034,7 +3034,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -240 184 -144 0 -2 ) ( -336 184 -144 0 -1 ) ( -336 184 -144 0 0 ) )
@@ -3057,7 +3057,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( 48 184 -144 0 -2 ) ( -48 184 -144 0 -1 ) ( -48 184 -144 0 0 ) )
@@ -3080,7 +3080,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -144 184 -144 0 -2 ) ( -240 184 -144 0 -1 ) ( -240 184 -144 0 0 ) )
@@ -3103,7 +3103,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -48 184 -144 0 -2 ) ( -144 184 -144 0 -1 ) ( -144 184 -144 0 0 ) )
@@ -3126,7 +3126,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -480 184 -144 0 -2 ) ( -552 184 -144 0 -1 ) ( -552 184 -144 0 0 ) )
@@ -3149,7 +3149,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -552 184 -144 0 -2 ) ( -552 184 -152 0 -1 ) ( -552 184 -152 0 0 ) )
@@ -3172,7 +3172,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -552 184 -152 0 0 ) ( -552 184 -152 0 -0.75 ) ( -488 184 -152 0 -1.5 ) )
@@ -3208,7 +3208,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( 48 184 144 0 0 ) ( 48 184 144 0 -1 ) ( 144 184 144 0 -2 ) )
@@ -3244,7 +3244,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -336 184 144 0 0 ) ( -336 184 144 0 -1 ) ( -240 184 144 0 -2 ) )
@@ -3267,7 +3267,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 144 184 144 0 -2 ) ( 192 184 144 0 -1 ) ( 192 184 144 0 0 ) )
@@ -3290,7 +3290,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -448 184 144 0 0 ) ( -448 184 144 0 -1 ) ( -336 184 144 0 -2 ) )
@@ -3313,7 +3313,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -552 184 144 0 0 ) ( -552 184 144 0 -1 ) ( -480 184 144 0 -2 ) )
@@ -3336,7 +3336,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 192 184 144 0 -2 ) ( 192 184 152 0 -1 ) ( 192 184 152 0 0 ) )
@@ -3359,7 +3359,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 192 184 152 0 0 ) ( 192 184 152 0 -0.75 ) ( 152 184 152 0 -1.5 ) )
@@ -3382,7 +3382,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -480 184 144 0 0 ) ( -480 184 144 0 -1 ) ( -448 184 144 0 -2 ) )
@@ -3405,7 +3405,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -240 184 144 0 0 ) ( -240 184 144 0 -1 ) ( -144 184 144 0 -2 ) )
@@ -3428,7 +3428,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -48 184 144 0 0 ) ( -48 184 144 0 -1 ) ( 48 184 144 0 -2 ) )
@@ -3451,7 +3451,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -144 184 144 0 0 ) ( -144 184 144 0 -1 ) ( -48 184 144 0 -2 ) )
@@ -3474,7 +3474,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -552 184 152 0 0 ) ( -552 184 152 0 -1 ) ( -552 184 144 0 -2 ) )
@@ -3497,7 +3497,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -488 184 152 0 -1.5 ) ( -552 184 152 0 -0.75 ) ( -552 184 152 0 0 ) )
@@ -3520,7 +3520,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( 144 -184 144 0 -2 ) ( 48 -184 144 0 -1 ) ( 48 -184 144 0 0 ) )
@@ -3556,7 +3556,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -240 -184 144 0 -2 ) ( -336 -184 144 0 -1 ) ( -336 -184 144 0 0 ) )
@@ -3579,7 +3579,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 192 -184 144 0 0 ) ( 192 -184 144 0 -1 ) ( 144 -184 144 0 -2 ) )
@@ -3602,7 +3602,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -336 -184 144 0 -2 ) ( -448 -184 144 0 -1 ) ( -448 -184 144 0 0 ) )
@@ -3625,7 +3625,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -480 -184 144 0 -2 ) ( -552 -184 144 0 -1 ) ( -552 -184 144 0 0 ) )
@@ -3648,7 +3648,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 192 -184 152 0 0 ) ( 192 -184 152 0 -1 ) ( 192 -184 144 0 -2 ) )
@@ -3671,7 +3671,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 152 -184 152 0 -1.5 ) ( 192 -184 152 0 -0.75 ) ( 192 -184 152 0 0 ) )
@@ -3694,7 +3694,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -448 -184 144 0 -2 ) ( -480 -184 144 0 -1 ) ( -480 -184 144 0 0 ) )
@@ -3717,7 +3717,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -144 -184 144 0 -2 ) ( -240 -184 144 0 -1 ) ( -240 -184 144 0 0 ) )
@@ -3740,7 +3740,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( 48 -184 144 0 -2 ) ( -48 -184 144 0 -1 ) ( -48 -184 144 0 0 ) )
@@ -3763,7 +3763,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -48 -184 144 0 -2 ) ( -144 -184 144 0 -1 ) ( -144 -184 144 0 0 ) )
@@ -3786,7 +3786,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -552 -184 144 0 -2 ) ( -552 -184 152 0 -1 ) ( -552 -184 152 0 0 ) )
@@ -3809,7 +3809,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -552 -184 152 0 0 ) ( -552 -184 152 0 -0.75 ) ( -488 -184 152 0 -1.5 ) )
@@ -3832,7 +3832,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( 48 -184 -144 0 0 ) ( 48 -184 -144 0 -1 ) ( 144 -184 -144 0 -2 ) )
@@ -3868,7 +3868,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -336 -184 -144 0 0 ) ( -336 -184 -144 0 -1 ) ( -240 -184 -144 0 -2 ) )
@@ -3891,7 +3891,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 144 -184 -144 0 -2 ) ( 192 -184 -144 0 -1 ) ( 192 -184 -144 0 0 ) )
@@ -3914,7 +3914,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -448 -184 -144 0 0 ) ( -448 -184 -144 0 -1 ) ( -336 -184 -144 0 -2 ) )
@@ -3937,7 +3937,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -552 -184 -144 0 0 ) ( -552 -184 -144 0 -1 ) ( -480 -184 -144 0 -2 ) )
@@ -3960,7 +3960,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 192 -184 -144 0 -2 ) ( 192 -184 -152 0 -1 ) ( 192 -184 -152 0 0 ) )
@@ -3983,7 +3983,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( 192 -184 -152 0 0 ) ( 192 -184 -152 0 -0.75 ) ( 152 -184 -152 0 -1.5 ) )
@@ -4006,7 +4006,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -480 -184 -144 0 0 ) ( -480 -184 -144 0 -1 ) ( -448 -184 -144 0 -2 ) )
@@ -4029,7 +4029,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -240 -184 -144 0 0 ) ( -240 -184 -144 0 -1 ) ( -144 -184 -144 0 -2 ) )
@@ -4052,7 +4052,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-common/entity_second_shiny
+common/entity_second
 ( 13 3 0 0 0 )
 (
 ( ( -48 -184 -144 0 0 ) ( -48 -184 -144 0 -1 ) ( 48 -184 -144 0 -2 ) )
@@ -4075,7 +4075,7 @@ common/entity_second_shiny
 {
 patchDef2
 {
-colors/grey50_shiny
+colors/grey50
 ( 13 3 0 0 0 )
 (
 ( ( -144 -184 -144 0 0 ) ( -144 -184 -144 0 -1 ) ( -48 -184 -144 0 -2 ) )
@@ -4098,7 +4098,7 @@ colors/grey50_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -552 -184 -152 0 0 ) ( -552 -184 -152 0 -1 ) ( -552 -184 -144 0 -2 ) )
@@ -4121,7 +4121,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 13 3 0 0 0 )
 (
 ( ( -488 -184 -152 0 -1.5 ) ( -552 -184 -152 0 -0.75 ) ( -552 -184 -152 0 0 ) )
diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map
index bf3f20a..292eb36 100644
--- a/base/maps/merchant/scalar.map
+++ b/base/maps/merchant/scalar.map
@@ -344,10 +344,10 @@
 }
 // brush 27
 {
-( -288 -48 0 ) ( -280 -48 0 ) ( -280 -32 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -288 -48 0 ) ( -280 -48 0 ) ( -280 -32 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -272 -32 -16 ) ( -284 -32 -8 ) ( -280 -32 -16 ) common/caulk 0 0 0 1 1 0 0 0
 ( -288 -40 0 ) ( -280 -48 0 ) ( -288 -48 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -288 -48 0 ) ( -280 -32 -16 ) ( -284 -32 -8 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -288 -48 0 ) ( -280 -32 -16 ) ( -284 -32 -8 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -272 -32 -16 ) ( -280 -48 0 ) ( -284 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 28
@@ -356,7 +356,7 @@
 ( -264 -40 96 ) ( -264 -16 96 ) ( -264 -40 -32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 -32 -8 ) ( -284 -32 -8 ) ( -272 -32 -16 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 -40 0 ) ( -280 -48 0 ) ( -288 -40 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -264 -40 0 ) ( -288 -40 0 ) ( -284 -32 -8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
+( -264 -40 0 ) ( -288 -40 0 ) ( -284 -32 -8 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -272 -32 -16 ) ( -284 -32 -8 ) ( -280 -48 0 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 29
@@ -365,15 +365,15 @@
 ( -264 40 -32 ) ( -264 16 96 ) ( -264 40 96 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 32 -8 ) ( -272 32 -16 ) ( -284 32 -8 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 40 0 ) ( -288 40 0 ) ( -280 48 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -264 40 0 ) ( -284 32 -8 ) ( -288 40 0 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
+( -264 40 0 ) ( -284 32 -8 ) ( -288 40 0 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -272 32 -16 ) ( -280 48 0 ) ( -284 32 -8 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 30
 {
-( -288 48 0 ) ( -280 32 -16 ) ( -280 48 0 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -288 48 0 ) ( -280 32 -16 ) ( -280 48 0 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -272 32 -16 ) ( -280 32 -16 ) ( -284 32 -8 ) common/caulk 0 0 0 1 1 0 0 0
 ( -288 48 0 ) ( -280 48 0 ) ( -288 40 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -288 48 0 ) ( -284 32 -8 ) ( -280 32 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -288 48 0 ) ( -284 32 -8 ) ( -280 32 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -272 32 -16 ) ( -284 32 -8 ) ( -280 48 0 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 31
@@ -382,7 +382,7 @@
 ( -264 40 -64 ) ( -264 16 -64 ) ( -264 40 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 32 48 ) ( -328 32 40 ) ( -328 32 48 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 40 32 ) ( -328 48 32 ) ( -328 40 32 ) common/caulk 0 0 0 1 1 0 0 0
-( -264 32 40 ) ( -328 40 32 ) ( -328 32 40 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
+( -264 32 40 ) ( -328 40 32 ) ( -328 32 40 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -306 36 36 ) ( -296 48 32 ) ( -304 32 48 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 32
@@ -391,38 +391,38 @@
 ( -264 -40 64 ) ( -264 -16 -64 ) ( -264 -40 -64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -328 -32 48 ) ( -328 -32 40 ) ( -264 -32 48 ) common/caulk 0 0 0 1 1 0 0 0
 ( -328 -40 32 ) ( -328 -48 32 ) ( -264 -40 32 ) common/caulk 0 0 0 1 1 0 0 0
-( -328 -32 40 ) ( -328 -40 32 ) ( -264 -32 40 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
+( -328 -32 40 ) ( -328 -40 32 ) ( -264 -32 40 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -304 -32 48 ) ( -296 -48 32 ) ( -306 -36 36 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 33
 {
-( -328 -48 32 ) ( -328 -32 48 ) ( -264 -48 32 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -328 -48 32 ) ( -328 -32 48 ) ( -264 -48 32 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -328 -32 48 ) ( -328 -32 40 ) ( -264 -32 48 ) common/caulk 0 0 0 1 1 0 0 0
 ( -328 -40 32 ) ( -328 -48 32 ) ( -264 -40 32 ) common/caulk 0 0 0 1 1 0 0 0
-( -280 64 -16 ) ( -288 -64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -280 64 -16 ) ( -288 -64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -306 -36 36 ) ( -296 -48 32 ) ( -304 -32 48 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 34
 {
-( -264 48 32 ) ( -328 32 48 ) ( -328 48 32 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -264 48 32 ) ( -328 32 48 ) ( -328 48 32 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -264 32 48 ) ( -328 32 40 ) ( -328 32 48 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 40 32 ) ( -328 48 32 ) ( -328 40 32 ) common/caulk 0 0 0 1 1 0 0 0
-( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -304 32 48 ) ( -296 48 32 ) ( -306 36 36 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 35
 {
-( -264 32 48 ) ( -328 -32 48 ) ( -328 32 48 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -264 32 48 ) ( -328 -32 48 ) ( -328 32 48 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -264 32 40 ) ( -328 32 48 ) ( -328 32 40 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 -32 48 ) ( -328 -32 40 ) ( -328 -32 48 ) common/caulk 0 0 0 1 1 0 0 0
-( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -308 -64 40 ) ( -304 64 48 ) ( -308 64 40 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 36
 {
 ( -264 32 40 ) ( -328 32 48 ) ( -328 32 40 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 -32 48 ) ( -328 -32 40 ) ( -328 -32 48 ) common/caulk 0 0 0 1 1 0 0 0
-( -264 32 40 ) ( -328 32 40 ) ( -328 -32 40 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
+( -264 32 40 ) ( -328 32 40 ) ( -328 -32 40 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -308 64 40 ) ( -304 64 48 ) ( -308 -64 40 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 32 48 ) ( -328 -32 48 ) ( -328 32 48 ) thorn/panel_01_primary 0 0 0 1 1 0 0 0
 ( -264 40 -64 ) ( -264 16 -64 ) ( -264 40 64 ) common/caulk 0 0 0 1 1 0 0 0
@@ -431,13 +431,13 @@
 {
 ( -276 32 -8 ) ( -284 32 -8 ) ( -280 32 -16 ) common/caulk 0 0 0 1 1 0 0 0
 ( -276 -32 -8 ) ( -280 -32 -16 ) ( -284 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0
-( -284 -32 -8 ) ( -280 -32 -16 ) ( -280 32 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
-( -264 -32 -16 ) ( -280 32 -16 ) ( -280 -32 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -284 -32 -8 ) ( -280 -32 -16 ) ( -280 32 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
+( -264 -32 -16 ) ( -280 32 -16 ) ( -280 -32 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -284 64 -8 ) ( -272 64 -16 ) ( -284 -64 -8 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 38
 {
-( -276 32 -8 ) ( -284 -32 -8 ) ( -284 32 -8 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
+( -276 32 -8 ) ( -284 -32 -8 ) ( -284 32 -8 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -276 32 -8 ) ( -284 32 -8 ) ( -280 32 -16 ) common/caulk 0 0 0 1 1 0 0 0
 ( -276 -32 -8 ) ( -280 -32 -16 ) ( -284 -32 -8 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 -32 -16 ) ( -280 32 -16 ) ( -280 -32 -16 ) thorn/panel_01_primary 0 0 0 1 1 0 0 0
@@ -446,17 +446,17 @@
 }
 // brush 39
 {
-( -328 -48 0 ) ( -328 -48 32 ) ( -264 -48 0 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -328 -48 0 ) ( -328 -48 32 ) ( -264 -48 0 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -328 -48 32 ) ( -328 -40 32 ) ( -264 -48 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -328 -40 0 ) ( -328 -48 0 ) ( -264 -40 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -280 64 -16 ) ( -288 -64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -280 64 -16 ) ( -288 -64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -304 -40 32 ) ( -288 -40 0 ) ( -280 -48 0 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 40
 {
 ( -328 -48 32 ) ( -328 -40 32 ) ( -264 -48 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -328 -40 0 ) ( -328 -48 0 ) ( -264 -40 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -328 -40 32 ) ( -328 -40 0 ) ( -264 -40 32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
+( -328 -40 32 ) ( -328 -40 0 ) ( -264 -40 32 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -280 -48 0 ) ( -288 -40 0 ) ( -304 -40 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -328 -48 0 ) ( -328 -48 32 ) ( -264 -48 0 ) thorn/panel_01_primary 0 0 0 1 1 0 0 0
 ( -264 -40 64 ) ( -264 -16 -64 ) ( -264 -40 -64 ) common/caulk 0 0 0 1 1 0 0 0
@@ -465,17 +465,17 @@
 {
 ( -264 48 32 ) ( -328 40 32 ) ( -328 48 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 40 0 ) ( -328 48 0 ) ( -328 40 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -264 40 32 ) ( -328 40 0 ) ( -328 40 32 ) colors/grey25_shiny 0 0 0 1 1 0 0 0
+( -264 40 32 ) ( -328 40 0 ) ( -328 40 32 ) colors/grey25 0 0 0 1 1 0 0 0
 ( -304 40 32 ) ( -288 40 0 ) ( -280 48 0 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 48 0 ) ( -328 48 32 ) ( -328 48 0 ) thorn/panel_01_primary 0 0 0 1 1 0 0 0
 ( -264 40 -64 ) ( -264 16 -64 ) ( -264 40 64 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 42
 {
-( -264 48 0 ) ( -328 48 32 ) ( -328 48 0 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -264 48 0 ) ( -328 48 32 ) ( -328 48 0 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -264 48 32 ) ( -328 40 32 ) ( -328 48 32 ) common/caulk 0 0 0 1 1 0 0 0
 ( -264 40 0 ) ( -328 48 0 ) ( -328 40 0 ) common/caulk 0 0 0 1 1 0 0 0
-( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark_shiny 0 0 0 1 1 0 0 0
+( -280 64 -16 ) ( -288 64 0 ) ( -280 -64 -16 ) common/entity_dark 0 0 0 1 1 0 0 0
 ( -280 48 0 ) ( -288 40 0 ) ( -304 40 32 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 43
@@ -1321,7 +1321,7 @@ common/engine
 {
 patchDef2
 {
-colors/grey25_shiny
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -238 72 -12 0 -0.5 ) ( -240 72 -8 0 -0.25 ) ( -240 72 -8 0 0 ) )
@@ -1340,7 +1340,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 3 5 0 0 0 )
 (
 ( ( -176 72 -40 -1.5 1.125 ) ( -176 56 -40 -1.5 1.375 ) ( -176 56 -24 -1.5 1.375 ) ( -176 56 -8 -1.5 1.375 ) ( -176 72 -8 -1.5 1.125 ) )
@@ -1366,7 +1366,7 @@ common/engine
 {
 patchDef2
 {
-colors/grey75
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -216 72 -12 0 0 ) ( -216 72 -12 0 -0.25 ) ( -238 72 -12 0 -0.5 ) )
@@ -1385,7 +1385,7 @@ colors/grey75
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -160 72 -8 0 0 ) ( -160 72 -8 0 -0.25 ) ( -144 72 -8 0 -0.5 ) )
@@ -1438,7 +1438,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 3 5 0 0 0 )
 (
 ( ( -96 72 -8 -1.5 1.125 ) ( -96 56 -8 -1.5 1.375 ) ( -96 56 -24 -1.5 1.375 ) ( -96 56 -40 -1.5 1.375 ) ( -96 72 -40 -1.5 1.125 ) )
@@ -1451,7 +1451,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -240 72 -8 0 -0.5 ) ( -176 72 -8 0 -0.25 ) ( -176 72 -8 0 0 ) )
@@ -1470,7 +1470,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 3 5 0 0 0 )
 (
 ( ( -160 72 -8 -1.5 1.125 ) ( -160 56 -8 -1.5 1.375 ) ( -160 56 -24 -1.5 1.375 ) ( -160 56 -40 -1.5 1.375 ) ( -160 72 -40 -1.5 1.125 ) )
@@ -1508,7 +1508,7 @@ colors/grey75
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 3 5 0 0 0 )
 (
 ( ( -144 72 -40 -1.5 1.125 ) ( -144 56 -40 -1.5 1.375 ) ( -144 56 -24 -1.5 1.375 ) ( -144 56 -8 -1.5 1.375 ) ( -144 72 -8 -1.5 1.125 ) )
@@ -1521,7 +1521,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -96 72 -8 0 0 ) ( -96 72 -8 0 -0.25 ) ( -47.9999961853 72 -8 0 -0.5 ) )
@@ -1540,7 +1540,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -48 72 -8 0 0 ) ( -48 72 -8 0 -0.25 ) ( -49.9999961853 72 -12 0 -0.5 ) )
@@ -1559,7 +1559,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey75
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -49.9999961853 72 -12 0 -0.5 ) ( -68 72 -12 0 -0.25 ) ( -68 72 -12 0 0 ) )
@@ -1606,7 +1606,7 @@ colors/black_bright
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 3 5 0 0 0 )
 (
 ( ( -144 -72 -40 -1.5 1.125 ) ( -144 -88 -40 -1.5 1.375 ) ( -144 -88 -24 -1.5 1.375 ) ( -144 -88 -8 -1.5 1.375 ) ( -144 -72 -8 -1.5 1.125 ) )
@@ -1619,7 +1619,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey75
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -216 -72 -12 0 0 ) ( -216 -72 -12 0 -0.25 ) ( -238 -72 -12 0 -0.5 ) )
@@ -1638,7 +1638,7 @@ colors/grey75
 {
 patchDef2
 {
-colors/grey25_shiny
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -238 -72 -12 0 -0.5 ) ( -240 -72 -8 0 -0.25 ) ( -240 -72 -8 0 0 ) )
@@ -1657,7 +1657,7 @@ colors/grey25_shiny
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -48 -72 -8 0 0 ) ( -48 -72 -8 0 -0.25 ) ( -49.9999961853 -72 -12 0 -0.5 ) )
@@ -1689,7 +1689,7 @@ common/engine
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 3 5 0 0 0 )
 (
 ( ( -160 -72 -8 -1.5 1.125 ) ( -160 -88 -8 -1.5 1.375 ) ( -160 -88 -24 -1.5 1.375 ) ( -160 -88 -40 -1.5 1.375 ) ( -160 -72 -40 -1.5 1.125 ) )
@@ -1702,7 +1702,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 3 5 0 0 0 )
 (
 ( ( -176 -72 -40 -1.5 1.125 ) ( -176 -88 -40 -1.5 1.375 ) ( -176 -88 -24 -1.5 1.375 ) ( -176 -88 -8 -1.5 1.375 ) ( -176 -72 -8 -1.5 1.125 ) )
@@ -1734,7 +1734,7 @@ common/engine
 {
 patchDef2
 {
-colors/grey75
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -49.9999961853 -72 -12 0 -0.5 ) ( -68 -72 -12 0 -0.25 ) ( -68 -72 -12 0 0 ) )
@@ -1770,7 +1770,7 @@ colors/grey75
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -96 -72 -8 0 0 ) ( -96 -72 -8 0 -0.25 ) ( -47.9999961853 -72 -8 0 -0.5 ) )
@@ -1789,7 +1789,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -160 -72 -8 0 0 ) ( -160 -72 -8 0 -0.25 ) ( -144 -72 -8 0 -0.5 ) )
@@ -1808,7 +1808,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 3 5 0 0 0 )
 (
 ( ( -96 -72 -8 -1.5 1.125 ) ( -96 -88 -8 -1.5 1.375 ) ( -96 -88 -24 -1.5 1.375 ) ( -96 -88 -40 -1.5 1.375 ) ( -96 -72 -40 -1.5 1.125 ) )
@@ -1821,7 +1821,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey50
+metals/steel
 ( 9 3 0 0 0 )
 (
 ( ( -240 -72 -8 0 -0.5 ) ( -176 -72 -8 0 -0.25 ) ( -176 -72 -8 0 0 ) )
diff --git a/base/maps/merchant/vector.map b/base/maps/merchant/vector.map
index c5ba14a..57f91e4 100644
--- a/base/maps/merchant/vector.map
+++ b/base/maps/merchant/vector.map
@@ -3252,7 +3252,7 @@ colors/grey25
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 9 3 0 0 0 )
 (
 ( ( -144 72 3.9999997616 0 0 ) ( -180 72 3.9999997616 0 -0.25 ) ( -180 72 3.9999997616 0 -0.5 ) )
@@ -3399,7 +3399,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 9 3 0 0 0 )
 (
 ( ( 0.0000002384 72 3.9999997616 0 -0.5 ) ( -16 72 3.9999997616 0 -0.25 ) ( -16 72 3.9999997616 0 0 ) )
@@ -3599,7 +3599,7 @@ common/engine
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 9 3 0 0 0 )
 (
 ( ( -144 -72 3.9999997616 0 0 ) ( -180 -72 3.9999997616 0 -0.25 ) ( -180 -72 3.9999997616 0 -0.5 ) )
@@ -3714,7 +3714,7 @@ colors/grey50
 {
 patchDef2
 {
-colors/grey25_shiny
+colors/grey25
 ( 9 3 0 0 0 )
 (
 ( ( 0.0000002384 -72 3.9999997616 0 -0.5 ) ( -16 -72 3.9999997616 0 -0.25 ) ( -16 -72 3.9999997616 0 0 ) )