diff --git a/Fabula Ultima/FabulaUltima.html b/Fabula Ultima/FabulaUltima.html
index 908f38ba05..ddfbb8398e 100644
--- a/Fabula Ultima/FabulaUltima.html
+++ b/Fabula Ultima/FabulaUltima.html
@@ -1,279 +1,504 @@
-
-
-
-
-
+{{charName}}
+ **Weapon Attack**
+ **{{weaponName}}**
+
+ {{#weaponCategory}}
+ **{{weaponCategory}}**
+ {{#weaponRange}}
+ -
+ {{/weaponRange}}
+ {{/weaponCategory}}
+ {{#weaponRange}}
+ **{{weaponRange}}**
+ {{/weaponRange}}
+
+ {{#weaponGrip}}
+ [{{weaponGrip}}{{#weaponMartial}} - {{weaponMartial}}{{/weaponMartial}}]
+ {{/weaponGrip}}
+
+
+ {{#^rollWasFumble() dice1}}
- setAttrs({
- hiddenMagicDefense: (parseInt(values.hiddenCurrentInsight) + parseInt(values.addedMagicDefense) + parseInt(resistBonus) + parseInt(values.shieldResist))
- });
- }
- else
- {
- setAttrs({
- hiddenMagicDefense: (parseInt(values.armorResist) + parseInt(values.addedMagicDefense) + parseInt(values.shieldResist))
- });
- }
- });
- });
+ {{#rollGreater() dice1 5}}
+ {{charName}}
+ **{{magicTitle}}**
+ **{{spellName}}**
+
+ **Cost: {{spellCost}}**
+ **Target: {{spellTarget}}**
+ **Duration: {{spellDuration}}**
+
+
+ {{#^rollWasFumble() dice1}}
+
+ {{#rollGreater() dice1 5}}
+ {{charName}}
+ **Check**
+ **{{name}}**
+ {{#attrs}}
+ {{attrs}}
+
+
+ {{#^rollWasFumble() dice1}}
+
+ {{#rollGreater() dice1 5}}
+ {{charName}}
+ **{{genericTitle}}**
+
+ **{{name}}**
+
+ {{#level}}
+ [Lvl {{level}}]
+ **{{genericType}}**
+ {{#genericType2}}
+ **{{genericType2}}**
+ {{/genericType2}}
+
+ **{{genericParam1}}: {{genericValue1}}**
+ {{#genericValue2}}
+ **{{genericParam2}}: {{genericValue2}}**
+ {{/genericValue2}}
+ {{#genericValue3}}
+ **{{genericParam3}}: {{genericValue3}}**
+ {{/genericValue3}}
+
+
+
+ {{#triggerType}}
+ **{{triggerType}}**
+ {{/triggerType}}
+
+ {{#effectType}}
+ **{{effectType}}**
+ {{/effectType}}
+
+
+
+
+ Elixir
+
+ Remedy
+
+ Tonic
+
+ Elemental Shard
+
+ Magic Tent
+