diff --git a/data/styles/colors_normal.mapcss b/data/styles/colors_normal.mapcss
new file mode 100644
index 0000000000..f47174e666
--- /dev/null
+++ b/data/styles/colors_normal.mapcss
@@ -0,0 +1,138 @@
+@background: #f1eee8;
+@water: #b9d4d4;
+@border_country_z4: #ffa090;
+@border_country_z5: #ff775b;
+@light_yellow: #eeeedd;
+@light_gray: #a0a0a0;
+@border_state: yellow;
+@border_country_z6: #d9775b;
+@gray90: #909090;
+@border: #f9574b;
+@natpark: #4ef94b;
+@farm: #dfdf97;
+@greenfill: #d0e8c4;
+@forest: #b2d6a5;
+@industrial: #ddddcc;
+@parking: #f8f8d8;
+@military: #d0d050;
+@conservation: #cfeca8;
+@residential_generic: #ede8d2;
+@residential_urban: #eeeeee;
+@residential_rural: #ffffcc;
+@retail: #f8ecec;
+@graye4: #e4e4e4;
+@landfill: #e9dd72;
+@vineyard: #d1ead1;
+@garages: #e1e1e5;
+@addr_z16: #808070;
+@dark_gray_40: #404040;
+@dark_gray_20: #202020;
+@white: white;
+@glacier: lightblue;
+@beach: #eecc55;
+@aerodrome: #d8dcce;
+@ferry_line: #98b8e8;
+@park_green: #cfecb7;
+@school_fill: #f0e0dc;
+@aeroway: #d4dcbd;
+@aero_terminal: #d4c894;
+@gray: grey;
+@park_name: #5ca800;
+@power_fill: #bebebe;
+@hw_construction: #d0d0d0;
+@airport_name: #005be2;
+@hw_primary_trunk: #303030;
+@building_fill: #cdcdb4;
+@comm_line: #f080f0;
+@ferry_z16: #a8c8d8;
+@gray70: #707070;
+@grayb0: #b0b0b0;
+@red: red;
+@piste_nordic: #c00000;
+@gray50: #505050;
+@piste_downhill_freeride: #f6dd0a;
+@piste_downhill_interm: #ff4040;
+@alpine_hiking: blue;
+@piste_downhill_novice: #40ff40;
+@piste_downhill_expert: #f6800a;
+@station_name: #3050d8;
+@ford_casing: #101010;
+@rope_tow: #d8d8c4;
+@continent_name: #808078;
+@gray60: #606060;
+@state_name: #c0c0b0;
+@country_name: #a0a090;
+@country_name_z7: #909080;
+@state_name_z8: #b0b0a8;
+@country_name_z8: #b0b0a0;
+@village_fill: #dddac9;
+@tram_line: #e6b7e6;
+@monorail_line: #4c0f4c;
+@tram_monorail_dash: #590959;
+@subway_line: #0f0f4c;
+@subway_red: #dd0000;
+@subway_blue: #072889;
+@subway_purple: #8b509c;
+@subway_orange: #ff7700;
+@subway_green: #006600;
+@subway_brown: #bb7700;
+@subway_yellow: #f7c600;
+@station_name_halo: #f8fcff;
+@rail_z12: silver;
+@light_rail_z12: #90d090;
+@abandoned_rail: #b2b2b2;
+@monorail_z12: #d08080;
+@light_rail_z14: #095909;
+@rail_z14_base: #e6e6e6;
+@rail_z14: #888888;
+@funicular_z14: #590909;
+@disused_rail: #f2f2f2;
+@light_rail: #b7e6e6;
+@railway_spur_z14: #ececec;
+@funicular: #e6b7b7;
+@rail_z15: #333333;
+@rail_z15_base: #666666;
+@light_rail_z15: #0f4c0f;
+@funicular_z15: #4c0f0f;
+@razed_rail: #c2c2c2;
+@railway_platform: #bbbbbb;
+@highway_casing: #b5944c;
+@highway_minor_casing: #c8c8af;
+@highway_trunk_z7: #eed4a6;
+@highway_motorway_z7: #efbb6e;
+@highway_trunk_z8: #f7d396;
+@highway_motorway_z8: #ef9721;
+@highway_trunk: #ffc444;
+@highway_motorway: #f08800;
+@highway_secondary: #fffb80;
+@highway_track: #c0a87c;
+@highway_primary: #fde066;
+@hw_motorway_casing: #b87c04;
+@hw_trunk_primary_casing: #d8a050;
+@highway_tertiary: #ffff90;
+@hw_secondary_tertiary_casing: #c8c860;
+@highway_raceway: #e8e4d4;
+@highway_bridleway_z13: #a9d355;
+@highway_path: #d79331;
+@cycleway_z14: #4dbf4d;
+@highway_bridleway_z14: #8fbf4d;
+@footway: #d0ccbc;
+@highway_pedestrian: #b9ba95;
+@highway_bridleway: #d3cb98;
+@highway_byway_fill: #efadaa;
+@highway_service_z15: #fdfdfd;
+@highway_footway_fill: #f8f0e8;
+@cycleway: #90bc90;
+@highway_steps: #d0ccac;
+@uk_motorway: #8ac;
+@uk_trunk: #9d9;
+@uk_primary: #d99;
+@uk_secondary: #fda;
+@pitch_fill: #ddb298;
+@sea_name: #4976d1;
+@wetland_fill: #a0c3b8;
+@water_name: #507cea;
+@waterway_lock: #f8f8f8;
+@waterway_weir: #000044;
+@lake_name: #5070d0;
+@waterfall_name: #0000ff;
diff --git a/data/styles/include/base_boundaries.mapcss b/data/styles/include/base_boundaries.mapcss
index c8ae45a3fc..d71dbbc3eb 100644
--- a/data/styles/include/base_boundaries.mapcss
+++ b/data/styles/include/base_boundaries.mapcss
@@ -1,6 +1,6 @@
 line|z4[boundary=administrative][admin_level=2]
 {
-  color: #ffa090;
+  color: @border_country_z4;
   width: 1;
   z-index: 400;
   dashes: 3.12,3.12;
@@ -9,7 +9,7 @@ line|z4[boundary=administrative][admin_level=2]
 }
 line|z5[boundary=administrative][admin_level=2]
 {
-  color: #ff775b;
+  color: @border_country_z5;
   width: 1;
   z-index: 400;
   dashes: 3.12,3.12;
@@ -19,14 +19,14 @@ line|z5[boundary=administrative][admin_level=2]
 line|z5-8[boundary=administrative][admin_level=4]::d2p2,
 line|z4-8[boundary=administrative][admin_level=4][border_type=state]::d3p2
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 1;
   z-index: 120;
   -x-kot-layer: top;
 }
 line|z4-[boundary=administrative][admin_level=3]
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 1;
   z-index: 123;
   dashes: 1,1;
@@ -35,27 +35,27 @@ line|z4-[boundary=administrative][admin_level=3]
 }
 line|z6[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 1;
   z-index: 123;
   -x-kot-layer: top;
 }
 line|z6[boundary=administrative][border_type=state]
 {
-  color: yellow;
+  color: @border_state;
   width: 1;
   z-index: 55;
 }
 line|z6-[boundary=administrative][admin_level=3]::d2p2
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 1;
   z-index: 122;
   -x-kot-layer: top;
 }
 line|z6[boundary=administrative][admin_level=2]
 {
-  color: #d9775b;
+  color: @border_country_z6;
   width: 1;
   z-index: 124;
   dashes: 3.12,3.12;
@@ -64,7 +64,7 @@ line|z6[boundary=administrative][admin_level=2]
 }
 line|z4-6[boundary=administrative][admin_level=4]
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 0.2;
   z-index: 121;
   dashes: 0.3,0.6;
@@ -73,14 +73,14 @@ line|z4-6[boundary=administrative][admin_level=4]
 }
 line|z7[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 2.73;
   z-index: 124;
   -x-kot-layer: top;
 }
 line|z7-8[boundary=administrative][admin_level=4]
 {
-  color: #909090;
+  color: @gray90;
   width: 0.7;
   z-index: 121;
   dashes: 0.3,0.6;
@@ -89,7 +89,7 @@ line|z7-8[boundary=administrative][admin_level=4]
 }
 line|z7[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   width: 2;
   z-index: 125;
   dashes: 5,5;
@@ -98,13 +98,13 @@ line|z7[boundary=administrative][admin_level=2]::d2p2
 }
 line|z7[boundary=administrative][border_type=state]
 {
-  color: yellow;
+  color: @border_state;
   width: 0.62;
   z-index: 56;
 }
 line|z7[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   width: 0.12;
   z-index: 57;
   dashes: 0.62,0.12,0.12,0.12;
@@ -112,13 +112,13 @@ line|z7[boundary=administrative][border_type=state]::d2p2
 }
 line|z8[boundary=administrative][border_type=state]
 {
-  color: yellow;
+  color: @border_state;
   width: 1.25;
   z-index: 63;
 }
 line|z8-11[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   width: 2.34;
   z-index: 125;
   dashes: 3.12,3.12;
@@ -127,7 +127,7 @@ line|z8-11[boundary=administrative][admin_level=2]::d2p2
 }
 line|z8[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   width: 0.25;
   z-index: 64;
   dashes: 1.25,0.25,0.25,0.25;
@@ -136,20 +136,20 @@ line|z8[boundary=administrative][border_type=state]::d2p2
 }
 line|z8-11[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 3.12;
   z-index: 124;
   -x-kot-layer: top;
 }
 line|z9[boundary=administrative][admin_level=4]::d2p2
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 1.2;
   -x-kot-layer: top;
 }
 line|z9[boundary=administrative][admin_level=4]
 {
-  color: #909090;
+  color: @gray90;
   width: 1;
   z-index: 12;
   dashes: 0.3,0.6;
@@ -158,13 +158,13 @@ line|z9[boundary=administrative][admin_level=4]
 }
 line|z9[boundary=administrative][border_type=state]
 {
-  color: yellow;
+  color: @border_state;
   width: 1;
   z-index: 63;
 }
 line|z9[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   width: 0.5;
   z-index: 64;
   dashes: 2.5,0.5,0.5,0.5;
@@ -172,20 +172,20 @@ line|z9[boundary=administrative][border_type=state]::d2p2
 }
 line|z10-11[boundary=administrative][admin_level=4]::d2p2,
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 2;
   z-index: 401;
   -x-kot-layer: top;
 }
 line|z10[boundary=administrative][border_type=state]
 {
-  color: yellow;
+  color: @border_state;
   width: 5;
   z-index: 152;
 }
 line|z10-11[boundary=administrative][admin_level=4]
 {
-  color: #909090;
+  color: @gray90;
   linecap: butt;
   -x-kot-layer: top;
   width: 1.5;
@@ -194,7 +194,7 @@ line|z10-11[boundary=administrative][admin_level=4]
 }
 line|z10[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   width: 1;
   z-index: 153;
   dashes: 5,1,1,1;
@@ -202,7 +202,7 @@ line|z10[boundary=administrative][border_type=state]::d2p2
 }
 line|z10[boundary=national_park]
 {
-  color: #4ef94b;
+  color: @natpark;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -211,7 +211,7 @@ line|z10[boundary=national_park]
 }
 line|z11[boundary=administrative][border_type=state],
 {
-  color: #f9574b;
+  color: @border;
   width: 2;
   z-index: 153;
   dashes: 10,2,2,2;
@@ -219,7 +219,7 @@ line|z11[boundary=administrative][border_type=state],
 }
 line|z11[boundary=national_park]
 {
-  color: #4ef94b;
+  color: @natpark;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -228,14 +228,14 @@ line|z11[boundary=national_park]
 }
 line|z12[boundary=administrative][type=nation]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 414;
   -x-kot-layer: top;
 }
 line|z12[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -244,7 +244,7 @@ line|z12[boundary=administrative][border_type=country]::d2p2
 }
 line|z12[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -253,7 +253,7 @@ line|z12[boundary=administrative][border_type=region]
 }
 line|z12-[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -262,21 +262,21 @@ line|z12-[boundary=administrative][border_type=state]
 }
 line|z12[boundary=administrative][border_type=country]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 415;
   -x-kot-layer: top;
 }
 line|z12[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 6;
   z-index: 409;
   -x-kot-layer: top;
 }
 line|z12[boundary=national_park]
 {
-  color: #4ef94b;
+  color: @natpark;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -285,7 +285,7 @@ line|z12[boundary=national_park]
 }
 line|z12[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -294,7 +294,7 @@ line|z12[boundary=administrative][admin_level=2]::d2p2
 }
 line|z12[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -303,7 +303,7 @@ line|z12[boundary=administrative][type=nation]::d2p2
 }
 line|z13[boundary=national_park]
 {
-  color: #4ef94b;
+  color: @natpark;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -312,14 +312,14 @@ line|z13[boundary=national_park]
 }
 line|z13[boundary=administrative][border_type=country]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 440;
   -x-kot-layer: top;
 }
 line|z13[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -328,7 +328,7 @@ line|z13[boundary=administrative][border_type=region]
 }
 line|z13[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -337,14 +337,14 @@ line|z13[boundary=administrative][border_type=country]::d2p2
 }
 line|z13[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 6;
   z-index: 433;
   -x-kot-layer: top;
 }
 line|z13[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -353,7 +353,7 @@ line|z13[boundary=administrative][type=nation]::d2p2
 }
 line|z13[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -362,14 +362,14 @@ line|z13[boundary=administrative][admin_level=2]::d2p2
 }
 line|z13[boundary=administrative][type=nation]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 439;
   -x-kot-layer: top;
 }
 line|z14[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -378,21 +378,21 @@ line|z14[boundary=administrative][admin_level=6]
 }
 line|z14[boundary=administrative][type=nation]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 532;
   -x-kot-layer: top;
 }
 line|z14[boundary=administrative][border_type=country]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 533;
   -x-kot-layer: top;
 }
 line|z14[boundary=national_park]
 {
-  color: #4ef94b;
+  color: @natpark;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -401,7 +401,7 @@ line|z14[boundary=national_park]
 }
 line|z14[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -410,7 +410,7 @@ line|z14[boundary=administrative][admin_level=5]
 }
 line|z14[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -419,14 +419,14 @@ line|z14[boundary=administrative][type=nation]::d2p2
 }
 line|z14[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 6;
   z-index: 525;
   -x-kot-layer: top;
 }
 line|z14[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -435,7 +435,7 @@ line|z14[boundary=administrative][border_type=country]::d2p2
 }
 line|z14[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -444,7 +444,7 @@ line|z14[boundary=administrative][border_type=region]
 }
 line|z14[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -453,7 +453,7 @@ line|z14[boundary=administrative][border_type=county]
 }
 line|z14[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -462,7 +462,7 @@ line|z14[boundary=administrative][admin_level=2]::d2p2
 }
 line|z15[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -471,7 +471,7 @@ line|z15[boundary=administrative][border_type=county]
 }
 line|z15[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -480,7 +480,7 @@ line|z15[boundary=administrative][admin_level=2]::d2p2
 }
 line|z15[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -489,7 +489,7 @@ line|z15[boundary=administrative][admin_level=5]
 }
 line|z15[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -498,7 +498,7 @@ line|z15[boundary=administrative][border_type=region]
 }
 line|z15[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -506,14 +506,14 @@ line|z15[boundary=administrative][admin_level=8]
 }
 line|z15[boundary=administrative][admin_level=7]
 {
-  color: #f9574b;
+  color: @border;
   width: 1;
   z-index: 674;
   -x-kot-layer: top;
 }
 line|z15[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -522,7 +522,7 @@ line|z15[boundary=administrative][border_type=city]
 }
 line|z15[boundary=national_park]
 {
-  color: #4ef94b;
+  color: @natpark;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -531,14 +531,14 @@ line|z15[boundary=national_park]
 }
 line|z15[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 6;
   z-index: 679;
   -x-kot-layer: top;
 }
 line|z15[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -547,14 +547,14 @@ line|z15[boundary=administrative][admin_level=10]
 }
 line|z15[boundary=administrative][type=nation]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 690;
   -x-kot-layer: top;
 }
 line|z15[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -563,7 +563,7 @@ line|z15[boundary=administrative][admin_level=6]
 }
 line|z15[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -572,7 +572,7 @@ line|z15[boundary=administrative][border_type=country]::d2p2
 }
 line|z15[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -581,7 +581,7 @@ line|z15[boundary=administrative][admin_level=9]
 }
 line|z15[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -590,7 +590,7 @@ line|z15[boundary=administrative][border_type=suburb]
 }
 line|z15[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -599,14 +599,14 @@ line|z15[boundary=administrative][type=nation]::d2p2
 }
 line|z15[boundary=administrative][border_type=country]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 691;
   -x-kot-layer: top;
 }
 line|z15[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -615,7 +615,7 @@ line|z15[boundary=administrative][border_type=municipality]
 }
 line|z16[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -625,14 +625,14 @@ line|z16[boundary=administrative][admin_level=5]
 line|z16[boundary=administrative][admin_level=2],
 line|z16[boundary=administrative][border_type=country]
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 6;
   z-index: 933;
   -x-kot-layer: top;
 }
 line|z16[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -641,7 +641,7 @@ line|z16[boundary=administrative][admin_level=10]
 }
 line|z16[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -650,7 +650,7 @@ line|z16[boundary=administrative][border_type=country]::d2p2
 }
 line|z16[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -659,7 +659,7 @@ line|z16[boundary=administrative][border_type=region]
 }
 line|z16[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -668,7 +668,7 @@ line|z16[boundary=administrative][border_type=county]
 }
 line|z16[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -678,7 +678,7 @@ line|z16[boundary=administrative][admin_level=8]
 
 line|z16[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -687,7 +687,7 @@ line|z16[boundary=administrative][admin_level=6]
 }
 line|z16[boundary=national_park]
 {
-  color: #4ef94b;
+  color: @natpark;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -696,7 +696,7 @@ line|z16[boundary=national_park]
 }
 line|z16[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -705,7 +705,7 @@ line|z16[boundary=administrative][border_type=suburb]
 }
 line|z16[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -714,7 +714,7 @@ line|z16[boundary=administrative][admin_level=2]::d2p2
 }
 line|z16[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -723,14 +723,14 @@ line|z16[boundary=administrative][type=nation]::d2p2
 }
 line|z16[boundary=administrative][admin_level=7]
 {
-  color: #f9574b;
+  color: @border;
   width: 1;
   z-index: 930;
   -x-kot-layer: top;
 }
 line|z16[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -739,7 +739,7 @@ line|z16[boundary=administrative][border_type=municipality]
 }
 line|z16[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -748,14 +748,14 @@ line|z16[boundary=administrative][border_type=city]
 }
 line|z16[boundary=administrative][type=nation]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 942;
   -x-kot-layer: top;
 }
 line|z16[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -764,14 +764,14 @@ line|z16[boundary=administrative][admin_level=9]
 }
 line|z17-[boundary=administrative][admin_level=7]
 {
-  color: #f9574b;
+  color: @border;
   width: 0.8;
   z-index: 965;
   -x-kot-layer: top;
 }
 line|z17-[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -780,7 +780,7 @@ line|z17-[boundary=administrative][border_type=county]
 }
 line|z17-[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -789,7 +789,7 @@ line|z17-[boundary=administrative][type=nation]::d2p2
 }
 line|z17-[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -798,7 +798,7 @@ line|z17-[boundary=administrative][admin_level=2]::d2p2
 }
 line|z17-[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -807,14 +807,14 @@ line|z17-[boundary=administrative][border_type=country]::d2p2
 }
 line|z17-[boundary=administrative][type=nation]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 976;
   -x-kot-layer: top;
 }
 line|z17-[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -823,7 +823,7 @@ line|z17-[boundary=administrative][border_type=suburb]
 }
 line|z17-[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -832,7 +832,7 @@ line|z17-[boundary=administrative][admin_level=9]
 }
 line|z17-[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -841,7 +841,7 @@ line|z17-[boundary=administrative][admin_level=5]
 }
 line|z17-[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -850,7 +850,7 @@ line|z17-[boundary=administrative][admin_level=6]
 }
 line|z17-[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -859,7 +859,7 @@ line|z17-[boundary=administrative][border_type=city]
 }
 line|z17-[boundary=administrative][admin_level=11]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -868,7 +868,7 @@ line|z17-[boundary=administrative][admin_level=11]
 }
 line|z17-[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 0.8;
@@ -877,7 +877,7 @@ line|z17-[boundary=administrative][admin_level=10]
 }
 line|z17-[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -886,7 +886,7 @@ line|z17-[boundary=administrative][border_type=region]
 }
 line|z17-[boundary=national_park]
 {
-  color: #4ef94b;
+  color: @natpark;
   linecap: butt;
   -x-kot-layer: top;
   width: 2;
@@ -895,7 +895,7 @@ line|z17-[boundary=national_park]
 }
 line|z17-[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -904,7 +904,7 @@ line|z17-[boundary=administrative][border_type=municipality]
 }
 line|z17-[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
+  color: @border;
   linecap: butt;
   -x-kot-layer: top;
   width: 1;
@@ -913,14 +913,14 @@ line|z17-[boundary=administrative][admin_level=8]
 }
 line|z17-[boundary=administrative][border_type=country]
 {
-  color: yellow;
+  color: @border_state;
   width: 6;
   z-index: 977;
   -x-kot-layer: top;
 }
 line|z17-[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
+  color: @light_yellow;
   width: 6;
   -x-kot-layer: top;
 }
diff --git a/data/styles/include/base_landuse.mapcss b/data/styles/include/base_landuse.mapcss
index 2ac3168061..53df235318 100644
--- a/data/styles/include/base_landuse.mapcss
+++ b/data/styles/include/base_landuse.mapcss
@@ -7,25 +7,25 @@ area[leisure],
 
 area[natural=coastline]
 {
-  fill-color: #B9D4D4;
+  fill-color: @water;
   z-index: -10;
 }
 
 area|z6-11[natural=land]
 {
-  fill-color: #EEEEDD;
+  fill-color: @light_yellow;
   z-index: -9;
 }
 area|z12-[natural=land]
 {
-  fill-color: #EEEEDD;
+  fill-color: @light_yellow;
   z-index: -9;
 }
 
 area|z12-[landuse=farm],
 area|z12-[landuse=farmland]
 {
-  fill-color: #DFDF97;
+  fill-color: @farm;
 }
 area|z13-[amenity=grave_yard],
 area|z12-[landuse=allotments],
@@ -39,12 +39,12 @@ area|z12-[landuse=village_green],
 area|z12-[natural=scrub],
 area|z12-[natural=grassland],
 {
-  fill-color: #d0e8c4;
+  fill-color: @greenfill;
 }
 area|z10-[natural=wood],
 area|z10-[landuse=forest],
 {
-  fill-color: #B2D6A5;
+  fill-color: @forest;
 }
 area|z11-[aeroway=apron],
 area|z12-[landuse=brownfield],
@@ -56,64 +56,64 @@ area|z12-[landuse=industrial],
 area|z12-[landuse=quarry],
 area|z12-[landuse=railway],
 {
-  fill-color: #DDDDCC;
+  fill-color: @industrial;
   z-index: 1;
 }
 area|z12-[landuse=commercial],
 area|z12-[natural=heath]
 {
-  fill-color: #f8f8d8;
+  fill-color: @parking;
   z-index: 2;
 }
 area|z12-[landuse=military]
 {
-  fill-color: #d0d050;
+  fill-color: @military;
   z-index: 10;
 }
 area|z12-[landuse=conservation]
 {
-  fill-color: #cfeca8;
+  fill-color: @conservation;
   z-index: 1;
 }
 area|z12-[landuse=residential]
 {
-  fill-color: #ede8d2;
+  fill-color: @residential_generic;
   z-index: -2;
 }
 area|z12-[landuse=residential][residential=urban]
 {
-  fill-color: #eeeeee;
+  fill-color: @residential_urban;
   z-index: -1;
 }
 area|z12-[landuse=residential][residential=rural]
 {
-  fill-color: #FFFFCC;
+  fill-color: @residential_rural;
   z-index: -1;
 }
 area|z12-[landuse=retail]
 {
-  fill-color: #f8ecec;
+  fill-color: @retail;
   z-index: 3;
 }
 area|z13-[landuse=farmyard]
 {
-  fill-color: #e4e4e4;
+  fill-color: @graye4;
   z-index: 1;
 }
 area|z13-[landuse=landfill],
 area|z13-[landuse=quarry]
 {
-  fill-color: #e9dd72;
+  fill-color: @landfill;
   z-index: 1;
 }
 area|z13-[landuse=vineyard]
 {
-  fill-color: #d1ead1;
+  fill-color: @vineyard;
   z-index: 2;
 }
 area|z15-[landuse=garages]
 {
-  fill-color: #e1e1e5;
+  fill-color: @garages;
   z-index: 4;
 }
 area|z15-16[landuse=construction],
@@ -121,14 +121,14 @@ node|z15-16[landuse=construction]
 {
   text: name;
   font-size: 12;
-  text-color: #808070;
+  text-color: @addr_z16;
 }
 area|z17-[landuse=construction],
 node|z17-[landuse=construction]
 {
   text: name;
   font-size: 14;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 area|z17-[aeroway=gate],
 node|z17-[aeroway=gate],
@@ -172,7 +172,7 @@ area|z15[natural=wood],
 {
   text: name;
   font-size: 12;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 
 area|z16-[landuse=forest],
@@ -190,8 +190,8 @@ node|z16-[amenity=townhall],
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: white;
+  text-color: @dark_gray_40;
+  text-halo-color: @white;
 }
 
 area|z16-[landuse=allotments],
@@ -265,20 +265,20 @@ node|z16-[natural=wood],
 {
   text: name;
   font-size: 16;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 
 area|z10-[natural=glacier]
 {
-  fill-color: lightblue;
+  fill-color: @glacier;
 }
 
 area|z14-[natural=beach]
 {
-  fill-color: #eecc55;
+  fill-color: @beach;
   text: name;
   font-size: 11;
-  text-color: #202020;
+  text-color: @dark_gray_20;
   text-halo-radius: 1;
-  text-halo-color: #eecc55;
+  text-halo-color: @beach;
 }
diff --git a/data/styles/include/base_other.mapcss b/data/styles/include/base_other.mapcss
index 2c6a2c667e..1a68981930 100644
--- a/data/styles/include/base_other.mapcss
+++ b/data/styles/include/base_other.mapcss
@@ -7,7 +7,7 @@ way::*
 
 *::*
 {
-  text-halo-color: white;
+  text-halo-color: @white;
   text-anchor-horizontal: center;
   text-anchor-vertical: center;
   icon-width: 16;
@@ -64,11 +64,11 @@ node|z12-[aeroway=aerodrome]
 }
 area|z11-[aeroway=aerodrome]
 {
-  fill-color: #d8dcce;
+  fill-color: @aerodrome;
 }
 line|z10-11[route=ferry]
 {
-  color: #98b8e8;
+  color: @ferry_line;
   width: 1;
   z-index: 147;
   dashes: 3,2;
@@ -86,43 +86,43 @@ area|z12-[tourism=caravan_site],
 area|z12-[tourism=picnic_site],
 area|z12-[tourism=zoo]
 {
-  fill-color: #cfecb7;
+  fill-color: @park_green;
 }
 area|z13-[amenity=college],
 area|z13-[amenity=kindergarten],
 area|z13-[amenity=school],
 area|z13-[amenity=university]
 {
-  fill-color: #f0e0dc;
+  fill-color: @school_fill;
 }
 area|z15-[amenity=parking][!access],
 area|z15-[amenity=parking][access?]
 {
-  fill-color: #f8f8d8;
+  fill-color: @parking;
   fill-position: background;
 }
 line|z12[aeroway=runway]
 {
   casing-linecap: butt;
-  color: #d4dcbd;
+  color: @aeroway;
   linecap: butt;
   width: 2;
   z-index: 230;
   linejoin: bevel;
   casing-linejoin: bevel;
   casing-width: 0.5;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z12[man_made=cutline]
 {
-  color: #f1eee8;
+  color: @background;
   width: 1;
   z-index: 184;
   linecap: butt;
 }
 line|z13[man_made=cutline]
 {
-  color: #f1eee8;
+  color: @background;
   width: 2;
   z-index: 184;
   linecap: butt;
@@ -131,14 +131,14 @@ line|z13[man_made=cutline]
 line|z12[aeroway=taxiway]
 {
   casing-linecap: butt;
-  color: #d4dcbd;
+  color: @aeroway;
   linecap: butt;
   width: 0.5;
   z-index: 231;
   linejoin: bevel;
   casing-linejoin: bevel;
   casing-width: 0.12;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 area|z13-[amenity=college],
 area|z13-[amenity=kindergarten],
@@ -149,7 +149,7 @@ area|z13-[amenity=university]
 }
 line|z12[route=ferry]
 {
-  color: #98b8e8;
+  color: @ferry_line;
   width: 1;
   z-index: 389;
   dashes: 3,2;
@@ -162,7 +162,7 @@ node|z12-[natural=volcano]
 }
 area|z12-[aeroway=terminal]
 {
-  fill-color: #d4c894;
+  fill-color: @aero_terminal;
 }
 area|z12-13[natural=peak],
 node|z12-13[natural=peak],
@@ -179,11 +179,11 @@ node|z13[aeroway=aerodrome]
   text-offset: 10;
   text: name;
   font-size: 12;
-  text-color: grey;
+  text-color: @gray;
 }
 line|z13[route=ferry]
 {
-  color: #98b8e8;
+  color: @ferry_line;
   width: 1;
   z-index: 411;
   dashes: 3,2;
@@ -192,14 +192,14 @@ line|z13[route=ferry]
 line|z13[aeroway=runway]
 {
   casing-linecap: butt;
-  color: #d4dcbd;
+  color: @aeroway;
   linecap: butt;
   width: 2.5;
   z-index: 240;
   linejoin: bevel;
   casing-linejoin: bevel;
   casing-width: 0.5;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 area|z13-15[natural=peak],
 node|z13-15[natural=peak],
@@ -211,19 +211,19 @@ node|z13-15[natural=bare_rock],
   text-offset: 10;
   text: name;
   font-size: 12;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 line|z13[aeroway=taxiway]
 {
   casing-linecap: butt;
-  color: #d4dcbd;
+  color: @aeroway;
   linecap: butt;
   width: 1;
   z-index: 241;
   linejoin: bevel;
   casing-linejoin: bevel;
   casing-width: 0.25;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 area|z17-[amenity=shelter],
 area|z17-[amenity=school],
@@ -234,8 +234,8 @@ node|z17-[amenity=school]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: white;
+  text-color: @dark_gray_40;
+  text-halo-color: @white;
 }
 node|z13-[highway=motorway_junction]
 {
@@ -247,22 +247,22 @@ area|z17-[leisure=park]::int_name
   font-size: 11;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #404040;
-  text-halo-color: white;
+  text-color: @dark_gray_40;
+  text-halo-color: @white;
 }
 area|z13-14[leisure=park],
 node|z13-14[leisure=park]
 {
   text: name;
   font-size: 12;
-  text-color: #5ca800;
+  text-color: @park_name;
 }
 area|z13-14[leisure=park]::int_name,
 node|z13-14[leisure=park]::int_name
 {
   text: int_name;
   font-size: 11;
-  text-color: #5ca800;
+  text-color: @park_name;
 }
 area|z14-15[natural=volcano],
 node|z14-15[natural=volcano],
@@ -274,7 +274,7 @@ area|z14-15[natural=cape],
   text-offset: 10;
   text: name;
   font-size: 12;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 area|z14-[natural=peak],
 node|z14-[natural=peak],
@@ -287,7 +287,7 @@ node|z14-[natural=bare_rock],
 }
 area|z14-[man_made=pier]
 {
-  fill-color: #f1eee8;
+  fill-color: @background;
   z-index: 488;
 }
 area|z16-[amenity=ferry_terminal],
@@ -297,7 +297,7 @@ node|z16-[amenity=ferry_terminal]
 }
 line|z14[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
+  color: @graye4;
   width: 0.6;
   z-index: 488;
 }
@@ -319,18 +319,18 @@ node|z14-[earthquake:damage=spontaneous_camp]
 line|z14[aeroway=runway]
 {
   casing-linecap: butt;
-  color: #d4dcbd;
+  color: @aeroway;
   linecap: butt;
   width: 10;
   z-index: 314;
   linejoin: bevel;
   casing-linejoin: bevel;
   casing-width: 2;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z14[route=ferry]
 {
-  color: #98b8e8;
+  color: @ferry_line;
   width: 1;
   z-index: 499;
   dashes: 3,2;
@@ -344,12 +344,12 @@ node|z14-[tourism=alpine_hut],
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: white;
+  text-color: @dark_gray_40;
+  text-halo-color: @white;
 }
 line|z14[man_made=cutline]
 {
-  color: #f1eee8;
+  color: @background;
   width: 4;
   z-index: 247;
   linecap: butt;
@@ -366,7 +366,7 @@ node|z14-[power=generator]
 }
 line|z12-[mapswithme=grid]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 4;
   dashes: 1,1;
   linecap: butt;
@@ -376,11 +376,11 @@ area|z14-[power=station],
 area|z14-[power=sub_station],
 node|z14-[power=generator]
 {
-  fill-color: #bebebe;
+  fill-color: @power_fill;
 }
 line|z14[man_made=pier]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 0.8;
 }
 area|z12-[aeroway=airport],
@@ -391,8 +391,8 @@ node|z12-[aeroway=aerodrome]
   font-size: 10;
   text-halo-radius: 2;
   text: name;
-  text-color: #005BE2;
-  text-halo-color: white;
+  text-color: @airport_name;
+  text-halo-color: @white;
   text-offset: 10;
   text-position: point;
 }
@@ -404,8 +404,8 @@ node|z12-[aeroway=aerodrome]::int_name,
   font-size: 9;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #005BE2;
-  text-halo-color: white;
+  text-color: @airport_name;
+  text-halo-color: @white;
   text-offset: 10;
 }
 area|z13-14[aeroway=airport],
@@ -455,18 +455,18 @@ node|z14-[power=generator][power_source=wind]::d2p2
 line|z14[aeroway=taxiway]
 {
   casing-linecap: butt;
-  color: #d4dcbd;
+  color: @aeroway;
   linecap: butt;
   width: 4;
   z-index: 315;
   linejoin: bevel;
   casing-linejoin: bevel;
   casing-width: 1;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z14[man_made=pier]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 0.1;
   z-index: 486;
 }
@@ -475,13 +475,13 @@ node|z16-[highway=motorway_junction]::d1p1
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
-  text-halo-color: white;
+  text-color: @dark_gray_20;
+  text-halo-color: @white;
   text-position: center;
 }
 line|z15-16[man_made=cutline]
 {
-  color: #f1eee8;
+  color: @background;
   width: 5;
 }
 area|z16[building],
@@ -491,12 +491,12 @@ node|z16[addr:housenumber][addr:street]
 {
   text: "addr:housenumber";
   font-size: 10;
-  text-color: #808070;
+  text-color: @addr_z16;
   text-position: center;
 }
 line|z15[route=ferry]
 {
-  color: #98b8e8;
+  color: @ferry_line;
   width: 1;
   z-index: 643;
   dashes: 7,5;
@@ -529,21 +529,21 @@ node|z15-[tourism=artwork],
 line|z15-[aeroway=runway]
 {
   casing-linecap: butt;
-  color: #d4dcbd;
+  color: @aeroway;
   linecap: butt;
   width: 20;
   linejoin: bevel;
   casing-linejoin: bevel;
   casing-width: 4;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 node|z15-[tourism=attraction]
 {
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
-  text-halo-color: white;
+  text-color: @hw_primary_trunk;
+  text-halo-color: @white;
 }
 area|z15-[aeroway=helipad],
 node|z15-[aeroway=helipad]
@@ -556,8 +556,8 @@ node|z15-[leisure=park]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #5ca800;
-  text-halo-color: white;
+  text-color: @park_name;
+  text-halo-color: @white;
 }
 area|z15-[leisure=park]::int_name,
 node|z15-[leisure=park]::int_name
@@ -565,36 +565,36 @@ node|z15-[leisure=park]::int_name
   font-size: 11;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #5ca800;
-  text-halo-color: white;
+  text-color: @park_name;
+  text-halo-color: @white;
 }
 line|z15-[aeroway=taxiway]
 {
   casing-linecap: butt;
-  color: #d4dcbd;
+  color: @aeroway;
   linecap: butt;
   width: 8;
   z-index: 415;
   linejoin: bevel;
   casing-linejoin: bevel;
   casing-width: 2;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z15[man_made=pier]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 0.2;
   z-index: 630;
 }
 line|z15[man_made=pier]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 1.6;
   z-index: 631;
 }
 line|z15[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
+  color: @graye4;
   width: 1.2;
   z-index: 632;
 }
@@ -623,11 +623,11 @@ node|z15-[leisure=nature_reserve]
 area|z15-[building],
 node|z15-[building]
 {
-  fill-color: #cdcdb4;
+  fill-color: @building_fill;
 }
 line|z16[communication=line]
 {
-  color: #f080f0;
+  color: @comm_line;
   width: 0.4;
   z-index: 873;
   dashes: 8,4;
@@ -640,7 +640,7 @@ node|z16-[amenity=bureau_de_change]
 }
 line|z16[man_made=pipeline][location=overground]
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 0.8;
   z-index: 875;
   dashes: 8,4;
@@ -653,7 +653,7 @@ node|z16-[amenity=restaurant]
 }
 line|z16[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
+  color: @graye4;
   width: 2.4;
   z-index: 857;
 }
@@ -673,9 +673,9 @@ node|z17-[internet_access],
   font-size: 11;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color: @dark_gray_40;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
   z-index: 1;
 }
 
@@ -701,7 +701,7 @@ node|z16[building]::int_name
 {
   text: int_name;
   font-size: 11;
-  text-color: #808070;
+  text-color: @addr_z16;
 }
 area|z16-[amenity=fast_food],
 node|z16-[amenity=fast_food]
@@ -729,11 +729,11 @@ node|z16-[natural=bare_rock],
   text-offset: 10;
   text: name;
   font-size: 16;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 line|z16[route=ferry]
 {
-  color: #a8c8d8;
+  color: @ferry_z16;
   width: 2;
   z-index: 877;
   dashes: 12,8;
@@ -746,7 +746,7 @@ node|z16-[amenity=bicycle_rental]
 }
 line|z16[power=minor_line]
 {
-  color: white;
+  color: @white;
   width: 1.6;
   z-index: 862;
   opacity: 0.5;
@@ -790,7 +790,7 @@ area|z16-[natural=cape],
   text-offset: 10;
   text: name;
   font-size: 16;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 line|z16[barrier=bollard],
 node|z16[barrier=block],
@@ -799,12 +799,12 @@ node|z16[barrier=stile],
 node|z16[barrier=toll_booth]
 {
   symbol-shape: circle;
-  symbol-fill-color: #707070;
+  symbol-fill-color: @gray70;
   symbol-size: 1.2;
 }
 line|z16[communication=line][location=underground]
 {
-  color: #f080f0;
+  color: @comm_line;
   width: 0.4;
   z-index: 871;
   dashes: 1.2,2,1.2,2,1.2,4.4;
@@ -812,7 +812,7 @@ line|z16[communication=line][location=underground]
 }
 line|z16[man_made=pipeline]::d1p2
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 0.8;
   z-index: 876;
   dashes: 1.2,2,1.2,2,1.2,4.4;
@@ -820,7 +820,7 @@ line|z16[man_made=pipeline]::d1p2
 }
 line|z16[power=minor_line]::d1p2
 {
-  color: grey;
+  color: @gray;
   width: 0.8;
   z-index: 863;
   dashes: 1.2,2,1.2,2,1.2,4.4;
@@ -841,7 +841,7 @@ node|z17-[amenity=taxi]
 }
 line|z16[power=minor_line]::d1p3
 {
-  color: grey;
+  color: @gray;
   width: 0.8;
   z-index: 864;
   dashes: 8,4;
@@ -859,7 +859,7 @@ line|z16-[barrier=fence],
 line|z16-[barrier=hedge],
 line|z16-[historic=citywalls],
 {
-  color: #b0b0b0;
+  color: @grayb0;
   width: 1;
   z-index: 950;
 }
@@ -889,7 +889,7 @@ node|z16-[amenity=place_of_worship]
 }
 line|z16[communication=line]
 {
-  color: white;
+  color: @white;
   width: 1.6;
   z-index: 870;
   opacity: 0.5;
@@ -913,7 +913,7 @@ node|z16-[historic=ruins]
 }
 line|z16[man_made=pier]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 0.4;
   z-index: 855;
 }
@@ -931,7 +931,7 @@ node|z16-[historic=monument]
 }
 line|z16[man_made=pier]::d1p2
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 3.2;
 }
 area|z16-[historic=castle],
@@ -961,7 +961,7 @@ node|z16-[amenity=cafe]
 }
 line|z16[man_made=pipeline]
 {
-  color: white;
+  color: @white;
   width: 1.6;
   z-index: 874;
   opacity: 0.5;
@@ -998,14 +998,14 @@ node|z16-[amenity=library],
 
 line|z14-[power=line]
 {
-  color: white;
+  color: @white;
   width: 1.6;
   z-index: 858;
   opacity: 0.5;
 }
 line|z14-[power=line]::d1p2
 {
-  color: grey;
+  color: @gray;
   width: 0.8;
   z-index: 861;
   dashes: 16,8;
@@ -1018,7 +1018,7 @@ line|z14-15[power=line][location=underground]::*
 }
 line|z16-[power=line][location=underground]
 {
-  color: grey;
+  color: @gray;
   width: 0.8;
   z-index: 859;
   dashes: 2.4,4,2.4,4;
@@ -1026,14 +1026,14 @@ line|z16-[power=line][location=underground]
 }
 line|z17-[man_made=pipeline]
 {
-  color: white;
+  color: @white;
   width: 1.6;
   z-index: 947;
   opacity: 0.5;
 }
 line|z17-[communication=line]::d1p2
 {
-  color: #f080f0;
+  color: @comm_line;
   width: 0.8;
   z-index: 933;
   dashes: 8,4;
@@ -1046,12 +1046,12 @@ node|z17-[addr:housenumber][addr:street]
 {
   text: "addr:housenumber";
   font-size: 11;
-  text-color: #404040;
+  text-color: @dark_gray_40;
   text-position: center;
 }
 line|z17-[man_made=pipeline]::d1p2
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 0.8;
   z-index: 949;
   dashes: 1.2,2,1.2,2,1.2,4.4;
@@ -1059,7 +1059,7 @@ line|z17-[man_made=pipeline]::d1p2
 }
 line|z17-[man_made=pipeline][location=overground]
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 0.8;
   z-index: 948;
   dashes: 8,4;
@@ -1067,7 +1067,7 @@ line|z17-[man_made=pipeline][location=overground]
 }
 line|z17-[power=minor_line]::d1p3
 {
-  color: grey;
+  color: @gray;
   width: 0.8;
   z-index: 923;
   dashes: 8,4;
@@ -1097,14 +1097,14 @@ node|z17-[power=generator]::d1p3
 }
 line|z17-[communication=line]
 {
-  color: white;
+  color: @white;
   width: 1.6;
   z-index: 930;
   opacity: 0.5;
 }
 line|z17-[man_made=pier]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 0.4;
   z-index: 914;
 }
@@ -1118,7 +1118,7 @@ node|z17-[amenity=university]
 node|z17-[man_made=cairn]
 {
   symbol-shape: circle;
-  symbol-fill-color: white;
+  symbol-fill-color: @white;
   symbol-size: 3.2;
 }
 area|z17-[amenity=parking][location=underground],
@@ -1149,7 +1149,7 @@ node|z16-[amenity=parking][fee?]
 }
 line|z17-[communication=line][location=underground]
 {
-  color: #f080f0;
+  color: @comm_line;
   width: 0.8;
   z-index: 931;
   dashes: 1.2,2,1.2,2,1.2,4.4;
@@ -1167,7 +1167,7 @@ node|z17-[amenity=kindergarten]
 }
 line|z17-[route=ferry]
 {
-  color: #a8c8d8;
+  color: @ferry_z16;
   width: 2;
   z-index: 950;
   dashes: 12,8;
@@ -1175,13 +1175,13 @@ line|z17-[route=ferry]
 }
 line|z17-[man_made=cutline]
 {
-  color: #f1eee8;
+  color: @background;
   width: 6;
   z-index: 276;
 }
 line|z17-[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
+  color: @graye4;
   width: 2.4;
   z-index: 916;
 }
@@ -1197,7 +1197,7 @@ node|z17-[barrier=stile],
 node|z17-[barrier=toll_booth]
 {
   symbol-shape: circle;
-  symbol-fill-color: #707070;
+  symbol-fill-color: @gray70;
   symbol-size: 1.6;
 }
 area|z17-[building]::int_name,
@@ -1205,30 +1205,30 @@ node|z17-[building]::int_name
 {
   text: int_name;
   font-size: 11;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 area|z15-[historic=ship]
 {
-  fill-color: #cdcdb4;
+  fill-color: @building_fill;
   text: name;
   font-size: 11;
 }
 line|z17-[man_made=pier]::d1p2
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 3.2;
   z-index: 915;
 }
 line|z17-[power=minor_line]::d1p2
 {
-  color: grey;
+  color: @gray;
   width: 0.8;
   dashes: 1.2,2,1.2,2,1.2,4.4;
   linecap: butt;
 }
 line|z17-[power=minor_line]
 {
-  color: white;
+  color: @white;
   width: 1.6;
   z-index: 921;
   opacity: 0.5;
@@ -1237,7 +1237,7 @@ line|z17-[power=minor_line]
 node|z17-[entrance]
 {
   symbol-shape: circle;
-  symbol-fill-color: #202020;
+  symbol-fill-color: @dark_gray_20;
   symbol-size: 2;
   font-size: 9;
   text: ref;
@@ -1325,21 +1325,21 @@ line|z15-[tunnel?]::tunnelwhite,
   z-index: 30;
   casing-width: eval(prop("width")/2+4);
   casing-linecap: butt;
-  casing-color: white;
+  casing-color: @white;
 }
 line|z15-[bridge?]::bridgeblack
 {
   z-index: 25;
   casing-width: eval(prop("width")/2+5);
   casing-linecap: butt;
-  casing-color: #707070;
+  casing-color: @gray70;
 }
 line|z15-[tunnel?]::tunnelblack
 {
   z-index: 25;
   casing-width: eval(prop("width")/2+5);
   casing-linecap: butt;
-  casing-color: #707070;
+  casing-color: @gray70;
   casing-dashes: 5,5;
 }
 
@@ -1357,7 +1357,7 @@ line|z16-[hwtag=oneway]::arrows
 line|z18-[hwtag=lit]::lit
 {
   width: 0.3;
-  color: yellow;
+  color: @border_state;
 }
 */
 
@@ -1366,7 +1366,7 @@ line|z18-[hwtag=lit]::lit
 line|z15-[hwtag=private]::private
 {
   width: 2;
-  color: red;
+  color: @red;
   z-index: 990;
   dashes: 5,15;
   linecap: butt;
diff --git a/data/styles/include/base_piste.mapcss b/data/styles/include/base_piste.mapcss
index a7098e027e..1409348ab8 100644
--- a/data/styles/include/base_piste.mapcss
+++ b/data/styles/include/base_piste.mapcss
@@ -1,54 +1,54 @@
 line|z13[piste:type=sled]
 {
-  color: #f0e0dc;
+  color: @school_fill;
   width: 1.25;
 }
 line|z13[piste:type=nordic]
 {
-  color: #c00000;
+  color: @piste_nordic;
   width: 0.5;
   dashes: 1.5,0.25;
   linecap: butt;
 }
 line|z13[piste:type=downhill]
 {
-  color: #505050;
+  color: @gray50;
   width: 2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=freeride]
 {
-  color: #f6dd0a;
+  color: @piste_downhill_freeride;
   width: 2.5;
 }
 node|z13[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #202020;
+  symbol-fill-color: @dark_gray_20;
   symbol-size: 2;
 }
 line|z13[piste:type=downhill][piste:difficulty=intermediate]
 {
-  color: #ff4040;
+  color: @piste_downhill_interm;
   width: 2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=advanced]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=easy]
 {
-  color: blue;
+  color: @alpine_hiking;
   width: 2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=novice]
 {
-  color: #40ff40;
+  color: @piste_downhill_novice;
   width: 2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=expert]
 {
-  color: #f6800a;
+  color: @piste_downhill_expert;
   width: 2.5;
 }
 node|z16-[aerialway=station]
@@ -56,81 +56,81 @@ node|z16-[aerialway=station]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
-  text-halo-color: white;
+  text-color: @station_name;
+  text-halo-color: @white;
 }
 line|z14[piste:lift=platter]::d1p2
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.4;
 }
 line|z14[piste:lift=j-bar]::d2p2
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.4;
 }
 line|z14-[piste:type=downhill]
 {
-  color: #505050;
+  color: @gray50;
   width: 5;
 }
 line|z14-[piste:type=downhill][piste:difficulty=easy]
 {
-  color: blue;
+  color: @alpine_hiking;
   width: 5;
 }
 line|z14-[piste:type=downhill][piste:difficulty=advanced]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 5;
 }
 line|z14[piste:type=sled]
 {
-  color: #f0e0dc;
+  color: @school_fill;
   width: 2.5;
 }
 line|z14-[piste:type=downhill][piste:difficulty=intermediate]
 {
-  color: #ff4040;
+  color: @piste_downhill_interm;
   width: 5;
 }
 line|z14-[piste:type=downhill][piste:difficulty=expert]
 {
-  color: #f6800a;
+  color: @piste_downhill_expert;
   width: 5;
 }
 line|z14[piste:lift=platter]::d1p3
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 4;
   dashes: 0.4,20;
   linecap: butt;
 }
 line|z14[piste:lift=j-bar]::d2p3
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 4;
   dashes: 0.4,20;
   linecap: butt;
 }
 line|z14-[piste:type=downhill][piste:difficulty=freeride]
 {
-  color: #f6dd0a;
+  color: @piste_downhill_freeride;
   width: 5;
 }
 line|z14[piste:lift=t-bar]::d2p2
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.4;
 }
 line|z14-[piste:type=downhill][piste:difficulty=novice]
 {
-  color: #40ff40;
+  color: @piste_downhill_novice;
   width: 5;
 }
 line|z14[piste:lift=t-bar]::d2p3
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 4;
   dashes: 0.4,20;
   linecap: butt;
@@ -138,12 +138,12 @@ line|z14[piste:lift=t-bar]::d2p3
 node|z14[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
+  symbol-fill-color: @station_name;
   symbol-size: 2;
 }
 line|z14[piste:type=nordic]
 {
-  color: #c00000;
+  color: @piste_nordic;
   width: 1;
   dashes: 3,0.5;
   linecap: butt;
@@ -151,46 +151,46 @@ line|z14[piste:type=nordic]
 node|z15[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
+  symbol-fill-color: @station_name;
   symbol-size: 3;
 }
 line|z15[piste:lift=magic_carpet]
 {
-  color: #101010;
+  color: @ford_casing;
   width: 1.6;
 }
 line|z15-[piste:lift=j-bar]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.8;
 }
 line|z15-[piste:lift=t-bar]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.8;
 }
 line|z15-[piste:lift=t-bar]::d2p2
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 8;
   dashes: 0.8,40;
   linecap: butt;
 }
 line|z15-[piste:lift=platter]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.8;
 }
 line|z15-[piste:type=nordic]
 {
-  color: #c00000;
+  color: @piste_nordic;
   width: 2;
   dashes: 6,1;
   linecap: butt;
 }
 line|z15-[piste:lift=j-bar]::d2p2
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 8;
   z-index: 605;
   dashes: 0.8,40;
@@ -198,13 +198,13 @@ line|z15-[piste:lift=j-bar]::d2p2
 }
 line|z15[aerialway=gondola]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.8;
   z-index: 610;
 }
 line|z15[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
+  color: @rope_tow;
   width: 1;
   z-index: 607;
   dashes: 2,2;
@@ -212,43 +212,43 @@ line|z15[piste:lift=rope_tow]
 }
 line|z15[aerialway=chair_lift]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.8;
   z-index: 612;
 }
 line|z15[aerialway=mixed_lift]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.8;
   z-index: 613;
 }
 line|z15[aerialway=cable_car]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.8;
   z-index: 609;
 }
 line|z15-[piste:lift=platter]::d1p2
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 8;
   dashes: 1,40;
   linecap: butt;
 }
 line|z15[piste:type=sled]
 {
-  color: #f0e0dc;
+  color: @school_fill;
   width: 5;
 }
 line|z16[aerialway=chair_lift]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 1.6;
   z-index: 852;
 }
 line|z16[piste:type=sled]
 {
-  color: #f0e0dc;
+  color: @school_fill;
   width: 10;
   z-index: 840;
 }
@@ -256,64 +256,64 @@ area|z16[aerialway=station],
 node|z16[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
+  symbol-fill-color: @station_name;
   symbol-size: 4;
 }
 line|z16[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
+  color: @rope_tow;
   width: 2;
   dashes: 4,4;
   linecap: butt;
 }
 line|z16[aerialway=cable_car]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 1.6;
   z-index: 850;
 }
 line|z16[piste:lift=magic_carpet]
 {
-  color: #101010;
+  color: @ford_casing;
   width: 3.2;
 }
 line|z16[aerialway=mixed_lift]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 1.6;
   z-index: 853;
 }
 line|z16[aerialway=gondola]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 1.6;
   z-index: 851;
 }
 line|z17-[piste:lift=magic_carpet]
 {
-  color: #101010;
+  color: @ford_casing;
   width: 6.4;
 }
 line|z17-[aerialway=cable_car]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 3.2;
   z-index: 909;
 }
 line|z17-[aerialway=mixed_lift]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 3.2;
   z-index: 912;
 }
 line|z17-[aerialway=chair_lift]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 3.2;
 }
 line|z17-[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
+  color: @rope_tow;
   width: 4;
   dashes: 8,8;
   linecap: butt;
@@ -322,17 +322,17 @@ area|z17-[aerialway=station],
 node|z17-[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
+  symbol-fill-color: @station_name;
   symbol-size: 3.2;
 }
 line|z17-[aerialway=gondola]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 3.2;
   z-index: 910;
 }
 line|z17-[piste:type=sled]
 {
-  color: #f0e0dc;
+  color: @school_fill;
   width: 20;
 }
diff --git a/data/styles/include/base_place.mapcss b/data/styles/include/base_place.mapcss
index 390e870174..c98e8b3b41 100644
--- a/data/styles/include/base_place.mapcss
+++ b/data/styles/include/base_place.mapcss
@@ -10,26 +10,26 @@ node|z15-[place=island]
 {
   text: name;
   font-size: 16;
-  text-color: #505050;
+  text-color: @gray50;
 }
 node|z-2[place=continent]
 {
   text: name;
   font-size: 18;
-  text-color: #808078;
+  text-color: @continent_name;
 }
 node|z3[place=country]
 {
   text: name;
   font-size: 12;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 area|z3[place=country]::int_name,
 node|z3[place=country]::int_name
 {
   text: int_name;
   font-size: 12;
-  text-color: #606060;
+  text-color: @gray60;
 }
 
 node|z4[place=city][capital?]::int_name
@@ -37,16 +37,16 @@ node|z4[place=city][capital?]::int_name
   font-size: 10;
   text-halo-radius: 2;
   text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
+  text-color: @gray;
+  text-halo-color: @light_yellow;
 }
 node|z8[place=town]
 {
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
+  text-color: @dark_gray_40;
+  text-halo-color: @light_yellow;
 }
 node|z4[place=country],
 node|z9[place=town]
@@ -54,14 +54,14 @@ node|z9[place=town]
   font-size: 14;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
+  text-color: @dark_gray_40;
+  text-halo-color: @light_yellow;
 }
 node|z4[place=state]
 {
   text: name;
   font-size: 11;
-  text-color: #c0c0b0;
+  text-color: @state_name;
   z-index: -10;
 }
 node|z4[place=city][capital?]
@@ -69,8 +69,8 @@ node|z4[place=city][capital?]
   font-size: 11;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
+  text-color: @gray50;
+  text-halo-color: @light_yellow;
 }
 node|z4-5[place=country]::int_name,
 node|z13-14[place=village]::int_name
@@ -78,8 +78,8 @@ node|z13-14[place=village]::int_name
   font-size: 12;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
+  text-color: @gray60;
+  text-halo-color: @light_yellow;
 }
 
 node|z5[place=city][capital?]
@@ -87,38 +87,38 @@ node|z5[place=city][capital?]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
+  text-color: @gray50;
+  text-halo-color: @light_yellow;
 }
 node|z5[place=city][capital?]::int_name
 {
   font-size: 11;
   text-halo-radius: 2;
   text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
+  text-color: @gray;
+  text-halo-color: @light_yellow;
 }
 node|z5[place=country]
 {
   font-size: 16;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
+  text-color: @dark_gray_40;
+  text-halo-color: @light_yellow;
 }
 node|z5[place=city]
 {
   font-size: 11;
   text-halo-radius: 2;
   text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
+  text-color: @gray60;
+  text-halo-color: @light_yellow;
 }
 node|z5[place=state]
 {
   text: name;
   font-size: 12;
-  text-color: #c0c0b0;
+  text-color: @state_name;
   z-index: -10;
 }
 node|z5[place=city]::int_name
@@ -126,8 +126,8 @@ node|z5[place=city]::int_name
   font-size: 10;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #909090;
-  text-halo-color: #eeeedd;
+  text-color: @gray90;
+  text-halo-color: @light_yellow;
 }
 node|z7-8[place=city]::int_name,
 node|z9[place=town]::int_name,
@@ -137,23 +137,23 @@ node|z6-9[place=city][capital?]::int_name
   font-size: 12;
   text-halo-radius: 2;
   text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
+  text-color: @gray;
+  text-halo-color: @light_yellow;
 }
 node|z6[place=city][capital?]
 {
   font-size: 14;
   text-halo-radius: 2;
   text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
+  text-color: @gray60;
+  text-halo-color: @light_yellow;
 }
 
 node|z6[place=country]
 {
   text: name;
   font-size: 18;
-  text-color: grey;
+  text-color: @gray;
 }
 node|z6[place=city],
 node|z15[place=locality],
@@ -163,55 +163,55 @@ node|z12-13[place=village],
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
+  text-color: @gray60;
+  text-halo-color: @light_yellow;
 }
 node|z6[place=state]
 {
   text: name;
   font-size: 13;
-  text-color: #c0c0b0;
+  text-color: @state_name;
   z-index: -10;
 }
 node|z6[place=country]::int_name
 {
   text: int_name;
   font-size: 12;
-  text-color: #a0a090;
+  text-color: @country_name;
 }
 node|z6[place=city]::int_name
 {
   font-size: 11;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #909090;
-  text-halo-color: #eeeedd;
+  text-color: @gray90;
+  text-halo-color: @light_yellow;
 }
 node|z7[place=country]
 {
   text: name;
   font-size: 26;
-  text-color: #909080;
+  text-color: @country_name_z7;
 }
 node|z7-8[place=city]
 {
   font-size: 14;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
+  text-color: @gray50;
+  text-halo-color: @light_yellow;
 }
 node|z7[place=country]::d1p3
 {
   text: int_name;
   font-size: 14;
-  text-color: #a0a090;
+  text-color: @country_name;
 }
 node|z7[place=state]
 {
   text: name;
   font-size: 14;
-  text-color: #c0c0b0;
+  text-color: @state_name;
   z-index: -10;
 }
 node|z8[place=state]
@@ -219,8 +219,8 @@ node|z8[place=state]
   font-size: 14;
   text-halo-radius: 2;
   text: name;
-  text-color: #b0b0a8;
-  text-halo-color: #eeeedd;
+  text-color: @state_name_z8;
+  text-halo-color: @light_yellow;
   z-index: -10;
 }
 area|z15-[place=farm],
@@ -232,7 +232,7 @@ node|z8-9[place=region],
 {
   text: name;
   font-size: 12;
-  text-color: #606060;
+  text-color: @gray60;
 }
 node|z8-9[place=city][capital?],
 node|z16[place=locality],
@@ -242,36 +242,36 @@ node|z16[place=isolated_dwelling],
   font-size: 16;
   text-halo-radius: 2;
   text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
+  text-color: @gray60;
+  text-halo-color: @light_yellow;
 }
 area|z10-14[place=island],
 node|z10-14[place=island]
 {
   text: name;
   font-size: 12;
-  text-color: #505050;
+  text-color: @gray50;
 }
 node|z8-9[place=country]
 {
   text: name;
   font-size: 28;
-  text-color: #a0a090;
+  text-color: @country_name;
 }
 area|z8-9[place=country]::int_name,
 node|z8-9[place=country]::int_name
 {
   text: int_name;
   font-size: 14;
-  text-color: #b0b0a0;
+  text-color: @country_name_z8;
 }
 node|z9[place=state]
 {
   font-size: 14;
   text-halo-radius: 2;
   text: name;
-  text-color: #c0c0b0;
-  text-halo-color: #eeeedd;
+  text-color: @state_name;
+  text-halo-color: @light_yellow;
   z-index: -10;
 }
 node|z9[place=city]
@@ -279,14 +279,14 @@ node|z9[place=city]
   font-size: 17;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
+  text-color: @gray50;
+  text-halo-color: @light_yellow;
 }
 node|z9[place=county]
 {
   text: name;
   font-size: 14;
-  text-color: #a0a0a0;
+  text-color: @light_gray;
 }
 node|z9-11[place=city]::int_name,
 node|z10-11[place=town]::int_name,
@@ -296,16 +296,16 @@ node|z10-11[place=city][capital?]::int_name
   font-size: 14;
   text-halo-radius: 2;
   text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
+  text-color: @gray;
+  text-halo-color: @light_yellow;
 }
 node|z10-11[place=town]
 {
   font-size: 16;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
+  text-color: @gray50;
+  text-halo-color: @light_yellow;
 }
 node|z10-11[place=city],
 node|z12[place=town]
@@ -313,16 +313,16 @@ node|z12[place=town]
   font-size: 18;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
+  text-color: @gray50;
+  text-halo-color: @light_yellow;
 }
 node|z10-11[place=city][capital?]
 {
   font-size: 18;
   text-halo-radius: 2;
   text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
+  text-color: @gray60;
+  text-halo-color: @light_yellow;
 }
 area|z10[place=county],
 node|z10[place=county]
@@ -330,8 +330,8 @@ node|z10[place=county]
   font-size: 14;
   text-halo-radius: 2;
   text: name;
-  text-color: #a0a0a0;
-  text-halo-color: #eeeedd;
+  text-color: @light_gray;
+  text-halo-color: @light_yellow;
 }
 area|z11-12[place=county],
 node|z11-12[place=county]
@@ -339,14 +339,14 @@ node|z11-12[place=county]
   font-size: 16;
   text-halo-radius: 2;
   text: name;
-  text-color: #a0a090;
-  text-halo-color: #eeeedd;
+  text-color: @country_name;
+  text-halo-color: @light_yellow;
 }
 node|z12[place=city]::int_name
 {
   text: int_name;
   font-size: 16;
-  text-color: grey;
+  text-color: @gray;
 }
 node|z13-15[place=city]::int_name,
 node|z12[place=city][capital?]::int_name
@@ -354,15 +354,15 @@ node|z12[place=city][capital?]::int_name
   font-size: 16;
   text-halo-radius: 2;
   text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
+  text-color: @gray;
+  text-halo-color: @light_yellow;
 }
 area|z12-16[place=suburb]::int_name,
 node|z12-16[place=suburb]::int_name
 {
   text: int_name;
   font-size: 12;
-  text-color: #a0a0a0;
+  text-color: @light_gray;
   z-index: 20;
 }
 node|z12[place=city],
@@ -371,23 +371,23 @@ node|z13[place=town]
   font-size: 20;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
+  text-color: @gray50;
+  text-halo-color: @light_yellow;
 }
 node|z12[place=city][capital?]
 {
   font-size: 22;
   text-halo-radius: 2;
   text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
+  text-color: @gray60;
+  text-halo-color: @light_yellow;
 }
 area|z12[place=suburb],
 node|z12[place=suburb]
 {
   text: name;
   font-size: 12;
-  text-color: #909090;
+  text-color: @gray90;
   z-index: 20;
 }
 node|z13[place=city][capital?]::int_name
@@ -395,8 +395,8 @@ node|z13[place=city][capital?]::int_name
   font-size: 18;
   text-halo-radius: 2;
   text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
+  text-color: @gray;
+  text-halo-color: @light_yellow;
 }
 area|z14[place=farm],
 area|z13-15[place=islet],
@@ -404,33 +404,33 @@ area|z17-[place=islet]
 {
   text: name;
   font-size: 12;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 area|z14-[place=hamlet],
 area|z11-[place=village]
 {
-  fill-color: #dddac9;
+  fill-color: @village_fill;
 }
 node|z13[place=city][capital?]
 {
   text: name;
   font-size: 24;
-  text-color: grey;
+  text-color: @gray;
 }
 node|z13[place=city]
 {
   font-size: 20;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
+  text-color: @dark_gray_40;
+  text-halo-color: @light_yellow;
 }
 area|z13[place=suburb],
 node|z13[place=suburb]
 {
   text: name;
   font-size: 14;
-  text-color: #909090;
+  text-color: @gray90;
   z-index: 20;
 }
 area|z14[place=town],
@@ -439,15 +439,15 @@ node|z14[place=town]
   font-size: 22;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
+  text-color: @gray50;
+  text-halo-color: @light_yellow;
 }
 area|z14-16[place=suburb],
 node|z14-16[place=suburb]
 {
   text: name;
   font-size: 18;
-  text-color: #909090;
+  text-color: @gray90;
   z-index: 20;
 }
 node|z14-15[place=city]
@@ -455,8 +455,8 @@ node|z14-15[place=city]
   font-size: 22;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
+  text-color: @dark_gray_40;
+  text-halo-color: @light_yellow;
 }
 area|z14[place=village],
 node|z14[place=village]
@@ -464,8 +464,8 @@ node|z14[place=village]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
+  text-color: @dark_gray_40;
+  text-halo-color: @light_yellow;
 }
 area|z14-16[place=locality]::int_name,
 node|z14-16[place=locality]::int_name,
@@ -477,15 +477,15 @@ node|z16[place=isolated_dwelling]::int_name,
 {
   text: int_name;
   font-size: 12;
-  text-color: #909090;
+  text-color: @gray90;
 }
 node|z15-[place=village]::int_name
 {
   font-size: 12;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #909090;
-  text-halo-color: #eeeedd;
+  text-color: @gray90;
+  text-halo-color: @light_yellow;
 }
 area|z15-16[place=village],
 node|z15-16[place=village]
@@ -493,29 +493,29 @@ node|z15-16[place=village]
   font-size: 16;
   text-halo-radius: 2;
   text: name;
-  text-color: #707070;
-  text-halo-color: #eeeedd;
+  text-color: @gray70;
+  text-halo-color: @light_yellow;
 }
 area|z16[place=islet],
 node|z16[place=islet]
 {
   text: name;
   font-size: 16;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 area|z16-[place=hamlet],
 node|z16-[place=hamlet]
 {
   text: name;
   font-size: 16;
-  text-color: #606060;
+  text-color: @gray60;
 }
 area|z17-[place=suburb],
 node|z17-[place=suburb]
 {
   text: name;
   font-size: 20;
-  text-color: #909090;
+  text-color: @gray90;
   z-index: 20;
 }
 area|z17-[place=village],
@@ -524,8 +524,8 @@ node|z17-[place=village]
   font-size: 18;
   text-halo-radius: 2;
   text: name;
-  text-color: #707070;
-  text-halo-color: #eeeedd;
+  text-color: @gray70;
+  text-halo-color: @light_yellow;
 }
 area|z17-[place=locality],
 node|z17-[place=locality],
@@ -536,13 +536,13 @@ node|z17-[place=isolated_dwelling],
 {
   text: name;
   font-size: 16;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 area|z17-[place=suburb]::int_name,
 node|z17-[place=suburb]::int_name
 {
   text: int_name;
   font-size: 14;
-  text-color: #a0a0a0;
+  text-color: @light_gray;
   z-index: 20;
-}
\ No newline at end of file
+}
diff --git a/data/styles/include/base_publictransport.mapcss b/data/styles/include/base_publictransport.mapcss
index 9143e99aa6..6a31bb5a98 100644
--- a/data/styles/include/base_publictransport.mapcss
+++ b/data/styles/include/base_publictransport.mapcss
@@ -21,9 +21,9 @@ node|z15[railway=tram_stop]
   font-size: 10;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
+  text-color: @station_name;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
 }
 
 area|z16[highway=bus_stop]::int_name,
@@ -34,9 +34,9 @@ node|z15[railway=tram_stop]::int_name
   font-size: 9;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #3050d8;
+  text-color: @station_name;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
   z-index: 20;
 }
 
@@ -46,9 +46,9 @@ node|z15[railway=tram_stop]::int_name
   font-size: 11;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
+  text-color: @station_name;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
   z-index: 20;
 }
 *|z17-[highway=bus_stop]::int_name,
@@ -57,9 +57,9 @@ node|z15[railway=tram_stop]::int_name
   font-size: 10;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #3050d8;
+  text-color: @station_name;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
   z-index: 20;
 }
 
@@ -69,9 +69,9 @@ node|z17-[amenity=bus_station]::int_name
   font-size: 10;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #404040;
+  text-color: @dark_gray_40;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
   z-index: 1;
 }
 
@@ -103,7 +103,7 @@ node|z15-16[railway=tram_stop]
 
 line|z15-[railway=tram]::d1p2
 {
-  color: #e6b7e6;
+  color: @tram_line;
   width: 2;
   z-index: 561;
 }
@@ -117,9 +117,9 @@ node|z17-[railway=tram_stop]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
+  text-color: @station_name;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
 }
 area|z17-[railway=tram_stop]::int_name,
 node|z17-[railway=tram_stop]::int_name
@@ -127,15 +127,15 @@ node|z17-[railway=tram_stop]::int_name
   font-size: 12;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #3050d8;
+  text-color: @station_name;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
 }
 
 line|z15[railway=monorail]::d1p3,
 line|z15[railway=tram]::d1p3
 {
-  color: #4c0f4c;
+  color: @monorail_line;
   width: 2;
   z-index: 566;
   dashes: 7.2,10.8;
@@ -144,14 +144,14 @@ line|z15[railway=tram]::d1p3
 
 line|z15-[railway=tram]
 {
-  color: #4c0f4c;
+  color: @monorail_line;
   width: 3.2;
   z-index: 556;
 }
 
 line|z16-[railway=tram]::d1p3
 {
-  color: #4c0f4c;
+  color: @monorail_line;
   width: 2;
   z-index: 566;
   dashes: 9.6,14.4;
@@ -160,7 +160,7 @@ line|z16-[railway=tram]::d1p3
 
 line|z14[railway=tram]::raildash
 {
-  color: #590959;
+  color: @tram_monorail_dash;
   width: 1.7;
   z-index: 557;
   dashes: 3.6,5.4;
@@ -168,13 +168,13 @@ line|z14[railway=tram]::raildash
 }
 line|z14[railway=tram]::railfill
 {
-  color: #e6b7e6;
+  color: @tram_line;
   width: 1.7;
   z-index: 556;
 }
 line|z14[railway=tram]::railborder
 {
-  color: #590959;
+  color: @tram_monorail_dash;
   width: 2;
   z-index: 555;
 }
@@ -183,7 +183,7 @@ line|z14[railway=tram]::railborder
 
 line|z12-[railway=subway]
 {
-  color: #0f0f4c;
+  color: @subway_line;
   width: 2;
   z-index: 686;
   dashes: 9.6,14.4;
@@ -196,33 +196,33 @@ node|z16-[railway=subway_entrance]
 {
   icon-image: subway.svg;
 }
-line|z12-[railway=subway]                                         {width:3; color: #0f0f4c; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway]                           {text-color: #3050d8; text-position: center;}
-node[railway=station][transport=subway]::int_name                 {text-color: #3050d8; text-position: center;}
+line|z12-[railway=subway]                                         {width:3; color: @subway_line; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway]                           {text-color: @station_name; text-position: center;}
+node[railway=station][transport=subway]::int_name                 {text-color: @station_name; text-position: center;}
 line|z12-[railway=subway][colour]                                 {width:3; color: eval(tag("colour")); z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
 node[railway=station][transport=subway][colour]                   {text-color: eval(tag("colour"));}
 node[railway=station][transport=subway][colour]::int_name         {text-color: eval(tag("colour"));}
-line|z12-[railway=subway][colour=red]                             {width:3; color: #DD0000; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=red]               {text-color: #DD0000;}
-node[railway=station][transport=subway][colour=red]::int_name     {text-color: #DD0000;}
-line|z12-[railway=subway][colour=blue]                            {width:3; color: #072889; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=blue]              {text-color: #072889;}
-node[railway=station][transport=subway][colour=blue]::int_name    {text-color: #072889;}
-line|z12-[railway=subway][colour=purple]                          {width:3; color: #8B509C; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=purple]            {text-color: #8B509C;}
-node[railway=station][transport=subway][colour=purple]::int_name  {text-color: #8B509C;}
-line|z12-[railway=subway][colour=orange]                          {width:3; color: #FF7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=orange]            {text-color: #FF7700;}
-node[railway=station][transport=subway][colour=orange]::int_name  {text-color: #FF7700;}
-line|z12-[railway=subway][colour=green]                           {width:3; color: #006600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=green]             {text-color: #006600;}
-node[railway=station][transport=subway][colour=green]::int_name   {text-color: #006600;}
-line|z12-[railway=subway][colour=brown]                           {width:3; color: #BB7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=brown]             {text-color: #BB7700;}
-node[railway=station][transport=subway][colour=brown]::int_name   {text-color: #BB7700;}
-line|z12-[railway=subway][colour=yellow]                          {width:3; color: #F7C600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=yellow]            {text-color: #F7C600;}
-node[railway=station][transport=subway][colour=yellow]::int_name  {text-color: #F7C600;}
+line|z12-[railway=subway][colour=red]                             {width:3; color: @subway_red; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=red]               {text-color: @subway_red;}
+node[railway=station][transport=subway][colour=red]::int_name     {text-color: @subway_red;}
+line|z12-[railway=subway][colour=blue]                            {width:3; color: @subway_blue; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=blue]              {text-color: @subway_blue;}
+node[railway=station][transport=subway][colour=blue]::int_name    {text-color: @subway_blue;}
+line|z12-[railway=subway][colour=purple]                          {width:3; color: @subway_purple; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=purple]            {text-color: @subway_purple;}
+node[railway=station][transport=subway][colour=purple]::int_name  {text-color: @subway_purple;}
+line|z12-[railway=subway][colour=orange]                          {width:3; color: @subway_orange; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=orange]            {text-color: @subway_orange;}
+node[railway=station][transport=subway][colour=orange]::int_name  {text-color: @subway_orange;}
+line|z12-[railway=subway][colour=green]                           {width:3; color: @subway_green; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=green]             {text-color: @subway_green;}
+node[railway=station][transport=subway][colour=green]::int_name   {text-color: @subway_green;}
+line|z12-[railway=subway][colour=brown]                           {width:3; color: @subway_brown; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=brown]             {text-color: @subway_brown;}
+node[railway=station][transport=subway][colour=brown]::int_name   {text-color: @subway_brown;}
+line|z12-[railway=subway][colour=yellow]                          {width:3; color: @subway_yellow; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=yellow]            {text-color: @subway_yellow;}
+node[railway=station][transport=subway][colour=yellow]::int_name  {text-color: @subway_yellow;}
 
 node|z12[railway=station][transport=subway],
 area|z12[railway=station][transport=subway]
@@ -231,7 +231,7 @@ area|z12[railway=station][transport=subway]
   text-halo-radius: 2;
   text: name;
   text-offset: 10;
-  text-halo-color: #f8fcff;
+  text-halo-color: @station_name_halo;
   z-index: 170;
   -x-kot-layer: top;
 }
@@ -242,7 +242,7 @@ area|z12[railway=station][transport=subway]::int_name
   text-halo-radius: 2;
   text: int_name;
   text-offset: 10;
-  text-halo-color: #f8fcff;
+  text-halo-color: @station_name_halo;
   z-index: 170;
   -x-kot-layer: top;
 }
@@ -253,7 +253,7 @@ area|z13-14[railway=station][transport=subway]
   text-halo-radius: 2;
   text: name;
   text-offset: 10;
-  text-halo-color: #f8fcff;
+  text-halo-color: @station_name_halo;
   z-index: 170;
   -x-kot-layer: top;
 }
@@ -264,7 +264,7 @@ area|z13-14[railway=station][transport=subway]::int_name
   text-halo-radius: 2;
   text: int_name;
   text-offset: 10;
-  text-halo-color: #f8fcff;
+  text-halo-color: @station_name_halo;
   z-index: 170;
   -x-kot-layer: top;
 }
@@ -275,7 +275,7 @@ area|z15-[railway=station][transport=subway]
   text-halo-radius: 2;
   text: name;
   text-offset: 10;
-  text-halo-color: #f8fcff;
+  text-halo-color: @station_name_halo;
   z-index: 170;
   -x-kot-layer: top;
 }
@@ -286,7 +286,7 @@ area|z15-[railway=station][transport=subway]::int_name
   text-halo-radius: 2;
   text: int_name;
   text-offset: 10;
-  text-halo-color: #f8fcff;
+  text-halo-color: @station_name_halo;
   z-index: 170;
   -x-kot-layer: top;
 }
diff --git a/data/styles/include/base_railways.mapcss b/data/styles/include/base_railways.mapcss
index 12f0e0172a..24dc296a54 100644
--- a/data/styles/include/base_railways.mapcss
+++ b/data/styles/include/base_railways.mapcss
@@ -1,143 +1,143 @@
 line|z10-11[railway=rail]
 {
-  color: silver;
+  color: @rail_z12;
   width: 1;
   z-index: 136;
 }
 line|z12[railway=yard]
 {
-  color: #404040;
+  color: @dark_gray_40;
   width: 0.5;
   z-index: 228;
 }
 line|z12[railway=narrow_gauge]
 {
-  color: silver;
+  color: @rail_z12;
   width: 1;
   z-index: 222;
 }
 line|z12[railway=light_rail]
 {
-  color: #90d090;
+  color: @light_rail_z12;
   width: 1;
   z-index: 668;
 }
 line|z12[railway=preserved]
 {
-  color: silver;
+  color: @rail_z12;
   width: 1;
   z-index: 223;
 }
 
 line|z12[railway=abandoned]
 {
-  color: #b2b2b2;
+  color: @abandoned_rail;
   width: 0.25;
   z-index: 219;
   opacity: 0.3;
 }
 line|z12[railway=monorail]
 {
-  color: #d08080;
+  color: @monorail_z12;
   width: 1;
   z-index: 226;
 }
 line|z12[railway=rail]
 {
-  color: silver;
+  color: @rail_z12;
   width: 1;
   z-index: 221;
 }
 line|z12[railway=funicular]
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 1;
   z-index: 225;
 }
 line|z12[railway=disused]
 {
-  color: grey;
+  color: @gray;
   width: 0.5;
   z-index: 218;
   opacity: 0.5;
 }
 line|z13[railway=siding]
 {
-  color: #b0b0b0;
+  color: @grayb0;
   width: 1;
   z-index: 239;
 }
 line|z13[railway=funicular]
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 1;
   z-index: 235;
 }
 line|z13[railway=preserved]
 {
-  color: #b0b0b0;
+  color: @grayb0;
   width: 1.35;
   z-index: 231;
 }
 line|z13[railway=abandoned]
 {
-  color: #b2b2b2;
+  color: @abandoned_rail;
   width: 0.55;
   z-index: 227;
   opacity: 0.3;
 }
 line|z13[railway=disused]
 {
-  color: grey;
+  color: @gray;
   width: 0.85;
   z-index: 226;
   opacity: 0.5;
 }
 line|z13[railway=monorail]
 {
-  color: #d08080;
+  color: @monorail_z12;
   width: 1;
 }
 line|z13[railway=narrow_gauge]
 {
-  color: #a0a0a0;
+  color: @light_gray;
   width: 1;
   z-index: 230;
 }
 line|z13[railway=light_rail]
 {
-  color: #90d090;
+  color: @light_rail_z12;
   width: 1;
   z-index: 687;
 }
 line|z13[railway=rail]
 {
-  color: #b0b0b0;
+  color: @grayb0;
   width: 1.85;
   z-index: 229;
 }
 line|z13[railway=yard]
 {
-  color: #404040;
+  color: @dark_gray_40;
   width: 0.85;
   z-index: 238;
 }
 line|z14[railway=spur]::d1p2
 {
-  color: #909090;
+  color: @gray90;
   width: 1;
   z-index: 293;
 }
 line|z14[railway=yard]
 {
-  color: #404040;
+  color: @dark_gray_40;
   width: 1.6;
   z-index: 208;
 }
 line|z14[railway=abandoned]::d1p3
 {
   opacity: 0.4;
-  color: #b2b2b2;
+  color: @abandoned_rail;
   linecap: butt;
   width: 1;
   z-index: 300;
@@ -145,7 +145,7 @@ line|z14[railway=abandoned]::d1p3
 }
 line|z14[railway=narrow_gauge]::d1p3
 {
-  color: #404040;
+  color: @dark_gray_40;
   width: 1.7;
   z-index: 303;
   dashes: 5.5,5.5;
@@ -153,13 +153,13 @@ line|z14[railway=narrow_gauge]::d1p3
 }
 line|z14[railway=monorail]::d1p2
 {
-  color: #d08080;
+  color: @monorail_z12;
   width: 1.7;
   z-index: 556;
 }
 line|z14[railway=light_rail]
 {
-  color: #095909;
+  color: @light_rail_z14;
   width: 2.4;
   z-index: 668;
 }
@@ -168,30 +168,30 @@ line|z14-[railway=rail]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
-  text-halo-color: white;
+  text-color: @station_name;
+  text-halo-color: @white;
 }
 line|z14[railway=spur]
 {
-  color: #b0b0b0;
+  color: @grayb0;
   width: 1.6;
   z-index: 207;
 }
 line|z14[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.7;
   z-index: 286;
 }
 line|z14[railway=rail],
 {
-  color: #888888;
+  color: @rail_z14;
   z-index: 198;
   width: 3;
 }
 line|z14[railway=preserved]::d1p3
 {
-  color: #505050;
+  color: @gray50;
   width: 1.7;
   z-index: 304;
   dashes: 4.5,4.5;
@@ -199,13 +199,13 @@ line|z14[railway=preserved]::d1p3
 }
 line|z14[railway=siding]
 {
-  color: #909090;
+  color: @gray90;
   width: 1.6;
   z-index: 209;
 }
 line|z14[railway=monorail]::raildash
 {
-  color: #590959;
+  color: @tram_monorail_dash;
   width: 1.7;
   z-index: 557;
   dashes: 3.6,5.4;
@@ -213,32 +213,32 @@ line|z14[railway=monorail]::raildash
 }
 line|z14[railway=monorail]::railborder
 {
-  color: #590959;
+  color: @tram_monorail_dash;
   width: 2;
   z-index: 555;
 }
 line|z14[railway=disused]
 {
-  color: grey;
+  color: @gray;
   width: 1.6;
   z-index: 196;
   opacity: 0.7;
 }
 line|z14[railway=funicular]::d1p3
 {
-  color: #590909;
+  color: @funicular_z14;
   width: 0.4;
   z-index: 309;
 }
 line|z14[railway=yard]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1;
   z-index: 294;
 }
 line|z14[railway=rail]::d1p5
 {
-  color: #888888;
+  color: @rail_z14;
   width: 1.8;
   z-index: 302;
   dashes: 4.5,4.5;
@@ -246,20 +246,20 @@ line|z14[railway=rail]::d1p5
 }
 line|z14[railway=rail]::d1p4
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.8;
   z-index: 285;
 }
 line|z14[railway=abandoned]::d1p2
 {
-  color: white;
+  color: @white;
   width: 1;
   z-index: 283;
   opacity: 0.4;
 }
 line|z14[railway=siding]::d1p3
 {
-  color: #404040;
+  color: @dark_gray_40;
   width: 1;
   z-index: 313;
   dashes: 3,6;
@@ -267,31 +267,31 @@ line|z14[railway=siding]::d1p3
 }
 line|z14[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.7;
 }
 line|z14[railway=siding]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1;
   z-index: 295;
 }
 line|z14[railway=disused]::d1p2
 {
-  color: #f2f2f2;
+  color: @disused_rail;
   width: 1;
   z-index: 282;
   opacity: 0.7;
 }
 line|z14[railway=preserved]
 {
-  color: #909090;
+  color: @gray90;
   width: 2.4;
   z-index: 200;
 }
 line|z14[railway=light_rail]::d1p3
 {
-  color: #095909;
+  color: @light_rail_z14;
   width: 1.7;
   z-index: 687;
   dashes: 3.8,5.4;
@@ -299,7 +299,7 @@ line|z14[railway=light_rail]::d1p3
 }
 line|z14[railway=yard]::d1p3
 {
-  color: #404040;
+  color: @dark_gray_40;
   width: 1;
   z-index: 312;
   dashes: 3,6;
@@ -307,14 +307,14 @@ line|z14[railway=yard]::d1p3
 }
 line|z14[railway=narrow_gauge]
 {
-  color: #606060;
+  color: @gray60;
   width: 2.4;
   z-index: 199;
 }
 line|z14[railway=disused]::d1p3
 {
   opacity: 0.7;
-  color: grey;
+  color: @gray;
   linecap: butt;
   width: 1;
   z-index: 299;
@@ -322,26 +322,26 @@ line|z14[railway=disused]::d1p3
 }
 line|z14[railway=abandoned]
 {
-  color: #b2b2b2;
+  color: @abandoned_rail;
   width: 1.6;
   z-index: 197;
   opacity: 0.4;
 }
 line|z14[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
+  color: @light_rail;
   width: 1.7;
   z-index: 677;
 }
 line|z14[railway=funicular]
 {
-  color: #590909;
+  color: @funicular_z14;
   width: 2.4;
   z-index: 205;
 }
 line|z14[railway=spur]::d1p3
 {
-  color: #ececec;
+  color: @railway_spur_z14;
   width: 1;
   z-index: 311;
   dashes: 3,6;
@@ -349,7 +349,7 @@ line|z14[railway=spur]::d1p3
 }
 line|z14[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
+  color: @funicular;
   width: 1.7;
   z-index: 291;
   dashes: 3.6,5.4;
@@ -357,7 +357,7 @@ line|z14[railway=funicular]::d1p2
 }
 line|z15[railway=spur]::d1p3
 {
-  color: #606060;
+  color: @gray60;
   width: 1.4;
   z-index: 411;
   dashes: 6,12;
@@ -365,27 +365,27 @@ line|z15[railway=spur]::d1p3
 }
 line|z15[railway=disused]
 {
-  color: grey;
+  color: @gray;
   width: 3.2;
   z-index: 284;
   opacity: 0.7;
 }
 line|z15[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 2;
   z-index: 388;
 }
 line|z15[railway=abandoned]
 {
-  color: #b2b2b2;
+  color: @abandoned_rail;
   width: 3.2;
   z-index: 285;
   opacity: 0.4;
 }
 line|z15[railway=siding]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 1.4;
   z-index: 413;
   dashes: 6,12;
@@ -393,37 +393,37 @@ line|z15[railway=siding]::d1p3
 }
 line|z15[railway=siding]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.4;
   z-index: 396;
 }
 
 line|z15[railway=preserved]
 {
-  color: #909090;
+  color: @gray90;
   width: 3.2;
   z-index: 289;
 }
 line|z15[railway=yard]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2.4;
 }
 line|z15[railway=spur]
 {
-  color: #606060;
+  color: @gray60;
   width: 2.4;
   z-index: 295;
 }
 line|z15[railway=rail]
 {
-  color: #666666;
+  color: @rail_z15_base;
   z-index: 287;
   width: 4;
 }
 line|z15[railway=rail]::d1p5
 {
-  color: #666666;
+  color: @rail_z15_base;
   width: 2.4;
   dashes: 9,9;
   linecap: butt;
@@ -431,37 +431,37 @@ line|z15[railway=rail]::d1p5
 }
 line|z15[railway=rail]::d1p4
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 2.4;
   z-index: 386;
 }
 line|z15[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 2;
   z-index: 387;
 }
 line|z15[railway=yard]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.4;
   z-index: 395;
 }
 line|z15-16[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
+  color: @light_rail;
   width: 2;
   z-index: 677;
 }
 line|z15-16[railway=light_rail]
 {
-  color: #0f4c0f;
+  color: @light_rail_z15;
   width: 3.2;
   z-index: 668;
 }
 line|z15[railway=preserved]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2;
   z-index: 405;
   dashes: 9,9;
@@ -469,7 +469,7 @@ line|z15[railway=preserved]::d1p3
 }
 line|z15[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
+  color: @light_rail_z15;
   width: 2;
   z-index: 687;
   dashes: 7.6,10.8;
@@ -477,7 +477,7 @@ line|z15[railway=light_rail]::d1p3
 }
 line|z15[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
+  color: @funicular;
   width: 2;
   z-index: 392;
   dashes: 7.2,10.8;
@@ -485,13 +485,13 @@ line|z15[railway=funicular]::d1p2
 }
 line|z15[railway=spur]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.4;
   z-index: 394;
 }
 line|z15[railway=monorail]::d1p3
 {
-  color: #4c0f4c;
+  color: @monorail_line;
   width: 2;
   z-index: 566;
   dashes: 7.2,10.8;
@@ -499,20 +499,20 @@ line|z15[railway=monorail]::d1p3
 }
 line|z15[railway=abandoned]::d1p2
 {
-  color: white;
+  color: @white;
   width: 2;
   z-index: 384;
   opacity: 0.4;
 }
 line|z15-[railway=monorail]
 {
-  color: #4c0f4c;
+  color: @monorail_line;
   width: 3.2;
   z-index: 556;
 }
 line|z15[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2;
   z-index: 404;
   dashes: 11,11;
@@ -520,13 +520,13 @@ line|z15[railway=narrow_gauge]::d1p3
 }
 line|z15[railway=funicular]
 {
-  color: #4c0f0f;
+  color: @funicular_z15;
   width: 3.2;
   z-index: 293;
 }
 line|z15[railway=yard]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 1.4;
   z-index: 412;
   dashes: 6,12;
@@ -534,7 +534,7 @@ line|z15[railway=yard]::d1p3
 }
 line|z15[railway=disused]::d1p2
 {
-  color: #f2f2f2;
+  color: @disused_rail;
   width: 2;
   z-index: 383;
   opacity: 0.7;
@@ -542,7 +542,7 @@ line|z15[railway=disused]::d1p2
 line|z15[railway=disused]::d1p3
 {
   opacity: 0.7;
-  color: grey;
+  color: @gray;
   linecap: butt;
   width: 2;
   z-index: 400;
@@ -551,7 +551,7 @@ line|z15[railway=disused]::d1p3
 line|z15[railway=abandoned]::d1p3
 {
   opacity: 0.4;
-  color: #b2b2b2;
+  color: @abandoned_rail;
   linecap: butt;
   width: 2;
   z-index: 401;
@@ -559,31 +559,31 @@ line|z15[railway=abandoned]::d1p3
 }
 line|z15-[railway=monorail]::d1p2
 {
-  color: #d08080;
+  color: @monorail_z12;
   width: 2;
   z-index: 561;
 }
 line|z15[railway=narrow_gauge]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 3.2;
   z-index: 288;
 }
 line|z15[railway=siding]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2.4;
   z-index: 297;
 }
 line|z15[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
+  color: @funicular_z15;
   width: 0.5;
   z-index: 410;
 }
 line|z16[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2;
   z-index: 647;
   dashes: 14,14;
@@ -591,26 +591,26 @@ line|z16[railway=narrow_gauge]::d1p3
 }
 line|z16[railway=spur]
 {
-  color: #606060;
+  color: @gray60;
   width: 2.4;
   z-index: 547;
 }
 line|z16[railway=funicular]
 {
-  color: #4c0f0f;
+  color: @funicular_z15;
   width: 3.2;
   z-index: 546;
 }
 line|z16[railway=disused]
 {
-  color: grey;
+  color: @gray;
   width: 3.2;
   z-index: 540;
   opacity: 0.7;
 }
 line|z16[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
+  color: @light_rail_z15;
   width: 2;
   z-index: 687;
   dashes: 9.6,14.4;
@@ -618,13 +618,13 @@ line|z16[railway=light_rail]::d1p3
 }
 line|z16[railway=spur]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.2;
   z-index: 638;
 }
 line|z16[railway=spur]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 1.2;
   z-index: 652;
   dashes: 8,16;
@@ -633,7 +633,7 @@ line|z16[railway=spur]::d1p3
 line|z16[railway=razed]
 {
   opacity: 0.3;
-  color: #c2c2c2;
+  color: @razed_rail;
   linecap: butt;
   width: 3.2;
   z-index: 541;
@@ -641,20 +641,20 @@ line|z16[railway=razed]
 }
 line|z16[railway=abandoned]
 {
-  color: #b2b2b2;
+  color: @abandoned_rail;
   width: 3.2;
   z-index: 542;
   opacity: 0.4;
 }
 line|z16[railway=rail]::d1p3
 {
-  color: #666666;
+  color: @rail_z15_base;
   z-index: 543;
   width: 4;
 }
 line|z16-[railway=monorail]::d1p3
 {
-  color: #4c0f4c;
+  color: @monorail_line;
   width: 2;
   z-index: 566;
   dashes: 9.6,14.4;
@@ -662,13 +662,13 @@ line|z16-[railway=monorail]::d1p3
 }
 line|z16[railway=rail]
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 2.4;
   z-index: 631;
 }
 line|z16[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 2;
   z-index: 632;
 }
@@ -679,14 +679,14 @@ node|z16-[railway=level_crossing]
 }
 line|z16[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 2;
   z-index: 633;
 }
 line|z16[railway=abandoned]::d1p3
 {
   opacity: 0.4;
-  color: #b2b2b2;
+  color: @abandoned_rail;
   linecap: butt;
   width: 2.4;
   z-index: 645;
@@ -695,7 +695,7 @@ line|z16[railway=abandoned]::d1p3
 line|z16[railway=disused]::d1p3
 {
   opacity: 0.7;
-  color: grey;
+  color: @gray;
   linecap: butt;
   width: 2.4;
   z-index: 643;
@@ -703,7 +703,7 @@ line|z16[railway=disused]::d1p3
 }
 line|z16[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
+  color: @funicular;
   width: 2;
   z-index: 636;
   dashes: 9.6,14.4;
@@ -711,7 +711,7 @@ line|z16[railway=funicular]::d1p2
 }
 line|z16[railway=preserved]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2;
   z-index: 648;
   dashes: 12,12;
@@ -719,38 +719,38 @@ line|z16[railway=preserved]::d1p3
 }
 line|z16[railway=narrow_gauge]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 3.2;
   z-index: 544;
 }
 line|z16[railway=siding]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2.4;
   z-index: 549;
 }
 line|z16[railway=siding]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.2;
   z-index: 640;
 }
 line|z16[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
+  color: @funicular_z15;
   width: 0.6;
   z-index: 651;
 }
 area|z16[railway=platform],
 line|z16[railway=platform]
 {
-  color: #bbbbbb;
+  color: @railway_platform;
   width: 4;
   z-index: 580;
 }
 line|z16[railway=disused]::d1p2
 {
-  color: #f2f2f2;
+  color: @disused_rail;
   width: 2.4;
   z-index: 627;
   opacity: 0.7;
@@ -762,7 +762,7 @@ node|z16-[railway=crossing]
 }
 line|z16[railway=rail]::d1p5
 {
-  color: #666666;
+  color: @rail_z15_base;
   width: 2.4;
   z-index: 646;
   dashes: 12,12;
@@ -771,11 +771,11 @@ line|z16[railway=rail]::d1p5
 area|z16-[railway=platform],
 line|z16-[railway=platform]
 {
-  fill-color: #bbbbbb;
+  fill-color: @railway_platform;
 }
 line|z16[railway=razed]::d1p2
 {
-  color: white;
+  color: @white;
   width: 2.4;
   z-index: 628;
   opacity: 0.3;
@@ -783,7 +783,7 @@ line|z16[railway=razed]::d1p2
 line|z16[railway=razed]::d1p3
 {
   opacity: 0.3;
-  color: #c2c2c2;
+  color: @razed_rail;
   linecap: butt;
   width: 2.4;
   z-index: 644;
@@ -791,19 +791,19 @@ line|z16[railway=razed]::d1p3
 }
 line|z16[railway=abandoned]::d1p2
 {
-  color: white;
+  color: @white;
   width: 2.4;
   z-index: 629;
   opacity: 0.4;
 }
 line|z16[railway=preserved]
 {
-  color: #909090;
+  color: @gray90;
   width: 3.2;
 }
 line|z16[railway=siding]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 1.2;
   z-index: 654;
   dashes: 8,16;
@@ -811,19 +811,19 @@ line|z16[railway=siding]::d1p3
 }
 line|z16[railway=yard]::railfill
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.2;
   z-index: 639;
 }
 line|z16[railway=yard]::railborder
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2.4;
   z-index: 548;
 }
 line|z16[railway=yard]::raildash
 {
-  color: #333333;
+  color: @rail_z15;
   width: 1.2;
   z-index: 653;
   dashes: 8,16;
@@ -831,14 +831,14 @@ line|z16[railway=yard]::raildash
 }
 line|z17-[railway=rail]
 {
-  color: #666666;
+  color: @rail_z15_base;
   z-index: 568;
   width: 4.4;
 }
 line|z17-[railway=razed]::d1p3
 {
   opacity: 0.3;
-  color: #c2c2c2;
+  color: @razed_rail;
   linecap: butt;
   width: 2;
   z-index: 678;
@@ -846,37 +846,37 @@ line|z17-[railway=razed]::d1p3
 }
 line|z17-[railway=narrow_gauge]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 3.2;
   z-index: 569;
 }
 line|z17-[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 2;
   z-index: 665;
 }
 line|z17-[railway=light_rail]
 {
-  color: #0f4c0f;
+  color: @light_rail_z15;
   width: 3.2;
   z-index: 571;
 }
 line|z17-[railway=yard]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.36;
   z-index: 672;
 }
 line|z17-[railway=yard]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2.4;
   z-index: 577;
 }
 line|z17-[railway=rail]::d1p5
 {
-  color: #666666;
+  color: @rail_z15_base;
   width: 3.2;
   z-index: 681;
   dashes: 12,12;
@@ -884,20 +884,20 @@ line|z17-[railway=rail]::d1p5
 }
 line|z17-[railway=spur]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.36;
   z-index: 671;
 }
 line|z17-[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 2;
   z-index: 666;
 }
 line|z17-[railway=disused]::d1p3
 {
   opacity: 0.7;
-  color: grey;
+  color: @gray;
   linecap: butt;
   width: 2;
   z-index: 677;
@@ -906,12 +906,12 @@ line|z17-[railway=disused]::d1p3
 area|z17-[railway=platform],
 line|z17-[railway=platform]
 {
-  color: #bbbbbb;
+  color: @railway_platform;
   width: 8;
 }
 line|z17-[railway=siding]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 1.36;
   z-index: 692;
   dashes: 7.2,16.8;
@@ -919,34 +919,34 @@ line|z17-[railway=siding]::d1p3
 }
 line|z17-[railway=siding]::d1p2
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 1.36;
   z-index: 673;
 }
 line|z17-[railway=razed]::d1p2
 {
-  color: white;
+  color: @white;
   width: 2;
   z-index: 662;
   opacity: 0.3;
 }
 line|z17-[railway=abandoned]
 {
-  color: #b2b2b2;
+  color: @abandoned_rail;
   width: 3.2;
   z-index: 565;
   opacity: 0.4;
 }
 line|z17-[railway=disused]
 {
-  color: grey;
+  color: @gray;
   width: 3.2;
   z-index: 564;
   opacity: 0.7;
 }
 line|z17-[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
+  color: @light_rail_z15;
   width: 2;
   z-index: 684;
   dashes: 9.6,14.4;
@@ -954,25 +954,25 @@ line|z17-[railway=light_rail]::d1p3
 }
 line|z17-[railway=rail]::d1p4
 {
-  color: #e6e6e6;
+  color: @rail_z14_base;
   width: 3.2;
   z-index: 664;
 }
 line|z17-[railway=spur]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2.4;
   z-index: 576;
 }
 line|z17-[railway=siding]
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2.4;
   z-index: 578;
 }
 line|z17-[railway=disused]::d1p2
 {
-  color: #f2f2f2;
+  color: @disused_rail;
   width: 2;
   z-index: 661;
   opacity: 0.7;
@@ -980,7 +980,7 @@ line|z17-[railway=disused]::d1p2
 line|z17-[railway=razed]
 {
   opacity: 0.3;
-  color: #c2c2c2;
+  color: @razed_rail;
   linecap: butt;
   width: 3.2;
   z-index: 567;
@@ -988,14 +988,14 @@ line|z17-[railway=razed]
 }
 line|z17-[railway=funicular]
 {
-  color: #4c0f0f;
+  color: @funicular_z15;
   width: 3.2;
   z-index: 574;
 }
 line|z17-[railway=abandoned]::d1p3
 {
   opacity: 0.4;
-  color: #b2b2b2;
+  color: @abandoned_rail;
   linecap: butt;
   width: 2;
   z-index: 679;
@@ -1003,13 +1003,13 @@ line|z17-[railway=abandoned]::d1p3
 }
 line|z17-[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
+  color: @light_rail;
   width: 2;
   z-index: 667;
 }
 line|z17-[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
+  color: @funicular;
   width: 2;
   z-index: 670;
   dashes: 9.6,14.4;
@@ -1017,13 +1017,13 @@ line|z17-[railway=funicular]::d1p2
 }
 line|z17-[railway=preserved]
 {
-  color: #909090;
+  color: @gray90;
   width: 3.2;
   z-index: 570;
 }
 line|z17-[railway=preserved]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2;
   z-index: 683;
   dashes: 12,12;
@@ -1031,20 +1031,20 @@ line|z17-[railway=preserved]::d1p3
 }
 line|z17-[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
+  color: @funicular_z15;
   width: 0.64;
   z-index: 688;
 }
 line|z17-[railway=abandoned]::d1p2
 {
-  color: white;
+  color: @white;
   width: 2;
   z-index: 663;
   opacity: 0.4;
 }
 line|z17-[railway=yard]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 1.36;
   z-index: 691;
   dashes: 7.2,16.8;
@@ -1052,7 +1052,7 @@ line|z17-[railway=yard]::d1p3
 }
 line|z17-[railway=spur]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 1.36;
   z-index: 690;
   dashes: 7.2,16.8;
@@ -1060,7 +1060,7 @@ line|z17-[railway=spur]::d1p3
 }
 line|z17-[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
+  color: @rail_z15;
   width: 2;
   z-index: 682;
   dashes: 14.4,14.4;
@@ -1074,9 +1074,9 @@ area|z15-[railway=halt],
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
+  text-color: @station_name;
   text-offset: 10;
-  text-halo-color: #f8fcff;
+  text-halo-color: @station_name_halo;
   z-index: 170;
 }
 
diff --git a/data/styles/include/base_roads.mapcss b/data/styles/include/base_roads.mapcss
index 7d0c670ae1..553f1e7fd7 100644
--- a/data/styles/include/base_roads.mapcss
+++ b/data/styles/include/base_roads.mapcss
@@ -1,6 +1,6 @@
 line[highway]
 {
-  casing-color: #B5944C;
+  casing-color: @highway_casing;
   casing-width: 0.8;
 }
 
@@ -19,108 +19,108 @@ line[highway=residential],
 line[highway=unclassified],
 line[highway=secondary]
 {
-  casing-color: #c8c8af;
+  casing-color: @highway_minor_casing;
 }
 line|z7[highway=trunk]
 {
-  color: #eed4a6;
+  color: @highway_trunk_z7;
   width: 1;
 }
 line|z7[highway=motorway]
 {
-  color: #efbb6e;
+  color: @highway_motorway_z7;
   width: 1;
 }
 line|z8[highway=trunk]
 {
-  color: #f7d396;
+  color: @highway_trunk_z8;
   width: 2;
 }
 line|z8[highway=motorway]
 {
-  color: #ef9721;
+  color: @highway_motorway_z8;
   width: 2;
 }
 line|z9-10[highway=trunk]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 2;
 }
 line|z9[highway=motorway]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 3;
 }
 line|z9-10[highway=secondary]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 1;
 }
 line|z10[highway=motorway]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 4;
 }
 line|z10-12[highway=byway]
 {
-  color: #c0a87c;
+  color: @highway_track;
   width: 1;
   dashes: 4.5,3;
 }
 line|z8-10[highway=primary]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 1;
 }
 line|z11[highway=primary]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 2;
 }
 line|z11[highway=trunk]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 3;
 }
 line|z11[highway=secondary]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 2;
 }
 line|z10-11[highway=primary_link]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 1;
 }
 line|z11[highway=motorway]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 4;
-  casing-color: #b87c04;
+  casing-color: @hw_motorway_casing;
 }
 line|z12[highway=primary]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 3;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z12[highway=trunk]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 3;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z12[highway=tertiary]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 1;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z12[highway=secondary]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 3;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z10-11[highway=primary],
 line|z10-11[highway=trunk],
@@ -129,7 +129,7 @@ line|z10-11[highway=motorway]
   font-size: 10;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color: @hw_primary_trunk;
 }
 line|z12-13[highway=primary],
 line|z12-13[highway=trunk],
@@ -138,49 +138,49 @@ line|z12-13[highway=motorway]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color: @hw_primary_trunk;
 }
 line|z12[highway=motorway]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 6;
-  casing-color: #b87c04;
+  casing-color: @hw_motorway_casing;
 }
 line|z12[highway=raceway]
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 0.38;
 }
 line|z12[highway=primary_link]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 3;
 }
 line|z12[highway=tertiary_link]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 1;
 }
 line|z13-14[highway=byway]
 {
-  color: #c0a87c;
+  color: @highway_track;
   width: 1;
 }
 line|z13[highway=secondary]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 4;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z13[highway=tertiary]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 2;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z13[highway=tertiary_link]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 2.75;
 }
 line|z13-15[highway=secondary]
@@ -188,39 +188,39 @@ line|z13-15[highway=secondary]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 line|z13[highway=raceway]
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 0.75;
 }
 line|z13[highway=primary_link]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 3;
 }
 line|z13[highway=construction]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 2.75;
   dashes: 4,4;
   linecap: butt;
 }
 line|z13[highway=ford]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2.75;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z13[highway=bridleway]
 {
-  color: #a9d355;
+  color: @highway_bridleway_z13;
   width: 0.9;
 }
 line|z13[highway=unclassified]
 {
-  color: white;
+  color: @white;
   width: 1;
 }
 line|z13-14[highway=motorway]
@@ -228,53 +228,53 @@ line|z13-14[highway=motorway]
   font-size: 16;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 line|z13[highway=residential],
 line|z13[highway=service],
 line|z13[highway=living_street]
 {
-  color: white;
+  color: @white;
   width: 1;
-  casing-color: #c8c8af;
+  casing-color: @highway_minor_casing;
 }
 line|z13[highway=road]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 1;
-  casing-color: #c8c8af;
+  casing-color: @highway_minor_casing;
 }
 line|z13[highway=primary]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 5;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z13[highway=trunk]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 5;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z13[highway=motorway]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 8;
-  casing-color: #b87c04;
+  casing-color: @hw_motorway_casing;
 }
 line|z13[highway=track]
 {
-  color: #d79331;
+  color: @highway_path;
   width: 1;
 }
 line|z14[highway=cycleway]
 {
-  color: #4dbf4d;
+  color: @cycleway_z14;
   width: 1;
 }
 line|z14[highway=raceway]
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 3;
 }
 line|z14-[highway=tertiary]
@@ -282,24 +282,24 @@ line|z14-[highway=tertiary]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 line|z14[highway=ford]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 3.5;
-  casing-color: #101010;
+  casing-color: @ford_casing;
 }
 line|z14[highway=construction]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 3.5;
   dashes: 4,4;
   linecap: butt;
 }
 line|z14[highway=motorway_link]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 5.5;
 }
 line|z14[highway=primary],
@@ -308,7 +308,7 @@ line|z14[highway=trunk]
   font-size: 14;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color: @hw_primary_trunk;
 }
 line|z15[highway=primary],
 line|z15[highway=trunk]
@@ -316,42 +316,42 @@ line|z15[highway=trunk]
   font-size: 15;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color: @hw_primary_trunk;
 }
 line|z14[highway=motorway]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 12;
-  casing-color: #b87c04;
+  casing-color: @hw_motorway_casing;
 }
 line|z14[highway=residential],
 line|z14[highway=service],
 line|z14[highway=unclassified],
 line|z14[highway=living_street]
 {
-  color: white;
+  color: @white;
   width: 2;
-  casing-color: #c8c8af;
+  casing-color: @highway_minor_casing;
 }
 line|z14[highway=tertiary]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 3;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z14[highway=track]
 {
-  color: #d79331;
+  color: @highway_path;
   width: 1;
 }
 line|z14[highway=bridleway]
 {
-  color: #8fbf4d;
+  color: @highway_bridleway_z14;
   width: 1.6;
 }
 line|z14[highway=primary_link]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 4.5;
 }
 line|z15[highway=living_street],
@@ -364,116 +364,116 @@ line|z15-[highway=tertiary_link]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 line|z14[highway=tertiary_link]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 4.5;
 }
 line|z14[highway=secondary]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 5;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z14[highway=primary]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 7;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z14[highway=trunk]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 7;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z10-12[highway=secondary_link]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 1;
 }
 line|z13[highway=secondary_link]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 2;
 }
 line|z14[highway=secondary_link]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 4.5;
 }
 line|z14[highway=road]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 3.5;
 }
 line|z13-15[highway=footway]
 {
-  color: #d0ccbc;
+  color: @footway;
   width: 1;
   dashes: 4,4;
 }
 line|z13-[highway=path]
 {
-  color: #d79331;
+  color: @highway_path;
   width: 1;
   dashes: 4,4;
 }
 line|z15[highway=raceway]
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 3;
 }
 line|z15-16[highway=motorway]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 16;
-  casing-color: #b87c04;
+  casing-color: @hw_motorway_casing;
 }
 line|z10-12[highway=trunk_link]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 1;
 }
 line|z13[highway=trunk_link]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 2;
 }
 line|z14[highway=trunk_link]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 4;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z15[highway=primary]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 8;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z15[highway=trunk],
 line|z15[highway=trunk_link]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 8;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z15[highway=track]
 {
-  color: #c0a87c;
+  color: @highway_track;
   width: 2;
 }
 line|z15-[highway=pedestrian]
 {
-  color: #B9BA95;
+  color: @highway_pedestrian;
 }
 area|z15-[highway=pedestrian][area?],
 area|z15-[area:highway=pedestrian],
 {
-  fill-color: #B9BA95;
+  fill-color: @highway_pedestrian;
 }
 line|z15[highway=pedestrian]
 {
@@ -481,28 +481,28 @@ line|z15[highway=pedestrian]
 }
 line|z15[highway=byway]
 {
-  color: #c0a87c;
+  color: @highway_track;
   width: 2;
 }
 line|z15[highway=primary_link]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 9;
 }
 line|z15[highway=secondary]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 7;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z15[highway=road]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 7;
 }
 line|z15[highway=raceway]::d2p2
 {
-  color: red;
+  color: @red;
   width: 3.4;
   z-index: 187;
   dashes: 0.4,0.4;
@@ -514,48 +514,48 @@ line|z14-[highway=unclassified]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
+  text-color: @gray50;
 }
 line|z15[highway=tertiary_link]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 9;
 }
 line|z15[highway=raceway]::out
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 6;
   z-index: 342;
 }
 line|z15[highway=bridleway]
 {
-  color: #d3cb98;
+  color: @highway_bridleway;
   width: 3.2;
 }
 line|z15[highway=secondary_link]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 9;
 }
 line|z15[highway=construction]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 7;
   dashes: 4,4;
   linecap: butt;
 }
 area|z15-[highway=byway][area?]
 {
-  fill-color: #efadaa;
+  fill-color: @highway_byway_fill;
 }
 line|z15[highway=service]
 {
-  color: #fdfdfd;
+  color: @highway_service_z15;
   width: 3;
 }
 line|z15[highway=raceway]
 {
-  color: white;
+  color: @white;
   width: 3.4;
   z-index: 186;
 }
@@ -564,101 +564,101 @@ line|z15[highway=motorway]
   font-size: 17;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 line|z15[highway=tertiary]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 4;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z15[highway=ford]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 7;
-  casing-color: #707070;
+  casing-color: @gray70;
 }
 area|z15-[highway=footway][area?]
 {
-  fill-color: #f8f0e8;
+  fill-color: @highway_footway_fill;
 }
 line|z12[highway=motorway_link]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 1;
 }
 line|z13[highway=motorway_link]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 2;
 }
 line|z14[highway=motorway_link]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 4;
 }
 line|z15[highway=motorway_link]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 8;
 }
 line|z15[highway=residential],
 line|z15[highway=unclassified],
 line|z15[highway=living_street]
 {
-  color: white;
+  color: @white;
   width: 4;
-  casing-color: #c8c8af;
+  casing-color: @highway_minor_casing;
 }
 line|z15[highway=cycleway]
 {
-  color: #90bc90;
+  color: @cycleway;
   width: 1;
 }
 line|z16[highway=footway][sac_scale=demanding_mountain_hiking],
 line|z16[highway=path][sac_scale=demanding_mountain_hiking]
 {
-  color: red;
+  color: @red;
   width: 1.2;
   dashes: 0.16,2.4;
   linecap: butt;
 }
 line|z16[highway=bridleway]
 {
-  color: #d3cb98;
+  color: @highway_bridleway;
   width: 6.4;
 }
 line|z16[highway=primary_link]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 12;
 }
 line|z16[highway=construction]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 9;
   dashes: 4,4;
   linecap: butt;
 }
 line|z16[highway=byway]
 {
-  color: #c0a87c;
+  color: @highway_track;
   width: 4;
 }
 line|z16[highway=cycleway]
 {
-  color: #90bc90;
+  color: @cycleway;
   width: 2;
 }
 line|z16[highway=path][route=hiking],
 line|z16[highway=footway][sac_scale=hiking]
 {
-  color: red;
+  color: @red;
   width: 1.2;
 }
 line|z16[highway=road]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 9;
 }
 line|z16-[highway=motorway]
@@ -666,17 +666,17 @@ line|z16-[highway=motorway]
   font-size: 18;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color: @dark_gray_20;
 }
 line|z16[highway=secondary]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 11;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z16[highway=raceway]::d2p3
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 6;
   z-index: 603;
 }
@@ -689,12 +689,12 @@ line|z16[highway=secondary]
   font-size: 14;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 line|z16[highway=footway][sac_scale=mountain_hiking],
 line|z16[highway=path][sac_scale=mountain_hiking]
 {
-  color: red;
+  color: @red;
   width: 1.2;
   dashes: 2,2;
   linecap: butt;
@@ -702,73 +702,73 @@ line|z16[highway=path][sac_scale=mountain_hiking]
 line|z16[highway=footway][sac_scale=difficult_alpine_hiking],
 line|z16[highway=path][sac_scale=difficult_alpine_hiking]
 {
-  color: blue;
+  color: @alpine_hiking;
   width: 1.2;
   dashes: 0.16,2.4;
   linecap: butt;
 }
 line|z16[highway=footway]
 {
-  color: #d0ccbc;
+  color: @footway;
   width: 2;
 }
 line|z16[highway=path][sac_scale=alpine_hiking],
 line|z16[highway=footway][sac_scale=alpine_hiking]
 {
-  color: blue;
+  color: @alpine_hiking;
   width: 1.2;
 }
 line|z16[highway=service]
 {
-  color: white;
+  color: @white;
   width: 5;
 }
 line|z16[highway=path][sac_scale=demanding_alpine_hiking],
 line|z16[highway=footway][sac_scale=demanding_alpine_hiking]
 {
-  color: blue;
+  color: @alpine_hiking;
   width: 1.2;
   dashes: 2,2;
   linecap: butt;
 }
 line|z16[highway=raceway]
 {
-  color: white;
+  color: @white;
   width: 6.8;
 }
 line|z16[highway=tertiary]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 6;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z16[highway=tertiary_link]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 12;
 }
 line|z16-[highway=motorway_link]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 12;
 }
 line|z15-16[highway=primary]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 14;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z16[highway=trunk],
 line|z16[highway=trunk_link]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 14;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z16[highway=steps]
 {
   width: 4;
-  color: #d0ccac;
+  color: @highway_steps;
   linecap: butt;
   dashes: 2.4,0.8;
 }
@@ -776,13 +776,13 @@ line|z16[highway=residential],
 line|z16[highway=unclassified],
 line|z16[highway=living_street]
 {
-  color: white;
+  color: @white;
   width: 6;
-  casing-color: #c8c8af;
+  casing-color: @highway_minor_casing;
 }
 line|z16[highway=raceway]::d2p2
 {
-  color: red;
+  color: @red;
   width: 6.8;
   z-index: 461;
   dashes: 0.8,0.8;
@@ -790,20 +790,20 @@ line|z16[highway=raceway]::d2p2
 }
 line|z16[highway=raceway]
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 12;
   z-index: 587;
 }
 line|z16-[highway=secondary_link]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 12;
 }
 line|z16[highway=ford]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 9;
-  casing-color: #707070;
+  casing-color: @gray70;
 }
 line|z15-[highway=primary],
 line|z15-[highway=trunk],
@@ -812,7 +812,7 @@ line|z15-[highway=trunk_link]
   font-size: 17;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 line|z15-[highway=bridleway],
 line|z15-[highway=byway],
@@ -823,7 +823,7 @@ line|z15-[highway=service]
 {
   font-size: 10;
   text: name;
-  text-color: #707070;
+  text-color: @gray70;
 }
 line|z15-[highway=footway],
 line|z15-[highway=cycleway],
@@ -833,11 +833,11 @@ line|z15-[highway=track]
 {
   font-size: 10;
   text: name;
-  text-color: #505050;
+  text-color: @gray50;
 }
 line|z16[highway=track]
 {
-  color: #c0a87c;
+  color: @highway_track;
   width: 4;
 }
 line|z17-[highway=pedestrian]
@@ -848,13 +848,13 @@ line|z17[highway=steps]::d1p2
 {
   width: 4;
   z-index: 300;
-  color: #d0ccac;
+  color: @highway_steps;
   linecap: butt;
   dashes: 2.4,1;
 }
 line|z17[highway=steps]
 {
-  color: #a0a090;
+  color: @country_name;
   width: 6;
   linecap: butt;
 }
@@ -862,13 +862,13 @@ line|z18[highway=steps]::d1p2
 {
   width: 8;
   z-index: 300;
-  color: #d0ccac;
+  color: @highway_steps;
   linecap: butt;
   dashes: 3,1;
 }
 line|z18[highway=steps]
 {
-  color: #a0a090;
+  color: @country_name;
   width: 10;
   linecap: butt;
 }
@@ -876,19 +876,19 @@ line|z19-[highway=steps]::d1p2
 {
   width: 16;
   z-index: 300;
-  color: #d0ccac;
+  color: @highway_steps;
   linecap: butt;
   dashes: 4,1;
 }
 line|z19-[highway=steps]
 {
-  color: #a0a090;
+  color: @country_name;
   width: 18;
   linecap: butt;
 }
 line|z17-[highway=service]
 {
-  color: white;
+  color: @white;
   width: 7;
 }
 
@@ -898,20 +898,20 @@ line|z17[highway=footway][!area][!sac_scale]::dashes
 {
   width: 4;
   z-index: 692;
-  color: #d0ccbc;
+  color: @footway;
   linecap: butt;
   dashes: 1,3;
 }
 line|z17-[highway=footway][!area][!sac_scale]
 {
-  color: #d0ccbc;
+  color: @footway;
   width: 5;
 }
 line|z18[highway=footway][!area][!sac_scale]::dashes
 {
   width: 8;
   z-index: 692;
-  color: #d0ccbc;
+  color: @footway;
   linecap: butt;
   dashes: 1,3;
 }
@@ -925,7 +925,7 @@ line|z19-[highway=footway][!area][!sac_scale]::dashes
 {
   width: 16;
   z-index: 692;
-  color: #d0ccbc;
+  color: @footway;
   linecap: butt;
   dashes: 1,4;
 }
@@ -938,7 +938,7 @@ line|z19-[highway=pedestrian],
 line|z17-[highway=footway][sac_scale=demanding_alpine_hiking],
 line|z17-[highway=path][sac_scale=demanding_alpine_hiking]
 {
-  color: blue;
+  color: @alpine_hiking;
   width: 0.8;
   dashes: 4,4;
   linecap: butt;
@@ -946,7 +946,7 @@ line|z17-[highway=path][sac_scale=demanding_alpine_hiking]
 line|z17-[highway=footway][sac_scale=demanding_mountain_hiking],
 line|z17-[highway=path][sac_scale=demanding_mountain_hiking]
 {
-  color: red;
+  color: @red;
   width: 0.8;
   dashes: 0.08,1.2;
   linecap: butt;
@@ -954,14 +954,14 @@ line|z17-[highway=path][sac_scale=demanding_mountain_hiking]
 line|z17-[highway=proposed],
 line|z17-[highway=construction]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 10;
   dashes: 4,4;
   linecap: butt;
 }
 line|z17-[highway=raceway]
 {
-  color: white;
+  color: @white;
   width: 13.6;
   z-index: 474;
 }
@@ -969,37 +969,37 @@ line|z17-[highway=residential],
 line|z17-[highway=unclassified],
 line|z17-[highway=living_street]
 {
-  color: white;
+  color: @white;
   width: 8;
-  casing-color: #c8c8af;
+  casing-color: @highway_minor_casing;
 }
 line|z17-[highway=footway][sac_scale=mountain_hiking],
 line|z17-[highway=path][sac_scale=mountain_hiking]
 {
-  color: red;
+  color: @red;
   width: 0.8;
   dashes: 4,4;
   linecap: butt;
 }
 line|z17-[highway=raceway]::d2p3
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 12;
   z-index: 635;
 }
 line|z17-[highway=primary_link]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 12;
 }
 line|z17-[highway=raceway]
 {
-  color: #e8e4d4;
+  color: @highway_raceway;
   width: 12;
 }
 line|z17-[highway=raceway]::d2p2
 {
-  color: red;
+  color: @red;
   width: 13.6;
   z-index: 475;
   dashes: 1.6,1.6;
@@ -1007,69 +1007,69 @@ line|z17-[highway=raceway]::d2p2
 }
 line|z17-[highway=secondary]
 {
-  color: #fffb80;
+  color: @highway_secondary;
   width: 14;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z17-[highway=bridleway]
 {
-  color: #d3cb98;
+  color: @highway_bridleway;
   width: 6.8;
 }
 line|z17-[highway=primary]
 {
-  color: #FDE066;
+  color: @highway_primary;
   width: 16;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z17-[highway=trunk],
 line|z17-[highway=trunk_link]
 {
-  color: #ffc444;
+  color: @highway_trunk;
   width: 16;
-  casing-color: #d8a050;
+  casing-color: @hw_trunk_primary_casing;
 }
 line|z17-[highway=ford]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 10;
-  casing-color: #707070;
+  casing-color: @gray70;
 }
 line|z17-[highway=byway]
 {
-  color: #c0a87c;
+  color: @highway_track;
   width: 6;
 }
 line|z17-[highway=path][route=hiking],
 line|z17-[highway=footway][sac_scale=hiking]
 {
-  color: red;
+  color: @red;
   width: 0.8;
 }
 line|z17-[highway=tertiary_link]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 12;
 }
 line|z17-[highway=track]
 {
-  color: #c0a87c;
+  color: @highway_track;
   width: 6;
 }
 line|z17-[highway=cycleway]
 {
-  color: #90bc90;
+  color: @cycleway;
   width: 3;
 }
 line|z17-[highway=motorway]
 {
-  color: #f08800;
+  color: @highway_motorway;
   width: 17;
-  casing-color: #b87c04;
+  casing-color: @hw_motorway_casing;
 }
 line|z17-[highway=road]
 {
-  color: #d0d0d0;
+  color: @hw_construction;
   width: 10;
 }
 line|z17-[highway=secondary]
@@ -1077,12 +1077,12 @@ line|z17-[highway=secondary]
   font-size: 16;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color: @dark_gray_40;
 }
 line|z17-[highway=footway][sac_scale=difficult_alpine_hiking],
 line|z17-[highway=path][sac_scale=difficult_alpine_hiking]
 {
-  color: blue;
+  color: @alpine_hiking;
   width: 0.8;
   dashes: 0.08,1.2;
   linecap: butt;
@@ -1090,14 +1090,14 @@ line|z17-[highway=path][sac_scale=difficult_alpine_hiking]
 line|z17-[highway=path][sac_scale=alpine_hiking],
 line|z17-[highway=footway][sac_scale=alpine_hiking]
 {
-  color: blue;
+  color: @alpine_hiking;
   width: 0.8;
 }
 line|z17-[highway=tertiary]
 {
-  color: #ffff90;
+  color: @highway_tertiary;
   width: 12;
-  casing-color: #c8c860;
+  casing-color: @hw_secondary_tertiary_casing;
 }
 line|z18[highway=motorway],
 line|z18[highway=motorway_link],
@@ -1138,7 +1138,7 @@ area|z15-[area:highway=footway],
 area|z15-[area:highway=path],
 area|z15-[area:highway=steps]
 {
-  fill-color: #d0ccbc;
+  fill-color: @footway;
 }
 line[highway=footway],
 line[highway=pedestrian],
@@ -1234,6 +1234,6 @@ area|z15-[area:highway=footway],
 {
   text: name;
   font-size: 11;
-  text-color: #404040;
+  text-color: @dark_gray_40;
   text-position: center
 }
diff --git a/data/styles/include/base_roads_UK.mapcss b/data/styles/include/base_roads_UK.mapcss
index 9d9885798f..e1f8d18920 100644
--- a/data/styles/include/base_roads_UK.mapcss
+++ b/data/styles/include/base_roads_UK.mapcss
@@ -2,34 +2,34 @@
 *[highway=motorway_link],
 area[area:highway=motorway]
 {
-  fill-color: #8AC;
-  color: #8AC;
-  text-halo-color: #8AC;
+  fill-color: @uk_motorway;
+  color: @uk_motorway;
+  text-halo-color: @uk_motorway;
 }
 
 *[highway=trunk],
 *[highway=trunk_link],
 area[area:highway=trunk]
 {
-  fill-color: #9D9;
-  color: #9D9;
-  text-halo-color: #9D9;
+  fill-color: @uk_trunk;
+  color: @uk_trunk;
+  text-halo-color: @uk_trunk;
 }
 
 *[highway=primary],
 *[highway=primary_link],
 area[area:highway=primary]
 {
-  fill-color: #D99;
-  color: #D99;
-  text-halo-color: #D99;
+  fill-color: @uk_primary;
+  color: @uk_primary;
+  text-halo-color: @uk_primary;
 }
 
 *[highway=secondary],
 *[highway=secondary_link],
 area[area:highway=secondary]
 {
-  fill-color: #FDA;
-  color: #FDA;
-  text-halo-color: #FDA;
+  fill-color: @uk_secondary;
+  color: @uk_secondary;
+  text-halo-color: @uk_secondary;
 }
diff --git a/data/styles/include/base_shop.mapcss b/data/styles/include/base_shop.mapcss
index f981023e70..384d98f897 100644
--- a/data/styles/include/base_shop.mapcss
+++ b/data/styles/include/base_shop.mapcss
@@ -9,9 +9,9 @@ node|z17-[shop][shop!=no],
   font-size: 11;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color: @dark_gray_40;
   text-offset: 10;
-  text-halo-color: white;
+  text-halo-color: @white;
   z-index: 1;
 }
 
@@ -82,4 +82,4 @@ area|z16-[shop=clothes],
 node|z16-[shop=clothes]
 {
   icon-image: clothes.svg;
-}
\ No newline at end of file
+}
diff --git a/data/styles/include/base_sport.mapcss b/data/styles/include/base_sport.mapcss
index bdefe2424b..e7994b2aa0 100644
--- a/data/styles/include/base_sport.mapcss
+++ b/data/styles/include/base_sport.mapcss
@@ -7,7 +7,7 @@ area|z12-[leisure=sports_centre],
 area|z12-[leisure=stadium],
 area|z12-[leisure=track]
 {
-  fill-color: #d0e8c4;
+  fill-color: @greenfill;
 }
 
 area|z17-[leisure=sports_centre],
@@ -18,8 +18,8 @@ node|z17-[leisure=sports_centre]
   font-size: 12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: white;
+  text-color: @dark_gray_40;
+  text-halo-color: @white;
 }
 
 area|z13-[leisure=dog_park][sport=tennis],
@@ -27,7 +27,7 @@ area|z13-[leisure=pitch][sport=tennis],
 area|z13-[leisure=playground][sport=tennis],
 area|z13-[leisure=playing_fields][sport=tennis]
 {
-  fill-color: #ddb298;
+  fill-color: @pitch_fill;
 }
 
 area|z17-[sport=gymnastics],
@@ -135,7 +135,7 @@ node|z17-[sport=basketball]
 line|z15-[marking=sport]
 {
   width: 0.5;
-  color: white;
+  color: @white;
 }
 line|z15-[marking=sport][colour?]
 {
diff --git a/data/styles/include/base_water.mapcss b/data/styles/include/base_water.mapcss
index df29c1c202..3e93972212 100644
--- a/data/styles/include/base_water.mapcss
+++ b/data/styles/include/base_water.mapcss
@@ -2,7 +2,7 @@ node|z1-[place=ocean]
 {
   text: name;
   font-size:8;
-  text-color:#4976d1;
+  text-color:@sea_name;
   z-index:-1
 }
 node|z2-[place=ocean]
@@ -21,7 +21,7 @@ node|z3-[place=sea]
 {
   text: name;
   font-size: 8;
-  text-color: #4976d1;
+  text-color: @sea_name;
 }
 node|z7-[place=sea]
 {
@@ -42,69 +42,69 @@ area|z10-[waterway=dock],
 area|z10-[waterway=riverbank],
 area|z14-[natural=bay],
 {
-  fill-color: #B9D4D4;
+  fill-color: @water;
   z-index: 100;
 }
 line|z10[waterway=river]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 0.5;
 }
 area|z13-[leisure=water_park],
 line|z11[waterway=river]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 1;
 }
 line|z12[waterway=river]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2.5;
 }
 area|z14-[natural=wetland],
 area|z12-[natural=wetland][wetland=bog]
 {
-  fill-color: #a0c3b8;
+  fill-color: @wetland_fill;
 }
 line|z12[waterway=drain]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 1;
   z-index: 67;
 }
 line|z12[waterway=ditch]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 0.3;
   z-index: 68;
 }
 line|z12[waterway=stream]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 0.75;
   z-index: 65;
 }
 line|z12[waterway=canal]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2.5;
 }
 line|z13[waterway=drain]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 1.5;
   z-index: 77;
 }
 line|z13[waterway=river]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 3;
 }
 area|z11-[natural=water]
 {
   text: name;
   font-size: 10;
-  text-color: #507cea;
+  text-color: @water_name;
 }
 area|z14[natural=water]
 {
@@ -123,30 +123,30 @@ area|z16-[natural=water]
 }
 line|z13[waterway=ditch]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 0.4;
   z-index: 78;
 }
 line|z13[waterway=stream]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 1;
   z-index: 75;
 }
 line|z13[waterway=canal]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 3;
 }
 line|z14[natural=spring],
 line|z14[waterway=river]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 4;
 }
 line|z14[waterway=stream][intermittent=yes]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 1;
   z-index: 100;
   dashes: 2.4,0.8;
@@ -154,23 +154,23 @@ line|z14[waterway=stream][intermittent=yes]
 }
 line|z14[waterway=dam]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 0.38;
   z-index: 124;
 }
 line|z14[waterway=lock]
 {
-  color: #f8f8f8;
+  color: @waterway_lock;
   width: 5;
   z-index: 88;
   casing-width: 0.5;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z11-13[waterway=river]
 {
   text: name;
   font-size: 10;
-  text-color: #507cea;
+  text-color: @water_name;
 }
 line|z14-[natural=spring],
 line|z14-[waterway=canal],
@@ -178,33 +178,33 @@ line|z14-[waterway=river]
 {
   text: name;
   font-size: 12;
-  text-color: #507cea;
+  text-color: @water_name;
 }
 line|z14[waterway=canal]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 4;
 }
 line|z14[waterway=drain]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2.3;
 }
 line|z14[waterway=ditch]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 0.3;
   z-index: 104;
 }
 line|z14[waterway=stream]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 1;
   z-index: 101;
 }
 line|z14[waterway=stream][intermittent=ephemeral]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 1;
   z-index: 99;
   dashes: 1.6,1.6;
@@ -212,43 +212,43 @@ line|z14[waterway=stream][intermittent=ephemeral]
 }
 line|z14[waterway=weir]
 {
-  color: #000044;
+  color: @waterway_weir;
   width: 0.25;
   z-index: 123;
 }
 line|z15[waterway=weir]
 {
-  color: #000044;
+  color: @waterway_weir;
   width: 1;
   z-index: 128;
 }
 line|z15[waterway=canal]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 4;
 }
 line|z15[waterway=stream][intermittent=yes]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2;
   dashes: 2.4,0.8;
   linecap: butt;
 }
 line|z15[waterway=ditch]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 0.6;
   z-index: 109;
 }
 line|z15[waterway=stream]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2;
   z-index: 106;
 }
 line|z15[waterway=stream][intermittent=ephemeral]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2;
   z-index: 104;
   dashes: 1.6,1.6;
@@ -256,48 +256,48 @@ line|z15[waterway=stream][intermittent=ephemeral]
 }
 line|z15[waterway=lock]
 {
-  color: #f8f8f8;
+  color: @waterway_lock;
   width: 9;
   z-index: 92;
   casing-width: 0.5;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z15[natural=spring],
 line|z15[waterway=river]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 5;
 }
 line|z15[waterway=drain]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2.8;
   z-index: 108;
   casing-width: 0.35;
-  casing-color: #b0b0b0;
+  casing-color: @grayb0;
 }
 line|z15[waterway=dam]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 1.5;
   z-index: 129;
 }
 line|z15[man_made=breakwater]
 {
-  color: #707070;
+  color: @gray70;
   width: 2;
 }
 line|z16[waterway=lock]
 {
-  color: #f8f8f8;
+  color: @waterway_lock;
   width: 10;
   z-index: 94;
   casing-width: 1;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z16[waterway=dam]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 3;
   z-index: 131;
 }
@@ -305,9 +305,9 @@ line|z16[waterway=drain]
 {
   width: 4;
   z-index: 110;
-  color: #B9D4D4;
+  color: @water;
   casing-width: 0.6;
-  casing-color: #b0b0b0;
+  casing-color: @grayb0;
 }
 line|z15-[waterway=ditch],
 line|z15-[waterway=drain],
@@ -315,11 +315,11 @@ line|z15-[waterway=stream]
 {
   text: name;
   font-size: 12;
-  text-color: #507cea;
+  text-color: @water_name;
 }
 line|z16[waterway=stream][intermittent=yes]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2;
   dashes: 2.4,0.8;
   linecap: butt;
@@ -331,7 +331,7 @@ node|z17-[amenity=drinking_water]
 }
 line|z16[man_made=breakwater]
 {
-  color: #707070;
+  color: @gray70;
   width: 4;
   z-index: 854;
 }
@@ -341,34 +341,34 @@ area|z12-[man_made=wastewater_plant]
 }
 area|z12-[man_made=wastewater_plant]
 {
-  fill-color: #e4e4e4;
+  fill-color: @graye4;
 }
 line|z16[waterway=stream]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2;
   z-index: 108;
 }
 line|z16[natural=spring],
 line|z16[waterway=river]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 8;
 }
 line|z16[waterway=canal]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 4.8;
 }
 line|z16[waterway=ditch]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 0.6;
   z-index: 111;
 }
 line|z16[waterway=stream][intermittent=ephemeral]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2;
   z-index: 106;
   dashes: 1.6,1.6;
@@ -376,52 +376,52 @@ line|z16[waterway=stream][intermittent=ephemeral]
 }
 line|z16[waterway=weir]
 {
-  color: #000044;
+  color: @waterway_weir;
   width: 2;
   z-index: 130;
 }
 line|z17-[waterway=canal]
 {
   width: 6.4;
-  color: #B9D4D4;
+  color: @water;
   casing-width: 0.8;
-  casing-color: #b0b0b0;
+  casing-color: @grayb0;
 }
 line|z17-[waterway=lock]
 {
-  color: #f8f8f8;
+  color: @waterway_lock;
   width: 12;
   z-index: 96;
   casing-width: 2;
-  casing-color: #202020;
+  casing-color: @dark_gray_20;
 }
 line|z17-[natural=spring],
 line|z17-[waterway=river]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 16;
 }
 line|z17-[waterway=weir]
 {
-  color: #000044;
+  color: @waterway_weir;
   width: 3;
   z-index: 132;
 }
 line|z17-[waterway=ditch]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 0.8;
   z-index: 113;
 }
 line|z17-[waterway=stream]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2.2;
   z-index: 110;
 }
 line|z17-[waterway=stream][intermittent=yes]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2.2;
   z-index: 108;
   dashes: 2.4,0.8;
@@ -429,13 +429,13 @@ line|z17-[waterway=stream][intermittent=yes]
 }
 line|z17-[man_made=breakwater]
 {
-  color: #707070;
+  color: @gray70;
   width: 6.4;
   z-index: 913;
 }
 line|z17-[waterway=stream][intermittent=ephemeral]
 {
-  color: #B9D4D4;
+  color: @water;
   width: 2.2;
   z-index: 109;
   dashes: 1.6,1.6;
@@ -445,13 +445,13 @@ line|z17-[waterway=drain]
 {
   width: 6.4;
   z-index: 112;
-  color: #B9D4D4;
+  color: @water;
   casing-width: 0.8;
-  casing-color: #b0b0b0;
+  casing-color: @grayb0;
 }
 line|z17-[waterway=dam]
 {
-  color: #202020;
+  color: @dark_gray_20;
   width: 4;
   z-index: 133;
 }
@@ -476,7 +476,7 @@ node|z12-14[natural=pond]
 {
   text: name;
   font-size: 12;
-  text-color: #5070d0;
+  text-color: @lake_name;
 }
 node|z14-[natural=waterfall]
 {
@@ -484,5 +484,5 @@ node|z14-[natural=waterfall]
   text-offset: 10;
   font-size: 12;
   text: name;
-  text-color: #0000FF;
+  text-color: @waterfall_name;
 }
diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss
index c07bb50ecc..0d19544928 100644
--- a/data/styles/normal.mapcss
+++ b/data/styles/normal.mapcss
@@ -1,3 +1,4 @@
+@import("colors_normal.mapcss");
 @import("include/base_roads.mapcss");
 /* @import("include/base_roads_UK.mapcss"); */
 @import("include/base_shop.mapcss");
@@ -12,8 +13,8 @@
 
 canvas
 {
-  background-color: #f1eee8;
-  fill-color: #B9D4D4;
+  background-color: @background;
+  fill-color: @water;
   default-lines: false;
   default-points: false;
 }