diff --git a/.editorconfig b/.editorconfig
index d61ded0..625d610 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,7 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
-indent_size = 1
+indent_size = 2
 indent_style = space
 trim_trailing_whitespace = true
 max_line_length = 100
@@ -12,5 +12,8 @@ max_line_length = 100
 [Makefile]
 indent_style = tab
 
-[.travis.yml]
-indent_size = 2
+[*.bs]
+indent_size = 1
+
+[*.py]
+indent_size = 4
diff --git a/.pr-preview.json b/.pr-preview.json
index e470554..bd2c683 100644
--- a/.pr-preview.json
+++ b/.pr-preview.json
@@ -1,9 +1,9 @@
 {
-    "src_file": "storage.bs",
-    "type": "bikeshed",
-    "params": {
-        "force": 1,
-        "md-status": "LS-PR",
-        "md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
-    }
+  "src_file": "storage.bs",
+  "type": "bikeshed",
+  "params": {
+    "force": 1,
+    "md-status": "LS-PR",
+    "md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
+  }
 }
diff --git a/Makefile b/Makefile
index 1fd20ab..bdaaac5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,21 @@ SHELL=/bin/bash -o pipefail
 .PHONY: local remote deploy review
 
 remote: storage.bs
-	curl https://api.csswg.org/bikeshed/ -f -F file=@storage.bs > storage.html -F md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
+	@ (HTTP_STATUS=$$(curl https://api.csswg.org/bikeshed/ \
+	                       --output storage.html \
+	                       --write-out "%{http_code}" \
+	                       --header "Accept: text/plain, text/html" \
+	                       -F die-on=warning \
+	                       -F md-Text-Macro="COMMIT-SHA LOCAL COPY" \
+	                       -F file=@storage.bs) && \
+	[[ "$$HTTP_STATUS" -eq "200" ]]) || ( \
+		echo ""; cat storage.html; echo ""; \
+		rm -f storage.html; \
+		exit 22 \
+	);
 
 local: storage.bs
-	bikeshed spec storage.bs storage.html --md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
+	bikeshed spec storage.bs storage.html --md-Text-Macro="COMMIT-SHA LOCAL COPY"
 
 deploy: storage.bs
 	curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh