diff --git a/Sigil-Shadow/sigil-shadow.html b/Sigil-Shadow/sigil-shadow.html
index c55153273b..fa76a43453 100644
--- a/Sigil-Shadow/sigil-shadow.html
+++ b/Sigil-Shadow/sigil-shadow.html
@@ -1,4 +1,4 @@
-    <!-- Header Image-->
+<!-- Header Image-->
 
 <div class='row'>
 		<div style="width:100%">
@@ -32,7 +32,8 @@
 <p><p/>
 
 <b>Background: </b><input type='text' name='attr_character_background' style='width:100%'><br>
-<b>Lifestyle: &nbsp; &nbsp; &nbsp; &nbsp;</b><input type='text' name='attr_character_description' style='width:100%'><br>
+<b>Lifestyle: &nbsp; &nbsp; &nbsp; &nbsp;</b><input type='text' name='attr_character_lifestyle' style='width:100%'><br>
+<b>Descriptors: &nbsp; &nbsp; &nbsp; &nbsp;</b><input type='text' name='attr_character_descriptors' style='width:100%'><br>       
         
 <p><p/>
 			  
@@ -95,7 +96,7 @@
         <div style='text-align: left; margin-left:5%'>
                                 
             <button type='roll' value='&{template:default} {{name=Arcana Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} }} + @{arcana} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_arcana'></button><b>Arcana&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;&nbsp;&nbsp;</b><input type='checkbox' name='attr_arcana_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='arcana_level' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_arcana_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_arcana' value='0' min='-100'/><b>&nbsp;%</b><br>
                
             <!-- Start of Repeating Fieldset for Focused Arcana Skills-->
@@ -104,7 +105,7 @@
                         
             <button type='roll' value='&{template:default} {{name=@{arcanafocus} Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} }} + @{arcanafocusscore} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_arcanafocus'></button>
             <input type='text' name='attr_arcanafocus' style='width:75px' placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_arcanafocus_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='arcanafocuslevel' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_arcanafocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_arcanafocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>
                     
             </fieldset>	
@@ -113,8 +114,8 @@
                
         <p></p>
                
-            <button type='roll' value='&{template:default} {{name=Combat Check}} {{Success Value = [[?{Ability | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic} | Willpower, @{willpower}} + @{combat} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_combat'></button><b>Combat&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_arcana_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='combat_level' value='0' min='0' max='5'/>
+            <button type='roll' value='&{template:default} {{name=Combat Check}} {{Success Value = [[?{Ability | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic} | Willpower, @{willpower}} + @{combat} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_combat'></button><b>Combat&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_combat_trained' value='1'> 
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_combat_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_combat' value='0' min='-100'><b>&nbsp;%</b><br>
                     
             <!-- Start of Repeating Fieldset for Focused Combat Skills-->
@@ -123,7 +124,7 @@
                         
             <button type='roll' value='&{template:default} {{name=@{combatfocus} Check}} {{Success Value = [[?{Ability | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic} | Willpower, @{willpower}  }} + @{combatfocusscore} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_combatfocus'></button>
             <input type='text' name='attr_combatfocus' style='width:75px' placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_combatfocus_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='combatfocuslevel' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_combatfocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_combatfocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>
                     
             </fieldset>	
@@ -132,8 +133,8 @@
                     
         <p></p>
                
-            <button type='roll' value='&{template:default} {{name=Education Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} } + @{education} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_education'></button><b>Education&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_arcana_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='education_level' value='0' min='0' max='5'/>
+            <button type='roll' value='&{template:default} {{name=Education Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} } + @{education} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_education'></button><b>Education&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_education_trained' value='1'> 
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_education_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_education' value='0' min='-100'><b>&nbsp;%</b><br>
                     
             <!-- Start of Repeating Fieldset for Focused Education Skills-->
@@ -142,7 +143,7 @@
                             
            <button type='roll' value='&{template:default} {{name=@{educationfocus} Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} }} + @{educationfocusscore} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_educationfocus'></button>
             <input type='text' name='attr_educationfocus' style='width:75px'placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_educationfocus_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='educationfocuslevel' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_educationfocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_educationfocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>
 
             </fieldset>
@@ -152,36 +153,36 @@
         <p></p>
                     
             <button type='roll' value='&{template:default} {{name=Investigation Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Strength, @{strength} | Dexterity, @{dexterity} | Willpower, @{willpower}} + @{investigation}+ ?{Difficulty|0}]]}} {{Roll=[[1d100]]}}' name='roll_investigation'></button><b>Investigation&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_investigation_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='investigation_level' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_investigation_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_investigation' value='0' min='-100'><b>&nbsp;%</b><br>
                     
         </div>
                 
-</div>
+    </div>
                 
     <div class='col'>
         <div style='text-align: left; margin-left:5%'>
                  
             <button type='roll' value='&{template:default} {{name=Larceny Check}} {{Success Value = [[?{Ability | Dexterity, @{dexterity} | Logic, @{logic} | Strength, @{strength} | Willpower, @{willpower}} + @{larceny}+ ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_larceny'></button><b>Larceny&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_larceny_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='larceny_level' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_larceny_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_larceny' value='0' min='-100'><b>&nbsp;%</b><br>
                     
             <p></p>
                  
             <button type='roll' value='&{template:default} {{name=Medicine Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Strength, @{strength} | Dexterity, @{dexterity} | Willpower, @{willpower}} + @{medicine} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_medicine'></button><b>Medicine&nbsp; &nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_medicine_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='medicine_level' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_medicine_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type="number" name="attr_medicine" value="0" min="-100" /><b>&nbsp;%</b><br>
              
             <p></p>
              
             <button type='roll' value='&{template:default} {{name=Mysticism Check}} {{Success Value = [[?{Ability | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic}} + @{mysticism} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_mysticism'></button><b>Mysticism&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_mysticism_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='mysticism_level' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_mysticism_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type="number" name="attr_mysticism" value="0" min=-'100' /><b>&nbsp;%</b><br>
                     
             <p></p>
                     
             <button type='roll' value='&{template:default} {{name=Social Check}} {{Success Value = [[?{Ability | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic}} + @{social} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_social'></button><b>Social&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_social_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='social_level' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_social_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type="number" name="attr_social" value="0" min='-100' /><b>&nbsp;%</b><br>
                     
             <!-- Start of Repeating Fieldset for Focused Social Skills-->
@@ -190,7 +191,7 @@
                             
             <button type='roll' value='&{template:default} {{name=@{socialfocus} Check}} {{Success Value = [[?{Ability | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic} }} + @{socialfocusscore} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_socialfocus'></button>
             <input type='text' name='attr_socialfocus' style='width:75px' placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_socialfocus_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='socialfocuslevel' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_socialfocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_socialfocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>
 
             </fieldset>	
@@ -199,14 +200,14 @@
                     
             <p></p>
                     
-            <button type='roll' value='&{template:default} {{name=Survival Check}} {{Success Value = [?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity}} + [@{survival} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_survival'></button><b>Survival&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_arcana_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='survial_level' value='0' min='0' max='5'/>
+            <button type='roll' value='&{template:default} {{name=Survival Check}} {{Success Value = [?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity}} + [@{survival} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_survival'></button><b>Survival&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_survival_trained' value='1'> 
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_survival_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_survival' value='0' min='-100' /><b>&nbsp;%</b><br>
                     
             <p></p>
                     
-            <button type='roll' value='&{template:default} {{name=Technical Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Strength, @{strength} | Dexterity, @{dexterity}| Willpower, @{willpower}} + @{technical} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_technical'></button><b>Technical&nbsp; &nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_arcana_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='technical_level' value='0' min='0' max='5'/>
+            <button type='roll' value='&{template:default} {{name=Technical Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Strength, @{strength} | Dexterity, @{dexterity}| Willpower, @{willpower}} + @{technical} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_technical'></button><b>Technical&nbsp; &nbsp;&nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_technical_trained' value='1'> 
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_technical_level' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_technical' value='0' min='-100' /><b>&nbsp;%</b><br>
                     
             <!-- Start of Repeating Fieldset for Focused Technical Skills-->
@@ -215,18 +216,18 @@
                             
             <button type='roll' value='&{template:default} {{name=@{technicalfocus} Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} }} + @{technicalfocusscore} + ?{Difficulty|0} ]]}} {{Roll=[[1d100]]}}' name='roll_technicalfocus'></button>
             <input type='text' name='attr_technicalfocus' style='width:75px' placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_technicalfocus_trained' value='1'> 
-            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='technicalfocuslevel' value='0' min='0' max='5'/>
+            <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_technicalfocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_technicalfocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>
 
             </fieldset>	
                     
             <!-- End of Repeating Fieldset for Focused Technical Skills-->  
             
-                </div>
-                
-            </div>
-                
         </div>
+                
+    </div>
+                
+</div>
         
 <p></p>
 				
@@ -235,14 +236,14 @@
                 
     <!--Attack and Damage Rolls-->               
     
-		<h3 style='text-align: center; color: #FFF; background-color: #777ba0;'>Melee / Ranged Attacks</h3>
+		<h3 style='text-align: center; color: #FFF; background-color: #777ba0;'>Melee Attacks</h3>
 		<div style='text-align: center; width:100%; font-size:0.8em'><b>*Input weapon name, attack skill value and damage including applicable damage bonus*</b></div>
             <p></p>
             
-<div class='2colrow'>
+<div class='row'>
            
     <div class='col'>
-    <b>Melee Damage Bonus:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b><input type='text' name='attr_melee_dmg' style='width:50px'>
+    <b>Melee Damage Bonus:&nbsp;&nbsp;</b><input type='text' name='attr_melee_dmg' style='width:50px'>
     
     <p></p>
     
@@ -253,15 +254,24 @@
 	    <fieldset class='repeating_meleeSkills'>
 	        
 		<button type='roll' value='&{template:default} {{name=@{meleeSkill} Attack}} {Target = [[@{meleescore}]]}} {{roll=[[1d100]]}}'/></button>
-		<input type='text' name='attr_meleeSkill' style='width:125px' class='sheet-skillname' <placeholder='Add Melee Attack'>
+		<input type='text' name='attr_meleeSkill' style='width:100px' class='sheet-skillname' <placeholder='Add Weapon'>
 		<input type='number' name='attr_meleescore' value='0' min='0'><b>%</b>
-		<input type='text' name='attr_melee_damage' style='width:125px'<placeholder='Add Weapon Dmg'><button type='roll' name='melee_damage' value='&{template:default} {{name=@{meleeSkill} Damage}} {{Damage =[[@{melee_damage}]]}}'></button>
-            
+		<input type='text' name='attr_melee_damage' style='width:100px'<placeholder='Add Dmg'><button type='roll' name='melee_damage' value='&{template:default} {{name=@{meleeSkill} Damage}} {{Damage =[[@{melee_damage}]]}}'></button>
+        <b>Range:</b><input type='text' name='attr_range' style='width:25px'>
+        <b>Conceal:</b><input type='text' name='attr_melee_conceal' style='width:25px'>
+        <b>Notes:</b><input type='text' name='attr_melee_notes' style='width:300px'>
         </fieldset>	
             
         </div>
     </div>
     
+</div>
+
+		<h3 style='text-align: center; color: #FFF; background-color: #777ba0;'>Ranged Attacks</h3>
+		<div style='text-align: center; width:100%; font-size:0.8em'><b>*Input weapon name, attack skill value and damage including applicable damage bonus*</b></div>
+            <p></p>
+
+<div class='row'>
     <div class='col'>
         
             <div style='text-align:left'>
@@ -274,10 +284,14 @@
 	            <fieldset class='repeating_rangedSkills'>
 	                
 			    <button type='roll' value='&{template:default} {{name=@{rangedSkill} Attack}} {{Target = [[@{rangedScore}]]}} {{roll=[[1d100]]}}'></button>
-				<input type='text' name='attr_rangedSkill' style='width:125px' class='sheet-skillname'<placeholder='Add Ranged Attack'>
+				<input type='text' name='attr_rangedSkill' style='width:100px' class='sheet-skillname'<placeholder='Add Weapon'>
 			    <input type='number' name='attr_rangedScore' value='0' min='0'><b>%</b>
-			    <input type='text' name='attr_ranged_damage' style='width:125px'<placeholder='Add Weapon Dmg'><button type='roll' name='ranged_damage' value="&{template:default} {{name=@{rangedSkill} Damage}} {{Damage =[[@{ranged_damage}]]}}"></button>
-
+			    <input type='text' name='attr_ranged_damage' style='width:100px'<placeholder='Add Dmg'><button type='roll' name='ranged_damage' value="&{template:default} {{name=@{rangedSkill} Damage}} {{Damage =[[@{ranged_damage}]]}}"></button>
+                <b>Range:</b><input type='text' name='attr_range' style='width:25px'>
+                <b>Ammo:</b><input type='text' name='attr_ammo' style='width:50px'>
+                <b>Conceal:</b><input type='text' name='attr_ranged_conceal' style='width:25px'>
+                <b>Notes:</b><input type='text' name='attr_melee_notes' style='width:200px'>
+		        
 		        </fieldset>	
 		        
 		    </div>
@@ -313,4 +327,4 @@
             
     </fieldset>
 
-<p></p>
+<p></p>