From 1c3dbcb9effb4afcee84afeceea6fad63dbeac54 Mon Sep 17 00:00:00 2001
From: MedievalSteve <skeightley@gmail.com>
Date: Sat, 30 Nov 2024 22:42:28 +1000
Subject: [PATCH] Dragon Warriors Update to 2.02

Bugfixes and Layout/styling updates
---
 Dragon Warriors/Dragon Warriors Revised.css  |  530 +++++----
 Dragon Warriors/Dragon Warriors Revised.html | 1063 +++++++-----------
 2 files changed, 713 insertions(+), 880 deletions(-)

diff --git a/Dragon Warriors/Dragon Warriors Revised.css b/Dragon Warriors/Dragon Warriors Revised.css
index 17ffaa48f3b..f733ee965d0 100644
--- a/Dragon Warriors/Dragon Warriors Revised.css	
+++ b/Dragon Warriors/Dragon Warriors Revised.css	
@@ -25,6 +25,12 @@
   font-family: 'Cormorant Unicase', serif; 
 }
 
+.ui-dialog .charsheet h2 {
+    text-align: center;
+    font-size: 19px;
+    margin-bottom: 10px;
+}
+
 /* Default styling for labels */
 .ui-dialog .charsheet label {
   font-size: 16px;
@@ -1274,10 +1280,11 @@
 
 /* Main container with border image and background color */
 .main {
-  min-width: 850px;
+  min-width: 595px;
+  aspect-ratio: 1.414/1;
   border: 20px solid transparent;
   padding: 1px;
-  border-image: url(https://i.imgur.com/XxBv5A2.png) 30 round;
+  border-image: url(https://i.imgur.com/XxBv5A2.png) 30 round repeat;
   border-image-outset: 1px;
   background-color: var(--primary-bg-color);
 }
@@ -1304,8 +1311,7 @@
         "primaryattributes finalattackdefenceattributes afattributes"
         "finalmeleecombatattributes finalrangedcombatattributes hpattributes"
         "finalmeleecombatattributes finalrangedcombatattributes stealthperceptionattributes"
-        "finalmeleecombatattributes finalrangedcombatattributes evasionattribute"
-        "classcombatabilities mpattributes mamdattributes";
+        "classcombatabilities mpattributes guardscontainer";
         /* Set all columns to equal width (1fr) */
       grid-template-columns: repeat(3, minmax(0, 1fr));
       grid-template-rows: auto; 
@@ -1364,7 +1370,7 @@
         .primaryattributes {
           display: grid;
           grid-area: primaryattributes;
-          grid-template-columns: 1fr 1fr auto; /* Columns: name, input, button */
+          grid-template-columns: 2fr 1fr auto; 
           grid-template-areas:
             "primaryattribheader primaryattribheader primaryattribheader"
             "name1 input1 button1"
@@ -1377,6 +1383,7 @@
           padding: var(--padding);
           border-radius: var(--border-radius);
           border: 5px double var(--border-color); /* Double-line border */
+          align-content: start;
           box-sizing: border-box;
         }
         
@@ -1452,19 +1459,22 @@
         .finalattackdefenceattributes {
           display: grid;
           grid-area: finalattackdefenceattributes;
-          grid-template-columns: 1fr 1fr; /* Two columns: one for labels and one for inputs */
+          grid-template-columns: 2fr 1fr; /* Two columns: one for labels and one for inputs */
           grid-template-areas:
             "finalattackdefenceheader finalattackdefenceheader"
             "meleeattacklabel meleeattackinput"
             "meleedefencelabel meleedefenceinput"
             "rangedattacklabel rangedattackinput"
-            "rangeddefencelabel rangeddefenceinput";
+            "rangeddefencelabel rangeddefenceinput"
+            "finalevasionlabel finalevasionbox"
+            "finalmagdeflabel finalmagdefbox";
           gap: 5px;
           background-color: var(--primary-bg-color); /* Make sure this matches your design */
           padding: var(--padding);
           border-radius: var(--border-radius);
           border: 5px double var(--border-color); /* Double-line border */
           box-sizing: border-box;
+          align-content: start;
         }
         
             .finalattackdefenceattributes h2 {
@@ -1507,6 +1517,22 @@
               grid-area: rangeddefenceinput;
             }
             
+            .finalattackdefenceattributes .finalevasionlabel {
+                grid-area: finalevasionlabel;
+            }
+            
+            .finalattackdefenceattributes .finalevasionbox {
+                grid-area: finalevasionbox;
+            }
+            
+            .finalattackdefenceattributes .finalmagdeflabel {
+                grid-area: finalmagdeflabel;
+            }
+            
+             .finalattackdefenceattributes .finalmagdefbox {
+                grid-area: finalmagdefbox;
+            }
+            
             /* Ensure inputs and labels are styled consistently */
             .finalattackdefenceattributes div {
               background-color: var(--primary-bg-color); /* Primary background color for divs */
@@ -1519,76 +1545,31 @@
               padding: var(--padding); /* Padding for inputs */
             }
                 
-        .evasionattribute {
-          display: grid;
-          grid-area: evasionattribute;
-          grid-template-columns: 1fr 1fr; /* Two columns: one for labels and one for inputs */
-          grid-template-areas: 
-            "evadeheader evadeheader"
-            "finaldodge finalevade";
-          gap: 5px;
-          background-color: var(--primary-bg-color); /* Make sure this matches your design */
-          padding: var(--padding);
-          border-radius: var(--border-radius);
-          border: 5px double var(--border-color); /* Double-line border */
-          box-sizing: border-box;
-        }
-        
-            .evasionattribute h2 {
-              grid-column: 1 / -1; /* Span the header across all columns */
-              text-align: center;
-              font-size: 19px;
-              margin-bottom: 10px;
-              grid-area: evadeheader;
-            }
-            
-            .evasionattribute .finaldodge {
-              grid-area: finaldodge;
-            }
-            
-            .evasionattribute .finalevade {
-              grid-area: finalevade;
-            }
-
-        .mamdattributes {
+        .guardscontainer {
             display: grid;
-            grid-area: mamdattributes; 
+            grid-area: guardscontainer; 
             grid-template-columns: 1fr 1fr; /* Two columns: one for labels and one for inputs */
             grid-template-areas: 
-                "mamdheader mamdheader"
-                "magicalattacklabel magicalattackinput"
-                "magicaldefencelabel magicaldefenceinput";
+              "nonmartialhidden"
+              "martialhidden";
             gap: 5px;
             background-color: var(--primary-bg-color); /* Make sure this matches your design */
             padding: var(--padding);
             border-radius: var(--border-radius);
             border: 5px double var(--border-color); /* Double-line border */
             box-sizing: border-box;
+            align-content: start;
         }
-                
-            .mamdattributes h2 {
-                grid-area: mamdheader;
-                text-align: center;
-                font-size: 19px;
-                margin-bottom: 10px;
-            }
-            
-            .mamdattributes .magicalattacklabel {
-                grid-area: magicalattacklabel;
-            }
-            
-            .mamdattributes .magicalattackinput {
-                grid-area: magicalattackinput;
-            }
             
-            .mamdattributes .magicaldefencelabel {
-                grid-area: magicaldefencelabel;
+            .nonmartialhidden {
+                grid-area: nonmartialhidden;
             }
             
-            .mamdattributes .magicaldefenceinput {
-                grid-area: magicaldefenceinput;
+            .martialhidden {
+                grid-area: martialhidden;
             }
-                
+
+
         .stealthperceptionattributes {
             display: grid;
             grid-area: stealthperceptionattributes;
@@ -1603,6 +1584,7 @@
             border-radius: var(--border-radius);
             border: 5px double var(--border-color); /* Double-line border */
             box-sizing: border-box;
+            align-content: space-evenly;
         }
 
             .stealthperceptionattributes h2 {
@@ -1624,8 +1606,6 @@
                 display: flex;
                 gap: 5px; /* Space between buttons */
             }
-            
-            /* Perception section */
             .stealthperceptionattributes > div:nth-of-type(4) {
                 grid-area: perceptionlabel;
             }
@@ -1637,15 +1617,10 @@
                 display: flex;
                 gap: 5px; /* Space between buttons */
             }
-            
             .stealthperceptionattributes button {
                 margin: 0 5px;
             }
 
-        /* .gapfillimg { */
-        /*    grid-area: gapfillimg; */
-       /*  } */
-        
         .hpattributes {
           grid-area: hpattributes;
           display: grid;
@@ -1655,6 +1630,7 @@
           border-radius: var(--border-radius);
           border: 5px double var(--border-color); /* Double-line border */
           box-sizing: border-box;
+          align-content: start;
         }
         
             .hpattributes h2 {
@@ -1681,7 +1657,7 @@
             border-radius: var(--border-radius);
             border: 5px double var(--border-color);
             box-sizing: border-box;
-            align-items: start; /* Vertically aligns the content */
+            align-items: start;
         }
         
             .afattributes h2 {
@@ -1730,6 +1706,7 @@
           border-radius: var(--border-radius);
           border: 5px double var(--border-color); /* Double-line border */
           box-sizing: border-box;
+          align-content: start;
           grid-template-columns: 1fr 1fr; /* Ensures all elements stack in a single column */
           grid-template-areas: 
           "finalcombatheader finalcombatheader"
@@ -1751,6 +1728,7 @@
             border: 5px double var(--border-color); /* Double-line border */
             grid-template-columns: 1fr 1fr; /* Ensures all elements stack in a single column */
             box-sizing: border-box;
+            align-content: start;
             grid-template-areas: 
                 "finalcombatheader finalcombatheader"
                 "rangedattack1 rangedattack1"
@@ -1841,6 +1819,7 @@
           grid-template-rows: max-content;
           grid-template-columns: 1fr; /* Ensures all elements stack in a single column */
           box-sizing: border-box;
+          align-content: start;          
           grid-template-areas:
             "classcombatabilitiesheader"
             "skills_known"
@@ -1866,6 +1845,7 @@
                 grid-template-areas:
                     "barbarianmelee"
                     "knightmelee"
+                    "supremacy"
                     "warlockmelee"
                     "assassinmelee"
                     "huntermelee"
@@ -1883,6 +1863,9 @@
             .knightmelee {
                 grid-area: knightmelee;
             }
+            .supremacy {
+                grid-area: supremacy;
+            }
             .warlockmelee {
                 grid-area: warlockmelee;
             }
@@ -1911,60 +1894,95 @@
                 grid-area: nomelee;
             }
 
-
         .mpattributes {
           grid-area: mpattributes;
           display: grid;
           gap: 5px;
-          background-color: var(--primary-bg-color); /* Make sure this matches your design */
+          background-color: var(--primary-bg-color); 
           padding: var(--padding);
           border-radius: var(--border-radius);
-          border: 5px double var(--border-color); /* Double-line border */
-          grid-template-columns: 1fr; /* Ensures all elements stack in a single column */
+          border: 5px double var(--border-color); 
+          grid-template-columns: 1fr; 
           box-sizing: border-box;
+          align-content: start;
           grid-template-areas:
-          "mpattribheader"
-          "mpattributeshidden"
-          "nonmartialhidden"
-          "martialhidden";
+          "magicattributeshidden"
+          "magicpointsattributeshidden";
         }
-
-            .mpattributes h2 {
-                grid-area: mpattribheader;
-                text-align: center;
-                font-size: 19px;
-                margin-bottom: 10px;
+            .magicpointsattributeshidden {
+                grid-area: magicpointsattributeshidden;
+                display: grid;
             }
             
-            .mpattributeshidden {
-                grid-area: mpattributeshidden;
+            .magicattributeshidden {
+              grid-area: magicattributeshidden; /* Make sure this has a designated grid area */
+              display: grid;
+              grid-template-rows: auto; /* Adjust rows as needed */
+              gap: 10px; 
+              align-items: start; 
             }
             
-            .nonmartialhidden {
-                grid-area: nonmartialhidden;
+            .castermp {
+              grid-row: 1; /* Place this in the first row */
+              display: grid;
+              grid-template-rows: auto auto; /* Two rows: one for the h2 and one for the grid */
+              gap: 10px; 
+              align-items: start; 
             }
             
-            .martialhidden {
-                grid-area: martialhidden;
+            .castermp h2 {
+              grid-row: 1; /* Place the h2 in the first row */
+              text-align: center;
+            }
+            
+            .castermp-grid {
+              grid-row: 2; /* Place the grid in the second row */
+              display: grid;
+              grid-template-columns: 2fr 1fr; 
+              align-items: start; 
+              gap: 5px;
             }
             
+            .castermp-grid > div:nth-of-type(odd) { 
+              font-weight: bold;
+            }
+            
+            .commonspellexpiry, 
+            .warlockspellexpiry {
+              grid-column: 1 / span 2; /* Span across both columns */
+              display: grid;
+              grid-template-columns: 2fr 1fr; 
+              align-items: start; 
+              gap: 5px;
+            }
+            
+            .mysticmp {
+              grid-row: 2; /* Place this in the second row */
+              display: grid;
+              grid-template-columns: 1fr 2fr; 
+              align-items: start; 
+              gap: 5px;
+            }            
     /* Grid layout for combat section */
     .basescores {
         grid-area: basescores;
         display: grid;
         grid-template-columns: repeat(2, 1fr); /* Three equal columns */
         grid-template-rows: auto; /* Automatically adjust row height */
-        gap: 10px; /* Space between grid items */        
+        gap: 10px; /* Space between grid items */
+        align-content: space-evenly;
         grid-template-areas:
+        "common common"
         "basecharacteristics baseattributes"
         "basemeleeattributes baserangedattributes"
+        "magicalattributes magicalattributes"
         "finalbasecombatattributes finalbasecombatattributes";
     }
         
         .basecharacteristics {
             grid-area: basecharacteristics;
             display: grid;
-            grid-template-columns: 1fr 1fr 1fr; /* Adjust column widths as needed */
+            grid-template-columns: 2fr 1fr 1fr; /* Adjust column widths as needed */
             grid-template-areas:
                 "basecharheader basecharheader basecharheader"
                 "characteristic base modifier"
@@ -2245,10 +2263,78 @@
                 grid-area: rollbasehpbuttoncontainer;
             }
             
+        .magicalattributes {
+          display: grid;
+          grid-area: magicalattributes;
+          grid-template-rows: auto; 
+          gap: 10px;
+          background-color: var(--primary-bg-color);
+          padding: var(--padding);
+          border-radius: var(--border-radius);
+          border: 5px double var(--border-color);
+          align-items: center; 
+          align-content: start;
+          grid-template-areas:
+            "magical-grid"; 
+        }
+        
+            .magical-grid {
+              grid-area: magical-grid;
+              display: grid;
+              grid-template-columns: 1fr 1fr 1fr; 
+              grid-template-areas:
+                "title title title" 
+                "attribute base modifier" 
+                "magicalattack magicalattack magicalattack" 
+                "magicaldefence magicaldefence magicaldefence"; 
+              gap: 5px; 
+            }
+            
+            .magical-grid h2 {
+              grid-area: title; 
+              text-align: center;
+            }
+            
+            .magical-grid h3.attribute {
+              grid-area: attribute;
+              font-weight: bold;
+            }
+            
+            .magical-grid h3.base {
+              grid-area: base;
+              font-weight: bold;
+            }
+            
+            .magical-grid h3.modifier {
+              grid-area: modifier;
+              font-weight: bold;
+            }
+            
+            .magicalattackcontainer { 
+              grid-area: magicalattack;
+              display: grid;
+              grid-template-columns: 1fr 1fr 1fr;
+            }
+            
+            .magicalattackcontainer > div:nth-of-type(1) { grid-column: 1; } 
+            .magicalattackcontainer > div:nth-of-type(2) { grid-column: 2; } 
+            .magicalattackcontainer > div:nth-of-type(3) { grid-column: 3; } 
+            
+            .magicaldefencecontainer { 
+              grid-area: magicaldefence;
+              display: grid;
+              grid-template-columns: 1fr 1fr 1fr; 
+            }
+            
+            .magicaldefencecontainer > div:nth-of-type(1) { grid-column: 1; } 
+            .magicaldefencecontainer > div:nth-of-type(2) { grid-column: 2; } 
+            .magicaldefencecontainer > div:nth-of-type(3) { grid-column: 3; }
+
         .basemeleeattributes {
             display: grid;
             grid-area: basemeleeattributes;
             grid-template-columns: 1fr 1fr; /* Two columns for Attribute and Modifier */
+            align-content: space-evenly;
             grid-template-areas:
                 "basemeleeheader basemeleeheader"
                 "attribute modifier"
@@ -2402,125 +2488,147 @@
             }
                 
         .finalbasecombatattributes {
-            display: grid;
-            grid-area: finalbasecombatattributes;
-            grid-template-columns: 1fr 1fr 1fr 1fr; /* Four columns: melee h3, melee input, ranged h3, ranged input */
-            gap: 10px;
-            background-color: var(--primary-bg-color);
-            padding: var(--padding);
-            border-radius: var(--border-radius);
-            border: 5px double var(--border-color); /* Double-line border */
-            align-items: center; /* Vertically align content */
+          display: grid;
+          grid-area: finalbasecombatattributes;
+          grid-template-columns: 1fr 1fr 1fr 1fr; /* Four columns: melee h3, melee input, ranged h3, ranged input */
+          gap: 10px;
+          background-color: var(--primary-bg-color);
+          padding: var(--padding);
+          border-radius: var(--border-radius);
+          border: 5px double var(--border-color); 
+          align-items: center; 
         }
         
             .finalbasecombatattributes h2 {
-                grid-column: 1 / span 4; /* Span across all four columns */
-                text-align: center;
-                margin-bottom: 10px;
+              grid-column: 1 / span 4; /* Span across all four columns */
+              text-align: center;
+              margin-bottom: 10px;
             }
             
             .finalbasecombatattributes h3 {
-                margin: 0; /* Remove default margin for tighter layout */
+              margin: 0; 
             }
             
             .finalbasecombatattributes input {
-                width: 100%;
-                box-sizing: border-box; /* Ensure inputs don't overflow their containers */
-                padding: 5px;
-                
-            }
-            
-    /* Grid layout for magic section */
+              width: 100%;
+              box-sizing: border-box;
+              padding: 5px;
+            }            
+
     .magic {
       grid-area: magic;
-      grid-template-columns: 1fr 1fr 1fr;
+      grid-template-columns: 1fr;
       display: grid;
       grid-template-areas:
-      "manabox allprofessionattribs allcastermana"
-      "spellbox spellbox spellbox";
+       "manabox"
+       "spellbox";
     }
-        .allprofessionattribs {
-            display: grid;
-            grid-area: allprofessionattribs;
-            grid-template-columns: 1fr 1fr; /* Two equal columns */
-            grid-template-rows: auto auto auto; /* Adjust rows automatically */
-            gap: 10px;
-            background-color: var(--primary-bg-color);
-            padding: var(--padding);
-            border-radius: var(--border-radius);
-            border: 5px double var(--border-color); /* Double-line border */
-            align-items: center; /* Vertically align content */
+    
+        .manabox {
+          display: grid;
+          grid-area: manabox;
+          gap: 10px;
+          background-color: var(--primary-bg-color);
+          padding: var(--padding);
+          border-radius: var(--border-radius);
+          border: 5px double var(--border-color);
+          align-items: center; 
+          align-content: center;
+          grid-template-columns: 1fr 1fr; 
+          grid-template-areas:
+            "magicbox manacollection"
+            "elementalistattributes elementalistattributes"; 
         }
         
-            .allprofessionattribs h2 {
-                grid-column: span 2; /* Make the header span across both columns */
-                text-align: center;
-                margin-bottom: 10px;
-            }
-    
-            .allprofessionattribs h3 {
-                text-align: left;
-                font-weight: bold;
+            .magicbox {
+                grid-area: magicbox;
             }
             
-            .allprofessionattribs input {
-                width: 100%;
-                padding: 5px;
-                text-align: center;
+            .notacaster {
+                grid-area: notacaster;
             }
-        
-        .allcastermana {
-            display: grid;
-            grid-area: allcastermana;
-            grid-template-columns: 1fr 1fr; /* Two equal columns */
-            grid-template-rows: auto auto auto; /* Adjust rows automatically */
-            gap: 10px;
-            background-color: var(--primary-bg-color);
-            padding: var(--padding);
-            border-radius: var(--border-radius);
-            border: 5px double var(--border-color); /* Double-line border */
-            align-items: center; /* Vertically align content */
-        }
-            
-            .allcastermana h2 {
-                grid-column: span 2; /* Make the header span across both columns */
-                text-align: center;
-                margin-bottom: 10px;
+                
+            .castermana {
+              grid-area: castermana; 
+              display: grid;
+              grid-template-rows: auto; 
+              gap: 10px; 
+              align-items: center;
+              align-content: center;
             }
             
-            .allcastermana h3 {
-                text-align: left;
-                font-weight: bold;
+            .castermana h2 { 
+              grid-row: 1; 
+              text-align: center;
             }
             
-            .allcastermana input {
-                width: 100%;
-                padding: 5px;
-                text-align: center;
-            }
-        
-        .manabox {
-            display: grid;
-            grid-area: manabox;
-            gap: 10px;
-            background-color: var(--primary-bg-color);
-            padding: var(--padding);
-            border-radius: var(--border-radius);
-            border: 5px double var(--border-color); /* Double-line border */
-            align-items: center; /* Vertically align content */
-        }
-        
-            .mana h3 {
-                margin-bottom: 5px;
-                font-weight: bold;
-            }
+            .castermana-grid {
+              grid-row: 2; 
+              display: grid;
+              grid-template-columns: 1fr 1fr; 
+              align-items: center;
+              align-content: center;
+              gap: 5px;
+            }
+            
+            .castermana-grid > div:nth-of-type(odd) { 
+              font-weight: bold;
+            }
+            
+            .commonspellexpiry, 
+            .warlockspellexpiry {
+              grid-column: 1 / span 2;  /* Make these span both columns */
+              display: grid;
+              grid-template-columns: 1fr 1fr;
+              align-items: center;
+              align-content: center;
+              gap: 5px;
+            } 
+            
+            .elementalistattributes {
+              grid-area: elementalistattributes;
+              display: grid; 
+              grid-template-columns: 1fr 1fr; 
+              gap: 10px; 
+              background-color: var(--primary-bg-color);
+              padding: var(--padding);
+              grid-template-areas:
+                "elementselectscontainer elementsimage";
+            }
+            
+                .elementselectscontainer {
+                    grid-area: elementselectscontainer;
+                    align-items: center; 
+                    align-content: center;
+                }
+                
+                .elementsimage {
+                    grid-area: elementsimage;
+                    width: 98%;
+                    height: auto;
+                }
             
-            .mana button, .mana input, .mana select {
-                width: 100%;
-                padding: 5px;
-                text-align: center;
-                margin-bottom: 10px;
+            .manacollection {
+              display: grid;
+              grid-area: manacollection;
+              align-items: center; 
+              align-content: center;
+              grid-template-areas:
+                "standardmana secondaryelementmpcontainer tertiaryelementmpcontainer"
+                "mysticmana mysticmana mysticmana";
             }
+            
+                .secondaryelementmpcontainer {
+                    grid-area: secondaryelementmpcontainer;
+                }
+                
+                .tertiaryelementmpcontainer {
+                    grid-area: tertiaryelementmpcontainer;
+                }
+                
+                .mysticmana {
+                    grid-area: mysticmana;
+                }
 
         .spellbox {
             grid-area: spellbox;
@@ -2537,7 +2645,7 @@
                 "warlock"
                 "elementalist"
                 "demonologist"
-                "noncaster" ;
+                "noncaster";
             }
         
                 .sorcerer_spell_list {
@@ -2902,7 +3010,7 @@
 /* Grid layout for languages section */
 .languages {
   grid-area: languages;
-              gap: 10px;
+            gap: 10px;
             background-color: var(--primary-bg-color);
             padding: var(--padding);
             border-radius: var(--border-radius);
@@ -2914,7 +3022,7 @@
 /* Grid layout for biographical section */
 .biographical {
   grid-area: biographical;
-              gap: 10px;
+            gap: 10px;
             background-color: var(--primary-bg-color);
             padding: var(--padding);
             border-radius: var(--border-radius);
@@ -2926,7 +3034,7 @@
 /* Documentation section with custom font and border style */
 .documentation {
   grid-area: documentation;
-              gap: 10px;
+            gap: 10px;
             background-color: var(--primary-bg-color);
             padding: var(--padding);
             border-radius: var(--border-radius);
@@ -3002,6 +3110,8 @@
 /* Display grid layout for specific profession abilities based on toggle value */
 input.profession-toggle[value="Knight"] ~ div.knightmelee,
 input.profession-toggle[value="Barbarian"] ~ div.barbarianmelee,
+input.profession-toggle[value="Knight"] ~ div.supremacy,
+input.profession-toggle[value="Barbarian"] ~ div.supremacy,
 input.profession-toggle[value="Assassin"] ~ div.assassinmelee,
 input.profession-toggle[value="Hunter"] ~ div.huntermelee,
 input.profession-toggle[value="Knave"] ~ div.knavemelee,
@@ -3037,17 +3147,17 @@ input.profession-toggle[value="Knave"] ~ div.nonmartialhidden,
 input.profession-toggle[value="Knave"] ~ div.nomagic,
 input.profession-toggle[value="Priest"] ~ div.nonmartialhidden,
 input.profession-toggle[value="Priest"] ~ div.nomagic,
-input.profession-toggle[value="Sorcerer"] ~ div.mpattributeshidden,
+input.profession-toggle[value="Sorcerer"] ~ div.magicattributeshidden,
 input.profession-toggle[value="Sorcerer"] ~ div.nonmartialhidden,
-input.profession-toggle[value="Mystic"] ~ div.mpattributeshidden,
+input.profession-toggle[value="Mystic"] ~ div.magicattributeshidden,
 input.profession-toggle[value="Mystic"] ~ div.nonmartialhidden,
-input.profession-toggle[value="Elementalist"] ~ div.mpattributeshidden,
+input.profession-toggle[value="Elementalist"] ~ div.magicattributeshidden,
 input.profession-toggle[value="Elementalist"] ~ div.nonmartialhidden,
-input.profession-toggle[value="Warlock"] ~ div.mpattributeshidden,
+input.profession-toggle[value="Warlock"] ~ div.magicattributeshidden,
 input.profession-toggle[value="Warlock"] ~ div.nonmartialhidden,
-input.profession-toggle[value="Demonologist"] ~ div.mpattributeshidden,
+input.profession-toggle[value="Demonologist"] ~ div.magicattributeshidden,
 input.profession-toggle[value="Demonologist"] ~ div.nonmartialhidden,
-input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.mpattributeshidden,
+input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.magicattributeshidden,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.martialhidden,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.nonmartialhidden {
   display: grid;
@@ -3063,15 +3173,21 @@ input.profession-toggle[value="Sorcerer"] ~ div.castermp,
 input.profession-toggle[value="Mystic"] ~ div.castermp,
 input.profession-toggle[value="Elementalist"] ~ div.castermp,
 input.profession-toggle[value="Demonologist"] ~ div.castermp,
-input.profession-toggle[value="Warlock"] ~ div.warlockmp,
+input.profession-toggle[value="Warlock"] ~ div.castermp,
+input.profession-toggle[value="Demonologist"] ~ div.commonspellexpiry,
+input.profession-toggle[value="Elementalist"] ~ div.commonspellexpiry,
+input.profession-toggle[value="Mystic"] ~ div.commonspellexpiry,
+input.profession-toggle[value="Sorcerer"] ~ div.commonspellexpiry,
+input.profession-toggle[value="Warlock"] ~ div.warlockspellexpiry,
 input.profession-toggle[value="Elementalist"] ~ div.standardmp,
 input.profession-toggle[value="Elementalist"] ~ div.elementalistmp,
 input.profession-toggle[value="Sorcerer"] ~ div.standardmp,
 input.profession-toggle[value="Mystic"] ~ div.mysticmp,
 input.profession-toggle[value="Warlock"] ~ div.standardmp,
 input.profession-toggle[value="Demonologist"] ~ div.standardmp,
+input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.warlockspellexpiry,
+input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.commonspellexpiry,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.castermp,
-input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.warlockmp,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.elementalistmp,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.standardmp,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.mysticmp {
@@ -3088,7 +3204,7 @@ input.profession-toggle[value="Sorcerer"] ~ div.castermana,
 input.profession-toggle[value="Mystic"] ~ div.castermana,
 input.profession-toggle[value="Elementalist"] ~ div.castermana,
 input.profession-toggle[value="Demonologist"] ~ div.castermana,
-input.profession-toggle[value="Warlock"] ~ div.warlockmana,
+input.profession-toggle[value="Warlock"] ~ div.castermana,
 input.profession-toggle[value="Sorcerer"] ~ div.standardmana,
 input.profession-toggle[value="Mystic"] ~ div.mysticmana,
 input.profession-toggle[value="Elementalist"] ~ div.elementalistattributes,
@@ -3096,8 +3212,12 @@ input.profession-toggle[value="Elementalist"] ~ div.standardmana,
 input.profession-toggle[value="Elementalist"] ~ div.elementalistmana,
 input.profession-toggle[value="Warlock"] ~ div.standardmana,
 input.profession-toggle[value="Demonologist"] ~ div.standardmana,
+input.profession-toggle[value="Sorcerer"] ~ div.magicalattackcontainer,
+input.profession-toggle[value="Mystic"] ~ div.magicalattackcontainer,
+input.profession-toggle[value="Elementalist"] ~ div.magicalattackcontainer,
+input.profession-toggle[value="Demonologist"] ~ div.magicalattackcontainer,
+input.profession-toggle[value="Warlock"] ~ div.magicalattackcontainer,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.castermana,
-input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.warlockmana,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.elementalistattributes,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.standardmana,
 input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([value="Warlock"]):not([value="Assassin"]):not([value="Knave"]):not([value="Hunter"]):not([value="Priest"]):not([value="Mystic"]):not([value="Elementalist"]):not([value="Demonologist"]):not([value="Sorcerer"]):not([value=""]) ~ div.elementalistmana,
@@ -3302,6 +3422,7 @@ input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([valu
 .charsheet input.paths_toggle[value="disabled"] ~ div.pathscontainer,
 .charsheet input.secondaryskills_toggle[value="disabled"] ~ div.secondaryskillscontainer,
 .charsheet input.playerspells_toggle[value="disabled"] ~ div.playerspell,
+.charsheet div.supremacy,
 .charsheet div.knightskills,
 .charsheet div.barbarianskills,
 .charsheet div.assassinskills,
@@ -3334,7 +3455,6 @@ input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([valu
 .charsheet div.demonologistmelee,
 .charsheet div.nomelee,
 .charsheet div.castermana,
-.charsheet div.warlockmana,
 .charsheet div.elementalistattributes,
 .charsheet div.standardmana,
 .charsheet div.elementalistmana,
@@ -3359,7 +3479,8 @@ input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([valu
 .charsheet div.rollbasestatsbuttoncontainer,
 .charsheet div.rollbasehpbuttoncontainer,
 .charsheet div.castermp,
-.charsheet div.warlockmp,
+.charsheet div.commonspellexpiry,
+.charsheet div.warlockspellexpiry,
 .charsheet div.standardmp,
 .charsheet div.elementalistmp,
 .charsheet div.mysticmp,
@@ -3449,7 +3570,8 @@ input.profession-toggle:not([value="Knight"]):not([value="Barbarian"]):not([valu
 .charsheet div.elementalist_core_powers,
 .charsheet div.steper_d20,
 .charsheet div.steper_2d10,
-.charsheet div.rangedmagicallowed {
+.charsheet div.rangedmagicallowed,
+.charsheet div.magicalattackcontainer {
         display: none;
 }
 
diff --git a/Dragon Warriors/Dragon Warriors Revised.html b/Dragon Warriors/Dragon Warriors Revised.html
index 01072a14f37..38cab825785 100644
--- a/Dragon Warriors/Dragon Warriors Revised.html	
+++ b/Dragon Warriors/Dragon Warriors Revised.html	
@@ -1,9 +1,8 @@
 <div class="main">
-    
     <div class="buttonbar">
         <img class="headerimage" src="https://i.imgur.com/KnxTKFu.png" alt="Dragon Warriors" />
         <button type="action" name="act_character" >Combat Summary</button>
-        <button type="action" name="act_basescores" >Character Modification</button>
+        <button type="action" name="act_basescores" >Character Builder</button>
         <button type="action" name="act_magic" >Magic</button>
         <button type="action" name="act_inventory" >Inventory</button>
         <button type="action" name="act_skills" >Paths and Skills</button>
@@ -13,7 +12,7 @@
     </div>
     <input type='hidden' class='tabstoggle' name='attr_sheetTab' value='character' />
     <div class="character">
-        <div class="frontpage common">
+        <div class="common">
           <div class="label-input-pair name">
             <label>Name</label>
             <input id="character-name" name="attr_character_name" type="text" class="fourteenlongtextinput" />
@@ -31,7 +30,7 @@
             <input id="xp" class="sixshorttextinput" name="attr_xp" type="number" value="0" />
           </div>
         </div>
-        <div class="frontpage primaryattributes">
+        <div class="primaryattributes">
             <h2>Characteristics</h2>
             <div>Strength</div>
             <div>
@@ -69,7 +68,7 @@ <h2>Characteristics</h2>
                 <button class="roll d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:customd20} {{title=@{character_name} tests Looks}} {{subtitle=Roll under Looks Value}} {{roll= [[?{Number of dice|1}d20cs1cf20]]}} {{Vs= [[@{finallooks}+?{Modifier?|0}]] }}" name="roll_lookscheck"></button>
             </div>
         </div>
-        <div class="frontpage finalattackdefenceattributes">
+        <div class="finalattackdefenceattributes">
           <h2>Combat Factors</h2>
           <div class="finalmeleelabel1">Melee Attack</div>
           <div class="finalmeleebox1">
@@ -87,32 +86,132 @@ <h2>Combat Factors</h2>
           <div class="finalrangedbox2">
             <input class="fourshorttextinput" type="number" name="attr_finalrangeddefence" value="0" readonly />
           </div>
-        </div>
-        <div class="frontpage evasionattribute">
-            <h2>Dodging</h2>
-            <div class="finaldodge">
-                Evasion
-            </div>
-            <div class="finalevade"> 
+          <div class="finalevasionlabel">Evasion</div>
+            <div class="finalevasionbox"> 
                 <input class="fourshorttextinput" type="number" name="attr_finalevasion" value="0" readonly />
+          </div>
+          <div class="finalmagdeflabel">Magical Defence</div> 
+          <div class="finalmagdefbox">
+              <input class="fourshorttextinput" type="number" name="attr_finalmagicaldefence" value="0" readonly /></span>
             </div>
         </div>
-        <div class="frontpage mamdattributes">
-            <h2>Magical Combat Factors</h2>
-            <div class="magicalattacklabel">
-                Magical Attack
-            </div>
-            <div class="magicalattackinput"> 
-                <input class="fourshorttextinput" type="number" name="attr_finalmagicalattack" value="0" readonly />
-            </div>
-            <div class="magicaldefencelabel">
-                Magical Defence
-            </div>
-            <div class="magicaldefenceinput"> 
-                <input class="fourshorttextinput" type="number" name="attr_finalmagicaldefence" value="0" readonly />
-            </div>
+
+        <div class="guardscontainer">
+            <input type="hidden" class="combat_guards_able" name="attr_combat_guards_able" value="0" />
+            <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+                <div class="nonmartialhidden">
+                   <h2>Basic Guards</h2>
+                    <div class="guardselect2"> 
+                        <select name="attr_guardcurrent">
+                        <option value="Neutral" selected>Neutral (0)</option> 
+                        <option value="Offensive" >Offensive (8)</option> 
+                        <option value="Defensive" >Defensive (7)</option> 
+                        </select>
+                    </div>
+                    <div class="malabel2">
+                        <span>Modifiers:</span>
+                        <br>
+                        <span>Melee Attack:</span>
+                    </div> 
+                    <div class="mabox2">
+                        <br> 
+                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_mattackmoda" value="0" readonly />
+                    </div>
+                    <div class="mdlabel2">
+                        <span>Melee Defence:</span>
+                    </div> 
+                    <div class="mdbox2"> 
+                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_mdefencemoda" value="0" readonly />
+                    </div>
+                    <div class="ralabel2">
+                        <span>Ranged Attack:</span>
+                    </div>
+                    <div class="rabox2"> 
+                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_rattackmoda" value="0" readonly />
+                    </div>
+                    <div class="rdlabel2">
+                        <span>Ranged Defence:</span>
+                    </div> 
+                    <div class="rdbox2"> 
+                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_rdefencemoda" value="0" readonly />
+                    </div>
+                    <div class="dodgelabel2">
+                        <span>Evasion:</span>
+                    </div> 
+                    <div class="dodgebox2"> 
+                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_evasionmod" value="0" readonly />
+                    </div>
+                    <div class="guardother2">
+                        <span>Other Effects:</span>
+                        <div class="sheet-auto-expand">
+                            <span name="attr_othermodifications"></span>
+                            <textarea readonly name="attr_othermodifications"> </textarea>
+                        </div>
+                    </div>
+                </div>
+                <input type="hidden" class="combat_guards_able" name="attr_combat_guards_able" value="0" />
+                <div class="martialhidden">
+                    <h2>Advanced Guards</h2>
+                    <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+                    <div class="guardselect1"> 
+                        <span>Guard Taken</span>
+                        <select name="attr_guardcurrent" readonly>
+                                <option value="Neutral" selected>Neutral (0)</option> 
+                                <option value="Hawk" >Hawk (1)</option> 
+                                <option value="Snake" >Snake (2)</option> 
+                                <option value="Wolf" >Wolf (3)</option>
+                                <option value="Bear" >Bear (4)</option> 
+                                <option value="Cat" >Cat (5)</option> 
+                                <option value="Crab" >Crab (6)</option>
+                        </select>
+                    </div>
+                    <div class="guardcounteredcol">
+                       <span>Guard Countered?</span>
+                        <input type="checkbox" name="attr_guardcountered" value="1" />
+                    </div>
+                        <div class="malabel1">
+                            <span>Modifiers:</span>
+                            <br>
+                            <span>Melee Attack:</span>
+                        </div> 
+                        <div class="mabox1">
+                            <br> 
+                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_mattackmoda" value="0" readonly />
+                        </div>
+                        <div class="mdlabel1">
+                            <span>Melee Defence:</span>
+                        </div> 
+                        <div class="mdbox1"> 
+                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_mdefencemoda" value="0" readonly />
+                        </div>
+                        <div class="ralabel1">
+                            <span>Ranged Attack:</span>
+                        </div>
+                        <div class="rabox1"> 
+                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_rattackmoda" value="0" readonly />
+                        </div>
+                        <div class="rdlabel1">
+                            <span>Ranged Defence:</span>
+                        </div> 
+                        <div class="rdbox1"> 
+                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_rdefencemoda" value="0" readonly />
+                        </div>
+                        <div class="dodgelabel1">
+                            <span>Evasion:</span>
+                        </div> 
+                        <div class="dodgebox1"> 
+                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_evasionmod" value="0" readonly />
+                        </div>
+                        <div class="guardother1">
+                            <span>Other Effects:</span>
+                            <div class="sheet-auto-expand">
+                                <span name="attr_othermodifications"></span>
+                                <textarea readonly name="attr_othermodifications"></textarea>
+                            </div>
+                        </div>
+                </div>
         </div>
-        <div class="frontpage stealthperceptionattributes">
+        <div class="stealthperceptionattributes">
             <h2>Stealth and Perception</h2>
             <div>Stealth</div>
             <div>
@@ -147,10 +246,6 @@ <h2>Stealth and Perception</h2>
                 </div>
             </div>
         </div>
-<!--    <div class="gapfillimg">
-            <img class="headerimage" src="https://i.imgur.com/bJM6vzJ.png" alt="Dice Warriors" />
-        </div>
--->
         <div class="afattributes">
             <h2>Armour</h2>
             <div class="imgshieldcol">
@@ -365,17 +460,17 @@ <h2>Melee Combat Summary</h2>
                 <button class="roll d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:customd20} {{title=@{character_name} attacks with @{equippedmeleeweaponname}}} {{subtitle=@{equippedmeleeweapontype} +@{equippedmeleeweaponmagicbonus}}} {{attackroll=[[1d20cs1cf20]]}} {{attackvsdefence=[[@{finalmeleeattack}-(?{Enemy Defence|0})]]}} {{abr=[[@{equippedmeleeweaponabr}+@{finalmeleeabrbonus}]]}} {{Damage=[[@{equippedmeleeweapondamage}+@{finalmeleedmgbonus}]]}} {{desc=@{equippedmeleeweaponother}}}" name="roll_meleeattack"></button>                
             </div>
             <div class="equippedweaponbox">
-                <span>Equipped Weapon:</span><input type="text" name="attr_equippedmeleeweaponname" readonly="readonly" /><br>
-                <span>Type:</span><input type="text" name="attr_equippedmeleeweapontype" readonly="readonly" /><br>
-                <span>Magic Bonus:</span><input type="number" name="attr_equippedmeleeweaponmagicbonus" readonly="readonly" /><br>
+                <span>Equipped Weapon:</span><input type="text" name="attr_equippedmeleeweaponname" readonly /><br>
+                <span>Type:</span><input type="text" name="attr_equippedmeleeweapontype" readonly /><br>
+                <span>Magic Bonus:</span><input type="number" name="attr_equippedmeleeweaponmagicbonus" readonly /><br>
                 <input class="hidden" name="attr_warlockweapongroupmelee" value="0" />
                 <input class="hidden" name="attr_ismaingauchedefenceweapon" value="0" />
             </div>
             <div class="abrbox">
-                <span>Armour Bypass Roll: </span><input type="text" name="attr_equippedmeleeweaponabr" readonly="readonly" /><br>
+                <span>Armour Bypass Roll: </span><input type="text" name="attr_equippedmeleeweaponabr" readonly /><br>
             </div>
             <div class="damagebox"> 
-                <span>Damage: </span><input type="text" name="attr_equippedmeleeweapondamage" readonly="readonly" /><br>
+                <span>Damage: </span><input type="text" name="attr_equippedmeleeweapondamage" readonly /><br>
             </div>
             <div class="meleeothereffects">
                 <span>Other effects: </span>
@@ -396,9 +491,9 @@ <h2>Ranged Combat Summary</h2>
                 </button>            
             </div>          
             <div class="equippedrangedweaponbox">
-                <span>Equipped Ranged Weapon:</span><input class="twelvemidlongtextinput" type="text" name="attr_equippedrangedweaponname" value="" readonly />
-                <span>Type:</span><input class="twelvemidlongtextinput" type="text" name="attr_equippedrangedweapontype" value="" readonly />
-                <span>Magic Bonus:</span><input type="number" name="attr_equippedrangedweaponmagicbonus" readonly="readonly" /><br>
+                <span>Equipped Ranged Weapon:</span><input class="twelvemidlongtextinput" type="text" name="attr_equippedrangedweaponname" value="" readonly /><br>
+                <span>Type:</span><input class="twelvemidlongtextinput" type="text" name="attr_equippedrangedweapontype" value="" readonly /><br>
+                <span>Magic Bonus:</span><input type="number" name="attr_equippedrangedweaponmagicbonus" readonly /><br>
                 <input class="hidden" name="attr_warlockweapongroupranged" value="0" />
             </div>
             <div class="equippedammobox">
@@ -444,8 +539,9 @@ <h2>Profession Abilities</h2>
                 <div class="barbarianmelee">
                     <input type="hidden" name="attr_bloodrageactive" value="0" />
                     <input type="hidden" name="attr_bloodragedmgmod" value="0" />
-                    <details>
-                    <summary><h2>Barbarian Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Barbarian Profession Abilities</h2>
+                    </div>
                     <div class="skillrow">
                         <details>
                             <summary>Track</summary>
@@ -479,37 +575,12 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    <input type="hidden" class="supremacy_able" name="attr_supremacy_able" value="0" />
-                    <div class="supremacy">
-                        <div class="skillrow">
-                            <details>
-                                <summary>Iron Will</summary>
-                                <input type="hidden" class="barbariancheckbox iron_will_front" name="attr_iron_will" value="0" />
-                                <div class="barbarianskill iron_will_button_front">
-                                    <span>Activate against the following spells: Command, Curse, Transfix, Enslave, Enthrall, Benight, Turncoat, Pacify, Dark Thoughts, Winds of Change, and Witch Steed.</span>
-                                    <select name="attr_activateiron_will">
-                                        <option>Inactive</option>
-                                        <option>Active</option>
-                                    </select>
-                                </div>
-                            </details>    
-                        </div>
-                        <div class="skillrow">
-                            <details>
-                                <summary>Intimidating</summary>
-                                <input type="hidden" class="barbariancheckbox intimidating_front" name="attr_intimidating" value="0" />
-                                <div class="barbarianroll intimidating_button_front">
-                                    <span>Roll Intimidate</span> <button class="button d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} glares intimidatingly}} {{subtitle=Roll Intimidation check under your Looks}} {{roll=[[1d20cs1cf20]]}} {{Vs=[[@{finallooks}+?{+1 to Looks for each other character of equal or greater Rank that stands with them|0}]] }}" name="roll_intimidate"></button>
-                                </div>
-                            </details>
-                        </div>
-                    </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="knightmelee">
-                    <details>
-                    <summary><h2>Knight Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Knight Profession Abilities</h2>
+                    </div>
                     <div class="skillrow">
                         <details>
                             <summary>Track</summary>
@@ -522,22 +593,18 @@ <h2>Profession Abilities</h2>
                     <div class="skillrow">
                         <details>
                             <summary>Weaponskill</summary>
-                            
                             <input type="hidden" class="knightcheckbox weaponskill1_front" name="attr_weaponskill1" value="0" />
                             <div class="knightskill weaponskillrow1_button_front">
                                 <span>Weaponskill</span> <input type="text" name="attr_weapon1" readonly />
                             </div>
-                            
                             <input type="hidden" class="knightcheckbox weaponskill2_front" name="attr_weaponskill2" value="0" />
                             <div class="knightskill weaponskillrow2_button_front">
                                 <span>Weaponskill</span> <input type="text" name="attr_weapon2" readonly />
                             </div>
-                            
                             <input type="hidden" class="knightcheckbox weaponskill3_front" name="attr_weaponskill3" value="0" />
                             <div class="knightskill weaponskillrow3_button_front">
                                 <span>Weaponskill</span> <input type="text" name="attr_weapon3" readonly />
                             </div>
-                            
                         </details>
                     </div>
                     <div>
@@ -562,38 +629,41 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    <input type="hidden" class="supremacy_able" name="attr_supremacy_able" value="0" />
-                    <div class="supremacy">
-                        <div class="skillrow">
-                            <details>
-                                <summary>Iron Will</summary>
-                                <input type="hidden" class="knightcheckbox iron_will_front" name="attr_iron_will" value="0" />
-                                <div class="knightskill iron_will_button_front">
-                                    <span>Activate against the following spells: Command, Curse, Transfix, Enslave, Enthrall, Benight, Turncoat, Pacify, Dark Thoughts, Winds of Change, and Witch Steed.</span>
-                                    <select name="attr_activateiron_will">
-                                        <option>Inactive</option>
-                                        <option>Active</option>
-                                    </select>
-                                </div>
-                            </details>    
-                        </div>
-                        <div class="skillrow">
-                            <details>
-                                <summary>Intimidating</summary>
-                                <input type="hidden" class="knightcheckbox intimidating_front" name="attr_intimidating" value="0" />
-                                <div class="knightroll intimidating_button_front">
-                                    <span>Roll Intimidate</span> <button class="button d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} glares intimidatingly}} {{subtitle=Roll Intimidation check under your Looks}} {{roll=[[1d20cs1cf20]]}} {{Vs=[[@{finallooks}+?{+1 to Looks for each other character of equal or greater Rank that stands with them|0}]] }}" name="roll_intimidate"></button>
-                                </div>
-                            </details>
-                        </div>
+                </div>
+                <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
+                <input type="hidden" class="supremacy_able" name="attr_supremacy_able" value="0" />
+                <div class="supremacy">
+                    <div class="skillrow">
+                        <h2>Supremacy of the Sword Abilities</h2>
+                    </div>
+                    <div class="skillrow">
+                        <details>
+                            <summary>Iron Will</summary>
+                            <input type="hidden" class="iron_will_front" name="attr_iron_will" value="0" />
+                            <div class="knightskill iron_will_button_front">
+                                <span>Activate against the following spells: Command, Curse, Transfix, Enslave, Enthrall, Benight, Turncoat, Pacify, Dark Thoughts, Winds of Change, and Witch Steed.</span>
+                                <select name="attr_activateiron_will">
+                                    <option>Inactive</option>
+                                    <option>Active</option>
+                                </select>
+                            </div>
+                        </details>    
+                    </div>
+                    <div class="skillrow">
+                        <details>
+                            <summary>Intimidating</summary>
+                            <input type="hidden" class="intimidating_front" name="attr_intimidating" value="0" />
+                            <div class="knightroll intimidating_button_front">
+                                <span>Roll Intimidate</span> <button class="button d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} glares intimidatingly}} {{subtitle=Roll Intimidation check under your Looks}} {{roll=[[1d20cs1cf20]]}} {{Vs=[[@{finallooks}+?{+1 to Looks for each other character of equal or greater Rank that stands with them|0}]] }}" name="roll_intimidate"></button>
+                            </div>
+                        </details>
                     </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="warlockmelee">
-                    <details>
-                    <summary><h2>Warlock Profession Abilities</h2></summary>
-                    <br>
+                    <div class="skillrow">
+                        <h2>Warlock Profession Abilities</h2>
+                    </div>
                     <div class="skillrow">
                         <details>
                             <summary>Selected Weapon Groups</summary>
@@ -621,12 +691,12 @@ <h2>Profession Abilities</h2>
                         </div>
                         </details>
                     </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="assassinmelee">
-                    <details>
-                        <summary><h2>Assassin Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Assassin Profession Abilities</h2>
+                    </div>
                         <div class="skillrow">
                             <details>
                                 <summary>Shock Attack</summary>
@@ -709,12 +779,12 @@ <h2>Profession Abilities</h2>
                                 </div>
                             </details>
                         </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="mysticmelee">
-                    <details>
-                    <summary><h2>Mystic Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Mystic Profession Abilities</h2>
+                    </div>
                     <div class="skillrow">
                         <details>
                             <summary>Spell Mastery</summary>
@@ -741,12 +811,12 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="huntermelee">
-                    <details>
-                    <summary><h2>Hunter Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Hunter Profession Abilities</h2>
+                    </div>
                     <div class="skillrow">
                         <details>
                             <summary>Favoured Weapon</summary> 
@@ -765,7 +835,6 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    <!-- Precise Shot Section -->
                     <div class="skillrow">
                         <details>
                             <summary>Precise Shot</summary>
@@ -777,7 +846,6 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    <!-- Stillness Section -->
                     <div class="skillrow">
                         <details>
                             <summary>Stillness</summary>
@@ -795,7 +863,6 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    <!-- Penetrating Shot Section -->
                     <div class="skillrow">
                         <details>
                             <summary>Penetrating Shot</summary>
@@ -809,7 +876,6 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>    
                     </div>
-                        <!-- New Hunter's Mind Section -->
                     <div class="skillrow">
                         <details>
                             <summary>Hunter's Mind</summary>
@@ -852,12 +918,12 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="knavemelee">
-                    <details>
-                    <summary><h2>Knave Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Knave Profession Abilities</h2>
+                    </div>
                     <div class="skillrow">
                         <details>
                             <summary>Favoured Language</summary>
@@ -974,12 +1040,12 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    </details>
                 </div>    
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="elementalistmelee">
-                    <details>
-                    <summary><h2>Elementalist Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Elementalist Profession Abilities</h2>
+                    </div>
                     <div class="skillrow">
                         <details>
                             <summary>Raw Power</summary>
@@ -1010,12 +1076,12 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="priestmelee">
-                    <details>
-                    <summary><h2>Priest Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Priest Profession Abilities</h2>
+                    </div>
                         <div class="skillrow">
                             <details>
                             <summary>Linguist</summary>
@@ -1061,12 +1127,12 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="demonologistmelee">
-                    <details>
-                    <summary><h2>Demonologist Profession Abilities</h2></summary>
+                    <div class="skillrow">
+                        <h2>Demonologist Profession Abilities</h2>
+                    </div>
                     <div class="skilrow">
                         <details>
                             <summary>Demonology</summary>
@@ -1109,7 +1175,6 @@ <h2>Profession Abilities</h2>
                             </div>
                         </details>
                     </div>
-                    </details>
                 </div>
                 <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />  
                 <div class="nomelee">
@@ -1117,69 +1182,44 @@ <h2>Profession Abilities</h2>
                 </div>
             </div>
         </div>
-        <div class="frontpage mpattributes">
-            
-            <h2>Profession Magic and Guards</h2>
-    
-            <div class="mp mpattributeshidden">
-                <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
-                <div class="frontmp castermp">
-                    <details>
-                        <summary>Magical Combat and Spell Expiry</summary>
-                        <div class="dma1">
-                            <span>Direct Magical Attack</span>
-                    </div>
-                    <button class="dmabutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{magicalattackvsmagicaldefence= [[@{MagicalAttack}-(?{Magical Defence|0})]] }}" name="roll_directmagicalattack">
-                    </button>
-                    <div class="ima1">
-                        <span>Indirect Magical Attack</span>
-                    </div>
-                    <button class="imabutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{speedvsevasion= [[?{Speed|0}-(?{Enemy Evasion|0})]] }}" name="roll_indirectmagicalattack">
-                    </button>
-                    <br>
-                    <div class="ser1">
-                        <span>Spell Expiry Roll</span>
-                    </div>
-                    <button class="serbutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} rolls Spell Expiry}} {{subtitle=Roll under Target number}} {{roll= [[2d6]] or [[1d100cf>75]]%}}" name="roll_spellexpiry">
-                    </button>
-                    <br>
-                    </details>
-                    </div>
-    
-                <div class="frontmp warlockmp">
-                    <details>
-                        <summary>Warlock Magics</summary>
-                    <div class="dma2">
-                        <span>Direct Magical Attack</span>
-                    </div>
-                    <button class="dmabutton2 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{magicalattackvsmagicaldefence=[[@{MagicalAttack}-(?{Magical Defence|0})]] }}" name="roll_directmagicalattack">
-                        
-                    </button>
-                    <div class="ima2">
-                        <span>Indirect Magical Attack</span>
-                    </div>
-                    <button class="imabutton2 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{attackroll= [[2d10]]}} {{Speed vs Evasion= [[?{Speed|0}-(?{Enemy Evasion|0})]] }}" name="roll_indirectmagicalattack">
-                        
-                    </button>
-                    <br>
-                    <div class="ser2">
-                        <span> Spell Expiry Roll</span>
-                    </div>
-                    <button class="serbutton2 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} rolls Spell Expiry}} {{subtitle=Roll under Target Number}} {{roll= [[1d20cf20]] or [[1d100cf>60]]%}}" name="roll_warlockspellexpiry">
-                    </button>
-                    </details>
+        <div class="mpattributes">
+            <div class="magicattributeshidden">
+              <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+              <div class="castermp">
+                <h2>Magical Combat</h2>
+                <div class="castermp-grid">
+                  <div>Magical Attack</div> 
+                  <div><input class="fourshorttextinput" type="number" name="attr_finalmagicalattack" value="0" readonly /></div>
+                  <div>Magical Defence</div>
+                  <div><input class="fourshorttextinput" type="number" name="attr_finalmagicaldefence" value="0" readonly /></div>
+                  <div>Direct Magical Attack</div>
+                  <div><button class="dmabutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{magicalattackvsmagicaldefence= [[@{MagicalAttack}-(?{Magical Defence|0})]] }}" name="roll_directmagicalattack"></button></div>
+                  <div>Indirect Magical Attack</div>
+                  <div><button class="imabutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{speedvsevasion= [[?{Speed|0}-(?{Enemy Evasion|0})]] }}" name="roll_indirectmagicalattack"></button></div>
+                  <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+                  <div class="commonspellexpiry">
+                    <div>Spell Expiry Roll</div>
+                    <div><button class="serbutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} rolls Spell Expiry}} {{subtitle=Roll under Target number}} {{roll= [[2d6]] or [[1d100cf>75]]%}}" name="roll_spellexpiry"></button></div>
+                  </div>
+                  <div class="warlockspellexpiry">
+                    <div>Warlock Spell Expiry Roll</div>
+                    <div><button class="serbutton2 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} rolls Spell Expiry}} {{subtitle=Roll under Target Number}} {{roll= [[1d20cf20]] or [[1d100cf>60]]%}}" name="roll_warlockspellexpiry"></button></div>
+                  </div>
                 </div>
-                
-                <div class="frontmp standardmp">
-                    <details>
-                        <summary> Primary Magic Points</summary>
-                        <span name="attr_primaryelement"></span> 
-                        <span>Magic Points:</span>
-                        <span name="attr_maxmp"></span>
-                        <span>Magic Points used:</span>
-                        <input type="number" name="attr_inputmanaused" min="0" step="1" value="0" />
-                        <div class="dots">
-                            <input type="hidden" name="attr_manaused" class="mdot" value="0" />        
+              </div>
+              <div class="mysticmp">
+                <span>Psychic Fatigue Check:</span>
+                <span><input class="fourshorttextinput" type="number" name="attr_pfc" value="0" readonly />- spell level <button class="button d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} checks for Psychic Fatigue}} {{subtitle=Roll 1d20 under Target Number}} {{roll= [[1d20cs1cf20]]}} {{Vs= [[@{pfc}-(?{Spell Level|0})]]}}" name="roll_psychicfatiguecheck"></button></span>
+              </div>
+            </div> 
+            <div class="magicpointsattributeshidden">
+                <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+                <div class="standardmp">
+                    <span><span name="attr_primaryelement"></span> Magic Points: <span name="attr_maxmp"></span></span>
+                    <span><span name="attr_primaryelement"></span> Magic Points used:</span>
+                    <input type="number" name="attr_inputmanaused" min="0" step="1" value="0" />
+                    <div class="dots">
+                        <input type="hidden" name="attr_manaused" class="mdot" value="0" />        
                             <input type="hidden" name="attr_maxmp" class="mbody" value="1" />
                             <button title="1" type="action" name="act_manaused_1" class="mdot mt-0">
                             <span class="checked"></span>
@@ -1332,18 +1372,12 @@ <h2>Profession Magic and Guards</h2>
                             <span class="checked"></span>
                             </button>
                         </div>
-                        <button type="action" name="act_mp_reset" class="mp_reset">Refresh!</button>
-                        <input type="hidden" name="attr_currentmp" />
-                    </details>
+                    <button type="action" name="act_mp_reset" class="mp_reset">Refresh!</button>
+                    <input type="hidden" name="attr_currentmp" />
                 </div>
-                
-                <div class="frontmp elementalistmp">
-                    <details>
-                        <summary>Secondary Magic Points</summary>
-                        <span name="attr_secondaryelement"></span> 
-                        <span>Magic Points:</span>
-                        <span name="attr_twomaxmp"></span>
-                        <span>Magic Points used:</span>
+                <div class="elementalistmp">
+                        <span><span name="attr_secondaryelement"></span> Magic Points: <span name="attr_twomaxmp"></span></span>
+                        <span><span name="attr_secondaryelement"></span> Magic Points used:</span>
                         <input type="number" name="attr_inputsecmanaused" min="0" step="1" value="0" />
                         <div class="dots">
                             <input type="hidden" name="attr_secmanaused" class="m2dot" value="0" />
@@ -1501,10 +1535,8 @@ <h2>Profession Magic and Guards</h2>
                         </div>
                         <button type="action" name="act_secmp_reset" class="mp_reset">Refresh!</button>
                         <input type="hidden" name="attr_currentmpelementtwo" />
-                        <span name="attr_tertiaryelement"></span> 
-                        <span>Magic Points:</span>
-                        <span name="attr_threemaxmp"></span>
-                        <span>Magic Points used:</span>
+                        <span><span name="attr_tertiaryelement"></span> Magic Points: <span name="attr_threemaxmp"></span></span>
+                        <span><span name="attr_tertiaryelement"></span> Magic Points used:</span>
                         <input type="number" name="attr_inputtermanaused" min="0" step="1" value="0" />
                         <div class="dots">
                             <input type="hidden" name="attr_termanaused" class="m3dot" value="0" />
@@ -1660,162 +1692,34 @@ <h2>Profession Magic and Guards</h2>
                             <span class="checked"></span>
                             </button>
                         </div>
-                        <button type="action" name="act_termp_reset" class="mp_reset">Refresh!</button>
-                        <input type="hidden" name="attr_currentmpelementthree" />
-                    </details>
-                </div>
-
-                <div class="frontmp mysticmp">
-                    <details>
-                        <summary>
-                            Mystic Magics
-                        </summary>
-                    <div class="psyfatlabel1"> 
-                        <span>Psychic Fatigue Check:</span>
-                        <br>
-                    </div> 
-                    <div class="psyfatbox1">
-                        <input class="fourshorttextinput" type="number" name="attr_pfc" value="0" readonly /> 
-                        <span>- spell level</span>
-                    </div> 
-                    <div class="psyfatbutton1">
-                        <button class="button d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} checks for Psychic Fatigue}} {{subtitle=Roll 1d20 under Target Number}} {{roll= [[1d20cs1cf20]]}} {{Vs= [[@{pfc}-(?{Spell Level|0})]]}}" name="roll_psychicfatiguecheck">
-                        </button>
-                        <br>
-                    </div>
-                    </details>
-                </div>
-                
-                <input type="hidden" class="combat_guards_able" name="attr_combat_guards_able" value="0" />
-                <div class="mp nonmartialhidden">
-                    <details>
-                        <summary>
-                            Basic Guards
-                        </summary>
-                    <div class="guardselect2"> 
-                        <select name="attr_guardcurrent">
-                        <option value="Neutral" selected>Neutral (0)</option> 
-                        <option value="Offensive" >Offensive (8)</option> 
-                        <option value="Defensive" >Defensive (7)</option> 
-                        </select>
-                    </div>
-                    <div class="malabel2">
-                        <span>Modifiers:</span>
-                        <br>
-                        <span>Melee Attack:</span>
-                    </div> 
-                    <div class="mabox2">
-                        <br> 
-                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_mattackmoda" value="0" readonly />
-                    </div>
-                    <div class="mdlabel2">
-                        <span>Melee Defence:</span>
-                    </div> 
-                    <div class="mdbox2"> 
-                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_mdefencemoda" value="0" readonly />
-                    </div>
-                    <div class="ralabel2">
-                        <span>Ranged Attack:</span>
-                    </div>
-                    <div class="rabox2"> 
-                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_rattackmoda" value="0" readonly />
-                    </div>
-                    <div class="rdlabel2">
-                        <span>Ranged Defence:</span>
-                    </div> 
-                    <div class="rdbox2"> 
-                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_rdefencemoda" value="0" readonly />
-                    </div>
-                    <div class="dodgelabel2">
-                        <span>Evasion:</span>
-                    </div> 
-                    <div class="dodgebox2"> 
-                        <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_evasionmod" value="0" readonly />
-                    </div>
-                    <div class="guardother2">
-                        <span>Other Effects:</span>
-                        <div class="sheet-auto-expand">
-                            <span name="attr_othermodifications"></span>
-                            <textarea readonly name="attr_othermodifications"> </textarea>
-                        </div>
-                    </div>
-                    </details>
-                </div>
-                
-                <input type="hidden" class="combat_guards_able" name="attr_combat_guards_able" value="0" />
-                <div class="mp martialhidden">
-                    <details>
-                        <summary>Advanced Guards</summary>
-                        <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
-                        <div class="guardselect1"> 
-                            <span>Guard Taken</span>
-                            <select name="attr_guardcurrent" readonly>
-                                <option value="Neutral" selected>Neutral (0)</option> 
-                                <option value="Hawk" >Hawk (1)</option> 
-                                <option value="Snake" >Snake (2)</option> 
-                                <option value="Wolf" >Wolf (3)</option>
-                                <option value="Bear" >Bear (4)</option> 
-                                <option value="Cat" >Cat (5)</option> 
-                                <option value="Crab" >Crab (6)</option>
-                            </select>
-                        </div>
-                        <div class="guardcounteredcol">
-                            <span>Guard Countered?</span>
-                            <input type="checkbox" name="attr_guardcountered" value="1" />
-                        </div>
-                        <div class="malabel1">
-                            <span>Modifiers:</span>
-                            <br>
-                            <span>Melee Attack:</span>
-                        </div> 
-                        <div class="mabox1">
-                            <br> 
-                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_mattackmoda" value="0" readonly />
-                        </div>
-                        <div class="mdlabel1">
-                            <span>Melee Defence:</span>
-                        </div> 
-                        <div class="mdbox1"> 
-                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_mdefencemoda" value="0" readonly />
-                        </div>
-                        <div class="ralabel1">
-                            <span>Ranged Attack:</span>
-                        </div>
-                        <div class="rabox1"> 
-                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_rattackmoda" value="0" readonly />
-                        </div>
-                        <div class="rdlabel1">
-                            <span>Ranged Defence:</span>
-                        </div> 
-                        <div class="rdbox1"> 
-                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_rdefencemoda" value="0" readonly />
-                        </div>
-                        <div class="dodgelabel1">
-                            <span>Evasion:</span>
-                        </div> 
-                        <div class="dodgebox1"> 
-                            <input title="These modifiers have been applied for you" class="fourshorttextinput" type="number" name="attr_evasionmod" value="0" readonly />
-                        </div>
-                        <div class="guardother1">
-                            <span>Other Effects:</span>
-                            <div class="sheet-auto-expand">
-                                <span name="attr_othermodifications"></span>
-                                <textarea readonly name="attr_othermodifications"></textarea>
-                            </div>
-                        </div>
-                    </details>
+                    <button type="action" name="act_termp_reset" class="mp_reset">Refresh!</button>
+                    <input type="hidden" name="attr_currentmpelementthree" />
                 </div>
-                
                 <div class="mp nomagic">
                     <img class="icon rider" src="https://i.imgur.com/TvsSUOU.png" alt="No Magic Attributes" />
                 </div>
-                
             </div>
         </div>  
     </div>
-
     <div class="basescores">
-
+        <div class="common">
+          <div class="label-input-pair name">
+            <label>Name</label>
+            <input id="character-name" name="attr_character_name" type="text" class="fourteenlongtextinput" />
+          </div>
+          <div class="label-input-pair profession">
+            <label>Profession</label>
+            <input type="text" list="profession" name="attr_profession" class="fourteenlongtextinput">
+          </div>
+          <div class="label-input-pair rank">
+            <label>Rank</label>
+            <input id="rank" class="sixshorttextinput" name="attr_rank" type="number" min="1" value="1" />
+          </div>
+          <div class="label-input-pair experience">
+            <label>Experience</label>
+            <input id="xp" class="sixshorttextinput" name="attr_xp" type="number" value="0" />
+          </div>
+        </div>
         <div class="basecharacteristics">
             <h2>Primary Statistics</h2>
                 <h3 class="characteristic">Characteristic</h3>
@@ -1872,187 +1776,150 @@ <h3 class="Modifier">Modifier</h3>
                     <button type="action" class="rollbasestatsbutton" name="act_rollbasestatsbutton">Roll Base Characteristics Points</button>
                 </div>
             </div>
-
         </div>
-        
         <div class="baseattributes">
             <h2>Base Factors</h2>
             <h3 class="attribute">Attribute</h3>
             <h3 class="base">Base Attribute</h3>
             <h3 class="modifier">Modifier</h3>
-            
             <div><span>Attack</span></div>
             <div><input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_attack" value="0" /></div>
             <div><span>See Below</span></div>
-            
             <div><span>Defence</span></div>
             <div><input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_defence" value="0" /></div>
             <div><span>See Below</span></div>
-            
             <div><span>Stealth</span></div>
             <div><input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_stealth" value="0" /></div>
             <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscstealth" value="0" /></div>
-            
             <div><span>Perception</span></div>
             <div><input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_perception" value="0" /></div>
             <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscperception" value="0" /></div>
-            
             <div><span>Evasion</span></div>
             <div><input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_evasion" value="0" /></div>
             <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscevasion" value="0" /></div>
-            
             <div><span>Health Points</span></div>
             <div><input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_base_maxhp" min="1" value="1"/></div>
             <div><input class="fourshorttextinput" title="Can be a positive or negative number" type="number" name="attr_maxhp_mod" value="0"/></div>
             <div class="rollbasehpsetcontainer">
-                <!-- Checkbox to control visibility -->
                 <input title="Show Roll Base HP Button" type="checkbox" class="rollhp-toggle" name="attr_rollhp-toggle" value="1">
-                <!-- Container for Roll Base HP Button -->
                 <div class="rollbasehpbuttoncontainer">
-                    <!-- Roll Base HP Button -->
                     <button type="action" class="rollbasehpbutton" name="act_rollbasehpbutton">Roll Base Health Points</button>
                     <br>
                     <span>For custom professions, input the number to be added to 1d6.</span> <input type="number" name="attr_customprofessionmodifier"> 
                 </div>
             </div>
         </div>
-
-        <div class="basemeleeattributes">
-            <h2>Miscellaneous Modifiers - Melee Combat</h2>
+        <div class="magicalattributes">
+          <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+          <div class="magical-grid">  
+            <h2>Magical Combat Factors</h2> 
             <h3 class="attribute">Attribute</h3>
+            <h3 class="base">Base Attribute</h3>
             <h3 class="modifier">Modifier</h3>
-            
-            <div><span>Attack</span></div>
-            <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscattackmelee" value="0" /></div>
-            
-            <div><span>Defence</span></div>
-            <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscdefencemelee" value="0" /></div>
-            
-            <div><span>Armour Bypass</span></div>
-            <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscabrmelee" value="0" /></div>
-            
-            <div><span>Damage</span></div>
-            <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscdamagemelee" value="0" /></div>
-        </div>
-
+            <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+            <div class="magicalattackcontainer">
+              <div><span>Magical Attack</span></div>
+              <div><input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_magicalattack" value="0" /></div>
+              <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscmagicattack" value="0" /></div>
+            </div>
+            <div class="magicaldefencecontainer">
+              <div><span>Magical Defence</span></div>
+              <div><input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_magicaldefence" value="0" /></div>
+              <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscmagicdefence" value="0" /></div>
+            </div>
+          </div>
+        </div>        
+        <div class="basemeleeattributes">
+                    <h2>Miscellaneous Modifiers - Melee Combat</h2>
+                    <h3 class="attribute">Attribute</h3>
+                    <h3 class="modifier">Modifier</h3>
+                    <div><span>Attack</span></div>
+                    <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscattackmelee" value="0" /></div>
+                    <div><span>Defence</span></div>
+                    <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscdefencemelee" value="0" /></div>
+                    <div><span>Armour Bypass</span></div>
+                    <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscabrmelee" value="0" /></div>
+                    <div><span>Damage</span></div>
+                    <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscdamagemelee" value="0" /></div>
+                </div>
         <div class="baserangedattributes">
             <h2>Miscellaneous Modifiers - Ranged Combat</h2>
             <h3 class="attribute">Attribute</h3>
             <h3 class="modifier">Modifier</h3>
-            
             <div><span>Attack</span></div>
             <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscattackranged" value="0" /></div>
-            
             <div><span>Defence</span></div>
             <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscdefenceranged" value="0" /></div>
-            
             <div><span>Armour Bypass</span></div>
             <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscabrranged" value="0" /></div>
-            
             <div><span>Damage</span></div>
             <div><input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscdamageranged" value="0" /></div>
         </div>
-
         <div class="finalbasecombatattributes">
-            <h2>Totaled Combat Factors</h2>
-        
-            <h3>Final Melee Attack</h3>
-            <input title="This is the score after all magic weapon modifiers, guard modifiers, and profession abilities have been applied." type="number" name="attr_finalmeleeattack" value="0" readonly />
-        
-            <h3>Final Ranged Attack</h3>
-            <input title="This is the score after all magic weapon and ammunition modifiers, guard modifiers, and profession abilities have been applied." type="number" name="attr_finalrangedattack" value="0" readonly />
-        
-            <h3>Final Melee Defence</h3>
-            <input title="This is the score after all magic weapon modifiers, shield modifiers, guard modifiers, and profession abilities have been applied." type="number" name="attr_finalmeleedefence" value="0" readonly />
-        
-            <h3>Final Ranged Defence</h3>
-            <input title="This is the score after all shield modifiers, guard modifiers, and profession abilities have been applied." type="number" name="attr_finalrangeddefence" value="0" readonly />
-        
-            <h3>Total Melee ABR Bonus</h3>
-            <input title="ABR bonuses from strength, magic items, and profession abilities." type="number" name="attr_finalmeleeabrbonus" value="0" readonly />
-        
-            <h3>Total Ranged ABR Bonus</h3>
-            <input title="ABR bonuses from strength, magic items, and profession abilities." type="number" name="attr_finalrangedabrbonus" value="0" readonly />
-        
-            <h3>Total Melee Damage Bonus</h3>
-            <input title="Damage bonuses from strength, magic items, and profession abilities." type="number" name="attr_finalmeleedmgbonus" value="0" readonly />
-        
-            <h3>Total Ranged Damage Bonus</h3>
-            <input title="Damage bonuses from strength, magic items, and profession abilities." type="number" name="attr_finalrangeddmgbonus" value="0" readonly />
-
-            <h3>Current Maximum Health Points</h3>
-            <input type="number" name="attr_maxhp" min="1" value="1"/>
+          <h2>Totaled Factors</h2>
+          <h3>Final Melee Attack</h3>
+          <input title="This is the score after all magic weapon modifiers, guard modifiers, and profession abilities have been applied." type="number" name="attr_finalmeleeattack" value="0" readonly />
+          <h3>Final Ranged Attack</h3>
+          <input title="This is the score after all magic weapon and ammunition modifiers, guard modifiers, and profession abilities have been applied." type="number" name="attr_finalrangedattack" value="0" readonly />
+          <h3>Final Melee Defence</h3>
+          <input title="This is the score after all magic weapon modifiers, shield modifiers, guard modifiers, and profession abilities have been applied." type="number" name="attr_finalmeleedefence" value="0" readonly />
+          <h3>Final Ranged Defence</h3>
+          <input title="This is the score after all shield modifiers, guard modifiers, and profession abilities have been applied." type="number" name="attr_finalrangeddefence" value="0" readonly />
+          <h3>Final Magical Attack</h3>
+          <input type="number" name="attr_finalmagicalattack" value="0" readonly />
+          <h3>Final Magical Defence</h3>
+          <input type="number" name="attr_finalmagicaldefence" value="0" readonly /> 
+          <h3>Final Stealth</h3>
+          <input type="number" name="attr_finalstealth" value="0" readonly />
+          <h3>Final Perception</h3>
+          <input type="number" name="attr_finalperception" value="0" readonly />
+          <h3>Final Evasion</h3>
+          <input type="number" name="attr_finalevasion" value="0" readonly />     
+          <h3>Total Melee ABR Bonus</h3>
+          <input title="ABR bonuses from strength, magic items, and profession abilities." type="number" name="attr_finalmeleeabrbonus" value="0" readonly />
+          <h3>Total Ranged ABR Bonus</h3>
+          <input title="ABR bonuses from strength, magic items, and profession abilities." type="number" name="attr_finalrangedabrbonus" value="0" readonly />
+          <h3>Total Melee Damage Bonus</h3>
+          <input title="Damage bonuses from strength, magic items, and profession abilities." type="number" name="attr_finalmeleedmgbonus" value="0" readonly />
+          <h3>Total Ranged Damage Bonus</h3>
+          <input title="Damage bonuses from strength, magic items, and profession abilities." type="number" name="attr_finalrangeddmgbonus" value="0" readonly />
+          <h3>Current Maximum Health Points</h3>
+          <input type="number" name="attr_maxhp" min="1" value="1"/>
         </div>
     </div>
 
     <div class="magic">
-        
-        <div class="allprofessionattribs">
-            <h2>Magical Defence</h2>
-            <h3>Base Score</h3>
-            <input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_magicaldefence" value="0" />
-            
-            <h3>Modifier</h3>
-            <input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscmagicdefence" value="0" />
-            
-            <h3>Final</h3>
-            <input class="fourshorttextinput" type="number" name="attr_finalmagicaldefence" value="0" readonly />
-        </div>
-    
-        <div class="allcastermana">
-            <h2>Magical Attack</h2>
-            
-            <h3>Base Score</h3>
-            <input title="Base from profession/rank only" class="fourshorttextinput" type="number" name="attr_magicalattack" value="0" />
-            
-            <h3>Modifier</h3>
-            <input class="fourshorttextinput" title="Can be a positive or negative number." type="number" name="attr_miscmagicattack" value="0" />
-            
-            <h3>Final</h3>
-            <input class="fourshorttextinput" type="number" name="attr_finalmagicalattack" value="0" readonly />
-        </div>
-            
         <div class="manabox">
-            <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
-        
-            <div class="mana notacaster">
-                <img class="icon sword" src="https://i.imgur.com/uTrcbgb.png" alt="Sword" />
-            </div>
-        
-            <div class="mana castermana">
-                <details>
-                    <summary>Magical Combat Values</summary>
-                    <h3>Direct Magical Attack</h3>
-                    <button class="roll twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{magicalattackvsmagicaldefence= [[@{MagicalAttack}-(?{Magical Defence|0})]] }}" name="roll_directmagicalattack"></button>
-        
-                    <h3>Indirect Magical Attack</h3>
-                    <button class="roll twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{attackroll= [[2d10]]}} {{Speed vs Evasion= [[?{Speed|0}-(?{Enemy Evasion|0})]] }}" name="roll_indirectmagicalattack"></button>
-        
-                    <h3>Spell Expiry Roll</h3>
-                    <button class="roll twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} rolls Spell Expiry}} {{subtitle=Roll under Target Number to succeed}} {{roll= [[2d6]] or [[1d100cf>75]]%}}" name="roll_warlockspellexpiry"></button>
-                </details>
-            </div>
-        
-            <div class="mana warlockmana">
-                <details>
-                    <summary>Warlock Magical Combat Values</summary>
-                    <h3>Direct Magical Attack</h3>
-                    <button class="roll twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{magicalattackvsmagicaldefence= [[@{MagicalAttack}-(?{Magical Defence|0})]] }}" name="roll_directmagicalattack"></button>
-        
-                    <h3>Indirect Magical Attack</h3>
-                    <button class="roll twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{attackroll= [[2d10]]}} {{Speed vs Evasion= [[?{Speed|0}-(?{Enemy Evasion|0})]] }}" name="roll_indirectmagicalattack"></button>
-        
-                    <h3>Spell Expiry Roll</h3>
-                    <button class="roll twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} rolls Spell Expiry}} {{subtitle=Roll under Target Number to succeed}} {{roll= [[1d20cf>20]] or [[1d100cf>60]]%}}" name="roll_warlockspellexpiry"></button>
-                </details>
+            <div class="magicbox">
+                <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+                <div class="notacaster">
+                    <img class="icon sword" src="https://i.imgur.com/uTrcbgb.png" alt="Sword" />
+                </div>
+                <div class="castermana">
+                    <h2>Magical Combat</h2>
+                    <div class="castermana-grid">
+                        <div>Direct Magical Attack</div>
+                        <div><button class="dmabutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{magicalattackvsmagicaldefence= [[@{MagicalAttack}-(?{Magical Defence|0})]] }}" name="roll_directmagicalattack"></button></div>
+                        <div>Indirect Magical Attack</div>  
+                        <div><button class="imabutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} casts a spell}} {{spellattackroll= [[2d10]]}} {{speedvsevasion= [[?{Speed|0}-(?{Enemy Evasion|0})]] }}" name="roll_indirectmagicalattack"></button></div>
+                        <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+                        <div class="commonspellexpiry">
+                            <div>Spell Expiry Roll</div>
+                            <div><button class="serbutton1 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} rolls Spell Expiry}} {{subtitle=Roll under Target number}} {{roll= [[2d6]] or [[1d100cf>75]]%}}" name="roll_spellexpiry"></button></div>
+                        </div>
+                        <div class="warlockspellexpiry">
+                            <div>Warlock Spell Expiry Roll</div>
+                            <div><button class="serbutton2 twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} rolls Spell Expiry}} {{subtitle=Roll under Target Number}} {{roll= [[1d20cf20]] or [[1d100cf>60]]%}}" name="roll_warlockspellexpiry"></button></div>
+                        </div>
+                    </div>
+                  </div> 
             </div>
-        
-            <div class="mana elementalistattributes">
-                <details>
-                    <summary>Elements</summary>
-                    <img src="https://i.imgur.com/askHpqp.png" alt="The Elements: Earth, Air, Fire, Water, Darkness" />
+            <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+            <div class="elementalistattributes">
+                <div class="elementselectscontainer">
+                    <h2>Elements</h2>
                     <h3>Primary Element</h3>
-                    <select name="attr_primaryelement"> 
+                    <select name="attr_primaryelement">  
                         <option value=" " selected>(Pick One)</option>
                         <option value="Earth">Earth (moonset)</option>
                         <option value="Air">Air (noon)</option>
@@ -2060,61 +1927,52 @@ <h3>Primary Element</h3>
                         <option value="Fire">Fire (sunrise)</option>
                         <option value="Darkness">Darkness (sunset)</option>
                     </select>
-        
                     <h3>Secondary Element</h3>
-                    <select name="attr_secondaryelement"> 
+                    <select name="attr_secondaryelement">  
                         <option value=" " selected>(Pick One)</option>
                         <option value="Earth">Earth (moonset)</option>
                         <option value="Air">Air (noon)</option>
                         <option value="Water">Water (moonrise)</option>
                         <option value="Fire">Fire (sunrise)</option>
                     </select>
-        
                     <h3>Secondary Element</h3>
-                    <select name="attr_tertiaryelement"> 
+                    <select name="attr_tertiaryelement">  
                         <option value=" " selected>(Pick One)</option>
                         <option value="Earth">Earth (moonset)</option>
                         <option value="Air">Air (noon)</option>
                         <option value="Water">Water (moonrise)</option>
                         <option value="Fire">Fire (sunrise)</option>
                     </select>
-                </details>
-            </div>
-        
-            <div class="mana standardmana">
-                <details>
-                    <summary>Primary Magic Points</summary>
-                    <span>Magic Points</span> <input title="Put your maximum Magic Points in this box. Mana used is tracked on the front page." class="fourshorttextinput" type="number" name="attr_maxmp" value="0" />
-                </details>
-            </div>
-        
-            <div class="mana elementalistmana">
-                <details>
-                    <summary>Secondary Magic Points</summary>
-                    <span>Magic Points</span>
-                        <input title="Put your maximum Magic Points in this box. Mana used is tracked on the front page." class="fourshorttextinput" type="number" name="attr_twomaxmp" value="0" />
-        
-                    <span>Magic Points</span>
-                        <input title="Put your maximum Magic Points in this box. Mana used is tracked on the front page." class="fourshorttextinput" type="number" name="attr_threemaxmp" value="0" />
-                </details>
+                </div>
+                <div class="elementsimage">
+                    <img src="https://i.imgur.com/askHpqp.png" alt="The Elements: Earth, Air, Fire, Water, Darkness" />
+                </div>   
             </div>
-        
-            <div class="mana mysticmana">
-                <details>
-                    <summary>Mystic Magic</summary>
+            <div class="manacollection">
+                <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
+                <div class="mana standardmana">
+                    <span name="attr_primaryelement"></span><span>Magic Points</span> <input title="Put your maximum Magic Points in this box. Mana used is tracked on the front page." class="fourshorttextinput" type="number" name="attr_maxmp" value="0" />
+                </div>
+                <div class="elementalistmana secondaryelementmpcontainer">
+                    <span name="attr_secondaryelement"></span><span>Magic Points</span>
+                    <input title="Put your maximum Magic Points in this box. Mana used is tracked on the front page." class="fourshorttextinput" type="number" name="attr_twomaxmp" value="0" />
+                </div>
+                <div class="elementalistmana tertiaryelementmpcontainer">
+                    <span name="attr_tertiaryelement"></span><span>Magic Points</span>
+                    <input title="Put your maximum Magic Points in this box. Mana used is tracked on the front page." class="fourshorttextinput" type="number" name="attr_threemaxmp" value="0" />
+                </div>
+                <div class="mysticmana">
                     <span>Psychic Fatigue Check:</span>
-                        <input class="fourshorttextinput" type="number" name="attr_pfc" value="0" /><span> - spell level</span>
-                </details>
+                    <span><input class="fourshorttextinput" type="number" name="attr_pfc" value="0" /> - spell level </span>
+                    <button class="button d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} checks for Psychic Fatigue}} {{subtitle=Roll 1d20 under Target Number}} {{roll= [[1d20cs1cf20]]}} {{Vs= [[@{pfc}-(?{Spell Level|0})]]}}" name="roll_psychicfatiguecheck"></button>
+               </div>
             </div>
         </div>
-            
         <div class="spellbox">
             <input type="hidden" class="profession-toggle" name="attr_profession" value="0" /> 
-            
             <div class="noncaster">
                 <img class="headerimage" src=https://i.imgur.com/71b5OWK.png alt="Scroll" /> 
             </div>
-
             <div class="mystic_spell_list">
                 <details class="spellbook">
                     <summary class="spellbook-header">Mystic Spells of Rank One</summary> 
@@ -3699,7 +3557,6 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-                    
                 <details class="spellbook">
                     <summary>Sorcerer Spells of Level Ten</summary>
                     
@@ -3709,7 +3566,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>A soulless duplicate of a known person can be created using a clay simulacrum mixed with the caster’s own blood, resulting in a permanent 1d4 Health Point loss. The duplicate takes on the physical characteristics and skills of the original, but lacks reason, volition, and knowledge skills. It cannot walk on consecrated ground or cast a reflection.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Hecatomb</div>
                         <div class="spell_range">Range: 10m</div>
@@ -3721,7 +3577,6 @@ <h3>Secondary Element</h3>
                             <span>Hecatomb Spell Backlash Effect: (the caster suffers when using this spell)</span> <button type="roll" name="attr_hecatomb_backlash" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} is wracked by the magical backlash of unleashing death}} {{Suffering=[[1d100]] experience loss}}"></button>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Pentacle of Entrapment</div>
                         <div class="spell_duration">Duration: Three days</div>
@@ -3733,7 +3588,6 @@ <h3>Secondary Element</h3>
                             <span>Pentacle Spell Attack Roll: (roll once for each target that comes into range, up to maximum targets)</span> <button type="roll" name="attr_pentacle_of_entrapment_attack" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name}'s Pentacle of Entrapment attempts to draw a victim inside}} {{subtitle=Pentacle of Entrapment}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}}"></button>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Resurrect</div>
                         <div class="spell_range">Range: Touch</div>
@@ -3741,7 +3595,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>Restores life to a character who has been dead for no more than 28 days. The character loses 1d3 Health Points permanently, and their Strength and Reflexes are halved for one week. The spell must be cast at sunrise, and the caster cannot use spells above the fifth level for the rest of the day.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Scry</div>
                         <div class="spell_duration">Duration: Three minutes</div>
@@ -3749,7 +3602,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>Enables the Sorcerer to look into a specially prepared obsidian mirror to view far-off places, people, or past events. The mirror cannot show specific locations, penetrate physical barriers, or see onto consecrated ground. If a Sorcerer of equal or higher rank is observed, they will know and can cancel the spell, shattering the mirror.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Transformation</div>
                         <div class="spell_duration">Duration: Three minutes</div>
@@ -3757,7 +3609,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>The caster transforms into any creature whose rank-equivalent does not exceed their own rank. The Sorcerer retains their Health Points, magical attack, and magical defence, but gains the fighting skills of the new form. Magic cannot be used unless the form is humanoid.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Sleep of Ages</div>
                         <div class="spell_range">Range: Touch</div>
@@ -3765,7 +3616,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>This spell places a willing target in a sleep lasting 100 years or until a specific condition is met. The target does not age during this time and can only be awakened by Dispel Magic or physical damage.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_sorcerer10">
                             <span>Name</span>
@@ -3783,7 +3633,6 @@ <h3>Secondary Element</h3>
                     </div>
                 </details>
             </div>
-
             <div class="warlock_spell_list">
                 <details>
                     <summary>Warlock Spells of Level One</summary>
@@ -3795,7 +3644,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>The Warlock’s eyes glow brightly, casting a beam of red light to a distance of 20m. This enables him to see perfectly even in utter darkness, and by looking at something, they can illuminate it so that their companions can see it. Use of this spell temporarily reduces the Warlock’s stealth score by 2 and negates any chance of surprising their enemies.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Heal Injury</div>
                         <div class="spell_range">Range: touch</div>
@@ -3803,7 +3651,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>The caster can use this spell to recover 1d4 HP when wounded. Alternatively, they can use it to treat an injured comrade. The spell cannot bring a character back from the dead (reduced to –3 HP or below), nor increase a character’s Health Points above their normal score.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Imperil</div>
                         <div class="spell_range">Range: touch</div>
@@ -3816,7 +3663,6 @@ <h3>Secondary Element</h3>
                             <span>Imperil Spell Attack Roll:</span> <button type="roll" name="attr_imperil_spell_effect" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attempts to weaken their target's flesh}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{target's Magical Defence}]] }} {{desc=If it takes effect, the victim is rendered more vulnerable to wounds. Any wound they takes from a mêlée weapon while the spell lasts will be for 1 Health Point more than usual.}}"></button>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Perception of Sorcery</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -3824,7 +3670,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>This spell enables the Warlock to sense magic within a range of 3m. By concentrating on an object or being, they may be able to determine whether it is enchanted or under the effect of a spell. They is not able to determine anything about the nature or strength of the spell. Perception of Sorcery is not infallible; a d20 roll is made (by the GM) for each object/person scrutinized, and the Warlock only senses any spells present if the roll is under their Psychic Talent score. (Having got a negative result, successive examinations of the same object/person will continue to yield the same result unless a spell is later cast on it—see the description of Sixth Sense on p. 34). The Warlock must take a full Combat Round for each object or being they wishes to investigate using this spell.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Silent Warrior</div>
                         <div class="spell_range">Range: 5m</div>
@@ -3847,7 +3692,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>This spell summons an illusion of a heavily armed and armoured warrior to guard the Warlock’s flank. The warrior takes its appearance from the Warlock with subtle changes that make him more threatening, such as adding 6 inches to their height, larger weapons, or a scar or two. The Battle Brother shouts and threatens anyone approaching the Warlock from the back or side, both warning the caster of sneak attacks and acting in an intimidating manner to ward off attackers.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock1">
                             <span>Name</span>
@@ -3864,10 +3708,8 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-
                 <details>
                     <summary>Warlock Spells of Level Two</summary>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Camouflage</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -3875,7 +3717,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>This spell enables the caster to blend in with whatever they is standing against, covering him with the illusion of a stone wall, a hedgerow, an open field, or whatever. They adds +2 to their stealth score and suffers no stealth penalty for lack of cover (see p. 63). However, they only gains these benefits when more than 5m from their enemies—at closer ranges, the Camouflage spell is ineffective.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Fearlessness</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -3883,7 +3724,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>While under this spell, the Warlock cannot be affected by Fright Attacks (see p 122). The spell prevents him from experiencing the emotion of fear. It does not turn him into a berserker. Low-ranking characters are apt to become a little reckless when using the spell, but more experienced Warlocks will be accustomed to its effects and should be better able to distinguish between lack of fear and lack of caution.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Fortune</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -3891,14 +3731,12 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>This is an all-purpose ‘good luck’ charm. It enhances the Warlock’s chance of success in anything they attempts. In game terms, they may add or subtract 1 from any dice roll they makes—but they can only apply its modifier to one dice roll in any given Combat Round. That means that they could increase their chance of hitting an opponent, say, but they could not also increase the chance of the same blow striking through armour. They must declare when they is taking advantage of the spell’s effect before making the roll. The spell also may be used to influence rolls made by the GM on the player’s behalf. It cannot influence rolls made by other characters (e.g., a Hit Roll made by the Warlock’s opponent). The Fortune spell itself is excluded from its effect; the caster cannot use it to influence its own Spell Expiry Rolls.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Inquiry</div>
                         <div class="spell_desc">
                             <span>Description</span><p>This spell enables the caster to assess instantaneously all characters within a radius of 15m to determine whether they are protected by some defence (such as Spell Screen or Wall of Magic) which shields against direct-attack spells. The caster may also be able to determine the strength of such defences. The chance of doing this is rank ×20%: the GM rolls d100, and if the score is less than or equal to the Warlock’s rank ×20, then they is told the strength of the magical defences. If the roll fails (and a 96–100 is always counted as a failure in this case), then the GM gives a misleading result within 1d8 Magic Points of the defence’s actual strength. Inquiry does not distinguish between the various types of direct-attack shields; it merely informs its caster of the total Magic Points (or spell-levels, in the case of a Mystic) that could be blocked by the shields at the instant of probing (A Spell Screen cannot be distinguished from a 5 MP Wall of Magic, for example).</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Warning</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -3917,7 +3755,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>A quick invocation to the seven great Djinn sultans enables the Warlock to leap vast distances trailing blue flames and sparks in their wake. The Warlock can use this spell to make a single leap of up to 20m in any direction. The spell carries the caster in a parabolic arc, so making it impossible to leap straight up using the spell. The high point of the arc is about 10m which is enough to clear most castle walls. The sparks that rain to the ground with the Warlock’s passing are likely to ignite flammable objects such as dry straw.</p>
                         </div>
                     </div>
-
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock2">
                             <span>Name</span>
@@ -3934,10 +3771,8 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-
                 <details>
                     <summary>Warlock Spells of Level Three</summary>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Deceit</div>
                         <div class="spell_range">Range: touch</div>
@@ -3946,7 +3781,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>The Warlock can apply this spell to a character (including themself) or object so that detection spells will obtain a false reading. They could, for example, apply it to an enchanted talisman so that it would register as non-magical under Detect Aura, or use it to make themself appear more or less powerful than they really is to a Mystic using the Assessment spell. The spells and abilities which may be fooled by Deceit are: ESP and Premonition, Detect Aura and Oracle, See Enchantment and Assessment, Perception of Sorcery and Warning. The spell always works against characters whose rank does not exceed the Warlock’s. More experienced magic-users have a chance (20% per rank higher than the Warlock’s) of realizing they are being deceived.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Enhancement</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -3963,7 +3797,6 @@ <h3>Secondary Element</h3>
                             <input type="number" name="attr_enhancement_neg" max="0" value="0" />
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Havok</div>
                         <div class="spell_range">Range: 12m</div>
@@ -3974,7 +3807,6 @@ <h3>Secondary Element</h3>
                             <span>Havok Spell Attack Roll:</span> <button type="roll" name="attr_havok" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} releases a glittering wave of energy at a single target}} {{subtitle=Havok}} {{spellattackroll=[[2d10]]}} {{speedvsevasion= [[14-?{Target's Evasion}]]}} {{damage= [[3d10-?{Target's Armour Factor}]]}}"></button>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Illusion</div>
                         <div class="spell_range">Range: 20m</div>
@@ -3983,7 +3815,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>Except for the different Spell Expiry probability, this is identical to the Sorcery spell of the same name (see p. 82). An Illusion of up to 2 cubic metres volume can be created, and even if examined closely there is only a 5% chance of distinguishing it from reality. An illusory sentry thus looks and sounds just like a real person, and even feels solid to the touch. It can be made to seem to attack someone who believes it and (although it is illusory and therefore not able to actually harm him) its sword will make a convincing clang and give off a shower of illusory sparks when it strikes their own. The Illusion can be cast onto a character (including the caster) in order to give a near-perfect disguise, with the single limitation that the Illusion must be equal in at least one linear measurement to the size of the thing it is covering.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Telekinesis</div>
                         <div class="spell_range">Range: 25m</div>
@@ -4006,7 +3837,6 @@ <h3>Secondary Element</h3>
                             <span>Ibn-Azi’s Shattering Blow Melee Attack Roll:</span> <button class="roll d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:customd20} {{title=@{character_name} swings their weapon, aiming to land a resounding blow on their target}} {{subtitle=Ibn Azi's Shattering Blow}} {{attackroll=[[1d20cs1cf20]]}} {{attackvsdefence=[[@{finalmeleeattack}-(?{Enemy Defence|0})]]}} {{abr=[[@{equippedmeleeweaponabr}+@{finalmeleeabrbonus}]]}} {{Damage=[[@{equippedmeleeweapondamage}+@{finalmeleedmgbonus}]]}} {{desc=Any armour worn flies apart in a spasm of leather and steel. The spell has no effect on targets with natural armour such as hair, thick skin, or scales. Beings of earth, stone, and metal like Automatons, Earth Elementals, Gargoyles, and Golems take [[2d4]] HP damage from this spell but suffer no armour factor reduction.}} " name="roll_ibn_azis_melee_attack"></button>                
                         </div>
                     </div>  
-
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock3">
                             <span>Name</span>
@@ -4023,10 +3853,8 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-
                 <details>
                     <summary>Warlock Spells of Level Four</summary>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Aegis</div>
                         <div class="spell_duration">Duration: 1d20 Spell Expiry Roll applies</div>
@@ -4034,7 +3862,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>The Aegis spell provides the Warlock with a magical protection which takes effect when they is about to be struck by a weapon (whether in mêlée or by an arrow, etc.) or by an indirect-effect spell (see p. 75). On a roll of 1 on 1d6 the attack is negated.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Neutralize Toxin</div>
                         <div class="spell_range">Range: touch</div>
@@ -4043,7 +3870,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>While this spell is in effect, poisons that enter the character’s body are immediately neutralized. If the spell is cast on a character after they has been poisoned, then it will prevent him from taking further damage but will not restore any Health Points already lost.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Oracle</div>
                         <div class="spell_duration">Duration: lasts for one minute</div>
@@ -4054,7 +3880,6 @@ <h3>Secondary Element</h3>
                             <span>Oracle Spirit Knowledge Chance Roll:</span><button type="roll" name="attr_oracle_warlock" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name} asks the oracles of the spirit world for answers}} {{subtitle=Oracle}} {{First Question=[[1d100cs1cf100]] vs 75%}} {{Second Question=[[1d100cs1cf100]] vs 75%}} {{Third Question=[[1d100cs1cf100]] vs 75%}} {{desc=If they do not know, they will answer randomly, and will also do this if the question is phrased ambiguously. Questions about the future or a character’s thoughts will not be answered—the spirits speak only of tangibles, not speculations and fancies.}}"></button>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Turncoat</div>
                         <div class="spell_range">Range: 5m</div>
@@ -4066,7 +3891,6 @@ <h3>Secondary Element</h3>
                             <span>Turncoat Spell Attack Roll:</span> <button type="roll" name="attr_turncoat" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} tries to manipulate their target's loyalties}} {{subtitle=Turncoat}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}}"></button>                        
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Vitality</div>
                         <div class="spell_desc">
@@ -4089,7 +3913,6 @@ <h3>Secondary Element</h3>
                             <span>Faestus’ Wrath Melee Attack Roll:</span> <button class="roll d20" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:customd20} {{title=The enchanted weapon leaps and twists in its owner’s hand, attempting to strike them repeatedly.}} {{subtitle=Faestus’ Wrath}} {{attackroll=[[1d20cs1cf20]]}} {{attackvsdefence=[[16-(?{Enemy Defence|0})]]}} {{abr=[[?{Target weapon's ABR|1d6}+?{Target weilder's ABR bonus|0}]]}} {{Damage=[[?{Target weapon's Damage|4}+?{Target weilder's Damage bonus|0}]]}} {{desc=Anyone with Reflexes and Strength scores of 13 each can grab the weapon holding it in place and preventing it from attacking. Keeping the weapon at bay counts as a full action, and someone performing that action cannot move or attack without letting go of the weapon.}} " name="roll_faestus_wrath_melee_attack"></button>                
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock4">
                             <span>Name</span>
@@ -4106,10 +3929,8 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-
                 <details>
                     <summary>Warlock Spells of Level Five</summary>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Force of Will</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -4117,7 +3938,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>This spell gives the Warlock the ability to completely ignore pain, allowing him to stay in combat until virtually hacked apart if need be. They does not black out on reaching 0 HP and must be reduced to –20 HP in order to kill him. Under the effect of this spell, it is thus possible to endure terrible wounds and then use Vitality or Heal Injury to restore oneself before the spell wears off. Of course, if the Force of Will spell should expire when the Warlock’s HP score is –3 or less, then they dies at once.</p>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Hellfire</div>
                         <div class="spell_range">Range: 15m</div>
@@ -4132,7 +3952,6 @@ <h3>Secondary Element</h3>
                             <span>Hellfire Area of Effect Damage Roll: (roll for each living being within 2m of the victim)</span> <button type="roll" name="attr_hellfire_areaeffect" class="roll d6" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=The Hellfires' burning intensity affects everybody around the victim}} {{damage=[[1d6-?{target's Armour Factor}]] }}"></button>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Slow</div>
                         <div class="spell_range">Range: 12m</div>
@@ -4145,7 +3964,6 @@ <h3>Secondary Element</h3>
                             <span>Slow Spell Attack Roll: (roll once against each target)</span> <button type="roll" name="attr_slow" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name}'s spell magially saps at their victim's ability to think and move}} {{subtitle=Slow}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=Slowed beings may only act in alternate Combat Rounds. Unless they has higher Reflexes than the Warlock and has thus acted already, an affected character loses their action for the Combat Round in which the spell is cast}}"> </button> 
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Soulbane</div>
                         <div class="spell_range">Range: 15m</div>
@@ -4156,7 +3974,6 @@ <h3>Secondary Element</h3>
                             <span>Soulbane Spell Attack Roll:</span><button type="roll" name="attr_soulbane" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} flings a tendril of black fire at their target}} {{spellattackroll=[[2d10]]}} {{speedvsevasion=[[17-?{Target's Evasion}]]}} {{desc=The spell reduces the target’s magical attack (if any) and magical defence by [[2d8-?{Magic Armour Bonus}]] points. Depleted scores recover at the rate of 1 point every Combat Round.}}"></button>
                         </div>
                     </div>
-                
                     <div class="spell-entry">
                         <div class="spell_name">Terminate Enchantment</div>
                         <div class="spell_range">Range: 5m</div>
@@ -4175,7 +3992,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>In the shadows of the Kaikuhuran Empire, the Warlock-Priests of Apep wielded weapons laced with venom that they claimed came from the fangs of their dread master. This spell envenoms a single blade as if it were coated in a single dose of Assassin’s Lotion. All standard rules for Assassin’s Lotion apply.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock5">
                             <span>Name</span>
@@ -4192,7 +4008,6 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-                
                 <details>
                     <summary>Warlock Spells of Level Six</summary>
                     <div class="spell-entry">
@@ -4205,7 +4020,6 @@ <h3>Secondary Element</h3>
                             <span>Annihilate Spell Attack Roll:</span> <button type="roll" name="attr_annihilate" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name}'s spell magially saps at their victim's ability to think and move}} {{subtitle=Slow}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The victim is utterly destroyed and cannot be restored to life by any known means.}}"> </button> 
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Lunacy</div>
                         <div class="spell_range">Range: 2m</div>
@@ -4216,9 +4030,7 @@ <h3>Secondary Element</h3>
                             <span>Lunacy Chance to Meet Gaze Roll:</span> <button type="roll" name="attr_lunacy_gaze_chance" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name}'s eyes fill with the cold, deranging gleam of moonlight}} {{subtitle=A character facing the Warlock in close combat at that moment has an 80% chance of looking straight into their eyes}} {{roll=[[1d100cs1cf100]] vs 80%}}"></button>
                             <span>Lunacy Fright Attack Roll:</span> <button type="roll" name="attr_lunacy_fright_attack" class="roll d12" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} meets their opponent’s gaze, the vicitm tries to resist their maddening gleam}} {{subtitle=The victim is subject to a Fright Attack of intensity 21 - Rank, which the caster must roll equal to or under on 2d10)}} {{Vs=[[21-?{Target's Rank}]]}} {{roll=[[2d10]]}} {{desc=this Fright Attack drives him into a state of hopeless insanity. They becomes a mewling halfwit who can do no more than grin and gurgle unintelligibly. There is a drawback to this spell. In the round they casts it, the Warlock is blinded and consequently at –8 defence}}"></button>
                         </div>
-
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Panoply</div>
                         <div class="spell_duration">Duration: 1d20 Spell Expiry Roll applies</div>
@@ -4233,7 +4045,6 @@ <h3>Secondary Element</h3>
                             </select>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Sigil of Destiny</div>
                         <div class="spell_duration">Duration: lasts one day</div>
@@ -4249,7 +4060,6 @@ <h3>Secondary Element</h3>
                             <p>the Sigil allows the character to take the roll again, this time with automatic success. The prediction must relate to a single character, and only that character can be saved by the Sigil. Each casting of this spell is good for only one ‘extra life’ and is then used up — you cannot predict taking a wound from a Skeleton and thus acquire total invincibility against every Skeleton you encounter while exploring the Labyrinth of Aktrium. The spell only covers effects that are direct, instant and obvious. Consider a Warlock who, having predicted death from a sword-blow, is struck a non-fatal wound with a sword. The sword happens to be coated in a slow-acting poison from which they dies several hours later. The sword may be said to have brought about their death, but only indirectly (it was actually the poison that killed him). The Sigil would not come into effect in this case.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Vaporize</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -4268,7 +4078,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>With a cry of alarm and a few quick gestures, the Warlock girds themself and their companions for battle. This spell instantly wakes the targets, places their weapons in their hands, and dons their armour. The weapons and armour must be accessible to the targets and within 10m of the caster. This spell is a favourite with civilized Khitai Warlocks travelling through the dark and dangerous western lands.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock6">
                             <span>Name</span>
@@ -4285,7 +4094,6 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-                
                 <details>
                     <summary>Warlock Spells of Level Seven</summary>
                     <div class="spell-entry">
@@ -4296,7 +4104,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>This spell increases the effectiveness of any attack the Warlock makes on one selected character within 15m: they can adjust their Hit Rolls, Armour Bypass Rolls and damage scores against the character by 3 points each. Any spells they casts at the character gain +3 to speed or magical attack (whichever is applicable), and if the spell inflicts damage on its target, then that is increased by 3. If the Warlock can slay their chosen foe while the Nemesis spell lasts, they gets twice the regular experience points award (see p. 129)—but if the foe is killed by someone else or is still alive when the spell wears off, the Warlock immediately loses 1d10 experience points.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Pacify</div>
                         <div class="spell_range">Range: 15m</div>
@@ -4309,7 +4116,6 @@ <h3>Secondary Element</h3>
                             <span>Pacify Spell Attack Roll: (roll once against each target)</span> <button type="roll" name="attr_slow" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name}'s spell magially saps at their victim's ability to think and move}} {{subtitle=Slow}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=This causes them to cease hostilities against the caster. They will still be able to attack the caster’s allies, but can take no action which might harm him. Pacify is not an Enthrall spell and affected characters do not become friendly to the caster; they merely acquire a mental block that prevents them from attacking him. If the Warlock attacks a character they has Pacified, that character snaps out of the spell immediately}}"> </button> 
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Runic Weapon</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -4320,7 +4126,6 @@ <h3>Secondary Element</h3>
                             <span>Activate Runic Weapon Spell: Please manually add your +3 weapon to your weapon list, this sheet is unable to do so for you.</span>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Spell Screen</div>
                         <div class="spell_duration">Duration: 1d20 Spell Expiry Roll applies</div>
@@ -4328,7 +4133,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>Other than its shorter duration, this is the same as the 7th-level Sorcery spell of the same name. A Spell Screen protects its caster from direct-attack spells by reducing any spell cast at him by 5 Magic Points. It does not affect spells cast by the Warlock themself. A spell which gets through the Screen with reduced strength may still affect the Warlock, but its effective magical attack against him is reduced by the difference between the spell’s level and the number of Magic Points remaining in it.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">The Trickster’s Hand</div>
                         <div class="spell_range">Range: touch</div>
@@ -4349,7 +4153,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>With a sonorous chant, the Warlock empowers their allies with the strength of the ancient Selentine heroes. Any ally of the Warlock standing within 20m of him when they begins the chant gains a +2 to their Attack and Defence. This spell turns average troops into hardened warriors, and veteran fighters into legends. The chant that accompanies this spell is often taken up by surrounding units, giving them a feeling of invincibility and incidentally making it difficult to spot the unit that has been bolstered. Each character affected by the spell must continue to chant for the duration or the spell will cease to function on them. The Warlock is not affected by the spell and need not continue the chant.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock7">
                             <span>Name</span>
@@ -4366,7 +4169,6 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-
                 <details>
                     <summary>Warlock Spells of Level Eight</summary>
                     <div class="spell-entry">
@@ -4376,7 +4178,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>This enables the Warlock literally to walk on air. The effect is accompanied by faint, glowing red ‘stepping stones’ that appear under the Warlock’s foot with each step they takes and then fade as they passes on to the next. They can move safely at normal walking speed, but if they tries to run or fight on the Demon Path they must roll under their Reflexes on 1d20 or fall to the ground below.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Energy Bolt</div>
                         <div class="spell_range">Range: 15m</div>
@@ -4388,7 +4189,6 @@ <h3>Secondary Element</h3>
                             <span>Energy Bolt Spell Attack Roll:</span> <button type="roll" name="attr_energy_bolt" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=A thunderous blast of scarlet energy rips through the air}} {{subtitle=Energy Bolt}} {{spellattackroll=[[2d10]]}} {{speedvsevasion=[[17-?{Target's Evasion}]]}} {{damage=[[5d10-?{Target's Armour Factor}]]}}"></button>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Gauntlet</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -4410,7 +4210,6 @@ <h3>Secondary Element</h3>
                             </details>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Killing Frenzy</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -4418,7 +4217,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>While under the effect of this powerful combat spell the Warlock is able to make two attacks every Combat Round. The first must be taken at the point in the round when they would normally get their action (see p. 70) and the second at the very end of the round. The Killing Frenzy allows only multiple weapon attacks. If the Warlock does something else such as casting a spell or moving instead of attacking with a weapon they does not get a second action that round. Furthermore, only attacks with a weapon in which the Warlock specializes (i.e. which belongs to one of their chosen Weapon Groups) are affected.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Reincarnate</div>
                         <div class="spell_range">Range: touch</div>
@@ -4441,9 +4239,7 @@ <h3>Secondary Element</h3>
                             <span>Rain of Death Spell Attack Roll: (roll for each target in the 20m radius area)</span> <button type="roll" name="attr_rain_of_death_attack" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} fires a single shot as they casts the spell, and the missile splits into dozens of duplicates of itself in mid-air}} {{subtitle=Rain of Death, fills an aread 20m Radius}} {{spellattackroll=[[2d10]]}} {{speedvsevasion=[[14-?{Target's Evasion}]]}} {{desc=This target is struck by [[1d4]] arrows}}"></button>
                             <span>Rain of Death Spell Damage Roll: (roll for each target hit successfully)</span> <button type="roll" name="attr_rain_of_death_damage" class="roll d6" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=The spectral arrows pin-cusion their victims}} {{subtitle=Rain of Death, roll once for each victim}} {{Armour Bypass Rolls=?{Number of missiles that hit|1, [[1d6]]|2, [[1d6]] [[1d6]]|3, [[1d6]] [[1d6]] [[1d6]]|4, [[1d6]] [[1d6]] [[1d6]] [[1d6]]} }} {{Damage per Missile=?{Number of missiles to do damage?|0, 0|1, [[1d6]]|2, [[1d6]] [[1d6]]|3, [[1d6]] [[1d6]] [[1d6]]|4, [[1d6]] [[1d6]] [[1d6]] [[1d6]]}}}"></button>
                         </div>
-                    
                     </div>
-                    
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock8">
                             <span>Name</span>
@@ -4460,7 +4256,6 @@ <h3>Secondary Element</h3>
                         </fieldset>
                     </div>
                 </details>
-
                 <details>
                     <summary>Warlock Spells of Level Nine</summary>
                     <div class="spell-entry">
@@ -4487,7 +4282,6 @@ <h3>Secondary Element</h3>
                                     <li>Notes: In horse form, stats as per Warhorse; can change between forms at will at night.</li>
                                 </ul>
                             </details>
-
                             <details>
                                 <summary>Warhorse Stats</summary>
                                 <ul>
@@ -4506,7 +4300,6 @@ <h3>Secondary Element</h3>
                             </details>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Invulnerability</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -4514,7 +4307,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>The Warlock encloses themself and one companion inside an invisible barrier that is impervious to all spells, ring-effects, creatures, and all weapons. Attacks such as hypnosis or Fright Attacks can affect those protected by this spell. The Warlock can move around slowly (5m/round).</p>
                         </div>
                     </div>
-
                     <div class="spell-entry">
                         <div class="spell_name">Simulacrum</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -4522,7 +4314,6 @@ <h3>Secondary Element</h3>
                             <span>Description</span><p>The Warlock can create their own double. The Simulacrum has all of the original’s normal stats and the current Magic Points score of the Warlock. The Warlock can see through their double’s eyes, and they obey their telepathic commands. There is a chance that if one takes a wound, the other may suffer the same effect.</p>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Song of Battle</div>
                         <div class="spell_duration">Duration: d20 Spell Expiry Roll applies</div>
@@ -4538,7 +4329,6 @@ <h3>Secondary Element</h3>
                             <span>Song of Battle Fear Effect Roll:</span> <button type="roll" name="attr_song_of_battle_fear" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom} {{title=@{character_name}'s Battle Form inspires fear in their foes}} {{subtitle=This affects Intelligent creatures up to 2nd rank and animals up to 4th rank-equivalent}} {{roll=[[1d100cs1cf100]]}} {{vs=[[30%]] }} {{desc=Enemies have a 30% chance of fleeing in panic if the warlock attacks them.}}" > </button>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <div class="spell_name">Teleport</div>
                         <div class="spell_range">Range: 100m</div>
@@ -4564,7 +4354,6 @@ <h3>Secondary Element</h3>
                             Fleeing the Warlock provokes another magical attack as the target re-enters the mist}}"></button>
                         </div>
                     </div>
-                    
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_warlock9">
                             <span>Name</span>
@@ -4582,12 +4371,10 @@ <h3>Secondary Element</h3>
                     </div>
                 </details>
             </div>
-
             <div class="elementalist_spell_list">
                 <input type="hidden" class="element-toggle1" name="attr_primaryelement" value="" />
                 <input type="hidden" class="element-toggle2" name="attr_secondaryelement" value="" />
                 <input type="hidden" class="element-toggle3" name="attr_tertiaryelement" value="" />
-                
                 <div class="earth_spell_list">
                     <details>
                         <summary>Earth Spells</summary>
@@ -4900,7 +4687,6 @@ <h3>Secondary Element</h3>
                         </div>
                     </details>
                 </div>
-                
                 <div class="air_spell_list">
                     <details>
                         <summary>Air Spells</summary>
@@ -5202,7 +4988,6 @@ <h3>Secondary Element</h3>
                         </div>
                     </details>
                 </div>
-                
                 <div class="water_spell_list">
                     <details>
                         <summary>Water Spells</summary>
@@ -5237,7 +5022,6 @@ <h3>Secondary Element</h3>
                                 </div>
                             </div>
                         </details>
-                    
                         <details>
                             <summary>Level 2</summary>
                             <div class="spell-entry">
@@ -5464,7 +5248,6 @@ <h3>Secondary Element</h3>
                         </div>
                     </details>
                 </div>
-                
                 <div class="fire_spell_list">
                     <details>
                         <summary>Fire Spells</summary>
@@ -5730,7 +5513,6 @@ <h3>Secondary Element</h3>
                         </div>
                     </details>
                 </div>
-                
                 <div class="darkness_spell_list">
                     <details>
                         <summary>Darkness Spells</summary>
@@ -5866,7 +5648,6 @@ <h3>Secondary Element</h3>
                                     <p>Geas: Every time the Darkness Elementalist casts this spell, he must resist becoming a creature of the shadows, an insubstantial Wraith (see p. 253). Roll a magical attack of 2d8 +1 against the character’s magical defence.</p>
                                 </div>
                             </div>
-                            
                         <input type="hidden" class="playerspells_toggle" name="attr_playerspells_toggle" value="0"/>
                             <div class="spell-entry playerspell">
                                 <div class="spell_name">Dark Rebirth</div>
@@ -6548,7 +6329,6 @@ <h3>Secondary Element</h3>
                         </div>
                         <div class="spell_button">
                             <span>Possession by Eldyr Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
-
                             <span>Possession by Eldyr Spell Attack Roll:</span><button type="roll" name="attr_possession_eldyr" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Eldyr}} {{subtitle=Possession by Eldyr}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The possessed characters have magically charming voices and demeanours. Any characters of 3rd Rank or below who listen to them speak for one Combat Round or more will be affected by the possessed characters as though they had cast a Command spell (see Dragon Warriors, p. 82). Looks scores are raised to 19.}}"></button>
                         </div>
                     </div>
@@ -6562,9 +6342,8 @@ <h3>Secondary Element</h3>
                         </div>
                         <div class="spell_button">
                             <span>Possession by Kesh Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
-
                             <span>Possession by Kesh Spell Attack Roll:</span><button type="roll" name="attr_possession_kesh" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Kesh}} {{subtitle=Possession by Kesh}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The possessed characters have an aura of terror about them. If anyone attempts to come within 5m of one of them, he pits his Magical Attack against the Magical Defence of the approacher. If he succeeds, the possessed character is so terrifying that the victim may not approach any closer, and may not attack the possessed character by any means.}}"></button>
-                                </div>
+                       </div>
                     </div>
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_demonologist4">
@@ -6594,9 +6373,8 @@ <h3>Secondary Element</h3>
                         </div>
                         <div class="spell_button">
                             <span>Possession by Tsienra Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
-
                             <span>Possession by Tsienra Spell Attack Roll:</span><button type="roll" name="attr_possession_Tsienra" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Tsienra}} {{subtitle=Possession by Tsienra}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The possessed characters gain +2 to Attack and +1 to Defence, and have their Reflexes scores raised to 19.}}"></button>
-                                </div>
+                       </div>
                     </div>
                     <div class="spell-entry">
                         <div class="spell_name">Possession by Kojuro</div>
@@ -6610,7 +6388,7 @@ <h3>Secondary Element</h3>
                             <span>Possession by Kojuro Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
 
                             <span>Possession by Kojuro Spell Attack Roll:</span><button type="roll" name="attr_possession_Kojuro" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Kojuro}} {{subtitle=Possession by Kojuro}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The possessed characters gain +2 to Attack and +2 to Defence, and gain a +1 bonus to Damage and to all armour bypass rolls in mêlée combat.}}"></button>
-                                </div>
+                       </div>
                     </div>
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_demonologist4">
@@ -6640,9 +6418,7 @@ <h3>Secondary Element</h3>
                         </div>
                         <div class="spell_button">
                             <span>Possession by Akresh Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
-
                             <span>Possession by Akresh Spell Attack Roll:</span><button type="roll" name="attr_possession_Akresh" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Akresh}} {{subtitle=Possession by Akresh}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The possessed characters gain +2 to Defence, a +1 bonus to any armour worn (or natural armour 2 if no armour is worn) and an increase of +2d6 Health Points. Damage is removed from the bonus Health Points first.}}"></button>
-           
                         </div>
                     </div>
                     <div class="spell-entry">
@@ -6655,7 +6431,6 @@ <h3>Secondary Element</h3>
                         </div>
                         <div class="spell_button">
                             <span>Possession by Hragahl Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
-
                             <span>Possession by Hragahl Spell Attack Roll:</span><button type="roll" name="attr_possession_Hragahl" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Hragahl}} {{subtitle=Possession by Hragahl}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The possessed characters gain +2 to Magical Attack and +2 to Magical Defence, and have their Psychic Talent scores raised to 19.}}"></button>
                         </div>
                     </div>
@@ -6689,7 +6464,7 @@ <h3>Secondary Element</h3>
                             <span>Possession by Engala Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
 
                             <span>Possession by Engala Spell Attack Roll:</span><button type="roll" name="attr_possession_Engala" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Engala}} {{subtitle=Possession by Engala}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=he possessed characters have their Strength scores raised to 19, and gain an increase of +3d6 Health Points. Damage is removed from the bonus Health Points first.}}"></button>
-                                </div>
+                       </div>
                     </div>
                     <div class="spell-entry">
                         <div class="spell_name">Possession by Sarasathsa</div>
@@ -6703,7 +6478,7 @@ <h3>Secondary Element</h3>
                             <span>Possession by Sarasathsa Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
 
                             <span>Possession by Sarasathsa Spell Attack Roll:</span><button type="roll" name="attr_possession_Sarasathsa" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Sarasathsa}} {{subtitle=Possession by Sarasathsa}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The possessed characters gain +6 to Magical Defence, are immune to Fright Attacks, and have their Intelligence scores raised to 19. Sarasatha’s possession is double-edged, in that the recipient could become sunk into lethargy and pensive introspection (roll Psychic Talent or less on 2d10 when coming out of possession to avoid this). A lethargic character will be unwilling to take any action that involves effort. He may attempt another Psychic Talent roll after every hour of lethargy to throw off the effects.}}"></button>
-                                </div>
+                       </div>
                     </div>    
                     <div class="spell-entry">
                         <fieldset class="repeating_spells_demonologist9">
@@ -6735,7 +6510,7 @@ <h3>Secondary Element</h3>
                             <span>Possession by Kyrax Demonology Roll</span><button class="button twod10" type="roll" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} attmepts to prepare a demonic talisman}} {{subtitle=Roll 2d10 under Demonology Skill}} {{roll=[[2d10]]}} {{Vs = [[@{rank}+@{demonology_modifier}]]}}" name="roll_demonology_possession"></button>
 
                             <span>Possession by Kyrax Spell Attack Roll:</span><button type="roll" name="attr_possession_Kyrax" class="roll twod10" value="?{Choose roll type|Public roll,|GM and player,/w gm}&{template:custom2d10} {{title=@{character_name} invokes the spirit-essence of Kyrax}} {{subtitle=Possession by Kyrax}} {{spellattackroll=[[2d10]]}} {{magicalattackvsmagicaldefence=[[@{finalmagicalattack}-?{Target's Magical Defence}]]}} {{desc=The possessed characters gain +4 to Stealth and Perception.}}"></button>
-                                </div>
+                        </div>
                     </div>
                     <div class="spell-entry">
                         <div class="spell_name">Possession by Umalu</div>
@@ -6808,9 +6583,7 @@ <h3>Secondary Element</h3>
             </div>
         </div>
     </div>
-    
     <div class="inventory">
-        
         <div class="weapons">
             <div class="meleeweapons">
                 <h2>Melee Weapons</h2>
@@ -6834,7 +6607,6 @@ <h2>Melee Weapons</h2>
                     </div>
                 </fieldset>
             </div>
-            
             <div class="rangedweapons">
                 <h2>Ranged Weapons</h2>
                 <fieldset class="repeating_rangedweapons">
@@ -6857,7 +6629,6 @@ <h2>Ranged Weapons</h2>
                     </div>
                 </fieldset>
             </div>
-            
             <div class="ammunition">
                 <h2>Ammunition</h2>
                 <fieldset class="repeating_ammo">
@@ -6882,32 +6653,26 @@ <h2>Ammunition</h2>
                     </div>
                 </fieldset>
             </div>
-            
         </div>
-        
         <div class="armour">
             <h2>Armour</h2>
             <div class="armourtypelist">
             <span>Armour Type</span> <input type="text" list="armourtype" name="attr_armourtype" />
             </div>
-            
             <div class="basearmourdetails">
                 <span>Base Armour Factor</span> <input type="number" name="attr_baseaf" min="0" value="0"  /><br>
                 <span>Magic Bonus</span> <input type="number" name="attr_magicafbonus" min="0" max="3" value="0" /><br>
                 <span>Miscellaneous Bonus</span> <input type="number" name="attr_miscaf" title="Can be a positive or negative number." value="0" />
             </div>
-            
             <div class="armourproficiencypenalties">
                 <h3>Non-Proficiency Penalties</h3>
                 <span>Attack</span> <input type="number" name="attr_armourattackpenalty" max="0" step="1" value="0"  /><br>
                 <span>Defence</span> <input type="number" name="attr_armourdefencepenalty" max="0" step="1" value="0"  /><br>
                 <span>Stealth</span> <input type="number" name="attr_armourstealthpenalty" max="0" step="1" value="0"  />
             </div>
-            
             <div class="skullimage"> 
                 <img class="icon skull" src="https://i.imgur.com/CrBuh7g.png" alt="Helmed Skull" /> 
             </div>
-            
             <div class="shieldtogglebox">
                 <span>Shield</span> 
                 <select name="attr_shield">
@@ -6915,7 +6680,6 @@ <h3>Non-Proficiency Penalties</h3>
                     <option value="1">Equipped</option>
                 </select>
             </div>
-            
             <input type="hidden" class="shield" name="attr_shield" value="0" />
             <div class="shieldhidden">
                 Roll <input title="Modified by Guard/Abilities" type="number" class="fourshorttextinput" name="attr_shieldsuccessvalue" value="1"  /> on <input class="fourshorttextinput" type="text" name="attr_shielddievalue" value="1d6"  />
@@ -6923,26 +6687,20 @@ <h3>Non-Proficiency Penalties</h3>
                 <span>Magic Bonus</span> <input class="fourshorttextinput" type='number' name='attr_magicshield' value='0' />    
             </div>    
         </div>
-                
         <div class="money">
             <h2>Coin Purse</h2>
-
             <div class="goldcrowns">
                 <span>Crowns</span> <input type="number" id="gc" name="attr_gc" value="0" />
             </div>
-            
             <div class="silverflorins">
                 <span>Florins</span> <input type="number" id="sf" name="attr_sf" value="0" />
             </div>
-            
             <div class="copperpennies">
                 <span>Pennies</span> <input type="number" id="cp" name="attr_cp" value="0" />
             </div>
-            
             <div class="chestimage">
                 <img class="icon chest" src="https://i.imgur.com/Mz8a04v.png" alt="Coin Chest" />
             </div>
-            
             <div class="otherwealth">
                 <h2>Other Wealth</h2>
                 <div class="sheet-auto-expand">
@@ -6951,8 +6709,6 @@ <h2>Other Wealth</h2>
                 </div>  
             </div>
         </div>
-        
-        <!-- Possessions Section -->
         <div class="possessions">
             <h2>Possessions</h2>
                 <fieldset class="repeating_inventoryitems">
@@ -6962,8 +6718,6 @@ <h2>Possessions</h2>
                         <span>Encumbrance Value</span> <input type="number" step="any" name="attr_encumbranceValue" value="0" />
                 </fieldset>
         </div>
-        
-        <!-- Encumbrance Section -->
         <div class="encumbrance">
             <h2>Encumbrance</h2>
             <div class="encumbrancecontainer">
@@ -6977,7 +6731,6 @@ <h2>Encumbrance</h2>
             </div>    
         </div>
     </div>
-
     <div class="skills">
         <div class="professionskillscontainer">
             <input type="hidden" class="profession-toggle" name="attr_profession" value="0" />
@@ -6985,7 +6738,6 @@ <h2>Encumbrance</h2>
                 <details>
                 <summary><h2>Assassin Profession Skills</h2></summary>
                 <div class="counter-container">
-                    <!-- Combat Technique Counter -->
                     <div class="counterbox">
                         <span>Combat Techniques:</span>
                         <div class="counterfields">
@@ -6996,8 +6748,6 @@ <h2>Encumbrance</h2>
                             <input type="number" class="fourshorttextinput" name="attr_combattechniques_selected" value="0" readonly />
                         </div>
                     </div>
-                
-                    <!-- Mental Techniques Counter -->
                     <div class="counterbox">
                         <span>Mental Techniques:</span>
                         <div class="counterfields">
@@ -7008,8 +6758,6 @@ <h2>Encumbrance</h2>
                             <input type="number" class="fourshorttextinput" name="attr_mentaltechniques_selected" value="0" readonly />
                         </div>
                     </div>
-                
-                    <!-- Alchemical Techniques Counter -->
                     <div class="counterbox">
                         <span>Alchemical Techniques:</span>
                         <div class="counterfields">
@@ -7020,8 +6768,6 @@ <h2>Encumbrance</h2>
                             <input type="number" class="fourshorttextinput" name="attr_alchemicaltechniques_selected" value="0" readonly />
                         </div>
                     </div>
-                
-                    <!-- Skills of the Assassin Counter -->
                     <div class="counterbox">
                         <span>Skills of the Assassin:</span>
                         <div class="counterfields">
@@ -7049,7 +6795,6 @@ <h2>Encumbrance</h2>
                                 </div>    
                             </details>
                         </div>
-                        
                         <div class="skillrow">
                             <details>
                                 <summary>Shock Attack</summary>
@@ -7078,7 +6823,6 @@ <h2>Encumbrance</h2>
                                 </div>
                             </details>
                         </div>
-                        
                         <div class="skillrow">
                             <details>
                                 <summary>Throwing Spike</summary>
@@ -7095,7 +6839,6 @@ <h2>Encumbrance</h2>
                                 </div>    
                             </details>
                         </div>
-                        
                         <div class="skillrow">
                             <details>
                                 <summary><span >Unarmed Combat</span></summary>
@@ -7296,7 +7039,6 @@ <h2>Encumbrance</h2>
                             </div>
                         </details>
                     </div>    
-    
                     <div class="skillrow">
                         <details>
                             <summary>Flash Pellets</summary>
@@ -7331,7 +7073,6 @@ <h2>Encumbrance</h2>
                                 </div>
                             </details>
                         </div>
-
                         <div class="skillrow">
                             <details>
                                 <summary>Climbing</summary>
@@ -7347,7 +7088,6 @@ <h2>Encumbrance</h2>
                                 </div>
                             </details>
                         </div>
-
                         <div class="skillrow">
                             <details>
                                 <summary>Jumping</summary>
@@ -7363,7 +7103,6 @@ <h2>Encumbrance</h2>
                                 </div>
                             </details>
                         </div>
-
                         <div class="skillrow">
                             <details>
                                 <summary>Disguise</summary>
@@ -7387,7 +7126,6 @@ <h2>Encumbrance</h2>
                                 </div>
                             </details>
                         </div>
-
                         <div class="skillrow">
                             <details>
                                 <summary>Pilfer</summary>
@@ -7451,7 +7189,6 @@ <h2>Encumbrance</h2>
                 <details>
                 <summary><h2>Knight Profession Skills</h2></summary>
                 <div class="counter-container">
-                    <!-- Combat Technique Counter -->
                     <div class="counterbox">
                         <span>Special Abilities of a Knight:</span>
                         <div class="counterfields">
@@ -7467,7 +7204,6 @@ <h2>Encumbrance</h2>
                         <div class="counterfields">
                             <span>Max:</span>
                             <input type="number" class="fourshorttextinput" name="attr_knightsupremacy_max" readonly />
-                            
                             <span>Selected:</span>
                             <input type="number" class="fourshorttextinput" name="attr_knightsupremacy_selected" readonly />
                         </div>
@@ -7577,15 +7313,10 @@ <h2>Encumbrance</h2>
                                 <input type="hidden" class="knightcheckbox main_gauche" name="attr_main_gauche_hidden" value="0"/>
                                 <div class="knightroll main_gauche">
                                     <fieldset class="repeating_meleeweapons maingauchesummary">
-                                        <!-- Weapon Name -->
                                         <span name="attr_meleeweaponname"></span>, 
-                                        <!-- Weapon Type -->
                                         <span name="attr_meleeweapon"></span>, +
-                                        <!-- Magic Bonus -->
                                         <span name="attr_magicmeleeweaponbonus"></span>
-                                        <!-- Equip Offhand Button -->
                                         <button type="action" name="act_equipoffhand">Equip Offhand</button>
-                                        <!-- Hidden Fields (Needed for References/Calculations) -->
                                         <input type="hidden" name="attr_ismaingauchedefenceweapon" />
                                         <input type="hidden" name="attr_meleeabr" />
                                         <input type="hidden" name="attr_meleedamage" />
@@ -7827,14 +7558,12 @@ <h2>Encumbrance</h2>
                 <details>
                 <summary><h2>Barbarian Profession Skills</h2></summary>
                     <div class="counter-container">
-                        <!-- Combat Technique Counter -->
                         <input type="hidden" class="supremacy_able" name="attr_supremacy_able" value="0" />
                         <div class="supremacy counterbox">
                             <span>The Supremacy of the Sword:</span>
                             <div class="counterfields">
                                 <span>Max:</span>
                                 <input type="number" class="fourshorttextinput" name="attr_barbariansupremacy_max" />
-                                
                                 <span>Selected:</span>
                                 <input type="number" class="fourshorttextinput" name="attr_barbariansupremacy_selected" readonly />
                             </div>
@@ -7842,7 +7571,6 @@ <h2>Encumbrance</h2>
                     </div>
                 <details>
                     <summary>Special Abilities of a Barbarian</summary>
-                        <!-- Track -->
                         <div class="skillrow">
                             <details>
                                 <summary>Track</summary>
@@ -8206,12 +7934,10 @@ <h2>Encumbrance</h2>
                     </div>
                 </details>
                 </details>
-                <!-- End of Mysticskills Section -->
             </div>
             <div class="elementalistskills">
                 <details>
                     <summary><h2>Elementalist Profession Skills</h2></summary>
-                    
                         <input type="hidden" class="elementalist_raw_power_type" name="attr_elementalist_raw_power_type" value="0"/>
                         <div class="skillrow elementalist_core_powers">
                             <details>
@@ -8232,7 +7958,6 @@ <h2>Encumbrance</h2>
                                 </div>
                             </details>
                         </div>
-                        
                         <input type="hidden" class="elementalist_raw_power_type" name="attr_elementalist_raw_power_type" value="0"/>
                         <div class="skillrow elementalist_alternate_powers">
                             <details>
@@ -8262,7 +7987,6 @@ <h2>Encumbrance</h2>
                                 </div>
                             </details>
                         </div>
-                        
                         <div class="skillrow">
                             <details>
                                 <summary>Elemental Essence</summary>
@@ -8294,12 +8018,10 @@ <h2>Encumbrance</h2>
                         </div>
                 </details>
             </div>
-            
             <div class="warlockskills">
                 <details>
                     <summary><h2>Warlock Profession Skills</h2></summary>
                     <div class="counter-container">
-                        <!-- Combat Technique Counter -->
                         <div class="counterbox">
                             <span>Special Abilities of a Warlock:</span>
                             <div class="counterfields">
@@ -8311,8 +8033,6 @@ <h2>Encumbrance</h2>
                             </div>
                         </div>
                     </div>
-    
-                    <!-- Weapon Groups Selection -->
                     <div class="weapon-group-selection">
                         <details>
                             <summary class="bigbolddetails">Select Weapon Groups</summary>
@@ -8328,7 +8048,6 @@ <h2>Encumbrance</h2>
                                     <option value="7">Weapon Group VII: Crossbow, Javelin, Sling, Dagger, Rock, Throwing Spike, Arbalest</option>
                                     <option value="8">Weapon Group VIII: Cudgel, Unarmed combat</option>
                                 </select>
-                
                                 <span>Weapon Group 2:</span>
                                 <select name="attr_weapon_group_2" class="warlock-weapongroup">
                                     <option value="1">Weapon Group I: Flail, Mace, Morningstar, Holy Water Sprinkler, Scourge, Warhammer</option>
@@ -8343,7 +8062,6 @@ <h2>Encumbrance</h2>
                             </div>
                         </details>
                     </div>
-    
                     <div class="warlockabilities">
                         <details>
                             <summary class="bigbolddetails">Special Abilities of a Warlock</summary>
@@ -8441,8 +8159,7 @@ <h2>Encumbrance</h2>
                                 </details>
                             </div>
                         </details>
-                
-            </div>
+                    </div>
                 </details>
             </div>    
             <div class="knaveskills">
@@ -8461,7 +8178,6 @@ <h2>Encumbrance</h2>
                         </div>
                     </div>
                 </div>
-
                   <h2>Knave Profession Skills</h2>
                   <details>
                     <summary>The Special Abilities of a Knave</summary>
@@ -8724,7 +8440,6 @@ <h2>Knave Profession Skills</h2>
                 <details>
                 <summary><h2>Hunter Profession Skills</h2></summary>
                 <div class="counter-container">
-                    <!-- Combat Technique Counter -->
                     <div class="counterbox">
                         <span>Special Abilities of a Hunter:</span>
                         <div class="counterfields">
@@ -8963,13 +8678,11 @@ <h2>Knave Profession Skills</h2>
                 <details>
                 <summary><h2>Priest Profession Skills</h2></summary>
                 <div class="counter-container">
-                    <!-- Combat Technique Counter -->
                     <div class="counterbox">
                         <span>Special Abilities of a Priest:</span>
                         <div class="counterfields">
                             <span>Max:</span>
                             <input type="number" class="fourshorttextinput" name="attr_priestskills_max" />
-                            
                             <span>Selected:</span>
                             <input type="number" class="fourshorttextinput" name="attr_priestskills_selected" readonly />
                         </div>
@@ -9245,8 +8958,6 @@ <h2>Knave Profession Skills</h2>
             <div class="customskills">
                 <details>
                 <summary><h2>Custom Special Abilities</h2></summary>
-                <details>
-                    <summary>Customised Abilities of the <span name="attr_profession"></span></summary>
                     <fieldset class="repeating_customskills">
                         <span>Skill Name</span>
                         <input type="text" name="attr_special_ability_name" placeholder="Ability Name" />
@@ -9262,7 +8973,6 @@ <h2>Knave Profession Skills</h2>
                         </div>
                     </fieldset>
                 </details>
-                </details>
             </div>
         </div>
             <input type="hidden" class="paths_toggle" name="attr_paths_toggle" value="0"/>
@@ -9303,7 +9013,6 @@ <h2>Knave Profession Skills</h2>
                 </fieldset>
             </div>
         </div>
-
     <div class="languages">
         <div class="modlang">
             <span>Modern Languages</span>
@@ -9390,7 +9099,6 @@ <h2>Knave Profession Skills</h2>
             </fieldset>
         </div>
     </div>
-
     <div class="biographical">
         <div class="basicbio">
             <span>Physical and Biographical Details</span>
@@ -9415,7 +9123,6 @@ <h2>Knave Profession Skills</h2>
                 <span name="attr_description"></span>  
                 <textarea name="attr_description" readonly placeholder="Enter description here..."></textarea>
             </div><br>
-
             <span>Biography</span>
             <div class="sheet-auto-expand">
                 <span name="attr_biography"></span>  
@@ -9423,7 +9130,6 @@ <h2>Knave Profession Skills</h2>
             </div>
         </div>
     </div>
-
     <div class="documentation">
         <h1>Settings</h1>
         <span>Berserk:</span><select title="Rule Option" name="attr_berserktoranged">
@@ -9464,21 +9170,24 @@ <h1>Settings</h1>
             <option value="disabled">Players Guide Spells are unavailable</option>
         </select>
         <h1>Documentation</h1>
-        <p>This character sheet includes material based on the Dragon Warriors setting, created by Dave Morris and Oliver Johnson, and used under the Serpent King Games Fan Policy. We are not permitted to charge for access to this content. This character sheet is not published, endorsed, or officially approved by Serpent King Games. For more information about Dragon Warriors products and Serpent King Games, please visit <a href="http://www.serpentking.com">www.serpentking.com</a>.</p>
-        
+        <p>This character sheet includes material based on the Dragon Warriors setting, created by Dave Morris and Oliver Johnson, and used under the Serpent King Games Fan Policy. We are not permitted to charge for access to this content. This character sheet is endorsed, or officially approved by Serpent King Games. For more information about Dragon Warriors products and Serpent King Games, please visit <a href="http://www.serpentking.com">www.serpentking.com</a>.</p>
         <p>Serpent King Games expects you to use the Dragon Warriors setting responsibly and legally. This means avoiding associations with extreme graphic violence, explicit sexual content, hate speech against any real-world groups, or anything else that does not present Dragon Warriors in a positive light.</p>
-        
         <p>If you have any questions about Dragon Warriors or the conditions of use for this character sheet, please email <a href="mailto:info@serpentking.com">info@serpentking.com</a>.</p>
-        
         <p>Most images on this character sheet come directly from the Dragon Warriors books. The image representing Magic Points, named "effect," was created by ATOM and sourced from the Noun Project.</p>
-        
         <p>A huge shoutout to Roll20 forums members <a href="https://app.roll20.net/users/157788/gigs">Gigs</a>, <a href="https://app.roll20.net/users/463088/vince">vÍnce</a>, and Scott, without whom this sheet would not have been built successfully.</p>
-        
         <p><a href="https://app.roll20.net/users/653871/brendan-r">Brendan R (SouthernSkies)</a> and <a href="https://app.roll20.net/users/202381/norman">Norman</a>, who have been absolute champions at doing the serious playtest/debugging of version 2.0</p>
-        
         <p>And most certainly not least, the brave group of adventurers who have been my primary playtesters: Gille, Hariot, Cador, Randos, Ulfthak, Argane, Ivon, and Kallister.</p>
-        
         <span >Release Notes</span>
+            <p>Ver 2.02</p>
+        <ul>
+            <li>Fixed more incorrectly placed readonly tags across the sheet</li>
+            <li>Fixed high Psychic Talent score bonus to Magical Attack</li>
+            <li>Fixed missing Psychic Fatigue check buttons</li>
+            <li>Evasion and Magical Defence put into the Combat Factors summary at the top of the page for easier quick reference</li>
+            <li>Guards moved out of the Magic container on the summary page</li>
+            <li>Renamed "Character Modification" to "Character Builder". Made sure all information including magical attributes, profession and rank appear on this page so users do not have to flip pages to make and check changes.</li>
+            <li>Various other UI, layout, and styling improvements</li>
+        </ul>
         <p>Ver 2.01</p>
         <ul>
             <li>Demonologist Spells have been implemented</li>
@@ -12013,8 +11722,10 @@ <h1>Documentation</h1>
         // Calculate Psychic Talent modifiers
         if (psychicTalent >= 16) {
             magicalDefenceModifier += 2;
+            magicalAttackModifier += 2;            
         } else if (psychicTalent >= 13) {
             magicalDefenceModifier += 1;
+            magicalAttackModifier += 1;            
         } else if (psychicTalent >= 9) {
             magicalDefenceModifier += 0;
         } else if (psychicTalent >= 6) {