diff --git a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.css b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.css
index 906e8a3650..d2fdc9d8cf 100644
--- a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.css
+++ b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.css
@@ -231,6 +231,8 @@ input.sheet-op:focus {
 }
 
 
+
+
 /* Tabs
  * ------------------------------------ */
 
@@ -250,12 +252,12 @@ input.sheet-tab-talents:checked ~ div.sheet-tab-talents,
 input.sheet-tab-weapons:checked ~ div.sheet-tab-weapons,
 input.sheet-tab-v-details:checked ~ div.sheet-tab-v-details,
 input.sheet-tab-v-weapons:checked ~ div.sheet-tab-v-weapons,
-input.sheet-tab-notes:checked ~ div.sheet-tab-notes {
+input.sheet-tab-notes:checked ~ div.sheet-tab-notes,
+input.sheet-tab-gm-weapons:checked ~ div.sheet-tab-gm-weapons, 
+input.sheet-tab-gm-adversaries:checked ~ div.sheet-tab-gm-adversaries {
     display: block;
 }
 
-
-
 input.sheet-tab {
     width: 162px;
     height: 30px;
@@ -306,6 +308,27 @@ input.sheet-tab-ship-sheet,
 input.sheet-tab-ship-sheet::before {display:none}
 */
 
+/* Custom Show Hide
+ * ------------------------------------ */
+input.sheet-player-sheet,
+input.sheet-gm-sheet {
+    display: none; 
+}
+
+input.sheet-player:checked ~ input.sheet-player-sheet,
+input.sheet-gm:checked ~ input.sheet-gm-sheet{
+    display: inline-block;  
+}
+ 
+input.sheet-gm:checked ~ div.sheet-tab-content {
+    display: none;  
+}
+ 
+input.sheet-gm:checked ~ div.sheet-tab-gm-dice {
+    display: block;  
+}
+
+
 /* ------------------------------------ */
 
 .charsheet {
@@ -396,6 +419,12 @@ input.sheet-tab-ship-sheet::before {display:none}
     color:#fff;
 }
 
+.charsheet .sheet-sub-header,
+.charsheet .sheet-sub-header:hover{
+    background:#485a6d;
+    color:#fff;
+}
+
 /* ------------------------------------------------- Dice Pool */
 
 .sheet-section-1 {
@@ -670,7 +699,9 @@ label.sheet-label-current {
 
 
 [name="attr_critAddRangeNum"],
-[name="attr_critShipAddRangeNum"]{
+[name="attr_critShipAddRangeNum"],
+[name="attr_critAddOffset"],
+[name="attr_critShipAddOffset"]{
     background:#ccc;
 }
 
@@ -984,9 +1015,11 @@ th .sheet-help-content {
     display:block;
 }
 
-.sheet-weapons [type=number] {
+.sheet-weapons [type=text] {
     font-size:14px;
     font-weight:bold;
+    width:50px;
+    text-align:center
 }
 
 .sheet-weapons [type=roll] {
diff --git a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.html b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.html
index 997f2b0c66..31b882c507 100644
--- a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.html
+++ b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.html
@@ -1,7 +1,8 @@
-
-<input type="radio" name="attr_pcgm" class="sheet-tab sheet-tab-character-sheet" value="1" title="Character Sheet" checked="checked" />
-<input type="radio" name="attr_pcgm" class="sheet-tab sheet-tab-ship-sheet" value="2" title="Vehicle Sheet" />
-<input type="radio" name="attr_pcgm" class="sheet-tab sheet-tab-gm-dice" value="3" title="GM Dice" />
+<input type="radio" name="attr_gmdicepool" class="sheet-player" value="1" checked="checked" style="display:none">
+<input type="radio" name="attr_gmdicepool" class="sheet-gm" value="2" style="display:none">
+<input type="radio" name="attr_pcgm" class="sheet-tab sheet-tab-character-sheet sheet-player-sheet" value="1" title="Character Sheet" checked="checked" />
+<input type="radio" name="attr_pcgm" class="sheet-tab sheet-tab-ship-sheet sheet-player-sheet" value="2" title="Vehicle Sheet" />
+<input type="radio" name="attr_pcgm" class="sheet-tab sheet-tab-gm-dice sheet-gm-sheet" value="3" title="GM Dice" />
          
 <div class="sheet-tab-content sheet-tab-character-sheet"><!-- PC Character Sheet -->
     <div class="sheet-row sheet-section-1">
@@ -779,6 +780,14 @@
                         
                         <table  class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
                             <tbody>
+                                <tr>
+                                    <td>
+                                        <label>Critcal roll offset:</label>
+                                    </td>
+                                    <td>
+                                        <input type="text" name="attr_critAddOffset" value="" />
+                                    </td>
+                                </tr>
                                 <tr>
                                     <td colspan="2">
                                         <button type="roll" class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) crit(roll)" />Roll Critical</button>
@@ -893,7 +902,7 @@
                                     <td><label>Magnitude:</label></td>
                                     <td><input type="number" name="attr_dutymag2"/></td>
                                 </tr>
-        						<tr>
+            					<tr>
                                         <td><label>Description:</label></td>
                                         <td colspan="3" class="sheet-div-right"><textarea rows="3" name="attr_dutydesc1"></textarea></td>
                                         <td><label>Description:</label></td>
@@ -3875,22 +3884,22 @@
                                         <td></td>
                                         <td>
                                             <label>Damage</label>
-                                            <input name='attr_damage' type="number" max="99" min="0" value="0"/>
+                                            <input name='attr_damage' type="text" value="0"/>
                                         </td>
                                         <td></td>
                                         <td>
                                             <label>Critical</label>
-                                            <input name='attr_critical' type="number" max="99" min="0" value="0"/>
+                                            <input name='attr_critical' type="text" value="0"/>
                                         </td>
                                         <td><button type='roll' name='roll_weapon' value='!eed characterID(@{character_id}) label(Weapon:@{weaponmake}|Damage:@{damage}|Critical:@{critical}|Range:@{weaponrange}|Speical:@{weaponspecial}) @{weapondice} encum(@{encumbrancemax}|@{encumbrance}) @{weaponskill} @{weaponcondition} @{dicePool} @{-dicepool|dicepoolgm}'></button></td>
                                         <td>
                                             <label>Encum</label>
-                                            <input name='attr_encum' type="number" max="99" min="0" value="0"/>
+                                            <input name='attr_encum' type="text" value="0"/>
                                         </td>
                                         <td></td>
                                         <td>
                                             <label>HP</label>
-                                            <input name='attr_hp' type="number" max="99" min="0" value="0"/>
+                                            <input name='attr_hp' type="text" value="0"/>
                                         </td>
                                         <td></td>
                                     </tr>
@@ -3910,6 +3919,7 @@
                                                 <option value="Short">Short</option>
                                                 <option vaule="Medium">Medium</option>
                                                 <option value="Long">Long</option>
+                                                <option value="Extreme">Extreme</option>
                                             </select> 
                                         </td>
                                         
@@ -3921,7 +3931,7 @@
                                         
                                         <td><label>Skill:</label></td>
                                         <td>
-                                             <select name='attr_weaponskill'>
+                                             <select name='attr_weaponskill'> 
                                                 <option value="skill(@{rankBrawl}|@{brawn})">Brawl</option>
                                                 <option value="skill(@{rankGunnery}|@{agility})">Gunnery</option>
                                                 <option value="skill(@{rankMelee}|@{brawn})">Melee</option>
@@ -4882,6 +4892,15 @@
                         
                         <table  class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
                             <tbody>
+                                <tr>
+                                    <td>
+                                        <label>Critcal roll offset:</label>
+                                    </td>
+                                    <td>
+                                        <input type="text" name="attr_critShipAddOffset" value="" />
+                                    </td>
+                                </tr>
+                                
                                 <tr>
                                     <td colspan="2">
                                         <button type="roll" class="sheet-btn-roll-crit" value="!eed characterID(@{character_id}) critship(roll)" />Roll Critical</button>
@@ -5066,12 +5085,14 @@
                             
                 <table cellspacing="0" cellpadding="0" border="0">
                     <thead>
-                        <th>Character Name</th>
-                        <th>Weapon Name</th>
-                        <th>Arc</th>
-                        <th>Crit</th>
-                        <th>Dmg</th>
-                        <th colspan="2">Range/Skill</th>
+                        <tr>
+                            <th>Character Name</th>
+                            <th>Weapon Name</th>
+                            <th>Arc</th>
+                            <th>Crit</th>
+                            <th>Dmg</th>
+                            <th colspan="2">Range/Skill</th>
+                        </tr>
                     </thead>
                     <tbody>
                         <tr>
@@ -5162,8 +5183,7 @@
                              <input type="hidden" name="attr_dicePoolgm"  value=" @{ggm}g @{ygm}y @{pgm}p @{rgm}r @{bgm}b @{blkgm}blk @{wgm}w upgrade(ability|@{upgradeAbilitygm}) downgrade(proficiency|@{downgradeProficiencygm}) upgrade(difficulty|@{upgradeDifficultygm}) downgrade(challenge|@{downgradeChallengegm})"/>
                              <button type='roll' name='roll_DicePoolgm' value='!eed @{dicePoolgm}'></button>
                              <button type='roll' name='roll_ResetGMDicePool' value='!eed resetgmdice characterID(@{character_id})'></button>
-
-                                 
+   
                          </td>
                          <td colspan="3" class="sheet-downgrade sheet-dark">
                              <label>&nbsp;&nbsp;&nbsp;&nbsp;Upgrade:
@@ -5181,6 +5201,233 @@
          </div><!-- end-column -->
          <div class="sheet-clear"></div>
     </div><!-- end sheet-row -->
+    
+    <input type="radio" name="attr_gm-sheet" class="sheet-tab sheet-tab-gm-weapons" value="1" title="Weapons" checked="checked" />
+    <input type="radio" name="attr_gm-sheet" class="sheet-tab sheet-tab-gm-adversaries" value="2" title="Adversaries" />
+    <input type="radio" name="attr_gm-sheet-unlock" value="unlock" style="display:none" />
+    
+    <div class="sheet-tab-content sheet-tab-gm-weapons">   
+        <div class="sheet-row">
+            <h3>Weapons Index</h3>
+            
+            <div class="sheet-small-12 sheet-column">
+            
+                <table cellspacing="0" cellpadding="0" border="0" class="gm-sheet-unlock">
+                    <tr>
+                        <td style="text-align: right">Give weapon to (character name):</td>
+                        <td><input type="text" name="attr_characternameweapon" value="" /></td>
+                    </tr>
+                </table>    
+            
+            </div>    
+            
+            <div class="sheet-small-6 sheet-column">
+                <table cellspacing="0" cellpadding="0" border="0">
+                    <thead>
+                        <tr>
+                            <th>Weapon Name</th>
+                            <th>Page</th>
+                            <th class="gm-sheet-unlock">&nbsp;</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td colspan="3" class="sheet-sub-header">Energy Weapons</td>
+                        </tr>
+                        <tr>
+                            <td>Holdout Pistol</td>
+                            <td>EotE (p161)</td>
+                            <td class="gm-sheet-unlock"><button type='roll' name='roll_characterweapon' value='!eeweapon weapon(Holdout Pistol) character(@{characternameweapon})'> Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Light Blaster Pistol</td>
+                            <td>EotE (p161)</td>
+                            <td class="gm-sheet-unlock"><button type='roll' name='roll_characterweapon' value='!eeweapon weapon(Light Blaster Pistol) character(@{characternameweapon})'> Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Blaster Pistol</td>
+                            <td>EotE (p161)</td>
+                            <td class="gm-sheet-unlock"><button type='roll' name='roll_characterweapon' value='!eeweapon weapon(Blaster Pistol) character(@{characternameweapon})'> Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Heavey Blaster Pistol</td>
+                            <td>EotE (p162)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Heavy Blaster Pistol) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Blaster Carbine</td>
+                            <td>EotE (p162)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Blaster Carbine) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Blaster Rifle</td>
+                            <td>EotE (p162)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Blaster Rifle) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Heavy Blaster Rifle</td>
+                            <td>EotE (p162)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Heavy Blaster Rifle) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Light Repeating Blaster</td>
+                            <td>EotE (p162)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Light Repeating Blaster) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Heavy Repeating Blaster</td>
+                            <td>EotE (p162)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Heavy Repeating Blaster) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Bowcaster</td>
+                            <td>EotE (p162)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Bowcaster) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Ionization Blaster</td>
+                            <td>EotE (p162)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Ionization Blaster) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Disruptor Pistol</td>
+                            <td>EotE (p163)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Disruptor Pistol) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Disruptor Rifle</td>
+                            <td>EotE (p163)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Disruptor Rifle) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td colspan="3" class="sheet-sub-header">Slugthrowers</td>
+                        </tr>
+                        <tr>
+                            <td>Slugthrower Pistol</td>
+                            <td>EotE (p164)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Slugthrower Pistol) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Slugthrower Rifle</td>
+                            <td>EotE (p164)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Slugthrower Rifle) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td colspan="3" class="sheet-sub-header">Explosives and Flame Projectors</td>
+                        </tr>
+                        <tr>
+                            <td>Flame Projector</td>
+                            <td>EotE (p165)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Flame Projector) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Missile Tube</td>
+                            <td>EotE (p165)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Missile Tube) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Frag Grenade</td>
+                            <td>EotE (p165)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Frag Grenade) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Stun Grenade</td>
+                            <td>EotE (p165)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Stun Grenade) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Thermal Detonator</td>
+                            <td>EotE (p165)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Thermal Detonator) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div><!-- end column -->
+            
+            <div class="sheet-small-6 sheet-column">
+                <table cellspacing="0" cellpadding="0" border="0">
+                    <thead>
+                        <tr>
+                            <th>Weapon Name</th>
+                            <th>Page</th>
+                            <th class="gm-sheet-unlock">&nbsp;</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td colspan="3" class="sheet-sub-header">Thrown Weapons</td>
+                        </tr>
+                        <tr>
+                            <td>Bola Net</td>
+                            <td>EotE (p164)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Bola Net) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td colspan="3" class="sheet-sub-header">Brawl Weapons</td>
+                        </tr>
+                        <tr>
+                            <td>Brass Knuckles</td>
+                            <td>EotE (p166)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Brass Knuckles) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Shock Gloves</td>
+                            <td>EotE (p166)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Shock Gloves) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td colspan="3" class="sheet-sub-header">Melee Weapons</td>
+                        </tr>
+                        <tr>
+                            <td>Combat Knife</td>
+                            <td>EotE (p166)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Combat Knife) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Gaffi Stick</td>
+                            <td>EotE (p166)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Gaffi Stick) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Force Pike</td>
+                            <td>EotE (p166)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Force Pike) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Truncheon</td>
+                            <td>EotE (p167)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Truncheon) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Vibro-Ax</td>
+                            <td>EotE (p167)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Vibro-Ax) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Vibroknife</td>
+                            <td>EotE (p167)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Vibroknife) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                        <tr>
+                            <td>Vibrosword</td>
+                            <td>EotE (p167)</td>
+                            <td class="gm-sheet-unlock"><button value='!eeweapon weapon(Vibrosword) character(@{characternameweapon})' type='roll' name='roll_characterweapon' > Create</button></td>
+                        </tr>
+                    </tbody>
+                </table>
+            
+            </div><!-- end column -->
+            
+        </div>
+    </div>
+    
+    
+    <div class="sheet-tab-content sheet-tab-gm-adversaries">   
+        <div class="sheet-row">
+            <h3>Adversaries Index</h3>
+        
+        </div>
+    </div>    
             
 </div><!-- sheet-content -->
   
diff --git a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.js b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.js
index 4eb0f1b7ee..bed079b3c9 100644
--- a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.js
+++ b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.js
@@ -1,10 +1,10 @@
 /*
     Current Version: 2.5
-    Last updated: 8.28.2014
+    Last updated: 12.02.2014
     Character Sheet and Script Maintained by: Steve Day
     Current Verion: https://github.com/Roll20/roll20-character-sheets/tree/master/StarWarsEdgeOfTheEmpire_Dice
     Development and Older Verions: https://github.com/dayst/StarWarsEdgeOfTheEmpire_Dice
-	
+    
 	Credits:
 		Original creator: Konrad J.
 		Helped with Dice specs: Alicia G. and Blake the Lake
@@ -198,22 +198,34 @@
     
     eote.createGMDicePool = function() {
         
+        var charObj_DicePool = findObjs({ _type: "character", name: "-DicePool" });
+        
+        var attrObj_DicePool = [
+            {
+                name : 'pcgm',
+                current : 3,
+                max : '',
+                update : true
+            },
+            {
+                name : 'gmdicepool',
+                current : 2,
+                max : '',
+                update : true
+            }   
+        ];
+        
         //create character -DicePool
-        if (findObjs({ _type: "character", name: "-DicePool" }).length == 0){
+        if (charObj_DicePool.length == 0){
            
-            createObj("character", {
+            charObj_DicePool = createObj("character", {
                 name: "-DicePool",
                 bio: "GM Dice Pool"
             });
-           
-            Char_dicePoolObject = findObjs({ _type: "character", name: "-DicePool" });
             
-            createObj("attribute", {
-                name: "pcgm",
-                current: 3,
-                characterid: Char_dicePoolObject[0].id
-            });
-        };
+        } 
+            
+        eote.updateAddAttribute(charObj_DicePool, attrObj_DicePool);
         
     }