diff --git a/Shadowrun3e/shadowrun3e.css b/Shadowrun3e/shadowrun3e.css
index 26448b2593..ee25b2c34d 100644
--- a/Shadowrun3e/shadowrun3e.css
+++ b/Shadowrun3e/shadowrun3e.css
@@ -521,6 +521,76 @@ input:checked+.slider:before {
     color: black;
 }
 
+.magic-tabs {
+	display: grid;
+    	grid-template-columns: auto auto auto auto auto auto auto auto auto;
+}
+
+.magic-tabs-spells,
+.magic-tabs-totem,
+.magic-tabs-initiate,
+.magic-tabs-skills,
+.magic-tabs-foci,
+.magic-tabs-adept,
+.magic-tabs-geas,
+.magic-tabs-conjuring,
+.magic-tabs-astral {
+    display: grid;
+    background-color: white;
+    border-bottom: 3px solid black;
+    text-align: center;
+    align-items: center;
+    border-top-right-radius: 10px;
+    border-top-left-radius: 10px;
+}
+
+.magic-tabs-switch[value="spells"]~button.magic-tabs-spells ,
+.magic-tabs-switch[value="totem"]~button.magic-tabs-totem,
+.magic-tabs-switch[value="initiate"]~button.magic-tabs-initiate,
+.magic-tabs-switch[value="skills"]~button.magic-tabs-skills,
+.magic-tabs-switch[value="foci"]~button.magic-tabs-foci,
+.magic-tabs-switch[value="adept"]~button.magic-tabs-adept,
+.magic-tabs-switch[value="geas"]~button.magic-tabs-geas,
+.magic-tabs-switch[value="conjuring"]~button.magic-tabs-conjuring,
+.magic-tabs-switch[value="astral"]~button.magic-tabs-astral {
+    background-color: rgba(192,192,192,.9);
+    font-weight: bold;
+    border-top: 3px solid black;
+    border-left: 3px solid black;
+    border-right: 3px solid black;
+    border-bottom: unset;
+}
+.sorcery-skills,
+.spells-section,
+.fetish-foci,
+.totem,
+.geas,
+.adept-powers,
+.conjuring,
+.magicinitiate,
+.astralattributes {
+	display: none;
+}
+
+.magic-tabs-switch[value="spells"]~div.spells-section,
+.magic-tabs-switch[value="totem"]~div.totem,
+.magic-tabs-switch[value="initiate"]~div.magicinitiate,
+.magic-tabs-switch[value="skills"]~div.sorcery-skills,
+.magic-tabs-switch[value="foci"]~div.fetish-foci,
+.magic-tabs-switch[value="adept"]~div.adept-powers,
+.magic-tabs-switch[value="geas"]~div.geas,
+.magic-tabs-switch[value="conjuring"]~div.conjuring,
+.magic-tabs-switch[value="astral"]~div.astralattributes {
+	display: block;
+    	border-bottom: 3px solid black;
+    	border-left: 3px solid black;
+    	border-right: 3px solid black;
+    	background-color: rgba(192,192,192,.9);
+    	border-bottom-left-radius: 10px;
+    	border-bottom-right-radius: 10px;
+}
+
+
 .sheet-tabstoggle[value="magic"]+.charsheet {
     background-image: url("https://raw.githubusercontent.com/bahornbeck/img/master/images/nebula2.jpg");
 }
@@ -783,6 +853,7 @@ min-width: 0;
     grid-template-columns: 73px 1fr;
 
 }
+.sheet-rolltemplate-conjure div.sheet-conjure-resist-table,
 .sheet-rolltemplate-spell div.sheet-spell-resist-table,
 .sheet-rolltemplate-resistance div.sheet-spell-resist-table {
     display: grid;
@@ -929,6 +1000,7 @@ min-width: 0;
 .sheet-rolltemplate-vehicle div.sheet-rtcontainer,
 .sheet-rolltemplate-matrix div.sheet-rtcontainer,
 .sheet-rolltemplate-spell div.sheet-rtcontainer,
+.sheet-rolltemplate-conjure div.sheet-rtcontainer,
 .sheet-rolltemplate-init div.sheet-rtcontainer,
 .sheet-rolltemplate-attribute div.sheet-rtcontainer,
 .sheet-rolltemplate-explosive div.sheet-rtcontainer,
@@ -950,6 +1022,8 @@ min-width: 0;
     color: white;
 }
 
+
+.sheet-rolltemplate-conjure div.sheet-rtheader,
 .sheet-rolltemplate-spell div.sheet-rtheader {
     border-bottom: 3px solid black;
     background-color: olivedrab;
@@ -1003,12 +1077,14 @@ min-width: 0;
     color: black;
 }
 
+.sheet-rolltemplate-spell div.sheet-conjure-resist-table:nth-child(odd),
 .sheet-rolltemplate-spell div.sheet-spell-resist-table:nth-child(odd),
 .sheet-rolltemplate-info div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-item div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-vehicle div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-matrix div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-spell div.sheet-rtrow:nth-child(odd),
+.sheet-rolltemplate-conjure div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-init div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-attribute div.sheet-rtrow:nth-child(odd),
 .sheet-rolltemplate-explosive div.sheet-rtrow:nth-child(odd),
@@ -1025,6 +1101,7 @@ min-width: 0;
 	font-size: 10px;
 }
 
+.sheet-rolltemplate-spell div.sheet-conjure-resist-table:nth-child(even),
 .sheet-rolltemplate-spell div.sheet-spell-resist-table:nth-child(even),
 .sheet-rolltemplate-item div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-info div.sheet-rtrow:nth-child(even),
@@ -1038,6 +1115,7 @@ min-width: 0;
 .sheet-rolltemplate-attack div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-aoe div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-melee div.sheet-rtrow:nth-child(even),
+.sheet-rolltemplate-conjure div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-resistance div.sheet-rtrow:nth-child(even),
 .sheet-rolltemplate-spell div.sheet-rtrow:nth-child(even) {
     background-color: lightgrey;
@@ -1053,6 +1131,7 @@ min-width: 0;
 .sheet-rolltemplate-adept .sheet-numberspan,
 .sheet-rolltemplate-spell .sheet-numberspan,
 .sheet-rolltemplate-melee .sheet-numberspan,
+.sheet-rolltemplate-conjure .sheet-numberspan,
 .sheet-rolltemplate-aoe .sheet-numberspan,
 .sheet-rolltemplate-resistance .sheet-numberspan,
 .sheet-rolltemplate-attack .sheet-numberspan{
@@ -1076,6 +1155,7 @@ min-width: 0;
 .sheet-rolltemplate-attack .inlinerollresult,
 .sheet-rolltemplate-aoe .inlinerollresult,
 .sheet-rolltemplate-melee .inlinerollresult,
+.sheet-rolltemplate-conjure .inlinerollresult,
 .sheet-rolltemplate-resistance .inlinerollresult,
 .sheet-rolltemplate-spell .inlinerollresult {
     display: inline-block;
@@ -1097,6 +1177,7 @@ min-width: 0;
 .sheet-rolltemplate-attack .inlinerollresult.fullcrit,
 .sheet-rolltemplate-aoe .inlinerollresult.fullcrit,
 .sheet-rolltemplate-melee .inlinerollresult.fullcrit,
+.sheet-rolltemplate-conjure .inlinerollresult.fullcrit,
 .sheet-rolltemplate-resistance .inlinerollresult.fullcrit,
 .sheet-rolltemplate-spell .inlinerollresult.fullcrit {
     border: 2px solid #3FB315;
@@ -1114,6 +1195,7 @@ min-width: 0;
 .sheet-rolltemplate-attack .inlinerollresult.fullfail,
 .sheet-rolltemplate-aoe .inlinerollresult.fullfail,
 .sheet-rolltemplate-melee .inlinerollresult.fullfail,
+.sheet-rolltemplate-conjure .inlinerollresult.fullfail,
 .sheet-rolltemplate-resistance .inlinerollresult.fullfail,
 .sheet-rolltemplate-spell .inlinerollresult.fullfail {
     border: 2px solid #B31515;
@@ -1131,6 +1213,7 @@ min-width: 0;
 .sheet-rolltemplate-attack .inlinerollresult.importantroll,
 .sheet-rolltemplate-aoe .inlinerollresult.importantroll,
 .sheet-rolltemplate-melee .inlinerollresult.importantroll,
+.sheet-rolltemplate-conjure .inlinerollresult.importantroll,
 .sheet-rolltemplate-resistance .inlinerollresult.importantroll,
 .sheet-rolltemplate-spell .inlinerollresult.importantroll {
     border: 2px solid #4A57ED;
@@ -1339,13 +1422,6 @@ input[type="checkbox"].hidden-checkbox {
     border-radius: 5px;
 }
 
-.astralattributes {
-    border: 1px solid #fff;
-    padding: 3px;
-    background-color: rgba(192,192,192,.9);
-    border-radius: 5px;
-}
-
 .astralspace {
     display: grid;
     vertical-align: middle;
@@ -1367,7 +1443,10 @@ input[type="checkbox"].hidden-checkbox {
     display: grid;
     grid-template-columns: 220px 220px;
 }
-
+.conjuring-table {
+    display: grid;
+    grid-template-columns: 120px 120px 120px 120px 120px 100px 100px 1fr;
+}
 
 .totem-table {
     display: grid;
@@ -1558,6 +1637,12 @@ melee-table-row input[type="textarea"],
     border-top-right-radius: 10px;
     border-top-left-radius: 10px;
 }
+.table-top-left-nc {
+    border: 2px solid #fff;
+    text-align: center;
+    vertical-align: middle;
+    border-top-left-radius: 10px;
+}
 
 .table-top-left {
     background-color: rgba(192,192,192,.9);
@@ -1566,7 +1651,13 @@ melee-table-row input[type="textarea"],
     vertical-align: middle;
     border-top-left-radius: 10px;
 }
-
+.table-top-left-w {
+    background-color: white;
+    border: 2px solid black;
+    text-align: center;
+    vertical-align: middle;
+    border-top-left-radius: 10px;
+}
 .table-top-right {
     background-color: rgba(192,192,192,.9);
     border-top: 2px solid #fff;
@@ -1577,6 +1668,16 @@ melee-table-row input[type="textarea"],
     border-top-right-radius: 10px;
 }
 
+.table-top-right-w {
+    background-color: white;
+    border-top: 2px solid black;
+    border-bottom: 2px solid black;
+    border-right: 2px solid black;
+    text-align: center;
+    vertical-align: middle;
+    border-top-right-radius: 10px;
+}
+
 .table-top-mid{
     background-color: rgba(192,192,192,.9);
     border-right: 2px solid #fff;
@@ -2465,21 +2566,6 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 .vehicle-skills-hide,
 .rc-deck-show,
 .rc-deck-hide,
-.foci-show,
-.foci-hide,
-.totem-show,
-.totem-hide,
-.magicinitiate-show,
-.magicinitiate-hide,
-.geas-show,
-.geas-hide,
-.adeptpowers-show,
-.adeptpowers-hide,
-.spells-show,
-.spells-hide,
-.astralattributes-show,
-.astralattributes-hide,
-.sorceryskills-show,
 .sorceryskills-hide {
     display: none;
 }
@@ -2522,23 +2608,7 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 .securitysheaf-switch[value="show"]~div.securitysheaf-hide,
 .securitysheaf-switch[value="hide"]~div.securitysheaf-show,
 .deck-skills-switch[value="show"]~div.deck-skills-hide,
-.deck-skills-switch[value="hide"]~div.deck-skills-show,
-.totem-switch[value="show"]~div.totem-hide,
-.totem-switch[value="hide"]~div.totem-show,
-.geas-switch[value="show"]~div.geas-hide,
-.geas-switch[value="hide"]~div.geas-show,
-.magicinitiate-switch[value="show"]~div.magicinitiate-hide,
-.magicinitiate-switch[value="hide"]~div.magicinitiate-show,
-.foci-switch[value="show"]~div.foci-hide,
-.foci-switch[value="hide"]~div.foci-show, 
-.spells-switch[value="show"]~div.spells-hide,
-.spells-switch[value="hide"]~div.spells-show,
-.adeptpowers-switch[value="show"]~div.adeptpowers-hide,
-.adeptpowers-switch[value="hide"]~div.adeptpowers-show,
-.sorceryskills-switch[value="show"]~div.sorceryskills-hide,
-.sorceryskills-switch[value="hide"]~div.sorceryskills-show,
-.astralattributes-switch[value="show"]~div.astralattributes-hide,
-.astralattributes-switch[value="hide"]~div.astralattributes-show {
+.deck-skills-switch[value="hide"]~div.deck-skills-show {
     display: grid;
     grid-template-columns: auto 60px 1fr;
 }
@@ -2558,14 +2628,6 @@ input.enable-fa:not(:checked)~span.show_fa_dice {
 .deck-cyberdeck-switch[value="hide"]~div.deck-cyberdeck,
 .securitysheaf-switch[value="hide"]~div.securitysheaf,
 .combatskills-switch[value="hide"]~div.combat-skills,
-.sorceryskills-switch[value="hide"]~div.sorcery-skills,
-.spells-switch[value="hide"]~div.spells-section,
-.astralattributes-switch[value="hide"]~div.astralattributes,
-.totem-switch[value="hide"]~div.totem,
-.geas-switch[value="hide"]~div.geas,
-.foci-switch[value="hide"]~div.fetish-foci,
-.magicinitiate-switch[value="hide"]~div.magicinitiate,
-.adeptpowers-switch[value="hide"]~div.adept-powers,
 .rc-deck-switch[value="hide"]~div.rc-deck,
 .vehicle-skills-switch[value="hide"]~div.vehicle-skills {
     display: none;
diff --git a/Shadowrun3e/shadowrun3e.html b/Shadowrun3e/shadowrun3e.html
index 00b403a9fc..28695a20fb 100644
--- a/Shadowrun3e/shadowrun3e.html
+++ b/Shadowrun3e/shadowrun3e.html
@@ -37,7 +37,7 @@
         </div>
         <div class="spirittype-info">
             <div class="SRH5" data-i18n="spirit-type">Spirit Type: </div>
-                <select id="spirit-type" name="attr_spirit-type" style="largeselect">
+                <select id="spirit-type" name="attr_spirit-type" class="mediumselect2">
                     <option data-i18n="watcher">Watcher</option>
                     <optgroup data-i18n-label="elementals" label="Elementals">
                         <option data-i18n="air-elemental">Air Elemental</option>
@@ -863,16 +863,25 @@
         <div data-i18n="resist-banish">Resist Banish: </div><button title="Resist a Banishing action by a Mage/Shaman " type="action"
             class="d6-button" name='act_resistbanish' id="resistbanish">L</button>
     </div>
-    <div class="astralattributes-show">
-        <div class="SRH3" data-i18n="astral-space">Astral Space</div>
-            <button class="switch-button-show" type="action" name="act_astralattributesswitch" data-i18n="show">Show</button>
-    </div>
-    <div class="astralattributes-hide">
-        <div class="SRH3" data-i18n="astral-space">Astral Space</div>
-            <button class="switch-button-hide" type="action" name="act_astralattributesswitch" data-i18n="hide">Hide</button>
+    <div class="magic-tabs">
+        <input type='hidden' class='magictype' name='attr_magic-type' />
+    	<input type="hidden" class="magic-tabs-switch" name="attr_magictab" value="skills">
+    	<button class="magic-tabs-astral" type="action" name="act_astral-tab" data-i8n="astral-uppercase" data-i18n-title="astral-state-combat" title="Astral State and Combat">ASTRAL</button>
+    	<button class="magic-tabs-skills" type="action" name="act_skills-tab" data-i8n="skills-uppercase" data-i18n-title="magic-skills-configuration" title="Magic Skills and Configuration">SKILLS</button>
+    	<button class="magic-tabs-spells" type="action" name="act_spells-tab">SPELLS</button>
+    	<button class="magic-tabs-conjuring" type="action" name="act_conjuring-tab">CONJURING</button>
+        <div class="adept-only">
+    	<button class="magic-tabs-adept" type="action" name="act_adept-tab" data-i8n="adept-uppercase" data-i18n-title="adept-powers" title="Adept Powers">ADEPT</button>
+        </div>
+    	<button class="magic-tabs-foci" type="action" name="act_foci-tab" data-i8n="foci-uppercase">FOCI</button>
+    	<button class="magic-tabs-initiate" type="action" name="act_initiate-tab" data-i8n="initiate-uppercase">INITIATE</button>
+    	<button class="magic-tabs-geas" type="action" name="act_geas-tab" data-i8n="geas-uppercase">GAES</button>
+    	<button class="magic-tabs-totem" type="action" name="act_totem-tab" data-i8n="totem-uppercase">TOTEM</button>
     </div>
+    <input type="hidden" class="magic-tabs-switch" name="attr_magictab" value="skills">
     <input type="hidden" name="attr_astralreaction" value=0>
     <div class="astralattributes">
+        <br>
         <div class="astralspace">
             <div><b>Astral State:</div> 
 	    <select name="attr_astralstate" class="mediumselect2">
@@ -903,16 +912,8 @@
         </div>
         <br>
     </div>
-    <input type='hidden' class='sorceryskills-switch' name='attr_sorceryskillsswitch' value="show" />
-    <div class="sorceryskills-show">
-        <div class="SRH3" data-i18n="magic-skills-configuration" >Magic Skills and Configuration</div>
-            <button class="switch-button-show" type="action" name="act_sorceryskillsswitch" data-i18n="show">Show</button>
-    </div>
-    <div class="sorceryskills-hide">
-        <div class="SRH3"data-i18n="magic-skills-configuration" >Magic Skills and Configuration</div>
-            <button class="switch-button-hide" type="action" name="act_sorceryskillsswitch" data-i18n="hide">Hide</button>
-    </div>
     <div class="sorcery-skills">
+            <br>
         <div class="sorcery-config">
             <div></div>
             <header data-i18n="adept">Adept</header><input type="radio" name="attr_magic-type" value="adept">
@@ -1110,16 +1111,9 @@
     <div class="adept-only">
         <input type='hidden' class='buttontoggle' name='attr_sheettype' />
         <div class="hide-spirit-critter">
-            <input type='hidden' class='adeptpowers-switch' name='attr_adeptpowersswitch' value="show" />
-            <div class="adeptpowers-show">
-                <div class="SRH3" data-i18n="adept-powers">Adept Powers </div>
-                    <button class="switch-button-show" type="action" name="act_adeptpowersswitch" data-i18n="show">Show</button>
-            </div>
-            <div class="adeptpowers-hide">
-                <div class="SRH3" data-i18n="adept-powers">Adept Powers</div>
-                    <button class="switch-button-hide" type="action" name="act_adeptpowersswitch" data-i18n="hide">Hide</button>
-            </div>
+    	    <input type="hidden" class="magic-tabs-switch" name="attr_magictab" value="skills">
             <div class="adept-powers">
+                <br>
                 <div class="adept-skills-table">
                     <header class="table-top-left" data-i18n="power">Power</header>
                     <header class="table-top-mid" data-i18n="rating">Rating</header>
@@ -1178,16 +1172,8 @@
             </div>
         </div>
     </div>
-    <input type='hidden' class='spells-switch' name='attr_spellsswitch' value="show" />
-    <div class="spells-show">
-        <div class="SRH3" data-i18n="spells">Spells</div>
-            <button class="switch-button-show" type="action" name="act_spellsswitch" data-i18n="show">Show</button>
-    </div>
-    <div class="spells-hide">
-        <div class="SRH3" data-i18n="spells">Spells</div>
-            <button class="switch-button-hide" type="action" name="act_spellsswitch" data-i18n="hide">Hide</button>
-    </div>
     <div class="spells-section">
+        <br>
         <div class="spells-table">
             <div class="magic-spells-table">
                 <div class="table-top-left header" data-i18n="name">Name</div>
@@ -1283,16 +1269,8 @@
         </div>
         <br>
     </div>
-    <input type='hidden' class='foci-switch' name='attr_fociswitch' value="show" />
-    <div class="foci-show">
-        <div class="SRH3" data-i18n="fetishes-and-foci">Fetishes and Foci</div>
-            <button class="switch-button-show" type="action" name="act_fociswitch" data-i18n="show">Show</button>
-    </div>
-    <div class="foci-hide">
-        <div class="SRH3" data-i18n="fetishes-and-foci">Fetishes and Foci</div>
-            <button class="switch-button-hide" type="action" name="act_fociswitch" data-i18n="hide">Hide</button>
-    </div>
     <div class="fetish-foci">
+            <br>
         <div class="foci-table">
             <header class="table-top-left" data-i18n="type">Type</header>
             <header class="table-top-mid" data-i18n="category">Category</header>
@@ -1403,45 +1381,28 @@
             <div><button class="attack-dice" id="weaponfocus" type="action" name="act_melee"
                     title="Melee Attack"></button></div>
             <input class="myweapontxt" type="text" name="attr_weaponfocus-notes">
-            <br>
         </div>
         </div>
-        <input type='hidden' class='magicinitiate-switch' name='attr_magicinitiateswitch' value="show" />
-        <div class="magicinitiate-show">
-            <div class="SRH3" data-i18n="initiation-and-metamagic">Initiation and Metamagic</div>
-                <button class="switch-button-show" type="action" name="act_magicinitiateswitch" data-i18n="show">Show</button>
-        </div>
-        <div class="magicinitiate-hide">
-            <div class="SRH3" data-i18n="initiation-and-metamagic">Initiation and Metamagic</div>
-                <button class="switch-button-hide" type="action" name="act_magicinitiateswitch" data-i18n="hide">Hide</button>
-        </div>
         <div class="magicinitiate">
+	    <br>
 	    <div class="magicinitiate-level">
             	<div class="SRH4" data-i18n="initiate-grade">Initiate Grade:</div>
 		<input type="number" name="attr_initiategrade" value=0>
 	    </div>
             <div class="metamagic-table">
-                <header class="table-top-left" data-i18n="metamagic">Metamagic</header>
-                <header class="table-top-right" data-i18n="notes">Notes</header>
+                <header class="table-top-left-w" data-i18n="metamagic">Metamagic</header>
+                <header class="table-top-right-w" data-i18n="notes">Notes</header>
             </div>
             <fieldset class="repeating_metamagic">
                 <div class="metamagic-table">
-                    <div class="table-item-left"><input type="text" name="attr_metamagicname" /></div>
-                    <div class="table-item"><input type="text" name="attr_metamagicnotes" /></div>
+                    <div class="table-item-left-nc"><input type="text" name="attr_metamagicname" /></div>
+                    <div class="table-item-nc"><input type="text" name="attr_metamagicnotes" /></div>
                 </div>
             </fieldset>
             <br>
         </div>
-        <input type='hidden' class='geas-switch' name='attr_geasswitch' value="show" />
-        <div class="geas-show">
-            <div class="SRH3" data-i18n="geas">Geas</div>
-                <button class="switch-button-show" type="action" name="act_geasswitch" data-i18n="show">Show</button>
-        </div>
-        <div class="geas-hide">
-            <div class="SRH3" data-i18n="geas">Geas</div>
-                <button class="switch-button-hide" type="action" name="act_geasswitch" data-i18n="hide">Hide</button>
-        </div>
         <div class="geas">
+	    <br>
             <div class="geas-table">
                 <header class="table-top-left" data-i18n="geas-type">Geas Type</header>
                 <header class="table-top-right" data-i18n="geas-notes">Geas Notes</header>
@@ -1454,16 +1415,8 @@
             </fieldset>
             <br>
         </div>
-        <input type='hidden' class='totem-switch' name='attr_totemswitch' value="show" />
-        <div class="totem-show">
-            <div class="SRH3" data-i18n="totem-abilities">Totem/Abilities</div>
-                <button class="switch-button-show" type="action" name="act_totemswitch" data-i18n="show">Show</button>
-        </div>
-        <div class="totem-hide">
-            <div class="SRH3" data-i18n="totem-abilities">Totem/Abilities</div>
-                <button class="switch-button-hide" type="action" name="act_totemswitch" data-i18n="hide">Hide</button>
-        </div>
         <div class="totem">
+	    <br>
             <div class="totem-table">
                 <header class="table-top-left" data-i18n="totem">Totem</header>
                 <header class="table-top-mid" data-i18n="environment">Environment</header>
@@ -1475,6 +1428,65 @@
                 <div class="table-item"><input type="text" name="attr_totemdisadv" class="myweapontxt2"></div>
             </div>
         </div>
+        <div class="conjuring"> 
+	    <br>
+            <div class="conjuring-table">
+                <div class="table-top-left header" data-i18n="spirit-name">Spirit Name</div>
+                <div class="table-top-mid header" data-i18n="spirit-type">Spirit Type</div>
+                <div class="table-top-mid header" data-i18n="force">Force</div>
+                <div class="table-top-mid header" data-i18n="fetish">Fetish</div>
+                <div class="table-top-mid header" data-i18n="expendable">Expendable</div>
+                <div class="table-top-mid header" data-i18n="summon">Summon</div>
+                <div class="table-top-right header" data-i18n="banish">Banish</div>
+            </div>
+            <fieldset class='repeating_conjuring'>
+                <div class="conjuring-table">
+		<input type="text" name="name">
+                <select id="spirit-type" name="attr_type" class="mediumselect2">
+                    <option data-i18n="watcher">Watcher</option>
+                    <optgroup data-i18n-label="elementals" label="Elementals">
+                        <option data-i18n="air-elemental">Air Elemental</option>
+                        <option data-i18n="water-elemental">Water Elemental</option>
+                        <option data-i18n="earth-elemental">Earth Elemental</option>
+                        <option data-i18n="fire-elemental">Fire Elemental</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-man" label="Spirits of Man">
+                        <option data-i18n="city-spirit">City Spirit</option>
+                        <option data-i18n="field-spirit">Field Spirit</option>
+                        <option data-i18n="hearth-spirit">Hearth Spirit</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-land" label="Spirits of the Land">
+                        <option data-i18n="desert-spirit">Desert Spirit</option>
+                        <option data-i18n="forest-spirit">Forest Spirit</option>
+                        <option data-i18n="mountain-spirit">Mountain Spirit</option>
+                        <option data-i18n="prairie-spirit">Prairie Spirit</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-sky" label="Spirits of the Sky">
+                        <option data-i18n="mist-spirit">Mist Spirit</option>
+                        <option data-i18n="storm-spirit">Storm Spirit</option>
+                        <option data-i18n="wind-spirit">Wind Spirit</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-water" label="Spirits of the Waters">
+                        <option data-i18n="lake-spirit">Lake Spirit</option>
+                        <option data-i18n="river-spirit">River Spirit</option>
+                        <option data-i18n="sea-spirit">Sea Spirit</option>
+                    </optgroup>
+                    <optgroup data-i18n-label="spirit-of-elements" label="Spirits of the Elements">
+                        <option data-i18n="gnome">Gnome</option>
+                        <option data-i18n="manitous">Manitous</option>
+                        <option data-i18n="salamander">Salamander</option>
+                        <option data-i18n="sylph">Sylphs</option>
+                        <option data-i18n="ancestor">Ancestor</option>
+                    </optgroup>
+                </select>
+                    <input type="number" value=1 name="attr_force">
+                    <input type="number" value=0 name="attr_fetish">
+                    <input type="number" value=0 name="attr_expendable">
+                    <button class="pictos-button" data-i18n-title="summon-spirit" title="summon spirit" type="action" id="summons" name="act_conjure-spirit">L</button>
+                    <button class="pictos-button" data-i18n-title="banish-spirit" title="banish spirit" type="action" id="banish" name="act_conjure-spirit">L</button>
+                </div>
+            </fieldset>
+        </div>
     </div>
 </div>
 <div class='sheet-decks'>
@@ -4315,6 +4327,15 @@ buttonlist.forEach(button => {
     });
 });
 
+const magictabs = ["astral", "skills", "adept", "conjuring", "geas", "totem", "initiate", "foci", "spells"];
+magictabs.forEach(magic => {
+    button=magic + "-tab";
+    console.log(button)
+    on(`clicked:${button}`, function() {
+        setAttrs({ magictab: magic });
+    });
+});
+
 </script>
 
 <script type="text/worker">
@@ -5602,9 +5623,12 @@ on('clicked:matrixattack', (info) => {
 		dodge(mods); 
 	});
 
-   	var conjuring = function (myid) {
+   	const conjuring = function (myid, spirittype="spirit", force="ask", name="none") {
 		const atts=["charisma_max", "magic-type", "magic", "summoning", "banishing", "spiritcontrol", "character_name"]
 		getAttrs(atts, function(myval) {
+			if ( name == "none" ) { 
+				name = (spirittype)? spirittype : "spirit";
+			}
 			const mycharisma=myval["charisma_max"];
 		 	var calcTN;
 		 	var calcDrainTN;
@@ -5612,10 +5636,10 @@ on('clicked:matrixattack', (info) => {
 			if (myid != "summoning") calcDice+= " + ?{Are you the summoner of the spirit?|Yes," + mycharisma + "|No,0}"
 			var action;
 			if (myid == "summoning" ) {
-				calcTN="?{Force?}";
+				calcTN = (force=="ask")? "?{Force?}" : force;
 				var calcDice="?{Conjuring Dice?|" +  parseInt(myval[myid]) + "} + ?{Spirit Focus Dice}";
-				calcDrainTN="?{Force?}";
-				action="Conjure Force ?{Force?} Spirit";
+				calcDrainTN = (force=="ask")? "?{Force?}" : force;
+				action= (force =="ask")? "Conjure Force ?{Force?} Spirit" : "Conjure Force " + force + " Spirit";;
 
 			} else {
 				calcTN="@{target|Target|force}";
@@ -5623,11 +5647,19 @@ on('clicked:matrixattack', (info) => {
 				action= actionname + " Force @{target|Target|force} Spirit";
 			}
 			var calcDrainDice=mycharisma + " + ?{Conjuring Dice for Drain?|0} + ?{Spirit Focus Dice}";
-			var myroll="&{template:spell}{{myname=" + myval["character_name"] + "}}";
+			var myroll="&{template:conjure}{{myname=" + myval["character_name"] + "}}";
 			myroll+="{{draindamage=[[0]]}}"
-			if (myid == "summoning" ) myroll+="{{spiritforce=[[?{Force?|1}]]}}"
-			else  myroll+="{{spiritforce=[[  @{target|Target|force} ]]}}"
-			myroll+="{{spellpool=[[?{Spell Pool Dice|0} + ?{Drain Pool Dice|0}]]}}";
+			if (myid == "summoning" )  {
+				if (force=="ask") myroll+="{{spiritforce=[[?{Force?|1}]]}}"
+				else myroll+="{{spiritforce=" + force + "}}";
+				myroll+="{{spirittype=" + spirittype + "}}";
+				myroll+="{{spiritname=" + name + "}}";
+				myroll+="{{spellpool=[[?{Conjuring Dice?|0} + ?{Conjuring Dice for Drain?|0}]]}}";
+			}
+			else  { 
+				myroll+="{{spiritforce=[[  @{target|Target|force} ]]}}"
+				myroll+="{{spellpool=[[?{Spell Pool Dice|0} + ?{Drain Pool Dice|0}]]}}";
+			}
 			myroll+="{{spellname=" + action + "}}";
 			myroll+="{{spiritdice=[[?{Spirit Focus Dice|0}]]}}";
 			myroll+="{{rolldice=[[" + calcDice + "]]}}";
@@ -5665,6 +5697,26 @@ on('clicked:matrixattack', (info) => {
     		on(`clicked:${action}`, conjuring(action) );
 	});
 
+	on('clicked:repeating_conjuring:conjure-spirit', (info) => {
+		var atts=[];
+		console.log(info);
+		var source=info['sourceAttribute'].split('_');
+		var sourceattr=source.pop();
+		const myrepeat=source.join('_').concat('_');
+		const attributes=["name", "force", "spirit-type"];
+		attributes.forEach( attr=> {
+			atts.push(myrepeat + attr);
+		});
+		console.log(atts);
+		getAttrs(atts, function(myval) {
+			var name=myval[myrepeat + "name"];
+			if (!name) name="none";
+			const force=parseInt(myval[myrepeat + "force"]);
+			const spirittype=myval[myrepeat + "spirit-type"];
+			conjuring("summoning", spirittype, force, name);
+		});
+	});
+
 	on('clicked:conjure', (info) => {
 		const mytitle=info["htmlAttributes"]["title"]
 		const myid=info["htmlAttributes"]["id"]
@@ -8734,6 +8786,39 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
 	});
 </script>
 
+<rolltemplate class="sheet-rolltemplate-conjure">
+    <div class="sheet-rtcontainer">
+        <div class="sheet-rtheader">{{myname}}: {{spellname}} vs. {{targetofspell}}</div>
+        <div class="sheet-rtrow">Rolling: {{computed::rolldice}}d6 vs. {{targetnumber}} = {{casttest}}</div>
+        {{#spelldamage}}<div class="sheet-rtrow">Force: {{castforce}} Damage: {{computed::spelldamage}} </div>{{/spelldamage}}
+        {{#sorcerydice}}
+	<div class="sheet-conjure-resist-table">
+		<div>Dice</div><div></div><div>Sorcery</div><div></div><div>Pool</div>
+		<div>Used</div><div></div><div>{{sorcerydice}}</div><div></div><div>{{#spellpool}}{{spellpool}}{{/spellpool}}</div>
+	</div>{{/sorcerydice}}
+        {{#roll}}<div class="sheet-rtrow">Casting Test: {{computed::cast}} {{computed::roll}}</div>{{/roll}}
+        {{#draintest}}
+	<div class="sheet-conjure-resist-table">
+		<div>Drain</div><div></div><div>Resist Test</div><div></div><div>Final</div>
+		<div>{{computed::draindamage}}</div><div></div><div>{{draintest}}</div><div></div><div>{{computed::finaldrain}}</div>
+	</div>
+	{{/draintest}}
+        {{#description}}<div class="rtrow">{{description}}</div>{{/description}}
+        {{#notes}}<div class="sheet-rtrow"> {{notes}}</div>{{/notes}}
+        {{#notes2}}<div class="sheet-rtrow"> {{notes2}}</div>{{/notes2}}
+        {{#resist}}<div class="sheet-rtrow">{{targetofspell}}: {{resist}}</div>{{/resist}}
+        {{#defensetest}}<div class="sheet-conjure-resist-table">
+		<div>Attack</div><div></div><div>Defense</div><div></div><div>Result</div>
+		<div>{{attacks}}</div><div>-</div><div>{{casttest}}</div><div>=</div><div>{{computed::defensetest}}</div>
+	</div>{{/defensetest}}
+        <div class="sheet-rtrow">{{#spelldefense}}[Spell Defense](~selected|spelldefense||{{computed::senddata}}){{/spelldefense}}
+        {{#casttest}}{{targetofspell}}:
+	{{#dodge}}[Dodge](~{{targetofspell}}|dodge||{{computed::senddata}}){{/dodge}}
+	[Resist](~{{targetofspell}}|{{resisttype}}||{{computed::senddata}})
+	</div>{{/casttest}}
+        {{#roll}}<div class="sheet-rtrow">{{targetofspell}}: [AOE](~selected|checkaoe||{{computed::senddata}})</div>{{/roll}}
+    </div>
+</rolltemplate>
 <rolltemplate class="sheet-rolltemplate-spell">
     <div class="sheet-rtcontainer">
         <div class="sheet-rtheader">{{myname}}: {{spellname}} vs. {{targetofspell}}</div>