diff --git a/NWOD-Demon/NWOD-Demon.html b/NWOD-Demon/NWOD-Demon.html
index 81c8b22682..51aa6d8065 100644
--- a/NWOD-Demon/NWOD-Demon.html
+++ b/NWOD-Demon/NWOD-Demon.html
@@ -2,6 +2,7 @@
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab2" value="2" title="Second" />
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab3" value="3" title="Third" />
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab4" value="4" title="Fourth" />
+<input type="radio" name="attr_tab" class="sheet-tab sheet-tab5" value="5" title="Fifth" />
 
 <div class="sheet-tab-br"></div>
 
@@ -594,55 +595,578 @@
                     </fieldset>
                     <br>
                     <h5 class="sheet-center">Conditions</h5>
-                        <textarea name="attr_Conditions" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea class="sheet-textarea" name="attr_Conditions" rows="3" wrap="soft" style="width:100%"></textarea>
+                    <h5 class="sheet-center">Tilts</h5>
+                        <textarea class="sheet-textarea" name="attr_Tilts" rows="3" wrap="soft" style="width:100%"></textarea>
                     <h5 class="sheet-center">Aspirations</h5>
-                        <textarea name="attr_Aspirations" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea class="sheet-textarea"  name="attr_Aspirations" rows="3" wrap="soft" style="width:100%"></textarea>
                     <!--Dice Pools -->
                     <h5 class="sheet-center">Common Dice Pools</h5>
                     <table>
                         <tr>
-                            <td><h5>Roll</h5></td>
-                            <td><h5>Name of Pool</h5></td>
-                            <td><h5>Number of dice</h5></td>
+                            <td style="width:50px;"><h5>Roll</h5></td>
+                            <td style="width:185px;"><h5>Name</h5></td>
+                            <td style="width:95px;"><h5>Dice</h5></td>
+                        </tr>
+                    </table>
+                    <table class="sheet-weapon">
+                        <tr>
+                            <td style="width:50px;"><button type="roll" class="sheet-btn" name="attr_Skillbtn_1" value="&{template:Interlock}{{InterName= @{dice_pool_name_1}}} {{Dice= [[@{dice_pool_1}]] }}{{character= @{character_name}}} {{Roll= [[ [[@{dice_pool_1}]]d10@{dice_pool_again_1}sd>8]] success(es)}}"></button></td>
+                            <td style="width:185px;" colspan="2"><input type="text" name="attr_dice_pool_name_1" placeholder="Name" style="width:185px;"/></td>
+                            <td style="width:85px;"><input type="number" name="attr_dice_pool_1" value="@{dice_pool_attribute_1} + @{dice_pool_skill_1} + @{dice_pool_mod_1}" disabled="true"/></td>
                         </tr>
                         <tr>
-                            <td><button type="roll" class="sheet-btn" name="attr_Skillbtn_1" value="&{template:Interlock}{{InterName= @{dice_pool_name_1}}} {{Dice= @{dice_pool_1}}}{{character= @{character_name}}} {{Roll= [[{@{dice_pool_1}d10sd!}>8]] success(es)}}"></button></td>
-                            <td><input type="text" name="attr_dice_pool_name_1" placeholder="Name"/></td>
-                            <td><input type="number" name="attr_dice_pool_1"/></td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_again_1" style="width:70px;">
+                                    <option value="">None</option>
+                                    <option value="!>10" selected>10-again</option>
+                                    <option value="!>7">9-again</option>
+                                    <option value="!>8">8-again</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select class="sheet-skill_select" name="attr_dice_pool_attribute_1" style="width:95px;">
+                                    <option value="0" selected>Attribute</option>
+                                    <option value="@{com}">Composure</option>
+                                    <option value="@{dex}">Dexterity</option>
+                                    <option value="@{int}">Intelligence</option>
+                                    <option value="@{man}">Manipulation</option>
+                                    <option value="@{pre}">Presence</option>
+                                    <option value="@{res}">Resolve</option>
+                                    <option value="@{sta}">Stamina</option>
+                                    <option value="@{str}">Strength</option>
+                                    <option value="@{wits}">Wits</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_skill_1" style="width:100px;">
+                                    <option value="0" selected>Skill</option>
+                                    <option value="@{academics}">Academics</option>
+                                    <option value="@{animalken}">Animal Ken</option>
+                                    <option value="@{athletics}">Athletics</option>
+                                    <option value="@{computer}">Computer</option>
+                                    <option value="@{crafts}">Crafts</option>
+                                    <option value="@{brawl}">Brawl</option>
+                                    <option value="@{drive}">Drive</option>
+                                    <option value="@{empathy}">Empathy</option>
+                                    <option value="@{expression}">Expression</option>
+                                    <option value="@{firearms}">Firearms</option>
+                                    <option value="@{intimidation}">Intimidation</option>
+                                    <option value="@{investigation}">Investigation</option>
+                                    <option value="@{larceny}">Larceny</option>
+                                    <option value="@{medicine}">Medicine</option>
+                                    <option value="@{occult}">Occult</option>
+                                    <option value="@{persuasion}">Persuasion</option>
+                                    <option value="@{politics}">Politics</option>
+                                    <option value="@{science}">Science</option>
+                                    <option value="@{socialize}">Socialize</option>
+                                    <option value="@{stealth}">Stealth</option>
+                                    <option value="@{streetwise}">Streetwise</option>
+                                    <option value="@{subterfuge}">Subterfuge</option>
+                                    <option value="@{survival}">Survival</option>
+                                    <option value="@{weaponry}">Weaponry</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_mod_1" value="0"/></td>
+                        </tr>
+                    </table>
+                    <table class="sheet-weapon">
+                        <tr>
+                            <td style="width:50px;"><button type="roll" class="sheet-btn" name="attr_Skillbtn_2" value="&{template:Interlock}{{InterName= @{dice_pool_name_2}}} {{Dice= [[@{dice_pool_2}]] }}{{character= @{character_name}}} {{Roll= [[ [[@{dice_pool_2}]]d10@{dice_pool_again_2}sd>8]] success(es)}}"></button></td>
+                            <td style="width:185px;" colspan="2"><input type="text" name="attr_dice_pool_name_2" placeholder="Name"/></td>
+                            <td style="width:95px;"><input type="number" name="attr_dice_pool_2" value="@{dice_pool_attribute_2} + @{dice_pool_skill_2} + @{dice_pool_mod_2}" disabled="true"/></td>
                         </tr>
                         <tr>
-                            <td><button type="roll" class="sheet-btn" name="attr_Skillbtn_2" value="&{template:Interlock}{{InterName= @{dice_pool_name_2}}} {{Dice= @{dice_pool_2}}}{{character= @{character_name}}} {{Roll= [[{@{dice_pool_2}d10sd!}>8]] success(es)}}"></button></td>
-                            <td><input type="text" name="attr_dice_pool_name_2" placeholder="Name"/></td>
-                            <td><input type="number" name="attr_dice_pool_2"/></td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_again_2" style="width:70px;">
+                                    <option value="">None</option>
+                                    <option value="!>10" selected>10-again</option>
+                                    <option value="!>7">9-again</option>
+                                    <option value="!>8">8-again</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select class="sheet-skill_select" name="attr_dice_pool_attribute_2" style="width:95px;">
+                                    <option value="0" selected>Attribute</option>
+                                    <option value="@{com}">Composure</option>
+                                    <option value="@{dex}">Dexterity</option>
+                                    <option value="@{int}">Intelligence</option>
+                                    <option value="@{man}">Manipulation</option>
+                                    <option value="@{pre}">Presence</option>
+                                    <option value="@{res}">Resolve</option>
+                                    <option value="@{sta}">Stamina</option>
+                                    <option value="@{str}">Strength</option>
+                                    <option value="@{wits}">Wits</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_skill_2" style="width:100px;">
+                                    <option value="0" selected>Skill</option>
+                                    <option value="@{academics}">Academics</option>
+                                    <option value="@{animalken}">Animal Ken</option>
+                                    <option value="@{athletics}">Athletics</option>
+                                    <option value="@{computer}">Computer</option>
+                                    <option value="@{crafts}">Crafts</option>
+                                    <option value="@{brawl}">Brawl</option>
+                                    <option value="@{drive}">Drive</option>
+                                    <option value="@{empathy}">Empathy</option>
+                                    <option value="@{expression}">Expression</option>
+                                    <option value="@{firearms}">Firearms</option>
+                                    <option value="@{intimidation}">Intimidation</option>
+                                    <option value="@{investigation}">Investigation</option>
+                                    <option value="@{larceny}">Larceny</option>
+                                    <option value="@{medicine}">Medicine</option>
+                                    <option value="@{occult}">Occult</option>
+                                    <option value="@{persuasion}">Persuasion</option>
+                                    <option value="@{politics}">Politics</option>
+                                    <option value="@{science}">Science</option>
+                                    <option value="@{socialize}">Socialize</option>
+                                    <option value="@{stealth}">Stealth</option>
+                                    <option value="@{streetwise}">Streetwise</option>
+                                    <option value="@{subterfuge}">Subterfuge</option>
+                                    <option value="@{survival}">Survival</option>
+                                    <option value="@{weaponry}">Weaponry</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_mod_2" value="0"/></td>
+                        </tr>
+                    </table>
+                    <table class="sheet-weapon">
+                        <tr>
+                            <td style="width:50px;"><button type="roll" class="sheet-btn" name="attr_Skillbtn_3" value="&{template:Interlock}{{InterName= @{dice_pool_name_3}}} {{Dice= [[@{dice_pool_3}]] }}{{character= @{character_name}}} {{Roll= [[ [[@{dice_pool_3}]]d10@{dice_pool_again_3}sd>8]] success(es)}}"></button></td>
+                            <td style="width:220px;" colspan="2"><input type="text" name="attr_dice_pool_name_3" placeholder="Name"/></td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_3" value="@{dice_pool_attribute_3} + @{dice_pool_skill_3} + @{dice_pool_mod_3}" disabled="true"/></td>
                         </tr>
                         <tr>
-                            <td><button type="roll" class="sheet-btn" name="attr_Skillbtn_3" value="&{template:Interlock}{{InterName= @{dice_pool_name_3}}} {{Dice= @{dice_pool_3}}}{{character= @{character_name}}} {{Roll= [[{@{dice_pool_3}d10sd!}>8]] success(es)}}"></button></td>
-                            <td><input type="text" name="attr_dice_pool_name_3" placeholder="Name"/></td>
-                            <td><input type="number" name="attr_dice_pool_3"/></td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_again_3" style="width:70px;">
+                                    <option value="">None</option>
+                                    <option value="!>10" selected>10-again</option>
+                                    <option value="!>7">9-again</option>
+                                    <option value="!>8">8-again</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select class="sheet-skill_select" name="attr_dice_pool_attribute_3" style="width:95px;">
+                                    <option value="0" selected>Attribute</option>
+                                    <option value="@{com}">Composure</option>
+                                    <option value="@{dex}">Dexterity</option>
+                                    <option value="@{int}">Intelligence</option>
+                                    <option value="@{man}">Manipulation</option>
+                                    <option value="@{pre}">Presence</option>
+                                    <option value="@{res}">Resolve</option>
+                                    <option value="@{sta}">Stamina</option>
+                                    <option value="@{str}">Strength</option>
+                                    <option value="@{wits}">Wits</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_skill_3" style="width:100px;">
+                                    <option value="0" selected>Skill</option>
+                                    <option value="@{academics}">Academics</option>
+                                    <option value="@{animalken}">Animal Ken</option>
+                                    <option value="@{athletics}">Athletics</option>
+                                    <option value="@{computer}">Computer</option>
+                                    <option value="@{crafts}">Crafts</option>
+                                    <option value="@{brawl}">Brawl</option>
+                                    <option value="@{drive}">Drive</option>
+                                    <option value="@{empathy}">Empathy</option>
+                                    <option value="@{expression}">Expression</option>
+                                    <option value="@{firearms}">Firearms</option>
+                                    <option value="@{intimidation}">Intimidation</option>
+                                    <option value="@{investigation}">Investigation</option>
+                                    <option value="@{larceny}">Larceny</option>
+                                    <option value="@{medicine}">Medicine</option>
+                                    <option value="@{occult}">Occult</option>
+                                    <option value="@{persuasion}">Persuasion</option>
+                                    <option value="@{politics}">Politics</option>
+                                    <option value="@{science}">Science</option>
+                                    <option value="@{socialize}">Socialize</option>
+                                    <option value="@{stealth}">Stealth</option>
+                                    <option value="@{streetwise}">Streetwise</option>
+                                    <option value="@{subterfuge}">Subterfuge</option>
+                                    <option value="@{survival}">Survival</option>
+                                    <option value="@{weaponry}">Weaponry</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_mod_3" value="0"/></td>
+                        </tr>
+                    </table>
+                    <table class="sheet-weapon">
+                        <tr>
+                            <td style="width:50px;"><button type="roll" class="sheet-btn" name="attr_Skillbtn_4" value="&{template:Interlock}{{InterName= @{dice_pool_name_4}}} {{Dice= [[@{dice_pool_4}]] }}{{character= @{character_name}}} {{Roll= [[ [[@{dice_pool_4}]]d10@{dice_pool_again_4}sd>8]] success(es)}}"></button></td>
+                            <td style="width:220px;" colspan="2"><input type="text" name="attr_dice_pool_name_4" placeholder="Name"/></td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_4" value="@{dice_pool_attribute_4} + @{dice_pool_skill_4} + @{dice_pool_mod_4}" disabled="true"/></td>
                         </tr>
                         <tr>
-                            <td><button type="roll" class="sheet-btn" name="attr_Skillbtn_4" value="&{template:Interlock}{{InterName= @{dice_pool_name_4}}} {{Dice= @{dice_pool_4}}}{{character= @{character_name}}} {{Roll= [[{@{dice_pool_4}d10sd!}>8]] success(es)}}"></button></td>
-                            <td><input type="text" name="attr_dice_pool_name_4" placeholder="Name"/></td>
-                            <td><input type="number" name="attr_dice_pool_4"/></td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_again_4" style="width:70px;">
+                                    <option value="">None</option>
+                                    <option value="!>10" selected>10-again</option>
+                                    <option value="!>7">9-again</option>
+                                    <option value="!>8">8-again</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select class="sheet-skill_select" name="attr_dice_pool_attribute_4" style="width:95px;">
+                                    <option value="0" selected>Attribute</option>
+                                    <option value="@{com}">Composure</option>
+                                    <option value="@{dex}">Dexterity</option>
+                                    <option value="@{int}">Intelligence</option>
+                                    <option value="@{man}">Manipulation</option>
+                                    <option value="@{pre}">Presence</option>
+                                    <option value="@{res}">Resolve</option>
+                                    <option value="@{sta}">Stamina</option>
+                                    <option value="@{str}">Strength</option>
+                                    <option value="@{wits}">Wits</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_skill_4" style="width:100px;">
+                                    <option value="0" selected>Skill</option>
+                                    <option value="@{academics}">Academics</option>
+                                    <option value="@{animalken}">Animal Ken</option>
+                                    <option value="@{athletics}">Athletics</option>
+                                    <option value="@{computer}">Computer</option>
+                                    <option value="@{crafts}">Crafts</option>
+                                    <option value="@{brawl}">Brawl</option>
+                                    <option value="@{drive}">Drive</option>
+                                    <option value="@{empathy}">Empathy</option>
+                                    <option value="@{expression}">Expression</option>
+                                    <option value="@{firearms}">Firearms</option>
+                                    <option value="@{intimidation}">Intimidation</option>
+                                    <option value="@{investigation}">Investigation</option>
+                                    <option value="@{larceny}">Larceny</option>
+                                    <option value="@{medicine}">Medicine</option>
+                                    <option value="@{occult}">Occult</option>
+                                    <option value="@{persuasion}">Persuasion</option>
+                                    <option value="@{politics}">Politics</option>
+                                    <option value="@{science}">Science</option>
+                                    <option value="@{socialize}">Socialize</option>
+                                    <option value="@{stealth}">Stealth</option>
+                                    <option value="@{streetwise}">Streetwise</option>
+                                    <option value="@{subterfuge}">Subterfuge</option>
+                                    <option value="@{survival}">Survival</option>
+                                    <option value="@{weaponry}">Weaponry</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_mod_4" value="0"/></td>
+                        </tr>
+                    </table>
+                    <table class="sheet-weapon">
+                        <tr>
+                            <td style="width:50px;"><button type="roll" class="sheet-btn" name="attr_Skillbtn_5" value="&{template:Interlock}{{InterName= @{dice_pool_name_5}}} {{Dice= [[@{dice_pool_5}]] }}{{character= @{character_name}}} {{Roll= [[ [[@{dice_pool_5}]]d10@{dice_pool_again_5}sd>8]] success(es)}}"></button></td>
+                            <td style="width:220px;" colspan="2"><input type="text" name="attr_dice_pool_name_5" placeholder="Name"/></td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_5" value="@{dice_pool_attribute_5} + @{dice_pool_skill_5} + @{dice_pool_mod_5}" disabled="true"/></td>
                         </tr>
                         <tr>
-                            <td><button type="roll" class="sheet-btn" name="attr_Skillbtn_5" value="&{template:Interlock}{{InterName= @{dice_pool_name_5}}} {{Dice= @{dice_pool_5}}}{{character= @{character_name}}} {{Roll= [[{@{dice_pool_5}d10sd!}>8]] success(es)}}"></button></td>
-                            <td><input type="text" name="attr_dice_pool_name_5" placeholder="Name"/></td>
-                            <td><input type="number" name="attr_dice_pool_5"/></td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_again_5" style="width:70px;">
+                                    <option value="">None</option>
+                                    <option value="!>10" selected>10-again</option>
+                                    <option value="!>7">9-again</option>
+                                    <option value="!>8">8-again</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select class="sheet-skill_select" name="attr_dice_pool_attribute_5" style="width:95px;">
+                                    <option value="0" selected>Attribute</option>
+                                    <option value="@{com}">Composure</option>
+                                    <option value="@{dex}">Dexterity</option>
+                                    <option value="@{int}">Intelligence</option>
+                                    <option value="@{man}">Manipulation</option>
+                                    <option value="@{pre}">Presence</option>
+                                    <option value="@{res}">Resolve</option>
+                                    <option value="@{sta}">Stamina</option>
+                                    <option value="@{str}">Strength</option>
+                                    <option value="@{wits}">Wits</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_skill_5" style="width:100px;">
+                                    <option value="0" selected>Skill</option>
+                                    <option value="@{academics}">Academics</option>
+                                    <option value="@{animalken}">Animal Ken</option>
+                                    <option value="@{athletics}">Athletics</option>
+                                    <option value="@{computer}">Computer</option>
+                                    <option value="@{crafts}">Crafts</option>
+                                    <option value="@{brawl}">Brawl</option>
+                                    <option value="@{drive}">Drive</option>
+                                    <option value="@{empathy}">Empathy</option>
+                                    <option value="@{expression}">Expression</option>
+                                    <option value="@{firearms}">Firearms</option>
+                                    <option value="@{intimidation}">Intimidation</option>
+                                    <option value="@{investigation}">Investigation</option>
+                                    <option value="@{larceny}">Larceny</option>
+                                    <option value="@{medicine}">Medicine</option>
+                                    <option value="@{occult}">Occult</option>
+                                    <option value="@{persuasion}">Persuasion</option>
+                                    <option value="@{politics}">Politics</option>
+                                    <option value="@{science}">Science</option>
+                                    <option value="@{socialize}">Socialize</option>
+                                    <option value="@{stealth}">Stealth</option>
+                                    <option value="@{streetwise}">Streetwise</option>
+                                    <option value="@{subterfuge}">Subterfuge</option>
+                                    <option value="@{survival}">Survival</option>
+                                    <option value="@{weaponry}">Weaponry</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_mod_5" value="0"/></td>
+                        </tr>
+                    </table>
+                    <table class="sheet-weapon">
+                        <tr>
+                            <td style="width:50px;"><button type="roll" class="sheet-btn" name="attr_Skillbtn_6" value="&{template:Interlock}{{InterName= @{dice_pool_name_6}}} {{Dice= [[@{dice_pool_6}]] }}{{character= @{character_name}}} {{Roll= [[ [[@{dice_pool_6}]]d10@{dice_pool_again_6}sd>8]] success(es)}}"></button></td>
+                            <td style="width:220px;" colspan="2"><input type="text" name="attr_dice_pool_name_6" placeholder="Name"/></td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_6" value="@{dice_pool_attribute_6} + @{dice_pool_skill_6} + @{dice_pool_mod_6}" disabled="true"/></td>
+                        </tr>
+                        <tr>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_again_6" style="width:70px;">
+                                    <option value="">None</option>
+                                    <option value="!>10" selected>10-again</option>
+                                    <option value="!>7">9-again</option>
+                                    <option value="!>8">8-again</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select class="sheet-skill_select" name="attr_dice_pool_attribute_6" style="width:95px;">
+                                    <option value="0" selected>Attribute</option>
+                                    <option value="@{com}">Composure</option>
+                                    <option value="@{dex}">Dexterity</option>
+                                    <option value="@{int}">Intelligence</option>
+                                    <option value="@{man}">Manipulation</option>
+                                    <option value="@{pre}">Presence</option>
+                                    <option value="@{res}">Resolve</option>
+                                    <option value="@{sta}">Stamina</option>
+                                    <option value="@{str}">Strength</option>
+                                    <option value="@{wits}">Wits</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td><select class="sheet-skill_select" name="attr_dice_pool_skill_6" style="width:100px;">
+                                    <option value="0" selected>Skill</option>
+                                    <option value="@{academics}">Academics</option>
+                                    <option value="@{animalken}">Animal Ken</option>
+                                    <option value="@{athletics}">Athletics</option>
+                                    <option value="@{computer}">Computer</option>
+                                    <option value="@{crafts}">Crafts</option>
+                                    <option value="@{brawl}">Brawl</option>
+                                    <option value="@{drive}">Drive</option>
+                                    <option value="@{empathy}">Empathy</option>
+                                    <option value="@{expression}">Expression</option>
+                                    <option value="@{firearms}">Firearms</option>
+                                    <option value="@{intimidation}">Intimidation</option>
+                                    <option value="@{investigation}">Investigation</option>
+                                    <option value="@{larceny}">Larceny</option>
+                                    <option value="@{medicine}">Medicine</option>
+                                    <option value="@{occult}">Occult</option>
+                                    <option value="@{persuasion}">Persuasion</option>
+                                    <option value="@{politics}">Politics</option>
+                                    <option value="@{science}">Science</option>
+                                    <option value="@{socialize}">Socialize</option>
+                                    <option value="@{stealth}">Stealth</option>
+                                    <option value="@{streetwise}">Streetwise</option>
+                                    <option value="@{subterfuge}">Subterfuge</option>
+                                    <option value="@{survival}">Survival</option>
+                                    <option value="@{weaponry}">Weaponry</option>
+                                    <option value="1">1</option>
+                                    <option value="2">2</option>
+                                    <option value="3">3</option>
+                                    <option value="4">4</option>
+                                    <option value="5">5</option>
+                                    <option value="6">6</option>
+                                    <option value="7">7</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                </select>
+                            </td>
+                            <td style="width:40px;"><input type="number" name="attr_dice_pool_mod_6" value="0"/></td>
                         </tr>
                     </table>
                     <fieldset class="repeating_dicepools"> 
-                        <table>
+                        <table class="sheet-weapon">
                             <tr>
-                            <td><button type="roll" class="sheet-btn" name="attr_Skillbtn" value="&{template:Interlock}{{InterName= @{dice_pool_name}}} {{Dice= @{dice_pool}}}{{character= @{character_name}}} {{Roll= [[{@{dice_pool}d10sd!}>8]] success(es)}}"></button></td>
-                                <td><input type="text" name="attr_dice_pool_name" placeholder="Name"/></td>
-                                <td><input type="number" name="attr_dice_pool"/></td>
+                                <td style="width:50px;"><button type="roll" class="sheet-btn" name="attr_Skillbtn" value="&{template:Interlock}{{InterName= @{dice_pool_name}}} {{Dice= [[@{dice_pool}]] }}{{character= @{character_name}}} {{Roll= [[ [[@{dice_pool}]]d10@{dice_pool_again}sd>8]] success(es)}}"></button></td>
+                                <td style="width:220px;" colspan="2"><input type="text" name="attr_dice_pool_name" placeholder="Name"/></td>
+                                <td style="width:40px;"><input type="number" name="attr_dice_pool" value="@{dice_pool_attribute} + @{dice_pool_skill} + @{dice_pool_mod}" disabled="true"/></td>
+                            </tr>
+                            <tr>
+                                <td><select class="sheet-skill_select" name="attr_dice_pool_again" style="width:70px;">
+                                        <option value="">None</option>
+                                        <option value="!>10" selected>10-again</option>
+                                        <option value="!>7">9-again</option>
+                                        <option value="!>8">8-again</option>
+                                    </select>
+                                </td>
+                                <td>
+                                    <select class="sheet-skill_select" name="attr_dice_pool_attribute" style="width:95px;">
+                                        <option value="0" selected>Attribute</option>
+                                        <option value="@{com}">Composure</option>
+                                        <option value="@{dex}">Dexterity</option>
+                                        <option value="@{int}">Intelligence</option>
+                                        <option value="@{man}">Manipulation</option>
+                                        <option value="@{pre}">Presence</option>
+                                        <option value="@{res}">Resolve</option>
+                                        <option value="@{sta}">Stamina</option>
+                                        <option value="@{str}">Strength</option>
+                                        <option value="@{wits}">Wits</option>
+                                        <option value="1">1</option>
+                                        <option value="2">2</option>
+                                        <option value="3">3</option>
+                                        <option value="4">4</option>
+                                        <option value="5">5</option>
+                                        <option value="6">6</option>
+                                        <option value="7">7</option>
+                                        <option value="8">8</option>
+                                        <option value="9">9</option>
+                                        <option value="10">10</option>
+                                    </select>
+                                </td>
+                                <td><select class="sheet-skill_select" name="attr_dice_pool_skill" style="width:100px;">
+                                        <option value="0" selected>Skill</option>
+                                        <option value="@{academics}">Academics</option>
+                                        <option value="@{animalken}">Animal Ken</option>
+                                        <option value="@{athletics}">Athletics</option>
+                                        <option value="@{computer}">Computer</option>
+                                        <option value="@{crafts}">Crafts</option>
+                                        <option value="@{brawl}">Brawl</option>
+                                        <option value="@{drive}">Drive</option>
+                                        <option value="@{empathy}">Empathy</option>
+                                        <option value="@{expression}">Expression</option>
+                                        <option value="@{firearms}">Firearms</option>
+                                        <option value="@{intimidation}">Intimidation</option>
+                                        <option value="@{investigation}">Investigation</option>
+                                        <option value="@{larceny}">Larceny</option>
+                                        <option value="@{medicine}">Medicine</option>
+                                        <option value="@{occult}">Occult</option>
+                                        <option value="@{persuasion}">Persuasion</option>
+                                        <option value="@{politics}">Politics</option>
+                                        <option value="@{science}">Science</option>
+                                        <option value="@{socialize}">Socialize</option>
+                                        <option value="@{stealth}">Stealth</option>
+                                        <option value="@{streetwise}">Streetwise</option>
+                                        <option value="@{subterfuge}">Subterfuge</option>
+                                        <option value="@{survival}">Survival</option>
+                                        <option value="@{weaponry}">Weaponry</option>
+                                        <option value="1">1</option>
+                                        <option value="2">2</option>
+                                        <option value="3">3</option>
+                                        <option value="4">4</option>
+                                        <option value="5">5</option>
+                                        <option value="6">6</option>
+                                        <option value="7">7</option>
+                                        <option value="8">8</option>
+                                        <option value="9">9</option>
+                                        <option value="10">10</option>
+                                    </select>
+                                </td>
+                                <td style="width:40px;"><input type="number" name="attr_dice_pool_mod" value="0"/></td>
                             </tr>
                         </table>
                     </fieldset>
                 </div>
                 <div class='sheet-col'>
-                <h2 class="sheet-center">Traits</h2>
+                    <h2 class="sheet-center">Traits</h2>
                     <!--Special traits -->
                     <h5 class="sheet-center">Health</h5>
                     <br>
@@ -954,13 +1478,15 @@
                     </table>
                     <div class="sheet-center" ><h5>Primum</h5>
                         <div>
-                            <table class="sheet-grid">
+                            <table class="sheet-grid" style="width:100%">
                                 <tr>
-                                    <td><b>Max Aether</b></td>
-                                    <td><b>Aether per Turn</b></td>
+                                    <td>Max Aether</td>
+                                    <td><div style="width:5px;"></div></td>
+                                    <td>Aether per Turn</td>
                                 </tr>
                                 <tr>
                                     <td><input type="number" class="" name="attr_max_aether" value="0"/></td>
+                                    <td><div style="width:5px;"></div></td>
                                     <td><input type="number" class="" name="attr_max_aether_per_turn" value="0"/></td>
                                 </tr>
                             </table>
@@ -1097,16 +1623,16 @@
                                         <td><input type="checkbox" name="attr_Aether_box-100" value="1" class="sheet-bigcheck"/><span></span></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="checkbox" name="attr_Aether_box-1" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-2" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-3" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-4" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-5" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-6" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-7" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-8" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-9" value="1" class="sheet-bigcheck"/><span></span></td>
-                                        <td><input type="checkbox" name="attr_Aether_box-10" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-101" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-102" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-103" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-104" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-105" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-106" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-107" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-108" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-109" value="1" class="sheet-bigcheck"/><span></span></td>
+                                        <td><input type="checkbox" name="attr_Aether_box-110" value="1" class="sheet-bigcheck"/><span></span></td>
                                     </tr>
                                 </table>
                             </div>
@@ -1159,8 +1685,6 @@
                         </table>
                     </div>
                     <br>
-                    <h5 class="sheet-center">Harmony</h5>
-                    <br>
                     <table class="sheet-grid">
                         <tr>
                             <td><h5 class="right">Size</h5></td>
@@ -1179,7 +1703,7 @@
                             <td><input type="text" name="attr_armor" style="width:100px" /></td>
                         </tr>
                         <tr>          
-                            <td><h5 class="right">Initiative Mods</h5></td>
+                            <td><h5 class="right">Initiative<br>Mods</h5></td>
                             <td><input type="text" name="attr_initiative_mods" style="width:100px" /></td>
                         </tr>
                         <tr>
@@ -1193,7 +1717,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td><h5 class="right">Cover Beats</h5></td>
+                            <td><h5 class="right">Cover<br>Beats</h5></td>
                             <td>&nbsp;
                                 <input type="checkbox" name="attr_Coverbeat_box-1" value="1" class="sheet-bigcheck"/><span></span>
                                 <input type="checkbox" name="attr_Coverbeat_box-2" value="1" class="sheet-bigcheck"/><span></span>
@@ -1207,7 +1731,7 @@
                             <td><input type="text" name="attr_experince" style="width:100px" /></td>
                         </tr>
                         <tr>
-                            <td><h5 class="right">Cover Experience</h5></td>
+                            <td><h5 class="right">Cover<br>Experience</h5></td>
                             <td><input type="text" name="attr_cover_experince" style="width:100px" /></td>
                         </tr>
                     </table>
@@ -1220,8 +1744,6 @@
 <div class="sheet-tab-content sheet-tab2">
     <div class="sheet-tabbed-panel">
         <div class="sheet-row-panel">
-            <div class="center"><h2>Other Traits</h2></div>
-            <!--Interlock & Embeds -->
             <table style="width:100%;">
                 <tr>
                     <td></td>
@@ -1255,140 +1777,663 @@
                     <td></td>
                 </tr>
             </table>
-            <div class='sheet-3colrow'>
-                <!-- -->
-                <div class='sheet-col'>
-                    <h5 class="sheet-center">Demonic Form</h5>
-                    <textarea name="attr_DemonicForm" class="sheet-cipher" rows="3" wrap="soft" placeholder="Demonic Form"></textarea>
+            <!--Demonic Form-->
+            <div class="sheet-tabbed-panel">
+                <div class="sheet-row-panel">
+                    <input type="checkbox" name="attr_DemonicForm-toggle" class="sheet-arrow" /><span></span>
+                    <div class="sheet-center"><h2>Demonic Form</h2></div>
+                    <div class="body">
+                        <textarea name="attr_DemonicForm" class="sheet-longtextarea" wrap="soft" placeholder="Demonic Form" style="width:98%"></textarea>
+                    </div>
+                </div>   
+            </div>
+            <!--Interlock & Embeds -->
+            <div class="sheet-tabbed-panel">
+                <div class="sheet-row-panel">
+                    <input type="checkbox" name="attr_Interlock-toggle" class="sheet-arrow" /><span></span>
+                    <div class="center"><h2>Interlocks</h2></div>
+                    <div class="body">
+                        <table class="sheet-grid">
+                            <tr>
+                                <td><button type="roll" class="sheet-btn" name="attr_InterlockButton-1" value="&{template:Interlock}{{InterName= @{interlock-name-1}}}{{Dice= @{interlock-dicepools-1}}}{{Cost= @{interlock-cost-1}}}{{Description= @{interlock-Description-1}}}{{character= @{character_name}}} {{Roll= [[{@{interlock-dicepools-1}d10sd!}>8]] success(es)}}"></button></td>
+                                <td><input type="text" class="sheet-interlock" name="attr_interlock-name-1" placeholder="Name"/></td>
+                                <td><input type="number" class="sheet-interlock" name="attr_interlock-dicepools-1" value="0"/></td>
+                                <td><input type="text" class="sheet-interlock" name="attr_interlock-cost-1" placeholder="Cost"/></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4">
+                                    <textarea name="attr_interlock-Description-1" class="sheet-textarea" rows="3" wrap="soft" stule="width:90%" placeholder="Description"></textarea>
+                                </td>
+                            </tr>    
+                            <tr>
+                                <td><button type="roll" class="sheet-btn" name="attr_InterlockButton-" value="&{template:Interlock}{{InterName= @{interlock-name-2}}}{{Dice= @{interlock-dicepools-2}}}{{Cost= @{interlock-cost-2}}}{{Description= @{interlock-Description-2}}}{{character= @{character_name}}} {{Roll= [[{@{interlock-dicepools-2}d10sd!}>8]] success(es)}}"></button></td>
+                                <td><input type="text" class="sheet-interlock" name="attr_interlock-name-2" placeholder="Name"/></td>
+                                <td><input type="number" class="sheet-interlock" name="attr_interlock-dicepools-2" value="0"/></td>
+                                <td><input type="text" class="sheet-interlock" name="attr_interlock-cost-2" placeholder="Cost"/></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4">
+                                    <textarea name="attr_interlock-Description-2" class="sheet-textarea" rows="3" wrap="soft" stule="width:90%" placeholder="Description"></textarea>
+                                </td>
+                            </tr>	
+                            <tr>
+                                <td><button type="roll" class="sheet-btn" name="attr_InterlockButton-3" value="&{template:Interlock}{{InterName= @{interlock-name-3}}}{{Dice= @{interlock-dicepools-3}}}{{Cost= @{interlock-cost-3}}}{{Description= @{interlock-Description-3}}}{{character= @{character_name}}} {{Roll= [[{@{interlock-dicepools-3}d10sd!}>8]] success(es)}}"></button></td>
+                                <td><input type="text" class="sheet-interlock" name="attr_interlock-name-3" placeholder="Name"/></td>
+                                <td><input type="number" class="sheet-interlock" name="attr_interlock-dicepools-3" value="0"/></td>
+                                <td><input type="text" class="sheet-interlock" name="attr_interlock-cost-3" placeholder="Cost"/></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4">
+                                    <textarea name="attr_interlock-Description-3" class="sheet-textarea" rows="3" wrap="soft" stule="width:90%" placeholder="Description"></textarea>
+                                </td>
+                            </tr>
+                        </table>
+                        <fieldset class="repeating_interlock">
+                            <table class="sheet-grid">
+                                <tr>
+                                    <td><button type="roll" class="sheet-btn" name="attr_InterlockButton" value="&{template:Interlock}{{InterName= @{interlock-name}}}{{Dice= @{interlock-dicepools}}}{{Cost= @{interlock-cost}}}{{Description= @{interlock-Description}}}{{character= @{character_name}}} {{Roll= [[{@{interlock-dicepools}d10sd!}>8]] success(es)}}"></button></td>
+                                    <td><input type="text" class="sheet-interlock" name="attr_interlock-name" placeholder="Name"/></td>
+                                    <td><input type="number" class="sheet-interlock" name="attr_interlock-dicepools" value="0"/></td>
+                                    <td><input type="text" class="sheet-interlock" name="attr_interlock-cost" placeholder="Cost"/></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4">
+                                        <textarea name="attr_interlock-Description" class="sheet-textarea"wrap="soft" stule="width:90%" placeholder="Description"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                        </fieldset>
+                    </div>
                 </div>
-                <!-- -->
-                <div class='sheet-col'>
-                    <h5 class="sheet-center">Embeds</h5>
-                    <textarea name="attr_Embeds" class="sheet-cipher" rows="3" wrap="soft" placeholder="Embeds"></textarea>
+            </div>
+            <div class="sheet-tabbed-panel">
+                <div class="sheet-row-panel">
+                    <input type="checkbox" name="attr_Embeds-toggle" class="sheet-arrow" /><span></span>
+                    <div class="center"><h2>Embeds</h2></div>
+                    <div class="body">
+                        <fieldset class="repeating_Embed">
+                            <table class="sheet-grid">
+                                <tr>
+                                    <td><button type="roll" class="sheet-btn" name="attr_EmbedButton" value="&{template:Interlock}{{InterName= @{Embed-name}}}{{Dice= @{Embed-dicepools}}}{{Cost= @{Embed-cost}}}{{Description= @{Embed-Description}}}{{character= @{character_name}}} {{Roll= [[{@{Embed-dicepools}d10sd!}>8]] success(es)}}"></button></td>
+                                    <td><input type="text" class="sheet-interlock" name="attr_Embed-name" placeholder="Name"/></td>
+                                    <td><input type="number" class="sheet-interlock" name="attr_Embed-dicepools" value="0"/></td>
+                                    <td><input type="text" class="sheet-interlock" name="attr_Embed-cost" placeholder="Cost"/></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4">
+                                        <textarea name="attr_Embed-Description" class="sheet-textarea"wrap="soft" stule="width:90%" placeholder="Description"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                        </fieldset>
+                    </div>
                 </div>
-                <!-- -->
-                <div class='sheet-col'>
-                    <h5 class="sheet-center">Exploits</h5>
-                    <textarea name="attr_Exploits" class="sheet-cipher" rows="3" wrap="soft" placeholder="Exploits"></textarea>
+            </div>
+            <div class="sheet-tabbed-panel">
+                <div class="sheet-row-panel">
+                    <input type="checkbox" name="attr_Exploits-toggle" class="sheet-arrow" /><span></span>
+                    <div class="center"><h2>Exploits</h2></div>
+                    <div class="body">
+                        <fieldset class="repeating_Exploit">
+                            <table class="sheet-grid">
+                                <tr>
+                                    <td><button type="roll" class="sheet-btn" name="attr_ExploitButton" value="&{template:Interlock}{{InterName= @{Exploit-name}}}{{Dice= @{Exploit-dicepools}}}{{Cost= @{Exploit-cost}}}{{Description= @{Exploit-Description}}}{{character= @{character_name}}} {{Roll= [[{@{Exploit-dicepools}d10sd!}>8]] success(es)}}"></button></td>
+                                    <td><input type="text" class="sheet-interlock" name="attr_Exploit-name" placeholder="Name"/></td>
+                                    <td><input type="number" class="sheet-interlock" name="attr_Exploit-dicepools" value="0"/></td>
+                                    <td><input type="text" class="sheet-interlock" name="attr_Exploit-cost" placeholder="Cost"/></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4">
+                                        <textarea name="attr_Exploit-Description" class="sheet-textarea"wrap="soft" stule="width:90%" placeholder="Description"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                        </fieldset>
+                    </div>
                 </div>
             </div>
-            <br>
-            <div class="center"><h2>Interlocks</h2></div>
-            <table class="sheet-grid">
-                <tr>
-                    <td><button type="roll" class="sheet-btn" name="attr_InterlockButton-1" value="&{template:Interlock}{{InterName= @{interlock-name-1}}}{{Dice= @{interlock-dicepools-1}}}{{Cost= @{interlock-cost-1}}}{{Description= @{interlock-Description-1}}}{{character= @{character_name}}} {{Roll= [[{@{interlock-dicepools-1}d10sd!}>8]] success(es)}}"></button></td>
-                    <td><input type="text" class="sheet-interlock" name="attr_interlock-name-1" placeholder="Name"/></td>
-                    <td><input type="number" class="sheet-interlock" name="attr_interlock-dicepools-1" value="0"/></td>
-                    <td><input type="text" class="sheet-interlock" name="attr_interlock-cost-1" placeholder="Cost"/></td>
-                </tr>
-                <tr>
-                    <td colspan="4">
-                        <textarea name="attr_interlock-Description-1" class="sheet-textarea" rows="3" wrap="soft" stule="width:90%" placeholder="Description"></textarea>
-                    </td>
-                </tr>    
-                <tr>
-                    <td><button type="roll" class="sheet-btn" name="attr_InterlockButton-" value="&{template:Interlock}{{InterName= @{interlock-name-2}}}{{Dice= @{interlock-dicepools-2}}}{{Cost= @{interlock-cost-2}}}{{Description= @{interlock-Description-2}}}{{character= @{character_name}}} {{Roll= [[{@{interlock-dicepools-2}d10sd!}>8]] success(es)}}"></button></td>
-                    <td><input type="text" class="sheet-interlock" name="attr_interlock-name-2" placeholder="Name"/></td>
-                    <td><input type="number" class="sheet-interlock" name="attr_interlock-dicepools-2" value="0"/></td>
-                    <td><input type="text" class="sheet-interlock" name="attr_interlock-cost-2" placeholder="Cost"/></td>
-                </tr>
-                <tr>
-                    <td colspan="4">
-                        <textarea name="attr_interlock-Description-2" class="sheet-textarea" rows="3" wrap="soft" stule="width:90%" placeholder="Description"></textarea>
-                    </td>
-				</tr>	
-                <tr>
-                    <td><button type="roll" class="sheet-btn" name="attr_InterlockButton-3" value="&{template:Interlock}{{InterName= @{interlock-name-3}}}{{Dice= @{interlock-dicepools-3}}}{{Cost= @{interlock-cost-3}}}{{Description= @{interlock-Description-3}}}{{character= @{character_name}}} {{Roll= [[{@{interlock-dicepools-3}d10sd!}>8]] success(es)}}"></button></td>
-                    <td><input type="text" class="sheet-interlock" name="attr_interlock-name-3" placeholder="Name"/></td>
-                    <td><input type="number" class="sheet-interlock" name="attr_interlock-dicepools-3" value="0"/></td>
-                    <td><input type="text" class="sheet-interlock" name="attr_interlock-cost-3" placeholder="Cost"/></td>
-                </tr>
-                <tr>
-                    <td colspan="4">
-                        <textarea name="attr_interlock-Description-3" class="sheet-textarea" rows="3" wrap="soft" stule="width:90%" placeholder="Description"></textarea>
-                    </td>
-				</tr>
-            </table>
-            <div class="center"><h2>Combat</h2></div>
-            <table style="width:820px" class="sheet-weapon">
-                <tr class="sheet-weapon">
-                    <th class="sheet-weapon" colspan="3">Weapon/Attack</th>
-                    <th class="sheet-weapon">Damage</th>
-                    <th class="sheet-weapon">Range</th>
-                    <th class="sheet-weapon">Clip</th>
-                    <th class="sheet-weapon">Initiative</th>
-                    <th class="sheet-weapon">Strength</th>
-                    <th class="sheet-weapon">Size</th>
-                    <th class="sheet-armor" colspan="2">Armor</th>
-                </tr>
-                <tr class="sheet-weapon">
-                    <td colspan="3" class="sheet-weapon"><input type="text" name="attr_weapon_name_1" style="width:100%" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_damage_1" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_range_1" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_1" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_1" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_1" /></td>
-                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_1" style="width:50px"/></td>
-                    <td class="sheet-armor"><h5 class="sheet-right">Rating</h5></td>
-                    <td class="sheet-armor"><input type="text" name="attr_armor_rating" style="width:50px"/></td>
-                </tr>
-                <tr class="sheet-weapon">
-                    <td colspan="3" class="sheet-weapon"><input type="text" name="attr_weapon_name_2" style="width:100%" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_damage_2" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_range_2" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_2" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_2" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_2" /></td>
-                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_2" style="width:50px"/></td>
-                    <td class="sheet-armor"><h5 class="sheet-right">Strength</h5></td>
-                    <td class="sheet-armor"><input type="text" name="attr_armor_strength" style="width:50px"/></td>
-                </tr>
-                <tr class="sheet-weapon">
-                    <td colspan="3" class="sheet-weapon"><input type="text" name="attr_weapon_name_3" style="width:100%" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_damage_3" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_range_3" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_3" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_3" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_3" /></td>
-                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_3" style="width:50px"/></td>
-                    <td class="sheet-armor"><h5 class="sheet-right">Defense</h5></td>
-                    <td class="sheet-armor"><input type="text" name="attr_armor_defense" style="width:50px"/></td>
-                </tr>
-                <tr class="sheet-weapon">
-                    <td colspan="3" class="sheet-weapon"><input type="text" name="attr_weapon_name_4" style="width:100%" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_damage_4" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_range_4" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_4" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_4" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_4" /></td>
-                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_4" style="width:50px"/></td>
-                    <td class="sheet-armor"><h5 class="sheet-right">Speed</h5></td>
-                    <td class="sheet-armor"><input type="text" name="attr_speed_defense" style="width:50px"/></td>                </tr>
-                <tr class="sheet-weapon">
-                    <td colspan="3" class="sheet-weapon"><input type="text" name="attr_weapon_name_5" style="width:100%" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_damage_5" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_range_5" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_5" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_5" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_5" /></td>
-                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_5" style="width:50px"/></td>
-                    <td colspan="2" rowspan="2"><textarea name="attr_armor_text" rows="3" wrap="soft" style="width:95%" placeholder="Armor Description"></textarea></td>
-                </tr>
-                <tr class="sheet-weapon">
-                    <td colspan="3" class="sheet-weapon"><input type="text" name="attr_weapon_name6_" style="width:100%" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_damage_6" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_range_6" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_6" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_6" /></td>
-                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_6" /></td>
-                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_6" style="width:50px"/></td>
-                </tr>
-            </table>
         </div>
     </div>
 </div>
 
 <div class="sheet-tab-content sheet-tab3">
+    <div class="sheet-tabbed-panel">
+        <div class="sheet-row-panel">
+            <div class="center"><h2>Combat</h2></div>
+            <!--Armor -->
+            <table style="width:820px" >
+                <tr>
+                    <th class="sheet-armor" colspan="4">Armor</th>
+                </tr>
+                <tr>
+                    <th class="sheet-armor">Rating</th>
+                    <th class="sheet-armor">Strength</th>
+                    <th class="sheet-armor">Defense</th>     
+                    <th class="sheet-armor">Speed</th>
+                </tr>
+                <tr>
+                    <th class="sheet-armor"><input type="text" name="attr_armor_rating" style="width:50px"/></th>
+                    <th class="sheet-armor"><input type="text" name="attr_armor_strength" style="width:50px"/></th>
+                    <th class="sheet-armor"><input type="text" name="attr_armor_defense" style="width:50px"/></th>   
+                    <th class="sheet-armor"><input type="text" name="attr_speed_defense" style="width:50px"/></th>
+                </tr>
+                <tr>
+                    <td colspan="4"><textarea name="attr_armor_text" class="sheet-textarea" wrap="soft" style="width:95%" placeholder="Armor Description"></textarea></td>
+                </tr>
+            </table>
+            <!--weapons -->
+            <table style="width:820px" class="sheet-weapon">
+                <tr class="sheet-weapon">
+                    <th class="sheet-weapon">Roll</th>
+                    <th class="sheet-weapon">Weapon/Attack</th>
+                    <th class="sheet-weapon">Attribute</th>
+                    <th class="sheet-weapon">Skill</th>
+                    <th class="sheet-weapon">Weapon<br>Modifier</th>
+                    <th class="sheet-weapon">Again</th>
+                    <th class="sheet-weapon">Range</th>
+                    <th class="sheet-weapon">Clip</th>
+                    <th class="sheet-weapon">Initiative</th>
+                    <th class="sheet-weapon">Strength</th>
+                    <th class="sheet-weapon">Size</th>
+                </tr>
+                <tr class="sheet-weapon">
+                    <td><button type="roll" class="sheet-btn" name="attr_weaponButton-1" value="&{template:Interlock} {{InterName= @{weapon_name_1} }} {{Dice= [[@{weapon_attribute_1} + @{weapon_skill_1}]] }} {{character= @{character_name}}} {{Roll= [[ [[@{weapon_attribute_1} + @{weapon_skill_1} + @{weapon_modifier_1}]]d10@{weapon_again_1}>8]] success(es)}}"></button></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_name_1" style="width:100%" /></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_attribute_1" style="width:95px;">
+                            <option value="0"></option>
+                            <option value="@{com}">Composure</option>
+                            <option value="@{dex}" selected>Dexterity</option>
+                            <option value="@{int}">Intelligence</option>
+                            <option value="@{man}">Manipulation</option>
+                            <option value="@{pre}">Presence</option>
+                            <option value="@{res}">Resolve</option>
+                            <option value="@{sta}">Stamina</option>
+                            <option value="@{str}">Strength</option>
+                            <option value="@{wits}">Wits</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_skill_1" style="width:100px;">
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{brawl}" selected>Brawl</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="0"></option>
+                            <option value="@{academics}">Academics</option>
+                            <option value="@{animalken}">Animal Ken</option>
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{computer}">Computer</option>
+                            <option value="@{crafts}">Crafts</option>
+                            <option value="@{brawl}">Brawl</option>
+                            <option value="@{drive}">Drive</option>
+                            <option value="@{empathy}">Empathy</option>
+                            <option value="@{expression}">Expression</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{intimidation}">Intimidation</option>
+                            <option value="@{investigation}">Investigation</option>
+                            <option value="@{larceny}">Larceny</option>
+                            <option value="@{medicine}">Medicine</option>
+                            <option value="@{occult}">Occult</option>
+                            <option value="@{persuasion}">Persuasion</option>
+                            <option value="@{politics}">Politics</option>
+                            <option value="@{science}">Science</option>
+                            <option value="@{socialize}">Socialize</option>
+                            <option value="@{stealth}">Stealth</option>
+                            <option value="@{streetwise}">Streetwise</option>
+                            <option value="@{subterfuge}">Subterfuge</option>
+                            <option value="@{survival}">Survival</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_modifier_1" value="0"/></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_again_1" style="width:50px;">
+                            <option value="">None</option>
+                            <option value="!>10" selected>10</option>
+                            <option value="!>7">9</option>
+                            <option value="!>8">8</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_range_1"  style="width:60px"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_1" value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_1" value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_1" value="0"/></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_1" style="width:50px"/></td>
+                </tr>
+                <tr class="sheet-weapon">
+                    <td class="sheet-weapon"><button type="roll" class="sheet-btn" name="attr_weaponButton_2" value="&{template:Interlock} {{InterName= @{weapon_name_2} }} {{Dice= [[@{weapon_attribute_2} + @{weapon_skill_2}]] }} {{character= @{character_name}}} {{Roll= [[ [[@{weapon_attribute_2} + @{weapon_skill_2} + @{weapon_modifier_1}]]d10@{weapon_again_2}>8]] success(es)}}"></button></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_name_2" style="width:100%" /></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_attribute_2" style="width:95px;">
+                            <option value="0"></option>
+                            <option value="@{com}">Composure</option>
+                            <option value="@{dex}" selected>Dexterity</option>
+                            <option value="@{int}">Intelligence</option>
+                            <option value="@{man}">Manipulation</option>
+                            <option value="@{pre}">Presence</option>
+                            <option value="@{res}">Resolve</option>
+                            <option value="@{sta}">Stamina</option>
+                            <option value="@{str}">Strength</option>
+                            <option value="@{wits}">Wits</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_skill_2" style="width:100px;">
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{brawl}" selected>Brawl</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="0"></option>
+                            <option value="@{academics}">Academics</option>
+                            <option value="@{animalken}">Animal Ken</option>
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{computer}">Computer</option>
+                            <option value="@{crafts}">Crafts</option>
+                            <option value="@{brawl}">Brawl</option>
+                            <option value="@{drive}">Drive</option>
+                            <option value="@{empathy}">Empathy</option>
+                            <option value="@{expression}">Expression</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{intimidation}">Intimidation</option>
+                            <option value="@{investigation}">Investigation</option>
+                            <option value="@{larceny}">Larceny</option>
+                            <option value="@{medicine}">Medicine</option>
+                            <option value="@{occult}">Occult</option>
+                            <option value="@{persuasion}">Persuasion</option>
+                            <option value="@{politics}">Politics</option>
+                            <option value="@{science}">Science</option>
+                            <option value="@{socialize}">Socialize</option>
+                            <option value="@{stealth}">Stealth</option>
+                            <option value="@{streetwise}">Streetwise</option>
+                            <option value="@{subterfuge}">Subterfuge</option>
+                            <option value="@{survival}">Survival</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_modifier_2"  value="0"/></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_again_3" style="width:50px;">
+                            <option value="">None</option>
+                            <option value="!>10" selected>10</option>
+                            <option value="!>7">9</option>
+                            <option value="!>8">8</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_range_2"  style="width:60px"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_2"  value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_2"  value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_2"  value="0"/></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_2" style="width:50px"/></td>
+                </tr>
+                <tr class="sheet-weapon">
+                    <td class="sheet-weapon"><button type="roll" class="sheet-btn" name="attr_weaponButton_3" value="&{template:Interlock} {{InterName= @{weapon_name_3} }} {{Dice= [[@{weapon_attribute_3} + @{weapon_skill_3}]] }} {{character= @{character_name}}} {{Roll= [[ [[@{weapon_attribute_3} + @{weapon_skill_3} +@{weapon_modifier_3}]]d10@{weapon_again_3}>8]] success(es)}}"></button></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_name_3" style="width:100%" /></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_attribute_3" style="width:95px;">
+                            <option value="0"></option>
+                            <option value="@{com}">Composure</option>
+                            <option value="@{dex}" selected>Dexterity</option>
+                            <option value="@{int}">Intelligence</option>
+                            <option value="@{man}">Manipulation</option>
+                            <option value="@{pre}">Presence</option>
+                            <option value="@{res}">Resolve</option>
+                            <option value="@{sta}">Stamina</option>
+                            <option value="@{str}">Strength</option>
+                            <option value="@{wits}">Wits</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_skill_3" style="width:100px;">
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{brawl}" selected>Brawl</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="0"></option>
+                            <option value="@{academics}">Academics</option>
+                            <option value="@{animalken}">Animal Ken</option>
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{computer}">Computer</option>
+                            <option value="@{crafts}">Crafts</option>
+                            <option value="@{brawl}">Brawl</option>
+                            <option value="@{drive}">Drive</option>
+                            <option value="@{empathy}">Empathy</option>
+                            <option value="@{expression}">Expression</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{intimidation}">Intimidation</option>
+                            <option value="@{investigation}">Investigation</option>
+                            <option value="@{larceny}">Larceny</option>
+                            <option value="@{medicine}">Medicine</option>
+                            <option value="@{occult}">Occult</option>
+                            <option value="@{persuasion}">Persuasion</option>
+                            <option value="@{politics}">Politics</option>
+                            <option value="@{science}">Science</option>
+                            <option value="@{socialize}">Socialize</option>
+                            <option value="@{stealth}">Stealth</option>
+                            <option value="@{streetwise}">Streetwise</option>
+                            <option value="@{subterfuge}">Subterfuge</option>
+                            <option value="@{survival}">Survival</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_modifier_3"  value="0"/></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_again_3" style="width:50px;">
+                            <option value="">None</option>
+                            <option value="!>10" selected>10</option>
+                            <option value="!>7">9</option>
+                            <option value="!>8">8</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_range_3"  style="width:60px"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_3"  value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_3"  value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_3"  value="0"/></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_3" style="width:50px"/></td>
+                </tr>
+                <tr class="sheet-weapon">
+                    <td class="sheet-weapon"><button type="roll" class="sheet-btn" name="attr_weaponButton_4" value="&{template:Interlock} {{InterName= @{weapon_name_4} }} {{Dice= [[@{weapon_attribute_4} + @{weapon_skill_4}]] }} {{character= @{character_name}}} {{Roll= [[ [[@{weapon_attribute_4} + @{weapon_skill_4} + @{weapon_modifier_4}]]d10@{weapon_again_4}>8]] success(es)}}"></button></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_name_4" style="width:100%" /></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_attribute_4" style="width:95px;">
+                            <option value="0"></option>
+                            <option value="@{com}">Composure</option>
+                            <option value="@{dex}" selected>Dexterity</option>
+                            <option value="@{int}">Intelligence</option>
+                            <option value="@{man}">Manipulation</option>
+                            <option value="@{pre}">Presence</option>
+                            <option value="@{res}">Resolve</option>
+                            <option value="@{sta}">Stamina</option>
+                            <option value="@{str}">Strength</option>
+                            <option value="@{wits}">Wits</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_skill_4" style="width:100px;">
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{brawl}" selected>Brawl</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="0"></option>
+                            <option value="@{academics}">Academics</option>
+                            <option value="@{animalken}">Animal Ken</option>
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{computer}">Computer</option>
+                            <option value="@{crafts}">Crafts</option>
+                            <option value="@{brawl}">Brawl</option>
+                            <option value="@{drive}">Drive</option>
+                            <option value="@{empathy}">Empathy</option>
+                            <option value="@{expression}">Expression</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{intimidation}">Intimidation</option>
+                            <option value="@{investigation}">Investigation</option>
+                            <option value="@{larceny}">Larceny</option>
+                            <option value="@{medicine}">Medicine</option>
+                            <option value="@{occult}">Occult</option>
+                            <option value="@{persuasion}">Persuasion</option>
+                            <option value="@{politics}">Politics</option>
+                            <option value="@{science}">Science</option>
+                            <option value="@{socialize}">Socialize</option>
+                            <option value="@{stealth}">Stealth</option>
+                            <option value="@{streetwise}">Streetwise</option>
+                            <option value="@{subterfuge}">Subterfuge</option>
+                            <option value="@{survival}">Survival</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_modifier_4"  value="0"/></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_again_4" style="width:50px;">
+                            <option value="">None</option>
+                            <option value="!>10" selected>10</option>
+                            <option value="!>7">9</option>
+                            <option value="!>8">8</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_range_4" style="width:60px"  /></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_4" value="0" /></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_4" value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_4" value="0"/></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_4" style="width:50px"/></td>
+                </tr>
+                <tr class="sheet-weapon">
+                    <td class="sheet-weapon"><button type="roll" class="sheet-btn" name="attr_weaponButton_5" value="&{template:Interlock} {{InterName= @{weapon_name_5} }} {{Dice= [[@{weapon_attribute_5} + @{weapon_skill_5}]] }} {{character= @{character_name}}} {{Roll= [[ [[@{weapon_attribute_5} + @{weapon_skill_5} +@{weapon_modifier_5}]]d10@{weapon_again_5}>8]] success(es)}}"></button></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_name_5" style="width:100%" /></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_attribute_5" style="width:95px;">
+                            <option value="0"></option>
+                            <option value="@{com}">Composure</option>
+                            <option value="@{dex}" selected>Dexterity</option>
+                            <option value="@{int}">Intelligence</option>
+                            <option value="@{man}">Manipulation</option>
+                            <option value="@{pre}">Presence</option>
+                            <option value="@{res}">Resolve</option>
+                            <option value="@{sta}">Stamina</option>
+                            <option value="@{str}">Strength</option>
+                            <option value="@{wits}">Wits</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_skill_5" style="width:100px;">
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{brawl}" selected>Brawl</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="0"></option>
+                            <option value="@{academics}">Academics</option>
+                            <option value="@{animalken}">Animal Ken</option>
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{computer}">Computer</option>
+                            <option value="@{crafts}">Crafts</option>
+                            <option value="@{brawl}">Brawl</option>
+                            <option value="@{drive}">Drive</option>
+                            <option value="@{empathy}">Empathy</option>
+                            <option value="@{expression}">Expression</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{intimidation}">Intimidation</option>
+                            <option value="@{investigation}">Investigation</option>
+                            <option value="@{larceny}">Larceny</option>
+                            <option value="@{medicine}">Medicine</option>
+                            <option value="@{occult}">Occult</option>
+                            <option value="@{persuasion}">Persuasion</option>
+                            <option value="@{politics}">Politics</option>
+                            <option value="@{science}">Science</option>
+                            <option value="@{socialize}">Socialize</option>
+                            <option value="@{stealth}">Stealth</option>
+                            <option value="@{streetwise}">Streetwise</option>
+                            <option value="@{subterfuge}">Subterfuge</option>
+                            <option value="@{survival}">Survival</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_modifier_5" value="0"/></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_again_5" style="width:50px;">
+                            <option value="">None</option>
+                            <option value="!>10" selected>10</option>
+                            <option value="!>7">9</option>
+                            <option value="!>8">8</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_range_5" style="width:60px" /></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_5" value="0" /></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_5" value="0" /></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_5" value="0" /></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_5" style="width:50px"/></td>
+                </tr>
+                <tr class="sheet-weapon">
+                    <td class="sheet-weapon"><button type="roll" class="sheet-btn" name="attr_weaponButton_6" value="&{template:Interlock} {{InterName= @{weapon_name_6} }} {{Dice= [[@{weapon_attribute_6} + @{weapon_skill_6}]] }} {{character= @{character_name}}} {{Roll= [[ [[@{weapon_attribute_6} + @{weapon_skill_6} + @{weapon_modifier_6}]]d10@{weapon_again_6}>8]] success(es)}}"></button></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_name_6" style="width:100%" /></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_attribute_6" style="width:95px;">
+                            <option value="0"></option>
+                            <option value="@{com}">Composure</option>
+                            <option value="@{dex}" selected>Dexterity</option>
+                            <option value="@{int}">Intelligence</option>
+                            <option value="@{man}">Manipulation</option>
+                            <option value="@{pre}">Presence</option>
+                            <option value="@{res}">Resolve</option>
+                            <option value="@{sta}">Stamina</option>
+                            <option value="@{str}">Strength</option>
+                            <option value="@{wits}">Wits</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_skill_6" style="width:100px;">
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{brawl}" selected>Brawl</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="0"></option>
+                            <option value="@{academics}">Academics</option>
+                            <option value="@{animalken}">Animal Ken</option>
+                            <option value="@{athletics}">Athletics</option>
+                            <option value="@{computer}">Computer</option>
+                            <option value="@{crafts}">Crafts</option>
+                            <option value="@{brawl}">Brawl</option>
+                            <option value="@{drive}">Drive</option>
+                            <option value="@{empathy}">Empathy</option>
+                            <option value="@{expression}">Expression</option>
+                            <option value="@{firearms}">Firearms</option>
+                            <option value="@{intimidation}">Intimidation</option>
+                            <option value="@{investigation}">Investigation</option>
+                            <option value="@{larceny}">Larceny</option>
+                            <option value="@{medicine}">Medicine</option>
+                            <option value="@{occult}">Occult</option>
+                            <option value="@{persuasion}">Persuasion</option>
+                            <option value="@{politics}">Politics</option>
+                            <option value="@{science}">Science</option>
+                            <option value="@{socialize}">Socialize</option>
+                            <option value="@{stealth}">Stealth</option>
+                            <option value="@{streetwise}">Streetwise</option>
+                            <option value="@{subterfuge}">Subterfuge</option>
+                            <option value="@{survival}">Survival</option>
+                            <option value="@{weaponry}">Weaponry</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_modifier_6" value="0"/></td>
+                    <th class="sheet-weapon"><select class="sheet-skill_select" name="attr_weapon_again_6" style="width:50px;">
+                            <option value="">None</option>
+                            <option value="!>10" selected>10</option>
+                            <option value="!>7">9</option>
+                            <option value="!>8">8</option>
+                        </select>
+                    </th>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_range_6"  style="width:60px"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_clip_6" value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_initiative_6" value="0"/></td>
+                    <td class="sheet-weapon"><input type="number" name="attr_weapon_strength_6" value="0"/></td>
+                    <td class="sheet-weapon"><input type="text" name="attr_weapon_size_6" style="width:50px"/></td>
+                </tr>
+            </table>
+        </div>
+    </div>
+</div>
+
+<div class="sheet-tab-content sheet-tab4">
     <div class="sheet-tabbed-panel">
         <div class="sheet-row-panel">
             <input type="checkbox" name="attr_glitches-toggle" class="sheet-arrow" /><span></span>
@@ -1396,15 +2441,15 @@
             <div class="body">
                 <div class='sheet-2colrow'>
                     <div class='sheet-col'>
-                        <textarea name="attr_glitches-1" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_glitches-1" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_glitchesa">
-                            <textarea name="attr_glitchesa" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_glitchesa" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                     </div>
                     <div class='sheet-col'>
-                        <textarea name="attr_glitches-2" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_glitches-2" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_glitchesb">
-                            <textarea name="attr_glitchesb" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_glitchesb" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                     </div>
                 </div>
@@ -1418,15 +2463,15 @@
             <div class="body">
                 <div class='sheet-2colrow'>
                     <div class='sheet-col'>
-                        <textarea name="attr_glitches-1" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_Pacts-1" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_pactsa">
-                            <textarea name="attr_pactsa" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_Pactsa" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                     </div>
                     <div class='sheet-col'>
-                        <textarea name="attr_pacts-2" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_Pacts-2" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_pactsb">
-                            <textarea name="attr_pactsb" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_Pactsb" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                     </div>
                 </div>
@@ -1441,97 +2486,111 @@
                 <div class='sheet-2colrow'>
                     <div class='sheet-col'>
                         <div class="center"><h3>Allies</h3></div>
-                        <textarea name="attr_allies_1" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_allies_1" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_allies">
-                            <textarea name="attr_repeating_allies" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_repeating_allies" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                         <div class="center"><h3>Contacts</h3></div>
-                        <textarea name="attr_contacts" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_contacts" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_contacts">
-                            <textarea name="attr_repeating_contacts" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_repeating_contacts" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                         <div class="center"><h3>Fame</h3></div>
-                        <textarea name="attr_fame" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_fame" rows="3" class="sheet-longtextarea" style="width:100%"></textarea>
                         <fieldset class="repeating_fame">
-                            <textarea name="attr_repeating_fame" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_repeating_fame" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                         <div class="center"><input type="text" name="attr_expanded_other_merit1" placeholder="Other"/></div>
-                        <textarea name="attr_expandedothermerit1" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_expandedothermerit1" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_expandedothermerit1">
-                            <textarea name="attr_repeating_expandedothermerit1" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_repeating_expandedothermerit1" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                     </div>
                     <div class='sheet-col'>
                         <div class="center"><h3>Mentor</h3></div>
-                        <textarea name="attr_mentor" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_mentor" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_mentor">
-                            <textarea name="attr_repeating_mentor" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_repeating_mentor" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                         <div class="center"><h3>Resources</h3></div>
-                        <textarea name="attr_resources" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_resources" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_resources">
-                            <textarea name="attr_repeating_resources" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_repeating_resources" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                         <div class="center"><h3>Retainer</h3></div>
-                        <textarea name="attr_retainer" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_retainer" rows="3" class="sheet-longtextarea" style="width:100%"></textarea>
                         <fieldset class="repeating_retainer">
-                            <textarea name="attr_repeating_retainer" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_repeating_retainer" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                         <div class="center"><input type="text" name="attr_expanded_other_merit2" placeholder="Other"/></div>
-                        <textarea name="attr_expandedothermerit2" rows="3" wrap="soft" style="width:100%"></textarea>
+                        <textarea name="attr_expandedothermerit2" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         <fieldset class="repeating_expandedothermerit2">
-                            <textarea name="attr_repeating_expandedothermerit2" rows="3" wrap="soft" style="width:100%"></textarea>
+                            <textarea name="attr_repeating_expandedothermerit2" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
                         </fieldset>
                     </div>
                 </div>
             </div>
-            <div class="center"><h2>Possessions</h2></div>
-            <div class='sheet-2colrow'>
-                <div class='sheet-col'>
-                    <div class="center"><h3>Gear (carried)</h3></div>
-                    <textarea name="attr_gear_1" rows="3" wrap="soft" style="width:100%"></textarea>
-                    <div class="center"><h3>Vehicles</h3></div>
-                    <textarea name="attr_vehicles_1" rows="3" wrap="soft" style="width:100%"></textarea>
+            <div class="sheet-tabbed-panel">
+                <div class="sheet-row-panel">
+                    <input type="checkbox" name="attr_Possessions-toggle" class="sheet-arrow" /><span></span>
+                    <div class="center"><h2>Possessions</h2></div>
+                    <div class="body">
+                        <div class='sheet-2colrow'>
+                            <div class='sheet-col'>
+                                <div class="center"><h3>Gear (carried)</h3></div>
+                                <textarea name="attr_gear_1" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
+                                <div class="center"><h3>Vehicles</h3></div>
+                                <textarea name="attr_vehicles_1" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
+                            </div>
+                            <div class='sheet-col'>
+                                <div class="center"><h3>Equipment (owned)</h3></div>
+                                <textarea name="attr_equipment_1" class="sheet-longtextarea" wrap="soft" style="width:100%"></textarea>
+                                <div class="center"><h3>Misc</h3></div>
+                                <textarea name="attr_misc_1" class="sheet-longtextarea"  wrap="soft" style="width:100%"></textarea>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class='sheet-col'>
-                    <div class="center"><h3>Equipment (owned)</h3></div>
-                    <textarea name="attr_equipment_1" rows="3" wrap="soft" style="width:100%"></textarea>
-                    <div class="center"><h3>Misc</h3></div>
-                    <textarea name="attr_misc_1" rows="3" wrap="soft" style="width:100%"></textarea>
+            </div>
+            <div class="sheet-tabbed-panel">
+                <div class="sheet-row-panel">
+                    <input type="checkbox" name="attr_Bolthole-toggle" class="sheet-arrow" /><span></span>
+                    <div class="center"><h2>Bolthole</h2></div>
+                    <div class="body">
+                        <table style="width:70%">
+                            <tr>
+                                <th class="sheet-center">Location</th>
+                                <th colspan="4" class="sheet-left">Description</th>
+                            </tr>
+                            <tr>
+                                <td><input type="text" name="attr_location_1" style="width:100%" /></td>
+                                <td colspan="4"><input type="text" name="attr_description_1" style="width:190%" /></td>
+                            </tr>
+                            <tr>
+                                <td><input type="text" name="attr_location_2" style="width:100%" /></td>
+                                <td colspan="4"><input type="text" name="attr_description_2" style="width:190%" /></td>
+                            </tr>
+                            <tr>
+                                <td><input type="text" name="attr_location_3" style="width:100%" /></td>
+                                <td colspan="4"><input type="text" name="attr_description_3" style="width:190%" /></td>
+                            </tr>
+                            <tr>
+                                <td><input type="text" name="attr_location_4" style="width:100%" /></td>
+                                <td colspan="4"><input type="text" name="attr_description_4" style="width:190%" /></td>
+                            </tr>
+                            <tr>
+                                <td><input type="text" name="attr_location_5" style="width:100%" /></td>
+                                <td colspan="4"><input type="text" name="attr_description_5" style="width:190%" /></td>
+                            </tr>
+                        </table>
+                    </div>
                 </div>
             </div>
-            <div class="center"><h2>Bolthole</h2></div>
-            <table style="width:70%">
-                <tr>
-                    <th class="sheet-center">Location</th>
-                    <th colspan="4" class="sheet-left">Description</th>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_location_1" style="width:100%" /></td>
-                    <td colspan="4"><input type="text" name="attr_description_1" style="width:190%" /></td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_location_2" style="width:100%" /></td>
-                    <td colspan="4"><input type="text" name="attr_description_2" style="width:190%" /></td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_location_3" style="width:100%" /></td>
-                    <td colspan="4"><input type="text" name="attr_description_3" style="width:190%" /></td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_location_4" style="width:100%" /></td>
-                    <td colspan="4"><input type="text" name="attr_description_4" style="width:190%" /></td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_location_5" style="width:100%" /></td>
-                    <td colspan="4"><input type="text" name="attr_description_5" style="width:190%" /></td>
-                </tr>
-            </table>
         </div>
     </div>
 </div>
 
-<div class="sheet-tab-content sheet-tab4">
+<div class="sheet-tab-content sheet-tab5">
     <div class="sheet-tabbed-panel">
         <div class="sheet-row-panel">
             <div class="center"><h2>History</h2></div>
@@ -1540,6 +2599,9 @@
             <div class="center"><h2>Description</h2></div>
             <textarea name="attr_description" rows="3" wrap="soft" style="width:99%"></textarea>
             <br>
+            <div class="center"><h2>Compromises</h2></div>
+            <textarea name="attr_Compromises" rows="3" wrap="soft" style="width:99%"></textarea>
+            <br>
             <div class="center"><h2>Covers</h2></div>
             <fieldset class="repeating_covers">
                 <div class='sheet-2colrow'>
@@ -1626,7 +2688,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_cover-merit_4_name" style="width:120px" /></td>
+                                <td><input type="text" name="attr_cover-merit_5_name" style="width:120px" /></td>
                                 <td>&nbsp;</td>
                                 <td>
                                     <input type="radio" class="sheet-normal sheet-zero" name="attr_cover-merit_5" value="0" checked="checked" /><span></span>
@@ -1648,7 +2710,7 @@
 <rolltemplate class="sheet-rolltemplate-Interlock">
     <table>
         <tr><th>{{InterName}}</th></tr>
-        <tr><td class="sheet-detail"><i><b>{{character}}</b> uses {{InterName}} </i></td></tr>
+        <tr><td class="sheet-detail"><b>{{character}}</b> uses {{InterName}} </td></tr>
         <tr><td><b>Dice Pool:</b>{{Dice}}</td></tr>
         <tr><td><b>Roll:</b>{{Roll}}</td></tr>
         {{#Cost}}
@@ -1662,4 +2724,4 @@
 		</tr>
         {{/Description}}
     </table>
-</rolltemplate>
\ No newline at end of file
+</rolltemplate>