diff --git a/Continuum/Continuum.html b/Continuum/Continuum.html
index f0c020d121..60e625728a 100644
--- a/Continuum/Continuum.html
+++ b/Continuum/Continuum.html
@@ -393,9 +393,9 @@
             Conceal <input type="number" name="attr_melee-weapon-conceal" style="width: 50px" value="0" />
             Length <input type="text" name="attr_melee-weapon-length" style="width: 50px" value="0" />
             <br>
-            <button type="roll" name="attr_weapon-roll" value="&{template:melee} {{name=@{character_name}'s}} {{attack=@{melee-weapon-name} attack [[{@{melee-weapon-rating}[rating]-@{total-IP}[penalties]-1d10}]]}} {{0=[[0+@{melee-damage}]]}}{{1=[[1+@{melee-damage}]]}}{{2=[[2+@{melee-damage}]]}}{{3=[[3+@{melee-damage}]]}}{{4=[[4+@{melee-damage}]]}}{{5=[[5+@{melee-damage}]]}}{{6=[[6+@{melee-damage}]]}}{{7=[[7+@{melee-damage}]]}}{{8=[[8+@{melee-damage}]]}}{{9=[[9+@{melee-damage}]]}}{{10=[[10+@{melee-damage}]]}}{{11=[[11+@{melee-damage}]]}}{{12=[[12+@{melee-damage}]]}}{{13=[[13+@{melee-damage}]]}}{{14=[[14+@{melee-damage}]]}}{{15=[[15+@{melee-damage}]]}}{{16=[[16+@{melee-damage}]]}}{{17=[[17+@{melee-damage}]]}}">Roll Attack</button>
+            <button type="roll" name="attr_weapon-roll" value="&{template:combat} {{name=@{character_name}'s}} {{attack=@{melee-weapon-name} attack [[{@{melee-weapon-rating}[rating]-@{total-IP}[penalties]-1d10+?{modifier?|0}}]]}}{{a=[[@{melee-weapon-rating}+@{melee-damage}]]}}{{b=[[floor(.75*@{melee-weapon-rating})+@{melee-damage}]]}}{{c=[[floor(.5*@{melee-weapon-rating})+@{melee-damage}]]}}{{d=[[floor(.25*@{melee-weapon-rating})+@{melee-damage}]]}} ">Roll Attack</button>
             Notes <input type="text" style="width: 500px" name="attr_melee-weapon-notes" />
-            <button type="roll" name="attr_weapon-counter-roll" value="&{template:melee} {{name=@{character_name}'s}} {{attack=@{melee-weapon-name} counter attack [[{@{melee-weapon-rating}[rating]-?{counter attack}-@{total-IP}[penalties]-1d10}]]}} {{0=[[0+@{melee-damage}]]}}{{1=[[1+@{melee-damage}]]}}{{2=[[2+@{melee-damage}]]}}{{3=[[3+@{melee-damage}]]}}{{4=[[4+@{melee-damage}]]}}{{5=[[5+@{melee-damage}]]}}{{6=[[6+@{melee-damage}]]}}{{7=[[7+@{melee-damage}]]}}{{8=[[8+@{melee-damage}]]}}{{9=[[9+@{melee-damage}]]}}{{10=[[10+@{melee-damage}]]}}{{11=[[11+@{melee-damage}]]}}{{12=[[12+@{melee-damage}]]}}{{13=[[13+@{melee-damage}]]}}{{14=[[14+@{melee-damage}]]}}{{15=[[15+@{melee-damage}]]}}{{16=[[16+@{melee-damage}]]}}{{17=[[17+@{melee-damage}]]}}">Counter Attack</button>
+            <button type="roll" name="attr_weapon-counter-roll" value="&{template:combat} {{name=@{character_name}'s}} {{attack=@{melee-weapon-name} counter attack [[{@{melee-weapon-rating}[rating]-?{counter attack|0}-@{total-IP}[penalties]-1d10+?{modifier?|0}}]]}}{{a=[[@{melee-weapon-rating}+@{melee-damage}]]}}{{b=[[floor(.75*@{melee-weapon-rating})+@{melee-damage}]]}}{{c=[[floor(.5*@{melee-weapon-rating})+@{melee-damage}]]}}{{d=[[floor(.25*@{melee-weapon-rating})+@{melee-damage}]]}}">Counter Attack</button>
         </fieldset>
         <br>
         Ranged Weapons
@@ -428,7 +428,7 @@
                 <option value="7">+7 Ranks</option>
             </select>
             <br>
-            <button type="roll" name="attr_weapon-roll" value="&{template:ranged} {{name=@{character_name}'s}} {{attack=@{ranged-weapon-name} attack [[{@{ranged-weapon-rating}[rating]-@{total-IP}[penalties]-(@{difficulty})-1d10}]]}} {{a=[[@{ranged-damage-a}]]}}{{b=[[@{ranged-damage-b}]]}}{{c=[[@{ranged-damage-c}]]}}{{d=[[@{ranged-damage-d}]]}}">Roll Attack</button>
+            <button type="roll" name="attr_weapon-roll" value="&{template:combat} {{name=@{character_name}'s}} {{attack=@{ranged-weapon-name} attack [[{@{ranged-weapon-rating}[rating]-@{total-IP}[penalties]-(@{difficulty})-1d10}]]}} {{a=[[@{ranged-damage-a}]]}}{{b=[[@{ranged-damage-b}]]}}{{c=[[@{ranged-damage-c}]]}}{{d=[[@{ranged-damage-d}]]}}">Roll Attack</button>
             Notes <input type="text" style="width: 600px" name="attr_ranged-weapon-notes" />
         </fieldset>
     <br>
@@ -617,31 +617,16 @@
         , h:m:s:{{ehour}}:{{eminute}}:{{esecond}}
         
 </rolltemplate>
-<rolltemplate class="sheet-rolltemplate-melee">
+<rolltemplate class="sheet-rolltemplate-combat">
     {{name}}<br>
     {{attack}}<br>
     {{#rollGreater() attack -1}} damage=
-    {{#rollTotal() attack 0}} {{0}} {{/rollTotal() attack 0}}
-    {{#rollTotal() attack 1}} {{1}} {{/rollTotal() attack 1}}
-    {{#rollTotal() attack 2}} {{2}} {{/rollTotal() attack 2}}
-    {{#rollTotal() attack 3}} {{3}} {{/rollTotal() attack 3}}
-    {{#rollTotal() attack 4}} {{4}} {{/rollTotal() attack 4}}
-    {{#rollTotal() attack 5}} {{5}} {{/rollTotal() attack 5}}
-    {{#rollTotal() attack 6}} {{6}} {{/rollTotal() attack 6}}
-    {{#rollTotal() attack 7}} {{7}} {{/rollTotal() attack 7}}
-    {{#rollTotal() attack 8}} {{8}} {{/rollTotal() attack 8}}
-    {{#rollTotal() attack 9}} {{9}} {{/rollTotal() attack 9}}
-    {{#rollTotal() attack 10}} {{10}} {{/rollTotal() attack 10}}
-    {{#rollTotal() attack 11}} {{11}} {{/rollTotal() attack 11}}
-    {{#rollTotal() attack 12}} {{12}} {{/rollTotal() attack 12}}
-    {{#rollTotal() attack 13}} {{13}} {{/rollTotal() attack 13}}
-    {{#rollTotal() attack 14}} {{14}} {{/rollTotal() attack 14}}
-    {{#rollTotal() attack 15}} {{15}} {{/rollTotal() attack 15}}
-    {{#rollTotal() attack 16}} {{16}} {{/rollTotal() attack 16}}
-    {{#rollTotal() attack 17}} {{17}} {{/rollTotal() attack 17}}
+        {{#rollBetween() attack 0 2}}{{d}} Location D{{/rollBetween() attack 0 2}}
+        {{#rollBetween() attack 3 4}}{{c}} Location C{{/rollBetween() attack 3 4}}
+        {{#rollBetween() attack 5 7}}{{b}} Location B{{/rollBetween() attack 5 7}}
+        {{#rollGreater() attack 7}}{{a}} Location A{{/rollGreater() attack 7}}
     {{/rollGreater() attack -1}}
 </rolltemplate>
-
 <rolltemplate class="sheet-rolltemplate-ranged">
     {{name}}<br>
     {{attack}}<br>