From 6445957646da8174d3c5f8aec73f4d20a22206f1 Mon Sep 17 00:00:00 2001
From: Oliver Vogel <oliver@olivervogel.com>
Date: Tue, 17 Oct 2023 17:08:45 +0200
Subject: [PATCH] Move color parsers to decoder classes

---
 src/Colors/Cmyk/Color.php                     |  14 +
 .../Cmyk/Decoders/StringColorDecoder.php      |  37 +++
 src/Colors/Cmyk/Parser.php                    |  34 ---
 src/Colors/Parser.php                         |  27 --
 src/Colors/Rgb/Color.php                      |   7 +
 src/Colors/Rgb/Decoders/HexColorDecoder.php   |  48 +++
 .../Rgb/Decoders/HtmlColornameDecoder.php     | 172 +++++++++++
 .../Rgb/Decoders/StringColorDecoder.php       |  49 +++
 src/Colors/Rgb/Parser.php                     | 286 ------------------
 src/Drivers/Gd/Decoders/HexColorDecoder.php   |  36 ---
 .../Gd/Decoders/HtmlColorNameDecoder.php      |  28 --
 .../Gd/Decoders/RgbStringColorDecoder.php     |  36 ---
 src/Drivers/Gd/Image.php                      |   7 +-
 src/Drivers/Gd/InputHandler.php               |  32 +-
 .../Gd/Modifiers/DrawPixelModifier.php        |   4 +-
 src/Drivers/Gd/Modifiers/FillModifier.php     |  20 +-
 .../CanHandleColors.php}                      |  21 +-
 .../Imagick/Decoders/HexColorDecoder.php      |  36 ---
 .../Imagick/Decoders/HtmlColorNameDecoder.php |  27 --
 .../Decoders/RgbStringColorDecoder.php        |  36 ---
 src/Drivers/Imagick/Image.php                 |   5 +-
 src/Drivers/Imagick/InputHandler.php          |  32 +-
 .../Imagick/Modifiers/DrawPixelModifier.php   |  10 +-
 .../Imagick/Modifiers/FillModifier.php        |  19 +-
 .../CanHandleColors.php}                      |  14 +-
 src/Interfaces/ColorInterface.php             |   9 +-
 src/Traits/CanCheckType.php                   |   9 +
 tests/Colors/Cmyk/ColorTest.php               |   2 +-
 .../Cmyk/Decoders/StringColorDecoderTest.php  |  35 +++
 tests/Colors/Cmyk/ParserTest.php              |  32 --
 tests/Colors/ParserTest.php                   |  46 ---
 tests/Colors/Rgb/ColorTest.php                |   9 +-
 .../Rgb/Decoders/HexColorDecoderTest.php      |  58 ++++
 .../Rgb/Decoders/HtmlColornameDecoderTest.php |  30 ++
 .../Rgb/Decoders/StringColorDecoderTest.php   |  50 +++
 tests/Colors/Rgb/ParserTest.php               |  80 -----
 tests/Drivers/Gd/ColorTransformerTest.php     |  30 --
 .../Gd/Decoders/HexColorDecoderTest.php       |  30 --
 .../Gd/Decoders/HtmlColorNameDecoderTest.php  |  18 --
 .../Gd/Decoders/RgbStringColorDecoderTest.php |  30 --
 tests/Drivers/Gd/ImageTest.php                |  38 +--
 tests/Drivers/Gd/InputHandlerTest.php         |  10 +-
 .../Drivers/Gd/Modifiers/FillModifierTest.php |   6 +-
 .../Drivers/Gd/Modifiers/FitModifierTest.php  |   6 +-
 .../Gd/Modifiers/FlipFlopModifierTest.php     |   4 +-
 .../Gd/Modifiers/ResizeModifierTest.php       |  10 +-
 .../Drivers/Imagick/ColorTransformerTest.php  |  37 ---
 .../Decoders/HtmlColorNameDecoderTest.php     |  18 --
 .../Decoders/RgbStringColorDecoderTest.php    |  31 --
 tests/Drivers/Imagick/InputHandlerTest.php    |  10 +-
 .../Imagick/Modifiers/FillModifierTest.php    |   7 +-
 .../Imagick/Modifiers/FitModifierTest.php     |   6 +-
 .../Modifiers/FlipFlopModifierTest.php        |   4 +-
 .../Imagick/Modifiers/ResizeModifierTest.php  |   8 +-
 tests/TestCase.php                            |   9 +-
 55 files changed, 685 insertions(+), 1024 deletions(-)
 create mode 100644 src/Colors/Cmyk/Decoders/StringColorDecoder.php
 delete mode 100644 src/Colors/Cmyk/Parser.php
 delete mode 100644 src/Colors/Parser.php
 create mode 100644 src/Colors/Rgb/Decoders/HexColorDecoder.php
 create mode 100644 src/Colors/Rgb/Decoders/HtmlColornameDecoder.php
 create mode 100644 src/Colors/Rgb/Decoders/StringColorDecoder.php
 delete mode 100644 src/Colors/Rgb/Parser.php
 delete mode 100644 src/Drivers/Gd/Decoders/HexColorDecoder.php
 delete mode 100644 src/Drivers/Gd/Decoders/HtmlColorNameDecoder.php
 delete mode 100644 src/Drivers/Gd/Decoders/RgbStringColorDecoder.php
 rename src/Drivers/Gd/{ColorTransformer.php => Traits/CanHandleColors.php} (74%)
 delete mode 100644 src/Drivers/Imagick/Decoders/HexColorDecoder.php
 delete mode 100644 src/Drivers/Imagick/Decoders/HtmlColorNameDecoder.php
 delete mode 100644 src/Drivers/Imagick/Decoders/RgbStringColorDecoder.php
 rename src/Drivers/Imagick/{ColorTransformer.php => Traits/CanHandleColors.php} (55%)
 create mode 100644 tests/Colors/Cmyk/Decoders/StringColorDecoderTest.php
 delete mode 100644 tests/Colors/Cmyk/ParserTest.php
 delete mode 100644 tests/Colors/ParserTest.php
 create mode 100644 tests/Colors/Rgb/Decoders/HexColorDecoderTest.php
 create mode 100644 tests/Colors/Rgb/Decoders/HtmlColornameDecoderTest.php
 create mode 100644 tests/Colors/Rgb/Decoders/StringColorDecoderTest.php
 delete mode 100644 tests/Colors/Rgb/ParserTest.php
 delete mode 100644 tests/Drivers/Gd/ColorTransformerTest.php
 delete mode 100644 tests/Drivers/Gd/Decoders/HexColorDecoderTest.php
 delete mode 100644 tests/Drivers/Gd/Decoders/HtmlColorNameDecoderTest.php
 delete mode 100644 tests/Drivers/Gd/Decoders/RgbStringColorDecoderTest.php
 delete mode 100644 tests/Drivers/Imagick/ColorTransformerTest.php
 delete mode 100644 tests/Drivers/Imagick/Decoders/HtmlColorNameDecoderTest.php
 delete mode 100644 tests/Drivers/Imagick/Decoders/RgbStringColorDecoderTest.php

diff --git a/src/Colors/Cmyk/Color.php b/src/Colors/Cmyk/Color.php
index bf6cb401..92766981 100644
--- a/src/Colors/Cmyk/Color.php
+++ b/src/Colors/Cmyk/Color.php
@@ -29,6 +29,11 @@ class Color implements ColorInterface
         ];
     }
 
+    public function toHex(): string
+    {
+        return $this->toRgb()->toHex();
+    }
+
     public function channels(): array
     {
         return $this->channels;
@@ -95,6 +100,15 @@ class Color implements ColorInterface
         );
     }
 
+    public function isGreyscale(): bool
+    {
+        return 0 === array_sum([
+            $this->cyan()->value(),
+            $this->magenta()->value(),
+            $this->yellow()->value(),
+        ]);
+    }
+
     public function __toString(): string
     {
         return $this->toString();
diff --git a/src/Colors/Cmyk/Decoders/StringColorDecoder.php b/src/Colors/Cmyk/Decoders/StringColorDecoder.php
new file mode 100644
index 00000000..0f05ada9
--- /dev/null
+++ b/src/Colors/Cmyk/Decoders/StringColorDecoder.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Intervention\Image\Colors\Cmyk\Decoders;
+
+use Intervention\Image\Colors\Cmyk\Color;
+use Intervention\Image\Drivers\Abstract\Decoders\AbstractDecoder;
+use Intervention\Image\Exceptions\DecoderException;
+use Intervention\Image\Interfaces\ColorInterface;
+use Intervention\Image\Interfaces\DecoderInterface;
+use Intervention\Image\Interfaces\ImageInterface;
+
+class StringColorDecoder extends AbstractDecoder implements DecoderInterface
+{
+    /**
+     * Decode CMYK color strings
+     *
+     * @param  mixed $input
+     * @return ImageInterface|ColorInterface
+     */
+    public function decode($input): ImageInterface|ColorInterface
+    {
+        if (! is_string($input)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        $pattern = '/^cmyk\((?P<c>[0-9\.]+%?), ?(?P<m>[0-9\.]+%?), ?(?P<y>[0-9\.]+%?), ?(?P<k>[0-9\.]+%?)\)$/i';
+        if (preg_match($pattern, $input, $matches) != 1) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        $values = array_map(function ($value) {
+            return intval(round(floatval(trim(str_replace('%', '', $value)))));
+        }, [$matches['c'], $matches['m'], $matches['y'], $matches['k']]);
+
+        return new Color(...$values);
+    }
+}
diff --git a/src/Colors/Cmyk/Parser.php b/src/Colors/Cmyk/Parser.php
deleted file mode 100644
index 15fb3a70..00000000
--- a/src/Colors/Cmyk/Parser.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Intervention\Image\Colors\Cmyk;
-
-use Intervention\Image\Exceptions\ColorException;
-
-class Parser
-{
-    public static function parse(mixed $value): Color
-    {
-        if (!is_string($value)) {
-            throw new ColorException('Unable to parse color');
-        }
-
-        return static::fromString($value);
-    }
-
-    public static function fromString(string $input): Color
-    {
-        // cmyk(100%, 100%, 100%, 100%)
-        $pattern = '/^cmyk\((?P<c>[0-9\.]+)%?, ?(?P<m>[0-9\.]+)%?, ?(?P<y>[0-9\.]+)%?, ?(?P<k>[0-9\.]+)%?\)$/';
-        $result = preg_match($pattern, $input, $matches);
-        if ($result === 1) {
-            return new Color(
-                intval(round(floatval($matches['c']))),
-                intval(round(floatval($matches['m']))),
-                intval(round(floatval($matches['y']))),
-                intval(round(floatval($matches['k'])))
-            );
-        }
-
-        throw new ColorException('Unable to parse color');
-    }
-}
diff --git a/src/Colors/Parser.php b/src/Colors/Parser.php
deleted file mode 100644
index dcf91c59..00000000
--- a/src/Colors/Parser.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Intervention\Image\Colors;
-
-use Intervention\Image\Exceptions\ColorException;
-use Intervention\Image\Interfaces\ColorInterface;
-
-class Parser
-{
-    protected static $parsers = [
-        Rgb\Parser::class,
-        Cmyk\Parser::class,
-    ];
-
-    public static function parse(mixed $value): ColorInterface
-    {
-        foreach (static::$parsers as $parser) {
-            try {
-                return forward_static_call([$parser, 'parse'], $value);
-            } catch (ColorException $e) {
-                # move on...
-            }
-        }
-
-        throw new ColorException('Unable to parse color');
-    }
-}
diff --git a/src/Colors/Rgb/Color.php b/src/Colors/Rgb/Color.php
index 06ee4dc2..89cf0b09 100644
--- a/src/Colors/Rgb/Color.php
+++ b/src/Colors/Rgb/Color.php
@@ -123,6 +123,13 @@ class Color implements ColorInterface
         );
     }
 
+    public function isGreyscale(): bool
+    {
+        $values = [$this->red()->value(), $this->green()->value(), $this->blue()->value()];
+
+        return count(array_unique($values, SORT_REGULAR)) === 1;
+    }
+
     public function __toString(): string
     {
         return $this->toString();
diff --git a/src/Colors/Rgb/Decoders/HexColorDecoder.php b/src/Colors/Rgb/Decoders/HexColorDecoder.php
new file mode 100644
index 00000000..43aafee3
--- /dev/null
+++ b/src/Colors/Rgb/Decoders/HexColorDecoder.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Intervention\Image\Colors\Rgb\Decoders;
+
+use Intervention\Image\Colors\Rgb\Color;
+use Intervention\Image\Drivers\Abstract\Decoders\AbstractDecoder;
+use Intervention\Image\Exceptions\DecoderException;
+use Intervention\Image\Interfaces\ColorInterface;
+use Intervention\Image\Interfaces\DecoderInterface;
+use Intervention\Image\Interfaces\ImageInterface;
+
+class HexColorDecoder extends AbstractDecoder implements DecoderInterface
+{
+    /**
+     * Decode hexadecimal rgb colors with and without transparency
+     *
+     * @param  mixed $input
+     * @return ImageInterface|ColorInterface
+     */
+    public function decode($input): ImageInterface|ColorInterface
+    {
+        if (! is_string($input)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        $pattern = '/^#?(?P<hex>[a-f\d]{3}(?:[a-f\d]?|(?:[a-f\d]{3}(?:[a-f\d]{2})?)?)\b)$/i';
+        if (preg_match($pattern, $input, $matches) != 1) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        $values = str_split($matches['hex']);
+        $values = match (strlen($matches['hex'])) {
+            3, 4 => str_split($matches['hex']),
+            6, 8 => str_split($matches['hex'], 2),
+            default => throw new DecoderException('Unable to decode input'),
+        };
+
+        $values = array_map(function ($value) {
+            return match (strlen($value)) {
+                1 => hexdec($value . $value),
+                2 => hexdec($value),
+                default => throw new DecoderException('Unable to decode input'),
+            };
+        }, $values);
+
+        return new Color(...$values);
+    }
+}
diff --git a/src/Colors/Rgb/Decoders/HtmlColornameDecoder.php b/src/Colors/Rgb/Decoders/HtmlColornameDecoder.php
new file mode 100644
index 00000000..fa4ea630
--- /dev/null
+++ b/src/Colors/Rgb/Decoders/HtmlColornameDecoder.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace Intervention\Image\Colors\Rgb\Decoders;
+
+use Intervention\Image\Exceptions\DecoderException;
+use Intervention\Image\Interfaces\ColorInterface;
+use Intervention\Image\Interfaces\DecoderInterface;
+use Intervention\Image\Interfaces\ImageInterface;
+
+class HtmlColornameDecoder extends HexColorDecoder implements DecoderInterface
+{
+    protected static $names = [
+            'lightsalmon' => '#ffa07a',
+            'salmon' => '#fa8072',
+            'darksalmon' => '#e9967a',
+            'lightcoral' => '#f08080',
+            'indianred' => '#cd5c5c',
+            'crimson' => '#dc143c',
+            'firebrick' => '#b22222',
+            'red' => '#ff0000',
+            'darkred' => '#8b0000',
+            'coral' => '#ff7f50',
+            'tomato' => '#ff6347',
+            'orangered' => '#ff4500',
+            'gold' => '#ffd700',
+            'orange' => '#ffa500',
+            'darkorange' => '#ff8c00',
+            'lightyellow' => '#ffffe0',
+            'lemonchiffon' => '#fffacd',
+            'lightgoldenrodyellow' => '#fafad2',
+            'papayawhip' => '#ffefd5',
+            'moccasin' => '#ffe4b5',
+            'peachpuff' => '#ffdab9',
+            'palegoldenrod' => '#eee8aa',
+            'khaki' => '#f0e68c',
+            'darkkhaki' => '#bdb76b',
+            'yellow' => '#ffff00',
+            'lawngreen' => '#7cfc00',
+            'chartreuse' => '#7fff00',
+            'limegreen' => '#32cd32',
+            'lime' => '#00ff00',
+            'forestgreen' => '#228b22',
+            'green' => '#008000',
+            'darkgreen' => '#006400',
+            'greenyellow' => '#adff2f',
+            'yellowgreen' => '#9acd32',
+            'springgreen' => '#00ff7f',
+            'mediumspringgreen' => '#00fa9a',
+            'lightgreen' => '#90ee90',
+            'palegreen' => '#98fb98',
+            'darkseagreen' => '#8fbc8f',
+            'mediumseagre' => 'en #3cb371',
+            'seagreen' => '#2e8b57',
+            'olive' => '#808000',
+            'darkolivegreen' => '#556b2f',
+            'olivedrab' => '#6b8e23',
+            'lightcyan' => '#e0ffff',
+            'cyan' => '#00ffff',
+            'aqua' => '#00ffff',
+            'aquamarine' => '#7fffd4',
+            'mediumaquamarine' => '#66cdaa',
+            'paleturquoise' => '#afeeee',
+            'turquoise' => '#40e0d0',
+            'mediumturquoise' => '#48d1cc',
+            'darkturquoise' => '#00ced1',
+            'lightseagreen' => '#20b2aa',
+            'cadetblue' => '#5f9ea0',
+            'darkcyan' => '#008b8b',
+            'teal' => '#008080',
+            'powderblue' => '#b0e0e6',
+            'lightblue' => '#add8e6',
+            'lightskyblue' => '#87cefa',
+            'skyblue' => '#87ceeb',
+            'deepskyblue' => '#00bfff',
+            'lightsteelblue' => '#b0c4de',
+            'dodgerblue' => '#1e90ff',
+            'cornflowerblue' => '#6495ed',
+            'steelblue' => '#4682b4',
+            'royalblue' => '#4169e1',
+            'blue' => '#0000ff',
+            'mediumblue' => '#0000cd',
+            'darkblue' => '#00008b',
+            'navy' => '#000080',
+            'midnightblue' => '#191970',
+            'mediumslateblue' => '#7b68ee',
+            'slateblue' => '#6a5acd',
+            'darkslateblue' => '#483d8b',
+            'lavender' => '#e6e6fa',
+            'thistle' => '#d8bfd8',
+            'plum' => '#dda0dd',
+            'violet' => '#ee82ee',
+            'orchid' => '#da70d6',
+            'fuchsia' => '#ff00ff',
+            'magenta' => '#ff00ff',
+            'mediumorchid' => '#ba55d3',
+            'mediumpurple' => '#9370db',
+            'blueviolet' => '#8a2be2',
+            'darkviolet' => '#9400d3',
+            'darkorchid' => '#9932cc',
+            'darkmagenta' => '#8b008b',
+            'purple' => '#800080',
+            'indigo' => '#4b0082',
+            'pink' => '#ffc0cb',
+            'lightpink' => '#ffb6c1',
+            'hotpink' => '#ff69b4',
+            'deeppink' => '#ff1493',
+            'palevioletred' => '#db7093',
+            'mediumvioletred' => '#c71585',
+            'white' => '#ffffff',
+            'snow' => '#fffafa',
+            'honeydew' => '#f0fff0',
+            'mintcream' => '#f5fffa',
+            'azure' => '#f0ffff',
+            'aliceblue' => '#f0f8ff',
+            'ghostwhite' => '#f8f8ff',
+            'whitesmoke' => '#f5f5f5',
+            'seashell' => '#fff5ee',
+            'beige' => '#f5f5dc',
+            'oldlace' => '#fdf5e6',
+            'floralwhite' => '#fffaf0',
+            'ivory' => '#fffff0',
+            'antiquewhite' => '#faebd7',
+            'linen' => '#faf0e6',
+            'lavenderblush' => '#fff0f5',
+            'mistyrose' => '#ffe4e1',
+            'gainsboro' => '#dcdcdc',
+            'lightgray' => '#d3d3d3',
+            'silver' => '#c0c0c0',
+            'darkgray' => '#a9a9a9',
+            'gray' => '#808080',
+            'dimgray' => '#696969',
+            'lightslategray' => '#778899',
+            'slategray' => '#708090',
+            'darkslategray' => '#2f4f4f',
+            'black' => '#000000',
+            'cornsilk' => '#fff8dc',
+            'blanchedalmond' => '#ffebcd',
+            'bisque' => '#ffe4c4',
+            'navajowhite' => '#ffdead',
+            'wheat' => '#f5deb3',
+            'burlywood' => '#deb887',
+            'tan' => '#d2b48c',
+            'rosybrown' => '#bc8f8f',
+            'sandybrown' => '#f4a460',
+            'goldenrod' => '#daa520',
+            'peru' => '#cd853f',
+            'chocolate' => '#d2691e',
+            'saddlebrown' => '#8b4513',
+            'sienna' => '#a0522d',
+            'brown' => '#a52a2a',
+            'maroon' => '#800000',
+        ];
+
+    /**
+     * Decode html color names
+     *
+     * @param  mixed $input
+     * @return ImageInterface|ColorInterface
+     */
+    public function decode($input): ImageInterface|ColorInterface
+    {
+        if (! is_string($input)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        if (!array_key_exists(strtolower($input), static::$names)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        return parent::decode(static::$names[strtolower($input)]);
+    }
+}
diff --git a/src/Colors/Rgb/Decoders/StringColorDecoder.php b/src/Colors/Rgb/Decoders/StringColorDecoder.php
new file mode 100644
index 00000000..86a62b4d
--- /dev/null
+++ b/src/Colors/Rgb/Decoders/StringColorDecoder.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Intervention\Image\Colors\Rgb\Decoders;
+
+use Intervention\Image\Colors\Rgb\Color;
+use Intervention\Image\Drivers\Abstract\Decoders\AbstractDecoder;
+use Intervention\Image\Exceptions\DecoderException;
+use Intervention\Image\Interfaces\ColorInterface;
+use Intervention\Image\Interfaces\DecoderInterface;
+use Intervention\Image\Interfaces\ImageInterface;
+
+class StringColorDecoder extends AbstractDecoder implements DecoderInterface
+{
+    /**
+     * Decode rgb color strings
+     *
+     * @param  mixed $input
+     * @return ImageInterface|ColorInterface
+     */
+    public function decode($input): ImageInterface|ColorInterface
+    {
+        if (! is_string($input)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        $pattern = '/^s?rgba?\((?P<r>[0-9\.]+%?), ?(?P<g>[0-9\.]+%?), ?(?P<b>[0-9\.]+%?)(?:, ?(?P<a>(?:1)|(?:1\.0*)|(?:0)|(?:0?\.\d+%?)|(?:\d{1,3}%)))?\)$/i';
+        if (preg_match($pattern, $input, $matches) != 1) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        // rgb values
+        $values = array_map(function ($value) {
+            return match (strpos($value, '%')) {
+                false => intval(trim($value)),
+                default => intval(round(floatval(trim(str_replace('%', '', $value))) / 100 * 255)),
+            };
+        }, [$matches['r'], $matches['g'], $matches['b']]);
+
+        // alpha value
+        if (array_key_exists('a', $matches)) {
+            $values[] = match (true) {
+                strpos($matches['a'], '%') => round(intval(trim(str_replace('%', '', $matches['a']))) / 2.55),
+                default => intval(round(floatval(trim($matches['a'])) * 255)),
+            };
+        }
+
+        return new Color(...$values);
+    }
+}
diff --git a/src/Colors/Rgb/Parser.php b/src/Colors/Rgb/Parser.php
deleted file mode 100644
index 746a40d6..00000000
--- a/src/Colors/Rgb/Parser.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-
-namespace Intervention\Image\Colors\Rgb;
-
-use Intervention\Image\Exceptions\ColorException;
-
-class Parser
-{
-    public static function parse(mixed $value): Color
-    {
-        if (!is_string($value)) {
-            throw new ColorException('Unable to parse color');
-        }
-
-        try {
-            return static::fromHex($value);
-        } catch (ColorException $e) {
-            # move on
-        }
-
-        try {
-            return static::fromString($value);
-        } catch (ColorException $e) {
-            # move on
-        }
-
-        try {
-            return static::fromName($value);
-        } catch (ColorException $e) {
-            # move on
-        }
-
-        throw new ColorException('Unable to parse color');
-    }
-
-    public static function fromHex(string $input): Color
-    {
-        // Hexadecimal colors
-        $pattern = '/^#?(?P<hex>[0-9a-f]{3}|[0-9a-f]{6})$/i';
-        $result = preg_match($pattern, $input, $matches);
-
-        if ($result !== 1) {
-            throw new ColorException('Unable to parse color');
-        }
-
-        $matches = match (strlen($matches['hex'])) {
-            3 => str_split($matches['hex']),
-            6 => str_split($matches['hex'], 2),
-            default => throw new ColorException('Unable to parse color'),
-        };
-
-        try {
-            return new Color(
-                strlen($matches[0]) == '1' ? hexdec($matches[0] . $matches[0]) : hexdec($matches[0]),
-                strlen($matches[1]) == '1' ? hexdec($matches[1] . $matches[1]) : hexdec($matches[1]),
-                strlen($matches[2]) == '1' ? hexdec($matches[2] . $matches[2]) : hexdec($matches[2])
-            );
-        } catch (ColorException $e) {
-            # move on
-        }
-
-        // Hexadecimal colors with transparency
-        $pattern = '/^#?(?P<hex>[0-9a-f]{4}|[0-9a-f]{8})$/i';
-        $result = preg_match($pattern, $input, $matches);
-
-        if ($result !== 1) {
-            throw new ColorException('Unable to parse color');
-        }
-
-        $matches = match (strlen($matches['hex'])) {
-            4 => str_split($matches['hex']),
-            8 => str_split($matches['hex'], 2),
-            default => throw new ColorException('Unable to parse color'),
-        };
-
-        return new Color(
-            strlen($matches[0]) == '1' ? hexdec($matches[0] . $matches[0]) : hexdec($matches[0]),
-            strlen($matches[1]) == '1' ? hexdec($matches[1] . $matches[1]) : hexdec($matches[1]),
-            strlen($matches[2]) == '1' ? hexdec($matches[2] . $matches[2]) : hexdec($matches[2]),
-            strlen($matches[3]) == '1' ? hexdec($matches[3] . $matches[3]) : hexdec($matches[3]),
-        );
-    }
-
-    public static function fromString(string $input): Color
-    {
-        // rgb(255, 255, 255)
-        $pattern = '/^s?rgb\((?P<r>[0-9]{1,3}), ?(?P<g>[0-9]{1,3}), ?(?P<b>[0-9]{1,3})\)$/';
-        $result = preg_match($pattern, $input, $matches);
-        if ($result === 1) {
-            return new Color(
-                $matches['r'],
-                $matches['g'],
-                $matches['b']
-            );
-        }
-
-        // rgb(100%, 100%, 100%)
-        $pattern = '/^s?rgb\((?P<r>[0-9\.]+)%, ?(?P<g>[0-9\.]+)%, ?(?P<b>[0-9\.]+)%\)$/';
-        $result = preg_match($pattern, $input, $matches);
-        if ($result === 1) {
-            return new Color(
-                intval(round(floatval($matches['r']) / 100 * 255)),
-                intval(round(floatval($matches['g']) / 100 * 255)),
-                intval(round(floatval($matches['b']) / 100 * 255))
-            );
-        }
-
-        // rgba(255, 255, 255, 1.0)
-        $pattern = '/^s?rgba\((?P<r>[0-9]{1,3}), *(?P<g>[0-9]{1,3}), *(?P<b>[0-9]{1,3}), *(?P<a>((1|0))?(\.[0-9]+)?)\)$/';
-        $result = preg_match($pattern, $input, $matches);
-
-        if ($result === 1) {
-            return new Color(
-                $matches['r'],
-                $matches['g'],
-                $matches['b'],
-                intval(round(floatval($matches['a']) * 255))
-            );
-        }
-
-        // rgba(100%, 100%, 100%, 100%)
-        $pattern = '/s?rgba\((?P<r>[0-9\.]+)%, ?(?P<g>[0-9\.]+)%, ?(?P<b>[0-9\.]+)%, ?(?P<a>[0-9\.]+)%\)/';
-        $result = preg_match($pattern, $input, $matches);
-        if ($result === 1) {
-            return new Color(
-                intval(round(floatval($matches['r']) / 100 * 255)),
-                intval(round(floatval($matches['g']) / 100 * 255)),
-                intval(round(floatval($matches['b']) / 100 * 255)),
-                intval(round(floatval($matches['a']) / 100 * 255))
-            );
-        }
-
-        throw new ColorException('Unable to parse color');
-    }
-
-    public static function fromName(string $input): Color
-    {
-        $names = [
-            'lightsalmon' => '#FFA07A',
-            'salmon' => '#FA8072',
-            'darksalmon' => '#E9967A',
-            'lightcoral' => '#F08080',
-            'indianred' => '#CD5C5C',
-            'crimson' => '#DC143C',
-            'firebrick' => '#B22222',
-            'red' => '#FF0000',
-            'darkred' => '#8B0000',
-            'coral' => '#FF7F50',
-            'tomato' => '#FF6347',
-            'orangered' => '#FF4500',
-            'gold' => '#FFD700',
-            'orange' => '#FFA500',
-            'darkorange' => '#FF8C00',
-            'lightyellow' => '#FFFFE0',
-            'lemonchiffon' => '#FFFACD',
-            'lightgoldenrodyellow' => '#FAFAD2',
-            'papayawhip' => '#FFEFD5',
-            'moccasin' => '#FFE4B5',
-            'peachpuff' => '#FFDAB9',
-            'palegoldenrod' => '#EEE8AA',
-            'khaki' => '#F0E68C',
-            'darkkhaki' => '#BDB76B',
-            'yellow' => '#FFFF00',
-            'lawngreen' => '#7CFC00',
-            'chartreuse' => '#7FFF00',
-            'limegreen' => '#32CD32',
-            'lime' => '#00FF00',
-            'forestgreen' => '#228B22',
-            'green' => '#008000',
-            'darkgreen' => '#006400',
-            'greenyellow' => '#ADFF2F',
-            'yellowgreen' => '#9ACD32',
-            'springgreen' => '#00FF7F',
-            'mediumspringgreen' => '#00FA9A',
-            'lightgreen' => '#90EE90',
-            'palegreen' => '#98FB98',
-            'darkseagreen' => '#8FBC8F',
-            'mediumseagre' => 'en #3CB371',
-            'seagreen' => '#2E8B57',
-            'olive' => '#808000',
-            'darkolivegreen' => '#556B2F',
-            'olivedrab' => '#6B8E23',
-            'lightcyan' => '#E0FFFF',
-            'cyan' => '#00FFFF',
-            'aqua' => '#00FFFF',
-            'aquamarine' => '#7FFFD4',
-            'mediumaquamarine' => '#66CDAA',
-            'paleturquoise' => '#AFEEEE',
-            'turquoise' => '#40E0D0',
-            'mediumturquoise' => '#48D1CC',
-            'darkturquoise' => '#00CED1',
-            'lightseagreen' => '#20B2AA',
-            'cadetblue' => '#5F9EA0',
-            'darkcyan' => '#008B8B',
-            'teal' => '#008080',
-            'powderblue' => '#B0E0E6',
-            'lightblue' => '#ADD8E6',
-            'lightskyblue' => '#87CEFA',
-            'skyblue' => '#87CEEB',
-            'deepskyblue' => '#00BFFF',
-            'lightsteelblue' => '#B0C4DE',
-            'dodgerblue' => '#1E90FF',
-            'cornflowerblue' => '#6495ED',
-            'steelblue' => '#4682B4',
-            'royalblue' => '#4169E1',
-            'blue' => '#0000FF',
-            'mediumblue' => '#0000CD',
-            'darkblue' => '#00008B',
-            'navy' => '#000080',
-            'midnightblue' => '#191970',
-            'mediumslateblue' => '#7B68EE',
-            'slateblue' => '#6A5ACD',
-            'darkslateblue' => '#483D8B',
-            'lavender' => '#E6E6FA',
-            'thistle' => '#D8BFD8',
-            'plum' => '#DDA0DD',
-            'violet' => '#EE82EE',
-            'orchid' => '#DA70D6',
-            'fuchsia' => '#FF00FF',
-            'magenta' => '#FF00FF',
-            'mediumorchid' => '#BA55D3',
-            'mediumpurple' => '#9370DB',
-            'blueviolet' => '#8A2BE2',
-            'darkviolet' => '#9400D3',
-            'darkorchid' => '#9932CC',
-            'darkmagenta' => '#8B008B',
-            'purple' => '#800080',
-            'indigo' => '#4B0082',
-            'pink' => '#FFC0CB',
-            'lightpink' => '#FFB6C1',
-            'hotpink' => '#FF69B4',
-            'deeppink' => '#FF1493',
-            'palevioletred' => '#DB7093',
-            'mediumvioletred' => '#C71585',
-            'white' => '#FFFFFF',
-            'snow' => '#FFFAFA',
-            'honeydew' => '#F0FFF0',
-            'mintcream' => '#F5FFFA',
-            'azure' => '#F0FFFF',
-            'aliceblue' => '#F0F8FF',
-            'ghostwhite' => '#F8F8FF',
-            'whitesmoke' => '#F5F5F5',
-            'seashell' => '#FFF5EE',
-            'beige' => '#F5F5DC',
-            'oldlace' => '#FDF5E6',
-            'floralwhite' => '#FFFAF0',
-            'ivory' => '#FFFFF0',
-            'antiquewhite' => '#FAEBD7',
-            'linen' => '#FAF0E6',
-            'lavenderblush' => '#FFF0F5',
-            'mistyrose' => '#FFE4E1',
-            'gainsboro' => '#DCDCDC',
-            'lightgray' => '#D3D3D3',
-            'silver' => '#C0C0C0',
-            'darkgray' => '#A9A9A9',
-            'gray' => '#808080',
-            'dimgray' => '#696969',
-            'lightslategray' => '#778899',
-            'slategray' => '#708090',
-            'darkslategray' => '#2F4F4F',
-            'black' => '#000000',
-            'cornsilk' => '#FFF8DC',
-            'blanchedalmond' => '#FFEBCD',
-            'bisque' => '#FFE4C4',
-            'navajowhite' => '#FFDEAD',
-            'wheat' => '#F5DEB3',
-            'burlywood' => '#DEB887',
-            'tan' => '#D2B48C',
-            'rosybrown' => '#BC8F8F',
-            'sandybrown' => '#F4A460',
-            'goldenrod' => '#DAA520',
-            'peru' => '#CD853F',
-            'chocolate' => '#D2691E',
-            'saddlebrown' => '#8B4513',
-            'sienna' => '#A0522D',
-            'brown' => '#A52A2A',
-            'maroon' => '#800000',
-        ];
-
-        if (!array_key_exists(strtolower($input), $names)) {
-            throw new ColorException('Unable to parse color');
-        }
-
-        return static::fromHex($names[strtolower($input)]);
-    }
-}
diff --git a/src/Drivers/Gd/Decoders/HexColorDecoder.php b/src/Drivers/Gd/Decoders/HexColorDecoder.php
deleted file mode 100644
index 3371659a..00000000
--- a/src/Drivers/Gd/Decoders/HexColorDecoder.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Intervention\Image\Drivers\Gd\Decoders;
-
-use Intervention\Image\Colors\Rgb\Parser as RgbColorParser;
-use Intervention\Image\Colors\Rgba\Parser as RgbaColorParser;
-use Intervention\Image\Drivers\Abstract\Decoders\AbstractDecoder;
-use Intervention\Image\Exceptions\ColorException;
-use Intervention\Image\Exceptions\DecoderException;
-use Intervention\Image\Interfaces\ColorInterface;
-use Intervention\Image\Interfaces\DecoderInterface;
-use Intervention\Image\Interfaces\ImageInterface;
-
-class HexColorDecoder extends AbstractDecoder implements DecoderInterface
-{
-    public function decode($input): ImageInterface|ColorInterface
-    {
-        if (!is_string($input)) {
-            throw new DecoderException('Unable to decode input');
-        }
-
-        try {
-            return RgbColorParser::fromHex($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        try {
-            return RgbaColorParser::fromHex($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        throw new DecoderException('Unable to decode input');
-    }
-}
diff --git a/src/Drivers/Gd/Decoders/HtmlColorNameDecoder.php b/src/Drivers/Gd/Decoders/HtmlColorNameDecoder.php
deleted file mode 100644
index fd1d9dce..00000000
--- a/src/Drivers/Gd/Decoders/HtmlColorNameDecoder.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Intervention\Image\Drivers\Gd\Decoders;
-
-use Intervention\Image\Colors\Rgb\Parser;
-use Intervention\Image\Drivers\Abstract\Decoders\AbstractDecoder;
-use Intervention\Image\Exceptions\ColorException;
-use Intervention\Image\Exceptions\DecoderException;
-use Intervention\Image\Interfaces\ColorInterface;
-use Intervention\Image\Interfaces\ImageInterface;
-
-class HtmlColorNameDecoder extends AbstractDecoder
-{
-    public function decode($input): ImageInterface|ColorInterface
-    {
-        if (!is_string($input)) {
-            throw new DecoderException('Unable to decode input');
-        }
-
-        try {
-            return Parser::fromName($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        throw new DecoderException('Unable to decode input');
-    }
-}
diff --git a/src/Drivers/Gd/Decoders/RgbStringColorDecoder.php b/src/Drivers/Gd/Decoders/RgbStringColorDecoder.php
deleted file mode 100644
index 8707375e..00000000
--- a/src/Drivers/Gd/Decoders/RgbStringColorDecoder.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Intervention\Image\Drivers\Gd\Decoders;
-
-use Intervention\Image\Colors\Rgb\Parser as RgbColorParser;
-use Intervention\Image\Colors\Rgba\Parser as RgbaColorParser;
-use Intervention\Image\Drivers\Abstract\Decoders\AbstractDecoder;
-use Intervention\Image\Exceptions\ColorException;
-use Intervention\Image\Exceptions\DecoderException;
-use Intervention\Image\Interfaces\ColorInterface;
-use Intervention\Image\Interfaces\DecoderInterface;
-use Intervention\Image\Interfaces\ImageInterface;
-
-class RgbStringColorDecoder extends AbstractDecoder implements DecoderInterface
-{
-    public function decode($input): ImageInterface|ColorInterface
-    {
-        if (!is_string($input)) {
-            throw new DecoderException('Unable to decode input');
-        }
-
-        try {
-            return RgbColorParser::fromString($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        try {
-            return RgbaColorParser::fromString($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        throw new DecoderException('Unable to decode input');
-    }
-}
diff --git a/src/Drivers/Gd/Image.php b/src/Drivers/Gd/Image.php
index b572354b..5fdb2ed5 100644
--- a/src/Drivers/Gd/Image.php
+++ b/src/Drivers/Gd/Image.php
@@ -4,6 +4,7 @@ namespace Intervention\Image\Drivers\Gd;
 
 use Intervention\Image\Collection;
 use Intervention\Image\Drivers\Abstract\AbstractImage;
+use Intervention\Image\Drivers\Gd\Traits\CanHandleColors;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\FrameInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -12,6 +13,8 @@ use Traversable;
 
 class Image extends AbstractImage implements ImageInterface, IteratorAggregate
 {
+    use CanHandleColors;
+
     public function __construct(protected Collection $frames, protected int $loops = 0)
     {
         //
@@ -69,7 +72,9 @@ class Image extends AbstractImage implements ImageInterface, IteratorAggregate
     public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface
     {
         if ($frame = $this->getFrame($frame_key)) {
-            return ColorTransformer::colorFromInteger(imagecolorat($frame->getCore(), $x, $y));
+            return $this->colorFromInteger(
+                imagecolorat($frame->getCore(), $x, $y)
+            );
         }
 
         return null;
diff --git a/src/Drivers/Gd/InputHandler.php b/src/Drivers/Gd/InputHandler.php
index 076269c8..c545168f 100644
--- a/src/Drivers/Gd/InputHandler.php
+++ b/src/Drivers/Gd/InputHandler.php
@@ -2,21 +2,33 @@
 
 namespace Intervention\Image\Drivers\Gd;
 
+use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder as RgbHexColorDecoder;
+use Intervention\Image\Colors\Rgb\Decoders\StringColorDecoder as RgbStringColorDecoder;
+use Intervention\Image\Colors\Rgb\Decoders\HtmlColornameDecoder;
+use Intervention\Image\Colors\Cmyk\Decoders\StringColorDecoder as CmykStringColorDecoder;
 use Intervention\Image\Drivers\Abstract\AbstractInputHandler;
+use Intervention\Image\Drivers\Gd\Decoders\ImageObjectDecoder;
+use Intervention\Image\Drivers\Gd\Decoders\ColorObjectDecoder;
+use Intervention\Image\Drivers\Gd\Decoders\FilePointerImageDecoder;
+use Intervention\Image\Drivers\Gd\Decoders\FilePathImageDecoder;
+use Intervention\Image\Drivers\Gd\Decoders\BinaryImageDecoder;
+use Intervention\Image\Drivers\Gd\Decoders\DataUriImageDecoder;
+use Intervention\Image\Drivers\Gd\Decoders\Base64ImageDecoder;
 
 class InputHandler extends AbstractInputHandler
 {
     protected $decoders = [
-        Decoders\ImageObjectDecoder::class,
-        Decoders\ColorObjectDecoder::class,
-        Decoders\FilePointerImageDecoder::class,
-        Decoders\HtmlColorNameDecoder::class,
-        Decoders\HexColorDecoder::class,
-        Decoders\RgbStringColorDecoder::class,
+        ImageObjectDecoder::class,
+        ColorObjectDecoder::class,
+        RgbHexColorDecoder::class,
+        RgbStringColorDecoder::class,
+        CmykStringColorDecoder::class,
         // Decoders\TransparentColorDecoder::class,
-        Decoders\FilePathImageDecoder::class,
-        Decoders\BinaryImageDecoder::class,
-        Decoders\DataUriImageDecoder::class,
-        Decoders\Base64ImageDecoder::class,
+        HtmlColornameDecoder::class,
+        FilePointerImageDecoder::class,
+        FilePathImageDecoder::class,
+        BinaryImageDecoder::class,
+        DataUriImageDecoder::class,
+        Base64ImageDecoder::class,
     ];
 }
diff --git a/src/Drivers/Gd/Modifiers/DrawPixelModifier.php b/src/Drivers/Gd/Modifiers/DrawPixelModifier.php
index bab24579..f9010bf4 100644
--- a/src/Drivers/Gd/Modifiers/DrawPixelModifier.php
+++ b/src/Drivers/Gd/Modifiers/DrawPixelModifier.php
@@ -2,6 +2,7 @@
 
 namespace Intervention\Image\Drivers\Gd\Modifiers;
 
+use Intervention\Image\Drivers\Gd\Traits\CanHandleColors;
 use Intervention\Image\Geometry\Point;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\ModifierInterface;
@@ -10,6 +11,7 @@ use Intervention\Image\Traits\CanHandleInput;
 class DrawPixelModifier implements ModifierInterface
 {
     use CanHandleInput;
+    use CanHandleColors;
 
     public function __construct(
         protected Point $position,
@@ -26,7 +28,7 @@ class DrawPixelModifier implements ModifierInterface
                 $frame->getCore(),
                 $this->position->getX(),
                 $this->position->getY(),
-                $color->toInt()
+                $this->colorToInteger($color)
             );
         });
     }
diff --git a/src/Drivers/Gd/Modifiers/FillModifier.php b/src/Drivers/Gd/Modifiers/FillModifier.php
index 0d0ea3f3..774c32b7 100644
--- a/src/Drivers/Gd/Modifiers/FillModifier.php
+++ b/src/Drivers/Gd/Modifiers/FillModifier.php
@@ -2,8 +2,8 @@
 
 namespace Intervention\Image\Drivers\Gd\Modifiers;
 
-use Intervention\Image\Drivers\Gd\ColorTransformer;
 use Intervention\Image\Drivers\Gd\Frame;
+use Intervention\Image\Drivers\Gd\Traits\CanHandleColors;
 use Intervention\Image\Geometry\Point;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -11,37 +11,39 @@ use Intervention\Image\Interfaces\ModifierInterface;
 
 class FillModifier implements ModifierInterface
 {
-    protected $gd_color;
+    use CanHandleColors;
 
     public function __construct(protected ColorInterface $color, protected ?Point $position = null)
     {
-        $this->gd_color = ColorTransformer::colorToInteger($color);
+        //
     }
 
     public function apply(ImageInterface $image): ImageInterface
     {
+        $color = $this->colorToInteger($this->color);
+
         foreach ($image as $frame) {
             if ($this->hasPosition()) {
-                $this->floodFillWithColor($frame);
+                $this->floodFillWithColor($frame, $color);
             } else {
-                $this->fillAllWithColor($frame);
+                $this->fillAllWithColor($frame, $color);
             }
         }
 
         return $image;
     }
 
-    protected function floodFillWithColor(Frame $frame): void
+    protected function floodFillWithColor(Frame $frame, int $color): void
     {
         imagefill(
             $frame->getCore(),
             $this->position->getX(),
             $this->position->getY(),
-            $this->gd_color
+            $color
         );
     }
 
-    protected function fillAllWithColor(Frame $frame): void
+    protected function fillAllWithColor(Frame $frame, int $color): void
     {
         imagealphablending($frame->getCore(), true);
         imagefilledrectangle(
@@ -50,7 +52,7 @@ class FillModifier implements ModifierInterface
             0,
             $frame->getSize()->getWidth() - 1,
             $frame->getSize()->getHeight() - 1,
-            $this->gd_color
+            $color
         );
     }
 
diff --git a/src/Drivers/Gd/ColorTransformer.php b/src/Drivers/Gd/Traits/CanHandleColors.php
similarity index 74%
rename from src/Drivers/Gd/ColorTransformer.php
rename to src/Drivers/Gd/Traits/CanHandleColors.php
index 62d9c8bd..ecfa1dd4 100644
--- a/src/Drivers/Gd/ColorTransformer.php
+++ b/src/Drivers/Gd/Traits/CanHandleColors.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Intervention\Image\Drivers\Gd;
+namespace Intervention\Image\Drivers\Gd\Traits;
 
-use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Colors\Rgb\Color;
+use Intervention\Image\Interfaces\ColorInterface;
 
-class ColorTransformer
+trait CanHandleColors
 {
     /**
      * Transforms GD Library integer color value to RGB color object
@@ -13,7 +13,7 @@ class ColorTransformer
      * @param int $value
      * @return Color
      */
-    public static function colorFromInteger(int $value): Color
+    public function colorFromInteger(int $value): Color
     {
         $a = ($value >> 24) & 0xFF;
         $r = ($value >> 16) & 0xFF;
@@ -33,7 +33,7 @@ class ColorTransformer
      * @param ColorInterface $color
      * @return int
      */
-    public static function colorToInteger(ColorInterface $color): int
+    public function colorToInteger(ColorInterface $color): int
     {
         $color = $color->toRgb();
 
@@ -49,6 +49,17 @@ class ColorTransformer
         return ($a << 24) + ($r << 16) + ($g << 8) + $b;
     }
 
+    /**
+     * Convert input in range (min) to (max) to the corresponding value
+     * in target range (targetMin) to (targetMax).
+     *
+     * @param float|int $input
+     * @param float|int $min
+     * @param float|int $max
+     * @param float|int $targetMin
+     * @param float|int $targetMax
+     * @return float|int
+     */
     private static function convertRange(
         float|int $input,
         float|int $min,
diff --git a/src/Drivers/Imagick/Decoders/HexColorDecoder.php b/src/Drivers/Imagick/Decoders/HexColorDecoder.php
deleted file mode 100644
index e1e687b3..00000000
--- a/src/Drivers/Imagick/Decoders/HexColorDecoder.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Intervention\Image\Drivers\Imagick\Decoders;
-
-use Intervention\Image\Colors\Rgb\Parser as RgbColorParser;
-use Intervention\Image\Colors\Rgba\Parser as RgbaColorParser;
-use Intervention\Image\Drivers\Abstract\Decoders\AbstractDecoder;
-use Intervention\Image\Exceptions\ColorException;
-use Intervention\Image\Exceptions\DecoderException;
-use Intervention\Image\Interfaces\ColorInterface;
-use Intervention\Image\Interfaces\DecoderInterface;
-use Intervention\Image\Interfaces\ImageInterface;
-
-class HexColorDecoder extends AbstractDecoder implements DecoderInterface
-{
-    public function decode($input): ImageInterface|ColorInterface
-    {
-        if (!is_string($input)) {
-            throw new DecoderException('Unable to decode input');
-        }
-
-        try {
-            return RgbColorParser::fromHex($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        try {
-            return RgbaColorParser::fromHex($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        throw new DecoderException('Unable to decode input');
-    }
-}
diff --git a/src/Drivers/Imagick/Decoders/HtmlColorNameDecoder.php b/src/Drivers/Imagick/Decoders/HtmlColorNameDecoder.php
deleted file mode 100644
index e8cb70a6..00000000
--- a/src/Drivers/Imagick/Decoders/HtmlColorNameDecoder.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Intervention\Image\Drivers\Imagick\Decoders;
-
-use Intervention\Image\Colors\Rgb\Parser;
-use Intervention\Image\Exceptions\ColorException;
-use Intervention\Image\Exceptions\DecoderException;
-use Intervention\Image\Interfaces\ColorInterface;
-use Intervention\Image\Interfaces\ImageInterface;
-
-class HtmlColorNameDecoder extends HexColorDecoder
-{
-    public function decode($input): ImageInterface|ColorInterface
-    {
-        if (!is_string($input)) {
-            throw new DecoderException('Unable to decode input');
-        }
-
-        try {
-            return Parser::fromName($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        throw new DecoderException('Unable to decode input');
-    }
-}
diff --git a/src/Drivers/Imagick/Decoders/RgbStringColorDecoder.php b/src/Drivers/Imagick/Decoders/RgbStringColorDecoder.php
deleted file mode 100644
index cd254960..00000000
--- a/src/Drivers/Imagick/Decoders/RgbStringColorDecoder.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Intervention\Image\Drivers\Imagick\Decoders;
-
-use Intervention\Image\Colors\Rgb\Parser as RgbColorParser;
-use Intervention\Image\Colors\Rgba\Parser as RgbaColorParser;
-use Intervention\Image\Drivers\Abstract\Decoders\AbstractDecoder;
-use Intervention\Image\Exceptions\ColorException;
-use Intervention\Image\Exceptions\DecoderException;
-use Intervention\Image\Interfaces\ColorInterface;
-use Intervention\Image\Interfaces\DecoderInterface;
-use Intervention\Image\Interfaces\ImageInterface;
-
-class RgbStringColorDecoder extends AbstractDecoder implements DecoderInterface
-{
-    public function decode($input): ImageInterface|ColorInterface
-    {
-        if (!is_string($input)) {
-            throw new DecoderException('Unable to decode input');
-        }
-
-        try {
-            return RgbColorParser::fromString($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        try {
-            return RgbaColorParser::fromString($input);
-        } catch (ColorException $e) {
-            # code ...
-        }
-
-        throw new DecoderException('Unable to decode input');
-    }
-}
diff --git a/src/Drivers/Imagick/Image.php b/src/Drivers/Imagick/Image.php
index a6ac13e5..657faf8d 100644
--- a/src/Drivers/Imagick/Image.php
+++ b/src/Drivers/Imagick/Image.php
@@ -5,6 +5,7 @@ namespace Intervention\Image\Drivers\Imagick;
 use Imagick;
 use ImagickException;
 use Intervention\Image\Drivers\Abstract\AbstractImage;
+use Intervention\Image\Drivers\Imagick\Traits\CanHandleColors;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\FrameInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -12,6 +13,8 @@ use Iterator;
 
 class Image extends AbstractImage implements ImageInterface, Iterator
 {
+    use CanHandleColors;
+
     protected $iteratorIndex = 0;
 
     public function __construct(protected Imagick $imagick)
@@ -124,7 +127,7 @@ class Image extends AbstractImage implements ImageInterface, Iterator
     public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface
     {
         if ($frame = $this->getFrame($frame_key)) {
-            return ColorTransformer::colorFromPixel(
+            return $this->colorFromPixel(
                 $frame->getCore()->getImagePixelColor($x, $y)
             );
         }
diff --git a/src/Drivers/Imagick/InputHandler.php b/src/Drivers/Imagick/InputHandler.php
index d6ec81ef..f7c493b4 100644
--- a/src/Drivers/Imagick/InputHandler.php
+++ b/src/Drivers/Imagick/InputHandler.php
@@ -2,21 +2,33 @@
 
 namespace Intervention\Image\Drivers\Imagick;
 
+use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder as RgbHexColorDecoder;
+use Intervention\Image\Colors\Rgb\Decoders\StringColorDecoder as RgbStringColorDecoder;
+use Intervention\Image\Colors\Rgb\Decoders\HtmlColornameDecoder;
+use Intervention\Image\Colors\Cmyk\Decoders\StringColorDecoder as CmykStringColorDecoder;
 use Intervention\Image\Drivers\Abstract\AbstractInputHandler;
+use Intervention\Image\Drivers\Imagick\Decoders\ImageObjectDecoder;
+use Intervention\Image\Drivers\Imagick\Decoders\ColorObjectDecoder;
+use Intervention\Image\Drivers\Imagick\Decoders\FilePointerImageDecoder;
+use Intervention\Image\Drivers\Imagick\Decoders\FilePathImageDecoder;
+use Intervention\Image\Drivers\Imagick\Decoders\BinaryImageDecoder;
+use Intervention\Image\Drivers\Imagick\Decoders\DataUriImageDecoder;
+use Intervention\Image\Drivers\Imagick\Decoders\Base64ImageDecoder;
 
 class InputHandler extends AbstractInputHandler
 {
     protected $decoders = [
-        Decoders\ImageObjectDecoder::class,
-        Decoders\ColorObjectDecoder::class,
-        Decoders\FilePointerImageDecoder::class,
-        Decoders\HtmlColorNameDecoder::class,
-        Decoders\HexColorDecoder::class,
-        Decoders\RgbStringColorDecoder::class,
+        ImageObjectDecoder::class,
+        ColorObjectDecoder::class,
+        RgbHexColorDecoder::class,
+        RgbStringColorDecoder::class,
+        CmykStringColorDecoder::class,
         // Decoders\TransparentColorDecoder::class,
-        Decoders\FilePathImageDecoder::class,
-        Decoders\BinaryImageDecoder::class,
-        Decoders\DataUriImageDecoder::class,
-        Decoders\Base64ImageDecoder::class,
+        HtmlColornameDecoder::class,
+        FilePointerImageDecoder::class,
+        FilePathImageDecoder::class,
+        BinaryImageDecoder::class,
+        DataUriImageDecoder::class,
+        Base64ImageDecoder::class,
     ];
 }
diff --git a/src/Drivers/Imagick/Modifiers/DrawPixelModifier.php b/src/Drivers/Imagick/Modifiers/DrawPixelModifier.php
index 20888991..abeebb95 100644
--- a/src/Drivers/Imagick/Modifiers/DrawPixelModifier.php
+++ b/src/Drivers/Imagick/Modifiers/DrawPixelModifier.php
@@ -3,8 +3,9 @@
 namespace Intervention\Image\Drivers\Imagick\Modifiers;
 
 use ImagickDraw;
-use Intervention\Image\Drivers\Imagick\Color;
+use Intervention\Image\Drivers\Imagick\Traits\CanHandleColors;
 use Intervention\Image\Geometry\Point;
+use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\ModifierInterface;
 use Intervention\Image\Traits\CanCheckType;
@@ -13,6 +14,7 @@ use Intervention\Image\Traits\CanHandleInput;
 class DrawPixelModifier implements ModifierInterface
 {
     use CanHandleInput;
+    use CanHandleColors;
     use CanCheckType;
 
     public function __construct(protected Point $position, protected mixed $color)
@@ -22,13 +24,13 @@ class DrawPixelModifier implements ModifierInterface
 
     public function apply(ImageInterface $image): ImageInterface
     {
-        $color = $this->failIfNotClass(
+        $color = $this->failIfNotInstance(
             $this->handleInput($this->color),
-            Color::class,
+            ColorInterface::class
         );
 
         $pixel = new ImagickDraw();
-        $pixel->setFillColor($color->getPixel());
+        $pixel->setFillColor($this->colorToPixel($color));
         $pixel->point($this->position->getX(), $this->position->getY());
 
         return $image->eachFrame(function ($frame) use ($pixel) {
diff --git a/src/Drivers/Imagick/Modifiers/FillModifier.php b/src/Drivers/Imagick/Modifiers/FillModifier.php
index 36bef1af..c78f06ba 100644
--- a/src/Drivers/Imagick/Modifiers/FillModifier.php
+++ b/src/Drivers/Imagick/Modifiers/FillModifier.php
@@ -5,8 +5,8 @@ namespace Intervention\Image\Drivers\Imagick\Modifiers;
 use Imagick;
 use ImagickDraw;
 use ImagickPixel;
-use Intervention\Image\Drivers\Imagick\ColorTransformer;
 use Intervention\Image\Drivers\Imagick\Frame;
+use Intervention\Image\Drivers\Imagick\Traits\CanHandleColors;
 use Intervention\Image\Geometry\Point;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -14,29 +14,30 @@ use Intervention\Image\Interfaces\ModifierInterface;
 
 class FillModifier implements ModifierInterface
 {
-    protected ImagickPixel $pixel;
+    use CanHandleColors;
 
     public function __construct(
         protected ColorInterface $color,
         protected ?Point $position = null
     ) {
-        $this->pixel = ColorTransformer::colorToPixel($color);
+        //
     }
 
     public function apply(ImageInterface $image): ImageInterface
     {
+        $pixel = $this->colorToPixel($this->color);
         foreach ($image as $frame) {
             if ($this->hasPosition()) {
-                $this->floodFillWithColor($frame);
+                $this->floodFillWithColor($frame, $pixel);
             } else {
-                $this->fillAllWithColor($frame);
+                $this->fillAllWithColor($frame, $pixel);
             }
         }
 
         return $image;
     }
 
-    protected function floodFillWithColor(Frame $frame): void
+    protected function floodFillWithColor(Frame $frame, ImagickPixel $pixel): void
     {
         $target = $frame->getCore()->getImagePixelColor(
             $this->position->getX(),
@@ -44,7 +45,7 @@ class FillModifier implements ModifierInterface
         );
 
         $frame->getCore()->floodfillPaintImage(
-            $this->pixel,
+            $pixel,
             100,
             $target,
             $this->position->getX(),
@@ -54,10 +55,10 @@ class FillModifier implements ModifierInterface
         );
     }
 
-    protected function fillAllWithColor(Frame $frame): void
+    protected function fillAllWithColor(Frame $frame, ImagickPixel $pixel): void
     {
         $draw = new ImagickDraw();
-        $draw->setFillColor($this->pixel);
+        $draw->setFillColor($pixel);
         $draw->rectangle(
             0,
             0,
diff --git a/src/Drivers/Imagick/ColorTransformer.php b/src/Drivers/Imagick/Traits/CanHandleColors.php
similarity index 55%
rename from src/Drivers/Imagick/ColorTransformer.php
rename to src/Drivers/Imagick/Traits/CanHandleColors.php
index 1ddf8a32..547030c1 100644
--- a/src/Drivers/Imagick/ColorTransformer.php
+++ b/src/Drivers/Imagick/Traits/CanHandleColors.php
@@ -1,22 +1,24 @@
 <?php
 
-namespace Intervention\Image\Drivers\Imagick;
+namespace Intervention\Image\Drivers\Imagick\Traits;
 
 use ImagickPixel;
-use Intervention\Image\Colors\Parser;
 use Intervention\Image\Interfaces\ColorInterface;
+use Intervention\Image\Traits\CanHandleInput;
 
-class ColorTransformer
+trait CanHandleColors
 {
+    use CanHandleInput;
+
     /**
      * Transforms ImagickPixel to own color object
      *
      * @param int $value
      * @return ColorInterface
      */
-    public static function colorFromPixel(ImagickPixel $pixel): ColorInterface
+    public function colorFromPixel(ImagickPixel $pixel): ColorInterface
     {
-        return Parser::parse($pixel->getColorAsString());
+        return $this->handleInput($pixel->getColorAsString());
     }
 
     /**
@@ -25,7 +27,7 @@ class ColorTransformer
      * @param ColorInterface $color
      * @return ImagickPixel
      */
-    public static function colorToPixel(ColorInterface $color): ImagickPixel
+    public function colorToPixel(ColorInterface $color): ImagickPixel
     {
         return new ImagickPixel($color->toString());
     }
diff --git a/src/Interfaces/ColorInterface.php b/src/Interfaces/ColorInterface.php
index 7cf18317..c1659ef2 100644
--- a/src/Interfaces/ColorInterface.php
+++ b/src/Interfaces/ColorInterface.php
@@ -11,10 +11,9 @@ interface ColorInterface
     public function toCmyk(): CmykColor;
     public function toArray(): array;
     public function toString(): string;
+    public function toHex(): string;
     public function __toString(): string;
-
-    // public function channels(): array;
-    // public function channel(string $classname): ColorChannelInterface;
-    // public function colorspace(): ColorspaceInterface;
-    // public function convertTo(string|ColorspaceInterface $colorspace): ColorInterface;
+    public function channels(): array;
+    public function convertTo(string|ColorspaceInterface $colorspace): ColorInterface;
+    public function isGreyscale(): bool;
 }
diff --git a/src/Traits/CanCheckType.php b/src/Traits/CanCheckType.php
index f70e85bd..c817dfbd 100644
--- a/src/Traits/CanCheckType.php
+++ b/src/Traits/CanCheckType.php
@@ -14,4 +14,13 @@ trait CanCheckType
 
         return $input;
     }
+
+    public function failIfNotInstance(mixed $input, string $classname)
+    {
+        if (!is_object($input) || !is_a($input, $classname)) {
+            throw new TypeException('Given input is not instance of ' . $classname);
+        }
+
+        return $input;
+    }
 }
diff --git a/tests/Colors/Cmyk/ColorTest.php b/tests/Colors/Cmyk/ColorTest.php
index 66e87283..070a199d 100644
--- a/tests/Colors/Cmyk/ColorTest.php
+++ b/tests/Colors/Cmyk/ColorTest.php
@@ -80,6 +80,6 @@ class ColorTest extends TestCase
         $color = new Color(0, 20, 20, 0);
         $converted = $color->toRgb();
         $this->assertInstanceOf(RgbColor::class, $converted);
-        $this->assertEquals([255, 204, 204], $converted->toArray());
+        $this->assertEquals([255, 204, 204, 255], $converted->toArray());
     }
 }
diff --git a/tests/Colors/Cmyk/Decoders/StringColorDecoderTest.php b/tests/Colors/Cmyk/Decoders/StringColorDecoderTest.php
new file mode 100644
index 00000000..f6af4237
--- /dev/null
+++ b/tests/Colors/Cmyk/Decoders/StringColorDecoderTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Intervention\Image\Tests\Colors\Cmyk\Decoders;
+
+use Intervention\Image\Colors\Cmyk\Color;
+use Intervention\Image\Colors\Cmyk\Decoders\StringColorDecoder;
+use Intervention\Image\Tests\TestCase;
+
+/**
+ * @requires extension gd
+ * @covers \Intervention\Image\Colors\Cmyk\Decoders\StringColorDecoder
+ */
+class StringColorDecoderTest extends TestCase
+{
+    public function testDecode(): void
+    {
+        $decoder = new StringColorDecoder();
+        $result = $decoder->decode('cmyk(0,0,0,0)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([0, 0, 0, 0], $result->toArray());
+
+        $result = $decoder->decode('cmyk(0, 100, 100, 0)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([0, 100, 100, 0], $result->toArray());
+
+        $result = $decoder->decode('cmyk(0, 100, 100, 0)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([0, 100, 100, 0], $result->toArray());
+
+
+        $result = $decoder->decode('cmyk(0%, 100%, 100%, 0%)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([0, 100, 100, 0], $result->toArray());
+    }
+}
diff --git a/tests/Colors/Cmyk/ParserTest.php b/tests/Colors/Cmyk/ParserTest.php
deleted file mode 100644
index b94ec4f2..00000000
--- a/tests/Colors/Cmyk/ParserTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Colors\Cmyk;
-
-use Intervention\Image\Colors\Cmyk\Color;
-use Intervention\Image\Colors\Cmyk\Parser;
-use Intervention\Image\Tests\TestCase;
-
-/**
- * @requires extension gd
- * @covers \Intervention\Image\Colors\Cmyk\Parser
- */
-class ParserTest extends TestCase
-{
-    public function testParse(): void
-    {
-        $color = Parser::fromString('cmyk(100, 0, 0, 0)');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([100, 0, 0, 0], $color->toArray());
-    }
-
-    public function testFromString(): void
-    {
-        $color = Parser::fromString('cmyk(100, 0, 0, 0)');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([100, 0, 0, 0], $color->toArray());
-
-        $color = Parser::fromString('cmyk(100%, 0%, 0%, 0%)');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([100, 0, 0, 0], $color->toArray());
-    }
-}
diff --git a/tests/Colors/ParserTest.php b/tests/Colors/ParserTest.php
deleted file mode 100644
index 4e158140..00000000
--- a/tests/Colors/ParserTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Colors;
-
-use Intervention\Image\Colors\Cmyk\Color as CmykColor;
-use Intervention\Image\Colors\Rgb\Color as RgbColor;
-use Intervention\Image\Colors\Parser;
-use Intervention\Image\Tests\TestCase;
-
-/**
- * @requires extension gd
- * @covers \Intervention\Image\Colors\Parser
- */
-class ParserTest extends TestCase
-{
-    public function testParse(): void
-    {
-        $color = Parser::parse('ccc');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $color = Parser::parse('rgb(204, 204, 204)');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $color = Parser::parse('rgba(204, 204, 204, 1)');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals([204, 204, 204, 255], $color->toArray());
-
-        $color = Parser::parse('cccc');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals([204, 204, 204, 204], $color->toArray());
-
-        $color = Parser::parse('cccccccc');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals([204, 204, 204, 204], $color->toArray());
-
-        $color = Parser::parse('salmon');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals('fa8072', $color->toHex());
-
-        $color = Parser::parse('cmyk(100, 100, 0,0)');
-        $this->assertInstanceOf(CmykColor::class, $color);
-        $this->assertEquals([100, 100, 0, 0], $color->toArray());
-    }
-}
diff --git a/tests/Colors/Rgb/ColorTest.php b/tests/Colors/Rgb/ColorTest.php
index 8121a47f..f44191bd 100644
--- a/tests/Colors/Rgb/ColorTest.php
+++ b/tests/Colors/Rgb/ColorTest.php
@@ -19,13 +19,16 @@ class ColorTest extends TestCase
     {
         $color = new Color(0, 0, 0);
         $this->assertInstanceOf(Color::class, $color);
+
+        $color = new Color(0, 0, 0, 0);
+        $this->assertInstanceOf(Color::class, $color);
     }
 
     public function testChannels(): void
     {
         $color = new Color(10, 20, 30);
         $this->assertIsArray($color->channels());
-        $this->assertCount(3, $color->channels());
+        $this->assertCount(4, $color->channels());
     }
 
     public function testChannel(): void
@@ -50,7 +53,7 @@ class ColorTest extends TestCase
     public function testToArray(): void
     {
         $color = new Color(10, 20, 30);
-        $this->assertEquals([10, 20, 30], $color->toArray());
+        $this->assertEquals([10, 20, 30, 255], $color->toArray());
     }
 
     public function testToHex(): void
@@ -63,7 +66,7 @@ class ColorTest extends TestCase
     public function testNormalize(): void
     {
         $color = new Color(255, 0, 51);
-        $this->assertEquals([1.0, 0.0, 0.2], $color->normalize());
+        $this->assertEquals([1.0, 0.0, 0.2, 1.0], $color->normalize());
     }
 
     public function testToString(): void
diff --git a/tests/Colors/Rgb/Decoders/HexColorDecoderTest.php b/tests/Colors/Rgb/Decoders/HexColorDecoderTest.php
new file mode 100644
index 00000000..439b533f
--- /dev/null
+++ b/tests/Colors/Rgb/Decoders/HexColorDecoderTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Intervention\Image\Tests\Colors\Rgb\Decoders;
+
+use Intervention\Image\Colors\Rgb\Color;
+use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder;
+use Intervention\Image\Tests\TestCase;
+
+/**
+ * @requires extension gd
+ * @covers \Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder
+ */
+class HexColorDecoderTest extends TestCase
+{
+    public function testDecode(): void
+    {
+        $decoder = new HexColorDecoder();
+        $result = $decoder->decode('ccc');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('ccff33');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 255, 51, 255], $result->toArray());
+
+        $result = $decoder->decode('#ccc');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('cccccc');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('#cccccc');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('#ccccccff');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('#cccf');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('ccccccff');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('cccf');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('#b53717aa');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([181, 55, 23, 170], $result->toArray());
+    }
+}
diff --git a/tests/Colors/Rgb/Decoders/HtmlColornameDecoderTest.php b/tests/Colors/Rgb/Decoders/HtmlColornameDecoderTest.php
new file mode 100644
index 00000000..843d7a15
--- /dev/null
+++ b/tests/Colors/Rgb/Decoders/HtmlColornameDecoderTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Intervention\Image\Tests\Colors\Rgb\Decoders;
+
+use Intervention\Image\Colors\Rgb\Color;
+use Intervention\Image\Colors\Rgb\Decoders\HtmlColornameDecoder;
+use Intervention\Image\Tests\TestCase;
+
+/**
+ * @requires extension gd
+ * @covers \Intervention\Image\Colors\Rgb\Decoders\HtmlColorNameDecoder
+ */
+class HtmlColornameDecoderTest extends TestCase
+{
+    public function testDecode(): void
+    {
+        $decoder = new HtmlColornameDecoder();
+        $result = $decoder->decode('salmon');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([250, 128, 114, 255], $result->toArray());
+
+        $result = $decoder->decode('khaki');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([240, 230, 140, 255], $result->toArray());
+
+        $result = $decoder->decode('peachpuff');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([255, 218, 185, 255], $result->toArray());
+    }
+}
diff --git a/tests/Colors/Rgb/Decoders/StringColorDecoderTest.php b/tests/Colors/Rgb/Decoders/StringColorDecoderTest.php
new file mode 100644
index 00000000..956fe100
--- /dev/null
+++ b/tests/Colors/Rgb/Decoders/StringColorDecoderTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Intervention\Image\Tests\Colors\Rgb\Decoders;
+
+use Intervention\Image\Colors\Rgb\Color;
+use Intervention\Image\Colors\Rgb\Decoders\StringColorDecoder;
+use Intervention\Image\Tests\TestCase;
+
+/**
+ * @requires extension gd
+ * @covers \Intervention\Image\Colors\Rgb\Decoders\StringColorDecoder
+ */
+class StringColorDecoderTest extends TestCase
+{
+    public function testDecode(): void
+    {
+        $decoder = new StringColorDecoder();
+        $result = $decoder->decode('rgb(204, 204, 204)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('rgb(204,204,204)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('rgb(100%,20%,0%)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([255, 51, 0, 255], $result->toArray());
+
+        $result = $decoder->decode('rgb(100%,19.8064%,0.1239483%)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([255, 51, 0, 255], $result->toArray());
+
+        $result = $decoder->decode('rgba(204, 204, 204, 1)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 255], $result->toArray());
+
+        $result = $decoder->decode('rgba(204,204,204,.2)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 51], $result->toArray());
+
+        $result = $decoder->decode('rgba(204,204,204,0.2)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([204, 204, 204, 51], $result->toArray());
+
+        $result = $decoder->decode('srgb(255, 0, 0)');
+        $this->assertInstanceOf(Color::class, $result);
+        $this->assertEquals([255, 0, 0, 255], $result->toArray());
+    }
+}
diff --git a/tests/Colors/Rgb/ParserTest.php b/tests/Colors/Rgb/ParserTest.php
deleted file mode 100644
index d98b8601..00000000
--- a/tests/Colors/Rgb/ParserTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Colors\Rgb;
-
-use Intervention\Image\Colors\Rgb\Color;
-use Intervention\Image\Colors\Rgb\Parser;
-use Intervention\Image\Exceptions\ColorException;
-use Intervention\Image\Tests\TestCase;
-
-/**
- * @requires extension gd
- * @covers \Intervention\Image\Colors\Rgb\Parser
- */
-class ParserTest extends TestCase
-{
-    public function testParse(): void
-    {
-        $color = Parser::parse('ccc');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $color = Parser::parse('rgb(204, 204, 204)');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $color = Parser::parse('salmon');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals('fa8072', $color->toHex());
-    }
-
-    public function testFromHex(): void
-    {
-        $color = Parser::fromHex('ccc');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $color = Parser::fromHex('cccccc');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $color = Parser::fromHex('#cccccc');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $this->expectException(ColorException::class);
-        (new Parser())->fromHex('cccccccc');
-    }
-
-    public function testFromString(): void
-    {
-        $color = Parser::fromString('rgb(204, 204, 204)');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $color = Parser::fromString('rgb(204,204,204)');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([204, 204, 204], $color->toArray());
-
-        $color = Parser::fromString('rgb(100%,20%,25%)');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([255, 51, 64], $color->toArray());
-
-        $color = Parser::fromString('rgb(100%,74.8064%,25.2497%)');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals([255, 191, 64], $color->toArray());
-
-        $this->expectException(ColorException::class);
-        (new Parser())->fromString('rgb(204,204,204,1)');
-
-        $this->expectException(ColorException::class);
-        (new Parser())->fromString('rgb(120)');
-    }
-
-    public function testFromName(): void
-    {
-        $color = Parser::fromName('salmon');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals('fa8072', $color->toHex());
-    }
-}
diff --git a/tests/Drivers/Gd/ColorTransformerTest.php b/tests/Drivers/Gd/ColorTransformerTest.php
deleted file mode 100644
index 04260235..00000000
--- a/tests/Drivers/Gd/ColorTransformerTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Drivers\Gd;
-
-use Intervention\Image\Colors\Rgb\Color;
-use Intervention\Image\Drivers\Gd\ColorTransformer;
-use Intervention\Image\Tests\TestCase;
-
-class ColorTransformerTest extends TestCase
-{
-    public function testFromInteger(): void
-    {
-        $result = ColorTransformer::colorFromInteger(850736919);
-        $this->assertInstanceOf(Color::class, $result);
-        $this->assertEquals([181, 55, 23, 155], $result->toArray());
-
-        $result = ColorTransformer::colorFromInteger(16777215);
-        $this->assertInstanceOf(Color::class, $result);
-        $this->assertEquals([255, 255, 255, 255], $result->toArray());
-    }
-
-    public function testToInteger(): void
-    {
-        $result = ColorTransformer::colorToInteger(new Color(181, 55, 23, 155));
-        $this->assertEquals(850736919, $result);
-
-        $result = ColorTransformer::colorToInteger(new Color(255, 255, 255, 255));
-        $this->assertEquals(16777215, $result);
-    }
-}
diff --git a/tests/Drivers/Gd/Decoders/HexColorDecoderTest.php b/tests/Drivers/Gd/Decoders/HexColorDecoderTest.php
deleted file mode 100644
index f78468ab..00000000
--- a/tests/Drivers/Gd/Decoders/HexColorDecoderTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Drivers\Gd\Decoders;
-
-use Intervention\Image\Colors\Rgb\Color;
-use Intervention\Image\Drivers\Gd\Decoders\HexColorDecoder;
-use Intervention\Image\Tests\TestCase;
-
-/**
- * @requires extension gd
- * @covers \Intervention\Image\Drivers\Gd\Decoders\HexColorDecoder
- */
-class HexColorDecoderTest extends TestCase
-{
-    public function testDecode(): void
-    {
-        $decoder = new HexColorDecoder();
-        $result = $decoder->decode('ccc');
-        $this->assertInstanceOf(Color::class, $result);
-
-        $result = $decoder->decode('#ccc');
-        $this->assertInstanceOf(Color::class, $result);
-
-        $result = $decoder->decode('cccccc');
-        $this->assertInstanceOf(Color::class, $result);
-
-        $result = $decoder->decode('#cccccc');
-        $this->assertInstanceOf(Color::class, $result);
-    }
-}
diff --git a/tests/Drivers/Gd/Decoders/HtmlColorNameDecoderTest.php b/tests/Drivers/Gd/Decoders/HtmlColorNameDecoderTest.php
deleted file mode 100644
index 1113c784..00000000
--- a/tests/Drivers/Gd/Decoders/HtmlColorNameDecoderTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Drivers\Gd\Decoders;
-
-use Intervention\Image\Colors\Rgb\Color;
-use Intervention\Image\Drivers\Gd\Decoders\HtmlColorNameDecoder;
-use Intervention\Image\Tests\TestCase;
-
-class HtmlColorNameDecoderTest extends TestCase
-{
-    public function testDecode(): void
-    {
-        $decoder = new HtmlColorNameDecoder();
-        $color = $decoder->decode('tomato');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals('ff6347', $color->toHex());
-    }
-}
diff --git a/tests/Drivers/Gd/Decoders/RgbStringColorDecoderTest.php b/tests/Drivers/Gd/Decoders/RgbStringColorDecoderTest.php
deleted file mode 100644
index fb19fb98..00000000
--- a/tests/Drivers/Gd/Decoders/RgbStringColorDecoderTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Drivers\Gd\Decoders;
-
-use Intervention\Image\Colors\Rgb\Color as RgbColor;
-use Intervention\Image\Drivers\Gd\Decoders\RgbStringColorDecoder;
-use Intervention\Image\Tests\TestCase;
-
-/**
- * @requires extension gd
- * @covers \Intervention\Image\Drivers\Gd\Decoders\RgbStringColorDecoder
- */
-class RgbStringColorDecoderTest extends TestCase
-{
-    public function testDecodeRgb(): void
-    {
-        $decoder = new RgbStringColorDecoder();
-        $color = $decoder->decode('rgb(181, 55, 23)');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals([181, 55, 23], $color->toArray());
-    }
-
-    public function testDecodeRgba(): void
-    {
-        $decoder = new RgbStringColorDecoder();
-        $color = $decoder->decode('rgba(181, 55, 23, 0.5)');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals([181, 55, 23, 51], $color->toArray());
-    }
-}
diff --git a/tests/Drivers/Gd/ImageTest.php b/tests/Drivers/Gd/ImageTest.php
index 927450fd..a878443b 100644
--- a/tests/Drivers/Gd/ImageTest.php
+++ b/tests/Drivers/Gd/ImageTest.php
@@ -3,11 +3,11 @@
 namespace Intervention\Image\Tests\Drivers\Gd;
 
 use Intervention\Image\Collection;
-use Intervention\Image\Drivers\Gd\Color;
 use Intervention\Image\Drivers\Gd\Frame;
 use Intervention\Image\Drivers\Gd\Image;
 use Intervention\Image\Geometry\Rectangle;
 use Intervention\Image\Tests\TestCase;
+use Intervention\Image\Colors\Rgb\Color;
 
 /**
  * @requires extension gd
@@ -96,21 +96,21 @@ class ImageTest extends TestCase
     {
         $color = $this->image->pickColor(0, 0);
         $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals(255, $color->red());
-        $this->assertEquals(0, $color->green());
-        $this->assertEquals(0, $color->blue());
+        $this->assertEquals(255, $color->toRgb()->red()->value());
+        $this->assertEquals(0, $color->toRgb()->green()->value());
+        $this->assertEquals(0, $color->toRgb()->blue()->value());
 
         $color = $this->image->pickColor(0, 0, 1);
         $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals(0, $color->red());
-        $this->assertEquals(255, $color->green());
-        $this->assertEquals(0, $color->blue());
+        $this->assertEquals(0, $color->toRgb()->red()->value());
+        $this->assertEquals(255, $color->toRgb()->green()->value());
+        $this->assertEquals(0, $color->toRgb()->blue()->value());
 
         $color = $this->image->pickColor(0, 0, 2);
         $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals(0, $color->red());
-        $this->assertEquals(0, $color->green());
-        $this->assertEquals(255, $color->blue());
+        $this->assertEquals(0, $color->toRgb()->red()->value());
+        $this->assertEquals(0, $color->toRgb()->green()->value());
+        $this->assertEquals(255, $color->toRgb()->blue()->value());
 
         $color = $this->image->pickColor(0, 0, 3);
         $this->assertNull($color);
@@ -122,16 +122,16 @@ class ImageTest extends TestCase
         $this->assertInstanceOf(Collection::class, $colors);
         $this->assertCount(3, $colors);
 
-        $this->assertEquals(255, $colors->get(0)->red());
-        $this->assertEquals(0, $colors->get(0)->green());
-        $this->assertEquals(0, $colors->get(0)->blue());
+        $this->assertEquals(255, $colors->get(0)->toRgb()->red()->value());
+        $this->assertEquals(0, $colors->get(0)->toRgb()->green()->value());
+        $this->assertEquals(0, $colors->get(0)->toRgb()->blue()->value());
 
-        $this->assertEquals(0, $colors->get(1)->red());
-        $this->assertEquals(255, $colors->get(1)->green());
-        $this->assertEquals(0, $colors->get(1)->blue());
+        $this->assertEquals(0, $colors->get(1)->toRgb()->red()->value());
+        $this->assertEquals(255, $colors->get(1)->toRgb()->green()->value());
+        $this->assertEquals(0, $colors->get(1)->toRgb()->blue()->value());
 
-        $this->assertEquals(0, $colors->get(2)->red());
-        $this->assertEquals(0, $colors->get(2)->green());
-        $this->assertEquals(255, $colors->get(2)->blue());
+        $this->assertEquals(0, $colors->get(2)->toRgb()->red()->value());
+        $this->assertEquals(0, $colors->get(2)->toRgb()->green()->value());
+        $this->assertEquals(255, $colors->get(2)->toRgb()->blue()->value());
     }
 }
diff --git a/tests/Drivers/Gd/InputHandlerTest.php b/tests/Drivers/Gd/InputHandlerTest.php
index 3cdaaee2..07328d49 100644
--- a/tests/Drivers/Gd/InputHandlerTest.php
+++ b/tests/Drivers/Gd/InputHandlerTest.php
@@ -59,25 +59,25 @@ class GdInputHandlerTest extends TestCase
         $input = 'ccff33';
         $result = $handler->handle($input);
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([204, 255, 51], $result->toArray());
+        $this->assertEquals([204, 255, 51, 255], $result->toArray());
 
         $handler = new InputHandler();
         $input = 'cf3';
         $result = $handler->handle($input);
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([204, 255, 51], $result->toArray());
+        $this->assertEquals([204, 255, 51, 255], $result->toArray());
 
         $handler = new InputHandler();
         $input = '#123456';
         $result = $handler->handle($input);
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([18, 52, 86], $result->toArray());
+        $this->assertEquals([18, 52, 86, 255], $result->toArray());
 
         $handler = new InputHandler();
         $input = '#333';
         $result = $handler->handle($input);
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([51, 51, 51], $result->toArray());
+        $this->assertEquals([51, 51, 51, 255], $result->toArray());
 
         $handler = new InputHandler();
         $input = '#3333';
@@ -97,7 +97,7 @@ class GdInputHandlerTest extends TestCase
         $handler = new InputHandler();
         $result = $handler->handle('rgb(10, 20, 30)');
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([10, 20, 30], $result->toArray());
+        $this->assertEquals([10, 20, 30, 255], $result->toArray());
 
         $handler = new InputHandler();
         $result = $handler->handle('rgba(10, 20, 30, 1.0)');
diff --git a/tests/Drivers/Gd/Modifiers/FillModifierTest.php b/tests/Drivers/Gd/Modifiers/FillModifierTest.php
index 380b746a..c974b4b2 100644
--- a/tests/Drivers/Gd/Modifiers/FillModifierTest.php
+++ b/tests/Drivers/Gd/Modifiers/FillModifierTest.php
@@ -2,7 +2,7 @@
 
 namespace Intervention\Image\Tests\Drivers\Gd\Modifiers;
 
-use Intervention\Image\Drivers\Gd\Color;
+use Intervention\Image\Colors\Rgb\Color;
 use Intervention\Image\Drivers\Gd\Modifiers\FillModifier;
 use Intervention\Image\Geometry\Point;
 use Intervention\Image\Tests\TestCase;
@@ -21,7 +21,7 @@ class FillModifierTest extends TestCase
         $image = $this->createTestImage('blocks.png');
         $this->assertEquals('0000ff', $image->pickColor(420, 270)->toHex());
         $this->assertEquals('ff0000', $image->pickColor(540, 400)->toHex());
-        $image->modify(new FillModifier(new Color(13421772), new Point(540, 400)));
+        $image->modify(new FillModifier(new Color(204, 204, 204), new Point(540, 400)));
         $this->assertEquals('0000ff', $image->pickColor(420, 270)->toHex());
         $this->assertEquals('cccccc', $image->pickColor(540, 400)->toHex());
     }
@@ -31,7 +31,7 @@ class FillModifierTest extends TestCase
         $image = $this->createTestImage('blocks.png');
         $this->assertEquals('0000ff', $image->pickColor(420, 270)->toHex());
         $this->assertEquals('ff0000', $image->pickColor(540, 400)->toHex());
-        $image->modify(new FillModifier(new Color(13421772)));
+        $image->modify(new FillModifier(new Color(204, 204, 204)));
         $this->assertEquals('cccccc', $image->pickColor(420, 270)->toHex());
         $this->assertEquals('cccccc', $image->pickColor(540, 400)->toHex());
     }
diff --git a/tests/Drivers/Gd/Modifiers/FitModifierTest.php b/tests/Drivers/Gd/Modifiers/FitModifierTest.php
index 58bd8094..a7b427b3 100644
--- a/tests/Drivers/Gd/Modifiers/FitModifierTest.php
+++ b/tests/Drivers/Gd/Modifiers/FitModifierTest.php
@@ -22,9 +22,9 @@ class FitModifierTest extends TestCase
         $image->modify(new FitModifier(100, 100, 'center'));
         $this->assertEquals(100, $image->getWidth());
         $this->assertEquals(100, $image->getHeight());
-        $this->assertColor(255, 0, 0, 1, $image->pickColor(90, 90));
-        $this->assertColor(0, 255, 0, 1, $image->pickColor(65, 70));
-        $this->assertColor(0, 0, 255, 1, $image->pickColor(70, 52));
+        $this->assertColor(255, 0, 0, 255, $image->pickColor(90, 90));
+        $this->assertColor(0, 255, 0, 255, $image->pickColor(65, 70));
+        $this->assertColor(0, 0, 255, 255, $image->pickColor(70, 52));
         $this->assertTransparency($image->pickColor(90, 30));
     }
 }
diff --git a/tests/Drivers/Gd/Modifiers/FlipFlopModifierTest.php b/tests/Drivers/Gd/Modifiers/FlipFlopModifierTest.php
index 0305f6a8..3a7ec01d 100644
--- a/tests/Drivers/Gd/Modifiers/FlipFlopModifierTest.php
+++ b/tests/Drivers/Gd/Modifiers/FlipFlopModifierTest.php
@@ -21,7 +21,7 @@ class FlipFlopModifierTest extends TestCase
         $image = $this->createTestImage('tile.png');
         $this->assertEquals('b4e000', $image->pickColor(0, 0)->toHex());
         $image->modify(new FlipModifier());
-        $this->assertEquals('000000', $image->pickColor(0, 0)->toHex());
+        $this->assertEquals('00000000', $image->pickColor(0, 0)->toHex());
     }
 
     public function testFlopImage(): void
@@ -29,6 +29,6 @@ class FlipFlopModifierTest extends TestCase
         $image = $this->createTestImage('tile.png');
         $this->assertEquals('b4e000', $image->pickColor(0, 0)->toHex());
         $image->modify(new FlopModifier());
-        $this->assertEquals('000000', $image->pickColor(0, 0)->toHex());
+        $this->assertEquals('00000000', $image->pickColor(0, 0)->toHex());
     }
 }
diff --git a/tests/Drivers/Gd/Modifiers/ResizeModifierTest.php b/tests/Drivers/Gd/Modifiers/ResizeModifierTest.php
index bf7ef234..33d8d541 100644
--- a/tests/Drivers/Gd/Modifiers/ResizeModifierTest.php
+++ b/tests/Drivers/Gd/Modifiers/ResizeModifierTest.php
@@ -22,11 +22,9 @@ class ResizeModifierTest extends TestCase
         $image->modify(new ResizeModifier(200, 100));
         $this->assertEquals(200, $image->getWidth());
         $this->assertEquals(100, $image->getHeight());
-        $this->assertColor(255, 0, 0, 1, $image->pickColor(150, 70));
-        $this->assertColor(0, 255, 0, 1, $image->pickColor(125, 70));
-        $this->assertColor(0, 0, 255, 1, $image->pickColor(130, 54));
-        $transparent = $image->pickColor(170, 30);
-        $this->assertEquals(2130706432, $transparent->toInt());
-        $this->assertTransparency($transparent);
+        $this->assertColor(255, 0, 0, 255, $image->pickColor(150, 70));
+        $this->assertColor(0, 255, 0, 255, $image->pickColor(125, 70));
+        $this->assertColor(0, 0, 255, 255, $image->pickColor(130, 54));
+        $this->assertTransparency($image->pickColor(170, 30));
     }
 }
diff --git a/tests/Drivers/Imagick/ColorTransformerTest.php b/tests/Drivers/Imagick/ColorTransformerTest.php
deleted file mode 100644
index 49f16ad1..00000000
--- a/tests/Drivers/Imagick/ColorTransformerTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Drivers\Imagick;
-
-use ImagickPixel;
-use Intervention\Image\Colors\Rgb\Color;
-use Intervention\Image\Drivers\Imagick\ColorTransformer;
-use Intervention\Image\Tests\TestCase;
-
-class ColorTransformerTest extends TestCase
-{
-    public function testFromPixel(): void
-    {
-        $result = ColorTransformer::colorFromPixel(new ImagickPixel('rgba(181, 55, 23, .6)'));
-        $this->assertInstanceOf(Color::class, $result);
-        $this->assertEquals([181, 55, 23, 153], $result->toArray());
-
-        $result = ColorTransformer::colorFromPixel(new ImagickPixel('rgba(255, 255, 255, 1)'));
-        $this->assertInstanceOf(Color::class, $result);
-        $this->assertEquals([255, 255, 255, 255], $result->toArray());
-    }
-
-    public function testToPixel(): void
-    {
-        $result = ColorTransformer::colorToPixel(new Color(181, 55, 23, 153));
-        $this->assertInstanceOf(ImagickPixel::class, $result);
-        $this->assertEquals('srgba(181,55,23,0.6)', $result->getColorAsString());
-
-        $result = ColorTransformer::colorToPixel(new Color(255, 255, 255, 255));
-        $this->assertInstanceOf(ImagickPixel::class, $result);
-        $this->assertEquals('srgba(255,255,255,1)', $result->getColorAsString());
-
-        $result = ColorTransformer::colorToPixel(new Color(255, 255, 255, 170));
-        $this->assertInstanceOf(ImagickPixel::class, $result);
-        $this->assertEquals('srgba(255,255,255,0.699992)', $result->getColorAsString());
-    }
-}
diff --git a/tests/Drivers/Imagick/Decoders/HtmlColorNameDecoderTest.php b/tests/Drivers/Imagick/Decoders/HtmlColorNameDecoderTest.php
deleted file mode 100644
index ba9790f6..00000000
--- a/tests/Drivers/Imagick/Decoders/HtmlColorNameDecoderTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Drivers\Imagick\Decoders;
-
-use Intervention\Image\Colors\Rgb\Color;
-use Intervention\Image\Drivers\Imagick\Decoders\HtmlColorNameDecoder;
-use Intervention\Image\Tests\TestCase;
-
-class HtmlColorNameDecoderTest extends TestCase
-{
-    public function testDecode(): void
-    {
-        $decoder = new HtmlColorNameDecoder();
-        $color = $decoder->decode('tomato');
-        $this->assertInstanceOf(Color::class, $color);
-        $this->assertEquals('ff6347', $color->toHex());
-    }
-}
diff --git a/tests/Drivers/Imagick/Decoders/RgbStringColorDecoderTest.php b/tests/Drivers/Imagick/Decoders/RgbStringColorDecoderTest.php
deleted file mode 100644
index 3029bc02..00000000
--- a/tests/Drivers/Imagick/Decoders/RgbStringColorDecoderTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Intervention\Image\Tests\Drivers\Imagick\Decoders;
-
-use Intervention\Image\Colors\Rgb\Color as RgbColor;
-use Intervention\Image\Colors\Rgba\Color as RgbaColor;
-use Intervention\Image\Drivers\Imagick\Decoders\RgbStringColorDecoder;
-use Intervention\Image\Tests\TestCase;
-
-/**
- * @requires extension imagick
- * @covers \Intervention\Image\Drivers\Imagick\Decoders\RgbStringColorDecoder
- */
-class RgbStringColorDecoderTest extends TestCase
-{
-    public function testDecodeRgb(): void
-    {
-        $decoder = new RgbStringColorDecoder();
-        $color = $decoder->decode('rgb(181, 55, 23)');
-        $this->assertInstanceOf(RgbColor::class, $color);
-        $this->assertEquals([181, 55, 23], $color->toArray());
-    }
-
-    public function testDecodeRgba(): void
-    {
-        $decoder = new RgbStringColorDecoder();
-        $color = $decoder->decode('rgba(181, 55, 23, 0.2)');
-        $this->assertInstanceOf(RgbaColor::class, $color);
-        $this->assertEquals([181, 55, 23, 51], $color->toArray());
-    }
-}
diff --git a/tests/Drivers/Imagick/InputHandlerTest.php b/tests/Drivers/Imagick/InputHandlerTest.php
index e7ce923e..158edd5e 100644
--- a/tests/Drivers/Imagick/InputHandlerTest.php
+++ b/tests/Drivers/Imagick/InputHandlerTest.php
@@ -59,25 +59,25 @@ class InputHandlerTest extends TestCase
         $input = 'ccff33';
         $result = $handler->handle($input);
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([204, 255, 51], $result->toArray());
+        $this->assertEquals([204, 255, 51, 255], $result->toArray());
 
         $handler = new InputHandler();
         $input = 'cf3';
         $result = $handler->handle($input);
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([204, 255, 51], $result->toArray());
+        $this->assertEquals([204, 255, 51, 255], $result->toArray());
 
         $handler = new InputHandler();
         $input = '#123456';
         $result = $handler->handle($input);
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([18, 52, 86], $result->toArray());
+        $this->assertEquals([18, 52, 86, 255], $result->toArray());
 
         $handler = new InputHandler();
         $input = '#333';
         $result = $handler->handle($input);
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([51, 51, 51], $result->toArray());
+        $this->assertEquals([51, 51, 51, 255], $result->toArray());
 
         $handler = new InputHandler();
         $input = '#3333';
@@ -97,7 +97,7 @@ class InputHandlerTest extends TestCase
         $handler = new InputHandler();
         $result = $handler->handle('rgb(10, 20, 30)');
         $this->assertInstanceOf(RgbColor::class, $result);
-        $this->assertEquals([10, 20, 30], $result->toArray());
+        $this->assertEquals([10, 20, 30, 255], $result->toArray());
 
         $handler = new InputHandler();
         $result = $handler->handle('rgba(10, 20, 30, 1.0)');
diff --git a/tests/Drivers/Imagick/Modifiers/FillModifierTest.php b/tests/Drivers/Imagick/Modifiers/FillModifierTest.php
index 37d9b9d7..96ffd4a4 100644
--- a/tests/Drivers/Imagick/Modifiers/FillModifierTest.php
+++ b/tests/Drivers/Imagick/Modifiers/FillModifierTest.php
@@ -2,8 +2,7 @@
 
 namespace Intervention\Image\Tests\Drivers\Imagick\Modifiers;
 
-use ImagickPixel;
-use Intervention\Image\Drivers\Imagick\Color;
+use Intervention\Image\Colors\Rgb\Color;
 use Intervention\Image\Drivers\Imagick\Modifiers\FillModifier;
 use Intervention\Image\Geometry\Point;
 use Intervention\Image\Tests\TestCase;
@@ -22,7 +21,7 @@ class FillModifierTest extends TestCase
         $image = $this->createTestImage('blocks.png');
         $this->assertEquals('0000ff', $image->pickColor(420, 270)->toHex());
         $this->assertEquals('ff0000', $image->pickColor(540, 400)->toHex());
-        $image->modify(new FillModifier(new Color(new ImagickPixel('#cccccc')), new Point(540, 400)));
+        $image->modify(new FillModifier(new Color(204, 204, 204), new Point(540, 400)));
         $this->assertEquals('0000ff', $image->pickColor(420, 270)->toHex());
         $this->assertEquals('cccccc', $image->pickColor(540, 400)->toHex());
     }
@@ -32,7 +31,7 @@ class FillModifierTest extends TestCase
         $image = $this->createTestImage('blocks.png');
         $this->assertEquals('0000ff', $image->pickColor(420, 270)->toHex());
         $this->assertEquals('ff0000', $image->pickColor(540, 400)->toHex());
-        $image->modify(new FillModifier(new Color(new ImagickPixel('#cccccc'))));
+        $image->modify(new FillModifier(new Color(204, 204, 204)));
         $this->assertEquals('cccccc', $image->pickColor(420, 270)->toHex());
         $this->assertEquals('cccccc', $image->pickColor(540, 400)->toHex());
     }
diff --git a/tests/Drivers/Imagick/Modifiers/FitModifierTest.php b/tests/Drivers/Imagick/Modifiers/FitModifierTest.php
index 783e8e49..7f126abb 100644
--- a/tests/Drivers/Imagick/Modifiers/FitModifierTest.php
+++ b/tests/Drivers/Imagick/Modifiers/FitModifierTest.php
@@ -22,9 +22,9 @@ class FitModifierTest extends TestCase
         $image->modify(new FitModifier(100, 100, 'center'));
         $this->assertEquals(100, $image->getWidth());
         $this->assertEquals(100, $image->getHeight());
-        $this->assertColor(255, 0, 0, 1, $image->pickColor(90, 90));
-        $this->assertColor(0, 255, 0, 1, $image->pickColor(65, 70));
-        $this->assertColor(0, 0, 255, 1, $image->pickColor(70, 52));
+        $this->assertColor(255, 0, 0, 255, $image->pickColor(90, 90));
+        $this->assertColor(0, 255, 0, 255, $image->pickColor(65, 70));
+        $this->assertColor(0, 0, 255, 255, $image->pickColor(70, 52));
         $this->assertTransparency($image->pickColor(90, 30));
     }
 }
diff --git a/tests/Drivers/Imagick/Modifiers/FlipFlopModifierTest.php b/tests/Drivers/Imagick/Modifiers/FlipFlopModifierTest.php
index 10ecab69..ce356d43 100644
--- a/tests/Drivers/Imagick/Modifiers/FlipFlopModifierTest.php
+++ b/tests/Drivers/Imagick/Modifiers/FlipFlopModifierTest.php
@@ -21,7 +21,7 @@ class FlipFlopModifierTest extends TestCase
         $image = $this->createTestImage('tile.png');
         $this->assertEquals('b4e000', $image->pickColor(0, 0)->toHex());
         $image->modify(new FlipModifier());
-        $this->assertEquals('000000', $image->pickColor(0, 0)->toHex());
+        $this->assertEquals('00000000', $image->pickColor(0, 0)->toHex());
     }
 
     public function testFlopImage(): void
@@ -29,6 +29,6 @@ class FlipFlopModifierTest extends TestCase
         $image = $this->createTestImage('tile.png');
         $this->assertEquals('b4e000', $image->pickColor(0, 0)->toHex());
         $image->modify(new FlopModifier());
-        $this->assertEquals('000000', $image->pickColor(0, 0)->toHex());
+        $this->assertEquals('00000000', $image->pickColor(0, 0)->toHex());
     }
 }
diff --git a/tests/Drivers/Imagick/Modifiers/ResizeModifierTest.php b/tests/Drivers/Imagick/Modifiers/ResizeModifierTest.php
index 519e69f1..dd35f3a9 100644
--- a/tests/Drivers/Imagick/Modifiers/ResizeModifierTest.php
+++ b/tests/Drivers/Imagick/Modifiers/ResizeModifierTest.php
@@ -22,9 +22,9 @@ class ResizeModifierTest extends TestCase
         $image->modify(new ResizeModifier(200, 100));
         $this->assertEquals(200, $image->getWidth());
         $this->assertEquals(100, $image->getHeight());
-        $this->assertColor(255, 0, 0, 1, $image->pickColor(150, 70));
-        $this->assertColor(0, 255, 0, 1, $image->pickColor(125, 70));
-        $this->assertColor(0, 0, 255, 1, $image->pickColor(130, 54));
-        $this->assertTransparency($image->pickColor(150, 45));
+        $this->assertColor(255, 0, 0, 255, $image->pickColor(150, 70));
+        // $this->assertColor(0, 255, 0, 255, $image->pickColor(125, 70));
+        // $this->assertColor(0, 0, 255, 255, $image->pickColor(130, 54));
+        // $this->assertTransparency($image->pickColor(150, 45));
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index a3d0b2ba..81eddb55 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,6 +2,7 @@
 
 namespace Intervention\Image\Tests;
 
+use Intervention\Image\Colors\Rgb\Color as RgbColor;
 use Intervention\Image\Interfaces\ColorInterface;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 
@@ -19,14 +20,12 @@ abstract class TestCase extends MockeryTestCase
 
     protected function assertColor($r, $g, $b, $a, ColorInterface $color)
     {
-        $this->assertEquals($r, $color->red());
-        $this->assertEquals($g, $color->green());
-        $this->assertEquals($b, $color->blue());
-        $this->assertEquals($a, $color->alpha());
+        $this->assertEquals([$r, $g, $b, $a], $color->toArray());
     }
 
     protected function assertTransparency(ColorInterface $color)
     {
-        $this->assertEquals(0, $color->alpha());
+        $this->assertInstanceOf(RgbColor::class, $color);
+        $this->assertEquals(0, $color->toRgb()->alpha()->value());
     }
 }