diff --git a/Anima-Beyond-Fantasy/A-BF.html b/Anima-Beyond-Fantasy/A-BF.html
index 1bf3bbd16b..a517119e0a 100644
--- a/Anima-Beyond-Fantasy/A-BF.html
+++ b/Anima-Beyond-Fantasy/A-BF.html
@@ -17,7 +17,7 @@
         <div class="cell" style="margin-left:14px;">Appear.</div>
     </div>
     <div class="style_row">
-		<input type="text" name="attr_character_name" style="width:130px;"disabled="true;"/>
+    	<input type="text" name="attr_character_name" style="width:130px;"disabled="true;"/>
 		<input type="text" name="attr_character_height" style="width:55px; "/>
 		<input type="text" name="attr_character_weight" style="width:62px;"/>
         <input type="number" name="attr_character_size" value="10" min="0" />
@@ -416,15 +416,19 @@
             <div class="cell" style="margin-left:9px;">Special</div>
             <div class="cell" style="margin-left:10px;">Final</div>
         </div>
-        <fieldset class="repeating_initiative style_row">
-            <input type="number" name="attr_init_armor" value="0"/>
-            <input type="number" name="attr_init_weapon" value="20"/>
-            <input type="number" name="attr_init_class" value="0" min="0"/>
-            <input type="number" name="attr_init_special" value="0"/>
-            <input type="number" name="attr_init_final" disabled="true"
-            value="@{agi_mod}+@{dex_mod}+@{init_armor}+@{init_weapon}+@{init_class}+@{init_special}+20+@{ki_increasedSpeed}"/>
-            <button type="roll" class="d100-roll-button" 
-            value="/em Rolls for initiative! [[1d100+@{init_final}]]"></button> 
+        <fieldset class="repeating_initiative">
+            <input type="text" name="attr_init_label"
+            style="width:275px; margin:3px 3px 0px 3px;"/>
+            <div class="style_row">
+                <input type="number" name="attr_init_armor" value="0"/>
+                <input type="number" name="attr_init_weapon" value="20"/>
+                <input type="number" name="attr_init_class" value="0" min="0"/>
+                <input type="number" name="attr_init_special" value="0"/>
+                <input type="number" name="attr_init_final" disabled="true"
+                value="@{agi_mod}+@{dex_mod}+@{init_armor}+@{init_weapon}+@{init_class}+@{init_special}+20+@{ki_increasedSpeed}"/>
+                <button type="roll" class="d100-roll-button" 
+                value="/em Rolls for initiative! [[1d100+@{init_final}]]"></button> 
+            </div>
         </fieldset>
         </div><!-- end initiative -->
    </div>
@@ -2212,6 +2216,104 @@
                     value="/em Begins to summon @{ki_creaturename} [[{1d100+?{Bonus from extra seals|0}}>@{ki_creaturedifficulty}]]"></button>
                 </fieldset>
             </div><!-- end ki creatures -->
+            
+            <div class="wrapper" style="width:420px;;"><!-- ki techniques -->
+            <div class="title">Ki Techniques</div>
+            <fieldset class="repeating_kitechniques">
+                <div class="dark_row" style="padding-top:4px;padding-bottom:3px;">
+                    <input type="text" name="attr_ki_technique_name" value="Name"
+                    style="margin-left:5px;"/>
+                    <div class="cell" style="margin-left:15px;">Level</div>
+                    <input type="number" name="attr_ki_technique_level" min="0" max="3"/>
+                    <div class="cell">MK</div>
+                    <input type="number" class="longbubble"
+                    name="attr_ki_technique_cost" min="0"/>
+                </div>
+                <div class="dark_row">
+                    <div class="cell">Frequency</div>
+                    <select name="attr_ki_technique_freq" style="width:100px;">
+                        <option value="0">Action</option>
+                        <option value="1">Turn</option>
+                        <option value="2">Variable</option>
+                    </select>
+                    <div class="cell" style="margin-left:30px;">Related Action</div>
+                    <select name="attr_ki_technique_action" style="width:100px;">
+                        <option value="0">Attack</option>
+                        <option value="1">Defense</option>
+                        <option value="2">Counterattack</option>
+                        <option value="3">Variable</option>
+                    </select>
+                </div>
+                <div class="dark_row">
+                    <div class="cell" style="margin-left:10px;">Ki</div>
+                    <div class="cell" style="margin-left:20px;">Use</div>
+                    <div class="cell" style="margin-left:18px;">Maint.</div>
+                    <div class="cell" style="margin-left:90px;">Effect</div>
+                    <div class="cell" style="margin-left:100px;">MK</div>
+                </div>
+                <div class="2colrow" style="margin-bottom: -3px;">
+                    <div class="col" style="width:auto; margin-right:0px;padding-bottom:3px;">
+                        <div class="dark_row" style="padding-right:5px;">
+                            <div class="cell actual_cell kipool">AGI</div>
+                            <input type="number" name="attr_ki_technique_agicost" min="0"/>
+                            <input type="number" name="attr_ki_technique_agimaint" min="0"/>
+                        </div>
+                        <div class="dark_row">
+                            <div class="cell actual_cell kipool">CON</div>
+                            <input type="number" name="attr_ki_technique_concost" min="0"/>
+                            <input type="number" name="attr_ki_technique_conmaint" min="0"/>
+                        </div>
+                        <div class="dark_row">
+                            <div class="cell actual_cell kipool">DEX</div>
+                            <input type="number" name="attr_ki_technique_dexcost" min="0"/>
+                            <input type="number" name="attr_ki_technique_dexmaint" min="0"/>
+                        </div>
+                        <div class="dark_row">
+                            <div class="cell actual_cell kipool">STR</div>
+                            <input type="number" name="attr_ki_technique_strcost" min="0"/>
+                            <input type="number" name="attr_ki_technique_strmaint" min="0"/>
+                        </div>
+                        <div class="dark_row">
+                            <div class="cell actual_cell kipool">POW</div>
+                            <input type="number" name="attr_ki_technique_powcost" min="0"/>
+                            <input type="number" name="attr_ki_technique_powmaint" min="0"/>
+                        </div>
+                        <div class="dark_row" style="padding-bottom: 3px;">
+                            <div class="cell actual_cell kipool">WP</div>
+                            <input type="number" name="attr_ki_technique_wpcost" min="0"/>
+                            <input type="number" name="attr_ki_technique_wpimaint" min="0"/>
+                        </div>
+                    </div>
+                    <div class="col" style="width: 270px; margin-left: -5px;">
+                        <div class="style_row">
+                            <input type="text" name="attr_ki_technique_effect1"/>
+                            <input type="number" name="attr_ki_technique_mkcost1" value="0"/>
+                        </div>
+                        <div class="style_row">
+                            <input type="text" name="attr_ki_technique_effect2"/>
+                            <input type="number" name="attr_ki_technique_mkcost2" value="0"/>
+                        </div>
+                        <div class="style_row">
+                            <input type="text" name="attr_ki_technique_effect3"/>
+                            <input type="number" name="attr_ki_technique_mkcost3" value="0"/>
+                        </div>
+                        <div class="style_row">
+                            <input type="text" name="attr_ki_technique_effect4"/>
+                            <input type="number" name="attr_ki_technique_mkcost4" value="0"/>
+                        </div>
+                        <div class="style_row">
+                            <input type="text" name="attr_ki_technique_effect5"/>
+                            <input type="number" name="attr_ki_technique_mkcost5" value="0"/>
+                        </div>
+                        <div class="style_row">
+                            <input type="text" name="attr_ki_technique_effect6"/>
+                            <input type="number" name="attr_ki_technique_mkcost6" value="0"/>
+                        </div>
+                    </div>
+                </div>
+            </fieldset>
+        </div><!-- end ki techniques -->
+        
         </div>
     </div><!-- end column div -->
     
@@ -2380,27 +2482,47 @@
 </fieldset>
 </div><!-- end proficiencies -->
 
-<div class="wrapper"><!-- weapons -->
-    <div class="title">Weapon Attacks</div>
+<div class="wrapper"><!-- melee weapons -->
+    <div class="title">Melee Attacks</div>
     <fieldset class="repeating_weapons">
         <div class="dark_row" style="padding-top:4px;">
             <input type="text" name="attr_weapon_name" style="margin-left:22%;" value="Name"/>
         </div>
         <div class="dark_row">
             <div class="cell" style="margin-left: 5px;">Quality</div>
-            <div class="cell" style="margin-left: 20px;">Attack</div>
-            <div class="cell" style="margin-left: 45px;">Block</div>
-            <div class="cell" style="margin-left: 35px;">Primary</div>
-            <div class="cell" style="margin-left: 12px;">Secondary</div>
+            <div class="cell" style="margin-left: 30px;">Speed</div>
+            <div class="cell" style="margin-left: 50px;">Attack</div>
+            <div class="cell" style="margin-left: 35px;">Shield</div>
+            <div class="cell" style="margin-left: 40px;">Block</div>
         </div>
         <div class="style_row">
             <input type="number" name="attr_weapon_quality" value="0"/>
+            <input type="number" value="0" name="attr_weapon_basespeed"/>
+            <input type="number" disabled="true" name="attr_weapon_finalspeed"
+            value="@{weapon_quality}+@{weapon_basespeed}"/>
             <input type="number" disabled="true" name="attr_weapon_attack" value="@{weapon_quality}+@{attack_final}"/>
             <button type="roll" class="d100-roll-button" 
             value="/em attacks with @{weapon_name}! [[1d100+?{modifiers?|0}+?{Fatigue?|0}*15+@{weapon_attack}]]"></button>
-            <input type="number" disabled="true" name="attr_weapon_block" value="@{weapon_quality}+@{block_final}"/>
+            <select name="attr_weapon_shieldval" style="width:65px;">
+                <option value="0">N/A</option>
+                <option value="10">Buckler</option>
+                <option value="20">Shield</option>
+                <option value="30">F.Sheild</option>
+            </select>
+            <input type="number" disabled="true" name="attr_weapon_block" 
+            value="@{weapon_quality}+@{weapon_shieldval}+@{block_final}"/>
             <button type="roll" class="d100-roll-button"
             value="/em blocks with @{weapon_name}! [[1d100+?{modifiers?|0}+?{Fatigue?|0}*15+@{weapon_block}]]"></button>
+        </div>
+        <div class="dark_row">
+            <div class="cell" style="margin-left: 10px;">Primary</div>
+            <div class="cell" style="margin-left: 12px;">Secondary</div>
+            <div class="cell" style="margin-left: 10px;">Dmg.</div>
+            <div class="cell" style="margin-left: 25px;">2H</div>
+            <div class="cell" style="margin-left: 10px;">STR</div>
+            <div class="cell" style="margin-left: 30px;">Final</div>
+        </div>
+        <div class="style_row"> 
             <select name="attr_weapon_primary" style="width:65px;">
                 <option value="0">CUT</option>
                 <option value="1">THR</option>
@@ -2420,18 +2542,6 @@
                 <option value="6">ELE</option>
                 <option value="7">ENE</option>
             </select>
-        </div>
-        <div class="dark_row">
-            <div class="cell" style="margin-left: 30px;">Speed</div>
-            <div class="cell" style="margin-left: 40px;">Dmg.</div>
-            <div class="cell" style="margin-left: 22px;">2H</div>
-            <div class="cell" style="margin-left: 10px;">STR</div>
-            <div class="cell" style="margin-left: 30px;">Final</div>
-        </div>
-        <div class="style_row">
-            <input type="number" value="0" name="attr_weapon_basespeed"/>
-            <input type="number" disabled="true" name="attr_weapon_finalspeed"
-            value="@{weapon_quality}+@{weapon_basespeed}"/>
             <input type="number" name="attr_weapon_basedmg" value="0" min="0">
             <div class="cell" style="font-size:12pt;font-weight:bold;">+</div>
             <input type="checkbox" class="weapon_input" name="attr_weapon_twohanded"
@@ -2446,7 +2556,7 @@
             <div class="cell" style="margin-left: 30px;">Fortitude</div>
             <div class="cell" style="margin-left: 15px;">Breakage</div>
             <div class="cell" style="margin-left: 20px;">STR</div>
-            <div class="cell" style="margin-left: 55px;">Final</div>
+            <div class="cell" style="margin-left: 55px;">Final Breakage</div>
         </div>
         <div class="style_row">
             <input type="number" name="attr_weapon_basefort" value="0" min="0"/>
@@ -2476,8 +2586,121 @@
             <input type="text" name="attr_weapon_properties" style="margin-left:10px;"
             value="Special Properties"/>
         </div>
-    </div>
-</div><!-- end weapons -->
+    </fieldset>
+</div><!-- end melee weapons -->
+
+<div class="wrapper"><!-- ranged weapons -->
+    <div class="title">Ranged Attacks</div>
+    <fieldset class="repeating_rangedweapons">
+        <div class="dark_row" style="padding-top:4px;">
+            <input type="text" name="attr_rangedweapon_name" style="margin-left:22%;" value="Name"/>
+        </div>
+        <div class="dark_row">
+            <div class="cell" style="margin-left: 5px;">Quality</div>
+            <div class="cell" style="margin-left: 30px;">Speed</div>
+            <div class="cell" style="margin-left: 55px;">Attack</div>
+            <div class="cell" style="margin-left: 45px;">Block</div>
+        </div>
+        <div class="style_row">
+            <input type="number" name="attr_rangedweapon_quality" value="0"/>
+            <input type="number" value="0" name="attr_rangedweapon_basespeed"/>
+            <input type="number" disabled="true" name="attr_rangedweapon_finalspeed"
+            value="@{rangedweapon_quality}+@{rangedweapon_basespeed}"/>
+            <input type="number" disabled="true" name="attr_rangedweapon_attack"
+            value="@{rangedweapon_quality}+@{attack_final}"/>
+            <button type="roll" class="d100-roll-button" 
+            value="/em attacks with @{rangedweapon_name}! [[1d100+?{modifiers?|0}+?{Fatigue?|0}*15+@{rangedweapon_attack}]]"></button>
+            <input type="number" disabled="true" name="attr_rangedweapon_block"
+            value="@{rangedweapon_quality}+@{block_final}"/>
+            <button type="roll" class="d100-roll-button"
+            value="/em blocks with @{rangedweapon_name}! [[1d100+?{modifiers?|0}+?{Fatigue?|0}*15+@{rangedweapon_block}]]"></button>
+            
+        </div>
+        <div class="dark_row">
+            <div class="cell" style="margin-left: 10px;">Primary</div>
+            <div class="cell" style="margin-left: 15px;">Secondary</div>
+            <div class="cell" style="margin-left: 10px;">Dmg.</div>
+            <div class="cell" style="margin-left: 30px;">Wpn. STR</div>
+            <div class="cell" style="margin-left: 30px;">Final</div>
+        </div>
+        <div class="style_row">
+            <select name="attr_rangedweapon_primary" style="width:65px;">
+                <option value="0">CUT</option>
+                <option value="1" selected="true">THR</option>
+                <option value="2">IMP</option>
+                <option value="3">HEA</option>
+                <option value="4">COL</option>
+                <option value="5">ELE</option>
+                <option value="6">ENE</option>
+            </select>
+            <select name="attr_rangedweapon_secondary" style="width:65px;">
+                <option value="0">N/A</option>
+                <option value="1">CUT</option>
+                <option value="2">THR</option>
+                <option value="3">IMP</option>
+                <option value="4">HEA</option>
+                <option value="5">COL</option>
+                <option value="6">ELE</option>
+                <option value="7">ENE</option>
+            </select>
+            <input type="number" name="attr_rangedweapon_basedmg" value="0" min="0">
+            <div class="cell" style="font-size:12pt;font-weight:bold;">+</div>
+            <select name="attr_rangedweapon_strbonus" style="width:80px;">
+                <option value="-30">1</option>
+                <option value="-20">2</option>
+                <option value="-10">3</option>
+                <option value="-5">4</option>
+                <option value="0" selected="true">5</option>
+                <option value="5">6-7</option>
+                <option value="10">8-9</option>
+                <option value="15">10</option>
+                <option value="20">11-12</option>
+                <option value="25">13-14</option>
+                <option value="30">15</option>
+                <option value="35">16-17</option>
+                <option value="40">18-19</option>
+                <option value="45">20</option>
+            </select>
+            <div class="cell" style="font-size:12pt;font-weight:bold;">=</div>
+            <input type="number" disabled="true" name="attr_weapon_finaldmg"
+            value="@{rangedweapon_basedmg}+@{rangedweapon_strbonus}+@{aura_extension}+@{increased_damage}"/>
+        </div>
+        <div class="dark_row">
+            <div class="cell" style="margin-left: 30px;">Fortitude</div>
+            <div class="cell" style="margin-left: 15px;">Breakage</div>
+            <div class="cell" style="margin-left: 20px;">STR</div>
+            <div class="cell" style="margin-left: 55px;">Final Breakage</div>
+        </div>
+        <div class="style_row">
+            <input type="number" name="attr_rangedweapon_basefort" value="0" min="0"/>
+            <input type="number" disabled="true" name="attr_rangedweapon_finalfort"
+            value="@{weapon_quality}+10*@{rangedweapon_basefort}"/>
+            <input type="number" name="attr_rangedweapon_basebreakage" value="0"/>
+            <div class="cell" style="font-size:12pt;font-weight:bold;">+</div>
+            <select name="attr_rangedweapon_strbreakage" style="width:75px;">
+                    <option value="0">Str 1-8</option>
+                    <option value="1">8-9</option>
+                    <option value="2">10</option>
+                    <option value="4">11-12</option>
+                    <option value="6">13-14</option>
+                    <option value="8">15+</option>
+                </select>
+            <div class="cell" style="font-size:12pt;font-weight:bold;">=</div>
+            <input type="number" name="attr_rangedweapon_finalbreakage" disabled="true"
+            value="@{rangedweapon_basebreakage}+@{rangedweapon_strbreakage}+@{rangedweapon_quality}+@{aura_extension}/2"> 
+            <button type="roll" class="d100-roll-button"
+            value="/em attempts to break things with @{rangedweapon_name}! [[1d10+@{rangedweapon_finalbreakage}]]"></button>
+        </div>
+        <div class="dark_row" style="padding-top:4px; padding-bottom:2px;">
+            <div class="cell">Presence</div>
+            <input type="number" value="0" min="0" name="attr_rangedweapon_basepresence"/>
+            <input type="number" min="0" name="attr_rangedweapon_finalpresence" disabled="true"
+            value="@{rangedweapon_basepresence}+10*@{rangedweapon_quality}"/>
+            <input type="text" name="attr_rangedweapon_properties" style="margin-left:10px;"
+            value="Special Properties"/>
+        </div>
+    </fieldset>
+</div><!-- end ranged weapons -->
 
 </div>
 </div><!-- end armory page tab -->