diff --git a/D&D_5e_Shaped/precompiled/pages/roll_template.html b/D&D_5e_Shaped/precompiled/pages/roll_template.html
index 12da84e652..65f009e077 100644
--- a/D&D_5e_Shaped/precompiled/pages/roll_template.html
+++ b/D&D_5e_Shaped/precompiled/pages/roll_template.html
@@ -23,11 +23,8 @@
       {{#melee}}
         <div class="sheet-rt-subheader">{{#show_character_name}}{{character_name}} &bullet; {{/show_character_name}}Melee {{#reach}} &bullet; {{reach}}{{/reach}}</div>
       {{/melee}}
-      {{#thrown}}
-        <div class="sheet-rt-subheader">{{#show_character_name}}{{character_name}} &bullet; {{/show_character_name}}Thrown {{#reach}} &bullet; {{reach}}{{/reach}}{{#range}} &bullet; {{range}}{{/range}}</div>
-      {{/thrown}}
       {{#ranged}}
-      <div class="sheet-rt-subheader">{{#show_character_name}}{{character_name}} &bullet; {{/show_character_name}}Ranged {{#range}} &bullet; {{range}}{{/range}}</div>
+      <div class="sheet-rt-subheader">{{#show_character_name}}{{character_name}} &bullet; {{/show_character_name}}Ranged {{#range}} &bullet; {{range}}{{/range}}{{#ammo}} &bullet; {{ammo}} ammo{{/ammo}}</div>
       {{/ranged}}
       {{#spell}}
         <div class="sheet-rt-subheader">{{#show_character_name}}{{character_name}} &bullet; {{/show_character_name}}{{spellfriendlylevel}}{{#spellschool}} &bullet; {{spellschool}}{{/spellschool}}{{#range}} &bullet; {{range}}{{/range}}</div>
@@ -302,12 +299,12 @@
 
       <!-- Class action additions -->
       {{#showclassactions}}
-        {{#allprops() showclassactions character_name save title show_character_name subheader subheaderright subheader2 subheaderright2 rollname roll rolladv emote deathsave targetAC weapon attack action melee thrown ranged attackadv damage critdamage target reach range spell spellfriendlylevel spellschool spellconcentration spellritual spellshowinfoblock spellshowdesc spelldescription spellshowhigherlvl spellhigherlevel spellshowattack spellattack spellshowattackadv spellattackadv spellshowsavethrow spellsavedc spellsavestat spellsavesuccess spellshowhealing spellhealing spellshowdamage spelldamage spellcancrit spellcritdamage spellshoweffects spelleffect spellcasttime spellduration spellgainedfrom spellcomponents ability}}
+        {{#allprops() showclassactions character_name save title show_character_name subheader subheaderright subheader2 subheaderright2 rollname roll rolladv emote deathsave targetAC weapon attack action melee ranged attackadv damage critdamage target reach range spell spellfriendlylevel spellschool spellconcentration spellritual spellshowinfoblock spellshowdesc spelldescription spellshowhigherlvl spellhigherlevel spellshowattack spellattack spellshowattackadv spellattackadv spellshowsavethrow spellsavedc spellsavestat spellsavesuccess spellshowhealing spellhealing spellshowdamage spelldamage spellcancrit spellcritdamage spellshoweffects spelleffect spellcasttime spellduration spellgainedfrom spellcomponents ability}}
           <div class="sheet-row">
             <div class="sheet-col-9-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key">{{key}}</div>
             <div class="sheet-col-15-24 sheet-pad-r-sm sheet-rt-value">{{value}}</div>
           </div>
-        {{/allprops() showclassactions character_name save title show_character_name subheader subheaderright subheader2 subheaderright2 rollname roll rolladv emote deathsave targetAC weapon attack action melee thrown ranged attackadv damage critdamage target reach range spell spellfriendlylevel spellschool spellconcentration spellritual spellshowinfoblock spellshowdesc spelldescription spellshowhigherlvl spellhigherlevel spellshowattack spellattack spellshowattackadv spellattackadv spellshowsavethrow spellsavedc spellsavestat spellsavesuccess spellshowhealing spellhealing spellshowdamage spelldamage spellcancrit spellcritdamage spellshoweffects spelleffect spellcasttime spellduration spellgainedfrom spellcomponents ability}}
+        {{/allprops() showclassactions character_name save title show_character_name subheader subheaderright subheader2 subheaderright2 rollname roll rolladv emote deathsave targetAC weapon attack action melee ranged attackadv damage critdamage target reach range spell spellfriendlylevel spellschool spellconcentration spellritual spellshowinfoblock spellshowdesc spelldescription spellshowhigherlvl spellhigherlevel spellshowattack spellattack spellshowattackadv spellattackadv spellshowsavethrow spellsavedc spellsavestat spellsavesuccess spellshowhealing spellhealing spellshowdamage spelldamage spellcancrit spellcritdamage spellshoweffects spelleffect spellcasttime spellduration spellgainedfrom spellcomponents ability}}
       {{/showclassactions}}
 
       <!--Outputall-->