diff --git a/shchemes b/shchemes
index 56451db..61eaf44 100755
--- a/shchemes
+++ b/shchemes
@@ -130,17 +130,18 @@ inject() {
 	parse_scheme
 	check_scheme_path
 	parse_comment_pattern
+	tmp=$(mktemp)
 
 	if [ "$comment_start" == "" ]; then
 	  comment_start="#"
 	fi
-	awk -i inplace \
-		-v blockstart="${comment_start}START SHCHEMES BLOCK" \
+	awk -v blockstart="${comment_start}START SHCHEMES BLOCK" \
 		-v blockend="${comment_start}END SHCHEMES BLOCK" \
 		-v commentend="$comment_end" \
 		-v scheme="$scheme" \
 		-v shchemes="$shchemes_path" \
 		-v sq="'" \
+		-v nl="\n" \
 		-F ":" '
 !inblock { print }
 inblock {
@@ -153,39 +154,31 @@ $1 ~ blockstart {
 	system("/usr/bin/env bash -c " sq "SCHEME=\"" scheme "\";" command sq);
 	next
 }
-$1 ~ blockend {
+$1 == blockend && inblock {
 	inblock = 0;
-	print;
-	next
+	print nl blockend commentend;
+	next;
 }
-ENDFILE {
-	if(inblock) {
-	    print blockend commentend;
-		for(i=1;i<=bi;i++) {
-			print lines[i];
-		}
-	}
+ENDFILE  {
+    if(inblock) {
+    	print nl blockend commentend;
+   		for(i=1;i<=bi;i++) {
+   			print lines[i];
+   		}
+    }
 }
-	' "$path"
-}
-
-convert_tinted_template() {
-	path=$1
-	sed -r \
-	  -e 's/\{\{base([0-9A-F]+)-hex\}\}/{{base\1}}/' \
-	  -e 's/\{\{base([0-9A-F]+)-rgb-r\}\}/{{rgb_r base\1}}/' \
-	  -e 's/\{\{base([0-9A-F]+)-rgb-g\}\}/{{rgb_g base\1}}/' \
-	  -e 's/\{\{base([0-9A-F]+)-rgb-b\}\}/{{rgb_b base\1}}/' "$path"
+	' "$path" > "$tmp" && mv "$tmp" "$path"
 }
 
 convert_tinted_scheme() {
 	path=$1
+	tmp=$(mktemp)
 	
-	awk -i inplace -F ' *: *' '
+	awk -F ' *: *' '
 /^#/ { print }
 $1 ~ "palette" { p = 1; next }
 p && /^ +/ { gsub(/ /, "", $1); print $1 "=" $2 }
-	' "$path"
+	' "$path" > "$tmp" && mv -f "$tmp" "$path"
 }
 
 install_tinted_scheme() {
@@ -216,11 +209,23 @@ install_tinted_scheme() {
 	echo "Installed ${scheme}"
 }
 
+convert_tinted_template() {
+	path=$1
+	sed -r \
+	  -e 's/\{\{base([0-9A-F]+)-hex\}\}/{{base\1}}/' \
+	  -e 's/\{\{base([0-9A-F]+)-rgb-r\}\}/{{rgb_r base\1}}/' \
+	  -e 's/\{\{base([0-9A-F]+)-rgb-g\}\}/{{rgb_g base\1}}/' \
+	  -e 's/\{\{base([0-9A-F]+)-rgb-b\}\}/{{rgb_b base\1}}/' "$path"
+}
+
 install_tinted_template() {
 	url=$1
 	target=$2
+	tmp=$(mktemp)
 	
-	curl "$url" | convert_tinted_template > "${shchemes_dir}/base16/templates/${target}.mustache"
+	curl "$url" > "$tmp"
+	convert_tinted_template "$tmp" > "${shchemes_dir}/base16/templates/${target}.mustache"
+	rm "$tmp"
 }
 
 manual() {