diff --git a/Shadowrun3e/shadowrun3e.html b/Shadowrun3e/shadowrun3e.html
index 2376c65b7e..fa4d37c161 100644
--- a/Shadowrun3e/shadowrun3e.html
+++ b/Shadowrun3e/shadowrun3e.html
@@ -1103,36 +1103,65 @@
         </div>
     </div>
     <div class="fetish-foci">
+    	<input type='hidden' class='magictype' name='attr_magic-type'/>
         <div class="foci-table">
             <header class="table-top-left">Name</header>
-            <header class="table-top-mid">Type</header>
-            <header class="table-top-mid">Quantity</header>
-            <header class="table-top-mid">Power</header>
-            <header class="table-top-right">Notes</header>
-        </div>
-        <fieldset class="repeating_foci">
-            <div class="foci-table">
-                <div class="table-item-left"><input type="text" name="attr_fociname" class="myweapontxt"></div>
-                <div class="table-item"><select name="attr_type" clas="mediumselect3">
-                        <option SELECTED>Expendable</option>
-                        <option>Spell</option>
-                        <option>Spell Category</option>
-                        <option>Spirit</option>
-                        <option>Power</option>
-                        <option>Sustaining</option>
-                        <option>Weapon</option>
-                    </select>
-                </div>
-                <div class="table-item"><input type="number" name="attr_qty" value=1></div>
-                <div class="table-item"><input type="number" name="attr_power" value=1></div>
-                <div class="table-item">
-                    <input type="text" name="attr_focinotes" style="width: 300px;">
-                    <input type="hidden" class="select-focitype" name="attr_type" value="Spell">
-                    <div class="show_weapon_focus_die">Show</div>
-                </div>
-
-            </div>
-        </fieldset>
+            <header class="table-top-mid">Force</header>
+            <div class="table-item-left">Power Foci</div>
+            <div class="table-item"><input type="number" name="attr_powerfoci" value=0></div>
+	</div>
+	<div class="mage-only-foci">
+		<div class="table-item-left">Air Elemental</div>
+                <div class="table-item"><input type="number" name="attr_airfoci" value=0></div>
+		<div class="table-item-left">Water Elemental</div>
+                <div class="table-item"><input type="number" name="attr_waterfoci" value=0></div>
+		<div class="table-item-left">Earth Elemental</div>
+                <div class="table-item"><input type="number" name="attr_earthfoci" value=0></div>
+		<div class="table-item-left">Fire Elemental</div>
+                <div class="table-item"><input type="number" name="attr_firefoci" value=0></div>
+	</div>
+	<div class="shaman-only-foci">
+		<div class="table-item-left">City Spirit</div>
+                <div class="table-item"><input type="number" name="attr_citifoci" value=0></div>
+		<div class="table-item-left">Field Spirit</div>
+                <div class="table-item"><input type="number" name="attr_fieldfoci" value=0></div>
+		<div class="table-item-left">Hearth Spirit</div>
+                <div class="table-item"><input type="number" name="attr_hearthfoci" value=0></div>
+		<div></div><div></div><div></div><div></div>
+		<div class="table-item-left">Desert Spirit</div>
+                <div class="table-item"><input type="number" name="attr_desertfoci" value=0></div>
+		<div class="table-item-left">Forest Spirit</div>
+                <div class="table-item"><input type="number" name="attr_forestfoci" value=0></div>
+		<div class="table-item-left">Mountain Spirit</div>
+                <div class="table-item"><input type="number" name="attr_mountainfoci" value=0></div>
+		<div class="table-item-left">Prairie Spirit</div>
+                <div class="table-item"><input type="number" name="attr_prairiefoci" value=0></div>
+		<div></div><div></div>
+		<div class="table-item-left">Mist Spirit</div>
+                <div class="table-item"><input type="number" name="attr_mistfoci" value=0></div>
+		<div class="table-item-left">Storm Spirit</div>
+                <div class="table-item"><input type="number" name="attr_stormfoci" value=0></div>
+		<div class="table-item-left">Wind Spirit</div>
+                <div class="table-item"><input type="number" name="attr_windfoci" value=0></div>
+		<div></div><div></div><div></div><div></div>
+		<div class="table-item-left">Lake Spirit</div>
+                <div class="table-item"><input type="number" name="attr_lakefoci" value=0></div>
+		<div class="table-item-left">River Spirit</div>
+                <div class="table-item"><input type="number" name="attr_riverfoci" value=0></div>
+		<div class="table-item-left">Sea Spirit</div>
+                <div class="table-item"><input type="number" name="attr_seafoci" value=0></div>
+		<div></div><div></div><div></div><div></div>
+		<div class="table-item-left">Gnome</div>
+                <div class="table-item"><input type="number" name="attr_gnomefoci" value=0></div>
+		<div class="table-item-left">Manitous</div>
+                <div class="table-item"><input type="number" name="attr_manitousfoci" value=0></div>
+		<div class="table-item-left">Salamander</div>
+                <div class="table-item"><input type="number" name="attr_salamanderfoci" value=0></div>
+		<div class="table-item-left">Sylphs</div>
+                <div class="table-item"><input type="number" name="attr_sylphfoci" value=0></div>
+		<div class="table-item-left">Ancestor</div>
+                <div class="table-item"><input type="number" name="attr_ancestorfoci" value=0></div>
+	</div>
 	<br>
     </div>
     <input type='hidden' class='magicinitiate-switch' name='attr_magicinitiateswitch' value="show" />