diff --git a/ShadowbaneInquisition/Shadowbane.css b/ShadowbaneInquisition/Shadowbane.css
index 73a920e3ed..910a2acaf3 100644
--- a/ShadowbaneInquisition/Shadowbane.css
+++ b/ShadowbaneInquisition/Shadowbane.css
@@ -382,20 +382,22 @@ _____________ start of grid structure for unnatural characteristics, size dropdo
 .sheet-movementgs3 { grid-area: amm3; }
 .sheet-movementgs4 { grid-area: amm4; }
 .sheet-movementgs5 { grid-area: amm5; }
+.sheet-movementgs0 { grid-area: amm0; }
 .sheet-movementgs6 { grid-area: amm6;  3px; font-size: 14px; font-family: inherit; }
 .sheet-movementgs7 { grid-area: amm7; 5px; font-size: 14px; font-family: inherit; }
 .sheet-movementgs8 { grid-area: amm8; 5px; font-size: 14px; font-family: inherit; }
 .sheet-movementgs9 { grid-area: amm9; font-size: 14px; font-family: inherit; }
+.sheet-movementgs10 { grid-area: amm10; font-size: 14px; font-family: inherit; }
 .sheet-characteristics2_movement {
 	justify-content: center;
 	text-align: center;
 	display: grid;
 	justify-items: center;
-	grid-template-columns: 50px 50px 50px 50px;
+	grid-template-columns: 50px 50px 50px 50px 50px;
 	grid-template-areas:
-	'amm1 amm1 amm1 amm1'
-	'amm2 amm3 amm4 amm5'
-	'amm6 amm7 amm8 amm9';
+	'amm1 amm1 amm1 amm1 amm1'
+	'amm2 amm3 amm4 amm5 amm0'
+	'amm6 amm7 amm8 amm9 amm10';
 }
 
 .sheet-carrygs1 { grid-area: ac1; font-size: 15px; font-family: inherit; letter-spacing: 0px; }
@@ -762,7 +764,7 @@ ______________________________ start of equipment tab __________________________
 .sheet-equipment_ranged_weapons_gs37 { grid-area: rw37; /*color: white;*/ font-size: 12px; padding: 0px 2px; }
 .sheet-equipment_ranged_weapons_gs38 { grid-area: rw38; /*color: white;*/ font-size: 12px; padding: 0px 2px; }
 
-.sheet-equipment_ranged_weapons_grid0 { /* gs1-4, Name, Class */
+.sheet-equipment_ranged_weapons_grid0 { /* gs01-05, roll modifiers, hit, DMG */
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto auto auto auto;
@@ -786,12 +788,11 @@ ______________________________ start of equipment tab __________________________
 	'rw5 rw6 rw7 rw8 rw8 rw9 rw10 rw11 rw12 rw12';
 }
 
-.sheet-equipment_ranged_weapons_grid3 { /* gs13-24 RoF, Magazine, Hit/Dmg buttons */
+.sheet-equipment_ranged_weapons_grid3 { /* gs13-22 RoF, Magazine */
 	align-items: center;
 	display: grid;
-	grid-template-columns: auto 8% 4% 8% 4% 8% auto 8% 4% 8% 61px 61px; /* 12 columns, nonstandard */
-	grid-template-areas:
-	'rw13 rw14 rw15 rw16 rw17 rw18 rw19 rw20 rw21 rw22 rw23 rw24';
+	grid-template-columns: auto 10% 4% 10% 4% 10% 6% auto 13% 4% 13%;
+  grid-template-areas: 'rw13 rw14 rw15 rw16 rw17 rw18 . rw19 rw20 rw21 rw22';
 }
 
 
@@ -837,8 +838,8 @@ ______________________________ start of equipment tab __________________________
 .sheet-equipment_melee_weapons_gs16 { grid-area: mw16; /*color: white;*/ font-size: 12px;  }
 .sheet-equipment_melee_weapons_gs17 { grid-area: mw17; /*color: white;*/ font-size: 12px; padding: 0px 2px; }
 .sheet-equipment_melee_weapons_gs18 { grid-area: mw18; /*color: white;*/ font-size: 12px;  }
-.sheet-equipment_melee_weapons_gs19 { grid-area: mw19; /*color: white;*/ font-size: 12px; width: 50px!important; }
-.sheet-equipment_melee_weapons_gs20 { grid-area: mw20; /*color: white;*/ font-size: 12px; width: 50px!important; }
+.sheet-equipment_melee_weapons_gs19 { grid-area: mw19; /*color: white;*/ font-size: 12px;  }
+.sheet-equipment_melee_weapons_gs20 { grid-area: mw20; /*color: white;*/ font-size: 12px;  }
 
 .sheet-equipment_melee_weapons_grid0 { /* gs01-05 aim, type, multi, hit, dmg */
 	align-items: center;
@@ -848,7 +849,7 @@ ______________________________ start of equipment tab __________________________
 	'mw01 mw02 mw03 . mw04 mw05';
 }
 
-.sheet-equipment_melee_weapons_grid1 { /* gs1-4 name, domain */
+.sheet-equipment_melee_weapons_grid1 { /* gs1-4 name, class */
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
@@ -864,10 +865,10 @@ ______________________________ start of equipment tab __________________________
 	'mw5 mw6 mw7 mw8 mw8 mw9 mw10 mw11 mw12 mw12';
 }
 
-.sheet-equipment_melee_weapons_grid3 { /* gs13-20 trained?, hitmod, weight, buttons */
+.sheet-equipment_melee_weapons_grid3 { /* gs13-20 trained?, hitmod, weight, domain */
 	align-items: center;
 	display: grid;
-	grid-template-columns: auto 20px auto auto auto auto auto auto 61px 61px;
+	grid-template-columns: auto 20px auto auto auto auto auto auto 50px 80px;
 	grid-template-areas:
 	'mw13 mw14 mw15 mw16 mw16 mw17 mw18 mw18 mw19 mw20';
 }
@@ -925,6 +926,7 @@ width: 60px;
 display: inline-block;
 }
 
+.sheet-armor_display_gs0 { grid-area: ad0; }
 .sheet-armor_display_gs1 { grid-area: ad1; }
 .sheet-armor_display_gs2 { grid-area: ad2; }
 .sheet-armor_display_gs3 { grid-area: ad3; }
@@ -937,7 +939,7 @@ display: inline-block;
 	column-gap: 10px;
 	row-gap: 15px;
 	grid-template-areas:
-	'. ad1 .'
+	'. ad1 ad0'
 	'ad2 ad3 ad4';
 }
 
@@ -1371,6 +1373,12 @@ ______________________________ start of rolltemplate ___________________________
 	background-color: transparent;
 }
 
+.sheet-rolltemplate-mythic .sheet-roll-adjust {
+  padding: 0 3px 0 3px;
+  font-weight: bold;
+  font-size: 1.1em;
+}
+
 .sheet-rolltemplate-mythic .inlinerollresult {
 	display: inline-block;
 	min-width: 1.5em;
diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html
index d0679e01f1..76b4e20e5c 100644
--- a/ShadowbaneInquisition/Shadowbane.html
+++ b/ShadowbaneInquisition/Shadowbane.html
@@ -35,15 +35,15 @@
 	  <input name='attr_appearance' type='text' class='gs15' placeholder='Gender, Age, Build, etc.' />
 	  <input name='attr_appearance2' type='text' class='gs16' placeholder='Complexion, Hair, etc.' />
 	  <input name='attr_Quirks' type='text' class='gs17' />
-	  <input name='attr_Allies' type='text' class='gs18' />
-	  <input name='attr_Enemies' type='text' class='gs19' />
+	  <input name='attr_Divination' type='text' class='gs18' />
+	  <input name='attr_Superstition' type='text' class='gs19' />
 
 	  <!-- fifth column of grid: right-side fields' labels/names gs20-24 -->
 	  <div class='gs20 edge_padding'><b>Player Name</b></div>
 	  <div class='gs21 edge_padding'><b>Appearance</b></div>
 	  <div class='gs22 edge_padding'><b>Quirks</b></div>
-	  <div class='gs23 edge_padding'><b>Allies</b></div>
-	  <div class='gs24 edge_padding'><b>Enemies</b></div>
+	  <div class='gs23 edge_padding'><b>Divination</b></div>
+	  <div class='gs24 edge_padding'><b>Superstition</b></div>
 
 	</div>
 	<br>
@@ -58,12 +58,12 @@
 		<button title="Ballistic Skill" name='BS' type='roll' class='clear full_width characteristics_button'value=  '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Ballistic Skill}} [[1 + floor(abs([[@{BS} + @{BS_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'   >BS |<input name='attr_BS_total'  value='@{BS}  + @{BS_advancement}'  class='input_background input_char_background' disabled /></button>
 		<button title="Strength" name='STR' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Strength}}        [[1 + floor(abs([[@{STR} + @{STR_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>STR |<input name='attr_STR_total' value='@{STR} + @{STR_advancement}' class='input_background input_char_background' disabled /></button>
 		<button title="Toughness" name='TOU' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Toughness}}       [[1 + floor(abs([[@{TOU} + @{TOU_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>TOU |<input name='attr_TOU_total' value='@{TOU} + @{TOU_advancement}' class='input_background input_char_background' disabled /></button>
-		<button title="Agility" name='AGI' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Agility}}         [[1 + floor(abs([[@{AGI} + @{AGI_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>AGI |<input name='attr_AGI_total' value='@{AGI} + @{AGI_advancement}' class='input_background input_char_background' disabled /></button>
+		<button title="Agility" name='AGI' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Agility}}         [[1 + floor(abs([[@{AGI_total} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>AGI |<input type="hidden" name="attr_agiTotal" value=""><input name='attr_AGI_total' value="@{agiTotal}" class='input_background input_char_background' disabled /></button>
 		<button title="Intelligence" name='INT' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Intelligence}}    [[1 + floor(abs([[@{INT} + @{INT_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>INT |<input name='attr_INT_total' value='@{INT} + @{INT_advancement}' class='input_background input_char_background' disabled /></button>
 		<button title="Perception" name='PER' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Perception}}      [[1 + floor(abs([[@{PER} + @{PER_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>PER |<input name='attr_PER_total' value='@{PER} + @{PER_advancement}' class='input_background input_char_background' disabled /></button>
 		<button title="Willpower" name='WP' type='roll' class='clear full_width characteristics_button'value=  '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Willpower}}       [[1 + floor(abs([[@{WP} + @{WP_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'   >WP |<input name='attr_WP_total'  value='@{WP}  + @{WP_advancement}'  class='input_background input_char_background' disabled /></button>
 		<button title="Fellowship" name='FEL' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Fellowship}}      [[1 + floor(abs([[@{FEL} + @{FEL_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>FEL |<input name='attr_FEL_total' value='@{FEL} + @{FEL_advancement}' class='input_background input_char_background' disabled /></button>
-		<button title="Influence" name='INF' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Influence}}       [[1 + floor(abs([[@{INF} + @{INF_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>INF |<input name='attr_INF_total' value='@{INF} + @{INF_advancement}' class='input_background input_char_background' disabled /></button>
+		<button title="Influence" name='INF' type='roll' class='clear full_width characteristics_button'value= '@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Influence}}       [[1 + floor(abs([[@{INF} + @{INF_advancement} + @{inlinemod-toggle} ]]- [[1d100]])/10)]]}} {{target= $[[0]]}}{{roll= $[[1]]}}{{degrees= $[[2]]}}'>INF |<input name='attr_INF_total' value='@{INF}' class='input_background input_char_background' disabled /></button>
 
 	  <input title="Weapon Skill" name='attr_WS'  type='text' value='0' class='characteristics_input full_width' />
 	  <input title="Ballistic Skill" name='attr_BS'  type='text' value='0' class='characteristics_input full_width' />
@@ -157,15 +157,14 @@
 		<option value='25'>E +25</option>
 		<option value='30'>M +30</option>
 	  </select>
-	  <select name='attr_INF_advancement' class='full_width'>
-		<option value='0' selected='selected'>Not 4 U</option>
-		<!--<option value='0' selected='selected'>N/A +0</option>
+	  <select name='attr_INF_advancement' class='full_width' disabled>
+		<option value='0' selected='selected'>N/A +0</option>
 		<option value='5'>S +5</option>
 		<option value='10'>I +10</option>
 		<option value='15'>T +15</option>
 		<option value='20'>P +20</option>
 		<option value='25'>E +25</option>
-		<option value='30'>M +30</option> -->
+		<option value='30'>M +30</option>
 	</div>
 	<br>
 
@@ -225,10 +224,12 @@
 		<input name='attr_full_move' type='text' class='movementgs3 unnatgs_width' readonly />
 		<input name='attr_charge_move' type='text' class='movementgs4 unnatgs_width' readonly />
 		<input name='attr_run_move' type='text' class='movementgs5 unnatgs_width' readonly />
+		<input name='attr_agi_mov_mod' type='number' value='0' class='movementgs0 unnatgs_width' /> <!-- NOTE: this add a modifier to the AgB for movement only -->
 		<p class='movementgs6 '>Half</p>
 		<p class='movementgs7 '>Full</p>
 		<p class='movementgs8 '>Charge</p>
 		<p class='movementgs9 '>Run</p>
+		<p class='movementgs10 '>Mod</p>
 	  </div>
 	  <div class='characteristics2_carry'>
 		<p class='carrygs1 unnatgs_heading'><b>Weight Capacity</b></p>
@@ -255,7 +256,7 @@
 		Initiative|<input name='attr_init_total' value='floor(@{initmod2}+@{initmod3})' class='input_background input_init_background' disabled /></button>
 		<select name='attr_initmod1' class='init_field'>
 		  <option value='1d10' selected='selected'>Standard</option>
-		  <option value='2d10k1'>Lightning Reflexes</option>
+		  <option value='2d10k1'>Constant Vigiliance</option>
 		  <option value='?{dice|1d10}'>Custom</option>
 		</select>
 		<p class='init_plus'>+</p>
@@ -338,8 +339,8 @@
     		<div class='edge_padding ssc'>
 					<fieldset name='conditions' class='repeating_conditions'>
     			<input name='attr_condition_r' type='text' placeholder='Name' class='full_width_49px' />
-    			<label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
-    			<label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{condition_r} }} {{description=@{condition_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+    			<label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
+    			<label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{condition_r} }} {{description=@{condition_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
     			<input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
     			<textarea name='attr_condition_desc_r' class='collapsible_entity_block' placeholder='Description of the conditions suffered'></textarea>
     		  </fieldset>
@@ -633,19 +634,6 @@
 			  <input name='attr_mod3_nav_warp' type='checkbox' value='50' class='skills_item' />
 			  <button type='roll' name='nav_warp_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Navigate: Warp}} {{roll=[[1+floor(abs([[@{mod1_nav_warp}+@{mod2_nav_warp}+@{mod3_nav_warp}-20+@{inlinemod-toggle}]]-[[1d100]])/10)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{degrees= $[[2]]}}' class='clear'><input name='attr_nav_warp_total' value='@{mod1_nav_warp}+@{mod2_nav_warp}+@{mod3_nav_warp}-20' class='input_background' disabled /></button>
 			</div>
-			<div class='skill_grid'>
-			  <p class='bold_text skills_text'>Operate: Surface</p>
-			  <select name='attr_mod1_op_surface' class='full_width full_height'>
-				<option value='@{AGI} + @{AGI_advancement}' selected='selected'>AGI</option>
-				<option value='@{INT} + @{INT_advancement}' >INT</option>
-			  </select>
-			  <input name='attr_mod2_op_surface' type='number' value='0' />
-			  <input name='attr_mod3_op_surface' type='checkbox' value='20' class='skills_item' />
-			  <input name='attr_mod3_op_surface' type='checkbox' value='30' class='skills_item' />
-			  <input name='attr_mod3_op_surface' type='checkbox' value='40' class='skills_item' />
-			  <input name='attr_mod3_op_surface' type='checkbox' value='50' class='skills_item' />
-			  <button type='roll' name='op_surface_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Surface}} {{roll=[[1+floor(abs([[@{mod1_op_surface}+@{mod2_op_surface}+@{mod3_op_surface}-20+@{inlinemod-toggle}]]-[[1d100]])/10)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{degrees= $[[2]]}}' class='clear'><input name='attr_op_surface_total' value='@{mod1_op_surface}+@{mod2_op_surface}+@{mod3_op_surface}-20' class='input_background' disabled /></button>
-			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Operate: Aeronautica</p>
 			  <select name='attr_mod1_op_aero' class='full_width full_height'>
@@ -659,6 +647,19 @@
 			  <input name='attr_mod3_op_aero' type='checkbox' value='50' class='skills_item' />
 			  <button type='roll' name='op_aero_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Aeronautica}} {{roll=[[1+floor(abs([[@{mod1_op_aero}+@{mod2_op_aero}+@{mod3_op_aero}-20+@{inlinemod-toggle}]]-[[1d100]])/10)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{degrees= $[[2]]}}' class='clear'><input name='attr_op_aero_total' value='@{mod1_op_aero}+@{mod2_op_aero}+@{mod3_op_aero}-20' class='input_background' disabled /></button>
 			</div>
+			<div class='skill_grid'>
+			  <p class='bold_text skills_text'>Operate: Surface</p>
+			  <select name='attr_mod1_op_surface' class='full_width full_height'>
+				<option value='@{AGI} + @{AGI_advancement}' selected='selected'>AGI</option>
+				<option value='@{INT} + @{INT_advancement}' >INT</option>
+			  </select>
+			  <input name='attr_mod2_op_surface' type='number' value='0' />
+			  <input name='attr_mod3_op_surface' type='checkbox' value='20' class='skills_item' />
+			  <input name='attr_mod3_op_surface' type='checkbox' value='30' class='skills_item' />
+			  <input name='attr_mod3_op_surface' type='checkbox' value='40' class='skills_item' />
+			  <input name='attr_mod3_op_surface' type='checkbox' value='50' class='skills_item' />
+			  <button type='roll' name='op_surface_roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Operate: Surface}} {{roll=[[1+floor(abs([[@{mod1_op_surface}+@{mod2_op_surface}+@{mod3_op_surface}-20+@{inlinemod-toggle}]]-[[1d100]])/10)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{degrees= $[[2]]}}' class='clear'><input name='attr_op_surface_total' value='@{mod1_op_surface}+@{mod2_op_surface}+@{mod3_op_surface}-20' class='input_background' disabled /></button>
+			</div>
 			<div class='skill_grid'>
 			  <p class='bold_text skills_text'>Operate: Voidship</p>
 			  <select name='attr_mod1_op_void' class='full_width full_height'>
@@ -1042,15 +1043,15 @@
 		<p class='abilities_checkbox_pointer'><b>Expand ⯆</b></p>
 		<div class='edge_padding ssc'>
 		  <input name='attr_ability' type='text' placeholder='Ability or Talent Name' class='full_width_49px' />
-		  <label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='1' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
-		  <label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{ability} }} {{description=@{ability_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+		  <label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='1' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
+		  <label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{ability} }} {{description=@{ability_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 		  <input name='attr_collapse' type='checkbox'  value='1' class='collapsible_entity_switch hidden' />
 		  <textarea name='attr_ability_desc' class='collapsible_entity_block'
 		  placeholder='Anything about this character that innately changes how they interact with the world fits here.'></textarea>
 		  <fieldset name='abilities' class='repeating_abilities'>
 			<input name='attr_ability_r' type='text' placeholder='Name' class='full_width_49px' />
-			<label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
-			<label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{ability_r} }} {{description=@{ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+			<label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
+			<label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{ability_r} }} {{description=@{ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 			<input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 			<textarea name='attr_ability_desc_r' class='collapsible_entity_block'></textarea>
 		  </fieldset>
@@ -1060,15 +1061,15 @@
 		<p class='traits_checkbox_pointer'><b>Expand ⯆</b></p>
 		<div class='edge_padding ssc'>
 		  <input name='attr_trait' type='text' placeholder='Trait Name' class='full_width_49px' />
-		  <label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='2' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
-		  <label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{trait} }} {{description=@{trait_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+		  <label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='2' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
+		  <label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{trait} }} {{description=@{trait_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 		  <input name='attr_collapse' type='checkbox'  value='2' class='collapsible_entity_switch hidden' />
 		  <textarea name='attr_trait_desc' class='collapsible_entity_block'
 		  placeholder='Anything about this character that innately changes how they interact with the world fits here.'></textarea>
 		  <fieldset name='traits' class='repeating_traits'>
 			<input name='attr_trait_r' type='text' placeholder='Name' class='full_width_49px' />
-			<label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
-			<label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{trait_r} }} {{description=@{trait_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+			<label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
+			<label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{trait_r} }} {{description=@{trait_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 			<input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 			<textarea name='attr_trait_desc_r' class='collapsible_entity_block'></textarea>
 		  </fieldset>
@@ -1084,36 +1085,44 @@
 	<div class='equipment_divider'>
 	  <div class='equipment_ranged_weapons ssc'>
 		<h3 class='radius_border_top'>Ranged Weapons</h3>
+		<!-- TODO: find a way to expand/collapse weapons -->
 		<fieldset name='rangedweapons' class='repeating_rangedweapons'>
 		  <div class='equipment_ranged_weapons_rep'>
 			<div class="equipment_ranged_weapons_grid0">
-				<select name='attr_R_weapon_aim' class='equipment_ranged_weapons_gs01 full_width clear sheet-select_corection'>
+				<select name='attr_R_weapon_aim' class='equipment_ranged_weapons_gs01 full_width clear select_corection'>
 					<option value='0' selected='selected'>No Aim (+0)</option>
 					<option value='10' >Half Aim (+10)</option>
 					<option value='20' >Full Aim (+20)</option>
 			  </select>
-				<select name='attr_R_weapon_attack' class='equipment_ranged_weapons_gs02 full_width clear sheet-select_corection'>
+				<select name='attr_R_weapon_attack' class='equipment_ranged_weapons_gs02 full_width clear select_corection'>
 					<option value='10' selected='selected'>Standard (+10)</option>
 					<option value='0' >Semi Auto (+0)</option>
 					<option value='-10' >Full Auto (-10)</option>
 					<option value='-20' >Called Shot (-20)</option>
 					<option value='-20' >Suppressing (-20)</option>
 			  </select>
-				<select name='attr_R_weapon_attack_range' class='equipment_ranged_weapons_gs03 full_width clear sheet-select_corection'>
+				<select name='attr_R_weapon_attack_range' class='equipment_ranged_weapons_gs03 full_width clear select_corection'>
 					<option value='30' >Point Blank (+30)</option>
 					<option value='10' >Short Range (+10)</option>
 					<option value='0' selected='selected'>Standard (+0)</option>
 					<option value='-10' >Long Range (-10)</option>
 					<option value='-30' >Extreme Range (-30)</option>
 			  </select>
-				<button class='equipment_ranged_weapons_gs04 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{R_weapon_name}}} {{degrees=[[1+ floor(abs( [[[[@{BS} + @{BS_advancement} + @{R_weapon_trained} - 20 + @{R_weapon_mod1}]] + [[@{R_weapon_attack} + @{R_weapon_aim} + @{R_weapon_attack_range} + @{inlinemod-toggle} ]]]] - [[1d100@{R_weapon_mishap_chance}]])/10)]]}}{{roll= $[[3]]}}{{target= $[[2]]}}@{settings_hitroll}{{aim= [[@{R_weapon_aim}]]}}{{R_type= [[@{R_weapon_attack}]]}}{{range= [[@{R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Ballistic}}{{skill=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{weaponmod= [[@{R_weapon_mod1}]]}}{{trained= [[@{R_weapon_trained}]]}}' >Hit</button>
+				<button class='equipment_ranged_weapons_gs04 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{R_weapon_name}}} {{degrees=[[1+ floor(abs( [[[[@{BS} + @{BS_advancement} + @{R_weapon_trained} - 20 + @{R_weapon_mod1}]] + [[@{R_weapon_attack} + @{R_weapon_aim} + @{R_weapon_attack_range} + @{inlinemod-toggle} ]]]] - [[1d100@{R_weapon_mishap_chance}]])/10)]]}}{{roll= $[[3]]}}{{target= $[[2]]}}@{settings_hitroll}{{aim= [[@{R_weapon_aim}]]}}{{R_type= [[@{R_weapon_attack}]]}}{{range= [[@{R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Ballistic}}{{skill=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{weaponmod= [[@{R_weapon_mod1}]]}}{{trained= [[@{R_weapon_trained}]]}}{{burst=@{R_weapon_burst}}}{{auto=@{R_weapon_auto}}}' >Hit</button>
 			  <button class='equipment_ranged_weapons_gs05 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{type= @{R_weapon_type}}} {{weapon= @{R_weapon_name}}} {{damage=[[@{R_weapon_dam-roll}]] }} {{@{R_weapon_spray}= }} {{pen=[[@{R_weapon_pen}]] }}  {{@{settings_weapondescription}=@{R_ability_r} }}' >DMG</button>
 			</div>
 			<div class='equipment_ranged_weapons_grid1'>
 			  <div class='equipment_ranged_weapons_gs1'>Name</div>
 			  <input class='equipment_ranged_weapons_gs2 full_width' type='text' name='attr_R_weapon_name' />
 			  <div class='equipment_ranged_weapons_gs3'>Class</div>
-			  <input class='equipment_ranged_weapons_gs4 full_width' type='text' name='attr_R_weapon_class' />
+				<select class='equipment_ranged_weapons_gs4 full_width select_corection' name='attr_R_weapon_class' >
+				  <option value='-'>N/A</option>
+				  <option value='Basic'>Basic</option>
+				  <option value='Heavy'>Heavy</option>
+				  <option value='Melee'>Melee</option>
+				  <option value='Pistol'>Pistol</option>
+				  <option value='Thrown'>Thrown</option>
+				</select>
 			</div>
 			<div class='equipment_ranged_weapons_grid2'>
 			  <div class='equipment_ranged_weapons_gs5'>Range</div>
@@ -1123,7 +1132,13 @@
 			  <div class='equipment_ranged_weapons_gs9'>Pen</div>
 			  <input class='equipment_ranged_weapons_gs10 full_width' type='text' value='0' name='attr_R_weapon_pen' />
 			  <div class='equipment_ranged_weapons_gs11'>Type</div>
-			  <input class='equipment_ranged_weapons_gs12 full_width' type='text' name='attr_R_weapon_type' />
+        <select class='equipment_ranged_weapons_gs12 full_width select_corection' name='attr_R_weapon_type'>
+          <option value='-'>N/A</option>
+          <option value='Energy'>Energy</option>
+          <option value='Impact'>Impact</option>
+          <option value='Rending'>Rending</option>
+          <option value='Explosive'>Explosive</option>
+        </select>
 			</div>
 			<div class='equipment_ranged_weapons_grid3'>
 			  <div class='equipment_ranged_weapons_gs13'>RoF</div>
@@ -1141,7 +1156,7 @@
 			  <div class='equipment_ranged_weapons_gs25'>Trained?</div>
 			  <input class='equipment_ranged_weapons_gs26' type='checkbox' value='20' name='attr_R_weapon_trained' checked />
 			  <div class='equipment_ranged_weapons_gs27'>Hit Mod</div>
-			  <input class='equipment_ranged_weapons_gs28 full_width' type='text' value='0' name='attr_R_weapon_mod1' />
+			  <input class='equipment_ranged_weapons_gs28 full_width' type='number' value='0' name='attr_R_weapon_mod1' />
 			  <div class='equipment_ranged_weapons_gs29'>Reload</div>
 			  <input class='equipment_ranged_weapons_gs30 full_width' type='text' value='0' name='attr_R_weapon_reload' />
 			  <div class='equipment_ranged_weapons_gs31'>Weight</div>
@@ -1149,9 +1164,33 @@
 			</div>
 			<div class='equipment_ranged_weapons_grid5'>
 			  <div class='equipment_ranged_weapons_gs33'>Domain</div>
-			  <input class='equipment_ranged_weapons_gs34 full_width' type='text' name='attr_R_weapon_domain' />
+				<select class='equipment_ranged_weapons_gs34 full_width select_corection' name='attr_R_weapon_domain'>
+				  <option value='-'>N/A</option>
+				  <option value='Bolt'>Bolt</option>
+				  <option value='Chain'>Chain</option>
+				  <option value='Exotic'>Exotic</option>
+				  <option value='Exotic (Graviton)'>Exotic (Graviton)</option>
+				  <option value='Explosives'>Explosives</option>
+				  <option value='Flame'>Flame</option>
+				  <option value='Force'>Force</option>
+				  <option value='Grenades/Missiles'>Grenades/Missiles</option>
+				  <option value='Las'>Las</option>
+				  <option value='Launcher'>Launcher</option>
+				  <option value='Low-Tech'>Low-Tech</option>
+				  <option value='Melta'>Melta</option>
+				  <option value='Plasma'>Plasma</option>
+				  <option value='Power'>Power</option>
+				  <option value='Shock'>Shock</option>
+				  <option value='Solid-Projectile'>Solid Projectile</option>
+				  <option value='Varies'>Varies</option>
+				  <option value='Xenos(Eldar)'>Xenos (Eldar)</option>
+				  <option value='Xenos(Kroot)'>Xenos (Kroot)</option>
+				  <option value='Xenos(Lost Races)'>Xenos (Lost Races)</option>
+				  <option value='Xenos(Necron)'>Xenos (Necron)</option>
+				  <option value='Xenos(Ork)'>Xenos (Ork)</option>
+				</select>
 			  <div class='equipment_ranged_weapons_gs35'>Mishap Chance</div>
-			  <select name='attr_R_weapon_mishap_chance' class='equipment_ranged_weapons_gs36 full_width sheet-select_corection'>
+			  <select name='attr_R_weapon_mishap_chance' class='equipment_ranged_weapons_gs36 full_width select_corection'>
 				<option value='cs>90' >Unreliable (91)</option>
 				<option value='cs>93' >Burst/Auto (94)</option>
 				<option value='cs>95' selected='selected'>Standard (96)</option>
@@ -1164,8 +1203,8 @@
 			</div>
 			<div>
 			  <input name='attr_R_ability_r' type='text' placeholder='Special' class='full_width_49px border_none' />
-			  <label class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
-			  <label class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{R_weapon_name} }} {{description=@{R_ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+			  <label title='Expand' class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
+			  <label title='Send description in the chat' class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{R_weapon_name} }} {{description=@{R_ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 			  <input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 			  <textarea name='attr_R_ability_desc_r' class='collapsible_entity_block description_rounded_margin' placeholder='Description'></textarea>
 			</div>
@@ -1179,29 +1218,36 @@
 		<fieldset name='meleeweapons' class='repeating_meleeweapons'>
 		  <div class='equipment_melee_weapons_rep'>
 			<div class="equipment_melee_weapons_grid0">
-				<select name='attr_M_weapon_aim' class='equipment_melee_weapons_gs01 full_width clear sheet-select_corection'>
+				<select name='attr_M_weapon_aim' class='equipment_melee_weapons_gs01 full_width clear select_corection'>
 					<option value='0' selected='selected'>No Aim (+0)</option>
 					<option value='10' >Half Aim (+10)</option>
 					<option value='20' >Full Aim (+20)</option>
 			  </select>
-				<select name='attr_M_weapon_attack' class='equipment_melee_weapons_gs02 full_width clear sheet-select_corection'>
+				<select name='attr_M_weapon_attack' class='equipment_melee_weapons_gs02 full_width clear select_corection'>
 					<option value='10' selected='selected'>Standard (+10)</option>
 					<option value='20' >Charge (+20)</option>
 					<option value='30' >All Out (+30)</option>
 			  </select>
-				<select name='attr_M_weapon_multi' class='equipment_melee_weapons_gs03 full_width clear sheet-select_corection'>
+				<select name='attr_M_weapon_multi' class='equipment_melee_weapons_gs03 full_width clear select_corection'>
 					<option value='0' selected='selected'>Standard (-0)</option>
 					<option value='-10' >Swift (-10)</option>
 					<option value='-20' >Lighting (-20)</option>
 			  </select>
-				<button class='equipment_melee_weapons_gs04 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{M_weapon_name}}}{{degrees=[[1+ floor(abs([[[[@{WS}+@{WS_advancement} + @{M_weapon_trained} - 20 + @{M_weapon_mod1}]] + [[@{M_weapon_attack} + @{M_weapon_aim} + @{M_weapon_multi} + @{inlinemod-toggle} ]]]] - [[1d100]])/10)]]}}{{roll= $[[3]]}} {{target= $[[2]]}}@{settings_hitroll} {{aim= [[@{M_weapon_aim}]]}}{{M_type= [[@{M_weapon_attack}]]}}{{multi= [[@{M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Weapon}}{{skill=[[@{WS}]]}}{{advancement= [[@{WS_advancement}]]}}{{weaponmod= [[@{M_weapon_mod1}]]}}{{trained= [[@{M_weapon_trained}]]}}' >Hit</button>
+				<button class='equipment_melee_weapons_gs04 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{M_weapon_name}}}{{degrees=[[1+ floor(abs([[[[@{WS}+@{WS_advancement} + @{M_weapon_trained} - 20 + @{M_weapon_mod1}]] + [[@{M_weapon_attack} + @{M_weapon_aim} + @{M_weapon_multi} + @{inlinemod-toggle} ]]]] - [[1d100]])/10)]]}}{{roll= $[[3]]}} {{target= $[[2]]}}@{settings_hitroll} {{aim= [[@{M_weapon_aim}]]}}{{M_type= [[@{M_weapon_attack}]]}}{{multi= [[@{M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Weapon}}{{skill=[[@{WS}]]}}{{advancement= [[@{WS_advancement}]]}}{{weaponmod= [[@{M_weapon_mod1}]]}}{{trained= [[@{M_weapon_trained}]]}}{{WS_bonus=[[floor((@{WS}+@{WS_advancement}+@{WS_unnat})/10)]]}}' >Hit</button>
 			  <button class='equipment_melee_weapons_gs05 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{weapon= @{M_weapon_name}}} {{type= @{M_weapon_type}}} {{damage=[[@{M_weapon_dam-roll}+[[floor((@{STR} + @{STR_advancement})/10) + @{str_unnat}]]]] }} {{pen= [[@{M_weapon_pen}]] }} {{@{settings_weapondescription}=@{M_ability_r} }}' >DMG</button>
 			</div>
 			<div class='equipment_melee_weapons_grid1'>
 			  <div class='equipment_melee_weapons_gs1'>Name</div>
 			  <input class='equipment_melee_weapons_gs2 full_width' type='text' name='attr_M_weapon_name' />
-			  <div class='equipment_melee_weapons_gs3'>Domain</div>
-			  <input class='equipment_melee_weapons_gs4 full_width' type='text' name='attr_M_weapon_domain' />
+			  <div class='equipment_melee_weapons_gs3'>Class</div>
+				<select class='equipment_melee_weapons_gs4 full_width select_corection' name='attr_R_weapon_class' >
+				  <option value='-'>N/A</option>
+				  <option value='Basic'>Basic</option>
+				  <option value='Heavy'>Heavy</option>
+				  <option value='Melee'>Melee</option>
+				  <option value='Pistol'>Pistol</option>
+				  <option value='Thrown'>Thrown</option>
+				</select>
 			</div>
 			<div class='equipment_melee_weapons_grid2'>
 			  <div class='equipment_melee_weapons_gs5'>Reach</div>
@@ -1211,20 +1257,52 @@
 			  <div class='equipment_melee_weapons_gs9'>Pen</div>
 			  <input class='equipment_melee_weapons_gs10 full_width' type='text' value='0' name='attr_M_weapon_pen' />
 			  <div class='equipment_melee_weapons_gs11'>Type</div>
-			  <input class='equipment_melee_weapons_gs12 full_width' type='text' name='attr_M_weapon_type' />
+				<select class='equipment_melee_weapons_gs12 full_width select_corection' name='attr_M_weapon_type'>
+          <option value='-'>N/A</option>
+          <option value='Energy'>Energy</option>
+          <option value='Impact'>Impact</option>
+          <option value='Rending'>Rending</option>
+          <option value='Explosive'>Explosive</option>
+        </select>
 			</div>
 			<div class='equipment_melee_weapons_grid3'>
 			  <div class='equipment_melee_weapons_gs13'>Trained?</div>
 			  <input class='equipment_melee_weapons_gs14' type='checkbox' value='20' name='attr_M_weapon_trained' checked />
 			  <div class='equipment_melee_weapons_gs15'>Hit Mod</div>
-			  <input class='equipment_melee_weapons_gs16 full_width' type='text' value='0' name='attr_M_weapon_mod1' />
+			  <input class='equipment_melee_weapons_gs16 full_width' type='number' value='0' name='attr_M_weapon_mod1' />
 			  <div class='equipment_melee_weapons_gs17'>Weight</div>
 			  <input class='equipment_melee_weapons_gs18 full_width' type='text' value='0' name='attr_M_weapon_weight' />
+				<div class='equipment_melee_weapons_gs19'>Domain</div>
+				<select class='equipment_melee_weapons_gs20 full_width select_corection' name='attr_R_weapon_domain'>
+				  <option value='-'>N/A</option>
+				  <option value='Bolt'>Bolt</option>
+				  <option value='Chain'>Chain</option>
+				  <option value='Exotic'>Exotic</option>
+				  <option value='Exotic (Graviton)'>Exotic (Graviton)</option>
+				  <option value='Explosives'>Explosives</option>
+				  <option value='Flame'>Flame</option>
+				  <option value='Force'>Force</option>
+				  <option value='Grenades/Missiles'>Grenades/Missiles</option>
+				  <option value='Las'>Las</option>
+				  <option value='Launcher'>Launcher</option>
+				  <option value='Low-Tech'>Low-Tech</option>
+				  <option value='Melta'>Melta</option>
+				  <option value='Plasma'>Plasma</option>
+				  <option value='Power'>Power</option>
+				  <option value='Shock'>Shock</option>
+				  <option value='Solid-Projectile'>Solid Projectile</option>
+				  <option value='Varies'>Varies</option>
+				  <option value='Xenos(Eldar)'>Xenos (Eldar)</option>
+				  <option value='Xenos(Kroot)'>Xenos (Kroot)</option>
+				  <option value='Xenos(Lost Races)'>Xenos (Lost Races)</option>
+				  <option value='Xenos(Necron)'>Xenos (Necron)</option>
+				  <option value='Xenos(Ork)'>Xenos (Ork)</option>
+				</select>
 			</div>
 			<div>
 			  <input name='attr_M_ability_r' type='text' placeholder='Special' class='full_width_49px border_none' />
-			  <label class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
-			  <label class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{M_weapon_name} }} {{description=@{M_ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+			  <label title='Expand' title='Expand' class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
+			  <label title='Send description in the chat' class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{M_weapon_name} }} {{description=@{M_ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 			  <input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 			  <textarea name='attr_M_ability_desc_r' class='collapsible_entity_block description_rounded_margin' placeholder='Description'></textarea>
 			</div>
@@ -1257,7 +1335,7 @@
 	  <input name='attr_gear_avail' type='text' placeholder='Availability' class='equipment_gear_gs4' />
 	  <input name='attr_gear_weight' type='text' value='0' class='equipment_gear_gs5' />
 	  <input name='attr_gear_pg#' type='text' placeholder='Page #' class='equipment_gear_gs6' />
-	  <label class='margin_adjust equipment_gear_gs7'><input type='checkbox' name='attr_collapse' value='7' class='collapsible_entity_switch select_button hidden'><span class='select_text'>▼</span></label>
+	  <label title='Expand' class='margin_adjust equipment_gear_gs7'><input type='checkbox' name='attr_collapse' value='7' class='collapsible_entity_switch select_button hidden'><span class='select_text'>▼</span></label>
 	</div>
 	<input name='attr_collapse' type='checkbox'  value='7' class='collapsible_entity_switch hidden' />
 	<textarea name='attr_gear_desc' placeholder='Description' class='collapsible_entity_block auto_margin 90width'></textarea>
@@ -1269,7 +1347,7 @@
 		<input name='attr_gear_avail_r' type='text' placeholder='Availability' class='equipment_gear_gs4' />
 		<input name='attr_gear_weight_r' type='text' value='0' class='equipment_gear_gs5' />
 		<input name='attr_gear_pg#_r' type='text' placeholder='Page #' class='equipment_gear_gs6' />
-		<label class='margin_adjust equipment_gear_gs7'><input type='checkbox' name='attr_collapse_r' value='2' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
+		<label title='Expand' class='margin_adjust equipment_gear_gs7'><input type='checkbox' name='attr_collapse_r' value='2' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
 	  </div>
 	  <input name='attr_collapse_r' type='checkbox'  value='2' class='collapsible_entity_switch hidden' />
 	  <textarea name='attr_ability_desc_r' class='collapsible_entity_block auto_margin 90width'></textarea>
@@ -1288,6 +1366,14 @@
 					<input name='attr_soak_head' type='number' readonly' />
 				</div>
 			</div>
+				<div class='armor_display_gs0'>
+					<div class='armor_border equipment_armor_input'>
+						<p><b>Max AGI</b></p>
+						<input name='attr_armor_AGI' type='number' value='0' />
+						<p><b>Armor Cap</b>
+						<input type="checkbox" name="attr_armor_limit" value="1"></p>
+					</div>
+				</div>
 			<div class='armor_display_gs2'>
 				<div class='armor_border equipment_armor_input'>
 					<p><b>Arm R</b></p>
@@ -1348,8 +1434,8 @@
 			<input class='full_width' type='text' name='attr_cybernetic_location' placeholder='Location'>
 			<input class='full_width' type='text' name='attr_cybernetic_page' placeholder='Pg#'>
 		  </div>
-		  <label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='8' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
-		  <label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{cybernetic_name} }} {{description=@{cybernetic_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+		  <label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='8' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
+		  <label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{cybernetic_name} }} {{description=@{cybernetic_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 		  <input name='attr_collapse' type='checkbox'  value='8' class='collapsible_entity_switch hidden' />
 		  <textarea name='attr_cybernetic_desc' placeholder='In the event that the Character is subject to biomechanical augmentation by the will of the Omnissiah, installed cybernetics can be described here.' class='collapsible_entity_block'></textarea>
 		</div>
@@ -1360,8 +1446,8 @@
 			  <input class='full_width' type='text' name='attr_cybernetic_location_r' placeholder='Location'>
 			  <input class='full_width' type='text' name='attr_cybernetic_page_r' placeholder='Pg#'>
 			</div>
-			<label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='8' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
-			<label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{cybernetic_name_r} }} {{description=@{cybernetic_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+			<label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='8' class='collapsible_entity_switch select_button hidden' /><span class='select_text'>▼</span></label>
+			<label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{cybernetic_name_r} }} {{description=@{cybernetic_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 			<input name='attr_collapse' type='checkbox'  value='8' class='collapsible_entity_switch hidden' />
 			<textarea name='attr_cybernetic_desc_r' class='collapsible_entity_block'></textarea>
 		  </div>
@@ -1419,7 +1505,7 @@
 	  <input class='advancements_grid_gs4' name='attr_advancement_nameR' type='text' placeholder='Write XP-costing item name here' />
 	  <input class='advancements_grid_gs5' name='attr_advancement_costR' type='number' placeholder='XP Cost' />
 	  <input class='advancements_grid_gs6' name='attr_advancement_pg#R' type='text' placeholder='Page #' />
-	  <label class='advancements_grid_gs7'><input type='checkbox' name='attr_collapse' value='7' class='collapsible_entity_switch select_button hidden'><span class='select_text'>▼</span></label>
+	  <label title='Expand' class='advancements_grid_gs7'><input type='checkbox' name='attr_collapse' value='7' class='collapsible_entity_switch select_button hidden'><span class='select_text'>▼</span></label>
 	</div>
 	<input name='attr_collapse' type='checkbox' value='7' class='collapsible_entity_switch hidden' />
 	<textarea name='attr_advancement_desc' placeholder='Unfortunately, one text box will have to suffice for descriptions of both Items above.' class='collapsible_entity_block auto_margin 90width'></textarea>
@@ -1427,11 +1513,11 @@
 	  <div class='advancements_grid'>
 		<input class='advancements_grid_gs1' name='attr_advancement_nameL_r' type='text' placeholder='Write XP-costing item name here' />
 		<input class='advancements_grid_gs2' name='attr_advancement_costL_r' type='number' placeholder='XP Cost' />
-		<input class='advancements_grid_gs3' name='attr_advancement_pg#L_r' type='number' placeholder='Page #'  />
+		<input class='advancements_grid_gs3' name='attr_advancement_pg#L_r' type='text' placeholder='Page #'  />
 		<input class='advancements_grid_gs4' name='attr_advancement_nameR_r' type='text' placeholder='Write XP-costing item name here' />
 		<input class='advancements_grid_gs5' name='attr_advancement_costR_r' type='number' placeholder='XP Cost' />
-		<input class='advancements_grid_gs6' name='attr_advancement_pg#R_r' type='number' placeholder='Page #' />
-		<label class='advancements_grid_gs7'><input type='checkbox' name='attr_collapse' value='2' class='collapsible_entity_switch select_button hidden'><span class='select_text'>▼</span></label>
+		<input class='advancements_grid_gs6' name='attr_advancement_pg#R_r' type='text' placeholder='Page #' />
+		<label title='Expand' class='advancements_grid_gs7'><input type='checkbox' name='attr_collapse' value='2' class='collapsible_entity_switch select_button hidden'><span class='select_text'>▼</span></label>
 	  </div>
 	<input name='attr_collapse' type='checkbox' value='2' class='collapsible_entity_switch hidden' />
 	<textarea name='attr_advancement_desc_r' placeholder='Unfortunately, one text box will have to suffice for descriptions of both Items above.' class='collapsible_entity_block auto_margin 90width'></textarea>
@@ -1492,8 +1578,8 @@
 			<div>
 				<fieldset name="disorders" class="repeating_disorders full_width border_none">
 					<input name='attr_disorder_r' type='text' placeholder='Disorder Name' class='full_width_49px' />
-					<label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
-					<label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{disorder_r} }} {{description=@{disorder_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+					<label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
+					<label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{disorder_r} }} {{description=@{disorder_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 					<input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 					<textarea name='attr_disorder_desc_r' class='collapsible_entity_block'></textarea>
 	      </fieldset>
@@ -1509,8 +1595,8 @@
 		  <div>
 		    <fieldset name='mutations' class='repeating_mutations'>
 			<input name='attr_mutation_r' type='text' placeholder='Malignancy or Mutation Name' class='full_width_49px' />
-			<label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
-			<label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{mutation_r} }} {{description=@{mutation_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+			<label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
+			<label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{mutation_r} }} {{description=@{mutation_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 			<input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 			<textarea name='attr_mutation_desc_r' class='collapsible_entity_block'></textarea>
 		    </fieldset>
@@ -1603,22 +1689,22 @@
 			  <div class='vehicles_G26 '>
 				<div>
 				  <input name='attr_armaments' type='text' placeholder='Armaments' class='full_width_49px' />
-				  <label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='4' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
-				  <label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{armaments} }} {{description=@{armaments_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+				  <label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='4' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
+				  <label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{armaments} }} {{description=@{armaments_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 				  <input name='attr_collapse' type='checkbox'  value='4' class='collapsible_entity_switch hidden' />
 				  <textarea name='attr_armaments_desc' class='collapsible_entity_block' placeholder='Enter more detailed information, such as placement of vehicle armament. Full stat-blocks should be written out in the sections on the right.'></textarea>
 				</div>
 				<div>
 				  <input name='attr_vehicle_traits' type='text' placeholder='Traits' class='full_width_49px' />
-				  <label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='5' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
-				  <label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{vehicle_traits} }} {{description=@{vehicle_traits_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+				  <label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='5' class='collapsible_entity_switch select_button hidden' /><span class='select_text '>▼</span></label>
+				  <label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{vehicle_traits} }} {{description=@{vehicle_traits_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 				  <input name='attr_collapse' type='checkbox'  value='5' class='collapsible_entity_switch hidden' />
 				  <textarea name='attr_vehicle_traits_desc' class='collapsible_entity_block' placeholder='Enter any vehicle-specific rules or other unique information here, such as specific details about crew placement or expanded descriptions of the Vehicle Traits.'></textarea>
 				</div>
 				<div>
 				  <input name='attr_modifications' type='text' placeholder='Modifications' class='full_width_49px vehicles_descriptor' />
-				  <label class='margin_adjust'><input type='checkbox' name='attr_collapse' value='6' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right'>▼</span></label>
-				  <label class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{modifications} }} {{description=@{modifications_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+				  <label title='Expand' class='margin_adjust'><input type='checkbox' name='attr_collapse' value='6' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right'>▼</span></label>
+				  <label title='Send description in the chat' class='margin_adjust2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{modifications} }} {{description=@{modifications_desc} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 				  <input name='attr_collapse' type='checkbox'  value='6' class='collapsible_entity_switch hidden' />
 				  <textarea name='attr_modifications_desc' class='collapsible_entity_block description_rounded_margin' placeholder='Vehicles can be fitted with Vehicle Upgrades or other player modifications. Be sure to include the Base Difficulty Modifier of each Modification here.
 				  &#10;Vehicle modifications are classified into two categories: Integral ones which the vehicle must come from the factory with, or Standard ones which can be requisitioned and installed as normal.'></textarea>
@@ -1634,33 +1720,40 @@
 			  <fieldset name='vehiclerangedweapons' class='repeating_vehiclerangedweapons'>
 			  <div class='equipment_ranged_weapons_rep'>
 				<div class="equipment_ranged_weapons_grid0">
-					<select name='attr_V_R_weapon_aim' class='equipment_ranged_weapons_gs01 full_width clear sheet-select_corection'>
+					<select name='attr_V_R_weapon_aim' class='equipment_ranged_weapons_gs01 full_width clear select_corection'>
 						<option value='0' selected='selected'>No Aim (+0)</option>
 						<option value='10' >Half Aim (+10)</option>
 						<option value='20' >Full Aim (+20)</option>
 				  </select>
-					<select name='attr_V_R_weapon_attack' class='equipment_ranged_weapons_gs02 full_width clear sheet-select_corection'>
+					<select name='attr_V_R_weapon_attack' class='equipment_ranged_weapons_gs02 full_width clear select_corection'>
 						<option value='10' selected='selected'>Standard (+10)</option>
 						<option value='0' >Semi Auto (+0)</option>
 						<option value='-10' >Full Auto (-10)</option>
 						<option value='-20' >Called Shot (-20)</option>
 						<option value='-20' >Suppressing (-20)</option>
 				  </select>
-					<select name='attr_V_R_weapon_attack_range' class='equipment_ranged_weapons_gs03 full_width clear sheet-select_corection'>
+					<select name='attr_V_R_weapon_attack_range' class='equipment_ranged_weapons_gs03 full_width clear select_corection'>
 						<option value='30' >Point Blank (+30)</option>
 						<option value='10' >Short Range (+10)</option>
 						<option value='0' selected='selected'>Standard (+0)</option>
 						<option value='-10' >Long Range (-10)</option>
 						<option value='-30' >Extreme Range (-30)</option>
 				  </select>
-					<button class='equipment_ranged_weapons_gs04 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{V_R_weapon_name}}}{{degrees=[[1+ floor(abs( [[[[@{BS} + @{BS_advancement} + @{V_R_weapon_trained} - 20 + @{V_R_weapon_mod1}]] + [[@{V_R_weapon_attack} + @{V_R_weapon_aim} + @{V_R_weapon_attack_range} + @{inlinemod-toggle} ]]]] - [[1d100@{V_R_weapon_mishap_chance}]])/10)]]}}{{roll= $[[3]]}}{{target= $[[2]]}}@{settings_hitroll} {{aim= [[@{V_R_weapon_aim}]]}}{{R_type= [[@{V_R_weapon_attack}]]}}{{range= [[@{V_R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Ballistic}}{{skill=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{weaponmod= [[@{V_R_weapon_mod1}]]}}{{trained= [[@{V_R_weapon_trained}]]}}' >Hit</button>
+					<button class='equipment_ranged_weapons_gs04 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{V_R_weapon_name}}}{{degrees=[[1+ floor(abs( [[[[@{BS} + @{BS_advancement} + @{V_R_weapon_trained} - 20 + @{V_R_weapon_mod1}]] + [[@{V_R_weapon_attack} + @{V_R_weapon_aim} + @{V_R_weapon_attack_range} + @{inlinemod-toggle} ]]]] - [[1d100@{V_R_weapon_mishap_chance}]])/10)]]}}{{roll= $[[3]]}}{{target= $[[2]]}}@{settings_hitroll} {{aim= [[@{V_R_weapon_aim}]]}}{{R_type= [[@{V_R_weapon_attack}]]}}{{range= [[@{V_R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Ballistic}}{{skill=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{weaponmod= [[@{V_R_weapon_mod1}]]}}{{trained= [[@{V_R_weapon_trained}]]}}{{burst=@{V_R_weapon_burst}}{{auto=@{V_R_weapon_auto}}' >Hit</button>
 				  <button class='equipment_ranged_weapons_gs05 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{type= @{V_R_weapon_type}}} {{weapon= @{V_R_weapon_name}}} {{damage=[[@{V_R_weapon_dam-roll}]] }} {{@{V_R_weapon_spray}= }} {{pen=[[@{V_R_weapon_pen}]] }}  {{@{settings_weapondescription}=@{V_R_ability_r} }}' >DMG</button>
 				</div>
 				<div class='equipment_ranged_weapons_grid1'>
 				  <div class='equipment_ranged_weapons_gs1'>Name</div>
 				  <input class='equipment_ranged_weapons_gs2 full_width' type='text' name='attr_V_R_weapon_name' />
 				  <div class='equipment_ranged_weapons_gs3'>Class</div>
-				  <input class='equipment_ranged_weapons_gs4 full_width' type='text' name='attr_V_R_weapon_class' />
+					<select class='equipment_ranged_weapons_gs4 full_width select_corection' name='attr_R_weapon_class' >
+					  <option value='-'>N/A</option>
+					  <option value='Basic'>Basic</option>
+					  <option value='Heavy'>Heavy</option>
+					  <option value='Melee'>Melee</option>
+					  <option value='Pistol'>Pistol</option>
+					  <option value='Thrown'>Thrown</option>
+					</select>
 				</div>
 				<div class='equipment_ranged_weapons_grid2'>
 				  <div class='equipment_ranged_weapons_gs5'>Range</div>
@@ -1670,7 +1763,13 @@
 				  <div class='equipment_ranged_weapons_gs9'>Pen</div>
 				  <input class='equipment_ranged_weapons_gs10 full_width' type='text' value='0' name='attr_V_R_weapon_pen' />
 				  <div class='equipment_ranged_weapons_gs11'>Type</div>
-				  <input class='equipment_ranged_weapons_gs12 full_width' type='text' name='attr_V_R_weapon_type' />
+					<select class='equipment_ranged_weapons_gs12 full_width select_corection' name='attr_V_R_weapon_type'>
+	          <option value='-'>N/A</option>
+	          <option value='Energy'>Energy</option>
+	          <option value='Impact'>Impact</option>
+	          <option value='Rending'>Rending</option>
+	          <option value='Explosive'>Explosive</option>
+	        </select>
 				</div>
 				<div class='equipment_ranged_weapons_grid3'>
 				  <div class='equipment_ranged_weapons_gs13'>RoF</div>
@@ -1688,17 +1787,41 @@
 				  <div class='equipment_ranged_weapons_gs25'>Trained?</div>
 				  <input class='equipment_ranged_weapons_gs26' type='checkbox' value='20' name='attr_V_R_weapon_trained' checked />
 				  <div class='equipment_ranged_weapons_gs27'>Hit Mod</div>
-				  <input class='equipment_ranged_weapons_gs28 full_width' type='text' value='0' name='attr_V_R_weapon_mod1' />
+				  <input class='equipment_ranged_weapons_gs28 full_width' type='number' value='0' name='attr_V_R_weapon_mod1' />
 				  <div class='equipment_ranged_weapons_gs29'>Reload</div>
 				  <input class='equipment_ranged_weapons_gs30 full_width' type='text' value='0' name='attr_V_R_weapon_reload' />
 				  <div class='equipment_ranged_weapons_gs31'>Weight</div>
 				  <input class='equipment_ranged_weapons_gs32 full_width' type='text' value='0' name='attr_V_R_weapon_weight' />
 				</div>
 				<div class='equipment_ranged_weapons_grid5'>
-				  <div class='equipment_ranged_weapons_gs33'>Domain</div>
-				  <input class='equipment_ranged_weapons_gs34 full_width' type='text' name='attr_V_R_weapon_domain' />
+					<div class='equipment_ranged_weapons_gs33'>Domain</div>
+					<select class='equipment_ranged_weapons_gs34 full_width select_corection' name='attr_R_weapon_domain'>
+					  <option value='-'>N/A</option>
+					  <option value='Bolt'>Bolt</option>
+					  <option value='Chain'>Chain</option>
+					  <option value='Exotic'>Exotic</option>
+					  <option value='Exotic (Graviton)'>Exotic (Graviton)</option>
+					  <option value='Explosives'>Explosives</option>
+					  <option value='Flame'>Flame</option>
+					  <option value='Force'>Force</option>
+					  <option value='Grenades/Missiles'>Grenades/Missiles</option>
+					  <option value='Las'>Las</option>
+					  <option value='Launcher'>Launcher</option>
+					  <option value='Low-Tech'>Low-Tech</option>
+					  <option value='Melta'>Melta</option>
+					  <option value='Plasma'>Plasma</option>
+					  <option value='Power'>Power</option>
+					  <option value='Shock'>Shock</option>
+					  <option value='Solid-Projectile'>Solid Projectile</option>
+					  <option value='Varies'>Varies</option>
+					  <option value='Xenos(Eldar)'>Xenos (Eldar)</option>
+					  <option value='Xenos(Kroot)'>Xenos (Kroot)</option>
+					  <option value='Xenos(Lost Races)'>Xenos (Lost Races)</option>
+					  <option value='Xenos(Necron)'>Xenos (Necron)</option>
+					  <option value='Xenos(Ork)'>Xenos (Ork)</option>
+					</select>
 				  <div class='equipment_ranged_weapons_gs35'>Mishap Chance</div>
-				  <select name='attr_V_R_weapon_mishap_chance' class='equipment_ranged_weapons_gs36 full_width sheet-select_corection'>
+				  <select name='attr_V_R_weapon_mishap_chance' class='equipment_ranged_weapons_gs36 full_width select_corection'>
 					<option value='cs>90' >Unreliable (91)</option>
 					<option value='cs>93' >Burst/Auto (94)</option>
 					<option value='cs>95' selected='selected'>Standard (96)</option>
@@ -1711,8 +1834,8 @@
 				</div>
 				<div>
 				  <input name='attr_V_R_ability_r' type='text' placeholder='Special' class='full_width_49px border_none' />
-				  <label class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
-				  <label class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{V_R_weapon_name} }} {{description=@{V_R_ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+				  <label title='Expand' class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
+				  <label title='Send description in the chat' class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{V_R_weapon_name} }} {{description=@{V_R_ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 				  <input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 				  <textarea name='attr_V_R_ability_desc_r' class='collapsible_entity_block description_rounded_margin' placeholder='Description'></textarea>
 				</div>
@@ -1726,29 +1849,36 @@
 			  <fieldset name='vehiclemeleeweapons' class='repeating_vehiclemeleeweapons'>
 			  <div class='equipment_melee_weapons_rep'>
 				<div class="equipment_melee_weapons_grid0">
-					<select name='attr_V_M_weapon_aim' class='equipment_melee_weapons_gs01 full_width clear sheet-select_corection'>
+					<select name='attr_V_M_weapon_aim' class='equipment_melee_weapons_gs01 full_width clear select_corection'>
 						<option value='0' selected='selected'>No Aim (+0)</option>
 						<option value='10' >Half Aim (+10)</option>
 						<option value='20' >Full Aim (+20)</option>
 				  </select>
-					<select name='attr_V_M_weapon_attack' class='equipment_melee_weapons_gs02 full_width clear sheet-select_corection'>
+					<select name='attr_V_M_weapon_attack' class='equipment_melee_weapons_gs02 full_width clear select_corection'>
 						<option value='10' selected='selected'>Standard (+10)</option>
 						<option value='20' >Charge (+20)</option>
 						<option value='30' >All Out (+30)</option>
 				  </select>
-					<select name='attr_V_M_weapon_multi' class='equipment_melee_weapons_gs03 full_width clear sheet-select_corection'>
+					<select name='attr_V_M_weapon_multi' class='equipment_melee_weapons_gs03 full_width clear select_corection'>
 						<option value='0' selected='selected'>Standard (-0)</option>
 						<option value='-10' >Swift (-10)</option>
 						<option value='-20' >Lighting (-20)</option>
 				  </select>
-					<button class='equipment_melee_weapons_gs04 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{V_M_weapon_name}}}{{degrees=[[1+ floor(abs([[[[@{WS}+@{WS_advancement} + @{V_M_weapon_trained} - 20 + @{V_M_weapon_mod1}]] + [[@{V_M_weapon_attack} + @{V_M_weapon_aim} + @{V_M_weapon_multi} + @{inlinemod-toggle} ]]]] - [[1d100]])/10)]]}}{{roll= $[[3]]}} {{target= $[[2]]}}@{settings_hitroll} {{aim= [[@{V_M_weapon_aim}]]}}{{M_type= [[@{V_M_weapon_attack}]]}}{{multi= [[@{V_M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Weapon}}{{skill=[[@{WS}]]}}{{advancement= [[[@{WS_advancement}]]]}}{{weaponmod= [[@{V_M_weapon_mod1}]]}}{{trained= [[@{V_M_weapon_trained}]]}}' >Hit</button>
+					<button class='equipment_melee_weapons_gs04 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{V_M_weapon_name}}}{{degrees=[[1+ floor(abs([[[[@{WS}+@{WS_advancement} + @{V_M_weapon_trained} - 20 + @{V_M_weapon_mod1}]] + [[@{V_M_weapon_attack} + @{V_M_weapon_aim} + @{V_M_weapon_multi} + @{inlinemod-toggle} ]]]] - [[1d100]])/10)]]}}{{roll= $[[3]]}} {{target= $[[2]]}}@{settings_hitroll} {{aim= [[@{V_M_weapon_aim}]]}}{{M_type= [[@{V_M_weapon_attack}]]}}{{multi= [[@{V_M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Weapon}}{{skill=[[@{WS}]]}}{{advancement= [[[@{WS_advancement}]]]}}{{weaponmod= [[@{V_M_weapon_mod1}]]}}{{trained= [[@{V_M_weapon_trained}]]}}{{WS_bonus=[[floor((@{WS}+@{WS_advancement}+@{WS_unnat})/10)]]}}' >Hit</button>
 				  <button class='equipment_melee_weapons_gs05 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{weapon= @{V_M_weapon_name}}} {{type= @{V_M_weapon_type}}} {{damage=[[@{V_M_weapon_dam-roll}+[[floor((@{STR} + @{STR_advancement})/10) + @{str_unnat}]]]] }} {{pen= [[@{V_M_weapon_pen}]] }} {{@{settings_weapondescription}=@{V_M_ability_r} }}' >DMG</button>
 				</div>
 				<div class='equipment_melee_weapons_grid1'>
 				  <div class='equipment_melee_weapons_gs1'>Name</div>
 				  <input class='equipment_melee_weapons_gs2 full_width' type='text' name='attr_V_M_weapon_name' />
-				  <div class='equipment_melee_weapons_gs3'>Domain</div>
-				  <input class='equipment_melee_weapons_gs4 full_width' type='text' name='attr_V_M_weapon_domain' />
+				  <div class='equipment_melee_weapons_gs3'>Class</div>
+					<select class='equipment_melle_weapons_gs4 full_width select_corection' name='attr_R_weapon_class' >
+					  <option value='-'>N/A</option>
+					  <option value='Basic'>Basic</option>
+					  <option value='Heavy'>Heavy</option>
+					  <option value='Melee'>Melee</option>
+					  <option value='Pistol'>Pistol</option>
+					  <option value='Thrown'>Thrown</option>
+					</select>
 				</div>
 				<div class='equipment_melee_weapons_grid2'>
 				  <div class='equipment_melee_weapons_gs5'>Reach</div>
@@ -1758,20 +1888,52 @@
 				  <div class='equipment_melee_weapons_gs9'>Pen</div>
 				  <input class='equipment_melee_weapons_gs10 full_width' type='text' value='0' name='attr_V_M_weapon_pen' />
 				  <div class='equipment_melee_weapons_gs11'>Type</div>
-				  <input class='equipment_melee_weapons_gs12 full_width' type='text' name='attr_V_M_weapon_type' />
+					<select class='equipment_melee_weapons_gs12 full_width select_corection' name='attr_V_M_weapon_type'>
+	          <option value='-'>N/A</option>
+	          <option value='Energy'>Energy</option>
+	          <option value='Impact'>Impact</option>
+	          <option value='Rending'>Rending</option>
+	          <option value='Explosive'>Explosive</option>
+	        </select>
 				</div>
 				<div class='equipment_melee_weapons_grid3'>
 				  <div class='equipment_melee_weapons_gs13'>Trained?</div>
 				  <input class='equipment_melee_weapons_gs14' type='checkbox' value='20' name='attr_V_M_weapon_trained' checked />
 				  <div class='equipment_melee_weapons_gs15'>Hit Mod</div>
-				  <input class='equipment_melee_weapons_gs16 full_width' type='text' value='0' name='attr_V_M_weapon_mod1' />
+				  <input class='equipment_melee_weapons_gs16 full_width' type='number' value='0' name='attr_V_M_weapon_mod1' />
 				  <div class='equipment_melee_weapons_gs17'>Weight</div>
 				  <input class='equipment_melee_weapons_gs18 full_width' type='text' value='0' name='attr_V_M_weapon_weight' />
+					<div class='equipment_melee_weapons_gs39'>Domain</div>
+					<select class='equipment_melee_weapons_gs20 full_width select_corection' name='attr_R_weapon_domain'>
+					  <option value='-'>N/A</option>
+					  <option value='Bolt'>Bolt</option>
+					  <option value='Chain'>Chain</option>
+					  <option value='Exotic'>Exotic</option>
+					  <option value='Exotic (Graviton)'>Exotic (Graviton)</option>
+					  <option value='Explosives'>Explosives</option>
+					  <option value='Flame'>Flame</option>
+					  <option value='Force'>Force</option>
+					  <option value='Grenades/Missiles'>Grenades/Missiles</option>
+					  <option value='Las'>Las</option>
+					  <option value='Launcher'>Launcher</option>
+					  <option value='Low-Tech'>Low-Tech</option>
+					  <option value='Melta'>Melta</option>
+					  <option value='Plasma'>Plasma</option>
+					  <option value='Power'>Power</option>
+					  <option value='Shock'>Shock</option>
+					  <option value='Solid-Projectile'>Solid Projectile</option>
+					  <option value='Varies'>Varies</option>
+					  <option value='Xenos(Eldar)'>Xenos (Eldar)</option>
+					  <option value='Xenos(Kroot)'>Xenos (Kroot)</option>
+					  <option value='Xenos(Lost Races)'>Xenos (Lost Races)</option>
+					  <option value='Xenos(Necron)'>Xenos (Necron)</option>
+					  <option value='Xenos(Ork)'>Xenos (Ork)</option>
+					</select>
 				</div>
 				<div>
 				  <input name='attr_V_M_ability_r' type='text' placeholder='Special' class='full_width_49px border_none' />
-				  <label class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
-				  <label class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{V_M_weapon_name} }} {{description=@{V_M_ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+				  <label title='Expand' class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
+				  <label title='Send description in the chat' class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{V_M_weapon_name} }} {{description=@{V_M_ability_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 				  <input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 				  <textarea name='attr_V_M_ability_desc_r' class='collapsible_entity_block description_rounded_margin' placeholder='Description'></textarea>
 				</div>
@@ -1792,13 +1954,13 @@
 		<h3 class='radius_border_top'>Psychic Strength</h3>
 		<div class='psykana_info_grid'>
 			<div class='psykana_info_gs1'>Class</div>
-			<select name='attr_psykana_class' class='psykana_info_gs2 full_width'>
+			<select name='attr_psykana_class ' class='psykana_info_gs2 full_width select_corection'>
 				<option value='0' selected='selected'>Bound</option>
 				<option value='1'>Unbound</option>
 				<option value='2'>Demonic</option>
 			</select>
 			<div class='psykana_info_gs3'>Limit</div>
-			<select name='attr_psykana_limit' class='psykana_info_gs4 full_width'>
+			<select name='attr_psykana_limit' class='psykana_info_gs4 full_width select_corection'>
 				<option value='0' selected='selected'>Fettered</option>
 				<option value='1'>Unfettered</option>
 				<option value='2'>Push</option>
@@ -1833,8 +1995,8 @@
 		<fieldset name='minormanifestation' class='repeating_minormanifestation'>
 			<div class='minormanifestation_rep'>
 			<input name='attr_P_minor_r' type='text' placeholder='Minor Manifestation name' class='full_width_49px border_none' />
-			<label class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='5' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
-			<label class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{P_minor_r} }} {{description=@{P_minor_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+			<label title='Expand' class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='5' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
+			<label title='Send description in the chat' class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{P_minor_r} }} {{description=@{P_minor_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 			<input name='attr_collapse' type='checkbox'  value='5' class='collapsible_entity_switch hidden' />
 			<textarea name='attr_P_minor_desc_r' class='collapsible_entity_block description_rounded_margin' placeholder='MMs are subtle uses for the power of the Warp that a Psyker may pick up in the course of training.&#10;This Description box may be used to state which psychic discipline this MM falls under, as well as to provide a brief description of what this power does.&#10;&#10;Minor Manifestations cost 50xp. Use requires a Half Action and a +30 Willpower test.'></textarea>
 			</div>
@@ -1846,8 +2008,8 @@
 		<fieldset name='psynotes' class='repeating_psynotes'>
 			<div class='psynotes_rep'>
 			<input name='attr_P_note_r' type='text' placeholder='Psyker Notes name' class='full_width_49px border_none' />
-			<label class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='15' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
-			<label class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{P_note_r} }} {{description=@{P_note_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+			<label title='Expand' class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='15' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
+			<label title='Send description in the chat' class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{P_note_r} }} {{description=@{P_note_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 			<input name='attr_collapse' type='checkbox'  value='15' class='collapsible_entity_switch hidden' />
 			<textarea name='attr_P_note_desc_r' class='collapsible_entity_block description_rounded_margin' placeholder='Psyker Notes are used to keep track of your psychic journey'></textarea>
 			</div>
@@ -1876,7 +2038,7 @@
 			</div>
 			<div class='psykana_ability_grid3'>
 				<div class='psykana_ability_gs13'>Focus Power</div>
-				<select name='attr_P_focus' class='psykana_ability_gs14 full_width sheet-select_corection'>
+				<select name='attr_P_focus' class='psykana_ability_gs14 full_width select_corection'>
           <optgroup label="Stats :">
             <option value='[[@{WS} + @{WS_advancement} ]]'>Weapon Sikll</option>
             <option value='[[@{BS} + @{BS_advancement} ]]'>Ballistic Skill</option>
@@ -1896,7 +2058,7 @@
 					</optgroup>
 				</select>
 				<div class='psykana_ability_gs15'>Power Mod</div>
-				<input class='psykana_ability_gs16 full_width' type='text' value='0' name='attr_P_mod1' />
+				<input class='psykana_ability_gs16 full_width' type='number' value='0' name='attr_P_mod1' />
 				<button class='psykana_ability_gs17 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}}{{psy= }}{{attack= }}{{weapon= @{P_name}}}[[1+floor(abs( [[[[[[@{P_focus} + @{P_mod1} ]]+[[@{focus_mod} + @{psykana_sustain}]]]]+@{inlinemod-toggle}]]-[[1d100@{psy_roll}]])/10)]]{{degrees=$[[6]]}}{{target=$[[4]]}}{{roll=$[[5]]}}@{settings_hitroll} {{class=[[@{psykana_class}]]}}{{limit=[[@{psykana_limit}]]}}{{focus=[[@{P_focus}]]}}{{pmod=[[@{P_mod1}]]}}{{focus_mod=[[@{focus_mod}]]}}{{sustain=[[@{psykana_sustain}]]}}{{modifier=[[@{inlinemod-toggle}]]}}
 	' >Cast</button>
 				<button class='psykana_ability_gs18 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{type= @{P_type}}} {{weapon= @{P_name}}} {{damage=[[@{P_dam-roll}]] }} {{pen=[[@{P_pen}]] }} {{@{settings_weapondescription}=@{P_ability_r} }}' >DMG</button>
@@ -1909,8 +2071,8 @@
 			</div>
 			<div>
 				<input name='attr_P_ability_r' type='text' placeholder='Disclaimer: Effective PR not counted in casting test use Focus Mod instead' class='full_width_49px border_none' />
-				<label class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
-				<label class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{P_name} }} {{description=@{P_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
+				<label title='Expand' class='margin_adjust_wep'><input type='checkbox' name='attr_collapse' value='3' class='collapsible_entity_switch select_button hidden' /><span class='select_text radius_border_right_wep'>▼</span></label>
+				<label title='Send description in the chat' class='margin_adjust_wep2'><button type='roll' value='@{to-gm}&{template:mythic} {{name=@{P_name} }} {{description=@{P_desc_r} }}' class='hidden'></button><span class='select_text'>🔊</span></label>
 				<input name='attr_collapse' type='checkbox'  value='3' class='collapsible_entity_switch hidden' />
 				<textarea name='attr_P_desc_r' class='collapsible_entity_block description_rounded_margin' placeholder='Description'></textarea>
 			</div>
@@ -1992,17 +2154,18 @@
   // ___________________________________________________________________________
   // ____________________Movement and Weight sheet worker_______________________
   // ___________________________and Fatigue Pts_________________________________
-  on('sheet:opened change:size change:str change:str_unnat change:str_advancement change:tou change:tou_unnat change:tou_advancement change:agi change:agi_unnat change:agi_advancement', function() {
+  on('sheet:opened change:size change:str change:str_unnat change:str_advancement change:tou change:tou_unnat change:tou_advancement change:agi change:agi_unnat change:agi_advancement change:agi_mov_mod', function() {
     getAttrs([
 	'size',
     'str', 'str_unnat', 'str_advancement',
     'tou', 'tou_unnat', 'tou_advancement',
-	'agi', 'agi_unnat', 'agi_advancement'
+	'agi', 'agi_unnat', 'agi_advancement', 'agi_mov_mod'
     ], function(values) {
 	  var size = parseInt(values['size'], 10) || 0;
       var agi = parseInt(values['agi'], 10) || 0;
       var agi_unnat = parseInt(values['agi_unnat'], 10) || 0;
-      var agi_advancement = parseInt(values['agi_advancement'], 10) || 0;
+			var agi_advancement = parseInt(values['agi_advancement'], 10) || 0;
+      var agi_mov_mod = parseInt(values['agi_mov_mod'], 10) || 0;
       var str = parseInt(values['str'], 10) || 0;
       var str_unnat = parseInt(values['str_unnat'], 10) || 0;
       var str_advancement = parseInt(values['str_advancement'], 10) || 0;
@@ -2016,7 +2179,7 @@
 	  var tou_mod = Math.floor((tou + tou_advancement) / 10 + tou_unnat);
 	  var agi_mod = Math.floor((agi + agi_advancement) / 10 + agi_unnat);
 	  var wp_mod = Math.floor((wp + wp_advancement) / 10 + wp_unnat);
-	  var move_mod = agi_mod + size;
+	  var move_mod = agi_mod + size + agi_mov_mod;
 	  var carry_mod = str_mod + tou_mod;
 	  var carry_calc;
 
@@ -2119,6 +2282,30 @@
     });
   });
 
+	// ___________________________________________________________________________
+  // ____________________Armor Agility Limiter__________________________________
+  // ___________________________________________________________________________
+
+	on('sheet:opened change:agi change:agi_unnat change:agi_advancement change:armor_agi change:armor_limit ', function() {
+    getAttrs([
+    'agi', 'agi_unnat', 'agi_advancement', 'armor_agi', 'armor_limit'], function(values) {
+      var agi = parseInt(values['agi'], 10) || 0;
+      var agi_unnat = parseInt(values['agi_unnat'], 10) || 0;
+      var agi_advancement = parseInt(values['agi_advancement'], 10) || 0;
+      var armor_agi = parseInt(values['armor_agi'], 10) || 0;
+			var armor_limit = parseInt(values['armor_limit'], 10) || 0;
+			var agiTotal = agi + agi_advancement
+
+			if (armor_limit) {
+				agiTotal = (agiTotal > armor_agi ) ? armor_agi : agiTotal;
+			}
+
+      // normal, no modifiers ___________________________________________________
+      setAttrs({agiTotal: (agiTotal)});
+
+    });
+  });
+
 
 
   // ___________________________________________________________________________
@@ -2542,7 +2729,7 @@
         		<div class="sheet-template-2x2 sheet-template-row">
         			<div class="sheet-template-right">Weapon Trained</div>
 							<div class="sheet-template-left">
-								<span class="sheet-inlineresult">
+								<span class="sheet-inlineresult sheet-roll-adjust">
 								{{#rollTotal() trained 20}}	0 {{/rollTotal() trained 20}}
 								{{#^rollTotal() trained 20}} -20 {{/^rollTotal() trained 20}}
 								</span>
@@ -2659,7 +2846,6 @@
       </div>
 			<img alt="spacer" src="https://raw.githubusercontent.com/ChtiKenny/roll20-character-sheets/ShadowbaneInauisition/ShadowbaneInquisition/images/assets/spacer.png"
 				class="sheet-rolltemplate-spacer sheet-invert">
-
 			<div class="sheet-template-row">
 	      {{#^rollGreater() roll target }}
 				<div class="sheet-template-center sheet-success">
@@ -2669,24 +2855,54 @@
 					{{#rollTotal() R_type 0}}
 			      <img alt="spacer" src="https://raw.githubusercontent.com/ChtiKenny/roll20-character-sheets/ShadowbaneInauisition/ShadowbaneInquisition/images/assets/spacer.png"
 			        class="sheet-rolltemplate-spacer">
-					<div class="sheet-template-center">Semi Auto: one hit per odd Dos<br>Max: Rate of Fire</div>
+					<div class="sheet-template-center">Semi Auto:
+            {{#rollBetween() degrees 1 2}}1 Hit {{/rollBetween() degrees 1 2}}
+            {{#rollBetween() degrees 3 4}}2 Hits {{/rollBetween() degrees 3 4}}
+            {{#rollBetween() degrees 5 6}}3 Hits  {{/rollBetween() degrees 5 6}}
+            {{#rollBetween() degrees 7 8}}4 Hits  {{/rollBetween() degrees 7 8}}
+            {{#rollBetween() degrees 9 10}}5 Hits  {{/rollBetween() degrees 9 10}}
+            {{#rollBetween() degrees 11 12}}6 Hits  {{/rollBetween() degrees 11 12}}
+            {{#rollBetween() degrees 13 14}}7 Hits  {{/rollBetween() degrees 13 14}}
+            {{#rollBetween() degrees 15 16}}8 Hits  {{/rollBetween() degrees 15 16}}
+            {{#rollBetween() degrees 17 18}}9 Hits  {{/rollBetween() degrees 17 18}}
+            {{#rollBetween() degrees 19 20}}10 Hits  {{/rollBetween() degrees 19 20}}
+            {{#rollGreater() degrees 20}}10+ Hits  {{/rollGreater() degrees 20}}
+            / Max: {{burst}}</div>
 					{{/rollTotal() R_type 0}}
 					{{#rollTotal() R_type -10}}
 			      <img alt="spacer" src="https://raw.githubusercontent.com/ChtiKenny/roll20-character-sheets/ShadowbaneInauisition/ShadowbaneInquisition/images/assets/spacer.png"
 			        class="sheet-rolltemplate-spacer">
-					<div class="sheet-template-center">Full Auto: one hit per DoS<br>Max: Rate of Fire</div>
+					<div class="sheet-template-center">Full Auto:
+            {{#rollTotal() degrees 1}}1 Hit {{/rollTotal() degrees 1}}
+            {{#rollGreater() degrees 1}} {{degrees}} Hits  {{/rollGreater() degrees 1}}
+            / Max: {{auto}}</div>
 					{{/rollTotal() R_type -10}}
 				{{/R_type}}
 				{{#M_type}}
 					{{#rollTotal() multi -10}}
 			      <img alt="spacer" src="https://raw.githubusercontent.com/ChtiKenny/roll20-character-sheets/ShadowbaneInauisition/ShadowbaneInquisition/images/assets/spacer.png"
 			        class="sheet-rolltemplate-spacer">
-					<div class="sheet-template-center">Swift Attack: one hit per odd Dos<br>Max: Weapon Skill bonus</div>
+					<div class="sheet-template-center">Swift Attack:
+            {{#rollBetween() degrees 1 2}}1 Hit {{/rollBetween() degrees 1 2}}
+            {{#rollBetween() degrees 3 4}}2 Hits {{/rollBetween() degrees 3 4}}
+            {{#rollBetween() degrees 5 6}}3 Hits  {{/rollBetween() degrees 5 6}}
+            {{#rollBetween() degrees 7 8}}4 Hits  {{/rollBetween() degrees 7 8}}
+            {{#rollBetween() degrees 9 10}}5 Hits  {{/rollBetween() degrees 9 10}}
+            {{#rollBetween() degrees 11 12}}6 Hits  {{/rollBetween() degrees 11 12}}
+            {{#rollBetween() degrees 13 14}}7 Hits  {{/rollBetween() degrees 13 14}}
+            {{#rollBetween() degrees 15 16}}8 Hits  {{/rollBetween() degrees 15 16}}
+            {{#rollBetween() degrees 17 18}}9 Hits  {{/rollBetween() degrees 17 18}}
+            {{#rollBetween() degrees 19 20}}10 Hits  {{/rollBetween() degrees 19 20}}
+            {{#rollGreater() degrees 20}}10+ Hits  {{/rollGreater() degrees 20}}
+            / Max: {{WS_bonus}}</div>
 					{{/rollTotal() multi -10}}
 					{{#rollTotal() multi -20}}
 			      <img alt="spacer" src="https://raw.githubusercontent.com/ChtiKenny/roll20-character-sheets/ShadowbaneInauisition/ShadowbaneInquisition/images/assets/spacer.png"
 			        class="sheet-rolltemplate-spacer">
-					<div class="sheet-template-center">Lightning Attack: one hit per DoS<br>Max: Weapon Skill bonus</div>
+					<div class="sheet-template-center">Lightning Attack:
+            {{#rollTotal() degrees 1}}1 Hit {{/rollTotal() degrees 1}}
+            {{#rollGreater() degrees 1}} {{degrees}} Hits  {{/rollGreater() degrees 1}}
+            / Max: {{WS_bonus}}</div>
 					{{/rollTotal() multi -20}}
 				{{/M_type}}
 				{{/^rollGreater() roll target }}