diff --git a/css/fvtt-cthulhu-eternal.css b/css/fvtt-cthulhu-eternal.css
index e2fff05..44a1468 100644
--- a/css/fvtt-cthulhu-eternal.css
+++ b/css/fvtt-cthulhu-eternal.css
@@ -110,11 +110,11 @@
   --font-secondary: "RozhaOne";
   --font-title: "Broadway";
   --logo-standard: url("../assets/logos/reanimated-ce-logo.webp");
-  --color-success: darkgreen;
+  --color-success: #12e912;
   --color-failure: darkred;
   --color-warning: darkorange;
-  --color-critical-success: lightgreen;
-  --color-critical-failure: lightcoral;
+  --color-critical-success: #1527cc;
+  --color-critical-failure: #8d20e7;
   --img-icon-color-filter: brightness(0) saturate(100%) invert(52%) sepia(9%) saturate(2368%) hue-rotate(360deg) brightness(86%) contrast(84%);
 }
 .d100 {
@@ -364,10 +364,16 @@ i.fvtt-cthulhu-eternal {
   max-width: 2.4rem;
 }
 .fvtt-cthulhu-eternal .protagonist-main .protagonist-pc .protagonist-right .willpower .label-field {
-  flex-grow: 0;
+  flex-grow: 1;
   margin-left: 4px;
-  max-width: 3rem;
-  min-width: 3rem;
+  max-width: 5rem;
+  min-width: 5rem;
+  font-size: 0.9rem;
+}
+.fvtt-cthulhu-eternal .protagonist-main .protagonist-pc .protagonist-right .willpower .checkbox {
+  flex-grow: 0;
+  min-width: 1rem;
+  max-width: 1rem;
 }
 .fvtt-cthulhu-eternal .protagonist-main .protagonist-pc .protagonist-right .protagonist-infos {
   display: flex;
diff --git a/styles/global.less b/styles/global.less
index 9c7bb84..a9b0f51 100644
--- a/styles/global.less
+++ b/styles/global.less
@@ -7,11 +7,11 @@
   --font-secondary: "RozhaOne";
   --font-title: "Broadway";
   --logo-standard: url("../assets/logos/reanimated-ce-logo.webp");
-  --color-success: darkgreen;
+  --color-success: rgb(18, 233, 18);
   --color-failure: darkred;
   --color-warning: darkorange;
-  --color-critical-success: lightgreen;
-  --color-critical-failure: lightcoral;
+  --color-critical-success: rgb(21, 39, 204);
+  --color-critical-failure: rgb(141, 32, 231);
   --img-icon-color-filter: brightness(0) saturate(100%) invert(52%) sepia(9%) saturate(2368%) hue-rotate(360deg) brightness(86%) contrast(84%);
 }
 
diff --git a/styles/protagonist.less b/styles/protagonist.less
index 56f7dde..92d9a5d 100644
--- a/styles/protagonist.less
+++ b/styles/protagonist.less
@@ -127,12 +127,16 @@
           max-width: 2.4rem;
         }
         .label-field {
-          flex-grow: 0;
+          flex-grow: 1;
           margin-left: 4px;
-          max-width: 3.0rem;
-          min-width: 3.0rem;
+          max-width: 5rem;
+          min-width: 5rem;
+          font-size: 0.9rem;
         }
-        .checkbox {          
+        .checkbox {       
+          flex-grow: 0;
+          min-width: 1rem;
+          max-width: 1rem;
         }
 
       }
diff --git a/templates/protagonist-main.hbs b/templates/protagonist-main.hbs
index 7cdb03a..9795675 100644
--- a/templates/protagonist-main.hbs
+++ b/templates/protagonist-main.hbs
@@ -82,12 +82,12 @@
         <fieldset class="willpower">
           <legend>{{localize "CTHULHUETERNAL.Label.willpower"}}</legend>
           <div class="flexrow">
-            <span class="label-field">{{localize "CTHULHUETERNAL.Label.current"}}</span>
-            {{formField systemFields.wp.fields.value value=system.wp.value}}
-            <span class="label-field">{{localize "CTHULHUETERNAL.Label.max"}}</span>
-            {{formField systemFields.wp.fields.max value=system.wp.max rootId=partId disabled=true}}
-            <span class="label-field">{{localize "CTHULHUETERNAL.Label.exhausted"}}</span>
-            {{formField systemFields.wp.fields.exhausted value=system.wp.exhausted classes="checkbox"}}
+            <label class="label-field">{{localize "CTHULHUETERNAL.Label.current"}}</label>
+            {{formInput systemFields.wp.fields.value value=system.wp.value}}
+            <label class="label-field">{{localize "CTHULHUETERNAL.Label.max"}}</label>
+            {{formInput systemFields.wp.fields.max value=system.wp.max rootId=partId disabled=true}}
+            <label class="label-field">{{localize "CTHULHUETERNAL.Label.exhausted"}}</label>
+            {{formInput systemFields.wp.fields.exhausted value=system.wp.exhausted classes="checkbox"}}
           </div>
         </fieldset>