diff --git a/BAT.tsx b/BAT.tsx
index 7d03201cde..094b08bf14 100644
--- a/BAT.tsx
+++ b/BAT.tsx
@@ -1,6 +1,578 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tileset>
   <name value="BAT" />
+  <terrain x="0" y="1" t="5" />
+  <terrain x="0" y="2" t="5" />
+  <terrain x="0" y="3" t="5" />
+  <terrain x="0" y="4" t="5" />
+  <terrain x="0" y="5" t="5" />
+  <terrain x="0" y="6" t="2" />
+  <terrain x="0" y="7" t="2" />
+  <terrain x="0" y="8" t="2" />
+  <terrain x="0" y="10" t="2" />
+  <terrain x="0" y="11" t="2" />
+  <terrain x="0" y="13" t="1" />
+  <terrain x="0" y="14" t="1" />
+  <terrain x="0" y="15" t="7" />
+  <terrain x="0" y="16" t="7" />
+  <terrain x="0" y="17" t="3" />
+  <terrain x="0" y="18" t="3" />
+  <terrain x="0" y="19" t="3" />
+  <terrain x="0" y="20" t="2" />
+  <terrain x="0" y="21" t="2" />
+  <terrain x="0" y="24" t="2" />
+  <terrain x="0" y="27" t="2" />
+  <terrain x="0" y="28" t="2" />
+  <terrain x="0" y="29" t="1" />
+  <terrain x="0" y="30" t="2" />
+  <terrain x="0" y="31" t="2" />
+  <terrain x="0" y="32" t="2" />
+  <terrain x="0" y="33" t="3" />
+  <terrain x="0" y="34" t="3" />
+  <terrain x="0" y="38" t="6" />
+  <terrain x="0" y="39" t="6" />
+  <terrain x="1" y="0" t="3" />
+  <terrain x="1" y="1" t="5" />
+  <terrain x="1" y="2" t="5" />
+  <terrain x="1" y="3" t="5" />
+  <terrain x="1" y="4" t="5" />
+  <terrain x="1" y="5" t="5" />
+  <terrain x="1" y="6" t="2" />
+  <terrain x="1" y="7" t="2" />
+  <terrain x="1" y="8" t="2" />
+  <terrain x="1" y="11" t="2" />
+  <terrain x="1" y="12" t="2" />
+  <terrain x="1" y="15" t="7" />
+  <terrain x="1" y="16" t="7" />
+  <terrain x="1" y="17" t="3" />
+  <terrain x="1" y="18" t="3" />
+  <terrain x="1" y="19" t="3" />
+  <terrain x="1" y="20" t="2" />
+  <terrain x="1" y="21" t="2" />
+  <terrain x="1" y="22" t="1" />
+  <terrain x="1" y="23" t="1" />
+  <terrain x="1" y="24" t="2" />
+  <terrain x="1" y="25" t="2" />
+  <terrain x="1" y="26" t="2" />
+  <terrain x="1" y="27" t="1" />
+  <terrain x="1" y="28" t="2" />
+  <terrain x="1" y="29" t="1" />
+  <terrain x="1" y="38" t="6" />
+  <terrain x="1" y="39" t="6" />
+  <terrain x="2" y="0" t="3" />
+  <terrain x="2" y="1" t="5" />
+  <terrain x="2" y="2" t="5" />
+  <terrain x="2" y="3" t="5" />
+  <terrain x="2" y="4" t="5" />
+  <terrain x="2" y="5" t="5" />
+  <terrain x="2" y="6" t="2" />
+  <terrain x="2" y="7" t="2" />
+  <terrain x="2" y="8" t="2" />
+  <terrain x="2" y="11" t="2" />
+  <terrain x="2" y="12" t="2" />
+  <terrain x="2" y="13" t="1" />
+  <terrain x="2" y="14" t="1" />
+  <terrain x="2" y="15" t="1" />
+  <terrain x="2" y="16" t="2" />
+  <terrain x="2" y="17" t="3" />
+  <terrain x="2" y="18" t="3" />
+  <terrain x="2" y="19" t="3" />
+  <terrain x="2" y="20" t="2" />
+  <terrain x="2" y="21" t="2" />
+  <terrain x="2" y="24" t="2" />
+  <terrain x="2" y="25" t="2" />
+  <terrain x="2" y="26" t="1" />
+  <terrain x="2" y="27" t="1" />
+  <terrain x="2" y="28" t="2" />
+  <terrain x="2" y="29" t="1" />
+  <terrain x="2" y="30" t="2" />
+  <terrain x="2" y="31" t="2" />
+  <terrain x="2" y="32" t="2" />
+  <terrain x="2" y="38" t="6" />
+  <terrain x="2" y="39" t="6" />
+  <terrain x="3" y="0" t="3" />
+  <terrain x="3" y="1" t="5" />
+  <terrain x="3" y="3" t="5" />
+  <terrain x="3" y="4" t="5" />
+  <terrain x="3" y="5" t="5" />
+  <terrain x="3" y="6" t="2" />
+  <terrain x="3" y="7" t="2" />
+  <terrain x="3" y="8" t="2" />
+  <terrain x="3" y="10" t="2" />
+  <terrain x="3" y="11" t="2" />
+  <terrain x="3" y="15" t="1" />
+  <terrain x="3" y="17" t="3" />
+  <terrain x="3" y="18" t="3" />
+  <terrain x="3" y="19" t="3" />
+  <terrain x="3" y="20" t="2" />
+  <terrain x="3" y="21" t="2" />
+  <terrain x="3" y="22" t="2" />
+  <terrain x="3" y="26" t="2" />
+  <terrain x="3" y="28" t="2" />
+  <terrain x="3" y="30" t="2" />
+  <terrain x="3" y="31" t="2" />
+  <terrain x="3" y="32" t="4" />
+  <terrain x="3" y="33" t="4" />
+  <terrain x="3" y="38" t="6" />
+  <terrain x="3" y="39" t="6" />
+  <terrain x="4" y="1" t="5" />
+  <terrain x="4" y="3" t="5" />
+  <terrain x="4" y="4" t="5" />
+  <terrain x="4" y="5" t="5" />
+  <terrain x="4" y="6" t="2" />
+  <terrain x="4" y="7" t="2" />
+  <terrain x="4" y="8" t="1" />
+  <terrain x="4" y="9" t="1" />
+  <terrain x="4" y="10" t="2" />
+  <terrain x="4" y="15" t="1" />
+  <terrain x="4" y="16" t="1" />
+  <terrain x="4" y="17" t="3" />
+  <terrain x="4" y="19" t="3" />
+  <terrain x="4" y="20" t="2" />
+  <terrain x="4" y="21" t="2" />
+  <terrain x="4" y="22" t="2" />
+  <terrain x="4" y="23" t="2" />
+  <terrain x="4" y="24" t="1" />
+  <terrain x="4" y="25" t="1" />
+  <terrain x="4" y="26" t="2" />
+  <terrain x="4" y="28" t="2" />
+  <terrain x="4" y="29" t="2" />
+  <terrain x="4" y="30" t="2" />
+  <terrain x="4" y="31" t="2" />
+  <terrain x="4" y="32" t="4" />
+  <terrain x="4" y="33" t="4" />
+  <terrain x="4" y="35" t="1" />
+  <terrain x="4" y="36" t="1" />
+  <terrain x="4" y="38" t="6" />
+  <terrain x="4" y="39" t="6" />
+  <terrain x="5" y="1" t="5" />
+  <terrain x="5" y="2" t="5" />
+  <terrain x="5" y="3" t="5" />
+  <terrain x="5" y="5" t="2" />
+  <terrain x="5" y="6" t="2" />
+  <terrain x="5" y="8" t="1" />
+  <terrain x="5" y="11" t="2" />
+  <terrain x="5" y="13" t="1" />
+  <terrain x="5" y="15" t="1" />
+  <terrain x="5" y="16" t="1" />
+  <terrain x="5" y="17" t="3" />
+  <terrain x="5" y="18" t="3" />
+  <terrain x="5" y="19" t="3" />
+  <terrain x="5" y="20" t="2" />
+  <terrain x="5" y="21" t="2" />
+  <terrain x="5" y="22" t="1" />
+  <terrain x="5" y="23" t="1" />
+  <terrain x="5" y="24" t="2" />
+  <terrain x="5" y="25" t="2" />
+  <terrain x="5" y="26" t="2" />
+  <terrain x="5" y="27" t="1" />
+  <terrain x="5" y="28" t="2" />
+  <terrain x="5" y="29" t="2" />
+  <terrain x="5" y="30" t="2" />
+  <terrain x="5" y="31" t="2" />
+  <terrain x="5" y="32" t="4" />
+  <terrain x="5" y="33" t="4" />
+  <terrain x="5" y="35" t="1" />
+  <terrain x="5" y="36" t="1" />
+  <terrain x="5" y="38" t="6" />
+  <terrain x="5" y="39" t="6" />
+  <terrain x="6" y="0" t="3" />
+  <terrain x="6" y="1" t="5" />
+  <terrain x="6" y="2" t="5" />
+  <terrain x="6" y="3" t="5" />
+  <terrain x="6" y="6" t="2" />
+  <terrain x="6" y="8" t="3" />
+  <terrain x="6" y="9" t="3" />
+  <terrain x="6" y="10" t="2" />
+  <terrain x="6" y="11" t="2" />
+  <terrain x="6" y="14" t="1" />
+  <terrain x="6" y="15" t="1" />
+  <terrain x="6" y="17" t="3" />
+  <terrain x="6" y="18" t="3" />
+  <terrain x="6" y="19" t="3" />
+  <terrain x="6" y="20" t="2" />
+  <terrain x="6" y="21" t="2" />
+  <terrain x="6" y="22" t="2" />
+  <terrain x="6" y="23" t="2" />
+  <terrain x="6" y="24" t="2" />
+  <terrain x="6" y="25" t="2" />
+  <terrain x="6" y="26" t="2" />
+  <terrain x="6" y="27" t="1" />
+  <terrain x="6" y="28" t="2" />
+  <terrain x="6" y="29" t="2" />
+  <terrain x="6" y="30" t="2" />
+  <terrain x="6" y="31" t="2" />
+  <terrain x="6" y="32" t="4" />
+  <terrain x="6" y="33" t="4" />
+  <terrain x="6" y="34" t="4" />
+  <terrain x="6" y="35" t="1" />
+  <terrain x="6" y="36" t="1" />
+  <terrain x="6" y="38" t="6" />
+  <terrain x="6" y="39" t="6" />
+  <terrain x="7" y="1" t="5" />
+  <terrain x="7" y="2" t="5" />
+  <terrain x="7" y="4" t="2" />
+  <terrain x="7" y="8" t="3" />
+  <terrain x="7" y="9" t="3" />
+  <terrain x="7" y="10" t="2" />
+  <terrain x="7" y="13" t="1" />
+  <terrain x="7" y="14" t="1" />
+  <terrain x="7" y="15" t="1" />
+  <terrain x="7" y="18" t="3" />
+  <terrain x="7" y="19" t="3" />
+  <terrain x="7" y="20" t="2" />
+  <terrain x="7" y="21" t="2" />
+  <terrain x="7" y="22" t="2" />
+  <terrain x="7" y="23" t="2" />
+  <terrain x="7" y="24" t="2" />
+  <terrain x="7" y="25" t="2" />
+  <terrain x="7" y="26" t="2" />
+  <terrain x="7" y="27" t="1" />
+  <terrain x="7" y="28" t="2" />
+  <terrain x="7" y="29" t="1" />
+  <terrain x="7" y="30" t="3" />
+  <terrain x="7" y="31" t="3" />
+  <terrain x="7" y="32" t="4" />
+  <terrain x="7" y="33" t="4" />
+  <terrain x="7" y="34" t="4" />
+  <terrain x="7" y="35" t="1" />
+  <terrain x="7" y="36" t="1" />
+  <terrain x="7" y="38" t="6" />
+  <terrain x="7" y="39" t="6" />
+  <terrain x="8" y="4" t="2" />
+  <terrain x="8" y="8" t="2" />
+  <terrain x="8" y="9" t="2" />
+  <terrain x="8" y="10" t="2" />
+  <terrain x="8" y="13" t="2" />
+  <terrain x="8" y="15" t="1" />
+  <terrain x="8" y="17" t="3" />
+  <terrain x="8" y="18" t="3" />
+  <terrain x="8" y="19" t="3" />
+  <terrain x="8" y="20" t="2" />
+  <terrain x="8" y="21" t="2" />
+  <terrain x="8" y="24" t="2" />
+  <terrain x="8" y="25" t="2" />
+  <terrain x="8" y="26" t="2" />
+  <terrain x="8" y="27" t="1" />
+  <terrain x="8" y="28" t="2" />
+  <terrain x="8" y="29" t="1" />
+  <terrain x="8" y="30" t="3" />
+  <terrain x="8" y="31" t="3" />
+  <terrain x="8" y="32" t="4" />
+  <terrain x="8" y="33" t="4" />
+  <terrain x="8" y="34" t="4" />
+  <terrain x="8" y="37" t="6" />
+  <terrain x="8" y="38" t="6" />
+  <terrain x="8" y="39" t="6" />
+  <terrain x="9" y="4" t="2" />
+  <terrain x="9" y="6" t="2" />
+  <terrain x="9" y="8" t="2" />
+  <terrain x="9" y="9" t="2" />
+  <terrain x="9" y="10" t="2" />
+  <terrain x="9" y="11" t="2" />
+  <terrain x="9" y="12" t="2" />
+  <terrain x="9" y="13" t="2" />
+  <terrain x="9" y="17" t="3" />
+  <terrain x="9" y="18" t="3" />
+  <terrain x="9" y="19" t="3" />
+  <terrain x="9" y="20" t="2" />
+  <terrain x="9" y="21" t="2" />
+  <terrain x="9" y="22" t="1" />
+  <terrain x="9" y="23" t="1" />
+  <terrain x="9" y="24" t="2" />
+  <terrain x="9" y="25" t="2" />
+  <terrain x="9" y="26" t="2" />
+  <terrain x="9" y="27" t="1" />
+  <terrain x="9" y="28" t="1" />
+  <terrain x="9" y="29" t="1" />
+  <terrain x="9" y="30" t="3" />
+  <terrain x="9" y="31" t="3" />
+  <terrain x="9" y="32" t="4" />
+  <terrain x="9" y="33" t="4" />
+  <terrain x="9" y="34" t="2" />
+  <terrain x="9" y="35" t="3" />
+  <terrain x="9" y="36" t="3" />
+  <terrain x="9" y="37" t="6" />
+  <terrain x="9" y="38" t="6" />
+  <terrain x="9" y="39" t="6" />
+  <terrain x="10" y="1" t="5" />
+  <terrain x="10" y="5" t="2" />
+  <terrain x="10" y="6" t="2" />
+  <terrain x="10" y="7" t="2" />
+  <terrain x="10" y="12" t="2" />
+  <terrain x="10" y="18" t="3" />
+  <terrain x="10" y="20" t="2" />
+  <terrain x="10" y="21" t="2" />
+  <terrain x="10" y="22" t="2" />
+  <terrain x="10" y="24" t="2" />
+  <terrain x="10" y="25" t="2" />
+  <terrain x="10" y="26" t="2" />
+  <terrain x="10" y="27" t="1" />
+  <terrain x="10" y="28" t="1" />
+  <terrain x="10" y="29" t="1" />
+  <terrain x="10" y="30" t="3" />
+  <terrain x="10" y="31" t="3" />
+  <terrain x="10" y="32" t="4" />
+  <terrain x="10" y="33" t="4" />
+  <terrain x="10" y="34" t="2" />
+  <terrain x="10" y="35" t="3" />
+  <terrain x="10" y="36" t="3" />
+  <terrain x="10" y="37" t="6" />
+  <terrain x="10" y="38" t="6" />
+  <terrain x="10" y="39" t="6" />
+  <terrain x="11" y="0" t="5" />
+  <terrain x="11" y="1" t="5" />
+  <terrain x="11" y="4" t="2" />
+  <terrain x="11" y="5" t="2" />
+  <terrain x="11" y="8" t="2" />
+  <terrain x="11" y="9" t="2" />
+  <terrain x="11" y="11" t="2" />
+  <terrain x="11" y="12" t="2" />
+  <terrain x="11" y="20" t="2" />
+  <terrain x="11" y="21" t="2" />
+  <terrain x="11" y="23" t="1" />
+  <terrain x="11" y="24" t="1" />
+  <terrain x="11" y="25" t="1" />
+  <terrain x="11" y="26" t="2" />
+  <terrain x="11" y="27" t="3" />
+  <terrain x="11" y="28" t="2" />
+  <terrain x="11" y="29" t="1" />
+  <terrain x="11" y="30" t="1" />
+  <terrain x="11" y="31" t="1" />
+  <terrain x="11" y="32" t="4" />
+  <terrain x="11" y="33" t="4" />
+  <terrain x="11" y="34" t="4" />
+  <terrain x="11" y="35" t="3" />
+  <terrain x="11" y="37" t="6" />
+  <terrain x="11" y="38" t="6" />
+  <terrain x="11" y="39" t="6" />
+  <terrain x="12" y="4" t="2" />
+  <terrain x="12" y="5" t="2" />
+  <terrain x="12" y="8" t="2" />
+  <terrain x="12" y="9" t="2" />
+  <terrain x="12" y="10" t="2" />
+  <terrain x="12" y="11" t="2" />
+  <terrain x="12" y="12" t="2" />
+  <terrain x="12" y="13" t="2" />
+  <terrain x="12" y="20" t="2" />
+  <terrain x="12" y="21" t="2" />
+  <terrain x="12" y="22" t="2" />
+  <terrain x="12" y="23" t="2" />
+  <terrain x="12" y="24" t="2" />
+  <terrain x="12" y="25" t="2" />
+  <terrain x="12" y="26" t="2" />
+  <terrain x="12" y="27" t="1" />
+  <terrain x="12" y="28" t="1" />
+  <terrain x="12" y="29" t="1" />
+  <terrain x="12" y="30" t="1" />
+  <terrain x="12" y="31" t="1" />
+  <terrain x="12" y="32" t="3" />
+  <terrain x="12" y="33" t="3" />
+  <terrain x="12" y="34" t="2" />
+  <terrain x="12" y="37" t="6" />
+  <terrain x="12" y="38" t="6" />
+  <terrain x="12" y="39" t="6" />
+  <terrain x="13" y="2" t="2" />
+  <terrain x="13" y="3" t="2" />
+  <terrain x="13" y="4" t="2" />
+  <terrain x="13" y="5" t="2" />
+  <terrain x="13" y="6" t="2" />
+  <terrain x="13" y="7" t="2" />
+  <terrain x="13" y="10" t="2" />
+  <terrain x="13" y="13" t="2" />
+  <terrain x="13" y="22" t="2" />
+  <terrain x="13" y="24" t="2" />
+  <terrain x="13" y="25" t="2" />
+  <terrain x="13" y="27" t="1" />
+  <terrain x="13" y="28" t="1" />
+  <terrain x="13" y="29" t="1" />
+  <terrain x="13" y="30" t="1" />
+  <terrain x="13" y="31" t="1" />
+  <terrain x="13" y="32" t="3" />
+  <terrain x="13" y="33" t="3" />
+  <terrain x="13" y="36" t="3" />
+  <terrain x="13" y="37" t="6" />
+  <terrain x="13" y="38" t="6" />
+  <terrain x="13" y="39" t="6" />
+  <terrain x="14" y="2" t="2" />
+  <terrain x="14" y="3" t="2" />
+  <terrain x="14" y="4" t="2" />
+  <terrain x="14" y="5" t="2" />
+  <terrain x="14" y="6" t="2" />
+  <terrain x="14" y="7" t="2" />
+  <terrain x="14" y="12" t="2" />
+  <terrain x="14" y="19" t="3" />
+  <terrain x="14" y="20" t="3" />
+  <terrain x="14" y="21" t="1" />
+  <terrain x="14" y="22" t="2" />
+  <terrain x="14" y="23" t="1" />
+  <terrain x="14" y="24" t="1" />
+  <terrain x="14" y="25" t="2" />
+  <terrain x="14" y="26" t="2" />
+  <terrain x="14" y="27" t="1" />
+  <terrain x="14" y="28" t="1" />
+  <terrain x="14" y="29" t="1" />
+  <terrain x="14" y="30" t="1" />
+  <terrain x="14" y="31" t="1" />
+  <terrain x="14" y="32" t="1" />
+  <terrain x="14" y="33" t="2" />
+  <terrain x="14" y="34" t="2" />
+  <terrain x="14" y="35" t="3" />
+  <terrain x="14" y="36" t="3" />
+  <terrain x="14" y="37" t="6" />
+  <terrain x="14" y="38" t="6" />
+  <terrain x="14" y="39" t="6" />
+  <terrain x="15" y="2" t="2" />
+  <terrain x="15" y="3" t="2" />
+  <terrain x="15" y="4" t="2" />
+  <terrain x="15" y="5" t="2" />
+  <terrain x="15" y="6" t="2" />
+  <terrain x="15" y="7" t="2" />
+  <terrain x="15" y="10" t="2" />
+  <terrain x="15" y="12" t="2" />
+  <terrain x="15" y="17" t="1" />
+  <terrain x="15" y="18" t="1" />
+  <terrain x="15" y="19" t="3" />
+  <terrain x="15" y="20" t="3" />
+  <terrain x="15" y="21" t="1" />
+  <terrain x="15" y="23" t="2" />
+  <terrain x="15" y="24" t="1" />
+  <terrain x="15" y="25" t="2" />
+  <terrain x="15" y="26" t="2" />
+  <terrain x="15" y="27" t="1" />
+  <terrain x="15" y="28" t="1" />
+  <terrain x="15" y="29" t="1" />
+  <terrain x="15" y="30" t="1" />
+  <terrain x="15" y="31" t="1" />
+  <terrain x="15" y="32" t="1" />
+  <terrain x="15" y="33" t="2" />
+  <terrain x="15" y="35" t="3" />
+  <terrain x="15" y="37" t="6" />
+  <terrain x="15" y="38" t="6" />
+  <terrain x="15" y="39" t="6" />
+  <terrain x="16" y="1" t="5" />
+  <terrain x="16" y="2" t="5" />
+  <terrain x="16" y="4" t="2" />
+  <terrain x="16" y="5" t="2" />
+  <terrain x="16" y="6" t="2" />
+  <terrain x="16" y="7" t="2" />
+  <terrain x="16" y="10" t="2" />
+  <terrain x="16" y="12" t="1" />
+  <terrain x="16" y="13" t="1" />
+  <terrain x="16" y="17" t="1" />
+  <terrain x="16" y="19" t="2" />
+  <terrain x="16" y="20" t="2" />
+  <terrain x="16" y="21" t="2" />
+  <terrain x="16" y="22" t="2" />
+  <terrain x="16" y="23" t="2" />
+  <terrain x="16" y="24" t="1" />
+  <terrain x="16" y="25" t="2" />
+  <terrain x="16" y="26" t="2" />
+  <terrain x="16" y="27" t="1" />
+  <terrain x="16" y="28" t="1" />
+  <terrain x="16" y="29" t="1" />
+  <terrain x="16" y="30" t="1" />
+  <terrain x="16" y="31" t="1" />
+  <terrain x="16" y="32" t="1" />
+  <terrain x="16" y="33" t="2" />
+  <terrain x="16" y="34" t="2" />
+  <terrain x="16" y="35" t="2" />
+  <terrain x="16" y="36" t="2" />
+  <terrain x="16" y="37" t="6" />
+  <terrain x="16" y="38" t="6" />
+  <terrain x="16" y="39" t="6" />
+  <terrain x="17" y="0" t="5" />
+  <terrain x="17" y="1" t="5" />
+  <terrain x="17" y="2" t="5" />
+  <terrain x="17" y="3" t="5" />
+  <terrain x="17" y="6" t="2" />
+  <terrain x="17" y="7" t="2" />
+  <terrain x="17" y="10" t="2" />
+  <terrain x="17" y="13" t="1" />
+  <terrain x="17" y="17" t="1" />
+  <terrain x="17" y="19" t="1" />
+  <terrain x="17" y="20" t="2" />
+  <terrain x="17" y="21" t="2" />
+  <terrain x="17" y="22" t="2" />
+  <terrain x="17" y="23" t="1" />
+  <terrain x="17" y="24" t="1" />
+  <terrain x="17" y="25" t="2" />
+  <terrain x="17" y="26" t="2" />
+  <terrain x="17" y="27" t="1" />
+  <terrain x="17" y="28" t="1" />
+  <terrain x="17" y="29" t="1" />
+  <terrain x="17" y="30" t="1" />
+  <terrain x="17" y="31" t="1" />
+  <terrain x="17" y="32" t="4" />
+  <terrain x="17" y="33" t="2" />
+  <terrain x="17" y="35" t="2" />
+  <terrain x="17" y="36" t="2" />
+  <terrain x="17" y="37" t="6" />
+  <terrain x="17" y="38" t="6" />
+  <terrain x="17" y="39" t="6" />
+  <terrain x="18" y="0" t="5" />
+  <terrain x="18" y="1" t="5" />
+  <terrain x="18" y="2" t="5" />
+  <terrain x="18" y="3" t="5" />
+  <terrain x="18" y="4" t="2" />
+  <terrain x="18" y="5" t="2" />
+  <terrain x="18" y="6" t="2" />
+  <terrain x="18" y="7" t="2" />
+  <terrain x="18" y="8" t="1" />
+  <terrain x="18" y="10" t="1" />
+  <terrain x="18" y="13" t="1" />
+  <terrain x="18" y="14" t="2" />
+  <terrain x="18" y="16" t="3" />
+  <terrain x="18" y="17" t="3" />
+  <terrain x="18" y="18" t="2" />
+  <terrain x="18" y="19" t="1" />
+  <terrain x="18" y="20" t="2" />
+  <terrain x="18" y="21" t="2" />
+  <terrain x="18" y="22" t="2" />
+  <terrain x="18" y="24" t="2" />
+  <terrain x="18" y="26" t="1" />
+  <terrain x="18" y="27" t="1" />
+  <terrain x="18" y="28" t="1" />
+  <terrain x="18" y="29" t="1" />
+  <terrain x="18" y="30" t="1" />
+  <terrain x="18" y="31" t="1" />
+  <terrain x="18" y="32" t="4" />
+  <terrain x="18" y="33" t="2" />
+  <terrain x="18" y="34" t="2" />
+  <terrain x="18" y="35" t="3" />
+  <terrain x="18" y="37" t="3" />
+  <terrain x="18" y="38" t="6" />
+  <terrain x="18" y="39" t="6" />
+  <terrain x="19" y="1" t="5" />
+  <terrain x="19" y="2" t="5" />
+  <terrain x="19" y="4" t="2" />
+  <terrain x="19" y="6" t="2" />
+  <terrain x="19" y="7" t="2" />
+  <terrain x="19" y="8" t="1" />
+  <terrain x="19" y="10" t="1" />
+  <terrain x="19" y="13" t="1" />
+  <terrain x="19" y="14" t="2" />
+  <terrain x="19" y="16" t="3" />
+  <terrain x="19" y="17" t="3" />
+  <terrain x="19" y="19" t="2" />
+  <terrain x="19" y="20" t="2" />
+  <terrain x="19" y="22" t="2" />
+  <terrain x="19" y="23" t="1" />
+  <terrain x="19" y="24" t="2" />
+  <terrain x="19" y="26" t="1" />
+  <terrain x="19" y="27" t="1" />
+  <terrain x="19" y="28" t="1" />
+  <terrain x="19" y="29" t="1" />
+  <terrain x="19" y="30" t="1" />
+  <terrain x="19" y="31" t="1" />
+  <terrain x="19" y="32" t="4" />
+  <terrain x="19" y="33" t="2" />
+  <terrain x="19" y="34" t="2" />
+  <terrain x="19" y="35" t="3" />
+  <terrain x="19" y="36" t="3" />
+  <terrain x="19" y="37" t="3" />
+  <terrain x="19" y="38" t="6" />
+  <terrain x="19" y="39" t="6" />
   <template>
     <cell x="0" y="0" />
   </template>
@@ -16,10 +588,6 @@
   <template>
     <cell x="4" y="0" />
   </template>
-  <template>
-    <cell x="5" y="0" />
-    <cell x="6" y="0" />
-  </template>
   <template>
     <cell x="8" y="0" />
   </template>
@@ -1322,4 +1890,18 @@
     <cell x="17" y="26" />
     <cell x="17" y="25" />
   </template>
+  <template>
+    <cell x="6" y="0" />
+  </template>
+  <template>
+    <cell x="5" y="0" />
+  </template>
+  <template>
+    <cell x="16" y="33" />
+    <cell x="16" y="34" />
+  </template>
+  <template>
+    <cell x="17" y="33" />
+    <cell x="17" y="34" />
+  </template>
 </tileset>
\ No newline at end of file
diff --git a/ripD2kGameFiles.sh b/ripD2kGameFiles.sh
index bda0ec8c52..911d7b10c6 100755
--- a/ripD2kGameFiles.sh
+++ b/ripD2kGameFiles.sh
@@ -394,18 +394,18 @@ mono OpenRA.Utility.exe --shp spice0.png 32
 mono OpenRA.TilesetBuilder.exe "BASE.png" 32 --export "Content/d2k/Tilesets"
 R8="$HOME/.openra/Content/d2k/BLOXBAT.R8"
 mono OpenRA.Utility.exe --r8 $R8 $PAL 0 799 "BAT" --tileset
-mono OpenRA.TilesetBuilder.exe "BAT.png" 32 --export "Content/d2k/tilesets"
+mono OpenRA.TilesetBuilder.exe "BAT.png" 32 --export "Content/d2k/Tilesets"
 R8="$HOME/.openra/Content/d2k/BLOXBGBS.R8"
 mono OpenRA.Utility.exe --r8 $R8 $PAL 0 799 "BGBS" --tileset
-mono OpenRA.TilesetBuilder.exe "BGBS.png" 32 --export "Content/d2k/tilesets"
+mono OpenRA.TilesetBuilder.exe "BGBS.png" 32 --export "Content/d2k/Tilesets"
 R8="$HOME/.openra/Content/d2k/BLOXICE.R8"
 mono OpenRA.Utility.exe --r8 $R8 $PAL 0 799 "ICE" --tileset
-mono OpenRA.TilesetBuilder.exe "ICE.png" 32 --export "Content/d2k/tilesets"
+mono OpenRA.TilesetBuilder.exe "ICE.png" 32 --export "Content/d2k/Tilesets"
 R8="$HOME/.openra/Content/d2k/BLOXTREE.R8"
 mono OpenRA.Utility.exe --r8 $R8 $PAL 0 799 "TREE" --tileset
-mono OpenRA.TilesetBuilder.exe "TREE.png" 32 --export "Content/d2k/tilesets"
+mono OpenRA.TilesetBuilder.exe "TREE.png" 32 --export "Content/d2k/Tilesets"
 R8="$HOME/.openra/Content/d2k/BLOXWAST.R8"
 mono OpenRA.Utility.exe --r8 $R8 $PAL 0 799 "XWAST" --tileset
-mono OpenRA.TilesetBuilder.exe "XWAST.png" 32 --export "Content/d2k/tilesets"
+mono OpenRA.TilesetBuilder.exe "XWAST.png" 32 --export "Content/d2k/Tilesets"
 
 mv *.shp $HOME/.openra/Content/d2k/SHPs
\ No newline at end of file