diff --git a/css/reset.css b/css/00_reset.css
similarity index 100%
rename from css/reset.css
rename to css/00_reset.css
diff --git a/css/map.css b/css/20_map.css
similarity index 99%
rename from css/map.css
rename to css/20_map.css
index de5e9edda..5823f3878 100644
--- a/css/map.css
+++ b/css/20_map.css
@@ -307,7 +307,7 @@ text.gpx {
display: none;
}
-.fill-partial path.fill {
+.fill-partial path.area.fill {
fill-opacity: 0;
stroke-width: 60px;
pointer-events: visibleStroke;
diff --git a/css/areas.css b/css/25_areas.css
similarity index 100%
rename from css/areas.css
rename to css/25_areas.css
diff --git a/css/highways.css b/css/30_highways.css
similarity index 100%
rename from css/highways.css
rename to css/30_highways.css
diff --git a/css/aeroways.css b/css/35_aeroways.css
similarity index 100%
rename from css/aeroways.css
rename to css/35_aeroways.css
diff --git a/css/railways.css b/css/40_railways.css
similarity index 100%
rename from css/railways.css
rename to css/40_railways.css
diff --git a/css/waterways.css b/css/45_waterways.css
similarity index 100%
rename from css/waterways.css
rename to css/45_waterways.css
diff --git a/css/misc.css b/css/50_misc.css
similarity index 99%
rename from css/misc.css
rename to css/50_misc.css
index 3f764a00f..fb1a9332c 100644
--- a/css/misc.css
+++ b/css/50_misc.css
@@ -1,4 +1,3 @@
-
/* power */
.preset-icon .icon.tag-man_made-pipeline,
.preset-icon .icon.tag-power {
diff --git a/css/cursors.css b/css/55_cursors.css
similarity index 100%
rename from css/cursors.css
rename to css/55_cursors.css
diff --git a/css/mapillary.css b/css/60_mapillary.css
similarity index 99%
rename from css/mapillary.css
rename to css/60_mapillary.css
index b7e40dce3..578e96a9b 100644
--- a/css/mapillary.css
+++ b/css/60_mapillary.css
@@ -1,4 +1,3 @@
-
/* Mapillary Image Layer */
.layer-mapillary-images {
diff --git a/css/app.css b/css/80_app.css
similarity index 100%
rename from css/app.css
rename to css/80_app.css
diff --git a/index.html b/index.html
index 7168ff60b..0892708df 100644
--- a/index.html
+++ b/index.html
@@ -3,15 +3,10 @@
iD
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/package.json b/package.json
index 40f5695cd..dc78bd9c5 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"build": "node build.js && node development_server.js",
"clean": "shx rm -f dist/*.js dist/*.map dist/*.css dist/img/*.svg",
"dist": "npm-run-all -p dist:**",
- "dist:css": "shx cat css/reset.css css/map.css css/app.css > dist/iD.css",
+ "dist:css": "shx cat css/*.css > dist/iD.css",
"dist:mapillary": "shx mkdir -p dist/mapillary-js && shx cp -R node_modules/mapillary-js/dist/* dist/mapillary-js/",
"dist:min": "uglifyjs dist/iD.js -c -m -o dist/iD.min.js",
"dist:svg:maki": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/maki-sprite.svg node_modules/@mapbox/maki/icons/*.svg",