diff --git a/module/item/entity.js b/module/item/entity.js
index 8b35bcc5..3ddab49e 100644
--- a/module/item/entity.js
+++ b/module/item/entity.js
@@ -55,6 +55,26 @@ export default class Item5e extends Item {
 
   /* -------------------------------------------- */
 
+  /**
+   * Is the Item a force power
+   * @type {boolean}
+   */
+  get isForcePower() {
+    return ["lgt", "drk", "uni"].includes(this.data.data.school);
+  }
+
+  /* -------------------------------------------- */
+
+  /**
+   * Is the Item a tech power
+   * @type {boolean}
+   */
+  get isTechPower() {
+    return ["tec"].includes(this.data.data.school);
+  }
+
+  /* -------------------------------------------- */
+
   /**
    * Does the Item implement an attack roll as part of its usage
    * @type {boolean}
diff --git a/module/templates.js b/module/templates.js
index af337996..764463f3 100644
--- a/module/templates.js
+++ b/module/templates.js
@@ -21,7 +21,8 @@ export const preloadHandlebarsTemplates = async function() {
 	  "systems/sw5e/templates/actors/newActor/parts/swalt-active-effects.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-features.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-inventory.html",
-    "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html",
+    "systems/sw5e/templates/actors/newActor/parts/swalt-force-powerbook.html",
+    "systems/sw5e/templates/actors/newActor/parts/swalt-tech-powerbook.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-resources.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-traits.html",
     
diff --git a/templates/actors/newActor/character-sheet.html b/templates/actors/newActor/character-sheet.html
index 58de5c48..a53cc6bc 100644
--- a/templates/actors/newActor/character-sheet.html
+++ b/templates/actors/newActor/character-sheet.html
@@ -132,7 +132,11 @@
 		</section>
 		{{!-- Powerbook Tab --}}
 		<section class="tab powerbook" data-group="primary" data-tab="powerbook">
-			{{> "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html"}}
+			{{> "systems/sw5e/templates/actors/newActor/parts/swalt-force-powerbook.html"}}
+		</section>
+
+		<section class="tab powerbook" data-group="primary" data-tab="powerbook">
+			{{> "systems/sw5e/templates/actors/newActor/parts/swalt-tech-powerbook.html"}}
 		</section>
 		{{!-- Effects Tab --}}
         <section class="tab effects flexcol" data-group="primary" data-tab="effects">
diff --git a/templates/actors/newActor/expanded-limited-sheet.html b/templates/actors/newActor/expanded-limited-sheet.html
index be0f84ab..7f8337fc 100644
--- a/templates/actors/newActor/expanded-limited-sheet.html
+++ b/templates/actors/newActor/expanded-limited-sheet.html
@@ -128,7 +128,10 @@
 		</section>
 		{{!-- Powerbook Tab --}}
 		<section class="tab powerbook" data-group="primary" data-tab="powerbook">
-			{{> "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html"}}
+			{{> "systems/sw5e/templates/actors/newActor/parts/swalt-force-powerbook.html"}}
+		</section>
+		<section class="tab powerbook" data-group="primary" data-tab="powerbook">
+			{{> "systems/sw5e/templates/actors/newActor/parts/swalt-tech-powerbook.html"}}
 		</section>
 		{{!-- Biography Tab --}}
 		<section class="tab biography" data-group="primary" data-tab="biography">
diff --git a/templates/actors/newActor/npc-sheet.html b/templates/actors/newActor/npc-sheet.html
index 037f64de..a3b8ed7e 100644
--- a/templates/actors/newActor/npc-sheet.html
+++ b/templates/actors/newActor/npc-sheet.html
@@ -173,7 +173,10 @@
 
         {{!-- Powerbook Tab --}}
         <div class="tab powerbook flexcol" data-group="primary" data-tab="powerbook">
-            {{> "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html"}}
+            {{> "systems/sw5e/templates/actors/newActor/parts/swalt-force-powerbook.html"}}
+        </div>
+        <div class="tab powerbook flexcol" data-group="primary" data-tab="powerbook">
+            {{> "systems/sw5e/templates/actors/newActor/parts/swalt-tech-powerbook.html"}}
         </div>
 
         {{!-- Effects Tab --}}
diff --git a/templates/actors/newActor/parts/swalt-powerbook.html b/templates/actors/newActor/parts/swalt-force-powerbook.html
similarity index 84%
rename from templates/actors/newActor/parts/swalt-powerbook.html
rename to templates/actors/newActor/parts/swalt-force-powerbook.html
index adf7a022..d7bfbd6b 100644
--- a/templates/actors/newActor/parts/swalt-powerbook.html
+++ b/templates/actors/newActor/parts/swalt-force-powerbook.html
@@ -1,27 +1,11 @@
 <section class="resource-items">
     <div class="resource">
-        <h1>
-            Force Points
-        </h1>
-        <div class="attribute-value">
-            <input name="data.attributes.force.points.value" type="text" value="{{data.attributes.force.points.value}}" data-dtype="Number"
-                placeholder="0" class="value-number" />
-            <span class="value-separator">/</span>
-            <input name="data.attributes.force.points.max" type="text" value="{{data.attributes.force.points.max}}" data-dtype="Number"
-                placeholder="0" class="value-number" />
-        </div>
-    </div>
+        <h1>Force Points</h1>
 
-    <div class="resource">
-        <h1>
-            Tech Points
-        </h1>
         <div class="attribute-value">
-            <input name="data.attributes.tech.points.value" type="text" value="{{data.attributes.tech.points.value}}" data-dtype="Number"
-                placeholder="0" class="value-number" />
+            <input name="data.attributes.force.points.value" type="text" value="{{data.attributes.force.points.value}}" data-dtype="Number" placeholder="0" class="value-number" />
             <span class="value-separator">/</span>
-            <input name="data.attributes.tech.points.max" type="text" value="{{data.attributes.tech.points.max}}" data-dtype="Number"
-                placeholder="0" class="value-number" />
+            <input name="data.attributes.force.points.max" type="text" value="{{data.attributes.force.points.max}}" data-dtype="Number" placeholder="0" class="value-number" />
         </div>
     </div>
 </section>
@@ -54,18 +38,16 @@
         <li class="filter-item" data-filter="reaction">{{localize "SW5E.Reaction"}}</li>
         <li class="filter-item" data-filter="concentration">{{localize "SW5E.AbbreviationConc"}}</li>
         <li class="filter-item" data-filter="ritual">{{localize "SW5E.Ritual"}}</li>
-        <li class="filter-item" data-filter="prepared">{{localize "SW5E.Prepared"}}{{#if preparedPowers}}
-            ({{preparedPowers}}){{/if}}</li>
+        <li class="filter-item" data-filter="prepared">{{localize "SW5E.Prepared"}}{{#if preparedPowers}}({{preparedPowers}}){{/if}}</li>
     </ul>
 
     <div class="group-list-header group-grid-powers">
-        <div></div>
         <div class="item-detail item-uses"></div>
         <div class="item-detail item-school">{{localize "SW5E.PowerSchool"}}</div>
         <div class="item-detail item-action">{{localize "SW5E.PowerUsage"}}</div>
         <div class="item-detail item-target">{{localize "SW5E.PowerTarget"}}</div>
-
     </div>
+
     <ol class="group-list">
         {{#each powerbook as |section|}}
         <li>
@@ -99,6 +81,7 @@
             </div>
             <ol class="item-list">
                 {{#each section.powers as |item i|}}
+                {{#if item.data.isForcePower }}
                 <li class="item group-grid-powers" data-item-id="{{item._id}}">
                     <div class="item-name rollable">
                         <div class="item-image" style="background-image: url({{item.img}})"></div>
@@ -110,12 +93,7 @@
                         Uses {{item.data.uses.value}} / {{item.data.uses.max}}
                         {{/if}}
                     </div>
-                    
-                    <!-- <div class="power-comps">
-                        {{#each labels.components}}
-                        <span class="power-component {{this}}">{{this}}</span>
-                        {{/each}}
-                    </div> -->
+
                     <div class="item-detail item-school">{{labels.school}}</div>
                     <div class="item-detail item-action">{{labels.activation}}</div>
                     <div class="item-detail item-target" title="{{localize 'SW5E.Range'}}: {{labels.range}}">
@@ -125,7 +103,6 @@
                         {{/if}}
                     </div>
 
-
                     {{#if ../../owner}}
                     <div class="item-detail item-controls">
                         {{#if section.canPrepare}}
@@ -137,6 +114,7 @@
                     </div>
                     {{/if}}
                 </li>
+                {{/if}}
                 {{/each}}
             </ol>
         </li>
diff --git a/templates/actors/newActor/parts/swalt-tech-powerbook.html b/templates/actors/newActor/parts/swalt-tech-powerbook.html
new file mode 100644
index 00000000..84df6e67
--- /dev/null
+++ b/templates/actors/newActor/parts/swalt-tech-powerbook.html
@@ -0,0 +1,141 @@
+<section class="resource-items">
+    <div class="resource">
+        <h1>Tech Points</h1>
+
+        <div class="attribute-value">
+            <input name="data.attributes.tech.points.value" type="text" value="{{data.attributes.tech.points.value}}" data-dtype="Number" placeholder="0" class="value-number" />
+            <span class="value-separator">/</span>
+            <input name="data.attributes.tech.points.max" type="text" value="{{data.attributes.tech.points.max}}" data-dtype="Number" placeholder="0" class="value-number" />
+        </div>
+    </div>
+</section>
+
+<section class="panel">
+    <div class="powercasting-ability">
+        <label>{{localize "SW5E.PowerAbility"}}
+        <select name="data.attributes.powercasting" data-type="String">
+            {{#select data.attributes.powercasting}}
+            <option value="">{{localize "SW5E.None"}}</option>
+            {{#each data.abilities as |abl a|}}
+            <option value="{{a}}">{{abl.label}}</option>
+            {{/each}}
+            {{/select}}
+        </select>
+        </label>
+        {{#if isNPC}}
+        <label>{{localize "SW5E.PowercasterLevel"}}
+        <input class="powercasting-level" type="text" name="data.details.powerLevel" value="{{data.details.powerLevel}}"
+            data-dtype="Number" placeholder="0" />
+            </label>
+        {{/if}}
+        <h3 class="power-dc">{{localize "SW5E.PowerDC"}} <span>{{data.attributes.powerdc}}</span></h3>
+    </div>
+
+    <ul class="filter-list" data-filter="powerbook">
+        <li class="filter-title">{{localize "SW5E.Filter"}}</li>
+        <li class="filter-item" data-filter="action">{{localize "SW5E.Action"}}</li>
+        <li class="filter-item" data-filter="bonus">{{localize "SW5E.BonusAction"}}</li>
+        <li class="filter-item" data-filter="reaction">{{localize "SW5E.Reaction"}}</li>
+        <li class="filter-item" data-filter="concentration">{{localize "SW5E.AbbreviationConc"}}</li>
+        <li class="filter-item" data-filter="ritual">{{localize "SW5E.Ritual"}}</li>
+        <li class="filter-item" data-filter="prepared">{{localize "SW5E.Prepared"}}{{#if preparedPowers}}({{preparedPowers}}){{/if}}</li>
+    </ul>
+
+    <div class="group-list-header group-grid-powers">
+        <div class="item-detail item-uses"></div>
+        <div class="item-detail item-school">{{localize "SW5E.PowerSchool"}}</div>
+        <div class="item-detail item-action">{{localize "SW5E.PowerUsage"}}</div>
+        <div class="item-detail item-target">{{localize "SW5E.PowerTarget"}}</div>
+    </div>
+
+    <ol class="group-list">
+        {{#each powerbook as |section|}}
+        <li>
+            <div class="group-list-title group-grid-powers">
+                <div class="item-name">
+                    <h3>{{section.label}}</h3>
+                    {{#if section.canCreate}}
+                    <a class="item-control item-create" title="{{localize 'SW5E.PowerCreate'}}"
+                        {{#each section.dataset as |v k|}}data-{{k}}="{{v}}" {{/each}}>
+                        <i class="fas fa-plus"></i> {{localize "SW5E.Add"}}
+                    </a>
+                    {{/if}}
+                </div>
+    
+                <div class="item-detail item-uses">
+                    {{#if section.usesSlots}}
+                    <input type="text" name="data.powers.{{section.prop}}.value" value="{{section.uses}}" placeholder="0"
+                        data-dtype="Number" />
+                    /
+                    <span data-level="{{section.prop}}" data-slots="{{section.slots}}">
+                        {{{section.slots}}}
+                        {{#if ../editable}}
+                        <a class="slot-max-override" title="{{localize 'SW5E.PowerProgOverride'}}">
+                            <i class="fas fa-edit"></i>
+                        </a>
+                        {{/if}}
+                        {{ else }}
+                        {{{section.uses}}} / {{{section.slots}}}
+                        {{/if}}
+                </div>
+            </div>
+            <ol class="item-list">
+                {{#each section.powers as |item i|}}
+                {{#if item.data.isTechPower }}
+                <li class="item group-grid-powers" data-item-id="{{item._id}}">
+                    <div class="item-name rollable">
+                        <div class="item-image" style="background-image: url({{item.img}})"></div>
+                        <h4>{{item.name}}</h4>
+                    </div>
+                    
+                    <div class="item-detail item-uses">
+                        {{#if item.data.uses.per }}
+                        Uses {{item.data.uses.value}} / {{item.data.uses.max}}
+                        {{/if}}
+                    </div>
+
+                    <div class="item-detail item-school">{{labels.school}}</div>
+                    <div class="item-detail item-action">{{labels.activation}}</div>
+                    <div class="item-detail item-target" title="{{localize 'SW5E.Range'}}: {{labels.range}}">
+                        {{#if labels.target}}
+                        {{labels.target}}
+                        {{else}}None
+                        {{/if}}
+                    </div>
+
+                    {{#if ../../owner}}
+                    <div class="item-detail item-controls">
+                        {{#if section.canPrepare}}
+                        <a class="item-control item-toggle {{item.toggleClass}}" title="{{item.toggleTitle}}"><i
+                                class="fas fa-check-circle"></i></a>
+                        {{/if}}
+                        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                    </div>
+                    {{/if}}
+                </li>
+                {{/if}}
+                {{/each}}
+            </ol>
+        </li>
+        {{else}}
+        {{#if owner}}
+        {{#if filters.powerbook.size}}
+        <li class="item flexrow">
+            <p class="notes">{{localize "SW5E.FilterNoPowers"}}</p>
+        </li>
+        {{else}}
+        <li class="item flexrow inventory-header powerbook-header powerbook-empty">
+            <div class="item-controls">
+                <a class="item-control item-create" title="{{localize 'SW5E.PowerCreate'}}" data-type="power"
+                    data-level="{{lvl}}"><i class="fas fa-plus"></i> {{localize "SW5E.PowerAdd"}}</a>
+            </div>
+        </li>
+        <li class="item flexrow">
+            <p class="notes">{{localize "SW5E.NoPowerLevels"}}</p>
+        </li>
+        {{/if}}
+        {{/if}}
+        {{/each}}
+    </ol>
+</section>
\ No newline at end of file