diff --git a/less/character-sheet.less b/less/character-sheet.less
index 440db94..a877dbd 100644
--- a/less/character-sheet.less
+++ b/less/character-sheet.less
@@ -146,7 +146,7 @@
         flex-direction: column;
         align-items: center;
         width: 200px;
-        height: 400px;
+        height: 500px;
         border-right: #5e0000;
     }
 
@@ -252,7 +252,7 @@
 
     .vertLine {
         position: absolute;
-        height: 416px;
+        height: 490px;
         float: left;
         left: 216px;
         bottom: 0px;
@@ -330,6 +330,7 @@
         border: none;
         padding: 0px 10px;
         border-bottom-right-radius: 20px;
+        border-top-left-radius: 20px;
     }
 
     .horLine {
@@ -337,7 +338,7 @@
         position: absolute;
         right: 0px;
         height: 5px;
-        bottom: 411px;
+        bottom: 511px;
         background-color: #5e0000;
     }
 
diff --git a/modules/sheets/pokemonCharacterSheet.js b/modules/sheets/pokemonCharacterSheet.js
index d2276e9..9c8c70a 100644
--- a/modules/sheets/pokemonCharacterSheet.js
+++ b/modules/sheets/pokemonCharacterSheet.js
@@ -76,7 +76,14 @@ export default class pokemonCharacterSheet extends api.HandlebarsApplicationMixi
     }
 
     calculateDerivated(context) {
-        context.system.armorClass = 10+context.system.stats.defense;
+        context.system.phArmorClass = 10+context.system.stats.defense;
+        context.system.spArmorClass = 10+context.system.stats.defense;
+        if (context.system.defenseCategory == "Physical") {
+            context.system.phArmorClass += 2;
+        } else {
+            context.system.spArmorClass += 2;
+        }
+
         context.system.speed = 30+5*context.system.stats.speed;
 
         return context;
diff --git a/pokemon.css b/pokemon.css
index f13846b..5888f2e 100644
--- a/pokemon.css
+++ b/pokemon.css
@@ -131,7 +131,7 @@
   flex-direction: column;
   align-items: center;
   width: 200px;
-  height: 400px;
+  height: 500px;
   border-right: #5e0000;
 }
 .pokemon.sheet.characterSheet .imgBox {
@@ -218,7 +218,7 @@
 }
 .pokemon.sheet.characterSheet .vertLine {
   position: absolute;
-  height: 416px;
+  height: 490px;
   float: left;
   left: 216px;
   bottom: 0px;
@@ -282,13 +282,14 @@
   border: none;
   padding: 0px 10px;
   border-bottom-right-radius: 20px;
+  border-top-left-radius: 20px;
 }
 .pokemon.sheet.characterSheet .horLine {
   width: 400px;
   position: absolute;
   right: 0px;
   height: 5px;
-  bottom: 411px;
+  bottom: 511px;
   background-color: #5e0000;
 }
 .pokemon.sheet.characterSheet nav {
diff --git a/system.json b/system.json
index ca38eb0..fb63398 100644
--- a/system.json
+++ b/system.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.1.4",
+    "version": "0.1.5",
     "id": "pokemon",
     "title": "Pokémon TTRPG",
     "description": "A Pokémon TTRPG",
diff --git a/system.zip b/system.zip
index fca4a2b..b044a20 100644
Binary files a/system.zip and b/system.zip differ
diff --git a/template.json b/template.json
index 3f9394f..ea16a41 100644
--- a/template.json
+++ b/template.json
@@ -17,7 +17,8 @@
                 "EXP": 0
             },
 
-            "armorClass": 0,
+            "phArmorClass": 0,
+            "spArmorClass": 0,
             "stats": {
                 "attack": 0,
                 "defense": 0,
diff --git a/templates/sheets/character/header.hbs b/templates/sheets/character/header.hbs
index c766b3f..e65f285 100644
--- a/templates/sheets/character/header.hbs
+++ b/templates/sheets/character/header.hbs
@@ -6,13 +6,13 @@
             <div class="typeSelectBox">
                 <select class="{{system.type1}}" name="system.type1">
                     {{#each types}}
-                        <option value="{{this}}" {{#if (equals system.type1 this)}}selected{{/if}}>{{this}}</option>
+                        <option value="{{this}}" {{#if (equals ../system.type1 this)}}selected{{/if}}>{{this}}</option>
                     {{/each}}
                 </select>
                 <select class="{{system.type2}}" name="system.type2">
                     <option value="" {{#if (eq system.type2 "")}}selected{{/if}}></option>
                     {{#each types}}
-                        <option value="{{this}}" {{#if (equals system.type2 this)}}selected{{/if}}>{{this}}</option>
+                        <option value="{{this}}" {{#if (equals ../system.type2 this)}}selected{{/if}}>{{this}}</option>
                     {{/each}}
                 </select>
             </div>
diff --git a/templates/sheets/character/sidebar.hbs b/templates/sheets/character/sidebar.hbs
index 2d99ba6..4febda5 100644
--- a/templates/sheets/character/sidebar.hbs
+++ b/templates/sheets/character/sidebar.hbs
@@ -20,7 +20,10 @@
                 <div class="charHex charHPMax"><span class="charHexHead">Max</span></br><input class="charHexValue hpMaxValue invisibleInput" type="number" name="system.hp.max" value="{{system.hp.max}}"></div>
             </div>
             <div class="row">
-                <div class="charHex"><span class="charHexHead">{{localize "POKEMON.System.ArmorClass"}}</span></br><span class="charHexValue">{{system.armorClass}}</span></div>
+                <div class="charHex"><span class="charHexHead">Ph. AC</span></br><span class="charHexValue">{{system.phArmorClass}}</span></div>
+                <div class="charHex"><span class="charHexHead">Sp. AC</span></br><span class="charHexValue">{{system.spArmorClass}}</span></div>
+            </div>
+            <div class="row">
                 <div class="charHex"><span class="charHexHead">{{localize "POKEMON.System.Speed"}}</span></br><span class="charHexValue">{{system.speed}}</span></div>
             </div>
         </div>