diff --git a/Earthdawn-4E/ED4E 2.1.JPG b/Earthdawn-4E/ED4E 2.1.JPG
deleted file mode 100644
index c00f055121..0000000000
Binary files a/Earthdawn-4E/ED4E 2.1.JPG and /dev/null differ
diff --git a/Earthdawn-4E/ED4E 2.2.JPG b/Earthdawn-4E/ED4E 2.2.JPG
deleted file mode 100644
index 9a1f66e617..0000000000
Binary files a/Earthdawn-4E/ED4E 2.2.JPG and /dev/null differ
diff --git a/Earthdawn-4E/ED4E.css b/Earthdawn-4E/ED4E.css
index a9faab153a..02cb200761 100644
--- a/Earthdawn-4E/ED4E.css
+++ b/Earthdawn-4E/ED4E.css
@@ -1,4 +1,4 @@
-/*-- ED4 Character Sheet v2.2 Last update: 5-18-2018
+/*-- ED4 Character Sheet v2.3 Last update: 8-22-2018
 Author: Dougansf --*/
 
 h3 {text-indent: 20px;}
@@ -19,11 +19,12 @@ input {font-size: 90%}
 .charsheet input.sheet-tab2:checked ~ div.sheet-section-talents,
 .charsheet input.sheet-tab3:checked ~ div.sheet-section-skills,
 .charsheet input.sheet-tab4:checked ~ div.sheet-section-knacks,
-.charsheet input.sheet-tab5:checked ~ div.sheet-section-equipment,
-.charsheet input.sheet-tab6:checked ~ div.sheet-section-matrixes,
-.charsheet input.sheet-tab7:checked ~ div.sheet-section-grimoire,
-.charsheet input.sheet-tab8:checked ~ div.sheet-section-treasury,
-.charsheet input.sheet-tab9:checked ~ div.sheet-section-NPC,
+.charsheet input.sheet-tab5:checked ~ div.sheet-section-questor,
+.charsheet input.sheet-tab6:checked ~ div.sheet-section-equipment,
+.charsheet input.sheet-tab7:checked ~ div.sheet-section-matrixes,
+.charsheet input.sheet-tab8:checked ~ div.sheet-section-grimoire,
+.charsheet input.sheet-tab9:checked ~ div.sheet-section-treasury,
+.charsheet input.sheet-tab10:checked ~ div.sheet-section-NPC,
 .charsheet input.sheet-tab51:checked ~ div.sheet-section-circle1,
 .charsheet input.sheet-tab52:checked ~ div.sheet-section-circle2,
 .charsheet input.sheet-tab53:checked ~ div.sheet-section-circle3,
@@ -43,7 +44,7 @@ input {font-size: 90%}
 
 /*this hides the radio button for each tab, makes it 100px wide and 40px tall and makes sure it's above everything else*/
 .charsheet input.sheet-tab {
-        width: 84px;
+        width: 100px;
         height: 20px;
         cursor: pointer;    
     position: relative;
@@ -55,18 +56,18 @@ input {font-size: 90%}
 .charsheet span.sheet-tab {
     text-align: center;
         display: inline-block;
-    font-size: 12px;    
+    font-size: 13px;    
     background: #c7c3b0;
     color: black;
     font-weight: bold;
-    border-radius: 1px;
+    border-radius: 5px;
     
-    width: 85px;
+    width: 100px;
         height: 20px;
         cursor: pointer;    
     position: relative;
     vertical-align: middle;
-    margin-left: -92px;/*originally 91px*/
+    margin-left: -90px;/*originally 91px*/
 }
 
 /*this modifies the span color once the radio button is selected so you know which tab is selected*/
@@ -79,6 +80,7 @@ input {font-size: 90%}
 .charsheet input.sheet-tab7:checked + span.sheet-tab7,
 .charsheet input.sheet-tab8:checked + span.sheet-tab8,
 .charsheet input.sheet-tab9:checked + span.sheet-tab9,
+.charsheet input.sheet-tab10:checked + span.sheet-tab10,
 .charsheet input.sheet-tab51:checked + span.sheet-tab51,
 .charsheet input.sheet-tab52:checked + span.sheet-tab52,
 .charsheet input.sheet-tab53:checked + span.sheet-tab53,
@@ -91,6 +93,6 @@ input {font-size: 90%}
     
         background: #034cb2;
         color: #FFFFFF;
-    border-radius: 4px;
+    border-radius: 5px;
 }
 /*----------- End Main Tab Setup -----------*/
diff --git a/Earthdawn-4E/ED4E.html b/Earthdawn-4E/ED4E.html
index 4efccf501c..0503b33b7a 100644
--- a/Earthdawn-4E/ED4E.html
+++ b/Earthdawn-4E/ED4E.html
@@ -1,4 +1,4 @@
-<!-- ED4 Character Sheet v2.2 Last update: 5-18-2018
+<!-- ED4 Character Sheet v2.3 Last update: 8-22-2018
 Author: Dougansf -->
 <script>
     on('change:PD_Base change:PD_Mod change:ShPD change:Stance change:Blindside change:Cover change:Harried change:Overwhelmed change:Prone change:Surprised' ,function(eventinfo){
@@ -154,7 +154,7 @@ Author: Dougansf -->
                 <strong>/</strong>
                 <input style="background-color: #99ceff;" name="attr_Karma" type="number" value="5" style="width: 40px;"/>
                     <button name="roll_Karma" type="roll" value="!power {{
---format|blue
+--format|gold
 --titlefont|arial
 --titlefontsize|16px
 --bodyfontsize|12px
@@ -243,7 +243,7 @@ Author: Dougansf -->
 --bodyfontsize|12px
 --charid|@{character_id}
 --name|**@{Name} Initiative**
---Step|[[ ?{Step|@{InitTotal}+@{ActionMod}-@{Wounds}} ]] + [[ ?{Karma #|0} ]] Karma, [[ ?{Strain #|0} ]] Strain
+--Step|[[ ?{Step|@{InitTotal}-@{Wounds}} ]] + [[ ?{Karma #|0} ]] Karma, [[ ?{Strain #|0} ]] Strain
 --Result|**[[ [TRKR] [[{1e3, 8}<[[{?{Step} - 11, 0}kh1 % 11]] + floor([[{?{Step} - 11, 0}kh1]] / 11)]]d20! + [[{2, 4, 5, 6, 7}=[[{?{Step}, 0}kh1 % 11]] + {1, 3}=[[{?{Step}, 0}kh1]] + {1e3, 3}=[[{?{Step} - 11, 0}kh1 % 11]] * 2]]d[[{{(?{Step} - 1) * 2, 4}kh1, {12} }kl1]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * (1 - {3, 6, 10}=[[{?{Step}, 0}kh1 % 11]] + {1, 4, 8}=[[{?{Step}, 0}kh1 % 11]])]]d[[10 - {4, 5, 8, 9}=[[{?{Step}, 0}kh1 % 11]] * 4]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * ({0, 5, 7, 9}=[[{?{Step}, 1}kh1 % 11]] + 2 * {6, 10}=[[{?{Step}, 0}kh1 % 11]])]]d8! - [[{1, 2}=[[{?{Step}, 0}kh1]] * (3 - [[{?{Step}, 0}kh1]])]] + [?{Karma #|0} Karma] [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep} - 11, 0}kh1 % 11]] + floor([[{@{KarmaStep} - 11, 0}kh1]] / 11))]]d20! + [[?{Karma #} * ({2, 4, 5, 6, 7}=[[{@{KarmaStep}, 0}kh1 % 11]] + {1, 3}=[[{@{KarmaStep}, 0}kh1]] + {1e3, 3}=[[{@{KarmaStep} - 11, 0}kh1 % 11]] * 2)]]d[[{{(@{KarmaStep} - 1) * 2, 4}kh1, {12} }kl1]]! + [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep}, 0}kh1]] * (1 - {3, 6, 10}=[[{@{KarmaStep}, 0}kh1 % 11]] + {1, 4, 8}=[[{@{KarmaStep}, 0}kh1 % 11]]))]]d[[10 - {4, 5, 8, 9}=[[{@{KarmaStep}, 0}kh1 % 11]] * 4]]! + [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep}, 0}kh1]] * ({0, 5, 7, 9}=[[{@{KarmaStep}, 1}kh1 % 11]] + 2 * {6, 10}=[[{@{KarmaStep}, 0}kh1 % 11]]))]]d8! - [[?{Karma #} * ({1, 2}=[[{@{KarmaStep}, 0}kh1]] * (3 - [[{@{KarmaStep}, 0}kh1]]))]] ]]**
 }}
 !modattr {{
@@ -397,16 +397,20 @@ Author: Dougansf -->
     <span class="sheet-tab sheet-tab3" style='line-height: 20px;'>SKILLS</span>
     <input type="radio" class="sheet-tab sheet-tab4" name="attr_core-tab" value="4" title="Knacks" /> 
     <span class="sheet-tab sheet-tab4" style='line-height: 20px;'>KNACKS</span>
-    <input type="radio" class="sheet-tab sheet-tab5" name="attr_core-tab" value="5" title="Equipment" /> 
-    <span class="sheet-tab sheet-tab5" style='line-height: 20px;'>EQUIPMENT</span>
-    <input type="radio" class="sheet-tab sheet-tab6" name="attr_core-tab" value="6" title="Matrixes" /> 
-    <span class="sheet-tab sheet-tab6" style='line-height: 20px;'>MATRIXES</span>
-    <input type="radio" class="sheet-tab sheet-tab7" name="attr_core-tab" value="7" title="Grimoire" /> 
-    <span class="sheet-tab sheet-tab7" style='line-height: 20px;'>GRIMOIRE</span>
-    <input type="radio" class="sheet-tab sheet-tab8" name="attr_core-tab" value="8" title="Treasury" /> 
-    <span class="sheet-tab sheet-tab8" style='line-height: 20px;'>TREASURY</span>
-    <input type="radio" class="sheet-tab sheet-tab9" name="attr_core-tab" value="9" title="NPC" /> 
-    <span class="sheet-tab sheet-tab9" style='line-height: 20px;'>NPC</span>
+    <input type="radio" class="sheet-tab sheet-tab6" name="attr_core-tab" value="6" title="Equipment" /> 
+    <span class="sheet-tab sheet-tab6" style='line-height: 20px;'>EQUIPMENT</span>
+    <input type="radio" class="sheet-tab sheet-tab9" name="attr_core-tab" value="9" title="Treasury" /> 
+    <span class="sheet-tab sheet-tab9" style='line-height: 20px;'>TREASURY</span>
+    <p></p>
+    <input type="radio" class="sheet-tab sheet-tab5" name="attr_core-tab" value="5" title="Questor" /> 
+    <span class="sheet-tab sheet-tab5" style='line-height: 20px;'>QUESTOR</span>
+    <input type="radio" class="sheet-tab sheet-tab7" name="attr_core-tab" value="7" title="Matrixes" /> 
+    <span class="sheet-tab sheet-tab7" style='line-height: 20px;'>MATRIXES</span>
+    <input type="radio" class="sheet-tab sheet-tab8" name="attr_core-tab" value="8" title="Grimoire" /> 
+    <span class="sheet-tab sheet-tab8" style='line-height: 20px;'>GRIMOIRE</span>
+
+    <input type="radio" class="sheet-tab sheet-tab10" name="attr_core-tab" value="10" title="NPC" /> 
+    <span class="sheet-tab sheet-tab10" style='line-height: 20px;'>NPC</span>
     <!-- End Tab Setup -->
 <div class="sheet-section-attributes"><!-- Attributes Tab -->
 <p></p>
@@ -456,11 +460,11 @@ Author: Dougansf -->
                             <input name="attr_DexVal" type="number" value="10" style="width: 41px;"/>
                         </td>
                         <td style="vertical-align: bottom; text-align: center;">
-                            <strong>Base</strong>
+                            <strong>Base</strong> <br/>
                             <input name="attr_DexStep" type="number" value="5" style="width: 35px;"/>
                         </td>
                         <td style="vertical-align: bottom; text-align: center;">
-                            <strong>Modifier</strong>
+                            <strong>Modifier</strong> <br/>
                             <input name="attr_DexMod" type="number" value="0" style="width: 35px;"/>
                         </td>
                         <td style="vertical-align: bottom; text-align: center;">
@@ -871,7 +875,7 @@ Author: Dougansf -->
 --bodyfontsize|12px
 --charid|@{character_id}
 --name|**@{Name} Initiative**
---Step|[[ ?{Step|@{InitTotal}+@{ActionMod}-@{Wounds}} ]] + [[ ?{Karma #|0} ]] Karma, [[ ?{Strain #|0} ]] Strain
+--Step|[[ ?{Step|@{InitTotal}-@{Wounds}} ]] + [[ ?{Karma #|0} ]] Karma, [[ ?{Strain #|0} ]] Strain
 --Result|**[[ [TRKR] [[{1e3, 8}<[[{?{Step} - 11, 0}kh1 % 11]] + floor([[{?{Step} - 11, 0}kh1]] / 11)]]d20! + [[{2, 4, 5, 6, 7}=[[{?{Step}, 0}kh1 % 11]] + {1, 3}=[[{?{Step}, 0}kh1]] + {1e3, 3}=[[{?{Step} - 11, 0}kh1 % 11]] * 2]]d[[{{(?{Step} - 1) * 2, 4}kh1, {12} }kl1]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * (1 - {3, 6, 10}=[[{?{Step}, 0}kh1 % 11]] + {1, 4, 8}=[[{?{Step}, 0}kh1 % 11]])]]d[[10 - {4, 5, 8, 9}=[[{?{Step}, 0}kh1 % 11]] * 4]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * ({0, 5, 7, 9}=[[{?{Step}, 1}kh1 % 11]] + 2 * {6, 10}=[[{?{Step}, 0}kh1 % 11]])]]d8! - [[{1, 2}=[[{?{Step}, 0}kh1]] * (3 - [[{?{Step}, 0}kh1]])]] + [?{Karma #|0} Karma] [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep} - 11, 0}kh1 % 11]] + floor([[{@{KarmaStep} - 11, 0}kh1]] / 11))]]d20! + [[?{Karma #} * ({2, 4, 5, 6, 7}=[[{@{KarmaStep}, 0}kh1 % 11]] + {1, 3}=[[{@{KarmaStep}, 0}kh1]] + {1e3, 3}=[[{@{KarmaStep} - 11, 0}kh1 % 11]] * 2)]]d[[{{(@{KarmaStep} - 1) * 2, 4}kh1, {12} }kl1]]! + [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep}, 0}kh1]] * (1 - {3, 6, 10}=[[{@{KarmaStep}, 0}kh1 % 11]] + {1, 4, 8}=[[{@{KarmaStep}, 0}kh1 % 11]]))]]d[[10 - {4, 5, 8, 9}=[[{@{KarmaStep}, 0}kh1 % 11]] * 4]]! + [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep}, 0}kh1]] * ({0, 5, 7, 9}=[[{@{KarmaStep}, 1}kh1 % 11]] + 2 * {6, 10}=[[{@{KarmaStep}, 0}kh1 % 11]]))]]d8! - [[?{Karma #} * ({1, 2}=[[{@{KarmaStep}, 0}kh1]] * (3 - [[{@{KarmaStep}, 0}kh1]]))]] ]]**
 }}
 !modattr {{
@@ -2601,6 +2605,345 @@ Ranged Weapons
         </td>
     </tr>
 </div>
+<div class="sheet-section-questor"> <!-- Questor Tab -->
+<p></p>
+    <table style="width: 725px; height: 80%; background-color: #FFFFFF;" border="5" cellspacing="1" cellpadding="1">
+        <tr style="height: 10px; color: #FFFFFF; background-color: #1d5dc4;">
+            <td style="text-align: left; vertical-align: bottom; width: 100px">
+                <strong>
+                    PASSION
+                </strong>
+            </td>
+            <td style="vertical-align: bottom; text-align: center; ">
+                <strong>
+                    QUESTOR RANK
+                </strong>
+            </td>
+            <td style="vertical-align: bottom; text-align: center; ">
+                <strong>
+                    DEVOTION DIE STEP
+                </strong>
+            </td>
+            <td style="vertical-align: bottom; text-align: center; ">
+                <strong>
+                    DEVOTION POINTS
+                </strong>
+            </td>
+        </tr>
+        <tr style="height: 10px">
+            <td style="text-align: left; width: 160px">
+                <input name="attr_PassionName" type="text" style= "width: 140px"/>
+            </td>
+            <td style="text-align: center;">
+                <input name="attr_DevRank" type="number" value="0" style="width: 41px;">
+            </td>
+            <td style="text-align: center;">
+                <input name="attr_DevStep" type="number" value="0" style="width: 41px;">
+            </td>
+            <td style="text-align: center;">
+                <strong>Max / Current</strong> <br/>
+                <input style="background-color: #d9d9d9;" name="attr_DevPoint_max" type="number" value="0" style="width: 40px;"/>
+                <strong>/</strong>
+                <input style="background-color: #99ceff;" name="attr_DevPoint" type="number" value="0" style="width: 40px;"/>
+                <button name="roll_DevPoint" type="roll" value="!power {{
+--format|blue
+--titlefont|arial
+--titlefontsize|16px
+--bodyfontsize|12px
+--charid|@{character_id}
+--name|**@{Name} Devotion Point**
+--Spent|[[ ?{Devotion Points #|1} ]] Devotion Point
+--Result|** [[ [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep} - 11, 0}kh1 % 11]] + floor([[{@{DevStep} - 11, 0}kh1]] / 11))]]d20! + [[?{Devotion Points #} * ({2, 4, 5, 6, 7}=[[{@{DevStep}, 0}kh1 % 11]] + {1, 3}=[[{@{DevStep}, 0}kh1]] + {1e3, 3}=[[{@{DevStep} - 11, 0}kh1 % 11]] * 2)]]d[[{{(@{DevStep} - 1) * 2, 4}kh1, {12} }kl1]]! + [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep}, 0}kh1]] * (1 - {3, 6, 10}=[[{@{DevStep}, 0}kh1 % 11]] + {1, 4, 8}=[[{@{DevStep}, 0}kh1 % 11]]))]]d[[10 - {4, 5, 8, 9}=[[{@{DevStep}, 0}kh1 % 11]] * 4]]! + [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep}, 0}kh1]] * ({0, 5, 7, 9}=[[{@{DevStep}, 1}kh1 % 11]] + 2 * {6, 10}=[[{@{DevStep}, 0}kh1 % 11]]))]]d8! - [[?{Devotion Points #} * ({1, 2}=[[{@{DevStep}, 0}kh1]] * (3 - [[{@{DevStep}, 0}kh1]]))]] ]]**
+}}
+!modattr {{
+--silent
+--charid @{character_id}
+--DevPoint|-?{Devotion Points #}
+}}">
+                </button>
+            </td>
+        </tr>
+        <tbody>
+            <tr>
+                <td style="text-align: middle; vertical-align: middle;">
+                    <strong>
+                        DEVOTION ABILITY 1
+                    </strong>
+                </td>
+                <td colspan="3">
+                    <input name="attr_DevAbil1" type="text" style= "width: 550px"/>
+                </td>
+            </tr>
+            <tr>
+                <td style="text-align: middle; vertical-align: middle;">
+                    <strong>
+                        DEVOTION ABILITY 2
+                    </strong>
+                </td>
+                <td colspan="3">
+                    <input name="attr_DevAbil2" type="text" style= "width: 550px"/>
+                </td>
+            </tr>
+            <tr>
+                <td style="text-align: middle; vertical-align: middle;">
+                    <strong>
+                        DEVOTION ABILITY 3
+                    </strong>
+                </td>
+                <td colspan="3">
+                    <input name="attr_DevAbil3" type="text" style= "width: 550px"/>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+<fieldset class="repeating_devotions">
+<table style="width: 725px; height: 100px;" border="1">
+<tbody>
+    <tr>
+        <td>
+            <table style="width: 100%; height: 100%; background-color: #FFFFFF;" border="5" cellspacing="1" cellpadding="1">
+                <tbody>
+                    <tr style="color: #FFFFFF; background-color: #1d5dc4;">
+                        <td style="text-align: left; vertical-align: bottom; width: 140px;">
+                            <strong>
+                                GRANTED DEVOTION
+                            </strong>
+                        </td>
+                        <td style="vertical-align: bottom; text-align: center; width: 40px">
+                            <strong>
+                                STEP
+                            </strong>
+                        </td>
+                        <td style="vertical-align: bottom; text-align: center; width: 40px">
+                            <strong>
+                                RANK
+                            </strong>
+                        </td>
+                        <td style="vertical-align: bottom; text-align: center; width: 40px">
+                            <strong>
+                                BONUS
+                            </strong>
+                        </td>
+                        <td style="vertical-align: bottom; text-align: center; width: 40px">
+                            <strong>
+                                ATTR
+                            </strong>
+                        </td>
+                        <td style="vertical-align: bottom; text-align: center; width: 40px">
+                            <strong>
+                                STRAIN
+                            </strong>
+                        </td>
+                        <td style="vertical-align: bottom; text-align: center; width: 70px">
+                            <strong>
+                                ACTION
+                            </strong>
+                        </td>
+                        <td style="vertical-align: bottom; text-align: center; width: 75px">
+                            <strong>
+                                Vs DEFENSE
+                            </strong>
+                        </td>
+                        <td style="vertical-align: bottom; text-align: center; width: 170px">
+                            <strong>
+                                DURATION
+                            </strong>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="text-align: left; vertical-align: top;">
+                            <input name="attr_GDName" type="text" style= "width: 135px"/>
+                        </td>
+                        <td style="vertical-align: top; text-align: center;">
+                            <input disabled="disabled" name="attr_GDStep" type="number" value="@{AttrStep}+@{GDRank}+@{GDBonus}" style="width: 41px;"/>
+                        </td>
+                        <td style="vertical-align: top; text-align: center;">
+                            <input name="attr_GDRank" type="number" value="0" style="width: 41px;"/>
+                        </td>
+                        <td style="vertical-align: top; text-align: center;">
+                            <input name="attr_GDBonus" type="number" value="0" style="width: 41px;"/>
+                        </td>
+                        <td style="vertical-align: top; text-align: left;">
+                            <select class="AttrStep" name="attr_AttrStep" style= "width: 63px">
+                                <option value="0">
+                                    None
+                                </option>
+                                <option value="@{DexStep}+@{DexMod}">
+                                    DEX
+                                </option>
+                                <option value="@{StrStep}+@{StrMod}">
+                                    STR
+                                </option>
+                                <option value="@{TouStep}+@{TouMod}">
+                                    TOU
+                                </option>
+                                <option value="@{PerStep}+@{PerMod}">
+                                    PER
+                                </option>
+                                <option value="@{WilStep}+@{WilMod}">
+                                    WIL
+                                </option>
+                                <option value="@{ChaStep}+@{ChaMod}">
+                                    CHA
+                                </option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: top; text-align: center;">
+                            <input name="attr_GDStrain" type="number" value="0" style="width: 41px;"/>
+                        </td>
+                        <td style="vertical-align: top; text-align: center;">
+                            <select class="GDAction" name="attr_GDAction" style= "width: 90px">
+                                <option value="Free">
+                                    Free
+                                </option>
+                                <option value="Simple">
+                                    Simple
+                                </option>
+                                <option value="Standard">
+                                    Standard
+                                </option>
+                                <option value="Sustained">
+                                    Sustained
+                                </option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: top; text-align: center;">
+                            <select class="GDDefense" name="attr_GDDefense" style= "width: 80px">
+                                <option value="None">
+                                    None
+                                </option>
+                                <option value="@{target|PD}">
+                                    Physical
+                                </option>
+                                <option value="@{target|MD}">
+                                    Mystic
+                                </option>
+                                <option value="@{target|SD}">
+                                    Social
+                                </option>
+                            </select>
+                        </td>
+                        
+                        <td style="vertical-align: top; text-align: center;" rowspan="2">
+                                <input name="attr_GDDurationNumber" type="number" style="vertical-align: top; width: 41px;" value="0">
+                                <strong>+</strong>
+                                <select class="GDDurationRank" name="attr_GDDurationRank" style= "width: 62px">
+                                    <option value="0">
+                                        Zero
+                                    </option>
+                                    <option value="@{GDRank}">
+                                        Rank
+                                    </option>
+                                </select>
+                                <strong>=</strong><br/>
+                                <input disabled="disabled" name="attr_GDDurationTotal" type="number" style="vertical-align: top; width: 38px;" value="@{GDDurationNumber}+@{GDDurationRank}">
+                                <select class="GDDurationIncrement" name="attr_GDDurationIncrement" style= "width: 77px">
+                                    <option value="Rounds">
+                                        Rounds
+                                    </option>
+                                    <option value="Minutes">
+                                        Minutes
+                                    </option>
+                                    <option value="Hours">
+                                        Hours
+                                    </option>
+                                    <option value="Days">
+                                        Days
+                                    </option>
+                                </select>
+                            </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: top; text-align: center;">
+                            Public / GM Only / Target<br/>
+                            <span style="background-color: #ff0000;">
+                                <button name="roll_GDStep" type="roll" value="!power {{
+!power {{
+--format|blue
+--titlefont|arial
+--titlefontsize|16px
+--bodyfontsize|12px
+--charid|@{character_id}
+--name|**@{Name} @{GDName}**
+--Step|[[ ?{Step|@{GDStep}+@{ActionMod}-@{Wounds}} ]] + [[ ?{Devotion Points #|0} ]] Devotion Points, [[ ?{Strain #|@{GDStrain}} ]] Strain
+--Result|**[[ [[{1e3, 8}<[[{?{Step} - 11, 0}kh1 % 11]] + floor([[{?{Step} - 11, 0}kh1]] / 11)]]d20! + [[{2, 4, 5, 6, 7}=[[{?{Step}, 0}kh1 % 11]] + {1, 3}=[[{?{Step}, 0}kh1]] + {1e3, 3}=[[{?{Step} - 11, 0}kh1 % 11]] * 2]]d[[{{(?{Step} - 1) * 2, 4}kh1, {12} }kl1]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * (1 - {3, 6, 10}=[[{?{Step}, 0}kh1 % 11]] + {1, 4, 8}=[[{?{Step}, 0}kh1 % 11]])]]d[[10 - {4, 5, 8, 9}=[[{?{Step}, 0}kh1 % 11]] * 4]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * ({0, 5, 7, 9}=[[{?{Step}, 1}kh1 % 11]] + 2 * {6, 10}=[[{?{Step}, 0}kh1 % 11]])]]d8! - [[{1, 2}=[[{?{Step}, 0}kh1]] * (3 - [[{?{Step}, 0}kh1]])]] + [?{Devotion Points #|0} Devotion Points] [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep} - 11, 0}kh1 % 11]] + floor([[{@{DevStep} - 11, 0}kh1]] / 11))]]d20! + [[?{Devotion Points #} * ({2, 4, 5, 6, 7}=[[{@{DevStep}, 0}kh1 % 11]] + {1, 3}=[[{@{DevStep}, 0}kh1]] + {1e3, 3}=[[{@{DevStep} - 11, 0}kh1 % 11]] * 2)]]d[[{{(@{DevStep} - 1) * 2, 4}kh1, {12} }kl1]]! + [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep}, 0}kh1]] * (1 - {3, 6, 10}=[[{@{DevStep}, 0}kh1 % 11]] + {1, 4, 8}=[[{@{DevStep}, 0}kh1 % 11]]))]]d[[10 - {4, 5, 8, 9}=[[{@{DevStep}, 0}kh1 % 11]] * 4]]! + [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep}, 0}kh1]] * ({0, 5, 7, 9}=[[{@{DevStep}, 1}kh1 % 11]] + 2 * {6, 10}=[[{@{DevStep}, 0}kh1 % 11]]))]]d8! - [[?{Devotion Points #} * ({1, 2}=[[{@{DevStep}, 0}kh1]] * (3 - [[{@{DevStep}, 0}kh1]]))]] ]]**
+--?? @{GDDurationTotal} > 0 ?? Duration| @{GDDurationTotal} @{GDDurationIncrement}
+}}
+!modattr {{
+--silent
+--charid @{character_id}
+--DevPoint|-?{Devotion Points #}
+--Uncon|?{Strain #}
+}}">
+                                </button>
+                            </span>
+                            &nbsp;
+                            <strong>/</strong>
+                            <span style="background-color: #f4c542;">
+                                <button name="roll_GDStepGM" type="roll" value="/w gm @{Name} @{GDName}
+!power {{
+--whisper|GM
+--format|blue
+--titlefont|arial
+--titlefontsize|16px
+--bodyfontsize|12px
+--charid|@{character_id}
+--name|**@{Name} @{GDName}**
+--Step|[[ ?{Step|@{GDStep}+@{ActionMod}-@{Wounds}} ]] + [[ ?{Devotion Points #|0} ]] Devotion Points, [[ ?{Strain #|@{GDStrain}} ]] Strain
+--Result|**[[ [[{1e3, 8}<[[{?{Step} - 11, 0}kh1 % 11]] + floor([[{?{Step} - 11, 0}kh1]] / 11)]]d20! + [[{2, 4, 5, 6, 7}=[[{?{Step}, 0}kh1 % 11]] + {1, 3}=[[{?{Step}, 0}kh1]] + {1e3, 3}=[[{?{Step} - 11, 0}kh1 % 11]] * 2]]d[[{{(?{Step} - 1) * 2, 4}kh1, {12} }kl1]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * (1 - {3, 6, 10}=[[{?{Step}, 0}kh1 % 11]] + {1, 4, 8}=[[{?{Step}, 0}kh1 % 11]])]]d[[10 - {4, 5, 8, 9}=[[{?{Step}, 0}kh1 % 11]] * 4]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * ({0, 5, 7, 9}=[[{?{Step}, 1}kh1 % 11]] + 2 * {6, 10}=[[{?{Step}, 0}kh1 % 11]])]]d8! - [[{1, 2}=[[{?{Step}, 0}kh1]] * (3 - [[{?{Step}, 0}kh1]])]] + [?{Devotion Points #|0} Devotion Points] [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep} - 11, 0}kh1 % 11]] + floor([[{@{DevStep} - 11, 0}kh1]] / 11))]]d20! + [[?{Devotion Points #} * ({2, 4, 5, 6, 7}=[[{@{DevStep}, 0}kh1 % 11]] + {1, 3}=[[{@{DevStep}, 0}kh1]] + {1e3, 3}=[[{@{DevStep} - 11, 0}kh1 % 11]] * 2)]]d[[{{(@{DevStep} - 1) * 2, 4}kh1, {12} }kl1]]! + [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep}, 0}kh1]] * (1 - {3, 6, 10}=[[{@{DevStep}, 0}kh1 % 11]] + {1, 4, 8}=[[{@{DevStep}, 0}kh1 % 11]]))]]d[[10 - {4, 5, 8, 9}=[[{@{DevStep}, 0}kh1 % 11]] * 4]]! + [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep}, 0}kh1]] * ({0, 5, 7, 9}=[[{@{DevStep}, 1}kh1 % 11]] + 2 * {6, 10}=[[{@{DevStep}, 0}kh1 % 11]]))]]d8! - [[?{Devotion Points #} * ({1, 2}=[[{@{DevStep}, 0}kh1]] * (3 - [[{@{DevStep}, 0}kh1]]))]] ]]**
+--?? @{GDDurationTotal} > 0 ?? Duration| @{GDDurationTotal} @{GDDurationIncrement}
+}}
+!modattr {{
+--silent
+--charid @{character_id}
+--DevPoint|-?{Devotion Points #}
+--Uncon|?{Strain #}
+}}">
+                                </button>
+                            </span>
+                            &nbsp;
+                            <strong>/</strong>
+                            <span style="background-color: #004fce;">
+                                <button name="roll_GDTarget" type="roll" value="!power {{
+--format|blue
+--titlefont|arial
+--titlefontsize|16px
+--bodyfontsize|12px
+--charid|@{character_id}
+--name|**@{Name} @{GDName}**
+--Step|[[ ?{Step|@{GDStep}+@{ActionMod}-@{Wounds}} ]] + [[ ?{Devotion Points #|0} ]] Devotion Points, [[ ?{Strain #|@{GDStrain}} ]] Strain
+--Result:|**[^Result.base]**
+--Successes| [[ floor(([$Result] { [[{1e3, 8}<[[{?{Step} - 11, 0}kh1 % 11]] + floor([[{?{Step} - 11, 0}kh1]] / 11)]]d20! + [[{2, 4, 5, 6, 7}=[[{?{Step}, 0}kh1 % 11]] + {1, 3}=[[{?{Step}, 0}kh1]] + {1e3, 3}=[[{?{Step} - 11, 0}kh1 % 11]] * 2]]d[[{{(?{Step} - 1) * 2, 4}kh1, {12} }kl1]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * (1 - {3, 6, 10}=[[{?{Step}, 0}kh1 % 11]] + {1, 4, 8}=[[{?{Step}, 0}kh1 % 11]])]]d[[10 - {4, 5, 8, 9}=[[{?{Step}, 0}kh1 % 11]] * 4]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * ({0, 5, 7, 9}=[[{?{Step}, 1}kh1 % 11]] + 2 * {6, 10}=[[{?{Step}, 0}kh1 % 11]])]]d8! - [[{1, 2}=[[{?{Step}, 0}kh1]] * (3 - [[{?{Step}, 0}kh1]])]] + [?{Devotion Points #|0} Devotion Points] [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep} - 11, 0}kh1 % 11]] + floor([[{@{DevStep} - 11, 0}kh1]] / 11))]]d20! + [[?{Devotion Points #} * ({2, 4, 5, 6, 7}=[[{@{DevStep}, 0}kh1 % 11]] + {1, 3}=[[{@{DevStep}, 0}kh1]] + {1e3, 3}=[[{@{DevStep} - 11, 0}kh1 % 11]] * 2)]]d[[{{(@{DevStep} - 1) * 2, 4}kh1, {12} }kl1]]! + [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep}, 0}kh1]] * (1 - {3, 6, 10}=[[{@{DevStep}, 0}kh1 % 11]] + {1, 4, 8}=[[{@{DevStep}, 0}kh1 % 11]]))]]d[[10 - {4, 5, 8, 9}=[[{@{DevStep}, 0}kh1 % 11]] * 4]]! + [[?{Devotion Points #} * ({1e3, 8}<[[{@{DevStep}, 0}kh1]] * ({0, 5, 7, 9}=[[{@{DevStep}, 1}kh1 % 11]] + 2 * {6, 10}=[[{@{DevStep}, 0}kh1 % 11]]))]]d8! - [[?{Devotion Points #} * ({1, 2}=[[{@{DevStep}, 0}kh1]] * (3 - [[{@{DevStep}, 0}kh1]]))]] } - @{GDDefense}) / 5)+1 ]]
+--?? @{GDDurationTotal} > 0 ?? Duration| @{GDDurationTotal} @{GDDurationIncrement}
+}}
+!modattr {{
+--silent
+--charid @{character_id}
+--DevPoint|-?{Devotion Points #}
+--Uncon|?{Strain #}
+}}">
+                                </button>
+                            </span>
+                        </td>
+                        <td style="text-align: center; vertical-align: top;">
+                            <strong>
+                                NOTES
+                            </strong>
+                            <button name="roll_GDDesc" type="roll" value="@{GDName}: @{GDDesc}">
+                            </button>
+                        </td>
+                        <td style="text-align: left; vertical-align: top;" colspan="6" rowspan="1">
+                            <textarea class="text-input-noback" style="width:90%; height:20px" name="attr_GDDesc"></textarea>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </td>
+    </tr>
+</tbody>
+</table>
+</fieldset>
+</div>
 <div class="sheet-section-matrixes"> <!-- Matrixes Tab -->
 <p></p>
 <table style="width: 725px; height: 80%; background-color: #FFFFFF;" border="5" cellspacing="1" cellpadding="1">
@@ -3271,6 +3614,7 @@ Ranged Weapons
     <span class="sheet-tab sheet-tab55">Circle 5</span>
     <input type="radio" name="attr_tab" class="sheet-tab sheet-tab56" value="56" title="Circle6" />
     <span class="sheet-tab sheet-tab56">Circle 6</span>
+    <p></p>
     <input type="radio" name="attr_tab" class="sheet-tab sheet-tab57" value="57" title="Circle7" />
     <span class="sheet-tab sheet-tab57">Circle 7</span>
     <input type="radio" name="attr_tab" class="sheet-tab sheet-tab58" value="58" title="Circle8" />
@@ -5366,11 +5710,11 @@ Ranged Weapons
                             </strong>
                         </td>
                         <td style="vertical-align: bottom; text-align: center">
-                            <strong>Base</strong>
+                            <strong>Base</strong> <br/>
                             <input name="attr_DexStep" type="number" value="5" style="width: 41px;"/>
                         </td>
                         <td style="vertical-align: bottom; text-align: center;">
-                            <strong>Modifier</strong>
+                            <strong>Modifier</strong> 
                             <input name="attr_DexMod" type="number" value="0" style="width: 41px;"/>
                         </td>
                         <td style="vertical-align: bottom; text-align: center;">
@@ -5753,7 +6097,7 @@ Ranged Weapons
 --bodyfontsize|12px
 --charid|@{character_id}
 --name|**@{Name} Initiative**
---Step|[[ ?{Step|@{InitTotal}+@{ActionMod}-@{Wounds}} ]] + [[ ?{Karma #|0} ]] Karma, [[ ?{Strain #|0} ]] Strain
+--Step|[[ ?{Step|@{InitTotal}-@{Wounds}} ]] + [[ ?{Karma #|0} ]] Karma, [[ ?{Strain #|0} ]] Strain
 --Result|**[[ [TRKR] [[{1e3, 8}<[[{?{Step} - 11, 0}kh1 % 11]] + floor([[{?{Step} - 11, 0}kh1]] / 11)]]d20! + [[{2, 4, 5, 6, 7}=[[{?{Step}, 0}kh1 % 11]] + {1, 3}=[[{?{Step}, 0}kh1]] + {1e3, 3}=[[{?{Step} - 11, 0}kh1 % 11]] * 2]]d[[{{(?{Step} - 1) * 2, 4}kh1, {12} }kl1]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * (1 - {3, 6, 10}=[[{?{Step}, 0}kh1 % 11]] + {1, 4, 8}=[[{?{Step}, 0}kh1 % 11]])]]d[[10 - {4, 5, 8, 9}=[[{?{Step}, 0}kh1 % 11]] * 4]]! + [[{1e3, 8}<[[{?{Step}, 0}kh1]] * ({0, 5, 7, 9}=[[{?{Step}, 1}kh1 % 11]] + 2 * {6, 10}=[[{?{Step}, 0}kh1 % 11]])]]d8! - [[{1, 2}=[[{?{Step}, 0}kh1]] * (3 - [[{?{Step}, 0}kh1]])]] + [?{Karma #|0} Karma] [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep} - 11, 0}kh1 % 11]] + floor([[{@{KarmaStep} - 11, 0}kh1]] / 11))]]d20! + [[?{Karma #} * ({2, 4, 5, 6, 7}=[[{@{KarmaStep}, 0}kh1 % 11]] + {1, 3}=[[{@{KarmaStep}, 0}kh1]] + {1e3, 3}=[[{@{KarmaStep} - 11, 0}kh1 % 11]] * 2)]]d[[{{(@{KarmaStep} - 1) * 2, 4}kh1, {12} }kl1]]! + [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep}, 0}kh1]] * (1 - {3, 6, 10}=[[{@{KarmaStep}, 0}kh1 % 11]] + {1, 4, 8}=[[{@{KarmaStep}, 0}kh1 % 11]]))]]d[[10 - {4, 5, 8, 9}=[[{@{KarmaStep}, 0}kh1 % 11]] * 4]]! + [[?{Karma #} * ({1e3, 8}<[[{@{KarmaStep}, 0}kh1]] * ({0, 5, 7, 9}=[[{@{KarmaStep}, 1}kh1 % 11]] + 2 * {6, 10}=[[{@{KarmaStep}, 0}kh1 % 11]]))]]d8! - [[?{Karma #} * ({1, 2}=[[{@{KarmaStep}, 0}kh1]] * (3 - [[{@{KarmaStep}, 0}kh1]]))]] ]]**
 }}
 !modattr {{
diff --git a/Earthdawn-4E/ED4Ev1.4.jpg b/Earthdawn-4E/ED4Ev1.4.jpg
deleted file mode 100644
index 06d6fed12f..0000000000
Binary files a/Earthdawn-4E/ED4Ev1.4.jpg and /dev/null differ
diff --git a/Earthdawn-4E/ED4Ev2.0.jpg b/Earthdawn-4E/ED4Ev2.0.jpg
deleted file mode 100644
index 40c93f9e36..0000000000
Binary files a/Earthdawn-4E/ED4Ev2.0.jpg and /dev/null differ
diff --git a/Earthdawn-4E/README.md b/Earthdawn-4E/README.md
index 3ac1948a60..cf95cc902d 100644
--- a/Earthdawn-4E/README.md
+++ b/Earthdawn-4E/README.md
@@ -5,12 +5,10 @@ DISCLAIMER: This is NOT a Character Builder.  It does very little math for you.
 
 You will need a Pro account in order to use the rolls on this Character Sheet.
 They are written to work with the following API scripts:
-- ChatSetAttr version 1.6 or later (Available on the API Script Library)
-- Power Cards 3.5.0 or later (https://gist.github.com/Sky-Captain-13/452330a3d926b32da49c)
+- ChatSetAttr version 1.6 (Available on the API Script Library)
+- Power Cards 3.5.0 (https://gist.github.com/Sky-Captain-13/452330a3d926b32da49c)
 
 When you make a new Character, tab through all the entry boxes to create the attributes on the Attributes and Abilities Tab.
-The sheet will determine your Defenses and Armors based on your Equipment + Base + Modifiers.  Most characters have a Base Physical Armor of 0.
-
 When you set up a Token, I recommend setting the bars to track "Wounds," "Karma," and "Uncon" (Damage).
 
 Power Cards will require you to create a Handout named "PowerCard Formats" that is visible to all Players with the following information.  You can change the color numbers (#XXXXXX) if you like, but do not change the names (blue, green, etc).
diff --git a/Earthdawn-4E/Version 2.3.JPG b/Earthdawn-4E/Version 2.3.JPG
new file mode 100644
index 0000000000..8378fe1c40
Binary files /dev/null and b/Earthdawn-4E/Version 2.3.JPG differ