diff --git a/Exalted2e/exalted2e.css b/Exalted2e/exalted2e.css
index 7e9730f272..4396c7e1f4 100644
--- a/Exalted2e/exalted2e.css
+++ b/Exalted2e/exalted2e.css
@@ -1,4 +1,68 @@
-.charsheet
+.sheet-rolltemplate-joinbattle > div > img,
+.sheet-rolltemplate-joindebate > div > img,
+.sheet-rolltemplate-joinwar > div > img {
+    height: 45px;
+    float: left;
+    margin: 3px;
+}
+
+.sheet-rolltemplate-attack > div,
+.sheet-rolltemplate-damage > div {
+    background-image: url(http://i.imgur.com/X0RX9Qu.png);
+    background-size: contain;
+    background-position: right center;
+    background-repeat: no-repeat;
+}
+
+.sheet-rolltemplate-damage > div { background-image: url(http://i.imgur.com/t9YYFMu.png); }
+
+.sheet-rolltemplate-joinbattle > div > h3,
+.sheet-rolltemplate-joindebate > div > h3,
+.sheet-rolltemplate-joinwar > div > h3,
+.sheet-rolltemplate-attack > div > h3,
+.sheet-rolltemplate-damage > div > h3 {
+    color: #d6c110;
+    font-style: italic;
+    text-align: left;
+}
+
+.sheet-rolltemplate-joindebate > div > h3 { color: #90c1a5; }
+.sheet-rolltemplate-joinwar > div > h3 { color: #f69010; }
+.sheet-rolltemplate-attack > div > h3 { color: #d63010; }
+.sheet-rolltemplate-damage > div > h3 { color: #b39d9c; }
+
+.sheet-rolltemplate-attack h3.sheet-unnamed,
+.sheet-rolltemplate-damage h3.sheet-unnamed { text-align: center; }
+
+.sheet-rolltemplate-joinbattle > div > div,
+.sheet-rolltemplate-joindebate > div > div,
+.sheet-rolltemplate-joinwar > div > div,
+.sheet-rolltemplate-attack > div > div,
+.sheet-rolltemplate-damage > div > div {
+    text-align: right;
+}
+
+.sheet-rolltemplate-joinbattle > div,
+.sheet-rolltemplate-joindebate > div,
+.sheet-rolltemplate-joinwar > div,
+.sheet-rolltemplate-attack > div,
+.sheet-rolltemplate-damage > div {
+    font-weight: bold;
+    text-align: center;
+}
+
+.sheet-rolltemplate-damage span.sheet-minimum + span.sheet-regular { display: none; }
+.sheet-rolltemplate-damage span.sheet-damage-type {
+    display: inline-block;
+    font-weight: bolder;
+    text-transform: lowercase;
+    font-variant: small-caps;
+    background-color: #88ffff;
+    padding: 0 3px 0 3px;
+}
+.sheet-rolltemplate-damage span.sheet-damage-type::first-letter { text-transform: uppercase; }
+
+.charsheet
 {
     background-color: #fff;
     overflow: hidden;
diff --git a/Exalted2e/exalted2e.html b/Exalted2e/exalted2e.html
index deeff66adc..c20904879e 100644
--- a/Exalted2e/exalted2e.html
+++ b/Exalted2e/exalted2e.html
@@ -1,3 +1,118 @@
+<rolltemplate class="sheet-rolltemplate-joinbattle">
+    <div>
+        <img src="http://i.imgur.com/SncEMzz.png" />
+        <h3>Join Battle!</h3>
+        <div>Wits ({{wits}}) +</div>
+        <div>Awareness ({{awareness}}) +</div>
+        <div>Bonus Dice ({{bonus dice}}) +</div>
+        <div>Bonus Successess ({{bonus successess}}) =</div>
+        {{roll}} Successes
+    </div>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-joindebate">
+    <div>
+        <img src="http://i.imgur.com/SncEMzz.png" />
+        <h3>Join Debate!</h3>
+        <div>Wits ({{wits}}) +</div>
+        <div>Awareness ({{awareness}}) +</div>
+        <div>Bonus Dice ({{bonus dice}}) +</div>
+        <div>Bonus Successess ({{bonus successess}}) =</div>
+        {{roll}} Successes
+    </div>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-joinwar">
+    <div>
+        <img src="http://i.imgur.com/SncEMzz.png" />
+        <h3>Join War!</h3>
+        <div>Wits ({{wits}}) +</div>
+        <div>War ({{war}}) +</div>
+        <div>Bonus Dice ({{bonus dice}}) +</div>
+        <div>Bonus Successess ({{bonus successess}}) =</div>
+        {{roll}} Successes
+    </div>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-attack">
+    <div>
+        {{#name}}
+        <h3 class="named">{{name}} (Attack!)</h3>
+        {{/name}}
+        {{^name}}
+        <h3 class="unnamed">Attack!</h3>
+        {{/name}}
+        <div>
+            {{#attribute name}}
+            {{attribute name}}
+            {{/attribute name}}
+            {{^attribute name}}
+            Attribute
+            {{/attribute name}}
+            ({{attribute}}) +
+        </div>
+        <div>
+            {{#ability name}}
+            {{ability name}}
+            {{/ability name}}
+            {{^ability name}}
+            Ability
+            {{/ability name}}
+            ({{ability}}) +
+        </div>
+        <div>
+            {{#specialty name}}
+            {{specialty name}}
+            {{/specialty name}}
+            {{^specialty name}}
+            Specialty
+            {{/specialty name}}
+            ({{specialty}}) +
+        </div>
+        <div>Accuracy ({{accuracy}}) +</div>
+        <div>Bonus Dice ({{bonus dice}}) +</div>
+        <div>Bonus Successes ({{bonus successes}}) =</div>
+        {{roll}} Successes
+    </div>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-damage">
+    <div>
+        {{#name}}
+        <h3 class="named">{{name}} (Hit!)</h3>
+        {{/name}}
+        {{^name}}
+        <h3 class="unnamed">Hit!</h3>
+        {{/name}}
+        <div><span class="damage-type">{{damage type}}</span> Damage ({{damage}}) +</div>
+        {{#attribute}}
+        <div>
+            {{#attribute name}}
+            {{attribute name}}
+            {{/attribute name}}
+            {{^attribute name}}
+            Attribute
+            {{/attribute name}}
+            ({{attribute}}) +
+        </div>
+        {{/attribute}}
+        {{#ability}}
+        <div>
+            {{#ability name}}
+            {{ability name}}
+            {{/ability name}}
+            {{^ability name}}
+            Ability
+            {{/ability name}}
+            ({{ability}}) +
+        </div>
+        {{/ability}}
+        <div>Bonus Dice ({{bonus dice}}) +</div>
+        <div>Bonus Successes ({{bonus successes}}) &ndash;</div>
+        <div>Target Soak ({{target soak}}) =</div>
+        {{#rollTotal() pool 0}}
+        <span class="minimum">{{minimum roll}} Successes</span>
+        {{/rollTotal() pool 0}}
+        <span class="regular">{{roll}} Successes</span>
+    </div>
+</rolltemplate>
+
 <div class="bio sheet-3colrow">
     <div class="sheet-col center">
         <img src="http://i.imgur.com/RgaO9Ft.gif" class="banner" />
@@ -631,9 +746,9 @@
     <h1 class="separator vspace"><span>Combat</span></h1>
     <div class="combat-equipment">
         <div class="weapons" style="width: 67%">
-            <div style="width: 32%; display: inline-block" class="center"><button class="tokenaction blank-roll-button" type="roll" name="roll_JoinBattle" value="/me joins the fight\n/r (@{Wits}+@{Awareness}*(1-@{Awareness|max})+?{Bonus Dice (Charms, Stunts, etc.)|0})t[exalted]+?{Automatic Successes|0} &{tracker}">Join Battle</button></div>
-            <div style="width: 32%; display: inline-block" class="center"><button class="tokenaction blank-roll-button" type="roll" name="roll_JoinDebate" value="/me joins the argument\n/r (@{Wits}+@{Awareness}*(1-@{Awareness|max})+?{Bonus Dice (Charms, Stunts, etc.)|0})t[exalted]+?{Automatic Successes|0} &{tracker}">Join Debate</button></div>
-            <div style="width: 32%; display: inline-block" class="center"><button class="tokenaction blank-roll-button" type="roll" name="roll_JoinWar" value="/me joins the war\n/r (@{Wits}+@{War}*(1-@{War|max})+?{Bonus Dice (Charms, Stunts, etc.)|0})t[exalted]+?{Automatic Successes|0} &{tracker}">Join War</button></div>
+            <div style="width: 32%; display: inline-block" class="center"><button class="tokenaction blank-roll-button" type="roll" name="roll_JoinBattle" value="&{template:joinbattle} {{wits=[[@{Wits}]]}} {{awareness=[[(1-@{Awareness|max})*@{Awareness}]]}} {{bonus dice=[[?{Bonus Dice (Charms, Stunts, etc.)|0}]]}} {{bonus successess=[[?{Bonus Successes|0}]]}} {{roll=[[(@{Wits}+@{Awareness}*(1-@{Awareness|max})+?{Bonus Dice (Charms, Stunts, etc.)|0})t[exalted]+?{Bonus Successes|0} &{tracker}]]}}}">Join Battle</button></div>
+            <div style="width: 32%; display: inline-block" class="center"><button class="tokenaction blank-roll-button" type="roll" name="roll_JoinDebate" value="&{template:joindebate} {{wits=[[@{Wits}]]}} {{awareness=[[(1-@{Awareness|max})*@{Awareness}]]}} {{bonus dice=[[?{Bonus Dice (Charms, Stunts, etc.)|0}]]}} {{bonus successess=[[?{Bonus Successes|0}]]}} {{roll=[[(@{Wits}+@{Awareness}*(1-@{Awareness|max})+?{Bonus Dice (Charms, Stunts, etc.)|0})t[exalted]+?{Bonus Successes|0} &{tracker}]]}}">Join Debate</button></div>
+            <div style="width: 32%; display: inline-block" class="center"><button class="tokenaction blank-roll-button" type="roll" name="roll_JoinWar" value="&{template:joinwar} {{wits=[[@{Wits}]]}} {{war=[[(1-@{War|max})*@{War}]]}} {{bonus dice=[[?{Bonus Dice (Charms, Stunts, etc.)|0}]]}} {{bonus successess=[[?{Bonus Successes|0}]]}} {{roll=[[(@{Wits}+@{War}*(1-@{War|max})+?{Bonus Dice (Charms, Stunts, etc.)|0})t[exalted]+?{Bonus Successes|0} &{tracker}]]}}">Join War</button></div>
             <div class="vspace"></div>
             <span class="span-header center" style="padding: 0px; width: 130px">Weapon / Attack</span>
             <span class="span-header center" style="padding: 0px; width: 49px">Speed</span>
@@ -665,7 +780,7 @@
                         </div>
                     </div>
                     <div>
-                        <button style="width: 76px" class="blank-roll-button" type="roll" name="roll_AttackRoll" value="/r (@{AttackAttribute}+@{AttackAbility}+@{AttackSpecialty}+@{AttackAccuracy}+?{Bonus Dice (Charms, Stunts, etc.)|0})t[exalted]+?{Automatic Successes|0}">Attack:</button>
+                        <button value="&{template:attack} {{name=@{AttackName}}} {{attribute=[[@{AttackAttribute}]]}} {{ability=[[@{AttackAbility}]]}} {{specialty=[[@{AttackSpecialty}]]}} {{accuracy=[[@{AttackAccuracy}]]}} {{bonus dice=[[?{Bonus Dice (Charms, Stunts, etc.)|0}]]}} {{bonus successes=[[?{Bonus Successes|0}]]}} {{roll=[[(@{AttackAttribute}+@{AttackAbility}+@{AttackSpecialty}+@{AttackAccuracy}+?{Bonus Dice (Charms, Stunts, etc.)})t[exalted]+?{Bonus Successes}]]}}" style="width: 76px" class="blank-roll-button" type="roll" name="roll_AttackRoll">Attack:</button>
                         <select name="attr_AttackAttribute" class="regular fancy">
                             <option value="@{Strength}">Strength</option>
                             <option value="@{Dexterity}" selected="true">Dexterity</option>
@@ -720,7 +835,7 @@
                         <input type="number" class="fancy" name="attr_AttackSpecialty" min="0" max="3" value="0" title="Specialty" />
                     </div>
                     <div>
-                        <button class="blank-roll-button" type="roll" name="roll_AttackDamage" value="/r [[{?{Minimum Damage|1},@{AttackDamage}+@{AttackDamageAttribute}+@{AttackDamageAbility}+?{Bonus Dice (Charms, Threshold Successes etc.)|1}-?{Target Soak|0}}kh1]]t[exalted]+?{Automatic Successes|0} @{AttackDamageType}">Damage:</button>
+                        <button value="&{template:damage} {{name=@{AttackName}}} {{damage type=@{AttackDamageType}}} {{damage=[[@{AttackDamage}]]}} {{attribute=[[@{AttackDamageAttribute}]]}} {{ability=[[@{AttackDamageAbility}]]}} {{bonus dice=[[?{Bonus Dice (Charms, Threshold Successes, etc.)|1}]]}} {{bonus successes=[[?{Bonus Successes|0}]]}} {{target soak=[[?{Target Soak|0}]]}} {{pool=[[(@{AttackDamage}+@{AttackDamageAttribute}+@{AttackDamageAbility}+?{Bonus Dice (Charms, Threshold Successes, etc.)}-?{Target Soak})d0>1f<1]]}} {{minimum roll=[[?{Minimum Damage|1}t[exalted]+?{Bonus Successes}]]}} {{roll=[[(@{AttackDamage}+@{AttackDamageAttribute}+@{AttackDamageAbility}+?{Bonus Dice (Charms, Threshold Successes, etc.)}-?{Target Soak})t[exalted]+?{Bonus Successes}]]}}" class="blank-roll-button" type="roll" name="roll_AttackDamage">Damage:</button>
                         <select name="attr_AttackDamageAttribute" class="regular fancy">
                             <option value="0">–</option>
                             <option value="@{Strength}">Strength</option>
diff --git a/Exalted2e/images/attack.png b/Exalted2e/images/attack.png
new file mode 100644
index 0000000000..7a75ca47a6
Binary files /dev/null and b/Exalted2e/images/attack.png differ
diff --git a/Exalted2e/images/damage.png b/Exalted2e/images/damage.png
new file mode 100644
index 0000000000..38ede7540c
Binary files /dev/null and b/Exalted2e/images/damage.png differ
diff --git a/Exalted2e/images/join-encounter.png b/Exalted2e/images/join-encounter.png
new file mode 100644
index 0000000000..41c08ffa94
Binary files /dev/null and b/Exalted2e/images/join-encounter.png differ