diff --git a/src/fields/Buttons.php b/src/fields/Buttons.php
index 0e2048e..d76a3f7 100644
--- a/src/fields/Buttons.php
+++ b/src/fields/Buttons.php
@@ -8,6 +8,7 @@
 use craft\fields\BaseOptionsField;
 use craft\fields\data\OptionData;
 use craft\fields\data\SingleOptionFieldData;
+use craft\helpers\Cp;
 use craft\helpers\UrlHelper;
 
 use yii\db\Schema;
@@ -25,7 +26,7 @@ public static function displayName(): string
 
     // Properties
     // =========================================================================
-    
+
     public ?bool $displayAsGraphic = null;
     public ?bool $displayFullwidth = null;
     public array $options = [];
@@ -39,7 +40,7 @@ public function getContentColumnType(): string
         return Schema::TYPE_TEXT;
     }
 
-    public function normalizeValue(mixed $value, ElementInterface $element = null): mixed
+    public function normalizeValue(mixed $value, ElementInterface $element = null): SingleOptionFieldData
     {
         if (!$value) {
             $value = $this->defaultValue();
diff --git a/src/fields/Colours.php b/src/fields/Colours.php
index 18d5bf7..ea2a9ff 100644
--- a/src/fields/Colours.php
+++ b/src/fields/Colours.php
@@ -8,6 +8,7 @@
 use craft\fields\BaseOptionsField;
 use craft\fields\data\OptionData;
 use craft\fields\data\SingleOptionFieldData;
+use craft\helpers\Cp;
 
 use yii\db\Schema;
 
@@ -24,7 +25,7 @@ public static function displayName(): string
 
     // Properties
     // =========================================================================
-    
+
     public array $options = [];
 
 
@@ -162,7 +163,7 @@ protected function translatedOptions(bool $encode = false): array
         $translatedOptions = [];
 
         foreach ($this->options as $option) {
-            $cssColour = strpos($option['cssColour'], '#') === false ? '#' . $option['cssColour'] : $option['cssColour'];
+            $cssColour = !str_contains($option['cssColour'], '#') ? '#' . $option['cssColour'] : $option['cssColour'];
 
             $translatedOptions[] = [
                 'label' => Craft::t('site', $option['label']),
diff --git a/src/fields/TextSize.php b/src/fields/TextSize.php
index f699ad9..33adf90 100644
--- a/src/fields/TextSize.php
+++ b/src/fields/TextSize.php
@@ -8,6 +8,7 @@
 use craft\fields\BaseOptionsField;
 use craft\fields\data\OptionData;
 use craft\fields\data\SingleOptionFieldData;
+use craft\helpers\Cp;
 
 use yii\db\Schema;
 
@@ -36,7 +37,7 @@ public function getContentColumnType(): string
         return Schema::TYPE_TEXT;
     }
 
-    public function normalizeValue(mixed $value, ElementInterface $element = null): mixed
+    public function normalizeValue(mixed $value, ElementInterface $element = null): SingleOptionFieldData
     {
         if (!$value) {
             $value = $this->defaultValue();
@@ -85,7 +86,7 @@ public function getSettingsHtml(): ?string
             'instructions' => Craft::t('buttonbox', 'Pixel Size is optional and should be a single number.'),
             'id' => 'options',
             'name' => 'options',
-            'addRowLabel'  => Craft::t('buttonbox', 'Add an option'),
+            'addRowLabel' => Craft::t('buttonbox', 'Add an option'),
             'cols' => [
                 'label' => [
                     'heading' => Craft::t('buttonbox', 'Option Label'),
diff --git a/src/fields/Triggers.php b/src/fields/Triggers.php
index 9425210..cf937f9 100644
--- a/src/fields/Triggers.php
+++ b/src/fields/Triggers.php
@@ -6,6 +6,7 @@
 use Craft;
 use craft\base\ElementInterface;
 use craft\fields\BaseOptionsField;
+use craft\helpers\Cp;
 use craft\helpers\UrlHelper;
 
 class Triggers extends BaseOptionsField
@@ -26,11 +27,11 @@ public static function hasContentColumn(): bool
 
     // Properties
     // =========================================================================
-    
+
     public array $options = [];
     public ?bool $displayAsGraphic = null;
     public ?bool $displayFullwidth = null;
-  
+
 
     // Public Methods
     // =========================================================================
diff --git a/src/fields/Width.php b/src/fields/Width.php
index 15f13b5..9cd5e8a 100644
--- a/src/fields/Width.php
+++ b/src/fields/Width.php
@@ -8,6 +8,7 @@
 use craft\fields\BaseOptionsField;
 use craft\fields\data\OptionData;
 use craft\fields\data\SingleOptionFieldData;
+use craft\helpers\Cp;
 
 use yii\db\Schema;
 
@@ -36,7 +37,7 @@ public function getContentColumnType(): string
         return Schema::TYPE_TEXT;
     }
 
-    public function normalizeValue(mixed $value, ElementInterface $element = null): mixed
+    public function normalizeValue(mixed $value, ElementInterface $element = null): SingleOptionFieldData
     {
         if (!$value) {
             $value = $this->defaultValue();