diff --git a/less/character-sheet.less b/less/character-sheet.less
index b290e20..440db94 100644
--- a/less/character-sheet.less
+++ b/less/character-sheet.less
@@ -443,7 +443,7 @@
     }
 
     select {
-        background-color: #30da0c;
+        background-color: transparent;
         color: black;
         border: black;
         width: 80px;
@@ -454,7 +454,6 @@
         -moz-border-radius: 20px;
         -o-border-radius: 20px;
 
-        padding: 5px;
         margin: 15px 10px;
         display: flex;
         flex-direction: column;
@@ -484,7 +483,7 @@
         left: 0;
         height: 20px;
         width: 36px;
-        background-color: transparent;
+        background-color: #30da0c;
         border-radius: 5px;
         margin-right: 8px;
 
diff --git a/pokemon.css b/pokemon.css
index 9d2cf0f..f13846b 100644
--- a/pokemon.css
+++ b/pokemon.css
@@ -380,7 +380,7 @@
   margin-bottom: 7px;
 }
 .pokemon.sheet.characterSheet select {
-  background-color: #30da0c;
+  background-color: transparent;
   color: black;
   border: black;
   width: 80px;
@@ -389,7 +389,6 @@
   -webkit-border-radius: 20px;
   -moz-border-radius: 20px;
   -o-border-radius: 20px;
-  padding: 5px;
   margin: 15px 10px;
   display: flex;
   flex-direction: column;
@@ -415,7 +414,7 @@
   left: 0;
   height: 20px;
   width: 36px;
-  background-color: transparent;
+  background-color: #30da0c;
   border-radius: 5px;
   margin-right: 8px;
   box-shadow: 0 0 10px #003300 inset;
diff --git a/pokemon.js b/pokemon.js
index a97c4e1..07cda65 100644
--- a/pokemon.js
+++ b/pokemon.js
@@ -26,7 +26,7 @@ Hooks.once("init", async () => {
     preloadHandlebarsTemplates();
 
     // Register Additional Handelbar Helpers
-    registerHandlebarsHelpers();  
+    registerHandlebarsHelpers();
 });
 
 Hooks.once("ready", async () => {
@@ -35,7 +35,7 @@ Hooks.once("ready", async () => {
     CONFIG.INIT = false;
 
     // Only execute when run as Gamemaster
-    if(!game.user.isGM) return;   
+    if(!game.user.isGM) return;
 });
 
 function preloadHandlebarsTemplates() {
@@ -52,7 +52,7 @@ function preloadHandlebarsTemplates() {
 
 function registerHandlebarsHelpers() {
 
-    Handlebars.registerHelper("equals", function(v1, v2) { return (v1 === v2)});
+    Handlebars.registerHelper("equals", function(v1, v2) { console.log("v1: "+v1+"\nv2: "+v2); return (v1 === v2)});
 
     Handlebars.registerHelper("contains", function(element, search) { return (element.includes(search))});
 
@@ -79,9 +79,9 @@ function registerHandlebarsHelpers() {
     });
 
     Handlebars.registerHelper("times", function(n, content) {
-        
+
         let result = "";
-        
+
         for(let i = 0; i < n; i++)
             result += content.fn(i);
 
diff --git a/system.json b/system.json
index 395505d..ca38eb0 100644
--- a/system.json
+++ b/system.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.1.3",
+    "version": "0.1.4",
     "id": "pokemon",
     "title": "Pokémon TTRPG",
     "description": "A Pokémon TTRPG",
diff --git a/system.zip b/system.zip
index c40b45d..fca4a2b 100644
Binary files a/system.zip and b/system.zip differ
diff --git a/templates/partials/character-sheet-character.hbs b/templates/partials/character-sheet-character.hbs
index 7ec439f..f690cbe 100644
--- a/templates/partials/character-sheet-character.hbs
+++ b/templates/partials/character-sheet-character.hbs
@@ -5,7 +5,7 @@
             <div class="row">
                 <label class="container">
                     <input class="radioButton" type="radio" name="system.attackCategory" value="Physical"
-                            {{#if (eq system.attackCategory "Physical")}}checked{{/if}}>
+                            {{#if (equals system.attackCategory "Physical")}}checked{{/if}}>
                     <span class="checkmark"></span>
                     Physical
                 </label>
@@ -13,7 +13,7 @@
             <div class="row">
                 <label class="container">
                     <input class="radioButton" type="radio" name="system.attackCategory" value="Special"
-                            {{#if (eq system.attackCategory "Special")}}checked{{/if}}>
+                            {{#if (equals system.attackCategory "Special")}}checked{{/if}}>
                     <span class="checkmark"></span>
                     Special
                 </label>
@@ -30,7 +30,7 @@
             <div class="row">
                 <label class="container">
                     <input class="radioButton" type="radio" name="system.defenseCategory" value="Physical"
-                            {{#if (eq system.defenseCategory "Physical")}}checked{{/if}}>
+                            {{#if (equals system.defenseCategory "Physical")}}checked{{/if}}>
                     <span class="checkmark"></span>
                     Physical
                 </label>
@@ -38,7 +38,7 @@
             <div class="row">
                 <label class="container">
                     <input class="radioButton" type="radio" name="system.defenseCategory" value="Special"
-                            {{#if (eq system.defenseCategory "Special")}}checked{{/if}}>
+                            {{#if (equals system.defenseCategory "Special")}}checked{{/if}}>
                     <span class="checkmark"></span>
                     Special
                 </label>
diff --git a/templates/sheets/character/header.hbs b/templates/sheets/character/header.hbs
index cf558b2..c766b3f 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 (eq 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 (eq system.type2 this)}}selected{{/if}}>{{this}}</option>
+                        <option value="{{this}}" {{#if (equals system.type2 this)}}selected{{/if}}>{{this}}</option>
                     {{/each}}
                 </select>
             </div>