diff --git a/data/styles/colors_dark.mapcss b/data/styles/colors_dark.mapcss
index 2b25ad67cf..818a63fb3a 100644
--- a/data/styles/colors_dark.mapcss
+++ b/data/styles/colors_dark.mapcss
@@ -1,138 +1,138 @@
 @background: #0e1117;
 @water: #462b2b;
-@white: black;
+@abandoned_rail: #4d4d4d;
+@addr_z16: #7f7f8f;
+@aero_terminal: #2b376b;
+@aerodrome: #272331;
+@aeroway: #2b2342;
+@airport_name: #ffa41d;
+@alpine_hiking: yellow;
+@beach: #1133aa;
+@border: #06a8b4;
 @border_country_z4: #005f6f;
 @border_country_z5: #0088a4;
-@light_yellow: #111122;
-@light_gray: #5f5f5f;
-@border_state: blue;
 @border_country_z6: #2688a4;
-@gray90: #6f6f6f;
-@border: #06a8b4;
-@aerodrome: #272331;
-@rail_z12: #333333;
-@ferry_line: #674717;
-@park_green: #301348;
-@natpark: #b106b4;
-@school_fill: #0f1f23;
-@dark_gray_40: #bfbfbf;
-@light_rail_z12: #6f2f6f;
-@parking: #070727;
-@aeroway: #2b2342;
-@dark_gray_20: #dfdfdf;
-@abandoned_rail: #4d4d4d;
-@monorail_z12: #2f7f7f;
-@aero_terminal: #2b376b;
-@gray: #575757;
-@grayb0: #4f4f4f;
-@piste_nordic: #3fffff;
-@gray50: #afafaf;
-@piste_downhill_freeride: #0922f5;
-@piste_downhill_interm: #00bfbf;
-@park_name: #a357ff;
-@waterfall_name: yellow;
-@alpine_hiking: yellow;
-@piste_downhill_novice: #bf00bf;
-@piste_downhill_expert: #097ff5;
-@graye4: #1b1b1b;
-@light_rail_z14: #f6a6f6;
-@station_name: #cfaf27;
-@rail_z14_base: #191919;
-@rail_z14: #777777;
-@tram_monorail_dash: #a6f6a6;
-@funicular_z14: #a6f6f6;
-@disused_rail: #0d0d0d;
-@power_fill: #414141;
-@hw_construction: #2f2f2f;
-@airport_name: #ffa41d;
-@gray60: #9f9f9f;
-@light_rail: #481919;
-@railway_spur_z14: #131313;
-@funicular: #194848;
-@addr_z16: #7f7f8f;
-@ford_casing: #efefef;
-@rail_z15: silver;
-@hw_primary_trunk: #cfcfcf;
-@rail_z15_base: #999999;
-@light_rail_z15: #f0b3f0;
-@rope_tow: #27273b;
-@monorail_line: #b3f0b3;
-@funicular_z15: #b3f0f0;
+@border_state: blue;
 @building_fill: #32324b;
 @comm_line: #0f7f0f;
-@ferry_z16: #573727;
-@razed_rail: #3d3d3d;
-@gray70: #8f8f8f;
-@railway_platform: #444444;
-@station_name_halo: #070300;
-@red: #00ffff;
-@farm: #202068;
-@greenfill: #2f173b;
-@forest: #4d295a;
-@industrial: #222233;
-@military: #2f2faf;
 @conservation: #301357;
-@residential_generic: #12172d;
-@residential_urban: #111111;
-@residential_rural: #000033;
-@retail: #071313;
-@landfill: #16228d;
-@vineyard: #2e152e;
-@garages: #1e1e1a;
-@glacier: #522719;
-@beach: #1133aa;
 @continent_name: #7f7f87;
-@state_name: #3f3f4f;
 @country_name: #5f5f6f;
 @country_name_z7: #6f6f7f;
-@state_name_z8: #4f4f57;
 @country_name_z8: #4f4f5f;
-@village_fill: #222536;
-@tram_line: #194819;
-@subway_line: #f0f0b3;
-@subway_red: #22ffff;
-@subway_blue: #f8d776;
-@subway_purple: #74af63;
-@subway_orange: #0088ff;
-@subway_green: #ff99ff;
-@subway_brown: #4488ff;
-@subway_yellow: #0839ff;
-@highway_casing: #4a6bb3;
-@highway_minor_casing: #373750;
-@highway_trunk_z7: #112b59;
-@highway_motorway_z7: #104491;
-@highway_trunk_z8: #082c69;
-@highway_motorway_z8: #1068de;
-@highway_trunk: #003bbb;
-@highway_motorway: #0f77ff;
-@highway_secondary: #00047f;
-@highway_track: #3f5783;
-@highway_primary: #021f99;
-@hw_motorway_casing: #4783fb;
-@hw_trunk_primary_casing: #275faf;
-@highway_tertiary: #00006f;
-@hw_secondary_tertiary_casing: #37379f;
-@highway_raceway: #171b2b;
-@highway_bridleway_z13: #562caa;
-@highway_path: #286cce;
-@cycleway_z14: #b240b2;
-@highway_bridleway_z14: #7040b2;
-@footway: #2f3343;
-@highway_pedestrian: #46456a;
-@highway_bridleway: #2c3467;
-@highway_byway_fill: #105255;
-@highway_service_z15: #020202;
-@highway_footway_fill: #070f17;
 @cycleway: #6f436f;
+@cycleway_z14: #b240b2;
+@dark_gray_20: #dfdfdf;
+@dark_gray_40: #bfbfbf;
+@disused_rail: #0d0d0d;
+@farm: #202068;
+@ferry_line: #674717;
+@ferry_z16: #573727;
+@footway: #2f3343;
+@ford_casing: #efefef;
+@forest: #4d295a;
+@funicular: #194848;
+@funicular_z14: #a6f6f6;
+@funicular_z15: #b3f0f0;
+@garages: #1e1e1a;
+@glacier: #522719;
+@gray50: #afafaf;
+@gray60: #9f9f9f;
+@gray70: #8f8f8f;
+@gray90: #6f6f6f;
+@gray: #575757;
+@grayb0: #4f4f4f;
+@graye4: #1b1b1b;
+@greenfill: #2f173b;
+@highway_bridleway: #2c3467;
+@highway_bridleway_z13: #562caa;
+@highway_bridleway_z14: #7040b2;
+@highway_byway_fill: #105255;
+@highway_casing: #4a6bb3;
+@highway_footway_fill: #070f17;
+@highway_minor_casing: #373750;
+@highway_motorway: #0f77ff;
+@highway_motorway_z7: #104491;
+@highway_motorway_z8: #1068de;
+@highway_path: #286cce;
+@highway_pedestrian: #46456a;
+@highway_primary: #021f99;
+@highway_raceway: #171b2b;
+@highway_secondary: #00047f;
+@highway_service_z15: #020202;
 @highway_steps: #2f3353;
-@127: #8ac;
-@128: #9d9;
-@129: #d99;
-@130: #fda;
+@highway_tertiary: #00006f;
+@highway_track: #3f5783;
+@highway_trunk: #003bbb;
+@highway_trunk_z7: #112b59;
+@highway_trunk_z8: #082c69;
+@hw_construction: #2f2f2f;
+@hw_motorway_casing: #4783fb;
+@hw_primary_trunk: #cfcfcf;
+@hw_secondary_tertiary_casing: #37379f;
+@hw_trunk_primary_casing: #275faf;
+@industrial: #222233;
+@lake_name: #af8f2f;
+@landfill: #16228d;
+@light_gray: #5f5f5f;
+@light_rail: #481919;
+@light_rail_z12: #6f2f6f;
+@light_rail_z14: #f6a6f6;
+@light_rail_z15: #f0b3f0;
+@light_yellow: #111122;
+@military: #2f2faf;
+@monorail_line: #b3f0b3;
+@monorail_z12: #2f7f7f;
+@natpark: #b106b4;
+@park_green: #301348;
+@park_name: #a357ff;
+@parking: #070727;
+@piste_downhill_expert: #097ff5;
+@piste_downhill_freeride: #0922f5;
+@piste_downhill_interm: #00bfbf;
+@piste_downhill_novice: #bf00bf;
+@piste_nordic: #3fffff;
 @pitch_fill: #224d67;
+@power_fill: #414141;
+@rail_z12: #333333;
+@rail_z14: #777777;
+@rail_z14_base: #191919;
+@rail_z15: silver;
+@rail_z15_base: #999999;
+@railway_platform: #444444;
+@railway_spur_z14: #131313;
+@razed_rail: #3d3d3d;
+@red: #00ffff;
+@residential_generic: #12172d;
+@residential_rural: #000033;
+@residential_urban: #111111;
+@retail: #071313;
+@rope_tow: #27273b;
+@school_fill: #0f1f23;
 @sea_name: #b6892e;
-@wetland_fill: #5f3c47;
+@state_name: #3f3f4f;
+@state_name_z8: #4f4f57;
+@station_name: #cfaf27;
+@station_name_halo: #070300;
+@subway_blue: #f8d776;
+@subway_brown: #4488ff;
+@subway_green: #ff99ff;
+@subway_line: #f0f0b3;
+@subway_orange: #0088ff;
+@subway_purple: #74af63;
+@subway_red: #22ffff;
+@subway_yellow: #0839ff;
+@tram_line: #194819;
+@tram_monorail_dash: #a6f6a6;
+@uk_motorway: #8ac;
+@uk_primary: #d99;
+@uk_secondary: #fda;
+@uk_trunk: #9d9;
+@village_fill: #222536;
+@vineyard: #2e152e;
 @water_name: #af8315;
+@waterfall_name: yellow;
 @waterway_lock: #070707;
 @waterway_weir: #ffffbb;
-@lake_name: #af8f2f;
+@wetland_fill: #5f3c47;
+@white: black;
diff --git a/data/styles/colors_normal.mapcss b/data/styles/colors_normal.mapcss
index f47174e666..097c56b65c 100644
--- a/data/styles/colors_normal.mapcss
+++ b/data/styles/colors_normal.mapcss
@@ -1,138 +1,138 @@
 @background: #f1eee8;
 @water: #b9d4d4;
+@abandoned_rail: #b2b2b2;
+@addr_z16: #808070;
+@aero_terminal: #d4c894;
+@aerodrome: #d8dcce;
+@aeroway: #d4dcbd;
+@airport_name: #005be2;
+@alpine_hiking: blue;
+@beach: #eecc55;
+@border: #f9574b;
 @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;
+@border_state: yellow;
 @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;
+@conservation: #cfeca8;
 @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;
+@cycleway: #90bc90;
+@cycleway_z14: #4dbf4d;
+@dark_gray_20: #202020;
+@dark_gray_40: #404040;
 @disused_rail: #f2f2f2;
-@light_rail: #b7e6e6;
-@railway_spur_z14: #ececec;
+@farm: #dfdf97;
+@ferry_line: #98b8e8;
+@ferry_z16: #a8c8d8;
+@footway: #d0ccbc;
+@ford_casing: #101010;
+@forest: #b2d6a5;
 @funicular: #e6b7b7;
+@funicular_z14: #590909;
+@funicular_z15: #4c0f0f;
+@garages: #e1e1e5;
+@glacier: lightblue;
+@gray50: #505050;
+@gray60: #606060;
+@gray70: #707070;
+@gray90: #909090;
+@gray: grey;
+@grayb0: #b0b0b0;
+@graye4: #e4e4e4;
+@greenfill: #d0e8c4;
+@highway_bridleway: #d3cb98;
+@highway_bridleway_z13: #a9d355;
+@highway_bridleway_z14: #8fbf4d;
+@highway_byway_fill: #efadaa;
+@highway_casing: #b5944c;
+@highway_footway_fill: #f8f0e8;
+@highway_minor_casing: #c8c8af;
+@highway_motorway: #f08800;
+@highway_motorway_z7: #efbb6e;
+@highway_motorway_z8: #ef9721;
+@highway_path: #d79331;
+@highway_pedestrian: #b9ba95;
+@highway_primary: #fde066;
+@highway_raceway: #e8e4d4;
+@highway_secondary: #fffb80;
+@highway_service_z15: #fdfdfd;
+@highway_steps: #d0ccac;
+@highway_tertiary: #ffff90;
+@highway_track: #c0a87c;
+@highway_trunk: #ffc444;
+@highway_trunk_z7: #eed4a6;
+@highway_trunk_z8: #f7d396;
+@hw_construction: #d0d0d0;
+@hw_motorway_casing: #b87c04;
+@hw_primary_trunk: #303030;
+@hw_secondary_tertiary_casing: #c8c860;
+@hw_trunk_primary_casing: #d8a050;
+@industrial: #ddddcc;
+@lake_name: #5070d0;
+@landfill: #e9dd72;
+@light_gray: #a0a0a0;
+@light_rail: #b7e6e6;
+@light_rail_z12: #90d090;
+@light_rail_z14: #095909;
+@light_rail_z15: #0f4c0f;
+@light_yellow: #eeeedd;
+@military: #d0d050;
+@monorail_line: #4c0f4c;
+@monorail_z12: #d08080;
+@natpark: #4ef94b;
+@park_green: #cfecb7;
+@park_name: #5ca800;
+@parking: #f8f8d8;
+@piste_downhill_expert: #f6800a;
+@piste_downhill_freeride: #f6dd0a;
+@piste_downhill_interm: #ff4040;
+@piste_downhill_novice: #40ff40;
+@piste_nordic: #c00000;
+@pitch_fill: #ddb298;
+@power_fill: #bebebe;
+@rail_z12: silver;
+@rail_z14: #888888;
+@rail_z14_base: #e6e6e6;
 @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;
+@railway_spur_z14: #ececec;
+@razed_rail: #c2c2c2;
+@red: red;
+@residential_generic: #ede8d2;
+@residential_rural: #ffffcc;
+@residential_urban: #eeeeee;
+@retail: #f8ecec;
+@rope_tow: #d8d8c4;
+@school_fill: #f0e0dc;
+@sea_name: #4976d1;
+@state_name: #c0c0b0;
+@state_name_z8: #b0b0a8;
+@station_name: #3050d8;
+@station_name_halo: #f8fcff;
+@subway_blue: #072889;
+@subway_brown: #bb7700;
+@subway_green: #006600;
+@subway_line: #0f0f4c;
+@subway_orange: #ff7700;
+@subway_purple: #8b509c;
+@subway_red: #dd0000;
+@subway_yellow: #f7c600;
+@tram_line: #e6b7e6;
+@tram_monorail_dash: #590959;
 @uk_motorway: #8ac;
-@uk_trunk: #9d9;
 @uk_primary: #d99;
 @uk_secondary: #fda;
-@pitch_fill: #ddb298;
-@sea_name: #4976d1;
-@wetland_fill: #a0c3b8;
+@uk_trunk: #9d9;
+@village_fill: #dddac9;
+@vineyard: #d1ead1;
 @water_name: #507cea;
+@waterfall_name: #0000ff;
 @waterway_lock: #f8f8f8;
 @waterway_weir: #000044;
-@lake_name: #5070d0;
-@waterfall_name: #0000ff;
+@wetland_fill: #a0c3b8;
+@white: white;