diff --git a/less/character-sheet.less b/less/character-sheet.less
index ecbeb6f..fa707f7 100644
--- a/less/character-sheet.less
+++ b/less/character-sheet.less
@@ -504,12 +504,12 @@
 
     /* On mouse-over, add a grey background color */
     .container:hover input ~ .checkmark {
-        background-color: #3de31c;
+        background-color: #83f16d;
     }
 
     /* When the radio button is checked, add a blue background */
     .container input:checked ~ .checkmark {
-        background-color: #69f84d;
+        background-color: #30da0c;
     }
 
     /* Create the indicator (the dot/circle - hidden when not checked) */
@@ -527,8 +527,8 @@
     /* Style the indicator (dot/circle) */
     .container .checkmark:after {
         top: 5px;
-        left: 8px;
-        width: 13px;
+        left: 13px;
+        width: 10px;
         height: 10px;
         border-radius: 50%;
         background: black;
diff --git a/pokemon.css b/pokemon.css
index bf3f4aa..d7e0639 100644
--- a/pokemon.css
+++ b/pokemon.css
@@ -430,10 +430,10 @@
   -o-border-radius: 10px;
 }
 .pokemon.sheet.characterSheet .container:hover input ~ .checkmark {
-  background-color: #3de31c;
+  background-color: #83f16d;
 }
 .pokemon.sheet.characterSheet .container input:checked ~ .checkmark {
-  background-color: #69f84d;
+  background-color: #30da0c;
 }
 .pokemon.sheet.characterSheet .checkmark:after {
   content: "";
@@ -445,8 +445,8 @@
 }
 .pokemon.sheet.characterSheet .container .checkmark:after {
   top: 5px;
-  left: 8px;
-  width: 13px;
+  left: 13px;
+  width: 10px;
   height: 10px;
   border-radius: 50%;
   background: black;
diff --git a/system.json b/system.json
index ef7c3e0..c920057 100644
--- a/system.json
+++ b/system.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.0.46",
+    "version": "0.0.47",
     "id": "pokemon",
     "title": "Pokémon TTRPG",
     "description": "A Pokémon TTRPG",
diff --git a/system.zip b/system.zip
index ce0e8f2..e90a9a6 100644
Binary files a/system.zip and b/system.zip differ
diff --git a/template.json b/template.json
index 816b2a1..551e8c4 100644
--- a/template.json
+++ b/template.json
@@ -28,24 +28,28 @@
                 "current": 0
             },
             "moves": {
-                "move 1": {
-                    "category": 0,
-                    "type": 0,
+                "move1": {
+                    "name": "",
+                    "category": "Physical",
+                    "type": "Normal",
                     "description": ""
                 },
-                "move 2": {
-                    "category": 0,
-                    "type": 0,
+                "move2": {
+                    "name": "",
+                    "category": "Physical",
+                    "type": "Normal",
                     "description": ""
                 },
-                "move 3": {
-                    "category": 0,
-                    "type": 0,
+                "move3": {
+                    "name": "",
+                    "category": "Physical",
+                    "type": "Normal",
                     "description": ""
                 },
-                "move 4": {
-                    "category": 0,
-                    "type": 0,
+                "move4": {
+                    "name": "",
+                    "category": "Physical",
+                    "type": "Normal",
                     "description": ""
                 }
             }
diff --git a/templates/partials/character-sheet-combat.hbs b/templates/partials/character-sheet-combat.hbs
index 7a4d011..493e6ce 100644
--- a/templates/partials/character-sheet-combat.hbs
+++ b/templates/partials/character-sheet-combat.hbs
@@ -1,2 +1,18 @@
-<div class="charSheetBox">
+<div class="combatBox">
+    <div class="row">
+        <input class="inputText moveName" type="text" name="system.moves.move1.name" value="{{system.moves.move1.name}}">
+        <textarea class="inputText moveDescription" type="text" name="system.moves.move1.name">{{system.moves.move1.description}}</textarea>
+    </div>
+    <div class="row">
+        <input class="inputText moveName" type="text" name="system.moves.move2.name" value="{{system.moves.move2.name}}">
+        <textarea class="inputText moveDescription" type="text" name="system.moves.move2.name">{{system.moves.move2.description}}</textarea>
+    </div>
+    <div class="row">
+        <input class="inputText moveName" type="text" name="system.moves.move3.name" value="{{system.moves.move3.name}}">
+        <textarea class="inputText moveDescription" type="text" name="system.moves.move3.name">{{system.moves.move3.description}}</textarea>
+    </div>
+    <div class="row">
+        <input class="inputText moveName" type="text" name="system.moves.move4.name" value="{{system.moves.move4.name}}">
+        <textarea class="inputText moveDescription" type="text" name="system.moves.move4.name">{{system.moves.move4.description}}</textarea>
+    </div>
 </div>
\ No newline at end of file