diff --git a/Feng-Shui-2/Feng Shui 2.css b/Feng-Shui-2/Feng Shui 2.css
index 8e0ad3a0a7..5d52bc9be8 100644
--- a/Feng-Shui-2/Feng Shui 2.css	
+++ b/Feng-Shui-2/Feng Shui 2.css	
@@ -236,18 +236,32 @@ input[type="text"] {
     text-align: center;
 }
 
+.sheet-WCSkillsRow {
+    padding-left: 5px;
+}
+
 .sheet-untrainedSkill {
     font-weight: bold;  
     padding-right: 103px;
     padding-left: 5px;
 }
 
+.sheet-WCschticksRow {
+    padding: 5px;   
+    border-bottom: 1px #990000 solid;
+}
+
 input.sheet-schtickName {
     width:152px; 
     font-size: 13px; 
     font-weight: bold;
 }
 
+.sheet-schtickType {
+    margin-top: 10px;
+    width: 175px;
+}
+
 input.sheet-skillName {
     width:152px; 
     font-size: 13px; 
@@ -416,4 +430,4 @@ div.sheet-body {
  
 .sheet-rolltemplate-magicshow td {
     padding-left: 5px;
-}
+}
\ No newline at end of file
diff --git a/Feng-Shui-2/Feng Shui 2.html b/Feng-Shui-2/Feng Shui 2.html
index 62ca58eb97..a34c10b9dc 100644
--- a/Feng-Shui-2/Feng Shui 2.html	
+++ b/Feng-Shui-2/Feng Shui 2.html	
@@ -28,58 +28,18 @@
                     <div class='boxHeader'><span class='boxHeaderText'>SCHTICKS</span></div>
                     <div class='boxText'>
                     <fieldset class="repeating_schticks">
-            			<div class='sheet-row sheet-WCschticksRow'>
+                		<div class='sheet-row sheet-WCschticksRow'>
         					<input class="sheet-schtickName" type="text" name="attr_schtickName" title="@{repeating_schticks_#_schtickName}" placeholder="Schtick Name"/>
-    					    <textarea class="sheet-textarea" name="attr_schtickDetail" title="@{repeating_schticks_#_schtickDetail}" style="height: 50px;"></textarea>
+    					    <textarea class="sheet-textarea" name="attr_schtickDetail" title="@{repeating_schticks_#_schtickDetail}" style="height: 75px;"></textarea>
     					</div>
     				</fieldset>
                     </div>
                 </div>
-                
-                
-
-                <div class='textBoxArea'>
-                    <div class='boxHeader'><span class='boxHeaderText'>SKILLS</span></div>
-                    <div class='boxText'>
-                        <div class='sheet-row sheet-WCSkillsRow'>
-                        <span class='sheet-untrainedSkill'>Untrained Skill</span> <button type="roll" class="btn ui-draggable" value="/em attemps an Untrained Skill and rolls: [[(1 + ?{Fortune?|0})d6! - 1d6! + 7]] "></button>
-                    </div>
-                    <fieldset class="repeating_skills">
-        				<div class='sheet-row sheet-WCSkillsRow'>
-    						<input class="sheet-skillName" type="text" name="attr_SkillName" title="@{repeating_skills_#_SkillName}" placeholder="Skill Name"/>
-    					    <input type="number" class="sheet-modifier" name="attr_SkillMod" title="@{repeating_skills_#_SkillMod}" value="0" />
-    						<div class='sheet-col' style='width:90px; margin-left: -1px;'>
-    							<button class="sheet-normalbutton" type='roll' name='roll_SkillNameRoll' title="@{repeating_skills_#_SkillNameRoll}" value='/em @{character_name} attempts @{SkillName} and rolls: @{rollSkill}!'></button>
-                                <input type='hidden' name='attr_rollSkill' value='[[ (1 + ?{Fortune?|0})d6! - 1d6! + @{SkillMod} ]]' />
-                                <!--
-        						<button class="sheet-templatebutton" type='roll' name='roll_tSkillRoll' title="@{tSkillRoll}" value='@{skillrt} @{defsTemplate} @{rolltSkill}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSkillRoll' title="@{tgmSkillRoll}" value='/w gm @{skillrt} @{defsTemplate} @{rolltSkill}'></button>
-    							<button class="sheet-normalbutton" type='roll' name='roll_SkillNameRoll' title="@{repeating_skills_#_SkillNameRoll}" value='/em @{character_name} attempts to do something with @{SkillName} and rolls: @{rollSkill}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmSkillNameRoll' title="@{repeating_skills_#_gmSkillNameRoll}" value='/w gm @{character_name} attempts to do something with @{SkillName} and rolls: @{rollSkill}!'></button>
-        						<input type='hidden' name='attr_rollSkill' value='[[{1d@{SkillNameRank}![@{SkillName}], 1d@{wilddie}![Wild Die]}kh1 + @{SkillNameMod}[Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SkillEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
-    							<input type='hidden' name='attr_rolltSkill' value='{{name=@{character_name}}} {{skill_name=@{SkillName}}} {{skill_rank=@{SkillNameRank}}} {{skill_rank_mod=@{SkillNameMod}}} {{skill_mod=@{SkillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{SkillNameRank}![@{SkillName}] + @{SkillNameMod}[@{SkillName} Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{SkillNameMod}[@{SkillName} Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
-    						
                                 
-                                <button type="roll" class="btn ui-draggable" value="/em rolls BackupAttack. [[(1 + ?{Fortune?|0})d6! - 1d6! + [[@{BackupAttack}]]]] "></button>
-                                -->
-    						</div>
-    					</div>
-    				</fieldset>
-                    </div>
-                </div>                
-                
-                
                 <div class='textBoxArea'>
                     <div class='boxHeader'><span class='boxHeaderText'>NOTES</span></div>
                     <div class='boxText'><textarea class="sheet-textarea" name="attr_Schticks" style="height: 150px;"></textarea></div>
                 </div>
-                            
-                <div class='weaponSection'>
-                    <div class='weaponHeader'>WOUNDS</div>
-                    <div class='textBoxArea'>
-                        <span class='boxHeaderText'>WOUND POINTS: </span><input type='number' class="sheet-prime_attribute" name="attr_Wounds"/><br/>
-                        <span class='boxHeaderText'>MARKS OF DEATH: </span><input type='number' class="sheet-prime_attribute" name="attr_MarksOfDeath"/>
-                    </div>
-                    <button type="roll" class="sheet-attribute" name="attr_closed_roll-1" value="/em tries to stayin the fight! Death Check. Difficulty [[@{Wound} - 35]].  Roll is [[ [[(1 + ?{Fortune?|0})]]d6! + [[@{con}]] - 1d6! ]] ">Death Check</button>
-                </div>
             </div>
         </div>
         <div class='sheet-col'> 
@@ -104,7 +64,7 @@
                         <input type="text" class="sheet-heading" placeholder="MAIN ATTACK" name="attr_MainAttackType" /><br/>
                     </div>
                     <div class="attrValue">
-                        <button type="roll" class="btn ui-draggable" value="/em rolls Main Attack. [[(1 + ?{Fortune?|0})d6! - 1d6! + [[@{MainAttack}]]]] "></button>
+                        <button type="roll" class="btn ui-draggable" value="/em rolls Main Attack. [[?{Fortune?|0}d6 + 1d6! - 1d6! + [[@{MainAttack}]]]] "></button>
                         <input type="number" class="sheet-prime_attribute" name="attr_MainAttack" value="0" />
                     </div>
                 </div>
@@ -113,57 +73,57 @@
                         <input type="text" class="sheet-heading" placeholder="BACKUP ATTACK" name="attr_BackupAttackType" /><br/>
                     </div>
                     <div class="attrValue">
-                        <button type="roll" class="btn ui-draggable" value="/em rolls Backup Attack. [[(1 + ?{Fortune?|0})d6! - 1d6! + [[@{BackupAttack}]]]] "></button>
+                        <button type="roll" class="btn ui-draggable" value="/em rolls Backup Attack. [[?{Fortune?|0}d6 + 1d6! - 1d6! + [[@{BackupAttack}]]]] "></button>
                         <input type="number" class="sheet-prime_attribute" name="attr_BackupAttack" value="0" />
                     </div>
                 </div>
 				<div class='attrRow'>
                     <div class='attrHeader'>DEFENSE</div>
                     <div class="attrValue">
-                        <button type="roll" class="btn ui-draggable" value="/em rolls Defense. [[(1 + ?{Fortune?|0})d6! - 1d6! + [[@{Defense}]]]] "></button>
+                        <button type="roll" class="btn ui-draggable" value="/em rolls Defense. [[?{Fortune?|0}d6 + 1d6! - 1d6! + [[@{Defense}]]]] "></button>
                         <input type="number" class="sheet-prime_attribute" name="attr_Defense" value="0" />
                     </div>
                 </div>
 				<div class='attrRow'>
                     <div class='attrHeader'>TOUGHNESS</div>
                     <div class="attrValue">
-                        <button type="roll" class="btn ui-draggable" value="/em rolls Toughness. [[(1 + ?{Fortune?|0})d6! - 1d6! + [[@{Toughness}]]]] "></button>
+                        <button type="roll" class="btn ui-draggable" value="/em rolls Toughness. [[?{Fortune?|0}d6 + 1d6! - 1d6! + [[@{Toughness}]]]] "></button>
                         <input type="number" class="sheet-prime_attribute" name="attr_Toughness" value="0" />
                     </div>                    
                 </div>
 				<div class='attrRow'>
                     <div class='attrHeader'>FORTUNE</div>
                     <div class="attrValue">
-                        <button type="roll" class="btn ui-draggable" value="/em rolls Fortune. [[(1 + ?{Fortune?|0})d6! - 1d6! + [[@{Fortune}]]]] "></button>
+                        <button type="roll" class="btn ui-draggable" value="/em rolls Fortune. [[?{Fortune?|0}d6 + 1d6! - 1d6! + [[@{Fortune}]]]] "></button>
                         <input type="number" class="sheet-prime_attribute" name="attr_Fortune" value="0" />
                     </div>
                 </div>
                 <div class='attrRow'>
                     <div class='attrHeader'>SPEED</div>
                     <div class="attrValue">
-                        <button type="roll" class="btn ui-draggable" value="/em rolls Speed. [[(1 + ?{Fortune?|0})d6! - 1d6! + [[@{Speed}]]]] "></button>
+                        <button type="roll" class="btn ui-draggable" value="/em rolls Speed. [[?{Fortune?|0}d6 + 1d6! - 1d6! + [[@{Speed}]]]] "></button>
                         <input type="number" class="sheet-prime_attribute" name="attr_Speed" value="0" />
                     </div>
                 </div>
                 
                 <div class='attrRow'>
                     <div class='attrHeader'>
-                        MELODRAMA <button type="roll" class="btn ui-draggable" value="/em rolls Melodrama. [[(1 + ?{Fortune?|0})d6! - 1d6! + 7]] "></button>
+                        MELODRAMA <button type="roll" class="btn ui-draggable" value="/em rolls Melodrama. [[?{Fortune?|0}d6 + 1d6! - 1d6! + 7]] "></button>
                     </div>
                 </div>
                 <div class='attrRow'>
                     <div class='attrHeader'>
-                        WILL <button type="roll" class="btn ui-draggable" value="/em rolls Will. [[(1 + ?{Fortune?|0})d6! - 1d6! + 7]] "></button>
+                        WILL <button type="roll" class="btn ui-draggable" value="/em rolls Will. [[?{Fortune?|0}d6 + 1d6! - 1d6! + 7]] "></button>
                     </div>
                 </div>
                 <div class='attrRow'>
                     <div class='attrHeader'>
-                        NOTICE <button type="roll" class="btn ui-draggable" value="/em rolls Notice. [[(1 + ?{Fortune?|0})d6! - 1d6! + 7]] "></button>
+                        NOTICE <button type="roll" class="btn ui-draggable" value="/em rolls Notice. [[?{Fortune?|0}d6 + 1d6! - 1d6! + 7]] "></button>
                     </div>
                 </div>
                 <div class='attrRow'>
                     <div class='attrHeader'>
-                        STRENGTH <button type="roll" class="btn ui-draggable" value="/em rolls Strength. [[(1 + ?{Fortune?|0})d6! - 1d6! + 7]] "></button>
+                        STRENGTH <button type="roll" class="btn ui-draggable" value="/em rolls Strength. [[?{Fortune?|0}d6 + 1d6! - 1d6! + 7]] "></button>
                     </div>
                 </div>
             </div>
@@ -177,24 +137,46 @@
                         <input type='text' class="sheet-weaponSpecial sheet-heading" name="attr_wepSpecial" title="@{repeating_weapons_#_wepSpecial}" placeholder="Special"/>
                     </div>
 				</fieldset>
-                <!--
-                <div class='weaponRow'>
-                    <input type='text' class="weaponName sheet-heading" name="attr_Wep1Name"/>
-                    <input type='text' class="weaponStats sheet-heading" name="attr_Wep1Stats"/>
-                    <input type='text' class="weaponSpecial sheet-heading" name="attr_Wep1Special"/>
-                </div>
-                <div class='weaponRow'>
-                    <input type='text' class="weaponName sheet-heading" name="attr_Wep1Name"/>
-                    <input type='text' class="weaponStats sheet-heading" name="attr_Wep1Stats"/>
-                    <input type='text' class="weaponSpecial sheet-heading" name="attr_Wep1Special"/>
-                </div>
-                <div class='weaponRow'>
-                    <input type='text' class="weaponName sheet-heading" name="attr_Wep1Name"/>
-                    <input type='text' class="weaponStats sheet-heading" name="attr_Wep1Stats"/>
-                    <input type='text' class="weaponSpecial sheet-heading" name="attr_Wep1Special"/>
-                </div>-->
             </div>    
+            <br/>
             
+            <div class='textBoxArea'>
+                <div class='boxHeader'><span class='boxHeaderText'>SKILLS</span></div>
+                <div class='boxText'>
+                    <div class='sheet-row sheet-WCSkillsRow'>
+                    <span class='sheet-untrainedSkill'>Untrained Skill</span> <button type="roll" class="btn ui-draggable" value="/em attemps an Untrained Skill and rolls: [[?{Fortune?|0}d6 + 1d6! - 1d6! + 7]] "></button>
+                </div>
+                <fieldset class="repeating_skills">
+        			<div class='sheet-row sheet-WCSkillsRow'>
+						<input class="sheet-skillName" type="text" name="attr_SkillName" title="@{repeating_skills_#_SkillName}" placeholder="Skill Name"/>
+					    <input type="number" class="sheet-modifier" name="attr_SkillMod" title="@{repeating_skills_#_SkillMod}" value="0" />
+						<div class='sheet-col' style='width:90px; margin-left: -1px;'>
+							<button class="sheet-normalbutton" type='roll' name='roll_SkillNameRoll' title="@{repeating_skills_#_SkillNameRoll}" value='/em @{character_name} attempts @{SkillName} and rolls: @{rollSkill}!'></button>
+                            <input type='hidden' name='attr_rollSkill' value='[[ ?{Fortune?|0}d6 + 1d6! - 1d6! + @{SkillMod} ]]' />
+                            <!--
+    						<button class="sheet-templatebutton" type='roll' name='roll_tSkillRoll' title="@{tSkillRoll}" value='@{skillrt} @{defsTemplate} @{rolltSkill}'></button><button class="sheet-templatebutton sheet-GM-button" type='roll' name='roll_tgmSkillRoll' title="@{tgmSkillRoll}" value='/w gm @{skillrt} @{defsTemplate} @{rolltSkill}'></button>
+							<button class="sheet-normalbutton" type='roll' name='roll_SkillNameRoll' title="@{repeating_skills_#_SkillNameRoll}" value='/em @{character_name} attempts to do something with @{SkillName} and rolls: @{rollSkill}!'></button><button type='roll' class="sheet-normalbutton sheet-GM-button" name='roll_gmSkillNameRoll' title="@{repeating_skills_#_gmSkillNameRoll}" value='/w gm @{character_name} attempts to do something with @{SkillName} and rolls: @{rollSkill}!'></button>
+    						<input type='hidden' name='attr_rollSkill' value='[[{1d@{SkillNameRank}![@{SkillName}], 1d@{wilddie}![Wild Die]}kh1 + @{SkillNameMod}[Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ttmod}[Situational Modifiers] +(@{SkillEncumbrance}*@{encumbrance})[Encumbrance Penalty] - @{woundsMod}[Wounds] - @{fatigue}[Fatigue]]]' />
+							<input type='hidden' name='attr_rolltSkill' value='{{name=@{character_name}}} {{skill_name=@{SkillName}}} {{skill_rank=@{SkillNameRank}}} {{skill_rank_mod=@{SkillNameMod}}} {{skill_mod=@{SkillMod}}} {{ttmod=@{ttmod}}} {{wounds= -[[@{woundsMod}]]}} {{fatigue= -@{fatigue}}} {{skill_roll=[[1d@{SkillNameRank}![@{SkillName}] + @{SkillNameMod}[@{SkillName} Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}} {{wild_die_rank=@{wilddie}}} {{wild_die=[[1d@{wilddie}! + @{SkillNameMod}[@{SkillName} Rank Modifier] + @{SkillMod} [Skill Modifier] + @{ModSum}[Modifiers]]]}}' />
+						
+                            
+                            <button type="roll" class="btn ui-draggable" value="/em rolls BackupAttack. [[?{Fortune?|0}d6 + 1d6! - 1d6! + [[@{BackupAttack}]]]] "></button>
+                            -->
+						</div>
+					</div>
+				</fieldset>
+                </div>
+            </div> 
+            <br/>
+            
+            <div class='weaponSection'>
+                <div class='weaponHeader'>WOUNDS</div>
+                <div class='textBoxArea'>
+                    <span class='boxHeaderText'>WOUND POINTS: </span><input type='number' class="sheet-prime_attribute" name="attr_Wounds"/><br/>
+                    <span class='boxHeaderText'>MARKS OF DEATH: </span><input type='number' class="sheet-prime_attribute" name="attr_MarksOfDeath"/>
+                </div>
+                <button type="roll" class="sheet-attribute" name="attr_closed_roll-1" value="/em tries to stayin the fight! Death Check. Difficulty [[@{Wound} - 35]].  Roll is [[ [[(1 + ?{Fortune?|0})]]d6! + [[@{con}]] - 1d6! ]] ">Death Check</button>
+            </div>
         </div>
    </div>        
 </div>
@@ -203,138 +185,6 @@
 <!--  rolltemplates  -->
 <div class="sheet-hidden">
 
-<rolltemplate class="sheet-rolltemplate-show">
-    <table class="sheet-show">
-        <tr>
-            <th colspan="2">{{name}}</th>
-        </tr>
-        <tr>
-            <th>Chi</th>
-            <th>Shots</th>
-        </tr>
-        <tr>
-            <td>{{chi}}</td>
-            <td>{{shots}}</td>
-        </tr>
-        <tr>
-            <th colspan="2">Notes</th>
-        </tr>
-        <tr>
-            <td colspan="2" style="font-style: italic;">{{notes}}</td>
-        </tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-magicshow">
-    <table class="sheet-magicshow">
-        <tr>
-            <th>{{name}}</th>
-        </tr>
-        <tr>
-            <th>Special Effect</th>
-        </tr>
-        <tr>
-            <td style="font-style: italic;">{{speff}}</td>
-        </tr>
-        <tr>
-            <th>Backlash</th>
-        </tr>
-        <tr>
-            <td style="font-style: italic;">{{backlash}}</td>
-        </tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-initiative">
-    <table class="sheet-initiative">
-        <tr>
-            <th>{{name}}</th>
-        </tr>
-        <tr>
-            <th>{{init}}</th>
-        </tr>
-        <tr>
-            <th>success(es) for initiative</th>
-        </tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-dicepool">
-    <table class="sheet-dicepool">
-        <tr>
-            <th colspan="2"><br>{{name}}</th>
-        </tr>
-        <tr>
-            <th colspan="2" class="sheet-temp_title">{{dp}}</th>
-        </tr>
-        <tr>
-            <th>Attribute</th>
-            <th>{{attr}}</th>
-        </tr>
-        <tr>
-            <th>Skill</th>
-            <th>{{skill}}</th>
-        </tr>
-        <tr>
-            <th>Misc</th>
-            <th>{{misc}}</th>
-        </tr>
-        <tr>
-            <th>Difficulty</th>
-            <th>{{diff}}</th>
-        </tr>
-        <tr>
-            <th>Roll</th>
-            <th>{{roll}}</th>
-        </tr>
-        <tr>
-            <th><br></th>
-        </tr>
-    </table>
-</rolltemplate>
-
-<rolltemplate class="sheet-rolltemplate-attack">
-    <table class="sheet-attack">
-        <tr>
-            <th colspan="3"><br>{{name}}</th>
-        </tr>
-        <tr>
-            <th colspan="3" class="sheet-temp_title">{{weapon}}</th>
-        </tr>
-        <tr>
-            <th colspan="3" style="color:black;">Attack</th>
-        </tr>
-        <tr>
-            <th>Dice</th>
-            <th>Diff</th>
-            <th>Roll</th>
-        </tr>
-        <tr>        
-            <th>{{att_dice}}</th>
-            <th>{{att_diff}}</th>
-            <th>{{att_roll}}</th>
-        </tr>
-            <th colspan="3" style="color:black;">Damage</th>
-        </tr>
-        <tr>
-            <th>Dice</th>
-            <th>Diff</th>
-            <th>Roll</th>
-        </tr>
-        <tr>        
-            <th>{{dam_dice}}</th>
-            <th>{{dam_diff}}</th>
-            <th>{{dam_roll}}</th>
-        </tr>
-        <tr>
-            <th colspan="3">{{type}}</th>
-        </tr>
-        <tr>
-            <th><br></th>
-        </tr>
-    </table>
-</rolltemplate>
-
 </div>
 </body>
 </html>