diff --git a/ctw/ranch/map.xml b/ctw/ranch/map.xml
index c74f457d..c50de950 100644
--- a/ctw/ranch/map.xml
+++ b/ctw/ranch/map.xml
@@ -1,16 +1,16 @@
-<map proto="1.5.0">
+<map proto="1.5.1">
 <name>Ranch</name>
-<version>1.0.6</version>
-<created>2017-01-16</created>
+<version>1.0.7</version>
 <objective>Capture the enemy team's wools!</objective>
+<created>2017-01-16</created>
 <include id="gapple-kill-reward"/>
 <authors>
     <author uuid="fe3608b7-d105-4029-8800-34b3147065b6"/> <!-- rockymine -->
     <author uuid="6d256510-f2ec-4a5b-b678-fc01c5abd7b3"/> <!-- Sp33dfr3ak -->
 </authors>
 <teams>
-    <team id="blue" color="blue" max="32">Blue</team>
-    <team id="red" color="dark red" max="32">Red</team>
+    <team id="blue-team" color="blue" max="32">Blue</team>
+    <team id="red-team" color="dark red" max="32">Red</team>
 </teams>
 <kits>
     <kit id="spawn-kit">
@@ -21,13 +21,12 @@
         </item>
         <item slot="28" material="arrow"/>
         <item slot="2" unbreakable="true" material="iron pickaxe"/>
-        <item slot="29" unbreakable="true" material="iron spade"/>
+        <item slot="29" unbreakable="true" material="shears"/>
         <item slot="3" unbreakable="true" material="iron axe"/>
-        <item slot="30" unbreakable="true" material="shears"/>
+        <item slot="30" unbreakable="true" material="iron spade"/>
         <item slot="4" amount="64" damage="2" material="wood"/>
-        <item slot="5" amount="32" damage="2" material="glass"/>
-        <item slot="7" material="golden apple"/>
-        <item slot="8" amount="64" material="grilled pork"/>
+        <item slot="5" amount="32" material="glass"/>
+        <item slot="8" material="golden apple"/>
         <item slot="34" amount="32" material="fence"/>
         <item slot="35" amount="32" material="workbench"/>
         <item slot="26" amount="32" material="wood button"/>
@@ -35,105 +34,150 @@
         <chestplate unbreakable="true" team-color="true" material="leather chestplate"/>
         <leggings unbreakable="true" team-color="true" material="leather leggings"/>
         <boots unbreakable="true" team-color="true" material="leather boots"/>
-        <effect duration="5">heal</effect>
+        <effect duration="8s" amplifier="5">damage resistance</effect>
     </kit>
 </kits>
 <spawns>
     <default>
         <region>
-            <block>-711.5,73,-562.5</block>
+            <point>-711.5,72,-562</point>
+        </region>
+        <region yaw="180">
+            <point>-711.5,72,-562</point>
         </region>
     </default>
-    <spawn team="blue" kit="spawn-kit">
+    <spawn team="blue-team" kit="spawn-kit">
         <region>
-            <block>-711.5,8,-685.5</block>
+            <point>-711.5,7,-685.5</point>
         </region>
     </spawn>
-    <spawn team="red" kit="spawn-kit" yaw="-180">
-        <region>
-            <block>-711.5,8,-438.5</block>
+    <spawn team="red-team" kit="spawn-kit">
+        <region yaw="180">
+            <point>-711.5,7,-438.5</point>
         </region>
     </spawn>
 </spawns>
 <filters>
-    <team id="only-blue">blue</team>
-    <team id="only-red">red</team>
-    <all id="only-world-iron">
-        <material id="only-iron">iron block</material>
+    <!-- used with deny inline filters to prevent block destruction caused by water flow -->
+    <all id="not-water-cause-world">
+        <not>
+            <any>
+                <material>water</material>
+                <material>stationary water</material>
+            </any>
+        </not>
         <cause>world</cause>
     </all>
-    <all id="only-some">
+    <blocks id="wool-room-blocks" region="wool-rooms">
         <any>
+            <material>air</material>
             <material>web</material>
-            <material>leaves</material>
+            <material>redstone wire</material>
+            <material>redstone torch on</material>
+            <material>wood button</material>
+            <material>carpet:1</material>
+            <material>dead bush</material>
         </any>
+    </blocks>
+    <all id="blue-wool-room-blocks">
+        <team>blue-team</team>
+        <filter id="wool-room-blocks"/>
+    </all>
+    <all id="red-wool-room-blocks">
+        <team>red-team</team>
+        <filter id="wool-room-blocks"/>
+    </all>
+    <all id="only-iron-regen">
+        <material id="only-iron">iron block</material>
+        <cause>world</cause>
     </all>
-    <not id="no-void">
-        <void/>
-    </not>
 </filters>
 <regions>
-    <negative id="non-bridge">
-        <rectangle min="-766,-607" max="-657,-517"/>
-    </negative>
     <union id="spawns">
         <rectangle id="blue-spawn" min="-698,-645" max="-725,-694"/>
         <rectangle id="red-spawn" min="-725,-479" max="-698,-430"/>
     </union>
     <union id="wool-rooms">
-        <union id="blue-wools">
-            <rectangle id="purple-wool" min="-677,-688" max="-650,-712"/>
-            <rectangle id="yellow-wool" min="-773,-688" max="-746,-712"/>
-        </union>	
-        <union id="red-wools">
-            <rectangle id="green-wool" min="-650,-436" max="-677,-412"/>
-            <rectangle id="magenta-wool" min="-746,-436" max="-773,-412"/>
+        <union id="blue-wool-rooms"> <!-- red capture, blue defend -->
+            <!-- purple wool room -->
+            <complement>
+                <cuboid min="-677,0,-688" max="-650,128,-712"/>
+                <half origin="-668.5,0,-688" normal="-1,0,1"/>
+                <half origin="-677,0,-700.5" normal="-1,0,-1"/>
+                <half origin="-661.5,0,-712" normal="1,0,-1"/>
+                <half origin="-650,0,-696.5" normal="1,0,1"/>
+            </complement>
+            <cuboid min="-670,0,-688" max="-657,128,-689"/>
+            <!-- yellow wool room -->
+            <complement>
+                <cuboid min="-773,0,-688" max="-746,128,-712"/>
+                <half origin="-764.5,0,-688" normal="-1,0,1"/>
+                <half origin="-773,0,-700.5" normal="-1,0,-1"/>
+                <half origin="-757.5,0,-712" normal="1,0,-1"/>
+                <half origin="-746,0,-696.5" normal="1,0,1"/>
+            </complement>
+            <cuboid min="-766,0,-688" max="-753,128,-689"/>
+        </union>
+        <union id="red-wool-rooms"> <!-- blue capture, red defend -->
+            <!-- green wool room -->
+            <complement>
+                <cuboid min="-650,0,-436" max="-677,128,-412"/>
+                <half origin="-658.5,0,-436" normal="1,0,-1"/>
+                <half origin="-650,0,-423.5" normal="1,0,1"/>
+                <half origin="-665.5,0,-412" normal="-1,0,1"/>
+                <half origin="-677,0,-427.5" normal="-1,0,-1"/>
+            </complement>
+            <cuboid min="-657,0,-436" max="-670,128,-435"/>
+            <!-- magenta wool room -->
+            <complement>
+                <cuboid min="-746,0,-436" max="-773,128,-412"/>
+                <half origin="-754.5,0,-436" normal="1,0,-1"/>
+                <half origin="-746,0,-423.5" normal="1,0,1"/>
+                <half origin="-761.5,0,-412" normal="-1,0,1"/>
+                <half origin="-773,0,-427.5" normal="-1,0,-1"/>
+            </complement>
+            <cuboid min="-753,0,-436" max="-766,128,-435"/>
         </union>
     </union>
-    <union id="blue-deny">
-        <region id="red-spawn"/>
-        <region id="blue-wools"/>
-    </union>
-    <union id="red-deny">
-        <region id="blue-spawn"/>
-        <region id="red-wools"/>
-    </union>
-    <union id="iron-break">
-        <rectangle min="-725,-479" max="-698,-430"/>
-        <rectangle min="-698,-645" max="-725,-694"/>
-    </union>
-    <apply block-break="only-some" block-place="never" region="wool-rooms"/>
-    <apply block-break="only-iron" block-place="only-world-iron" region="spawns" message="You may only break iron in the spawn areas!"/>
-    <apply block-place="no-void" region="non-bridge" message="You may not place blocks in the void area!"/>
-    <apply enter="only-blue" message="Only Blue may enter this region!" region="red-deny"/>
-    <apply enter="only-red" message="Only Red may enter this region!" region="blue-deny"/>
-</regions>	
-<wools team="blue">
-    <wool color="magenta" location="-759.5,15,-425.5">
+    <negative id="restricted-void-area">
+        <rectangle min="-766,-607" max="-657,-517"/>
+    </negative>
+    <apply use="blue-team" region="red-wool-rooms"/>
+    <apply use="red-team" region="blue-wool-rooms"/>
+    <apply enter="blue-team" region="blue-spawn" message="You may not enter the enemy's spawn!"/>
+    <apply enter="red-team" region="red-spawn" message="You may not enter the enemy's spawn!"/>
+    <apply enter="blue-team" region="red-wool-rooms" message="You may not enter your own wool rooms!"/>
+    <apply enter="red-team" region="blue-wool-rooms" message="You may not enter your own wool rooms!"/>
+    <apply block-break="only-iron" block-place="only-iron-regen" region="spawns" message="You may only break iron blocks in the spawn!"/>
+    <apply block="deny(not-water-cause-world)" region="wool-rooms"/>
+    <apply block="blue-wool-room-blocks" region="red-wool-rooms" message="You may not modify the wool rooms!"/>
+    <apply block="red-wool-room-blocks" region="blue-wool-rooms" message="You may not modify the wool rooms!"/>
+    <apply block="deny(void)" region="restricted-void-area" message="You may not edit the void!"/>
+</regions>
+<wools craftable="false">
+    <wool team="blue-team" color="magenta" location="-759.5,12,-425.5">
         <monument>
             <block>-713,8,-693</block>
         </monument>
     </wool>
-    <wool color="green" location="-663.5,15,-425.5">
+    <wool team="blue-team" color="green" location="-663.5,12,-425.5">
         <monument>
             <block>-711,8,-693</block>
         </monument>
     </wool>
-</wools>
-<wools team="red">
-    <wool color="purple" location="-663.5,15,-698.5">
+    <wool team="red-team" color="purple" location="-663.5,12,-698.5">
         <monument>
             <block>-711,8,-432</block>
         </monument>
     </wool>
-    <wool color="yellow" location="-759.5,15,-698.5">
+    <wool team="red-team" color="yellow" location="-759.5,12,-698.5">
         <monument>
             <block>-713,8,-432</block>
         </monument>
     </wool>
 </wools>
 <renewables>
-    <renewable rate="2.5" grow="true" particles="true" sound="true" avoid-players="4" renew-filter="only-iron" region="iron-break"/>
+    <renewable region="spawns" renew-filter="only-iron" rate="2.5" avoid-players="4"/>
 </renewables>
 <toolrepair>
     <tool>iron sword</tool>
@@ -145,29 +189,36 @@
     <tool>arrow</tool>
 </toolrepair>
 <itemremove>
-    <item>wood</item>
-    <item>glass</item>
-    <item>grilled pork</item>
     <item>leather helmet</item>
     <item>leather chestplate</item>
     <item>leather leggings</item>
     <item>leather boots</item>
+    <item>string</item>
+    <item>redstone</item>
+    <item>redstone torch on</item>
     <item>red rose</item>
     <item>seeds</item>
     <item>sapling</item>
-    <item>apple</item>
-    <item>chest</item>
-    <item>step</item>
     <item>wood button</item>
-    <item>shears</item>
-    <item>carpet</item>
-    <item>long grass</item>
+    <item>carpet:1</item>
+    <item>glowstone dust</item>
 </itemremove>
 <itemkeep>
+    <item>wood:2</item>
+    <item>glass</item>
+    <item>wood button</item>
+    <item>workbench</item>
+    <item>fence</item>
     <item>golden apple</item>
 </itemkeep>
-<kill-reward>
-    <item damage="2" amount="8" material="wood"/>
-</kill-reward>
+<kill-rewards>
+    <kill-reward>
+        <item amount="16" damage="2" material="wood"/>
+        <item amount="8" material="glass"/>
+    </kill-reward>
+</kill-rewards>
 <maxbuildheight>30</maxbuildheight>
+<hunger>
+    <depletion>off</depletion>
+</hunger>
 </map>